commit db948825b2e62edcedf1c97edfe399e4d160068d
Author: luyisha <luyisha@xingtongworld.com>
Date:   Fri Jun 9 09:41:02 2023 +0800

    初始

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..b163ca8
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/unpackage
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..81f13f4
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,16 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..21a949f
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,85 @@
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		onLaunch: function(options) {
+			console.log('App Launch');
+			//设置项目地址信息
+			App.setSiteInfo();
+			// 设置地址
+			let getAid = uni.getStorageSync('agencyData');
+			// let aid = (options.query.aid == '0')?getAid.aid:(options.query.aid || getAid.aid);
+			let aid = options.query.aid || getAid.aid;
+			
+			App.setAppRoot(aid);
+			// 获取小程序信息
+			App.updateAppInfo();
+			// 获取跳转链接列表
+			App.navgatetoLink();
+			//获取用户设置
+			App.userSettings();
+			// 跳转选择地区
+			// 获取图片地址
+			App.getImgUrl();
+			//获取用户通讯信息
+			App.getSetInfo();
+			// App.saveCity();
+			//获取自定义文字替换信息
+			App.getInt();
+			// #ifndef H5
+			//微信公共分享
+			// 更新提示
+			App.up();
+			//#ifdef MP-WEIXIN
+			uni.setInnerAudioOption({
+			obeyMuteSwitch: false  
+			})
+			//#endif
+			App.wxShareInfo();
+			// #endif
+			// App.wxApiCallback(options.path);
+			
+			// App.GetifAid()
+			let location = uni.getStorageSync('curLoction');
+			let agencyData = uni.getStorageInfoSync('agencyData');
+			if (!!agencyData) {
+				App.getAreaId(location);
+			};	
+			if(uni.getSystemInfoSync().platform == 'ios'){
+				
+			}
+		},
+		onShow: function(options) {
+			// 	// 获取地区列表
+			// #ifdef H5
+			
+			// #endif
+			// #ifndef H5
+			// 小程序启动场景
+			
+			if (options.query && JSON.stringify(options.query) !== "{}") {
+				console.log("e.query", options.query);
+				App.scanCode = true;
+				App.onStartupScene(options.query);
+			}
+			// #endif
+		},
+		onHide: function() {
+			console.log('App Hide');
+		}
+		// onLaunch:function(){
+	};
+</script>
+
+<style>
+	/*每个页面公共css */
+	@import './common/css/common.css';
+	@import "./common/css/new_iconfont.css";
+	@import './common/css/iconfont.css';
+	@import './pages/subPages2/grace/animate.css';
+	/* @import './pages/subPages2/grace/graceIcons.css'; */
+	/* @import './pages/subPages2/grace/graceUI.css';
+@import './pages/subPages/grace2/graceWeex.css'; */
+</style>
diff --git a/common/css/common.css b/common/css/common.css
new file mode 100644
index 0000000..85f3c50
--- /dev/null
+++ b/common/css/common.css
@@ -0,0 +1,965 @@
+/* iconfont */
+
+.container,
+input {
+	font-family: PingFang-Medium,
+		PingFangSC-Regular,
+		Heiti,
+		Heiti SC,
+		DroidSans,
+		DroidSansFallback,
+		sans-serif !important;
+	-webkit-font-smoothing: antialiased;
+}
+
+/* image {
+	will-change: transform
+} */
+
+button::after {
+	content: none !important;
+}
+
+.price-font-family {
+	font-family: Number-Font !important;
+}
+
+.tab-container {
+	padding-bottom: 96upx;
+}
+
+.tab-padding-container {
+	padding-bottom: calc(96upx + 20px);
+}
+
+.b-f {
+	background: #fff;
+}
+
+.b-0 {
+	background: #000000;
+}
+
+.b-e6 {
+	background-color: #f6f6f6;
+}
+
+.tf-180 {
+	-moz-transform: rotate(-180deg);
+	-ms-transform: rotate(-180deg);
+	-o-transform: rotate(-180deg);
+	transform: rotate(-180deg);
+}
+
+.tf-90 {
+	-moz-transform: rotate(90deg);
+	-ms-transform: rotate(90deg);
+	-o-transform: rotate(90deg);
+	transform: rotate(90deg);
+}
+
+.dis-block {
+	display: block;
+}
+
+.dis-il-block {
+	display: inline-block;
+}
+
+.dis-flex {
+	display: flex !important;
+	/* flex-wrap: wrap; */
+}
+
+.flex-box {
+	flex: 1;
+	width: 0;
+}
+
+.flex-shrink {
+	flex-shrink: 0;
+}
+
+.flex-warp {
+	flex-wrap: wrap;
+}
+
+.flex-dir-row {
+	flex-direction: row;
+}
+
+.flex-dir-column {
+	flex-direction: column;
+}
+
+.flex-x-center {
+	/* display: flex; */
+	justify-content: center;
+}
+
+.flex-x-between {
+	justify-content: space-between;
+}
+
+.flex-x-around {
+	justify-content: space-around;
+}
+
+.flex-x-end {
+	justify-content: flex-end;
+}
+
+.flex-x-start {
+	justify-content: flex-start;
+}
+
+.flex-y-center {
+	align-items: center;
+}
+
+.flex-y-end {
+	align-items: flex-end;
+}
+
+.flex-y-line {
+	align-items: baseline;
+}
+
+.flex-five {
+	box-sizing: border-box;
+	flex: 0 0 50%;
+}
+
+.flex-three {
+	float: left;
+	width: 33.3%;
+}
+
+.flex-four {
+	box-sizing: border-box;
+	flex: 0 0 25%;
+}
+
+.t-l {
+	text-align: left;
+}
+
+.t-c {
+	text-align: center;
+}
+
+.t-r {
+	text-align: right;
+}
+
+.p-a {
+	position: absolute;
+}
+
+.p-r {
+	position: relative;
+}
+
+.fl {
+	float: left;
+}
+
+.fr {
+	float: right;
+}
+
+.clear::after {
+	clear: both;
+	content: " ";
+	display: table;
+}
+
+.oh {
+	overflow: hidden;
+}
+
+.tb-lr-center {
+	display: -webkit-box;
+	display: -ms-flexbox;
+	display: flex !important;
+	-webkit-box-pack: center;
+	-ms-flex-pack: center;
+	justify-content: center;
+	-webkit-box-align: center;
+	-ms-flex-align: center;
+	align-items: center;
+}
+
+.f-58 {
+	font-size: 58upx;
+}
+
+.f-50 {
+	font-size: 50upx;
+}
+
+.f-48 {
+	font-size: 48upx;
+}
+
+.f-44 {
+	font-size: 44upx;
+}
+
+.f-42 {
+	font-size: 42upx;
+}
+
+.f-40 {
+	font-size: 40upx;
+}
+
+.f-38 {
+	font-size: 38upx;
+}
+
+.f-36 {
+	font-size: 36upx;
+}
+
+.f-34 {
+	font-size: 34upx;
+}
+
+.f-32 {
+	font-size: 32upx;
+}
+
+.f-31 {
+	font-size: 31upx;
+}
+
+.f-30 {
+	font-size: 30upx;
+}
+
+.f-29 {
+	font-size: 29upx;
+}
+
+.f-28 {
+	font-size: 28upx;
+}
+
+.f-26 {
+	font-size: 26upx;
+}
+
+.f-25 {
+	font-size: 25upx;
+}
+
+.f-24 {
+	font-size: 24upx;
+}
+
+.f-22 {
+	font-size: 22upx;
+}
+
+.f-20 {
+	font-size: 20upx;
+}
+
+.f-w {
+	font-weight: 700;
+}
+
+.f-n {
+	font-weight: 400;
+}
+
+.col-f {
+	color: #fff;
+}
+
+.col-c {
+	color: #CCCCCC;
+}
+
+.col-a {
+	color: #AAAAAA;
+}
+
+.col-0 {
+	color: #000;
+}
+
+.col-3 {
+	color: #333;
+}
+
+.col-6 {
+	color: #666;
+}
+
+.col-7 {
+	color: #777;
+}
+
+.col-8 {
+	color: #888;
+}
+
+.col-9 {
+	color: #999;
+}
+
+.col-98 {
+	color: #989898
+}
+
+.col-f4 {
+	color: #FF4444;
+}
+
+.color-f02 {
+	color: #F02E24;
+}
+
+.col-gr {
+	color: rgb(146, 208, 80);
+}
+
+.col-917952 {
+	color: #917952;
+}
+
+.col-m {
+	color: #FE504F !important;
+}
+
+.col-s {
+	color: #FFD940 !important;
+}
+
+.col-green {
+	color: #0ed339 !important;
+}
+
+.cont-box {
+	padding: 30upx;
+}
+
+.cont-bot {
+	margin-bottom: 120upx;
+}
+
+.padding-box {
+	padding: 0 30upx;
+	box-sizing: border-box;
+}
+
+.padding-box-all {
+	padding: 30upx;
+	box-sizing: border-box;
+}
+
+.padding-box36 {
+	padding: 0 36upx;
+	box-sizing: border-box;
+}
+
+.padding-all-box36 {
+	padding: 36upx;
+	box-sizing: border-box;
+}
+
+.p-top-10 {
+	padding-top: 10upx;
+}
+
+.p-top-20 {
+	padding-top: 20upx;
+}
+
+.p-top-50 {
+	padding-top: 50upx;
+}
+
+.p-btm-50 {
+	padding-bottom: 50upx;
+}
+
+.p-top-bom-10 {
+	padding: 10upx 0;
+}
+
+.p-top-bom-20 {
+	padding: 20upx 0;
+}
+
+.p-top-bom-30 {
+	padding: 30upx 0;
+}
+
+.p-top-bom-40 {
+	padding: 40upx 0;
+}
+
+.p-top-bom-50 {
+	padding: 50upx 0;
+}
+
+.pl-12 {
+	padding-left: 12px;
+}
+
+.pr-12 {
+	padding-right: 12px;
+}
+
+.p-b-20 {
+	padding-bottom: 20upx;
+}
+
+.pr-6 {
+	padding-right: 6px;
+}
+
+.m-top4 {
+	margin-top: 4upx;
+}
+
+.m-top10 {
+	margin-top: 10upx;
+}
+
+.m-top16 {
+	margin-top: 16upx;
+}
+
+.m-top20 {
+	margin-top: 20upx;
+}
+
+.m-top30 {
+	margin-top: 30upx;
+}
+
+.m-top40 {
+	margin-top: 40upx;
+}
+
+.m-btm36 {
+	margin-bottom: 36upx;
+}
+
+.m-btm10 {
+	margin-bottom: 10upx;
+}
+
+.m-btm20 {
+	margin-bottom: 20upx;
+}
+
+.m-btm15 {
+	margin-bottom: 15upx;
+}
+
+.m-btm20 {
+	margin-bottom: 20upx;
+}
+
+.m-btm30 {
+	margin-bottom: 30upx;
+}
+
+.m-btm40 {
+	margin-bottom: 40upx;
+}
+
+.m-btm50 {
+	margin-bottom: 50upx;
+}
+
+.m-btm60 {
+	margin-bottom: 60upx;
+}
+
+.m-btm80 {
+	margin-bottom: 80upx;
+}
+
+.m-btm90 {
+	margin-bottom: 90upx;
+}
+
+.m-btm100 {
+	margin-bottom: 100upx;
+}
+
+.m-left10 {
+	margin-left: 10upx;
+}
+
+.m-left12 {
+	margin-left: 12upx;
+}
+
+.m-left30 {
+	margin-left: 30upx;
+}
+
+.m-right10 {
+	margin-right: 10upx;
+}
+
+.m-right12 {
+	margin-right: 12upx;
+}
+
+.m-right20 {
+	margin-right: 20upx;
+}
+
+.m-right30 {
+	margin-right: 30upx;
+}
+
+.m-right40 {
+	margin-right: 40upx;
+}
+
+.m-right50 {
+	margin-right: 50upx;
+}
+
+.m-right70 {
+	margin-right: 70upx;
+}
+
+.m-top-btm50 {
+	margin: 50upx 0;
+}
+
+.m-top-btm40 {
+	margin: 40upx 0;
+}
+
+.m-top-btm30 {
+	margin: 30upx 0;
+}
+
+.m-top-btm20 {
+	margin: 20upx 0;
+}
+
+.m-top-btm10 {
+	margin: 10upx 0;
+}
+
+.m-top-btm6 {
+	margin: 6upx 0;
+}
+
+.p-top-40 {
+	padding-top: 40upx;
+}
+
+.p-bottom {
+	padding-bottom: 112upx;
+}
+
+.p-right-30 {
+	padding-right: 30upx;
+}
+
+.p-left-right-20 {
+	padding: 0 20upx;
+}
+
+.p-left-right-28 {
+	padding: 0 28upx;
+}
+
+.p-left-right-30 {
+	padding: 0 30upx;
+}
+
+.p-left-right-40 {
+	padding: 0 40upx;
+}
+
+.m-left-right-6 {
+	margin: 0 6upx;
+}
+
+.m-left-right-10 {
+	margin: 0 10upx;
+}
+
+.m-left-right-20 {
+	margin: 0 20upx;
+}
+
+.m-left-right-30 {
+	margin: 0 30upx;
+}
+
+.m-left-right-40 {
+	margin: 0 40upx;
+}
+
+.onelist-hidden {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.twolist-hidden {
+	display: -webkit-box;
+	word-break: break-all;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.b-r {
+	border-right: 1upx solid #eee;
+
+}
+
+.b-b {
+	border-bottom: 1upx solid #eee;
+}
+
+.b-t {
+	border-top: 1upx solid #eee;
+}
+
+.ts-1 {
+	-moz-transition: all 0.1s;
+	-o-transition: all 0.1s;
+	transition: all 0.1s;
+}
+
+.ts-2 {
+	-moz-transition: all 0.2s;
+	-o-transition: all 0.2s;
+	transition: all 0.2s;
+}
+
+.ts-3 {
+	-moz-transition: all 0.3s;
+	-o-transition: all 0.3s;
+	transition: all 0.3s;
+}
+
+.ts-5 {
+	-moz-transition: all 0.5s;
+	-o-transition: all 0.5s;
+	transition: all 0.5s;
+}
+
+/* 字体颜色 */
+
+.c-ff4444 {
+	color: #FF4444;
+}
+
+/* 无样式button (用于伪submit) */
+
+.btn-normal {
+	display: block;
+	margin: 0;
+	padding: 0;
+	line-height: normal;
+	background: none;
+	border-radius: 0;
+	box-shadow: none;
+	border: none;
+	font-size: unset;
+	text-align: unset;
+	overflow: visible;
+}
+
+.btn-normal:after {
+	border: none;
+}
+
+.btn-normal.button-hover {
+	color: inherit;
+}
+
+/* 模板消息按钮 */
+.report-btn {
+	position: absolute !important;
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	opacity: 0;
+}
+
+
+/* 内容标题直 */
+.module-title {
+	color: #333333;
+	font-size: 30upx;
+	text-align: center;
+	height: 86upx;
+	line-height: 86upx;
+	font-weight: bold;
+	position: relative;
+	background: #FFFFFF;
+}
+
+.module-title::after {
+	content: " ";
+	position: absolute;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+	width: 40upx;
+	height: 8upx;
+	background: #FFD940;
+	border-radius: 20upx;
+}
+
+/* 内容标题直弯 */
+.module-title-w {
+	color: #333333;
+	font-size: 30upx;
+	text-align: center;
+	height: 86upx;
+	line-height: 86upx;
+	font-weight: bold;
+	position: relative;
+	background: #FFFFFF;
+}
+
+.module-content {
+	padding: 30upx;
+	background: #FFFFFF;
+}
+
+.bor-radius-10 {
+	border-radius: 6upx;
+}
+
+.bor-radius-10upx {
+	border-radius: 10upx;
+}
+
+/* loading动画 */
+.ball-clip-rotate-pulse {
+	position: absolute;
+	top: 36%;
+	left: 50%;
+	transform: scale(1) translateY(-15px);
+}
+
+.ball-clip-rotate-pulse::after {
+	content: "努力加载中...";
+	position: absolute;
+	top: 50%;
+	bottom: 0;
+	transform: translate(-50%, 3em);
+	font-size: 26upx;
+	line-height: 2em;
+	text-align: center;
+	width: 10em;
+	letter-spacing: 2upx;
+	color: #666666;
+}
+
+.ball-clip-rotate-pulse>view {
+	-webkit-animation-fill-mode: both;
+	animation-fill-mode: both;
+	position: absolute;
+	top: 0px;
+	left: 0px;
+	border-radius: 100%;
+}
+
+.ball-clip-rotate-pulse>view:first-child {
+	background: #FFD940;
+	height: 16px;
+	width: 16px;
+	top: 7px;
+	left: -7px;
+	-webkit-animation: scale 1s 0s cubic-bezier(0.09, 0.57, 0.49, 0.9) infinite;
+	animation: scale 1s 0s cubic-bezier(0.09, 0.57, 0.49, 0.9) infinite;
+}
+
+.ball-clip-rotate-pulse>view:last-child {
+	position: absolute;
+	border: 2px solid #FFF;
+	width: 30px;
+	height: 30px;
+	left: -16px;
+	top: -2px;
+	background: transparent;
+	border: 2px solid;
+	border-color: #ffe26e transparent #ffe26e transparent;
+	-webkit-animation: rotate 1s 0s cubic-bezier(0.09, 0.57, 0.49, 0.9) infinite;
+	animation: rotate 1s 0s cubic-bezier(0.09, 0.57, 0.49, 0.9) infinite;
+	-webkit-animation-duration: 1s;
+	animation-duration: 1s;
+}
+
+@keyframes rotate {
+	0% {
+		-webkit-transform: rotate(0deg) scale(1);
+		transform: rotate(0deg) scale(1);
+	}
+
+	50% {
+		-webkit-transform: rotate(180deg) scale(0.6);
+		transform: rotate(180deg) scale(0.6);
+	}
+
+	100% {
+		-webkit-transform: rotate(360deg) scale(1);
+		transform: rotate(360deg) scale(1);
+	}
+}
+
+@keyframes scale {
+	30% {
+		-webkit-transform: scale(0.3);
+		transform: scale(0.3);
+	}
+
+	100% {
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+}
+
+.diy-loading {
+	position: absolute;
+	top: 50%;
+	left: 50%;
+	transform: translate(-50%, -50%);
+}
+
+.loading-image {
+	width: 60upx;
+	height: 60upx;
+	display: block;
+	margin: 0 auto;
+}
+
+.loading-text {
+	font-size: 26upx;
+	line-height: 2em;
+	text-align: center;
+	width: 10em;
+	letter-spacing: 2upx;
+	color: #666666;
+}
+
+/* 0.5px边框 */
+.border-line,
+.border-vertical {
+	position: relative;
+}
+
+.border-line::after {
+	content: " ";
+	position: absolute;
+	border-top: 1px solid #EEEEEE;
+	transform-origin: 0 0;
+	transform: scaleY(0.5);
+	z-index: 2;
+}
+
+.border-vertical::after {
+	content: " ";
+	position: absolute;
+	border-left: 1px solid #F7F7F7;
+	transform-origin: 0 0;
+	transform: scaleX(0.5);
+	z-index: 2;
+}
+
+.border-vertical.border-left::after {
+	top: 0;
+	left: 0;
+	bottom: 0;
+}
+
+.border-line.border-top::after {
+	left: 0;
+	top: 0;
+	right: 0;
+}
+
+.border-line.border-bottom::after {
+	left: 0;
+	bottom: 0;
+	right: 0;
+}
+
+.diy-nav-list .border-bottom::after {
+	left: 30upx;
+}
+
+.diy-nav-list .border-bottom.item-icon::after {
+	left: 100upx;
+}
+
+.diy-nav-list .border-bottom:last-child::after {
+	content: none;
+}
+
+.uni-picker-container {
+	z-index: 1003;
+}
+
+.uni-picker-container .uni-picker {
+	z-index: 1003;
+}
+
+.audio-main {
+	position: fixed;
+	right: 50upx;
+	top: 10%;
+	z-index: 10;
+}
+
+.audio-bg {
+	position: relative;
+}
+
+.audio-bg .audio-gif {
+	width: 100upx;
+	height: 100upx;
+	background-size: 100upx 100upx;
+	background-repeat: no-repeat;
+}
+
+.audio-bg .audio-gif .audio-png {
+	position: absolute;
+	background-size: 80upx 80upx;
+	animation: rotate2d 1.2s linear infinite;
+	z-index: -1;
+	width: 80upx;
+	height: 80upx;
+}
+
+.audio-bg.stop-audio .audio-gif {
+	background: none !important;
+}
+
+.audio-bg.stop-audio .audio-png {
+	animation: none;
+}
+
+@keyframes rotate2d {
+	from {
+		transform: rotate(0)
+	}
+
+	to {
+		transform: rotate(360deg)
+	}
+}
diff --git a/common/css/diyPages.css b/common/css/diyPages.css
new file mode 100644
index 0000000..0f64a15
--- /dev/null
+++ b/common/css/diyPages.css
@@ -0,0 +1,696 @@
+/* 团购样式5 */
+.groupon_goods5-pading{
+	padding: 20upx 30upx 0;
+}
+.groupon_goods5-list {
+	flex-wrap: nowrap;
+}
+
+.groupon_goods5-list-item .groupon_goods5-image {
+	width: 250upx;
+	height: 250upx;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 250upx 250upx;
+}
+.groupon_goods5-title{
+	height: 2.6em;
+	line-height: 1.3em;
+}
+.groupon_goods5-price .now-price {
+	color: #f64031;
+}
+
+.groupon_goods5-price .old-price {
+	color: #CCCCCC;
+	text-decoration: line-through;
+}
+
+
+/* 通用商品 */
+.public_goods_goods-price .now-price {
+	color: #f64031;
+}
+
+.public_goods_goods-price .old-price {
+	color: #CCCCCC;
+	text-decoration: line-through;
+	margin-left: 30upx;
+}
+
+
+/* 商家信息2 */
+.store-two-main .store-two-left {
+	width: 170upx;
+	height: 170upx;
+	background-position: center;
+	background-size: 170upx 170upx;
+	background-repeat: no-repeat;
+	flex-shrink: 0;
+}
+
+.store-two-main .store-two-right {
+	width: 100%;
+}
+
+.store-two-right .store-two-title {
+	height: 2.6em;
+	line-height: 1.3em;
+	width: 400upx;
+}
+
+.store-two-score .icon-shoucangxiao {
+	font-size: 28upx;
+	color: rgb(255, 153, 0);
+}
+
+.store-two-score .icon-shoucangxiao>text {
+	margin-left: 10upx;
+	color: red;
+}
+
+.store-time-tag{
+	padding: 3upx 10upx;
+	background-color: rgba(0,0,0,0.3);
+	color: #FFFFFF;
+	position: absolute;
+	left: 20upx;
+	bottom: 20upx;
+	font-size: 24upx;
+	border-radius: 6upx;
+}
+
+
+
+
+/* 抢购6 */
+.diy-goods3-item .goods3-item-image {
+	width: 100%;
+	height: 400upx;
+	background-repeat: no-repeat;
+	background-position: center;
+	background-size: 100% 400upx;
+	border-radius: 10upx 10upx 0 0;
+}
+
+.goods3-item-image .goods-image-gift {
+	position: absolute;
+	left: 0;
+	top: 40upx;
+	background-color: #27ce00;
+	border-radius: 0 8upx 8upx 0;
+	padding: 6upx 10upx;
+}
+
+.goods3-price .goods3-nowPrice {
+	color: red;
+}
+
+.goods3-price .goods3-oldPrice {
+	text-decoration: line-through;
+	color: #8c8b8b;
+}
+
+.goods-all-vip .goods-all-vip-label {
+	color: #DDCDA0;
+	padding: 0 2upx 0 2upx;
+	background-color: #363636;
+	border-radius: 6upx;
+}
+
+.goods-all-vip .goods-all-vip-price {
+	color: #363636;
+}
+
+/* 招聘统计 */
+
+.invite-statistics{
+	padding: 10upx 30upx;
+}
+
+.invite-statistics-item{
+	/* padding: 30upx; */
+	border-radius: 20upx;
+	/* border: 1upx; */
+	width: 25%;
+	border:  1upx solid #EEEEEE;
+	margin-right: 20upx;
+}
+
+.statistics-item-num{
+	font-size: 36upx;
+	padding: 30upx 30upx 0;
+	font-family: DINPro;
+	font-weight: bold;
+	color: #333333;
+}
+
+.statistics-item-class{
+	padding: 0 0upx;
+	font-size: 24upx;
+	height: 40upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #BBBBBB;
+	text-align: center;
+}
+
+.statistics-item-img{
+	height: 90upx;
+	position: relative;
+	border-radius: 0 0 20upx 0upx;
+}
+
+.statistics-item-image{
+	width: 60upx;
+	height: 60upx;
+	position: absolute;
+	right: 0upx;
+	bottom: 1upx;
+	border-radius: 0 0 20upx 0upx;
+}
+
+.enterprise-img{
+	width: 120upx;
+	height: 120upx;
+	border-radius: 10upx;
+}
+
+.enterprise-name{
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+}
+
+.enterprise-nature{
+	font-size: 24upx;
+	font-family: PingFang SC;
+	color: #999999;
+	padding: 6upx 0;
+}
+.enterprise-content{
+	padding-left: 20upx;
+}
+
+.enterprise-item{
+	padding: 30upx 0;
+	border-bottom: 1upx solid #EEEEEE;
+}
+.enterprise-item:last-child{
+	border: none;
+}
+
+.enterprise2-title{
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	flex: 0.5;
+}
+.enterprise2-more{
+	text-align: right;
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #999999;
+	flex: 0.5;
+}
+
+.enterprise2-item{
+	width: 240upx;
+	height: 340upx;
+	background-color: #B4B5C7;
+	border-radius: 15upx;
+	margin-right: 30upx;
+}
+
+.enterprise2-item-img{
+	width: 240upx;
+	height: 200upx;
+	border-radius:  15upx 15upx 0 0upx;
+}
+.enterprise2-item-name{
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	padding: 20upx 20upx;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis;
+}
+
+.enterprise2-item-invite{
+	font-size: 26upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #FFFFFF;
+	/* padding-bottom: 20upx; */
+	padding: 0 20upx 20upx;
+}
+.enterprise2-box{
+	overflow-y: scroll;
+	padding: 30upx 0 10upx;
+	display: flex;
+	
+}
+.recruit_enterprise2-box{
+	/* overflow: auto; */
+	overflow: hidden;
+}
+.recruit_recruit-name{
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	white-space:nowrap;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	flex: 0.5;
+}
+
+.recruit_recruit-top{
+	padding: 1upx 6upx;
+	background-color: #FF4444;
+	color: #FFFFFF;
+	font-size: 24upx;
+	font-weight: 500;
+	border-radius: 4upx;
+	margin-left: 20upx;
+}
+
+.recruit_recruit-salary{
+	font-size: 32upx;
+	font-family: DINPro;
+	font-weight: 500;
+	color: #FF4444;
+	flex: 0.5;
+	text-align: right;
+}
+.recruit_recruit-tags{
+	flex: 0.75;
+	height: 50upx;
+	overflow: hidden;
+}
+.recruit_recruit-tags-item{
+	padding: 5upx 20upx;
+	border-radius: 4upx;
+	font-size: 24upx;
+	font-family: PingFang SC;
+	font-weight: 400;
+	color: #666666;
+	margin-right: 20upx;
+}
+.recruit_recruit-region{
+	font-size: 28upx;
+	font-family: DINPro;
+	font-weight: 500;
+	line-height: 50upx;
+	text-align: right;
+	color: #999999;
+	flex: 0.25;
+	overflow:hidden; 
+	text-overflow:ellipsis; 
+	white-space:nowrap;
+}
+.recruit_recruit-imgbox{
+	flex: 0.2;
+}
+.recruit_recruit-img{
+	width: 120upx;
+	height: 120upx;
+	border-radius: 10upx;
+	border: 1upx solid #FFFFFF;
+}
+.recruit_recruit-left{
+	flex: 0.8;
+	padding-left: 20upx;
+}
+.recruit-left-nature{
+	font-size: 26upx;
+	color: #999999;
+	vertical-align: bottom;
+	padding-top: 20upx;
+}
+.recruit_recruit-right{
+	/* flex: 0.3; */
+}
+.recruit-left-name{
+	font-size: 28upx;
+	vertical-align: bottom;
+	margin-bottom: 30upx;
+	/* line-height: 60upx; */
+}
+.recruit-left-region{
+	font-size: 28upx;
+	font-family: DINPro;
+	font-weight: 500;
+	line-height: 50upx;
+	text-align: right;
+	color: #999999;
+	flex: 0.3;
+	width: 200upx;
+	overflow: hidden;/*超出部分隐藏*/
+	white-space: nowrap;/*不换行*/
+	text-overflow:ellipsis;/*超出部分文字以...显示*/
+}
+.recruit_recruit{
+	border-bottom: 1upx solid #EEEEEE;
+}
+.recruit_recruit:last-child{
+	border: none;
+}
+.recruit_resume-imgbox{
+	flex: 0.3;
+}
+.recruit_resume-content{
+	flex: 0.7;
+}
+.recruit_resume-img{
+	width: 150upx;
+	height: 150upx;
+	border-radius: 50%;
+}
+.recruit_resume-title{
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #333333;
+	flex: 0.5;
+}
+.recruit_resume-salary{
+	flex: 0.5;
+	font-size: 32upx;
+	font-family: PingFang SC;
+	font-weight: bold;
+	color: #ff4444;
+	text-align: right;
+}
+.recruit_resume-data{
+	font-size: 26upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: #999999;
+	padding: 15upx 0;
+}
+.recruit_resume-tags{
+	flex: 0.8;
+	height: 50upx;
+	overflow: hidden;
+}
+.recruit_resume-site{
+	flex: 0.2;
+	font-size: 26upx;
+	color: #999999;
+	text-align: right;
+	line-height: 52upx;
+}
+.recruit_resume-tagitem{
+	padding: 5upx 10upx;
+	font-size: 26upx;
+	background-color: #007AFF;
+	border-radius: 4upx;
+	margin-right: 10upx;
+}
+.recruit_resume-item{
+	margin-bottom: 50upx;
+}
+
+/* 相亲 */
+.blind{
+	/* padding: 30upx; */
+	margin: 30upx;
+}
+.blind-item{
+	padding: 30upx;
+	width: 335upx;
+	box-sizing: border-box;
+	height: 171upx;
+	background: #F8F8F8;
+	opacity: 1;
+	border-radius: 20upx;
+}
+.nav-content {
+		width: 690rpx;
+		margin: 0 auto 0;
+		display: flex;
+		flex-wrap: wrap;
+		justify-content:space-between;
+		
+}
+.nav-item {
+	width: 335rpx;
+	height: auto;
+	border-radius: 20rpx;
+	overflow: hidden;
+	background-color: #F8F8F8;
+	margin-bottom: 20rpx;
+}
+
+/* 家政 */
+.housekeeping{
+	padding: 30upx;
+	margin: 0 auto 0;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content:space-between;
+}
+
+.housekeeping:after {
	content: "";
+	flex:0 0 45%;
}
+
+.housekeeping-issue{
+	height: 90upx;
+	line-height: 90upx;
+	color: #FFFFFF;
+	font-size: 28upx;
+	text-align: center;
+	/* margin-right: 20upx; */
+	border-radius: 20upx;
+	margin-top: 50upx;
+}
+
+.housekeeping-lose{
+	width: 45%;
+}
+
+.housekeeping3{
+	padding: 30upx;
+	margin: 0 auto 0;
+	display: flex;
+	flex-wrap: wrap;
+	justify-content:space-between;
+}
+
+.housekeeping3:after {
	content: "";
+	flex:0 0 30%;
}
+
+.housekeeping-issue3{
+	flex:0 0 30%;
+	height: 90upx;
+	line-height: 90upx;
+	background-color: #A59AFF;
+	color: #FFFFFF;
+	font-size: 28upx;
+	text-align: center;
+	/* margin-right: 20upx; */
+	border-radius: 20upx;
+	margin-bottom: 20upx;
+}
+
+.housekeeping-lose3{
+	width: 30%;
+}
+
+.housekeeping-enter{
+	width: 335upx;
+	height: 90upx;
+	line-height: 90upx;
+	background-color: #FDAD28;
+	color: #FFFFFF;
+	font-size: 28upx;
+	text-align: center;
+	/* margin-right: 20upx; */
+	border-radius: 20upx;
+	margin-bottom: 20upx;
+}
+
+.housekeeping-image{
+	height: 30upx;
+	width: 30upx;
+	margin-right: 20upx;
+	margin-top: 30upx;
+	vertical-align: top;
+}
+
+.referralWaiter{
+	padding: 30upx;
+}
+
+.referralWaiter-content{
+	padding: 30upx 0;
+	overflow: auto;
+}
+
+.referralWaiter-item{
+	background-color: #F8F8F8;
+	margin-right: 20upx;
+	padding-bottom: 15upx;
+	border-radius: 20upx;
+	display: inline-block;
+	max-width: 330upx;
+	position: relative;
+}
+
+.referral-tag{
+	background-color: rgba(239,155,155,0.6);
+	color: #FFFFFF;
+	height: 36upx;
+	padding: 0 10upx;
+	font-size: 20upx;
+	display: inline-block;
+	line-height: 36upx;
+	border-radius: 10upx;
+	position: absolute;
+	left: 20upx;
+	top: 20upx;
+	z-index: 99;
+}
+
+.refText{
+	font-size: 20upx;
+	color: #ff4444;
+	font-weight:700;
+	padding-right: 20upx;
+	display: inline-block;
+	width: 200upx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.referralWaiter-item-img{
+	width: 330upx;
+	height: 186upx;
+	border-radius: 20upx 20upx 0 0;
+}
+
+.homemaking-tags{
+	padding: 22upx 20upx;
+	height: 36upx;
+	line-height: 38upx;
+	overflow: hidden;
+	
+}
+
+.homemaking-btn{
+	height: 40upx;
+	font-size: 20upx;
+	padding: 0 20upx;
+	line-height: 40upx;
+	background: linear-gradient(180deg, #72AAFD 0%, #6094FD 100%);
+	display: inline-block;
+	color: #FFFFFF;
+	border-radius: 10upx;
+	margin-right: 20upx;
+}
+
+.homemaking-tags-item{
+	/* width: 100upx; */
+	height: 32upx;
+	line-height: 32upx;
+	font-size: 20upx;
+	text-align: center;
+	background-color: #EEEEEE;
+	color: #999999;
+	padding: 0 10upx;
+	border-radius: 6upx;
+	display: inline-block;
+	margin-right: 10upx;
+	margin-bottom: 10upx;
+}
+
+.homemaking-name{
+	width: 300upx;
+	margin-left: 20upx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.homemakingList-boex{
+	padding: 20upx 30upx;
+	background-color: #F8F8F8;
+}
+
+.enter-box{
+	position: relative;
+	width: 690upx;
+	padding: 30upx;
+	padding-bottom: 170upx;
+	background-color: #FFFFFF;
+	border-radius: 30upx 30upx 0 0;
+}
+
+.enter-img{
+	width: 50upx;
+	height: 50upx;
+	position: absolute;
+	right: 30upx;
+	top: 30upx;
+}
+
+.IndividualsIn{
+	margin-top: 60upx;
+	padding: 35upx 40upx;
+	border-radius: 20upx;
+	background: #72AAFD;
+	display: flex;
+}
+
+.IndividualsInImg{
+	width: 110upx;
+	height: 110upx;
+}
+
+.IndividualsInright{
+	height: 28upx;
+	width: 56upx;
+	line-height: 110upx;
+}
+
+.vcssopen{
+	/* width:580upx;
+	overflow:hidden;
+	text-overflow:ellipsis;
+	white-space:nowrap; */
+}
+
+.linkRed{
+	width: 600upx;
+	height: 752upx;
+	position: relative;
+	border-radius: 30upx;
+}
+.redmt{
+	margin-top: 100upx;
+}
+.redmtf{
+	margin-top: 40upx;
+}
+.bnnerBox{
+	position: absolute;
+	left: 50%;
+	bottom: 10upx;
+	/* width: 100upx; */
+	transform: translateX(-50%);
+}
+.bnnerItem{
+	width: 15upx;
+	height: 15upx;
+	border-radius: 60upx;
+	background-color: #ffffff;
+	display: inline-block;
+	margin-right: 10upx;
+}
\ No newline at end of file
diff --git a/common/css/iconfont.css b/common/css/iconfont.css
new file mode 100644
index 0000000..98bb4de
--- /dev/null
+++ b/common/css/iconfont.css
@@ -0,0 +1,3082 @@
+@font-face {
+	font-family: "iconfont";
+	src: url('https://at.alicdn.com/t/font_453360_ifl5gbn650g.ttf?t=1575942588038') format('truetype'); /* chrome, firefox, opera, Safari, Android, iOS 4.2+ */
+
+}
+
+.iconfont {
+	font-family: "iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-appreciate:before {
+	content: "\e644";
+}
+
+.icon-check:before {
+	content: "\e645";
+}
+
+.icon-close:before {
+	content: "\e646";
+}
+
+.icon-edit:before {
+	content: "\e649";
+}
+
+.icon-emoji:before {
+	content: "\e64a";
+}
+
+.icon-favorfill:before {
+	content: "\e64b";
+}
+
+.icon-favor:before {
+	content: "\e64c";
+}
+
+.icon-loading:before {
+	content: "\e64f";
+}
+
+.icon-locationfill:before {
+	content: "\e650";
+}
+
+.icon-location:before {
+	content: "\e651";
+}
+
+.icon-phone:before {
+	content: "\e652";
+}
+
+.icon-roundcheckfill:before {
+	content: "\e656";
+}
+
+.icon-roundcheck:before {
+	content: "\e657";
+}
+
+.icon-roundclosefill:before {
+	content: "\e658";
+}
+
+.icon-roundclose:before {
+	content: "\e659";
+}
+
+.icon-roundrightfill:before {
+	content: "\e65a";
+}
+
+.icon-roundright:before {
+	content: "\e65b";
+}
+
+.icon-search:before {
+	content: "\e65c";
+}
+
+.icon-taxi:before {
+	content: "\e65d";
+}
+
+.icon-timefill:before {
+	content: "\e65e";
+}
+
+.icon-time:before {
+	content: "\e65f";
+}
+
+.icon-unfold:before {
+	content: "\e661";
+}
+
+.icon-warnfill:before {
+	content: "\e662";
+}
+
+.icon-warn:before {
+	content: "\e663";
+}
+
+.icon-camerafill:before {
+	content: "\e664";
+}
+
+.icon-camera:before {
+	content: "\e665";
+}
+
+.icon-commentfill:before {
+	content: "\e666";
+}
+
+.icon-comment:before {
+	content: "\e667";
+}
+
+.icon-likefill:before {
+	content: "\e668";
+}
+
+.icon-like:before {
+	content: "\e669";
+}
+
+.icon-notificationfill:before {
+	content: "\e66a";
+}
+
+.icon-notification:before {
+	content: "\e66b";
+}
+
+.icon-order:before {
+	content: "\e66c";
+}
+
+.icon-samefill:before {
+	content: "\e66d";
+}
+
+.icon-same:before {
+	content: "\e66e";
+}
+
+.icon-deliver:before {
+	content: "\e671";
+}
+
+.icon-evaluate:before {
+	content: "\e672";
+}
+
+.icon-pay:before {
+	content: "\e673";
+}
+
+.icon-send:before {
+	content: "\e675";
+}
+
+.icon-shop:before {
+	content: "\e676";
+}
+
+.icon-ticket:before {
+	content: "\e677";
+}
+
+.icon-wang:before {
+	content: "\e678";
+}
+
+.icon-back:before {
+	content: "\e679";
+}
+
+.icon-cascades:before {
+	content: "\e67c";
+}
+
+.icon-discover:before {
+	content: "\e67e";
+}
+
+.icon-list:before {
+	content: "\e682";
+}
+
+.icon-more:before {
+	content: "\e684";
+}
+
+.icon-scan:before {
+	content: "\e689";
+}
+
+.icon-settings:before {
+	content: "\e68a";
+}
+
+.icon-questionfill:before {
+	content: "\e690";
+}
+
+.icon-question:before {
+	content: "\e691";
+}
+
+.icon-shopfill:before {
+	content: "\e697";
+}
+
+.icon-form:before {
+	content: "\e699";
+}
+
+.icon-wangfill:before {
+	content: "\e69a";
+}
+
+.icon-pic:before {
+	content: "\e69b";
+}
+
+.icon-filter:before {
+	content: "\e69c";
+}
+
+.icon-footprint:before {
+	content: "\e69d";
+}
+
+.icon-top:before {
+	content: "\e69e";
+}
+
+.icon-pulldown:before {
+	content: "\e69f";
+}
+
+.icon-pullup:before {
+	content: "\e6a0";
+}
+
+.icon-right:before {
+	content: "\e6a3";
+}
+
+.icon-refresh:before {
+	content: "\e6a4";
+}
+
+.icon-moreandroid:before {
+	content: "\e6a5";
+}
+
+.icon-deletefill:before {
+	content: "\e6a6";
+}
+
+.icon-refund:before {
+	content: "\e6ac";
+}
+
+.icon-cart:before {
+	content: "\e6af";
+}
+
+.icon-qrcode:before {
+	content: "\e6b0";
+}
+
+.icon-remind:before {
+	content: "\e6b2";
+}
+
+.icon-delete:before {
+	content: "\e6b4";
+}
+
+.icon-profile:before {
+	content: "\e6b7";
+}
+
+.icon-home:before {
+	content: "\e6b8";
+}
+
+.icon-cartfill:before {
+	content: "\e6b9";
+}
+
+.icon-discoverfill:before {
+	content: "\e6ba";
+}
+
+.icon-homefill:before {
+	content: "\e6bb";
+}
+
+.icon-message:before {
+	content: "\e6bc";
+}
+
+.icon-addressbook:before {
+	content: "\e6bd";
+}
+
+.icon-link:before {
+	content: "\e6bf";
+}
+
+.icon-lock:before {
+	content: "\e6c0";
+}
+
+.icon-unlock:before {
+	content: "\e6c2";
+}
+
+.icon-vip:before {
+	content: "\e6c3";
+}
+
+.icon-weibo:before {
+	content: "\e6c4";
+}
+
+.icon-activity:before {
+	content: "\e6c5";
+}
+
+.icon-big:before {
+	content: "\e6c7";
+}
+
+.icon-friendaddfill:before {
+	content: "\e6c9";
+}
+
+.icon-friendadd:before {
+	content: "\e6ca";
+}
+
+.icon-friendfamous:before {
+	content: "\e6cb";
+}
+
+.icon-friend:before {
+	content: "\e6cc";
+}
+
+.icon-goods:before {
+	content: "\e6cd";
+}
+
+.icon-selection:before {
+	content: "\e6ce";
+}
+
+.icon-tmall:before {
+	content: "\e6cf";
+}
+
+.icon-explore:before {
+	content: "\e6d2";
+}
+
+.icon-present:before {
+	content: "\e6d3";
+}
+
+.icon-squarecheckfill:before {
+	content: "\e6d4";
+}
+
+.icon-square:before {
+	content: "\e6d5";
+}
+
+.icon-squarecheck:before {
+	content: "\e6d6";
+}
+
+.icon-round:before {
+	content: "\e6d7";
+}
+
+.icon-roundaddfill:before {
+	content: "\e6d8";
+}
+
+.icon-roundadd:before {
+	content: "\e6d9";
+}
+
+.icon-add:before {
+	content: "\e6da";
+}
+
+.icon-notificationforbidfill:before {
+	content: "\e6db";
+}
+
+.icon-explorefill:before {
+	content: "\e6dd";
+}
+
+.icon-fold:before {
+	content: "\e6de";
+}
+
+.icon-game:before {
+	content: "\e6df";
+}
+
+.icon-redpacket:before {
+	content: "\e6e0";
+}
+
+.icon-selectionfill:before {
+	content: "\e6e1";
+}
+
+.icon-similar:before {
+	content: "\e6e2";
+}
+
+.icon-appreciatefill:before {
+	content: "\e6e3";
+}
+
+.icon-infofill:before {
+	content: "\e6e4";
+}
+
+.icon-info:before {
+	content: "\e6e5";
+}
+
+.icon-tao:before {
+	content: "\e6e8";
+}
+
+.icon-mobiletao:before {
+	content: "\e6e9";
+}
+
+.icon-forwardfill:before {
+	content: "\e6ea";
+}
+
+.icon-forward:before {
+	content: "\e6eb";
+}
+
+.icon-rechargefill:before {
+	content: "\e6ec";
+}
+
+.icon-recharge:before {
+	content: "\e6ed";
+}
+
+.icon-vipcard:before {
+	content: "\e6ee";
+}
+
+.icon-voice:before {
+	content: "\e6ef";
+}
+
+.icon-voicefill:before {
+	content: "\e6f0";
+}
+
+.icon-friendfavor:before {
+	content: "\e6f1";
+}
+
+.icon-wifi:before {
+	content: "\e6f2";
+}
+
+.icon-share:before {
+	content: "\e6f3";
+}
+
+.icon-wefill:before {
+	content: "\e6f4";
+}
+
+.icon-we:before {
+	content: "\e6f5";
+}
+
+.icon-lightauto:before {
+	content: "\e6f6";
+}
+
+.icon-lightforbid:before {
+	content: "\e6f7";
+}
+
+.icon-lightfill:before {
+	content: "\e6f8";
+}
+
+.icon-camerarotate:before {
+	content: "\e6f9";
+}
+
+.icon-light:before {
+	content: "\e6fa";
+}
+
+.icon-barcode:before {
+	content: "\e6fb";
+}
+
+.icon-flashlightclose:before {
+	content: "\e6fc";
+}
+
+.icon-flashlightopen:before {
+	content: "\e6fd";
+}
+
+.icon-searchlist:before {
+	content: "\e6fe";
+}
+
+.icon-service:before {
+	content: "\e6ff";
+}
+
+.icon-sort:before {
+	content: "\e700";
+}
+
+.icon-1212:before {
+	content: "\e702";
+}
+
+.icon-down:before {
+	content: "\e703";
+}
+
+.icon-mobile:before {
+	content: "\e704";
+}
+
+.icon-mobilefill:before {
+	content: "\e705";
+}
+
+.icon-copy:before {
+	content: "\e706";
+}
+
+.icon-countdownfill:before {
+	content: "\e707";
+}
+
+.icon-countdown:before {
+	content: "\e708";
+}
+
+.icon-noticefill:before {
+	content: "\e709";
+}
+
+.icon-notice:before {
+	content: "\e70a";
+}
+
+.icon-qiang:before {
+	content: "\e70b";
+}
+
+.icon-upstagefill:before {
+	content: "\e70e";
+}
+
+.icon-upstage:before {
+	content: "\e70f";
+}
+
+.icon-babyfill:before {
+	content: "\e710";
+}
+
+.icon-baby:before {
+	content: "\e711";
+}
+
+.icon-brandfill:before {
+	content: "\e712";
+}
+
+.icon-brand:before {
+	content: "\e713";
+}
+
+.icon-choicenessfill:before {
+	content: "\e714";
+}
+
+.icon-choiceness:before {
+	content: "\e715";
+}
+
+.icon-clothesfill:before {
+	content: "\e716";
+}
+
+.icon-clothes:before {
+	content: "\e717";
+}
+
+.icon-creativefill:before {
+	content: "\e718";
+}
+
+.icon-creative:before {
+	content: "\e719";
+}
+
+.icon-female:before {
+	content: "\e71a";
+}
+
+.icon-keyboard:before {
+	content: "\e71b";
+}
+
+.icon-male:before {
+	content: "\e71c";
+}
+
+.icon-newfill:before {
+	content: "\e71d";
+}
+
+.icon-new:before {
+	content: "\e71e";
+}
+
+.icon-pullleft:before {
+	content: "\e71f";
+}
+
+.icon-pullright:before {
+	content: "\e720";
+}
+
+.icon-rankfill:before {
+	content: "\e721";
+}
+
+.icon-rank:before {
+	content: "\e722";
+}
+
+.icon-bad:before {
+	content: "\e723";
+}
+
+.icon-cameraadd:before {
+	content: "\e724";
+}
+
+.icon-focus:before {
+	content: "\e725";
+}
+
+.icon-friendfill:before {
+	content: "\e726";
+}
+
+.icon-cameraaddfill:before {
+	content: "\e727";
+}
+
+.icon-rectangle390:before {
+	content: "\e600";
+}
+
+.icon-icon:before {
+	content: "\e602";
+}
+
+.icon-zhuanzhang:before {
+	content: "\e603";
+}
+
+.icon-xinyongqiahuankuan:before {
+	content: "\e604";
+}
+
+.icon-dangmianfu:before {
+	content: "\e605";
+}
+
+.icon-shuidianmei:before {
+	content: "\e606";
+}
+
+.icon-shoujichongzhi:before {
+	content: "\e607";
+}
+
+.icon-qinmifu:before {
+	content: "\e608";
+}
+
+.icon-gupiao:before {
+	content: "\e609";
+}
+
+.icon-youxichongzhi:before {
+	content: "\e60a";
+}
+
+.icon-shoukuan:before {
+	content: "\e60b";
+}
+
+.icon-jipiao:before {
+	content: "\e60c";
+}
+
+.icon-huilvhuansuan:before {
+	content: "\e60d";
+}
+
+.icon-taobao:before {
+	content: "\e60e";
+}
+
+.icon-jizhang:before {
+	content: "\e60f";
+}
+
+.icon-lvyoutehui:before {
+	content: "\e610";
+}
+
+.icon-caipiao:before {
+	content: "\e611";
+}
+
+.icon-aa:before {
+	content: "\e612";
+}
+
+.icon-kuaidi:before {
+	content: "\e613";
+}
+
+.icon-guojihuikuan:before {
+	content: "\e614";
+}
+
+.icon-aixinjuanzeng:before {
+	content: "\e615";
+}
+
+.icon-diandian:before {
+	content: "\e616";
+}
+
+.icon-huafeiqiazhuanrang:before {
+	content: "\e617";
+}
+
+.icon-aliyouxi:before {
+	content: "\e618";
+}
+
+.icon-shoujibaoling:before {
+	content: "\e619";
+}
+
+.icon-tianmaobao:before {
+	content: "\e61a";
+}
+
+.icon-qianbaopengyou:before {
+	content: "\e61b";
+}
+
+.icon-dache:before {
+	content: "\e61c";
+}
+
+.icon-kuaiqiang:before {
+	content: "\e61d";
+}
+
+.icon-suishendai:before {
+	content: "\e61f";
+}
+
+.icon-xiaoyuanyiqiatong:before {
+	content: "\e620";
+}
+
+.icon-zhaocaibao:before {
+	content: "\e621";
+}
+
+.icon-yulebao:before {
+	content: "\e622";
+}
+
+.icon-wodebaozhang:before {
+	content: "\e623";
+}
+
+.icon-huiyuantequan:before {
+	content: "\e624";
+}
+
+.icon-chenggong:before {
+	content: "\e625";
+}
+
+.icon-shibai:before {
+	content: "\e626";
+}
+
+.icon-jingshi:before {
+	content: "\e627";
+}
+
+.icon-tishi:before {
+	content: "\e628";
+}
+
+.icon-bangzhu:before {
+	content: "\e629";
+}
+
+.icon-dengdai:before {
+	content: "\e62a";
+}
+
+.icon-xiangji:before {
+	content: "\e62b";
+}
+
+.icon-shoujitongxunlu:before {
+	content: "\e62c";
+}
+
+.icon-shezhi:before {
+	content: "\e62d";
+}
+
+.icon-wode:before {
+	content: "\e62e";
+}
+
+.icon-sousuo:before {
+	content: "\e62f";
+}
+
+.icon-liebiao:before {
+	content: "\e630";
+}
+
+.icon-bianji:before {
+	content: "\e631";
+}
+
+.icon-shanchu:before {
+	content: "\e632";
+}
+
+.icon-fenxiang:before {
+	content: "\e633";
+}
+
+.icon-ditu:before {
+	content: "\e634";
+}
+
+.icon-tianjia:before {
+	content: "\e635";
+}
+
+.icon-bangzhuxiantiao:before {
+	content: "\e636";
+}
+
+.icon-gengduo:before {
+	content: "\e637";
+}
+
+.icon-saoyisao:before {
+	content: "\e638";
+}
+
+.icon-fukuanma:before {
+	content: "\e639";
+}
+
+.icon-chengshifuwu:before {
+	content: "\e63a";
+}
+
+.icon-jiaoyujiaofei:before {
+	content: "\e63b";
+}
+
+.icon-yangchengtongchongzhi:before {
+	content: "\e63c";
+}
+
+.icon-chengshiyiqiatong:before {
+	content: "\e63d";
+}
+
+.icon-yiban:before {
+	content: "\e63e";
+}
+
+.icon-canyin:before {
+	content: "\e63f";
+}
+
+.icon-gouwu:before {
+	content: "\e640";
+}
+
+.icon-fushi:before {
+	content: "\e641";
+}
+
+.icon-jiaotong:before {
+	content: "\e642";
+}
+
+.icon-yule:before {
+	content: "\e643";
+}
+
+.icon-shejiao:before {
+	content: "\e647";
+}
+
+.icon-jujia:before {
+	content: "\e648";
+}
+
+.icon-tongxun:before {
+	content: "\e64d";
+}
+
+.icon-lingshi:before {
+	content: "\e64e";
+}
+
+.icon-meirong:before {
+	content: "\e653";
+}
+
+.icon-yundong:before {
+	content: "\e654";
+}
+
+.icon-lvxing:before {
+	content: "\e655";
+}
+
+.icon-shuma:before {
+	content: "\e660";
+}
+
+.icon-xuexi:before {
+	content: "\e66f";
+}
+
+.icon-yiliao:before {
+	content: "\e670";
+}
+
+.icon-shuji:before {
+	content: "\e674";
+}
+
+.icon-chongwu:before {
+	content: "\e67a";
+}
+
+.icon-caipiao1:before {
+	content: "\e67b";
+}
+
+.icon-qiche:before {
+	content: "\e67d";
+}
+
+.icon-bangong:before {
+	content: "\e67f";
+}
+
+.icon-zhufang:before {
+	content: "\e680";
+}
+
+.icon-weixiu:before {
+	content: "\e681";
+}
+
+.icon-haizi:before {
+	content: "\e683";
+}
+
+.icon-changbei:before {
+	content: "\e685";
+}
+
+.icon-liwu:before {
+	content: "\e686";
+}
+
+.icon-lijin:before {
+	content: "\e687";
+}
+
+.icon-huankuan:before {
+	content: "\e688";
+}
+
+.icon-juanzeng:before {
+	content: "\e68b";
+}
+
+.icon-licai:before {
+	content: "\e68c";
+}
+
+.icon-gongzi:before {
+	content: "\e68d";
+}
+
+.icon-jianzhi:before {
+	content: "\e68e";
+}
+
+.icon-licaishouyi:before {
+	content: "\e68f";
+}
+
+.icon-qitashouru:before {
+	content: "\e692";
+}
+
+.icon-zidingyileimu:before {
+	content: "\e693";
+}
+
+.icon-tianjialeimu:before {
+	content: "\e694";
+}
+
+.icon-zhifubaoa:before {
+	content: "\e695";
+}
+
+.icon-zhifubaob:before {
+	content: "\e696";
+}
+
+.icon-fuwuchuanga:before {
+	content: "\e698";
+}
+
+.icon-fuwuchuangb:before {
+	content: "\e6a1";
+}
+
+.icon-tansuoa:before {
+	content: "\e6a2";
+}
+
+.icon-tansuob:before {
+	content: "\e6a7";
+}
+
+.icon-caifua:before {
+	content: "\e6a8";
+}
+
+.icon-caifub:before {
+	content: "\e6a9";
+}
+
+.icon-apps:before {
+	content: "\e729";
+}
+
+.icon-paintfill:before {
+	content: "\e72a";
+}
+
+.icon-paint:before {
+	content: "\e72b";
+}
+
+.icon-picfill:before {
+	content: "\e72c";
+}
+
+.icon-refresharrow:before {
+	content: "\e72d";
+}
+
+.icon-markfill:before {
+	content: "\e730";
+}
+
+.icon-mark:before {
+	content: "\e731";
+}
+
+.icon-presentfill:before {
+	content: "\e732";
+}
+
+.icon-repeal:before {
+	content: "\e733";
+}
+
+.icon-album:before {
+	content: "\e734";
+}
+
+.icon-peoplefill:before {
+	content: "\e735";
+}
+
+.icon-people:before {
+	content: "\e736";
+}
+
+.icon-servicefill:before {
+	content: "\e737";
+}
+
+.icon-repair:before {
+	content: "\e738";
+}
+
+.icon-file:before {
+	content: "\e739";
+}
+
+.icon-repairfill:before {
+	content: "\e73a";
+}
+
+.icon-taoxiaopu:before {
+	content: "\e73b";
+}
+
+.icon-attentionfill:before {
+	content: "\e73c";
+}
+
+.icon-attention:before {
+	content: "\e73d";
+}
+
+.icon-commandfill:before {
+	content: "\e73e";
+}
+
+.icon-command:before {
+	content: "\e73f";
+}
+
+.icon-communityfill:before {
+	content: "\e740";
+}
+
+.icon-community:before {
+	content: "\e741";
+}
+
+.icon-read:before {
+	content: "\e742";
+}
+
+.icon-suan:before {
+	content: "\e743";
+}
+
+.icon-hua:before {
+	content: "\e744";
+}
+
+.icon-ju:before {
+	content: "\e745";
+}
+
+.icon-tian:before {
+	content: "\e748";
+}
+
+.icon-calendar:before {
+	content: "\e74a";
+}
+
+.icon-cut:before {
+	content: "\e74b";
+}
+
+.icon-magic:before {
+	content: "\e74c";
+}
+
+.icon-backwardfill:before {
+	content: "\e74d";
+}
+
+.icon-playfill:before {
+	content: "\e74f";
+}
+
+.icon-stop:before {
+	content: "\e750";
+}
+
+.icon-tagfill:before {
+	content: "\e751";
+}
+
+.icon-tag:before {
+	content: "\e752";
+}
+
+.icon-group:before {
+	content: "\e753";
+}
+
+.icon-all:before {
+	content: "\e755";
+}
+
+.icon-backdelete:before {
+	content: "\e756";
+}
+
+.icon-hotfill:before {
+	content: "\e757";
+}
+
+.icon-hot:before {
+	content: "\e758";
+}
+
+.icon-post:before {
+	content: "\e759";
+}
+
+.icon-radiobox:before {
+	content: "\e75b";
+}
+
+.icon-rounddown:before {
+	content: "\e75c";
+}
+
+.icon-upload:before {
+	content: "\e75d";
+}
+
+.icon-writefill:before {
+	content: "\e760";
+}
+
+.icon-write:before {
+	content: "\e761";
+}
+
+.icon-radioboxfill:before {
+	content: "\e763";
+}
+
+.icon-punch:before {
+	content: "\e764";
+}
+
+.icon-shake:before {
+	content: "\e765";
+}
+
+.icon-add1:before {
+	content: "\e767";
+}
+
+.icon-move:before {
+	content: "\e768";
+}
+
+.icon-safe:before {
+	content: "\e769";
+}
+
+.icon-haodian:before {
+	content: "\e76d";
+}
+
+.icon-mao:before {
+	content: "\e76e";
+}
+
+.icon-qi:before {
+	content: "\e76f";
+}
+
+.icon-ye:before {
+	content: "\e770";
+}
+
+.icon-juhuasuan:before {
+	content: "\e771";
+}
+
+.icon-taoqianggou:before {
+	content: "\e772";
+}
+
+.icon-tianmao:before {
+	content: "\e773";
+}
+
+.icon-activityfill:before {
+	content: "\e775";
+}
+
+.icon-crownfill:before {
+	content: "\e776";
+}
+
+.icon-crown:before {
+	content: "\e777";
+}
+
+.icon-goodsfill:before {
+	content: "\e778";
+}
+
+.icon-messagefill:before {
+	content: "\e779";
+}
+
+.icon-profilefill:before {
+	content: "\e77a";
+}
+
+.icon-sound:before {
+	content: "\e77b";
+}
+
+.icon-sponsorfill:before {
+	content: "\e77c";
+}
+
+.icon-sponsor:before {
+	content: "\e77d";
+}
+
+.icon-upblock:before {
+	content: "\e77e";
+}
+
+.icon-weblock:before {
+	content: "\e77f";
+}
+
+.icon-weunblock:before {
+	content: "\e780";
+}
+
+.icon-1111:before {
+	content: "\e782";
+}
+
+.icon-my:before {
+	content: "\e78b";
+}
+
+.icon-myfill:before {
+	content: "\e78c";
+}
+
+.icon-emojifill:before {
+	content: "\e78d";
+}
+
+.icon-emojiflashfill:before {
+	content: "\e78e";
+}
+
+.icon-flashbuyfill-copy:before {
+	content: "\e78f";
+}
+
+.icon-text:before {
+	content: "\e791";
+}
+
+.icon-goodsfavor:before {
+	content: "\e794";
+}
+
+.icon-musicfill:before {
+	content: "\e795";
+}
+
+.icon-musicforbidfill:before {
+	content: "\e796";
+}
+
+.icon-xiamiforbid:before {
+	content: "\e797";
+}
+
+.icon-xiami:before {
+	content: "\e798";
+}
+
+.icon-roundleftfill:before {
+	content: "\e799";
+}
+
+.icon-triangledownfill:before {
+	content: "\e79b";
+}
+
+.icon-triangleupfill:before {
+	content: "\e79c";
+}
+
+.icon-roundleftfill-copy:before {
+	content: "\e79e";
+}
+
+.icon-weixin:before {
+	content: "\e6ab";
+}
+
+.icon-pulldown1:before {
+	content: "\e79f";
+}
+
+.icon-emojilight:before {
+	content: "\e7a1";
+}
+
+.icon-keyboardlight:before {
+	content: "\e7a3";
+}
+
+.icon-recordfill:before {
+	content: "\e7a4";
+}
+
+.icon-recordlight:before {
+	content: "\e7a5";
+}
+
+.icon-record:before {
+	content: "\e7a6";
+}
+
+.icon-roundaddlight:before {
+	content: "\e7a7";
+}
+
+.icon-soundlight:before {
+	content: "\e7a8";
+}
+
+.icon-cardboardfill:before {
+	content: "\e7a9";
+}
+
+.icon-cardboard:before {
+	content: "\e7aa";
+}
+
+.icon-formfill:before {
+	content: "\e7ab";
+}
+
+.icon-coin:before {
+	content: "\e7ac";
+}
+
+.icon-sortlight:before {
+	content: "\e7ad";
+}
+
+.icon-cardboardforbid:before {
+	content: "\e7af";
+}
+
+.icon-circlefill:before {
+	content: "\e7b0";
+}
+
+.icon-circle:before {
+	content: "\e7b1";
+}
+
+.icon-attentionforbid:before {
+	content: "\e7b2";
+}
+
+.icon-attentionforbidfill:before {
+	content: "\e7b3";
+}
+
+.icon-attentionfavorfill:before {
+	content: "\e7b4";
+}
+
+.icon-attentionfavor:before {
+	content: "\e7b5";
+}
+
+.icon-piclight:before {
+	content: "\e7b7";
+}
+
+.icon-shoplight:before {
+	content: "\e7b8";
+}
+
+.icon-voicelight:before {
+	content: "\e7b9";
+}
+
+.icon-attentionfavorfill-copy:before {
+	content: "\e7ba";
+}
+
+.icon-full:before {
+	content: "\e7bc";
+}
+
+.icon-mail:before {
+	content: "\e7bd";
+}
+
+.icon-peoplelist:before {
+	content: "\e7be";
+}
+
+.icon-logo:before {
+	content: "\e6aa";
+}
+
+.icon-daohang1:before {
+	content: "\e6ad";
+}
+
+.icon-goodsnewfill:before {
+	content: "\e7bf";
+}
+
+.icon-goodsnew:before {
+	content: "\e7c0";
+}
+
+.icon-medalfill:before {
+	content: "\e7c1";
+}
+
+.icon-medal:before {
+	content: "\e7c2";
+}
+
+.icon-newsfill:before {
+	content: "\e7c3";
+}
+
+.icon-newshotfill:before {
+	content: "\e7c4";
+}
+
+.icon-newshot:before {
+	content: "\e7c5";
+}
+
+.icon-news:before {
+	content: "\e7c6";
+}
+
+.icon-videofill:before {
+	content: "\e7c7";
+}
+
+.icon-video:before {
+	content: "\e7c8";
+}
+
+.icon-askfill:before {
+	content: "\e7c9";
+}
+
+.icon-ask:before {
+	content: "\e7ca";
+}
+
+.icon-exit:before {
+	content: "\e7cb";
+}
+
+.icon-skinfill:before {
+	content: "\e7cc";
+}
+
+.icon-skin:before {
+	content: "\e7cd";
+}
+
+.icon-moneybagfill:before {
+	content: "\e7ce";
+}
+
+.icon-usefullfill:before {
+	content: "\e7cf";
+}
+
+.icon-usefull:before {
+	content: "\e7d0";
+}
+
+.icon-moneybag:before {
+	content: "\e7d1";
+}
+
+.icon-redpacket_fill:before {
+	content: "\e7d3";
+}
+
+.icon-subscription:before {
+	content: "\e7d4";
+}
+
+.icon-home_light:before {
+	content: "\e7d5";
+}
+
+.icon-my_light:before {
+	content: "\e7d6";
+}
+
+.icon-community_light:before {
+	content: "\e7d7";
+}
+
+.icon-cart_light:before {
+	content: "\e7d8";
+}
+
+.icon-we_light:before {
+	content: "\e7d9";
+}
+
+.icon-home_fill_light:before {
+	content: "\e7da";
+}
+
+.icon-cart_fill_light:before {
+	content: "\e7db";
+}
+
+.icon-community_fill_light:before {
+	content: "\e7dc";
+}
+
+.icon-my_fill_light:before {
+	content: "\e7dd";
+}
+
+.icon-we_fill_light:before {
+	content: "\e7de";
+}
+
+.icon-skin_light:before {
+	content: "\e7df";
+}
+
+.icon-search_light:before {
+	content: "\e7e0";
+}
+
+.icon-scan_light:before {
+	content: "\e7e1";
+}
+
+.icon-people_list_light:before {
+	content: "\e7e2";
+}
+
+.icon-message_light:before {
+	content: "\e7e3";
+}
+
+.icon-close_light:before {
+	content: "\e7e4";
+}
+
+.icon-add_light:before {
+	content: "\e7e5";
+}
+
+.icon-profile_light:before {
+	content: "\e7e6";
+}
+
+.icon-service_light:before {
+	content: "\e7e7";
+}
+
+.icon-friend_add_light:before {
+	content: "\e7e8";
+}
+
+.icon-edit_light:before {
+	content: "\e7e9";
+}
+
+.icon-camera_light:before {
+	content: "\e7ea";
+}
+
+.icon-hot_light:before {
+	content: "\e7eb";
+}
+
+.icon-refresh_light:before {
+	content: "\e7ec";
+}
+
+.icon-back_light:before {
+	content: "\e7ed";
+}
+
+.icon-share_light:before {
+	content: "\e7ee";
+}
+
+.icon-comment_light:before {
+	content: "\e7ef";
+}
+
+.icon-appreciate_light:before {
+	content: "\e7f0";
+}
+
+.icon-favor_light:before {
+	content: "\e7f1";
+}
+
+.icon-appreciate_fill_light:before {
+	content: "\e7f2";
+}
+
+.icon-comment_fill_light:before {
+	content: "\e7f3";
+}
+
+.icon-wang_light:before {
+	content: "\e7f4";
+}
+
+.icon-more_android_light:before {
+	content: "\e7f5";
+}
+
+.icon-friend_light:before {
+	content: "\e7f6";
+}
+
+.icon-more_light:before {
+	content: "\e7f7";
+}
+
+.icon-goods_favor_light:before {
+	content: "\e7f8";
+}
+
+.icon-goods_new_fill_light:before {
+	content: "\e7f9";
+}
+
+.icon-goods_new_light:before {
+	content: "\e7fa";
+}
+
+.icon-goods_light:before {
+	content: "\e7fb";
+}
+
+.icon-medal_fill_light:before {
+	content: "\e7fc";
+}
+
+.icon-medal_light:before {
+	content: "\e7fd";
+}
+
+.icon-news_fill_light:before {
+	content: "\e7fe";
+}
+
+.icon-news_hot_fill_light:before {
+	content: "\e7ff";
+}
+
+.icon-news_hot_light:before {
+	content: "\e800";
+}
+
+.icon-news_light:before {
+	content: "\e801";
+}
+
+.icon-video_fill_light:before {
+	content: "\e802";
+}
+
+.icon-message_fill_light:before {
+	content: "\e803";
+}
+
+.icon-form_light:before {
+	content: "\e804";
+}
+
+.icon-video_light:before {
+	content: "\e805";
+}
+
+.icon-search_list_light:before {
+	content: "\e806";
+}
+
+.icon-form_fill_light:before {
+	content: "\e807";
+}
+
+.icon-global_light:before {
+	content: "\e808";
+}
+
+.icon-global:before {
+	content: "\e809";
+}
+
+.icon-favor_fill_light:before {
+	content: "\e80a";
+}
+
+.icon-delete_light:before {
+	content: "\e80b";
+}
+
+.icon-back_android:before {
+	content: "\e80c";
+}
+
+.icon-back_android_light:before {
+	content: "\e80d";
+}
+
+.icon-down_light:before {
+	content: "\e80e";
+}
+
+.icon-round_close_light:before {
+	content: "\e80f";
+}
+
+.icon-round_close_fill_light:before {
+	content: "\e810";
+}
+
+.icon-expressman:before {
+	content: "\e811";
+}
+
+.icon-punch_light:before {
+	content: "\e812";
+}
+
+.icon-evaluate_fill:before {
+	content: "\e813";
+}
+
+.icon-furniture:before {
+	content: "\e814";
+}
+
+.icon-dress:before {
+	content: "\e815";
+}
+
+.icon-coffee:before {
+	content: "\e816";
+}
+
+.icon-sports:before {
+	content: "\e817";
+}
+
+.icon-group_light:before {
+	content: "\e818";
+}
+
+.icon-location_light:before {
+	content: "\e819";
+}
+
+.icon-attention_light:before {
+	content: "\e81a";
+}
+
+.icon-group_fill_light:before {
+	content: "\e81b";
+}
+
+.icon-group_fill:before {
+	content: "\e81c";
+}
+
+.icon-play_forward_fill:before {
+	content: "\e81d";
+}
+
+.icon-shoucang:before {
+	content: "\e86d";
+}
+
+.icon-guanbijiantou:before {
+	content: "\e86e";
+}
+
+.icon-shoucang1:before {
+	content: "\e86f";
+}
+
+.icon-sousuo1:before {
+	content: "\e870";
+}
+
+.icon-fenxiang1:before {
+	content: "\e871";
+}
+
+.icon-xiaoxi:before {
+	content: "\e872";
+}
+
+.icon-xihuan:before {
+	content: "\e873";
+}
+
+.icon-xihuan1:before {
+	content: "\e874";
+}
+
+.icon-zan:before {
+	content: "\e875";
+}
+
+.icon-zan1:before {
+	content: "\e876";
+}
+
+.icon-huafu:before {
+	content: "\e877";
+}
+
+.icon-lvjing:before {
+	content: "\e878";
+}
+
+.icon-huafu1:before {
+	content: "\e879";
+}
+
+.icon-fanzhuanjingtou:before {
+	content: "\e87a";
+}
+
+.icon-paizhao:before {
+	content: "\e87b";
+}
+
+.icon-shanguangdengdakai:before {
+	content: "\e87c";
+}
+
+.icon-shanguangdengzidong:before {
+	content: "\e87d";
+}
+
+.icon-huafu2:before {
+	content: "\e87e";
+}
+
+.icon-huafu3:before {
+	content: "\e87f";
+}
+
+.icon-shanguangdengguanbi:before {
+	content: "\e880";
+}
+
+.icon-paizhao1:before {
+	content: "\e881";
+}
+
+.icon-kuaitui:before {
+	content: "\e882";
+}
+
+.icon-bianda:before {
+	content: "\e883";
+}
+
+.icon-kuaijin:before {
+	content: "\e884";
+}
+
+.icon-xuanzhuanshouji:before {
+	content: "\e885";
+}
+
+.icon-liangdu:before {
+	content: "\e886";
+}
+
+.icon-yanjingmoshi:before {
+	content: "\e887";
+}
+
+.icon-zanting:before {
+	content: "\e888";
+}
+
+.icon-yinliang:before {
+	content: "\e889";
+}
+
+.icon-vrbofangqi:before {
+	content: "\e88a";
+}
+
+.icon-suoxiao:before {
+	content: "\e88b";
+}
+
+.icon-bofang:before {
+	content: "\e88c";
+}
+
+.icon-yueduxiao:before {
+	content: "\e88d";
+}
+
+.icon-xialajiantouxiao:before {
+	content: "\e88e";
+}
+
+.icon-dingweixiao:before {
+	content: "\e88f";
+}
+
+.icon-vrbofangqi1:before {
+	content: "\e890";
+}
+
+.icon-jingxuan:before {
+	content: "\e891";
+}
+
+.icon-zhekou:before {
+	content: "\e892";
+}
+
+.icon-tishi1:before {
+	content: "\e893";
+}
+
+.icon-shuiguo:before {
+	content: "\e894";
+}
+
+.icon-huiyi:before {
+	content: "\e895";
+}
+
+.icon-youhuiquan:before {
+	content: "\e896";
+}
+
+.icon-jianshen:before {
+	content: "\e897";
+}
+
+.icon-chufang:before {
+	content: "\e898";
+}
+
+.icon-ditu1:before {
+	content: "\e899";
+}
+
+.icon-zanxiao:before {
+	content: "\e89a";
+}
+
+.icon-huiyuanqia:before {
+	content: "\e89b";
+}
+
+.icon-jiesonghuoche:before {
+	content: "\e89c";
+}
+
+.icon-changyongxinxi:before {
+	content: "\e89d";
+}
+
+.icon-fanchengjipiao:before {
+	content: "\e89e";
+}
+
+.icon-chujingchaoshi:before {
+	content: "\e89f";
+}
+
+.icon-jiudian:before {
+	content: "\e8a0";
+}
+
+.icon-shoujian:before {
+	content: "\e8a1";
+}
+
+.icon-shaixuan:before {
+	content: "\e8a2";
+}
+
+.icon-jiesongji:before {
+	content: "\e8a3";
+}
+
+.icon-tupian:before {
+	content: "\e8a4";
+}
+
+.icon-zengjia:before {
+	content: "\e8a5";
+}
+
+.icon-neirong2:before {
+	content: "\e8a6";
+}
+
+.icon-daohang:before {
+	content: "\e8a7";
+}
+
+.icon-wenda:before {
+	content: "\e8a8";
+}
+
+.icon-fujian:before {
+	content: "\e8a9";
+}
+
+.icon-ganxie:before {
+	content: "\e8aa";
+}
+
+.icon-gengduo1:before {
+	content: "\e8ab";
+}
+
+.icon-gouwu1:before {
+	content: "\e8ac";
+}
+
+.icon-ganxie1:before {
+	content: "\e8ad";
+}
+
+.icon-huodongxiangqu:before {
+	content: "\e8ae";
+}
+
+.icon-huidaodingbu:before {
+	content: "\e8af";
+}
+
+.icon-dianhua:before {
+	content: "\e8b0";
+}
+
+.icon-huodongxiangqu1:before {
+	content: "\e8b1";
+}
+
+.icon-jinrujiantou:before {
+	content: "\e8b2";
+}
+
+.icon-jieban:before {
+	content: "\e8b3";
+}
+
+.icon-kefu:before {
+	content: "\e8b4";
+}
+
+.icon-liebiao1:before {
+	content: "\e8b5";
+}
+
+.icon-jingdian:before {
+	content: "\e8b6";
+}
+
+.icon-jingdian1:before {
+	content: "\e8b7";
+}
+
+.icon-mulu:before {
+	content: "\e8b8";
+}
+
+.icon-neirong:before {
+	content: "\e8b9";
+}
+
+.icon-naozhong:before {
+	content: "\e8ba";
+}
+
+.icon-pinglun:before {
+	content: "\e8bb";
+}
+
+.icon-saoyisao1:before {
+	content: "\e8bc";
+}
+
+.icon-qianzheng:before {
+	content: "\e8bd";
+}
+
+.icon-shouqijiantouxiao:before {
+	content: "\e8be";
+}
+
+.icon-toutiao:before {
+	content: "\e8bf";
+}
+
+.icon-shezhi1:before {
+	content: "\e8c0";
+}
+
+.icon-tuichu:before {
+	content: "\e8c1";
+}
+
+.icon-jinnang:before {
+	content: "\e8c2";
+}
+
+.icon-wenda1:before {
+	content: "\e8c3";
+}
+
+.icon-wifi1:before {
+	content: "\e8c4";
+}
+
+.icon-wifidianhuaqia:before {
+	content: "\e8c5";
+}
+
+.icon-changge:before {
+	content: "\e8c6";
+}
+
+.icon-dianpu:before {
+	content: "\e8c7";
+}
+
+.icon-baoxiandingdan:before {
+	content: "\e8c8";
+}
+
+.icon-anquanzhongxin:before {
+	content: "\e8c9";
+}
+
+.icon-dingdanchulizhong:before {
+	content: "\e8ca";
+}
+
+.icon-dingdandaifukuan:before {
+	content: "\e8cb";
+}
+
+.icon-dingdan:before {
+	content: "\e8cc";
+}
+
+.icon-dingdanjihe:before {
+	content: "\e8cd";
+}
+
+.icon-faxian:before {
+	content: "\e8ce";
+}
+
+.icon-chujingyou:before {
+	content: "\e8cf";
+}
+
+.icon-dingdanyichenggong:before {
+	content: "\e8d0";
+}
+
+.icon-gouwu2:before {
+	content: "\e8d1";
+}
+
+.icon-gouwuche:before {
+	content: "\e8d2";
+}
+
+.icon-dujia:before {
+	content: "\e8d3";
+}
+
+.icon-hongbao:before {
+	content: "\e8d4";
+}
+
+.icon-huochepiao:before {
+	content: "\e8d5";
+}
+
+.icon-jihuozhongzhuan:before {
+	content: "\e8d6";
+}
+
+.icon-jiudian1:before {
+	content: "\e8d7";
+}
+
+.icon-licheng:before {
+	content: "\e8d8";
+}
+
+.icon-guojijipiao:before {
+	content: "\e8d9";
+}
+
+.icon-lichengdixian:before {
+	content: "\e8da";
+}
+
+.icon-jipiao1:before {
+	content: "\e8db";
+}
+
+.icon-lichengfanbei:before {
+	content: "\e8dc";
+}
+
+.icon-mudedi:before {
+	content: "\e8dd";
+}
+
+.icon-qichepiao:before {
+	content: "\e8de";
+}
+
+.icon-lubiao:before {
+	content: "\e8df";
+}
+
+.icon-qitadingdan:before {
+	content: "\e8e0";
+}
+
+.icon-rili:before {
+	content: "\e8e1";
+}
+
+.icon-shikebiao:before {
+	content: "\e8e2";
+}
+
+.icon-shoudiantongguan:before {
+	content: "\e8e3";
+}
+
+.icon-shoudiantongkai:before {
+	content: "\e8e4";
+}
+
+.icon-taideng:before {
+	content: "\e8e5";
+}
+
+.icon-shouye:before {
+	content: "\e8e6";
+}
+
+.icon-weilaijiudian:before {
+	content: "\e8e7";
+}
+
+.icon-xiangqing:before {
+	content: "\e8e8";
+}
+
+.icon-wangwang:before {
+	content: "\e8e9";
+}
+
+.icon-wode1:before {
+	content: "\e8ea";
+}
+
+.icon-hangcheng:before {
+	content: "\e8eb";
+}
+
+.icon-yuyuedingdan:before {
+	content: "\e8ec";
+}
+
+.icon-zuche:before {
+	content: "\e8ed";
+}
+
+.icon-zhoubianyou:before {
+	content: "\e8ee";
+}
+
+.icon-yijianfankui:before {
+	content: "\e8ef";
+}
+
+.icon-bangzhu1:before {
+	content: "\e8f0";
+}
+
+.icon-bofang1:before {
+	content: "\e8f1";
+}
+
+.icon-bangdan:before {
+	content: "\e8f2";
+}
+
+.icon-bangdan1:before {
+	content: "\e8f3";
+}
+
+.icon-feiyongbaohan:before {
+	content: "\e8f4";
+}
+
+.icon-ditudingwei:before {
+	content: "\e8f5";
+}
+
+.icon-canyin1:before {
+	content: "\e8f6";
+}
+
+.icon-fanhui:before {
+	content: "\e8f7";
+}
+
+.icon-gantanhao:before {
+	content: "\e8f8";
+}
+
+.icon-feiyongbuhan:before {
+	content: "\e8f9";
+}
+
+.icon-gengduo2:before {
+	content: "\e8fa";
+}
+
+.icon-huiyuan:before {
+	content: "\e8fb";
+}
+
+.icon-jia:before {
+	content: "\e8fc";
+}
+
+.icon-jian:before {
+	content: "\e8fd";
+}
+
+.icon-jingdianwanfa:before {
+	content: "\e8fe";
+}
+
+.icon-jingdianwanfa1:before {
+	content: "\e8ff";
+}
+
+.icon-jiaoxing:before {
+	content: "\e900";
+}
+
+.icon-kuandai:before {
+	content: "\e901";
+}
+
+.icon-qianzheng1:before {
+	content: "\e902";
+}
+
+.icon-shibai1:before {
+	content: "\e903";
+}
+
+.icon-qiehuan:before {
+	content: "\e904";
+}
+
+.icon-shijian:before {
+	content: "\e905";
+}
+
+.icon-shuaxin:before {
+	content: "\e906";
+}
+
+.icon-tingche:before {
+	content: "\e907";
+}
+
+.icon-reshui:before {
+	content: "\e908";
+}
+
+.icon-xiaolian:before {
+	content: "\e909";
+}
+
+.icon-weizhixiangqing:before {
+	content: "\e90a";
+}
+
+.icon-tuikuan:before {
+	content: "\e90b";
+}
+
+.icon-youji:before {
+	content: "\e90c";
+}
+
+.icon-xuanzuo:before {
+	content: "\e90d";
+}
+
+.icon-youji1:before {
+	content: "\e90e";
+}
+
+.icon-zhengque:before {
+	content: "\e90f";
+}
+
+.icon-youyongchi:before {
+	content: "\e910";
+}
+
+.icon-huabeizhangdan:before {
+	content: "\e911";
+}
+
+.icon-guojihuochepiao:before {
+	content: "\e912";
+}
+
+.icon-menpiao:before {
+	content: "\e913";
+}
+
+.icon-shangwu:before {
+	content: "\e914";
+}
+
+.icon-zaocan:before {
+	content: "\e915";
+}
+
+.icon-shaixuan1:before {
+	content: "\e916";
+}
+
+.icon-shaixuan2:before {
+	content: "\e917";
+}
+
+.icon-fanhuijiantou:before {
+	content: "\e918";
+}
+
+.icon-guoneiyou:before {
+	content: "\e919";
+}
+
+.icon-youlun:before {
+	content: "\e91a";
+}
+
+.icon-menpiao1:before {
+	content: "\e91b";
+}
+
+.icon-dangdiwanle:before {
+	content: "\e91c";
+}
+
+.icon-dangdiwanle1:before {
+	content: "\e91d";
+}
+
+.icon-pinglunxiao:before {
+	content: "\e91e";
+}
+
+.icon-jinrujiantouxiao:before {
+	content: "\e91f";
+}
+
+.icon-dingweixiao1:before {
+	content: "\e920";
+}
+
+.icon-guanbixiao:before {
+	content: "\e921";
+}
+
+.icon-shoucangxiao:before {
+	content: "\e922";
+}
+
+.icon-shoucangxiao1:before {
+	content: "\e923";
+}
+
+.icon-gaoxiao:before {
+	content: "\e924";
+}
+
+.icon-lishixiao:before {
+	content: "\e925";
+}
+
+.icon-jiazaixiao:before {
+	content: "\e926";
+}
+
+.icon-lishixiao1:before {
+	content: "\e927";
+}
+
+.icon-duigouxiao:before {
+	content: "\e928";
+}
+
+.icon-dixiao:before {
+	content: "\e929";
+}
+
+.icon-wenxiao:before {
+	content: "\e92a";
+}
+
+.icon-duigouzhong:before {
+	content: "\e92b";
+}
+
+.icon-feijizhong:before {
+	content: "\e92c";
+}
+
+.icon-huanzhong:before {
+	content: "\e92d";
+}
+
+.icon-quzhong:before {
+	content: "\e92e";
+}
+
+.icon-quzhong1:before {
+	content: "\e92f";
+}
+
+.icon-fanzhong:before {
+	content: "\e930";
+}
+
+.icon-biaodankongjianshanchu:before {
+	content: "\e931";
+}
+
+.icon-biaodankongjianlianxiren:before {
+	content: "\e932";
+}
+
+.icon-shanchu1:before {
+	content: "\e933";
+}
+
+.icon-banxiao:before {
+	content: "\e934";
+}
+
+.icon-xiuxiao:before {
+	content: "\e935";
+}
+
+.icon-remendibiaoxiao:before {
+	content: "\e936";
+}
+
+.icon-ditiexiao:before {
+	content: "\e937";
+}
+
+.icon-cuicuxiao:before {
+	content: "\e938";
+}
+
+.icon-duquanjing:before {
+	content: "\e939";
+}
+
+.icon-shangquanxiao:before {
+	content: "\e93a";
+}
+
+.icon-biaodankongjiandanxuan:before {
+	content: "\e93b";
+}
+
+.icon-zantianchongxiao:before {
+	content: "\e93c";
+}
+
+.icon-biaodankongjianfuxuan:before {
+	content: "\e93d";
+}
+
+.icon-biaodankongjianfuxuankong:before {
+	content: "\e93e";
+}
+
+.icon-chaxunfancheng:before {
+	content: "\e93f";
+}
+
+.icon-chaxunchufadaoda:before {
+	content: "\e940";
+}
+
+.icon-wenhaoxiao:before {
+	content: "\e941";
+}
+
+.icon-icon-test:before {
+	content: "\e942";
+}
+
+.icon-xiangxiajiantoucuxiao:before {
+	content: "\e943";
+}
+
+.icon-chufadaodaxiao:before {
+	content: "\e944";
+}
+
+.icon-daxiao:before {
+	content: "\e945";
+}
+
+.icon-bujifapiao:before {
+	content: "\e946";
+}
+
+.icon-gongxianghangbanxiao:before {
+	content: "\e947";
+}
+
+.icon-dijiaqushi:before {
+	content: "\e948";
+}
+
+.icon-tejiajipiaobiaoqian:before {
+	content: "\e949";
+}
+
+.icon-hangbanyanwu:before {
+	content: "\e94a";
+}
+
+.icon-tuijianjipiao:before {
+	content: "\e94b";
+}
+
+.icon-fangxinfei:before {
+	content: "\e94c";
+}
+
+.icon-qiehuanchengshi:before {
+	content: "\e94d";
+}
+
+.icon-tuijianqiche:before {
+	content: "\e94e";
+}
+
+.icon-taocan-suoxiao:before {
+	content: "\e94f";
+}
+
+.icon-wenda2:before {
+	content: "\e950";
+}
+
+.icon-weizhidifang:before {
+	content: "\e951";
+}
+
+.icon-hangliexiao:before {
+	content: "\e952";
+}
+
+.icon-wopu:before {
+	content: "\e953";
+}
+
+.icon-xiugai:before {
+	content: "\e954";
+}
+
+.icon-zhinan:before {
+	content: "\e955";
+}
+
+.icon-zengzhifuwu:before {
+	content: "\e956";
+}
+
+.icon-yingerpiaobuzhichi:before {
+	content: "\e957";
+}
+
+.icon-yingerpiaozhichi:before {
+	content: "\e958";
+}
+
+.icon-jipiaoxiaoxiala:before {
+	content: "\e959";
+}
+
+.icon-jinrujiantouxiao1:before {
+	content: "\e95a";
+}
+
+.icon-lishihangcheng:before {
+	content: "\e95b";
+}
+
+.icon-sousuoxiao:before {
+	content: "\e95c";
+}
+
+.icon-xiangjixiao:before {
+	content: "\e95d";
+}
+
+.icon-xiangshangjiantoucuxiao:before {
+	content: "\e95e";
+}
+
+.icon-huochepiaomianxing:before {
+	content: "\e95f";
+}
+
+.icon-xuzhixiao:before {
+	content: "\e960";
+}
+
+.icon-fenxiangxiao:before {
+	content: "\e961";
+}
+
+.icon-wangfandijia:before {
+	content: "\e962";
+}
+
+.icon-hangbandongtai:before {
+	content: "\e963";
+}
+
+.icon-guanbishixin:before {
+	content: "\e964";
+}
+
+.icon-fanhuijiantouxiangqingye:before {
+	content: "\e965";
+}
+
+.icon-duigou-weigouxuan:before {
+	content: "\e966";
+}
+
+.icon-kouling:before {
+	content: "\e967";
+}
+
+.icon-lianjie:before {
+	content: "\e968";
+}
+
+.icon-subscription_light:before {
+	content: "\e81e";
+}
+
+.icon-deliver_fill:before {
+	content: "\e81f";
+}
+
+.icon-notice_forbid_fill:before {
+	content: "\e820";
+}
+
+.icon-qr_code_light:before {
+	content: "\e821";
+}
+
+.icon-qichebanci:before {
+	content: "\e969";
+}
+
+.icon-chengnianrennan:before {
+	content: "\e96a";
+}
+
+.icon-chengnianrennv:before {
+	content: "\e96b";
+}
+
+.icon-youleyuan:before {
+	content: "\e96c";
+}
+
+.icon-zhifubao:before {
+	content: "\e96d";
+}
+
+.icon-gantanhaozhong:before {
+	content: "\e96e";
+}
+
+.icon-pailie:before {
+	content: "\e96f";
+}
+
+.icon-dibiao:before {
+	content: "\e970";
+}
+
+.icon-woshuohao:before {
+	content: "\e971";
+}
+
+.icon-woshuohao1:before {
+	content: "\e972";
+}
+
+.icon-paihang:before {
+	content: "\e973";
+}
+
+.icon-settings_light:before {
+	content: "\e822";
+}
+
+.icon-lingquanzhongxin:before {
+	content: "\e974";
+}
+
+.icon-xingqiu:before {
+	content: "\e975";
+}
+
+.icon-pdf:before {
+	content: "\e976";
+}
+
+.icon-guojijiudian:before {
+	content: "\e977";
+}
+
+.icon-kezhangongyu:before {
+	content: "\e978";
+}
+
+.icon-youxian:before {
+	content: "\e979";
+}
+
+.icon-dangritui:before {
+	content: "\e97a";
+}
+
+.icon-pick:before {
+	content: "\e823";
+}
+
+.icon-dianhua1:before {
+	content: "\e72e";
+}
+
+.icon-ARsaoyisao:before {
+	content: "\e97b";
+}
+
+.icon-jinrujiantou1:before {
+	content: "\e97c";
+}
+
+.icon-triangledownfill-after::after {
+	content: "\e79b";
+	position: absolute;
+	font-size: 20rpx;
+	top: -14rpx;
+	right: -50%;
+	color: #818181;
+}
diff --git a/common/css/iconfont.ttf b/common/css/iconfont.ttf
new file mode 100644
index 0000000..2127d20
Binary files /dev/null and b/common/css/iconfont.ttf differ
diff --git a/common/css/new_iconfont.css b/common/css/new_iconfont.css
new file mode 100644
index 0000000..21e6e91
--- /dev/null
+++ b/common/css/new_iconfont.css
@@ -0,0 +1,17 @@
+@font-face {
+	font-family: "new_iconfont";
+	src: url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAAAAAAMgAA0AAAAABywAAALMAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGh4GVgCCQhEICoIcgXwLCgABNgIkAxAEIAWFCAcxGxgGEZWbbcl+JGSnhZeMumdLbKWaRok38fC8Tv1zJbl5ZQK7gLg1mfqBYQJeiWn16XLXh21UhZqSePDTd43fxyfwvO3ebf8GEihlGaWSQBM309pEk3NaWyAKu2hNisOAohedNrY9bn19e7DXZ33iH5w3HmpLt5K1FgLeu6tvgo8uWtpFO3WgEdogE3K5UCBDRBwlsp29ClwKXh+PikSm1LTAsl2zd5j2fSfqyWurtTYwwHkIQI4cnQSYJBfopNANhULwfadqFezS/gcEiCEAUeBwPw8BP0v8qgwUICGhjMOAAgBpleo3al40y7df0KZyTeR11zZsfGHr8tVXtdpxVaW8u9Jo7eNv171z4Vu1b1YuuO+66++/+94Ho+6BjQGdura7r+XQWnOHA3Ca4x7/xFUNKpN3r/kzrbrt9llpfs0NaX6a9fDD5aar1o5defXTl146tctttw59seeWHkt6Lhm5aHbvy5vf/vrh0///2qF52+pDZ2tmf/n57Cazxqyb3WzVn3/Najpr3rzZr/393PNDh77//pNfpVkzZzq6N69Z1eSGAF94zc3lmv7lM3suBwLB/oYdb97cdNJ/qWGhYS92d/Wl/PEckgwEjTFXgPzy/xqgCKBAwd0ChbIEMjTQAFUALXyOAFobJEBIVgmQqXFQgFxyToBCcocAJQ09g4B6kq8Q0MDAmCFAQy3jGrlIfQxAJ0IzM4hMExuJXDMnwQK9jChp40GinmbeIBqo+Hl8Q33ikAZmEhaehozpUMafnVmjQRiBrlx32vkej/+RvV0oG9znAzx50U+jLeA/tabBm0vsL2+xymlKYgRYifWXTEQFH8MDb6nnMatNpCAUUMFi1KPuSXzCa5oRNVmMCs9CDBzi+9ctKsSwduNvrPILKPlv3/cBJAhNbjgupJxmrFEPFtZ8mfk5GD82KYNgF7hy7h4gIaLRHaseStY=) format('woff2'),
+		url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAT8AA0AAAAABywAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAE4AAAABoAAAAciLzFRUdERUYAAATAAAAAHgAAAB4AKQAKT1MvMgAAAaAAAABCAAAAVjyKSA5jbWFwAAAB9AAAAD4AAAFCAA/px2dhc3AAAAS4AAAACAAAAAj//wADZ2x5ZgAAAkAAAAEMAAABHLwdyl5oZWFkAAABMAAAAC4AAAA2FpLiAmhoZWEAAAFgAAAAHQAAACQHlAOFaG10eAAAAeQAAAAPAAAAEAwAAKVsb2NhAAACNAAAAAoAAAAKAI4AAG1heHAAAAGAAAAAHwAAACABFgBhbmFtZQAAA0wAAAFJAAACiCnmEVVwb3N0AAAEmAAAAB8AAAAxw4Fw13jaY2BkYGAA4mpu8dx4fpuvDNwsDCBws8dfDk4v/X+SeRsziMvBwASiAP3ZCZIAAHjaY2BkYGBu+N/AEMPCAALM2xgYGVABCwBUeAMiAAAAeNpjYGRgYGBhCGXgYAABJiDmAkIGhv9gPgMAEbsBeAB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PZJ7JMDf8b2CIYW5gaAAKM4LkAN8dDBMAAHjaY2GAABYIXgoAASUAsgB42mNgYGBmgGAZBkYGELAB8hjBfBYGBSDNAoRA/jOZ//8hpORzqEoGRjYGGJOBkQlIMDGgAkaGYQ8AWxUHvAAAAAAAAAAAAAAAjgAAeNo9zLFKw1AUxvFzUs+5oaWxSUtTKDRpxcSKqDQ36aQoFEQQQRChuLn5Fj5C6eAotqDuCjq4q10EJxdBfITqnKs3Iq4f/+8HJlx8T3K3OQAHXPBhCdZgE/ZgH2C+tYJBbMskanY8rLJADl0Mm+VllEmnWuGwZWHDWMdYBuWslV1MsrLyV+L/+DvN6Q37Jo8ob+K2STeMrC75dIAbI/UyCaNoV8aBXS+Kmu85/rWgDyLsUomnROqOnh9w9VVtmdQjNs7YylN6xWJxAY+nNCZNioI2S6SeZu4H6J2rN9Si3EmGjufXRLFuu356wu9sER4yfdKsVvnrMVMb1NNPo08Fi9IjPmjjEH4AfSs82HjafZA9TgMxEIWf8wckEkIgqF1RANr8lCkTKfQIpaNINt6QaNdeeZ1IOQEtFQeg5RgcgBsg0XIKXpZJkyJr7ejzm5nnsQGc4xsK/98l7oQVjvEoXMERMuEq9RfhGvlduI4WPoUb1H+Em7hVA+EWLtQbHVTthLub0m3LCmcYCFdwiifhKvWVcI38KlzHFT6EG9S/hJsY41e4hWtlqQzhYTBBYJxBY4oN4wIxHCySMgbWoTn0ZhLMTE83ehE7mzgbKO9XYpcDHmg554Ap7T23Zr5KJ/5gy4HUmG4eBUu2KY0uInQoG18snNXdqHOw/Z7ttrTYv2uBNcfsUQ1s1Pw92zPSSGwMr5CSNfIyt6QSU49oa6zxu2cp1vNeCIlOvMv0iMeaNHU6925p4sDi5/KMHH20uZI996gcPmNZCHm/3U7EIIpdhj+T2HEZAAAAeNpjYGKAAC4wyciADljAokyMTGzZiXlZmYkAC3YCjAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwADAAEABAAAAAIAAAAAeNpjYGBgZACCq0vUOUD0zR5/ORgNADpjBU4AAA==) format('woff');
+}
+
+.new_iconfont {
+	font-family: "new_iconfont" !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-kanjia:before {
+	content: "\e61c";
+}
diff --git a/common/css/old_diyPages.css b/common/css/old_diyPages.css
new file mode 100644
index 0000000..7b3ad3b
--- /dev/null
+++ b/common/css/old_diyPages.css
@@ -0,0 +1,1642 @@
+.notice {
+	background-color: #fff;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	overflow: hidden;
+}
+
+.diy-notice-icon {
+	width: 118upx;
+	height: 30upx;
+	background-size: 118upx 30upx;
+	background-repeat: no-repeat;
+}
+
+.notice-l {
+	-webkit-flex-shrink: 0;
+	flex-shrink: 0;
+	position: relative;
+}
+
+.notice-l.style1 {
+	width: 40upx;
+	height: 40upx;
+	padding: 20upx;
+}
+
+.notice-l.style1:after {
+	content: "";
+	width: 2upx;
+	height: 36%;
+	background-color: #e2e2e2;
+	position: absolute;
+	top: 32%;
+	right: 0;
+}
+
+.notice-l.style2 {
+	color: #ff4f4f;
+	padding: 20upx;
+	padding-right: 0;
+}
+
+.notice-l.style2 .span {
+	height: 40upx;
+	line-height: 40upx;
+	padding: 0 20upx;
+	background-color: #ffe1e1;
+	border-radius: 100upx;
+	font-size: 28upx;
+}
+
+.notice-l.style3 .span {
+	height: 40upx;
+	line-height: 40upx;
+	color: #FE433F;
+	font-weight: 700;
+	font-size: 32upx;
+	padding: 20upx 0 20upx 20upx;
+	display: inline-block;
+	position: relative;
+}
+
+.notice-l .i {
+	color: #ff9900;
+	font-size: 36upx;
+	margin-top: -2upx;
+}
+
+.notice-r {
+	height: 80upx;
+	line-height: 80upx;
+	font-size: 24upx;
+	padding: 0 0 0 40upx;
+	-webkit-flex: 1;
+	flex: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.notice-r swiper {
+	height: 80upx !important;
+}
+
+.notice-r swiper swiper-item .a {
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	/* position: relative; */
+}
+
+.movbox{
+	position: relative;
+	height: 80upx;
+	font-size: 24upx;
+}
+
+.move{
+	position: absolute;
+	height: 80upx;
+	line-height: 80upx;
+	/* left: 0; */
+	
+}
+
+
+.notice-r-i {
+	height: 40upx;
+	line-height: 40upx;
+	padding-top: 20upx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+/*  magic_cube  图片魔方  */
+.magic_cube {
+	width: 100vw;
+	height: 100vw;
+	max-height: 100vw;
+	overflow: hidden;
+	position: relative;
+}
+
+.magic_cube-d-f {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+
+.magic_cube-d {
+	width: 100%;
+	height: 100%;
+	margin-top: 0 !important;
+	position: relative;
+}
+
+.magic_cube-i {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	position: absolute;
+}
+
+.magic_cube-i-d {
+	width: 100%;
+	height: 100%;
+}
+
+.magic_cube-i .image {
+	width: 100%;
+	height: 100%;
+	object-fit: initial;
+	display: block;
+}
+
+/* picturew 图片橱窗1 */
+.imgwindow {
+	background-color: #fff;
+}
+
+.imgwindow:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+
+.imgwindow-i {
+	width: 25%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+}
+
+.imgwindow-i-d .image {
+	width: 100%;
+	display: block;
+}
+
+/* picturew2 图片橱窗2 */
+.picturew2-i {
+	width: 100%;
+}
+
+.picturew2-i-d {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.picturew2-i .image {
+	width: 100%;
+	display: block;
+}
+
+/* picturew3 图片橱窗3 */
+.picturew3 {
+	display: -webkit-flex;
+	display: flex;
+	-webkit-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-justify-content: flex-start;
+	justify-content: flex-start;
+}
+
+.picturew3-i {
+	width: 50%;
+}
+
+.picturew3-i-d {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.picturew3-i .image {
+	width: 100%;
+	display: block;
+}
+
+/* picturew4 图片橱窗4 */
+.picturew4:after {
+	content: "";
+	clear: both;
+	display: block;
+}
+
+.picturew4-i {
+	width: 50vw;
+	height: 25vw;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+}
+
+.picturew4-i:nth-child(1) {
+	height: 50vw;
+}
+
+.picturew4-i-d {
+	height: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.picturew4-i .image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+/* picturew5 图片橱窗5 */
+.picturew5:after {
+	content: "";
+	clear: both;
+	display: block;
+}
+
+.picturew5-i {
+	width: 50vw;
+	height: 25vw;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+}
+
+.picturew5-i:nth-child(1) {
+	height: 50vw;
+}
+
+.picturew5-i:nth-child(3),
+.picturew5-i:nth-child(4) {
+	width: 25vw;
+}
+
+.picturew5-i-d {
+	height: 100%;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.picturew5-i .image {
+	width: 100%;
+	height: 100%;
+	object-fit: cover;
+	display: block;
+}
+
+/* picturew6 图片橱窗6 */
+.picturew6 {
+	display: -webkit-flex;
+	display: flex;
+	-webkit-flex-wrap: wrap;
+	flex-wrap: wrap;
+	-webkit-justify-content: flex-start;
+	justify-content: flex-start;
+}
+
+.picturew6-i {
+	width: calc(100% / 3);
+}
+
+.picturew6-i-d {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.picturew6-i .image {
+	width: 100%;
+	display: block;
+}
+
+/* pictures 图片展播 */
+.pictures {
+	width: 100%;
+	overflow: auto;
+}
+
+.pictures-d:after {
+	content: "";
+	clear: both;
+	display: block;
+}
+
+.picturesd {
+	width: 100% !important;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.pictures-i {
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+	float: left;
+}
+
+.pictures-i .image {
+	position: relative;
+}
+
+.pictures-i .image .image {
+	width: 100%;
+	/* height: 200upx; */
+	background-repeat: no-repeat;
+}
+
+
+.pictures-i .image .title {
+	position: absolute;
+	height: 50upx;
+	line-height: 50upx;
+	width: 100%;
+	background: rgba(0, 0, 0, .3);
+	color: #fff;
+	margin: 0;
+	padding: 0 10upx;
+	bottom: 0;
+	left: 0;
+	right: 0;
+	font-size: 28upx;
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	-webkit-box-sizing: border-box;
+	-moz-box-sizing: border-box;
+	box-sizing: border-box;
+}
+
+.pictures-i .text {
+	font-size: 28upx;
+	height: 50upx;
+	line-height: 50upx;
+	display: block;
+	white-space: nowrap;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	padding: 0 .25rem;
+	position: relative;
+}
+
+.pictures-i.row-2 {
+	width: 50%;
+}
+
+.pictures-i.row-3 {
+	width: 33.33%;
+}
+
+.pictures-i.row-4 {
+	width: 25%;
+}
+
+.pictures-i.row-5 {
+	width: 20%;
+}
+
+/*  banner  图片轮播  */
+.imgswiper {
+	background-color: #fff;
+}
+
+.imgmarginlr {
+	margin: 0 30upx;
+}
+
+.banner-swiper-Item {
+	border-radius: 10upx;
+}
+
+/* .imgswiper .swiper {
+	width: 100%;
+	height: auto
+}
+ */
+
+.imgswiper swiper-item .image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+/*  richtext  富文本  */
+.richtext {
+	background-color: #fff;
+}
+
+/*  title  标题1  */
+.titlebar {
+	line-height: 42upx;
+	font-size: 32upx;
+	padding: 0 30upx;
+	background-color: #ffffff;
+	position: relative;
+}
+
+.titlebar-d {
+	line-height: 42upx;
+	display: inline-block;
+}
+
+.titlebar .i {
+	font-size: 34upx;
+	margin-right: 10upx;
+	display: inline;
+}
+
+.titlebar .text {
+	display: inline;
+}
+
+.titlebar .more {
+	height: 42upx;
+	line-height: 42upx;
+	color: #FE433F;
+	font-size: 30upx;
+	position: absolute;
+	top: 0;
+	right: 30upx;
+	display: inline-block;
+}
+
+.titlebar .more .a {
+	color: #999;
+}
+
+.titlebar .more .a .span {
+	display: inline;
+}
+
+.titlebar .more .a .i {
+	font-size: 32upx;
+	vertical-align: -2upx;
+	display: inline;
+}
+
+/*  title2  标题2  */
+.titlebar2 {
+	padding: 0 30upx;
+	position: relative;
+}
+
+.titlebar2 .h1 {
+	font-weight: normal;
+	font-size: 36upx;
+}
+
+.titlebar2 .p {
+	line-height: 42upx;
+	color: #999;
+	font-size: 24upx;
+}
+
+.titlebar2 .more {
+	height: 102upx;
+	line-height: 102upx;
+	color: #FE433F;
+	font-size: 30upx;
+	position: absolute;
+	top: 0;
+	right: 30upx;
+	display: inline-block;
+}
+
+.titlebar2 .more .a {
+	color: #999;
+}
+
+.titlebar2 .more .a .span {
+	display: inline;
+}
+
+.titlebar2 .more .a .i {
+	font-size: 32upx;
+	vertical-align: -2upx;
+	display: inline;
+}
+
+/*  search  搜索框  */
+.searchbox {
+	padding: 20upx 30upx;
+	background-color: #f1f1f2;
+}
+
+.searchbox-d {
+	width: calc(100% - 40upx);
+	height: 56upx;
+	padding: 8upx 20upx;
+	background-color: #ffffff;
+	box-shadow: 0 0 2upx rgba(0, 0, 0, .1);
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: inline-block;
+}
+
+.searchbox-d-inl {
+	height: 48upx;
+	line-height: 48upx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: inline-block;
+}
+
+.searchbox .i {
+	font-size: 28upx;
+	margin-right: 10upx;
+	display: inline;
+}
+
+.searchbox .text {
+	font-size: 24upx;
+	display: inline;
+	width: 400rpx;
+	line-height: 50upx;
+	height: 50upx;
+}
+
+.searchbox .radius {
+	border-radius: 10upx;
+}
+
+.searchbox .round {
+	border-radius: 100upx;
+}
+
+.searchbox2 {
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.searchbox2-l {
+	margin-right: 20upx;
+	max-width: 360upx;
+}
+
+.searchbox2-l>image {
+	width: 40upx;
+	height: 40upx;
+	margin-right: 4upx;
+	flex-shrink: 0;
+}
+
+.searchbox2-l .i {
+	font-size: 32upx;
+	font-weight: 600;
+	padding-left: 20upx;
+	display: inline;
+}
+
+.searchbox2-r {
+	-webkit-flex: 1;
+	flex: 1;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+	overflow: hidden;
+}
+
+/*  search3  搜索框3  */
+.searchbox3 {
+	background-color: #f1f1f1;
+	overflow: hidden;
+	position: relative;
+}
+
+.searchbox3-d {
+	height: 80upx;
+	line-height: 68upx;
+	padding: 10upx 30upx;
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	box-sizing: initial;
+}
+
+.searchbox3-l {
+	color: #000;
+	font-size: 36upx;
+	font-style: italic;
+	font-family: SimHei;
+}
+
+.searchbox3-r-d {
+	width: 180upx;
+	height: 56upx;
+	line-height: 56upx;
+	color: #808080;
+	font-size: 28upx;
+	text-align: center;
+	margin-top: 12upx;
+	background-color: #d9d9d9;
+	border-radius: 40upx;
+}
+
+.searchbox3-r-d .i {
+	font-size: 32upx;
+	margin-right: 10upx;
+	vertical-align: -2upx;
+}
+
+@keyframes move_wave {
+	0% {
+		transform: translateX(0) translateZ(0) scaleY(1);
+	}
+
+	100% {
+		transform: translateX(-66.66666%) translateZ(0) scaleY(1);
+	}
+}
+
+.search-wave {
+	width: 100%;
+	height: 28upx;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	overflow: hidden;
+}
+
+.search-wave-d {
+	width: 300%;
+	height: 100%;
+	animation: move_wave 4s linear infinite;
+	animation-delay: 0s;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.search-wave-i {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+
+.search-wave-i .image {
+	width: 100%;
+	height: 100%;
+	vertical-align: middle;
+}
+
+/*  line  辅助线  */
+.subline {
+	height: 2upx;
+}
+
+.subline-d {
+	height: 0;
+}
+
+/*  menu  按钮组  */
+.btngroup-d {
+	padding: 0 0 10upx;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: flex-start;
+	justify-content: flex-start;
+	-webkit-flex-wrap: wrap;
+	flex-wrap: wrap;
+}
+
+.btngroup-i {
+	padding-top: 20upx;
+}
+
+.btngroup-i-t {
+	padding: 0 15upx;
+}
+
+.btngroup-i-t-icon {
+	width: 84upx;
+	height: 84upx;
+	margin: 0 auto 8upx;
+	background-position: center;
+	background-size: cover;
+}
+
+.btngroup-i-t-icon .image {
+	width: 84upx;
+	height: 84upx;
+	background-repeat: no-repeat;
+	background-size: 100% 100% !important;
+	-webkit-background-size: cover;
+	-o-background-size: cover;
+	background-position: center center;
+}
+
+.btngroup-i-c {
+	height: 42upx;
+	line-height: 42upx;
+	font-size: 28upx;
+	color: #333;
+	text-align: center;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.btngroupImage.radius {
+	border-radius: 20upx;
+	background-size: cover;
+	background-position: center 0;
+}
+
+.btngroupImage.circle {
+	border-radius: 200upx;
+	background-size: cover;
+	background-position: center 0;
+}
+
+/*  blank  辅助空白  */
+.sublank {
+	background-color: #fff;
+}
+
+/*  picture  单图组  */
+.oneimgroup {
+	background-color: #fff;
+}
+
+.oneimgroup-i {
+	width: 100%;
+}
+
+.oneimgroup-i .image {
+	width: 100%;
+	display: block;
+}
+
+/*  rush_goods3 rush_goods3 rush_goods3  抢购3、团购3与优惠券3  */
+.goodslist {
+	padding: 30upx;
+	background-color: #fff;
+}
+
+.goodslist-i .rush_goods_mask_img {
+	width: calc(((100vw - 60upx) / 1.8) * 0.7);
+	height: calc(((100vw - 60upx) / 1.8) * 0.7);
+}
+
+.goodslist-i {
+	margin-top: 50upx;
+}
+
+.goodslist-i:first-child {
+	margin-top: 0;
+}
+
+.goodslist-i-t {
+	height: calc((100vw - 60upx) / 1.8);
+	position: relative;
+	overflow: hidden;
+}
+
+.goodslist-i-t .image {
+	width: 100%;
+	height: 100%;
+	border-radius: 4upx;
+}
+
+.goodslist-i-c-t {
+	color: #999;
+	font-size: 24upx;
+	margin-top: 20upx;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: space-between;
+}
+
+.goodslist-i-c-t-l {
+	padding-right: 20upx;
+	-webkit-flex-shrink: 1;
+	flex-shrink: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.goodslist-i-c-t-l {
+	-webkit-flex: 1;
+	flex: 1;
+}
+
+.goodslist-i-c-c {
+	line-height: 48upx;
+	font-size: 32upx;
+	margin-top: 20upx;
+}
+
+.goodslist-i-c-c .i {
+	height: 48upx;
+	line-height: 48upx;
+	font-size: 28upx;
+	font-style: normal;
+	margin-right: 10upx;
+	padding: 0 18upx;
+	background-color: #FFD93F;
+	border-radius: 4upx;
+	display: inline-block;
+}
+
+.goodslist-i-c-c2 {
+	margin-top: 20upx;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.goodslist-i-c-c2 .h1 {
+	color: #f64031;
+	font-size: 40upx;
+	-webkit-flex-shrink: 1;
+	flex-shrink: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: normal;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 1;
+}
+
+.goodslist-i-c-c2 .h1 text {
+	position: relative;
+	top: -2upx;
+	margin-left: 4upx;
+}
+
+.goodslist-i-c-c2 .h1 .i {
+	font-size: 24upx;
+	font-weight: normal;
+	vertical-align: 2upx;
+	margin-left: -2upx;
+}
+
+.goodslist-i-c-c2 .h1 .span {
+	color: #363636;
+	font-size: 22upx;
+	font-style: normal;
+	font-weight: normal;
+	vertical-align: 2upx;
+	margin-left: 20upx;
+	display: inline;
+}
+
+.goodslist-i-c-c2 .h1 .span .i {
+	height: 28upx;
+	line-height: 30upx;
+	color: #DDCDA0;
+	font-size: 22upx;
+	vertical-align: 0;
+	margin-left: 0;
+	margin-right: 4upx;
+	padding: 0 4upx;
+	background-color: #363636;
+	border-radius: 6upx;
+	display: inline-block;
+}
+
+.goodslist-i-c-c2 .h2 {
+	width: 144upx;
+	height: 56upx;
+	line-height: 56upx;
+	color: #fff;
+	font-size: 28upx;
+	text-align: center;
+	font-weight: normal;
+	background-color: #FF4040;
+	border-radius: 8upx;
+	-webkit-flex-shrink: 0;
+	flex-shrink: 0;
+}
+
+.goodslist-i-c-c2 .sell-out {
+	color: #808080;
+	background-color: #D2D2D2;
+}
+
+.goodslist-i-c-b {
+	margin-top: 20upx;
+}
+
+.goodslist-i-c-b .p {
+	color: #999;
+	font-size: 24upx;
+	margin-top: 6upx;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: space-between;
+}
+
+.goodslist-i-c-b .span {
+	text-decoration: line-through;
+}
+
+.goodslist-i-c-b .em {
+	font-style: normal;
+}
+
+
+
+/*  public_goods  通用商品  */
+.transverse .transverse_list::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+	color: transparent;
+}
+
+.transverse {
+	font-size: 30upx;
+	/* background-color: #fff; */
+}
+
+.transverse .transverse_list {
+	width: auto;
+}
+
+.goods_father {
+	padding: 30upx 0 10upx 0;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.transverse .transverse_list .goods_item {
+	width: calc(100vw / 2.4);
+	padding: 0 10upx;
+	flex: 0 0 auto;
+}
+
+.transverse .transverse_list .goods_item:first-child {
+	padding-left: 30upx;
+}
+
+.transverse .transverse_list .goods_item:last-child {
+	padding-right: 30upx;
+}
+
+.transverse .transverse_list .goods_item .goods_img {
+	width: calc(100vw / 2.4);
+	height: calc(100vw / 2.4);
+	position: relative;
+}
+
+.transverse .transverse_list .goods_item .goods_img .image {
+	display: block;
+	width: 100%;
+	height: 100%;
+}
+
+.transverse .transverse_list .goods_item .goods_tit {
+	line-height: 42upx;
+	color: #333;
+	font-size: 26upx;
+	margin: 20upx 0 5upx 0;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: normal;
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+}
+
+.transverse .transverse_list .goods_item .goods_price {
+	display: flex;
+	align-items: baseline;
+}
+
+.transverse .transverse_list .goods_item .goods_price .present_price {
+	color: #f64031;
+	display: flex;
+	align-items: baseline;
+	font-size: 26upx;
+}
+
+.transverse .transverse_list .goods_item .goods_price .present_price view {
+	font-size: 40upx;
+	padding-right: 8upx;
+}
+
+.transverse .transverse_list .goods_item .goods_price .original_price {
+	color: #cccccc;
+	text-decoration: line-through;
+	padding-left: 20upx;
+	font-size: 26upx;
+}
+
+/*  shop  商家信息  */
+.b-color-f8 {
+	padding: 20upx 30upx;
+	background-color: #F8F8F8;
+}
+
+.shangjia-i {
+	overflow: hidden;
+	margin-top: 6upx;
+	position: relative;
+	background-color: #fff;
+	margin-bottom: 20upx;
+	border-radius: 10upx;
+}
+
+.shangjia-i:first-child {
+	margin-top: 0;
+}
+
+.shangjiaISty {
+	padding-bottom: 0;
+}
+
+.shangjiaISty .shangjia-i-t {
+	padding: 30upx 30upx 16upx 30upx;
+}
+
+.shangjia-i-t {
+	padding: 30upx 30upx 0 30upx;
+	display: -webkit-flex;
+	display: flex;
+	-webkit-justify-content: space-between;
+	justify-content: space-between;
+}
+
+.shangjia-i-t:active {
+	background-color: #f3f3f3;
+}
+
+.shangjia-i-l {
+	width: 180upx;
+	height: 180upx;
+	border-radius: 6upx;
+	-webkit-flex-shrink: 0;
+	flex-shrink: 0;
+}
+
+.shangjia-i-l .image {
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+}
+
+.shangjia-i-r {
+	/* height: 194upx; */
+	-webkit-flex: 1;
+	flex: 1;
+	padding-left: 20upx;
+}
+
+.shangjia-i-r-d {
+	/* height: 180upx; */
+	padding-bottom: 10upx;
+}
+
+.shangjiaISty .shangjia-i-r-d {
+	padding-bottom: 0;
+	border-bottom: none;
+}
+
+.shangjia-i-r-t1 {
+	height: 42upx;
+	line-height: 42upx;
+	font-size: 30upx;
+}
+
+.shangjia-i-r-t2 {
+	position: relative;
+	height: 42upx;
+	line-height: 42upx;
+	padding: 4upx 0;
+}
+
+.shangjia-i-r-t2 .icon-shoucangxiao {
+	font-size: 26upx;
+	display: inline;
+	margin-right: 10upx;
+	float: left;
+}
+
+.shangjia-i-r-t2 .star {
+	display: inline-block;
+	position: absolute;
+	height: 42upx;
+}
+
+.shangjia-i-r-t2 .star:after {
+	content: "";
+	clear: both;
+	display: block;
+}
+
+.shangjia-i-r-t2-icon {
+	height: 46upx;
+}
+
+.star-grade {
+	margin-left: 180upx;
+}
+
+.shangjia-i-r-t2 .star-dark .icon-shoucangxiao {
+	z-index: 1;
+}
+
+.star-dark .icon-shoucangxiao {
+	color: #eee;
+}
+
+.star-light .icon-shoucangxiao {
+	color: #FF4444;
+}
+
+.shangjia-i-r-t2 .star-light {
+	z-index: 1;
+}
+
+.shangjia-i-r-t2 .star-width {
+	height: 42upx;
+	overflow: hidden;
+	word-break: keep-all;
+	white-space: nowrap;
+}
+.tags_view{
+		display: inline-block;
+		padding: 2upx 10upx;
+		margin-right: 10upx;
+		border-radius: 20upx 20upx 20upx 0upx;
+		border:1upx solid rgba(153,153,153,0.4);
+		font-size: 20upx;
+	}
+.shangjia-i-r-t3 {
+	position: relative;
+	height: 42upx;
+	line-height: 42upx;
+	color: #666666;
+	font-size: 26upx;
+	overflow: hidden;
+	word-break: keep-all;
+	white-space: nowrap;
+}
+
+.shangjia-i-r-t4 {
+	width: 420upx;
+	position: relative;
+	color: #666666;
+	font-size: 26upx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	margin-top: 8upx;
+}
+
+.shangjia-i-b {
+	line-height: 40upx;
+	color: #666666;
+	font-size: 26upx;
+	padding: 2upx 30upx 12upx 30upx;
+	position: relative;
+	padding-left: 230upx;
+}
+
+.shangjia-i-b-i {
+	height: 42upx;
+	margin-top: 6upx;
+	padding-right: 42upx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+}
+
+.shangjia-i-b-i:first-child {
+	margin-top: 0;
+}
+
+.shangjia-i-b .i {
+	width: 42upx;
+	height: 42upx;
+	line-height: 42upx;
+	font-size: 28upx;
+	text-align: right;
+	position: absolute;
+	top: 10upx;
+	right: 30upx;
+	display: inline-block;
+	color: #999999;
+}
+
+.shangjia-i-b .em {
+	width: 34upx;
+	height: 34upx;
+	line-height: 34upx;
+	text-align: center;
+	color: #fff;
+	font-style: normal;
+	border-radius: 4upx;
+	display: inline-block;
+	font-size: 24upx;
+}
+
+.shangjia-i-b .qiang {
+	background-color: #FF7FCA;
+}
+
+.shangjia-i-b .li {
+	background-color: #FF7FCA;
+}
+.shangjia-i-b .kan {
+	background-color: #FF4444;
+}
+.shangjia-i-b .ka {
+	background-color: #FFA530;
+}
+
+.shangjia-i-b .hui {
+	background-color: #ff8400;
+}
+
+.shangjia-i-b .pin {
+	background-color: #14DCD5;
+}
+
+.shangjia-i-b .tuan {
+	background-color: #FF834C;
+}
+
+.shangjia-i-b-i {
+	height: 42upx;
+	line-height: 42upx;
+}
+
+.shangjia-i-b-i .span {
+	margin-left: 8upx;
+	display: inline;
+	font-size: 24upx;
+	color: #666666;
+}
+
+.shangjia-i-b-t2 {
+	height: 42upx;
+	line-height: 42upx;
+	margin-top: 6upx;
+}
+
+.shangjia-i-b-t2 .em {
+	margin-right: 14upx;
+	display: inline-block;
+}
+
+.shangjia-i-b-t2 .em:last-child {
+	margin-right: 0;
+}
+
+/*  headline  头条1  */
+.goodstop-i {
+	width: calc(100vw - 60upx);
+	margin-bottom: 20upx;
+	padding: 40upx 30upx;
+	background-color: #fff;
+}
+
+.goodstop-i:last-child {
+	margin-bottom: 0;
+}
+
+.goodstop-i .h1 {
+	line-height: 52upx;
+	font-size: 36upx;
+	letter-spacing: 4upx;
+	font-weight: normal;
+}
+
+.goodstop-i-t {
+	width: calc(100vw - 60upx);
+	height: calc((100vw - 30upx) / 1.8);
+	margin-top: 30upx;
+	position: relative;
+}
+
+.goodstop-i-t-tag {
+	position: absolute;
+	top: 20upx;
+	left: 20upx;
+}
+
+.goodstop-i-t-tag .i {
+	height: 52upx;
+	line-height: 52upx;
+	font-size: 24upx;
+	font-style: normal;
+	margin-left: 10upx;
+	padding: 0 14upx;
+	background-color: #FFD93F;
+	border-radius: 4upx;
+	display: inline;
+}
+
+.goodstop-i-t-tag .i:first-child {
+	margin-left: 0;
+}
+
+.goodstop-i-t .image {
+	width: 100%;
+	height: 100%;
+}
+
+.goodstop-i-c .h2 {
+	height: 84upx;
+	line-height: 42upx;
+	font-size: 24upx;
+	color: #888;
+	font-weight: normal;
+	margin-top: 20upx;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	display: -webkit-box;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.goodstop-i-c .p {
+	height: 60upx;
+	line-height: 60upx;
+	font-size: 28upx;
+	color: #888;
+	margin-top: 20upx;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: space-between;
+}
+
+.goodstop-i-c .p .span {
+	line-height: 60upx;
+	-webkit-flex-shrink: 1;
+	flex-shrink: 1;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.goodstop-i-c .p .span .i {
+	width: 60upx;
+	height: 60upx;
+	margin-right: 20upx;
+	border-radius: 50%;
+	display: block;
+}
+
+.goodstop-i-c .p .span .b {
+	font-weight: normal;
+	display: block;
+}
+
+.goodstop-i-c .p .span .i .image {
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+
+.goodstop-i-c .p .em {
+	font-style: normal;
+	-webkit-flex-shrink: 0;
+	flex-shrink: 0;
+}
+
+/*  community  社群  */
+.diyPages-community{
+	padding: 20upx 30upx;
+}
+
+/* goods_detail-2  样式 */
+.goods2-coupon-style .i {
+	color: rgb(221, 205, 136);
+	font-size: 24upx;
+	margin-top: -2upx;
+	background-color: #000000;
+	border-radius: 10upx;
+	padding: 0 8upx;
+}
+
+/* 乐豆 */
+.LeBeans{
+	background: linear-gradient(to right,#F22D25,#FB6331);
+	position: relative;
+}
+
+.goods3-margin-16 {
+	margin-right: 32upx;
+}
+
+.goods3-margin-16 text {
+	position: relative;
+	top: -2upx;
+	font-size: 28upx;
+	margin-left: 6upx;
+}
+
+.shop3-title-width {
+	width: 300upx;
+}
+
+.store-containerIcon image {
+	width: 30upx;
+	height: 30upx;
+}
+
+.coupon-progress {
+	width: 216upx;
+	height: 24upx;
+	background: rgba(255, 120, 120, .2);
+	border-radius: 12upx;
+}
+
+.coupon-progress-already {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	background-color: #FF4444;
+	height: 100%;
+	border-radius: 12upx;
+	z-index: 2;
+	max-width: 100%;
+}
+
+.rush-price-box {
+	margin-bottom: 14upx;
+}
+
+.coupon-stk {
+	position: absolute;
+	width: 216upx;
+	height: 24upx;
+	left: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	z-index: 3;
+}
+
+.coupon-stk .shrink {
+	transform: scale(0.85);
+}
+
+.coupon-btn {
+	position: absolute;
+	right: 20upx;
+	bottom: 24upx;
+	width: 130upx;
+	height: 50upx;
+	line-height: 50upx;
+	border-radius: 26upx;
+}
+
+.qglist-i-t-bar {
+	height: 64upx;
+	line-height: 64upx;
+	padding-top: 66upx;
+	background: -webkit-linear-gradient(90deg, #FF7E42, #FB2F52);
+	background: linear-gradient(90deg, #FF7E42, #FB2F52);
+	border-radius: 140upx 0 0 140upx;
+	position: absolute;
+	top: -72upx;
+	right: 0upx;
+}
+
+.qglist-i-t-bar-d {
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.qglist-i-t-bar-l {
+	color: #fff;
+	font-size: 28upx;
+	padding: 0 40upx 0 30upx;
+}
+
+.qglist-i-t-bar-l .i {
+	font-size: 32upx;
+	vertical-align: -2upx;
+	margin-right: 8upx;
+	display: inline;
+}
+
+.qglist-i-t-bar-l .em {
+	font-style: normal;
+	font-weight: 600;
+	display: inline;
+}
+
+.qglist-i-t-bar-r {
+	padding: 10.8upx 20upx 10.8upx 0;
+}
+
+.qglist-i-t-bar-r:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+
+.qglist-i-t-bar-r .i {
+	width: 40upx;
+	height: 40upx;
+	margin-left: -16upx;
+	border-radius: 50%;
+	float: left;
+}
+
+.qglist-i-t-bar-r .i .image {
+	width: 100%;
+	height: 100%;
+	border-radius: 50%;
+}
+
+.Rank-logo {
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 120upx;
+	height: 50upx;
+	line-height: 50upx;
+	border-radius: 0 40upx 40upx 0;
+	background: #FF4040;
+	color: #FFFFFF;
+}
+
+/* #ifdef H5 */
+.swiperBanner-marbtm /deep/ .uni-swiper-dots.uni-swiper-dots-horizontal {
+	/**
+		 * 距离底部高度
+		 */
+	margin-bottom: 0;
+}
+
+.swiperBanner_dotsquare /deep/ .uni-swiper-dot {
+	border-radius: 0 !important;
+}
+
+.swiperBanner_rectangle /deep/ .uni-swiper-dot {
+	width: 40upx;
+	border-radius: 0 !important;
+}
+
+.swiperBanner_left /deep/ .uni-swiper-dots.uni-swiper-dots-horizontal {
+	left: 15% !important;
+}
+
+.swiperBanner_right /deep/ .uni-swiper-dots.uni-swiper-dots-horizontal {
+	left: 85% !important;
+}
+
+.swiperBanner-marbtm /deep/ .uni-swiper-dots.uni-swiper-dots-horizontal {
+	/**
+		 * 距离底部高度
+		 */
+	margin-bottom: 0;
+}
+
+.swiperBanner_dotsquare {
+	border-radius: 0 !important;
+}
+
+.swiperBanner_rectangle {
+	width: 40upx;
+	height: 20upx;
+	border-radius: 0 !important;
+}
+
+.swiperBanner_left {
+	left: 8% !important;
+}
+
+.swiperBanner_right {
+	right: 8% !important;
+	left: auto!important;
+}
+
+/* #endif */
+.goods_img .rush_goods_mask{
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	background-color: rgba(0, 0, 0, .5);
+}
+.goods_img .rush_goods_mask .img{
+	width: calc(100vw / 2.4);
+	height: calc(100vw / 2.47);
+
+}
\ No newline at end of file
diff --git a/common/js/app.js b/common/js/app.js
new file mode 100644
index 0000000..6bc302f
--- /dev/null
+++ b/common/js/app.js
@@ -0,0 +1,1392 @@
+/**
+ * tabBar页面路径列表 (用于链接跳转时判断)
+ * tabBarLinks为常量, 无需修改
+ */
+import Store from "@/store"
+import util from "@/common/js/util.js"
+// #ifdef H5
+import wxApi from "@/common/js/wxApi.js"
+// import manifest from "@/manifest.json"
+// #endif
+const tabBarLinks = [
+	'pages/mainPages/index/index',
+	'pages/mainPages/headline/index',
+	'pages/mainPages/userCenter/userCenter',
+	'pages/mainPages/index/diypage?type=1',
+	'pages/mainPages/index/diypage?type=2',
+	'pages/mainPages/index/diypage?type=3',
+	'pages/mainPages/index/diypage?type=4',
+	'pages/mainPages/index/diypage?type=5',
+	'pages/mainPages/index/diypage?type=6',
+	'pages/mainPages/index/diypage?type=7'
+];
+const Base64 = util.Base64;
+
+// 工具类
+
+let App = {
+	/**
+	 * 全局变量
+	 */
+	globalData: {
+		user_id: null,
+	},
+	// api地址
+	api_root: '',
+	scanCode: false,
+	aid: '',
+	// 图片地址
+	img_root: '',
+	imgfix: '',
+	
+	siteInfo: {},
+	postData: {},
+	loginstate:false,
+	base:null,
+	routers:null,
+	languageStatus:0,
+	/**
+	 * 设置项目基础信息
+	 */
+	setSiteInfo() {
+		// uni.setStorageSync('head_id', '24')
+		let version = require("@/siteinfo.json");
+		this.base = version.base;
+		this.routers = version.routers;
+		// #ifdef H5
+		let url = location.href,
+			uniacid;
+		if (process.env.NODE_ENV === 'development') {
+			uni.setStorageSync("uniacid", 1);
+			this.siteInfo = {
+				"siteroot": "https://citydev.weliam.com.cn",
+				"uniacid": "1",
+				"name": "weliam_smartcity",
+				"weliamv": "1.0.0"
+			};
+		} else {
+			if (location.href.indexOf("/h5/?#/pages/") === -1) {
+				let reg = new RegExp("\/h5/.*?\#/");
+				url = url.replace(reg, "/h5/#/");
+			}
+			//获取当前请求域名
+			
+			uniacid = util.getParams("i", url.split("#")[1], true);
+			let siteroot = location.protocol + "//" + location.hostname,
+				sitetoken = App.getClientType(),
+				name = location.href.split('/addons/')[1].split('/h5/')[0],
+				token = (sitetoken == 1) ? App.getCookie("weliam_user_token") : uni.getStorageSync('weliam_user_token'),
+				head_id = (location.href.indexOf("&token") === -1 ? location.href.split("head_id=")[1] : location.href.split("&")[
+					1].split("head_id=")[1]) || "";
+				let head_ids = head_id.split("&")[0];
+			if (head_id && !!head_id) {
+				// debugger
+				uni.setStorageSync('head_id', head_ids);
+				uni.setStorageSync('dating_head_id', head_ids);
+			};
+			
+			this.siteInfo = {
+				siteroot,
+				name,
+				uniacid,
+				weliamv: version.weliamv,
+				token
+			}
+			url = url.split("&token=")[0];
+			history.replaceState(null, null, `${this.base}#` + url.split("#")[1]);
+		}
+		if(url.indexOf('pages/mainPages/postDetails/postDetails') != -1){
+			// 
+			let urls = url.split('/#/')[1];
+			urls =  urls.replace('mainPages', "subPages");
+			this.navigationTo({
+				url:urls
+			});
+			return
+		}
+		// #endif
+		// #ifndef H5
+		this.siteInfo = version;
+		// #endif
+		this.imgfix = uni.getStorageSync('imgPrefix');
+	},
+
+	/**
+	 * 设置api地址
+	 */
+	setAppRoot(aids) {
+		this.aid = aids + ',';
+		let App = this,
+			siteroot = null,
+			postData = {
+				source: "1",
+				mode: "2",
+			},
+			weliam_user_token = this.getCookie("weliam_user_token");
+		siteroot = this.siteInfo.siteroot + `${this.routers}`;
+		
+		this.aid = this.aid.replace(/,/g, '');
+		this.api_root = siteroot + 'uniapp.php?i=' + this.siteInfo.uniacid + (!!this.siteInfo.token ? '&token=' +
+			this.siteInfo.token : '');
+		if (this.api_root.indexOf('aid') === -1) {
+			this.api_root + '&aid=' + this.aid;
+		}
+		this.img_root = this.siteInfo.siteroot + `${this.base}/resource/image/`;
+		this.img_root_new = this.siteInfo.siteroot + `addons/weliam_smartcity/data/img/`;
+		let apiObj = this.urlToObj(this.api_root);
+		if (!!apiObj.token && apiObj.token !== "undefined") {
+			uni.setStorageSync('weliam_user_token', apiObj.token)
+		} else {
+			// this._post_form('&p=member&do=login&source=1&mode=2', {}, (res) => {
+			// 	console.log(res);
+			// });
+		}
+	},
+	/**
+	 * 小程序启动场景
+	 */
+	onStartupScene(query) {
+		if (query && !!query.head_id) {
+			// debugger
+			uni.setStorageSync('head_id', query.head_id);
+			uni.setStorageSync('dating_head_id', query.head_id);
+		}
+	},
+	/**
+	 * 获取小程序信息
+	 */
+	updateAppInfo() {
+		let App = this;
+		App._post_form('&do=GetPlatformInfor', {}, function(result) {
+			Store.commit("APPINFO", result.data);
+			App.languageStatus = result.data.languageStatus;
+			uni.setStorage({
+				key: 'phone',
+				data: result.data.phone,
+				success: function() {}
+			});
+			uni.removeStorageSync('platformInfor');
+			uni.setStorage({
+				key: 'platformInfor',
+				data: result.data,
+				success: function() {}
+			});
+		});
+	},
+	
+	//更新提示
+	up(){
+		 const updateManager = uni.getUpdateManager();
+		 
+		 updateManager.onCheckForUpdate(function (res) {
+		   // 请求完新版本信息的回调
+		   console.log(res.hasUpdate);
+		 });
+		 
+		 updateManager.onUpdateReady(function (res) {
+		   uni.showModal({
+		     title: '更新提示',
+		     content: '新版本已经准备好，是否重启应用？',
+		     success(res) {
+		       if (res.confirm) {
+		         // 新的版本已经下载好，调用 applyUpdate 应用新版本并重启
+		         updateManager.applyUpdate();
+		       }
+		     }
+		   });
+		 
+		 });
+		 
+		 updateManager.onUpdateFailed(function (res) {
+		   // 新的版本下载失败;
+		    uni.showModal({
+		           title: '升级失败',
+		           content: '新版本下载失败，请检查网络！',
+		           showCancel: false
+		         });
+		 });
+
+	},
+	
+	//获取用户设置
+	userSettings(){
+		let App = this;
+		App._post_form('&do=CustomerService', {}, function(result) {
+			uni.removeStorageSync('CustomerService');
+			uni.removeStorageSync('btnleftAndbottom');
+			let ratio;
+			uni.getSystemInfo({
+				success: function(wh) {
+					ratio = wh.windowWidth / result.data.imgstyle.width;
+				}
+			});
+			let imgstyle = { //imgstyle为根据接口获取用户设置的宽高，根据设备进行比例转换，以达到无论多少宽高都要占满宽度。
+				width:ratio * result.data.imgstyle.width,
+				height:ratio * result.data.imgstyle.height
+			};
+			uni.setStorageSync('imgstyle',imgstyle);
+			
+			
+			let ratios;
+			uni.getSystemInfo({
+				success: function(wh) {
+					ratios = wh.windowWidth / result.data.listimgstyle.width;
+				}
+			});
+			//listimgstyle应用场景为内部页面的轮播图
+			let listimgstyle = {
+				width:ratios * result.data.listimgstyle.width,
+				height:ratios * result.data.listimgstyle.height
+			};
+			uni.setStorageSync('listimgstyle',listimgstyle);
+			uni.setStorageSync('CustomerService',result.data);
+		});
+	},
+	//SDK经纬度获取
+	wxApiCallback(path) {
+		let _this = this;
+		uni.removeStorageSync('memberCityAreaid');
+		// #ifdef H5
+		wxApi.wxRegister(() => {
+			jWeixin.getLocation({
+				type: 'gcj02',
+				success: function(res) {
+					uni.setStorageSync('curLoction', res);
+					let data = {
+						aid: this.aid,
+						lat: res.latitude,
+						lng: res.longitude
+					}
+					let curtimestamp = new Date().getTime(); //当前时间					
+					let lastredpackeTime = uni.getStorageSync('locationGetTime'); // 最后次时间;					
+					let now_packetTime = !!lastredpackeTime ? ((curtimestamp - lastredpackeTime) / 1000 / 60 % 60) : "";
+					if(!!now_packetTime && now_packetTime < 2) return
+					if(path == 'pages/mainPages/index/index'){
+						_this._post_form('&do=Aidtip', data, (reource) => {
+							if(reource.data.status == 1){
+								_this.showError(
+									`定位到您在${reource.data.memberCityName},是否切换到该地区?`,
+									data => {
+										if (data.confirm) {
+											uni.setStorageSync('memberCityAreaid',reource.data.memberCityAreaid);
+											_this.setAppRoot(reource.data.memberCityAid);
+											App.navigationToH5(false,`${this.base}#/?i=${_this.siteInfo.uniacid}&aid=${reource.data.memberCityAid}`);
+											window.location.reload();
+										}else{
+											let timestamp = (new Date()).getTime();											
+											uni.setStorageSync('locationGetTime', timestamp)
+										}
+									},
+									true
+								);
+							}
+							return
+						})
+					}
+				}
+			});
+		})
+		// #endif
+		// #ifndef H5
+		App.getLocation().then(res => {
+			let data = {
+				aid: this.aid,
+				lat: res.latitude,
+				lng: res.longitude
+			}
+			let curtimestamp = new Date().getTime(); //当前时间
+			let lastredpackeTime = uni.getStorageSync('locationGetTime'); // 最后时间;
+			let now_packetTime = !!lastredpackeTime ? ((curtimestamp - lastredpackeTime) / 1000 / 60 % 60) : "";
+			if(!!now_packetTime && now_packetTime < 2) return
+			if(path == 'pages/mainPages/index/index'){
+				_this._post_form('&do=Aidtip', data, (reource) => {
+					uni.setStorageSync('curLoction', res);
+					if(reource.data.status == 1){
+						_this.showError(
+							`定位到您在${reource.data.memberCityName},是否切换到该地区?`,
+							data => {
+								if (data.confirm) {
+									uni.setStorageSync('memberCityAreaid',reource.data.memberCityAreaid);
+									_this.setAppRoot(reource.data.memberCityAid);
+									App.navigationTo({
+										url: 'pages/mainPages/index/index'
+									});
+								}else{
+									let timestamp = (new Date()).getTime();											
+									uni.setStorageSync('locationGetTime', timestamp)
+								}
+							},
+							true
+						);
+					}
+					
+				})
+			}
+		})
+		// #endif
+	},
+
+	/**
+	 * 跳转链接转换
+	 */
+	navgatetoLink() {
+		let App = this;
+		App._post_form('&do=TransformationLink', {}, (res) => {
+			uni.setStorageSync('pagelinkList', res.data);
+		})
+	},
+	getCookie(cookieName) {
+		// #ifdef H5
+		let cookies = document.cookie,
+			cookiesArr = cookies.split(";");
+		for (let i = 0; i < cookiesArr.length; i++) {
+			let arr = cookiesArr[i].split("=");
+			arr[0] = arr[0].replace(/ /g, '')
+			if (arr[0] === cookieName) {
+				return arr[1];
+			}
+		}
+		return "";
+		// #endif
+		return "";
+	},
+	getuserToken() {
+		return uni.getStorageSync('weliam_user_token')
+	},
+	/**
+	 * 获取tabBar页面路径列表
+	 */
+	getTabBarLinks() {
+		return tabBarLinks;
+	},
+	/**
+	 * 执行用户登录
+	 */
+	doLogin() {
+		// 保存当前页面
+		let App = this,
+			clientType = App.getClientType(),
+			pages = getCurrentPages(),
+			
+			url = "";
+			// if(App.loginstate){
+				
+			// 	// return
+			// }
+		if (pages.length > 0) {
+			let currentPage = pages[pages.length - 1],
+				pageOptions = (clientType === "1" || clientType === "2" ? currentPage : currentPage.$vm).$mp.query;
+			("pages/mainPages/login/login" != currentPage.route) && uni.setStorageSync("currentPage", {
+				route: currentPage.route,
+				options: pageOptions
+			});
+		}
+		// // 跳转授权页面
+		// if (clientType === "2") {
+		// 	url = "pages/mainPages/login/login"
+		// } else if(clientType === "3") {
+		// 	url = "pages/mainPages/login/minLogin"
+		// }
+		App.navigationTo({
+			url
+		});
+	},
+
+	/**
+	 * 微信公众号登陆
+	 */
+	openWxLogin(Navurl) {
+		let App = this;
+		// #ifdef H5
+		location.href = Navurl;
+		// #endif
+	},
+	/**
+	 * 判断当前客户端类型
+	 */
+	getClientType() {
+		// 1 公众号 2h5 3微信
+		// #ifdef MP-WEIXIN
+		return "3";
+		// #endif
+
+		// #ifdef H5
+		let ua = navigator.userAgent.toLowerCase(); //获取判断用的对象
+		if (ua.match(/MicroMessenger/i) == "micromessenger") {
+			return "1";
+		}
+		return "2";
+		// #endif
+		
+		//#ifdef APP-PLUS
+		return "3";
+		//#endif
+	},
+
+	// 获取浏览器内核版本号
+
+	getBrowser(n) {
+		// #ifdef H5
+		let ua = navigator.userAgent.toLowerCase(),
+			s,
+			name = '',
+			ver = 0;
+		//探测浏览器
+		(s = ua.match(/msie ([\d.]+)/)) ? _set("ie", _toFixedVersion(s[1])):
+			(s = ua.match(/firefox\/([\d.]+)/)) ? _set("firefox", _toFixedVersion(s[1])) :
+			(s = ua.match(/chrome\/([\d.]+)/)) ? _set("chrome", _toFixedVersion(s[1])) :
+			(s = ua.match(/opera.([\d.]+)/)) ? _set("opera", _toFixedVersion(s[1])) :
+			(s = ua.match(/version\/([\d.]+).*safari/)) ? _set("safari", _toFixedVersion(s[1])) : 0;
+
+		function _toFixedVersion(ver, floatLength) {
+			ver = ('' + ver).replace(/_/g, '.');
+			floatLength = floatLength || 1;
+			ver = String(ver).split('.');
+			ver = ver[0] + '.' + (ver[1] || '0');
+			ver = Number(ver).toFixed(floatLength);
+			return ver;
+		}
+
+		function _set(bname, bver) {
+			name = bname;
+			ver = bver;
+		}
+		return (n == 'n' ? name : (n == 'v' ? ver : name + ver));
+		//getBrowser("n"); // 所获得的就是浏览器所用内核。
+		//getBrowser("v");// 所获得的就是浏览器的版本号。
+		//getBrowser();// 所获得的就是浏览器内核加版本号。
+		// #endif
+	},
+
+	/**
+	 * 验证是否存在user_info
+	 */
+	validateUserInfo() {
+		let user_info = uni.getStorageSync('userInfo');
+		return !!uni.getStorageSync('userInfo');
+	},
+
+	/**
+	 * 显示成功提示框
+	 */
+	showSuccess(msg, callback) {
+		uni.showToast({
+			title: msg,
+			icon: 'success',
+			mask: true,
+			duration: 1500,
+			success() {
+				callback && (setTimeout(function() {
+					callback();
+				}, 1500));
+			}
+		});
+	},
+
+	/**
+	 * 显示失败提示框
+	 */
+	showError(msg, callback, showCancel = false) {
+		uni.showModal({
+			title: '友情提示',
+			content: msg,
+			showCancel: showCancel,
+			success(res) {
+				callback && callback(res);
+			}
+		});
+	},
+
+	/**
+	 * @param {Object} url 请求地址转换
+	 */
+	transformUrl(url) {
+		return this.api_root + url;
+	},
+
+	/**
+	 * get请求
+	 */
+	_get(url, data, success, fail, complete) {
+		this.weRequest("GET", url, data, success, fail, complete);
+	},
+
+	/**
+	 * post提交
+	 */
+	_post_form(url, data, success, fail, complete) {
+		this.weRequest("POST", url, data, success, fail, complete);
+	},
+
+	weRequest(method, url, data, success, fail, complete) {
+		let App = this,
+			// uniacid = App.getUniacid(),
+			requestUrl = App.transformUrl(url),
+			pages = getCurrentPages(),
+			currentRegion = uni.getStorageSync('currentRegion'),
+			agencyData = uni.getStorageSync('agencyData'),
+			token = uni.getStorageSync('weliam_user_token'),
+			source = App.getClientType(), //1公众号 2H5	3微信小程序
+			loginTimer = null;
+			// console.log(url.indexOf('&p=dating') == -1?requestUrl:requestUrl + '&dating_head_id=' + uni.getStorageSync('dating_head_id'),'当前请求');
+		// 构造请求参数
+		data = data || {};
+		data.wxapp_id = App.siteInfo.uniacid;
+		data.aid = this.aid || agencyData.aid || "";
+		data.token = uni.getStorageSync('weliam_user_token');
+		data.source = source;
+		
+		// //#ifdef APP-PLUS
+		// data.source = "3";
+		// //#endif
+		// //#ifdef H5
+		// data.source = "4";
+		// //#endif
+		uni.request({
+			url:url.indexOf('&p=dating') == -1?requestUrl:requestUrl + '&dating_head_id=' + uni.getStorageSync('dating_head_id'),
+			header: {
+				'content-type': method === "POST" ? "application/x-www-form-urlencoded" : "application/json",
+			},
+			method: method,
+			data: data,
+			success(res) {
+				//#ifdef H5
+				let post = requestUrl.split('&do=')[1];
+				let local;
+				let onoption;
+				if(post == 'GetPlatformInfor'){
+					if(location.href.indexOf(".cn/") != -1){
+						local = location.href.split('.cn/')[0] + '.cn/';
+						onoption = location.href.split('.cn/')[1];
+					}else{
+						local = location.href.split('.com/')[0] + '.com/';
+						onoption = location.href.split('.com/')[1];
+					}
+					if(res.data.data.targetDmain.length > 0){
+						res.data.data.targetDmain.map(item=>{
+							if(item == local){
+								location.href = res.data.data.endDmain + onoption;
+							}
+						})
+					}
+					// location.href = 'https://yys.163.com/'
+					// App.openWxLogin('www.baidu.com');
+				};
+				//#endif
+				
+				if (res.statusCode !== 200 || typeof res.data !== 'object') {
+					if(url == '&do=getItemParams') return
+					App.showError(`网络请求出错:${url}`, () => {
+						fail && fail(res);
+					});
+					return false;
+				}
+				// 
+				if (res.data.errno === 5 || res.data.message == "请先登录"){
+					uni.showToast({
+						title: '请先登录',
+						icon:'none'
+					})
+					setTimeout(()=>{
+						uni.navigateTo({
+							url: '/pages/mainPages/login/minLogin'
+						})
+					}, 2000)
+				}
+				if (res.data.errno === 2 || res.data.data.relogin == 1) {
+					uni.removeStorage('weliam_user_token');
+					
+					if (pages.length > 0) {
+						// #ifdef H5
+						
+						
+						if (source === "2") {
+							App.doLogin()
+						} else {
+							let currentPage = pages[pages.length - 1],
+								currentPageRoute = pages[pages.length - 1].route,
+								currentPageUrl,
+								pageQuery = currentPage.$mp.query,
+								referrer_id = pageQuery.head_id || App.siteInfo.head_id,
+								vueurl = currentPageRoute + '?' + App.urlEncode(pageQuery) + (!!referrer_id ? '&head_id=' + referrer_id : "");
+							currentPageUrl = res.data.data.weChat_login + '&vueurl=' + encodeURIComponent(vueurl);
+							App.openWxLogin(currentPageUrl);
+						}
+						return false
+						// #endif
+					}else{
+						App.doLogin()
+					}
+				} else if (res.data.errno === 0) {
+					success && success(res.data);
+				} else if (res.data.errno === 1) {
+					// debugger
+					let post = requestUrl.split('&do=')[1];
+					if(post == 'phoneDecrypt'){
+						fail && fail(res);
+						return false;
+					}
+					let type = uni.getStorageSync('TextSubstitution').flag074;
+					
+					//#ifdef MP-WEIXIN
+					let pages = getCurrentPages(),
+					
+						currentPageObj = pages[pages.length - 1],
+						currentPage = currentPageObj.route;
+					//#endif
+					//#ifdef H5
+					let currentPage = location.href.split('?')[0].split('#/')[1];
+					//#endif
+					
+					if(res.data.message == '请先绑定手机号' && type == 1 && currentPage != 'pages/subPages2/cleanCustom/bindingPhone'){
+						// debugger
+						uni.showModal({
+							showCancel:false,
+							content:res.data.message,
+							success() {
+								// debugger
+								App.navigationTo({
+									url: 'pages/subPages2/cleanCustom/bindingPhone'
+								});
+							}
+						})
+						
+						return
+					}
+					// debugger
+					//判断是否为会员特供，从而转入会员开卡页面，因error皆为1无法判断，只能用文字判断
+					if(res.data.message == '该商品会员特供，请先成为会员' || res.data.message == '当前商品为会员限定，请先成为会员!'|| res.data.message ==  '此商品会员特供，请先开通会员'){
+						// debugger
+						uni.showModal({
+							title:'温馨提示',
+							content:res.data.message,
+							success() {
+								if (res.confirm) {
+								    App.navigationTo({
+								    	url: 'pages/mainPages/memberCard/getMembership/getMembership?card=nhave'
+								    });
+								} else if (res.cancel) {
+									return
+								}
+								// debugger
+								
+							}
+						})
+						
+						return
+					}
+					if (!!res.data.data.mergeflag) {
+						//错误回调函数
+						fail && fail(res);
+						return false;
+					} else {
+						// 
+						
+						// let postis = requestUrl.split('&do=')[1];
+						// if(postis == 'useDiscountCard'){
+						// 	App.navigationTo({})
+						// }
+						// console.log(url);
+						// 
+						if(url.indexOf('&p=distribution') != -1 && url.indexOf('&do=cashWithdrawalApply') == -1){
+							if(url.indexOf('&do=applyCondition') != -1){
+								return
+							}else if(url.indexOf('&do=disApply') != -1){
+								
+							}else{
+								if(res.data.data.mustmobile != 1){
+									App.navigationTo({
+										url: res.data.data.url,
+										navType: 'reLaunch'
+									})
+								}
+								return false
+							}
+							
+						}
+						
+						// 相亲模块判断是否填写个人资料
+						if(url.indexOf('&p=dating') != -1 && res.data.data.is_perfect == 1) {
+							App.showError(res.data.message, () => {
+								uni.reLaunch({
+									url: '/pages/subPages2/blindDate/form/userInfo'
+								})
+							})
+							return
+						}
+						if(url.indexOf('&p=dating') != -1 && res.data.data.dating_is_matchmaker == 1) {
+							App.showError(res.data.message, () => {
+								uni.reLaunch({
+									url: '/pages/subPages2/blindDate/form/matchmakerApply'
+								})
+							})
+							return
+						}
+						// 相亲模块动态列表会员专区时，非会员跳转到开通会员 或者详情页面查看资料会员失效时跳转至开通页面
+						if(
+							(url.indexOf('&p=dating&do=dynamicList') != -1 && res.data.data.dating_is_vip == 1) || 
+							(url.indexOf('p=dating&do=seeMemberInfo') != -1 && res.data.errno == 1)
+							) {
+							App.showError(res.data.message,() => {
+								uni.reLaunch({
+									url: '/pages/subPages2/blindDate/member/open'
+								})
+							})
+							return
+						}
+						
+						// 看不懂。。。
+						App.showError(res.data.message, function() {
+							fail && fail(res);
+							if(res.data.message == '该商品会员特供，请先成为会员' || res.data.message == '当前商品为会员限定，请先成为会员!'){
+								App.navigationTo({
+									url: 'pages/mainPages/memberCard/getMembership/getMembership?card=nhave'
+								});
+								return
+							}
+							uni.reLaunch({
+								url: '/' + res.data.data.url
+							})
+						})
+						return false;
+					}
+				} else if (res.data.errno === 5 && !App.loginstate) {
+					// #ifdef MP-WEIXIN || APP-PLUS
+					App.doLogin();
+					App.loginstate = true;
+					setTimeout(()=>{
+						App.loginstate = false;
+					},1000)
+					// #endif
+				}
+			},
+			fail(res) {},
+			complete(res) {
+				complete && complete(res);
+			}
+		});
+	},
+	// 推荐人id 
+	saveRefereeId() {
+		if (!!Store.state.recomid) {
+			return Store.state.recomid
+		}
+	},
+	getImgUrl() {
+		let App = this;
+		let a = this.siteInfo.uniacid;
+		App._post_form('&do=GetimgPrefix', {}, res => {
+			App.imgfix = res.data.imgPrefix;
+			uni.setStorageSync('imgPrefix', res.data.imgPrefix);
+			return App.imgfix
+		});
+
+	},
+	
+	
+	clipboard(data){		
+		const textarea = document.createElement('textarea');		
+		textarea.value = data;		
+		textarea.readOnly = 'readOnly';		
+		document.body.appendChild(textarea);		
+		textarea.select();		
+		textarea.setSelectionRange(0, data.length);		
+		document.execCommand('copy');		
+		textarea.remove();
+		textarea.style.display="none";		
+		uni.showToast({			
+			icon:'none',			
+			title:'复制成功'	
+			})	
+		},
+	getSetInfo() {
+		let data = {
+			type:0
+		}
+		uni.setStorageSync('getSetInfo',data);
+		let App = this;
+		App._post_form('&p=Im&do=getSetInfo', {}, res => {
+			console.log(res)
+			uni.setStorageSync('getSetInfo', res.data);
+		});
+	
+	},
+	getAreaId(location = "", cityname = "", areaid = "", callback, isSwitchCity = false) {
+		let memberCityAreaid = uni.getStorageSync('memberCityAreaid');
+		let App = this,
+			pages = getCurrentPages(),
+			navType = pages.length > 1 ? 'reLaunch' : 'navigate',
+
+			// requestData = {
+			// 	lat: !!location.lat ? (location.lat || location.latitude) : "",
+			// 	lng: !!location.lng ? (location.lng || location.longitude) : "",
+			// 	cityname,
+			// 	areaid,
+			// };
+			
+			requestData = {
+				lat: location.lat || location.latitude || "",
+				lng: location.lng || location.longitude || "",
+				cityname,
+				areaid: areaid || memberCityAreaid
+			};
+		App._post_form('&do=GetAid', requestData, res => {
+			this.aid = res.data.aid;
+			if (res.data.status === 1 || res.data.status === 2) {
+				let agencyData = {
+					areaname: res.data.areaname,
+					aid: "",
+					lat: res.data.lat,
+					lng: res.data.lng
+				};
+				if (location) {
+					uni.setStorageSync('agencyData', res.data);
+				} else {
+					uni.setStorageSync('agencyData', agencyData);
+				}
+
+				App.setAppRoot(agencyData.aid);
+				App.getImgUrl();
+					App.navigationTo({
+						url: `pages/mainPages/notOpen/notOpen?city_agent_status=${res.data.status}&city_agent_name=${res.data.name}&joinPhone=${res.data.phone}`,
+						navType
+					})
+				return false;
+			} else if (res.data.status === 3) {
+				App.navigationTo({
+					url: `pages/subPages/city/city`,
+					navType
+				})
+			} else {
+				if (!isSwitchCity) {
+					uni.setStorageSync('agencyData', res.data);
+					App.setAppRoot(res.data.aid);
+				}
+				callback && callback(res)
+			}
+		})
+	},
+	wxShareInfo() {
+		let App = this;
+		App._post_form('&do=Shareinfo', {}, res => {
+			Store.commit('MPSHAREINFO', res.data)
+		})
+	},
+	dealershareInfo(callback, type = "11") {
+		let App = this;
+		App._post_form('&do=Shareinfo', {
+			type
+		}, res => {
+			callback && callback(res)
+		})
+	},
+	/**
+	 * 清除登录缓存
+	 */
+	removeCurrentPage() {
+		uni.removeStorageSync("currentPage");
+	},
+	/**
+	 * 对象转URL
+	 */
+	urlEncode(data) {
+		var _result = [];
+		for (var key in data) {
+			var value = data[key];
+			if (value.constructor == Array) {
+				value.forEach(function(_value) {
+					_result.push(key + "=" + _value);
+				});
+			} else {
+				_result.push(key + '=' + value);
+			}
+		}
+		return _result.join('&');
+	},
+	/**
+	 * url转对象
+	 */
+	urlToObj(str) {
+		var obj = {};
+		var arr1 = str.split("?");
+		var arr2 = arr1[1].split("&");
+		for (var i = 0; i < arr2.length; i++) {
+			var res = arr2[i].split("=");
+			obj[res[0]] = res[1];
+		}
+		return obj;
+	},
+	
+	/**
+	 * 获取url参数
+	 */
+	getQueryString(name,url) {
+		let reg = new RegExp('(^|&)' + name + '=([^&]*)(&|$)', 'i');
+		let r = url.substr(1).match(reg);
+		if (r != null) {
+			return unescape(r[2]);
+			}
+			return null;
+		8 },
+	/**
+	 * 通用指定跳转链接方法
+	 * url:跳转链接 navType:{navigate,rediRect,reLaunch,wxParse富文本}跳转方法, pageUrl 是否使用接口路径  success跳转成功回调
+	 */
+	navigationTo({
+		url,
+		navType = 'navigate',
+		success
+	}) {
+		let App = this,
+			tabBarLinks = App.getTabBarLinks(),
+			isTabBar = tabBarLinks.includes(url),
+			pageUrl = url.indexOf('http') !== -1 || url.indexOf('./index') !== -1,
+			isprogram = url.indexOf('appid') !== -1 || url.indexOf('appurl') !== -1,
+			istel = url.indexOf('tel') !== -1,
+			indet = url.indexOf('indet') !== -1;
+			// #ifdef H5
+			let pagetitle = uni.getStorageSync('TextSubstitution');
+			document.title = pagetitle.sysname || '⁣​';
+			// #endif
+			
+		// #ifndef H5
+		// debugger
+		if (isprogram) {
+			let parmsArr = url.split(','),
+				appId = parmsArr[0].split('appid:')[1],
+				path = parmsArr[1].split('appurl:')[1];
+			if (!!appId && !!path) {
+				uni.navigateToMiniProgram({
+					appId,
+					path,
+					success(res) {
+						console.log('success', res)
+						// 打开成功
+					},
+					fail(err) {
+						console.log('err', err)
+					}
+				})
+			}
+		};
+		// #endif
+		if (istel) {
+			let tel = url.split("tel:")[1];
+			uni.makePhoneCall({
+				phoneNumber: tel
+			})
+		};
+		if (navType === 'wxParse') {
+			location.href = url
+		};
+		if (pageUrl) {
+			// #ifndef H5
+			url = encodeURIComponent(url)
+			uni.redirectTo({
+				url: `/pages/subPages/webview/webview?urlsrc=${url}`
+			});
+			// #endif
+			// #ifdef H5
+			let pagelink_list = uni.getStorageSync('pagelinkList'),
+				isPageIndex = url.indexOf('./index') !== -1,
+				isParms = url.indexOf('?') !== -1;
+				
+			if (isParms) {
+				let params = App.urlToObj(url),
+					pageLine_name = `${params.p}/${params.ac}/${params.do}`;
+				if (!!params['p'] && !!params['ac'] && !!params['do']) {
+					for (let key in pagelink_list) {
+						let isPage_link = pageLine_name.indexOf(key) !== -1;
+						if (isPage_link) {
+							let navUrl = pagelink_list[pageLine_name],
+								newParams = params;
+							delete newParams['p'];
+							delete newParams['ac'];
+							delete newParams['do'];
+							delete newParams['c'];
+							delete newParams['m'];
+							navUrl += (navUrl.indexOf("?") !== -1 ? "&" : "?") + App.urlEncode(newParams);
+							// tabBar页面
+							
+							if (isTabBar) {
+								
+								uni.redirectTo({
+									url: '/' + navUrl
+								})
+							} else {
+								// 普通页面
+								uni.navigateTo({
+									url: '/' + navUrl
+								});
+							}
+						}
+					}
+				} else {
+					location.href = url
+				}
+			} else {
+				App.navigationToH5(isPageIndex, url)
+			}
+			// #endif
+		} else {
+			// #ifdef H5
+			if (url.indexOf("i=") === -1) {
+				url += (url.indexOf("?") !== -1 ? "&i=" : "?i=") + App.siteInfo.uniacid;
+			}
+			// #endif
+			if (navType === 'navigate') {
+				if (isTabBar) {
+					uni.redirectTo({
+						url: '/' + url
+					})
+				} else {
+					// 普通页面
+					uni.navigateTo({
+						url: '/' + url
+					});
+				}
+			} else if (navType === 'rediRect') {
+				uni.redirectTo({
+					url: '/' + url,
+					success
+				})
+			} else if (navType === 'reLaunch') {
+				uni.reLaunch({
+					url: '/' + url,
+					success
+				})
+			}
+		}
+	},
+	// h5跳转
+	navigationToH5(isPageIndex, url) {
+		let App = this;
+		// debugger
+		if (isPageIndex) {
+			// #ifdef H5
+			let pageIndexUrl = `${App.api_root}${url.split("./")[1]}`;
+			location.href = pageIndexUrl
+			// #endif
+		} else {
+			// #ifdef H5
+			location.href = url
+			// #endif
+		}
+	},
+	/**
+	 * 记录formId
+	 */
+	saveFormId(temp_type) {
+		let App = this;
+		App._post_form('&do=TempId', {
+			temp_type
+		}, res => {
+			let formList = res.data,
+				idsArray = [];
+			if (formList.length > 0) {
+				formList.map((val => {
+					idsArray.push(val.temp_id)
+				}))
+				let encodeFormList = JSON.stringify(formList),
+					base = new Base64,
+					encodeStr = base.encode(encodeFormList);
+				uni.requestSubscribeMessage({
+					tmplIds: idsArray,
+					success(idsres) {
+						let tmpIdsArray = [];
+						for (let [key, val] of Object.entries(idsres)) {
+							if (val === 'accept') {
+								tmpIdsArray.push(key)
+							}
+						}
+						App._post_form('&do=SetFromId', {
+							form_id: tmpIdsArray,
+							info: encodeStr
+						}, res => {
+							console.log(res)
+						});
+					},
+					fail(err) {
+						console.log(err)
+					}
+				})
+			}
+		})
+	},
+	//浏览器上传图片
+	browser_upload(number = 1){
+		return new Promise((resolve, reject) => {
+			let imageData;
+			uni.chooseImage({
+				count: number, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album','camera'], //从相册选择
+				success: function (res) {
+					// let imageData = await App._upLoad(filePaths);
+					// return 
+					resolve(res)
+				}
+			});
+		})
+		
+	},
+	//上传图片
+	_upLoad(url) {
+		let App = this;
+		return new Promise((resolve, reject) => {
+			uni.uploadFile({
+				url: App.api_root + '&do=uploadFiles',
+				filePath: url,
+				fileType: "image",
+				name: 'file',
+				success(res) {
+					console.log(res, 'success')
+					if (res.statusCode !== 200 || typeof res.data !== 'string') {
+						App.showError('网络请求出错');
+						return false;
+					} else {
+						if (res.code === 0) {
+							App.showError(res.data.msg);
+							return false;
+						} else {
+							resolve(JSON.parse(res.data));
+						}
+					}
+				},
+				fail(res) {
+					console.log(res, 'fail')
+					uni.hideLoading();
+					uni.showModal({
+						title: "上传失败",
+						content: JSON.stringify(res),
+						showCancel: false
+					});
+					reject();
+				},
+				complete() {
+					uni.hideToast(); //隐藏Toast
+				}
+			})
+		});
+	},
+	_MYupLoad(url) {
+		let App = this;
+		return new Promise((resolve, reject) => {
+			uni.uploadFile({
+				url: App.api_root + '&do=StudentUploadFiles',
+				filePath: url,
+				fileType: "image",
+				name: 'file',
+				success(res) {
+					if (res.statusCode !== 200 || typeof res.data !== 'string') {
+						App.showError('网络请求出错');
+						return false;
+					} else {
+						if (res.code === 0) {
+							App.showError(res.data.msg);
+							return false;
+						} else {
+							resolve(JSON.parse(res.data));
+						}
+					}
+				},
+				fail(res) {
+					uni.hideLoading();
+					uni.showModal({
+						title: "上传失败",
+						content: JSON.stringify(res),
+						showCancel: false
+					});
+					reject();
+				},
+				complete() {
+					uni.hideToast(); //隐藏Toast
+				}
+			})
+		});
+	},
+	/**
+	 * 获取当前页面栈
+	 */
+	getCurrentPage() {
+		//1-导入 2-微信小程序 3-H5 4-公众号 5-安卓 6-苹果 7-渠道1小程序 8-百度小程序 9-头条小程序
+		let App = this,
+			pages = getCurrentPages(),
+			clientType = App.getClientType(),
+			currentPage = pages[pages.length - 1],
+			pageInstance = null;
+		if (clientType === "2" || clientType === "7" || clientType === "9") {
+			pageInstance = currentPage.$vm;
+		} else if (clientType === "3" || clientType === "4") {
+			pageInstance = currentPage;
+		} else {
+			pageInstance = currentPage.rootVM;
+		}
+		return pageInstance;
+	},
+
+	/**
+	 * 全屏加载
+	 */
+	// showLoading() {
+	// 	let App = this,
+	// 		page = App.getCurrentPage();
+	// 	!!page.$refs.loading && page.$refs.loading.showLoading();
+	// },
+	// hideLoading(time = 500) {
+	// 	let App = this,
+	// 		page = App.getCurrentPage();
+	// 	setTimeout(() => {
+	// 		!!page.$refs.loading && page.$refs.loading.hideLoading();
+	// 	}, time);
+	// },
+
+	/**
+	 * 获取当前经纬度
+	 */
+	getLocation() {
+		let App = this,
+			clientType = App.getClientType();
+		return new Promise((resolve, reject) => {
+			let LocationType = clientType === "3" ? uni : wxApi;
+			LocationType.getLocation({
+				type: "gcj02", // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+				success(res) {
+					resolve(res);
+				},
+				fail(res) {
+					resolve({
+						latitude: "",
+						longitude: ""
+					});
+				}, 
+				complete(res) {
+					console.log(res);
+				}
+			});
+		})
+	},
+	/**
+	 * 查看位置
+	 */
+	openLocation(options) {
+		let App = this;
+		if (!!options.location) {
+			// let gps = util.baidu_To_qq(options.latitude, options.longitude);
+			uni.openLocation({
+				name: options.storename,
+				address: options.address,
+				latitude: Number(options.location.lat),
+				longitude: Number(options.location.lng),
+				success() {
+					options.success && options.success();
+				}
+			});
+		} else {
+			App.showError("经纬度信息不完整,请确认后重试");
+		}
+	},
+
+	/**
+	 * 商品富文本数据切割，避免一次性加载数据量超大
+	 * @param {type}  
+	 */
+	// wxParseLazyLoad(padding = 0, content, dataKey) {
+	// 	//商品富文本数据切割，避免一次性加载数据量超大
+	// 	let sliceLen = 20, //懒加载数据切割长度
+	// 		currentPage = this.getCurrentPage(),
+	// 		transData = {}, //存放转化后的数据
+	// 		bindData = {}, //存放当前绑定的数据
+	// 		nodePage = 0,
+	// 		nodesList = [],
+	// 		imageProp = {
+	// 			mode: 'aspectFit',
+	// 			padding,
+	// 			lazyLoad: false,
+	// 			domain: '',
+	// 		};
+	// 	transData = HtmlToJson(content, {}, imageProp);
+	// 	if (transData.nodes.length > sliceLen) {
+	// 		let nodes = transData.nodes;
+	// 		for (let i = 0, len = nodes.length; i < len; i += sliceLen) {
+	// 			nodesList.push(nodes.slice(i, i + sliceLen));
+	// 		}
+	// 		bindData.imageUrls = transData.imageUrls;
+	// 		bindData.nodes = nodesList[0];
+	// 	} else {
+	// 		bindData = transData;
+	// 	}
+	// 	currentPage[dataKey] = bindData;
+	// 	if (nodesList.length > 0) {
+	// 		for (let i = 1; i < nodesList.length; i++) {
+	// 			setTimeout(() => {
+	// 				currentPage[dataKey].nodes.push(...nodesList[i]);
+	// 			}, 800);
+	// 		}
+	// 	}
+	// },
+
+	// 获取地址和个人信息
+	getInt() {
+		let _this = this,
+			user_token = uni.getStorageSync('weliam_user_token');
+		if (user_token && !!user_token) {
+			_this._post_form('&p=member&do=memberInfo', {}, res => {
+				uni.setStorageSync('userinfo', res.data);
+			});
+		};
+
+		if (uni.getStorageSync('cityList') == undefined || uni.getStorageSync('cityList') == '') {
+			let data = {}
+			_this._post_form('&do=CityInfo', data, res => {
+				uni.setStorageSync('cityList', res.data);
+			})
+		}
+		// #ifdef H5
+		let pagetitle = uni.getStorageSync('TextSubstitution');
+		document.title = pagetitle.sysname || '⁣​';
+		// #endif
+		_this._post_form('&do=TextSubstitution', {}, res => {
+			uni.setStorageSync('TextSubstitution', res.data);
+			// #ifndef H5
+			let pages = getCurrentPages(),
+				curPage = pages[pages.length - 1],
+				filterList = [
+					'pages/mainPages/Settled/Settled',
+					'pages/subPages/merchant/sendDynamic/sendDynamic',
+					'pages/subPages/postRelease/postRelease',
+					'pages/mainPages/comment/comment'
+				];
+			if (res.data.examineing === "1") {
+				Store.commit("ISWXAUDIT", false);
+				if (!!curPage && filterList.includes(curPage.route)) {
+					_this.navigationTo({
+						url: 'pages/mainPages/index/index',
+						navType: 'reLaunch'
+					})
+				}
+			}
+			if(res.data.sysname && curPage.route.indexOf('pages/subPages2/redClothes/redClothes') == -1){
+				// 不需要吧
+				// uni.setNavigationBarTitle({
+				// 	title: res.data.sysname
+				// });
+			}
+			// #endif
+			
+			// #ifdef H5
+			let locations = location.href;
+			if(res.data.sysname && locations.indexOf('pages/subPages2/redClothes/redClothes')  == -1){
+				console.log('app.js执行',res.data.sysname)
+				// uni.setNavigationBarTitle({
+				// 	title: 
+				// });
+				document.title = res.data.sysname
+			}
+			// #endif
+		})
+	}
+}
+export default {
+	...App
+}
diff --git a/common/js/ms-openMap/openMap.js b/common/js/ms-openMap/openMap.js
new file mode 100644
index 0000000..ff3abcf
--- /dev/null
+++ b/common/js/ms-openMap/openMap.js
@@ -0,0 +1,96 @@
+import TransformCoordinate from './transformCoordinate.js'
+function openMapByDefault(latitude, longitude, name) {
+	uni.openLocation({
+		latitude: latitude,
+		longitude: longitude,
+		name: name,
+		fail: () => {
+			uni.showModal({
+				content: '打开地图失败,请重试'
+			})
+		},
+	})
+}
+function openMapByAndroid(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let identity = ''; // 程序名称
+	if(plus.runtime.isApplicationExist({pname: 'com.baidu.BaiduMap'})) { // baidumap
+		url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&coord_type=gcj02&src=andr.baidu.openAPIdemo`
+		identity = 'com.baidu.BaiduMap'
+		openURL(url, identity)
+	}
+	else if(plus.runtime.isApplicationExist({pname: 'com.autonavi.minimap'})) { // 高德
+		url = `androidamap://viewMap?sourceApplication=appname&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
+		identity = 'com.autonavi.minimap'
+		openURL(url, identity)
+	}
+	else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+function openMapByIos(latitude, longitude, name) {
+	let url = ''; // 回调地址
+	let errorCB = ''; // url失败的回调地址
+	let identity = ''; // 程序名称
+
+	if(plus.runtime.isApplicationExist({action: 'baidumap://'})) { // baidumap
+		url = `baidumap://map/marker?location=${latitude},${longitude}&title=${name}&content=${name}&src=ios.baidu.openAPIdemo&coord_type=gcj02`;
+		openURL(url, identity)
+	}
+	else if(plus.runtime.isApplicationExist({action: 'iosamap://'})) { // 高德
+		url = `iosamap://viewMap?sourceApplication=applicationName&poiname=${name}&lat=${latitude}&lon=${longitude}&dev=0`
+		openURL(url, identity)
+	} 
+	else {
+		openMapByDefault(latitude, longitude, name)
+	}
+}
+function openURL(url, identity ) {
+	let newurl = encodeURI(url);
+	plus.runtime.openURL( newurl, function(res){
+		uni.showModal({
+			content: res.message
+		})
+	}, identity);
+}
+function getCoordByType(longitude, latitude, coord_type) {
+	switch (coord_type){
+		case 'gcj02':
+			return [longitude, latitude]
+			break;
+		case 'bd09':
+			return TransformCoordinate.bd09togcj02(longitude, latitude)
+			break;
+		case 'wgs84':
+			return TransformCoordinate.wgs84togcj02(longitude, latitude)
+			break;
+		default:
+			return [longitude, latitude]
+			break;
+	}
+}
+export default {
+	/* 打开地图 */
+	openMap(latitude, longitude, name, coord_type='gcj02') {
+		let arr = getCoordByType(longitude, latitude, coord_type)
+		// #ifdef APP-PLUS
+		switch(uni.getSystemInfoSync().platform){
+			case 'android':
+				console.log('运行Android上')
+				openMapByAndroid(arr[1], arr[0], name)
+				break;
+			case 'ios':
+				console.log('运行iOS上')
+				openMapByIos(arr[1], arr[0], name)
+				break;
+			default:
+				openMapByDefault(arr[1], arr[0], name)
+				console.log('运行在开发者工具上')	
+				break;
+		}	
+		// #endif
+		// #ifndef APP-PLUS
+		openMapByDefault(arr[1], arr[0], name)
+		// #endif
+	}
+}
\ No newline at end of file
diff --git a/common/js/ms-openMap/transformCoordinate.js b/common/js/ms-openMap/transformCoordinate.js
new file mode 100644
index 0000000..425c296
--- /dev/null
+++ b/common/js/ms-openMap/transformCoordinate.js
@@ -0,0 +1,126 @@
+/**
+ * Created by Wandergis on 2015/7/8.
+ * 提供了百度坐标（BD09）、国测局坐标（火星坐标，GCJ02）、和WGS84坐标系之间的转换
+ */
+ 
+//定义一些常量
+var x_PI = 3.14159265358979324 * 3000.0 / 180.0;
+var PI = 3.1415926535897932384626;
+var a = 6378245.0;
+var ee = 0.00669342162296594323;
+ 
+/**
+ * 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+ * 即 百度 转 谷歌、高德
+ * @param bd_lon
+ * @param bd_lat
+ * @returns {*[]}
+ */
+function bd09togcj02(bd_lon, bd_lat) {
+    var x_pi = 3.14159265358979324 * 3000.0 / 180.0;
+    var x = bd_lon - 0.0065;
+    var y = bd_lat - 0.006;
+    var z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi);
+    var theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi);
+    var gg_lng = z * Math.cos(theta);
+    var gg_lat = z * Math.sin(theta);
+    return [gg_lng, gg_lat]
+}
+ 
+/**
+ * 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+ * 即谷歌、高德 转 百度
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02tobd09(lng, lat) {
+    var z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI);
+    var theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI);
+    var bd_lng = z * Math.cos(theta) + 0.0065;
+    var bd_lat = z * Math.sin(theta) + 0.006;
+    return [bd_lng, bd_lat]
+}
+ 
+/**
+ * WGS84转GCj02
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function wgs84togcj02(lng, lat) {
+    if (out_of_china(lng, lat)) {
+        return [lng, lat]
+    }
+    else {
+        var dlat = transformlat(lng - 105.0, lat - 35.0);
+        var dlng = transformlng(lng - 105.0, lat - 35.0);
+        var radlat = lat / 180.0 * PI;
+        var magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        var sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        var mglat = lat + dlat;
+        var mglng = lng + dlng;
+        return [mglng, mglat]
+    }
+}
+ 
+/**
+ * GCJ02 转换为 WGS84
+ * @param lng
+ * @param lat
+ * @returns {*[]}
+ */
+function gcj02towgs84(lng, lat) {
+    if (out_of_china(lng, lat)) {
+        return [lng, lat]
+    }
+    else {
+        var dlat = transformlat(lng - 105.0, lat - 35.0);
+        var dlng = transformlng(lng - 105.0, lat - 35.0);
+        var radlat = lat / 180.0 * PI;
+        var magic = Math.sin(radlat);
+        magic = 1 - ee * magic * magic;
+        var sqrtmagic = Math.sqrt(magic);
+        dlat = (dlat * 180.0) / ((a * (1 - ee)) / (magic * sqrtmagic) * PI);
+        dlng = (dlng * 180.0) / (a / sqrtmagic * Math.cos(radlat) * PI);
+        mglat = lat + dlat;
+        mglng = lng + dlng;
+        return [lng * 2 - mglng, lat * 2 - mglat]
+    }
+}
+ 
+function transformlat(lng, lat) {
+    var ret = -100.0 + 2.0 * lng + 3.0 * lat + 0.2 * lat * lat + 0.1 * lng * lat + 0.2 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lat * PI) + 40.0 * Math.sin(lat / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (160.0 * Math.sin(lat / 12.0 * PI) + 320 * Math.sin(lat * PI / 30.0)) * 2.0 / 3.0;
+    return ret
+}
+ 
+function transformlng(lng, lat) {
+    var ret = 300.0 + lng + 2.0 * lat + 0.1 * lng * lng + 0.1 * lng * lat + 0.1 * Math.sqrt(Math.abs(lng));
+    ret += (20.0 * Math.sin(6.0 * lng * PI) + 20.0 * Math.sin(2.0 * lng * PI)) * 2.0 / 3.0;
+    ret += (20.0 * Math.sin(lng * PI) + 40.0 * Math.sin(lng / 3.0 * PI)) * 2.0 / 3.0;
+    ret += (150.0 * Math.sin(lng / 12.0 * PI) + 300.0 * Math.sin(lng / 30.0 * PI)) * 2.0 / 3.0;
+    return ret
+}
+ 
+/**
+ * 判断是否在国内，不在国内则不做偏移
+ * @param lng
+ * @param lat
+ * @returns {boolean}
+ */
+function out_of_china(lng, lat) {
+    return (lng < 72.004 || lng > 137.8347) || ((lat < 0.8293 || lat > 55.8271) || false);
+}
+
+export default {
+	bd09togcj02: bd09togcj02,  // 百度坐标系 (BD-09) 与 火星坐标系 (GCJ-02)的转换
+	gcj02tobd09: gcj02tobd09, // 火星坐标系 (GCJ-02) 与百度坐标系 (BD-09) 的转换
+	wgs84togcj02: wgs84togcj02,  // 
+	gcj02towgs84: gcj02towgs84,
+}
\ No newline at end of file
diff --git a/common/js/pageListMixin.js b/common/js/pageListMixin.js
new file mode 100644
index 0000000..690e032
--- /dev/null
+++ b/common/js/pageListMixin.js
@@ -0,0 +1,22 @@
+let mixin = {
+	data() {
+		return {
+			showTopBtn: false,
+			pageScroll: 0,
+		}
+	},
+	methods: {
+
+	},
+	/**
+	 * 显示/隐藏 返回顶部按钮
+	 */
+	onPageScroll({scrollTop}) {
+		let _this = this;
+		_this.$util.debounce(200,()=>{
+			_this.pageScroll = scrollTop;
+		})
+	},
+}
+
+export default mixin
diff --git a/common/js/qqmap-wx-jssdk.min.js b/common/js/qqmap-wx-jssdk.min.js
new file mode 100644
index 0000000..8fa1477
--- /dev/null
+++ b/common/js/qqmap-wx-jssdk.min.js
@@ -0,0 +1 @@
+var ERROR_CONF = { KEY_ERR: 311, KEY_ERR_MSG: 'key格式错误', PARAM_ERR: 310, PARAM_ERR_MSG: '请求参数信息有误', SYSTEM_ERR: 600, SYSTEM_ERR_MSG: '系统错误', WX_ERR_CODE: 1000, WX_OK_CODE: 200 }; var BASE_URL = 'https://apis.map.qq.com/ws/'; var URL_SEARCH = BASE_URL + 'place/v1/search'; var URL_SUGGESTION = BASE_URL + 'place/v1/suggestion'; var URL_GET_GEOCODER = BASE_URL + 'geocoder/v1/'; var URL_CITY_LIST = BASE_URL + 'district/v1/list'; var URL_AREA_LIST = BASE_URL + 'district/v1/getchildren'; var URL_DISTANCE = BASE_URL + 'distance/v1/'; var URL_DIRECTION = BASE_URL + 'direction/v1/'; var MODE = { driving: 'driving', transit: 'transit' }; var EARTH_RADIUS = 6378136.49; var Utils = { safeAdd(x, y) { var lsw = (x & 0xffff) + (y & 0xffff); var msw = (x >> 16) + (y >> 16) + (lsw >> 16); return (msw << 16) | (lsw & 0xffff) }, bitRotateLeft(num, cnt) { return (num << cnt) | (num >>> (32 - cnt)) }, md5cmn(q, a, b, x, s, t) { return this.safeAdd(this.bitRotateLeft(this.safeAdd(this.safeAdd(a, q), this.safeAdd(x, t)), s), b) }, md5ff(a, b, c, d, x, s, t) { return this.md5cmn((b & c) | (~b & d), a, b, x, s, t) }, md5gg(a, b, c, d, x, s, t) { return this.md5cmn((b & d) | (c & ~d), a, b, x, s, t) }, md5hh(a, b, c, d, x, s, t) { return this.md5cmn(b ^ c ^ d, a, b, x, s, t) }, md5ii(a, b, c, d, x, s, t) { return this.md5cmn(c ^ (b | ~d), a, b, x, s, t) }, binlMD5(x, len) { x[len >> 5] |= 0x80 << (len % 32); x[((len + 64) >>> 9 << 4) + 14] = len; var i; var olda; var oldb; var oldc; var oldd; var a = 1732584193; var b = -271733879; var c = -1732584194; var d = 271733878; for (i = 0; i < x.length; i += 16) { olda = a; oldb = b; oldc = c; oldd = d; a = this.md5ff(a, b, c, d, x[i], 7, -680876936); d = this.md5ff(d, a, b, c, x[i + 1], 12, -389564586); c = this.md5ff(c, d, a, b, x[i + 2], 17, 606105819); b = this.md5ff(b, c, d, a, x[i + 3], 22, -1044525330); a = this.md5ff(a, b, c, d, x[i + 4], 7, -176418897); d = this.md5ff(d, a, b, c, x[i + 5], 12, 1200080426); c = this.md5ff(c, d, a, b, x[i + 6], 17, -1473231341); b = this.md5ff(b, c, d, a, x[i + 7], 22, -45705983); a = this.md5ff(a, b, c, d, x[i + 8], 7, 1770035416); d = this.md5ff(d, a, b, c, x[i + 9], 12, -1958414417); c = this.md5ff(c, d, a, b, x[i + 10], 17, -42063); b = this.md5ff(b, c, d, a, x[i + 11], 22, -1990404162); a = this.md5ff(a, b, c, d, x[i + 12], 7, 1804603682); d = this.md5ff(d, a, b, c, x[i + 13], 12, -40341101); c = this.md5ff(c, d, a, b, x[i + 14], 17, -1502002290); b = this.md5ff(b, c, d, a, x[i + 15], 22, 1236535329); a = this.md5gg(a, b, c, d, x[i + 1], 5, -165796510); d = this.md5gg(d, a, b, c, x[i + 6], 9, -1069501632); c = this.md5gg(c, d, a, b, x[i + 11], 14, 643717713); b = this.md5gg(b, c, d, a, x[i], 20, -373897302); a = this.md5gg(a, b, c, d, x[i + 5], 5, -701558691); d = this.md5gg(d, a, b, c, x[i + 10], 9, 38016083); c = this.md5gg(c, d, a, b, x[i + 15], 14, -660478335); b = this.md5gg(b, c, d, a, x[i + 4], 20, -405537848); a = this.md5gg(a, b, c, d, x[i + 9], 5, 568446438); d = this.md5gg(d, a, b, c, x[i + 14], 9, -1019803690); c = this.md5gg(c, d, a, b, x[i + 3], 14, -187363961); b = this.md5gg(b, c, d, a, x[i + 8], 20, 1163531501); a = this.md5gg(a, b, c, d, x[i + 13], 5, -1444681467); d = this.md5gg(d, a, b, c, x[i + 2], 9, -51403784); c = this.md5gg(c, d, a, b, x[i + 7], 14, 1735328473); b = this.md5gg(b, c, d, a, x[i + 12], 20, -1926607734); a = this.md5hh(a, b, c, d, x[i + 5], 4, -378558); d = this.md5hh(d, a, b, c, x[i + 8], 11, -2022574463); c = this.md5hh(c, d, a, b, x[i + 11], 16, 1839030562); b = this.md5hh(b, c, d, a, x[i + 14], 23, -35309556); a = this.md5hh(a, b, c, d, x[i + 1], 4, -1530992060); d = this.md5hh(d, a, b, c, x[i + 4], 11, 1272893353); c = this.md5hh(c, d, a, b, x[i + 7], 16, -155497632); b = this.md5hh(b, c, d, a, x[i + 10], 23, -1094730640); a = this.md5hh(a, b, c, d, x[i + 13], 4, 681279174); d = this.md5hh(d, a, b, c, x[i], 11, -358537222); c = this.md5hh(c, d, a, b, x[i + 3], 16, -722521979); b = this.md5hh(b, c, d, a, x[i + 6], 23, 76029189); a = this.md5hh(a, b, c, d, x[i + 9], 4, -640364487); d = this.md5hh(d, a, b, c, x[i + 12], 11, -421815835); c = this.md5hh(c, d, a, b, x[i + 15], 16, 530742520); b = this.md5hh(b, c, d, a, x[i + 2], 23, -995338651); a = this.md5ii(a, b, c, d, x[i], 6, -198630844); d = this.md5ii(d, a, b, c, x[i + 7], 10, 1126891415); c = this.md5ii(c, d, a, b, x[i + 14], 15, -1416354905); b = this.md5ii(b, c, d, a, x[i + 5], 21, -57434055); a = this.md5ii(a, b, c, d, x[i + 12], 6, 1700485571); d = this.md5ii(d, a, b, c, x[i + 3], 10, -1894986606); c = this.md5ii(c, d, a, b, x[i + 10], 15, -1051523); b = this.md5ii(b, c, d, a, x[i + 1], 21, -2054922799); a = this.md5ii(a, b, c, d, x[i + 8], 6, 1873313359); d = this.md5ii(d, a, b, c, x[i + 15], 10, -30611744); c = this.md5ii(c, d, a, b, x[i + 6], 15, -1560198380); b = this.md5ii(b, c, d, a, x[i + 13], 21, 1309151649); a = this.md5ii(a, b, c, d, x[i + 4], 6, -145523070); d = this.md5ii(d, a, b, c, x[i + 11], 10, -1120210379); c = this.md5ii(c, d, a, b, x[i + 2], 15, 718787259); b = this.md5ii(b, c, d, a, x[i + 9], 21, -343485551); a = this.safeAdd(a, olda); b = this.safeAdd(b, oldb); c = this.safeAdd(c, oldc); d = this.safeAdd(d, oldd) } return [a, b, c, d] }, binl2rstr(input) { var i; var output = ''; var length32 = input.length * 32; for (i = 0; i < length32; i += 8) { output += String.fromCharCode((input[i >> 5] >>> (i % 32)) & 0xff) } return output }, rstr2binl(input) { var i; var output = []; output[(input.length >> 2) - 1] = undefined; for (i = 0; i < output.length; i += 1) { output[i] = 0 } var length8 = input.length * 8; for (i = 0; i < length8; i += 8) { output[i >> 5] |= (input.charCodeAt(i / 8) & 0xff) << (i % 32) } return output }, rstrMD5(s) { return this.binl2rstr(this.binlMD5(this.rstr2binl(s), s.length * 8)) }, rstrHMACMD5(key, data) { var i; var bkey = this.rstr2binl(key); var ipad = []; var opad = []; var hash; ipad[15] = opad[15] = undefined; if (bkey.length > 16) { bkey = this.binlMD5(bkey, key.length * 8) } for (i = 0; i < 16; i += 1) { ipad[i] = bkey[i] ^ 0x36363636; opad[i] = bkey[i] ^ 0x5c5c5c5c } hash = this.binlMD5(ipad.concat(this.rstr2binl(data)), 512 + data.length * 8); return this.binl2rstr(this.binlMD5(opad.concat(hash), 512 + 128)) }, rstr2hex(input) { var hexTab = '0123456789abcdef'; var output = ''; var x; var i; for (i = 0; i < input.length; i += 1) { x = input.charCodeAt(i); output += hexTab.charAt((x >>> 4) & 0x0f) + hexTab.charAt(x & 0x0f) } return output }, str2rstrUTF8(input) { return unescape(encodeURIComponent(input)) }, rawMD5(s) { return this.rstrMD5(this.str2rstrUTF8(s)) }, hexMD5(s) { return this.rstr2hex(this.rawMD5(s)) }, rawHMACMD5(k, d) { return this.rstrHMACMD5(this.str2rstrUTF8(k), str2rstrUTF8(d)) }, hexHMACMD5(k, d) { return this.rstr2hex(this.rawHMACMD5(k, d)) }, md5(string, key, raw) { if (!key) { if (!raw) { return this.hexMD5(string) } return this.rawMD5(string) } if (!raw) { return this.hexHMACMD5(key, string) } return this.rawHMACMD5(key, string) }, getSig(requestParam, sk, feature, mode) { var sig = null; var requestArr = []; Object.keys(requestParam).sort().forEach(function (key) { requestArr.push(key + '=' + requestParam[key]) }); if (feature == 'search') { sig = '/ws/place/v1/search?' + requestArr.join('&') + sk } if (feature == 'suggest') { sig = '/ws/place/v1/suggestion?' + requestArr.join('&') + sk } if (feature == 'reverseGeocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'geocoder') { sig = '/ws/geocoder/v1/?' + requestArr.join('&') + sk } if (feature == 'getCityList') { sig = '/ws/district/v1/list?' + requestArr.join('&') + sk } if (feature == 'getDistrictByCityId') { sig = '/ws/district/v1/getchildren?' + requestArr.join('&') + sk } if (feature == 'calculateDistance') { sig = '/ws/distance/v1/?' + requestArr.join('&') + sk } if (feature == 'direction') { sig = '/ws/direction/v1/' + mode + '?' + requestArr.join('&') + sk } sig = this.md5(sig); return sig }, location2query(data) { if (typeof data == 'string') { return data } var query = ''; for (var i = 0; i < data.length; i++) { var d = data[i]; if (!!query) { query += ';' } if (d.location) { query = query + d.location.lat + ',' + d.location.lng } if (d.latitude && d.longitude) { query = query + d.latitude + ',' + d.longitude } } return query }, rad(d) { return d * Math.PI / 180.0 }, getEndLocation(location) { var to = location.split(';'); var endLocation = []; for (var i = 0; i < to.length; i++) { endLocation.push({ lat: parseFloat(to[i].split(',')[0]), lng: parseFloat(to[i].split(',')[1]) }) } return endLocation }, getDistance(latFrom, lngFrom, latTo, lngTo) { var radLatFrom = this.rad(latFrom); var radLatTo = this.rad(latTo); var a = radLatFrom - radLatTo; var b = this.rad(lngFrom) - this.rad(lngTo); var distance = 2 * Math.asin(Math.sqrt(Math.pow(Math.sin(a / 2), 2) + Math.cos(radLatFrom) * Math.cos(radLatTo) * Math.pow(Math.sin(b / 2), 2))); distance = distance * EARTH_RADIUS; distance = Math.round(distance * 10000) / 10000; return parseFloat(distance.toFixed(0)) }, getWXLocation(success, fail, complete) { wx.getLocation({ type: 'gcj02', success: success, fail: fail, complete: complete }) }, getLocationParam(location) { if (typeof location == 'string') { var locationArr = location.split(','); if (locationArr.length === 2) { location = { latitude: location.split(',')[0], longitude: location.split(',')[1] } } else { location = {} } } return location }, polyfillParam(param) { param.success = param.success || function () { }; param.fail = param.fail || function () { }; param.complete = param.complete || function () { } }, checkParamKeyEmpty(param, key) { if (!param[key]) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + key + '参数格式有误'); param.fail(errconf); param.complete(errconf); return true } return false }, checkKeyword(param) { return !this.checkParamKeyEmpty(param, 'keyword') }, checkLocation(param) { var location = this.getLocationParam(param.location); if (!location || !location.latitude || !location.longitude) { var errconf = this.buildErrorConfig(ERROR_CONF.PARAM_ERR, ERROR_CONF.PARAM_ERR_MSG + ' location参数格式有误'); param.fail(errconf); param.complete(errconf); return false } return true }, buildErrorConfig(errCode, errMsg) { return { status: errCode, message: errMsg } }, handleData(param, data, feature) { if (feature == 'search') { var searchResult = data.data; var searchSimplify = []; for (var i = 0; i < searchResult.length; i++) { searchSimplify.push({ id: searchResult[i].id || null, title: searchResult[i].title || null, latitude: searchResult[i].location && searchResult[i].location.lat || null, longitude: searchResult[i].location && searchResult[i].location.lng || null, address: searchResult[i].address || null, category: searchResult[i].category || null, tel: searchResult[i].tel || null, adcode: searchResult[i].ad_info && searchResult[i].ad_info.adcode || null, city: searchResult[i].ad_info && searchResult[i].ad_info.city || null, district: searchResult[i].ad_info && searchResult[i].ad_info.district || null, province: searchResult[i].ad_info && searchResult[i].ad_info.province || null }) } param.success(data, { searchResult: searchResult, searchSimplify: searchSimplify }) } else if (feature == 'suggest') { var suggestResult = data.data; var suggestSimplify = []; for (var i = 0; i < suggestResult.length; i++) { suggestSimplify.push({ adcode: suggestResult[i].adcode || null, address: suggestResult[i].address || null, category: suggestResult[i].category || null, city: suggestResult[i].city || null, district: suggestResult[i].district || null, id: suggestResult[i].id || null, latitude: suggestResult[i].location && suggestResult[i].location.lat || null, longitude: suggestResult[i].location && suggestResult[i].location.lng || null, province: suggestResult[i].province || null, title: suggestResult[i].title || null, type: suggestResult[i].type || null }) } param.success(data, { suggestResult: suggestResult, suggestSimplify: suggestSimplify }) } else if (feature == 'reverseGeocoder') { var reverseGeocoderResult = data.result; var reverseGeocoderSimplify = { address: reverseGeocoderResult.address || null, latitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lat || null, longitude: reverseGeocoderResult.location && reverseGeocoderResult.location.lng || null, adcode: reverseGeocoderResult.ad_info && reverseGeocoderResult.ad_info.adcode || null, city: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.city || null, district: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.district || null, nation: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.nation || null, province: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.province || null, street: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street || null, street_number: reverseGeocoderResult.address_component && reverseGeocoderResult.address_component.street_number || null, recommend: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.recommend || null, rough: reverseGeocoderResult.formatted_addresses && reverseGeocoderResult.formatted_addresses.rough || null }; if (reverseGeocoderResult.pois) { var pois = reverseGeocoderResult.pois; var poisSimplify = []; for (var i = 0; i < pois.length; i++) { poisSimplify.push({ id: pois[i].id || null, title: pois[i].title || null, latitude: pois[i].location && pois[i].location.lat || null, longitude: pois[i].location && pois[i].location.lng || null, address: pois[i].address || null, category: pois[i].category || null, adcode: pois[i].ad_info && pois[i].ad_info.adcode || null, city: pois[i].ad_info && pois[i].ad_info.city || null, district: pois[i].ad_info && pois[i].ad_info.district || null, province: pois[i].ad_info && pois[i].ad_info.province || null }) } param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify, pois: pois, poisSimplify: poisSimplify }) } else { param.success(data, { reverseGeocoderResult: reverseGeocoderResult, reverseGeocoderSimplify: reverseGeocoderSimplify }) } } else if (feature == 'geocoder') { var geocoderResult = data.result; var geocoderSimplify = { title: geocoderResult.title || null, latitude: geocoderResult.location && geocoderResult.location.lat || null, longitude: geocoderResult.location && geocoderResult.location.lng || null, adcode: geocoderResult.ad_info && geocoderResult.ad_info.adcode || null, province: geocoderResult.address_components && geocoderResult.address_components.province || null, city: geocoderResult.address_components && geocoderResult.address_components.city || null, district: geocoderResult.address_components && geocoderResult.address_components.district || null, street: geocoderResult.address_components && geocoderResult.address_components.street || null, street_number: geocoderResult.address_components && geocoderResult.address_components.street_number || null, level: geocoderResult.level || null }; param.success(data, { geocoderResult: geocoderResult, geocoderSimplify: geocoderSimplify }) } else if (feature == 'getCityList') { var provinceResult = data.result[0]; var cityResult = data.result[1]; var districtResult = data.result[2]; param.success(data, { provinceResult: provinceResult, cityResult: cityResult, districtResult: districtResult }) } else if (feature == 'getDistrictByCityId') { var districtByCity = data.result[0]; param.success(data, districtByCity) } else if (feature == 'calculateDistance') { var calculateDistanceResult = data.result.elements; var distance = []; for (var i = 0; i < calculateDistanceResult.length; i++) { distance.push(calculateDistanceResult[i].distance) } param.success(data, { calculateDistanceResult: calculateDistanceResult, distance: distance }) } else if (feature == 'direction') { var direction = data.result.routes; param.success(data, direction) } else { param.success(data) } }, buildWxRequestConfig(param, options, feature) { var that = this; options.header = { "content-type": "application/json" }; options.method = 'GET'; options.success = function (res) { var data = res.data; if (data.status === 0) { that.handleData(param, data, feature) } else { param.fail(data) } }; options.fail = function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; options.complete = function (res) { var statusCode = +res.statusCode; switch (statusCode) { case ERROR_CONF.WX_ERR_CODE: { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)); break } case ERROR_CONF.WX_OK_CODE: { var data = res.data; if (data.status === 0) { param.complete(data) } else { param.complete(that.buildErrorConfig(data.status, data.message)) } break } default: { param.complete(that.buildErrorConfig(ERROR_CONF.SYSTEM_ERR, ERROR_CONF.SYSTEM_ERR_MSG)) } } }; return options }, locationProcess(param, locationsuccess, locationfail, locationcomplete) { var that = this; locationfail = locationfail || function (res) { res.statusCode = ERROR_CONF.WX_ERR_CODE; param.fail(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) }; locationcomplete = locationcomplete || function (res) { if (res.statusCode == ERROR_CONF.WX_ERR_CODE) { param.complete(that.buildErrorConfig(ERROR_CONF.WX_ERR_CODE, res.errMsg)) } }; if (!param.location) { that.getWXLocation(locationsuccess, locationfail, locationcomplete) } else if (that.checkLocation(param)) { var location = Utils.getLocationParam(param.location); locationsuccess(location) } } }; class QQMapWX { constructor(options) { if (!options.key) { throw Error('key值不能为空') } this.key = options.key }; search(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, orderby: options.orderby || '_distance', page_size: options.page_size || 10, page_index: options.page_index || 1, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } var distance = options.distance || "1000"; var auto_extend = options.auto_extend || 1; var region = null; var rectangle = null; if (options.region) { region = options.region } if (options.rectangle) { rectangle = options.rectangle } var locationsuccess = function (result) { if (region && !rectangle) { requestParam.boundary = "region(" + region + "," + auto_extend + "," + result.latitude + "," + result.longitude + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else if (rectangle && !region) { requestParam.boundary = "rectangle(" + rectangle + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } else { requestParam.boundary = "nearby(" + result.latitude + "," + result.longitude + "," + distance + "," + auto_extend + ")"; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'search') } } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SEARCH, data: requestParam }, 'search')) }; Utils.locationProcess(options, locationsuccess) }; getSuggestion(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (!Utils.checkKeyword(options)) { return } var requestParam = { keyword: options.keyword, region: options.region || '全国', region_fix: options.region_fix || 0, policy: options.policy || 0, page_size: options.page_size || 10, page_index: options.page_index || 1, get_subpois: options.get_subpois || 0, output: 'json', key: that.key }; if (options.address_format) { requestParam.address_format = options.address_format } if (options.filter) { requestParam.filter = options.filter } if (options.location) { var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) }; Utils.locationProcess(options, locationsuccess) } else { if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'suggest') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_SUGGESTION, data: requestParam }, "suggest")) } }; reverseGeocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { coord_type: options.coord_type || 5, get_poi: options.get_poi || 0, output: 'json', key: that.key }; if (options.poi_options) { requestParam.poi_options = options.poi_options } var locationsuccess = function (result) { requestParam.location = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'reverseGeocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'reverseGeocoder')) }; Utils.locationProcess(options, locationsuccess) }; geocoder(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'address')) { return } var requestParam = { address: options.address, output: 'json', key: that.key }; if (options.region) { requestParam.region = options.region } if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'geocoder') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_GET_GEOCODER, data: requestParam }, 'geocoder')) }; getCityList(options) { var that = this; options = options || {}; Utils.polyfillParam(options); var requestParam = { output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getCityList') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_CITY_LIST, data: requestParam }, 'getCityList')) }; getDistrictByCityId(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'id')) { return } var requestParam = { id: options.id || '', output: 'json', key: that.key }; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'getDistrictByCityId') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_AREA_LIST, data: requestParam }, 'getDistrictByCityId')) }; calculateDistance(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { mode: options.mode || 'walking', to: Utils.location2query(options.to), output: 'json', key: that.key }; if (options.from) { options.location = options.from } if (requestParam.mode == 'straight') { var locationsuccess = function (result) { var locationTo = Utils.getEndLocation(requestParam.to); var data = { message: "query ok", result: { elements: [] }, status: 0 }; for (var i = 0; i < locationTo.length; i++) { data.result.elements.push({ distance: Utils.getDistance(result.latitude, result.longitude, locationTo[i].lat, locationTo[i].lng), duration: 0, from: { lat: result.latitude, lng: result.longitude }, to: { lat: locationTo[i].lat, lng: locationTo[i].lng } }) } var calculateResult = data.result.elements; var distanceResult = []; for (var i = 0; i < calculateResult.length; i++) { distanceResult.push(calculateResult[i].distance) } return options.success(data, { calculateResult: calculateResult, distanceResult: distanceResult }) }; Utils.locationProcess(options, locationsuccess) } else { var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'calculateDistance') } wx.request(Utils.buildWxRequestConfig(options, { url: URL_DISTANCE, data: requestParam }, 'calculateDistance')) }; Utils.locationProcess(options, locationsuccess) } }; direction(options) { var that = this; options = options || {}; Utils.polyfillParam(options); if (Utils.checkParamKeyEmpty(options, 'to')) { return } var requestParam = { output: 'json', key: that.key }; if (typeof options.to == 'string') { requestParam.to = options.to } else { requestParam.to = options.to.latitude + ',' + options.to.longitude } var SET_URL_DIRECTION = null; options.mode = options.mode || MODE.driving; SET_URL_DIRECTION = URL_DIRECTION + options.mode; if (options.from) { options.location = options.from } if (options.mode == MODE.driving) { if (options.from_poi) { requestParam.from_poi = options.from_poi } if (options.heading) { requestParam.heading = options.heading } if (options.speed) { requestParam.speed = options.speed } if (options.accuracy) { requestParam.accuracy = options.accuracy } if (options.road_type) { requestParam.road_type = options.road_type } if (options.to_poi) { requestParam.to_poi = options.to_poi } if (options.from_track) { requestParam.from_track = options.from_track } if (options.waypoints) { requestParam.waypoints = options.waypoints } if (options.policy) { requestParam.policy = options.policy } if (options.plate_number) { requestParam.plate_number = options.plate_number } } if (options.mode == MODE.transit) { if (options.departure_time) { requestParam.departure_time = options.departure_time } if (options.policy) { requestParam.policy = options.policy } } var locationsuccess = function (result) { requestParam.from = result.latitude + ',' + result.longitude; if (options.sig) { requestParam.sig = Utils.getSig(requestParam, options.sig, 'direction', options.mode) } wx.request(Utils.buildWxRequestConfig(options, { url: SET_URL_DIRECTION, data: requestParam }, 'direction')) }; Utils.locationProcess(options, locationsuccess) } }; module.exports = QQMapWX;
\ No newline at end of file
diff --git a/common/js/recorder.js b/common/js/recorder.js
new file mode 100644
index 0000000..5aa67c7
--- /dev/null
+++ b/common/js/recorder.js
@@ -0,0 +1,12 @@
+/*!
+ * 
+ * js-audio-recorder - js audio recorder plugin
+ * 
+ * @version v1.0.7
+ * @homepage https://github.com/2fps/recorder
+ * @author 2fps <echoweb@126.com> (https://www.zhuyuntao.cn)
+ * @license MIT
+ *         
+ */
+!function(t,e){"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.Recorder=e():t.Recorder=e()}(this,function(){return function(t){var e={};function n(i){if(e[i])return e[i].exports;var o=e[i]={i:i,l:!1,exports:{}};return t[i].call(o.exports,o,o.exports,n),o.l=!0,o.exports}return n.m=t,n.c=e,n.d=function(t,e,i){n.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:i})},n.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},n.t=function(t,e){if(1&e&&(t=n(t)),8&e)return t;if(4&e&&"object"==typeof t&&t&&t.__esModule)return t;var i=Object.create(null);if(n.r(i),Object.defineProperty(i,"default",{enumerable:!0,value:t}),2&e&&"string"!=typeof t)for(var o in t)n.d(i,o,function(e){return t[e]}.bind(null,o));return i},n.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return n.d(e,"a",e),e},n.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},n.p="",n(n.s=1)}([function(t,e,n){"use strict";function i(t,e,n){for(var i=0;i<n.length;i++)t.setUint8(e+i,n.charCodeAt(i))}Object.defineProperty(e,"__esModule",{value:!0}),e.compress=function(t,e,n){for(var i=e/n,o=Math.max(i,1),r=t.left,a=t.right,s=Math.floor((r.length+a.length)/i),u=new Float32Array(s),c=0,l=0;c<s;){var f=Math.floor(l);u[c]=r[f],c++,a.length&&(u[c]=a[f],c++),l+=o}return u},e.encodePCM=function(t,e,n){void 0===n&&(n=!0);var i=0,o=t.length*(e/8),r=new ArrayBuffer(o),a=new DataView(r);if(8===e)for(var s=0;s<t.length;s++,i++){var u=(c=Math.max(-1,Math.min(1,t[s])))<0?128*c:127*c;u=+u+128,a.setInt8(i,u)}else for(s=0;s<t.length;s++,i+=2){var c=Math.max(-1,Math.min(1,t[s]));a.setInt16(i,c<0?32768*c:32767*c,n)}return a},e.encodeWAV=function(t,e,n,o,r,a){void 0===a&&(a=!0);var s=n>e?e:n,u=r,c=new ArrayBuffer(44+t.byteLength),l=new DataView(c),f=o,p=0;i(l,p,"RIFF"),p+=4,l.setUint32(p,36+t.byteLength,a),i(l,p+=4,"WAVE"),i(l,p+=4,"fmt "),p+=4,l.setUint32(p,16,a),p+=4,l.setUint16(p,1,a),p+=2,l.setUint16(p,f,a),p+=2,l.setUint32(p,s,a),p+=4,l.setUint32(p,f*s*(u/8),a),p+=4,l.setUint16(p,f*(u/8),a),p+=2,l.setUint16(p,u,a),i(l,p+=2,"data"),p+=4,l.setUint32(p,t.byteLength,a),p+=4;for(var d=0;d<t.byteLength;)l.setUint8(p,t.getUint8(d)),p++,d++;return l}},function(t,e,n){"use strict";var i,o=this&&this.__extends||(i=function(t,e){return(i=Object.setPrototypeOf||{__proto__:[]}instanceof Array&&function(t,e){t.__proto__=e}||function(t,e){for(var n in e)e.hasOwnProperty(n)&&(t[n]=e[n])})(t,e)},function(t,e){function n(){this.constructor=t}i(t,e),t.prototype=null===e?Object.create(e):(n.prototype=e.prototype,new n)});Object.defineProperty(e,"__esModule",{value:!0});var r=n(2),a=n(0),s=n(3),u=function(t){function e(e){void 0===e&&(e={});var n=t.call(this,e)||this;return n.isrecording=!1,n.ispause=!1,n.isplaying=!1,n}return o(e,t),e.prototype.setOption=function(t){void 0===t&&(t={}),this.setNewOption(t)},e.prototype.start=function(){return this.isrecording?Promise.reject():(this.isrecording=!0,this.startRecord())},e.prototype.pause=function(){this.isrecording&&!this.ispause&&(this.ispause=!0,this.pauseRecord())},e.prototype.resume=function(){this.isrecording&&this.ispause&&(this.ispause=!1,this.resumeRecord())},e.prototype.stop=function(){this.isrecording&&(this.isrecording=!1,this.ispause=!1,this.stopRecord())},e.prototype.play=function(){this.stop(),this.isplaying=!0,this.onplay&&this.onplay(),s.default.addPlayEnd(this.onplayend);var t=this.getWAV();t.byteLength>44&&s.default.play(t.buffer)},e.prototype.getPlayTime=function(){return s.default.getPlayTime()},e.prototype.pausePlay=function(){!this.isrecording&&this.isplaying&&(this.isplaying=!1,this.onpauseplay&&this.onpauseplay(),s.default.pausePlay())},e.prototype.resumePlay=function(){this.isrecording||this.isplaying||(this.isplaying=!0,this.onresumeplay&&this.onresumeplay(),s.default.resumePlay())},e.prototype.stopPlay=function(){this.isrecording||(this.isplaying=!1,this.onstopplay&&this.onstopplay(),s.default.stopPlay())},e.prototype.destroy=function(){return s.default.destroyPlay(),this.destroyRecord()},e.prototype.getRecordAnalyseData=function(){return this.getAnalyseData()},e.prototype.getPlayAnalyseData=function(){return s.default.getAnalyseData()},e.prototype.getPCM=function(){this.stop();var t=this.getData();return t=a.compress(t,this.inputSampleRate,this.outputSampleRate),a.encodePCM(t,this.oututSampleBits,this.littleEdian)},e.prototype.getPCMBlob=function(){return new Blob([this.getPCM()])},e.prototype.downloadPCM=function(t){void 0===t&&(t="recorder");var e=this.getPCMBlob();r.downloadPCM(e,t)},e.prototype.getWAV=function(){var t=this.getPCM();return a.encodeWAV(t,this.inputSampleRate,this.outputSampleRate,this.config.numChannels,this.oututSampleBits,this.littleEdian)},e.prototype.getWAVBlob=function(){return new Blob([this.getWAV()],{type:"audio/wav"})},e.prototype.downloadWAV=function(t){void 0===t&&(t="recorder");var e=this.getWAVBlob();r.downloadWAV(e,t)},e.prototype.download=function(t,e,n){r.download(t,e,n)},e.prototype.getChannelData=function(){var t=this.getPCM(),e=t.byteLength,n=this.littleEdian,i={left:null,right:null};if(2===this.config.numChannels){var o=new DataView(new ArrayBuffer(e/2)),r=new DataView(new ArrayBuffer(e/2));if(16===this.config.sampleBits)for(var a=0;a<e/2;a+=2)o.setInt16(a,t.getInt16(2*a,n),n),r.setInt16(a,t.getInt16(2*a+2,n),n);else for(a=0;a<e/2;a+=2)o.setInt8(a,t.getInt8(2*a)),r.setInt8(a,t.getInt8(2*a+1));i.left=o,i.right=r}else i.left=t;return i},e}(n(5).default);e.default=u},function(t,e,n){"use strict";function i(t,e,n){var i=document.createElement("a");i.href=window.URL.createObjectURL(t),i.download=e+"."+n,i.click()}Object.defineProperty(e,"__esModule",{value:!0}),e.downloadWAV=function(t,e){void 0===e&&(e="recorder"),i(t,e,"wav")},e.downloadPCM=function(t,e){void 0===e&&(e="recorder"),i(t,e,"pcm")},e.download=function(t,e,n){return i(t,e,n)}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n(4),o=null,r=0,a=0,s=null,u=null,c=null,l=!1,f=0,p=function(){};function d(){return l=!1,s.decodeAudioData(c.slice(0),function(t){(o=s.createBufferSource()).onended=function(){l||(f=s.currentTime-a+r,p())},o.buffer=t,o.connect(u),u.connect(s.destination),o.start(0,r),a=s.currentTime},function(t){i.throwError(t)})}function h(){o&&(o.stop(),o=null)}var y=function(){function t(){}return t.play=function(t){return s||(s=new(window.AudioContext||window.webkitAudioContext),(u=s.createAnalyser()).fftSize=2048),this.stopPlay(),c=t,f=0,d()},t.pausePlay=function(){h(),r+=s.currentTime-a,l=!0},t.resumePlay=function(){return d()},t.stopPlay=function(){r=0,c=null,h()},t.destroyPlay=function(){this.stopPlay()},t.getAnalyseData=function(){var t=new Uint8Array(u.frequencyBinCount);return u.getByteTimeDomainData(t),t},t.addPlayEnd=function(t){void 0===t&&(t=function(){}),p=t},t.getPlayTime=function(){var t=l?r:s.currentTime-a+r;return f||t},t}();e.default=y},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.throwError=function(t){throw new Error(t)}},function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0});var i=n(0),o=function(){function t(e){void 0===e&&(e={}),this.size=0,this.lBuffer=[],this.rBuffer=[],this.tempPCM=[],this.inputSampleBits=16,this.fileSize=0,this.duration=0,this.needRecord=!0;var n,i=new(window.AudioContext||window.webkitAudioContext);this.inputSampleRate=i.sampleRate,this.setNewOption(e),this.littleEdian=(n=new ArrayBuffer(2),new DataView(n).setInt16(0,256,!0),256===new Int16Array(n)[0]),t.initUserMedia()}return t.prototype.setNewOption=function(t){void 0===t&&(t={}),this.config={sampleBits:~[8,16].indexOf(t.sampleBits)?t.sampleBits:16,sampleRate:~[8e3,11025,16e3,22050,24e3,44100,48e3].indexOf(t.sampleRate)?t.sampleRate:this.inputSampleRate,numChannels:~[1,2].indexOf(t.numChannels)?t.numChannels:1},this.outputSampleRate=this.config.sampleRate,this.oututSampleBits=this.config.sampleBits},t.prototype.startRecord=function(){var t=this;return this.context&&this.destroyRecord(),this.initRecorder(),navigator.mediaDevices.getUserMedia({audio:!0}).then(function(e){t.audioInput=t.context.createMediaStreamSource(e),t.stream=e}).then(function(){t.audioInput.connect(t.analyser),t.analyser.connect(t.recorder),t.recorder.connect(t.context.destination)})},t.prototype.pauseRecord=function(){this.needRecord=!1},t.prototype.resumeRecord=function(){this.needRecord=!0},t.prototype.stopRecord=function(){this.audioInput&&this.audioInput.disconnect(),this.source&&this.source.stop(),this.recorder.disconnect(),this.analyser.disconnect(),this.needRecord=!0},t.prototype.destroyRecord=function(){return this.clearRecordStatus(),this.stopStream(),this.closeAudioContext()},t.prototype.getAnalyseData=function(){var t=new Uint8Array(this.analyser.frequencyBinCount);return this.analyser.getByteTimeDomainData(t),t},t.prototype.getData=function(){return this.flat()},t.prototype.clearRecordStatus=function(){this.lBuffer.length=0,this.rBuffer.length=0,this.size=0,this.fileSize=0,this.PCM=null,this.audioInput=null,this.duration=0},t.prototype.flat=function(){var t=null,e=new Float32Array(0);1===this.config.numChannels?t=new Float32Array(this.size):(t=new Float32Array(this.size/2),e=new Float32Array(this.size/2));for(var n=0,i=0;i<this.lBuffer.length;i++)t.set(this.lBuffer[i],n),n+=this.lBuffer[i].length;n=0;for(i=0;i<this.rBuffer.length;i++)e.set(this.rBuffer[i],n),n+=this.rBuffer[i].length;return{left:t,right:e}},t.prototype.initRecorder=function(){var t=this;this.clearRecordStatus(),this.context=new(window.AudioContext||window.webkitAudioContext),this.analyser=this.context.createAnalyser(),this.analyser.fftSize=2048;var e=this.context.createScriptProcessor||this.context.createJavaScriptNode;this.recorder=e.apply(this.context,[4096,this.config.numChannels,this.config.numChannels]),this.recorder.onaudioprocess=function(e){if(t.needRecord){var n,i=e.inputBuffer.getChannelData(0),o=null;t.lBuffer.push(new Float32Array(i)),t.size+=i.length,2===t.config.numChannels&&(o=e.inputBuffer.getChannelData(1),t.rBuffer.push(new Float32Array(o)),t.size+=o.length),t.fileSize=Math.floor(t.size/Math.max(t.inputSampleRate/t.outputSampleRate,1))*(t.oututSampleBits/8),n=100*Math.max.apply(Math,i),t.duration+=4096/t.inputSampleRate,t.onprocess&&t.onprocess(t.duration),t.onprogress&&t.onprogress({duration:t.duration,fileSize:t.fileSize,vol:n})}}},t.prototype.stopStream=function(){this.stream&&this.stream.getTracks&&(this.stream.getTracks().forEach(function(t){return t.stop()}),this.stream=null)},t.prototype.closeAudioContext=function(){return this.context&&this.context.close&&"closed"!==this.context.state?this.context.close():new Promise(function(t){t()})},t.initUserMedia=function(){void 0===navigator.mediaDevices&&(navigator.mediaDevices={}),void 0===navigator.mediaDevices.getUserMedia&&(navigator.mediaDevices.getUserMedia=function(t){var e=navigator.getUserMedia||navigator.webkitGetUserMedia||navigator.mozGetUserMedia;return e?new Promise(function(n,i){e.call(navigator,t,n,i)}):Promise.reject(new Error("浏览器不支持 getUserMedia !"))})},t.prototype.transformIntoPCM=function(t,e){var n=new Float32Array(t),o=new Float32Array(e),r=i.compress({left:n,right:o},this.inputSampleRate,this.outputSampleRate);return i.encodePCM(r,this.oututSampleBits,this.littleEdian)},t.getPermission=function(){return this.initUserMedia(),navigator.mediaDevices.getUserMedia({audio:!0}).then(function(t){t&&t.getTracks().forEach(function(t){return t.stop()})})},t}();e.default=o}]).default});
+//# sourceMappingURL=recorder.js.map
\ No newline at end of file
diff --git a/common/js/setData.js b/common/js/setData.js
new file mode 100644
index 0000000..93f4394
--- /dev/null
+++ b/common/js/setData.js
@@ -0,0 +1,26 @@
+let setData = function(obj) {
+	let that = this;
+	let keys = [];
+	let val, data;
+	Object.keys(obj).forEach(function(key) {
+		keys = key.split('.');
+		val = obj[key];
+		data = that.$data;
+		if (keys.length === 1) {
+			if(!!that.$data[key]){
+				that.$set(that, key, val);
+			}else{
+				that[key] = val;
+			}
+		} else {
+			let setKey = keys.slice(0, keys.length - 1),
+				setObj = null;
+			setKey.map(itemKey => {
+				let ojbItem = setObj;
+				setObj = !!setObj ? setObj[itemKey] : that[itemKey];
+			});
+			that.$set(setObj, keys[keys.length - 1], val);
+		}
+	});
+}
+export default setData
diff --git a/common/js/util.js b/common/js/util.js
new file mode 100644
index 0000000..8453e7b
--- /dev/null
+++ b/common/js/util.js
@@ -0,0 +1,338 @@
+/**
+ * 工具类
+ */
+/*
+ * @description: 公用方法文件
+ * @author: 杨智源,吴潇
+ * @update: 2018-12-26
+ * 使用方式: this.$util.方法名
+ */
+const util = {
+	/**
+	 * 时间戳格式化
+	 * @param {Number} datetime 时间戳(秒)
+	 * @param {String} formateType 时间戳所需处理的方式 normal(月日时分),info(年月日时分秒),rule(年月日时分秒,date(年月日)
+	 * @param {String} joinType 日期间隔符号
+	 * @return {String}  日期字符串
+	 */
+	formatTime(datetime, formateType, joinType) {
+		const date = new Date(Number(datetime) * 1000),
+			year = date.getFullYear(),
+			month = date.getMonth() + 1,
+			day = date.getDate(),
+			hour = date.getHours(),
+			minute = date.getMinutes(),
+			second = date.getSeconds(),
+			formatNumber = function formatNumber(n) {
+				n = n.toString();
+				return n[1] ? n : '0' + n;
+			},
+			timeType = {
+				'normal': [
+					[month, day],
+					[hour, minute]
+				],
+				'info': [
+					[year, month, day],
+					[hour, minute, second]
+				],
+				'rule': [
+					[year, month, day],
+					[hour, minute]
+				],
+			};
+		if (formateType == 'date') {
+			return [year, month, day].map(formatNumber).join(joinType);
+		} else {
+			return timeType[formateType][0].map(formatNumber).join(joinType) + ' ' + timeType[formateType][1].map(formatNumber)
+				.join(':');
+		}
+	},
+
+	/**
+	 * 计算距离时间
+	 * @param {String} dateStr 时间格式字符串 yyyy-mm-dd HH:MM:ss
+	 * @return {String}  日期字符串
+	 */
+	dateDistance(dateStr) {
+		let UNITS = {
+				'年': 31557600000,
+				'月': 2629800000,
+				'天': 86400000,
+				'小时': 3600000,
+				'分钟': 60000,
+				'秒': 1000
+			},
+			humanize = function(milliseconds) {
+				var humanize = '';
+				for (var key in UNITS) {
+					if (milliseconds >= UNITS[key]) {
+						humanize = Math.floor(milliseconds / UNITS[key]) + key + '前';
+						break;
+					}
+				}
+				return humanize || '刚刚';
+			},
+			format = function(dateStr) {
+				var date = parse(dateStr)
+				var diff = Date.now() - date.getTime();
+				if (diff < UNITS['天']) {
+					return humanize(diff);
+				}
+				var _format = function(number) {
+					return (number < 10 ? ('0' + number) : number);
+				};
+				return date.getFullYear() + '/' + _format(date.getMonth() + 1) + '/' + _format(date.getDay()) + '-' +
+					_format(date.getHours()) + ':' + _format(date.getMinutes());
+			},
+			parse = function(str) { //将"yyyy-mm-dd HH:MM:ss"格式的字符串，转化为一个Date对象
+				var a = str.split(/[^0-9]/);
+				return new Date(a[0], a[1] - 1, a[2], a[3], a[4], a[5]);
+			};
+		return format(dateStr);
+	},
+
+	/**
+	 * Base64编码解码
+	 * @return {String}  Base64字符串
+	 * 使用方法：new Base64().encode(String) , new Base64().decode(String)
+	 */
+	Base64() {
+		var _keyStr = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
+
+		// 编码
+		this.encode = function(input) {
+			var output = "";
+			var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
+			var i = 0;
+			input = _utf8_encode(input);
+			while (i < input.length) {
+				chr1 = input.charCodeAt(i++);
+				chr2 = input.charCodeAt(i++);
+				chr3 = input.charCodeAt(i++);
+				enc1 = chr1 >> 2;
+				enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
+				enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
+				enc4 = chr3 & 63;
+				if (isNaN(chr2)) {
+					enc3 = enc4 = 64;
+				} else if (isNaN(chr3)) {
+					enc4 = 64;
+				}
+				output = output +
+					_keyStr.charAt(enc1) + _keyStr.charAt(enc2) +
+					_keyStr.charAt(enc3) + _keyStr.charAt(enc4);
+			}
+			return output;
+		}
+
+		// 解码
+		this.decode = function(input) {
+			var output = "";
+			var chr1, chr2, chr3;
+			var enc1, enc2, enc3, enc4;
+			var i = 0;
+			input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+			while (i < input.length) {
+				enc1 = _keyStr.indexOf(input.charAt(i++));
+				enc2 = _keyStr.indexOf(input.charAt(i++));
+				enc3 = _keyStr.indexOf(input.charAt(i++));
+				enc4 = _keyStr.indexOf(input.charAt(i++));
+				chr1 = (enc1 << 2) | (enc2 >> 4);
+				chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+				chr3 = ((enc3 & 3) << 6) | enc4;
+				output = output + String.fromCharCode(chr1);
+				if (enc3 != 64) {
+					output = output + String.fromCharCode(chr2);
+				}
+				if (enc4 != 64) {
+					output = output + String.fromCharCode(chr3);
+				}
+			}
+			output = _utf8_decode(output);
+			return output;
+		}
+
+		let _utf8_encode = function(string) {
+			string = string.replace(/\r\n/g, "\n");
+			var utftext = "";
+			for (var n = 0; n < string.length; n++) {
+				var c = string.charCodeAt(n);
+				if (c < 128) {
+					utftext += String.fromCharCode(c);
+				} else if ((c > 127) && (c < 2048)) {
+					utftext += String.fromCharCode((c >> 6) | 192);
+					utftext += String.fromCharCode((c & 63) | 128);
+				} else {
+					utftext += String.fromCharCode((c >> 12) | 224);
+					utftext += String.fromCharCode(((c >> 6) & 63) | 128);
+					utftext += String.fromCharCode((c & 63) | 128);
+				}
+
+			}
+			return utftext;
+		}
+
+		let _utf8_decode = function(utftext) {
+			var string = "";
+			var i = 0;
+			var c2 = 0,
+				c1 = c2,
+				c = c1;
+			while (i < utftext.length) {
+				c = utftext.charCodeAt(i);
+				if (c < 128) {
+					string += String.fromCharCode(c);
+					i++;
+				} else if ((c > 191) && (c < 224)) {
+					c2 = utftext.charCodeAt(i + 1);
+					string += String.fromCharCode(((c & 31) << 6) | (c2 & 63));
+					i += 2;
+				} else {
+					c2 = utftext.charCodeAt(i + 1);
+					var c3 = utftext.charCodeAt(i + 2);
+					string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
+					i += 3;
+				}
+			}
+			return string;
+		}
+	},
+
+	/**
+	 * 获取对象里每一项的值(代替Object.values())
+	 * @param {Object} obj 一个对象
+	 * @return {String}  一个给定对象自身的所有属性值的数组
+	 */
+	objectValues(obj) {
+		let valuesArray = []
+		if (obj) {
+			for (let key in obj) {
+				valuesArray.push(obj[key]);
+			}
+		}
+		return valuesArray
+	},
+
+	/**
+	 * 请求转换成Promise对象
+	 * @param {Object} options 请求参数
+	 * @param {Object} pageObj 当前页面实例
+	 * @param {Boolean} isToken 请求是否需要携带用户token
+	 * @returns {Promise} Promise对象
+	 */
+	requestPromise(options, pageObj, isToken = false) {
+		return new Promise((resolve, reject) => {
+			pageObj.$request({ ...options
+			}, res => resolve(res), pageObj, isToken);
+		});
+	},
+
+	/**
+	 * scene解码
+	 */
+	scene_decode(e) {
+		if (e === undefined)
+			return {};
+		let scene = decodeURIComponent(e),
+			params = scene.split(','),
+			data = {};
+		for (let i in params) {
+			var val = params[i].split(':');
+			val.length > 0 && val[0] && (data[val[0]] = val[1] || null)
+		}
+		return data;
+	},
+
+	/**
+	 * 防止滚动触发多次函数
+	 * @param {Number} wait 重复间隔
+	 * @param {Function} handler 处理操作
+	 */
+	scorllTimert: null,
+	debounce(wait, handler) {
+		let that = this;
+		return (() => {
+			// 每次触发 scroll 时先清除定时器
+			clearTimeout(that.scorllTimert);
+			that.scorllTimert = setTimeout(() => {
+				handler();
+			}, wait);
+		})();
+	},
+
+	/**
+	 * 获取url链接参数
+	 * @param {String} name 需要获取的参数名
+	 * @param {String} params url链接
+	 * @param {Boolean} ishref 是否使用完整的href路径作为正则匹配的参数 默认为否
+	 */
+	getParams(name, params, ishref = !1) {
+		var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+		var r = !!params ? (ishref ? params.includes('?') && params.split('?')[1].match(reg) : params.match(reg)) : null;
+		if (Object.prototype.toString.call(r) == "[object Array]") {
+			return r[2];
+		}
+		if (r != null) {
+			return unescape(r[2]);
+		}
+		return r || null;
+	},
+
+	/**
+	 * 坐标系转换
+	 */
+	// bd09转gcj02
+	baidu_To_qq(lat, lon) {
+		let x_pi = 3.14159265358979324 * 3000.0 / 180.0,
+			x = lon - 0.0065,
+			y = lat - 0.006,
+			z = Math.sqrt(x * x + y * y) - 0.00002 * Math.sin(y * x_pi),
+			theta = Math.atan2(y, x) - 0.000003 * Math.cos(x * x_pi),
+			latitude = z * Math.cos(theta),
+			longitude = z * Math.sin(theta),
+			gps = {
+				latitude,
+				longitude
+			};
+		return gps;
+	},
+	//gcj02转bd09
+	qq_To_baidu(lat, lng) {
+		let x_PI = 3.14159265358979324 * 3000.0 / 180.0,
+			z = Math.sqrt(lng * lng + lat * lat) + 0.00002 * Math.sin(lat * x_PI),
+			theta = Math.atan2(lat, lng) + 0.000003 * Math.cos(lng * x_PI),
+			latitude = z * Math.cos(theta) + 0.0065,
+			longitude = z * Math.sin(theta) + 0.006,
+			gps = {
+				latitude,
+				longitude
+			};
+		return gps;
+	},
+	
+	// 浮点数计算
+	// @digit {Number} 浮点数乘以的次方
+	// 加法 
+	additionFloat(one,two,digit){
+		let num=((one*digit)+(two*digit))/digit
+		return num;
+	},
+	// 减法
+	subtractionFloat(one,two,digit){
+		let num=((one*digit)-(two*digit))/digit
+		return num;
+	},
+	// 乘法
+	multiplicationFloat(one,two,digit){
+		let num=((one*digit)*(two*digit))/(digit*digit)
+		return num;
+	},
+	// 除法
+	divisionFloat(one,two,digit){
+		let num=((one*digit)/(two*digit))/(digit*digit)
+		return num;
+	},
+	
+};
+export default util
diff --git a/common/js/wxApi.js b/common/js/wxApi.js
new file mode 100644
index 0000000..2102982
--- /dev/null
+++ b/common/js/wxApi.js
@@ -0,0 +1,234 @@
+import App from "@/common/js/app.js"
+const wxApi = {
+	configData: null,
+	/**
+	 * [wxRegister 微信Api初始化]
+	 */
+	wxRegister(callback) {
+		let _this = this,
+			signUrl = encodeURIComponent(location.href.split("#")[0]),
+			jsApiList = ["hideAllNonBaseMenuItem", "onMenuShareTimeline", "onMenuShareAppMessage", "openBusinessView",
+				"scanQRCode",
+				"getLocation", "chooseImage", "uploadImage", "openAddress", "openLocation", "translateVoice", 'stopRecord',
+				'startRecord', "WeixinJSBridgeReady",'playVoice',"uploadVoice","downloadVoice","updateAppMessageShareData","updateTimelineShareData"
+			];
+		App._post_form("&do=getJssdk", {
+			sign_url: signUrl
+		}, (res) => {
+			let data = res.data;
+			jWeixin.config({
+				debug: false, // 开启调试模式
+				appId: data.appId, // 必填，公众号的唯一标识
+				timestamp: data.timestamp, // 必填，生成签名的时间戳
+				nonceStr: data.nonceStr, // 必填，生成签名的随机串
+				signature: data.signature, // 必填，签名
+				jsApiList: jsApiList ,// 必填，需要使用的JS接口列表
+				openTagList:['wx-open-launch-weapp','wx-open-subscribe']
+			});
+			jWeixin.ready(() => {
+				// jWeixin.hideMenuItems({
+				//     menuList: ["menuItem:copyUrl"] // 要隐藏的菜单项，只能隐藏“传播类”和“保护类”按钮
+				// });
+				callback && callback();
+			});
+			_this.configData = {
+				...data,
+				url: signUrl
+			}
+			jWeixin.error((optinos) => {
+				// config信息验证失败会执行error函数，
+				//如签名过期导致验证失败，具体错误信息可以打开config的debug模式查看，
+				//也可以在返回的res参数中查看，对于SPA可以在这里更新签名。
+				console.log(optinos, 'optinos',_this.configData.url)
+				// App.showError(optinos.errMsg)
+			});
+			// jWeixin.success((options) => {
+			// 	console.log(optinos, 'optinos')
+			// })
+			// wx.ready(function() {
+			//    wx.hideMenuItems({
+			//        menuList: ["menuItem:copyUrl"] // 要隐藏的菜单项，只能隐藏“传播类”和“保护类”按钮
+			//    });
+			// });
+			// jWeixin.ready(function() {
+			//    jWeixin.hideMenuItems({
+			//        menuList: ["menuItem:copyUrl","menuItem:editTag","menuItem:delete","menuItem:originPage","menuItem:readMode", "menuItem:openWithQQBrowser", "menuItem:openWithSafari","menuItem:share:email","menuItem:share:brand","menuItem:share:qq","menuItem:share:QZone"] // 要隐藏的菜单项，只能隐藏“传播类”和“保护类”按钮
+			//    });
+			// });
+		});
+	},
+	wxShare(options){
+		jWeixin.onMenuShareAppMessage(options);
+		jWeixin.onMenuShareTimeline(options);
+		// jWeixin.updateAppMessageShareData(options);
+		// jWeixin.updateTimelineShareData(options);
+	},
+	oldWxShare(options) {
+		jWeixin.onMenuShareAppMessage(options);		
+		jWeixin.onMenuShareTimeline(options);
+		jWeixin.updateAppMessageShareData(options);
+		jWeixin.updateTimelineShareData(options);
+		// jWeixin.onMenuShareTimeline({
+		// 	title: options.title, // 分享标题
+		// 	desc: options.desc, // 分享描述
+		// 	link: options.link, // 分享链接
+		// 	imgUrl: options.imgUrl, // 分享图标
+		// 	success: function() {
+		// 		// 用户点击了分享后执行的回调函数
+		// 	},
+		// })
+	},
+	WxopenLocation(lat, lng, storename, address) {
+		jWeixin.openLocation({
+			latitude: Number(lat), // 纬度，浮点数，范围为90 ~ -90
+			longitude: Number(lng), // 经度，浮点数，范围为180 ~ -180。
+			name: storename, // 位置名
+			address: address, // 地址详情说明
+			scale: 14, // 地图缩放级别,整形值,范围从1~28。默认为最大
+			infoUrl: '' // 在查看位置界面底部显示的超链接,可点击跳转
+		});
+	},
+	wxPay(options) {
+		jWeixin.chooseWXPay({
+			timestamp: options.timeStamp, // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+			nonceStr: options.nonceStr, // 支付签名随机串，不长于 32 位
+			package: options.package, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+			signType: options.signType, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+			paySign: options.paySign, // 支付签名
+			success(res) {
+				// 支付成功后的回调函数
+				options.success && options.success(res)
+			},
+			cancel(res) {
+				options.cancel && options.cancel(res)
+			},
+			fail(res) {
+				options.fail && options.fail(res)
+			}
+		});
+	},
+	scanQRCode(callback) {
+		jWeixin.scanQRCode({
+			needResult: 0, // 默认为0，扫描结果由微信处理，1则直接返回扫描结果，
+			scanType: ["qrCode", "barCode"], // 可以指定扫二维码还是一维码，默认二者都有
+			complete(res) {
+				callback && callback(res);
+			}
+		});
+	},
+	hideMenuItem() {
+		jWeixin.hideAllNonBaseMenuItem();
+	},
+	getLocation(optinos) {
+		jWeixin.getLocation(optinos);
+	},
+	getLocation1() {
+		jWeixin.getLocation({
+			type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+			success: function(res) {
+				jWeixin.openLocation({
+					latitude: res.latitude, // 纬度，浮点数，范围为90 ~ -90
+					longitude: res.longitude, // 经度，浮点数，范围为180 ~ -180。
+					name: '', // 位置名
+					address: '', // 地址详情说明
+					scale: 14, // 地图缩放级别,整形值,范围从1~28。默认为最大
+					infoUrl: '' // 在查看位置界面底部显示的超链接,可点击跳转
+				});
+			}
+		});
+	},
+	// 选取图片
+	choseImage(callback,num=1) {
+		
+			jWeixin.chooseImage({
+				count: num, // 默认9
+				sizeType: ['original', 'compressed'], // 可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], // 可以指定来源是相册还是相机，默认二者都有
+				complete: function(res) {
+					callback && callback(res);
+				}
+			});
+		
+	},
+	//上传图片
+	uoloadIg(localId, callback) {
+		debugger
+		// App._upLoad()
+		jWeixin.uploadImage({
+			localId: localId, // 需要上传的图片的本地ID，由chooseImage接口获得
+			isShowProgressTips: 1, // 默认为1，显示进度提示
+			complete: function(res) {
+				callback && callback(res)
+			}
+		});
+	},
+	/**
+	 * 微信好物圈
+	 */
+	wxGoodsCircle(queryString, success, fail) {
+		jWeixin.openBusinessView({
+			businessType: 'friendGoodsRecommend',
+			queryString: queryString,
+			success(res) {
+				success && success(res);
+			},
+			fail(res) {
+				fail && fail(res);
+			}
+		})
+	},
+	wxOpenAddress(callback) {
+		console.info(jWeixin)
+		jWeixin.openAddress({
+			success(res) {
+				callback && callback(res)
+			},
+			fail(errMsg) {
+				callback && callback(errMsg)
+				console.info('我失败了')
+			}
+		})
+	},
+	// 监听录音自动停止接口
+	wxStartRecord() {
+		console.info('startRecord')
+		jWeixin.startRecord({})
+	},
+	// 停止录音接口
+	wxStopRecord(callback) {
+		console.info('wxStopRecord')
+		jWeixin.stopRecord({
+			success: function(res) {
+				console.info('localId', res.localId)
+				callback && callback(res.localId)
+
+			}
+		})
+	},
+	//监听播放录音
+	wxPlayVoice(id){
+		jWeixin.playVoice({
+			localId:id
+		})
+	},
+	//录音上传
+	wxUploadVoice(localId,callback){
+		jWeixin.uploadVoice({
+			localId:localId,
+			success: function (res) {
+				callback && callback(res.serverId);
+			}
+		})
+	},
+	// 识别音频并返回识别结果接口
+	wxTranslateVoice(localId, callback) {
+		jWeixin.translateVoice({
+			localId: localId, // 需要识别的音频的本地Id，由录音相关接口获得
+			isShowProgressTips: 1, // 默认为1，显示进度提示
+			success: function(res) {
+				callback && callback(res.translateResult) // 语音识别的结果
+			}
+		})
+	}
+}
+export default wxApi
diff --git a/components/.DS_Store b/components/.DS_Store
new file mode 100644
index 0000000..37fdde6
Binary files /dev/null and b/components/.DS_Store differ
diff --git a/components/drag-button/drag-button.vue b/components/drag-button/drag-button.vue
new file mode 100644
index 0000000..f8151ff
--- /dev/null
+++ b/components/drag-button/drag-button.vue
@@ -0,0 +1,599 @@
+<template>
+	<view>
+		<view class="tui-fab-mask" :class="{'tui-visible':isOpen}" @tap.stop="handleClickCancel"></view>
+		<view class="tui-fab-btn" :class="{'tui-visible':isOpen,'tui-fab-hidden':hidden}" :style="'right: ' + left + 'px; bottom:' + (Number(top)+50) + 'px;'">
+			<view class="tui-fab-item-box" :class="{'tui-fab-item-left':lefts && !rights && item.imgUrl}" v-for="(item,index) in btnList"
+			 :key="index" @tap.stop="handleClick(item.id)">
+				<view :class="[lefts && !rights?'tui-text-left':'tui-text-right']" v-if="item.imgUrl" :style="{fontSize:item.fontSize+'rpx',color:item.color}">{{item.text || ""}}</view>
+				<view class="tui-fab-item" :style="{width:widths+'rpx',height:heights+'rpx',background:item.bgColor || bgColor,borderRadius:radius}">
+					<view class="tui-fab-title" v-if="!item.imgUrl" :style="{fontSize:item.fontSize+'rpx',color:item.color}">{{item.text || ""}}</view>
+					<image :src="item.imgUrl" class="tui-fab-img" v-else :style="{width:item.imgWidth+'rpx',height:item.imgHeight+'rpx'}"></image>
+				</view>
+			</view>
+		</view>
+		
+		<view v-if="CustomerService.wxappcur == 1">
+			<button
+				id="_drag_button"
+				class="drag buttondrag"
+				open-type="contact"
+				:style="'left: ' + left + 'px; bottom:' + top + 'px;'"
+				@touchstart="touchstart"
+				@touchmove.stop.prevent="touchmovel"
+				@touchend="touchend"
+				hover-class="none"
+				:class="{transition: isDock && !isMove }"
+			>
+				<image :src="CustomerService.susicon" class="img" :style="{width: CustomerService.logowidth + 'px',height:CustomerService.logowidth + 'px'}"  mode="aspectFit"></image>
+			</button>
+		</view>
+		<view v-else>
+			<view v-if="CustomerService.logoloca == 1">
+					<view
+						id="_drag_button"
+						class="drag"
+						:style="'left: ' + left + 'px; bottom:' + top + 'px;'"
+						@touchstart="touchstart"
+						@touchmove.stop.prevent="touchmovel"
+						@touchend="touchend"
+						@click.stop.prevent="click(-1)"
+						:class="{transition: isDock && !isMove }"
+					>
+						<image :src="CustomerService.susicon" class="img" :style="{width: CustomerService.logowidth + 'px',height:CustomerService.logowidth + 'px'}"  mode="aspectFit"></image>
+					</view>
+			</view>
+			
+			<view v-if="CustomerService.logoloca == 0">
+					<view
+						id="_drag_button"
+						class="drag"
+						:style="'right: ' + left + 'px; bottom:' + top + 'px;'"
+						@touchstart="touchstart"
+						@touchmove.stop.prevent="touchmover"
+						@touchend="touchend"
+						@click.stop.prevent="click(-1)"
+						:class="{transition: isDock && !isMove }"
+					>
+						<image :src="CustomerService.susicon" class="img" :style="{width: CustomerService.logowidth + 'px',height:CustomerService.logowidth + 'px'}"  mode="aspectFit"></image>
+					</view>
+				
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		name: 'drag-button',
+		props: {
+			isDock:{
+				type: Boolean,
+				default: false
+			},
+			existTabBar:{
+				type: Boolean,
+				default: false
+			},
+			btndata:{
+				type:Object,
+				default:null
+			},
+			lefts: {
+				type: Number,
+				default: 0
+			},
+			//rpx 当为0时且left不为0，值为auto
+			rights: {
+				type: Number,
+				default: 80
+			},
+			//rpx bottom值
+			bottoms: {
+				type: Number,
+				default: 100
+			},
+			//默认按钮 宽度 rpx
+			widths: {
+				type: Number,
+				default: 108
+			},
+			//默认按钮 高度 rpx
+			heights: {
+				type: Number,
+				default: 108
+			},
+			//圆角值
+			radius: {
+				type: String,
+				default: "50%"
+			},
+			//默认按钮背景颜色
+			bgColor: {
+				type: String,
+				default: "#5677fc"
+			},
+			//字体颜色
+			color: {
+				type: String,
+				default: "#fff"
+			},
+			//拓展按钮
+			// bgColor: "#5677fc",
+			// //图标/图片地址
+			// imgUrl: "/static/images/fab/fab_reward.png",
+			// //图片高度 rpx
+			// imgHeight: 60,
+			// //图片宽度 rpx
+			// imgWidth: 60,
+			// //名称
+			// text: "名称",
+			// //字体大小
+			// fontSize: 30,
+			// //字体颜色
+			// color: "#fff"
+			//点击遮罩 是否可关闭
+			maskClosable: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				top:0,
+				left:0,
+				width: 0,
+				height: 0,
+				offsetWidth: 0,
+				offsetHeight: 0,
+				windowWidth: 0,
+				windowHeight: 0,
+				isMove: true,
+				edge: 10,
+				text: '按钮',
+				CustomerService:'',
+				isOpen: false,
+				hidden: true,
+				timer: null,
+				btnList: [{
+					bgColor: "#16C2C2",
+					//名称
+					text: "客服",
+					//字体大小
+					fontSize: 28,
+					id:0,
+					//字体颜色
+					color: "#fff"
+				}
+				// , 
+				// {
+				// 	bgColor: "#FFA000",
+				// 	//名称
+				// 	text: "链接",
+				// 	//字体大小
+				// 	fontSize: 28,
+				// 	id:2,
+				// 	//字体颜色
+				// 	color: "#fff"
+				// }
+				]
+			}
+		},
+		onHide() {
+			console.log('进了onhide');
+		},
+		mounted() {
+			const sys = uni.getSystemInfoSync();
+			let _this = this;
+			//#ifdef APP-PLUS
+			let obj =  {
+					bgColor: "#64B532",
+					//名称
+					text: "分享",
+					//字体大小
+					fontSize: 28,
+					id:1,
+					//字体颜色
+					color: "#fff"};
+			this.btnList.push(obj);
+			//#endif
+			this.windowWidth = sys.windowWidth;
+			this.windowHeight = sys.windowHeight;
+			this.CustomerService = uni.getStorageSync('CustomerService');
+			let btnleftAndbottom = uni.getStorageSync('btnleftAndbottom');
+			if(btnleftAndbottom){
+				this.left = btnleftAndbottom.left;
+				this.top = btnleftAndbottom.top;
+			}else{
+				this.left = this.CustomerService.logoleft;
+				this.top = this.CustomerService.logobottom;
+			}
+			// #ifdef APP-PLUS
+				this.existTabBar && (this.windowHeight -= 50);
+			// #endif
+			if (sys.windowTop) {
+				this.windowHeight += sys.windowTop;
+			}
+			uni.$on('getFarBtn',function(data){
+				_this.getFar();
+			})
+		},
+		methods: {
+			getLeft() {
+				let val = "auto"
+				if (this.lefts && !this.rights) {
+					val = this.left + 'rpx'
+				}
+				return val
+			},
+			getRight() {
+				let val = this.rights + 'rpx'
+				if (this.lefts && !this.rights) {
+					val = "auto"
+				}
+				return val
+			},
+			handleClick: function(index) {
+				// this.hidden = false
+				// clearTimeout(this.timer)
+				// if (index == -1 && this.btnList.length) {
+				// 	this.isOpen = !this.isOpen
+				// } else {
+				// 	this.$emit("click", {
+				// 		index: index
+				// 	})
+				// 	this.isOpen = false
+				// }
+				// if (!this.isOpen) {
+				// 	this.timer = setTimeout(() => {
+				// 		this.hidden = true
+				// 	}, 200)
+				// }
+				if(index == 0){
+					this.$emit('btnClick');
+				}else if(index == 1){
+					let AppShareData = uni.getStorageSync('AppShareData');
+					console.log('分享数据测试',JSON.stringify(AppShareData));
+					// //#ifdef APP-PLUS
+					// uni.share({
+					//     provider: 'weixin', // 分享服务提供商（即weixin|qq|sinaweibo）
+					//     scene: "WXSceneSession", //分享到聊天界面
+					//     type: 5, //分享形式 5:小程序
+					//     imageUrl: AppShareData.img,//官方规定分享图比例是5：4,其它尺寸可能显示不全。
+					//     title: '欢迎体验uniapp',
+					//     miniProgram: {
+					//         id: 'gh_59d3d43b1c12', //微信小程序原始id
+					//         path: 'pages/mainPages/index/index', //点击链接进入的页面
+					//         type: 0, //微信小程序版本类型，可取值： 0-正式版； 1-测试版； 2-体验版。 默认值为0。
+					//         webUrl: 'https://image.baidu.com/search/index?tn=baiduimage&ct=201326592&lm=-1&cl=2&ie=gb18030&word=%CA%D6%BB%FA%B1%DA%D6%BD%CD%BC%C6%AC&fr=ala&ala=1&alatpl=normal&pos=0' //兼容低版本的网页链接
+					//     },
+					//     success: ret => {
+					//         console.log(JSON.stringify(ret));
+					//     }
+					// });
+					// //#endif
+					//#ifdef APP-PLUS
+					uni.share({
+					    provider: "weixin",
+					    scene: "WXSceneSession",
+					    type: 0,
+					    // href: AppShareData.mpurl,
+						href:'https://image.baidu.com/search/index?tn=baiduimage&ct=201326592&lm=-1&cl=2&ie=gb18030&word=%CA%D6%BB%FA%B1%DA%D6%BD%CD%BC%C6%AC&fr=ala&ala=1&alatpl=normal&pos=0',
+					    title: AppShareData.title,
+					    summary: AppShareData.desc,
+					    imageUrl: AppShareData.img,
+					    success: function (res) {
+					        console.log(JSON.stringify(res));
+					        uni.showToast({
+					            title: '已分享',
+					            duration: 2000
+					        });
+					    },
+					    
+					    fail: function (err) {
+					    
+					        var errrr = JSON.stringify(err);
+					        if(errrr){
+					            uni.showModal({
+					            title: '表单不能留空',
+					            content: '请完善所有信息再发起分享',
+					            success: function (res) {
+					if (res.confirm) {
+					        console.log('用户点击确定');
+					    } else if (res.cancel) {
+					        console.log('用户点击取消');
+					    }
+					}
+					            });
+					        }
+					    }
+					});
+					//#endif
+				}else{
+					this.$emit('btnClick');
+				}
+			},
+			handleClickCancel: function() {
+				// if (!this.maskClosable) return;
+				//#ifndef APP-PLUS
+				this.$emit('btnClick');
+				//#endif
+				//#ifdef APP-PLUS
+				this.isOpen = !this.isOpen
+				//#endif
+				
+			},
+			getFar(){
+				let btnleftAndbottom = uni.getStorageSync('btnleftAndbottom');
+				if(btnleftAndbottom){
+					this.left = btnleftAndbottom.left;
+					this.top = btnleftAndbottom.top;
+				}else{
+					this.left = this.CustomerService.logoleft;
+					this.top = this.CustomerService.logobottom;
+				}
+			},
+			click(index) {
+				//#ifdef APP-PLUS
+				this.hidden = false
+				clearTimeout(this.timer)
+				if (index == -1 && this.btnList.length) {
+					this.isOpen = !this.isOpen
+					// debugger
+				} else {
+					this.$emit("click", {
+						index: index
+					})
+					this.isOpen = false
+				}
+				if (!this.isOpen) {
+					this.timer = setTimeout(() => {
+						this.hidden = true
+					}, 200)
+				}
+				//#endif
+				//#ifndef APP-PLUS
+				if(this.CustomerService.wxappcur == 2){
+					//#ifdef H5
+					App.navigationTo({
+						url: this.CustomerService.customerurl
+					});
+					// #endif
+					//#ifdef MP-WEIXIN
+					wx.openCustomerServiceChat({
+					  extInfo: {url: this.CustomerService.customerurl},
+					  corpId: this.CustomerService.enterpriseid,
+					  success(res) {
+						  
+					  }
+					})
+					//#endif
+					
+				}else{
+					this.$emit('btnClick');
+				}
+				
+				//#endif
+				
+			},
+			touchstart(e) {
+				this.$emit('btnTouchstart');
+			},
+			touchmovel(e){
+				this.width = this.btndata.width;
+				this.height = this.btndata.height;
+				this.offsetWidth = this.btndata.width/2;
+				this.offsetHeight = this.btndata.height/2;
+				// 单指触摸
+				if (e.touches.length !== 1) {
+					return false;
+				}
+				
+				this.isMove = true;
+				this.left = e.touches[0].clientX - this.offsetWidth - 25;
+				
+				let clientY = e.touches[0].clientY - this.offsetHeight;
+				// #ifdef H5
+					clientY += this.height;
+				// #endif
+				let edgeBottom = this.windowHeight - this.height - this.edge;
+				
+				// 上下触及边界
+				
+				if(this.windowHeight < (clientY - 25)){
+					this.top = 0
+				}else if(clientY < 0){
+					return
+				}else{
+					this.top =this.windowHeight - clientY - 25;
+				}
+					// this.top =this.windowHeight - clientY - 25
+				
+				
+			},
+			touchmover(e) {
+				this.width = this.btndata.width;
+				this.height = this.btndata.height;
+				this.offsetWidth = this.btndata.width/2;
+				this.offsetHeight = this.btndata.height/2;
+				// 单指触摸
+				if (e.touches.length !== 1) {
+					return false;
+				}
+				
+				this.isMove = true;
+				this.left = this.windowWidth - e.touches[0].clientX - this.offsetWidth - 25;
+				
+				let clientY = e.touches[0].clientY - this.offsetHeight;
+				// #ifdef H5
+					clientY += this.height;
+				// #endif
+				let edgeBottom = this.windowHeight - this.height - this.edge;
+
+				// 上下触及边界
+					if(this.windowHeight < (clientY - 25)){
+						this.top = 0
+					}else if(clientY < 0){
+						return
+					}else{
+						this.top =this.windowHeight - clientY - 25;
+					}
+				
+			},
+			touchend(e) {
+				if (this.isDock) {
+					let edgeRigth = this.windowWidth - this.width - this.edge - 25;
+					setTimeout(()=>{
+						if (this.left < this.windowWidth / 2 - this.offsetWidth) {
+							this.left = -this.edge;
+						} else {
+							this.left = edgeRigth;
+						}
+						let btnleftAndbottom = {
+							left:this.left,
+							top:this.top
+						};
+						uni.setStorageSync('btnleftAndbottom',btnleftAndbottom);
+					},200)
+				}
+				
+				this.isMove = false;
+				
+				this.$emit('btnTouchend');
+			},
+		}}
+</script>
+
+<style lang="scss">
+	.drag {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		// background-color: rgba(0, 0, 0, 0.5);
+		// box-shadow: 0 0 6upx rgba(0, 0, 0, 0.4);
+		color: $uni-text-color-inverse;
+		// width: 80upx;
+		// height: 80upx;
+		// border-radius: 50%;
+		font-size: $uni-font-size-sm;
+		position: fixed;
+		z-index: 999999;
+		
+		&.transition {
+			transition: left .3s ease,top .3s ease;
+		}
+		&.transition {
+			transition: right .3s ease,bottom .3s ease;
+		}
+	}
+	.buttondrag{
+		padding: 0;
+		border-radius: 0;
+	}
+	.tui-fab-icon {
+		font-family: "tuifab" !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		padding: 10rpx;
+	}
+	
+	.tui-icon-plus:before {
+		content: "\e613";
+	}
+	
+	.tui-fab-box {
+		display: flex;
+		justify-content: center;
+		flex-direction: column;
+		position: fixed;
+		z-index: 99997;
+	}
+	
+	.tui-fab-right {
+		align-items: flex-end;
+	}
+	
+	.tui-fab-btn {
+		transform: scale(0);
+		transition: all 0.2s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+		position: fixed;
+		z-index: 999999;
+	}
+	
+	.tui-fab-hidden {
+		height: 0;
+		width: 0;
+	}
+	
+	
+	.tui-fab-item-box {
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		padding-bottom: 40rpx;
+	}
+	
+	.tui-fab-item-left {
+		flex-flow: row-reverse;
+	}
+	
+	.tui-fab-title {
+		width: 90%;
+		text-align: center;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+	}
+	
+	.tui-text-left {
+		padding-left: 28rpx;
+	}
+	
+	.tui-text-right {
+		padding-right: 28rpx;
+	}
+	
+	.tui-fab-img {
+		display: block;
+	}
+	
+	.tui-fab-item {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		box-shadow: 0 0 5px 2px rgba(0, 0, 0, 0.1);
+		transition: all 0.2s linear;
+	}
+	
+	.tui-radius {
+		border-radius: 50%;
+	}
+	
+	.tui-active {
+		transform: rotate(135deg);
+	}
+	
+	.tui-fab-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background: rgba(0, 0, 0, 0.75);
+		z-index: 99996;
+		transition: all 0.2s ease-in-out;
+		opacity: 0;
+		visibility: hidden;
+	}
+	
+	.tui-visible {
+		visibility: visible;
+		opacity: 1;
+		transform: scale(1);
+	}
+</style>
diff --git a/components/hx-jump-ball/hx-jump-ball.vue b/components/hx-jump-ball/hx-jump-ball.vue
new file mode 100644
index 0000000..8c93bf5
--- /dev/null
+++ b/components/hx-jump-ball/hx-jump-ball.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="hx-jump-ball">
+		<view class="ballBox" :animation="ballBoxAnimationData" >
+			<view class="ballOuter" 
+			:animation="ballOuterAnimationData" 
+			:style="{width:ballWidth*2 + 'upx',height:ballHeight*2 + 'upx','background-color':backgroundColor,'background-image': backgroundImage ?`url(${backgroundImage})`: '','z-index':index}">
+			<text style="font-size: 24;margin: auto;color: #FFFFFF;font-weight: 700;line-height: 20upx;text-align: center;">+1</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "hx-jump-ball",
+		data() {
+			return {
+				flag: false,
+				ballBoxAnimation: null,
+				ballOuterAnimation: null,
+				ballBoxAnimationData: {},
+				ballOuterAnimationData: {},
+			};
+		},
+		props: {
+			//小球宽度
+			ballWidth: {
+			    type: Number,
+				default: 20
+			},
+			//小球高度
+			ballHeight: {
+			    type: Number,
+				default: 20
+			},
+			//小球颜色
+			backgroundColor: {
+			    type: String,
+				default: "#ff4444"
+			},
+			//图片
+			backgroundImage: {
+			    type: String,
+				default: ""
+			},
+			//小球的堆叠顺序
+			index: {
+			    type: Number,
+				default: 999
+			},
+			//开始动画
+			start: {
+			    type: Number,
+				default: 1
+			},
+			//html元素class名称，[起点元素，终点元素]
+			element:{
+				type: Array,
+				default(){
+					return []
+				}
+			},
+			//下落速度 ms毫秒
+			speed:{
+				type: Number,
+				default: 400
+			},
+			//贝塞尔曲线
+			bezier:{
+				type: String,
+				default: "cubic-bezier(.6,-0.63,.94,.71)"
+			}
+		},
+		watch:{
+			'start': {
+				handler(val,oldVal) {
+					console.log(val,oldVal);
+					let that = this;
+					if(!that.element){
+						return;
+					}
+					if(that.flag == true){
+						return;
+					}else{
+						that.flag = !that.flag;
+						console.log(that.flag);
+						that.getElementCoordinate(that.element[0],that.element[1]);
+					}
+					
+				},
+				deep: true, //对象内部的属性监听，也叫深度监听
+			}
+		},
+		created() {
+			this.ballBoxAnimation = uni.createAnimation({
+				duration: 0,
+				timingFunction: this.bezier,
+				delay: 0
+			}); 
+			this.ballOuterAnimation = uni.createAnimation({
+				duration: 0,
+				timingFunction: "linear",
+				delay: 0
+			});
+			this.setEnd();
+			//初始化位置
+		},
+		mounted() {
+			this.monitoring() // 注册监听事件
+			 uni.$on('update',function(data){
+			        this.setEnd();
+			    })
+		},
+		methods:{
+			 monitoring() { // 监听事件
+			 let that = this;
+			    this.$on('childMethod', (res) => {
+					that.element = res;
+					that.getElementCoordinate(that.element[0],that.element[1]);
+			    })
+			},
+			//获取元素坐标
+			getElementCoordinate(startElement,endElement){
+				let that = this;
+					  const SLeft = startElement.left  + ((startElement.width + that.ballWidth ) / 2  - that.ballWidth);
+					  const STop = startElement.bottom - ((startElement.height - that.ballHeight ) / 2  + that.ballHeight);
+					  
+					  
+						  //计算出元素的中心坐标
+					  	  let ELeft = endElement.left + ((endElement.width + that.ballWidth ) / 2  - that.ballWidth);
+					  	  let ETop = endElement.bottom - ((endElement.height - that.ballHeight ) / 2  + that.ballHeight);
+						  //#ifndef H5
+						  ELeft = ELeft;
+						  ETop = ETop;
+						  //#endif
+						  //初始化位置
+						  that.setStart(SLeft,STop,ELeft,ETop);
+					  	  that.startAnimation(SLeft,STop,ELeft,ETop); 
+			},
+			
+			
+			//开始动画
+			startAnimation(SLeft,STop,ELeft,ETop){
+				let that = this;
+				let jumpDistance = SLeft - ELeft;
+				//#ifndef MP-WEIXIN
+				setTimeout(function() {
+					that.flag = !that.flag;
+					that.$emit("msg",{code:0,status:true});
+				},600);
+				//#endif
+				//#ifndef H5
+				setTimeout(function() {
+					that.flag = !that.flag;
+					that.$emit("msg",{code:0,status:true});
+				},700);
+				//#endif
+				
+			
+			//  暂时注释掉，待uniapp修复bug后再调整
+				//根坐标
+			// 	this.ballBoxAnimation.translate3d(ELeft,STop,0).step({duration: 800});
+			// 	this.ballBoxAnimation.translate3d(ELeft,ETop,0).step({duration: 800});
+			// 	this.ballBoxAnimationData = this.ballBoxAnimation.export();
+			
+			// 	console.log('根坐标执行玩');
+			// 	//相对根的坐标
+			// 	this.ballOuterAnimation.translate3d(jumpDistance,0,0).step({duration: 800});
+			// 	this.ballOuterAnimation.translate3d(0,0,0).step({duration: 800});
+			// 	this.ballOuterAnimationData = this.ballOuterAnimation.export();
+			// 	console.log('相对根的坐标');
+			// 	setTimeout(function() {
+			// 		console.log("动画完成");
+			// 		that.flag = !that.flag;
+			// 	}, 800);
+				
+				//因为uniapp  step()有bug，所以必须要延时执行
+				setTimeout(function() {
+					//根坐标
+					that.ballBoxAnimation.opacity(1).translate3d(ELeft,ETop,0).step({duration: that.speed});
+					that.ballBoxAnimationData = that.ballBoxAnimation.export();
+					
+					
+					//相对根的坐标
+					that.ballOuterAnimation.opacity(1).translate3d(0,0,0).step({duration: that.speed});
+					that.ballOuterAnimationData = that.ballOuterAnimation.export();
+				
+				}, 50);
+				
+			},
+			 //动画开始前初始化小球位置并显示小球
+			setStart(SLeft,STop,ELeft,ETop){
+				this.ballBoxAnimation.translate3d(ELeft,STop,0).opacity(1).step({duration: 0});
+				this.ballBoxAnimationData = this.ballBoxAnimation.export();
+				
+				this.ballOuterAnimation.translate3d(SLeft - ELeft,0,0).opacity(1).step({duration: 0});
+				this.ballOuterAnimationData = this.ballOuterAnimation.export();
+			},
+			
+			//隐藏小球
+			setEnd(){
+				this.ballBoxAnimation.opacity(0).step({duration: 0});
+				this.ballBoxAnimationData = this.ballBoxAnimation.export();
+				
+				this.ballOuterAnimation.opacity(0).step({duration: 0});
+				this.ballOuterAnimationData = this.ballOuterAnimation.export();
+			}
+		}
+	}
+</script>
+
+<style>
+	.ballBox{
+		position: fixed;
+		left: -10upx;
+		top: 15upx;
+		z-index: 9;
+		/*  用颜色来演示用原理 */
+		/* background-color: #4CD964; */
+		height:30rpx;
+		width:30rpx;
+	}
+	.ballOuter {
+	   background:red;
+	   height:100%;
+	   width:100%;
+	   border-radius: 50%;
+	   background-size: 100% 100%;
+	   background-position: center;
+	   z-index: 999;
+	}
+	
+</style>
diff --git a/components/invinbg-image-cropper/.DS_Store b/components/invinbg-image-cropper/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/components/invinbg-image-cropper/.DS_Store differ
diff --git a/components/invinbg-image-cropper/invinbg-image-cropper.vue b/components/invinbg-image-cropper/invinbg-image-cropper.vue
new file mode 100644
index 0000000..91cef1d
--- /dev/null
+++ b/components/invinbg-image-cropper/invinbg-image-cropper.vue
@@ -0,0 +1,759 @@
+<template>
+    <view class="vue-cropper" ref="cropper" :style="{ top : `${containerTop}px` }" v-show="show">
+        <view class="cropper-box">
+            <view class="cropper-box-canvas" @touchstart.stop.prevent="imgTouchStart" @touchmove.stop.prevent="imgMoveing" @touchend.stop.prevent="imgMoveEnd" :style="{
+					'width': imageWidth + 'px',
+					'height': imageHeight + 'px',
+					'transform': 'scale(' + scale + ',' + scale + ') ' + 'translate3d('+ x / scale + 'px,' + y / scale + 'px,' + '0)'
+					+ 'rotateZ('+ rotate * 90 +'deg)'
+					}">
+                <image :src="src" alt="cropper-img" ref="cropperImg" mode="scaleToFill" class="uni-image"></image>
+            </view>
+        </view>
+        <view class="cropper-drag-box cropper-modal cropper-move pointer-events"></view>
+        <view class="cropper-crop-box" :class="{'pointer-events': cropFixed}" :style="{'width': cropW + 'px','height': cropH + 'px','transform': 'translate3d('+ cropOffsertX + 'px,' + cropOffsertY + 'px,' + '0)'}">
+            <view class="cropper-view-box">
+                <image :style="{'width': imageWidth + 'px','height': imageHeight + 'px','transform': 'scale(' + scale + ',' + scale + ') ' + 'translate3d('+ (x - cropOffsertX) / scale  + 'px,' + (y - cropOffsertY) / scale + 'px,' + '0)' + 'rotateZ('+ rotate * 90 +'deg)'}" mode="scaleToFill" :src="src" alt="cropper-img"></image>
+            </view>
+
+            <view v-if="!cropFixed" class="cropper-face cropper-move" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="cropMoveing"></view>
+
+            <view class="crop-line line-w"></view>
+            <view class="crop-line line-a"></view>
+            <view class="crop-line line-s"></view>
+            <view class="crop-line line-d"></view>
+            <block v-if="!cropFixed">
+                <view class="crop-point point-lt" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'left-top')"></view>
+                <view class="crop-point point-mt" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'middle-top')"></view>
+                <view class="crop-point point-rt" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'right-top')"></view>
+                <view class="crop-point point-ml" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'middle-left')"></view>
+                <view class="crop-point point-mr" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'middle-right')"></view>
+                <view class="crop-point point-lb" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'left-bottom')"></view>
+                <view class="crop-point point-mb" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'middle-bottom')"></view>
+                <view class="crop-point point-rb" @touchstart.stop.prevent="touchStart" @touchmove.stop.prevent="dragMove($event, 'right-bottom')"></view>
+            </block>
+        </view>
+
+        <canvas canvas-id="myCanvas" class="cropper-canvas" :style="{ 'width': cropW + 'px','height': cropH + 'px' }"></canvas>
+
+        <view class="btn-group">
+            <view class="btn-item reset-btn" v-show="showResetBtn" @tap="init"></view>
+            <view class="btn-item rotate-btn" v-show="showRotateBtn" @tap="rotateHandler"></view>
+        </view>
+
+        <view class="uni-info__ft">
+            <view class="uni-modal__btn uni-modal__btn_default" style="color: rgb(0, 0, 0);" @tap="cancel">取消</view>
+            <view class="uni-modal__btn uni-modal__btn_primary" style="color: rgb(0, 122, 255);" @tap="confirm">确定</view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'image-cropper',
+        props: {
+            cropWidth: {
+                type: Number,
+                default: 200,
+            },
+            cropHeight: {
+                type: Number,
+                default: 200
+            },
+            cropFixed: {
+                type: Boolean,
+                default: false,
+            },
+            src: {
+                type: String,
+            },
+            showResetBtn: {
+                type: Boolean,
+                default: true,
+            },
+            showRotateBtn: {
+                type: Boolean,
+                default: true,
+            }
+        },
+        data() {
+            const sysInfo = uni.getSystemInfoSync();
+            const pixelRatio = sysInfo.pixelRatio
+            return {
+                show: false,
+                scale: 1,
+                rotate: 0,
+                cropW: 0,
+                cropH: 0,
+                cropOldW: 0,
+                cropOldH: 0,
+                sysInfo: sysInfo,
+                pixelRatio: pixelRatio,
+                imageRealWidth: 0,
+                imageRealHeight: 0,
+                cropOffsertX: 0,
+                cropOffsertY: 0,
+                startX: 0,
+                startY: 0,
+                // 裁剪框与边界间距
+                border: 5,
+                x: 0,
+                y: 0,
+                startL: 0,
+                oldScale: 1,
+            }
+        },
+        watch: {
+            src(val) {
+                if(val.length > 0) {
+                    this.init()
+                }
+            },
+            show(val) {
+                if(!val) {
+                    this.src = ''
+                }
+            }
+        },
+        computed: {
+            containerTop() {
+                let top = 0
+                // #ifdef H5
+                    top = 44
+                // #endif
+                return top;
+            },
+            // 容器高度
+            containerHeight() {
+                return this.windowHeight - 48;
+            },
+            // 屏幕宽度
+            windowWidth() {
+                return this.sysInfo.windowWidth;
+            },
+            windowHeight() {
+                return this.sysInfo.windowHeight;
+            },
+            // 图片宽高比
+            imageRatio() {
+                if (this.imageRealHeight > 0) {
+                    return this.imageRealWidth / this.imageRealHeight
+                }
+                return 0
+            },
+            // 等比缩放后的宽度
+            imageWidth() {
+                if (this.imageRatio >= 1) {
+                    return this.windowWidth
+                }
+                return this.windowWidth * this.imageRatio
+            },
+            // 等比缩放后的高度
+            imageHeight() {
+                if (this.imageRatio >= 1) {
+                    return this.windowWidth / this.imageRatio
+                }
+                return this.windowWidth
+            },
+        },
+        methods: {
+            rotateHandler() {
+                if(this.rotate == 3) {
+                    this.rotate = 0;
+                } else {
+                    ++this.rotate
+                }
+            },
+            init() {
+                this.rotate = 0;
+                this.scale = 1;
+                this.cropW = this.cropWidth
+                this.cropH = this.cropHeight
+                uni.showLoading({
+                    title: '图片加载中...',
+                })
+                this.loadImage(this.src).then((e) => {
+                    uni.hideLoading()
+                }).catch((e) => {
+                    uni.hideLoading()
+                    uni.showModal({
+                        title: '标题',
+                        content: '图片加载失败'
+                    })
+                })
+            },
+            loadImage(src) {
+                const _this = this
+                return new Promise((resolve, reject) => {
+                    uni.getImageInfo({
+                        src: src,
+                        success: (res) => {
+                            _this.imageRealWidth = res.width
+                            _this.imageRealHeight = res.height
+
+                            _this.cropOffsertX = _this.windowWidth / 2 - _this.cropW / 2
+                            _this.cropOffsertY = _this.windowHeight / 2 - _this.cropH / 2
+                            _this.show = true
+
+                            _this.$nextTick(() => {
+                                _this.x = _this.windowWidth / 2 - _this.imageWidth / 2
+                                _this.y = _this.containerHeight / 2 - _this.imageHeight / 2
+                            });
+                            resolve(res)
+                        },
+                        fail: (e) => {
+                            _this.show = false
+                            reject(e)
+                        }
+                    })
+                });
+
+            },
+            cancel() {
+                this.show = false
+                this.$emit('cancel')
+            },
+            confirm(event) {
+                uni.showLoading({
+                    title: '裁剪中...',
+                })
+                const _this = this
+                const ctx = uni.createCanvasContext('myCanvas', _this);
+
+                const pixelRatio = _this.pixelRatio
+                const imgage = _this.src
+                const imgW = _this.imageWidth * _this.scale;
+                const imgH = _this.imageHeight * _this.scale
+                const rotate = _this.rotate
+                let dx = _this.cropOffsertX - _this.x - (_this.imageWidth - imgW) / 2;
+                let dy = _this.cropOffsertY - _this.y - (_this.imageHeight - imgH) / 2;
+
+                ctx.setFillStyle('white')
+                ctx.fillRect(0, 0, imgW, imgH)
+                ctx.save()
+
+                ctx.rotate((rotate * 90 * Math.PI) / 180);
+                switch (rotate) {
+                    case 1:
+                        dx += (imgH-imgW) / 2
+                        dy -= (imgH-imgW) / 2
+                        ctx.drawImage(imgage, -dy, dx, imgW, -imgH);
+                        break;
+                    case 2:
+                        ctx.drawImage(imgage, dx, dy, -imgW, -imgH);
+                        break;
+                    case 3:
+                        dx += (imgH-imgW) / 2
+                        dy -= (imgH-imgW) / 2
+                        ctx.drawImage(imgage, dy, -dx, -imgW, imgH);
+                        break;
+                    default:
+                        ctx.drawImage(imgage, -dx, -dy, imgW, imgH);
+                        break;
+                }
+                ctx.restore()
+                ctx.draw(false, () => {
+                    uni.canvasToTempFilePath({
+                        canvasId: 'myCanvas',
+                        destWidth: _this.cropW * pixelRatio,
+                        destHeight: _this.cropH * pixelRatio,
+                        success: (res) => {
+                            uni.hideLoading()
+                            event.detail.tempFilePath = res.tempFilePath
+                            _this.show = false
+                            _this.$emit('confirm', event)
+                        },
+                        fail: (e) => {
+                            uni.hideLoading()
+                            uni.showModal({
+                                title: '提示',
+                                content: '裁剪失败'
+                            })
+                        }
+                    }, _this);
+                })
+
+            },
+            imgTouchStart(e) {
+                if(e.touches.length == 2) {
+                    this.oldScale = this.scale
+                    this.scaling = true
+                    const x = e.touches[0].pageX - e.touches[1].pageX
+                    const y = e.touches[0].pageY - e.touches[1].pageY
+                    const hypotenuse = Math.sqrt(
+                        Math.pow(x, 2) +
+                        Math.pow(y, 2)
+                    )
+
+                    this.startL = Math.max(x, y, hypotenuse)
+                    uni.showModal({
+                        content: this.startL
+                    })
+                } else {
+                    this.startX = e.touches[0].pageX - this.x
+                    this.startY = e.touches[0].pageY - this.y
+                }
+            },
+            imgMoveing(e) {
+                if(this.scaling) {
+                    let scale = this.oldScale
+
+                    const x = e.touches[0].pageX - e.touches[1].pageX
+                    const y = e.touches[0].pageY - e.touches[1].pageY
+                    const hypotenuse = Math.sqrt(
+                        Math.pow(x, 2) +
+                        Math.pow(y, 2)
+                    )
+
+                    const newL = Math.max(x, y, hypotenuse)
+
+                    const cha = newL - this.startL;
+
+                    // 根据图片本身大小 决定每次改变大小的系数, 图片越大系数越小
+                    // 1px - 0.2
+                    let coe = 1;
+                    coe =
+                        coe / this.imageWidth > coe / this.imageHeight
+                            ? coe / this.imageHeight
+                            : coe / this.imageWidth;
+                    coe = coe > 0.1 ? 0.1 : coe;
+                    const num = coe * cha;
+
+                    if (cha > 0) {
+                        scale += Math.abs(num);
+                    } else if (cha < 0) {
+                        scale > Math.abs(num) ? (scale -= Math.abs(num)) : scale;
+                    }
+
+                    this.scale = scale;
+                } else {
+                    const moveX = e.touches[0].pageX - this.startX
+                    const moveY = e.touches[0].pageY - this.startY
+
+                    this.x = moveX
+                    this.y = moveY
+                }
+            },
+            imgMoveEnd() {
+                setTimeout(() => {
+                    this.scaling = false
+                }, 100)
+            },
+            touchStart(e) {
+                this.startX = e.touches[0].pageX - this.cropOffsertX;
+                this.startY = e.touches[0].pageY - this.cropOffsertY;
+
+                this.cropOldW = this.cropW
+                this.cropOldH = this.cropH
+            },
+            cropMoveing(e) {
+                const moveX = this._cropX(e.touches[0].pageX - this.startX)
+                const moveY = this._cropY(e.touches[0].pageY - this.startY)
+
+                this.cropOffsertX = moveX
+                this.cropOffsertY = moveY
+            },
+            dragMove(e, type) {
+                if(this.cropFixed) {
+                    return false
+                }
+                const moveX = e.touches[0].pageX - this.startX
+                const moveY = e.touches[0].pageY - this.startY
+                switch (type) {
+                    case 'left-top':
+                        this._cropMoveLeft(moveX)
+                        this._cropMoveTop(moveY)
+                        break;
+                    case 'middle-top':
+                        this._cropMoveTop(moveY)
+                        break;
+                    case 'right-top':
+                        this._cropMoveTop(moveY)
+                        this._cropMoveRight(moveX)
+                        break;
+                    case 'middle-right':
+                        this._cropMoveRight(moveX)
+                        break;
+                    case 'right-bottom':
+                        this._cropMoveRight(moveX)
+                        this._cropMoveBottom(moveY)
+                        break;
+                    case 'middle-bottom':
+                        this._cropMoveBottom(moveY)
+                        break;
+                    case 'left-bottom':
+                        this._cropMoveBottom(moveY)
+                        this._cropMoveLeft(moveX)
+                        break;
+                    case 'middle-left':
+                        this._cropMoveLeft(moveX)
+                        break;
+                    default:
+                        break;
+                }
+            },
+            _cropMoveTop(y) {
+                const topY = this._cropY(y)
+                this.cropH += this.cropOffsertY - topY
+                this.cropOffsertY = topY
+            },
+            _cropMoveRight(x) {
+                if(this.cropOldW + x >= this.windowWidth - this.border) {
+                    return false;
+                }
+                this.cropW = this.cropOldW + (x  - this.cropOffsertX)
+            },
+            _cropMoveBottom(y) {
+                if(this.cropOldH + y >= this.windowHeight - this.containerTop - this.border) {
+                    return false;
+                }
+                this.cropH = this.cropOldH + (y  - this.cropOffsertY)
+            },
+            _cropMoveLeft(x) {
+                const leftX = this._cropY(x)
+                this.cropW += this.cropOffsertX - leftX
+                this.cropOffsertX = leftX
+            },
+            _cropX(x) {
+                if(x <= this.border) {
+                    return this.border
+                }
+                if(x + this.cropW >= this.windowWidth - this.border) {
+                    return this.windowWidth - this.cropW - this.border
+                }
+                return x
+            },
+            _cropY(y) {
+                if(y <= this.border) {
+                    return this.border
+                }
+                if(y + this.cropH >= this.windowHeight - this.containerTop - this.border) {
+                    return this.windowHeight - this.cropH - this.containerTop - this.border
+                }
+                return y
+            }
+        }
+    }
+</script>
+
+<style scoped lang="css">
+
+    @font-face {
+        font-family: "iconfont";
+        src: url('data:application/x-font-woff2;charset=utf-8;base64,d09GMgABAAAAAAR4AAsAAAAACKgAAAQsAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAHEIGVgCDBgqEfIRGATYCJAMMCwgABCAFhG0HShugB8gOJUHBwAAAAAFEBNmwzd4dtatSmmpFoVAEhUThEAYkCozFKDCqCVO6RfH/89v869awDnTR1qrSANFt4GG4SNxreBn91fmV9f3+53J613ieHba+N1zmGM8PA7oXTaCAxpjei8IoLWFsGLu4jPME6vWJJdovqmgAO4U2LRBnep0K7GJmpYQWanXVOWuLuAFrtenK4haAa/f38QnKsCOpyrRFh6eFWsh5KXnfYcn958BGQNKfE8wmMmaAQpzkuo9Z+ukZluoltVV5abUipL5i/ysArlhWVut/eCRBVNPUjYg6oUo7JTHFoaYDSvdacnKTq9GAB4AY5y2dtL3qpFh1DENdnJC6Hq+xYb7pyRMDMzc/fYoJjY8flwO3m98rMucF+IZHj6Cagw5UeKpxyFbt2rHGY/8jpa7CYMvLfcIesLjY3bdqhaf+nqgQs2qT/+rjCH/VfA0VFGuAC3iE8NEr/Vau8vZsXiUy7+V3c3tQQXMAuNjDCC89KDIHH0OFhnUi81GEPwyc7wZUaN7DnUf4g+ZLQsMKYV/94NjK7R7TEM4niTY1oJ5zEU62aNVaasUub08YLUEam5EnT6a61/I17dNk+vTu9jpJjXhsTFwjqTtpCBxBIIgS6iQnc/Zod1YGKp0rAwsD8kkyP6AwcK0hcAwkiQmBhWvxPZWKDu86aUH2nLEdi9rGX1eXq5P6A1SrnAucMVMdZH/GKi/jyfCqJyucfK3mXpVujXOPfFf5LC4Dvx0X/943JyOq4HuCTZ8KiIPPAb6ro8akpT6ufiq39BQrNlk5mp8pO0JlJLk8f5QalRjoP60IMx0N8n7wGhSD3n6/F1zlcTVz/cR+Ev0lkLSTd7UiPbD/wCxGRMA2Krwro2O0bTQtImbwhjAJc0S3N4ROx15/PH60IzaIOjCbEelqkDOfETNxb/FMixnWNzeJp2KPQw9A5d76jGUOQOUvH7RE/o2RfkNatd3OGf9q0QKbnq8WB7qy+hVqJRjJn1BQgP/iErks0yy5iGJTrOayW7C/z0IoZH0qNH+7N+31XXc7G2p1hZDU6IWs1ghaqDNQpcEKVKu1BfWmFW9u0IFhKUodpswCEFodgqTZHWStbqOF+hqqdPsG1VrDEuodhfueDcZCj+QzuIrFtZh6BNNraIowbCzi1dbhOlOfionKXHoTzgzoY5hCKk/minEKZ/pYMDCoU7IsgREM3Y8Vgcvwvj4aMzK0AdewUpJljWkyGZH3IKmG7gfEHgZOhYXTwqiNwOhp0CiE3ZiFpL5fB6dj0keFKcGV+JvgGAP0vWMUpOQ10GI1VQt3LoMHDNJRYrEIPInAoPXDFEEnrk9P0zDG/FEGOA2WFNkiaZRGhuoRddXS8bX917cL6mn9c6TIUXSekybKHKQfJXFq2KSiRklLYU8dNKWDIX0cAA==') format('woff2');
+    }
+
+    .vue-cropper {
+        position: fixed;
+        left: 0;
+        right: 0;
+        bottom: 0;
+        z-index: 998;
+        box-sizing: border-box;
+        user-select: none;
+        -webkit-user-select: none;
+        -moz-user-select: none;
+        -ms-user-select: none;
+        direction: ltr;
+        touch-action: none;
+        text-align: left;
+        background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAQMAAAAlPW0iAAAAA3NCSVQICAjb4U/gAAAABlBMVEXMzMz////TjRV2AAAACXBIWXMAAArrAAAK6wGCiw1aAAAAHHRFWHRTb2Z0d2FyZQBBZG9iZSBGaXJld29ya3MgQ1M26LyyjAAAABFJREFUCJlj+M/AgBVhF/0PAH6/D/HkDxOGAAAAAElFTkSuQmCC");
+    }
+
+    .cropper-canvas {
+        position: absolute;
+        top: -9999px;
+        left:-9999px;
+        z-index: -998;
+    }
+
+    .vue-cropper .uni-info__ft {
+        position: absolute;
+        line-height: 48px;
+        font-size: 18px;
+        display: -webkit-box;
+        display: -webkit-flex;
+        display: flex;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 998;
+    }
+
+    .btn-group {
+        position: absolute;
+        right: 30px;
+        bottom: 78px;
+        z-index: 998;
+    }
+
+    .btn-item {
+        position: relative;
+        width: 40px;
+        height: 40px;
+        background: #fff;
+        border-radius: 20px;
+        padding: 10px;
+        display: inline-block;
+        margin-left: 10px;
+    }
+
+    .btn-item:active {
+        background: #ccc;
+    }
+
+    .rotate-btn {
+        font-family: "iconfont" !important;
+        font-size: 24px;
+        font-style: normal;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        line-height: 20px;
+    }
+
+    .rotate-btn:before {
+        content: "\e65c";
+        margin-left: -2px;
+    }
+
+    .reset-btn {
+        font-family: "iconfont" !important;
+        font-size: 24px;
+        font-style: normal;
+        -webkit-font-smoothing: antialiased;
+        -moz-osx-font-smoothing: grayscale;
+        line-height: 20px;
+    }
+
+    .reset-btn:before {
+        content: "\e648";
+        margin-left: -2px;
+    }
+
+    .vue-cropper .uni-info__ft:after {
+        content: " ";
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        height: 1px;
+        border-top: 1px solid #d5d5d6;
+        color: #d5d5d6;
+        -webkit-transform-origin: 0 0;
+        transform-origin: 0 0;
+        -webkit-transform: scaleY(.5);
+        transform: scaleY(.5);
+        z-index: 998;
+    }
+
+    .vue-cropper .uni-modal__btn {
+        display: block;
+        -webkit-box-flex: 1;
+        -webkit-flex: 1;
+        flex: 1;
+        color: #3cc51f;
+        text-decoration: none;
+        -webkit-tap-highlight-color: rgba(0,0,0,0);
+        position: relative;
+        text-align: center;
+        background-color: #fff;
+        z-index: 998;
+    }
+
+    .vue-cropper .uni-modal__btn:first-child:after { display:  none }
+    .vue-cropper .uni-modal__btn:after {
+        content: " ";
+        position: absolute;
+        left: 0;
+        top: 0;
+        width: 1px;
+        bottom: 0;
+        border-left: 1px solid #d5d5d6;
+        color: #d5d5d6;
+        -webkit-transform-origin: 0 0;
+        transform-origin: 0 0;
+        -webkit-transform: scaleX(.5);
+        transform: scaleX(.5);
+        z-index: 998;
+    }
+
+    .vue-cropper .uni-modal__btn:active {
+        background-color: #eee;
+    }
+
+    .cropper-box,
+    .cropper-box-canvas,
+    .cropper-drag-box,
+    .cropper-crop-box,
+    .cropper-face {
+        position: absolute;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+        user-select: none;
+        z-index: 998;
+    }
+
+    .uni-image {
+        width: 100%;
+        height: 100%;
+    }
+
+    .cropper-box-canvas image {
+        position: relative;
+        text-align: left;
+        user-select: none;
+        transform: none;
+        max-width: none;
+        max-height: none;
+        z-index: 998;
+    }
+
+    .cropper-box {
+        overflow: hidden;
+    }
+
+    .cropper-move {
+        cursor: move;
+    }
+
+    .cropper-crop {
+        cursor: crosshair;
+    }
+
+    .cropper-modal {
+        background: rgba(0, 0, 0, 0.5);
+    }
+
+    .pointer-events {
+        pointer-events:none;
+    }
+
+    .cropper-crop-box {
+        /*border: 2px solid #39f;*/
+    }
+
+    .cropper-view-box {
+        display: block;
+        overflow: hidden;
+        width: 100%;
+        height: 100%;
+        outline: 1px solid #39f;
+        outline-color: rgba(51, 153, 255, 0.75);
+        user-select: none;
+    }
+
+    .cropper-view-box image {
+        user-select: none;
+        text-align: left;
+        max-width: none;
+        max-height: none;
+    }
+
+    .cropper-face {
+        top: 0;
+        left: 0;
+        background-color: #fff;
+        opacity: 0.1;
+    }
+
+    .crop-line {
+        position: absolute;
+        display: block;
+        width: 100%;
+        height: 100%;
+        opacity: 0.1;
+        z-index: 998;
+    }
+
+    .line-w {
+        top: -3px;
+        left: 0;
+        height: 5px;
+        cursor: n-resize;
+    }
+
+    .line-a {
+        top: 0;
+        left: -3px;
+        width: 5px;
+        cursor: w-resize;
+    }
+
+    .line-s {
+        bottom: -3px;
+        left: 0;
+        height: 5px;
+        cursor: s-resize;
+    }
+
+    .line-d {
+        top: 0;
+        right: -3px;
+        width: 5px;
+        cursor: e-resize;
+    }
+
+    .crop-point {
+        position: absolute;
+        width: 8px;
+        height: 8px;
+        opacity: 0.75;
+        background-color: #39f;
+        border-radius: 100%;
+        z-index: 998;
+    }
+
+    .point-lt {
+        top: -4px;
+        left: -4px;
+        cursor: nw-resize;
+    }
+
+    .point-mt {
+        top: -5px;
+        left: 50%;
+        margin-left: -3px;
+        cursor: n-resize;
+    }
+
+    .point-rt {
+        top: -4px;
+        right: -4px;
+        cursor: ne-resize;
+    }
+
+    .point-ml {
+        top: 50%;
+        left: -4px;
+        margin-top: -3px;
+        cursor: w-resize;
+    }
+
+    .point-mr {
+        top: 50%;
+        right: -4px;
+        margin-top: -3px;
+        cursor: e-resize;
+    }
+
+    .point-lb {
+        bottom: -5px;
+        left: -4px;
+        cursor: sw-resize;
+    }
+
+    .point-mb {
+        bottom: -5px;
+        left: 50%;
+        margin-left: -3px;
+        cursor: s-resize;
+    }
+
+    .point-rb {
+        bottom: -5px;
+        right: -4px;
+        cursor: se-resize;
+    }
+</style>
\ No newline at end of file
diff --git a/components/jin-edit/jin-edit.vue b/components/jin-edit/jin-edit.vue
new file mode 100644
index 0000000..c468658
--- /dev/null
+++ b/components/jin-edit/jin-edit.vue
@@ -0,0 +1,404 @@
+<template>
+	<view class="container" :style="{
+		paddingBottom: showMoreTool ? '220rpx' : '120rpx'
+	}"> 
+		<editor
+			class="ql-container"
+			:placeholder="placeholder"
+			:show-img-size="true"
+			:show-img-toolbar="true"
+			:show-img-resize="true"
+			@ready="onEditorReady"
+			id="editor"
+			@statuschange="statuschange"
+			@focus="editFocus" 
+			@blur="editBlur"
+			ref="editot"
+		></editor>   
+		<!-- 操作工具 -->
+		<view class="tool-view" > 
+			<view class="tool">
+				<jinIcon class="single" type="&#xe6f3;" font-size="44rpx" title="插入图片" @click="insertImage"></jinIcon>
+				<jinIcon class="single" type="&#xe6f9;" font-size="44rpx" title="修改文字样式" @click="showMore" :color="showMoreTool ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6eb;" font-size="44rpx" title="分割线" @click="insertDivider"></jinIcon>
+				<jinIcon class="single" type="&#xe6e8;" font-size="44rpx" title="撤销" @click="undo"></jinIcon>
+				<jinIcon class="single" type="&#xe705;" font-size="44rpx" title="重做" @click="redo"></jinIcon>
+				<jinIcon class="single" type="&#xeb8a;" font-size="44rpx" title="设置" @click="release(true)"></jinIcon>
+			</view>
+			<!-- 文字相关操作 -->
+			<view class="font-more" :style="{ height: showMoreTool ? '100rpx' : 0 }">
+				<jinIcon class="single" type="&#xe6e7;" font-size="44rpx" title="加粗" @click="setBold" :color="showBold ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6fe;" font-size="44rpx" title="斜体" @click="setItalic" :color="showItalic ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6f8;" font-size="44rpx" title="分割线" @click="setIns" :color="showIns ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6e3;" font-size="44rpx" title="标题" @click="setHeader" :color="showHeader ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6f1;" font-size="44rpx" title="居中" @click="setCenter" :color="showCenter ? activeColor : '#666666'"></jinIcon>
+				<jinIcon class="single" type="&#xe6ed;" font-size="44rpx" title="居右" @click="setRight" :color="showRight ? activeColor : '#666666'"></jinIcon>
+			</view>
+			<view class="setting-layer-mask" v-if="showSettingLayer" @click="showSetting"></view>
+			<view class="setting-layer" v-if="showSettingLayer">
+				<view class="single" @click="release(true)">
+					<jinIcon class="icon" type="&#xe639;" ></jinIcon>
+					<view>公开发布</view>
+				</view>
+				<view class="single" @click="release(false)">
+					<jinIcon class="icon" type="&#xe655;" ></jinIcon>
+					<view>私密保存</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import App from "@/common/js/app.js";
+import jinIcon from './jin-icons.vue';
+export default {
+	props: {
+		// 点击图片时显示图片大小控件
+		showImgSize: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图片时显示工具栏控件
+		showImgToolbar: {
+			type: Boolean,
+			default: false
+		},
+		// 点击图片时显示修改尺寸控件
+		showImgResize: {
+			type: Boolean,
+			default: false
+		},
+		// 占位符
+		placeholder: {
+			type: String,
+			default: '开始输入...'
+		},
+		// 图片上传的地址
+		uploadFileUrl: {
+			type: String,
+			default: '#'
+		},
+		// 上传文件时的name
+		fileKeyName: {
+			type: String,
+			default: 'file'
+		},
+		// 上传图片时，http请求的header
+		header: {
+			type: Object
+		},
+		// 初始化html
+		html: {
+			type: String
+		}
+	},
+	computed:{
+		
+	},
+	data() {
+		return {
+			showMoreTool: false,
+			showBold: false,
+			showItalic: false,
+			showIns: false,
+			showHeader: false,
+			showCenter: false,
+			showRight: false,
+			showSettingLayer: false,
+			activeColor: '#F56C6C'
+		};
+	},
+	components: {
+		jinIcon
+	},
+	created() {
+		
+	},
+	methods: {
+		onEditorReady(e) {
+			uni.createSelectorQuery()
+				.in(this)
+				.select('.ql-container')
+				.fields({
+					size: true,
+					context: true
+				},res => {
+					this.editorCtx = res.context;
+					this.editorCtx.setContents({
+						html: this.html
+					})
+				})
+				.exec();
+		},
+		undo() {
+			this.editorCtx.undo();
+		},
+		// 插入图片
+		async insertImage() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
					let res = await App.browser_upload(1);
					uni.showLoading();
+					let imageUrl = res.tempFilePaths[0],
+						rnImageData = App._upLoad(imageUrl);
+					rnImageData.then(options => {
+						console.log(options, 'options');
+						let file = options.data.img;
+						_this.editorCtx.insertImage({
+							src: file, // 此处需要将图片地址切换成服务器返回的真实图片地址
+							alt: '图片',
+							success: function(e) {}
+						});
+						uni.hideLoading();
+					});
					return
			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								_this.editorCtx.insertImage({
+									src: res.data.img, // 此处需要将图片地址切换成服务器返回的真实图片地址
+									alt: '图片',
+									success: function(e) {}
+								});
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album', 'camera'], //从相册选择
+				success: function(res) {
+					uni.showLoading();
+					let imageUrl = res.tempFilePaths[0],
+						rnImageData = App._upLoad(imageUrl);
+					rnImageData.then(options => {
+						console.log(options, 'options');
+						let file = options.data.img;
+						_this.editorCtx.insertImage({
+							src: file, // 此处需要将图片地址切换成服务器返回的真实图片地址
+							alt: '图片',
+							success: function(e) {}
+						});
+						uni.hideLoading();
+					});
+				},
+				fail: function(data) {
+					if(data.errMsg != 'chooseImage:fail cancel'){
+						App.showError('上传失败');
+					}
+				}
+			});
+			// #endif
+			// uni.chooseImage({
+			// 	count: 9, //默认9
+			// 	sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+			// 	sourceType: ['album', 'camera'], //从相册选择
+			// 	success: async(res) => {
+			// 		var tempFilePaths = res.tempFilePaths;
+			// 		uni.showLoading({
+			// 			title: '正在上传中...'
+			// 		})
+			// 		for (let temp of tempFilePaths) {
+			// 			// 图片上传服务器
+			// 			await uni.uploadFile({
+			// 				url: this.uploadFileUrl,
+			// 				filePath: temp,
+			// 				name: this.fileKeyName,
+			// 				header: this.header,
+			// 				success: res => {
+			// 					// 上传完成后处理
+			// 					this.editorCtx.insertImage({
+			// 						src: temp,  // 此处需要将图片地址切换成服务器返回的真实图片地址
+			// 						alt: '图片',
+			// 						success: function(e) {}
+			// 					});
+			// 					uni.hideLoading()
+			// 				},
+							
+			// 			});
+			// 		}
+			// 	}
+			// });
+		},
+		insertDivider() {
+			this.editorCtx.insertDivider();
+		},
+		redo() {
+			this.editorCtx.redo();
+		},
+		showMore() {
+			this.showMoreTool = !this.showMoreTool;
+			this.editorCtx.setContents()
+		},
+		setBold() {
+			this.showBold = !this.showBold;
+			this.editorCtx.format('bold');
+		},
+		setItalic() {
+			this.showItalic = !this.showItalic;
+			this.editorCtx.format('italic');
+		},
+		checkStatus(name, detail, obj) {
+			if (detail.hasOwnProperty(name)) {
+				this[obj] = true;
+			} else {
+				this[obj] = false;
+			}
+		},
+		statuschange(e) {
+			var detail = e.detail;
+			this.checkStatus('bold', detail, 'showBold');
+			this.checkStatus('italic', detail, 'showItalic');
+			this.checkStatus('ins', detail, 'showIns');
+			this.checkStatus('header', detail, 'showHeader');
+			if (detail.hasOwnProperty('align')) {
+				if (detail.align == 'center') {
+					this.showCenter = true;
+					this.showRight = false;
+				} else if (detail.align == 'right') {
+					this.showCenter = false;
+					this.showRight = true;
+				} else {
+					this.showCenter = false;
+					this.showRight = false;
+				}
+			} else {
+				this.showCenter = false;
+				this.showRight = false;
+			}
+		},
+		setIns() {
+			this.showIns = !this.showIns;
+			this.editorCtx.format('ins');
+		},
+		setHeader() {
+			this.showHeader = !this.showHeader;
+			this.editorCtx.format('header', this.showHeader ? 'H2' : false);
+		},
+		setCenter() {
+			this.showCenter = !this.showCenter;
+			this.editorCtx.format('align', this.showCenter ? 'center' : false);
+		},
+		setRight() {
+			this.showRight = !this.showRight;
+			this.editorCtx.format('align', this.showRight ? 'right' : false);
+		},
+		showSetting() {
+			this.showSettingLayer = !this.showSettingLayer;
+		},
+		async editFocus() {
+			
+		},
+		editBlur() {
+			
+		},
+		release(isPublic) {
+			this.showSettingLayer = false;
+			this.editorCtx.getContents({
+				success: res => {
+					Object.assign(res, {
+						isPublic: isPublic
+					})
+					this.$emit('editOk', res);
+				} 
+			})
+		},
+	}
+};
+</script>
+
+<style scoped>
+.container {
+	padding: 30rpx 0;
+	box-sizing: border-box;
+	padding-bottom: 120rpx;
+}
+
+.ql-container {
+	line-height: 160%;
+	font-size: 34rpx;
+	width: calc(100% - 60rpx); 
+	height: auto;
+	margin: 0 auto;
+} 
+.tool-view{
+	width: 80vw;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	
+}
+.tool {
+	height: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	background: #eee;
+}
+
+.font-more {
+	position: absolute;
+	left: 0;
+	bottom: 100rpx;
+	display: flex;
+	align-items: center;
+	justify-content: space-around;
+	width: 100%;
+	background: rgb(235, 235, 235);
+	overflow: hidden;
+	transition: all 0.15s;
+}
+
+.setting-layer {
+	position: absolute;
+	bottom: 100rpx;
+	background: #fff;
+	width: 250rpx;
+	right: 20rpx;
+	box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+	border-radius: 8rpx;
+}
+.setting-layer .single {
+	height: 80rpx;
+	font-size: 32rpx;
+	padding: 0 30rpx;
+	display: flex;
+	align-items: center;
+	line-height: 80rpx;
+	flex-direction: row;
+	color: #666;
+}
+.setting-layer .single .icon {
+	margin-right: 20rpx;
+}
+.setting-layer-mask{
+	position: fixed;
+	left: 0;
+	top: 0;
+	width: 100vw;
+	height: 100vh;
+	background: transparent; 
+}
+</style>
diff --git a/components/jin-edit/jin-icons.vue b/components/jin-edit/jin-icons.vue
new file mode 100644
index 0000000..b85d216
--- /dev/null
+++ b/components/jin-edit/jin-icons.vue
@@ -0,0 +1,48 @@
+<template>
+	<view class="content">
+		<view class="icon" :style="{color: color, fontSize: fontSize}" v-html="type" @click="toclick"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			type: {
+				type: String,
+				default: '&#xe644;'
+			},
+			color: {
+				type: String,
+				default: '#666666'
+			},
+			fontSize: {
+				type: String,
+				default: '34rpx'
+			}
+		},
+		methods: {
+			toclick() {
+				this.$emit('click');
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.content{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+	}
+	@font-face {
+		font-family: 'jin';
+		/** 阿里巴巴矢量图标库的字体库地址，可以替换自己的字体库地址 **/
+		src: url('https://at.alicdn.com/t/font_1491431_6m7ltjo8wi.ttf') format('truetype');
+	}
+
+	.icon {
+		font-family: jin !important;
+		font-size: 34rpx;
+	}
+
+</style>
diff --git a/components/junyi-h5-copy/junyi-h5-copy.js b/components/junyi-h5-copy/junyi-h5-copy.js
new file mode 100644
index 0000000..91fff37
--- /dev/null
+++ b/components/junyi-h5-copy/junyi-h5-copy.js
@@ -0,0 +1,18 @@
+export default function h5Copy(content) {
+  
+  if (!document.queryCommandSupported('copy')) {
+    // 不支持
+    return false
+  }
+  
+  let textarea = document.createElement("textarea")
+  textarea.value = content
+  textarea.readOnly = "readOnly"
+  document.body.appendChild(textarea)
+  textarea.select() // 选择对象
+  textarea.setSelectionRange(0, content.length) //核心
+  let result = document.execCommand("copy") // 执行浏览器复制命令
+  textarea.remove()
+  return result
+  
+}
\ No newline at end of file
diff --git a/components/jyf-parser/jyf-parser.vue b/components/jyf-parser/jyf-parser.vue
new file mode 100644
index 0000000..8e95787
--- /dev/null
+++ b/components/jyf-parser/jyf-parser.vue
@@ -0,0 +1,698 @@
+<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-->
+			<div :id="'rtf'+uid"></div>
+			<!--#endif-->
+			<!--#ifndef H5-->
+			<view  v-if="html">
+				<trees :nodes="nodes" :lazyLoad="lazyLoad" :loading="loadingImg" :options="name"  />
+			</view>
+			
+			<!--#endif-->
+		</view>
+		<!--#endif-->
+	</view>
+</template>
+
+<script>
+	// #ifndef H5
+	import trees from './libs/trees';
+	var cache = {};
+		// #ifdef MP-WEIXIN
+		var fs = uni.getFileSystemManager() || null;
+		// #endif
+	var	Parser = require('./libs/MpHtmlParser.js');
+	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
+	var rpx = uni.getSystemInfoSync().screenWidth / 750,
+		cfg = require('./libs/config.js');
+	// #endif
+	// #ifdef APP-PLUS-NVUE
+	var weexDom = weex.requireModule('dom');
+	// #endif
+	/**
+	 * Parser 富文本组件
+	 * @tutorial https://github.com/jin-yufeng/Parser
+	 * @property {String|Array} 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 链接点击事件
+	 * @example <jyf-parser :html="html"></jyf-parser>
+	 * @author JinYufeng
+	 * @version 20200524
+	 * @listens MIT
+	 */
+	export default {
+		name: 'parser',
+		data() {
+			return {
+				// #ifdef H5
+				uid: this._uid,
+				// #endif
+				// #ifdef APP-PLUS-NVUE
+				height: 1,
+				// #endif
+				// #ifndef APP-PLUS-NVUE
+				showAm: '',
+				// #endif
+				nodes: [],
+				poster:''
+			}
+		},
+		// #ifndef H5 || APP-PLUS-NVUE
+		components: {
+			trees
+		},
+		// #endif
+		props: {
+			name:'parser',
+			html: null,
+			autopause: {
+				type: Boolean,
+				default: true
+			},
+			autoscroll: Boolean,
+			autosetTitle: {
+				type: Boolean,
+				default: true
+			},
+			// #ifndef H5 || APP-PLUS-NVUE
+			compress: Number,
+			loadingImg: String,
+			useCache: Boolean,
+			// #endif
+			domain: String,
+			lazyLoad: Boolean,
+			selectable: Boolean,
+			tagStyle: Object,
+			showWithAnimation: Boolean,
+			useAnchor: Boolean
+		},
+		watch: {
+			html(html) {
+				console.log('html',html);
+				this.setContent(html);
+			}
+		},
+		mounted() {
+			this.poster = uni.getStorageSync('platformInfor').videoimg;
+			// 图片数组
+			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 = '';
+					for (var j = 0, 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;
+					// #ifndef H5 || 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
+				}
+			}
+			// #ifdef H5
+			this.document = document.getElementById('rtf' + this._uid);
+			// #endif
+			// #ifndef H5 || APP-PLUS-NVUE
+			if (dom) this.document = new dom(this);
+			// #endif
+			// #ifdef APP-PLUS-NVUE
+			this.document = this.$refs.web;
+			setTimeout(() => {
+				// #endif
+				if (this.html) this.setContent(this.html);
+				// #ifdef APP-PLUS-NVUE
+			}, 30)
+			// #endif
+			
+		},
+		beforeDestroy() {
+			// #ifdef H5
+			if (this._observer) this._observer.disconnect();
+			// #endif
+			if(!!this.imgList){
+				this.imgList.each(src => {
+					// #ifdef APP-PLUS
+					if (src && src.includes('_doc')) {
+						plus.io.resolveLocalFileSystemURL(src, entry => {
+							entry.remove();
+						});
+					}
+					// #endif
+					// #ifndef H5 || MP-TOUTIAO
+					if (src && src.includes(uni.env.USER_DATA_PATH))
+						fs && fs.unlink({
+							filePath: src
+						})
+					// #endif
+				})
+			}
+			
+			clearInterval(this._timer);
+		},
+		methods: {
+			// #ifdef H5 || APP-PLUS-NVUE
+			_Dom2Str(nodes) {
+				var str = '';
+				for (var node of nodes) {
+					if (node.type == 'text')
+						str += node.text;
+					else {
+						str += ('<' + node.name);
+						for (var attr in node.attrs || {})
+							str += (' ' + attr + '="' + node.attrs[attr] + '"');
+						if (!node.children || !node.children.length) str += '>';
+						else str += ('>' + this._Dom2Str(node.children) + '</' + node.name + '>');
+					}
+				}
+				return str;
+			},
+			_handleHtml(html, append) {
+				if (typeof html != 'string') html = this._Dom2Str(html.nodes || html);
+				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($) * rpx + 'px');
+				return html;
+			},
+			// #endif
+			setContent(htmls, append) {
+				let html = htmls.replace(/$nbsp;/g,"");
+				// #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"><base href="' +
+						this.domain + '"><div id="parser"' + (this.selectable ? '>' : ' style="user-select:none">') + this._handleHtml(html) +
+						'</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))}}' +
+						(this.showWithAnimation ? 'document.body.style.animation="show .5s",' : '') +
+						'setTimeout(function(){e({action:"load",text:document.body.innerText,height:document.getElementById("parser").scrollHeight+16})},50);\x3c/script>';
+					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=0;o=n[r++];)o.innerHTML=o.innerHTML.replace(/body/g,"#parser");for(var i,a=document.getElementsByTagName("img"),s=[],c=0,l=0;i=a[c];c++)i.onerror=function(){' +
+					(cfg.errorImg ? 'this.src=' + cfg.errorImg + ',' : '') +
+					'e({action:"error",source:"img",target:this})},i.hasAttribute("ignore")||"A"==i.parentElement.nodeName||(i.i=l++,s.push(i.src),i.onclick=function(){e({action:"preview",img:{i:this.i,src:this.src}})});e({action:"getImgList",imgList:s});for(var d,u=document.getElementsByTagName("a"),g=0;d=u[g];g++)d.onclick=function(){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 m,f=document.getElementsByTagName("video"),h=0;m=f[h];h++)m.style.maxWidth="100%",m.onerror=function(){e({action:"error",source:"video",target:this})}' +
+					(this.autopause ? ',m.onplay=function(){for(var e,t=0;e=f[t];t++)e!=this&&e.pause()}' : '') +
+					';for(var v,y=document.getElementsByTagName("audio"),_=0;v=y[_];_++)v.onerror=function(){e({action:"error",source:"audio",target:this})};' +
+					(this.autoscroll ? 'for(var p,w=document.getElementsByTagName("table"),T=0;p=w[T];T++){var E=document.createElement("div");E.style.overflow="scroll",p.parentNode.replaceChild(E,p),E.appendChild(p)}' : '') +
+					'(function(){return new Promise(function(e){var t=document.getElementById("parser"),o=t.scrollHeight,n=setInterval(function(){o==t.scrollHeight?(clearInterval(n),e(o)):o=t.scrollHeight},500)})})().then(function(t){e({action:"ready",height:t+16})})'
+				)
+				this.nodes = [1];
+				// #endif
+				// #ifdef H5
+				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
+					// })
+					// 暂时搁置
+				// 图片处理
+				this.imgList.length = 0;
+				var imgs = this.rtf.getElementsByTagName('img');
+				for (let i = 0, j = 0, img; img = imgs[i]; i++) {
+					var src = img.getAttribute('src');
+					img.style.maxWidth = '100%';
+					img.style.verticalAlign = 'top';
+					if (this.domain && src) {
+						if (src[0] == '/') {
+							if (src[1] == '/')
+								img.src = (this.domain.includes('://') ? this.domain.split('://')[0] : '') + ':' + src;
+							else img.src = this.domain + src;
+						} else if (!src.includes('://')) img.src = this.domain + '/' + src;
+					}
+					if (!img.hasAttribute('ignore') && img.parentElement.nodeName != 'A') {
+						img.i = j++;
+						_ts.imgList.push(img.src || img.getAttribute('data-src'));
+						img.onclick = function() {
+							var preview = true;
+							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() {
+						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;
+				// _ts.videoContexts.poster = '';
+				// debugger
+				for (let video, i = 0; video = videos[i++];) {
+					video.style.maxWidth = '100%';
+					video.poster = _ts.poster;
+					// debugger
+					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)
+					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
+				var nodes;
+				if (!html)
+					return this.nodes = [];
+				else if (typeof html == 'string') {
+					let 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);
+				} else if (Object.prototype.toString.call(html) == '[object Array]') {
+					// 非本插件产生的 array 需要进行一些转换
+					if (html.length && html[0].PoweredBy != 'Parser') {
+						let parser = new Parser(html, this);
+						(function f(ns) {
+							for (var i = 0, n; n = ns[i]; i++) {
+								if (n.type == 'text') continue;
+								n.attrs = n.attrs || {};
+								for (var item in n.attrs)
+									if (typeof n.attrs[item] != 'string') n.attrs[item] = n.attrs[item].toString();
+								parser.matchAttr(n, parser);
+								if (n.children && n.children.length) {
+									parser.STACK.push(n);
+									f(n.children);
+									parser.popNode(parser.STACK.pop());
+								} else n.children = void 0;
+							}
+						})(html);
+					}
+					nodes = html;
+				} else if (typeof html == 'object' && html.nodes) {
+					nodes = html.nodes;
+					console.warn('错误的 html 类型：object 类型已废弃');
+				} else
+					return console.warn('错误的 html 类型：' + typeof html);
+				if (append) this.nodes = this.nodes.concat(nodes);
+				else this.nodes = nodes;
+				if (nodes.length && nodes[0].title && this.autosetTitle)
+					// uni.setNavigationBarTitle({
+					// 	title: nodes[0].title
+					// })
+					// 暂时搁置
+				if (this.imgList) this.imgList.length = 0;
+				this.videoContexts = [];
+				this.$nextTick(() => {
+					this.$emit('load');
+				})
+				// #endif
+				var height;
+				clearInterval(this._timer);
+				this._timer = setInterval(() => {
+					// #ifdef H5
+					this.rect = this.rtf.getBoundingClientRect();
+					// #endif
+					// #ifndef H5
+					// #ifdef APP-PLUS
+					uni.createSelectorQuery().in(this)
+					// #endif
+					// #ifndef APP-PLUS
+					this.createSelectorQuery()
+						// #endif
+						.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
+						});
+					// #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
+				txt = this.rtf.innerText;
+				// #endif
+				// #ifndef H5 || APP-PLUS-NVUE
+				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;
+			},
+			navigateTo(obj) {
+				if (!this.useAnchor)
+					return obj.fail && obj.fail({
+						errMsg: '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({
+					errMsg: 'pageScrollTo:ok'
+				});
+				// #endif
+				// #ifdef H5
+				if (!obj.id) {
+					window.scrollTo(0, this.rtf.offsetTop);
+					return obj.success && obj.success({
+						errMsg: 'pageScrollTo:ok'
+					});
+				}
+				var target = document.getElementById(obj.id);
+				if (!target) return obj.fail && obj.fail({
+					errMsg: 'Label not found'
+				});
+				obj.scrollTop = this.rtf.offsetTop + target.offsetTop + (obj.offset || 0);
+				uni.pageScrollTo(obj);
+				// #endif
+				// #ifndef H5 || APP-PLUS-NVUE
+				var Scroll = (selector, component) => {
+					uni.createSelectorQuery().in(component ? component : this).select(selector).boundingClientRect().selectViewport()
+						.scrollOffset()
+						.exec(res => {
+							if (!res || !res[0])
+								return obj.fail && obj.fail({
+									errMsg: 'Label not found'
+								});
+							obj.scrollTop = res[1].scrollTop + res[0].top + (obj.offset || 0);
+							uni.pageScrollTo(obj);
+						})
+				}
+				if (!obj.id) Scroll('#top');
+				else {
+					// #ifndef MP-BAIDU || MP-ALIPAY || APP-PLUS
+					Scroll('#top >>> #' + obj.id + ', #top >>> .' + obj.id);
+					// #endif
+					// #ifdef MP-BAIDU || MP-ALIPAY || APP-PLUS
+					for (var anchor of this.anchors)
+						if (anchor.id == obj.id)
+							Scroll('#' + obj.id + ', .' + obj.id, anchor.node);
+					// #endif
+				}
+				// #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 APP-PLUS-NVUE
+			_message(e) {
+				// 接收 web-view 消息
+				var data = e.detail.data[0];
+				if (data.action == 'load') {
+					this.$emit('load');
+					this.height = data.height;
+					this._text = data.text;
+				} else if (data.action == 'getTitle') {
+					if (this.autosetTitle)
+						// uni.setNavigationBarTitle({
+						// 	title: data.title
+						// })
+						// 暂时搁置
+				} else if (data.action == 'getImgList') {
+					this.imgList.length = 0;
+					for (var i = data.imgList.length; i--;)
+						this.imgList.setItem(i, data.imgList[i]);
+				} else if (data.action == 'preview') {
+					var preview = true;
+					data.img.ignore = () => preview = false;
+					this.$emit('imgtap', data.img);
+					if (preview)
+						uni.previewImage({
+							current: data.img.i,
+							urls: this.imgList
+						})
+				} else if (data.action == 'linkpress') {
+					console.log('点了点了点了')
+					debugger
+					var jump = true,
+						href = data.href;
+					this.$emit('linkpress', {
+						href,
+						ignore: () => jump = false
+					})
+					if (jump && href) {
+						if (href[0] == '#') {
+							if (this.useAnchor)
+								weexDom.scrollToElement(this.$refs.web, {
+									offset: data.offset
+								})
+						} else if (href.includes('://'))
+							plus.runtime.openWeb(href);
+						else
+							uni.navigateTo({
+								url: href
+							})
+					}
+				} else if (data.action == 'error') {
+					if (data.source == 'img' && cfg.errorImg)
+						this.imgList.setItem(data.target.i, cfg.errorImg);
+					this.$emit('error', {
+						source: data.source,
+						target: data.target
+					})
+				} else if (data.action == 'ready') {
+					this.height = data.height;
+					this.$nextTick(() => {
+						uni.createSelectorQuery().in(this).select('#top').boundingClientRect().exec(res => {
+							this.rect = res[0];
+							this.$emit('ready', res[0]);
+						})
+					})
+				}
+			},
+			// #endif
+		}
+	}
+</script>
+
+<style>
+	@keyframes show {
+		0% {
+			opacity: 0;
+		}
+
+		100% {
+			opacity: 1;
+		}
+	}
+
+	/* #ifndef H5 */
+	:host {
+		display: block;
+		/* overflow: scroll; */
+		-webkit-overflow-scrolling: touch;
+	}
+
+	/* #endif */
+</style>
diff --git a/components/jyf-parser/libs/CssHandler.js b/components/jyf-parser/libs/CssHandler.js
new file mode 100644
index 0000000..8000377
--- /dev/null
+++ b/components/jyf-parser/libs/CssHandler.js
@@ -0,0 +1,97 @@
+const cfg = require('./config.js'),
+	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;
+}
+module.exports = 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.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/components/jyf-parser/libs/MpHtmlParser.js b/components/jyf-parser/libs/MpHtmlParser.js
new file mode 100644
index 0000000..ccd15a5
--- /dev/null
+++ b/components/jyf-parser/libs/MpHtmlParser.js
@@ -0,0 +1,546 @@
+/**
+ * html 解析器
+ * @tutorial https://github.com/jin-yufeng/Parser
+ * @version 20200524
+ * @author JinYufeng
+ * @listens MIT
+ */
+const cfg = require('./config.js'),
+	blankChar = cfg.blankChar,
+	CssHandler = require('./CssHandler.js'),
+	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]) {
+				if (item.name == 'table' && !Object.hasOwnProperty.call(item, 'c')) item.c = 1;
+				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());
+	if (this.DOM.length) {
+		this.DOM[0].PoweredBy = 'Parser';
+		if (this.title) this.DOM[0].title = this.title;
+	}
+	return this.DOM;
+}
+// 设置属性
+MpHtmlParser.prototype.setAttr = function() {
+	var name = this.attrName.toLowerCase();
+	if (cfg.trustAttrs[name]) {
+		var val = this.attrVal;
+		if (val) {
+			if (name == 'src') this.attrs[name] = this.getUrl(this.decode(val, 'amp'));
+			else if (name == 'href' || name == 'style') this.attrs[name] = this.decode(val, 'amp');
+			else this.attrs[name] = val;
+		} else if (cfg.boolAttrs[name]) this.attrs[name] = 'T';
+	}
+	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 tmp = [];
+		for (let i = text.length, c; c = text[--i];)
+			if (!blankChar[c] || (!blankChar[tmp[0]] && (c = ' '))) tmp.unshift(c);
+		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];
+	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;
+					}
+				}
+				attrs.source = [];
+				if (attrs.src) {
+					attrs.source.push(attrs.src);
+					attrs.src = void 0;
+				}
+				if (!attrs.controls && !attrs.autoplay) attrs.controls = 'T';
+				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.c = void 0;
+							break;
+						}
+		}
+		if (attrs.align) {
+			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.includes('-webkit') || value.includes('-moz') || value.includes('-ms') || value.includes('-o') || 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['data-src']) {
+				attrs.src = attrs.src || attrs['data-src'];
+				attrs['data-src'] = void 0;
+			}
+			if (attrs.src && !attrs.ignore) {
+				if (this.bubble())
+					attrs.i = (this.imgNum++).toString();
+				else attrs.ignore = 'T';
+			}
+			if (attrs.ignore) styleObj['max-width'] = '100%';
+			var width;
+			if (styleObj.width) width = styleObj.width;
+			else if (attrs.width) width = attrs.width.includes('%') ? attrs.width : 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 += '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'))
+				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);
+		if (!node.attrs.xmlns) src = ' xmlns="http://www.w3.org/2000/svg"' + src;
+		var i = j;
+		while (this.data[j] != '<') j--;
+		src = this.data.substring(j, i) + 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: (/vertical[^;]+/.exec(node.attrs.style) || []).shift(),
+				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.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.name == 'div' || node.name == 'p' || node.name[0] == 't') {
+		if (len > 1 && siblings[len - 2].text == ' ')
+			siblings.splice(--len - 1, 1);
+		if (childs.length && childs[childs.length - 1].text == ' ')
+			childs.pop();
+	}
+	// 处理列表
+	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 = attrs.cellpadding,
+			spacing = attrs.cellspacing,
+			border = attrs.border;
+		if (node.c) {
+			this.bubble();
+			attrs.style = (attrs.style || '') + ';display:table';
+			if (!padding) padding = 2;
+			if (!spacing) spacing = 2;
+		}
+		if (border) attrs.style = `border:${border}px solid gray;${attrs.style || ''}`;
+		if (spacing) attrs.style = `border-spacing:${spacing}px;${attrs.style || ''}`;
+		if (border || padding || node.c)
+			(function f(ns) {
+				for (var i = 0, n; n = ns[i]; i++) {
+					if (n.type == 'text') continue;
+					var style = n.attrs.style || '';
+					if (node.c && n.name[0] == 't') {
+						n.c = 1;
+						style += ';display:table-' + (n.name == 'th' || n.name == 'td' ? 'cell' : (n.name == 'tr' ? 'row' : 'row-group'));
+					}
+					if (n.name == 'th' || n.name == 'td') {
+						if (border) style = `border:${border}px solid gray;${style}`;
+						if (padding) style = `padding:${padding}px;${style}`;
+					} else f(n.children || []);
+					if (style) n.attrs.style = style;
+				}
+			})(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 == '!') {
+			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) {
+	var blank = blankChar[c];
+	if (blank) {
+		this.attrName = this.section();
+		c = this.data[this.i];
+	}
+	if (c == '=') {
+		if (!blank) this.attrName = this.section();
+		while (blankChar[this.data[++this.i]]);
+		this.start = this.i--;
+		this.state = this.AttrValue;
+	} else if (blank) this.setAttr();
+	else if (this.isClose()) {
+		this.attrName = this.section();
+		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;
+	}
+}
+module.exports = MpHtmlParser;
diff --git a/components/jyf-parser/libs/config.js b/components/jyf-parser/libs/config.js
new file mode 100644
index 0000000..c3339d8
--- /dev/null
+++ b/components/jyf-parser/libs/config.js
@@ -0,0 +1,98 @@
+/* 配置文件 */
+// #ifndef H5
+const canIUse = wx.canIUse('editor'); // 高基础库标识，用于兼容
+// #endif
+module.exports = {
+	// 出错占位图
+	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'),
+	// 块级标签，将被转为 div
+	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,section' + (
+		// #ifndef H5
+		canIUse ? '' :
+		// #endif
+		',pre')),
+	// 将被移除的标签
+	ignoreTags: makeMap(
+		'area,base,canvas,frame,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr'
+		// #ifndef H5
+		+ (canIUse ? ',rp' : '')
+		// #endif
+		// #ifndef APP-PLUS
+		+ ',iframe'
+		// #endif
+	),
+	// 只能被 rich-text 显示的标签
+	richOnlyTags: makeMap('a,colgroup,fieldset,legend,picture,table,navigator'
+		// #ifndef H5
+		+ (canIUse ? ',bdi,bdo,caption,rt,ruby' : '')
+		// #endif
+	),
+	// 自闭合的标签
+	selfClosingTags: makeMap(
+		'area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'
+	),
+	// 信任的属性
+	trustAttrs: makeMap(
+		'align,allowfullscreen,alt,app-id,author,autoplay,autostart,border,cellpadding,cellspacing,class,color,colspan,controls,data-src,dir,face,height,href,id,ignore,loop,media,muted,name,path,poster,rowspan,size,span,src,start,style,type,unit-id,width,xmlns'
+	),
+	// bool 型的属性
+	boolAttrs: makeMap('allowfullscreen,autoplay,autostart,controls,ignore,loop,muted'),
+	// 信任的标签
+	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'
+		// #ifndef H5
+		+ (canIUse ? ',bdi,bdo,caption,pre,rt,ruby' : '')
+		// #endif
+		// #ifdef APP-PLUS
+		+ ',embed,iframe'
+		// #endif
+	),
+	// 默认的标签样式
+	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;
+}
diff --git a/components/jyf-parser/libs/handler.sjs b/components/jyf-parser/libs/handler.sjs
new file mode 100644
index 0000000..79c7739
--- /dev/null
+++ b/components/jyf-parser/libs/handler.sjs
@@ -0,0 +1,20 @@
+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
+}
+export default {
+	use: function(item) {
+		return !item.c && !inline[item.name] && (item.attrs.style || '').indexOf('display:inline') == -1
+	}
+}
diff --git a/components/jyf-parser/libs/handler.wxs b/components/jyf-parser/libs/handler.wxs
new file mode 100644
index 0000000..ad9b15b
--- /dev/null
+++ b/components/jyf-parser/libs/handler.wxs
@@ -0,0 +1,20 @@
+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
+}
+module.exports = {
+	use: function(item) {
+		return !item.c && !inline[item.name] && (item.attrs.style || '').indexOf('display:inline') == -1
+	}
+}
diff --git a/components/jyf-parser/libs/trees.vue b/components/jyf-parser/libs/trees.vue
new file mode 100644
index 0000000..9bdb6fe
--- /dev/null
+++ b/components/jyf-parser/libs/trees.vue
@@ -0,0 +1,526 @@
+<template>
+	<view class="interlayer" style="word-wrap: break-word;">
+		<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="imgtap">
+				<rich-text :nodes="[{attrs:{src:loading&&controls[i]!=2?loading:(lazyLoad&&!controls[i]?placeholder:(controls[i]==3?errorImg:n.attrs.src)),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]" />
+				<image class="_image" :src="lazyLoad&&!controls[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&&controls[i]==undefined&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo)" :id="n.attrs.id" :class="'_video '+(n.attrs.class||'')"
+			 :style="n.attrs.style" :data-i="i" @tap="_loadVideo" />
+			<video v-else-if="n.name=='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay||n.lazyLoad"
+			 :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="poster" :src="n.attrs.source[controls[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[controls[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="linkpress">
+				<trees class="_span" :nodes="n.children" />
+			</view>
+			<!--链接-->
+			<view v-else-if="n.name=='navigator'" :id="n.attrs.id" :class="'_a '+(n.attrs.class||'')" hover-class="_hover" :style="n.attrs.style"
+			 :data-attrs="n.attrs" @tap="linkpress">
+				<trees class="_span" :nodes="n.children" />
+			</view>
+			<!--广告（按需打开注释）-->
+			<!--#ifndef H5 || MP-QQ || MP-TOUTIAO-->
+			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :unit-id="n.attrs['unit-id']"
+			 data-from="ad" @error="error" />-->
+			<!--#endif-->
+			<!--#ifdef MP-BAIDU-->
+			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :appid="n.attrs.appid"
+			 :apid="n.attrs.apid" :type="n.attrs.type" data-from="ad" @error="error" />-->
+			<!--#endif-->
+			<!--#ifdef APP-PLUS-->
+			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :adpid="n.attrs.adpid"
+			 data-from="ad" @error="error" />-->
+			<!--#endif-->
+			<!--列表-->
+			<view v-else-if="n.name=='li'" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:flex'">
+				<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>
+				<!--#ifdef MP-ALIPAY-->
+				<view class="_li">
+					<trees :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+				</view>
+				<!--#endif-->
+				<!--#ifndef MP-ALIPAY-->
+				<trees class="_li" :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+				<!--#endif-->
+			</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" />
+						<block v-else>
+							<!--#ifdef MP-ALIPAY-->
+							<view v-for="(td, q) in tr.children" v-bind:key="q" :class="td.attrs.class" :style="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')">
+								<trees :nodes="td.children" />
+							</view>
+							<!--#endif-->
+							<!--#ifndef MP-ALIPAY-->
+							<trees v-for="(td, q) in tr.children" v-bind:key="q" :class="td.attrs.class" :style="(td.attrs.style||'')+(td.name[0]=='t'?';display:table-'+(td.name=='tr'?'row':'cell'):'')"
+							 :nodes="td.children" />
+							<!--#endif-->
+						</block>
+					</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-->
+			<!--富文本-->
+			<!--#ifndef MP-BAIDU || MP-TOUTIAO-->
+			<rich-text v-else-if="handler.use(n)" :id="n.attrs.id" :class="'_p __'+n.name" :nodes="[n]" />
+			<!--#endif-->
+			<!--#ifdef MP-BAIDU || MP-TOUTIAO-->
+			<rich-text v-else-if="!n.c" :id="n.attrs.id" :nodes="[n]" />
+			<!--#endif-->
+			<!--#ifdef MP-ALIPAY-->
+			<view v-else :id="n.attrs.id" :class="'_'+n.name+' '+(n.attrs.class||'')" :style="n.attrs.style">
+				<trees :nodes="n.children" :lazyLoad="lazyLoad" :loading="loading" />
+			</view>
+			<!--#endif-->
+			<!--#ifndef MP-ALIPAY-->
+			<trees v-else :class="(n.attrs.id||'')+' _'+n.name+' '+(n.attrs.class||'')" :style="n.attrs.style" :nodes="n.children"
+			 :lazyLoad="lazyLoad" :loading="loading" />
+			<!--#endif-->
+		</block>
+	</view>
+</template>
+<script module="handler" lang="wxs" src="./handler.wxs"></script>
+<script module="handler" lang="sjs" src="./handler.sjs"></script>
+<script>
+	global.Parser = {};
+	import trees from './trees'
+	const errorImg = require('../libs/config.js').errorImg;
+	export default {
+		components: {
+			trees
+		},
+		name: 'trees',
+		data() {
+			return {
+				controls: [],
+				placeholder: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="300" height="225"/>',
+				errorImg,
+				loadVideo:
+				// #ifdef APP-PLUS
+					false,
+				// #endif
+				// #ifndef APP-PLUS
+				true,
+				// #endif
+				poster:''
+			}
+		},
+		props: {
+			nodes: Array,
+			lazyLoad: Boolean,
+			loading: String
+		},
+		mounted() {
+			this.poster = uni.getStorageSync('platformInfor').videoimg;
+			// 获取顶层组件
+			var _top = this.$parent;
+			while (_top.$options.name != 'parser') {
+				if (_top.top) {
+					_top = _top.top;
+					break;
+				}
+				_top = _top.$parent;
+			}
+			this.top = _top;
+			
+			for (var j = this.nodes.length, item; item = this.nodes[--j];) {
+				if (item.c) continue;
+				if (item.name == 'img')
+					_top.imgList.setItem(item.attrs.i, item.attrs.src);
+				else if (item.name == 'video' || item.name == 'audio') {
+					var ctx;
+					if (item.name == 'video')
+						ctx = uni.createVideoContext(item.attrs.id
+							// #ifndef MP-BAIDU
+							, this
+							// #endif
+						);
+					else if (this.$refs[item.attrs.id])
+						ctx = this.$refs[item.attrs.id][0];
+					if (ctx) {
+						ctx.id = item.attrs.id;
+						_top.videoContexts.push(ctx);
+					}
+				}
+				// #ifdef MP-BAIDU || MP-ALIPAY || APP-PLUS
+				if (item.attrs && item.attrs.id) {
+					_top.anchors = _top.anchors || [];
+					_top.anchors.push({
+						id: item.attrs.id,
+						node: this
+					})
+				}
+				// #endif
+			}
+			// #ifdef APP-PLUS
+			// APP 上避免 video 错位需要延时渲染
+			setTimeout(() => {
+				this.loadVideo = true;
+			}, 3000)
+			// #endif
+		},
+		methods: {
+			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.controls[i])
+					this.$set(this.controls, i, 1);
+				else if (this.loading && this.controls[i] != 2)
+					this.$set(this.controls, i, 2);
+			},
+			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.controls[i] ? this.controls[i].i + 1 : 1;
+					if (index < this.nodes[i].attrs.source.length)
+						this.$set(this.controls, 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.controls, i, 3);
+				}
+				this.top && this.top.$emit('error', {
+					source,
+					target,
+					errMsg: e.detail.errMsg
+				});
+			},
+			_loadVideo(e) {
+				this.$set(this.controls, e.target.dataset.i, 0);
+			}
+		}
+	}
+</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 {
+		position: relative;
+		display: inline-block;
+		max-width: 100%;
+		vertical-align: top;
+	}
+	
+	image{
+		max-width: 750upx!important;
+		vertical-align: top;
+	}
+	
+	img{
+		max-width: 750upx!important;
+		vertical-align: top;
+	}
+	
+	/* #ifndef H5 */
+	:host {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifdef MP */
+	.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;
+	}
+
+	._blockquote,
+	._div,
+	._p,
+	._ol,
+	._ul,
+	._li {
+		display: block;
+	}
+
+	._code {
+		font-family: monospace;
+	}
+
+	._del {
+		text-decoration: line-through;
+	}
+
+	._em,
+	._i {
+		font-style: italic;
+	}
+
+	._h1 {
+		font-size: 2em;
+	}
+
+	._h2 {
+		font-size: 1.5em;
+	}
+
+	._h3 {
+		font-size: 1.17em;
+	}
+
+	._h5 {
+		font-size: 0.83em;
+	}
+
+	._h6 {
+		font-size: 0.67em;
+	}
+
+	._h1,
+	._h2,
+	._h3,
+	._h4,
+	._h5,
+	._h6 {
+		display: block;
+		font-weight: bold;
+	}
+
+	._image {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		opacity: 1;
+	}
+
+	._ins {
+		text-decoration: underline;
+	}
+
+	._li {
+		flex: 1;
+		width: 0;
+	}
+
+	._ol-bef {
+		width: 36px;
+		margin-right: 5px;
+		text-align: right;
+	}
+
+	._ul-bef {
+		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 */
+	._abbr,
+	._b,
+	._code,
+	._del,
+	._em,
+	._i,
+	._ins,
+	._label,
+	._q,
+	._span,
+	._strong,
+	._sub,
+	._sup {
+		display: inline;
+	}
+
+	/* #endif */
+
+	/* #ifndef H5 || 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/components/lb-picker/index.vue b/components/lb-picker/index.vue
new file mode 100644
index 0000000..13b3e9f
--- /dev/null
+++ b/components/lb-picker/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <view :class="['lb-picker', inline ? 'lb-picker-inline' : '']">
+
+    <!-- 默认插槽 -->
+    <view v-if="!inline"
+      class="lb-picker-default-slot"
+      @tap="show">
+      <slot></slot>
+    </view>
+
+    <!-- 遮罩层 -->
+    <view v-if="visible && showMask && !inline"
+      :class="['lb-picker-mask', animation ? 'lb-picker-mask-animation' : '']"
+      :style="{
+        backgroundColor: maskBgColor,
+        zIndex: zIndex - 1
+      }"
+      @tap.stop="handleMaskTap"
+      @touchmove.stop.prevent="moveHandle">
+    </view>
+
+    <view v-if="visible || inline"
+      :class="[
+        'lb-picker-container',
+        !inline ? 'lb-picker-container-fixed' : '',
+        animation ? 'lb-picker-container-animation' : '',
+        containerVisible ? 'lb-picker-container-show' : ''
+      ]"
+      :style="{
+        borderRadius: `${radius} ${radius} 0 0`,
+        zIndex: zIndex
+      }">
+      <view v-if="showHeader"
+        class="lb-picker-header">
+
+        <!-- 头部顶部插槽 -->
+        <slot name="header-top"></slot>
+
+        <view class="lb-picker-header-actions">
+          <!-- 取消 -->
+          <view class="lb-picker-action lb-picker-action-cancel"
+            @tap.stop="handleCancel">
+            <slot v-if="$slots['cancel-text']"
+              name="cancel-text">
+            </slot>
+            <text v-else
+              class="lb-picker-action-cancel-text"
+              :style="{ color: cancelColor }">{{ cancelText }}</text>
+          </view>
+
+          <!-- 中间 -->
+          <view class="lb-picker-action lb-picker-center"
+            v-if="$slots['action-center']">
+            <slot name="action-center"></slot>
+          </view>
+
+          <!-- 确定 -->
+          <view class="lb-picker-action lb-picker-action-confirm"
+            @tap.stop="handleConfirm">
+            <slot v-if="$slots['confirm-text']"
+              name="confirm-text"> </slot>
+            <text v-else
+              class="lb-picker-action-confirm-text"
+              :style="{ color: confirmColor }">{{ confirmText }}</text>
+          </view>
+        </view>
+
+        <!-- 头部底部插槽 -->
+        <slot name="header-bottom"></slot>
+      </view>
+
+      <view :class="[
+        'lb-picker-content',
+        safeAreaInsetBottom ? 'lb-picker-content-safe-buttom' : ''
+      ]">
+
+        <!-- 选择器顶部插槽 -->
+        <slot name="picker-top"></slot>
+
+        <view class="lb-picker-content-main"
+          :style="{ height: pickerContentHeight }">
+          <!-- loading -->
+          <view v-if="loading"
+            class="lb-picker-loading">
+            <slot name="loading">
+              <image class="lb-picker-loading-img"
+                src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAYAAACtWK6eAAAPFklEQVR4Xu2dTXbUOBeGpToHF7OGFTSsAFhBJytoWAFkUnKNoFdAWEGHUVmZJKygwwpIVkB6BYQVdDIj4Ry5zw3210W++pFtSb6S3pqWpHv9Xj2WZMtXUuAHBaDAWgUktIECUGC9AgAEvQMKbFAAgKB7QAEAgj4ABfopgBGkn26olYkCACSTQOMy+ykAQPrphlqZKABARg700dHRg+vr69+klE/run5E7kgpL+q6Pp9Op2d7e3uXI7uYtXkAMmL4tdZvhRBvhBAP1rhBcBwopd6N6GbWpgHICOGnUePm5uaTEOKppfnzoih2MZpYquWwGABxKKZtU1VVfZJS7tiWp3J1XZ+WZbnbpQ7KDlcAgAzXsFMLi8Xi1WQyOepUqSlsjNmbz+fHfeqiTj8FAEg/3XrX0lp/7jC1umvnXCn1rLdxVOysAADpLFn/Cs3a45/+LQhRFMVDrEWGKNitLgDppteg0ovFYmcymdDivPfPGLM7n89PezeAip0UACCd5BpWGIAM02+M2gAkoOoAJKDYjkwBEEdC2jQDQGxU4lUGgASMBwAJKLYjUwDEkZA2zQAQG5V4lQEgAeMBQAKK7cgUAHEkpE0zAMRGJV5lAEjAeACQgGI7MgVAHAlp0wwAsVGJVxkAEjAeACSg2I5MARBHQto0A0BsVOJVBoAEjAcACSi2I1MAxJGQNs0AEBuVeJUBIAHjAUACiu3IFABxJKRNMwDERiVeZQBIwHgAkIBiOzIFQBwJadMMALFRiVcZloA0ydReSilfLX+/Xdf1hZTyuCiK9zF+dpo7IIvF4tFkMnlZ1/VyRpcLIcRJWZYfeaHxwxt2gDRZP/7ckEyNUuBcTCaTF7PZ7JyjqOt8yhUQAkNKebQp1VFz8/tDKXXCKaasAKmqikSkUcPmdyml3I0JkhwBOTw8pJSq9B3+uuyRP8W6ruvjsiz3bDpAiDJsAKmq6kBK+brjRUcFSW6AdIVjKfY0khx07AteirMAZGDHiQaSgdd52wFiyWoyAA66zEul1EMvPb5joywAqarqi5TyNrN5z18UkOQCyEA42hsBiyySowPSPNn40hOM5WqXxphn8/mcnoqw/OUAiAs4KHh1Xb8vy5Iy34/6Gx0QrTWJQE+tXPxYZ0FPHRBXcDQd4Uwp1SnBt4sOdLcNDoDsCyHonAxXP7aQpAyIYzioLwAQUkFr7RoQapYlJKkC4gEOmmJ9LMvyuau7Zt92Rh9BXHSaNRfPDhIX18rtKZYPOJp4snjUOzogzShCR4390pfyDfVYQZIaIB7hoMfZjzk8cOECiI9pVssNG0hSAsQnHEKID0op2x0VHu6r/zXJApBmc+KplPKJp6tlAUkqgHiG46ooikdcNqOyAISg8A0Jhz0+KQDiGw7a0Mhpfx0bQHKAJHZAcoOD+iQrQFKHJGZAcoSDJSApQxIrILnCwRaQVCGJEZCc4WANSKqQaK3rAU/qrpRSVh8eDbDxv6q5w8EekBQhqarqREr5e88OHOz9AOD4ESF2i/RVHcf3I2AhRLBtDUOmWaHeLgMOZi8Kbe6mviExxgT7QKfnBs0gEAOOn3tjFCNI63LGkAAOm7uohzJRARJiTRJyJGm+pqR9aC/XxPaDMWY/xKY9jByrIxAdIKlB0oaF1ibLIZrP56cebogrmwQc65WOEpBUIQkFxLIdwLFZ9WgBCQQJi28SfIHTrOk+D8wos869K24bD/voGDUgviHh8tlnn8Da1On5NM2m6STgiOY9yLaI+Hy6Ferdw7Zr9PG/g3xkq9xKBo5kAPE5koR8quUDgnVtNmuPz45tJgVHUoB4hOSdUooexSb1G/JGf40QycGRHCCeIAEg228NScKRJCAeIEkSEIdTrGThSBYQl5CkugYhjbTWlMf41+0DxNoSScORNCCuICmK4iGXDBsDOvLKqgMf8yYPR/KAOIAkyelVSws9Hr+5uaFj7LqOIlnAkQUgAyD5WhTF01RHjxaSZi1C+75sM1tmA0c2gPSAJKtOQJAYY44tEvd9lVI+55S3yvW082570W816SpQc4ouvddYNa24EkIcFEVxkPrIsUo30kZK+WYFKNnqkh0gbcegbzGEEHRu944xhp7mXITcYt4V7JDlW21amznrki0gITscbMWrAACJN3bwPIACACSAyDARrwIAJN7YwfMACgCQACLDRLwKAJB4YwfPAygAQAKIDBPxKgBA4o0dPA+gAAAJIDJMxKsAAIk3dvA8gAIAJIDIMBGvAgAk3tjB8wAKAJAAIsNEvAoAkHhjB88DKABAAogME/EqAEDijR08D6AAAAkgMkzEq0BvQCgjxvfv359wu/TZbHbGzaec/Dk8PPyN2/Xeu3fv776fUHcGRGtNx4W9EUI85SbEkj8nxpg/QhxdxliDYK41eX5fCyGeBzPa3RClNzpQSn3oUtUakOaIgb/oUJQuBsYsW9f1m7Is34/pQ+q2tdZvhRDRJPeu6/p0Op2+sB1RrAHRWlOqfM6jxrq+GOSE2NRBWHV9AzMzjinZuVLqmY0DVoBELMStBikfgmMTZB9lPByf4MPNTW1aZc3cCkiTnvKLEOJB6CtwaO+DUuqVw/ayb6qqqhMp5e8RC3FZFMXjbVOtrYBorWnh9VfEQty6rpTaeq2xX2NI/7XWdUh7nmy9UEqdbGp7a6eJfXrVXrwxZjfnBGguO1gC06tWjq3TLBtAjoUQ9Gg36h8AcRe+hADZOvUGIO76TTYtAZClUGOKlU2/t77QhABxMsXCIt266+RTEIv0JtbNY17Kfm57wArHXrJ1rsnRac4+JfCY96ooikeDH/NSkGKfZuFFoXvUHJ6S6945uxa3Tq+oma2L9NZWVVXnFicQ2bkWthS2mnjSO9YbZ13Xf5dlabVtyhqQZqpFL1XYbWfeEH/A4QmOttkIITkriuL5tqlVe33WgLQVNhzT5TkUnZr/YIzZx3b3Tpr1LkwnUkkpDzhvPaFRo67rg/l8Tu/1rH+dAWlbphHl27dvVsOUtTcOCuJtuQMRBzRBj4AHVPdS9f79++e2I8ZdB3oD4uVK0CgUYKYAAGEWELjDSwEAwise8IaZAgCEWUDgDi8FAAiveMAbZgoAEGYBgTu8FAAgvOIBb5gpAECYBQTu8FIAgPCKB7xhpgAAYRYQuMNLAQDCKx7whpkCAIRZQOAOLwUACK94wBtmCgAQZgGBO7wUACC84gFvmCkAQJgFBO7wUgCA8IoHvGGmQNaArDhG7mo2m9FJRPhBgVsFsgRk0zFydV1fSCmPi6J43/czzdj7VlVVdKzBcyklfVL9tNGEbhyUX2xjNvTYr/2u/1kB0uRyOrI8Keu8KIrdnCBpUor+uUmfrkeYxQ5MNoA0cHzqeBCQ9VFdsXcEylYzmUzo5mHzy+bmkQUgPeFoO4pVBj6bXsW1TEc42svIApLkARkIh6D5d1mWj7l27qF+DczUnjwkSQMyFI6280kpn6X6dKuqqk8Dj/ZOGpJkAXEFB0FijNnrmpFv6J09RH3KiDiZTOiA1qG/ZCFJEhCXcDQ9J8l1SM+1xzqYkoQkOUA8wJHsCOIh8XRykCQFiA84bt+mJroG8QAIPdQ4Lctyd+icjUv9ZADxBYcQ4qtS6hGXgLn0Y+ATrLWu1HV9XJblnktfx2orCUA8wkFxSXL90XY4X2cNpgJJ9ID4hIPOlJhOpzspbzepqorO9Xjt4w6dAiRRA+ITDiHEFb0fSPX9RwtEc3IYbUT8FZD8vwLRApIaHIeHhz8dbTebzc58dNhVbTZanvo6yTjmkSRKQFKBo1kk0/SGzqJf9TuRUr4LMYoBktUBiA6QVODQWr8VQuxbjhL7Sql3lmV7FwsAyfuyLN/0dnCEilEBkhAcBAYB0uUX5MRe35DEtm0nGkBSgWPIuwdjzOMQJ/cCkv/uW1EAkgocJHtVVbSuoE9a+/zok9dXfSp2rQNIfijGHpCU4CDBh76YU0oFixkgYQ5IanAMmV61I4AxZjfkWfC5QxLsbtRziO/6DbmtmVFeAsYICAmaMyQsAUlt5GipjRWQnCFhB0iqcFAnixmQAJBcSil3Q7wUtZ1msFukpwxHCoDkCAmbEaTZNEffRz/oQrhl2VHWHHd9i30Eaa/H85qE1UjCBhCt9bEQ4qVlh+9SjAUcqYwgoSApiuIxh88MWADiMLvGXXDYwJEaIAGmW8Feim6627IARGtNG9goJ6zLHys4UgTENyRFUTwcexRhAcjA7ReroGIHR6qAeIbkxdjZ5FkAorWmj3V++mBowFDCEo6UAfEIyej5AFIDhC0cqQPiCRIAQsI6ShzAGo4cAPEACQBpOk6XsymiWXOk+h5k2/TX4XsSANKKrbW+7Jk0gP3I0V5jKi8KtwHiaiThkNGSxRqEBO35qDcaOHKZYi3DM2QkoZxkZVnSGYmj/tgA0kDS5W16VHDkCMiQkST0dy/rKGQFSAMJJTSgF4e/bLh1nBljXoX4Ptvl7SunKdaKkYROx7VKTscpsQM7QJo7LSWL3pFS0lHEt5sX67qmTWynxpiT2MDIcQ1y98bSbEalG9/abC51XX+cTCb7nLa8swTE5V2bU1u5jiDLMWhA2Vk+atoYcyGEOOV44wMgAQkCIAHFdmQKgDgS0qYZAGKjEq8yACRgPABIQLEdmQIgjoS0aQaA2KjEqwwACRgPABJQbEemAIgjIW2aASA2KvEqA0ACxgOABBTbkSkA4khIm2YAiI1KvMoAkIDxACABxXZkCoA4EtKmGQBioxKvMgAkYDwASECxHZkCII6EtGkGgNioxKsMAAkYDwASUGxHpgCIIyFtmgEgNirxKgNAAsYDgAQU25EpAOJISJtmAIiNSrzKAJCA8QAgAcV2ZAqAOBLSppnma7p/bMquK8MhofMQ/2OrC0ACR6yqqnMp5ZM+Zrmkwunje6x1AEjgyC0Wi95ZJDll+wgs22jmAMgI0vfMZn+mlKJkB/gFVACABBS7NUVrkevr61PbqRZNrabT6c7Yh8mMINXoJgHIiCHQWm9LknclhDhQSlE5/EZQAICMIPqyyTt5oihhHv0oT9R5URSnGDXGDRAAGVd/WGeuAABhHiC4N64CAGRc/WGduQIAhHmA4N64CgCQcfWHdeYKABDmAYJ74yoAQMbVH9aZKwBAmAcI7o2rwL9NuZ5QQgPItwAAAABJRU5ErkJggg==">
+              </image>
+            </slot>
+          </view>
+
+          <!-- 暂无数据 -->
+          <view v-if="isEmpty && !loading"
+            class="lb-picker-empty">
+            <slot name="empty">
+              <text class="lb-picker-empty-text"
+                :style="{ color: emptyColor }">{{ emptyText }}</text>
+            </slot>
+          </view>
+
+          <!-- 单选 -->
+          <selector-picker v-if="mode === 'selector' && !loading && !isEmpty"
+            :ref="mode"
+            :value="value"
+            :list="list"
+            :mode="mode"
+            :props="pickerProps"
+            :height="pickerContentHeight"
+            :inline="inline"
+            :column-style="columnStyle"
+            :active-column-style="activeColumnStyle"
+            :align="align"
+            :press-enable="pressEnable"
+            :press-time="pressTime"
+            :formatter="formatter"
+            @change="handleChange">
+          </selector-picker>
+
+          <!-- 多列联动 -->
+          <multi-selector-picker v-if="mode === 'multiSelector' && !loading && !isEmpty"
+            :ref="mode"
+            :value="value"
+            :list="list"
+            :mode="mode"
+            :level="level"
+            :visible="visible"
+            :props="pickerProps"
+            :height="pickerContentHeight"
+            :inline="inline"
+            :column-style="columnStyle"
+            :active-column-style="activeColumnStyle"
+            :align="align"
+            :press-enable="pressEnable"
+            :press-time="pressTime"
+            :formatter="formatter"
+            @change="handleChange">
+          </multi-selector-picker>
+
+          <!-- 非联动选择 -->
+          <unlinked-selector-picker v-if="mode === 'unlinkedSelector' && !loading && !isEmpty"
+            :ref="mode"
+            :value="value"
+            :list="list"
+            :mode="mode"
+            :visible="visible"
+            :props="pickerProps"
+            :height="pickerContentHeight"
+            :inline="inline"
+            :column-style="columnStyle"
+            :active-column-style="activeColumnStyle"
+            :align="align"
+            :press-enable="pressEnable"
+            :press-time="pressTime"
+            :formatter="formatter"
+            @change="handleChange">
+          </unlinked-selector-picker>
+        </view>
+
+        <!-- 选择器底部插槽 -->
+        <slot name="picker-bottom"></slot>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+const defaultMaskBgColor = 'rgba(0, 0, 0, 0)'
+const defaultProps = {
+  label: 'label',
+  value: 'value',
+  children: 'children'
+}
+import { getColumns } from './utils'
+import SelectorPicker from './pickers/selector-picker'
+import MultiSelectorPicker from './pickers/multi-selector-picker'
+import UnlinkedSelectorPicker from './pickers/unlinked-selector-picker'
+export default {
+  components: {
+    SelectorPicker,
+    MultiSelectorPicker,
+    UnlinkedSelectorPicker
+  },
+  props: {
+    value: [String, Number, Array],
+    list: Array,
+    mode: {
+      type: String,
+      default: 'selector'
+    },
+    level: {
+      type: Number,
+      default: 1
+    },
+    props: {
+      type: Object
+    },
+    cancelText: {
+      type: String,
+      default: '取消'
+    },
+    cancelColor: {
+			type: String,
+			default: '#999'
+		},
+    confirmText: {
+      type: String,
+      default: '确定'
+    },
+    confirmColor: {
+			type: String,
+			default: '#007aff'
+		},
+    canHide: {
+      type: Boolean,
+      default: true
+    },
+    emptyColor: {
+			type: String,
+			default: '#999'
+		},
+    emptyText: {
+      type: String,
+      default: '暂无数据'
+    },
+    radius: String,
+    columnNum: {
+      type: Number,
+      default: 5
+    },
+    loading: Boolean,
+    closeOnClickMask: {
+      type: Boolean,
+      default: true
+    },
+    showMask: {
+      type: Boolean,
+      default: true
+    },
+    maskColor: {
+      type: String,
+      default: 'rgba(0, 0, 0, 0.4)'
+    },
+    dataset: Object,
+    inline: Boolean,
+    showHeader: {
+      type: Boolean,
+      default: true
+    },
+    animation: {
+      type: Boolean,
+      default: true
+    },
+    zIndex: {
+      type: Number,
+      default: 999
+    },
+    safeAreaInsetBottom: {
+      type: Boolean,
+      default: true
+    },
+    disabled: Boolean,
+    columnStyle: Object,
+    activeColumnStyle: Object,
+    align: {
+      type: String,
+      default: 'center'
+    },
+    pressEnable: Boolean,
+    pressTime: {
+      type: Number,
+      default: 500
+    },
+    formatter: Function
+  },
+  data () {
+    return {
+      visible: false,
+      containerVisible: false,
+      maskBgColor: defaultMaskBgColor,
+      myValue: this.value,
+      picker: {},
+      pickerProps: Object.assign({}, defaultProps, this.props)
+    }
+  },
+  computed: {
+    pickerContentHeight () {
+      return 34 * this.columnNum + 'px'
+    },
+    isEmpty () {
+      if (!this.list) return true
+      if (this.list && !this.list.length) return true
+      return false
+    }
+  },
+  methods: {
+    show () {
+      if (this.inline || this.disabled) return
+      this.visible = true
+      setTimeout(() => {
+        this.maskBgColor = this.maskColor
+        this.containerVisible = true
+      }, 20)
+    },
+    hide () {
+      if (this.inline) return
+      this.maskBgColor = defaultMaskBgColor
+      this.containerVisible = false
+      setTimeout(() => {
+        this.visible = false
+      }, 200)
+    },
+    handleCancel () {
+      this.$emit('cancel', this.picker)
+      if (this.canHide && !this.inline) {
+        this.hide()
+      }
+    },
+    handleConfirm () {
+      if (this.isEmpty) {
+        this.$emit('confirm', null)
+        this.hide()
+      } else {
+        const picker = { ...this.picker }
+        this.$refs[this.mode].isConfirmChange = true
+        this.myValue = picker.value
+        this.$emit('confirm', this.picker)
+        if (this.canHide) this.hide()
+      }
+    },
+    handleChange ({ value, item, index, change }) {
+      this.picker.value = value
+      this.picker.item = item
+      this.picker.index = index
+      this.picker.change = change
+      this.picker.dataset = this.dataset || {}
+      if (this.$refs[this.mode] && this.inline) {
+        this.$refs[this.mode].isConfirmChange = true
+      }
+      this.$emit('change', this.picker)
+    },
+    handleMaskTap () {
+      if (this.closeOnClickMask) {
+        this.hide()
+      }
+    },
+    moveHandle () {},
+    getColumnsInfo (value, type = 1) {
+      let columnsInfo = getColumns(
+        {
+          value,
+          list: this.list,
+          mode: this.mode,
+          props: this.pickerProps,
+          level: this.level
+        },
+        type
+      )
+      if (columnsInfo) {
+        if (this.mode === 'selector') {
+          columnsInfo.index = columnsInfo.index[0]
+        }
+      } else {
+        columnsInfo = {}
+      }
+      columnsInfo.dataset = this.dataset || {}
+      return columnsInfo
+    }
+  },
+  watch: {
+    value (newVal) {
+      this.myValue = newVal
+    },
+    myValue (newVal) {
+      this.$emit('input', newVal)
+    },
+    visible (newVisible) {
+      if (newVisible) {
+        this.$emit('show')
+      } else {
+        this.$emit('hide')
+      }
+    },
+    props (newProps) {
+      this.pickerProps = Object.assign({}, defaultProps, newProps)
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "./style/picker.scss";
+</style>
diff --git a/components/lb-picker/mixins/index.js b/components/lb-picker/mixins/index.js
new file mode 100644
index 0000000..adb35fb
--- /dev/null
+++ b/components/lb-picker/mixins/index.js
@@ -0,0 +1,93 @@
+import { getColumns, isObject, isFunction } from '../utils'
+export const commonMixin = {
+  data () {
+    return {
+      isConfirmChange: false,
+      indicatorStyle: `height: 34px`,
+      pressTimeout: null
+    }
+  },
+  created () {
+    this.init('init')
+  },
+  methods: {
+    init (changeType) {
+      if (this.list && this.list.length) {
+        const column = getColumns({
+          value: this.value,
+          list: this.list,
+          mode: this.mode,
+          props: this.props,
+          level: this.level
+        })
+        const { columns, value, item, index } = column
+        this.selectValue = value
+        this.selectItem = item
+        this.pickerColumns = columns
+        this.pickerValue = index
+        this.$emit('change', {
+          value: this.selectValue,
+          item: this.selectItem,
+          index: this.pickerValue,
+          change: changeType
+        })
+      }
+    },
+    touchstart (e) {
+      if (!this.pressEnable) return
+      clearTimeout(this.pressTimeout)
+      this.pressTimeout = setTimeout(() => {
+        let item = {}
+        let toastTitle = ''
+        // #ifdef APP-NVUE
+        item = e.target.dataset.item
+        // #endif
+
+        // #ifdef H5
+        item = JSON.parse(e.currentTarget.dataset.item)
+        // #endif
+
+        // #ifndef APP-NVUE || H5
+        item = e.currentTarget.dataset.item
+        // #endif
+
+        // #ifdef APP-PLUS || H5
+        toastTitle = this.getLabel(item)
+        // #endif
+
+        // #ifndef APP-PLUS || H5
+        toastTitle = item[this.props.label] || item
+        // #endif
+        uni.showToast({
+          title: toastTitle,
+          icon: 'none'
+        })
+      }, this.pressTime)
+    },
+    touchmove () {
+      if (!this.pressEnable) return
+      clearTimeout(this.pressTimeout)
+    },
+    touchend () {
+      if (!this.pressEnable) return
+      clearTimeout(this.pressTimeout)
+    },
+    getLabel (item, rowIndex, columnIndex) {
+      if (this.formatter && isFunction(this.formatter)) {
+        return this.formatter({ item, rowIndex, columnIndex })
+      } else {
+        return item[this.props.label] || item
+      }
+    }
+  },
+  watch: {
+    value () {
+      if (!this.isConfirmChange) {
+        this.init('value')
+      }
+    },
+    list () {
+      this.init('list')
+    }
+  }
+}
diff --git a/components/lb-picker/pickers/multi-selector-picker.vue b/components/lb-picker/pickers/multi-selector-picker.vue
new file mode 100644
index 0000000..97df459
--- /dev/null
+++ b/components/lb-picker/pickers/multi-selector-picker.vue
@@ -0,0 +1,135 @@
+<template>
+  <view class="lb-multi-selector lb-picker-item"
+    :style="{ height: height }">
+    <picker-view :value="pickerValue"
+      :indicator-style="indicatorStyle"
+      :style="{ height: height }"
+      @change="handleChange">
+      <picker-view-column v-for="(column, index) in pickerColumns"
+        :key="index">
+        <!-- #ifdef H5 -->
+        <view v-for="(item, i) in column || []"
+          :class="[
+				    'lb-picker-column',
+				    item[props.value] === selectValue[index]
+				      ? 'lb-picker-column-active'
+				      : ''
+				  ]"
+          :key="i"
+          :data-item="pressEnable ? JSON.stringify(item) : ''"
+          @touchstart="touchstart"
+          @touchmove="touchmove"
+          @touchend="touchend">
+          <!-- #endif -->
+          <!-- #ifndef H5 -->
+          <view v-for="(item, i) in column || []"
+            :class="[
+            'lb-picker-column',
+            item[props.value] === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
+            :key="i"
+            :data-item="item"
+            @touchstart="touchstart"
+            @touchmove="touchmove"
+            @touchend="touchend">
+            <!-- #endif -->
+            <!-- #ifdef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]"
+              :style="[
+              item[props.value] === selectValue[index]
+              ? activeColumnStyle
+              : columnStyle
+            ]">{{ getLabel(item, i, index) }}</text>
+            <!-- #endif -->
+
+            <!-- #ifndef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]">{{ item[props.label] || item }}</text>
+            <!-- #endif -->
+          </view>
+      </picker-view-column>
+    </picker-view>
+  </view>
+</template>
+
+<script>
+import { commonMixin } from '../mixins'
+export default {
+  props: {
+    value: Array,
+    list: Array,
+    mode: String,
+    props: Object,
+    level: Number,
+    visible: Boolean,
+    height: String,
+    columnStyle: Object,
+    activeColumnStyle: Object,
+    align: String,
+    pressEnable: Boolean,
+    pressTime: Number,
+    formatter: Function
+  },
+  mixins: [commonMixin],
+  data () {
+    return {
+      pickerValue: [],
+      pickerColumns: [],
+      selectValue: [],
+      selectItem: []
+    }
+  },
+  methods: {
+    handleChange (item) {
+      const pickerValue = item.detail.value
+      const columnIndex = pickerValue.findIndex(
+        (item, i) => item !== this.pickerValue[i]
+      )
+      const valueIndex = pickerValue[columnIndex]
+      this.setPickerChange(pickerValue, valueIndex, columnIndex)
+    },
+    setPickerChange (pickerValue, valueIndex, columnIndex) {
+      for (let i = 0; i < this.level; i++) {
+        if (i > columnIndex) {
+          pickerValue[i] = 0
+          const column =
+            this.pickerColumns[i - 1][valueIndex] ||
+            this.pickerColumns[i - 1][0]
+          this.$set(this.pickerColumns, i, column[this.props.children] || [])
+          valueIndex = 0
+        }
+        this.$set(this.pickerValue, i, pickerValue[i])
+        const selectItem = this.pickerColumns[i][pickerValue[i]]
+        if (selectItem) {
+          this.selectItem[i] = selectItem
+          this.selectValue[i] = selectItem[this.props.value]
+        } else {
+          const spliceNum = this.level - i
+          this.pickerValue.splice(i, spliceNum)
+          this.selectValue.splice(i, spliceNum)
+          this.selectItem.splice(i, spliceNum)
+          this.pickerColumns.splice(i, spliceNum)
+          break
+        }
+      }
+      this.$emit('change', {
+        value: this.selectValue,
+        item: this.selectItem,
+        index: this.pickerValue,
+        change: 'scroll'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../style/picker-item.scss";
+</style>
diff --git a/components/lb-picker/pickers/selector-picker.vue b/components/lb-picker/pickers/selector-picker.vue
new file mode 100644
index 0000000..0a0fda9
--- /dev/null
+++ b/components/lb-picker/pickers/selector-picker.vue
@@ -0,0 +1,113 @@
+<template>
+  <view class="lb-selector-picker lb-picker-item"
+    :style="{ height: height }">
+    <picker-view :value="pickerValue"
+      :style="{ height: height }"
+      :indicator-style="indicatorStyle"
+      @change="handleChange">
+      <picker-view-column>
+        <!-- #ifdef H5 -->
+        <view v-for="(item, i) in list"
+          :class="[
+				    'lb-picker-column',
+				    (item[props.value] || item) === selectValue
+				      ? 'lb-picker-column-active'
+				      : ''
+				  ]"
+          :key="i"
+          :data-item="pressEnable ? JSON.stringify(item) : ''"
+          @touchstart="touchstart"
+          @touchmove="touchmove"
+          @touchend="touchend">
+          <!-- #endif -->
+          <!-- #ifndef H5 -->
+          <view v-for="(item, i) in list"
+            :class="[
+            'lb-picker-column',
+            (item[props.value] || item) === selectValue
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
+            :key="i"
+            :data-item="item"
+            @touchstart="touchstart"
+            @touchmove="touchmove"
+            @touchend="touchend">
+            <!-- #endif -->
+            <!-- #ifdef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]"
+              :style="[
+              (item[props.value] || item) === selectValue
+                ? activeColumnStyle
+                : columnStyle
+            ]">{{ getLabel(item, i, 0) }}</text>
+            <!-- #endif -->
+
+            <!-- #ifndef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]">{{ item[props.label] || item }}</text>
+            <!-- #endif -->
+          </view>
+      </picker-view-column>
+    </picker-view>
+  </view>
+</template>
+
+<script>
+import { isObject } from '../utils'
+import { commonMixin } from '../mixins'
+export default {
+  props: {
+    value: [String, Number],
+    list: Array,
+    mode: String,
+    props: Object,
+    visible: Boolean,
+    height: String,
+    columnStyle: Object,
+    activeColumnStyle: Object,
+    align: String,
+    pressEnable: Boolean,
+    pressTime: Number,
+    formatter: Function
+  },
+  mixins: [commonMixin],
+  data () {
+    return {
+      pickerValue: [],
+      selectValue: '',
+      selectItem: null
+    }
+  },
+  computed: {
+    isH5 () {
+      return false
+    }
+  },
+  methods: {
+    handleChange (item) {
+      const index = item.detail.value[0] || 0
+      this.selectItem = this.list[index]
+      this.selectValue = isObject(this.selectItem)
+        ? this.selectItem[this.props.value]
+        : this.selectItem
+      this.pickerValue = item.detail.value
+      this.$emit('change', {
+        value: this.selectValue,
+        item: this.selectItem,
+        index: index,
+        change: 'scroll'
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../style/picker-item.scss";
+</style>
diff --git a/components/lb-picker/pickers/unlinked-selector-picker.vue b/components/lb-picker/pickers/unlinked-selector-picker.vue
new file mode 100644
index 0000000..05d8098
--- /dev/null
+++ b/components/lb-picker/pickers/unlinked-selector-picker.vue
@@ -0,0 +1,116 @@
+<template>
+  <view class="lb-selector-picker lb-picker-item"
+    :style="{ height: height }">
+    <picker-view :value="pickerValue"
+      :indicator-style="indicatorStyle"
+      :style="{ height: height }"
+      @change="handleChange">
+      <picker-view-column v-for="(column, index) in pickerColumns"
+        :key="index">
+        <!-- #ifdef H5 -->
+        <view v-for="(item, i) in column || []"
+          :class="[
+				    'lb-picker-column',
+				    (item[props.value] || item) === selectValue[index]
+				      ? 'lb-picker-column-active'
+				      : ''
+				  ]"
+          :key="i"
+          :data-item="pressEnable ? JSON.stringify(item) : ''"
+          @touchstart="touchstart"
+          @touchmove="touchmove"
+          @touchend="touchend">
+          <!-- #endif -->
+          <!-- #ifndef H5 -->
+          <view v-for="(item, i) in column || []"
+            :class="[
+            'lb-picker-column',
+            (item[props.value] || item) === selectValue[index]
+              ? 'lb-picker-column-active'
+              : ''
+          ]"
+            :key="i"
+            :data-item="item"
+            @touchstart="touchstart"
+            @touchmove="touchmove"
+            @touchend="touchend">
+            <!-- #endif -->
+            <!-- #ifdef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]"
+              :style="[
+              (item[props.value] || item) === selectValue[index]
+              ? activeColumnStyle
+              : columnStyle
+            ]">{{ getLabel(item, i, index) }}</text>
+            <!-- #endif -->
+
+            <!-- #ifndef APP-PLUS || H5 -->
+            <text :class="[
+              'lb-picker-column-label',
+              `lb-picker-column-label-${align}`
+            ]">{{ item[props.label] || item }}</text>
+            <!-- #endif -->
+          </view>
+      </picker-view-column>
+    </picker-view>
+  </view>
+</template>
+
+<script>
+import { isObject } from '../utils'
+import { commonMixin } from '../mixins'
+export default {
+  props: {
+    value: Array,
+    list: Array,
+    mode: String,
+    props: Object,
+    visible: Boolean,
+    height: String,
+    columnStyle: Object,
+    activeColumnStyle: Object,
+    align: String,
+    pressEnable: Boolean,
+    pressTime: Number,
+    formatter: Function
+  },
+  mixins: [commonMixin],
+  data () {
+    return {
+      pickerValue: [],
+      pickerColumns: [],
+      selectValue: [],
+      selectItem: []
+    }
+  },
+  methods: {
+    handleChange (item) {
+      const pickerValue = item.detail.value
+      const columnIndex = pickerValue.findIndex((item, i) => item !== this.pickerValue[i])
+      if (columnIndex > -1) {
+        const valueIndex = pickerValue[columnIndex]
+        const columnItem = this.list[columnIndex][valueIndex]
+        const valueItem = isObject(columnItem)
+          ? columnItem[this.props.value]
+          : columnItem
+        this.pickerValue = pickerValue
+        this.$set(this.selectValue, columnIndex, valueItem)
+        this.$set(this.selectItem, columnIndex, columnItem)
+        this.$emit('change', {
+          value: this.selectValue,
+          item: this.selectItem,
+          index: this.pickerValue,
+          change: 'scroll'
+        })
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+@import "../style/picker-item.scss";
+</style>
diff --git a/components/lb-picker/style/picker-item.scss b/components/lb-picker/style/picker-item.scss
new file mode 100644
index 0000000..15d6e39
--- /dev/null
+++ b/components/lb-picker/style/picker-item.scss
@@ -0,0 +1,40 @@
+.lb-picker-column {
+  height: 34px;
+  padding: 0 10px;
+  /* #ifndef APP-NVUE */
+  display: flex;
+  box-sizing: border-box;
+  white-space: nowrap;
+  overflow: hidden;
+  /* #endif */
+  flex-direction: row;
+  align-items: center;
+}
+
+.lb-picker-column-label {
+  font-size: 16px;
+  text-align: center;
+  flex: 1;
+  /* #ifdef APP-NVUE */
+  lines: 1;
+  /* #endif */
+  text-overflow: ellipsis;
+  transition-property: color;
+  transition-duration: 0.3s;
+  /* #ifndef APP-NVUE */
+  overflow: hidden;
+  white-space: nowrap;
+  /* #endif */
+}
+
+.lb-picker-column-label-left {
+  text-align: left;
+}
+
+.lb-picker-column-label-center {
+  text-align: center;
+}
+
+.lb-picker-column-label-right {
+  text-align: right;
+}
\ No newline at end of file
diff --git a/components/lb-picker/style/picker.scss b/components/lb-picker/style/picker.scss
new file mode 100644
index 0000000..a4744e7
--- /dev/null
+++ b/components/lb-picker/style/picker.scss
@@ -0,0 +1,176 @@
+.lb-picker {
+	position: relative;
+}
+
+.lb-picker-mask {
+	background-color: rgba(0, 0, 0, 0.0);
+	position: fixed;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+}
+
+.lb-picker-mask-animation {
+	transition-property: background-color;
+	transition-duration: 0.3s;
+}
+
+.lb-picker-container {
+	position: relative;
+}
+
+.lb-picker-container-fixed {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	transform: translateY(100%);
+	/* #ifndef APP-NVUE */
+	overflow: hidden;
+	/* #endif */
+}
+
+.lb-picker-container-animation {
+	transition-property: transform;
+	transition-duration: 0.3s;
+}
+
+.lb-picker-container-show {
+	transform: translateY(0);
+}
+
+.lb-picker-header {
+	position: relative;
+	background-color: #fff;
+	/* #ifdef APP-NVUE */
+	border-bottom-width: 1px;
+	border-bottom-style: solid;
+	border-bottom-color: #e5e5e5;
+	border-top-width: 1px;
+	border-top-style: solid;
+	border-top-color: #e5e5e5;
+	/* #endif */
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	/* #endif */
+
+}
+
+/* #ifndef APP-NVUE */
+.lb-picker-header::before {
+	content: "";
+	position: absolute;
+	left: 0;
+	top: 0;
+	right: 0;
+	height: 1px;
+	clear: both;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	transform-origin: 0 100%;
+	transform: scaleY(0.5);
+}
+
+.lb-picker-header::after {
+	content: "";
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	right: 0;
+	height: 1px;
+	clear: both;
+	border-bottom: 1px solid #e5e5e5;
+	color: #e5e5e5;
+	transform-origin: 0 100%;
+	transform: scaleY(0.5);
+}
+
+/* #endif */
+
+.lb-picker-header-actions {
+	height: 45px;
+	/* #ifndef APP-NVUE */
+	box-sizing: border-box;
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	justify-content: space-between;
+	flex-wrap: nowrap;
+}
+
+.lb-picker-action {
+	padding-left: 10px;
+	padding-right: 10px;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	flex-direction: row;
+	align-items: center;
+	justify-content: center;
+}
+
+.lb-picker-action-cancel-text {
+	font-size: 16px;
+}
+
+.lb-picker-action-confirm-text {
+	font-size: 16px;
+}
+
+.lb-picker-content {
+	position: relative;
+	background-color: #fff;
+}
+
+/* #ifndef APP-PLUS */
+.lb-picker-content-safe-buttom {
+	padding-bottom: 0;
+	padding-bottom: constant(safe-area-inset-bottom);
+	padding-bottom: env(safe-area-inset-bottom);
+}
+
+/* #endif */
+
+.lb-picker-content-main {
+	position: relative;
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	flex-direction: column;
+}
+
+.lb-picker-loading,
+.lb-picker-empty {
+	/* #ifndef APP-NVUE */
+	display: flex;
+	/* #endif */
+	justify-content: center;
+	align-items: center;
+}
+
+.lb-picker-empty-text {
+	font-size: 16px;
+}
+
+.lb-picker-loading-img {
+	width: 25px;
+	height: 25px;
+	/* #ifndef APP-NVUE */
+	animation: rotating 2s linear infinite;
+	/* #endif */
+}
+
+/* #ifndef APP-NVUE */
+@keyframes rotating {
+	0% {
+		transform: rotate(0deg)
+	}
+
+	100% {
+		transform: rotate(1turn)
+	}
+}
+
+/* #endif */
\ No newline at end of file
diff --git a/components/lb-picker/utils.js b/components/lb-picker/utils.js
new file mode 100644
index 0000000..545a1e6
--- /dev/null
+++ b/components/lb-picker/utils.js
@@ -0,0 +1,129 @@
+/**
+ * 判断是否是对象
+ *
+ * @export
+ * @param {*} val
+ * @returns true/false
+ */
+export function isObject (val) {
+  // return Object.prototype.toString.call(val) === '[object Object]'
+	// 报错了 Cannot read property 'call' of undefined
+	if(Object.prototype.toString){
+		return Object.prototype.toString.call(val) === '[object Object]'
+	}
+}
+
+/**
+ * 判断是否是Function
+ *
+ * @export
+ * @param {*} val
+ * @returns true/false
+ */
+export function isFunction (val) {
+  // return Object.prototype.toString.call(val) === '[object Function]'
+	// 报错了 Cannot read property 'call' of undefined
+	if(Object.prototype.toString){
+		return Object.prototype.toString.call(val) === '[object Function]'
+	}
+}
+
+/**
+ * 根据value获取columns信息
+ *
+ * @export
+ * @param {*} { value, list, mode, props, level }
+ * @param {number} [type=2] 查询不到value数据返回数据类型 1空值null 2默认第一个选项
+ * @returns
+ */
+export function getColumns ({ value, list, mode, props, level }, type = 2) {
+  let pickerValue = []
+  let pickerColumns = []
+  let selectValue = []
+  let selectItem = []
+  let columnsInfo = null
+  switch (mode) {
+    case 'selector':
+      let index = list.findIndex(item => {
+        return isObject(item) ? item[props.value] === value : item === value
+      })
+      if (index === -1 && type === 1) {
+        columnsInfo = null
+      } else {
+        index = index > -1 ? index : 0
+        selectItem = list[index]
+        selectValue = isObject(selectItem)
+          ? selectItem[props.value]
+          : selectItem
+        pickerColumns = list
+        pickerValue = [index]
+        columnsInfo = {
+          index: pickerValue,
+          value: selectValue,
+          item: selectItem,
+          columns: pickerColumns
+        }
+      }
+      break
+    case 'multiSelector':
+      const setPickerItems = (data = [], index = 0) => {
+        if (!data.length) return
+        const defaultValue = value || []
+        if (index < level) {
+          const value = defaultValue[index] || ''
+          let i = data.findIndex(item => item[props.value] === value)
+          if (i === -1 && type === 1) return
+          i = i > -1 ? i : 0
+          pickerValue[index] = i
+          pickerColumns[index] = data
+          if (data[i]) {
+            selectValue[index] = data[i][props.value]
+            selectItem[index] = data[i]
+            setPickerItems(data[i][props.children] || [], index + 1)
+          }
+        }
+      }
+      setPickerItems(list)
+      if (!selectValue.length && type === 1) {
+        columnsInfo = null
+      } else {
+        columnsInfo = {
+          index: pickerValue,
+          value: selectValue,
+          item: selectItem,
+          columns: pickerColumns
+        }
+      }
+      break
+    case 'unlinkedSelector':
+      list.forEach((item, i) => {
+        let index = item.findIndex(item => {
+          return isObject(item)
+            ? item[props.value] === value[i]
+            : item === value[i]
+        })
+        if (index === -1 && type === 1) return
+        index = index > -1 ? index : 0
+        const columnItem = list[i][index]
+        const valueItem = isObject(columnItem)
+          ? columnItem[props.value]
+          : columnItem
+        pickerValue[i] = index
+        selectValue[i] = valueItem
+        selectItem[i] = columnItem
+      })
+      pickerColumns = list
+      if (!selectValue.length && type === 1) {
+        columnsInfo = null
+      } else {
+        columnsInfo = {
+          index: pickerValue,
+          value: selectValue,
+          item: selectItem,
+          columns: pickerColumns
+        }
+      }
+      break
+  }
+  return columnsInfo
+}
diff --git a/components/page/pageComponents/Recommend_goods.vue b/components/page/pageComponents/Recommend_goods.vue
new file mode 100644
index 0000000..38de789
--- /dev/null
+++ b/components/page/pageComponents/Recommend_goods.vue
@@ -0,0 +1,67 @@
+<template>
+	<view class="container">
+		<goods-style goodsStyleType="rush2" :goodslistData="goodslist"></goods-style>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	export default {
+		data() {
+			return {
+				goodslist: []
+			}
+		},
+		props: {
+			goods_type: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			goods_id: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			}
+		},
+		components:{
+			goodsStyle
+		},
+		mounted() {
+			this.getRecommendGoods()
+		},
+		methods: {
+			getRecommendGoods() {
+				let _this = this;
+				App._post_form('&do=getRecommendGoods', {
+					type: _this.goods_type,
+					id: _this.goods_id
+				}, res => {
+					_this.setData({
+						goodslist: res.data,
+					});
+					this.$emit('recommendGoodNoOff',res.data);
+				}, false, () => {})
+			},
+
+			navgateto(goods) {
+				let _this = this,
+					pages = getCurrentPages(),
+					currentPage = pages[pages.length - 1],
+					navType = currentPage.route === 'pages/subPages/goods/index' ? 'rediRect' : 'navigate';
+				App.navigationTo({
+					url: `pages/subPages/goods/index?goods_id=${goods['id']}&goodsType=${goods['type']}`,
+					navType: navType
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+
+
+</style>
diff --git a/components/page/pageComponents/Video.vue b/components/page/pageComponents/Video.vue
new file mode 100644
index 0000000..63e5221
--- /dev/null
+++ b/components/page/pageComponents/Video.vue
@@ -0,0 +1,171 @@
+<template>
+	<view>
+		<!-- 视频组 -->
+		<view class="show-video" :style="{'height':videoHeight+'px'}">
+			<block v-if="isVideoPlay">
+				<video :id="itemId" class="video" style="width:100%;" :style="{'height':videoHeight+'px'}" objectFit="contain" :src="params.videolink"
+				 :muted="muted" :poster="params.videocover" @play="showVideoStatus" @ended="showVideoStatus">
+					<view class="video-muted flex-row" v-if="isVideoPlay" @click="videoMuted">
+						<image class="video-muted-img" :src="imgfixUrls + 'diypage/notification_fill.png'" v-if="!muted"></image>
+						<image class="video-muted-img" :src="imgfixUrls + 'diypage/notification_forbid_fill.png'" v-if="muted"></image>
+					</view>
+				</video>
+			</block>
+			<block v-else>
+				<image :src="params.videocover" class="cover-poster" style="width:100%;" :style="{'height':videoHeight+'px'}" @load="imageLoad"></image>
+				<image class="video-play" :src="imgfixUrls + 'diypage/video_play.png'" @click="videoPlay"></image>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	let videoContext = null;
+	export default {
+		data() {
+			return {
+				isVideoPlay: false,
+				videoHeight: 240,
+				muted: false,
+				imgUrl:''
+			};
+		},
+		props: {
+			itemIndex: Number,
+			itemStyle: Object,
+			params: Object,
+			itemId: String
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		beforeCreate() {
+
+		},
+		onLoad(options) {},
+		onShow() {
+
+		},
+		onReady() {
+			videoContext = uni.createVideoContext(this.itemId, this);
+		},
+		mounted() {
+			this.imgUrl = this.imgfixUrl;
+			let _this = this,
+				params = _this.params,
+				itemStyle = _this.itemStyle,
+				scaleData = {
+					"1": 16 / 9,
+					"2": 4 / 3,
+					"3": 1 / 1,
+				}
+			if (params.videotype === "2") {
+				uni.getSystemInfo({
+					success(res) {
+						let windowWidth = res.windowWidth,
+							scale = scaleData[itemStyle.display];
+							console.log("videoHeight",windowWidth / scale)
+						_this.videoHeight = windowWidth / scale;
+					}
+				});
+			}
+		},
+		methods: {
+			imageLoad(e) {
+				let _this = this;
+				if (_this.params.videotype === "1" && _this.params.videocover) {
+					uni.getSystemInfo({
+						success(res) {
+							let windowWidth = res.windowWidth,
+								imgDetail = e.detail,
+								imgScale = imgDetail.width / imgDetail.height;
+							_this.videoHeight = windowWidth / imgScale;
+						}
+					});
+				}
+			},
+			videoPlay(e) {
+				let that = this;
+				that.isVideoPlay = true;
+				//延时操作,防止视频组件获取失败
+				setTimeout(() => {
+					console.log("video play");
+					videoContext.play();
+				}, 200);
+			},
+			showVideoStatus(e) {
+				let moduleId = e.currentTarget.id,
+					playType = e.type,
+					isVideoPlay;
+				if (playType == "play") {
+					isVideoPlay = true;
+				} else {
+					isVideoPlay = false;
+				}
+				this.isVideoPlay = isVideoPlay;
+			},
+			videoMuted(e) {
+				console.log("muted");
+				this.muted = !this.muted;
+			},
+		},
+		watch: {
+			isVideoPlay(newValue, oldValue) {
+				videoContext = uni.createVideoContext(this.itemId, this);
+			}
+		},
+	}
+</script>
+
+<style scoped>
+	/* 视频组 */
+	.show-video {
+		position: relative;
+	}
+
+	.video {
+		position: relative;
+		height: 100%;
+	}
+
+	.video-muted {
+		position: absolute;
+		top: 20upx;
+		right: 20upx;
+		border-radius: 60upx;
+		background: rgba(0, 0, 0, 0.6);
+		text-align: center;
+		padding: 10upx;
+		justify-content: center;
+		align-items: center;
+		z-index: 10;
+	}
+
+	.cover-poster {
+		width: 100%;
+		position: relative;
+		z-index: 10;
+		background-repeat: no-repeat;
+		background-size: cover;
+	}
+
+	.video-play {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		z-index: 30;
+		transform: translate(-50%, -50%);
+		width: 100upx;
+		height: 100upx;
+		border-radius: 50%;
+	}
+
+	.video-muted-img {
+		width: 40upx;
+		height: 40upx;
+		line-height: 40upx;
+	}
+</style>
diff --git a/components/page/pageComponents/businessCard.vue b/components/page/pageComponents/businessCard.vue
new file mode 100644
index 0000000..578e9e4
--- /dev/null
+++ b/components/page/pageComponents/businessCard.vue
@@ -0,0 +1,394 @@
+<template>
+	<view class="business-box">
+		<view :class="is_pading?'businessCrard-list padding-box':'businessCrard-list'">
+			<view class="creatCard-box b-f bor-radius-10upx dis-flex flex-y-center m-btm20" @click="creatCard" v-if="is_have===0 && is_Add">
+				<view class="creatCard-bg m-right50" :style="{'background-image':'url('+imageRoot+'creatCard.png)'}"></view>
+				<view class="creatInfo">
+					<view class="dis-flex flex-y-center m-btm20">
+						<view class="iconfont icon-roundaddlight roundaddlight m-right20"></view>
+						<view class="roundaddlightText f-28">添加自己的名片</view>
+					</view>
+					<view class="f-24 col-9">您还没有自己的名片，请添加！</view>
+				</view>
+			</view>
+			<view class="businessCard-items b-f bor-radius-10upx   m-btm20" v-for="(item,index) in cardList" :key="index" @click.stop="fnclick(item.id)"> 
+				<view class="businessCard-left dis-flex" >
+					<view class="head-box p-r">
+						<view class="head m-right30" :style="{'background-image':'url('+item.logo+')'}"></view>
+						
+					</view>
+					<view class="personInfo">
+						<view class="personInfo-namebox dis-flex flex-y-center m-btm10">
+							<view class="personInfo-name f-30 col-3">{{item.name}}</view>
+							<view class="stick f-24 col-f" v-if="item.top_is == '1'">顶</view>
+							<view class="personInfolabel-item col-f4 f-22" style="background-color: #FEF1F1;padding: 5upx 8upx;" v-if="!!item.position">{{item.position}}</view>
+						</view>
+						<view class="addressInfo m-btm10 dis-flex personInfolabel">
+							<view class=" f-22" v-if="!!item.one_class_title">{{item.one_class_title}}</view>
+							<text style="padding: 0 10upx;font-size: 22upx;" v-if="!!item.two_class_title && !!item.one_class_title">|</text>
+							<view class=" f-22" v-if="!!item.two_class_title">{{item.two_class_title}}</view>
+						</view>
+						<view class="Cardbrief f-24 col-9 onelist-hidden m-btm10" v-if="!!item.oneCateName">
+							<view class="dis-il-block" style="height: 35upx;line-height: 35upx;padding: 0 10upx;background-color: #FEF1F1;color: #FF4444;border-radius: 10upx;margin-right: 20upx;">
+								{{item.oneCateName}}
+							</view>
+							<view class="dis-il-block" style="height: 35upx;line-height: 35upx;padding: 0 10upx;background-color: #FEF1F1;color: #FF4444;border-radius: 10upx;">
+								{{item.twoCateName}}
+							</view>
+						</view>
+						<view class="addressInfo m-btm10 dis-flex">
+							<view class="col-6 f-24">{{item.company || item.address}}</view>
+							<text style="padding: 0 10upx;font-size: 22upx;" v-if="!!item.distance && !!item.company">|</text>
+							<view class="col-6 f-24" v-if="item.distance">{{item.distance}}</view>
+						</view>
+						
+						<!-- <view class="Cardbrief f-24 col-9 onelist-hidden m-btm10" v-if="!!item.address">
+							<view class="iconfont icon-location_light f-20 dis-il-block" style="font-size: 24upx;padding-right: 10upx;"></view>{{item.address}}|<view class="dis-il-block" v-if="item.distance">{{item.distance}}</view>
+						</view> -->
+						<view class="Cardbrief f-24 col-9 onelist-hidden m-btm10" v-if="!!item.desc">
+							{{item.desc}}
+						</view>
+						
+					</view>
+				</view>
+				<view class="card-icon-box dis-flex flex-y-center">
+					<view class="dis-flex flex-y-center m-right40">
+						<view class="iconfont icon-hot_light IconClass col-9 m-right10"></view>
+						<view class="f-24 col-9">{{item.pv}}</view>
+					</view>
+					<view class="dis-flex flex-y-center m-right40" v-if="item.collectNum">
+						<view class="iconfont icon-shoucang1 IconClass col-9 m-right10"></view>
+						<view class="f-24 col-9">{{item.collectNum}}</view>
+					</view>
+					<view class="dis-flex flex-y-center m-right40" v-else>
+						<view class="iconfont icon-punch_light IconClass col-9 m-right10"></view>
+						<view class="f-24 col-9">{{item.total_collect}}</view>
+					</view>
+					<view class="dis-flex flex-y-center" v-if="item.laud">
+						<view class="iconfont icon-appreciate_light IconClass col-9 m-right10"></view>
+						<view class="f-24 col-9">{{item.laud}}</view>
+					</view>
+					<view class="dis-flex flex-y-center m-right40" v-else>
+						<view class="iconfont icon-share_light IconClass col-9 m-right10"></view>
+						<view class="f-24 col-9">{{item.share}}</view>
+					</view>
+					<view class="dis-flex flex-y-center"  v-if="!item.laud && item.collectNum" @click.stop="delectCollectis(item.id)">
+						<view class="iconfont icon-delete IconClass col-9 m-right10" style="color: #FF4444;"></view>
+						<view class="f-24 col-9" style="color: #FF4444;">取消收藏</view>
+					</view>
+					<view class="flex-box">
+						
+					</view>
+					<view class="dis-flex">
+						<view class="iconfont icon-dianhua1 IcondhClass" @click.stop="contact('phone',item.mobile)" v-if="item.show_mobile=='1'"></view>
+						<view class="iconfont icon-dianhua1 IcondhClass" @click.stop="contact('phone',item.mobile)" v-if="item.mobile && !item.laud && item.showtel"></view>
+						<view class="iconfont icon-markfill IconmarkClass" @click.stop="contact('wx',item)" v-if="item.mid!='0'"></view>
+						<view class="iconfont icon-delete_light IconmarkClass col-9" v-if="is_collcet==='1'" @click.stop="delectCollect(item.id,index)"></view>
+					</view>
+				</view>
+				<!-- <view class="businessCard-right dis-flex flex-dir-column flex-x-center" style="position: relative;">
+					<view class="f-24" v-if="!item.laud" style="padding-bottom: 10upx;color: #6f6f6f;position: absolute;top: 0;right: 0;">
+						{{item.distance}}
+					</view>
+					<view class="f-24" v-if="!item.laud" style="padding-bottom: 10upx;color: #6f6f6f;height: 20upx;">
+						{{item.distance}} -->
+					<!-- </view>
+					<view class="iconfont icon-mark IconmarkClass" @click.stop="contact('wx',item)" v-if="item.mid!='0'"></view>
+					<view class="seg" v-if="item.show_mobile=='1'"></view>
+					<view class="iconfont icon-dianhua IcondhClass" @click.stop="contact('phone',item.mobile)" v-if="item.show_mobile=='1'"></view>
+					<view class="sega" v-if="item.mobile && !item.laud"></view>
+					<view class="iconfont icon-dianhua IcondhClass" @click.stop="contact('phone',item.mobile)" v-if="item.mobile && !item.laud && item.showtel"></view>
+					<view class="iconfont icon-delete_light delectIconClass col-9" style="margin-top: 20upx;" v-if="is_collcet==='1'" @click.stop="delectCollect(item.id,index)"></view>
+				</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+				loadlogo: true
+			}
+		},
+		methods: {
+			delectCollectis(id){
+				let data={
+					id:id
+				};
+				App.showError(
+					`是否取消收藏?`,
+					data => {
+						if (data.confirm) {
+						App._post_form(
+								`&p=yellowpage&do=pageCollect&id=${id}`,
+								{},
+								res => {
+									uni.showToast({
+										title:'取消收藏成功'
+									})
+									this.$emit('deleteis');
+								},
+								false,
+								() => {
+									
+								}
+							);
+						}
+					},
+					true
+				);
+				
+				
+			},
+			contact(type, Data) {
+				let _this = this;
+				if (type === 'phone') {
+					uni.makePhoneCall({
+						phoneNumber: Data
+					})
+				}
+				if (type === 'wx') {
+					let getSetInfo = uni.getStorageSync('getSetInfo');
+					if(getSetInfo.type == 1){
+						App.navigationTo({
+							url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + Data.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}else{
+						App.navigationTo({
+							url: 'pages/subPages/homepage/chat/chat?other_party_id=' + Data.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}
+					// App.navigationTo({
+					// 	url: `pages/subPages/homepage/chat/chat?other_party_id=${Data.mid}&other_party_type=1&type=1`
+					// })
+				}
+			},
+			fnclick(cardid) {
+				let _this = this;
+				console.log(cardid);
+				if(_this.is_yellow){
+					App.navigationTo({
+						url: `pages/subPages2/phoneBook/logistics/logistics?id=${cardid}`
+					})
+				}else{
+					App.navigationTo({
+						url: `pages/subPages/businesscard/carddetail/carddetail?cardid=${cardid}`
+					})
+				}
+				
+			},
+			creatCard() {
+				let _this = this;
+				App.navigationTo({
+					url: `pages/subPages/businesscard/formcard/formcard`
+				})
+			},
+			delectCollect(cardid, index) {
+				let _this = this,
+					businCard_list = _this.businCard_list;
+				uni.showModal({
+					title: '温馨提示',
+					content: '是否删除该收藏名片',
+					success: function(res) {
+						if (res.confirm) {
+							uni.showLoading({})
+							App._post_form('&p=citycard&do=cardCollect', {
+								id: cardid
+							}, res => {
+								if (res.errno === 0) {
+									businCard_list.splice(index, 1);
+									_this.$emit('chrbusinCard', businCard_list);
+									_this.$forceUpdate()
+								}
+							}, false, () => {
+								uni.hideLoading()
+							})
+						}
+					}
+				})
+			}
+		},
+		computed: {
+			cardList: {
+				get() {
+					let _this = this,
+						businCard_list = _this.businCard_list;
+					if (!!businCard_list && businCard_list.length >= 0) {
+						return businCard_list
+					}
+				},
+				set(val) {
+					console.log(val)
+				}
+			}
+		},
+		components: {},
+		props: {
+			businCard_list: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			is_collcet: {
+				type: String,
+				default: function() {
+					return '1'
+				}
+			},
+			is_have: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			is_pading:{
+				type: Boolean,
+				default: true
+			},
+			is_yellow:{
+				type: Boolean,
+				default: false
+			},
+			is_Add:{
+				type: Boolean,
+				default: true
+			}
+		},
+		onLoad(e) {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.personInfo-name {
+		// width: 400upx;
+		// white-space: nowrap;
+		// overflow: hidden;
+		// text-overflow: ellipsis;
+		margin-right: 10upx;
+	}
+
+	.personInfolabel-item {
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		word-break: break-all;
+		max-width: 240rpx;
+	}
+
+	.businessCard-items {
+		padding: 30upx;
+	}
+
+	.stick {
+		padding: 2upx 6upx;
+		background-color: #FF4444;
+		border-radius: 4upx;
+		transform: scale(.85);
+		margin-right: 10upx;
+	}
+
+	.businessCard-left {
+		padding-bottom: 20upx;
+		.head-box {
+			padding-top: 6upx;
+
+			.head {
+				width: 90upx;
+				height: 90upx;
+				border-radius: 45upx;
+				background-size: 90upx 90upx;
+				background-repeat: no-repeat;
+			}
+		}
+
+		.delectIconClass {
+			position: absolute;
+			left: 36%;
+			top: 67%;
+			transform: translateX(-50%);
+			font-size: 36upx;
+		}
+
+		.personInfolabel {
+			.personInfolabel-item {
+				padding: 4upx 8upx;
+				background-color: #FEF1F1;
+				border-radius: 4upx;
+				margin-right: 8upx;
+				transform: scale(.9);
+			}
+		}
+
+		.Cardbrief {
+			width: 450upx;
+		}
+
+		
+	}
+	.card-icon-box {
+		padding: 30upx 0 0;
+		border-top: 1upx solid #eeeeee;
+		.IconClass {
+			font-size: 24upx;
+		}
+	}
+	.IconmarkClass {
+		font-size: 40upx;
+		width: 40upx;
+		height: 40upx;
+		line-height: 40upx;
+		margin-left: 45upx;
+		color: #3388FF;
+	}
+	
+	.IcondhClass {
+		font-size: 40upx;
+		line-height: 40upx;
+		width: 40upx;
+		height: 40upx;
+		// margin-right: 45upx;
+		color: #3388FF;
+	}
+	.businessCard-right {
+		
+
+		.seg {
+			width: 40upx;
+			height: 2upx;
+			background-color: rgb(238, 238, 238);
+			margin: 20upx 0;
+		}
+		.sega {
+			width: 40upx;
+			height: 2upx;
+			background-color: rgb(238, 238, 238);
+			margin: 10upx 0;
+		}
+	}
+
+	.creatCard-box {
+		padding: 20upx 0 0 60upx;
+
+		.creatCard-bg {
+			width: 166upx;
+			height: 166upx;
+			background-repeat: no-repeat;
+			background-size: 166upx 166upx;
+		}
+
+		.roundaddlight {
+			color: #3388FF;
+			font-size: 38upx;
+		}
+
+		.roundaddlightText {
+			color: #3388FF;
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/citywide.vue b/components/page/pageComponents/citywide.vue
new file mode 100644
index 0000000..ae1f0b0
--- /dev/null
+++ b/components/page/pageComponents/citywide.vue
@@ -0,0 +1,126 @@
+<!-- 同城 -->
+<template>
+	<view class="container">
+		<!-- 帖子列表循环模板 -->
+		<!-- <postList :itemInfo="item" :indexNumber="index" :indexShow="indexShow" @operationShow="operationShow" @getover="getover" v-for="(item, index) in homeList"
+		 :key="index"></postList> -->
+		<post-list v-for="(item,index) in citywideList" :itemInfo="item" :indexNumber="index" :indexShow='indexShow' @getover="getover" @operationShow="operationShow" :key="index"></post-list>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import postList from '@/components/template/postList'
+	export default {
+		data() {
+			return {
+				indexShow: -1,
+			}
+		},
+		props: {
+			citywideList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			}
+		},
+		components: {
+			postList
+		},
+		computed: {
+
+		},
+		onShow() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			operationShow(e) {
+				let _this = this;
+				_this.indexShow = e;
+			},
+			getover(id,bor){
+				this.$emit('getaver',id,bor)
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		background-color: #f6f6f6;
+		padding: 10upx 30upx;
+	}
+
+	.city-wide-item {
+		.city-wideheader {
+			.wideheader-left {
+				width: 80upx;
+				height: 80upx;
+				background-size: 80upx 80upx;
+				background-repeat: no-repeat;
+				border-radius: 50%;
+				flex-shrink: 0;
+			}
+
+			.wideheader-right {
+				.wideheader-right-top {
+					.wide-onename {
+						padding: 4upx 16upx;
+						border-radius: 30upx;
+						background-color: #ffeded;
+						color: #df231c;
+					}
+				}
+
+				.wideheader-right-bottom {
+					.header-stick {
+						border-radius: 4upx;
+						background-color: #fe433f;
+						color: #fff;
+						padding: 0 10upx;
+					}
+				}
+			}
+
+			.callMobile {
+				position: absolute;
+				right: 0;
+				top: 0;
+				z-index: 2;
+				padding: 0 20upx 0 16upx;
+				height: 40upx;
+				line-height: 40upx;
+				border-radius: 30upx;
+				background: linear-gradient(90deg, #ff8032, #fe453f);
+			}
+		}
+
+		.city-content {
+			.city-imageList {
+				.city-imageItem {
+					width: 220upx;
+					height: 220upx;
+
+					&>image {
+						width: 100%;
+						height: 100%;
+						border-radius: 4upx;
+					}
+				}
+			}
+
+			.city-wide-detail {
+				.city-wide-detail-right {
+					.detail-comment {
+						.iconfont-size {
+							font-size: 36upx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/discountCard.vue b/components/page/pageComponents/discountCard.vue
new file mode 100644
index 0000000..d364ae7
--- /dev/null
+++ b/components/page/pageComponents/discountCard.vue
@@ -0,0 +1,268 @@
+<!-- 折扣卡组件 -->
+<template>
+	<view class="container" :style="{background:!isdiyPage?'#ffffff':isdiyPageStyle.bgColor,paddingBottom: '1upx'}">
+		<view class="disCard1-box b-f dis-flex m-btm20 p-r" v-for="(cardItem,index) in disCardList" :key="index" @click="gourl(cardItem.sid,cardItem)" :class="!isdiyPage?'bor-radius-10upx':''"
+		 :style="{padding:!isdiyPage?'20rpx':isdiyPageStyle.padding*2+'rpx',margin:!isdiyPage?'20rpx':isdiyPageStyle.margin*2+'rpx'}">
+			<view class="disCard1-left m-right20">
+				<view class="disCard-image" :style="{'background-image':'url('+cardItem['logo']+')'}"></view>
+			</view>
+			<view class="disCard1-right dis-flex flex-dir-column flex-x-between">
+				<view>
+					<view class="dis-flex flex-x-between flex-y-center" @click="navigateToShop(cardItem.is_link,cardItem['shop_url'])">
+						<view class="f-26 disCard1-store onelist-hidden">{{cardItem['name']}}</view>
+						<view class="f-24 col-9" v-if="!!cardItem['distance']">{{cardItem['distance']}}</view>
+					</view>
+					<view class="f-24 disCard-notice-use twolist-hidden">使用须知:{{cardItem['limit']}}</view>
+					<view class="dis-flex f-24" style="position: relative;margin-top: 15upx;font-family: '黑体';" v-if="(userinfo.halfcardflag == 0 && platformInfor.newpayonline == 1) ||  !platformInfor.newpayonline">
+						<view class="dis-il-block"
+						style="background-color: #E8C977;
+						height: 40upx;
+						line-height: 40upx;
+						padding-left: 20upx;
+						border-radius: 60upx 0upx 0upx 60upx;
+						color: #333333;
+						padding: 0 3upx 0 15upx;
+						letter-spacing:2upx;
+						">
+							会员
+						</view>
+						<view  style="position: relative;">
+							<view class="dis-il-block"
+							style="width: 0;
+							height: 0;
+							border-bottom: 40upx solid #E8C977;
+							border-right: 8upx solid transparent;
+							position: absolute;
+							left: 0;">
+							</view>
+							<view class="dis-il-block" 
+							style="width: 0;
+							height: 0;
+							border-top: 40upx solid #484743;
+							border-left: 8upx solid transparent;
+							position: absolute;
+							left: 0;">
+							</view>
+						</view>
+						<view class="dis-il-block" 
+						style="background-color: #484743;
+						margin-left: 4upx;
+						height: 40upx;
+						line-height: 40upx;
+						padding-right: 10upx;
+						border-radius: 0upx 60upx 60upx 0upx;
+						color: #FFFFFF;
+						letter-spacing: 2upx;
+						padding-left: 4upx;">
+							{{cardItem.lowtip==1?'最低立享':'立享'}}
+							<text style="font-size: 24upx;">{{!platformInfor.newpayonline ?cardItem['discount']:cardItem.activediscount}}</text>
+							折
+						</view>
+					</view>
+				</view>
+				<view class="disCard-discount f-36" v-if="platformInfor.newpayonline == 1 && userinfo.halfcardflag == 0 && token">{{cardItem['discount']}}<text class="f-24">折</text></view>
+				<view class="disCard-discount f-36" v-if="platformInfor.newpayonline == 1 && userinfo.halfcardflag !== 0 && token">{{cardItem['discount']}}<text class="f-24">折</text></view>
+				<!-- <view class="disCard-discount f-36" v-if="">{{cardItem['discount']}}<text class="f-24">折</text></view> -->
+				<view class="disCard-discount f-36" v-if="(platformInfor.newpayonline == 1 && !token)">{{cardItem['discount']}}<text class="f-24">折</text></view>
+				<view class="disCard-skip-btn col-f f-24 t-c p-r" style="background-color: #FF4444;" @click.stop="navigateTo(cardItem.is_link,cardItem['url'],cardItem)">去买单</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				platformInfor:{},
+				userinfo:{},
+				token:''
+			}
+		},
+		components: {
+
+		},
+		props: {
+			disCardData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			disCardData_two: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			disCardType: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			},
+			disType: {
+				type: Number,
+				default: function() {
+					return 1
+				}
+			},
+			isdiyPageStyle: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			isdiyPage: {
+				type: Boolean,
+				default: function() {
+					return false
+				}
+			},
+			isdiyPageParams: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		computed: {
+			disCardList() {
+				return this.disType === 1 ? this.disCardData['data'] : this.disCardData_two
+			}
+		},
+		onShow() {
+			
+		},
+		mounted() {
+			this.platformInfor = uni.getStorageSync('platformInfor');
+			// this.platformInfor.newpayonline = 0;
+			this.userinfo = uni.getStorageSync('userinfo');
+			this.token = uni.getStorageSync('weliam_user_token');
+		},
+		methods: {
+			gourl(sid,item){
+				if(this.userinfo.halfcardflag == 0){
+					App.showError('对不起，您不符合使用要求');
+					return
+				}
+				if(!sid){
+					App.navigationTo({
+						url:item.url
+					})
+				}else{
+					App.navigationTo({
+							url:'pages/mainPages/store/index?sid=' + sid
+					})
+				}
+				
+			},
+			navigateToShop(is_link, url) {
+				// debugger
+				if (is_link === "1") return
+				App.navigationTo({
+					url
+				})
+			},
+			navigateTo(is_link, url, item) {
+				
+				if (is_link === "1") {
+					if (item.payonline === "1") {
+						if(this.platformInfor.newpayonline == 1){
+							App.navigationTo({
+								url: 'pages/subPages2/newBuyOrder/newBuyOrder?sid=' + item.sid
+							});
+						}else{
+							App.navigationTo({
+								url: 'pages/subPages2/newBuyOrder/buyOrder?sid=' + item.sid
+							})
+						}
+					} else {
+						App.navigationTo({
+							url: 'pages/mainPages/memberCard/memberCard?id=' + item.id + '&type=' + item.type
+						})
+					}
+				} else {
+					if(this.userinfo.halfcardflag == 0){
+						App.showError('对不起，您不符合使用要求');
+						return
+					}
+					// if(url.indexOf('buyOrder') === -1){
+						App.navigationTo({
+							url
+						})
+					// }else{
+						// App.navigationTo({
+						// 	url: 'pages/subPages2/newBuyOrderOrder?sid=' + item.sid
+						// });
+					// }
+					
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss" scoped>
+	.disCard1-box:last-child{
+		// margin-bottom: 0 !important;
+		// margin: 0 30upx 30upx;
+	}
+	.disCard1-left {
+		.disCard-image {
+			width: 200upx;
+			height: 200upx;
+			background-repeat: no-repeat;
+			background-position: center;
+			background-size: 200upx 200upx;
+			flex-shrink: 0;
+			border-radius: 10upx;
+		}
+	}
+
+	.disCard1-right {
+		flex: 1;
+
+		.disCard1-store {
+			width: 300upx;
+		}
+
+		.disCard-notice-use {
+			color: #bdbdbd;
+		}
+
+		.disCard2-notice-use {
+			width: 300upx;
+		}
+
+		.disCard-discount {
+			color: #ff3f43;
+		}
+
+		.disCard-skip-btn {
+			position: absolute;
+			right: 20upx;
+			bottom: 24upx;
+			width: 130upx;
+			height: 50upx;
+			line-height: 50upx;
+			border-radius: 10upx;
+		}
+
+		.disCard2-skip {
+			position: absolute;
+			right: 0;
+			bottom: 20upx;
+		}
+
+		.disCard2-skip-btn {
+			width: 70upx;
+			border-radius: 50%;
+			height: 70upx;
+			background: #d83a3a;
+			color: #FFF;
+			padding: 10upx;
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/giftbag.vue b/components/page/pageComponents/giftbag.vue
new file mode 100644
index 0000000..5ffad0e
--- /dev/null
+++ b/components/page/pageComponents/giftbag.vue
@@ -0,0 +1,189 @@
+<!-- 大礼包组件 -->
+<template>
+	<view class="packages-container" :style="{'padding':isdiyPageStyle.margin+'px'}">
+		<view class="disCard1-box b-f dis-flex m-btm20 p-r" v-for="(giftItem,index) in giftList" :key="index" :class="!isdiyPage?'bor-radius-10upx':''"
+		 :style="{padding:!isdiyPage?'20rpx':isdiyPageStyle.padding*2+'rpx'}" @click="navigateTo(giftItem['url'],giftItem)">
+			<view class="disCard1-left m-right20" style="padding-left: 20upx;">
+				<view>
+					<view class="dis-flex flex-x-between flex-y-center">
+						<view class="f-30  disCard1-store onelist-hidden" style="padding-bottom: 10upx;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;width: 320upx;">{{giftItem['name']}}</view>
+						<!-- <view class="f-24 col-9" v-if="!!giftItem['distance']" style="padding-bottom: 10upx;">{{giftItem['distance']}}</view> -->
+					</view>
+					<view class="f-24 disCard-notice-use twolist-hidden" style="color: #FF4444;">{{giftItem['newlimit']}} <text style="padding-left: 10upx;">当前剩余{{giftItem['surplus']}}次</text></view>
+				</view>
+				<!-- <view class="disCard-image" :style="{'background-image':'url('+giftItem['shop_logo']+')'}"></view> -->
+				<image :src="giftItem['shop_logo']" class="disCard-image" mode="aspectFill"></image>
+				<view class="dis-il-block f-28" style="vertical-align:top;line-height: 100upx;padding-left: 20upx;">
+					{{giftItem.storename}}
+				</view>
+			</view>
+			<view class="disCard1-right dis-flex flex-dir-column flex-x-between">
+				
+				<view class="col-f4 f-24 t-r" style="margin-top: 20upx;">价值：¥<text class="f-36">{{giftItem['price']}}</text></view>
+				<view class="disCard-skip-btn col-f f-24 t-c p-r" style="margin-bottom: 20upx;" v-if="giftItem.use_where == 1">去使用</view>
+				<view class="disCard-skip-btns  f-24 t-c p-r" style="margin-bottom: 20upx;color: #FFFFFF;width: 210upx;background-color: #999999;border: 2upx solid #999999;" v-if="giftItem.use_where == 0">当前等级无法使用</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		components: {
+
+		},
+		props: {
+			giftData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			giftData_two: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+
+			disType: {
+				type: Number,
+				default: function() {
+					return 1
+				}
+			},
+			isdiyPage: {
+				type: Boolean,
+				default: function() {
+					return false
+				}
+			},
+			isdiyPageStyle: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			isdiyPageParams: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+		},
+		computed: {
+			giftList() {
+				return this.disType === 1 ? this.giftData['data'] : this.giftData_two
+			}
+		},
+		onShow() {
+
+		},
+		onLoad() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			isUnfold_act(index) {
+				let _this = this,
+					giftDataInfo = _this.giftData.data || _this.giftData_two;
+				_this.$set(giftDataInfo[index], 'isUnfold', !giftDataInfo[index].isUnfold)
+			},
+			navigateTo(url,item) {
+				console.log(url);
+				// if(item.use_where == 0) return
+				App.navigationTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F6F6F6;
+	}
+</style>
+<style lang="scss" scoped>
+	.disCard1-box:last-child {
+		margin-bottom: 0 !important;
+	}
+
+	.disCard1-left {
+		.disCard-image {
+			width: 60upx;
+			height: 60upx;
+			background-repeat: no-repeat;
+			background-position: center;
+			background-size: 200upx 200upx;
+			flex-shrink: 0;
+			border-radius: 60upx;
+			margin-top: 20upx;
+		}
+	}
+
+	.disCard1-right {
+		flex: 1;
+
+		.disCard1-store {
+			width: 300upx;
+		}
+
+		.disCard-notice-use {
+			color: #bdbdbd;
+		}
+
+		.disCard2-notice-use {
+			width: 300upx;
+		}
+
+		.disCard-skip-btn {
+			position: absolute;
+			right: 20upx;
+			bottom: 24upx;
+			width: 130upx;
+			height: 50upx;
+			line-height: 50upx;
+			border-radius: 10upx;
+			// background-color: linear-gradient(direction, #FF8032, #ff4444);
+			background: -webkit-linear-gradient(right, #FF8032 , #ff4444); /* Safari 5.1 - 6.0 */
+			background: -o-linear-gradient(right, #FF8032 , #ff4444); /* Opera 11.1 - 12.0 */
+			background: -moz-linear-gradient(right, #FF8032 , #ff4444); /* Firefox 3.6 - 15 */
+			background: linear-gradient(right, #FF8032 , #ff4444); /* 标准的语法（必须放在最后） */
+		}
+		
+		.disCard-skip-btns {
+			position: absolute;
+			right: 20upx;
+			bottom: 24upx;
+			width: 130upx;
+			height: 50upx;
+			line-height: 50upx;
+			border-radius: 10upx;
+			background-color: #999999;
+		}
+
+		.disCard2-skip {
+			position: absolute;
+			right: 0;
+			bottom: 20upx;
+		}
+
+		.disCard2-skip-btn {
+			width: 70upx;
+			border-radius: 50%;
+			height: 70upx;
+			background: #d83a3a;
+			color: #FFF;
+			padding: 10upx;
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/goods.vue b/components/page/pageComponents/goods.vue
new file mode 100644
index 0000000..0315ee2
--- /dev/null
+++ b/components/page/pageComponents/goods.vue
@@ -0,0 +1,123 @@
+<!-- 商品各个样式组件 -->
+<template>
+	<view class="container">
+		<!-- _goods_type_1  商品样式1 -->
+		<block v-if="goodsType==='goods_type1'">
+			<view class="groupon_goods5 groupon_goods5-pading" :style="{marginBottom:goodsData.style.marginBottom*2+'rpx',padding:goodsData.style.margin*2+'rpx',backgroundColor:goodsData.style.bgColor}">
+				<view class="b-f" :style="{paddingLeft:goodsData.style.padding*2+'rpx',paddingTop:goodsData.style.padding*2+'rpx',paddingBottom:goodsData.style.padding*2+'rpx',paddingRight:'0'}">
+					<scroll-view scroll-x="true">
+						<view class="groupon_goods5-list dis-flex">
+							<view class="groupon_goods5-list-item m-right20" v-for="(goods,index) in goodsData.data" :key="index" @click="navigateTo(goods.url)">
+								<view class="groupon_goods5-image" :style="{'background-image':'url('+goods['logo']+')'}">
+									<image v-if="goods.stk == 0" style="width: 250upx;height: 250upx;background-color: rgba(0,0,0,0.5);" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode="aspectFit"></image>
+								</view>
+								<view class="groupon_goods5-title twolist-hidden f-28 col-3 m-top20">{{goods['goods_name']}}</view>
+								<view class="groupon_goods5-price dis-flex flex-y-center flex-x-between">
+									<view class="now-price f-28">￥{{goods['price']}}</view>
+									<view class="old-price f-24" style="text-decoration:line-through;">￥{{goods['oldprice']}}</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			goodsData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			goodsType: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.setEndTime()
+		},
+		methods: {
+			//  倒计时
+			setEndTime() {
+				if (this.goodsType === 'goods_type4') {
+					setInterval(() => {
+						let _this = this,
+							nowTime = new Date().getTime();
+						for (let i in _this.goodsData.data) {
+							// 开始时间
+							let startTime = Number(_this.goodsData.data[i].starttime) * 1000,
+								// 截止时间
+								endTime = Number(_this.goodsData.data[i].endtime) * 1000,
+								// 距离结束时间
+								leftTime = parseInt((endTime - nowTime) / 1000),
+								// 距离开始时间
+								rightTime = parseInt((startTime - nowTime) / 1000),
+								// 每个商品活动时间
+								timeobj = {},
+								callback = function(dataTime, timeType) {
+									let hh = parseInt(dataTime / 60 / 60 / 24 * 24),
+										mm = parseInt(dataTime / 60 % 60),
+										ss = parseInt(dataTime % 60),
+										timeobj = {
+											hh: hh < 10 ? '0' + `${hh}` : hh,
+											mm: mm < 10 ? '0' + `${mm}` : mm,
+											ss: ss < 10 ? '0' + `${ss}` : ss
+										};
+									_this.$set(_this.goodsData.data[i], 'timeobj', timeobj)
+									_this.goodsData.data[i].stateTime = timeType === 'left' ? 1 : 2;
+								};
+							if (leftTime > 0 && rightTime <= 0) {
+								if (nowTime > startTime && nowTime < endTime) {
+									callback(leftTime, 'left')
+								}
+							} else if (rightTime > 0 && leftTime > 0) {
+								if (startTime > nowTime && nowTime < endTime) {
+									callback(rightTime, 'right')
+								}
+							} else {
+								_this.goodsData.data[i].isTimeOver = true;
+								return false
+							}
+						}
+					}, 1000);
+				}
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import url('../../../common/css/diyPages.css')
+</style>
diff --git a/components/page/pageComponents/goodsStyle.vue b/components/page/pageComponents/goodsStyle.vue
new file mode 100644
index 0000000..595041a
--- /dev/null
+++ b/components/page/pageComponents/goodsStyle.vue
@@ -0,0 +1,832 @@
+<!-- 商品各个样式组件 -->
+<!-- @remindSuccess="remindSuccess" 抢购关注 -->
+<template>
+	
+	<view class="goods-container" v-if="logos">
+		<!-- 新加注释 - 技能培训等，第二版选项卡和内容 -->
+		<tabs :cc_id="cc_id" @changeChildType="changeChildType"></tabs>
+		<!-- 抢购 -->
+		<block v-if="goodsStyleType === 'rush'">
+			<view
+				class="goods-box b-f dis-flex m-btm20 p-r"
+				v-for="(goodsItem, index) in goodslistData"
+				:key="index"
+				@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
+				:class="!isdiyPage ? 'bor-radius-10upx' : ''"
+				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
+			>
+				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+					<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">抢购</view></block>
+					<block v-else>
+						<block v-if="isdiyPageParams.marker_set === '1'">
+							<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">抢购</view>
+						</block>
+					</block>
+					<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+						<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+					</view>
+				</view>
+				<view class="goodsBox-right flex-box">
+					<view class="goods-title col-3 f-26 goods-title-twoList twolist-hidden">{{ goodsItem.goods_name }}</view>
+					<view class="dis-flex flex-y-center flex-x-between m-btm10">
+						<view class="f-24 col-9" v-if="goodsItem.storename">{{ goodsItem.storename }}</view>
+						<view class="f-24 col-9" v-if="!!goodsItem.distance">{{ goodsItem.distance }}</view>
+					</view>
+					<view class="rush-price-box dis-flex flex-y-center">
+						<view class="col-f4 f-36 m-right10">
+							<text class="f-24">¥</text>
+							{{ goodsItem.price }}
+						</view>
+						<view class="f-24 col-9" style="text-decoration:line-through;">¥{{ goodsItem.oldprice }}</view>
+					</view>
+					<view class="coupon-progress p-r">
+						<view class="coupon-progress-already" :style="'width: ' + goodsItem.buy_percentage + '%;'"></view>
+						<view class="coupon-stk dis-flex flex-y-center">
+							<view class="col-f f-22 shrink">已抢{{ goodsItem.buy_num }}份</view>
+						</view>
+					</view>
+				</view>
+				<view
+					class="coupon-btn col-f f-24 t-c"
+					style="background-color: #4CD43A;"
+					v-if="goodsItem.status === '1'"
+					@click.stop="goodsremind(goodsItem.id, goodsItem, index)"
+				>
+					{{ goodsItem.is_follow === 0 || goodsItem.is_show === 0 ? '提醒我' : '已关注' }}
+				</view>
+				<view class="coupon-btn col-f f-24 t-c" :style="{ backgroundColor: goodsItem.stk === 0 ? '#CCCCCC' : '#FF4444' }" v-if="goodsItem.status === '2'">
+					{{ goodsItem.stk === 0 ? '已售罄' : '马上抢' }}
+				</view>
+				<view class="coupon-btn col-f f-24 t-c" style="background-color: #CCCCCC;" v-if="goodsItem.status === '3'">已结束</view>
+			</view>
+		</block>
+		<!-- 抢购2 -->
+		<block v-if="goodsStyleType === 'rush2'">
+			<view class="goods-box2 dis-flex flex-x-between b-f" :style="{ padding: !isdiyPage ? '0' : isdiyPageStyle.padding * 2 + 'rpx' }">
+				<view class="goods-box2-item p-r m-btm20" v-for="(goodsItem, index) in goodslistData" :key="index" @click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+					<view class="goods2-image m-btm20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+						<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+							<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+						</view>
+					</view>
+					<view class="goods2-title col-3 f-28 goods-title-twoList twolist-hidden m-btm30">{{ goodsItem.goods_name }}</view>
+					<view class="dis-flex flex-y-center m-btm10">
+						<view class="goods2-price f-30 col-f4" v-if="goodsItem.plugin == 'coupon' && goodsItem.is_charge == 0">
+							免费
+						</view>
+						<view class="goods2-price f-30 col-f4" v-else>
+							{{ goodsItem.price }}
+							<text class="f-24">元</text>
+						</view>
+						<block v-if="goodsItem.discount_price > 0">
+							<view class="groupon-vip t-c f-24">会员</view>
+							<view class="col-9 f-24 groupon-vipPrice onelist-hidden">优惠{{ goodsItem.discount_price }}元</view>
+						</block>
+					</view>
+					<view class="dis-flex  flex-y-center flex-x-between">
+						<view class="col-9 f-24" style="text-decoration:line-through;" v-if="goodsItem.oldprice">¥{{ goodsItem.oldprice }}</view>
+						<view class="col-9 f-24">{{ goodsItem.pv }}人喜欢</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 团购 -->
+		<block v-if="goodsStyleType === 'groupon'">
+			<view
+				class="goods-box b-f dis-flex m-btm20 p-r"
+				v-for="(goodsItem, index) in goodslistData"
+				:key="index"
+				@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
+				:class="!isdiyPage ? 'bor-radius-10upx' : ''"
+				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
+			>
+				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+					<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">团购</view></block>
+					<block v-else>
+						<block v-if="isdiyPageParams.marker_set === '1'">
+							<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">团购</view>
+						</block>
+					</block>
+					<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+						<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+					</view>
+				</view>
+				<view class="goodsBox-right dis-flex flex-box flex-dir-column flex-x-between">
+					<view class="goods-title col-3 f-26 goods-title-twoList twolist-hidden">{{ goodsItem.goods_name }}</view>
+					<view class="dis-flex flex-y-center flex-x-between m-btm10">
+						<view class="f-24 col-9" v-if="goodsItem.storename">{{ goodsItem.storename }}</view>
+						<view class="f-24 col-9" v-if="!!goodsItem.distance">{{ goodsItem.distance }}</view>
+					</view>
+					<view class="groupon-price-box dis-flex flex-y-center">
+						<view class="col-f4 f-36">
+							<text class="f-24">¥</text>
+							{{ goodsItem.price }}
+						</view>
+						<block v-if="goodsItem.discount_price > 0">
+							<view class="groupon-vip t-c f-24">会员</view>
+							<view class="col-9 f-24">优惠{{ goodsItem.discount_price }}元</view>
+						</block>
+					</view>
+					<view class="col-9 f-24" style="text-decoration:line-through;">市场价：¥{{ goodsItem.oldprice }}</view>
+				</view>
+				<view class="coupon-btn coupon-btnBtm col-f f-24 t-c" :style="{ backgroundColor: goodsItem.stk === 0 ? '#CCCCCC' : '#FF4444' }">
+					{{ goodsItem.stk === 0 ? '已售罄' : '去购买' }}
+				</view>
+			</view>
+		</block>
+		<!-- 砍价 -->
+		<block v-if="goodsStyleType === 'bargain'">
+			<view
+				class="goods-box b-f m-btm20 dis-flex p-r"
+				v-for="(goodsItem, index) in goodslistData"
+				:key="index"
+				@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
+				:class="!isdiyPage ? 'bor-radius-10upx' : ''"
+				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
+			>
+				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+					<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">砍价</view></block>
+					<block v-else>
+						<block v-if="isdiyPageParams.marker_set === '1'">
+							<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">砍价</view>
+						</block>
+					</block>
+					<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+						<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+					</view>
+				</view>
+				<view class="goodsBox-right dis-flex flex-box flex-dir-column flex-x-between">
+					<view class="goods-title col-3 f-26 goods-title-twoList twolist-hidden">{{ goodsItem.goods_name }}</view>
+					<view class="f-24 col-9">{{ goodsItem.buy_num }}人砍价成功</view>
+					<view class="bargin-price col-f4 f-24 m-right10">
+						可砍至¥
+						<text class="f-36">{{ goodsItem.price }}</text>
+					</view>
+					<view class="col-9 f-24" style="text-decoration:line-through;">市场价：¥{{ goodsItem.oldprice }}</view>
+				</view>
+				<view class="coupon-btn col-f f-24 t-c" :style="{ backgroundColor: goodsItem.stk === 0 ? '#CCCCCC' : '#FF4444' }">
+					{{ goodsItem.stk === 0 ? '已售罄' : '去砍价' }}
+				</view>
+			</view>
+		</block>
+		<!-- 砍价2 -->
+		<block v-if="goodsStyleType === 'bargain2'">
+			<view class="goods-box2 dis-flex flex-x-between b-f" :style="{ padding: !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }">
+				<view class="goods-box2-item p-r m-btm20" v-for="(goodsItem, index) in goodslistData" :key="index" @click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+					<view class="goods2-image m-btm20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+						<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">砍价</view></block>
+						<block v-else>
+							<block v-if="isdiyPageParams.marker_set === '1'">
+								<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">砍价</view>
+							</block>
+						</block>
+						<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+							<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+						</view>
+					</view>
+					<view class="goods2-title col-3 f-28 goods-title-twoList twolist-hidden m-btm20">{{ goodsItem.goods_name }}</view>
+					<view class="col-f4 f-24 m-btm20">{{ goodsItem.buy_num }}人砍价成功</view>
+					<view class="dis-flex flex-x-between flex-y-center">
+						<view class="bargin-price col-3 f-24">
+							可砍至
+							<text class="col-f4 f-26">¥</text>
+							<text class="f-30 col-f4">{{ goodsItem.price }}</text>
+						</view>
+						<view class="bargin-oldprice col-9 f-24" style="text-decoration:line-through;">¥{{ goodsItem.oldprice }}</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 拼团 -->
+		<block v-if="goodsStyleType === 'fight'">
+			<view
+				class="goods-box b-f m-btm20 dis-flex p-r"
+				v-for="(goodsItem, index) in goodslistData"
+				:key="index"
+				@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
+				:class="!isdiyPage ? 'bor-radius-10upx' : ''"
+				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
+			>
+				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+					<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">拼团</view></block>
+					<block v-else>
+						<block v-if="isdiyPageParams.marker_set === '1'">
+							<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">拼团</view>
+						</block>
+					</block>
+					<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+						<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+					</view>
+				</view>
+				<view class="goodsBox-right dis-flex flex-box flex-dir-column flex-x-between">
+					<view class="goods-title col-3 f-26 goods-title-twoList twolist-hidden">
+						<text>{{ goodsItem.goods_name }}</text>
+						<text style="float: right;color: #999999;">{{ goodsItem.distance }}</text>
+					</view>
+					<view class="dis-flex flex-y-center fight_goods-amount">
+						<view class="fight_goods-sales col-f4 f-24 m-right10">已团{{ goodsItem.buy_num }}件</view>
+						<view class="fight_goods-num col-f4 f-24">{{ goodsItem.peoplenum }}人团</view>
+					</view>
+					<view class="bargin-price col-f4 f-24">
+						¥
+						<text class="f-36">{{ goodsItem.price }}</text>
+					</view>
+					<view class="col-9 f-24" style="text-decoration:line-through;">市场价：¥{{ goodsItem.oldprice }}</view>
+				</view>
+				<view class="coupon-btn col-f f-24 t-c" :style="{ backgroundColor: goodsItem.stk === 0 ? '#CCCCCC' : '#FF4444' }">
+					{{ goodsItem.stk === 0 ? '已售罄' : '去拼团' }}
+				</view>
+			</view>
+		</block>
+		<!-- 拼团2 -->
+		<block v-if="goodsStyleType === 'fight2'">
+			<view class="goods-box2 dis-flex flex-x-between b-f" :style="{ padding: !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }">
+				<view class="goods-box2-item p-r m-btm20" v-for="(goodsItem, index) in goodslistData" :key="index" @click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+					<view class="goods2-image m-btm20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+						<block v-if="!isdiyPage"><view class="marker_set col-f f-24" style="background-color: #FF4444;">拼团</view></block>
+						<block v-else>
+							<block v-if="isdiyPageParams.marker_set === '1'">
+								<view class="marker_set col-f f-24" :style="{ backgroundColor: isdiyPageStyle.marker_bg, color: isdiyPageStyle.marker_color }">拼团</view>
+							</block>
+						</block>
+						<view class="alreayOverImage-mask" v-if="goodsItem.stk === 0">
+							<image class="alreayOverImage" :src="imgfixUrls  + 'rush_goods_sell_out.png'" mode=""></image>
+						</view>
+					</view>
+					<view class="goods2-title col-3 f-28 goods-title-twoList twolist-hidden m-btm20">{{ goodsItem.goods_name }}</view>
+					<view class="dis-flex flex-y-center m-btm10">
+						<view class="fight-num col-f4 f-24">已拼{{ goodsItem.buy_num }}件</view>
+						<view class="fight-person col-f4 f-24">{{ goodsItem.peoplenum }}人团</view>
+					</view>
+					<view class="dis-flex  flex-y-center flex-x-between">
+						<view class="col-f4 f-24">
+							¥
+							<text class="f-36">{{ goodsItem.price }}</text>
+						</view>
+						<view class="col-9 f-24 fight-oldprice" style="text-decoration:line-through;">单购价¥{{ goodsItem.oldprice }}</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 卡券 -->
+		<block v-if="goodsStyleType === 'coupon'">
+			<view
+				class="goods-box b-f dis-flex m-btm20 p-r"
+				v-for="(goodsItem, index) in goodslistData"
+				:key="index"
+				@click="navigateTo(goodsItem.url,goodsItem.exdetail)"
+				:class="!isdiyPage ? 'bor-radius-10upx' : ''"
+				:style="{ padding: issearch === '1' ? '10rpx 30rpx' : !isdiyPage ? '20rpx' : isdiyPageStyle.padding * 2 + 'rpx' }"
+			>
+				<view class="goodsBox-left m-right20 p-r" :style="{ 'background-image': 'url(' + goodsItem.logo + ')' }">
+					<block v-if="goodsItem.vipstatus === '1'"><view class="marker_set marker_setVipColor f-24" style="background-color: #333333;">会员特价</view></block>
+					<block v-else-if="goodsItem.vipstatus === '2'"><view class="marker_set marker_setVipColor f-24" style="background-color: #333333;">会员专享</view></block>
+				</view>
+				<view class="goodsBox-right flex-box dis-flex flex-dir-column flex-x-between">
+					<view class="goods-title col-3 f-26 goods-title-twoList twolist-hidden" >{{ goodsItem.goods_name }}</view>
+					<view class="dis-flex flex-y-center flex-x-between m-btm10">
+						<view class="f-24 col-9" v-if="goodsItem.storename">{{ goodsItem.storename }}</view>
+						<view class="f-24 col-9" v-if="!!goodsItem.distance">{{ goodsItem.distance }}</view>
+					</view>
+					<block v-if="goodsItem.is_charge === '1'">
+						<view class="groupon-price-box dis-flex flex-y-center">
+							<view class="col-f4 f-36">
+								<text class="f-24">¥</text>
+								{{ goodsItem.price }}
+							</view>
+							<block v-if="goodsItem.discount_price > 0">
+								<view class="groupon-vip t-c f-24">会员</view>
+								<view class="col-9 f-24">优惠{{ goodsItem.discount_price }}元</view>
+							</block>
+						</view>
+					</block>
+					<block v-else><view class="col-f4 f-30">免费</view></block>
+					<view class="coupon-progress p-r">
+						<view class="coupon-progress-already" :style="'width: ' + goodsItem.buy_percentage + '%;'"></view>
+						<view class="coupon-stk dis-flex flex-y-center">
+							<view class="col-f f-22 shrink">已抢{{ goodsItem.buy_num }}份</view>
+						</view>
+					</view>
+				</view>
+				<view class="coupon-btn col-f f-24 t-c" :class="{ 'coupon-btnBtm': goodsItem.is_charge === '1' }" style="background-color: #FF4444;">
+					{{ goodsItem.is_charge === '1' ? '去购买' : '去领取' }}
+				</view>
+			</view>
+		</block>
+		<!-- 卡券2 -->
+		<block v-if="goodsStyleType === 'coupon2'">
+			<view class="b-f p30 dis-flex" style="justify-content: space-between;flex-wrap: wrap;padding: 30upx;">
+				<view class="b-f" style="flex:0 0 48%;" v-for="(goodsItem, index) in goodslistData" :key="index" @click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+					<image style="width: 100%;height: 330upx;border-radius: 6upx;" :src="goodsItem.logo" mode=""></image>
+					<view class="f-26 col-3 p-top-bom-10" style="width: 320upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ goodsItem.goods_name }}</view>
+					<view class="f-26 f-w c-ff4444 p-top-20" v-if="goodsItem.is_charge === '1'">
+						{{ goodsItem.price }}
+						<text style="font-weight: 400;">元</text>
+					</view>
+					<view class="f-26 f-w c-ff4444 p-top-20" v-else>
+						免费
+					</view>
+					<view class="dis-flex" style="padding-bottom: 30upx;">
+						<view class="flex-box f-24 col-9" style="">
+							{{ goodsItem.vipstatus == 0 ? '无限制' : goodsItem.vipstatus == 1 ? '会员减免' : '会员特供' }}
+						</view>
+						<view class="flex-box f-24 col-9 t-r">已售{{ goodsItem.buy_num }}</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 卡券3 -->
+		<block v-if="goodsStyleType === 'coupon3'">
+			<view class="b-f" style="padding: 30upx;" v-for="(goodsItem, index) in goodslistData" :key="index"@click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+				<view ><image style="height: 380upx;border-radius: 6upx;width: 690upx;" :src="goodsItem.logo" mode=""></image></view>
+				<view class="f-26 col-9 dis-flex p-top-bom-10">
+					<view class="flex-box">{{ goodsItem.storename }}</view>
+					<view class="flex-box t-r">{{ goodsItem.distance }}</view>
+				</view>
+				<view class="b-f p-top-10">
+					<view
+						class="dis-il-block f-26 t-c"
+						style="height: 50upx;line-height: 50upx;border-radius: 4upx;width: 100upx;background-color: rgba(255,217,63);margin-right: 10upx;"
+					>
+						优惠券
+					</view>
+					<view class="f-26 dis-il-block" style="width: 560upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ goodsItem.goods_name }}</view>
+				</view>
+				<view class="p-top-bom-20 dis-flex">
+					<view class=" f-34 c-ff4444 f-w flex-box" style="height: 50upx;line-height: 50upx;" v-if="goodsItem.is_charge === '1'">
+						{{ goodsItem.price }}
+						<text style="font-weight: 400;font-size: 24upx;">元</text>
+					</view>
+					<view class=" f-34 c-ff4444 f-w flex-box" style="height: 50upx;line-height: 50upx;" v-else>
+						免费
+					</view>
+					<view class="t-r flex-box" style="position: relative;">
+						<view
+							class="t-c f-26 col-f"
+							style="height: 50upx;
+						line-height: 50upx;
+						border-radius: 4upx;
+						width: 100upx;
+						background-color: #FF4444;
+						position: absolute;
+						right: 0;"
+						>
+							{{goodsItem.is_charge === '1'?'购买':'领取'}}
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex">
+					<view class="flex-box f-24 col-9" style="">
+						{{ goodsItem.vipstatus == 0 ? '无限制' : goodsItem.vipstatus == 1 ? '会员减免' : '会员特供' }}
+					</view>
+					<view class="flex-box f-24 col-9 t-r">已售{{ goodsItem.buy_num }}</view>
+				</view>
+			</view>
+		</block>
+		<!-- 卡券4 -->
+		<block v-if="goodsStyleType === 'coupon4'">
+			<view style="padding: 30upx;overflow: hidden;">
+				<view class="dis-flex" style="overflow: auto;">
+					<view class="dis-il-block" style="margin-right: 20upx;" v-for="(goodsItem, index) in goodslistData" :key="index"@click="navigateTo(goodsItem.url,goodsItem.exdetail)">
+						<image
+							:src="goodsItem.logo"
+							mode=""
+							style="width: 250upx;height: 250upx;border-radius: 4upx;"
+						></image>
+						<view class="f-28 p-top-bom-10" style="width: 240upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{goodsItem.goods_name}}</view>
+						<view class="dis-flex">
+							<view class="f-30 c-ff4444 f-w flex-box" v-if="goodsItem.is_charge === '1'">￥{{goodsItem.price}}</view>
+							<view class="f-30 c-ff4444 f-w flex-box" v-else>免费</view>
+							<view class="f-24 col-9 t-r flex-box">{{ goodsItem.vipstatus == 0 ? '无限制' : goodsItem.vipstatus == 1 ? '会员减免' : '会员特供' }}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 商品样式3 -->
+		<block v-if="goodsStyleType === 'goodsStyle3'">
+			<view class="b-f" :class="!isdiyPage ? 'bor-radius-10upx' : ''" :style="{ padding: !isdiyPage ? '20px' : isdiyPageStyle.padding  + 'px',backgroundColor:'#ffffff'}">
+				<view class="goodslist-i b-f" v-for="(item2, key2) in goodslistData" :key="key2">
+					<view class="a" @click="navigateTo(item2.url,item2.exdetail)">
+						<view class="goodslist-i-t" :style="{ width: imgstyle.width - isdiyPageStyle.padding * 2 - isdiyPageStyle.margin*2 + 'px', height: imgstyle.height - isdiyPageStyle.padding * 2 - isdiyPageStyle.margin*2 + 'px' }">
+							<image class="image" :style="{ width: imgstyle.width - isdiyPageStyle.padding *2 - isdiyPageStyle.margin*2  + 'px', height: imgstyle.height - isdiyPageStyle.padding*2 - isdiyPageStyle.margin*2 + 'px' }" :src="item2.logo" mode=""></image>
+							<view class="Rank-logo f-24 t-c" v-if="isdiyPageParams.sort_icon == '1'">TOP {{ key2 + 1 }}</view>
+							<view class="rush_goods_mask" v-if="item2.goods_state == 2 || item2.stk == 0">
+								<view class="rush_goods_mask_img">
+									<image
+										class="img"
+										:src="imgfixUrls  + 'rush_goods_end.png'"
+										v-if="item2.goods_state == 2 && item2.stk > 0"
+										mode="scaleToFill"
+									></image>
+									<image
+										class="img"
+										:src="imgfixUrls  + 'rush_goods_sell_out.png'"
+										v-if="item2.stk === 0"
+										mode="scaleToFill"
+									></image>
+								</view>
+							</view>
+							<view class="qglist-i-t-bar" v-if="isdiyPageParams.buy_user == '1'">
+								<view class="qglist-i-t-bar-d">
+									<view class="qglist-i-t-bar-l">
+										<view class="i icon iconfont icon-hotfill"></view>
+										已购
+										<view class="em">{{ item2.user_num }}</view>
+									</view>
+									<view class="qglist-i-t-bar-r">
+										<view class="i" v-for="(item2, key2) in item2.user_list" :key="key2"><image class="image" :src="item2" mode="aspectFill"></image></view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="goodslist-i-c">
+						<view class="goodslist-i-c-t dis-flex">
+							<view class="goodslist-i-c-t-l">{{ item2.storename }}</view>
+							<view v-if="item2.distance" class="goodslist-i-c-t-r flex-box t-r" style="font-size: 26upx;">
+								<text class="iconfont icon-location" style="color: #999999;padding-right: 10upx;font-size: 26upx;"></text>
+								{{ item2.distance }}
+							</view>
+						</view>
+						<view class="goodslist-i-c-c">
+							<view class="a" @click="navigateTo(item2.url,item2.exdetail)">
+								<view class="i" v-if="!!isdiyPageParams.goodsLabel">{{ isdiyPageParams.goodsLabel }}</view>
+								{{ item2.goods_name }}
+							</view>
+						</view>
+						<view class="goodslist-i-c-c2">
+							<view class="dis-flex flex-y-center flex-x-between">
+								<view class="h1 goods3-margin-16">
+									{{ item2.price }}
+									<text>元</text>
+								</view>
+								<view class="span goods2-coupon-style dis-flex" v-if="item2.vipstatus == 1">
+									<view class="i">会员</view>
+									<view class="coupon-price f-24 m-left12">优惠{{ item2.discount_price }}元</view>
+								</view>
+							</view>
+							<view class="h2" v-if="item2.stk > 0"><view class="a" @click="navigateTo(item2.url,item2.exdetail)" hover-class="none">购买</view></view>
+							<view class="h2 sell-out" v-if="item2.stk <= 0">已售罄</view>
+						</view>
+						<view class="goodslist-i-c-b">
+							<view class="p">
+								<view class="span" style="text-decoration:line-through;">市场价{{ item2.oldprice }}</view>
+								<view class="em" v-if="item2.pv">{{ item2.pv }}人喜欢</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<PopManager :show="showtetx" :type="'center'" @clickmask="showtetx = false">
+			<view class="showtetxDiv">
+				<view class="showparserDiv">
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+					 selectable show-with-animation use-anchor :html="exdetail"></jyf-parser>
+				</view>
+				<view class="showtetxBtn">
+					<view class="flex-box tetxcolse"  @click="showtetx = false">
+						取消
+					</view>
+					<view class="flex-box tetxsluo"  @click="shougo">
+						确定
+					</view>
+				</view>
+			</view>
+			
+		</PopManager>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import PopManager from '@/components/template/PopManager';
+import tabs from '@/components/template/tabs/tabs.vue';
+export default {
+	data() {
+		return {
+			logos: true,
+			showtetx:false,
+			imgstyle: {},
+			exdetail:{},
+			goUrl:'',
+			cc_child_id:''//子分类id
+		};
+	},
+	components:{
+		PopManager,
+		tabs
+	},
+	props: {
+		isdiyPage: {
+			type: Boolean,
+			default: function() {
+				return false;
+			}
+		},
+		isdiyPageStyle: {
+			type: Object,
+			default: function() {
+				return {};
+			}
+		},
+		isdiyPageParams: {
+			type: Object,
+			default: function() {
+				return {};
+			}
+		},
+		goodslistData: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		goodsStyleType: {
+			type: String,
+			default: function() {
+				return '';
+			}
+		},
+		issearch: {
+			type: String,
+			default: function() {
+				return '0';
+			}
+		},
+		cc_id:{
+			type: String | Number,
+			default: 1
+		}
+	},
+	computed: {},
+	onShow() {},
+	mounted() {
+		this.imgstyle = uni.getStorageSync('imgstyle');
+	},
+	methods: {
+		shougo(){
+			App.navigationTo({
+				url:this.goUrl
+			});
+			this.goUrl = '';
+		},
+		goodsremind(id, item, index) {
+			let _this = this;
+			if (item.is_follow == 0) {
+				App._post_form(
+					'&p=rush&do=follow',
+					{
+						id
+					},
+					res => {
+						if (res.errno === 0) {
+							App.showSuccess(res.message, () => {
+								// _this.goodslistData.map(items=>{
+								// 	if(items.id == id){
+								// 		// item.is_follow = 1;
+								// 		_this.$set(items, 'is_follow', 1);
+								// 		_this.$set(items, 'is_show', 1);
+								// 		console.log(_this.goodslistData);
+								// 		_this.logos = false;
+								// 		_this.logos = true;
+								// 	}
+								// })
+								//
+								_this.$emit('remindSuccess', _this.goodslistData, index);
+							});
+						} else {
+							App.showError(res.message);
+						}
+					}
+				);
+			} else {
+				App._post_form(
+					'&p=rush&do=follow',
+					{
+						id
+					},
+					res => {
+						if (res.errno === 0) {
+							App.showSuccess(res.message, () => {
+								// _this.goodslistData.map(items=>{
+								// 	if(items.id == id){
+								// 		_this.$set(items, 'is_follow', 0);
+								// 		_this.$set(items, 'is_show', 0);
+								// 		_this.logos = false;
+								// 		_this.logos = true;
+								// 	}
+								// })
+								_this.$emit('remindSuccess', _this.goodslistData, index);
+							});
+						} else {
+							App.showError(res.message);
+						}
+					}
+				);
+			}
+		},
+		navigateTo(url,exdetail) {
+			let isHttpUrl = url.indexOf('https') !== -1;
+			if(exdetail){
+				this.goUrl = url;
+				this.exdetail = exdetail;
+				this.showtetx = true;
+				return
+			}
+			if (isHttpUrl) {
+				//#ifdef H5
+				location.href = url;
+				//#endif
+				//#ifdef MP-WEIXIN
+				App.navigationTo({
+					url
+				});
+				//#endif
+			} else {
+				App.navigationTo({
+					url
+				});
+			}
+		},
+		changeChildType(e){
+			this.cc_child_id = e;
+			this.$emit('cultivateClassChange', this.cc_child_id);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import '../../../common/css/old_diyPages';
+
+.goods-title-twoList {
+	height: 2.6em;
+	line-height: 1.3em;
+}
+
+.coupon-btnBtm {
+	bottom: 10upx !important;
+}
+
+.goods-box:last-child {
+	margin-bottom: 0 !important;
+}
+
+.goods-box2 {
+	flex-wrap: wrap;
+}
+
+.goods-box2-item {
+	width: 48.5%;
+
+	.goods2-image {
+		width: 100%;
+		height: 330upx;
+		background-repeat: no-repeat;
+		background-size: 100% 330upx;
+		border-radius: 6upx;
+	}
+
+	// 拼团
+	.fight-num {
+		background-color: #fff6f6;
+		border-radius: 4upx;
+		padding: 2upx;
+		transform: scale(0.9);
+		margin-right: 14upx;
+	}
+
+	.fight-person {
+		border: 1px solid #ff4444;
+		padding: 4upx;
+		transform: scale(0.85);
+		border-radius: 4upx;
+	}
+
+	.fight-oldprice {
+		transform: scale(0.85);
+	}
+
+	// 砍价
+	.bargin-oldprice {
+		transform: scale(0.85);
+	}
+}
+
+.goods-box {
+	.goodsBox-left {
+		width: 200upx;
+		height: 200upx;
+		background-size: 200upx 200upx;
+		background-repeat: no-repeat;
+		flex-shrink: 0;
+		border-radius: 6upx;
+	}
+}
+
+.alreayOverImage-mask {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	background-color: rgba(0, 0, 0, 0.5);
+
+	.alreayOverImage {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+	}
+}
+
+// 团购会员标签
+.groupon-vip {
+	width: 50upx;
+	// height: 28upx;
+	// line-height: 28upx;
+	background-color: #333333;
+	color: #eed196;
+	border-radius: 4upx;
+	transform: scale(0.85);
+	padding: 2upx 4upx;
+	margin: 0 6upx 0 6upx;
+	display: flex;
+	flex-shrink: 0;
+}
+
+//优惠价格
+.groupon-vipPrice {
+	width: 150upx;
+}
+
+// 拼团数量box
+.fight_goods-amount {
+	.fight_goods-sales {
+		background-color: #fff6f6;
+		border-radius: 4upx;
+		padding: 2upx;
+	}
+
+	.fight_goods-num {
+		padding: 0 8upx;
+		border: 1px solid #ff4444;
+		border-radius: 4upx;
+		transform: scale(0.85);
+	}
+}
+
+.marker_set {
+	position: absolute;
+	left: 10upx;
+	top: 0;
+	border-radius: 0 0 10upx 10upx;
+	padding: 4upx 12upx;
+}
+
+.marker_setVipColor {
+	color: #eed196;
+}
+.showtetxDiv{
+	width: 80vw;
+	height: 60vh;
+	// padding: 30upx;
+	border-radius: 20upx;
+	background-color: #ffffff;
+	position: relative;
+	overflow: hidden;
+}
+.tetxsluo{
+	background-color: #ff4444;
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	color: #ffffff;
+	font-size: 34upx;
+	font-weight: bold;
+}
+.tetxcolse{
+	background-color: #eeeeee;
+	color: #999999;
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	font-size: 34upx;
+	font-weight: bold;
+}
+.showtetxBtn{
+	display: flex;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+}
+.showparserDiv{
+	padding: 30upx;
+	overflow: auto;
+}
+</style>
diff --git a/components/page/pageComponents/integral.vue b/components/page/pageComponents/integral.vue
new file mode 100644
index 0000000..363d2ec
--- /dev/null
+++ b/components/page/pageComponents/integral.vue
@@ -0,0 +1,104 @@
+<!-- 积分 -->
+<template>
+	<view class="container padding-box-all b-e6">
+		<view class="integral-list b-f dis-flex m-btm20 p-r" @click="navgateto(integraItem['url'])" v-for="(integraItem,index) in integralList"
+		 :key="index">
+			<view class="integral-item-left m-right20" :style="{'background-image':'url('+integraItem['thumb']+')'}"></view>
+			<view class="integral-item-right flex-box dis-flex flex-dir-column flex-x-between">
+				<view class="integral-title twolist-hidden f-28 col-3">{{integraItem['title']}}</view>
+				<view class="integral-condition f-24">
+					<text class="f-w f-36 m-right10">{{integraItem['use_credit1']}}</text>{{subText['credittext']}}
+					<block v-if="integraItem['use_credit2']>0">
+						<text class="m-left-right-10">+</text>
+						<text class="f-w f-36 m-right10">{{integraItem['use_credit2']}}</text>元
+					</block>
+				</view>
+				<view class="goods-oldPrice col-9 f-24" style="text-decoration:line-through;">市场价:{{integraItem['old_price']}}元</view>
+				<view class="integral-btn col-f f-24 t-c" style="background-color: #FF4444;">去兑换</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			integralList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			subText() {
+				return uni.getStorageSync('TextSubstitution');
+			}
+		},
+		onShow() {
+
+		},
+		mounted() {
+			console.log(this.integralList)
+		},
+		methods: {
+			navgateto(url) {
+				App.navigationTo({
+					url
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.integral-list:last-child {
+		margin-bottom: 0 !important;
+	}
+
+	.integral-list {
+		padding: 20upx;
+		border-radius: 10upx;
+	}
+
+	.integral-item-left {
+		width: 200upx;
+		height: 200upx;
+		background-size: 200upx 200upx;
+		background-repeat: no-repeat;
+		flex-shrink: 0;
+		border-radius: 10upx;
+	}
+
+	.integral-item-right {
+		color: #FF4444;
+
+		.integral-title {
+			height: 2.6em;
+			line-height: 1.3em;
+		}
+
+		.goods-oldPrice {
+			text-decoration: line-through;
+			margin-top: 8upx;
+		}
+
+		.integral-btn {
+			position: absolute;
+			right: 20upx;
+			bottom: 24upx;
+			width: 130upx;
+			height: 50upx;
+			line-height: 50upx;
+			border-radius: 26upx;
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/region.vue b/components/page/pageComponents/region.vue
new file mode 100644
index 0000000..09ffa2f
--- /dev/null
+++ b/components/page/pageComponents/region.vue
@@ -0,0 +1,88 @@
+<!-- 选择地区组件 -->
+<template>
+	<view class="container">
+		<view class="region-box dis-flex flex-x-between flex-y-center" :style="'margin-bottom: '+(regionStyle.marginBottom*2)+'rpx; background-color: '+regionStyle.background">
+			<view class="user-info dis-flex flex-y-center">
+				<view class="user-info-avatar m-right10" :style="{'background-image':'url('+regionParams['avatar']+')'}"></view>
+				<view class="user-info-nickName f-30" :style="'color:'+regionStyle['nicknameColor']+';'">{{regionParams.nickname}}</view>
+			</view>
+			<view class="region-title dis-flex flex-y-center" @click="navGateto()">
+				<view class="region-areaname f-30" :style="'color:'+regionStyle['areanameColor']+';'">{{currentaidCity}}</view>
+				<view v-if="regionStyle['showtype']==='0'" class="region-unfold iconfont icon-unfold" :style="'color:'+regionStyle['areanameColor']+';'"></view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			regionStyle: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			regionParams: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			currentaidCity() {
+				let agencyData = uni.getStorageSync('agencyData')
+				if (!!agencyData) {
+					return agencyData.areaname
+				} else {
+					return '选择地区'
+				}
+			},
+		},
+		onShow() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			navGateto() {
+				App.navigationTo({
+					url: 'pages/subPages/city/city'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+		.region-box {
+			padding: 20upx 30upx;
+
+			.user-info {
+				.user-info-avatar {
+					width: 60upx;
+					height: 60upx;
+					background-repeat: no-repeat;
+					background-size: 60upx 60upx;
+				}
+			}
+
+			.region-title {
+				.region-unfold {
+					font-size: 30upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/shopEnter.vue b/components/page/pageComponents/shopEnter.vue
new file mode 100644
index 0000000..4d0d169
--- /dev/null
+++ b/components/page/pageComponents/shopEnter.vue
@@ -0,0 +1,137 @@
+<template>
+	<view class="padding-box-all">
+		<view class="enter-box">
+			<view class="swiper-item dis-flex flex-y-center">
+				<view class="swiper-item-left dis-flex p-r flex-y-center">
+					<image class="swiperImage" :src="imgfixUrls + 'diypage/ruzhu.png'" v-if="imgfixUrls"></image>
+					<!-- <view class="swiper-title f-24 t-c">{{swiperParams.title}}</view> -->
+					<view class="swiper-box" v-if="swiperContainer.length > 0">
+						<swiper :autoplay="true" :interval="3000" :duration="1000" :vertical="true" :circular="true" class="swiper-view">
+							<swiper-item v-for="(item,index) in swiperContainer" :key="index">
+								<view class="onelist-hidden f-28 swiperContainer">{{item.storename || item.commundesc}}</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<view class="swiper-box" v-else>
+						<swiper :autoplay="true" :interval="3000" :duration="1000" :vertical="true" :circular="true" class="swiper-view">
+							<swiper-item>
+								<view class="onelist-hidden f-28 swiperContainer">暂无入驻商户</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<view class="fgx"></view>
+				</view>
+				<view class="swiper-item-right t-c f-28 col-f" @click="navgateto('pages/mainPages/Settled/Settled')">{{swiperParams.button || '我要入驻'}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				imgUrl:''
+			}
+		},
+		mounted() {
+			this.imgUrl = this.imgfixUrl
+		},
+		components: {
+
+		},
+		props: {
+			swiperContainer: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			swiperParams: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		methods: {
+			navgateto(url) {
+				App.navigationTo({
+					url: url
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.enter-box {
+		.swiper-item {
+			border-radius: 60upx;
+			height: 84upx;
+
+			.swiper-item-left {
+				background-color: #FFFFFF;
+				border-radius: 40upx 0 0 40upx;
+				height: 84upx;
+				border: 5upx solid #F1F1F1;
+				border-right: none;
+				.swiperImage {
+					width: 50upx;
+					height: 36upx;
+					margin: 0 20upx 0 30upx;
+				}
+				.fgx{
+					width: 2upx;
+					height: 30upx;
+					position: absolute;
+					left: 18%;
+					top: 50%;
+					transform: translateY(-50%);
+					background-color: #DDDDDD;
+				}
+				.swiper-title {
+					padding: 4upx 24upx;
+					width: 50upx;
+					color: red;
+				}
+
+				.swiper-title::after {
+					content: " ";
+					width: 2upx;
+					height: 60upx;
+					font-size: 0;
+					background-color: #bdbdbd;
+					position: absolute;
+					left: 22%;
+					top: 50%;
+					transform: translateY(-50%);
+				}
+
+				.swiper-box {
+					.swiper-view {
+						padding: 0 10upx 0 30upx;
+						width: 400upx;
+						height: 84upx;
+						line-height: 84upx;
+
+						.swiperContainer {
+							width: 350upx;
+						}
+					}
+				}
+			}
+
+			.swiper-item-right {
+				flex: 1;
+				height: 100%;
+				line-height: 84upx;
+				background-image: linear-gradient(to right, rgba(252,104,104,1) 0% , rgba(255,68,68,1) 100%);
+				border-radius: 0 40px 40px 0;
+				border: 5upx solid #f9f9f9;
+				border-left: none;
+			}
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/shopInfo.vue b/components/page/pageComponents/shopInfo.vue
new file mode 100644
index 0000000..8d08c3e
--- /dev/null
+++ b/components/page/pageComponents/shopInfo.vue
@@ -0,0 +1,290 @@
+<!-- 商铺信息 -->
+<template>
+	<view class="container">
+		<!-- 商铺详情3 -->
+		<view class="shopInfo-3">
+			<view class="shopInfo-tabbar dis-flex b-f">
+				<view class="tabbar-item flex-box t-c p-r" v-for="(tabItem,index) in shopinfoData" @click="selectTabbar(tabItem)" :key="index">
+					<text class="f-28" :class="currentTab===tabItem.order?'tabbar-item-active':''">{{tabItem['title']}}</text>
+					<view class="tabbar-item-active-btm" v-if="currentTab===tabItem.order"></view>
+				</view>
+			</view>
+			<view class="shop b-color-f8" style="padding: 20upx 30upx 60upx;">
+				<view class="shangjia" style="padding-bottom: 80upx;">
+					<view class="shangjia-i" :class="{shangjiaISty: item2.goods.length == 0}" v-for="(item2, key2) in shopInfoList"
+					 :key="key2">
+						<view class="a shangjia-i-t" @click="navigateTo(item2.shop_url,item2,shopInfoList)">
+							<view class="shangjia-i-l">
+								<image class="image" :src="item2.logo" mode="aspectFill"></image>
+							</view>
+							<view class="shangjia-i-r">
+								<view class="shangjia-i-r-d">
+									<view class="dis-flex flex-y-center flex-x-between">
+										<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+										<view class="store-containerIcon dis-flex flex-y-center">
+											<image :src="imgfixUrls + 'citydeliveryicon.png'" class="image30" v-if="item2.deliverystatus == 1" />
+											<image :src="imgfixUrls + 'homePage/home_logo2.png'" class="image30" v-if="item2['attestation']['attestation'] == 2" />
+											<image :src="imgfixUrls + 'homePage/home_logo3.png'" class="image30" v-if="item2['attestation']['bondflag'] == 1" />
+											<image :src="imgfixUrls + 'diypage/720icon.png'" mode="" class="m-right10" v-if="item2.panorama===1"></image>
+											<image :src="imgfixUrls + 'diypage/videoicon.png'" mode="" v-if="item2.videourl===1"></image>
+										</view>
+									</view>
+									<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="shangjia-i-r-t2-icon">
+												<view class="star star-dark">
+													<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+												</view>
+												<view class="star star-light">
+													<view class="star-width" :style="'width:'+(item2.score / 5) * 100+'%;'">
+														<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+													</view>
+												</view>
+											</view>
+											<view class="f-28 col-6 star-grade">{{item2.score}}分</view>
+										</view>
+										<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{item2.distance}}</view>
+									</view>
+									<view class="shangjia-i-r-t3 over-omit">
+										<view class="p" v-html="item2.storehours"></view>
+									</view>
+									<view class="shangjia-i-r-t3 over-omit" v-if="item2.catename">
+										<view class="p">{{item2.catename}}</view>
+									</view>
+									<view class="shangjia-i-r-t4 over-omit">
+										<view v-for="(item3,index3) in item2.tags" class="tags_view" :key="index3">{{item3}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="shangjia-i-b" style="margin-top: 20upx;" v-if="((shopFold && shopFoldIndex == key2) || (shopFoldIndex !== key2)) && item2.goods.length > 0">
+							<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+								<view class="i icon iconfont icon-unfold"></view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+								<view class="em" :class="tag.css">{{ tag.tag }}</view>
+								<view class="span">{{ tag.name }}</view>
+							</view>
+							<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+								<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+							</view>
+						</view>
+						<view class="shangjia-i-b" style="margin-top: 20upx;" v-if="!shopFold && shopFoldIndex == key2 &&  item2.goods.length > 2">
+							<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+								<view class="i icon iconfont icon-fold"></view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style=" background-color: #F8F8F8;">
+					<load-more :isMore="loadingMore"></load-more>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import loadMore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				currentTab: null,
+				shopFold: true,
+				shopFoldIndex: -1,
+				shopInfoList: null,
+				pageTotal: null,
+				current_page: 1,
+				tabItemInfo: {},
+				scrollTop: 0,
+				loadingMore: false,
+				mobileHeight: 0,
+				img:''
+			}
+		},
+		components: {
+			loadMore
+		},
+		props: {
+			shopinfoData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			shopinfoStyle: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		onShow() {
+
+		},
+		computed:{
+			curLoction(){
+				return uni.getStorageSync('curLoction')
+			}
+		},
+		mounted() {
+			this.img = this.imgfixUrl;
+			uni.$on('isBottomMore',this.shopInfomore);
+		},
+		destroyed() {
+			uni.$off('isBottomMore',this.shopInfomore);
+		},
+		watch: {
+			'shopinfoData': {
+				handler(newData, oldData) {
+					if (!!newData && Object.keys(newData)['length'] > 0) {
+						let tabItem = Object.keys(newData)[0];
+						this.selectTabbar(newData[tabItem])
+					}
+				},
+				immediate: true,
+				deep: true
+			}
+		},
+		methods: {
+			selectTabbar(tabItem, page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						order: tabItem.order,
+						is_total: "1",
+						page,
+						lat: !!_this.curLoction ? _this.curLoction.latitude : '',
+						lng: !!_this.curLoction ? _this.curLoction.longitude : ''
+					};
+				App._post_form('&p=store&do=homeList', requestData, res => {
+					let storeList = res.data.list;
+					for (let i = 0; i < storeList.length; i++) {
+						let goodsList = [];
+						for (let j in storeList[i].goods) {
+							let goodsData = storeList[i].goods[j];
+							if (goodsData !== '') {
+								if (j == 'active') {
+									goodsData.css = 'qiang'
+									goodsData.tag = '抢'
+								} else if (j == 'coupon') {
+									goodsData.css = 'hui'
+									goodsData.tag = '券'
+								} else if (j == 'fightgroup') {
+									goodsData.css = 'pin'
+									goodsData.tag = '拼'
+								} else if (j == 'groupon') {
+									goodsData.css = 'tuan'
+									goodsData.tag = '团'
+								} else if (j == 'halfcard') {
+									goodsData.css = 'ka'
+									goodsData.tag = '卡'
+								} else if (j == 'packages') {
+									goodsData.css = 'li'
+									goodsData.tag = '礼'
+								}else if (j == 'bargain') {
+									goodsData.css = 'kan'
+									goodsData.tag = '砍'
+								}
+								goodsList.push(goodsData);
+							}
+						}
+						storeList[i].goods = goodsList;
+					}
+					if (isPage) {
+						if (storeList.length > 0) {
+							_this["shopInfoList"].push(...storeList);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData({
+							current_page: 1,
+							shopInfoList: storeList,
+							currentTab: tabItem.order,
+							pageTotal: res.data.total,
+							tabItemInfo: tabItem,
+							loadingMore: storeList.length === 0 || _this.current_page === res.data.total,
+							scrollTop: 0
+						})
+					}
+				}, false, () => {})
+			},
+			navigateTo(url,aa,bb) {
+				
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+				console.log(url,isHttpUrl);
+			},
+			shangjiaFold(key2) {
+				this.shopFold = false
+				this.shopFoldIndex = key2
+			},
+			shangjiaUpFold(key2) {
+				this.shopFold = true
+				this.shopFoldIndex = key2
+			},
+			shopInfomore() {
+				if (this.current_page >= this.pageTotal) {
+					this.loadingMore = true;
+					return false;
+				}
+				console.log(this.current_page,this.pageTotal)
+				this.selectTabbar(this.tabItemInfo, ++this.current_page, true);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../../common/css/old_diyPages";
+	
+	// 商铺3
+	.shopInfo-3 {
+		.shopInfo-tabbar {
+			.tabbar-item-active {
+				color: #FF4444;
+			}
+
+			.tabbar-item {
+				padding-bottom: 20upx;
+				&>text {
+					display: inline-block;
+					height: 70upx;
+					line-height: 60upx;
+				}
+			}
+
+			.tabbar-item-active-btm {
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				bottom: 0;
+				width: 56upx;
+				height: 8upx;
+				background: rgba(255, 68, 68, 1);
+				border-radius: 8upx 8upx 0 0;
+			}
+		}
+	}
+</style>
diff --git a/components/page/pageComponents/tabContro.vue b/components/page/pageComponents/tabContro.vue
new file mode 100644
index 0000000..0dd0d33
--- /dev/null
+++ b/components/page/pageComponents/tabContro.vue
@@ -0,0 +1,875 @@
+<template>
+	<view class="container" :style="'margin-bottom:'+(tabStyle.marginBottom*2)+'rpx;' + 'background-color:'+ (currentTab==='dating' || tabParms.goods_type ==='dating'?'#ffffff':'#f7f7f7') +';'">
+		<block v-if="controType==='options'">
+			<view class="tabBar-box">
+				<scroll-view class="scroll-view" scroll-x :style="'background-color:'+tabStyle.background+';'" :scroll-left="scroll_left">
+					<view class="tabBar-list">
+						<!-- currentTab===tabBarItem.type?'color:'+tabStyle.selectBg+';':+tabStyle.defaultBg+';' -->
+						<view @click="selectTabBar(tabData[key],'','',index + 1)" class="tabBar-item p-r f-32 t-c onelist-hidden" v-for="(tabBarItem,key,index) in tabData"
+						 :key="index" :style="{color:(currentTab===tabBarItem.type?tabStyle.selectBg:tabStyle.defaultBg)}">{{tabBarItem.nickname}}
+							<!-- :style="'color:'+tabStyle.default,currentTab===tabBarItem.type?'background-color:'+tabStyle.selectBg+';':''" -->
+							<view :class="{'selectTabBar':currentTab===tabBarItem.type}" :style="{'color':tabStyle.default,'background-color':currentTab===tabBarItem.type?tabStyle.selectBg:''}"></view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="b-f" v-if="currentTab==='pocket' && !!children &&  children.length > 0" style="padding: 0 30upx 30upx;">
+					<v-tabs
+					:color="'#333333'" 
+					:bgColor="'#ffffff'" 
+					:activeColor="'#ffffff'" 
+					:height="'40rpx'" 
+					:paddingItem="'2rpx 20rpx'" 
+					:fontSize="'24rpx'" 
+					:activeFontSize="'24rpx'"
+					:pillsColor="'#ff4444'" 
+					:pillsBorderRadius="'60rpx'" 
+					v-model="sort" 
+					:field="'title'" 
+					:tabs="children" 
+					:pills="true" 
+					line-height="0" 
+					:bold="false" 
+					@change="vtabschange"></v-tabs>
+				</view>
+			</view>
+		</block>
+		<!-- 新加注释 - 技能培训等，第一版选项卡，第二版弃用 -->
+		<block v-if="controType==='options2' && currentTab !=='rush' && tabParms.goods_type !=='rush'">
+			<view class="tabBar-cn">
+				<view class="tabBar-box">
+					<scroll-view class="scroll-view" scroll-x :scroll-left="scroll_left">
+						<view class="tabBar-list" :style="'background-color:'+tabStyle.background+';'">
+							<view @click="selectTabBar_two(tabBarItem,index)" class="tabBar-item2 p-r f-32 t-c" v-for="(tabBarItem,index) in tabData"
+							 :key="index" :style="{'color':currentTwoTab==index?tabStyle.selectBg:tabStyle.defaultBg,'width':tabParms.total>5?'20%': 100 / tabParms.total+'%'}">{{tabBarItem.name}}
+								<view :class="{'selectTabBar':currentTwoTab==index}" :style="currentTwoTab==index?'background-color:'+tabStyle.selectBg+';':''"></view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<block v-if="!!tabParms.class_list&&tabParms.class_list.length>0">
+					<view class="tabBar-listTwo-box b-e6">
+						<scroll-view class="scroll-view" scroll-x="true" :scroll-left="scroll_left2">
+							<view class="tabBar-Twolist">
+								<view class="tabBar-Twolist-all m-right50 f-24 col-3 dis-il-block" :class="{tabClassiflySelect:classifly=='0'}"
+								 @click="selectClassifly('0',1,false,-1,'全部')">全部</view>
+								<view class="f-24 col-3 m-right50 dis-il-block" :class="{tabClassiflySelect:classifly===listItem.id}" v-for="(listItem,index) in tabParms.class_list"
+								 @click="selectClassifly(listItem.id,1,false,index,listItem.name)" :key="index">{{listItem.name}}</view>
+							</view>
+						</scroll-view>
+					</view>
+				</block>
+			</view>
+		</block>
+		<!--  商家信息  -->
+		<block v-if="currentTab === 'store'">
+			<view class="shop " style="background-color: #F8F8F8;">
+				<view class="shangjia">
+					<view class="shangjia-i" style="margin: 30upx;" :class="{shangjiaISty: item2.goods.length == 0}" v-for="(item2, key2) in tabDataList"
+					 :key="key2">
+						<view class="a shangjia-i-t" @click="navigateTo(item2.shop_url)">
+							<view class="shangjia-i-l">
+								<image class="image" :src="item2.logo" mode="aspectFill"></image>
+							</view>
+							<view class="shangjia-i-r">
+								<view class="shangjia-i-r-d">
+									<view class="dis-flex flex-y-center flex-x-between">
+										<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+										<view class="store-containerIcon dis-flex flex-y-center">
+											<image :src="imgfixUrls + 'homePage/home_logo2.png'" class="image30" v-if="item2['attestation']['attestation'] == 2" />
+											<image :src="imgfixUrls + 'homePage/home_logo3.png'" class="image30" v-if="item2['attestation']['bondflag']?item2['attestation']['bondflag'] == 1:false" />
+											<image :src="imgfixUrls + 'diypage/720icon.png'" mode="" class="m-right10" v-if="item2.panorama===1"></image>
+											<image :src="imgfixUrls + 'diypage/videoicon.png'" mode="" v-if="item2.videourl===1"></image>
+										</view>
+									</view>
+									<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="shangjia-i-r-t2-icon">
+												<view class="star star-dark">
+													<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+												</view>
+												<view class="star star-light">
+													<view class="star-width" :style="'width:'+(item2.score / 5) * 100+'%;'">
+														<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+													</view>
+												</view>
+											</view>
+											<view class="f-28 col-6 star-grade">{{item2.score}}分</view>
+										</view>
+										<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{item2.distance}}</view>
+									</view>
+									<view class="shangjia-i-r-t3 over-omit">
+										<view class="p" v-html="item2.storehours"></view>
+									</view>
+									<view class="shangjia-i-r-t4 over-omit">
+										<view v-for="(item3,index3) in item2.tags" class="tags_view" :key="index3">{{item3}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || (shopFoldIndex !== key2)) && item2.goods.length > 0">
+							<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+								<view class="i icon iconfont icon-unfold"></view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+								<view class="em" :class="tag.css">{{ tag.tag }}</view>
+								<view class="span">{{ tag.name }}</view>
+							</view>
+							<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+								<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+							</view>
+						</view>
+						<view class="shangjia-i-b" v-if="!shopFold && shopFoldIndex == key2 &&  item2.goods.length > 2">
+							<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+								<view class="i icon iconfont icon-fold"></view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<!-- 抢购 -->
+		<block v-if="currentTab ==='rush' || tabParms.goods_type ==='rush'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<goods-style goodsStyleType="rush" :goodslistData="rush_goodsList" @remindSuccess="remindSuccess"
+				 :cc_id="newCC_id" @cultivateClassChange="cultivateClassChange"></goods-style>
+			</view>
+		</block>
+		<!-- 卡券 -->
+		<block v-if="currentTab==='coupon' || tabParms.goods_type ==='coupon'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<goods-style goodsStyleType="coupon" :goodslistData="couponList"></goods-style>
+			</view>
+		</block>
+		<!-- 折扣 -->
+		<block v-if="currentTab==='halfcard'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<card-components :disCardData_two="tabDataList" disCardType="disCard1" :disType="2"></card-components>
+			</view>
+		</block>
+		<!-- 拼团 -->
+		<block v-if="currentTab==='fight' || tabParms.goods_type==='wlfightgroup'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<goods-style goodsStyleType="fight" :goodslistData="fightList"></goods-style>
+			</view>
+		</block>
+		<!-- 同城 -->
+		<block v-if="currentTab==='pocket'">
+			<citywide :citywideList="tabDataList" @getaver="getaver"></citywide>
+		</block>
+		<!-- 团购 -->
+		<block v-if="currentTab ==='groupon' || tabParms.goods_type ==='groupon'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<goods-style goodsStyleType="groupon" :goodslistData="gpOrbrList"></goods-style>
+			</view>
+		</block>
+		<!-- 砍价 -->
+		<block v-if="currentTab ==='bargain' || tabParms.goods_type ==='bargain'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<goods-style goodsStyleType="bargain" :goodslistData="gpOrbrList"></goods-style>
+			</view>
+		</block>
+		<!-- 大礼包 -->
+		<block v-if="currentTab==='package'">
+			<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+				<giftbag-components :giftData_two="tabDataList" giftType="gift_type1" :disType="2"></giftbag-components>
+			</view>
+		</block>
+		<!-- 积分 -->
+		<block v-if="currentTab==='consumption'">
+			<integral :integralList="tabDataList"></integral>
+		</block>
+		<!-- 活动 -->
+		<block v-if="currentTab==='activity' || tabParms.goods_type ==='activity'">
+			<activity :tabDataList="activityList"></activity>
+		</block>
+		<!-- 招聘 -->
+		<block v-if="currentTab==='recruit' || tabParms.goods_type ==='recruit'">
+			<work-List :inviteList="inviteList" :tabStyle="true"></work-List>
+		</block>
+		<!-- 相亲 -->
+		<block v-if="currentTab==='dating' || tabParms.goods_type ==='dating'">
+			<view class="nav-content">
+				<view class="nav-item" v-for="(items,indexs) in datingList" :key="indexs">
+					<user :memberInfo="items"></user>
+				</view>
+			</view>
+			
+		</block>
+		<!-- 家政 -->
+		<block v-if="currentTab==='housekeep' && tabParms.goods_type ==='housekeep'">
+			<view  style="padding: 30upx;">
+				<view  v-for="(items,indexs) in tabDataTwoList" :key="indexs">
+					<homemaking-item :items="items"></homemaking-item>
+				</view>
+			</view>
+			
+		</block>
+		<block v-else-if="currentTab==='housekeep2'">
+			<view  style="padding: 30upx;">
+				<view  style="margin-bottom: 30upx;" v-for="(items,indexs) in tabDataTwoList" :key="indexs">
+					<demand-item :demanItem="items"></demand-item>
+				</view>
+			</view>
+			
+		</block>
+		<block v-else-if="currentTab==='housekeep3'">
+			<view  style="padding: 30upx;">
+				<view  style="margin-bottom: 30upx;" v-for="(items,indexs) in tabDataTwoList" :key="indexs">
+					<myser-item :states="false" :serItem="items"></myser-item>
+				</view>
+			</view>
+			
+		</block>
+		
+		<view style="padding-bottom: 10px; background-color: #F8F8F8;">
+			<load-more :isMore="loadingMore"></load-more>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import demandItem from '@/components/template/demandItem.vue'
+	import myserItem from '@/components/template/myserItem.vue'
+	import cardComponents from '@/components/page/pageComponents/discountCard.vue'
+	import giftbagComponents from '@/components/page/pageComponents/giftbag.vue'
+	import citywide from '@/components/page/pageComponents/citywide.vue'
+	import integral from '@/components/page/pageComponents/integral.vue'
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	import loadMore from '@/components/template/loadmore.vue'
+	import activity from '@/components/template/activityData.vue'
+	import workList from '@/components/template/workList.vue'
+	import user from '@/components/template/user.vue'
+	import homemakingItem from '@/components/template/homemakingItem.vue'
+	import vTabs from '@/components/v-tabs/v-tabs.vue'
+	export default {
+		data() {
+			return {
+				scroll_left: 0,
+				currentTab: null,
+				currentTwoTab: 0,
+				classifly: "0",
+				tabDataList: null,
+				tabDataTwoList: null,
+				shopFold: true,
+				shopFoldIndex: -1,
+				Twotabtype: null,
+				requestData: {},
+				loadingMore: false,
+				pageTotal: null,
+				current_page: 1,
+				currentTabItem: {},
+				requestTwoSelectInfo: null,
+				scroll_left2: 0,
+				imgUrl:'',
+				cate_id:'',
+				onekey:'',
+				sort:0,
+				children:[],
+				idIndex:'',
+				cc_child_id: '',
+			}
+		},
+		props: {
+			tabData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			tabStyle: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			tabParmsType: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			controType: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			},
+			city_id:{
+				type:String,
+				default:function(){
+					return ''
+				}
+			},
+			newCC_id: {
+				type:String||Number,
+				default: 1
+			}
+		},
+		components: {
+			cardComponents,
+			giftbagComponents,
+			citywide,
+			integral,
+			goodsStyle,
+			loadMore,
+			activity,
+			workList,
+			user,
+			homemakingItem,
+			demandItem,
+			myserItem,
+			vTabs
+		},
+		onShow() {
+
+		},
+		onLoad() {
+	
+		},
+		mounted() {
+			this.imgUrl = this.imgfixUrl;
+			// debugger
+			uni.$on('tabisBottomMore', this.tabInfomore);
+		},
+		destroyed() {
+			uni.$off('tabisBottomMore', this.tabInfomore);
+		},
+		computed: {
+			istabbarcontro() {
+				return this.$store.state.istabcontro;
+			},
+			rush_goodsList: {
+				get() {
+					return this.currentTab === 'rush' ? this.tabDataList : this.tabDataTwoList;
+				},
+				set(val) {
+					return val
+				}
+			},
+			fightList() {
+				return this.currentTab === 'fight' ? this.tabDataList : this.tabDataTwoList;
+			},
+			gpOrbrList() {
+				return (this.currentTab === 'groupon' || this.currentTab === 'bargain') ? this.tabDataList : this.tabDataTwoList;
+			},
+			couponList() {
+				return this.currentTab === 'coupon' ? this.tabDataList : this.tabDataTwoList;
+			},
+			activityList() {
+				return this.currentTab === 'activity' ? this.tabDataList : this.tabDataTwoList;
+			},
+			inviteList() {
+				return this.currentTab === 'recruit' ? this.tabDataList : this.tabDataTwoList;
+			},
+			datingList() {
+				return this.currentTab === 'dating' ? this.tabDataList : this.tabDataTwoList;
+			},
+			tabParms() {
+				return this.tabParmsType.length > 0 ? this.tabParmsType[0] : this.tabParmsType
+			},
+			curLoction() {
+				return uni.getStorageSync('curLoction')
+			}
+		},
+		watch: {
+			'tabData': {
+				handler(newData, oldData) {
+					if (!!newData && Object.keys(newData)['length'] > 0) {
+						// let tabItem = Object.keys(newData)[0];
+						let tabItem = 0;//还给除了抢购首页其余模块一个this.selectTabBar_two(newData[tabItem],0)
+						let arr112 = Object.keys(newData);
+						for(let j = 0;j <arr112.length; j++){
+							if(j+1 == this.newCC_id){
+								tabItem = Object.keys(newData)[j];
+							}
+						}
+						
+						if (this.controType === 'options2') {
+							if(this.onekey){
+								this.selectTabBar_two(newData[this.onekey],0)
+							}else{
+								this.currentTabData = newData[tabItem],this.currentTabItem = tabItem;//切换子分类需要用到
+								this.selectTabBar_two(newData[tabItem],tabItem)
+								//首次打开抢购首页(技能培训等)执行这里
+							}
+							
+						} else {
+							this.selectTabBar(newData[tabItem])
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			},
+		},
+		methods: {
+			vtabschange(e){
+				this.sort = e;
+				this.selectTabBar(this.currentTabItem,1,false,'',e)
+			},
+			handleMemberClick(item) {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/member/detail?id=${item.id}`
+				})
+			},
+			getaver(id,bor){
+				let _this = this;
+				_this.tabDataList.forEach(item=>{
+					if(item.id == id){
+						if(bor){
+							_this.$set(item,'fabulous_num',item.fabulous_num + 1);
+							item.look++;
+							_this.$set(item,'is_fabulous',1);
+							item.fabulous_avatar.push(uni.getStorageSync('userinfo').avatar);
+							// item.fabulous_avatar.forEach((items,index)=>{
+							// 	if(items == uni.getStorageSync('userinfo').avatar){
+							// 		item.fabulous_avatar.splice(index, 1);
+							// 	}
+							// })
+						}else{
+							_this.$set(item,'fabulous_num',item.fabulous_num - 1);
+							item.look--;
+							_this.$set(item,'is_fabulous',0);
+							item.fabulous_avatar.forEach((items,index)=>{
+								if(items == uni.getStorageSync('userinfo').avatar){
+									item.fabulous_avatar.splice(index, 1);
+								}
+							})
+						}
+					}
+				})
+				
+				// this.aolist = false;
+				// this.aolist = true;
+				
+			},
+			changeItem(tabItem ,index) {
+				let _this = this
+				let tabArrary = []
+				for (let key in _this.tabData) {
+					tabArrary.push(key)
+				}
+				if (index > 2 && index < (tabArrary.length - 1)) {
+					if (index == 3) {
+						_this.scroll_left = 0
+					} else if (index == tabArrary.length - 2) {
+						_this.scroll_left = uni.upx2px(150 * (tabArrary.length + 3))
+					} else {
+						_this.scroll_left = uni.upx2px(150 * (index - 3))
+					}
+				} else if (index < 3) {
+					_this.scroll_left = 0
+				} else if (index > (tabArrary.length - 2)) {
+					_this.scroll_left = uni.upx2px(150 * (tabArrary.length + 3))
+				}
+			},
+			selectTabBar(tabItem, page = 1, isPage = false,index,id) {
+				//#ifdef H5
+				let pageurl = location.href,
+					pages = pageurl.split('/#/')[1].split('?')[0];
+				// if(pages == 'pages/mainPages/index/diypage') return; 这里退出会导致自定义页面无法加载
+				//#endif
+				uni.showLoading({})
+				let _this = this,
+					requestUrl = '&' + tabItem.request_link,
+					requestData = {
+						page,
+						is_total: "1",
+						lat: !!_this.curLoction ? _this.curLoction.latitude : '',
+						lng: !!_this.curLoction ? _this.curLoction.longitude : ''
+					};
+					// debugger
+					if(tabItem.type == 'pocket'){
+						requestData.homeflag = 1;
+						if(id){
+							requestData.id = _this.children[id].id;
+						}
+					}
+				_this.changeItem(tabItem,index)
+				App._post_form(requestUrl, requestData, res => {
+					if (tabItem.type === 'store' || _this.currentTab === 'store') {
+						for (let i = 0; i < res.data.list.length; i++) {
+							let goodsList = [];
+							for (let j in res.data.list[i].goods) {
+								let goodsData = res.data.list[i].goods[j];
+								if (goodsData !== '') {
+									if (j == 'active') {
+										goodsData.css = 'qiang'
+										goodsData.tag = '抢'
+									} else if (j == 'coupon') {
+										goodsData.css = 'hui'
+										goodsData.tag = '券'
+									} else if (j == 'fightgroup') {
+										goodsData.css = 'pin'
+										goodsData.tag = '拼'
+									} else if (j == 'groupon') {
+										goodsData.css = 'tuan'
+										goodsData.tag = '团'
+									} else if (j == 'halfcard') {
+										goodsData.css = 'ka'
+										goodsData.tag = '卡'
+									} else if (j == 'packages') {
+										goodsData.css = 'li'
+										goodsData.tag = '礼'
+									} else if (j == 'bargain') {
+										goodsData.css = 'kan'
+										goodsData.tag = '砍'
+									}else if(j == 'activity'){
+										goodsData.css = 'huo'
+										goodsData.tag = '活'
+									}
+									goodsList.push(goodsData);
+								}
+							}
+							res.data.list[i].goods = goodsList;
+						}
+					}
+					if (isPage) {
+						if (res.data.list.length > 0) {
+							_this["tabDataList"].push(...res.data.list);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						// debugger
+						_this.setData({
+							current_page: 1,
+							currentTab: tabItem.type,
+							tabDataList: res.data.list,
+							pageTotal: res.data.total,
+							loadingMore: res.data.list.length === 0 || _this.current_page === res.data.total,
+							currentTabItem: tabItem
+						})
+						if(tabItem.type == 'pocket' && !!res.data.children && !id){
+							_this.children = res.data.children;
+						}
+					}
+					uni.hideLoading()
+				}, false, () => {})
+			},
+			selectTabBar_two(tabItem,isindex, page = 1, isPage = false) {
+				// console.log(tabItem,isindex, page, isPage, '======njkfsadsad')
+				if(isindex){
+					this.onekey = isindex
+					// this.onekey = Object.keys(this.tabData)[isindex]
+				}else if(!this.onekey){
+					this.onekey = Object.keys(this.tabData)[0];//获取第一个key值，默认高亮
+				}
+				let cartid = uni.getStorageSync('cate_id');
+				uni.showLoading({
+					mask:true
+				})
+				let _this = this,
+					requestUrl = '&' + tabItem.request_link,
+					requestData = {
+						page,
+						is_total: "1",
+						lat: _this.curLoction ? _this.curLoction.latitude : '',
+						lng: _this.curLoction ? _this.curLoction.longitude : '',
+						status: tabItem.status,
+						sort: tabItem.orders || ''
+						
+					};
+				if (tabItem.request_link === "p=dating&do=homeList") {
+					Object.assign(requestData, {
+						gneder: tabItem.gneder || '0'
+					})
+				}
+				if (tabItem.request_link === "p=rush&do=homeList") {
+					Object.assign(requestData, {
+						cate_id: cartid || '0'
+					})
+				}
+				if (tabItem.request_link === "p=rush&do=homeList") {
+					Object.assign(requestData, {
+						cate_id: cartid || '0'
+					})
+				}
+				if(tabItem.request_link === "p=housekeep&do=getNewStorelist" || tabItem.request_link === "p=housekeep&do=getStorelist" || tabItem.request_link === "p=housekeep&do=getArtificerlist"){
+					
+					this.currentTab = 'housekeep';
+					requestData.status = 1;
+				}
+				if(tabItem.request_link === "p=housekeep&do=getDemandlist"){
+					this.currentTab = 'housekeep2';
+					// requestData.status = 1;
+				}
+				if (tabItem.request_link === "p=housekeep&do=getServicelist") {
+					requestData.status = 1;
+					this.currentTab = 'housekeep3';
+				}
+				if(cartid){
+					Object.assign(requestData, {
+						cate_id: cartid
+					})
+				}else if(_this.cate_id){
+					// _this.classifly = _this.cate_id;
+					requestData.cate_id = _this.cate_id
+				}else{
+					_this.classifly = '0';
+				}
+				// debugger
+				_this.changeItem(tabItem);
+				//#ifdef H5
+				let pageurl = location.href;
+				//#endif
+				
+				// 抢购首页的商品列表需要添加参数
+				if (tabItem.request_link === "p=rush&do=homeList") {
+					Object.assign(requestData, {
+						cc_id: tabItem.cc_id,
+						sort: 3,
+						cc_child_id: this.cc_child_id
+					})
+				}
+				
+				App._post_form(requestUrl, requestData, res => {
+					
+					if (isPage) {
+						if (res.data.list.length > 0) {
+							_this["tabDataTwoList"].push(...res.data.list);
+							_this.loadingMore = true;
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						// _this.tabDataTwoList = [];
+						_this.setData({
+							current_page: 1,
+							currentTwoTab: isindex || this.onekey,
+							tabDataTwoList: res.data.list,
+							pageTotal: res.data.total,
+							loadingMore: res.data.list.length === 0 || _this.current_page === res.data.total,
+							Twotabtype: _this.tabParms.goods_type,
+							requestData: requestData,
+							currentTabItem: tabItem,
+							requestTwoSelectInfo: requestUrl
+						});
+						// debugger
+					}
+					if(cartid){
+						_this.classifly = cartid;
+						let index;
+						// debugger
+						_this.tabParms.class_list.map((item,indexs)=>{
+							if(item.id == cartid){
+								index = indexs;
+							}
+						})
+						const query = uni.createSelectorQuery().in(this);
+						query.selectAll('.dis-il-block, .some-other-nodes').boundingClientRect(data => {
+							let marinfo = uni.upx2px(50),
+								padInfo = uni.upx2px(24),
+								marWid = index * marinfo,
+								itemWid = ((data[index].width) / 2) + padInfo, //当前选中大小
+								windowWid = (uni.upx2px(690)) / 2, //当前容器大小
+								arrlength = 0;
+							for (let i = 0; i < index; i++) {
+								arrlength = arrlength + data[i].width
+							}
+							arrlength = arrlength + marWid + itemWid //选中前全部选项大小
+							_this.scroll_left2 = arrlength - windowWid
+						}).exec();
+					}
+					// if(tabItem.request_link == "p=activity&do=homeList"){
+					// 	_this.currentTab = 	'activity';
+					// }
+					_this.loadingMore = true;
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			selectClassifly(cate_id, page = 1, isPage = false, index1, item) {
+				uni.showLoading({})
+				let _this = this,
+					classRequestData = {
+						..._this.requestData,
+						cate_id,
+						page
+					},
+					requestTwoSelectInfo = _this.requestTwoSelectInfo;
+				let index = index1 + 1;
+				_this.cate_id = cate_id;
+				const query = uni.createSelectorQuery().in(this);
+				query.selectAll('.dis-il-block, .some-other-nodes').boundingClientRect(data => {
+					let marinfo = uni.upx2px(50),
+						padInfo = uni.upx2px(24),
+						marWid = index * marinfo,
+						itemWid = ((data[index].width) / 2) + padInfo, //当前选中大小
+						windowWid = (uni.upx2px(690)) / 2, //当前容器大小
+						arrlength = 0;
+					for (let i = 0; i < index; i++) {
+						arrlength = arrlength + data[i].width
+					}
+					arrlength = arrlength + marWid + itemWid //选中前全部选项大小
+					_this.scroll_left2 = arrlength - windowWid
+				}).exec();
+
+				App._post_form(requestTwoSelectInfo, classRequestData, res => {
+					if (isPage) {
+						if (res.data.list.length > 0) {
+							_this["tabDataTwoList"].push(...res.data.list);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData({
+							current_page: 1,
+							tabDataTwoList: res.data.list,
+							pageTotal: res.data.total,
+							loadingMore: res.data.list.length === 0 || _this.current_page === res.data.total,
+							Twotabtype: _this.tabParms.goods_type,
+							classifly: cate_id
+						})
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			},
+			shangjiaFold(key2) {
+				this.shopFold = false
+				this.shopFoldIndex = key2
+			},
+			shangjiaUpFold(key2) {
+				this.shopFold = true
+				this.shopFoldIndex = key2
+			},
+			// 抢购关注事件
+			remindSuccess(goodsData, goodsIndex) {
+				this.rush_goodsList.splice(goodsIndex, 1, goodsData[goodsIndex]);
+			},
+			// 商品切换二级分类
+			cultivateClassChange(e){
+				this.cc_child_id = e;
+				this.selectTabBar_two(this.currentTabData, this.currentTabItem);
+			},
+			tabInfomore() {
+				let _this = this;
+				if (_this.current_page >= _this.pageTotal) {
+					_this.loadingMore = true;
+					return false;
+				}
+				if(_this.city_id){
+					_this.classifly = _this.city_id;
+					
+				}
+				if (_this.controType === 'options2') {
+					if (!!_this.tabParms.class_list && _this.tabParms.class_list.length > 0) {
+						_this.selectClassifly(_this.classifly, ++_this.current_page, true)
+					} else {
+						// if(_this.currentTab == 'housekeep' || _this.currentTab == 'housekeep2' || _this.currentTab == 'housekeep3') return
+						_this.selectTabBar_two(_this.currentTabItem,0, ++_this.current_page, true)
+					}
+				} else {
+					_this.selectTabBar(_this.currentTabItem, ++_this.current_page, true,'',_this.sort);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../../common/css/old_diyPages";
+
+	.tabBar-list {
+		height: 100upx;
+		line-height: 100upx;
+		white-space: nowrap;
+
+		.tabBar-item2 {
+			// width: 20%;
+			display: inline-block;
+
+			.selectTabBar {
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				width: 58upx;
+				height: 8upx;
+				background: rgba(255, 68, 68, 1);
+				border-radius: 8upx 8upx 0 0;
+				transform: translateX(-50%);
+			}
+		}
+
+		.tabBar-item {
+			width: 150upx;
+			display: inline-block;
+
+			.selectTabBar {
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				width: 58upx;
+				height: 8upx;
+				background: rgba(255, 68, 68, 1);
+				border-radius: 8upx 8upx 0 0;
+				transform: translateX(-50%);
+
+			}
+		}
+	}
+
+	.fui-groupon_goods-i-r-storeTitle {
+		height: 2.6em;
+		line-height: 1.3em;
+	}
+
+	.tabBar-listTwo-box {
+		padding: 30upx 30upx 0;
+	}
+
+	.tabBar-Twolist {
+		font-size: 0;
+		white-space: nowrap;
+	}
+
+	.tabClassiflySelect {
+		padding: 0 25upx;
+		height: 50upx;
+		line-height: 50upx;
+		background-color: #FFEBEB;
+		border-radius: 26upx;
+		color: #FF4444;
+		margin-right: 50upx;
+	}
+	.nav-content {
+			width: 690rpx;
+			margin: 30upx auto 0;
+			display: flex;
+			flex-wrap: wrap;
+			justify-content:space-between;
+	}
+	.nav-item {
+		width: 335rpx;
+		height: auto;
+		border-radius: 20rpx;
+		overflow: hidden;
+		background-color: #F8F8F8;
+		margin-bottom: 20rpx;
+	}
+</style>
diff --git a/components/page/pageComponents/tabMenu.vue b/components/page/pageComponents/tabMenu.vue
new file mode 100644
index 0000000..49c5d45
--- /dev/null
+++ b/components/page/pageComponents/tabMenu.vue
@@ -0,0 +1,217 @@
+<!-- displayMode 是否为滑动菜单 1:是-->
+<!-- list 菜单列表 -->
+<!-- eachPageNum 菜单一页个数 -->
+<!-- eachLineNum 菜单一行个数 -->
+<!-- swiperHeight swiper高度 -->
+<!-- btngroupHandleData 总页数 -->
+<!-- btnBordeRadius 菜单图标为圆角radius 为圆形circle -->
+
+<template>
+	<view class="box">
+		<view v-if="menuId == 'menu'">
+			<block v-if="btngroupData.displayMode == 1 && btngroupData.list.length>btngroupData.eachPageNum">
+				<view class="btngroup-p" :style="'height: '+(btngroupData.swiperHeight * 2 + 40)+'rpx; overflow: hidden;'">
+					<swiper :indicator-dots="btngroup.indicatorDots" :autoplay="true" :interval="5000"  indicator-color="rgba(0,0,0,.2)" indicator-active-color="#fe433f"
+					 :duration="btngroup.duration" :style="'height: '+(btngroupData.swiperHeight * 2 + 40)+'rpx'">
+						<swiper-item class="swiper-slide" v-for="(item2, key2) in btngroupData.btngroupHandleData" :key="key2">
+							<view class="btngroup-d">
+								<view class="a btngroup-i" :style="'width: '+(100 / btngroupData.eachLineNum) + '%'" v-for="(item3, key3) in item2"
+								 :key="key3" @click="navigateTo(item3.linkurl)">
+									<view class="btngroup-i-t">
+										<view class="btngroup-i-t-icon">
+											<!-- <image class="image btngroupImage" :class="{radius: btngroupData.btnBordeRadius == 'radius', circle: btngroupData.btnBordeRadius == 'circle'}"
+											 :src="item3.imgurl" /> -->
+											<view 
+											 class="image btngroupImage" 
+											 :class="{radius: btngroupData.btnBordeRadius == 'radius', circle: btngroupData.btnBordeRadius == 'circle'}" 
+											 :style="{background: 'url(' + item3.imgurl + ') ',backgroundSize:'100% 100%'}">
+											 	
+											 </view>
+										</view>
+									</view>
+									<view class="btngroup-i-c" :style="'color: '+item3.color">
+										{{ item3.text }}
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</block>
+			<block v-else>
+				<view class="btngroup-p">
+					<view class="btngroup-d">
+						<view class="a btngroup-i" :style="'width: '+(100 / btngroupData.eachLineNum) + '%'" v-for="(item2, key2) in btngroupData.list"
+						 :key="key2" @click="navigateTo(item2.linkurl)">
+							<view class="btngroup-i-t">
+								<view class="btngroup-i-t-icon">
+									<!-- <image class="image btngroupImage" :class="{radius: btngroupData.btnBordeRadius == 'radius', circle: btngroupData.btnBordeRadius == 'circle'}"
+									 :src="item2.imgurl" /> -->
+									 <view class="image btngroupImage" :class="{radius: btngroupData.btnBordeRadius == 'radius', circle: btngroupData.btnBordeRadius == 'circle'}" 
+									 :style="{background:'url(' + item2.imgurl + ') ',backgroundSize:'100% 100%'}">
+									 	
+									 </view>
+								</view>
+							</view>
+							<view class="btngroup-i-c" :style="'color: '+item2.color">
+								{{ item2.text }}
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view v-else>
+			<block v-if="btngroupData.displayMode == 1 && btngroupData.list.length>btngroupData.eachPageNum">
+				<view class="btngroup-p" :style="'height: '+(btngroupData.swiperHeight * 2 + 40)+'rpx; overflow: hidden;'">
+					<swiper :indicator-dots="btngroup.indicatorDots" :autoplay="true" :interval="5000" indicator-color="rgba(0,0,0,.2)" indicator-active-color="#fe433f"
+					 :duration="btngroup.duration" :style="'height: '+(btngroupData.swiperHeight * 2 + 40)+'rpx'">
+						<swiper-item class="swiper-slide" v-for="(item2, key2) in btngroupData.btngroupHandleData" :key="key2">
+							<view class="housekeeping">
+								<view class="housekeeping-issue" :style="{backgroundColor: item3.bgColor,color: item3.color,width:(100 / btngroupData.eachLineNum - (10/btngroupData.eachLineNum)) + '%',borderRadius:btngroupData.btnBordeRadius == 'radius'?'20rpx':'0px'}"  v-for="(item3, key3) in item2"
+								 :key="key3" @click="navigateTo(item3.linkurl)">
+									<image class="housekeeping-image" :src="item3.imgurl" v-if="item3.imgurl" mode=""></image>
+										{{item3.text}}
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</block>
+			<block v-else>
+				<view class="btngroup-p">
+					<view class="housekeeping" style="border-radius: 10upx;">
+						<view class="housekeeping-issue"
+						:style="{backgroundColor: item3.bgColor,color: item3.color,width:(100 / btngroupData.eachLineNum - (10/btngroupData.eachLineNum)) + '%',marginTop: 0,borderRadius:btngroupData.btnBordeRadius == 'radius'?'20rpx':'0px'}"  
+						v-for="(item3, key3) in btngroupData.list"
+						 :key="key3" @click="navigateTo(item3.linkurl)">
+							<image class="housekeeping-image" :src="item3.imgurl" v-if="item3.imgurl" mode=""></image>
+								{{item3.text}}
+						</view>
+					</view>
+				</view>
+			</block>
+			
+		</view>
+		<popup-view :show="showEnter" type="bottom" @clickmask="showEnter = false">
+			<view class="enter-box">
+				<view class="t-c f-36 f-w col-3" style="padding-top: 30upx;">
+					请选择您的身份
+				</view>
+				<view class="f-28 col-9 t-c" style="padding-top: 10upx;">
+					明确后将为您提供更准确的服务
+				</view>
+				<image :src="imgfixUrls +'homemakingImg/ruzhuclose.png'" @click="showEnter = false" class="enter-img" mode=""></image>
+				<view class="IndividualsIn" @click="navigateTo('pages/subPages2/homemaking/serviceIn/serviceIn?tim=1&type=')">
+					<image class="IndividualsInImg" :src="imgfixUrls + 'homemakingImg/grruzhu.png'"  mode=""></image>
+					<view class="f-32 f-w col-f flex-box" style="line-height: 110upx;margin-left: 40upx;">
+						选择个人入驻
+					</view>
+					<view  style="line-height: 110upx;">
+						<image  :src="imgfixUrls +'homemakingImg/jinruruzhu.png'" mode="" class="IndividualsInright"></image>
+					</view>
+					
+				</view>
+				<view class="IndividualsIn" style="margin-top: 20upx;background-color: #FDAD28;" @click="navigateTo('pages/mainPages/Settled/Settled')">
+					<image class="IndividualsInImg" :src="imgfixUrls + 'homemakingImg/qyruzhu.png'"  mode=""></image>
+					<view class="f-32 f-w col-f flex-box" style="line-height: 110upx;margin-left: 40upx;">
+						选择企业入驻
+					</view>
+					<view  style="line-height: 110upx;">
+						<image  :src="imgfixUrls +'homemakingImg/jinruruzhu.png'" mode="" class="IndividualsInright"></image>
+					</view>
+					
+				</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import PopupView from "@/components/template/PopManager.vue"
+	export default {
+		components:{
+			PopupView
+		},
+		data() {
+			return {
+				btngroup: {
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: [],
+					houseinfo:0
+				},
+				showEnter:false
+			}
+		},
+		onHide() {
+			console.log(this.btngroup);
+		},
+		mounted() {
+			this.houseinfo = uni.getStorageSync('platformInfor').houseinfo;
+		},
+		props: {
+			menuId: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			},
+			btngroupData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			}
+		},
+		methods: {
+			navigateTo(url) {
+				console.log(url);
+				// debugger
+				if(url.indexOf('pages/subPages2/homemaking/serviceIn/serviceIn') !=  -1 && url.indexOf('?tim') ==  -1 && this.houseinfo == 0){
+					this.showEnter = true;
+					return
+				}else if(url.indexOf('pages/subPages2/homemaking/serviceIn/serviceIn') !=  -1 && url.indexOf('?tim') ==  -1 && this.houseinfo == 2){
+					App.navigationTo({
+						url:'pages/mainPages/Settled/Settled'
+					});
+					return
+				}
+				if(url.indexOf('indet') != -1){					
+					//#ifdef H5					
+					// let loc = url.split('?')[1];					
+					// debugger					
+					App.navigationToH5(false,`${App.base}#/${url}`);					
+					window.location.reload();					
+					//#endif					
+					//#ifndef H5					
+					App.navigationTo({						
+						url:url	,
+					});					
+					//#endif
+					return				
+					}
+				// #ifdef H5
+				if(url.indexOf('appid') !=  -1){
+					uni.showModal({
+						showCancel:false,
+						title:'温馨提示',
+						content:'此链接无法在公众号端打开,请在小程序中打开'
+					});
+					return
+				}
+				// #endif
+				
+				App.navigationTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@import "../../../common/css/diyPages.css";
+	@import "../../../common/css/old_diyPages";
+</style>
diff --git a/components/raffle-wheel/raffle-wheel.vue b/components/raffle-wheel/raffle-wheel.vue
new file mode 100644
index 0000000..e4e3ec1
--- /dev/null
+++ b/components/raffle-wheel/raffle-wheel.vue
@@ -0,0 +1,456 @@
+<template>
+  <view class="raffle-wheel" :style="{ width: canvasWidth + 44 + 'px', height: canvasHeight + 44 + 'px','background-image': 'url(' + imageRoot + 'cjqq.png)'}">
+    <view class="raffle-wheel-wrap" :style="{width: canvasWidth + 'px', height: canvasHeight + 'px'}">
+      <!-- #ifdef MP-ALIPAY -->
+      <canvas :class="className" :id="canvasId" :width="canvasWidth" :height="canvasHeight" :style="{
+         width: canvasWidth + 'px',
+         height: canvasHeight + 'px'
+       }" />
+      <!-- #endif -->
+      <!-- #ifndef MP-ALIPAY -->
+      <canvas :class="className" :canvas-id="canvasId" :width="canvasWidth" :height="canvasHeight" :style="{
+         width: canvasWidth + 'px',
+         height: canvasHeight + 'px'
+       }" />
+      <!-- #endif -->
+      <image class="canvas-img" :src="canvasImg" :style="{
+         width: canvasWidth + 'px',
+         height: canvasHeight + 'px',
+         transform: `rotate(${canvasAngle + targetAngle}deg)`,
+         transitionDuration: `${transitionDuration}s`
+       }"
+        v-if="canvasImg"></image>
+      <view class="raffle-wheel__action" :style="{ 'background-image': 'url(' + imageRoot + 'djcj.png)' }" @click="openGame"></view>
+      <!-- 为了兼容 app 端 ctx.measureText 所需的标签 -->
+      <text class="raffle-wheel__measureText">{{ measureText }}</text>
+    </view>
+  </view>
+</template>
+
+<script>
+  export default {
+    name: 'RaffleWheel',
+    props: {
+      // canvas 宽度
+      canvasWidth: {
+        type: Number,
+        default: 240
+      },
+      // canvas 高度
+      canvasHeight: {
+        type: Number,
+        default: 240
+      },
+      // 奖品列表
+      prizeList: {
+        type: Array,
+        // 必须是偶数
+        validator: function(value) {
+          return value.length % 2 === 0
+        },
+        required: true
+      },
+      // 奖品区块对应背景颜色
+      colors: {
+        type: Array,
+        default: () => [
+          '#E6A53F',
+          '#E6DB74'
+        ],
+        // 必须是偶数且仅为 2 个颜色相互交替
+        validator: function(value) {
+          return value.length === 2
+        }
+      },
+      // 旋转动画时间 单位s
+      duration: {
+        type: Number,
+        default: 8
+      },
+      // 旋转的圈数
+      ringCount: {
+        type: Number,
+        default: 8
+      },
+      // 字体颜色
+      fontColor: {
+        type: String,
+        default: '#ff4444'
+      },
+      // 文字的大小
+      fontSize: {
+        type: String,
+        default: '10px'
+      },
+      // 奖品文字多行情况下的行高
+      lineHeight: {
+        type: Number,
+        default: 20
+      },
+      // 奖品名称所对应的 key 值
+      strKey: {
+        type: String,
+        required: true
+      },
+      // 奖品文字总长度限制
+      strMaxLength: {
+        type: Number,
+        default: 12
+      },
+      // 奖品文字多行情况下第一行文字长度
+      strLineLength: {
+        type: Number,
+        default: 6
+      },
+	  //开始抽奖
+	  num:{
+		  type:Number,
+		  default:null
+	  }
+    },
+	watch:{
+		num(){
+			this.handleAction();
+		}
+	},
+    data() {
+      return {
+        // 画板className
+        className: 'raffle-wheel__canvas',
+        // 画板标识
+        canvasId: 'raffleWheelCanvas',
+        // 画板导出的图片
+        canvasImg: '',
+        // 旋转到奖品目标需要的角度
+        targetAngle: 0,
+        // 旋转动画时间 单位 s
+        transitionDuration: 0,
+        // 是否正在旋转
+        isRotate: false,
+        // 当前停留在那个奖品的序号
+        stayIndex: 0,
+        // 解决 app 不支持 measureText 的问题
+        measureText: ''
+      }
+    },
+    computed: {
+      // 设备像素密度
+      pixelRatio() {
+        return uni.getSystemInfoSync().pixelRatio
+      },
+      // 根据奖品列表计算 canvas 旋转角度
+      // 让 启动按钮指针 在奖品分区中间 position = 45
+      // 让 启动按钮指针 在奖品分区边界 position = 90
+      canvasAngle() {
+        let prizeCount = this.prizeList.length
+        let position = 90
+        if (prizeCount % 4 !== 0) {
+          return 0
+        } else {
+          let num = prizeCount / 4
+          return num % 2 === 0 ? position / num : position
+        }
+      },
+      // 根据画板的宽度计算奖品文字与中心点的距离
+      textRadius() {
+        return Math.round(this.canvasWidth / 2.4)
+      }
+    },
+    methods: {
+		openGame(){
+			this.$emit('playdraw');
+		},
+      // 开始旋转
+      handleStartRotate(targetIndex) {
+        // 奖品总数
+        let prizeCount = this.prizeList.length
+        let baseAngle = 360 / prizeCount
+        let angles = 0
+        if (this.targetAngle === 0) {
+          console.log('第一次旋转')
+          // 因为第一个奖品是从0°开始的，即水平向右方向
+          // 第一次旋转角度 = 270度 - (停留的序号-目标序号) * 每个奖品区间角度 - 每个奖品区间角度的一半 - canvas自身旋转的度数
+          angles = (270 - (targetIndex - this.stayIndex) * baseAngle - baseAngle / 2) - this.canvasAngle
+        } else {
+          console.log('后续旋转')
+          // 后续继续旋转 就只需要计算停留的位置与目标位置的角度
+          angles = -(targetIndex - this.stayIndex) * baseAngle
+        }
+        // 更新目前序号
+        this.stayIndex = targetIndex
+        // 转 8 圈，圈数越多，转的越快
+        this.targetAngle += angles + 360 * this.ringCount
+
+        // 计算转盘结束对时间，预加一些延迟确保转盘停止后触发结束事件
+        let endTime = this.transitionDuration * 1000 + 100
+        setTimeout(() => {
+          this.isRotate = false
+          this.$emit('actionEnd')
+        }, endTime)
+      },
+      // 点击 开始抽奖 按钮
+      handleAction() {
+        if (this.isRotate) return
+        this.isRotate = true
+        this.$emit('actionStart')
+      },
+      // 渲染转盘
+      async drawWheelCanvas() {
+        // 获取 canvas 画布
+        const canvasId = this.canvasId
+        const ctx = uni.createCanvasContext(canvasId, this);
+		this.ctxr = uni.createCanvasContext(canvasId, this);
+
+        // canvas 的宽高
+        let canvasW = this.canvasWidth
+        let canvasH = this.canvasHeight
+        
+        // 根据奖品个数计算 角度
+        let prizeCount = this.prizeList.length
+        let baseAngle = Math.PI * 2 / prizeCount
+
+        // 设置描边颜色
+        ctx.setStrokeStyle('#00ff99')
+        
+        // 设置字体和字号
+        // #ifndef MP-WEIXIN
+        let fontFamily = '-apple-system, BlinkMacSystemFont, \'PingFang SC\', \'Helvetica Neue\', STHeiti, \'Microsoft Yahei\', Tahoma, Simsun, sans-serif'
+        ctx.font = `${this.fontSize} ${fontFamily}`
+        // #endif
+        // #ifndef H5
+        ctx.setFontSize(10)
+        // #endif
+
+        // 注意，开始画的位置是从0°角的位置开始画的。也就是水平向右的方向。
+        // 画具体内容
+        for (let i = 0; i < prizeCount; i++) {
+          // 当前角度
+          let angle = i * baseAngle
+
+          // 保存当前画布的状态
+          ctx.save()
+
+          // 开始画内容
+          ctx.beginPath()
+
+          // 开始画圆弧
+          // x => 圆弧对应的圆心横坐标 x
+          // y => 圆弧对应的圆心横坐标 y
+          // radius => 圆弧的半径大小
+          // startAngle => 圆弧开始的角度，单位是弧度
+          // endAngle => 圆弧结束的角度，单位是弧度
+          // anticlockwise(可选) => 绘制方向，true 为逆时针，false 为顺时针
+          let outsideRadius = canvasW / 2
+          let insideRadius = 20
+          ctx.arc(canvasW * 0.5, canvasH * 0.5, outsideRadius, angle, angle + baseAngle, false)
+          ctx.arc(canvasW * 0.5, canvasH * 0.5, insideRadius, angle + baseAngle, angle, true)
+
+          // 开始链接线条
+          ctx.stroke()
+          // 每个奖品区块背景填充颜色
+          ctx.setFillStyle(this.colors[i % 2])
+          // 填充颜色
+          ctx.fill()
+
+          // 开始绘制奖品内容
+          ctx.setFillStyle(this.fontColor)
+          let rewardName = this.strLimit(this.prizeList[i][this.strKey])
+
+          // translate方法重新映射画布上的 (0,0) 位置
+          let translateX = canvasW * 0.5 + Math.cos(angle + baseAngle / 2) * this.textRadius
+          let translateY = canvasH * 0.5 + Math.sin(angle + baseAngle / 2) * this.textRadius
+          ctx.translate(translateX, translateY)
+
+          // rotate方法旋转当前的绘图，因为文字是和当前扇形中心线垂直的
+          ctx.rotate(angle + (baseAngle / 2) + (Math.PI / 2))
+
+          // 设置文本位置并处理换行
+
+          // 是否需要换行
+          let isLineBreak = rewardName.length > this.strLineLength
+          if (isLineBreak) {
+            // 获得多行文本数组
+            rewardName = rewardName.substring(0, this.strLineLength) + ',' + rewardName.substring(this.strLineLength)
+            let rewardNames = rewardName.split(',')
+
+            // 循环文本数组，计算每一行的文本宽度
+            for (let j = 0; j < rewardNames.length; j++) {
+              if (ctx.measureText && ctx.measureText(rewardNames[j]).width) {
+                // 文本的宽度信息
+                let tempStrSize = ctx.measureText(rewardNames[j])
+                ctx.fillText(rewardNames[j], -tempStrSize.width / 2, j * this.lineHeight)
+              } else {
+                this.measureText = rewardNames[j]
+
+                // 等待页面重新渲染
+                await this.$nextTick()
+
+                let textWidth = await this.getTextWidth()
+
+                ctx.fillText(rewardNames[j], -textWidth / 2, j * this.lineHeight)
+                // console.log(rewardNames[j], textWidth, i)
+              }
+            }
+          } else {
+            if (ctx.measureText && ctx.measureText(rewardName).width) {
+              // 文本的宽度信息
+              let tempStrSize = ctx.measureText(rewardName)
+              ctx.fillText(rewardName, -tempStrSize.width / 2, 0)
+            } else {
+              this.measureText = rewardName
+
+              // 等待页面重新渲染
+              await this.$nextTick()
+
+              let textWidth = await this.getTextWidth()
+
+              ctx.fillText(rewardName, -textWidth / 2, 0)
+            }
+          }
+
+          ctx.restore();
+        }
+
+        // 保存绘图并导出图片
+        ctx.draw(true, () => {
+          let drawTimer = setTimeout(() => {
+            clearTimeout(drawTimer)
+            drawTimer = null
+            
+            // #ifdef MP-ALIPAY
+            ctx.toTempFilePath({
+              destWidth: this.canvasWidth * this.pixelRatio,
+              destHeight: this.canvasHeight * this.pixelRatio,
+              success: (res) => {
+                // console.log(res.filePath)
+                this.canvasImg = res.filePath
+                // 通知父级组件，抽奖转品生成图片完成
+                this.$emit('done')
+              }
+            })
+            // #endif
+            // #ifndef MP-ALIPAY
+            uni.canvasToTempFilePath({
+              destWidth: this.canvasWidth * this.pixelRatio,
+              destHeight: this.canvasHeight * this.pixelRatio,
+              canvasId: this.canvasId,
+              success: (res) => {
+                // 在 H5 平台下，tempFilePath 为 base64
+                // console.log(res.tempFilePath)
+                this.canvasImg = res.tempFilePath
+                // 通知父级组件，抽奖转品生成图片完成
+                this.$emit('done')
+              }
+            }, this)
+            // #endif
+          }, 20)
+        })
+      },
+      // 兼容 app 端不支持 ctx.measureText
+      // 已知问题：初始绘制时，低端安卓机 平均耗时 2s
+      getTextWidth() {
+        return new Promise((resolve, reject) => {
+          uni.createSelectorQuery().in(this).select('.raffle-wheel__measureText').fields({
+            size: true,
+          }, (res) => {
+            resolve(res.width)
+          }).exec()
+        })
+      },
+      // 处理文字溢出
+      strLimit(value) {
+        let maxLength = this.strMaxLength
+        if (!value || !maxLength) return value
+        return value.length > maxLength ? value.slice(0, maxLength - 1) + '...' : value
+      }
+    },
+    mounted() {
+      this.$nextTick(() => {
+        let stoTimer = setTimeout(() => {
+          clearTimeout(stoTimer)
+          stoTimer = null
+          
+          this.drawWheelCanvas()
+          this.transitionDuration = this.duration
+        }, 50)
+      })
+    }
+  }
+</script>
+
+<style lang="scss" scoped>
+  // $actionBgUrl: '~static/raffle-wheel/raffle-wheel__action';
+  // $raffleBgUrl: '~static/raffle-wheel/raffle-wheel__bg';
+
+  .raffle-wheel {
+    position: relative;
+    left: 0;
+    top: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .raffle-wheel {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    margin: 0 auto;
+    background-repeat: no-repeat;
+    background-position: center center;
+    background-size: contain;
+    // background-image: url($raffleBgUrl + ".png");
+
+    // @media (-webkit-min-device-pixel-ratio: 2), (min-device-pixel-ratio: 2) {
+    //   background-image: url($raffleBgUrl + "@2x.png");
+    // }
+
+    // @media (-webkit-min-device-pixel-ratio: 3),
+    // (min-device-pixel-ratio: 3) {
+    //   background-image: url($raffleBgUrl + "@3x.png");
+    // }
+  }
+
+  .raffle-wheel__canvas {
+    position: absolute;
+    left: -9999px;
+    opacity: 0;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+  }
+
+  .raffle-wheel__action {
+    position: absolute;
+    top: calc(50% - 58px);
+    left: calc(50% - 58px);
+    width: 114px;
+    height: 114px;
+    // background-repeat: no-repeat;
+    // background-position: center center;
+    // background-size: contain;
+    // background-image: url($actionBgUrl + ".png");
+
+    // @media (-webkit-min-device-pixel-ratio: 2), (min-device-pixel-ratio: 2) {
+    //   background-image: url($actionBgUrl + "@2x.png");
+    // }
+
+    // @media (-webkit-min-device-pixel-ratio: 3),
+    // (min-device-pixel-ratio: 3) {
+    //   background-image: url($actionBgUrl + "@3x.png");
+    // }
+  }
+
+  .raffle-wheel__measureText {
+    position: absolute;
+    left: 0;
+    top: 0;
+    white-space: nowrap;
+    font-size: 12px;
+    opacity: 0;
+  }
+
+  .canvas-img {
+    transition: transform cubic-bezier(.34, .12, .05, .95);
+  }
+</style>
diff --git a/components/rattenking-dtpicker/GetDate.js b/components/rattenking-dtpicker/GetDate.js
new file mode 100644
index 0000000..8933c77
--- /dev/null
+++ b/components/rattenking-dtpicker/GetDate.js
@@ -0,0 +1,167 @@
+const GetDate = {
+  withData: (num) => {
+		let param = parseInt(num);
+    return param < 10 ? '0' + param : '' + param;
+  },
+  getTimes(str){
+    return new Date(str.replace(/-/g,'/')).getTime();
+  },
+	getCurrentTimes(){
+		const date = new Date();
+		const year = date.getFullYear();
+		const month = date.getMonth() + 1;
+		const day = date.getDate();
+		const hour = date.getHours();
+		const minute = date.getMinutes();
+		const second = date.getSeconds();
+		return {
+			detail: {
+				year: year,
+				month: month,
+				day: day,
+				hour: hour,
+				minute: minute,
+				second: second
+			}
+		}
+	},
+  format(arr){
+    let curarr = [];
+    let curarr0 = [];
+    let str = '';
+    arr.forEach((cur,index) => {
+			let o = GetDate.withData(cur);
+      if(index > 2){
+        curarr.push(o);
+      }else{
+        curarr0.push(o);
+      }
+    })
+    if(arr.length < 4){
+      str = curarr0.join('-');
+    }else{
+      str = curarr0.join('-') + ' ' + curarr.join(':');
+    }
+    return str;
+  },
+	getCurrentStringValue(str){
+		let newstr = str.split(' ');
+		if(newstr && newstr[1]){
+			let arr = [...newstr[0].split('-'),...newstr[1].split(':')];
+			return arr;
+		}
+		return newstr[0].split('-');
+	},
+	getCompare(curp,startp,endp,timesp){
+		let cur = GetDate.getTimes(curp);
+		let start = GetDate.getTimes(startp);
+		let end = GetDate.getTimes(endp);
+		if(cur < start){
+			return GetDate.getTimeIndex(timesp,GetDate.getCurrentStringValue(startp));
+		}else if(cur > end){
+			return GetDate.getTimeIndex(timesp,GetDate.getCurrentStringValue(endp));
+		}else{
+			return GetDate.getTimeIndex(timesp,GetDate.getCurrentStringValue(curp));
+		}
+	},
+	getChooseArr(times,indexs){
+		let arr = [];
+		times.forEach((cur,index) => arr.push(cur[indexs[index]]));
+		return arr;
+	},
+	getNewArray(arr){
+		let newarr = [];
+		arr.forEach(cur => newarr.push(cur));
+		return newarr;
+	},
+  getLoopArray: (start, end) => {
+    var start = start || 0;
+    var end = end || 1;
+    var array = [];
+    for (var i = start; i <= end; i++) {
+      array.push(GetDate.withData(i));
+    }
+    return array;
+  },
+  getMonthDay: (year, month) => {
+    var flag = year % 400 == 0 || (year % 4 == 0 && year % 100 != 0), array = null;
+
+    switch (month) {
+      case '01':
+      case '03':
+      case '05':
+      case '07':
+      case '08':
+      case '10':
+      case '12':
+        array = GetDate.getLoopArray(1, 31)
+        break;
+      case '04':
+      case '06':
+      case '09':
+      case '11':
+        array = GetDate.getLoopArray(1, 30)
+        break;
+      case '02':
+        array = flag ? GetDate.getLoopArray(1, 29) : GetDate.getLoopArray(1, 28)
+        break;
+      default:
+        array = '月份格式不正确，请重新输入！'
+    }
+    return array;
+  },
+  getDateTimes: (opts) => {
+    var years = GetDate.getLoopArray(opts.start, opts.end);
+    var months = GetDate.getLoopArray(1, 12);
+    var days = GetDate.getMonthDay(opts.curyear, opts.curmonth);
+    var hours = GetDate.getLoopArray(0, 23);
+    var minutes = GetDate.getLoopArray(0, 59);
+    var seconds = GetDate.getLoopArray(0, 59);
+    var times = null;
+
+    switch (opts.fields) {
+      case 'year':
+        times = [years]
+        break;
+      case 'month':
+        times = [years, months]
+        break;
+      case 'day':
+        times = [years, months, days]
+        break;
+      case 'hour':
+        times = [years, months, days, hours]
+        break;
+      case 'minute':
+        times = [years, months, days, hours, minutes]
+        break;
+      case 'second':
+        times = [years, months, days, hours, minutes, seconds]
+        break;
+      default:
+        times = [years, months, days, hours, minutes, seconds]
+    }
+    return times;
+  },
+  getIndex(arr,target){
+    let len = arr.length;
+    for(let i = 0; i < len; i++){
+      if(arr[i] == target){
+        return i;
+      }
+    }
+  },
+  getTimeIndex(arrs, targets){
+    let len = arrs.length;
+    let arr = [];
+    for(let i = 0; i < len; i++){
+      arr.push(GetDate.getIndex(arrs[i], targets[i]))
+    }
+    return arr;
+  },
+  error(str){
+	  console.error(str);
+  }
+}
+
+module.exports = GetDate; 
\ No newline at end of file
diff --git a/components/rattenking-dtpicker/rattenking-dtpicker.vue b/components/rattenking-dtpicker/rattenking-dtpicker.vue
new file mode 100644
index 0000000..1e3edc9
--- /dev/null
+++ b/components/rattenking-dtpicker/rattenking-dtpicker.vue
@@ -0,0 +1,239 @@
+<template>
+	<picker class='rui-picker rui-class' mode="multiSelector" :range="times" :value="timesIndex" :disabled="curDisabled" @change='changeDate' @cancel="cancelDate" @columnchange="columnchangeDate">
+	  {{curValue || '请选择时间'}}
+	  <!-- #ifdef H5 -->
+	  <text v-if='iftime' class="iconfont icon-right col-9" style="font-size: 26upx;position: absolute;right: 20upx;" @click.capture=""></text>
+	  <!-- #endif -->
+	  <!-- #ifdef MP-WEIXIN -->
+	  <text v-if='iftime' class="iconfont icon-right col-9" style="font-size: 26upx;position: absolute;right: 80upx;" @click.capture=""></text>
+	  <!-- #endif -->
+	  
+	</picker>
+</template>
+
+<script>
+	import GetDate from './GetDate.js';
+	export default {
+		name: 'rattenking-dtpicker',
+		props: {
+			/**
+			 * picker允许选中的最小值
+			 */
+			start: {
+			  type: String,
+			  default: '1900-00-00 00:00:00'
+			},
+			/**
+			 * picker允许选中的最大值
+			 */
+			end: {
+			  type: String,
+			  default: '2500-12-30 23:59:59'
+			},
+			/**
+			 * picker默认展示的值
+			 */
+			value: {
+			  type: String,
+			  default: ''
+			},
+			/**
+			 * picker的时间粒度
+			 */
+			fields: {
+			  type: String,
+			  default: 'second'
+			},
+			name:{
+				type: String,
+				default:'请选择时间'
+			},
+			/**
+			 * picker是否禁止
+			 */
+			disabled: {
+			  type: Boolean,
+			  default: false
+			},
+			
+			iftime:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {
+				times:[['2019','2020'],['01','02']],
+				timesIndex: [1,1],
+				timesString: null,
+				curValue: this.value,
+				curDisabled: this.disabled,
+				cancel: null
+			}
+		},
+		watch: {
+			value(val) {
+				this.curValue = val;
+			},
+			disabled(val){
+				this.curDisabled = val;
+			},
+			curDisabled(val){
+				this.curDisabled = val;
+			},
+			curValue(val) {
+				this.curValue = val;
+				this.$emit('change', val);
+			},
+			times(val){
+				this.times = val;
+			},
+			timesIndex(val){
+				this.timesIndex = val;
+			},
+			cancel(val) {
+				this.$emit('cancel', val);
+			}
+		},
+		created() {
+			if(this.value === ''){
+				let time = GetDate.getCurrentTimes();
+				let arr = [];
+				for (let key in time.detail) {
+					arr.push(time.detail[key]);
+					if(key === this.fields){
+						break;
+					}
+				}
+				this.value = GetDate.format(arr);
+				this.curValue = GetDate.format(arr);
+			}
+			switch (this.fields){
+				case 'year':
+				  if (this.value.length !== 4) {GetDate.error('时间粒度和时间格式不一致');this.curDisabled = true;return false;}
+				  if (this.start.length !== 4) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 4) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				case 'month':
+				  if (this.value.length !== 7) { GetDate.error('时间粒度和时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.start.length !== 7) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 7) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				case 'day':
+				  if (this.value.length !== 10) { GetDate.error('时间粒度和时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.start.length !== 10) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 10) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				case 'hour':
+				  if (this.value.length !== 13) { GetDate.error('时间粒度和时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.start.length !== 13) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 13) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				case 'minute':
+				  if (this.value.length !== 16) { GetDate.error('时间粒度和时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.start.length !== 16) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 16) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				case 'second':
+				  if (this.value.length !== 19) { GetDate.error('时间粒度和时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.start.length !== 19) { GetDate.error('时间粒度和开始时间格式不一致'); this.curDisabled = true; return false;}
+				  if (this.end.length !== 19) { GetDate.error('时间粒度和结束时间格式不一致'); this.curDisabled = true; return false;}
+				  break;
+				default: 
+				  GetDate.error('时间粒度不存在')
+				  break;
+			  }
+			  let values = this.value.split(' ');
+			  let targets = GetDate.getCurrentStringValue(this.value);
+
+			  if (GetDate.getTimes(this.value) < GetDate.getTimes(this.start)){
+				GetDate.error('默认时间不能小于开始时间')
+				this.curDisabled = true
+				return false;
+			  }
+			  if (GetDate.getTimes(this.value) > GetDate.getTimes(this.end)) {
+				GetDate.error('默认时间不能大于开始时间')
+				this.curDisabled = true
+				return false;
+			  }
+			  let times = GetDate.getDateTimes({
+					start: this.start.substring(0, 4),
+					end: this.end.substring(0, 4),
+					curyear: this.value.substring(0, 4),
+					curmonth: this.value.substring(5, 7),
+					fields: this.fields
+			  })
+			  let timesIndex = GetDate.getTimeIndex(times, targets);
+			  let timesString = [];
+			  timesIndex.forEach(o => timesString.push(o));
+
+			  this.times = times;
+			  this.timesIndex = timesIndex;
+			  this.timesString = timesString;
+		},
+		methods: {
+			changeDate(e){
+			  let values = e.detail.value;
+			  let times = this.times;
+			  let curarr = [];
+			  for (let i = 0, len = values.length; i < len; i++) {
+				curarr.push(times[i][values[i]])
+			  }
+			  let str = GetDate.format(curarr);
+			  // debugger
+			  this.curValue = str;
+			},
+			columnchangeDate(e){
+				// 如果是年和月粒度，那么只需要改变时间格式的index，否则需要判断当月天数
+			  if ((this.fields === 'year' || this.fields === 'month')){
+					let timesIndex = GetDate.getNewArray(this.timesIndex);
+					timesIndex[e.detail.column] = e.detail.value;
+// 					let arr = GetDate.getCompare(GetDate.format(GetDate.getChooseArr(this.times,timesIndex)),this.start,this.end,this.times);
+// 					console.log(arr)
+					this.timesIndex = timesIndex;
+					return false;
+			  }else{
+					// 如果改变的是年和月，重新获取天数，同时判断天数的index是否大于当前天数，大于就设置为当月最后一天，否则不变。
+					if(e.detail.column === 0 || e.detail.column === 1){
+						let times = GetDate.getNewArray(this.times);
+						let timesIndex = GetDate.getNewArray(this.timesIndex);
+						timesIndex[e.detail.column] = e.detail.value;
+						let days = GetDate.getMonthDay(times[0][timesIndex[0]], times[1][timesIndex[1]]);
+						times[2] = days;
+						if(timesIndex[2] > days.length - 1){
+							timesIndex[2] = days.length - 1;
+						}
+						this.times = times;
+						// let arr = GetDate.getCompare(GetDate.format(GetDate.getChooseArr(this.times,timesIndex)),this.start,this.end,this.times);
+						this.timesIndex = timesIndex;
+					}else{
+						let timesIndex = GetDate.getNewArray(this.timesIndex);
+						timesIndex[e.detail.column] = e.detail.value;
+// 						let arr = GetDate.getCompare(GetDate.format(GetDate.getChooseArr(this.times,timesIndex)),this.start,this.end,this.times);
+// 						console.log(arr)
+						this.timesIndex = timesIndex;
+					}
+				}
+			},
+			cancelDate(e){
+				this.cancel = e
+			}
+		}
+	}
+</script>
+
+<style>
+	.rui-picker{
+	  /* height: 50upx; */
+	  font-size: 26upx;
+	  /* left: 50upx; */
+	  color: #000;
+	  display: -webkit-flex;
+	  display: flex;
+	  align-items: center;
+	  /* padding: 0 10px; */
+	  box-sizing: border-box;
+	  /* border: 1px solid #aaa; */
+	  border-radius: 3px;
+	}
+</style>
diff --git a/components/template/Abnor.vue b/components/template/Abnor.vue
new file mode 100644
index 0000000..565fba1
--- /dev/null
+++ b/components/template/Abnor.vue
@@ -0,0 +1,137 @@
+<!-- Abnor页面异常处理 buy 缪启峙
+	 引入 Abnor  如:<vAbnor :abnor="'CART'"/>
+	 异常状态名称 默认为:'DATA' : 如'REQUEST_ERROR','NOT_FOUND','DATA'
+-->
+<template>
+	<view>
+		<view class="abnor">
+			<view class="abnor-box">
+				<image class="abnor-image" :src="abnorImg" mode="widthFix"></image>
+				<view class="abnor-text">{{abnorTitle}}</view>
+				<!-- <view class="abnor-tip" v-if="!!abnortip">{{abnortip}}</view> -->
+				<!-- <view class="abnor-btn" v-if="!!abnorbutton">{{abnorbutton}}</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			abnor: {
+				type: String,
+				default: "DATA"
+			},
+			title: {
+				type: String,
+				default: ""
+			}
+		},
+		computed: {
+			abnorName() {
+				return {
+					'DATA': {
+						image: '12.png',
+						title: '没有相关记录哦'
+					},
+					'GOODS': {
+						image: '11.png',
+						title: '没有相关商品哦'
+					},
+					'ORDER': {
+						image: '10.png',
+						title: '您还没有订单信息哦'
+					},
+					'ADDRESS': {
+						image: '13.png',
+						title: '您还没有收货地址哦'
+					},
+					'COUNPONS': {
+						image: '14.png',
+						title: `暂无${this.appCoupon.coupon_title}哦`
+					}
+				}
+			},
+			abnorImg() {
+				return App.img_root + this.abnorName[this.abnor].image;
+			},
+			abnorTitle() {
+				return this.title ? this.title : this.abnorName[this.abnor].title;
+			}, //
+			// 			abnortip() {
+			// 				return this.abnorName[`${this.abnor}`].tip;
+			// 			},
+			// 			abnorbutton() {
+			// 				return this.abnorName[`${this.abnor}`].button;
+			// 			}
+		}
+	}
+</script>
+
+<style scoped>
+	.abnor {
+		position: relative;
+		display: block;
+		width: 100%;
+		height: 0;
+		padding-bottom: 100%;
+		overflow: hidden
+	}
+
+	.abnor-box {
+		position: absolute;
+		display: flex;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center
+	}
+
+	.abnor-btn {
+		min-width: 228upx;
+		height: 66upx;
+		margin-top: 30upx;
+		padding: 0 30upx;
+		background-color: #ff5777;
+		border: 0 none;
+		border-radius: 2upx;
+		color: #fff;
+		font-size: 28upx;
+		text-align: center;
+		overflow: hidden;
+		line-height: 66upx
+	}
+
+	.abnor-btn:active {
+		background-color: #f5456e
+	}
+
+	.abnor-image {
+		width: 400upx;
+		height: 400upx;
+		display: block;
+		background: transparent no-repeat;
+		background-size: cover
+	}
+
+	.abnor-text {
+		margin-top: 30upx;
+		color: #333;
+		font-size: 28upx
+	}
+
+	.abnor-tip {
+		margin-top: 20upx;
+		color: #666;
+		font-size: 28upx
+	}
+</style>
diff --git a/components/template/GoTopBtn.vue b/components/template/GoTopBtn.vue
new file mode 100644
index 0000000..5a4ea18
--- /dev/null
+++ b/components/template/GoTopBtn.vue
@@ -0,0 +1,114 @@
+<!-- 返回页面顶部 buy 缪启峙 
+	引入 返回顶部组件如:
+	<vGoTop :pageScroll ="PageScroll" goTopStyle="bottom:20px;right:20px;" :showTopHeight ="可不填默认为 300"/>
+	pageScroll  // 页面滑动的高度,
+	goTopStyle  // 返回按钮与底部,左右的距离,
+	showTopHeight //  滑动高度>按钮出现高度时出现返回按钮  ！
+-->
+
+<template>
+	<view>
+		<view class="go-top" :class="{'top-show':isShowTop}" @click="goTop" :style="goTopStyle">
+			<view class="iconfont icon-top"></view>
+			<!-- <image src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHgAAAB4CAMAAAAOusbgAAAA6lBMVEX///8AAAD5+fk1NTXW1tbR0dHx8fH8/Pz19fXm5ubQ0NDs7Ozd3d04ODjS0tLf39/j4+PT09Pp6enS0tLPz8/Z2dnZ2dnR0dHh4eHQ0NDU1NSfn5+urq64uLjQ0NDR0dHR0dHBwcHR0dHR0dHR0dHQ0NCjo6OysrK7u7vQ0NDR0dHQ0NDR0dHQ0NDQ0NDS0tLR0dHR0dHR0dHT09PR0dHQ0NDQ0NCnp6fR0dHGxsb09PTT09PQ0NDR0dHQ0NDQ0NA5OTk5OTlDQ0PQ0NDR0dHQ0NDQ0NDQ0NDQ0NDR0dFZWVmrq6vR0dEzMzPX3q4CAAAATHRSTlO/AMb+9vLPw8rcUQLr/WXp4fzYHBAG8a/jP/jZ1dJc9eXPpTie+dfT0c3LxsSqhWxILiEXvZvj1s/OzDri09K8/fz57r50c2LhPfDVto54cwAABKBJREFUaN7k1llTGkEUhuHjyMwAQ9gREEUFV0R2EdC4lmu+/P+/kz6ITiWi3QcGvMh7kYtUqp5095luaEVatvjYqPQG/TsbsO/6g16l8VjMrkgTwbnzh/wFpnaRfzjP8b8JHu7GT2x8mZ2Pd4OGs/ErvLWWSKadsOW6RK5rhZ10MrGGt3rxbIBwdXcL49Zj6TBNLZyOrWPc1m41GNiLHk9WGvHR6XhksvLjqKeHtewluFDEIoOsSAjcpaLngotH4BIOGeckwB0V54AzFahSBYtEWYUUVJXMjLDXtKHyWQkNld30ZoE7dahiPiujY1DVO3K4zMsNOTRzTogXXRbCuVOoki7NkZuE6jQngTM1zXIFi65lzOH2Nn9CLs2dyye93TaFW3y8EQqkCB90ywyO7gEphwLKSQF7URO4zI/BiAJrxI9HWQ9HeawsCjCLRyyqg1t7Alcg77W+htu2wBXJdvsrONNX56vcwGV1zv3M53CupuY5TAsorGa7lvsU5nvSoYXk8O35GVyW3Rvym6Q8He6owUrQwkqoAetMg726GmiXFparRrvuTYGb8gOWH3PzI5yxgSRJKt3elkhSErAzH+AT6UaXfqtK0s0++Rd+5o2WuixLN/v5b9g7Ek70/qpSuX3hZB95E9h/kyyp++OH+mNVIluv75QPe5dAgcw7G7s7O2P5jMwrAD89H+YFpwQL/vXqEollK8VL9uG6aMEbY/eQVIdjeUP0SdV9uMonLHOv2WX5WibzKVff4V0gJlzvJk3aFK45Buy+wdktwTd8sMqQct/l8V8cCL7lrewEjgMhsTuzHALiE7ineYY1iP+fMX2Ye69wl0dL7splf7y6DPNOr5E+f5A0A6drjfea4bx+pzWfjv+JGe51nuGcDYRJl39ZaC4VfWHAzim4CqyTNv961FyjZnN9ruB7ICZwdQ+H2R1yr2B1xGkDV/8E7pvKaXXICn4yOeLhzeTR18o3Q5NDflqhLADS9sJuyejn0AvpchWZpSJ/xSYrZlcr84qNpqtIj2Y/toa3JbOfvEOz6YpTA0jSkisADarwUC83HusKXfFbvOQc4IoGwIiW3AgY0Da/iUvOArbJBlxaci5gfx8MgJYdo98G/4dn/Kd7s1lBEIiiMEGLyBiC3LhSpJ0o1Drd6Ps/U+rmw012ZToz9r1Cqff8hXqcgr1Agr0yg30ktJ9FRHLDIaAAD8Zx+ihAxGQce0LmY+/w4rwVwHnLQS+Agx4JIwEJg2iTgGhDpkpApiLMFSDMsSI0YEVgvkjAfMFukoDdhMGmAYMNS1ECliImqgZMVGxjAQvbeKJSXQPTDVCtRQN27NFA0k7ZgADCkJX4x4Y9/iHwsmMOvIwRn688NVsNNe3YQ01iXCv2GDee4FoS1VdJgHLCZSonxFXH+HkB5R5f5UZQMtLXqvJHnEWyQNU5yoInj/+ruSwYcz0yUCGUCuzFXwU2/tKv35rzPordnqrs1XNP5f2RW71trnCd5wr1bX8DjZHk3G6ZpLTnZK8jnOXs6PhpdnT0NzuC1A3fDa0Gl/7HtCzkmI75oGvKoSv6fPw9+6IbysZtmA++AWRCZN3Qi4IuAAAAAElFTkSuQmCC"></image> -->
+			<!-- <text>顶部</text> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	var scorllTimert = null;
+	export default {
+		data() {
+			return {
+				isShowTop: false
+			};
+		},
+		methods: {
+			goTop(e) {
+				if (this.topType === "page") {
+					uni.pageScrollTo({
+						scrollTop: 0,
+						duration: 300
+					});
+				} else if (this.topType === "view") {
+					this.$emit("clickBtn");
+				}
+			},
+			//防止滚动触发多次函数
+			debounce(wait, immediate) {
+				var that = this;
+				return function() {
+					// 每次触发 scroll 时先清除定时器
+					clearTimeout(scorllTimert);
+					scorllTimert = setTimeout(function() {
+						that.handler(immediate);
+					}, wait);
+				}();
+			},
+			handler(scrollHeight) {
+				this.isShowTop = scrollHeight > this.showTopHeight;
+			},
+		},
+		watch: {
+			pageScroll(value) {
+				this.debounce(200, value)
+			}
+		},
+		props: {
+			pageScroll: Number,
+			showTopHeight: {
+				type: Number,
+				default: 300
+			},
+			topType: {
+				type: String,
+				default: "page"
+			},
+			goTopStyle: String
+		}
+	}
+</script>
+
+<style>
+	.go-top {
+		position: fixed;
+		bottom: 156upx;
+		right: 24upx;
+		width: 76upx;
+		height: 76upx;
+		border-radius: 50%;
+		overflow: hidden;
+		text-align: center;
+		z-index: 16;
+		transform: translateY(80upx);
+		opacity: 0;
+		transition: all .5s ease;
+		background: rgba(255, 255, 255, 0.7);
+		border: 1upx solid #eee;
+	}
+
+	.go-top.top-show {
+		transform: translateY(0);
+		opacity: 1;
+	}
+
+	.go-top .iconfont {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 76upx;
+		height: 76upx;
+		line-height: 76upx;
+		z-index: 1;
+	}
+
+	/* .go-top text {
+		display: inline-block;
+		color: #333;
+		font-size: 22upx;
+		margin-top: 38upx;
+		position: relative;
+		z-index: 10;
+	} */
+</style>
diff --git a/components/template/GoodsBuyMenu.vue b/components/template/GoodsBuyMenu.vue
new file mode 100644
index 0000000..e2a255d
--- /dev/null
+++ b/components/template/GoodsBuyMenu.vue
@@ -0,0 +1,776 @@
+<!-- 
+	商品购买菜单
+	submit 确认选择
+ -->
+<template>
+	<view>
+		<!-- 购买菜单 -->
+		<popup-view :show="showBuyMenu" type="bottom" @clickmask="onToggleTrade">
+			<view class="goods-buy-menu" :style="{'height':buyMeunHeight}">
+				<!-- 关闭按钮 -->
+				<view class="iconfont icon-roundclose" @click="onToggleTrade"></view>
+				<!-- 主体信息-->
+				<view class="trade-main">
+					<!-- 购买信息 -->
+					<view class="buy-info dis-flex flex-y-center">
+						<view class="buy-images">
+							<image :src="image_path"></image>
+						</view>
+						<view class="buy-content">
+							<view class="buy-money price-font-family dis-flex flex-y-line">
+								<text class="money-label">¥</text>{{(groupBuyType == '1') ? share_price :goods_price}}
+								<view class="dis-flex flex-y-center member-coupon-view" v-if="goodsDetail.vipstatus==='1' && sku_coupon_price != 0">
+									<view class="member-price-label f-22" v-if="goodsDetail.levelarmy == 1">拥军价格</view>
+									<view class="member-price-label f-22" v-else>{{goodsDetail.levelname}}</view>
+									<view class="f-22 col-f onelist-hidden b-0 coupon-price-2">立减<text class="member-coupon-price">{{sku_coupon_price}}</text>元</view>
+								</view>
+							</view>
+							<view class="buy-stock">库存{{stock_num}}件</view>
+							<view class="buy-spec" v-if="!!specData && specData.length>0">选择 {{selectSpec}}</view>
+						</view>
+					</view>
+					<!-- 商品规格 -->
+					<scroll-view scroll-y class="buy-spec-list" :style="{'height':'calc('+buyMeunHeight+' - 370rpx)'}">
+						<block v-if="!!specData && specData.length>0">
+							<block v-for="(attr,attr_idx) in specData" :key="attr_idx">
+								<view class="buy-spec-item">
+									<view class="spec-item-title">{{attr.title}}</view>
+									<view class="spec-items dis-flex flex-dir-row" v-if="attr.item.length>0">
+										<block v-for="(signItem,item_idx) in attr.item" :key="item_idx">
+											<view class="spec-item" :class="{'active':signItem.checked,'disabled':signItem.disabled}" @click="modelTap"
+											 :data-attr-idx="attr_idx" :data-item-idx="item_idx" :data-item-check="signItem.checked" :data-item-disabled="signItem.disabled">{{signItem.title}}</view>
+										</block>
+									</view>
+								</view>
+							</block>
+						</block>
+						<view class="buy-number dis-flex flex-y-center flex-x-between" style="padding-bottom: 50upx;">
+							<view class="buyNumber f-28">
+								<text>购买数量</text>
+							</view>
+							<view class="selectNumber dis-flex flex-y-center">
+								<button @click="down" class="default" :class="[goods_num>1?'':' default-active']" type="default">-</button>
+								<input type="number" v-if="showBuyMenu" v-model="goods_num" ></input>
+								<button @click="up" class="default" :class="{'default-active':goods_num>=stock_num || (buy_limit > 0 && goods_num>=user_limit_num)}"
+								 :disabled="Number(goods_num) > Number(stock_num)" type="default">+</button>
+							</view>
+						</view>
+					</scroll-view>
+					<!-- 按钮 -->
+					<view class="buy-button-box dis-flex flex-y-center">
+						<block v-if="isSelectSpec">
+							<block v-if="goodsDetail['type']==='3' && groupBuyType === '2'">
+								<button class="buy-button join-btn" :class="{'notAva-btn':stock_num == 0}" :disabled="stock_num == 0 || isMaxBuyLimit"
+								 @click="btnClick('confirm')">{{stock_num == 0?"暂无库存":"去参团"}}</button>
+							</block>
+							<block v-else>
+								<button class="buy-button" :class="{'notAva-btn':stock_num == 0}" :disabled="stock_num == 0" @click="btnClick('confirm')">{{stock_num == 0?"暂无库存":"确定"}}</button>
+							</block>
+						</block>
+						<block v-else>
+							<button class="buy-button" disabled>请选择商品规格</button>
+						</block>
+					</view>
+				</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import PopupView from "@/components/template/PopManager.vue"
+	export default {
+		data() {
+			return {
+				showBuyMenu: false,
+				goods_price: 0, //商品价格
+				goods_num: 1, //商品数量
+				stock_num: 0, //库存数量
+				buy_limit: 0, //用户限购数量
+				user_limit_num: 0, //用户可购数量
+				goods_sku_id: "", //选择规格id
+				goods_spec_arr: [], //子规格项id
+				sku_coupon_price: 0 , //规格会员优惠
+				share_price:0,//拼团价格
+				specData: [], //规格项列表
+				image_path: null, //规格图片
+				skuItem: null, //已选规格
+				activityData: null, //活动参数
+				lp_now_stk: 0 ,// 阶梯数量
+				TextSubstitution:{}
+			};
+		},
+		props: {
+			goodsSpec: { //商品规格项
+				type: Array,
+				default: () => null
+			},
+			goodsDetail: { //商品详情
+				type: Object,
+				default: () => null
+			},
+			specDisabled: {
+				type: Boolean,
+				default: false
+			},
+			groupBuyType: { //商品活动数据
+				type: String,
+				default: ""
+			},
+		},
+		watch: {
+			goodsSpec(newValue) {
+				if (!!newValue && newValue.length > 0) {
+					this.specData.splice(0, newValue.length, ...newValue);
+				}
+			},
+			goodsDetail(val,oldVal) {
+					if (!!val) {
+						this.initBuyMeunData(val);
+						console.log('监听')
+					}
+				// deep: true, //对象内部的属性监听，也叫深度监听
+			},
+			groupBuyType(newValue) {
+				if (!!newValue) {
+					this.updateSpecGoods();
+				}
+			},
+			// goods_num(newNumber){
+			// 	if(Number(newNumber)> Number(this.stock_num)){
+			// 		this.goods_num = this.stock_num;
+			// 		uni.showToast({
+			// 			title:'选择数量不能超出库存',
+			// 			icon:'none'
+			// 		})
+			// 	}else if(Number(newNumber) == 0){
+			// 		this.goods_num = 1;
+			// 		uni.showToast({
+			// 			title:'选择数量不能为0',
+			// 			icon:'none'
+			// 		})
+			// 	}
+			// }
+		},
+		components: {
+			PopupView
+		},
+		computed: {
+			selectSpec() {
+				let specData = this.specData,
+					specTextArray = [];
+				if (!!specData && specData.length > 0) {
+					specData.map(val => {
+						val.item.map(item => {
+							if (item.checked) {
+								specTextArray.push(item.title);
+							}
+						})
+					});
+				}
+				return specTextArray.join(" · ");
+			},
+			isSelectSpec() {
+				if (this.goodsDetail) {
+					return Number(this.goodsDetail.optionstatus > 0) ? this.goods_spec_arr.filter(val => !!val).length === this.specData
+						.length :
+						true;
+				}
+			},
+			buyMeunHeight() {
+				if (this.goodsDetail && !!this.specData['list']) {
+					return Number(this.goodsDetail.optionstatus) > 0 ? (!!this.specData && this.specData['list']['length'] > 1 ?
+						'67vh' : '50vh') : '40vh'
+				}
+			},
+			hasGroups() {
+				return this.goodsActivity && this.goodsActivity.group_id;
+			},
+			groupsType() {
+				return this.goodsDetail.type === '3' && this.groupBuyType === '2';
+			},
+			isShowJoinGroups() {
+				return this.activityData && this.activityData.is_show_groups === 1 && this.activityData.groupsNumber > 0;
+			},
+			isMaxBuyLimit() {
+				if (this.activityData) {
+					let {
+						limit_buy, //用户限购数量
+						surplus_quantity //用户可购数量
+					} = this,
+					buyNumber = this.activityData.buyNumber;
+				
+					if (typeof buyNumber === 'string') {
+						if (limit_buy === 10 && ((this.goods_num + Number(buyNumber)) >= surplus_quantity)) {
+							return !0;
+						}
+						return !1;
+					}
+				}
+			},
+		},
+		
+		mounted() {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			if(!!this.goodsDetail.spec){
+				if(this.goodsDetail.spec.info[0]){
+					console.log(this.goodsDetail);
+					if(!this.goodsDetail.spec.info[0].thumb){
+						this.image_path = this.goodsDetail.logo;
+					}else{
+						this.image_path = this.goodsDetail.spec.info[0].thumb;
+					}
+					console.log(this.goodsDetail.spec.info[0].thumb,111111111111);
+				}
+			}
+		},
+		methods: {
+			/**
+			 * 初始化商品详情数据
+			 */
+			initBuyMeunData(detail,num) {
+				let _this = this,
+					data = {};	
+				// 规格id///
+				data.goods_sku_id = !!detail['spec'] ? detail['spec']['info'][0]['id'] : "";
+				//商品价格
+				// console.log(detail,'coushabicaons')
+				data.goods_price =_this.goods_price == 0? !!detail['spec'] ? (!_this.groupsType && detail.is_vip > 0 && detail.vipstatus === "1" ? detail['spec']['info'][0]['price'] : detail['spec']['info'][0]['price']) : detail['price'] : _this.goods_price;
+				// data.goods_price = !data.goods_price?detail['aloneprice']:0;
+				//会员优惠
+				data.sku_coupon_price = !!detail['spec'] ? detail['spec']['info'][0]['discount_price'] : detail['discount_price'];
+				//拼团
+				// debugger
+				data.share_price = !!detail['spec'] ? detail['spec']['info'][0].aloneprice : (detail['aloneprice']);
+				// debugger
+				// debugger
+				//库存
+				data.stock_num = detail.stk || detail.user_limit_num;
+				console.log(data.goods_price)
+				//是否限购
+				data.buy_limit = Number(detail.buy_limit);
+				//剩余可购买数量
+				data.user_limit_num = detail.user_limit_num;
+				// debugger
+				// 单规格商品封面图
+				data.image_path = detail.type === '5' ? detail.logo : detail.thumbs[0];
+				//阶梯价数量
+				data.lp_now_stk = detail['lp_now_stk'];
+				// 多规格商品封面图
+				if (Number(detail.optionstatus) > 0 && detail['spec']['list'][0]['item']['thumb']) {
+					data.image_path = detail['spec']['list'][0]['item']['thumb'];
+				}
+				// 初始化商品多规格
+				if (Number(detail.optionstatus) > 0) {
+					// 默认选中规格第一项
+					let specData = _this.initManySpecData(this.specData,num);
+					//查询默认规格的库存
+					let checkedSpec = specData.map(specDataItem => {
+						let checked = "";
+						specDataItem.item.map(val => {
+							if (val.checked) {
+								checked = val.id;
+							}
+						});
+						return checked;
+					});
+					if (checkedSpec.length > 0) {
+						let spec_num = detail.spec.info.filter(val => val.specs === checkedSpec.join("_"));
+						data.stock_num = spec_num.length > 0 ? spec_num[0].stock : detail.stk;
+					}
+					data.specData = specData;
+				}
+				this.setData(data);
+				if(!this.goodsDetail.spec) {
+					this.image_path = this.goodsDetail.logo;
+					return
+				}
+				if(this.goodsDetail.spec.info[0].thumb){
+					this.image_path = this.goodsDetail.spec.info[0].thumb;
+				}else{
+					this.image_path = this.goodsDetail.logo;
+				}
+				
+				
+			},
+			/**
+			 * 商品规格默认不选中
+			 */
+			initManySpecData(data,num) {
+				if(num !== 1){
+					console.log(this.goods_spec_arr);
+					return data
+					}
+				console.log(data,'guige1规格测试试试',num);
+				for (let i in data) {
+					for (let j=0;j<data[i].item.length;j++) {
+						// for(let k;k<)
+						console.log(data[i].item[j])
+						if(data[i].item[j].checked){
+							// this.showBuyMenu = false;
+							// this.showBuyMenu = true;
+							console.log(data[i].item[j],11111);
+							
+							return data
+						}else{
+							if (j < 1) {
+								// if(data[i].item[0].checked) return;
+								data[i].item[0].checked = true;
+								this.goods_spec_arr.splice(i, 1, data[i].item[0].id);
+							}
+						}
+						
+					}
+				}
+				return data;
+			},
+			/**
+			 * 点击切换不同规格
+			 */
+			modelTap(e) {
+				let _this = this,
+					attrIdx = Number(e.currentTarget.dataset.attrIdx),
+					itemIdx = Number(e.currentTarget.dataset.itemIdx),
+					disabled = e.currentTarget.dataset.itemDisabled,
+					checked = e.currentTarget.dataset.itemCheck,
+					specItemList = null;
+				//活动商品判断不参与规格
+				if (_this.specDisabled && disabled) return;
+				specItemList = _this.specData[attrIdx].item.map((val, index) => {
+					//活动商品规格，可以取消选择 和 判断是否不参与活动
+					if (_this.specDisabled) {
+						if (!disabled) {
+							if (!checked) {
+								val.checked = itemIdx === index;
+							} else {
+								// val.checked = false;
+								_this.$set(val,'checked',false)
+							}
+							if (itemIdx === index) {
+								_this.goods_spec_arr.splice(attrIdx, 1, val.signid);
+							}
+						}
+					} else {
+						// val.checked = ;
+						_this.$set(val,'checked',(itemIdx === index))
+					}
+					if (val.checked) {
+						let thumb = val.thumb;
+						if(thumb){
+							_this.setData({
+								image_path: thumb
+							});
+						}
+					}
+					if (itemIdx === index) {
+						_this.goods_spec_arr.splice(attrIdx, 1, val.checked ? val.id : null);
+						if (_this.specDisabled) {
+							_this.filterDisabledSpec(val, attrIdx);
+						}
+					}
+					return val;
+				});
+				_this.$set(_this.specData[attrIdx], "item", specItemList);
+				// 更新商品规格信息
+				_this.updateSpecGoods();
+			},
+			/**
+			 * 拼团过滤不参与活动规格
+			 * @param {Object} 当前子规格项
+			 * @param {Number} 当前规格项index
+			 */
+			filterDisabledSpec(currentSign, attrIdx) {
+				let _this = this,
+					skuData = _this.goodsDetail.sku,
+					specData = _this.specData,
+					specLength = specData.length, //规格数量
+					disabledSignid = []; //包含该规格切不参与活动的规格
+				if (Array.isArray(specData) && Array.isArray(skuData)) {
+					//查找包含该子规格的所有规格是否参与拼团
+					skuData.map((skuItem) => {
+						const {
+							is_use,
+							title,
+							spec_sku_id = ''
+						} = skuItem;
+						if (specLength === 1 && !is_use) {
+							disabledSignid.push(spec_sku_id);
+						} else if (!is_use && spec_sku_id.includes(currentSign.signid)) {
+							disabledSignid.push(spec_sku_id);
+						}
+					});
+					//判断该项是否存在可选规格项
+					if (specLength === 1) {
+						return
+					} else {
+						specData.map((val, index) => {
+							let spec_item_list = val.spec_item_list;
+							//判断其他规格中，不参与拼团的规格项
+							if (index !== attrIdx) {
+								spec_item_list.map(item => {
+									let goodsSpec = _this.goods_spec_arr.map(val => val); //已选子规格
+									goodsSpec[index] = item.signid;
+									goodsSpec = goodsSpec.filter(val => !!val).join("_"); //可选规格
+									item.disabled = disabledSignid.includes(goodsSpec);
+								});
+							}
+						})
+					}
+				}
+			},
+			/**
+			 * 更新商品规格信息
+			 */
+			updateSpecGoods(numis) {
+				let spec_sku_id = this.goods_spec_arr.join('_'),
+					// 查找skuItem
+					spec_list = !!this.goodsDetail.spec ? this.goodsDetail.spec.info : [],
+					{
+						is_vip,
+						discount_price,
+						vipstatus,
+						type
+					} = this.goodsDetail,
+					skuItem = null;
+				skuItem = spec_list.find((val) => {
+					return val.specs == spec_sku_id;
+				});
+				// 记录goods_sku_id
+				// console.log(group_id, skuItem);
+				// 更新商品价格、划线价、库存
+				if (typeof skuItem === 'object') {
+					console.log(skuItem,'是是是',spec_list)
+					this.skuItem = skuItem;
+					this.setData({
+						goods_sku_id: skuItem.id,
+						goods_price: (this.groupBuyType === '1' || (is_vip > 0 && vipstatus === '1')) ? skuItem.price : skuItem.price,
+						// line_price: skuItem.line_price,
+						stock_num: skuItem.stock,
+						// image_path: skuItem.image ? skuItem.image.file_path : this.goodsDetail.thumbs[0],
+						goods_num: numis==1?this.goods_num:1,
+						sku_coupon_price: skuItem.discount_price,
+						share_price:skuItem.aloneprice,
+						image_path:skuItem.thumb || this.goodsDetail.logo
+					});
+				} else if (skuItem === undefined || skuItem === "") {
+					let useSkuItem = this.skuItem ? this.skuItem : spec_list[0];
+					console.log('是是是',spec_list,this.goodsDetail)
+					if (type === '3') {
+						this.goods_price = this.groupBuyType === "2" ? this.goodsDetail['price'] : this.goodsDetail['aloneprice'];
+						this.stock_num = this.stock_num;
+					} else {
+						this.goods_price = spec_list[0].price;
+						this.stock_num = spec_list[0].stock;
+					}
+				}
+			},
+
+			/**
+			 * 增加商品数量
+			 */
+			up() {
+				let {
+					stock_num,
+					buy_limit, //用户限购数量
+					user_limit_num //用户可购数量
+				} = this;
+				this.goods_num = Number(this.goods_num);
+				// debugger
+				if (buy_limit > 0 && (this.goods_num >= user_limit_num)) {
+					
+					uni.showToast({
+						icon: "none",
+						title: user_limit_num === 0 ? "购买数量已达上限" : `您最多可购买${user_limit_num}件商品`
+					})
+					return
+				}else if(buy_limit == 0 && (this.goods_num >= user_limit_num) && user_limit_num != 0){
+					uni.showToast({
+						icon: "none",
+						title: user_limit_num === 0 ? "购买数量已达上限" : `您最多可购买${user_limit_num}件商品`
+					})
+					return
+				}
+				if (this.goods_num < stock_num) {
+					++this.goods_num;
+				}else if(this.goods_num < user_limit_num){
+					++this.goods_num;
+				}
+			},
+
+			/**
+			 * 减少商品数量
+			 */
+			down() {
+				if (this.goods_num > 1) {
+					--this.goods_num;
+				}
+			},
+			/**
+			 * 按钮操作
+			 */
+			btnClick(btnType) {
+				console.log(this.specData);
+				if(this.specData.length > 0){
+					console.log(1111);
+					this.updateSpecGoods(1);
+				}
+				let {
+					goods_num,
+					goods_sku_id
+				} = this,
+				buystatus = this.goodsDetail.type === '3' && this.groupBuyType === '2' ? '1' : '2',
+					submitData = {
+						btnType,
+						goods_num,
+						goods_sku_id
+					};
+					
+				if (this.goodsDetail.type === '3') {
+					Object.assign(submitData, {
+						buystatus: buystatus
+					});
+				};
+				// debugger
+				// if (this.buy_limit > 0 && (this.goods_num >= this.user_limit_num)) {
+				// 	uni.showToast({
+				// 		icon: "none",
+				// 		title: this.user_limit_num === 0 ? "购买数量已达上限" : `您最多可购买${this.user_limit_num}件商品`
+				// 	})
+				// 	return
+				// }
+				if(this.goods_num > this.stock_num){
+					uni.showToast({
+						title:'购买数量不能超过库存',
+						icon:'none'
+					});
+					this.goods_num = this.stock_num;
+					return
+				}else if(this.goods_num < 1){
+					uni.showToast({
+						title:'购买数量不能为0',
+						icon:'none'
+					});
+					this.goods_num = 1;
+					return
+				}else if(this.goods_num > this.user_limit_num &&  this.user_limit_num != 0){
+					uni.showToast({
+						title:`您最多可购买${this.user_limit_num}件商品`,
+						icon:'none'
+					});
+					this.goods_num = this.user_limit_num;
+					return
+				}
+				if (this.goodsDetail.type === "1" && this.lp_now_stk > 0) {
+					if (goods_num > this.lp_now_stk) {
+						App.showError("抢购数量已达上限");
+						return;
+					}
+				};
+				this.showBuyMenu = false;
+				this.activeBuyMeuns(false);
+				this.$emit("submit", submitData);
+				
+			},
+			/**
+			 * 活动购买菜单重置
+			 */
+			activeBuyMeuns(showBuyMenu) {
+				let _this = this,
+					{
+						groupBuyType,
+						specData
+					} = _this;
+				showBuyMenu && this.updateSpecGoods();
+				if (Array.isArray(specData) && specData.length > 0) {
+					specData = specData.map((specItem, specIndex) => {
+						specItem.item = specItem.item.map((val, index) => {
+							if (!showBuyMenu) { //关
+								// val.checked = false;
+								_this.$set(val,'checked',false)
+							}
+							_this.goods_spec_arr.splice(specIndex, 1, "");
+							return val;
+						})
+						return specItem
+					});
+					this.specData = specData;
+				}
+			},
+			/**
+			 * 购买菜单显示隐藏
+			 */
+			onToggleTrade() {
+				//关闭后重置规格数据
+				this.showBuyMenu = !this.showBuyMenu;
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	/* 购买菜单 */
+	.goods-buy-menu {
+		width: 100vw;
+		height: 67vh;
+		background: #FFFFFF;
+		border-radius: 12upx 12upx 0 0;
+		position: relative;
+		z-index: 999;
+	}
+
+	.goods-buy-menu .icon-roundclose {
+		position: absolute;
+		top: 20upx;
+		right: 20upx;
+		font-size: 42upx;
+		height: 1em;
+		width: 1em;
+		color: #999999;
+	}
+
+	.trade-main {
+		padding: 20upx 20upx 50upx;
+		box-sizing: border-box;
+	}
+
+	.buy-info .buy-images image {
+		width: 180upx;
+		height: 180upx;
+		display: block;
+		border-radius: 12upx;
+	}
+
+	.buy-content {
+		margin-left: 30upx;
+		font-size: 24upx;
+	}
+
+	.buy-money {
+		font-size: 40upx;
+		color: #fe504f;
+	}
+
+	.buy-money text {
+		font-size: 24upx;
+	}
+
+	.buy-stock {
+		margin-top: 20upx;
+		color: #999999;
+	}
+
+	.buy-spec {
+		margin-top: 24upx;
+	}
+
+	.buy-spec-list {
+		margin-top: 30upx;
+		height: calc(65vh - 336upx);
+	}
+
+	.buy-spec-item {
+		padding-bottom: 30upx;
+	}
+
+	.spec-item-title {
+		font-size: 28upx;
+		line-height: 2em;
+		margin-top: 12upx;
+	}
+
+	.spec-items {
+		flex-wrap: wrap;
+	}
+
+	.spec-items .spec-item {
+		font-size: 26upx;
+		white-space: nowrap;
+		background: #F5F5F5;
+		padding: 12upx 20upx;
+		border-radius: 12upx;
+		color: #333;
+		margin: 20upx 20upx 0 0;
+		border: 1upx solid transparent;
+	}
+
+	.spec-items .spec-item.active {
+		background: #fffbfb;
+		color: #FE504F;
+		border: 1upx solid #ff4444;
+	}
+
+	.spec-items .spec-item.disabled {
+		background: rgb(245, 245, 245);
+		color: rgb(208, 208, 208);
+	}
+
+	.buy-number {
+		margin: 20upx 0;
+	}
+
+	.buy-button-box {
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 140upx;
+		background: #FFFFFF;
+	}
+
+	.buy-button-box .buy-button {
+		color: #FFFFFF;
+		border-radius: 50upx;
+		width: 90%;
+		margin: 16upx 5% 0;
+		background: #FE504F;
+		font-size: 28upx;
+		line-height: 2.8em;
+	}
+
+	.buy-button-box .buy-button.join-btn {
+		background: #FFD940;
+		color: #333333;
+	}
+
+	.buy-button-box .buy-button.notAva-btn {
+		background-color: #EEEEEE !important;
+		color: #999999 !important;
+	}
+
+	.member-price-label {
+		color: #333333;
+		height: 0;
+		line-height: 30upx;
+		border-width: 0upx 10upx 30upx 0;
+		border-style: none solid solid;
+		border-color: transparent #000 #efd68f;
+		position: relative;
+		left: 10upx;
+		padding-left: 6upx;
+		border-radius: 4upx 0 0 4upx;
+		margin-left: -10upx;
+	}
+
+	.member-coupon-price {
+		color: #efd68f;
+	}
+
+	.coupon-price-2 {
+		padding: 0 10upx;
+		height: 30upx;
+		line-height: 30upx;
+		border-radius: 0 4upx 4upx 0;
+	}
+
+	.member-coupon-view {
+		position: relative;
+		margin-left: 12upx;
+		top: -6rpx;
+	}
+
+	.selectNumber input {
+		text-align: center;
+		width: 100upx;
+	}
+</style>
diff --git a/components/template/PartLoading.vue b/components/template/PartLoading.vue
new file mode 100644
index 0000000..f341fe6
--- /dev/null
+++ b/components/template/PartLoading.vue
@@ -0,0 +1,75 @@
+<!-- 局部加载样式 -->
+<template>
+	<view class="part-loading" v-if="isShow" :style="backgroundType==='goods'?'':'background-color:#FFFFFF;'">
+		<view class="data-load"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isShow: true
+			};
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		onLoad(options) {
+
+		},
+		methods: {
+			showChange() {
+				this.isShow = !this.isShow;
+			}
+		},
+		props: {
+			backgroundType: {
+				type: String,
+				default: () => ""
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.part-loading {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 500;
+	}
+
+	.data-load {
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		margin: -30upx 0 0 -30upx;
+		width: 60upx;
+		height: 60upx;
+		display: inline-block;
+		padding: 0px;
+		border-radius: 100%;
+		border: 4upx solid;
+		border-top-color: #FFD940;
+		border-bottom-color: rgba(0, 0, 0, 0.2);
+		border-left-color: #FFD940;
+		border-right-color: rgba(0, 0, 0, 0.2);
+		animation: loader 1s ease-in-out infinite;
+	}
+
+	@keyframes loader {
+		from {
+			transform: rotate(0deg);
+		}
+
+		to {
+			transform: rotate(360deg);
+		}
+	}
+</style>
diff --git a/components/template/PhoneMask.vue b/components/template/PhoneMask.vue
new file mode 100644
index 0000000..2343370
--- /dev/null
+++ b/components/template/PhoneMask.vue
@@ -0,0 +1,482 @@
+<template>
+	<view class="page">
+		<view class="pop" :class="['pop--'+type1,{'pop--show' : show1 }]" v-if="show1">
+			<view v-if="overlay1" class="pop__mask" @touchmove="touchmove" :class="{'pop__mask--hide':!showOverlay1}" @click="handleMaskClick1"></view>
+			<view class="pop__container" :style="{zIndex: zIndex}" @touchmove="touchmove">
+				<view class="show">
+					<image :src="imgfixUrls + 'merchant/addPhone.png'" />
+					<view class="showPackage">
+						<view class="showTitle"><span>绑定手机号</span></view>
+						<view class="userNameInput">
+							<view class="phones" style="font-size: 20upx;">
+								手机号:
+							</view>
+							<input v-if="show1" :class="show1?'faluhd':'ruleInputs'" :disabled="!show1" style="padding-left: 100upx;" v-model="phone" @blur="blurIos"/>
+						</view>
+						<view class="userSmsInput" v-if="verifyCode == 1">
+							<view class="phones" style="font-size: 20upx;">
+								图形验证码:
+							</view>
+							<input v-if="show1" :class="show1?'faluhd':'ruleInputs'" type="number" :disabled="!show1" maxlength="4" v-model="txMode" style="padding-left:150upx;width: 150upx;"  @blur="blurIos"/>
+							<image class="getSms" :src="getImgUrl" @click="GVC" />
+						</view>
+						<view class="userSmsInput" v-if="smsver == 0">
+							<view class="phones" style="font-size: 20upx;">
+								验证码:
+							</view>
+							<input v-if="show1" :class="show1?'faluhd':'ruleInputs'" :disabled="!show1" type="number" maxlength="4" v-model="smsCode" style="padding-left:100upx;"  @blur="blurIos"/>
+							<view class="getSms" @click.stop="PIN" v-if="timeCount == 0"><span>获取验证码</span></view>
+							<view class="getSms" v-else>
+								<span>{{ timeEnd }}</span>
+							</view>
+						</view>
+						<view class="showSubmitButton" @click="changeMobile"><span>绑定手机号</span></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	import App from '@/common/js/app.js';
+
+	export default {
+		data() {
+			return {
+				showB: true,
+				phone: '',
+				txMode: '',
+				smsCode: '',
+				getSmsCode: '',
+				getImgUrl: '',
+				timeCount: 0,
+				timeEnd: '',
+				verifyCode: '',
+				smsver:0,
+				img:'',
+				codetime:''
+			};
+		},
+		props: {
+			show1: {
+				type: Boolean,
+				default: false
+			},
+			// 是否有遮罩层
+			overlay1: {
+				default: true
+			},
+			// 遮罩层是否会显示
+			showOverlay1: {
+				default: true
+			},
+			// 内容从哪个方向出，可选 center top bottom left right
+			type1: {
+				type: String,
+				default: 'center'
+			},
+			//表单组件v-model所需的参数
+			modelData: {
+				type1: Object,
+				default: () => {}
+			},
+			zIndex :{
+				type: String,
+				default: '999'
+			}
+		},
+		watch:{
+			show1(val){
+				if(val){
+					this.GVC();
+				}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		mounted() {
+			let _this = this;
+			_this.img = _this.imgfixUrl;
+			_this.verifyCode = uni.getStorageSync('platformInfor').verifycode;
+			_this.smsver = uni.getStorageSync('platformInfor').smsver;
+			// console.log(_this.verifyCode);
+		},
+		methods: {
+			touchmove(){
+				
+			},
+			blurIos(){
+				uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+				});
+			},
+			GVC() {
+				let _this = this;
+				let data = {};
+				App._post_form('&do=GVC', data, res => {
+					_this.getImgUrl = res.data.image_data;
+					_this.codetime = res.data.time;
+				});
+			},
+			handleMaskClick1() {
+				this.$emit('clickmask1');
+			},
+			// 发送短信验证码
+			PIN() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号',
+						duration: 2000
+					});
+					return;
+				}
+				if ( _this.txMode == ''  && _this.verifyCode == 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确图形验证码',
+						duration: 2000,
+						success() {
+							_this.GVC();
+						}
+					});
+					return;
+				}
+				let data = {
+					phone: _this.phone,
+					type: 2,
+					code:_this.txMode,
+					time:_this.codetime
+				};
+				App._post_form('&do=PIN', data, res => {
+					let timer_num = 60;
+					let timeClock = setInterval(function() {
+						timer_num--;
+						_this.timeEnd = timer_num + 's后重试';
+						_this.timeCount = timer_num;
+						if (timer_num == 0) {
+							clearInterval(timeClock);
+						}
+					}, 1000);
+					_this.getSmsCode = res.data.code;
+				});
+			},
+			// 改绑手机
+			changeMobile() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showModal({
+						showCancel:false,
+						content:'请输入正确的手机号'
+					})
+					return;
+				}
+				if (_this.smsCode == '' && _this.smsver == 0) {
+					uni.showModal({
+						showCancel:false,
+						content:'请输入验证码'
+					})
+					return;
+				}
+				if ( _this.txMode == '' && _this.verifyCode == 1) {
+					uni.showModal({
+						showCancel:false,
+						content:'请输入验证码',
+						success() {
+							_this.GVC();
+						}
+					})
+					return;
+				}
+				let data = {
+					mobile: _this.phone,
+					mergeflag: '',
+					code: _this.smsCode
+				};
+				App._post_form(
+					'&p=member&do=changeMobile',
+					data,
+					res => {
+						
+						_this.phone = '';
+						_this.smsCode = '';
+						_this.txMode = '';
+						uni.showToast({
+							icon: 'none',
+							title: '绑定成功',
+							duration: 2000,
+						});
+						let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+						let curRoute = routes[routes.length - 1].route
+						if(curRoute == 'pages/mainPages/userCenter/userCenter') {
+							_this.$emit('getMemberInfo');
+						}
+						this.$emit('clickmask1',true);
+						// _this.show1 = false;
+					},
+					errno => {
+						if (!!errno.data.data.code && errno.data.data.code === 1 || errno.data.message == '手机号已存在,无法重复绑定') return
+						uni.showModal({
+							title: '友情提示',
+							content: errno.data.message,
+							showCancel: true,
+							success(res) {
+								if (res.confirm) {
+									let data = {
+										mobile: _this.phone,
+										mergeflag: 1,
+										code: _this.smsCode
+									};
+									App._post_form('&p=member&do=changeMobile', data, res => {
+										_this.phone = '';
+										_this.smsCode = '';
+										uni.showToast({
+											icon: 'none',
+											title: '绑定成功',
+											duration: 2000
+										});
+										_this.$emit('clickmask1');
+										// _this.show1 = false;
+									});
+								}
+							}
+						});
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+
+</style>
+<style lang="less" scoped>
+	.page{
+		z-index: 2000;
+	}
+	.phones {
+		position: absolute;
+		padding-left: 20upx;
+		left: 1%;
+		top: 1%;
+		color: #999999;
+		line-height: 92upx;
+	}
+	.ruleInputs{
+		min-width:0!important;
+		min-height:0!important;
+		padding: 0!important;
+	}
+	.faluhd{
+		
+	}
+	.pop {
+		visibility: hidden;
+
+		.uni-input-placeholder {
+			display: none;
+		}
+	}
+
+	.pop--show {
+		visibility: visible;
+
+		.uni-input-placeholder {
+			display: block;
+		}
+	}
+
+	.pop__mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999;
+		background: rgba(0, 0, 0, .5);
+		display: none
+	}
+
+	.pop__mask--hide {
+		background: 0 0;
+	}
+
+	.pop__container {
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		-webkit-transform: translate3d(-50%, -50%, 0);
+		transform: translate3d(-50%, -50%, 0);
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transition: all .3s ease;
+		transition: all .3s ease;
+		opacity: 0
+	}
+
+	.pop--show .pop__container {
+		opacity: 1
+	}
+
+	.pop--show .pop__mask {
+		display: block
+	}
+
+	.pop--left .pop__container {
+		left: 0;
+		top: 50%;
+		-webkit-transform: translate3d(-100%, -50%, 0);
+		transform: translate3d(-100%, -50%, 0)
+	}
+
+	.pop--show.pop--left .pop__container {
+		-webkit-transform: translate3d(0, -50%, 0);
+		transform: translate3d(0, -50%, 0)
+	}
+
+	.pop--right .pop__container {
+		right: 0;
+		top: 50%;
+		left: auto;
+		-webkit-transform: translate3d(100%, -50%, 0);
+		transform: translate3d(100%, -50%, 0)
+	}
+
+	.pop--show.pop--right .pop__container {
+		-webkit-transform: translate3d(0, -50%, 0);
+		transform: translate3d(0, -50%, 0)
+	}
+
+	.pop--bottom .pop__container {
+		top: auto;
+		left: 50%;
+		// bottom: 0;
+		-webkit-transform: translate3d(-50%, 100%, 0);
+		transform: translate3d(-50%, 100%, 0)
+	}
+
+	.pop--show.pop--bottom .pop__container {
+		-webkit-transform: translate3d(-50%, 0, 0);
+		transform: translate3d(-50%, 0, 0)
+	}
+
+	.pop--top .pop__container {
+		top: 0;
+		left: 50%;
+		-webkit-transform: translate3d(-50%, -100%, 0);
+		transform: translate3d(-50%, -100%, 0)
+	}
+
+	.pop--show.pop--top .pop__container {
+		-webkit-transform: translate3d(-50%, 0, 0);
+		transform: translate3d(-50%, 0, 0)
+	}
+
+	.show {
+		width: 600upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20upx;
+		overflow: hidden;
+
+		>image {
+			width: 600upx;
+			height: 112upx;
+		}
+	}
+
+	.showTitle {
+		font-size: 36upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.showTitle2 {
+		margin-top: 16upx;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+
+	.showPackage {
+		padding: 0 50upx 50upx 50upx;
+	}
+
+	.userNameInput {
+		margin-top: 50upx;
+		position: relative;
+		width: 500upx;
+		height: 90upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+
+		>input {
+			height: 90upx;
+			margin-left: 30upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.userSmsInput {
+		width: 500upx;
+		height: 90upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+		margin-top: 20upx;
+		position: relative;
+
+		>input {
+			vertical-align: middle;
+			display: inline-block;
+			height: 90upx;
+			width: 200upx;
+			margin-left: 30upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.getSms {
+		vertical-align: middle;
+		display: inline-block;
+		width: 150upx;
+		height: 58upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 6upx;
+		text-align: center;
+
+		>span {
+			line-height: 58upx;
+			font-size: 24upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.showSubmitButton {
+		margin: 40upx auto 0 auto;
+		width: 292upx;
+		height: 74upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 37upx;
+		text-align: center;
+
+		>span {
+			line-height: 74upx;
+			font-size: 28upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+</style>
diff --git a/components/template/PopManager.vue b/components/template/PopManager.vue
new file mode 100644
index 0000000..5037097
--- /dev/null
+++ b/components/template/PopManager.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="page">
+		<view class="pop" :class="['pop--'+type,{'pop--show' : show }]">
+			<view v-if="overlay" class="pop__mask" :class="{'pop__mask--hide':!showOverlay}" @click="handleMaskClick" @touchmove="touchmove"></view>
+			<view class="pop__container" :style="{'bottom':bottom}" @touchmove="touchmove">
+				<slot></slot>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		},
+		props: {
+			show: {
+				default: false
+			},
+			// 是否有遮罩层
+			overlay: {
+				default: true
+			},
+			// 遮罩层是否会显示
+			showOverlay: {
+				default: true
+			},
+			// 内容从哪个方向出，可选 center top bottom left right
+			type: {
+				type: String,
+				default: 'center'
+			},
+			bottom:{
+				type:String,
+				default:''
+			},
+			//表单组件v-model所需的参数
+			modelData: {
+				type: Object,
+				default: () => {}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+		
+		},
+		mounted() {
+
+		},
+		methods: {
+			handleMaskClick() {
+				this.$emit('clickmask');
+			},
+			touchmove(){
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.pop {
+		visibility: hidden
+	}
+
+	.pop--show {
+		visibility: visible
+	}
+
+	.pop__mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 999;
+		background: rgba(0, 0, 0, .5);
+		display: none
+	}
+
+	.pop__mask--hide {
+		background: 0 0;
+	}
+
+	.pop__container {
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		-webkit-transform: translate3d(-50%, -50%, 0);
+		transform: translate3d(-50%, -50%, 0);
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transition: all .3s ease;
+		transition: all .3s ease;
+		z-index: 999;
+		opacity: 0
+	}
+
+	.pop--show .pop__container {
+		opacity: 1
+	}
+
+	.pop--show .pop__mask {
+		display: block
+	}
+
+	.pop--left .pop__container {
+		left: 0;
+		top: 50%;
+		-webkit-transform: translate3d(-100%, -50%, 0);
+		transform: translate3d(-100%, -50%, 0)
+	}
+
+	.pop--show.pop--left .pop__container {
+		-webkit-transform: translate3d(0, -50%, 0);
+		transform: translate3d(0, -50%, 0)
+	}
+
+	.pop--right .pop__container {
+		right: 0;
+		top: 50%;
+		left: auto;
+		-webkit-transform: translate3d(100%, -50%, 0);
+		transform: translate3d(100%, -50%, 0)
+	}
+
+	.pop--show.pop--right .pop__container {
+		-webkit-transform: translate3d(0, -50%, 0);
+		transform: translate3d(0, -50%, 0)
+	}
+
+	.pop--bottom .pop__container {
+		top: auto;
+		left: 50%;
+		bottom: 0;
+		-webkit-transform: translate3d(-50%, 100%, 0);
+		transform: translate3d(-50%, 100%, 0)
+	}
+
+	.pop--show.pop--bottom .pop__container {
+		-webkit-transform: translate3d(-50%, 0, 0);
+		transform: translate3d(-50%, 0, 0)
+	}
+
+	.pop--top .pop__container {
+		top: 0;
+		left: 50%;
+		-webkit-transform: translate3d(-50%, -100%, 0);
+		transform: translate3d(-50%, -100%, 0)
+	}
+
+	.pop--show.pop--top .pop__container {
+		-webkit-transform: translate3d(-50%, 0, 0);
+		transform: translate3d(-50%, 0, 0)
+	}
+</style>
diff --git a/components/template/Skip.vue b/components/template/Skip.vue
new file mode 100644
index 0000000..3f0970a
--- /dev/null
+++ b/components/template/Skip.vue
@@ -0,0 +1,43 @@
+<template>
+	<view class="Skip"><view v-html="wxOpenTags"></view></view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			wxOpenTags: null
+		};
+	},
+	props: {
+		AppData: {
+			type: Object,
+			default: null
+		}
+	},
+	mounted() {
+		//#ifdef H5
+		setTimeout(() => {
+			this.pageWxApp();
+		}, 2000);
+		//#endif
+	},
+	methods: {
+		pageWxApp() {
+			let _this = this;
+			let linktitle;
+			let linktail;
+			linktitle =_this.AppData.link.split('?')[0];
+			linktail =_this.AppData.link.split('?')[1];
+			_this.AppData.link = linktitle + '.html?' + linktail;
+			_this.wxOpenTags = `<wx-open-launch-weapp path="${_this.AppData.link}" id="launch-wxapp" username="${_this.AppData.original_id}">  
+							            <template>  
+							                <uni-view style="display: block;background: url(${_this.AppData.img});background-size: 100% 100%;width: 400px;height: 140px;"></uni-view>
+							            </template>  
+										</wx-open-launch-weapp>`;
+		}
+	}
+};
+</script>
+
+<style></style>
diff --git a/components/template/Swiper.vue b/components/template/Swiper.vue
new file mode 100644
index 0000000..7190179
--- /dev/null
+++ b/components/template/Swiper.vue
@@ -0,0 +1,161 @@
+<template>
+	<!-- banner轮播 -->
+	<view class="diy-banner">
+		<swiper :autoplay="autoplay" class="banner-box swiper-box b-f" :circular="true"
+		 @change="_bindChange" :style="{'height':styles.img_height+'px','width':styles.img_width+'px'}">
+			<swiper-item v-for="(banner,index) in itemData" :key="index">
+				<image @click="navigationTo(banner.link)" @load="_imagesHeight($event,index)" class="slide-image" :src="banner.thumb"></image>
+			</swiper-item>
+		</swiper>
+		<view class="swiper-indicator" :class="indicatorStyle">
+			<block v-if="indicatorStyle !== 'arc2'">
+				<view class="indicator-item" :class="{'active':imgCurrent === index }" v-for="(item,index) in itemData" :key="index"></view>
+			</block>
+			<block v-else>
+				<view class="indicator-item">{{imgCurrent+1}}/{{itemData.length}}</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+				// banner轮播组件属性
+				indicatorDots: true, // 是否显示面板指示点	
+				autoplay: true, // 是否自动切换
+				imgCurrent: 0, // 当前banne所在滑块指针
+			};
+		},
+		props: {
+			itemData: {
+				type: Array,
+				default: ()=>[]
+			},
+			styles:{
+				type:Object,
+				default:{}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			indicatorStyle() {
+				//下标样式 1圆角 2椭圆  3矩形 4椭圆数字
+				// let borderstyle = this.itemStyle.borderstyle;
+				// return borderstyle == 1 ? "round" : borderstyle == 2 ? "arc" : borderstyle == 3 ? "square" : "arc2";
+				return "arc2"
+			}
+		},
+		beforeCreate() {
+
+		},
+		mounted() {
+			
+		},
+		methods: {
+			/**
+			 * 计算图片高度
+			 */
+			_imagesHeight(e,imgIndex) {
+				if(imgIndex !== 0) return;
+				let that = this;
+				uni.getSystemInfo({
+					success(res) {
+						// 获取图片真实宽度
+						let imgwidth = e.detail.width,
+							imgheight = e.detail.height,
+							// 宽高比
+							ratio = imgwidth / imgheight;
+						// 计算的高度值
+						let viewHeight = res.windowWidth / ratio;
+						that.imgHeight = viewHeight;
+					}
+				})
+			},
+
+			/**
+			 * 记录当前指针
+			 */
+			_bindChange(e) {
+				this.imgCurrent = e.detail.current;
+			},
+
+			/**
+			 * 跳转到指定页面
+			 */
+			navigationTo(url) {
+				App.navigationTo({
+					url:url
+				})
+				// App.navigationToH5(url);
+			},
+		},
+	}
+</script>
+
+<style scoped>
+	/* banner轮播 */
+
+	.diy-banner {
+		position: relative;
+		padding: 30upx;
+		background-color: #FFFFFF;
+	}
+
+	.diy-banner .slide-image {
+		width: 100%;
+		height: 100%;
+		margin: 0 auto;
+		display: block;
+	}
+
+	/* 底部指示器 */
+	.swiper-indicator {
+		height: 28upx;
+		padding: 0 20upx;
+		position: absolute;
+		left: 0;
+		right: 0;
+		bottom: 20upx;
+		text-align: right;
+	}
+
+	.indicator-item {
+		display: inline-block;
+		height: 12upx;
+		width: 12upx;
+		border-radius: 20upx;
+		background: rgba(204, 204, 204, .6);
+		margin: 0 8upx;
+		font-size: 24upx;
+	}
+
+	.swiper-indicator.arc .indicator-item {
+		width: 24upx;
+		border-radius: 12upx;
+	}
+
+	.swiper-indicator.square .indicator-item {
+		display: inline-block;
+		height: 6upx;
+		width: 32upx;
+		border-radius: 0;
+	}
+
+	.swiper-indicator.arc2 .indicator-item {
+		width: auto;
+		height: 28upx;
+		line-height: 28upx;
+		color: #fff;
+		padding: 0 10upx;
+		vertical-align:top;
+	}
+
+	.indicator-item.active {
+		background: #fff;
+	}
+</style>
diff --git a/components/template/activityData.vue b/components/template/activityData.vue
new file mode 100644
index 0000000..d548873
--- /dev/null
+++ b/components/template/activityData.vue
@@ -0,0 +1,81 @@
+<template>
+	<view class="activity">
+		<view  style="background-color: #F6F6F6;">
+			<view class="b-f" style="padding: 20upx;border-radius: 10upx;margin-bottom: 30upx;" v-for="(item,index) in tabDataList" :key="index" @click="toSignUp(item)">
+				<view class="dis-flex" >
+					<view  style="flex: 0.3;">
+						<image :src="item.logo" style="width: 200upx;height: 200upx;margin-right: 20upx;border-radius: 10upx;" mode=""></image>
+					</view>
+					<view  style="position: relative;flex: 0.7;">
+						<view class="f-30" style="padding-bottom: 15upx;">
+							{{item.goods_name}}
+						</view>
+						<view class="col-9 f-20" style="padding-bottom: 15upx;">
+							<view class="dis-il-block" style="width: 350upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+								{{item.address}}
+							</view>
+							<view style="float: right;">{{item.distance}}</view>
+						</view>
+						<view class="f-22 col-9" style="height: 30upx;line-height: 30upx;padding-bottom: 15upx;" v-if="item.minprice && item.maxprice">
+							<view >
+								价格: <text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.minprice}}</text>
+								<text style="padding: 0 10upx;color: #FF4444;">~</text>
+								<text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.maxprice}}</text>
+							</view>
+							<!-- <view >
+								最高价: 
+							</view> -->
+						</view>
+						<view class="f-22 col-9" style="height: 30upx;line-height: 30upx;padding-bottom: 15upx;" v-else>
+							<view >
+								价格: <text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.price}}</text>
+							</view>
+							<!-- <view >
+								最高价: 
+							</view> -->
+						</view>
+						<view >
+							<view class="f-20 col-9 dis-il-block" style="margin: 10upx  0 10upx;background-color: #FFEBEB;color: #FF4444;border-radius: 60upx;height: 30upx;line-height: 30upx;padding: 5upx 20upx;">
+								{{item.catename}}
+							</view>
+						</view>
+		
+						<view class="f-26 col-f t-c" 
+						style="position: absolute;background-color: #FF4444;height: 50upx;line-height: 50upx;width: 150upx;border-radius: 60upx;right: 10upx;bottom: 10upx;">
+							立即报名
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		props:{
+			tabDataList:{
+				type:Array,
+				default:[]
+			}
+		},
+		methods:{
+			toSignUp(item){
+				console.log(item);
+				debugger
+				App.navigationTo({
+					url: `pages/subPages2/coursegoods/coursegoods?id=${item.id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/components/template/advert.vue b/components/template/advert.vue
new file mode 100644
index 0000000..b15b92a
--- /dev/null
+++ b/components/template/advert.vue
@@ -0,0 +1,257 @@
+<template>
+	<view>
+		<view class="advert" v-if="isadvert && !advertflag && advertData.data !== '' && advertData.data !== null">
+			<view class="advert-style1" v-if="advertData.params.style == 'default'">
+				<view class="advert-mask" :style="'background-color: #000; opacity: 0.65;'" @click="advertClose()"></view>
+				<view class="advert-style1-d">
+					<view class="advert-style1-close" v-if="advertData.params.canclose == '0' && advertData.params.autoclose !== '0'">{{ countTimeNmu }}&nbsp;秒</view>
+					<view class="advert-style1-close" @click="advertClose()" v-if="advertData.params.canclose == '1' && advertData.params.autoclose !== '0'">{{ countTimeNmu }}&nbsp;关闭</view>
+					<view class="advert-style1-close" @click="advertClose()" v-if="advertData.params.canclose == '1' && advertData.params.autoclose == '0'">关闭</view>
+					<swiper class="swiper" :indicator-dots="true" :circular="banner.circular" indicator-color="rgba(255,255,255,.4)"
+					 indicator-active-color="rgba(255,255,255,.8)">
+						<swiper-item v-for="(item, key) in advertData.data" :key="key">
+							<view class="a" v-if="item.click == '0'" @click="navigateTo(item.linkurl)">
+								<image class="image" :src="item.imgurl" mode="scaleToFill"></image>
+							</view>
+							<view class="a" v-if="item.click == '1'" @click="advertClose()">
+								<image class="image" :src="item.imgurl" mode="scaleToFill"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+			<view class="advert-style2" v-else-if="advertData.params.style == 'small-bot'">
+				<view class="advert-mask" :style="'background-color: '+advertData.style.background+'; opacity: '+advertData.style.opacity+';'"
+				 @click="advertClose()"></view>
+				<view class="advert-d">
+					<view class="advert-close" v-if="advertData.params.canclose == '1'" @click="advertClose()">
+						<view class="i icon iconfont icon-round_close_light"></view>
+					</view>
+					<swiper class="swiper" :indicator-dots="true" :circular="banner.circular" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.8)"
+					 v-if="advertDataData.length > 1">
+						<swiper-item class="swiper-item" v-for="(item, key) in advertData.data" :key="key">
+							<view class="a" v-if="item.click == '0'" @click="navigateTo(item.linkurl)">
+								<image class="image" :src="item.imgurl" mode="widthFix"></image>
+							</view>
+							<view class="a" v-if="item.click == '1'" @click="advertClose()">
+								<image class="image" :src="item.imgurl" mode="widthFix"></image>
+							</view>
+						</swiper-item>
+					</swiper>
+					<view class="swiper-container-advert-one" v-else>
+						<view class="swiper-item-one" v-for="(item, key) in advertDataData" :key="key">
+							<view class="a" v-if="item.click == '0'" @click="navigateTo(item.linkurl)">
+								<image class="image" :src="item.imgurl" mode="widthFix"></image>
+							</view>
+							<view class="a" v-if="item.click == '1'" @click="advertClose()">
+								<image class="image" :src="item.imgurl"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		props: ['advertData'],
+		data() {
+			return {
+				countTimeNmu: 0,
+				banner: {
+					indicatorDots: true,
+					circular: false,
+				},
+				advertDataData: [],
+				isadvert: null,
+				advertflag: false
+			}
+		},
+		computed: {
+
+		},
+		mounted() {
+			this.openAdvert()
+		},
+		methods: {
+			openAdvert() {
+				let _this = this;
+				// showType  0 每次显示  1 间隔
+				if (!!_this.advertData.params && _this.advertData.params.showtype === '1') {
+					let timeStamp = uni.getStorageSync(`timeStamp${_this.advertData.id}`),
+						nowTime = Date.parse(new Date()) / 1000,
+						showTime = _this.advertData.params.showtime;
+					if (!!timeStamp) {
+						let isadvert = (timeStamp + showTime * 60) > nowTime ? false : true;
+						if (isadvert) {
+							uni.setStorageSync(`timeStamp${_this.advertData.id}`, nowTime);
+						}
+						_this.isadvert = isadvert;
+					} else {
+						_this.isadvert = true;
+						uni.setStorageSync(`timeStamp${_this.advertData.id}`, nowTime);
+					}
+				} else {
+					_this.isadvert = true;
+				}
+				for (var i in _this.advertData.data) {
+					_this.advertDataData.push(_this.advertData.data[i])
+				}
+				if (!!_this.advertData.params && _this.advertData.params.style == 'default' && _this.advertData.params.autoclose != 0) {
+					_this.countTimeNmu = parseInt(_this.advertData.params.autoclose)
+					setTimeout(_this.countTime, 1000)
+				}
+			},
+			advertClose() {
+				var that = this
+				if (!!that.advertData.params && that.advertData.params.canclose == '1') {
+					that.isadvert = false;
+					that.advertflag = true;
+					that.countTimeNmu = 0;
+					clearTimeout(that.countTime)
+				}
+			},
+			countTime() {
+				var that = this
+				that.countTimeNmu += -1;
+				if (that.countTimeNmu > 0) {
+					setTimeout(that.countTime, 1000)
+				} else {
+					that.advertClose()
+				}
+			},
+			navigateTo(url) {
+				App.navigationTo({
+					url: url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.advert-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .65);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+	}
+
+	.advert-d {
+		width: 100%;
+		height: calc((100vw - 80upx) / 0.7142);
+		position: fixed;
+		top: 100upx;
+		left: 0;
+		z-index: 101;
+	}
+
+	.advert-close {
+		width: 80upx;
+		height: 80upx;
+		line-height: 80upx;
+		color: #fff;
+		text-indent: 4upx;
+		text-align: center;
+		margin-left: -40upx;
+		border-radius: 50%;
+		position: fixed;
+		left: 50%;
+		bottom: 200upx;
+		z-index: 999;
+	}
+
+	.advert-close .i {
+		font-size: 80upx;
+		display: inline;
+	}
+
+	.advert-d .swiper {
+		height: 100%;
+	}
+
+	.advert-d .swiper-item-one {
+		width: 100%;
+		height: 100%;
+	}
+
+	.advert-d .swiper-item-one .a {
+		height: 100%;
+		padding: 0 80upx;
+		margin-top: 40upx;
+	}
+
+	.advert-d .swiper-item-one .a .image {
+		width: 100%;
+		height: calc((100vw - 80upx) / 0.7142);
+		max-height: 100%;
+		border-radius: 10upx;
+	}
+
+	.advert-d .swiper-item {
+		width: calc(100vw - 160upx);
+	}
+
+	.advert-d .swiper-item .a {
+		height: 100%;
+		padding: 0 80upx;
+	}
+
+	.advert-d .swiper-item .a .image {
+		width: 100%;
+		max-height: 90%;
+		border-radius: 10upx;
+	}
+
+	.advert-d .swiper-container-advert-one {
+		height: 100%;
+	}
+
+	.advert-style1-d {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10000;
+	}
+
+	.advert-style1-close {
+		height: 60upx;
+		line-height: 60upx;
+		color: #fff;
+		font-size: 30upx;
+		padding: 0 20upx;
+		background-color: rgba(0, 0, 0, .65);
+		border-radius: 100upx;
+		position: absolute;
+		top: 10%;
+		right: 30upx;
+		z-index: 99;
+	}
+
+	.advert-style1-d .swiper {
+		height: 100%;
+	}
+
+	.advert-style1-d swiper-item {
+		width: 100vw;
+	}
+
+	.advert-style1-d swiper-item .a {
+		height: 100%;
+	}
+
+	.advert-style1-d swiper-item .a .image {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+	}
+</style>
diff --git a/components/template/barrage.vue b/components/template/barrage.vue
new file mode 100644
index 0000000..9673c1d
--- /dev/null
+++ b/components/template/barrage.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="barrage" v-if="!!barrageInfo&&(!!barrageInfo.avatar)">
+		<view class="mbList" :style="{ top: topH, left: topW }">
+			<view class="mbPackage">
+				<image :src="barrageInfo.avatar" class="barrageImg verCenter" v-if="!!barrageInfo.avatar"></image>
+				<text class="font26 colorW lineH50 verCenter pL10">{{ barrageInfo.nickname }}开通了{{ barrageInfo.day }}天{{ halfcardtext }}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		barrageList: {
+			type: Array,
+			default: []
+		},
+		barrageType: {
+			type: Boolean,
+			default: false
+		}
+	},
+	data() {
+		return {
+			barrageInfo:{},
+			topH: null,
+			topW: null,
+			itempx: null,
+			halfcardtext: ''
+		};
+	},
+	mounted() {
+		let _this = this;
+		// console.info('barrageInfo',(!!_this.barrageInfo.avatar))
+		uni.getStorage({
+			key: 'TextSubstitution',
+			success: function(res) {
+				_this.halfcardtext = res.data.halfcardtext;
+			}
+		});
+		setTimeout(()=>{
+			_this.clock()
+		},5000)
+	},
+	watch: {
+	},
+	onReady() {
+		let _this = this;
+	},
+	onHide() {
+		console.info('onHide');
+		let _this = this;
+	},
+	onUnload() {
+		console.info('onUnload');
+	},
+	methods: {
+		clearSet() {
+			console.info('我执行了');
+			let _this = this;
+			clearInterval(_this.set1);
+			clearInterval(_this.set2);
+			clearInterval(_this.set3);
+		},
+		clock(w, h) {
+			let _this = this;
+			console.info('执行2');
+			_this.set1 = setInterval(barrage, 4000);
+			function barrage() {
+				let i = Math.ceil(Math.random() * _this.barrageList.length);
+				_this.barrageInfo = _this.barrageList[i - 1];
+				// console.info('barrageInfo',(!!_this.barrageInfo.avatar))
+			}
+			_this.set2 = setInterval(barrageh, 4000);
+			function barrageh() {
+				let i = Math.ceil(Math.random() * uni.upx2px(400));
+				uni.createSelectorQuery()
+					.select('.mbList')
+					.boundingClientRect(data => {
+						_this.itempx = uni.upx2px(750) + 'px';
+						_this.topH = i + 'px';
+					})
+					.exec();
+			}
+			_this.set3 = setInterval(barrageW, 4000);
+			function barrageW() {
+				let i = Math.ceil(Math.random() * h);
+				_this.topW = i - _this.itempx;
+				if (_this.topW < 0) {
+					_this.topW = 0 + 'px';
+				} else {
+					_this.topW = i - _this.itempx + 'px';
+				}
+			}
+		}
+	}
+};
+</script>
+
+<style lang="less">
+@keyframes myfirst {
+	0% {
+		opacity: 0;
+	}
+	50% {
+		opacity: 1;
+	}
+	100% {
+		opacity: 0;
+	}
+}
+.barrageImg {
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+}
+.mbList {
+	animation-iteration-count: infinite;
+	animation-duration: 4s;
+	animation-name: myfirst;
+	position: absolute;
+	height: 50upx;
+	background: rgba(0, 0, 0, 0.65);
+	display: inline-block;
+	border-radius: 20upx;
+}
+.mbPackage {
+	padding: 0 20upx;
+}
+.font26 {
+	font-size: 26upx;
+}
+.colorW {
+	color: white;
+}
+.lineH50 {
+	line-height: 50upx;
+}
+.verCenter {
+	vertical-align: middle;
+}
+.pL10 {
+	padding-left: 10upx;
+}
+</style>
diff --git a/components/template/checkCity.vue b/components/template/checkCity.vue
new file mode 100644
index 0000000..2033f61
--- /dev/null
+++ b/components/template/checkCity.vue
@@ -0,0 +1,196 @@
+<template>
+	<view class="checkCity" :style="{width: width,margin:m_l}">
+		<picker mode="multiSelector" class="dataPicker" :range="citylist"  :value="cityIndex" @columnchange='changeCity' range-key="name" @change="checkCity">
+			<view class="uni-input" v-if="returnData.provinceidName!==''">{{ returnData.provinceidName }} {{ returnData.areaidName }} {{ returnData.distidName }}</view>
+			<view class="uni-input1" v-else>
+				选择省市  区县
+			</view>
+		</picker>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif	
+	
+export default {
+	props:{
+		userAddress:{
+			type: Object,
+			default:{}
+		},
+		show:'',
+		width:{
+			type:String,
+			default:'70%'
+		},
+		m_l:{
+			type:String,
+			default:'0 0 0 30px'
+		}
+	},
+	data() {
+		return {
+			cityList:[],
+			citylist:[],
+			cityIndex:[0,0,0],
+			returnData:{
+				distidName:'',
+				provinceidName:'',
+				areaidName:'',
+				provinceid:'',
+				cityid:'', 
+				countyid:'',
+			},
+			count:0
+		};
+	},
+	mounted(){
+		this.cityList=uni.getStorageSync('cityList')
+		this.init();
+	},
+	watch:{
+		'userAddress':{
+			handler(newval,oldval){
+				let _this=this;
+				console.log(newval);
+				if(_this.userAddress.provinceidName == undefined || _this.userAddress.provinceidName==''){
+					for(let i=0;i<_this.cityList.length;i++){
+						if(_this.userAddress.provinceid==_this.cityList[i].id){
+							_this.returnData.provinceidName=_this.cityList[i].name;
+							for(let a=0;a<_this.cityList[i].area.length;a++){
+								if(_this.userAddress.cityid==_this.cityList[i].area[a].id){
+									_this.returnData.areaidName=_this.cityList[i].area[a].name
+									for(let c=0;c<_this.cityList[i].area[a].dist.length;c++){
+										if(_this.userAddress.countyid==_this.cityList[i].area[a].dist[c].id){
+											_this.returnData.distidName=_this.cityList[i].area[a].dist[c].name
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+				else{
+					_this.returnData.provinceidName=_this.userAddress.provinceidName
+					_this.returnData.areaidName=_this.userAddress.areaidName
+					_this.returnData.distidName=_this.userAddress.distidName
+					for(let i=0;i<_this.cityList.length;i++){
+						if(_this.userAddress.provinceidName==_this.cityList[i].name){
+							_this.returnData.provinceid=_this.cityList[i].id
+							for(let a=0;a<_this.cityList[i].area.length;a++){
+								if(_this.userAddress.areaidName==_this.cityList[i].area[a].name){
+									_this.returnData.cityid=_this.cityList[i].area[a].id
+									for(let c=0;c<_this.cityList[i].area[a].dist.length;c++){
+										if(_this.userAddress.countyid==_this.cityList[i].area[a].dist[c].id){
+											_this.returnData.countyid=_this.cityList[i].area[a].dist[c].id
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+				_this.$emit("galadata",_this.returnData);
+			},
+			deep:true
+		}
+	},
+	methods:{
+		init(){
+			let _this=this
+			let cityCheckLeft=[]
+			let cityCheckCenter=[]
+			let cityCheckRight=[]
+			// 省
+			for(let i=0;i<_this.cityList.length;i++){
+				cityCheckLeft.push(_this.cityList[i])
+			}
+			_this.citylist.push(cityCheckLeft)	
+			// 市
+			for(let i=0;i<_this.cityList[0].area.length;i++ ){
+				cityCheckCenter.push(_this.cityList[0].area[i])
+			}
+			_this.citylist.push(cityCheckCenter)
+			// 区
+			for(let i=0;i<_this.cityList[0].area[0].dist.length;i++){
+				cityCheckRight.push(_this.cityList[0].area[0].dist[i])
+			}
+			_this.citylist.push(cityCheckRight)
+		},
+		// 三级联动
+		changeCity(e){
+			let _this=this
+			let cityCheckCenter=[]
+			let cityCheckRight=[]
+			// 市级联动
+			if(e.target.column==0){
+				for(let i=0;i<_this.cityList.length;i++){
+					if(e.target.value==i){
+						for( let a=0;a<_this.cityList[i].area.length;a++){
+							cityCheckCenter.push(_this.cityList[i].area[a])
+						}
+					}
+				}
+				_this.citylist.splice(1,2,cityCheckCenter)
+				_this.citylist.splice(2,3,cityCheckCenter[0].dist)
+			}
+			// 区级联动
+			if (e.target.column == 1) {
+				for (let a = 0; a < _this.citylist[1].length; a++) {
+					if (e.target.value == a) {
+						for (let c = 0; c < _this.citylist[1][a].dist.length; c++) {
+							cityCheckRight.push(_this.citylist[1][a].dist[c]);
+						}
+					}
+				}
+				_this.citylist.splice(2, 3, cityCheckRight);
+			}
+		},
+		// 弹窗确定按钮
+		checkCity: function(e) {
+			let _this = this;
+			_this.returnData.provinceidName = _this.citylist[0][e.target.value[0]].name;
+			_this.returnData.areaidName = _this.citylist[1][e.target.value[1]].name;
+			_this.returnData.distidName = _this.citylist[2][e.target.value[2]] && _this.citylist[2][e.target.value[2]].name  || '';
+			_this.returnData.provinceid = _this.citylist[0][e.target.value[0]].id;
+			_this.returnData.cityid = _this.citylist[1][e.target.value[1]].id;
+			_this.returnData.countyid = _this.citylist[2][e.target.value[2]] && _this.citylist[2][e.target.value[2]].id || '';
+			_this.$emit("returnData",_this.returnData,_this.cityIndex)
+			console.log(_this.cityIndex);
+		},
+	}
+};
+</script>
+
+<style lang="less" scoped>
+	.checkCity{
+		vertical-align: middle;
+		height: 100%;
+		display: inline-block;
+	}
+	.uni-input{
+		line-height: 80upx;
+		vertical-align: middle;
+		width: 100%;
+		height: 80upx;
+		display: inline-block;
+		font-size: 24upx;
+		font-family: SourceHanSansCN-Regular;
+		
+		color: #333333;
+	}
+	.uni-input1{
+		line-height: 80upx;
+		color:rgba(153,153,153,1);
+		vertical-align: middle;
+		width: 100%;
+		height: 80upx;
+		display: inline-block;
+		font-size: 24upx;
+		font-family: SourceHanSansCN-Regular;
+		
+	}
+</style>
diff --git a/components/template/citydeliveryGoods.vue b/components/template/citydeliveryGoods.vue
new file mode 100644
index 0000000..8779053
--- /dev/null
+++ b/components/template/citydeliveryGoods.vue
@@ -0,0 +1,329 @@
+<template>
+	<view class="citydeliveryGoods">
+		<view class="style-one" v-if="goodItem.id == 'citydelivery_goods'">
+			<view class="dis-flex">
+				<view class="f-36 f-w flex-box">{{ goodItem.params.title }}</view>
+				<view class="col-9 f-24 flex-box t-r" style="line-height: 48upx;" v-if="goodItem.params.show_more == 1">
+					<text @click="openAllGoods(false)" >更多</text>
+					<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+				</view>
+			</view>
+			<view class="goods-box">
+				<view class="goods-item" v-for="(item, index) in goodItem.data" @click="openGoods(item.id)">
+					<image :src="item.logo" mode=""></image>
+					<view style="padding: 10upx;box-sizing: border-box;width: 202upx;">
+						<view class="f-28 col-3 f-w goods-title">{{ item.goods_name }}</view>
+						<view class="f-20 col-9 p-top-bom-10">销量：{{ item.buy_num }}</view>
+						<view >
+							<text class="f-20 c-ff4444 f-w">¥</text>
+							<text class="f-32 c-ff4444 f-w">{{ item.price }}</text>
+						</view>
+						<view class="shop-btn">购</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="style-two" @click="openAllGoods(goodItem.style.link)" v-if="goodItem.id == 'citydelivery_goods2'"
+			:style="'background-image: url(' + goodItem.style.top_image + ');background-size: 100% 130px;background-repeat: no-repeat;' " >
+			<view class="col-9 f-24 t-r" style="line-height: 200upx;padding: 0 10upx;">
+				<view style="height: 200upx;">
+					
+				</view>
+				<!-- <text @click="openAllGoods(goodItem.style.link)">更多</text> -->
+				<!-- <text class="iconfont icon-right" style="font-size: 24upx;"></text> -->
+			</view>
+			<view class="dis-flex goodsTwoBox">
+				<view class="goodsTwoItem" v-for="(item, index) in goodItem.data" :key="index" @click="openGoods(item.id)">
+					<image :src="item.logo" mode=""></image>
+					<view class="content">
+						<view class="f-24 col-3 f-w goods-title">{{ item.goods_name }}</view>
+						<view class="f-20 col-9 p-top-bom-10">销量：{{ item.buy_num }}</view>
+						<view class="price-box">
+							<text class="f-20 f-w c-ff4444">¥</text>
+							<text class="f-28 f-w c-ff4444">{{ item.price }}</text>
+							<view class="goodsBtn"><view class="shop-btn">购</view></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="style-two" v-if="goodItem.id == 'citydelivery_goods3'"
+			:style="'background-image: url(' + goodItem.style.top_image + ');background-size: 100% 130px;background-repeat: no-repeat;' " >
+			<view class="col-9 f-24 t-r" style="line-height: 140upx;padding: 0 10upx;">
+				<text @click="openAllGoods(goodItem.style.link)">更多</text>
+				<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+			</view>
+			<view class="goodsTwoBox">
+				<view class="goodsThreeItem dis-flex" v-for="(item, index) in goodItem.data" :key="index" @click="openGoods(item.id)">
+					<view class="img">
+						<image :src="item.logo" mode=""></image>
+					</view>
+					<view class="content">
+						<view class="col-3 f-32 f-w m-btm20 name">
+							{{item.goods_name}}
+						</view>
+						<view class="f-24 col-9">
+							销量：{{ item.buy_num }}
+						</view>
+						<view class="f-36 c-ff4444">
+							<text class="f-24">¥</text>
+							<text>{{ item.price }}</text>
+						</view>
+						<view class="content-btn">
+							立即购买
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="style-four" v-if="goodItem.id == 'citydelivery_goods4'">
+			<view class="four-item" @click="openAllGoods(goodItem.style.link)">
+				<image :src="goodItem.style.top_image" mode="" style="width: 100%;height: 100%;border-radius: 10upx;"></image>
+			</view>
+			<view class="four-item" v-for="(item,index) in goodItem.data" :key="index"  @click="openGoods(item.id)">
+				<image :src="item.logo" mode=""></image>
+				<view style="padding: 10upx 10upx;box-sizing: border-box;width: 202upx;">
+					<view class="f-28 col-3 f-w goods-title">{{ item.goods_name }}</view>
+					<view class="f-20 col-9 p-top-bom-10">销量：{{ item.buy_num }}</view>
+					<view >
+						<text class="f-20 c-ff4444 f-w">¥</text>
+						<text class="f-32 c-ff4444 f-w">{{ item.price }}</text>
+					</view>
+					<view class="shop-btn">购</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		goodItem: {
+			type: Object,
+			default: {}
+		}
+	},
+	methods: {
+		openGoods(id) {
+			App.navigationTo({
+				url: `pages/subPages2/businessCenter/foodIntroduced/foodIntroduced?id=${id}`
+			});
+		},
+		openAllGoods(url) {
+			// debugger
+			if (url) {
+				App.navigationTo({
+					url:url
+				});
+			}else{
+				App.navigationTo({
+					url: `pages/subPages2/businessCenter/businessCenter`
+				});
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.style-one {
+	.goods-box {
+		display: flex;
+		padding-top: 30upx;
+		overflow: auto;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		.goods-item {
+			border: 1upx solid #eeeeee;
+			background-color: #ffffff;
+			width: 400upx;
+			border-radius: 10upx;
+			// height: 100upx;
+			flex: 0 0 30%;
+			// margin-right: 20upx;
+			position: relative;
+			margin-bottom: 20upx;
+			image {
+				width: 200upx;
+				height: 200upx;
+				border-radius: 10upx;
+			}
+
+			.goods-title {
+				text-overflow:ellipsis;
+				display:-webkit-box;
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2;
+				overflow: hidden;
+			}
+			.shop-btn {
+				width: 50upx;
+				height: 50upx;
+				border-radius: 10upx;
+				background-color: #ff4444;
+				color: #ffffff;
+				font-size: 30upx;
+				font-weight: 700;
+				text-align: center;
+				line-height: 50upx;
+				position: absolute;
+				right: 10upx;
+				bottom: 10upx;
+			}
+		}
+	}
+
+	.goods-box::after {
+		content: '';
+		flex: 0 0 32%; /* 或者flex: 1 */
+	}
+}
+.style-four{
+	display: flex;
+	overflow: auto hidden;
+	.four-item{
+		flex: 0 0 31.5%;
+		height: 380upx;
+		border-radius: 10upx;
+		margin-right: 20upx;
+		position: relative;
+		background-color: #FFFFFF;
+		image{
+			width: 100%;
+			height: 216upx;
+			border-radius: 10upx;
+		}
+		.goods-title {
+			text-overflow:ellipsis;
+			display:-webkit-box;
+			-webkit-box-orient:vertical;
+			-webkit-line-clamp:2;
+			overflow: hidden;
+		}
+		.shop-btn {
+			width: 50upx;
+			height: 50upx;
+			border-radius: 10upx;
+			background-color: #ff4444;
+			color: #ffffff;
+			font-size: 30upx;
+			font-weight: 700;
+			text-align: center;
+			line-height: 50upx;
+			position: absolute;
+			right: 10upx;
+			bottom: 10upx;
+		}
+	}
+}
+.style-two {
+	width: 100%;
+	min-height: 100px;
+	.goodsTwoBox {
+		overflow: auto;
+		padding: 0 20upx 20upx;
+		.goodsTwoItem {
+			flex: 0 0 182upx;
+			background-color: #ffffff;
+			border: 1upx solid #eeeeee;
+			border-radius: 10upx;
+			margin-right: 20upx;
+			box-sizing: 10upx;
+			overflow: hidden;
+			image {
+				width: 100%;
+				height: 150upx;
+				box-sizing: 10upx;
+			}
+			.content {
+				padding: 0 10upx;
+				box-sizing: border-box;
+			}
+			.goods-title {
+				text-overflow:ellipsis;
+				display:-webkit-box;
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:2;
+				overflow: hidden;
+			}
+			.price-box {
+				background: #fff2f2;
+				margin: 0 0upx;
+				height: 42upx;
+				line-height: 34upx;
+				position: relative;
+				margin-bottom: 10upx;
+				padding-left: 10upx;
+				.goodsBtn {
+					position: absolute;
+					width: 66upx;
+					height: 66upx;
+					border-radius: 50%;
+					background-color: #ffffff;
+					right: -10upx;
+					top: -10upx;
+				}
+				.shop-btn {
+					position: absolute;
+					left: 30upx;
+					top: 6upx;
+					transform: translate(-50%);
+					height: 46upx;
+					width: 46upx;
+					border-radius: 50%;
+					background-color: #ff4444;
+					line-height: 46upx;
+					font-size: 26upx;
+					text-align: center;
+					color: #ffffff;
+					font-weight: 600;
+				}
+			}
+		}
+		.goodsThreeItem{
+			padding: 20upx;
+			border: 1upx solid #EEEEEE;
+			background-color: #FFFFFF;
+			border-radius: 10upx;
+			margin-bottom: 20upx;
+			.img{
+				flex: 0.38;
+				image{
+					width: 100%;
+					height: 230upx;
+					border-radius: 10upx;
+				}
+			}
+			.content{
+				flex: 0.62;
+				padding-left: 20upx;
+				.name{
+					font-size: 30upx;
+					text-overflow:ellipsis;
+					display:-webkit-box;
+					-webkit-box-orient:vertical;
+					-webkit-line-clamp:2;
+					overflow: hidden;
+				}
+				.content-btn{
+					width: 140upx;
+					height: 50upx;
+					line-height: 50upx;
+					border-radius: 10upx;
+					background-color: #FF4444;
+					color: #FFFFFF;
+					font-size: 26upx;
+					font-weight: 400;
+					text-align: center;
+					// margin-top: 34upx;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/components/template/commentlist.vue b/components/template/commentlist.vue
new file mode 100644
index 0000000..9ad1470
--- /dev/null
+++ b/components/template/commentlist.vue
@@ -0,0 +1,552 @@
+<template>
+  <view>
+    <view class="commentlist">
+      <view class="cmt-share">
+        <view class="cmt-share-mask" :class="{shareMask: cmtShare, shareMaskHide: !cmtShareMask}" @click="cmtShareH"></view>
+        <view class="cmt-share-d" :class="{cmtShareShow: cmtShare}">
+          <view class="cmt-share-i">
+            <button hover-class="none" plain="true" open-type="share" @click="cmtShareH">
+              发送好友
+            </button>
+          </view>
+					<!--
+          <view class="cmt-share-i">
+            <navigator class="a" url="/pagesOther/creatcard/index" hover-class="none" @click="cmtShareH">生成卡片</navigator>
+          </view>
+					-->
+          <view class="cmt-share-i cancel" @click="cmtShareH">
+            取消
+          </view>
+        </view>
+      </view>
+			<view class="commentlist-d">
+				<view class="cmtlist-i" v-for="(item, key) in commentList" :key="key">
+					<view class="cmtlist-i-link-d">
+						<navigator class="a cmtlist-i-link" :url="'/pagesComment/commentdetail/index?i='+item.id+'&state='+item.praise_type" hover-class="none" v-if="!cmtdtl"></navigator>
+						<view class="cmtlist-i-t1">
+							<view class="cmtlist-i-t1-l">
+								<view class="cmtlist-i-t1-l-face"><image class="image" :src="item.headimg" mode="aspectFill"></image></view>
+							</view>
+							<view class="cmtlist-i-t1-r">
+								<view class="h1">
+									<view class="h1-l">{{ item.nickname }}</view>
+									<view class="h1-r">{{ item.createtime }}</view>
+								</view>
+								<view class="p"><view class="i icon iconfont icon-favor_fill_light" v-for="(item2, key2) in item.star" :key="key2"></view></view>
+							</view>
+						</view>
+						<view class="cmtlist-i-t2">{{ item.text }}</view>
+						<view class="cmtlist-i-t3" v-if="item.pic !== '' && item.pic !== null">
+							<view :class="'list-img-list list-img-list'+item.pic.length" v-if="!cmtdtl && item.pic.length && item.pic.length > 0 && item.pic !== '' && item.pic !== null">
+								<view class="list-img-i" v-for="(item3, key3) in item.pic" :key="key3" v-if="item3 && item3 !== '' && item3 !== null"><image class="image" :src="item3" mode="aspectFill"></image></view>
+							</view>
+							<view class="list-img-list listImgList10" v-if="cmtdtl">
+								<view class="list-img-i" v-for="(item3, key3) in item.pic" :key="key3" v-if="item3 && item3 !== '' && item3 !== null"><image class="image" :src="item3" mode="aspectFill" @click="previewImg(item3, item.pic)"></image></view>
+							</view>
+						</view>
+					</view>
+					<view class="cmtlist-i-t4" v-if="!rushdtl">
+						<navigator class="a" :url="'/pagesBuy/rushdetail/index?i='+item.goods_id+'&c='+item.plugin" hover-class="none" v-if="item.goods_id !== '' && item.goods_id !== null">
+							<view class="cmtlist-i-t4-d">
+								<view class="cmtlist-i-t4-l">
+									<image class="image" :src="item.goods_logo" mode="aspectFill"></image>
+								</view>
+								<view class="cmtlist-i-t4-r">
+									<view class="h1">{{ item.goods_name }}</view>
+									<view class="p">
+										<view class="p-l">{{ item.goods_price }}元</view>
+										<view class="p-r">购买</view>
+									</view>
+								</view>
+							</view>
+						</navigator>
+						<navigator class="a" :url="'/pagesBuy/rushdetail/index?i='+item.rush_id+'&c='+item.plugin" hover-class="none" v-if="item.goods_id == '' || item.goods_id == null">
+							<view class="cmtlist-i-t4-d">
+								<view class="cmtlist-i-t4-l">
+									<image class="image" :src="item.goods_logo" mode="aspectFill"></image>
+								</view>
+								<view class="cmtlist-i-t4-r">
+									<view class="h1">{{ item.goods_name }}</view>
+									<view class="p">
+										<view class="p-l">{{ item.goods_price }}元</view>
+										<view class="p-r">购买</view>
+									</view>
+								</view>
+							</view>
+						</navigator>
+					</view>
+					<view class="cmtlist-i-t5" v-if="!cmtdtl">
+						<view class="cmtlist-i-t5-l" :class="{isagree: item.fabulousState}" @click="agree(item.id, key)" v-if="item.fabulousNum > 0"><view class="i icon iconfont icon-zan1"></view>{{ item.fabulousNum }}</view>
+						<view class="cmtlist-i-t5-l" :class="{isagree: item.fabulousState}" @click="agree(item.id, key)" v-if="item.fabulousNum == 0"><view class="i icon iconfont icon-zan1"></view></view>
+						<view class="cmtlist-i-t5-r" @click="cgShare(item.nickname, item.storename, item.star, item.id, item.praise_type, item.goods_logo)" v-if="!rushdtl">
+							<button hover-class="none" plain="true" @click="cmtShareS()">
+								<view class="i icon iconfont icon-fenxiang"></view>分享
+							</button>
+						</view>
+					</view>
+				</view>
+			</view>
+    </view>
+  </view>
+</template>
+
+<script>
+import { mapState, mapMutations } from 'vuex'
+import { CMTSHAREAPPMSG } from '@/store/mutation-types'
+
+export default {
+  props: ['commentList', 'cmtdtl', 'rushdtl'],
+  data () {
+    return {
+      cmtShare: false,
+      cmtShareMask: false
+    }
+  },
+	computed: {
+		...mapState([
+			'cmtShareAppMsg'
+		])
+	},
+  methods: {
+		...mapMutations([
+			CMTSHAREAPPMSG
+		]),
+    cmtShareS () {
+      this.cmtShare = true
+      this.cmtShareMask = true
+    },
+    cmtShareH () {
+      var that = this
+      that.cmtShare = false
+      setTimeout(() => {
+        that.cmtShareMask = false
+      },300)
+    },
+		previewImg (current, urls) {
+			wx.previewImage({
+				current: current,
+				urls: urls
+			})
+		},
+		agree(id, key){
+			var that = this
+			var mid = ""
+			var token = ""
+			if(that.$store.state.userInfo !== '' && typeof(that.$store.state.userInfo.uid) !== 'undefined'){
+				mid = that.$store.state.userInfo.uid
+				token = that.$store.state.userInfo.token
+			}
+			uni.request({
+				url: that.$util.util.url('Fabulous'),
+				data: {mid: mid,'class': 1,id: id, token: token},
+				success: (res) => {
+					//console.log(res)
+					if(res.data.errno == 0){
+						if(that.commentList[key].fabulousState){
+							that.commentList[key].fabulousState = false
+							that.commentList[key].fabulousNum += -1
+						}else{
+							that.commentList[key].fabulousState = true
+							that.commentList[key].fabulousNum += 1
+						}
+					}else if(res.data.errno == 1){
+						if(res.data.message == "未登录"){
+							uni.navigateTo({
+								url: '/pagesIndex/login/index'
+							})
+						}
+					}
+				}
+			})
+		},
+		cgShare (nickname, storename, starnum, id, praise_type, imgurl) {
+			var cmtShareAppMsgList = {}
+			cmtShareAppMsgList.nickname = nickname
+			cmtShareAppMsgList.storename = storename
+			cmtShareAppMsgList.starnum = starnum
+			cmtShareAppMsgList.id = id
+			cmtShareAppMsgList.praise_type = praise_type
+			cmtShareAppMsgList.imgurl = imgurl
+			this[CMTSHAREAPPMSG](cmtShareAppMsgList)
+		}
+  }
+}
+</script>
+
+<style scoped>
+.cmtlist-i {
+  padding: 0 30px;
+  position: relative;
+}
+.cmt-share-mask {
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0,0,0,.5);
+  opacity: 0;
+  position: fixed;
+  top: 0;
+  left: 0;
+  z-index: 100;
+  transition: opacity .3s;
+}
+.shareMaskHide {
+  display: none;
+}
+@keyframes shareMaskAni {
+  0%    {opacity: 0;}
+  100%  {opacity: 1.0;}
+}
+.shareMask {
+  opacity: 1.0;
+  animation: shareMaskAni .3s;
+}
+.cmt-share-d {
+  width: 100%;
+  background-color: #EDEDED;
+  position: fixed;
+  left: 0;
+  bottom: -100%;
+  transition: all .3s;
+  z-index: 101;
+}
+.cmtShareShow {
+  bottom: 0;
+}
+.cmt-share-i {
+  height: 120px;
+  line-height: 120px;
+  font-size: 36px;
+  text-align: center;
+  margin-bottom: 2px;
+  background-color: #fff;
+}
+.cmt-share-i:active {
+  background-color: #ECECEC;
+}
+.cmt-share-i button {
+  height: 120px;
+  line-height: 120px;
+  font-size: 36px;
+  border: none;
+}
+.cmt-share-d .cancel {
+  margin-top: 8px;
+  margin-bottom: 0;
+}
+.cmtlist-i-link-d {
+  position: relative;
+}
+.cmtlist-i-link {
+  width: 100%;
+  height: 100%;
+  position: absolute;
+  z-index: 1;
+}
+.cmtlist-i:first-child .cmtlist-i-t1 {
+  border-top: none;
+}
+.cmtlist-i-t1 {
+  padding: 40px 0 30px 0;
+  border-top: 1px solid #f3f3f3;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: flex-start;
+}
+.cmtlist-i-t1-l {
+  width: 72px;
+  height: 72px;
+  padding: 4px;
+  border-radius: 50%;
+  -webkit-flex-shrink: 0;
+  flex-shrink: 0;
+}
+.cmtlist-i-t1-l-face {
+  width: 72px;
+  height: 72px;
+}
+.cmtlist-i-t1-l .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 50%;
+}
+.cmtlist-i-t1-r {
+  padding-left: 20px;
+  -webkit-flex: 1;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.cmtlist-i-t1-r .h1 {
+  height: 42px;
+  line-height: 42px;
+  font-size: 30px;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: space-between;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.cmtlist-i-t1-r .h1-l {
+  -webkit-flex-shrink: 1;
+  flex-shrink: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.cmtlist-i-t1-r .h1-r {
+  color: #999;
+  font-size: 24px;
+  padding-left: 10px;
+  -webkit-flex-shrink: 0;
+  flex-shrink: 0;
+}
+.cmtlist-i-t1-r .p {
+  height: 40px;
+  line-height: 40px;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: flex-start;
+}
+.cmtlist-i-t1-r .p .i {
+  color: #FF7F18;
+  font-size: 32px;
+}
+.cmtlist-i-t2 {
+  line-height: 48px;
+  font-size: 30px;
+}
+.cmtlist-i-t3 {
+  margin-top: 30px;
+}
+.list-img-list .list-img-i {
+	background-color: #f3f3f3;
+	float: left;
+}
+.list-img-list:after {
+	content: "";
+	display: block;
+	clear: both;
+}
+.list-img-i .image {
+  width: 100%;
+  height: 100%;
+}
+.list-img-list1 .list-img-i {
+	width: calc(100vw - 60px);
+	height: calc(100vw - 60px);
+}
+.list-img-list2 .list-img-i {
+  width: calc((100vw - 72px) / 2);
+	height: calc((100vw - 72px) / 2);
+}
+.list-img-list2 .list-img-i:nth-child(2) {
+  margin-left: 12px;
+}
+.list-img-list3 .list-img-i:first-child {
+  width: calc(((100vw - 84px) / 3) * 2 + 12px);
+	height: calc(((100vw - 84px) / 3) * 2 + 12px);
+}
+.list-img-list3 .list-img-i:nth-child(2), .list-img-list3 .list-img-i:nth-child(3) {
+  width: calc((100vw - 84px) / 3);
+	height: calc((100vw - 84px) / 3);
+  margin-left: 12px;
+}
+.list-img-list3 .list-img-i:nth-child(3) {
+  margin-top: 12px;
+}
+.list-img-list4 .list-img-i {
+  width: calc((100vw - 72px) / 2);
+	height: calc((100vw - 72px) / 2);
+}
+.list-img-list4 .list-img-i:nth-child(2), .list-img-list4 .list-img-i:nth-child(4) {
+  margin-left: 12px;
+}
+.list-img-list4 .list-img-i:nth-child(3), .list-img-list4 .list-img-i:nth-child(4) {
+  margin-top: 12px;
+}
+.list-img-list5 .list-img-i {
+  width: calc(((100vw - 72px) / 2 - 12px) / 2);
+	height: calc(((100vw - 72px) / 2 - 12px) / 2);
+  margin-left: 12px;
+}
+.list-img-list5 .list-img-i:nth-child(1) {
+  width: calc((100vw - 72px) / 2);
+	height: calc((100vw - 72px) / 2);
+  margin-left: 0;
+}
+.list-img-list5 .list-img-i:nth-child(4), .list-img-list5 .list-img-i:nth-child(5) {
+  margin-top: 12px;
+}
+.list-img-list6 .list-img-i {
+  width: calc((100vw - 84px) / 3);
+	height: calc((100vw - 84px) / 3);
+}
+.list-img-list6 .list-img-i:nth-child(2), .list-img-list6 .list-img-i:nth-child(5) {
+  margin: 0 12px;
+}
+.list-img-list6 .list-img-i:nth-child(4), .list-img-list6 .list-img-i:nth-child(5), .list-img-list6 .list-img-i:nth-child(6) {
+  margin-top: 12px;
+}
+.list-img-list7 .list-img-i {
+  width: calc(((100vw - 72px) / 2 - 12px) / 2);
+	height: calc(((100vw - 72px) / 2 - 12px) / 2);
+  margin-left: 12px;
+}
+.list-img-list7 .list-img-i:nth-child(1), .list-img-list7 .list-img-i:nth-child(6), .list-img-list7 .list-img-i:nth-child(7) {
+  width: calc((100vw - 72px) / 2);
+	height: calc((100vw - 72px) / 2);
+  margin-left: 0;
+  margin-top: 12px;
+}
+.list-img-list7 .list-img-i:nth-child(1) {
+  margin-top: 0;
+}
+.list-img-list7 .list-img-i:nth-child(7) {
+  margin-left: 12px;
+}
+.list-img-list7 .list-img-i:nth-child(4), .list-img-list7 .list-img-i:nth-child(5) {
+  margin-top: 12px;
+}
+.list-img-list8 .list-img-i {
+  width: calc((100vw - 96px) / 4);
+	height: calc((100vw - 96px) / 4);
+  margin-left: 12px;
+  margin-top: 12px;
+}
+.list-img-list8 .list-img-i:nth-child(1) {
+  width: calc(((100vw - 96px) / 4) * 3 + 24px);
+	height: calc(((100vw - 96px) / 4) * 3 + 24px);
+  margin-top: 0;
+  margin-left: 0;
+}
+.list-img-list8 .list-img-i:nth-child(2) {
+  margin-top: 0;
+}
+.list-img-list8 .list-img-i:nth-child(5) {
+  margin-left: 0;
+}
+.list-img-list9 .list-img-i {
+  width: calc((100vw - 84px) / 3);
+	height: calc((100vw - 84px) / 3);
+  margin-top: 12px;
+}
+.list-img-list9 .list-img-i:nth-child(2), .list-img-list9 .list-img-i:nth-child(5), .list-img-list9 .list-img-i:nth-child(8) {
+  margin: 12px 12px 0 12px ;
+}
+.list-img-list9 .list-img-i:nth-child(4), .list-img-list9 .list-img-i:nth-child(5), .list-img-list9 .list-img-i:nth-child(6) {
+  margin-top: 12px;
+}
+.list-img-list9 .list-img-i:nth-child(1), .list-img-list9 .list-img-i:nth-child(2), .list-img-list9 .list-img-i:nth-child(3) {
+  margin-top: 0;
+}
+.listImgList10 .list-img-i {
+  width: calc(100vw - 60px)!important;
+	height: calc(100vw - 60px)!important;
+  margin: 0!important;
+  margin-bottom: 20px!important;
+  display: block;
+  float: none;
+}
+.listImgList10 .list-img-i:last-child {
+  margin-bottom: 0;
+}
+.cmtlist-i-t4 {
+  margin-top: 30px;
+}
+.cmtlist-i-t4-d {
+  padding: 30px;
+  background-color: #fff;
+  border-radius: 12px;
+  box-shadow: 0 0 16px #d9d9d9;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: flex-start;
+}
+.cmtlist-i-t4-l {
+  width: 144px;
+  height: 144px;
+  border-radius: 8px;
+  -webkit-flex-shrink: 0;
+  flex-shrink: 0;
+}
+.cmtlist-i-t4-l .image {
+  width: 100%;
+  height: 100%;
+  border-radius: 6px;
+}
+.cmtlist-i-t4-r {
+  padding-left: 30px;
+  -webkit-flex: 1;
+  flex: 1;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.cmtlist-i-t4-r .h1 {
+  height: 72px;
+  line-height: 36px;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: normal;
+  display: -webkit-box;
+  -webkit-line-clamp: 2;
+  -webkit-box-orient: vertical;
+}
+.cmtlist-i-t4-r .p {
+  height: 60px;
+  line-height: 60px;
+  margin-top: 12px;
+  color: #FF5050;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: space-between;
+}
+.cmtlist-i-t4-r .p .p-l {
+  font-size: 32px;
+  font-weight: 600;
+}
+.cmtlist-i-t4-r .p .p-r {
+  height: 57.6px;
+  line-height: 57.6px;
+  padding: 0 46px;
+  border: 1.2px solid #FF5050;
+  border-radius: 100px;
+}
+.cmtlist-i-t5 {
+  color: #979797;
+  height: 42px;
+  line-height: 42px;
+  font-size: 30px;
+  padding: 40px 0;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: space-between;
+}
+.cmtlist-i-t5 .i {
+  font-size: 36px;
+  margin-right: 6px;
+  display: inline-block;
+  vertical-align: -2px;
+}
+.isagree {
+	color: #FF7F18;
+}
+.cmtlist-i-t5-l .i {
+  font-size: 44px;
+}
+.cmtlist-i-t5-r button {
+	height: 42px;
+	line-height: 42px;
+	color: #979797;
+	font-size: 28px;
+	border: none;
+}
+
+
+
+
+
+
+</style>
diff --git a/components/template/custom-digitKeyboard.vue b/components/template/custom-digitKeyboard.vue
new file mode 100644
index 0000000..707f3a5
--- /dev/null
+++ b/components/template/custom-digitKeyboard.vue
@@ -0,0 +1,388 @@
+<template>
+  <view class="modal" :animation="animationData1" @touchmove.stop.prevent>
+    <view class=" content-wrap" :animation="animationData2">
+      <view class="content-header dis-flex">
+        <view class="cancel-btn" >实付金额:</view>
+        <view class="input-contant t-c">
+			<view class="input-contant-gs" v-if="(mone !== '¥' && mone )">
+				<view  style="line-height: 48upx;color: #FFFFFF;padding-left: 20upx;padding-right: 20upx;" v-if="(mone !== '¥' && mone ) ">
+					<text v-if="inputmodel !== '¥' && inputmodel">(</text>
+					<text>{{mone.replace("¥","")}}</text>
+					<text v-if="inputmodel !== '¥' && inputmodel">-</text>
+					<text v-if="inputmodel !== '¥' && inputmodel">{{inputmodel.replace("¥","")}}</text>
+					<text v-if="inputmodel !== '¥' && inputmodel">)</text>
+					<text>x</text>
+					<text>{{Math.round((lilv / 10) * 100) / 100 }}</text>
+					<text v-if="inputmodel !== '¥' && inputmodel">+</text>
+					<text v-if="inputmodel !== '¥' && inputmodel">{{inputmodel.replace("¥","")}}</text>
+				</view>
+				
+			</view>
+		</view>
+        <view class="confirm-btn" >
+			<view class="triangle" v-if="(mone !== '¥' && mone ) ">
+				
+			</view>
+			<text style="padding-left: 30upx;" v-if="mone !== '¥' && mone ">¥{{Math.round((((Number(mone.replace("¥","")) - Number(inputmodel.replace("¥",""))) * (Math.round((lilv / 10) * 100) / 100)) + Number(inputmodel.replace("¥",""))) * 100) / 100}}</text>
+			<text v-else>0.00</text>
+			</view>
+      </view>
+	  	<view class="key-box" style="position: relative;">
+	  	  <view
+	  	    :class="{
+	  	      'handel-btn': ['.', '', ''].includes(item),
+	  	      'active-btn': activeKey === item,
+	  	      'active-handel-btn':
+	  	        activeKey === item && ['.', ''].includes(item),
+	  	    }"
+	  	    v-for="(item, index) in keyboardList"
+	  	    :key="index"
+	  	    @click.stop="setValue(item)"
+	  	    >{{ item }}</view
+	  	  >
+	  	</view>
+		<view  style="position: absolute;width: 20%;right: 14upx;top: 76upx;">
+			<view class="t-c" style="height: 120upx;line-height: 100upx;" @click.stop="setValue('删除')">
+				<image :src="imgfixUrls + 'scv.png'" style="width: 60upx;height: 60upx;padding-top: 46upx;" mode=""></image>
+			</view>
+			<view class="t-c" style="width: 166upx;height: 300upx;box-sizing: border-box;background-color: #19A119;padding-top: 100upx;color: #FFFFFF;margin-top: 2px;font-size: 30upx;" @click.stop="pay">
+				<view >
+					确认
+					<br/>
+					支付
+				</view>
+			</view>
+		</view>
+	  </view>
+  </view>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      animationData1: {},
+      animationData2: {},
+      activeKey: "",
+      inputValue: [],
+    };
+  },
+  props: {
+    visible: {
+      type: Boolean,
+      default: true,
+    },
+    //是否为带小数的数字键盘
+    decimals: {
+      type: Boolean,
+      default: true,
+    },
+    //小数点前整数的位数
+    maxLength: {
+      type: [Number, String],
+      default: 9,
+    },
+    //小数点后的位数
+    pointLength: {
+      type: [Number, String],
+      default: 2,
+    },
+    //最大的值
+    max: {
+      type: [Number, String],
+      default: 999999999,
+    },
+    //最小的值
+    min: {
+      type: [Number, String],
+      default: 0,
+    },
+	inputValues:{
+		type:Array,
+		default:[],
+	},
+	mone:{
+		type:String,
+		default:'0'
+	},
+	inputmodel:{
+		type:String,
+		default:'0'
+	},
+	lilv:{
+		type:String,
+		default:'0'
+	}
+  },
+  computed: {
+    keyboardList() {
+      return this.decimals
+        ? ["1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "."]
+        : ["1", "2", "3", "4", "5", "6", "7", "8", "9", "", "0", "."];
+    },
+  },
+  mounted() {
+  	this.enterAnimate();
+  },
+  watch: {
+    visible(val) {
+      this.inputValue = [];
+      if (val) this.enterAnimate();
+      else this.leaveAnimate();
+    },
+	'inputValues':{ //监听的对象
+	     deep:true, //深度监听设置为 true
+	     handler:function(val,oldV){
+			 console.log(val,'进来进来');
+			 if(val[0] == '11' || val[0] == '112'){
+				  this.inputValue = [];
+			 }else{
+				  this.inputValue =val;
+			 }
+	      
+	    }
+	}
+	// inputValues(val){
+		// console.log(val[0],11111);
+		
+		// console.log(this.inputValue);
+		
+	// }
+  },
+  methods: {
+	pay(){
+		this.$emit("pay");  
+	},
+    setValue(data) {
+		// if(data.length == 1){
+		// 	this.inputValue[0] = data[0];
+		// }
+
+      this.activeKey = data;
+      let timer = setTimeout(() => {
+        this.activeKey = "-";
+        clearTimeout(timer);
+      }, 100);
+
+      if (
+        !data ||
+        (data !== "删除" &&
+          this.inputValue.includes(".") &&
+          this.inputValue.join("").split(".")[1].length === this.pointLength)
+      )
+        return false;
+
+      if (
+        this.inputValue.length === 1 &&
+        this.inputValue[0] === "0" &&
+        !["删除", "."].includes(data)
+      ) {
+        return (this.inputValue = [data]);
+      }
+
+      if (data !== "删除") {
+        if (this.inputValue.includes(".")) {
+          if (
+            this.inputValue.join("").split(".")[0].length === this.maxLength
+          ) {
+            return false;
+          }
+        } else if (this.inputValue.length === this.maxLength) {
+          return false;
+        }
+      }
+
+      if (data == "删除") {
+        this.inputValue.length && this.inputValue.pop();
+		console.log(this.inputValue,data);
+		let num = this.inputValue.join("");
+		this.$emit("confirm",num,this.inputValue);
+		return
+      }
+      if (data === ".") {
+        if (!this.inputValue.length || this.inputValue.includes("."))
+          return false;
+      }
+      this.inputValue.push(data);
+	  console.log(this.inputValue,data);
+	  let num = this.inputValue.join("");
+	  this.$emit("confirm",num,this.inputValue);
+    },
+    close() {
+      this.$emit("update:visible", false);
+      this.$emit("close");
+    },
+    confirm() {
+      let result = Number(this.inputValue.join(""));
+      if (result < this.min) {
+        uni.showToast({
+          title: `最小值为${this.min}`,
+          duration: 1500,
+          icon: "none",
+        });
+        return;
+      } else if (result > this.max) {
+        uni.showToast({
+          title: `最大值为${this.max}`,
+          duration: 1500,
+          icon: "none",
+        });
+        return;
+      }
+      this.$emit("confirm", result);
+      this.close();
+    },
+    enterAnimate() {
+      this.animation1 = uni.createAnimation();
+      this.animation2 = uni.createAnimation();
+      this.animation1.backgroundColor("rgba(0,0,0,0.5)").step({
+        duration: 500,
+        timingFunction: "ease",
+      });
+      this.animation2.translateY(0).step({
+        timingFunction: "ease-out",
+        duration: 500,
+      });
+      this.animationData1 = this.animation1.export();
+      this.animationData2 = this.animation2.export();
+    },
+    leaveAnimate() {
+      this.animation1 = uni.createAnimation();
+      this.animation2 = uni.createAnimation();
+      this.animation1.backgroundColor("rgba(0,0,0,0)").step({
+        duration: 500,
+        timingFunction: "ease",
+      });
+      this.animation2.translateY(500).step({
+        timingFunction: "ease-out",
+        duration: 500,
+      });
+      this.animationData1 = this.animation1.export();
+      this.animationData2 = this.animation2.export();
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+.modal {
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background: rgba(0, 0, 0, 0);
+  z-index: 998;
+
+  .content-wrap {
+    position: fixed;
+    bottom: 0;
+    left: 0;
+    width: 100%;
+    background: #fff;
+    box-sizing: border-box;
+    transform: translateY(100%);
+
+    .content-header {
+      width: 100%;
+      height: 100upx;
+      background: rgba(255, 255, 255, 1);
+      float: right;
+
+      .input-contant {
+        text-align: right;
+        line-height: 100upx;
+        font-size: 20upx;
+		// min-width: 390upx;
+		flex: 1;
+		// padding-right: 164upx;
+		.input-contant-gs{
+			// width: 200upx;
+			height: 48upx;
+			// position: absolute;
+			min-width: 100upx;
+			margin-top: 28upx;
+			display: inline-block;
+			background-color: #413634;
+			border-radius: 10upx 0 0 10upx;
+		}
+      }
+
+      .cancel-btn {
+		  font-size: 30upx;
+		  font-weight: 700;
+        padding-left: 30upx;
+        color: #000000;
+        line-height: 100upx;
+		min-width: 166upx;
+        // position: absolute;
+        // top: 0;
+        // left: 0;
+      }
+
+      .confirm-btn {
+		  font-size: 40upx;
+		  font-weight: 700;
+		  text-align: center;
+        // padding-right: 64upx;
+		// width: 164upx;
+		position: relative;
+		min-width: 164upx;
+        color: #000000;
+		border-bottom: 1upx solid #F1F1F1;
+        line-height: 100upx;
+		// position: relative;
+		// top: -114upx;
+		// left: 10upx;
+        // position: absolute;
+        // top: 0;
+        // right: 0;
+      }
+    }
+
+    .key-box {
+      margin-top: 60upx;
+      display: flex;
+      flex-flow: wrap;
+      width: 90%;
+
+      view {
+        width: 29%;
+        height: 100upx;
+        border: 1upx solid #f1f1f1;
+        box-sizing: border-box;
+        text-align: center;
+        line-height: 100upx;
+        font-size: 50upx;
+        // font-weight: bold;
+        margin: 0 -1upx -1upx 0;
+
+        &:hover {
+          z-index: 1;
+          border: 1upx solid #F1F1F1;
+        }
+      }
+
+      .handel-btn {
+        background: rgb(235, 237, 240);
+        font-size: 30upx;
+      }
+      .active-btn {
+        background: rgb(235, 237, 240);
+      }
+      .active-handel-btn {
+        background: rgb(252, 252, 252);
+      }
+    }
+  }
+}
+.triangle{
+	position: absolute;
+	    width: 0;
+	    height: 0;
+		left: 0;
+		
+		top: 28upx;
+		display: inline-block;
+	    border-top: 25upx solid transparent;
+	    border-left: 16upx solid #413634;
+	    border-bottom: 25upx solid transparent;
+}
+</style>
diff --git a/components/template/demandItem.vue b/components/template/demandItem.vue
new file mode 100644
index 0000000..fb7db87
--- /dev/null
+++ b/components/template/demandItem.vue
@@ -0,0 +1,442 @@
+<template>
+	<view class="demand">
+		<view class="demand-title f-32 f-w">
+			{{demanItem.typename || demanItem.name}}
+			<view class="stateo" v-if="demanItem.status" :style="{color: demanItem.status == '1'?'#1FBEA0':demanItem.status == '0'?'#999999':demanItem.status == '5'?'#ff4444':demanItem.status == '6'?'#ff4444':'#0099ff',border: demanItem.status == '1'?'1rpx solid #1FBEA0':demanItem.status == '0'?'1rpx solid #999999':demanItem.status == '5'?'1rpx solid #ff4444':demanItem.status == '6'?'1rpx solid #ff4444':'1rpx solid #0099ff'}">
+				{{demanItem.status == '1'?'发布中':demanItem.status == '0'?'已关闭':demanItem.status == '5'?'待审核':demanItem.status == '6'?'被驳回':'待支付'}}
+			</view>
+		</view>
+		<view class="stick" v-if="demanItem.topflag == 1">
+			<image :src="imgfixUrls + 'homemakingImg/zhiding.png'" mode=""></image>
+		</view>
+		<view class="demand-time f-24 col-9 p-top-10">
+			上门时间：{{demanItem.visitingtime}}
+		</view>
+		<view class="demand-time f-24 col-9 p-top-10" @click="conloding">
+			<text 
+			style="width: 600upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;display: inline-block;">上门地址：{{demanItem.address}}</text> 
+			<text style="float: right;color: #FF4444;display: inline-block;line-height: 26upx;" class="iconfont icon-locationfill"></text>
+		</view>
+		<view class="problemDescription f-28">
+			<text class="col-9 p-right-30">需求说明:</text>
+			<text class="col-3">{{demanItem.detail}}</text>
+		</view>
+		<view class="demand-img" v-if="demanItem.thumbs.length > 0">
+			<view class="img-item" v-for="(item,index) in demanItem.thumbs" @click="lookImg(index)" v-if="index < 3">
+				<image :src="item" mode="aspectFill"></image>
+				<view class="overspread" v-if="index == 2 && demanItem.thumbs.length > 3">
+					+{{demanItem.thumbs.length - 3}}
+				</view>
+			</view>
+		</view>
+		<view class="dis-flex chat" v-if="demanItem.mid != '0' && demanItem.nickname && demanItem.mid">
+			<image :src="demanItem.avatar" mode=""></image>
+			<view class="chatName">
+				{{demanItem.nickname}}
+			</view>
+			<view class="chatBtn" style="margin-right: 30upx;width: 150upx;" @click="call" v-if="demanItem.mobile && demanItem.mobile != 0">
+				电话联系
+			</view>
+			<view class="chatBtn" @click="chat">
+				聊天
+			</view>
+		</view>
+		<view class="demand-btn" v-if="demanItem.status == '3' || demanItem.status == '1' ||  demanItem.status == '6' || demanItem.status == '0' || demanItem.status == '5'">
+			<view class="soldOut" v-if="demanItem.status == '1'" @click="delet(0)">
+				下架
+			</view>
+			<view class="soldOut" style="background-color: #FF4444;color: #FFFFFF;border: none;" v-if="demanItem.status == '0'" @click="delet(1)">
+				上架
+			</view>
+			<view class="delete" v-if="demanItem.status == '1'" @click="delet(4)">
+				删除
+			</view>
+			<view class="payment" v-if="demanItem.status == '3'" @click="goPay">
+				去支付
+			</view>
+			<view  style="height: 50upx;display: inline-block;">
+				
+			</view>
+			<view class="regulator" v-if="demanItem.status == '1' ||  demanItem.status == '5'||  demanItem.status == '0' || demanItem.status == '6'" @click="compile">
+				管理
+			</view>
+		</view>
+		<PopManager :show="glshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="glshow = false">
+			<view class="glbox" v-if="myDemandData">
+				<view class="glitem" @click="redact">
+					编辑需求
+				</view>
+				<view class="glitem" @click="refresh" v-if="myDemandData.set.payrefstatus == 1 && demanItem.status != '6' && demanItem.status != '0' &&  demanItem.status != '5'">
+					{{myDemandData.refmoney || '0'}}元刷新需求
+				</view>
+				<view class="glitem" @click="top(item.day)" v-for="(item,index) in myDemandData.toparray" :key="index" v-if="myDemandData.set.payrefstatus == 1 && demanItem.status != '6' &&  demanItem.status != '5' &&  demanItem.status != '0'">
+					{{item.topprice}}元,置顶{{item.day}}天
+				</view>
+
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	export default{
+		data(){
+			return{
+				glshow:false
+			}
+		},
+		components:{
+			PopManager
+		},
+		props:{
+			demanItem:{
+				type:Object,
+				default:{}
+			},
+			myDemandData:{
+				type:Object,
+				default:null
+			},
+			refmoney:{
+				type:String,
+				default:''
+			}
+		},
+		methods:{
+			conloding(){
+				let storeInfo = {};
+				storeInfo = {
+					location:{
+						lat:this.demanItem.lat,
+						lng:this.demanItem.lng
+					},
+					address:this.demanItem.address
+				}
+				// #ifdef H5
+				
+				console.log(storeInfo);
+				wxApi.WxopenLocation(
+					storeInfo['location']['lat'],
+					storeInfo['location']['lng'],
+					storeInfo['address']
+				)
+				// #endif
+				// #ifdef MP-WEIXIN
+				App.openLocation(storeInfo)
+				// #endif
+				//#ifdef APP-PLUS
+				    Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['address'],'gcj02')
+				    //#endif
+			},
+			call(){
+				uni.makePhoneCall({
+					phoneNumber: this.demanItem.mobile
+				})
+			},
+			top(day){
+				App.showError(
+					`是否置顶此需求?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								id:this.demanItem.id,
+								day:day
+							}
+							App._post_form(
+								`&p=housekeep&do=TopDemand`,
+								data,
+								res => {
+									console.log(res);
+									
+									if(res.data.orderid != '0'){
+										App.navigationTo({
+											url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=housekeep' 
+										});
+									}else{
+										uni.showToast({
+											title:'置顶成功'
+										});
+									}
+									
+									// this.$emit('getMyDemandList');
+								},
+								false,
+								() => {
+									
+								}
+							);
+						}
+					},
+					true
+				);
+			},
+			refresh(){
+				App.showError(
+					`刷新会将此需求置顶,是否刷新此需求?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								id:this.demanItem.id
+							}
+							App._post_form(
+								`&p=housekeep&do=refreshDemand`,
+								data,
+								res => {
+									console.log(res);
+									
+									if(res.data.orderid != '0'){
+										App.navigationTo({
+											url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=housekeep' 
+										});
+									}else{
+										uni.showToast({
+											title:'刷新成功'
+										});
+									}
+									
+									// this.$emit('getMyDemandList');
+								},
+								false,
+								() => {
+									
+								}
+							);
+						}
+					},
+					true
+				);
+			},
+			chat(){
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.demanItem.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+				})
+			},
+			redact(){
+				App.navigationTo({
+					url: `pages/subPages2/homemaking/postDemand/postDemand?id=${this.demanItem.id}`
+				});
+			},
+			compile(){
+				this.glshow = true;
+				
+			},
+			delet(type){
+				App.showError(
+					`是否${type==0?'下架':type==0?'上架':'下架'}本条需求?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								dostatus:type,
+								id:this.demanItem.id
+							}
+							App._post_form(
+								`&p=housekeep&do=changeDemandStatus`,
+								data,
+								res => {
+									console.log(res);
+									uni.showToast({
+										title:res.message
+									});
+									this.$emit('getMyDemandList')
+								},
+								false,
+								() => {
+									
+								}
+							);
+						}
+					},
+					true
+				);
+				
+			},
+			// 去支付
+			goPay() {
+				// console.log(this.sid);
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + this.demanItem.payorderid + '&plugin=housekeep' 
+				});
+			},
+			lookImg(index){
+				uni.previewImage({
+					current: this.demanItem.thumbs[index], // 当前显示图片的http链接
+					urls: this.demanItem.thumbs // 需要预览的图片http链接列表
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.demand{
+		padding: 20upx;
+		background-color: #FFFFFF;
+		position: relative;
+		.stick{
+			width: 70upx;
+			height: 60upx;
+			position: absolute;
+			right: 0;
+			top: 0;
+			image{
+				width: 70upx;
+				height: 60upx;
+			}
+		}
+		.demand-title{
+			.stateo{
+				display: inline-block;
+				width: 90upx;
+				height: 36upx;
+				line-height: 36upx;
+				text-align: center;
+				color: #FF4444;
+				border: 1upx solid #FF4444;
+				border-radius: 6upx;
+				font-size: 24upx;
+				margin-left: 20upx;
+			}
+		}
+		.problemDescription{
+			padding: 20upx;
+			background-color: #F8F8F8;
+			border-radius: 20upx;
+			margin-top: 20upx;
+		}
+		.chat{
+			.chatName{
+				font-size: 26upx;
+				color: #333333;
+				line-height: 58upx;
+				flex: 1;
+			}
+			.chatBtn{
+				width: 120upx;
+				height: 60upx;
+				line-height: 60upx;
+				text-align: center;
+				font-size: 28upx;
+				font-weight: bold;
+				background: linear-gradient(180deg, #72AAFD 0%, #6094FD 100%);
+				opacity: 1;
+				border-radius: 10upx;
+				color: #FFFFFF;
+			}
+			padding: 20upx 0;
+			image{
+				width: 58upx;
+				height: 58upx;
+				border: 1upx solid #EEEEEE;
+				border-radius: 60upx;
+				margin-right: 10upx;
+			}
+		}
+		.demand-img:after{
+			content:'';
+			width:33.33%;
+		}
+		.demand-img{
+			display: flex;
+			display: -webkit-flex;
+			justify-content: space-between;
+			flex-direction: row;
+			flex-wrap: wrap;
+			padding-top: 20upx;
+			.img-item{
+				width: 210upx;
+				height: 210upx;
+				border-radius: 20upx;
+				position: relative;
+				image{
+					width: 100%;
+					height: 100%;
+					border-radius: 20upx;
+				}
+			}
+			.overspread{
+				width: 210upx;
+				height: 210upx;
+				line-height: 210upx;
+				text-align: center;
+				color: #FFFFFF;
+				border-radius: 20upx;
+				background-color: rgba(0,0,0,0.3);
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
+		}
+		.demand-btn{
+			padding-top: 20upx;
+			.soldOut{
+				height: 60upx;
+				width: 120upx;
+				border-radius: 10upx;
+				line-height: 60upx;
+				text-align: center;
+				border: 1upx solid #333333;
+				color: #333333;
+				font-size: 28upx;
+				font-weight: bold;
+				margin-right: 20upx;
+				display: inline-block;
+			}
+			.delete{
+				display: inline-block;
+				height: 60upx;
+				width: 120upx;
+				border-radius: 10upx;
+				line-height: 60upx;
+				text-align: center;
+				border: 1upx solid #FF4444;
+				color: #ff4444;
+				font-size: 28upx;
+				font-weight: bold;
+				margin-right: 20upx;
+			}
+			.payment{
+				display: inline-block;
+				height: 60upx;
+				width: 120upx;
+				border-radius: 10upx;
+				line-height: 60upx;
+				text-align: center;
+				border: 1upx solid #0099ff;
+				color: #0099ff;
+				font-size: 28upx;
+				font-weight: bold;
+				
+			}
+			.regulator{
+				display: inline-block;
+				height: 60upx;
+				width: 120upx;
+				border-radius: 10upx;
+				line-height: 60upx;
+				text-align: center;
+				background: linear-gradient(180deg, #72AAFD 0%, #6094FD 100%);
+				color: #FFFFFF;
+				font-size: 28upx;
+				font-weight: bold;
+				float: right;
+				margin-top: 10upx;
+			}
+			
+		}
+		.glbox{
+			width: 750upx;
+			background-color: #FFFFFF;
+			border-radius: 30upx 30upx 0 0;
+			.glitem{
+				height: 100upx;
+				line-height: 100upx;
+				border-bottom: 1upx solid #EEEEEE;
+				text-align: center;
+				font-size: 28upx;
+				color: #333333;
+			}
+		}
+	}
+</style>
diff --git a/components/template/diypages.vue b/components/template/diypages.vue
new file mode 100644
index 0000000..e8b59bb
--- /dev/null
+++ b/components/template/diypages.vue
@@ -0,0 +1,2137 @@
+<template>
+	<view>
+		<view class="diypages">
+			<view class="diypages-i" v-for="(item, key) in diypagesData" :key="key">
+				<!--  notice  公告1  -->
+				<view class="notice dis-flex flex-y-center padding-box" :style="'margin-bottom: '+(item.style.marginbottom*2)+'rpx'"
+				 v-if="item.id == 'notice'">
+					<view class="diy-notice-icon" :style="{'background-image':'url('+imageRoot+'diynotice.png)'}" v-if="imageRoot"></view>
+					<view class="notice-r">
+						<swiper :autoplay="notice.autoplay" :vertical="notice.vertical" @change="pmove" :circular="notice.circular" :interval="notice.interval"
+						 :duration="notice.duration">
+							<swiper-item v-for="(item2, key2) in item.data" :key="key2">
+								<view class="a movbox" @click="navigateTo(item2.link)"><view class="move" :style="{left: moveLeft + 'px'}">{{ item2.title }}</view></view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+
+				<!--  notice2  公告2  -->
+				<view class="notice notice2" :style="'margin-bottom: '+(item.style.marginbottom*2)+'rpx'" v-if="item.id == 'notice2'">
+					<view class="notice-l style2">
+						<view class="span">公告</view>
+					</view>
+					<view class="notice-r">
+						<swiper :autoplay="notice.autoplay" @change="pmove" :vertical="notice.vertical" :circular="notice.circular" :interval="notice.interval"
+						 :duration="notice.duration">
+							<swiper-item v-for="(item2, key2) in item.data" :key="key2">
+								<view class="a movbox" @click="navigateTo(item2.link)"><view class="move">{{ item2.title }}</view></view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+
+				<!--  notice3  公告3  -->
+				<view class="notice notice3" :style="'margin-bottom: '+(item.style.marginbottom)+'upx'" v-if="item.id == 'notice3'">
+					<view class="notice-l style3">
+						<view class="span">{{ item.params.title }}</view>
+					</view>
+					<view class="notice-r">
+						<swiper :autoplay="notice.autoplay" @change="pmove" :vertical="notice.vertical" :circular="notice.circular" :interval="notice.interval"
+						 :duration="notice.duration">
+							<swiper-item v-for="(item2, key2) in item.data" :key="key2">
+								<view class="a movbox" @click="navigateTo(item2.link)"><view class="move">{{ item2.title }}</view></view>
+							</swiper-item>
+						</swiper>
+					</view>
+				</view>
+				<!--  magic_cube  图片魔方  -->
+				<view class="magic_cube" :style="'height: calc(100vw * ('+item.height+' / '+item.style.width+') + '+(item.style.padding * 2)+'rpx);background-color: '+item.style.bgColor+';'"
+				 v-if="item.id == 'magic_cube'">
+					<view class="magic_cube-d-f" :style="'padding-top: '+item.style.padding+'rpx;'">
+						<view class="magic_cube-d" :style="'width: calc(100vw - '+(item.style.padding*4)+'rpx);height: calc(100vw - '+(item.style.padding*4)+'rpx);margin: '+(item.style.padding*2)+'rpx;'">
+							<view class="a magic_cube-i" :style="'width: calc(100% * ('+item2.width+' / '+item.style.width+'));height: calc(100% * ('+item2.height+' / '+item.style.width+')); padding: '+(item.style.padding*2)+'rpx; top: calc(100% * ('+item2.top+' / '+item.style.width+')); left: calc(100% * ('+item2.left+' / '+item.style.width+'));'"
+							 v-for="(item2, key2) in item.data" :key="key2" @click="navigateTo(item2.url)">
+								<view class="magic_cube-i-d">
+									<image class="image" :src="item2.imgurl"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!--  picturew  图片橱窗1  -->
+				<view class="imgwindow" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew'">
+					<view class="a imgwindow-i" v-for="(item2, key2) in item.data" :key="key2" @click="navigateTo(item2.linkurl)">
+						<view class="imgwindow-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;'">
+							<image class="image" :src="item2.imgurl" mode="widthFix"></image>
+						</view>
+					</view>
+				</view>
+
+				<!--  picturew2  图片橱窗2  -->
+				<view class="picturew2" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;margin-bottom: '+(item.style.marginBottom * 2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew2'">
+					<view class="a picturew2-i" v-for="(item2, key2) in item.data" :key="key2" @click="navigateTo(item2.linkurl)">
+						<view class="picturew2-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;'">
+							<image class="image" :src="item2.imgurl" mode="widthFix"></image>
+						</view>
+					</view>
+				</view>
+				<!--  picturew3  图片橱窗3  -->
+				<view class="picturew3" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;margin-bottom: '+(item.style.marginBottom * 2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew3'">
+					<view class="a picturew3-i" @click="navigateTo(item2.linkurl)" v-for="(item2, key2) in item.data" :key="key2">
+						<view class="picturew3-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;'">
+							<image class="image" :src="item2.imgurl" mode="widthFix"></image>
+						</view>
+					</view>
+					<!-- 					</navigator> -->
+				</view>
+
+				<!--  picturew4  图片橱窗4  -->
+				<view class="picturew4" :style="'margin-bottom: '+(item.style.marginBottom * 2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew4'">
+					<view class="a picturew4-i" @click="navigateTo(item2.linkurl)" v-for="(item2, key2) in item.data" :key="key2">
+						<view class="picturew4-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-right: 0;'"
+						 v-if="key2 == 0">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+						<view class="picturew4-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-bottom: '+((item.style.marginTopBottom / 2) * 2)+'rpx;'"
+						 v-if="key2 == 1">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+						<view class="picturew4-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-top: '+((item.style.marginTopBottom / 2) * 2)+'rpx;'"
+						 v-if="key2 == 2">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+					</view>
+				</view>
+
+				<!--  picturew5  图片橱窗5  -->
+				<view class="picturew5" :style="'margin-bottom: '+(item.style.marginBottom * 2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew5'">
+					<view class="a picturew5-i" v-for="(item2, key2) in item.data" :key="key2" @click="navigateTo(item2.linkurl)">
+						<view class="picturew5-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-right: 0;'"
+						 v-if="key2 == 0">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+						<view class="picturew5-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-bottom: '+((item.style.marginTopBottom / 2) * 2)+'rpx;'"
+						 v-if="key2 == 1">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+						<view class="picturew5-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-top: '+((item.style.marginTopBottom / 2) * 2)+'rpx; padding-right: '+((item.style.marginLeftRight / 2) * 2)+'rpx;'"
+						 v-if="key2 == 2">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+						<view class="picturew5-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; padding-top: '+((item.style.marginTopBottom / 2) * 2)+'rpx; padding-left: '+((item.style.marginLeftRight / 2) * 2)+'rpx;'"
+						 v-if="key2 == 3">
+							<image class="image" :src="item2.imgurl" mode="scaleToFill"></image>
+						</view>
+					</view>
+				</view>
+
+				<!-- picturew6  图片橱窗6 -->
+				<view class="picturew6" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx; margin-bottom: '+(item.style.marginBottom * 2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'picturew6'">
+					<view class="a picturew6-i" v-for="(item2, key2) in item.data" :key="key2" @click="navigateTo(item2.linkurl)">
+						<view class="picturew6-i-d" :style="'padding: '+(item.style.marginTopBottom * 2)+'rpx '+(item.style.marginLeftRight * 2)+'rpx;'">
+							<image class="image" :src="item2.imgurl" mode="widthFix"></image>
+						</view>
+					</view>
+				</view>
+
+				<!-- pictures  图片展播 -->
+				<!-- pictures  图片展播 -->
+								<view class="pictures" :style="'background-color: '+item.style.background" v-if="item.id == 'pictures'">
+									<scroll-view scroll-x class="pictures-scroll" :style="'height: ((((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+') * '+item.data.length+') * ('+item.max_height+' / '+item.max_width+') + '+(item.style.paddingleft * 2)+');'"
+									 v-if="item.params.showtype == '1'">
+										<view class="pictures-d" :class="{picturesd: item.params.showtype == '0'}" :style="'width: calc(((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+') * '+item.data.length+'); padding: '+(item.style.paddingtop * 2)+'rpx '+(item.style.paddingleft * 2)+'rpx;'">
+											<view :class="'a pictures-i row-'+item.params.rownum" @click="navigateTo(item2.linkurl)" :style="'width: calc((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+'); padding: '+(item.style.paddingtop * 2)+'rpx '+(item.style.paddingleft * 2)+'rpx;'"
+											 v-for="(item2, key2) in item.data" :key="key2">
+												<view class="image">
+													<!-- <view class="image" :style="{'background-image':'url('+item2.imgurl+')','height':' calc((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+ ')','background-size':'100% '+ 'calc((100vw -' + ((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum + ')'}"></view> -->
+													<image class="image" :src="item2.imgurl" 　mode="aspectFit" @load="ImgLoad" :style="{'height':' calc((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+ ')','background-size':'100% '+ 'calc((100vw -' + ((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum + ')'}"></image>
+													<view class="title" :style="'color: '+item.style.titlecolor+'; text-align: '+item.style.titlealign+';bottom:' + imgHeights[key2] + ';'"
+													 v-if="item2.title !== '' && item2.title !== null">{{ item2.title }}</view>
+												</view>
+												<view class="text" :style="'color: '+item.style.textcolor+'; text-align: '+item.style.titlealign+';bottom:' + imgHeights[key2] + ';'"
+												 v-if="item2.text !== '' && item2.text !== null">{{ item2.text }}</view>
+											</view>
+										</view>
+									</scroll-view>
+									<view class="pictures-scroll" :style="'padding: '+(item.style.paddingtop * 2)+'rpx '+(item.style.paddingleft * 2)+'rpx;'"
+									 v-else>
+										<view class="pictures-d" :class="{picturesd: item.params.showtype == '0'}">
+											<view :class="'a pictures-i pictures-i-two row-'+item.params.rownum" @click="navigateTo(item2.linkurl)" :style="'width: calc((100vw - '+(item.style.paddingleft * 4)+'rpx) / '+item.params.rownum+'); padding: '+(item.style.paddingtop * 2)+'rpx '+(item.style.paddingleft * 2)+'rpx;'"
+											 v-for="(item2, key2) in item.data" :key="key2">
+												<view class="image">
+													<image class="image" :src="item2.imgurl" 　mode="widthFix" @load="ImgLoad" :style="{'background-size':'100% '+ 'calc((100vw -' + ((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum + ')'}"></image>
+													<!-- <view class="image" :style="{'background-image':'url('+item2.imgurl+')','height':' calc((100vw - '+((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum+ ')','background-size':'100% '+ 'calc((100vw -' + ((item.style.paddingleft * 4) + (item.style.paddingleft * 4))+'rpx) / '+item.params.rownum + ')'}"></view> -->
+													<view class="title" :style="'color: '+item.style.titlecolor+'; text-align: '+item.style.titlealign+';'" v-if="item2.title !== '' && item2.title !== null">{{ item2.title }}</view>
+												</view>
+												<view class="text" :style="'color: '+item.style.textcolor+'; text-align: '+item.style.titlealign+';'" v-if="item2.text !== '' && item2.text !== null">{{ item2.text }}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+
+				<!-- banner  图片轮播 -->
+				<view class="imgswiper" :style="'margin-bottom: '+(item.style.bottom*2)+'rpx;height:' + (item.params.img_height - (item.style.side_margin=='1'?30:0)) + 'px;width:' + 0 + 'px'" v-if="item.id == 'banner'">
+					<!-- :style="'height:'+bannerimgheights[bannerIndex][bannercurrent]+'px;'" -->
+					<!-- :style="{'height':[cliType==='3'?bannerSwiperList:bannerDataList][cliType==='3'?bannercurrent:bannerIndex][bannercurrent]['imgHeight']+'rpx'"} -->
+					<!-- #ifdef H5 -->
+						<!-- <swiper v-if="!!item.data" class="swiper swiperBanner-marbtm default-swh" :style="{height:(item.params.img_height - (item.style.side_margin=='1'?30:0))+'px',width:(item.params.img_width - (item.style.side_margin=='1'?30:0)) + 'px'}"
+						 :class="{
+								imgmarginlr:item.style.side_margin=='1',
+								swiperBanner_rectangle:item.style.dotstyle==='rectangle',
+								swiperBanner_dotsquare:item.style.dotstyle==='square',
+								swiperBanner_left:item.style.dotalign==='left',
+								swiperBanner_right:item.style.dotalign==='right'}"
+						 :indicator-dots="banner.indicatorDots" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)"
+						 :autoplay="banner.autoplay" :interval="banner.interval" :duration="banner.duration" @change="bannerChange">
+							<swiper-item :class="{'banner-swiper-Item':item.style.side_margin=='1'}" v-for="(item2, key2,index) in item.data"
+							 :key="key2" @click="navigateTo(item2.linkurl)">
+								<image class="image" :data-key="item2.order" :data-id="item2.order" :src="item2.imgurl" :style="{height:(item.params.img_height - (item.style.side_margin=='1'?30:0))+'px',width:(item.params.img_width - (item.style.side_margin=='1'?30:0)) + 'px'}"></image>
+							</swiper-item>
+						</swiper> -->
+					<!-- #endif -->
+					
+					<swiper v-if="!!item.data" class="swiper swiperBanner-marbtm default-swh" :style="{height:(item.params.img_height - (item.style.side_margin=='1'?30:0))+'px',width:(item.params.img_width - (item.style.side_margin=='1'?30:0)) + 'px'}"
+					 :class="{imgmarginlr:item.style.side_margin=='1'}"
+					 :indicator-dots="false" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)"
+					 :autoplay="banner.autoplay" :interval="banner.interval" :duration="banner.duration" @change="bannerChange">
+						<swiper-item :class="{'banner-swiper-Item':item.style.side_margin=='1'}" v-for="(item2,key2) in item.data"
+						 :key="key2" @click="navigateTo(item2.linkurl)">
+							<image class="image" :data-key="item2.order" :data-id="item2.order" :src="item2.imgurl" :style="{height:(item.params.img_height - (item.style.side_margin=='1'?30:0))+'px',width:(item.params.img_width - (item.style.side_margin=='1'?30:0)) + 'px'}"></image>
+						</swiper-item>
+					</swiper>
+					<view 
+					:class="{bnnerBox:true,
+					swiperBanner_left:item.style.dotalign==='left',
+					swiperBanner_right:item.style.dotalign==='right'}"
+					:style="{left:item.style.dotalign==='left'?'4%':item.style.dotalign==='right'?'auto':'50%',
+					right:item.style.dotalign==='left'?'auto':item.style.dotalign==='right'?'4%':'auto',
+					transform: item.style.dotalign==='left'|| item.style.dotalign==='right'?'translateX(0%)':'translateX(-50%)'}">
+						<view 
+						:class="{bnnerItem:true,
+						swiperBanner_rectangle:item.style.dotstyle==='rectangle',
+						swiperBanner_dotsquare:item.style.dotstyle==='square'}"
+						:style="{backgroundColor: `rgba(255,255,255,${bannercurrent == key2?'1':'0.4'})`
+						,width:item.style.dotstyle==='rectangle'?'40rpx':'20upx',
+						height:item.style.dotstyle==='rectangle'?'20rpx':'20upx',
+						borderRadius:item.style.dotstyle==='rectangle' || item.style.dotstyle==='square'?'0':'50%'
+						}"
+						v-for="(item2,key2,index) in item.data" :key="index">
+							
+						</view>
+						<!-- <view class="bnnerItem">
+							
+						</view>
+						<view class="bnnerItem">
+							
+						</view> -->
+					</view>
+					
+				</view>
+
+				<!-- banner2  图片轮播2 -->
+				<view class="imgswiper2" :class="item.style.dotstyle" :style="'margin-bottom: '+(item.style.marginBottom)+'upx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'banner2'">
+					<Imgswipertwo :imgswipertwoData="item" />
+				</view>
+				
+				
+				<!-- 推荐服务者 -->
+				<view class="referralWaiter b-f" v-if="item.id == 'house_keep'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: '0 ' + item.style.padding + 'px'}">
+					<view class="referralWaiter-title dis-flex" v-if="item.params.show_title == '1'">
+						<view class="f-36 col-3 f-w flex-box">
+							{{item.params.title}}
+						</view>
+						<view class="t-r f-24 col-9 flex-box" v-if="item.params.show_more == '1'" @click="navigateTo('pages/subPages2/homemaking/homemakingMerchant/homemakingMerchant')">
+							更多
+							<text style="font-size: 24upx;color: #999999;line-height: 50upx;" class="iconfont icon-right"></text>
+						</view>
+					</view>
+					<view class="referralWaiter-content dis-flex">
+						<view class="referralWaiter-item" v-if="items.service_type == 1" v-for="(items,indexs) in item.data" :key="indexs" @click="navigateTo(`pages/mainPages/store/index?sid=${items.id}`)">
+							<view class="referral-tag" v-if="item.params.jbstatus != 2" style="left: 0;top: 0;">
+								商户服务商
+							</view>
+							<image class="referralWaiter-item-img" :src="items.long_logo" mode="aspectFill"></image>
+							<view class="f-24 col-3 t-l homemaking-name">
+								{{items.name}}
+							</view>
+							<view class="homemaking-tags">
+								<view class="homemaking-tags-item" v-for="(itemss,indexss) in items.label">
+									{{itemss}}
+								</view>
+							</view>
+						</view>
+						<view class="referralWaiter-item" v-if="items.service_type == 2"  v-for="(items,indexs) in item.data" :key="indexs" @click="navigateTo(`pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter?mid=${items.mid}&id=${items.id}`)">
+							<view class="referral-tag"  style="left: 0;top: 0;" v-if="item.hidepersontag != 1 && item.params.jbstatus != 2">
+								个人服务商
+							</view>
+							<image class="referralWaiter-item-img" :src="items.long_logo" mode="aspectFill"></image>
+							<view class="f-24 col-3 t-l homemaking-name">
+								{{items.name}}
+							</view>
+							<view class="homemaking-tags">
+								<view class="homemaking-tags-item" v-for="(itemss,indexss) in items.label">
+									{{itemss}}
+								</view>
+							</view>
+						</view>
+						<view class="referralWaiter-item" v-if="items.service_type == 3"  v-for="(items,indexs) in item.data" :key="indexs">
+							<view class="referral-tag" v-if="item.params.jbstatus != 2" style="left: 0;top: 0;">
+								客户需求
+							</view>
+							<image class="referralWaiter-item-img" :src="items.long_logo" mode="aspectFill"></image>
+							<view class="f-24 col-3 t-l homemaking-name">
+								{{items.name}}
+							</view>
+							<view class="homemaking-tags" style="padding: 0 20upx;">
+								<view class="homemaking-tags-item" v-for="(itemss,indexss) in items.label">
+									{{itemss}}
+								</view>
+							</view>
+							<view style="margin-left: 20upx;">
+								<view class="homemaking-btn" @click.stop="call(items)">
+									电话联系
+								</view>
+								<view class="homemaking-btn" @click.stop="chat(items)">
+									聊天
+								</view>
+							</view>
+							
+						</view>
+						<view class="referralWaiter-item" v-if="items.service_type == 4"  v-for="(items,indexs) in item.data" :key="indexs" @click="navigateTo(`pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${items.id}`)">
+							<view class="referral-tag" v-if="item.params.jbstatus != 2" style="left: 0;top: 0;">
+								服务项目
+							</view>
+							<image class="referralWaiter-item-img" :src="items.long_logo" mode="aspectFill"></image>
+							<view class="f-24 col-3 t-l homemaking-name">
+								{{items.name}}
+							</view>
+							<view class="homemaking-tags" style="padding: 0 20upx;">
+								<view class="homemaking-tags-item" v-for="(itemss,indexss) in items.label">
+									{{itemss}}
+								</view>
+							</view>
+							<view style="margin-left: 20upx;">
+								<text class="refText">{{items.price}}</text>
+								<text style="font-size: 20upx;color: #999999;display: inline-block;position: relative;bottom: 6upx;">销量:{{items.salenum}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<view class="referralWaiter b-f" v-if="item.id == 'house_keep2'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.padding + 'px'}">
+					<view  v-for="(items,indexs) in item.data" :key="indexs">
+						<view v-if="items.service_type == 1 || items.service_type == 2" style="margin-top: 20upx;position: relative;">
+							<view class="referral-tag" v-if="item.params.jbstatus != 2">
+								{{items.service_type == 1?'商户服务商':item.hidepersontag ==1?'':'个人服务商'}}
+							</view>
+							<homemaking-item :items="items"></homemaking-item>
+						</view>
+						<view v-if="items.service_type == 3" style="margin-top: 20upx;border-radius: 20upx;overflow: hidden;position: relative;">
+							<demand-item :demanItem="items"></demand-item>
+							<view class="referral-tag" v-if="item.params.jbstatus != 2" style="left: 80%;">
+								客户需求
+							</view>
+						</view>
+						<view v-if="items.service_type == 4" style="margin-top: 20upx;position: relative;">
+							<myser-item :states="false" :serItem="items"></myser-item>
+							<view class="referral-tag" v-if="item.params.jbstatus != 2">
+								服务项目
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 推荐服务者 -->
+				
+				<!-- 家政列表 -->
+				<view class="homemakingList" v-if="item.id == 'shop222222222'">
+					<view >
+						<v-tabs
+						:lineScale="0.15" 
+						:lineRadius="'100rpx 100rpx 0 0'" 
+						:lineHeight="'8rpx'" 
+						:fontSize="'28rpx'"
+						:activeFontSize="'36rpx'"
+						:bold="true"
+						:height="'120rpx'"
+						:paddingItem="'0 22rpx 20rpx'" 
+						:activeColor="'#333333'" 
+						:lineColor="'#333333'"
+						:color="'#999999'"
+						v-model="sort" 
+						:scroll="false"
+						@change="vtabschange"
+						:tabs="['服务商家','客户需求']">
+						</v-tabs>
+						<!-- <v-tabs v-model="activeTab" :scroll="false" :tabs="['全部', '进行中', '已完成']"></v-tabs> -->
+					</view>
+					<view class="homemakingList-boex">
+						<view  v-for="(item,index) in [1,2]">
+							<homemaking-item></homemaking-item>
+						</view>
+						
+					</view>
+				</view>
+				<!-- 家政列表 -->
+				
+				<!-- 相亲统计 -->
+				<view class="blind" v-if="item.id == 'dating_statistics'">
+					<view class="blind-item dis-il-block m-right20" :style="{backgroundColor: item.params.user.backgroundColor}">
+						<view class="f-48 f-w" :style="{color: item.params.user.numberColor}">
+							{{item.params.user.statistics}}
+						</view>
+						<view class="dis-flex">
+							<view class="flex-box f-24" :style="{color: item.params.user.titleColor,lineHeight: '80rpx'}">
+								{{item.params.user.title}}
+							</view>
+							<view class="flex-box">
+								<image style="width: 58upx;height: 54upx;float: right;" :src="item.params.user.icon" mode=""></image>
+							</view>
+						</view>
+					</view>
+					<view class="blind-item dis-il-block" :style="{backgroundColor: item.params.pv.backgroundColor}">
+						<view class="f-48 f-w" :style="{color: item.params.pv.numberColor}">
+							{{item.params.pv.statistics}}
+						</view>
+						<view class="dis-flex">
+							<view class="flex-box f-24" :style="{color: item.params.pv.titleColor,lineHeight: '80rpx'}">
+								{{item.params.pv.title}}
+							</view>
+							<view class="flex-box">
+								<image style="width: 65upx;height: 46upx;float: right;" :src="item.params.pv.icon" mode=""></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 相亲推荐列表 -->
+				<view class="blindList" v-if="item.id == 'dating_user'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'rpx',padding: item.style.padding + 'rpx'}">
+					<scroll-view scroll-y="true" class="scroll">
+						<view class="nav-content">
+							<view class="nav-item" v-for="(items,indexs) in item.data" :key="indexs">
+								<user :memberInfo="items"></user>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				
+				
+				<!-- 同城配送一 -->
+				<view class="distribution" v-if="item.id == 'citydelivery_goods'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.padding + 'px'}">
+					<citydeliveryGoods :goodItem="item"></citydeliveryGoods>
+				</view>
+				
+				<!-- 同城配送二 -->
+				<view class="distribution" v-if="item.id == 'citydelivery_goods2'" :style="{background: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.padding + 'px'}">
+					<citydeliveryGoods :goodItem="item"></citydeliveryGoods>
+				</view>
+				
+				<!-- 同城配送三 -->
+				<view class="distribution" v-if="item.id == 'citydelivery_goods3'" :style="{background: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.padding + 'px'}">
+					<citydeliveryGoods :goodItem="item"></citydeliveryGoods>
+				</view>
+				
+				<!-- 同城配送四 -->
+				<view class="distribution" v-if="item.id == 'citydelivery_goods4'" :style="{background: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.padding + 'px'}">
+					<citydeliveryGoods :goodItem="item"></citydeliveryGoods>
+				</view>
+				
+				<!-- 积分商品一 -->
+				<view class="integralGood"  v-if="item.id == 'integral_goods'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.margin + 'px'}">
+					<integralGood :padding="item.style.padding" :integralGoodLsit="item.data" :pid="item.id"></integralGood>
+				</view>
+				
+				<!-- 积分商品二 -->
+				<view class="integralGood"  v-if="item.id == 'integral_goods2'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.margin + 'px'}">
+					<integralGood :padding="item.style.padding" :integralGoodLsit="item.data" :pid="item.id"></integralGood>
+				</view>
+				
+				<!-- 积分商品三 -->
+				<view class="integralGood"  v-if="item.id == 'integral_goods3'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.margin + 'px'}">
+					<integralGood :padding="item.style.padding" :integralGoodLsit="item.data" :pid="item.id"></integralGood>
+				</view>
+				
+				<!-- 积分商品四 -->
+				<view class="integralGood"  v-if="item.id == 'integral_goods4'" :style="{backgroundColor: item.style.bgColor,marginBottom: item.style.marginBottom + 'px',padding: item.style.margin + 'px'}">
+					<integralGood :padding="item.style.padding" :integralGoodLsit="item.data" :pid="item.id"></integralGood>
+				</view>
+				
+				<!-- richtext  富文本 -->
+				<view class="richtext" :style="'padding: '+(item.style.padding*2)+'rpx; background-color: '+item.style.background"
+				 v-if="item.id == 'richtext'">
+					<!-- <wx-parse :content="item.params['content']"></wx-parse> -->
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+					 selectable show-with-animation use-anchor :html="item.params['content']"></jyf-parser>
+				</view>
+
+				<!-- title  标题1 -->
+				<view class="titlebar" :style="'margin-bottom: '+(item.style.paddingBottom*2)+'rpx; background-color: '+item.style.background+'; text-align: '+item.style.textalign"
+				 v-if="item.id == 'title'">
+					<view class="titlebar-d" :style="'color: '+item.style.color">
+						<view class="i" :class="item.params.icon" v-if="item.params.icon !== '' && item.params.icon !== null"></view>
+						<view class="text">{{ item.params.title }}</view>
+					</view>
+					<view class="more" v-if="item.params.link && item.params.link !== null">
+						<view class="a" v-if="item.params.butname && item.params.butname !== null" @click="navigateTo(item.params.link)">
+							<view class="span">{{ item.params.butname }}</view>
+							<view class="i icon iconfont icon-right"></view>
+						</view>
+						<view class="a" v-else @click="navigateTo(item.params.link)">更多<view class="i icon iconfont icon-right"></view>
+						</view>
+					</view>
+				</view>
+
+				<!-- title2  标题2 -->
+				<view class="titlebar2" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx; background-color: '+item.style.bgColor+'; text-align: '+item.style.textalign"
+				 v-if="item.id == 'title2'">
+					<view class="titlebar2-t">
+						<view class="h1 vcssopen" :style="'color: '+item.style.mainColor+';text-align: '+item.style.mainAlign">{{ item.params.mainText }}</view>
+						<view class="p" :style="'color: '+item.style.viceColor+';text-align: '+item.style.mainAlign">{{ item.params.viceText }}</view>
+					</view>
+					<view class="more" style="top: 6upx;" v-if="item.params.link && item.params.link !== null">
+						<view class="a" @click="navigateTo(item.params.link)" v-if="item.params.butname && item.params.butname !== null">
+							<view class="span">{{ item.params.butname }}</view>
+							<view class="i icon iconfont icon-right"></view>
+						</view>
+						<view class="a" @click="navigateTo(item.params.link)" v-else>更多<view class="i icon iconfont icon-right"></view>
+						</view>
+					</view>
+				</view>
+
+				<!-- search search2  搜索框1和搜索框2 -->
+				<view class="searchbox" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx; background-color: '+item.style.background"
+				 v-if="item.id == 'search' || item.id == 'search2'">
+					<view class="a searchbox-d" :class="{radius: item.style.searchstyle == 'radius', round: item.style.searchstyle == 'round'}"
+					 :style="'background-color: '+item.style.inputbackground+'; text-align: '+item.style.textalign" v-if="item.id == 'search'"
+					 @click="naviGa(item.params.search_type,true)">
+						<view class="searchbox-d-inl">
+							<view class="i icon iconfont icon-search" :style="'color: '+item.style.iconcolor"></view>
+							<view class="text" :style="'color: '+item.style.color">{{ item.params.placeholder }}</view>
+						</view>
+					</view>
+					<view class="searchbox2 dis-flex flex-y-center" v-if="item.id == 'search2'">
+						<!-- <view class="searchbox2-l dis-flex flex-y-center" :style="'color: '+item.style.areaColor" @click="navigateTo('pages/subPages/city/city')">
+							<image :src="imgfixUrls + 'diypage/city.png'" v-if="imgfixUrls"></image>
+							<view class="span f-28 onelist-hidden">{{!!switchCity?switchCity:currentaidCity }}</view>
+						</view> -->
+						<!-- 新加注释 - 技能培训等，新增返回按钮 -->
+						<view class="search-h-t1-r f-30" style="color: #999999;" @click="cancelBtn">
+							<view class="search-h-t1-r-lk" style="padding-right: 20upx;height: 30px;line-height: 30px;margin-top: 4px;"><text class="iconfont icon-pullleft" style="font-size: 30upx;padding-right: 10upx;"></text>返回</view>
+						</view>
+						<!-- <navigator class="searchbox2-l" url="/pages/subPages/search/search" hover-class="none" :style="'color: '+item.style.areaColor">
+						<! </navigator> -->
+						<view class="searchbox2-r">
+							<view class="a searchbox-d" style="padding-bottom: 0;" :class="{radius: item.style.searchstyle == 'radius', round: item.style.searchstyle == 'round'}"
+							 :style="'background-color: '+item.style.inputbackground+'; text-align: '+item.style.textalign">
+								<view class="searchbox-d-inl" style="display: flex;">
+									<view class="i icon iconfont icon-search" :style="'color: '+item.style.iconcolor"></view>
+									<input :placeholder-style="'color: '+item.style.color" class="text" type="text" v-model="bussiKey"
+									 :placeholder="item.params.placeholder" @focus="naviGa(item.params.search_type)" />
+									<text class="showSea" v-if="showS" @click="searchBussi" :style="'color:' + item.style.iconcolor+ ';margin-top:5rpx;font-size:28rpx'">搜索</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!--  search3  搜索框3  -->
+				<view class="searchbox3" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx; background-color: '+item.style.background"
+				 v-if="item.id == 'search3'">
+					<view class="searchbox3-d">
+						<view class="searchbox3-l" :style="'color: '+item.style.titlecolor">
+							{{ item.params.textcontent }}
+						</view>
+						<view class="searchbox3-r">
+							<view class="a" @click="naviGa(item.params.search_type,true)">
+								<view class="searchbox3-r-d dis-flex flex-x-center" :style="'color: '+item.style.iconcolor+';background-color: '+item.style.inputbackground+''">
+									<view class="i icon iconfont icon-search inline"></view>
+									<view class="f-24">搜索</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="search-wave">
+						<view class="search-wave-d">
+							<view class="search-wave-i wave-i1">
+								<image class="image" :src="imgfixUrls + 'wave-i1.png'" mode="aspectFit"></image>
+							</view>
+							<view class="search-wave-i wave-i2">
+								<image class="image" :src="imgfixUrls + 'wave-i2.png'" mode="aspectFit"></image>
+							</view>
+							<view class="search-wave-i wave-i3">
+								<image class="image" :src="imgfixUrls + 'wave-i1.png'" mode="aspectFit"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!--  line  辅助线  -->
+				<view class="subline" :style="'padding: '+(item.style.padding*2)+'rpx '+(item.style.leftpadding*2)+'rpx; background-color: '+item.style.background"
+				 v-if="item.id == 'line'">
+					<view class="subline-d" :style="'border-top: 2rpx '+item.style.linestyle+' '+item.style.bordercolor+';'"></view>
+				</view>
+
+				<!--  menu  按钮组 - 新加注释 - 首页的按钮组使用这个 -->
+				<view class="btngroup" :style="{marginBottom:item.style.marginbottom*2+'rpx',backgroundColor:item.btngroupData.backgroundColor,padding:'0'+' '+item.style.leftRight*2+'rpx'}"
+				 v-if="item.id == 'menu'">
+					<tab-menu :menuId="item.id" :btngroupData="item.btngroupData"></tab-menu>
+				</view>
+				
+				<!--  menu  按钮组  -->
+				<view class="btngroup" :style="{marginBottom:item.style.marginbottom*2+'rpx',backgroundColor:item.btngroupData.backgroundColor,padding:'0'+' '+item.style.leftRight*2+'rpx'}"
+				 v-if="item.id == 'menu2'">
+					<tab-menu :menuId="item.id" :btngroupData="item.btngroupData"></tab-menu>
+				</view>
+				
+				<!--  blank  辅助空白  -->
+				<view class="sublank" :style="'height: '+(item.style.height*2)+'rpx; background-color: '+item.style.background+';'"
+				 v-if="item.id == 'blank'"></view>
+
+				<!--  picture  单图组  -->
+				<view class="oneimgroup" v-if="item.id == 'picture'">
+					<navigator class="a oneimgroup-i" :url="item2.linkurl" :open-type="item2.url_type" hover-class="none" v-for="(item2, key2) in item.data"
+					 :key="key2">
+						<image class="image" :src="item2.imgurl" mode="widthFix"></image>
+					</navigator>
+				</view>
+
+				<!--  rush_goods  抢购1  -->
+				<view class="rush_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'rush_goods'">
+					<goods-style goodsStyleType="rush" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+				<!--  rush_goods2  抢购2  -->
+				<view class="rush_goods2" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'rush_goods2'">
+					<goods-style goodsStyleType="rush2" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+
+				<!--  rush_goods3  抢购3  // 砍价 // 团购  -->
+				<view class="rush_goods3" v-if="item.id == 'rush_goods3' || item.id == 'groupon_goods3' || item.id == 'bargain_goods3' || item.id =='fightgroup_goods4'"
+				 :style="{marginBottom:item.style.marginBottom*2+'rpx',backgroundColor:item.style.bgColor,padding:item.style.margin*2+'rpx'}">
+					<goods-style goodsStyleType="goodsStyle3" :goodslistData="item.data" @remindSuccess="remindSuccess()"
+					 :isdiyPageStyle="item.style" :isdiyPage="true" :isdiyPageParams="item.params"></goods-style>
+				</view>
+				
+				<!-- 公众号跳转小程序 -->
+				<view v-if="item.id == 'jump_wxapp'">
+					<Skip :AppData="item.params"></Skip>
+				</view>
+				
+				<!-- 同城活动 -->
+				<view class="rush_goods3" v-if="item.id == 'activity_goods'" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}">
+					<activityData :tabDataList="item.data"></activityData>
+				</view>
+				<!-- 大礼包组件1 -->
+				<block v-if="item.id =='packages'">
+					<view :style="{ 'margin-bottom': (item.style.marginBottom*2)+'rpx;','background-color': item.style.bgColor}">
+						<giftbag-components :giftData="item" giftType="gift_type1" :isdiyPageStyle="item.style" :isdiyPage="true"
+						 :isdiyPageParams="item.params"></giftbag-components>
+					</view>
+				</block>
+				<!-- 折扣卡1 -->
+				<block v-if="item.id =='discount_card'">
+					<view :style="{ 'margin-bottom': (item.style.marginBottom*2)+'rpx;','background-color': item.style.background}">
+						<card-components :disCardData="item" disCardType="disCard1" :isdiyPageStyle="item.style" :isdiyPage="true"
+						 :isdiyPageParams="item.params" style="background-color: #F6F6F6;"></card-components>
+					</view>
+				</block>
+				<!-- 选择地区 -->
+				<block v-if="item.id=='area_select'">
+					<region :regionStyle="item.style" :regionParams="item.params"></region>
+				</block>
+				<!-- 选项卡1 -->
+				<block v-if="item.id=='options'">
+					<tab-contro :tabData="item.data" :city_id="city_id" :tabStyle="item.style" :controType="item.id" :tabParmsType="[item.params]"></tab-contro>
+				</block>
+				<!-- 选项卡2 - 新加注释 - 首页点进去的技能培训等，旧标题抢购首页 -->
+				<block v-if="item.id=='options2'">
+					<!-- <tab-contro :tabData="item.data" :city_id="city_id" :tabStyle="item.style" :controType="item.id" :tabParmsType="[item.params]"></tab-contro> -->
+					<tab-contro :tabData="item.data" :newCC_id="item.newCC_id" :city_id="city_id" :tabStyle="item.style" :controType="item.id" :tabParmsType="[item.params]"></tab-contro>
+				</block>
+				<!-- 商铺入驻 -->
+				<block v-if="item.id=='shop_join'">
+					<shop-enter :swiperContainer="item.data" :swiperParams="item.params"></shop-enter>
+				</block>
+				<!-- 砍价1 -->
+				<view class="groupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'bargain_goods'">
+					<goods-style goodsStyleType="bargain" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true" :isdiyPageParams="item.params"></goods-style>
+				</view>
+				<!-- 砍价2 -->
+				<view class="groupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'bargain_goods2'">
+					<goods-style goodsStyleType="bargain2" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true" :isdiyPageParams="item.params"></goods-style>
+				</view>
+				<!--  groupon_goods  团购1  -->
+				<view class="groupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'groupon_goods'">
+					<goods-style goodsStyleType="groupon" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+				<!--  groupon_goods2  团购2  -->
+				<view class="groupon_goods2" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'groupon_goods2'">
+					<goods-style goodsStyleType="rush2" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+
+				<!--  groupon_goods4  团购4 // 砍价4 //  拼团4  //  抢购4 -->
+				<view class="rush_goods4" v-if="item.id == 'groupon_goods4' ||item.id == 'bargain_goods4' || item.id =='fightgroup_goods3' || item.id =='rush_goods4'">
+					<goods-components :goodsData="item" goodsType="goods_type1"></goods-components>
+				</view>
+
+				<!--  coupon_goods  优惠券1  -->
+				<view class="coupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'coupon_goods'">
+					<goods-style goodsStyleType="coupon" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+				<!--  coupon_goods  优惠券2  -->
+				<view class="coupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx'}"
+				 v-if="item.id == 'coupon_goods2'">
+					<goods-style goodsStyleType="coupon2" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+				<!--  coupon_goods  优惠券3  -->
+				<view class="coupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx'}"
+				 v-if="item.id == 'coupon_goods3'">
+					<goods-style goodsStyleType="coupon3" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+				<!--  coupon_goods  优惠券4  -->
+				<view class="coupon_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx'}"
+				 v-if="item.id == 'coupon_goods4'">
+					<goods-style goodsStyleType="coupon4" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true"></goods-style>
+				</view>
+
+				<!-- 拼团1 -->
+				<view class="fightgroup_goods" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'fightgroup_goods'">
+					<goods-style goodsStyleType="fight" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true" :isdiyPageParams="item.params"></goods-style>
+				</view>
+				<!--  fightgroup_goods2  拼团2  -->
+				<view class="fightgroup_goods2" :style="{marginBottom:item.style.marginBottom*2+'rpx',padding:item.style.margin*2+'rpx',backgroundColor:item.style.bgColor}"
+				 v-if="item.id == 'fightgroup_goods2'">
+					<goods-style goodsStyleType="fight2" :goodslistData="item.data" @remindSuccess="remindSuccess()" :isdiyPageStyle="item.style"
+					 :isdiyPage="true" :isdiyPageParams="item.params"></goods-style>
+				</view>
+				<!--  public_goods  通用商品  -->
+				<view class="public_goods"  :style="{marginBottom:item.style.marginBottom*2+'rpx',margin:item.style.margin*2+'rpx',padding:item.style.padding +'rpx',backgroundColor:item.style.bgColor}" v-if="item.id == 'public_goods'">
+					<view class="transverse">
+						<scroll-view class="transverse_list" scroll-x>
+							<view class="goods_father">
+								<view class="goods_item" v-for="(item2, key2) in item.data" :key="key2">
+									<view class="a" @click="navigateTo(item2.url)">
+										<view class="goods_img">
+											<image class="image" :src="item2.logo" mode="scaleToFill"></image>
+											<view class="rush_goods_mask" v-if="item2.goods_state && (item2.goods_state == 2 || item2.stk == 0) && item2.plugin == 'rush'">
+												<view class="rush_goods_mask_img">
+													<image class="img" :src="imgfixUrls + 'rush_goods_end.png'" v-if="item2.goods_state == 2 && item2.stk > 0"
+													 mode="scaleToFill"></image>
+													<image class="img" :src="imgfixUrls + 'rush_goods_sell_out.png'" v-if="item2.stk === 0" mode="scaleToFill"></image>
+												</view>
+											</view>
+											<view class="rush_goods_mask" v-if="item2.stk === 0 && item2.plugin !== 'rush'">
+												<view class="rush_goods_mask_img">
+													<image class="img" :src="imgfixUrls + 'rush_goods_sell_out.png'" mode="aspectFill"></image>
+												</view>
+											</view>
+										</view>
+										<view class="goods_tit">
+											{{ item2.goods_name }}
+										</view>
+										<view class="public_goods_goods-price dis-flex flex-y-center">
+											<view class="now-price f-32" v-if="item2.plugin != 'coupon' || item2.is_charge == '1'">￥{{item2['price']}}</view>
+											<view class="now-price f-32" v-else>免费</view>
+											<view class="old-price f-24" style="text-decoration:line-through;" v-if="item2['oldprice']">￥{{item2['oldprice']}}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+
+				<!--  public_goods2  通用商品2  -->
+				<view class="public_goods2" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;background-color: #f6f6f6;'"
+				 v-if="item.id == 'public_goods2'">
+					<Publicgoodstwo :publicgoodstwoData="item" />
+				</view>
+				<!--  shop  商家信息1  -->
+				<view class="shop" :style="'margin-bottom: '+(item.style.marginBottom*40)+'rpx;'" v-if="item.id == 'shop'">
+					<view class="shangjia">
+						<view class="shangjia-i" :class="{shangjiaISty: item2.goods.length == 0}" v-for="(item2, key2) in item.shopArr"
+						 :key="key2">
+							<view class="a shangjia-i-t" @click="navigateTo(item2.shop_url)">
+								<view class="shangjia-i-l">
+									<image class="image b-f" :src="item2.logo" mode="aspectFill"></image>
+								</view>
+								<view class="shangjia-i-r">
+									<view class="shangjia-i-r-d">
+										<view class="shangjia-i-r-t1 over-omit">
+											{{ item2.storename }}
+											<!-- <text style="font-size: 20upx;float: right;padding-right: 30upx;" class="col-9">{{item2.distance}}</text> -->
+										</view>
+										<view class="shangjia-i-r-t2 over-omit">
+											<view class="star star-dark">
+												<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+											</view>
+											<view class="star star-light">
+												<view class="star-width" :style="'width:'+(item2.score / 5) * 100+'%;'">
+													<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+												</view>
+											</view>
+											<view v-if="item2.distance" style="font-size: 24rpx;color: #999;width: 120rpx;margin-left: 396rpx;">
+												{{item2.distance}}
+											</view>
+										</view>
+										<view class="shangjia-i-r-t3 over-omit">
+											<view class="p" v-html="item2.storehours"></view>
+										</view>
+										<view class="shangjia-i-r-t4 over-omit">
+											<view v-for="(item3,index3) in item2.tags" class="tags_view">{{item3}}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || (shopFoldIndex !== key2 || diyDataFoldIndex !== key)) && item2.goods.length > 0">
+								<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-t1" @click="shangjiaFold(key, key2)" v-if="item2.goods.length > 2">
+									<view class="i icon iconfont icon-unfold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+								<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+									<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="!shopFold && (shopFoldIndex == key2 && diyDataFoldIndex == key) &&  item2.goods.length > 2">
+								<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key, key2)">
+									<view class="i icon iconfont icon-fold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!--  shop 商家信息2 -->
+				<view class='store-two b-f' :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;'" v-if="item.id == 'shop2'">
+					<view class="store-two-main dis-flex padding-box-all border-line border-bottom" v-for="(item2,index2) in item.data"
+					 :key="index2" @click="navigateTo(item2.shop_url)">
+						<view class="store-two-left bor-radius-10upx m-right20 b-f" :style="'background-image:url('+item2.logo+');'"></view>
+						<view class="store-two-right">
+							<view class="dis-flex flex-x-between">
+								<view class="store-two-title twolist-hidden f-28">{{item2.storename}}</view>
+								<view class="f-26 col-f4">{{!!item2.distance?item2.distance:'未定位'}}</view>
+							</view>
+							<view class="store-two-score dis-flex flex-y-center">
+								<tui-rate :current="item2.score" :disabled="true" :score="1" active="#F5D145"></tui-rate>
+								
+								<text class="score-grade p-left-right-30 f-28">{{item2.score}}</text>
+								
+								<view class="store-sales f-24">月售:{{item2.salesVolume}}</view>
+							</view>
+							<view class="store-two-storehours f-24 col-3">{{item2.storehours}}</view>
+						</view>
+						
+					</view>
+				</view>
+				
+				<!--  shop 商家信息5 -->
+				<view class='store-two' :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;'" v-if="item.id == 'shop5'">
+					<view >
+						<image :src="item.style.top_image" class="b-f" style="height: 260upx;width: 750upx;vertical-align: bottom;border-radius: 20upx 20upx 0 0;" mode=""></image>
+						<view  :style="{backgroundColor: item.style.bgColor,height: 300 + ((Math.ceil(Object.keys(item.data).length / 3) - 1) * 370) + 'rpx'}">
+							<view  style="padding: 30upx;position: relative;bottom: 212upx;">
+								<view class="dis-flex" :style="{color: item.style.titleColor}">
+									<view class="flex-box f-40 f-w">
+										{{item.style.title}}
+									</view>
+									<view class="flex-box t-r f-28" v-if="item.style.link" @click="navigateTo(item.style.link)">
+										更多<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+									</view>
+								</view>
+								<view class="dis-flex store-two-shop" style="flex-wrap: wrap;justify-content: space-between;padding-top: 30upx;">
+									<view  style="flex: 0 0 31%;margin-bottom: 20upx;" v-for="(items,index) in item.data" :key="index" @click="navigateTo(items.shop_url)">
+										<view  style="position: relative;">
+											<image class="b-f" style="width: 100%;height: 192upx;border-radius: 10upx 10upx 0 0;vertical-align: bottom;" 
+											:src="items.logo" mode=""></image>
+											<view class="store-time-tag iconfont icon-locationfill dis-il-block" v-if="items.distance != ' '">
+												{{items.distance}}
+											</view>
+										</view>
+										<view class="b-f" style="padding: 10upx;">
+											<view class="f-28 f-w p-top-bom-10" style="width: 180upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+												{{items.storename}}
+											</view>
+											<view class="f-26 col-9">
+												<text>{{items.score}}分</text>
+												<text style="padding: 0 10upx;">|</text>
+												<text>月售{{items.salesVolume}}</text>
+											</view>
+											<view  style="height: 60upx;overflow: hidden;">
+												<view class="f-24 t-c dis-il-block" style="border-radius: 6upx;border: 1upx solid #FF4444;color: #FF4444;padding: 1upx 10upx;margin-right: 20upx;margin-bottom: 20upx;" v-for="(tag,indextag) in items.tags" :key="indextag">
+													{{tag}}
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!--  shop 商家信息3 -->
+				<view class='store-two' :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;'" v-if="item.id == 'shop3'">
+					<view style="padding: 30upx;">
+						<view class="dis-flex" style="justify-content: space-between;overflow: auto;">
+							<view  style="flex: 0 0 43%;margin-bottom: 20upx;margin-right: 20upx;" v-for="(items,index) in item.data" :key="index" @click="navigateTo(items.shop_url)">
+								<view  style="position: relative;">
+									<image class="b-f" style="width: 100%;height: 296upx;border-radius: 20upx 20upx 0 0;vertical-align: bottom;" 
+									:src="items.logo" mode=""></image>
+									<view class="store-time-tag iconfont icon-locationfill dis-il-block" v-if="items.distance != ' '">
+										{{items.distance}}
+									</view>
+								</view>
+								<view class="b-f" style="padding: 10upx;">
+									<view class="f-26 f-w p-top-bom-10" style="width: 280upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+										{{items.storename}}
+									</view>
+									<view class="f-26 col-9" style="padding: ;">
+										<text>{{items.score}}分</text>
+										<text style="padding: 0 10upx;">|</text>
+										<text>月售{{items.salesVolume}}</text>
+									</view>
+									<view  style="height: 60upx;overflow: hidden;">
+										<view class="f-24 t-c dis-il-block" style="border-radius: 6upx;border: 1upx solid #FF4444;color: #FF4444;padding: 3upx 10upx;margin-right: 20upx;margin-bottom: 20upx;" v-for="(tag,indextag) in items.tags" :key="indextag">
+											{{tag}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!--  shop 商家信息4 -->
+				<view class='store-two' :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;'" v-if="item.id == 'shop4'">
+					<view style="padding: 30upx;">
+						<view class="dis-flex" style="flex-wrap: wrap;justify-content: space-between;">
+							<view style="flex: 0 0 48%;margin-bottom: 20upx;" v-for="(item2,index2) in item.data" :key="index2" @click="navigateTo(item2.shop_url)">
+								<view style="position: relative;">
+									<image class="b-f" style="width: 100%;height: 330upx;border-radius: 10upx 10upx 0upx 0;" 
+									:src="item2.logo" mode=""></image>
+									<view class="store-time-tag">
+										{{item2.storehours}}
+									</view>
+								</view>
+								<view class="p-top-bom-10 f-28 f-w" style="width: 320upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+									{{item2.storename}}
+								</view>
+								<view class="f-24 col-9">
+									<text>{{item2.score}}分</text>
+									<text style="padding: 0 10upx;">|</text>
+									<text>月售{{item2.salesVolume}}</text>
+								</view>
+								<view class="f-24 col-9 p-top-10">
+									<view  style="font-size: 26upx;"></view>
+									<text 
+									class="iconfont icon-locationfill dis-il-block" 
+									style="padding: 0 1upx 0 0 ;width: 220upx;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;display: inline-block;font-size: 24upx;">
+									{{item2.address}}
+									</text>
+									<view class="dis-il-block t-r" style="vertical-align: top;width: 100upx;" v-if="item2.distance">{{item2.distance}}</view>
+								<view  style="height: 50upx;overflow: hidden;margin-top: 10upx;">
+									<view class="f-24 t-c dis-il-block" style="border-radius: 6upx;border: 1upx solid #FF4444;color: #FF4444;padding: 1upx 14upx;margin-right: 20upx;margin-bottom: 20upx;" v-for="(tag,indextag) in item2.tags">
+										{{tag}}
+									</view>
+								</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!--  shop 商家信息6ss -->
+				<view class='store-two' :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx;background-color:'+item.style.bgColor+';'" v-if="item.id == 'shop6'">
+					<view style="padding: 30upx;">
+						<view class="dis-flex" style="overflow: auto;">
+							<view class="b-f" style="padding: 20upx;" v-for="(item2,index2) in item.data" :key="index2" @click="navigateTo(item2.shop_url)">
+								<view  style="position: relative;width: 600upx;height: 600upx;">
+									<image 
+									class="b-f"
+									style="width: 600upx;height: 600upx;border-radius: 20upx;" 
+									:src="item2.logo" mode=""></image>
+									<view class="b-f" 
+									style="position: absolute;
+									width: 520upx;
+									border-radius: 20upx;
+									left: 50%;
+									bottom: 5%;
+									transform: translate(-50%);
+									padding: 20upx 20upx;">
+										<view class="f-28 f-w" style="width: 520upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+											{{item2.storename}}
+										</view>
+										<view class="dis-flex f-26 col-9 p-top-bom-10">
+											<view class="iconfont icon-locationfill f-26" style="font-size: 26upx;width: 80%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+												{{item2.address}}
+											</view>
+											<view class="t-r" style="width: 20%;">
+												{{item2.distance}}
+											</view>
+										</view>
+										<view class="p-top-bom-10" style="border-top: 1upx solid #EEEEEE;">
+											<view class="dis-flex">
+												<view class="iconfont icon-favor_fill_light c-ff4444" style="font-size: 26upx;flex: 0.2;">
+													<text class="col-3">{{item2.score}}</text>
+												</view>
+												<view class="iconfont icon-shijian t-c" style="flex: 0.6;font-size: 26upx;">
+													{{item2.storehours}}
+												</view>
+												<view class="iconfont icon-rank t-r" style="flex: 0.2;font-size: 26upx;">
+													{{item2.salesVolume}}
+												</view>
+											</view>
+										</view>
+										<view  style="height: 60upx;overflow: hidden;">
+											<view class="dis-il-block c-ff4444 f-20" 
+											style="padding: 4upx 8upx;border: 1upx solid #FF4444;border-radius: 4upx;margin-right: 10upx;margin-bottom: 10upx;"
+											v-for="(items,index) in item2.tags">
+												{{items}}
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- shop 商品信息3 -->
+				<view v-if="item.id == 'options3'">
+					<shop-info :shopinfoData="item.data" :shopinfoStyle="item.style" ref="shopInfo"></shop-info>
+				</view>
+				<!--  headline  头条1  -->
+				<view class="headline" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'headline'">
+					<view class="goodstop-i" :style="'background-color: '+item.style.bgColor" v-for="(item2, key2) in item.data" :key="key2"
+					 @click="navigateTo(`pages/mainPages/headline/headlineDetail?headline_id=${item2.id}`)">
+						<view class="h1">{{ item2.title }}</view>
+						<view class="goodstop-i-t">
+							<view class="goodstop-i-t-tag">
+								<view class="i">{{ item2.one_name }}</view>
+								<view class="i">{{ item2.two_name }}</view>
+							</view>
+							<image class="image" :src="item2.display_img" mode="aspectFill"></image>
+						</view>
+						<view class="goodstop-i-c">
+							<view class="h2">{{ item2.summary }}</view>
+							<view class="p">
+								<view class="span">
+									<view class="i">
+										<image class="image" :src="item2.author_img" mode="aspectFill"></image>
+									</view>
+									<view class="b">{{ item2.author }}</view>
+								</view>
+								<view class="em">阅读&nbsp;{{ item2.browse }}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!--  headline2  头条2  -->
+				<view class="headline2" :style="'margin-bottom: '+(item.style.marginBottom*2)+'rpx; background-color: '+item.style.bgColor"
+				 v-if="item.id == 'headline2'">
+					<Haodiantoutiao :hdttData="item" />
+				</view>
+				<!-- 社群 -->
+				<view v-if="item.id == 'community'">
+					<view class="diyPages-community dis-flex flex-x-between flex-y-center" :style="{marginBottom:item.style.marginBottom+'rpx',backgroundColor:item.style.bgColor}">
+						<view class="community-user dis-flex flex-y-center flex-box ">
+							<image :src="item.params.imgUrl" class="community-user-img"></image>
+							<view class="community-user-info flex-box">
+								<view class="community-user-name col-0 f-28">{{ item.params.name }}</view>
+								<view class="community-user-des f-24 col-9 onelist-hidden">{{item.params.introduce}}</view>
+							</view>
+						</view>
+						<view class="community-btn">
+							<button class="community-add f-24" :style="{color:item.style.buttonColor,backgroundColor:item.style.buttonbg}"
+							 @click="openshequn(item.params)">{{item.params.title}}</button>
+						</view>
+					</view>
+					<!-- 社群弹窗 -->
+					<popup-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+						<view class="community-detail b-f t-c">
+							<view class="community-header f-w f-36 p-r col-f"><text class="community-header-text p-r">{{shequn.name}}</text></view>
+							<!-- #ifdef H5 -->
+							<view class="community-body">
+								<image :src="shequn.qrcodeUrl" class="community-qrcodeimg"></image>
+								<view class="community-toreply f-26 col-3">长按识别二维码</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view class="community-body f-26 col-3">
+								有任何疑问，点击“<text class="col-m">去回复</text>”发送“<text class="col-m">{{shequn.community_id}}</text>”,即可添加{{shequn.name}}
+							</view>
+							<!-- #endif -->
+							<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!shequn.phone">
+								<view class="community-number dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon"></image>
+									<view class="f-24 col-3">{{shequn.phone}}</view>
+								</view>
+								<view class="community-bdial f-24" @click="callPhone(shequn.phone)">拨号</view>
+							</view>
+							<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType==='3'">去回复</button>
+						</view>
+					</popup-view>
+				</view>
+				<!-- 乐豆 -->
+				<view class="LeBeans" style="border-radius: 0;" v-if="item.id == 'user_info'">
+					<view class="dis-flex">
+						<view >
+							<image style="border-radius: 50%;height: 100upx;width: 100upx;border: 6upx solid rgba(255,255,255,0.2);box-sizing: border-box;"
+							 :src="item.data.avatar || 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=408169738,1296166492&fm=26&gp=0.jpg'"
+							 mode=""></image>
+						</view>
+						<view class="col-f" style="padding-left: 20upx;" v-if="item.data.nickname">
+							<view class="f-30" style="padding-top: 10upx;">
+								{{item.data.nickname || '未登录'}}
+							</view>
+							<view class="f-24" style="font-weight: 300;color: #F1F1F1;padding-top: 15upx;">
+								{{item['data']['mobile'] || ''}}
+							</view>
+						</view>
+						<view class="col-f f-34 f-w" style="line-height: 100upx;padding-left: 20upx;" v-else>
+							未登录
+						</view>
+					</view>
+					<view class="f-26 col-f" style="font-weight: 300;padding: 20upx 0;" v-if="item.data.constructor === Object && item.data.credit2">
+						{{item.params.title}}
+					</view>
+					<view class="dis-flex" v-if="item.data.constructor === Object && item.data.credit2">
+						<view class="f-50 f-w col-f">
+							{{item.data.credit2}}
+						</view>
+						<view >
+							<view class="f-30 col-f" @click="goLeBeans(item.params.link)" style="padding: 10upx 25upx;background-color: rgba(255,255,255,0.3);border-radius: 60upx 0 0 60upx;position: absolute;right: 0;">
+								{{item.params.button_title}}
+								<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 乐豆 -->
+				
+				<!-- 招聘统计 -->
+				<view class="invite-statistics dis-flex" v-if="item.id == 'recruit_statistics'">
+					<view class="invite-statistics-item"  v-for="(items,key,indexs) in item.params" :key="indexs" :style="{marginRight: indexs == 3?'0':'20rpx',backgroundColor: items.backgroundColor}">
+						<view class="statistics-item-num" :style="{color: items.numberColor}">
+							{{items.statistics}}
+						</view>
+						<view class="statistics-item-class" :style="{color: items.titleColor}">
+							{{items.title}}
+						</view>
+						<view class="statistics-item-img">
+							<image class="statistics-item-image" :src="items.icon" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<!-- 招聘统计 -->
+				
+				<!-- 企业信息风格一 -->
+				<view v-if="item.id == 'recruit_enterprise'">
+					<view :style="{padding: item.style.padding + 'px',marginBottom: item.style.marginBottom + 'px',backgroundColor: item.style.bgColor}">
+						<view class="dis-flex enterprise-item"  v-for="(its,indexs) in item.data" :key="indexs" @click="goEnterprise(its)">
+							<view class="enterprise-imgbox" v-if="its.logo">
+								<image class="enterprise-img" :src="its.logo" mode=""></image>
+							</view>
+							<view class="enterprise-content">
+								<view class="enterprise-name">
+									{{its.storename}}
+								</view>
+								<view class="enterprise-nature">
+									{{its.nature}}·{{its.scale}}·{{its.industry}}
+								</view>
+								<view class="enterprise-nature">
+									{{its.area}}
+									<text style="padding-left: 10upx;">
+										在招岗
+										<text style="color: #3388FF;">
+											{{its.release_recruit}}
+										</text>
+										个
+									</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 企业信息风格一 -->
+				
+				<!-- 企业信息风格二 -->
+				<view  v-if="item.id == 'recruit_enterprise2'">
+					<view class="recruit_enterprise2-box" :style="{padding: item.style.padding + 'px',marginBottom: item.style.marginBottom + 'px',backgroundColor: item.style.bgColor}">
+						<view class="dis-flex" style="padding: 20upx 0;">
+							<view class="enterprise2-title">
+								{{item.params.title}}
+							</view>
+							<view class="enterprise2-more" @click="enterpriseList">
+								更多
+								<text class="iconfont icon-right"></text>
+							</view>
+						</view>
+						<view class="enterprise2-box" :style="{paddingRight: item.style.padding + 'px'}">
+							<view class="enterprise2-item dis-il-block" v-for="(its,indexs) in item.data" :key="indexs" @click="goEnterprise(its)">
+								<image class="enterprise2-item-img" :src="its.logo" mode="" v-if="its.logo"></image>
+								<view class="enterprise2-item-name">
+									{{its.storename}}
+								</view>
+								<view class="enterprise2-item-invite" v-if="its.release_recruit != 0">
+									{{its.release_recruit}} + 岗位热招
+								</view>
+								<view class="enterprise2-item-invite" v-else>
+									暂无招聘
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 企业信息风格二 -->
+				
+				<!-- 招聘模板 -->
+				<view v-if="item.id == 'recruit_recruit'">
+					<view class="recruit_recruit-f" :style="{padding: item.style.padding != 0? item.style.padding + 'px':'0rpx',marginBottom: item.style.marginBottom + 30 + 'px',backgroundColor: item.style.bgColor}">
+						<view class="recruit_recruit" v-for="(its,indexs) in item.data" :key="indexs" @click="naviRecruit_recruit(its)">
+						<view class="dis-flex" style="padding: 30upx 0 20upx;">
+							<view class="recruit_recruit-name">
+								{{its.title}} <view  class="dis-il-block recruit_recruit-top" v-if="its.is_top == '1'">顶</view>
+							</view>
+							<view class="recruit_recruit-salary">
+								{{its.salary}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 0upx 0 30upx;" v-if="its.welfare_list">
+							<view class="recruit_recruit-tags">
+								<view class="dis-il-block recruit_recruit-tags-item"  :style="{backgroundColor: item.style.labelBgColor,color: item.style.labelColor}" v-for="(it,ins) in its.welfare_list" :key="ins">
+									{{it}}
+								</view>
+							</view>
+							<view class="recruit_recruit-region">
+								{{its.region}}
+							</view>
+						</view>	
+						<view class="dis-flex" style="padding: 0upx 0 30upx;" v-if="its.release">
+							<view class="recruit_recruit-imgbox">
+								<image class="recruit_recruit-img"  :src="its.release.logo" mode=""></image>
+							</view>
+							<view class="recruit_recruit-left">
+								<view class="recruit-left-name dis-flex">
+									<view style="flex: 0.7;">
+										{{its.release.name}} <view  class="dis-il-block recruit_recruit-top" style="background-color: #008CFF;" v-if="its.release.is_authentication == '1'">已认证</view>
+									</view>
+									<view class="recruit-left-region" v-if="!its.welfare_list">
+										{{its.region}}
+									</view>
+								</view>
+								<view class="recruit-left-nature dis-flex" v-if="its.release.nature && its.release.scale && its.release.industry">
+									<view style="flex: 0.8;">
+										{{its.release.nature}}·{{its.release.scale}}·{{its.release.industry}}
+									</view>
+									<view class="recruit-left-region" style="line-height: 30upx;">
+										{{its.release_time}}
+									</view>
+								</view>
+								<view class="recruit-left-nature dis-flex" v-else>
+									<view style="flex: 0.8;">
+										个人招聘
+									</view>
+									<view class="recruit-left-region" style="line-height: 30upx;">
+										{{its.release_time}}
+									</view>
+								</view>
+							</view>
+							<!-- <view class="recruit_recruit-right">
+								
+							</view> -->
+						</view>
+						</view>
+						
+					</view>
+				</view>
+				<!-- 招聘模板 -->
+				<!-- 简历模板 -->
+				<view v-if="item.id == 'recruit_resume'" style="margin-bottom: 30upx;">
+					<view class="recruit_resume" :style="{padding: item.style.padding != 0? item.style.padding + 'px':'30rpx',marginBottom: item.style.marginBottom + 'px',backgroundColor: item.style.bgColor}">
+						<view class="recruit_resume-item dis-flex" v-for="(its,indexs) in item.data" :key="indexs" @click="goRecruit_resume(its)">
+							<view class="recruit_resume-imgbox">
+								<image class="recruit_resume-img" :src="its.avatar" mode=""></image>
+							</view>
+							<view class="recruit_resume-content">
+								<view class="dis-flex ">
+									<view class="recruit_resume-title">
+										{{its.name}}
+									</view>
+									<view class="recruit_resume-salary">
+										{{its.salary}}
+									</view>
+								</view>
+								<view class="recruit_resume-data">
+									{{its.age}}岁·{{its.experience}}·{{its.education}}
+								</view>
+								<view class="dis-flex">
+									<view class="recruit_resume-tags">
+										<view class="recruit_resume-tagitem dis-il-block" :style="{color: item.style.labelColor,backgroundColor: item.style.labelBgColor}" v-for="(it,ins) in its.expect_position_list" :key="ins">
+											{{it}}
+										</view>
+									</view>
+									<view class="recruit_resume-site">
+										{{its.city}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- #ifdef MP-WEIXIN -->
+				<!-- banner流量主 -->
+				<view v-if="item.id == 'flow'">
+					<ad :unit-id="item.params.unit_id" @close="onclose($event,item.params.unit_id)"></ad>
+				</view>
+				<!-- 视频流量主 -->
+				<view v-if="item.id == 'flow4'">
+					<ad :unit-id="item.params.unit_id" @close="onclose($event,item.params.unit_id)" ad-type="video" ad-theme="white"></ad>
+				</view>
+				<!-- 视频贴片流量主 -->
+				<!-- <view v-if="item.id == 'flow5'">
+					<video style="width: 750upx;" src="" :unit-id="item.params.unit_id"></video>
+				</view> -->
+				<!-- 格子广告流量主 -->
+				<view v-if="item.id == 'flow6'">
+					<ad :unit-id="item.params.unit_id" @close="onclose($event,item.params.unit_id)" ad-type="grid" grid-opacity="0.8" grid-count="5" ad-theme="white"></ad>
+				</view>
+				<!-- #endif -->
+				
+				<!-- 转赠红包 -->
+				<popup-view :show="showRed" :showOverlay="false" type="center" @clickmask="showRed = false">
+					<view class="linkRed t-c" :style="'background-image: url(' + imgfixUrls + (redData.type == 1?'couponBg.png':'linkRedBG.png')+');background-size: 600rpx 782rpx;background-repeat: no-repeat;'">
+						<view 
+						class="iconfont icon-roundclose" 
+						style="font-weight: 700;font-size: 40upx;color: #333333;position: absolute;right: 30upx;top: 30upx;"
+						@click="showRed = false">
+						</view>
+						<image 
+						:src="redData.avatar" 
+						style="width: 146upx;height: 146upx;border-radius: 50%;margin-top: 84upx;"
+						mode=""></image>
+						<view class="f-28" :style="{color:redData.type == 1?'#C18F64':'#FDC789',marginTop: '40rpx'}">
+							<text>{{redData.nickname}}</text>
+							<text>发起一个{{redData.type == 1?'转赠卡券':'转赠红包'}}</text>
+						</view>
+						<view
+						v-if="redData.ownget == 1"
+						:style="{width: '400rpx',
+						backgroundColor: redData.type == 1?'':'#F9F3E3',
+						borderRadius: '10rpx',
+						padding: '30rpx',
+						margin: '40rpx 0 0 70rpx'}">
+							<view class="f-w" style="font-size: 50upx;color: #ff4444;">
+								{{redData.title}}
+							</view>
+							<view class="f-28" :style="{padding: '30rpx 0',marginTop:redData.type == 1?'56rpx':'0'}">
+								领取成功
+							</view>
+							<view class="f-28" :style="{color: redData.type == 1?'#ffffff':'#FF6633',paddingLeft: '20rpx'}" @click="navigateTo(redData.type == 1?'pages/subPages/coupon/coupon':'pages/subPages/redpacket/myredpacket')">
+								<text>立即查看</text>
+								<text style="font-size: 28upx;" class="iconfont icon-playfill"></text>
+							</view>
+						</view>
+						<view v-else>
+							<view  style="margin-top: 40upx;color: #FDC789;">
+								<text :style="{fontSize: redData.type != 1?'68rpx':'48rpx',color:redData.type != 1?'#FDC789':'#B15910'}">{{redData.title}}</text>
+								<!-- <text style="font-size: 36upx;padding-left: 10upx;">元</text> -->
+							</view>
+							<view class="f-28" style="color: #FDC789;margin-top: 40upx;" >
+								<text v-if="redData.status != 2 || redData.type != 1">{{redData.sub_title}}</text>
+							</view>
+							<view  
+							v-if="redData.status == 0 && redData.ownflag != 1"
+							:style="{marginTop: redData.type == 1?'100rpx':'40rpx',
+							backgroundColor: '#FCC688',
+							width: '460rpx',
+							height: '80rpx',
+							lineHeight: '80rpx',
+							marginLeft: '70rpx',
+							borderRadius: '60rpx',
+							fontSize: '28rpx'}
+							" @click="receive">
+								立即领取
+							</view>
+							<view v-else-if="redData.status == 0 && redData.ownflag == 1" 
+							:style="{fontSize: '28rpx',paddingTop: '40rpx',marginTop:redData.type == 1?'90rpx':'',color:redData.type == 1?'#ffffff':''}" 
+							@click="closeLink">
+								<text>取消转赠</text>
+								<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+							</view>
+							<view 
+							v-else
+							class="f-28"
+							:style="{marginTop: redData.type != 1?'40rpx':redData.status == 2?'180rpx':'90rpx',
+							color: redData.type != 1?'#8B1518':'#ffffff',
+							width: '420rpx',
+							padding: '30rpx 20rpx',
+							backgroundColor: redData.type != 1?'#FDEAEE':'',
+							marginLeft: '70rpx',
+							borderRadius: '30rpx'
+							}">
+								<view >
+									哎呦来晚了
+								</view>
+								<view >
+									{{redData.status == 2?`${redData.type == 1?'卡券':'红包'}已经被转赠人取消了~`:`${redData.type == 1?'卡券':'红包'}已经被人领走了~`}}
+								</view>
+								
+							</view>
+						</view>
+						
+					</view>
+				</popup-view>
+				<view style="background-color: rgba(0,0,0,0.1);width: 100vw;height: 100vh;position: fixed;left: 0;top: 0;" v-if="showRed">
+					
+				</view>
+				<PhoneMask :zIndex="'9999'" :show1="popShow" @clickmask1="closePop"></PhoneMask>
+				<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+			</view>
+		</view>
+	</view>
+	
+	</view>
+</template>
+
+<script>
+	import jyfParser from "@/components/jyf-parser/jyf-parser.vue"
+	import Goodslist from '@/components/template/goodslist.vue'
+	import Imgswipertwo from '@/components/template/imgswipertwo.vue'
+	import Publicgoodstwo from '@/components/template/publicgoodstwo.vue'
+	import Haodiantoutiao from '@/components/template/haodiantoutiao.vue'
+	import goodsComponents from '@/components/page/pageComponents/goods.vue'
+	import giftbagComponents from '@/components/page/pageComponents/giftbag.vue'
+	import cardComponents from '@/components/page/pageComponents/discountCard.vue'
+	import region from '@/components/page/pageComponents/region.vue'
+	import tabContro from '@/components/page/pageComponents/tabContro.vue'
+	import shopInfo from '@/components/page/pageComponents/shopInfo.vue'
+	import shopEnter from '@/components/page/pageComponents/shopEnter.vue'
+	import PopupView from "@/components/template/PopManager.vue"
+	import App from '@/common/js/app.js'
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	import tabMenu from '@/components/page/pageComponents/tabMenu.vue'
+	import activityData from '@/components/template/activityData.vue'
+	import user from '@/components/template/user.vue'
+	import Skip from '@/components/template/Skip.vue'
+	import integralGood from '@/components/template/integralGood.vue'
+	import citydeliveryGoods from '@/components/template/citydeliveryGoods.vue'
+	import tuiRate from '@/components/template/rate.vue';
+	import homemakingItem from '@/components/template/homemakingItem.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import demandItem from '@/components/template/demandItem.vue'
+	import myserItem from '@/components/template/myserItem.vue'
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				titleName: '请输入关键字进行搜索',
+				bussiKey: '',
+				aidCity: {
+					cityname: '选择地区'
+				},
+
+				notice: {
+					autoplay: false,
+					interval: 3000,
+					duration: 1000,
+					vertical: true,
+					circular: true,
+				},
+				banner: {
+					indicatorDots: true,
+					autoplay: true,
+					interval: 4000,
+					duration: 500
+				},
+				richtext: {
+					imageProp: {
+						mode: 'widthFix'
+					}
+				},
+				btngroup: {
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: []
+				},
+				showCommunity: false,
+				shopFold: true,
+				diyDataFoldIndex: -1,
+				shopFoldIndex: -1,
+				switchCity: "",
+				i: 0,
+				showS: false,
+				img: '',
+				shequn: {
+					name: '',
+					qrcodeUrl: '',
+					community_id: '',
+					phone: ''
+				},
+				imgHeights: [],
+				wxOpenTags:null,
+				imgStyle:{},
+				sort:0,
+				showEnter:false,
+				bingImg:{},
+				showRed:false,
+				redData:{},
+				popShow:false,
+				vxshow:false,
+				bannercurrent:0,
+				moveLeft:0
+				// cliType:null
+			}
+		},
+		components: {
+			Goodslist,
+			Imgswipertwo,
+			Publicgoodstwo,
+			Haodiantoutiao,
+			goodsComponents,
+			giftbagComponents,
+			cardComponents,
+			region,
+			tabContro,
+			shopInfo,
+			shopEnter,
+			PopupView,
+			goodsStyle,
+			tabMenu,
+			activityData,
+			Skip,
+			user,
+			integralGood,
+			citydeliveryGoods,
+			tuiRate,
+			vTabs,
+			homemakingItem,
+			demandItem,
+			myserItem,
+			PhoneMask,
+			getvxphone
+		},
+		onShow() {
+
+		},
+		mounted() {
+			
+			this.img = this.imgfixUrls;
+			if (this.pageData.title == '名片首页') {
+				this.titleName = '请输入名片名称进行搜索';
+				this.showS = true;
+			}
+			if(this.isred){
+				setTimeout(()=>{
+					this.getLinkRed()
+				})
+			}
+			this.imgStyle = uni.getStorageSync('imgstyle')
+			let version = require("@/siteinfo.json");
+			let pages = getCurrentPages();
+			this.cliType = App.getClientType();
+			uni.setStorageSync('aa', this.diypagesData);
+			this.pageWxApp();
+			let curPage = pages[pages.length - 1];
+			//#ifdef H5
+			this.i = curPage.$mp.query.i;
+			
+			//#endif
+			//#ifndef H5
+			this.i = version.uniacid;
+			this.flow();
+			//#endif
+			this.$nextTick(function(){
+				// debugger
+				this.diypagesData.forEach((item) =>{
+					if(item.id == 'notice' || item.id == 'notice1' || item.id == 'notice2'){
+						this.pmove();
+						return
+					}
+				}); 
+				// debugger
+				
+			})
+		},
+		props: {
+			diypagesData: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			pageData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			btngroupData: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			swiperIList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			city_id: {
+				type: String,
+				default: function() {
+					return ''
+				}
+			},
+			isred: {
+				default: function() {
+					return ''
+				}
+			}
+		},
+		computed: {
+			currentaidCity: {
+				get() {
+					console.log(this.agencyData)
+					// debugger
+					if (!!this.agencyData) {
+						if(this.agencyData.areaname){
+							return this.agencyData.areaname
+						}else if(Array.isArray(this.agencyData)){
+							return this.agencyData[0].title
+						}else{
+							uni.showModal({
+								showCancel:false,
+								title:'温馨提示',
+								content:'暂未安装地区数据,请前往系统后台进行安装'
+							});
+							return '无地区数据'
+						}
+					} else {
+						return '选择地区'
+					}
+				},
+				set(val) {
+					this.switchCity = val
+				}
+			},
+			agencyData() {
+				return uni.getStorageSync('agencyData') || uni.getStorageSync('locationArray' + this.i);
+			},
+			clienType() {
+				return App.getClientType()
+			}
+		},
+		methods: {
+			cancelBtn() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			pmove(e){ //公告组件移动动画
+			let _this = this;
+			_this.moveLeft = 0;
+			// console.log(e)
+			if(_this.notice.autoplay == false){ //首次进入，第一条公告
+			
+				uni.createSelectorQuery()
+					.in(this)
+					.selectAll('.move')
+					.boundingClientRect(data => {
+						// debugger
+						let width = data[0].width; //首次进入的动画
+						if(width < 266 && data.length == 1){
+							return
+						}else if(width < 266 && data.length > 1){
+							_this.notice.autoplay = true;
+							return
+						}
+						let moveTime = setInterval(()=>{
+							// console.log(width,Math.abs(_this.moveLeft))
+							//266为父盒子默认宽度
+							if(width - Math.abs(_this.moveLeft) < 266){
+								clearTimeout(moveTime);
+								if(data.length  == 1){
+									setTimeout(()=>{
+										_this.pmove(); //递归调用，延时平滑
+									},2000)
+								}else{
+									_this.notice.autoplay = true;
+								}
+								
+							}
+							_this.moveLeft = _this.moveLeft - 2;
+						},20)
+						console.log(data);
+					})
+					.exec();
+			}else{
+				// debugger
+				_this.notice.autoplay = false
+				setTimeout(()=>{
+					// debugger
+					uni.createSelectorQuery()
+						.in(this)
+						.selectAll('.move')
+						.boundingClientRect(data => {
+							// debugger
+							let width = data[e.detail.current].width;
+							if(width > 266){
+								let moveTime = setInterval(()=>{
+									// console.log(width,Math.abs(_this.moveLeft))
+									if(width - Math.abs(_this.moveLeft) < 266){
+										clearTimeout(moveTime);
+										_this.notice.autoplay = true;
+									}
+									_this.moveLeft = _this.moveLeft - 2;
+								},20)
+								// console.log(data);
+							}else{
+								_this.notice.autoplay = true;
+							}
+							
+						})
+						.exec();
+				},2000)
+				
+			}
+			// _this.notice.autoplay = false;
+			// console.log(e);
+			// debugger
+				
+			},
+			onclose(e,id){
+				let data = this.diypagesData;
+				// console.log(e,id);
+				// debugger
+				this.diypagesData.forEach((item,index)=>{
+					if(!!item.params && item.params.unit_id){
+						// console.log(item.params.unit_id,id);
+						if(item.params.unit_id == id){
+							
+							data[index].id = '';
+							item.id = '';
+							// console.log(diypagesData[index].id,item.id)
+							this.$emit('update:diypagesData',data);
+						}
+					}
+					
+				})
+			},
+			showFalse(){
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			closeLink(){
+				App.showError(
+					`是否取消本次转赠?`,
+					data => {
+						if (data.confirm) {
+						App._post_form('&p=Order&do=cancelTransfer', {
+							id:this.isred,
+							objid:this.redData.objid,
+							type:this.redData.type
+						}, res => {
+							uni.showToast({
+								title:'取消成功'
+							});
+							this.showRed = false;
+						})
+					}
+					},
+					true
+				);
+				
+			},
+			receive(){
+				let  _this = this;
+				App._post_form('&p=Order&do=getTransfer', {
+					id:this.isred
+				}, res => {
+					uni.showToast({
+						title:'领取成功'
+					});
+					this.getLinkRed();
+				},fail=>{
+					// _this.gouniond();
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							
+						}
+				});
+			},
+			getLinkRed(){
+				App._post_form('&p=Order&do=transferInfo', {
+					id:this.isred
+				}, res => {
+					this.redData = res.data;
+					this.showRed = true;
+				})
+			},
+			call(item){
+				uni.makePhoneCall({
+					phoneNumber: item.mobile
+				})
+			},
+			chat(item){
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+				})
+			},
+			vtabschange(e){
+				
+			},
+			// handleMemberClick(item) {
+			// 	App.navigationTo({
+			// 		url: `pages/subPages2/blindDate/member/detail?id=${item.id}`
+			// 	})
+			// },
+			flow(){
+				this.diypagesData.map(item=>{
+					if(item.id == 'flow2'){
+						// 在页面中定义激励视频广告
+						let videoAd = null
+						
+						// 在页面onLoad回调事件中创建激励视频广告实例
+						if (wx.createRewardedVideoAd) {
+						  videoAd = wx.createRewardedVideoAd({
+						    adUnitId: item.params.unit_id
+						  })
+						  videoAd.onLoad(() => {})
+						  videoAd.onError((err) => {})
+						  videoAd.onClose((res) => {})
+						}
+						
+						// 用户触发广告后，显示激励视频广告
+						if (videoAd) {
+						  videoAd.show().catch(() => {
+						    // 失败重试
+						    videoAd.load()
+						      .then(() => videoAd.show())
+						      .catch(err => {
+						        console.log('激励视频 广告显示失败')
+						      })
+						  })
+						}
+					}else if(item.id == 'flow3'){
+						// 在页面中定义插屏广告
+						let interstitialAd = null
+						
+						// 在页面onLoad回调事件中创建插屏广告实例
+						if (wx.createInterstitialAd) {
+						  interstitialAd = wx.createInterstitialAd({
+						    adUnitId: item.params.unit_id
+						  })
+						  interstitialAd.onLoad(() => {})
+						  interstitialAd.onError((err) => {})
+						  interstitialAd.onClose(() => {})
+						}
+						
+						// 在适合的场景显示插屏广告
+						if (interstitialAd) {
+						  interstitialAd.show().catch((err) => {
+						    console.error(err)
+						  })
+						}
+					}
+				})
+				// debugger
+			},
+			goRecruit_resume(item){
+				App.navigationTo({
+					url: `pages/subPages2/hirePlatform/resume/resume?id=${item.id}&flag=1`
+				});
+			},
+			enterpriseList(){
+				App.navigationTo({
+					url: `pages/subPages2/hirePlatform/companiesList/companiesList`
+				});
+			},
+			goEnterprise(item){
+				App.navigationTo({
+					url: `pages/subPages2/hirePlatform/companyDetails/companyDetails?id=${item.id}`
+				});
+			},
+			naviRecruit_recruit(item){
+				App.navigationTo({
+					url: `pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails?id=${item.id}`
+				});
+			},
+			pageWxApp() {
+				setTimeout(()=>{
+					this.diypagesData.map(item => {
+						if (item.id == 'banner') {
+							let ratio;
+							uni.getSystemInfo({
+								success: function(wh) {
+									ratio = wh.windowWidth / item.params.img_width;
+									item.params.img_width = ratio * item.params.img_width;
+									item.params.img_height = ratio * item.params.img_height;
+								}
+							});
+							
+						}
+					})
+				})
+				// console.log(_this.diypagesData,'我是装修组件合集')
+			},
+			remindSuccess(goodsData, goodsIndex) {
+				// goodsData.map((item,index)=>{
+				// 	if(item.is_follow)
+				// });
+				this.$emit('diyhomepage');
+				// console.log(goodsData, goodsIndex,'问题一抹多')
+			},
+			goLeBeans(link) {
+				let urls;
+				// #ifdef H5
+				let locations = window.location.href;
+				 urls = link + '&backurl=' + encodeURIComponent(locations);
+				location.href = urls;
+				//#endif
+				//#ifndef H5
+				let pages = getCurrentPages();
+				let pageObj = pages[pages.length - 1];
+				let wxurl = pageObj.route;
+				 urls = link + '&backurl=' + wxurl;
+				// console.log(urls,pageObj.options)
+				uni.navigateTo({
+					url: `/pages/subPages/webview/webview?urlsrc=${encodeURIComponent(urls)}`
+				})
+				//#endif
+
+			},
+			ImgLoad(e) {
+				let ratios;
+				let _this = this;
+				uni.getSystemInfo({
+					success: function(wh) {
+						ratios = wh.windowWidth / e.detail.width;
+						_this.bingImg = {
+							width:ratios * e.detail.width,
+							height:ratios * e.detail.height
+						};
+					}
+				});
+				
+				// console.log(e.detail.width / e.detail.height)
+				// if(e.detail.width == e.detail.height){
+				this.imgHeights.push((e.detail.width / e.detail.height * 35 / 2) + 'rpx')
+				// }else{
+				// 	this.imgHeights.push((e.detail.width / e.detail.height * 35) + 'rpx');
+				// }
+
+				// console.log(e.detail.width / e.detail.hight * 10)
+
+				// this.imgHeights.push(e.detail.width);
+				// console.log(this.imgHeights,e,e.detail.width%150)
+			},
+			// 社群传参
+			openshequn(open) {
+				this.shequn = open;
+				this.showCommunity = true;
+
+			},
+			/**
+			 * 社群显示
+			 */
+			searchBussi() {
+				// debugger
+				if (this.pageData.title == '名片首页') {
+
+					this.$emit("getChild", this.bussiKey);
+
+				} else {
+					App.navigationTo({
+						url: 'pages/subPages/search/search'
+					});
+				}
+			},
+			naviGa(type,flag) {
+				// debugger
+				if (type == 1) {
+					App.navigationTo({
+						url: 'pages/subPages/search/search'
+					});
+				}else if(type == 2){
+					App.navigationTo({
+						url: 'pages/subPages2/hirePlatform/serchWork/serchWork'
+					});
+				}else if(type == 3){
+					App.navigationTo({
+						url: 'pages/subPages2/blindDate/member/all'
+					});
+				}else if(type == 4){
+					App.navigationTo({
+						url: 'pages/subPages2/homemaking/homemaSearch/homemaSearch'
+					});
+				}
+			},
+			communityShow() {
+				this.showCommunity = !this.showCommunity;
+			},
+			callPhone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				})
+			},
+			pvImge(imgurl) {
+				uni.previewImage({
+					current: imgurl, // 当前显示图片的http链接
+					urls: [imgurl] // 需要预览的图片http链接列表
+				})
+			},
+
+			shangjiaFold: function(key, key2) {
+				this.shopFold = false
+				this.diyDataFoldIndex = key
+				this.shopFoldIndex = key2
+			},
+			shangjiaUpFold: function(key, key2) {
+				this.shopFold = true
+				this.diyDataFoldIndex = key
+				this.shopFoldIndex = key2
+			},
+			navigateTo(url) {
+				// let e = url.split('?')[1]
+				// return
+				if(!url)return
+				// #ifdef H5				
+				if(url.indexOf('appid') !=  -1){					
+					uni.showModal({						
+						showCancel:false,						
+						title:'温馨提示',						
+						content:'此链接无法在公众号端打开,请在小程序中打开'					,
+						});					
+						return				
+						}				
+						// #endif
+				if(url.indexOf('indet') != -1){
+					//#ifdef H5
+					// let loc = url.split('?')[1];
+					// debugger
+					App.navigationToH5(false,`${App.base}#/${url}`);
+					window.location.reload();
+					//#endif
+					//#ifndef H5
+					App.navigationTo({
+						url:url
+					});
+					//#endif
+					return
+				}else{
+					
+					// let linkUrl = url.indexOf('?') != -1?url.split('?')[0]:url;
+					// if(url.indexOf('pages/subPages2/homemaking/serviceIn/serviceIn') != -1){
+					// 	this.showEnter = true;
+					// 	return
+					// }
+					App.navigationTo({
+						url:url
+					});
+				}
+			},
+			bannerChange(e) {
+				this.bannercurrent = e.detail.current;
+				// console.log(e,this.diypagesData);
+				// this.diypagesData.map((item,index)=>{
+				// 	if(item.id == 'banner'){
+				// 		console.log(item.data);
+				// 	}
+				// })
+				
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	@import "../../common/css/diyPages.css";
+	@import "../../common/css/old_diyPages";
+	@import "../../pages/subPages/goods/index.css";
+
+	.diypages {
+		/* background-color: #F8F8F8; */
+		/* padding-bottom: 100upx; */
+		/* margin-bottom: 100upx; */
+	}
+
+	.diypages-j {
+		margin-bottom: 20upx;
+	}
+	.diypages-i{
+		position: relative;
+	}
+	
+	.btn-open-weapp{
+	    border: 0;  
+	    color: #424242;  
+	    text-shadow: 0px 1px 1px #fff;  
+	    border-radius: 50px;  
+	    text-align: center;  
+	    line-height: 35px;  
+	    outline:none;  
+	} 
+	.store-two-shop:after{
+		content:'';
+		flex: 0 0 31%;
+	}
+</style>
diff --git a/components/template/drawCommodity.vue b/components/template/drawCommodity.vue
new file mode 100644
index 0000000..ec4fde3
--- /dev/null
+++ b/components/template/drawCommodity.vue
@@ -0,0 +1,204 @@
+<template>
+	<view class="drawCommodity">
+		<view class="title" v-if="goodItem.plugin != 'store'">
+			<image v-if="goodItem.storelogo" :src="goodItem.storelogo" mode=""></image>
+			<view class="title-text dis-flex">
+				<view class="t-c">
+					{{goodItem.storename}}
+				</view>
+				<view class="t-r flex-box" style="font-weight: 500;font-size: 22upx;color: #ff4444;">
+					{{goodItem.distance}}
+				</view>
+			</view>
+		</view>
+		<view class="commodityDetails">
+			<view class="detailsImg">
+				<image :src="goodItem.thumb" mode=""></image>
+				<view class="tags">
+					{{goodItem.pluginName}}
+				</view>
+			</view>
+			<view>
+				<view class="productName" :style="{marginBottom:goodItem.plugin == 'store'?'20rpx':'60rpx'}">
+					<view class="t-l name">
+						{{goodItem.name}}
+					</view>
+					
+				</view>
+				<view class="t-r" style="font-weight: 500;font-size: 24upx;color: #ff4444;"  v-if="goodItem.plugin == 'store'">
+					{{goodItem.distance}}
+				</view>
+				<view class="shopingNum">
+					<!-- {{goodItem.gid}}人购买 -->
+				</view>
+				<view class="priceButton">
+					<view class="dis-flex" style="width: 100%;" v-if="goodItem.plugin != 'store'">
+						<view class="flex-box col-f4" >
+							<text class="f-24" v-if="goodItem.price">¥</text>
+							<text class="f-36 f-w" v-if="goodItem.price">{{goodItem.price}}</text>
+						</view>
+						<view class="shopingButton" @click="goGoods">
+							购买获得抽奖码
+						</view>
+					</view>
+					<view class="dis-flex" style="width: 100%;justify-content: flex-end;" v-else>
+							<view class="t-r flex-box" style="font-weight: 500;font-size: 24upx;color: #ff4444;width: 200upx;"  v-if="goodItem.plugin == 'store'">
+								<!-- {{goodItem.distance}} -->
+							</view>
+						<view class="storeButton" style="background-color: #F1C426;" v-if="goodItem.payurl" @click="goGoodpay">
+							买单
+						</view>
+						<view class="storeButton" style="margin-right: 0;" @click="goGoodStore" v-if="goodItem.deliveurl">
+							商城
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		methods:{
+			goGoodStore(){
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages2/businessCenter/foodList/foodList?id=' + _this.goodItem.gid  + '&storeid=' + _this.goodItem.gid 
+				});
+			},
+			goGoodpay(){
+				let _this = this;
+				let mid = uni.getStorageSync('userinfo').mid;
+				App.navigationTo({
+					url: 'pages/subPages2/newBuyOrder/buyOrder?sid=' + _this.goodItem.gid + '&mid=' + mid
+				});
+			},
+			goGoods(){
+				let _this = this;
+				App.navigationTo({
+					url: _this.goodItem.url
+				});
+			},
+		},
+		props:{
+			goodItem: {
+				type: Object,
+				default: {}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.drawCommodity{
+		margin-bottom: 20upx;
+		position: relative;
+		padding: 20upx;
+		background-color: #F8F8F8;
+		border-radius: 20upx;
+		.title{
+			display: flex;
+			margin-bottom: 20upx;
+			image{
+				width: 40upx;
+				height: 40upx;
+				border-radius: 50%;
+			}
+			.title-text{
+				flex: 1;
+				height: 40upx;
+				line-height: 40upx;
+				font-size: 24upx;
+				font-weight: bold;
+				margin-left: 10upx;
+			}
+		}
+		.commodityDetails{
+			// position: relative;
+			display: flex;
+			// margin-top: 20upx;
+			.detailsImg{
+				position: relative;
+				image{
+					width: 180upx;
+					height: 180upx;
+					border-radius: 10upx;
+					margin-right: 20upx;
+				}
+				.tags{
+					width: 70upx;
+					height: 34upx;
+					line-height: 34upx;
+					text-align: center;
+					font-size: 24upx;
+					color: #E3A815;
+					background: linear-gradient(130deg, #FEDB58 0%, #FBC84A 100%);
+					opacity: 1;
+					border-radius: 10upx 0upx 10upx 0upx;
+					position: absolute;
+					left: 0;
+					top: 0;
+				}
+			}
+			
+			.productName{
+				
+				font-size: 28upx;
+				font-weight: bold;
+				// overflow:hidden;
+				// text-overflow:ellipsis;
+				// -o-text-overflow:ellipsis;
+				// white-space:nowrap;
+				margin-bottom: 60upx;
+				.name{
+					text-overflow:ellipsis;
+					display:-webkit-box;
+					-webkit-box-orient:vertical;
+					-webkit-line-clamp:2;
+					overflow: hidden;
+					// width: 270upx;
+					height: 72upx;
+				}
+			}
+			.shopingNum{
+				font-size: 24upx;
+				color: #999999;
+				margin-bottom: 10upx;
+			}
+			.priceButton{
+				width:380upx;
+				display: flex;
+				.shopingButton{
+					width: 200upx;
+					height: 50upx;
+					line-height: 50upx;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 24upx;
+					background-color: #FF4444;
+					border-radius: 10upx;
+				}
+				.storeButton{
+					// max-width: 120upx;
+					height: 50upx;
+					line-height: 50upx;
+					text-align: center;
+					color: #FFFFFF;
+					font-size: 24upx;
+					background-color: #FF4444;
+					border-radius: 10upx;
+					flex: 1;
+					margin: 0upx 10upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/template/evaluateItem.vue b/components/template/evaluateItem.vue
new file mode 100644
index 0000000..b91450e
--- /dev/null
+++ b/components/template/evaluateItem.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="evaluateItem">
+		<view class="dis-flex evaluate-title">
+			<image :src="evaItem.avatar" mode=""></image>
+			<view class="flex-box">
+				<view class="f-28 col-3 f-w">{{evaItem.nickname}}</view>
+				<view class="f-24 col-9 p-top-10">{{evaItem.createtime}}</view>
+			</view>
+			<!-- #ifdef H5 -->
+			<view class="f-24 col-9 dis-flex" style="position: relative;top: -25upx;">
+				<tui-rate :current="evaItem.star" :disabled="true" :score="1" active="#ff4444"></tui-rate>
+				<view style="line-height: 90upx;padding-left: 5upx;">{{evaItem.star == 5 || evaItem.star == 4?'好评':evaItem.star == 3?'中评':'差评'}}</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<view class="f-24 col-9 dis-flex" style="">
+				<tui-rate :current="evaItem.star" :disabled="true" :score="1" active="#ff4444"></tui-rate>
+				<view style="line-height: 45upx;padding-left: 5upx;">{{evaItem.star == 5 || evaItem.star == 4?'好评':evaItem.star == 3?'中评':'差评'}}</view>
+			</view>
+			<!-- #endif -->
+		</view>
+		<view style="padding-left: 110upx;">
+			<view class="col-3 f-28 p-top-20">{{evaItem.text}}</view>
+			<view class="img-flex" style="padding-top: 30upx;" v-if="evaItem.pic.length > 0">
+				<image
+					v-for="(item, index) in evaItem.pic" :key="index"
+					:src="item"
+					@click="lookImg(evaItem.pic,index)"
+					mode=""
+				></image>
+			</view>
+			<view class="dis-flex condition f-28 col-3 f-w" >
+				<view  @click="like">
+					<image :src="imgfixUrls + 'homemakingImg/weidianzan.png'" v-if="evaItem.praiseflag == 0" mode=""></image>
+					<image :src="imgfixUrls + 'homemakingImg/yidianzan.png'" v-else mode=""></image>
+					<view class="text">{{evaItem.praisetotal}}</view>
+				</view>
+				<view  style="padding-left: 50upx;" @click="openComm" v-if="hidereply == 0">
+					<image :src="imgfixUrls + 'homemakingImg/huifukuang.png'" mode=""></image>
+					<view class="text">{{evaItem.replytotal}}</view>
+				</view>
+			</view>
+			<view class="criticList" v-if="evaItem.replylist.length != 0 || evaItem.replytextone">
+				<view class="criticItem f-24 col-3 " v-if="evaItem.replytextone">
+					<text class="f-w" style="color: #007AFF;">商家回复：</text>
+					<text>{{evaItem.replytextone}}</text>
+				</view>
+				<view class="criticItem f-24 col-3 " v-for="(item,index) in evaItem.replylist">
+					<text class="f-w">{{item.nickname}}：</text>
+					<text>{{item.content}}</text>
+				</view>
+			</view>
+			<view class="f-28 col-3 f-w t-r" style="padding-top: 20upx;" @click="open" v-if="evaItem.replytotal != evaItem.replylist.length - 1 && evaItem.replylist.length != 0">
+				{{evaItem.replytotal>5?'展开':''}}
+			</view>
+		</view>
+		<PopManager :show="commShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="close">
+			<view class="commBox">
+				<textarea value="" v-if="commShow" v-model="textCom" class="textarea" placeholder="回复:" />
+				<view class="commBtn" @click="reply">
+					回复
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import tuiRate from '@/components/template/rate.vue';
+import PopManager from '@/components/template/PopManager';
+export default {
+	data() {
+		return {
+			onnumber:5,
+			commShow:false,
+			textCom:''
+		};
+	},
+	components: {
+		tuiRate,
+		PopManager
+	},
+	props:{
+		evaItem:{
+			type:Object,
+			default:{}
+		},
+		hidereply:{
+			type:Number,
+			default:0
+		}
+	},
+	methods:{
+		lookImg(imgs,index){
+			uni.previewImage({
+				current:imgs[index],
+				urls: imgs
+			})
+		},
+		like(){
+			App._post_form(
+				`&p=housekeep&do=clickPraise`,
+				{cid:this.evaItem.id},
+				res => {
+					console.log(res);
+					uni.showToast({
+						title: res.message
+					});
+					this.$emit('getData');
+				},
+				false,
+				() => {}
+			);
+		},
+		reply(){
+			let data = {
+				content:this.textCom,
+				cid:this.evaItem.id
+			}
+			App._post_form(
+				`&p=housekeep&do=leaveMessage`,
+				data,
+				res => {
+					console.log(res);
+					uni.showToast({
+						title: res.message
+					});
+					this.$emit('getData');
+					this.textCom = '';
+					this.commShow = false;
+				},
+				false,
+				() => {}
+			);
+		},
+		openComm(){
+			this.commShow = true;
+		},
+		close(){
+			this.commShow = false;
+			this.textCom = ''
+		},
+		open(){
+			this.$emit('getmoreCom',this.evaItem.id);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.evaluateItem {
+	padding: 30upx 0;
+	.evaluate-title {
+		image {
+			width: 90upx;
+			height: 90upx;
+			border-radius: 50%;
+			margin-right: 20upx;
+			// border: 1upx solid #707070;
+		}
+	}
+	.commBox{
+		width: 450upx;
+		background-color: #FFFFFF;
+		border-radius: 30upx;
+		padding: 30upx;
+		.textarea{
+			width: 100%;
+			height: 200upx;
+			font-size: 28upx;
+		}
+		.commBtn{
+			width: 200upx;
+			height: 60upx;
+			line-height: 60upx;
+			border-radius: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			font-weight: bold;
+			background-color: #72AAFD;
+			color: #FFFFFF;
+			margin: auto;
+		}
+	}
+	.img-flex:after{
+		content:'';
+		width:187upx;
+	}
+	.img-flex {
+		display: flex;
+		display: -webkit-flex;
+		justify-content: space-between;
+		flex-direction: row;
+		flex-wrap: wrap;
+		// padding-top: 20upx;
+		image {
+			// flex: 0 0 30%;
+			width: 187upx;
+			height: 187upx;
+			margin-top: 20upx;
+			border-radius: 20upx;
+		}
+	}
+	.condition{
+		// padding-left: 110upx;
+		padding: 40upx 0 40upx;
+		// border-bottom: 1upx solid #EEEEEE;
+		image{
+			width: 34upx;
+			height: 34upx;
+			vertical-align: bottom;
+		}
+		.text{
+			display: inline-block;
+			vertical-align: bottom;
+			line-height: 34upx;
+			padding-left: 10upx;
+		}
+	}
+	.criticList{
+		padding: 20upx 0;
+		border-top: 1upx solid #EEEEEE;
+		.criticItem{
+			padding-bottom: 10upx;
+		}
+	}
+}
+</style>
diff --git a/components/template/farbottom.vue b/components/template/farbottom.vue
new file mode 100644
index 0000000..2821711
--- /dev/null
+++ b/components/template/farbottom.vue
@@ -0,0 +1,351 @@
+<template>
+	<view   v-if="CustomerService.suspension == '1'" >
+		<view class="col-f f-42 zooms" id="id" :style="{position: 'fixed',left:CustomerService.logoleft + 'px',bottom: CustomerService.logobottom + 'px'}"
+		 v-if="CustomerService.logoloca == '1' && btndata" >
+			<drag-button :isDock="true" :existTabBar="true" :btndata="btndata" @btnClick="gourl" @btnTouchstart="btnTouchstart" @btnTouchend="btnTouchend" />
+			<!-- <image :src="CustomerService.susicon" class="img" :style="{width: CustomerService.logowidth + 'px',height:CustomerService.logowidth + 'px'}"  mode="aspectFit"></image> -->
+		</view>
+		<view class="col-f f-42 zooms" id="id"  v-if="CustomerService.logoloca == '0' && btndata" :style="{position: 'fixed',bottom: CustomerService.logobottom + 'px',right:CustomerService.logoleft + 'px'}"
+		 >
+		 <!-- <image :src="CustomerService.susicon" class="img" :style="{width: CustomerService.logowidth + 'px',height:CustomerService.logowidth + 'px'}"  mode="aspectFit"></image> -->
+			<drag-button :btndata="btndata" :isDock="true" :existTabBar="true" @btnClick="gourl" @btnTouchstart="btnTouchstart" @btnTouchend="btnTouchend" />
+		</view>
+		<popup-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+			<view class="mainView marT30Auto textC" style="width: 80vw;height: 80vh;">
+				<view class="title textC marT80Auto backImg" :style="{ background: 'url(' + backImg + ')' }"><text class="font30">在线咨询</text></view>
+				<view class="body marT50Auto" @click="checkImg">
+					<view class="p20">
+						<image :src="CustomerService.qrcode" class="qrCode"></image>
+					</view>
+				</view>
+				<view class=" textC marT50 marT50Auto">
+					<text class="font30 color333333">{{CustomerService.tel}}</text>
+				</view>
+				<view class="phoneButton textC marT19Auto f-22" style="color: #999999;" @click="kfPhone">
+					点击拨打电话
+				</view>
+				<!-- #ifdef H5 -->
+					    <!-- <view v-html="wxOpenTags"></view> -->
+				
+					<!-- #endif --> 
+				<view class="marT30">
+					<text class="font24 color666666">长按保存二维码或者点击拔打电话</text>
+				</view>
+				<view>
+					<text class="font24 color666666">添加客服微信</text>
+				</view>
+				<view>
+					<text class="font24 color666666">我们会尽快回复您</text>
+				</view>
+				<!-- <navigator class="searchbox2-l" url="/pages/subPages/search/search" hover-class="none">
+					经历抽奖
+				</navigator> -->
+				<!-- <view class="f-20" @click="qqqq">
+					经历抽奖
+				</view>
+				<view class="f-20" @click="wwww">
+					获奖列表
+				</view>
+				<view class="f-20" @click="ssss">
+					抽奖码
+				</view> -->
+				<!-- <view class="f-20" @click="aaaa">
+					发布服务
+				</view>
+				<view class="f-20" @click="eeee">
+					入驻
+				</view> -->
+				<!-- <view class="f-20" @click="xxxx">
+					发布招聘
+				</view>
+				<view class="f-20" @click="rrrr">
+					添加简历
+				</view>
+				<view class="f-20" @click="tttt">
+					招聘详情
+				</view>
+				<view class="f-20" @click="yyyy">
+					企业列表
+				</view> -->
+			</view>
+		</popup-view>
+	
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import dragButton from "@/components/drag-button/drag-button.vue";
+	import PopupView from '@/components/template/PopManager.vue';
+	export default {
+		data() {
+			return {
+				CustomerService: {},
+				showCommunity: false,
+				btndata:{}
+			}
+		},
+		components: {
+			PopupView,
+			dragButton
+		},
+		mounted() {
+			let _this = this;
+			this.CustomerService = uni.getStorageSync('CustomerService');
+			setTimeout(()=>{
+				const query = uni.createSelectorQuery().in(_this);
+					query.select('#id').boundingClientRect(data => {
+						// console.log(data)
+						_this.btndata = data;
+					}).exec();
+			})
+			//#ifdef H5  
+				    setTimeout(()=>{  
+				        this.wxOpenTags=`<wx-open-launch-weapp path="pages/mainPages/index/index.html" id="launch-wxapp" username="gh_59d3d43b1c12">  
+				            <template>  
+				                <view class="btn-open-weapp"><image src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1178643745,283795116&fm=26&gp=0.jpg" mode=""></image></view>  
+				            </template>  
+				        </wx-open-launch-weapp>`;  
+				    },1000);  
+			//#endif
+		},
+		computed: {
+			backImg() {
+				return this.imageRoot + 'zxzx.png';
+			}
+		},
+		methods: {
+			xxxx(){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/postRecruitment/postRecruitment"
+				});
+			},
+			yyyy(){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/companiesList/companiesList"
+				});
+			},
+			tttt(){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails"
+				});
+			},
+			rrrr(){
+				// App.navigationTo({
+				// 	url: "pages/subPages2/booked/bookedInformation/bookedInformation"
+				// });
+			},
+			qqqq(){
+				App.navigationTo({
+					url: "pages/subPages2/lottery/lotteryIndex/lotteryIndex?i=1&aid=125&head_id=51&recordid=24&id=5"
+				});
+			},
+			wwww(){
+				App.navigationTo({
+					url: "pages/subPages2/lottery/lotteryList/lotteryList?i=1&aid=125&sharemid=51&recordid=21"
+				});
+			},
+			ssss(){
+				App.navigationTo({
+					url: "pages/subPages2/lottery/lotteryCode/lotteryCode"
+				});
+			},
+			aaaa(){
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/pubService/pubService"
+				});
+				
+				
+			},
+			eeee(){
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/serviceIn/serviceIn"
+				});
+			},
+			btnTouchend() {
+
+			},
+			btnTouchstart() {
+
+			},
+			checkImg() {
+				let _this = this
+				let a = []
+				a.push(_this.CustomerService.qrcode)
+				uni.previewImage({
+					urls: a
+				})
+			},
+			kfPhone() {
+				let _this = this
+				uni.makePhoneCall({
+					phoneNumber: _this.CustomerService.tel //仅为示例
+				});
+			},
+			gourl() {
+				if (this.CustomerService.type == '0') {
+					this.showCommunity = true;
+					// debugger
+					// App.navigationTo({
+					// 	url: "pages/subPages2/phoneBook/phoneClass/phoneClass"
+					// })
+					// App.navigationTo({
+					// 	url: "pages/subPages2/coursegoods/localindex/localindex"
+					// });
+					
+					// App.navigationTo({
+					// 	url: "pages/subPages2/newBuyOrderOrder"
+					// })
+					// App.navigationTo({
+					// 	url: 'pages/subPages/orderList/orderList?type=' + 10
+					// });
+				} else {
+					let url = encodeURIComponent(this.CustomerService.url);
+					// App.navigationTo({
+					// 	url: `pages/subPages/webview/webview?urlsrc=${url}`
+					// })
+					// App.navigationTo({
+					// 	url: "pages/subPages2/drawGame/drawGame1"
+					// });
+					// App.navigationTo({
+					// 	url: "pages/subPages2/coursegoods/localindex/localindex"
+					// });
+					
+					if(this.CustomerService.url.indexOf('https://work.weixin.qq.com') != -1){
+						App.navigationTo({
+							url:this.CustomerService.url
+						});
+					}else{
+						uni.navigateTo({
+							url: `/pages/subPages/webview/webview?urlsrc=${url}`
+						});
+					}
+					
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.img {
+		// border-radius: 50%;
+	}
+
+	.zooms {
+		z-index: 997;
+	}
+
+	.customer {
+		font-size: 0;
+	}
+
+	.customer {
+		background: #eeeeee;
+	}
+
+	.mainView {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		width: 690upx;
+		height: 840upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.marT30Auto {
+		margin: 30upx auto 0 auto;
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	.title {
+		width: 271upx;
+		height: 41upx;
+	}
+
+	.font30 {
+		font-size: 30upx;
+	}
+
+	.marT80Auto {
+		margin: 80upx auto 0 auto;
+	}
+
+	.backImg {
+		background-size: 100% !important;
+	}
+
+	.body {
+		width: 340upx;
+		height: 340upx;
+		border: 2upx solid rgba(255, 68, 68, 1);
+		border-radius: 10upx;
+	}
+
+	.marT50Auto {
+		margin: 50upx auto 0 auto;
+	}
+
+	.qrCode {
+		width: 300upx;
+		height: 300upx;
+	}
+
+	.phoneButton {
+		width: 164upx;
+		height: 40upx;
+		background: rgba(245, 245, 245, 1);
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 4upx;
+	}
+
+	.font30 {
+		font-size: 30upx;
+	}
+
+	.lineHeight40 {
+		line-height: 40upx;
+	}
+
+	.color333333 {
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.font22 {
+		font-size: 22upx;
+	}
+
+	.marT19Auto {
+		margin: 19upx auto 0 auto;
+	}
+
+	.font24 {
+		font-size: 24upx;
+	}
+
+	.marT30 {
+		margin: 30upx 0 0 0;
+	}
+
+	.color666666 {
+		color: rgba(102, 102, 102, 1);
+	}
+
+	.p20 {
+		padding: 20upx;
+	}
+	.btn-open-weapp{
+	    background: linear-gradient(to right, #ffd52e 0%, #ffef93 50%, #ffd52e 100%);  
+	    border: 0;  
+	    color: #424242;  
+	    text-shadow: 0px 1px 1px #fff;  
+	    border-radius: 50px;  
+	    text-align: center;  
+	    width: 120px;  
+	    height: 35px;  
+	    line-height: 35px;  
+	    outline:none;  
+	} 
+</style>
diff --git a/components/template/filtertab.vue b/components/template/filtertab.vue
new file mode 100644
index 0000000..f8222e2
--- /dev/null
+++ b/components/template/filtertab.vue
@@ -0,0 +1,969 @@
+<!-- requestType 1:掌上信息 2:好店首页 3:积分商城 -->
+<!-- @selectAreaid  选择地区id -->
+<!-- @selectClassid 选择分类id -->
+<!-- @selectClassTwoid 选择二级分类id -->
+<!-- @selectOrders 选择排序id -->
+<!-- @pageScrollHeight 积分商城点击tab后滑动顶部,取消回到顶部 -->
+<!-- @getOrderId 默认第一个排序id -->
+<template>
+	<view class="container">
+		<view class="pop-mask" v-if="is_openTabbar" @click="close"></view>
+		<view :class="isPageScroll==='1'&& is_openTabbar?'isPageScroll':'p-r'">
+			<view class="tabBar-list dis-flex b-f" :class="{'border-line':is_openTabbar,'border-bottom':is_openTabbar}">
+				<block v-for="(tabItem,index) in SelectInfo.top" :key="index" v-if="index < 3">
+					<view class="tabBar-item dis-flex flex-x-center flex-y-center f-28 flex-box" :style="currentType===tabItem.subscript?'color:#FF4444;':'color:#333333'"
+					 @click="openTabbar(tabItem.subscript)" v-if="tabItem.status===1 && (requestType ==1 && index!=0)">
+						<view class="m-right10 onelist-hidden tabBar-itemTitle">{{(title && index ==1 && requestType!= '文章头条' )?title:(title && index ==0 && requestType== '文章头条' )?title:tabItem.title}}</view>
+						<view class="iconfont" :class="currentType===tabItem.subscript?'icon-fold':'icon-unfold'"></view>
+					</view>
+				</block>
+			</view>
+			<view class="pop-content padding-box-all b-f" @touchmove.stop.prevent="" :class="{show:is_openTabbar}">
+				<block v-if="!!cityData && currentType==='area'">
+					<view >
+					<view class="dis-flex">
+						<view class="flex-box" style="padding-top: 30upx;">
+							<view v-if="businessCard" class="city-name f-28 m-btm50" :class="isAllarea?'col-f4':'col-3'" @click="allCityarea('all')">全部</view>
+							<view class="city-name f-28" :class="!isAllarea?'col-f4':'col-3'" @click="allCityarea('city')">{{cityData.name}}</view>
+						</view>
+						<scroll-view 
+						scroll-y="true" 
+						class="cityScroll"  
+						v-if="!isAllarea" 
+						:scroll-top="cityScrollTop"  
+						@scroll="cityChage"
+						:upper-threshold="topNumberct"
+						lower-threshold="0"
+						@scrolltolower="scrolltolowerct"
+						@scrolltoupper="scrolltoupperct"
+						>
+							<view class="city-list" style="padding-left: 30upx;padding-top: 30upx;">
+								<view class="city-list-item m-btm50 f-28" :class="city_id===cityItem.id?'col-f4':'col-3'" @click="getcityId(cityItem)"
+								 v-for="(cityItem,index) in cityData.list" :key="index">{{cityItem.name}}</view>
+								<!-- <view class="right">
+								 	<image v-if="cityData.list.length > 9" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image>
+								 </view> -->
+							</view>
+						</scroll-view>
+						
+					</view>
+					<view class="dis-flex" style="height: 50upx;">
+						<view class="left" >
+							<!-- <image v-if="SelectInfo.class.length > 9" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image> -->
+						</view>
+						<view class="left" style="padding-top: 0upx;position: relative;padding-bottom: 18upx;">
+							<!-- <view  style="width: 2upx;background-color: #eeeeee;height: 100%;position: absolute;left: 0;top: 0;">
+								
+							</view> -->
+							<image @click="citybottombtn" v-if="cityData.list.length > 9 && !citybottom" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image>
+						</view>
+					</view>
+					</view>
+				</block>
+				<block v-if="currentType==='class'">
+									<scroll-view 
+									class="classScroll" 
+									:scroll-top="scrollTop" 
+									scroll-y="true" 
+									style="padding-top: 30upx;" 
+									:upper-threshold="topNumber"
+									lower-threshold="0"
+									@scrolltolower="scrolltolowers"
+									@scrolltoupper="scrolltolower" 
+									@scroll="classoneChage">
+										
+										<view class="class_list dis-flex" v-for="(classItem,index) in SelectInfo.class" :key="index">
+											<view class="class_listOne  dis-flex flex-box m-btm50"  style="width: 50%;" :class="classOneId===classItem.cate_one || classOneId===classItem.id || cate_one == classItem.cate_one || cate_one == classItem.id?'col-f4':'col-3'"
+											 @click="getclassOneId(classItem)">
+												<view class="class_listOneItem f-28">{{classItem.name}}</view>
+											</view>
+											<block v-if="(classOneId===classItem.cate_one || classOneId===classItem.id) && (!!classItem.list &&classItem.list.length>0) || cate_one == classItem.cate_one || cate_one == classItem.id">
+												<view class="class_Twolist"  @touchmove.stop.prevent="">
+													<scroll-view 
+													scroll-y="true" 
+													:style="{height: boxHeight - 20 + 'px'}"
+													:scroll-top="scrollTopTwo" 
+													class="class_TwoScroll" 
+													@scroll="classtwoChage"
+													:upper-threshold="topNumbertwo"
+													lower-threshold="0"
+													@scrolltolower="scrolltolowerst"
+													@scrolltoupper="scrolltolowert" 
+													>
+														<view class="class_listTwo m-btm30" @click="getclassTwoId(classTwoItem)" v-for="(classTwoItem,indexTwo) in classItem.list"
+														 :key="indexTwo">
+														 <view class="class_listTwoItem f-28" :class="(classTwoId===classTwoItem.id||classTwoId===classTwoItem.cate_two || cate_two == classTwoItem.cate_two || cate_two == classTwoItem.id)?'col-f4':'col-3'">{{classTwoItem.name}}</view>
+															<!-- <view class="class_listTwoItem f-28" :class="(classTwoId===classTwoItem.id||classTwoId===classTwoItem.cate_two || cate_two == classTwoItem.cate_two || cate_two == classTwoItem.id)?'col-f4':'col-3'">{{classTwoItem.name}}</view> -->
+														</view>
+														
+													</scroll-view>
+													<view class="right">
+														<image @click="sorTwoTop" v-if="classItem.list.length > 11 && !classtwobottom" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image>
+													</view>
+												</view>
+											</block>
+										</view>
+									</scroll-view>
+								</block>
+				<block v-if="currentType==='orders'">
+					<scroll-view scroll-y="true" class="class_TwoScroll" style="padding-top: 30upx;">
+						<view class="class_listTwo">
+							<view class="class_listTwoItem f-28 m-btm50" @click="getOrderId(orderItem)" v-for="(orderItem,index) in SelectInfo.orders"
+							 :key="index" :class="orderId===orderItem.val?'col-f4':'col-3'">{{orderItem.title}}</view>
+						</view>
+					</scroll-view>
+				</block>
+				<block v-if="currentType==='nwe_area' || currentType === 'area_id'">
+					<view class="dis-flex" style="padding-top: 30upx;">
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true">
+							<view class="f-24 t-c industry-item" :style="{color: item.id != provinceId?'#363636':'#ff4444'}" v-for="(item,index) in provinceList" :key="index" @click="getCityList(index,item)">
+								{{item.name}}
+							</view>
+						</scroll-view>
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true">
+							<view class="f-24 t-c industry-item" :style="{color: item.id != cityId?'#363636':'#ff4444'}" v-for="(item,index) in cityList" :key="index" @click="getAreaList(index,item)">
+								{{item.name}}
+							</view>
+						</scroll-view>
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true">
+							<view class="f-24 t-c industry-item" :style="{color: item.id != areaId?'#363636':'#ff4444'}" v-for="(item,index) in areaList" :key="index" @click="getAreaId(index,item)">
+								{{item.name}}
+							</view>
+						</scroll-view>
+					</view>
+				</block>
+				<block v-if="currentType==='industry' || currentType=== 'education' && industryOne">
+					<view class="dis-flex" style="padding-top: 30upx;">
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true">
+							<view class="f-24 t-c industry-item" :style="{color: !item.checked?'#363636':'#ff4444'}" v-for="(item,index) in industryOne" :key="index" @click="getindustryTwo(index,item)">
+								{{item.title}}
+							</view>
+						</scroll-view>
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true" v-if="pageName != '企业'">
+							<view class="f-24 t-c industry-item" :style="{color: !item.checked?'#363636':'#ff4444'}" v-for="(item,index) in industryTwo" :key="index" @click="getindustryThree(index,item)">
+								{{item.title}}
+							</view>
+						</scroll-view>
+						<scroll-view class="flex-box" style="height: 400upx;" :scroll-y="true" v-if="pageName != '企业'">
+							<view class="f-24 t-c industry-item" :style="{color: !item.checked?'#363636':'#ff4444'}" v-for="(item,index) in industryThree" :key="index" @click="getindustryFour(index,item)">
+								{{item.title}}
+							</view>
+						</scroll-view>
+					</view>
+				</block>
+				<!-- 相亲新增 -->
+				<block v-if="currentType==='sort'">
+					<scroll-view scroll-y="true" style="padding-top: 30upx;" class="class_TwoScroll">
+						<view class="class_listTwo">
+							<view class="class_listTwoItem f-28 m-btm50" @click="getSortId(sortItem)" v-for="(sortItem,index) in SelectInfo.sort"
+							 :key="index" :class="sortId===sortItem.val?'col-f4':'col-3'">{{sortItem.title}}</view>
+						</view>
+					</scroll-view>
+				</block>
+				<block v-if="currentType==='gneder'">
+					<scroll-view scroll-y="true" style="padding-top: 30upx;" class="class_TwoScroll">
+						<view class="class_listTwo">
+							<view class="class_listTwoItem f-28 m-btm50" @click="getGnederId(gnederItem)" v-for="(gnederItem,index) in SelectInfo.gneder"
+							 :key="index" :class="gnederId===gnederItem.val?'col-f4':'col-3'">{{gnederItem.title}}</view>
+						</view>
+					</scroll-view>
+				</block>
+				<view class="dis-flex" v-if="currentType==='class' && SelectInfo.class.length > 9" style="height: 50upx;">
+					<view class="left" @click="sorTop">
+						<image v-if="SelectInfo.class.length > 9 && !classonebottom" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image>
+					</view>
+					<view class="left">
+						<!-- <image v-if="SelectInfo.class.length > 9" :src="imgfixUrls  + 'scrollbottom.gif'" mode=""></image> -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<view >
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '../../common/js/app.js';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	export default {
+		data() {
+			return {
+				is_openTabbar: false,
+				SelectInfo: {},
+				currentType: null,
+				cityData: {},
+				city_id: null,
+				classOneId: null,
+				classTwoId: null,
+				orderId: null,
+				isAllarea: false,
+				industryOne:null,
+				industryTwo:[],
+				industryThree:[],
+				industryID:[],
+				provinceList:[],
+				cityList:[],
+				areaList:[],
+				provinceId:'',
+				cityId:'',
+				areaId:'',
+				agencyData:{},
+				sortId: null,  //相亲新增
+				gnederId: null,
+				citybottom:false,
+				classonebottom:false,
+				classtwobottom:false,
+				scrollTop:0,
+				scrollTopTwo:0,
+				cityScrollTop:0,
+				topNumbertwo:10,//预设为10避免一开始就触发事件
+				topNumber:10,
+				topNumberct:10,
+				boxHeight:0
+			}
+		},
+		mounted() {
+			this.getSelectInfo();
+			this.agencyData = uni.getStorageSync('agencyData');
+			
+			
+		},
+		components:{
+			wPicker
+		},
+		props: {
+			//请求页面类型
+			requestType: {
+				type: String,
+				default: function() {
+					return '2'
+				}
+			},
+			//积分商城滑动 0关闭 1开启
+			isPageScroll: {
+				type: String,
+				default: function() {
+					return '0'
+				}
+			},
+			businessCard: {
+				type: Boolean,
+				default: function() {
+					return false
+				}
+			},
+			cate_one: {
+				type:String,
+				default: ''
+			},
+			cate_two: {
+				type:String,
+				default:''
+			},
+			title:{
+				type:String,
+				default:''
+			},
+			pageName:{
+				type:String,
+				default:''
+			}
+		},
+		watch:{
+			cate_one: {
+				handler(newval) {
+
+					this.setData({
+						classOneId: newval
+					})
+				},
+				deep: true
+			},
+			cate_two: {
+				handler(newval) {
+
+					this.setData({
+						classTwoId: newval
+					})
+				},
+				deep: true
+			},
+			title :{
+				handler(newval) {
+					
+					// debugger
+				},
+				deep: true
+			},
+		},
+		methods: {
+			citybottombtn(){
+				this.cityScrollTop = 9999;
+				this.citybottom = true;
+			},
+			sorTwoTop(){
+				this.scrollTopTwo = 9999;
+				this.classtwobottom = true;
+			},
+			sorTop(){
+				this.scrollTop = 9999;
+				this.classonebottom = true;
+			},
+			scrolltolowerst(e){
+				//到底部
+				this.classtwobottom = true;
+			},
+			scrolltolowert(e){
+				this.scrollTopTwo =  this.topNumbertwo;
+				this.classtwobottom = false;
+			},
+			classtwoChage(e){
+				console.log(e);
+				this.topNumbertwo = e.detail.scrollHeight - 366;
+			},
+			scrolltolower(e){
+				// console.log(e);
+				this.scrollTop =  this.topNumber;
+				this.classonebottom = false;
+			},
+			scrolltolowers(e){
+				this.classonebottom = true;
+			},
+			classoneChage(e){
+				console.log(e);
+				this.topNumber = e.detail.scrollHeight - 371;
+			},
+			scrolltolowerct(e){
+				console.log('触发了距底');
+				this.citybottom = true;
+			},
+			scrolltoupperct(e){
+				console.log('触发了距顶');
+				this.citybottom = false;
+				this.cityScrollTop =  this.topNumberct;
+			},
+			cityChage(e){
+				console.log(e);
+				this.topNumberct = e.detail.scrollHeight - 371;
+			},
+			getAreaId(index,item){
+				if(item.id == this.areaId) return
+				this.areaId = item.id;
+				this.$emit('getcityWork',item.id);
+				this.SelectInfo.top.map(items=>{
+										if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
+											items.title = item.name;
+										}
+									})
+				this.close();
+			},
+			getAreaList(index,item){
+				
+				let _this = this;
+				
+				_this.cityId = item.id;
+				_this.areaList = item.dist;
+				if(item.dist.length == 0){
+					_this.$emit('getcityWork',item.id);
+					_this.areaList = [];
+					this.SelectInfo.top.map(items=>{
+											if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
+												items.title = item.name;
+											}
+										})
+					return
+				}
+				if(_this.areaList[0].id == item.id) return
+				_this.areaList.unshift({
+					id:item.id,
+					name:`全${item.name}`,
+					flag:true
+				})
+			},
+			getCityList(index,item){
+				let _this = this;
+				// console.log(item);
+				_this.provinceId = item.id;
+				_this.cityList = item.area;
+				_this.areaList = [];
+				if(!item.id || !_this.cityList[0]){
+					_this.$emit('getcityWork',item.id);
+					this.SelectInfo.top.map(items=>{
+						if(items.subscript == 'nwe_area' || items.subscript == 'area_id'){
+							items.title = item.name;
+						}
+					})
+					return
+				}
+				if(!!_this.cityList[0] && _this.cityList[0].id == item.id) return
+				_this.cityList.unshift({
+					id:item.id,
+					name:`全${item.name}`,
+					dist:[]
+				});
+				
+				
+			},
+			getCitys(){
+				let _this = this;
+				
+				_this.provinceList = uni.getStorageSync('cityList');
+				_this.provinceList.unshift({
+					id:'',
+					name:'全国',
+					area:[]
+				})
+				// _this.agencyData.areaid = ''
+				console.log(_this.provinceList,_this.agencyData);
+				// debugger
+				_this.provinceList.map(item=>{
+					if(item.id == _this.agencyData.areaid){
+						_this.getCityList('',item);
+						return false
+					}
+					item.area.map(items=>{
+						if(items.id == _this.agencyData.areaid){
+							_this.getCityList('',item);
+							_this.getAreaList('',items);
+							return false
+						}
+						items.dist.map(itemss=>{
+							if(itemss.id == _this.agencyData.areaid){
+								_this.getCityList('',item);
+								_this.getAreaList('',items);
+								_this.getAreaId('',itemss);
+								return false
+							}
+						})
+					})
+				})
+				
+			},
+			getindustryFour(index,items){
+				console.log(this.industryThree[0].id)
+				
+				this.industryThree.map(item=>{
+					item.checked = false;
+				});
+				this.industryThree[index].checked = true;
+				this.is_openTabbar = !this.is_openTabbar;
+				this.is_openTabbar = !this.is_openTabbar;
+				this.SelectInfo.top.map(item=>{
+									if(item.subscript == 'industry' || item.subscript == 'education'){
+										item.title = items.title;
+									}
+								})
+				if(index == 0){
+					this.industryID = [this.industryID[0],this.industryID[1],''];
+					this.$emit('getResumeList',this.industryID);
+					return
+				}else{
+					this.industryID = [this.industryID[0],this.industryID[1],this.industryThree[index].id];
+					this.$emit('getResumeList',this.industryID);
+				};
+				this.is_openTabbar = false;
+				this.currentType = null;
+			},
+			getindustryThree(index,items){
+				// debugger
+				this.industryThree = [];
+				this.industryTwo.map(item=>{
+					item.checked = false;
+				})
+				this.industryTwo[index].checked = true;
+				this.is_openTabbar = !this.is_openTabbar;
+				this.is_openTabbar = !this.is_openTabbar;
+				
+				if(index == 0){
+					this.industryID = [this.industryID[0],'',''];
+					this.$emit('getResumeList',this.industryID);
+					return
+				}else{
+					this.industryID = [this.industryID[0],this.industryTwo[index].id,'']
+				}
+				this.SelectInfo.top.map(item=>{
+									if(item.subscript == 'industry' || item.subscript == 'education'){
+										item.title = items.title;
+										// debugger
+									}
+								})
+				let data={
+					type:3,
+					pid:this.industryTwo[index].id
+				}
+				App._post_form('&'+ this.SelectInfo.industry, data, res => {
+					console.log(res);
+					this.industryThree = res.data;
+					if(res.data.length != 0){
+						this.industryThree.unshift({
+							id:'0',
+							title:'全部'
+						})
+					}
+					this.getindustryFour(0,this.industryThree[0]);
+				})
+			},
+			getindustryTwo(index,items){
+				this.industryTwo = [];
+				this.industryThree = [];
+				this.industryOne.map(item=>{
+					item.checked = false;
+				});
+				this.industryOne[index].checked = true;
+				this.is_openTabbar = !this.is_openTabbar;
+				this.is_openTabbar = !this.is_openTabbar;
+				this.SelectInfo.top.map(item=>{
+					if(item.subscript == 'industry' || item.subscript == 'education'){
+						item.title = items.title;
+					}
+				})
+				if(index == 0){
+					this.industryID = ['','',''];
+					this.$emit('getResumeList',this.industryID);
+					return
+				}else{
+					this.industryID = [this.industryOne[index].id,'','']
+				}
+				
+				// this.
+				let data={
+					type:2,
+					pid:this.industryOne[index].id
+				}
+				App._post_form('&'+ this.SelectInfo.industry, data, res => {
+					console.log(res);
+					
+					this.industryTwo = res.data;
+					if(res.data.length != 0){
+						this.industryTwo.unshift({
+							id:'0',
+							title:'全部'
+						})
+					};
+					// console.log(index)
+					// debugger
+					this.getindustryThree(0,this.industryTwo[0]);
+				})
+			},
+			openTabbar(subscript) {
+				let _this = this;
+				if (this.isPageScroll === '1') {
+					this.$emit('pageScrollHeight', '1')
+				}
+				this.is_openTabbar = true;
+				this.currentType = subscript;
+				this.$nextTick(function(){
+					const query = uni.createSelectorQuery().in(_this);
+						query.select('.pop-content').boundingClientRect(data => {
+							console.log(data,2333333)
+							_this.boxHeight = data.height;
+						}).exec();
+				})
+			},
+			close() {
+				if (this.isPageScroll === '1') {
+					this.$emit('pageScrollHeight', '0')
+				}
+				this.is_openTabbar = false;
+				this.currentType = null;
+			},
+			getindustry(url){
+				// 
+				this.industryOne = [];
+				this.industryTwo = [];
+				this.industryThree = [];
+				App._post_form('&'+ url, {
+				}, res => {
+					console.log(res);
+					this.industryOne = res.data;
+					this.industryOne.unshift({
+						id:'0',
+						title:'全部'
+					})
+					this.industryOne.map(item=>{
+						item.checked = false
+					});
+					// this.industryOne[0].checked = true;
+					this.getindustryTwo(0,this.industryOne[0]);
+				})
+			},
+			getSelectInfo() {
+				let _this = this,
+					agencyData = uni.getStorageSync('agencyData'),
+					url = `&do=SelectInfo&type=${_this.requestType}&cate_one=${_this.cate_one}&cate_two=${_this.cate_two}`;
+				if(_this.requestType == '服务列表'){
+					url = `&p=housekeep&do=housekeepSelectInfo&type=2`
+				}else if(_this.requestType == '需求列表'){
+					url = `&p=housekeep&do=housekeepSelectInfo&type=1`
+				} else if(_this.requestType == '文章头条'){
+					url = `&p=headline&do=headlineSelectInfo`
+				}
+				
+				App._post_form(url, {
+					
+				}, res => {
+					let SelectInfo = res.data;
+					let title;
+					if(res.data.class){
+						
+						res.data.class.map(item=>{
+							if(item.cate_one == _this.cate_one){
+								_this.$emit('selectClassid', item);
+								// debugger
+								if(item.list.length > 0){
+									item.list.map(items=>{
+										if(items.cate_two == _this.cate_two){
+											// debugger
+											_this.$emit('selectClassTwoid', items)
+											// debugger
+										}
+									})
+								}
+							}
+						})
+					}
+					if(res.data.orders){
+						setTimeout(()=>{
+							_this.getOrderId(res.data.orders[0]);
+							
+							_this.getCitys();
+						})
+						_this.$emit('getOrderId', SelectInfo.orders[0].val,title);
+					}
+					// 相亲新增
+					if(res.data.sort) {
+						setTimeout(() => {
+							_this.getSortId(res.data.sort[0]);
+							_this.getCitys();
+							_this.getGnederId(res.data.gneder[0]);
+						})
+						_this.$emit('getSortId', SelectInfo.sort[0].val,title);
+					}
+					
+					if (!!SelectInfo.area) {
+						_this.getCityarea(SelectInfo.area,true);
+						SelectInfo.top.map(item=>{
+							if(item.subscript == 'area'){
+								item.title = agencyData.areaname;
+							}
+						})
+					}
+					if(!!SelectInfo.industry){
+						_this.getindustry(SelectInfo.industry);
+					}
+					if(SelectInfo.top.length > 3){
+						_this.$emit('getmore',SelectInfo);
+					}
+					if(_this.SelectInfo.orders) {
+						_this.setData({
+							orderId: SelectInfo.orders[0].val
+						})
+					}
+					_this.setData({
+						SelectInfo
+					});
+					// _this.SelectInfo.top.splice(0)
+				})
+			},
+			allCityarea(cityType = 'all') {
+				let _this = this;
+				if (cityType === 'all') {
+					_this.$emit('selectAllarea')
+					let tabbarList = _this.SelectInfo.top,
+						tabIndex = tabbarList.findIndex(item => item.subscript === 'area');
+					tabbarList[tabIndex].title = '全部';
+					_this.setData({
+						is_openTabbar: false,
+						currentType: null,
+						city_id: "",
+						isAllarea: true
+					})
+				} else {
+					_this.setData({
+						isAllarea: false
+					})
+				}
+			},
+			getCityarea(requestUrl,flag) {
+				let _this = this,
+					agencyData = uni.getStorageSync('agencyData'),
+					doUrl = '&' + requestUrl;
+				App._post_form(doUrl, {
+					city_id: agencyData.areaid
+				}, res => {
+					_this.setData({
+						cityData: res.data,
+						city_id: agencyData.areaid,
+					})
+					_this.cityData.list.map(item=>{
+						if(item.select == 1){
+							_this.$emit('selectAreaid', item,flag);
+						}
+					})
+				})
+			},
+			async getcityId(cityItem) {
+				let _this = this;
+				_this.SelectInfo.class = await _this.getCityClass(cityItem.id);
+				_this.$emit('selectAreaid', cityItem);
+				_this.setData({
+					is_openTabbar: false,
+					currentType: null,
+					city_id: cityItem.id,
+				})
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'area');
+				tabbarList[tabIndex].title = cityItem.name;
+			},
+			getCityClass(areaid){
+				let _this = this;
+				let data = {
+					is_two: 1,
+					is_set: 0,
+					is_ios: 0,
+					areaid:areaid.id ||areaid
+				};
+				// debugger
+				return new Promise((resolve, reject) => {
+					let all = {
+								id:'0',
+								name:'全部',
+								title:'全部',
+								list:[]
+							}
+					App._post_form('&p=pocket&do=classList', data, res => {
+						if(JSON.stringify(res.data) != '[]'){
+							res.data.list.unshift(all)
+							res.data.list.map((item,index)=>{
+								item.name = item.title;
+								if(index == 0){
+									_this.$emit('selectClassid', item);
+								}
+									if(item.list.length > 0){
+										item.list.map((items,indexs)=>{
+											items.name = items.title;
+											if(indexs == 0){
+												_this.$emit('selectClassTwoid', items)
+											}
+										})
+									}
+							});
+							resolve(res.data.list);
+							_this.getclassOneId(all)
+						}else{
+							resolve(_this.SelectInfo.class);
+						}
+						
+						
+					});
+				})
+				
+			},
+			getclassOneId(classItem) {
+				let _this = this;
+				_this.$emit('selectClassid', classItem)
+				if (!(!!classItem.list) || (!!classItem.list && classItem.list.length === 0)) {
+					_this.setData({
+						is_openTabbar: false,
+						currentType: null,
+						classTwoId: ""
+					})
+				}
+				_this.setData({
+					classOneId: !!classItem.cate_one ? classItem.cate_one : classItem.id
+				});
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'class');
+				tabbarList[tabIndex].title = classItem.name;
+			},
+			getclassTwoId(classTwoItem) {
+				let _this = this;
+				// debugger
+				_this.$emit('selectClassTwoid', classTwoItem);
+				
+				_this.setData({
+					classTwoId: !!classTwoItem.id ? classTwoItem.id : classTwoItem.cate_two,
+					is_openTabbar: false,
+					currentType: null
+				})
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'class');
+				tabbarList[tabIndex].title = classTwoItem.name;
+			},
+			getOrderId(orderItem) {
+				let _this = this;
+				
+				_this.$emit('selectOrders', orderItem)
+				_this.setData({
+					orderId: orderItem.val,
+					is_openTabbar: false,
+					currentType: null
+				})
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'orders');
+				tabbarList[tabIndex].title = orderItem.title;
+				console.log(tabbarList[tabIndex].title,'tabbarList[tabIndex].title')
+			},
+			// 相亲模块新增
+			getSortId(sortItem) {
+				let _this = this
+				_this.$emit('selectSort',sortItem)
+				_this.setData({
+					sortId: sortItem.val,
+					is_openTabbar: false,
+					currentType: null
+				})
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'sort');
+				tabbarList[tabIndex].title = sortItem.title;
+			},
+			getGnederId(gneterItem) {
+				let _this = this
+				_this.$emit('selectGneder',gneterItem)
+				_this.setData({
+					gnederId: gneterItem.val,
+					is_openTabbar: false,
+					currentType: null
+				})
+				let tabbarList = _this.SelectInfo.top,
+					tabIndex = tabbarList.findIndex(item => item.subscript === 'gneder');
+				tabbarList[tabIndex].title = gneterItem.title;
+			}
+		},
+		computed: {
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pop-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 997;
+		background: rgba(0, 0, 0, .5);
+	}
+
+	.isPageScroll {
+		position: fixed;
+		left: 0;
+		right: 0;
+		top: 0;
+		z-index: 999;
+	}
+
+	.tabBar-list {
+		height: 80upx;
+		line-height: 80upx;
+		position: relative;
+		z-index: 997;
+		// border-bottom: 1upx solid #eeeeee;
+	}
+
+
+	.pop-content {
+		position: absolute;
+		left: 0;
+		top: 80upx;
+		z-index: 998;
+		opacity: 0;
+		visibility: 0;
+		transition: all .25s ease-in;
+		// transform: translateY(-400upx);
+		border-radius: 0upx 0upx 30upx 30upx;
+		border-top: 1upx solid #eeeeee;
+		padding-top: 0 !important;
+		padding-bottom: 0!important;
+		// margin-top: 30upx;
+	}
+
+	.pop-content.show {
+		width: 100vw;
+		max-height: 830upx;
+		opacity: 1;
+		visibility: 1;
+		// transform: translateY(18%);
+	}
+
+	.cityScroll {
+		width: 50%;
+		max-height: 740upx;
+	}
+
+	.classScroll {
+		width: 100%;
+		max-height: 780upx;
+		overflow-y: scroll;
+		position: relative;
+	}
+	
+	.left{
+		// position: absolute;
+		// bottom: 10upx;
+		// left: 30upx;
+		flex: 1;
+		text-align: center;
+		image{
+			width: 30upx;
+			height: 30upx;
+		}
+		// background-color: #ff4444;
+	}
+	.right{
+		// text-align: center;
+		position: relative;
+		image{
+			width: 30upx;
+			height: 30upx;
+			margin: auto;
+			position: absolute;
+			left: 22%;
+			top: 10upx;
+			transform: translateX(-50%);
+			
+		}
+	}
+	
+	.city-list-item:last-child {
+		margin: 0 !important;
+	}
+
+	.class_listOne {
+		overflow-y: scroll;
+	}
+
+	.class_Twolist {
+		z-index: 1000;
+		position: fixed;
+		left: 50%;
+		top: 80upx;
+		width: 100%;
+		max-height: 798upx;
+		// border-left: 1upx solid #eeeeee;
+		padding-left: 30upx;
+		padding-top: 30upx;
+		padding-bottom: 54upx;
+	}
+
+	.class_TwoScroll {
+		width: 100%;
+		max-height: 730upx;
+	}
+
+	.tabBar-itemTitle {
+		width: auto;
+	}
+	.industry-item{
+		padding: 5upx 10upx;
+		width: 200upx;
+		line-height: 100upx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+	}
+</style>
diff --git a/components/template/follow.vue b/components/template/follow.vue
new file mode 100644
index 0000000..8aca6b2
--- /dev/null
+++ b/components/template/follow.vue
@@ -0,0 +1,313 @@
+<template>
+	<view class="follow">
+		<!-- 头部引导关注 -->
+		<!--  -->
+		<view  class="followTitle" v-if="followType == '0'&&followTitleShow==true&&followInfo.status != 0">
+			<view class="followTitlePackage">
+				<view class="followImage"><image :src="platformInfor.logo"></image></view>
+				<view class="followInfomation">
+					<view :style="followInfo.korea != 1?'overflow: hidden;text-overflow: ellipsis;white-space: nowrap;':''">
+						<text>{{followInfo.korea == 1?'나의 소식 전하는 한밥상~':'欢迎进入'}}</text>
+						<text class="followText" v-if="followInfo.korea != 1">{{ platformInfor.name }}</text>
+					</view>
+					<view><text>{{followInfo.korea == 1?'가끔 한밥상 필요할때가 있습니다!':'关注公众号，享专属服务'}}</text></view>
+				</view>
+				<view class="followButton" @click="openQrShow"><text>{{followInfo.korea == 1?'팔로우':'立即关注'}}</text></view>
+			</view>
+			<view class="followTitleClose" @click="closeFollowTitle"><image :src="imgfixUrls + 'merchant/followClose.png'"></image></view>
+		</view>
+		<!-- 头部引导关注 -->
+		<PopManager :show="followShow" :type="type" @clickmask="closePop">
+			<view class="qrCenter" v-if="(followType == '0') && followInfo.status!='0'">
+				<view class="qrCenterTitle"><text>长按二维码，关注我们</text></view>
+				<view class="qrCenterMain">
+					<view class="qrCenterMainPackage"><image :src="followInfo.gzimage"></image></view>
+				</view>
+			</view>
+			<view v-if="followType != '0'&&followInfo.status!='0'" class="qrBottom" >
+				<view class="qrBottomTitle">
+					<view class="qrBottomImage">
+						<image :src="followInfo.gzimage"></image>
+					</view>
+					<view class="qrBottomTip">
+						<text>长按识别，扫码关注</text>
+					</view>
+				</view>
+				<view class="qrBottomFoot" @click="closePop" >
+					<view class="qrBottomButton">
+						<text>取消</text>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import PopManager from '@/components/template/PopManager';
+export default {
+	components: {
+		PopManager
+	},
+	props: {
+		shareId:{
+			type: String,
+			default: ''	
+		},
+		followShow: {
+			type: Boolean,
+			default: false
+		},
+		followType: {
+			type: String,
+			default: ''
+		},
+		followTitleShow:{
+			type: Boolean,
+			default: false
+		},
+		followData:{
+			type: Object,
+			default:null
+		}
+	},
+	watch:{
+		'followData': {
+			handler(newData, oldData) {
					this.followInfo = newData;
			},
+			deep: true
+		}
+	},
+	data() {
+		return {
+			type: null,
+			platformInfor: {},
+			followInfo: {
+				status: 0
+			},
+			img:''
+		};
+	},
+	mounted() {
+		let _this = this;
+		// _this.img = this.imgfixUrl;
+		if (_this.followType == '0') {
+			_this.type = 'center';
+		} else {
+			_this.type = 'bottom';
+		}
+		_this.platformInfor = uni.getStorageSync('platformInfor');
+		_this.init();
+	},
+	methods: {
+		closePop() {
+			let _this = this;
+			_this.$emit('closeFollowPop');
+		},
+		closeFollowTitle(){
+			let _this = this;
+			_this.$emit('closeFollowTitle');
+		},
+		init() {
+			let _this = this;
+			_this.getFollow();
+		},
+		// 关注接口
+		getFollow() {
+			let _this = this;
+			
+			// debugger
+			if(_this.followType == '10') return;
+			let data = {
+				type: _this.followType,
+				id:_this.shareId||''
+			};
+			App._post_form('&do=Follow', data, res => {
+				_this.followInfo = res.data;
+			});
+		},
+		openQrShow() {
+			let _this = this;
+			_this.$emit('clickmask');
+			let locations = location.href;
+			let data={
+				url:locations
+			};
+			App._post_form('&do=TopFollow', data, res => {
+				console.info(res.data);
+				// _this.followInfo = res.data;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.qrBottomTip{
+	margin-top: 30upx;
+	text-align: center;
+	>text{
+		font-size:24upx;
+		color:rgba(102,102,102,1);
+	}
+}	
+.qrBottomImage{
+	margin: 50upx auto 0 auto;
+	width: 300upx;
+	height: 300upx;
+	>image{
+		width: 300upx;
+		height: 300upx;
+	}
+}	
+.qrBottomTitle{
+	border: 1upx solid rgba(0,0,0,0);
+	width: 750upx;
+	height: 480upx;
+	background: #FFFFFF;
+}	
+.qrBottomButton{
+	margin:20upx auto 0 auto;
+	width: 700upx;
+	height: 80upx;
+	text-align: center;
+	background:rgba(245,245,245,1);
+	border:1upx solid rgba(204,204,204,1);
+	border-radius:10upx;
+	>text{
+		line-height: 80upx;
+		font-size:30upx;
+		color:rgba(51,51,51,1);
+	}
+}	
+.qrBottomFoot{
+	box-shadow: 10upx 20upx 20upx 20upx rgba(245,245,245,1);
+	border: 1upx solid rgba(0,0,0,0);
+	width: 750upx;
+	height: 120upx;
+	background: #FFFFFF;
+	text-align: center;
+}	
+.qrBottom{
+	border: 1upx solid rgba(0,0,0,0);
+	width: 750upx;
+	height: 600upx;
+	background: #F6F6F6;
+}	
+.followTitleClose {
+	position: absolute;
+	top: 0;
+	right: 0;
+	width: 70upx;
+	height: 70upx;
+	> image {
+		width: 70upx;
+		height: 70upx;
+	}
+}
+.qrCenterMainPackage {
+	padding: 30upx;
+	> image {
+		width: 520upx;
+		height: 510upx;
+	}
+}
+.qrCenterMain {
+	height: 570upx;
+	background: #ffffff;
+}
+.qrCenterTitle {
+	height: 80upx;
+	text-align: center;
+	> text {
+		line-height: 80upx;
+		font-size: 30upx;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.qrCenter {
+	overflow: hidden;
+	border-radius: 10upx;
+	width: 580upx;
+	height: 650upx;
+	background: #eeeeee;
+}
+.followButton {
+	margin-left: 10upx;
+	display: inline-block;
+	width: 130upx;
+	padding: 0 10upx;
+	height: 60upx;
+	border-radius: 10upx;
+	vertical-align: middle;
+	text-align: center;
+	background: rgba(255, 68, 68, 1);
+	> text {
+		font-size: 28upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: rgba(255, 255, 255, 1);
+		line-height: 60upx;
+	}
+}
+.followTitlePackage {
+	position: relative;
+	padding: 15upx 30upx;
+}
+.followInfomation {
+	width: 400upx;
+	margin-left: 20upx;
+	vertical-align: middle;
+	display: inline-block;
+	
+	> view {
+		width: 400upx;
+		// overflow: hidden;
+		// text-overflow: ellipsis;
+		// white-space: nowrap;
+		
+		> text {
+			display: inline-block;
+			font-size: 28upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: rgba(255, 255, 255, 1);
+			
+		}
+	}
+}
+.followText {
+	font-size: 28upx;
+	font-family: PingFang SC;
+	font-weight: 500;
+	color: rgba(255, 68, 68, 1) !important;
+}
+.followImage {
+	vertical-align: middle;
+	display: inline-block;
+	width: 100upx;
+	height: 100upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 100upx;
+		height: 100upx;
+	}
+}
+.follow {
+	font-size: 0;
+}
+.followTitle {
+	z-index: 200;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 750upx;
+	min-height: 130upx;
+	background: black;
+}
+</style>
diff --git a/components/template/footer.vue b/components/template/footer.vue
new file mode 100644
index 0000000..6f88dc0
--- /dev/null
+++ b/components/template/footer.vue
@@ -0,0 +1,89 @@
+<template>
+  <view>
+    <view class="footer">
+      <view class="footer-l">
+        <image class="image" :src="appInfo.logo" mode="aspectFill"></image>
+      </view>
+      <view class="footer-c">
+        <view class="p">{{ appInfo.name }} 出品</view>
+        <view class="p">合作电话: {{ appInfo.phone }}</view>
+      </view>
+      <view class="footer-r">
+        <view class="span" @click="cell"><text class="i icon iconfont icon-tongxun inline"></text>拨打</view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+	data () {
+		return {
+			appInfo: {}
+		}
+	},
+	mounted () {
+		if(this.$store.state.appInfo !== ''){
+			this.appInfo = this.$store.state.appInfo
+		}
+	},
+  methods: {
+    cell (e) {
+			let _this = this
+      uni.makePhoneCall({
+        phoneNumber: _this.appInfo.phone
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.footer {
+  width: auto;
+  margin: 0 auto;
+  padding: 90upx 30upx 30upx 30upx;
+  display: -webkit-flex;
+  display: flex;
+  justify-content: center;
+}
+.footer-l {
+  width: 84upx;
+  height: 84upx;
+  border-radius: 6upx;
+}
+.footer-l .image {
+  width: 100%;
+  height: 100%;
+}
+.footer-c .p {
+  height: 42upx;
+  line-height: 42upx;
+  font-size: 26upx;
+  padding: 0 20upx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.footer-r {
+  display: -webkit-flex;
+  display: flex;
+  align-items: center;
+}
+.footer-r .span {
+  height: 48upx;
+  line-height: 46upx;
+  font-size: 26upx;
+  color: #232323;
+  text-align: center;
+  background-color: #FFD93F;
+  padding: 0 16upx;
+  border-radius: 6upx;
+  display: block;
+	z-index: 1;
+}
+.footer-r .i {
+  color: #666;
+  font-size: 26upx;
+}
+</style>
diff --git a/components/template/formItem.vue b/components/template/formItem.vue
new file mode 100644
index 0000000..8601746
--- /dev/null
+++ b/components/template/formItem.vue
@@ -0,0 +1,1019 @@
+<template>
+	<view class="formItem" v-if="logocome && formData">
+		<view v-for="(item, key, index) in formData" class="dis-flex" style="line-height: 100upx;" :key="key">
+	<!-- 	v-if="
+			item.id == 'text' ||
+				item.id == 'textarea' ||
+				item.id == 'select' ||
+				item.id == 'checkbox' ||
+				item.id == 'time' ||
+				item.id == 'datetime' ||
+				item.id == 'city'
+		" -->
+			<span :class="item.id == 'datetime'?'m-t':''" style="display: inline-block;width: 200upx;text-align: right;margin-right: 20upx;">
+				{{ item.data.title }}
+				<text class="c-ff4444 f-28 p-l-20" style="padding-left: 10upx;line-height: 10upx;">{{item.data.is_required == 1?'*':' '}}</text>
+			</span>
+			<!-- 文本 -->
+			<input
+				:placeholder="`${item.data.placeholder}`"
+				:maxlength="item.data.length != '' ? Number(item.data.length) : 9999"
+				v-model="createOrderInfo[key].data"
+				v-if="item.id == 'text'"
+				:adjust-position="false"
+				style="position: relative;height: 100upx;line-height: 100upx;margin-left: 0;"
+				class="flex-box"
+			/>
+			<!-- 文本域 -->
+			<textarea
+				:placeholder="`${item.data.placeholder}`"
+				:maxlength="item.data.length != '' ? Number(item.data.length) : 9999"
+				class="f-26 flex-box"
+				v-model="createOrderInfo[key].data"
+				placeholder-style="font-size: 26upx"
+				:style="{ height: item.data.height + 'rpx',marginTop:'32rpx'}"
+				v-if="item.id == 'textarea'"
+				:adjust-position="false"
+			/>
+			<!-- <picker v-if="item.id=='select'" mode="selector" class="dataPicker" :range="item.data.options"
+			 :value="createOrderInfo['aa']" v-model="createOrderInfo['aa']">
+				<view class="uni-input" style="font-size: 20upx;">{{ createOrderInfo['aa'] || item.data.options[0]}}</view>
+			</picker> -->
+			<!-- 单项选择器 -->
+			<lb-picker class="flex-box" v-if="item.id == 'select' && item.data.options" @confirm="confirm($event,'select' + key)" :list="item.data.options" v-model="createOrderInfo['select' + key]" mode="selector">
+				<button class="t-r" style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 100upx;width: 100%;">
+					{{ createOrderInfo['select' + key] || item.data.options[0] }}
+					<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+				</button>
+			</lb-picker>
+			<!-- 多选框 -->
+			<view class="dis-flex t-r" style="flex-wrap: wrap;width: 100%;align-content: flex-end;flex: 1;margin-top: 26upx;" v-if="item.id == 'checkbox' && createOrderInfo[key + 'multiple']">
+				<view
+					:class="items.check ? 'dynamiccheck' : 'dynamicnocheck'"
+					v-for="(items, indexs) in createOrderInfo[key + 'multiple']"
+					:key="indexs"
+					@click="dycheck(key, item, indexs, index, items.check)"
+				>
+					{{ items.name }}
+				</view>
+			</view>
+			<!-- 时间 -->
+			<view class="flex-box" style='pointer-events：auto;'  v-if="item.id == 'time'">
+					<ruiDatePicker
+					    fields="minute"
+					    start="1970-00-00 00:00"
+					    end="2100-12-30 23:59"
+					    :value="item.data.value || item.data.datetime_local"
+					    @change="bindChange($event,key,1)"
+						:iftime="item.id == 'time'"
+					></ruiDatePicker>
+					
+				<!-- </view> -->
+			</view>
+			<!-- 时间段 -->
+			<view  style="flex: 1;line-height: 50upx;" v-if="item.id == 'datetime'">
+				<view  >
+					<ruiDatePicker
+					    fields="minute"
+					    start="1970-00-00 00:00"
+					    end="2100-12-30 23:59"
+					    :value="item.data.value?item.data.value[0]:item.data.start_time"
+					    @change="bindChange($event,key,2)"
+					></ruiDatePicker>
+				</view>
+				<view  style="padding: 0 20upx;font-size: 30upx;line-height: 30upx;font-size: 20upx;padding-left: 100upx;">
+					至
+				</view>
+				<view  >
+					<ruiDatePicker
+					    fields="minute"
+					    start="1970-00-00 00:00"
+					    end="2100-12-30 23:59"
+					    :value="item.data.value?item.data.value[1]: item.data.end_time"
+					    @change="bindChange($event,key,3)"
+					></ruiDatePicker>
+				</view>
+				<!-- <text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;height: 0;position: relative;bottom: 96upx;"></text> -->
+			</view>
+			<!-- 城市 -->
+			<view class="flex-box" style="margin-top: 20upx;" v-if="item.id == 'city'">
+				<!-- 区 -->
+				<lb-picker
+					v-if="item.data.area == 'true' && item.data.city == 'false' && item.data.province == 'false'"
+					:list="area"
+					v-model="createOrderInfo['area' + key]"
+					mode="selector"
+					@confirm="confirm($event,'area' + key)"
+				>
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 62upx;">
+					{{ createOrderInfo['area' + key] || area[0] }}
+					<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- 市 -->
+				<lb-picker
+					v-else-if="item.data.area == 'false' && item.data.city == 'true' && item.data.province == 'false'"
+					:list="city"
+					v-model="createOrderInfo['city' + key]"
+					mode="selector"
+					@confirm="confirm($event,'area' + key)"
+				>
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;">
+					{{ createOrderInfo['city' + key] || city[0] }}
+					<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;line-height: 62upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- 省 -->
+				<lb-picker
+					v-else-if="item.data.area == 'false' && item.data.city == 'false' && item.data.province == 'true'"
+					:list="province"
+					v-model="createOrderInfo['province' + key]"
+					mode="selector"
+					@confirm="confirm($event,'province' + key)"
+				>
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 62upx;">
+						{{ createOrderInfo['province' + key] || province[0] }}
+					<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- 省市 -->
+				<lb-picker
+					v-else-if="item.data.area == 'false' && item.data.city == 'true' && item.data.province == 'true'"
+					:level="2"
+					:list="provincecity"
+					@confirm="confirm($event,'provincecity' + key)"
+					v-model="createOrderInfo['provincecity' + key]"
+					mode="multiSelector"
+				>
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 62upx;">
+						{{ createOrderInfo['provincecity' + key].length > 0?`${createOrderInfo['provincecity' + key][0]}-${createOrderInfo['provincecity' + key][1]}`:`${provincecity[0].label}-${provincecity[0].children[0].label}` }}
+					<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- 市区 -->
+				<lb-picker
+					v-else-if="item.data.area == 'true' && item.data.city == 'true' && item.data.province == 'false'"
+					:list="cityarea"
+					v-model="createOrderInfo['cityarea' + key]"
+					mode="multiSelector"
+					@confirm="confirm($event,'cityarea' + key)"
+					:level="2"
+				>
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 62upx;">
+						{{ createOrderInfo['cityarea' + key].length > 0?`${createOrderInfo['cityarea' + key][0]}-${createOrderInfo['cityarea' + key][1]}`:`${cityarea[0].label}-${cityarea[0].children[0].label}` }}
+						<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- 省市区 -->
+				<lb-picker
+					v-else-if="item.data.area == 'true' && item.data.city == 'true' && item.data.province == 'true'"
+					:list="provincecityarea"
+					:level="3"
+					@confirm="confirm($event,'provincecityarea' + key)"
+					v-model="createOrderInfo['provincecityarea' + key]"
+					mode="multiSelector">
+					<button style="background-color: #fafafa;font-size: 26upx;text-align: left;padding: 0;line-height: 62upx;">
+						{{
+							 createOrderInfo['provincecityarea' + key].length > 0
+							?`${createOrderInfo['provincecityarea' + key][0]}-${createOrderInfo['provincecityarea' + key][1]}-${createOrderInfo['provincecityarea' + key][2]}`
+							:item.data.value?`${item.data.value[0]}-${item.data.value[1]}-${item.data.value[1]}`:`${provincecityarea[0].label}-${provincecityarea[0].children[0].label}-${provincecityarea[0].children[0].children[0].label}`
+						}}
+						<text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;margin-right: 20upx;"></text>
+					</button>
+				</lb-picker>
+				<!-- <text class="iconfont icon-right col-9" style="float: right;font-size: 26upx;height: 0;position: relative;bottom: 80upx;"></text> -->
+			</view>
+			<view v-if="item.id == 'img' && item.data.number == 1">
+				<!-- 图片预览循环模板 -->
+				<view class="imgPreview" style="position: relative;" v-if="createOrderInfo[key].data && createOrderInfo[key].data.length > 0">
+					<image :src="createOrderInfo[key].data" />
+					<image
+						:src="imgfixUrls + 'merchant/close.png'"
+						style="width: 40upx;height: 40upx;position: absolute;right: 20upx;top: 20upx;"
+						class="close"
+						@click="closeLogo(key)"
+					/>
+				</view>
+				<!-- 图片预览循环模板 -->
+				<view class="userImgUpdata" @click="uploadFiles(1,key)" v-else>
+					<image style="width: 420upx;height:330upx;margin-top: 40upx;" :src="imgfixUrls + 'tpsz.png'" />
+				</view>
+			</view>
+			<view v-if="item.id == 'img' && item.data.number > 1" style="display: flex;justify-content: flex-start;flex-direction: row;align-items: center;text-align: left;flex-wrap: wrap;flex: 1;margin-top: 20upx;">
+				<!-- 图片预览循环模板 -->
+				<view
+					class="imgPreview"
+					v-for="(items, indexs) in createOrderInfo['img' + key]"
+					style="flex:30%;max-width: 28%;position: relative;margin-right: 20upx;height: 150upx;"
+					:key="indexs"
+				>
+					<image :src="items" style="width: 130upx;height: 130upx;" />
+					<image
+						:src="imgfixUrls + 'merchant/close.png'"
+						style="width: 30upx;height: 30upx;position: absolute;right: -6upx;top: 0;"
+						class="close"
+						@click="closePreview(items, key)"
+					/>
+				</view>
+			
+				<!-- 	<view class="imgPreview" v-for="(items, indexs) in type2Url" style="flex:31%;max-width: 25%;" :key="indexs" v-else>
+					<image :src="items" />
+					<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(items,index)" />
+				</view> -->
+				<!-- 图片预览循环模板 -->
+				<view
+					class="userImgUpdata"
+					@click="uploadFiles(2, key,Number(item.data.number))"
+					style="flex:30%;max-width: 29%;width: 130upx;height: 130upx;border: 1upx solid #CCCCCC;border-radius: 10upx;position: relative;margin-right: 20upx;margin-bottom: 20upx;"
+					v-if="createOrderInfo['img' + key] ? createOrderInfo['img' + key].length !== Number(item.data.number) : true"
+				>
+					<image style="width: 40upx;height: 40upx;margin: auto;padding: 40upx;" :src="imgfixUrls + 'merchant/addImg.svg'" />
+				</view>
+			</view>
+			</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import LbPicker from '@/components/lb-picker';
+	import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
+	export default{
+		data(){
+			return{
+				createOrderInfo:{},
+				province: [],
+				city: [],
+				area: [],
+				provincecity: [],
+				cityarea: [],
+				provincecityarea: [],
+				logocome:true,
+				formList:{},
+				ifrequired:true,
+				type1Url: '',
+				type1Urlon: '',
+				type2Url: [],
+				type2Urlon: [],
+				localIds: '',
+				uploadlength: 0,
+				inputs:{
+					
+				},
+				imgs:{},
+				formData:null
+			}
+		},
+		props: {
+			orderSubmitInfo:{
+				type: Object,
+				default: {}
+			},
+			gopay:{
+				type: Boolean,
+				default :false
+			},
+			gopaytwo:{
+				type: Boolean,
+				default :false
+			}
+		},
+		components:{
+			LbPicker,
+			ruiDatePicker
+		},
+		methods:{
+			datasValue(){
+				let _this = this;
+				let count = 0;
+				console.log(_this.orderSubmitInfo,'初始化数据')
+				// 
+				if (_this.orderSubmitInfo.diyform) {
+					for (let key in _this.orderSubmitInfo.diyform.list) {
+						// 
+						if (_this.orderSubmitInfo.diyform.list[key].id == 'img' && Number(_this.orderSubmitInfo.diyform.list[key].data.number) > 1) {
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data:  [],
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							
+							if(_this.createOrderInfo['img' + key]){
+								_this.createOrderInfo['img' + key] = _this.createOrderInfo['img' + key];
+							}else{
+								_this.createOrderInfo['img' + key] = [];
+							}
+							if(_this.orderSubmitInfo.diyform.list[key].data.value){
+								_this.createOrderInfo['img' + key] = _this.orderSubmitInfo.diyform.list[key].data.value;
+								_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value;
+							}
+						} else if (_this.orderSubmitInfo.diyform.list[key].id == 'checkbox') {
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data: [],
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							
+							_this.createOrderInfo[key + 'multiple'] = [];
+							if(_this.orderSubmitInfo.diyform.list[key].data.options){
+								_this.orderSubmitInfo.diyform.list[key].data.options.map(item => {
+									let obj = {
+										name: item,
+										check: false
+									};
+									if(_this.orderSubmitInfo.diyform.list[key].data.value){
+										_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value;
+										_this.orderSubmitInfo.diyform.list[key].data.value.map(items=>{
+											if(items == item){
+												obj = {
+													name: item,
+													check: true
+												};
+											}
+										})
+									}
+									
+									
+									// obj.name = item;
+									// obj.check = false;
+									_this.createOrderInfo[key + 'multiple'].push(obj);
+									console.log(_this.createOrderInfo[key + 'multiple']);
+									// 
+									// 
+								});
+							}
+							
+							console.log(_this.createOrderInfo[key + 'multiple'],999999999999999999999999);
+						} else if (_this.orderSubmitInfo.diyform.list[key].id == 'time') {
+							_this.createOrderInfo['show' + key] = false;
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data: _this.addtime(_this.orderSubmitInfo.diyform.list[key].data.time_stamp),
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							_this.orderSubmitInfo.diyform.list[key].data.datetime_local= _this.orderSubmitInfo.diyform.list[key].data.datetime_local.replace(/T/g," ");
+							console.log(_this.createOrderInfo[key].data,_this.orderSubmitInfo.diyform.list[key].data.datetime_local);
+							_this.orderSubmitInfo.diyform.list[key].data.datetime_local = _this.orderSubmitInfo.diyform.list[key].data.datetime_local.substring(0,_this.orderSubmitInfo.diyform.list[key].data.datetime_local.length-3);
+							// 
+							console.log(_this.createOrderInfo[key].data,_this.orderSubmitInfo.diyform.list[key].data.datetime_local);
+							if(_this.orderSubmitInfo.diyform.list[key].data.value){
+								_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value;
+							}
+							// 
+						} else if (
+							_this.orderSubmitInfo.diyform.list[key].id == 'text' ||
+							_this.orderSubmitInfo.diyform.list[key].id == 'textarea' ||
+							_this.orderSubmitInfo.diyform.list[key].id == 'select' ||
+							(_this.orderSubmitInfo.diyform.list[key].id == 'img' && Number(_this.orderSubmitInfo.diyform.list[key].data.number) == 1)
+						) {
+							// 文本处理
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data: '',
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							if(_this.orderSubmitInfo.diyform.list[key].id == 'img'){
+								if(_this.orderSubmitInfo.diyform.list[key].data.value){
+									_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value[0];
+									console.log(_this.createOrderInfo[key].data,_this.orderSubmitInfo.diyform.list[key].data.value[0])
+									_this.imgs[key] = _this.orderSubmitInfo.diyform.list[key].data.value;
+								}
+							}else{
+								
+								if(_this.orderSubmitInfo.diyform.list[key].id == 'select'){
+									if(_this.orderSubmitInfo.diyform.list[key].data.value){
+										_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value;
+										_this.createOrderInfo['select' + key] = _this.orderSubmitInfo.diyform.list[key].data.value;
+									}
+								}else{
+									if(_this.orderSubmitInfo.diyform.list[key].data.value){
+										_this.createOrderInfo[key].data = _this.orderSubmitInfo.diyform.list[key].data.value;
+									}
+								}
+							}
+							// if(_this.orderSubmitInfo.diyform.list[key].id == 'select'){
+							// 	_this.createOrderInfo['select' + count] = _this.orderSubmitInfo.diyform.list[key].data.options[0];
+							// }
+						} else if (_this.orderSubmitInfo.diyform.list[key].id == 'datetime') {
+							_this.createOrderInfo['start' + key] = false;
+							_this.createOrderInfo['end' + key] = false;
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data: [],
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							_this.createOrderInfo[key].data[0] = _this.addtime(_this.orderSubmitInfo.diyform.list[key].data.start_time_stamp);
+							
+							_this.createOrderInfo[key].data[1] = _this.addtime(_this.orderSubmitInfo.diyform.list[key].data.end_time_stamp);
+							_this.orderSubmitInfo.diyform.list[key].data.end_time= _this.orderSubmitInfo.diyform.list[key].data.end_time.replace(/T/g," ");
+							_this.orderSubmitInfo.diyform.list[key].data.end_time = _this.orderSubmitInfo.diyform.list[key].data.end_time.substring(0,_this.orderSubmitInfo.diyform.list[key].data.end_time.length-3);
+							_this.orderSubmitInfo.diyform.list[key].data.start_time= _this.orderSubmitInfo.diyform.list[key].data.start_time.replace(/T/g," ");
+							_this.orderSubmitInfo.diyform.list[key].data.start_time = _this.orderSubmitInfo.diyform.list[key].data.start_time.substring(0,_this.orderSubmitInfo.diyform.list[key].data.start_time.length-3);
+							if(_this.orderSubmitInfo.diyform.list[key].data.value){
+								_this.createOrderInfo[key].data[0] = _this.orderSubmitInfo.diyform.list[key].data.value[0];
+								_this.createOrderInfo[key].data[1] = _this.orderSubmitInfo.diyform.list[key].data.value[1];
+							}
+						} else if (_this.orderSubmitInfo.diyform.list[key].id == 'city') {
+							_this.createOrderInfo[key] = {
+								id: _this.orderSubmitInfo.diyform.list[key].id,
+								data: [],
+								count: count,
+								key:key,
+								title:_this.orderSubmitInfo.diyform.list[key].data.title
+							};
+							_this.createOrderInfo['show' + key] = false;
+							let str = '';
+							if (_this.orderSubmitInfo.diyform.list[key].data.province) {
+								_this.createOrderInfo[key].data.push(str);
+							} else if (_this.orderSubmitInfo.diyform.list[key].data.city) {
+								_this.createOrderInfo[key].data.push(str);
+							} else if (_this.orderSubmitInfo.diyform.list[key].data.area) {
+								_this.createOrderInfo[key].data.push(str);
+							}
+							let citys = uni.getStorageSync('cityList');
+							citys = JSON.stringify(citys)
+								.replace(/name/g, 'label')
+								.replace(/id/g, 'value')
+								.replace(/area/g, 'children')
+								.replace(/dist/g, 'children');
+							citys = JSON.parse(citys);
+							_this.province = [];
+							_this.city = [];
+							_this.area = [];
+						
+							_this.provincecityarea = citys;
+							_this.provincecityarea.map(item => {
+								item.value = item.label;
+								_this.province.push(item.label);
+								item.children.map(items => {
+									items.value = items.label;
+									_this.city.push(items.label);
+									items.children.map(i => {
+										i.value = i.label;
+										_this.area.push(i.label);
+									});
+								});
+							});
+							_this.provincecity = _this.provincecityarea;
+							if (
+								_this.orderSubmitInfo.diyform.list[key].data.area == 'true' &&
+								_this.orderSubmitInfo.diyform.list[key].data.city == 'true' &&
+								_this.orderSubmitInfo.diyform.list[key].data.province == 'true'
+							) {
+								if(_this.orderSubmitInfo.diyform.list[key].data.value){
+									_this.createOrderInfo['provincecityarea' + key] = [];
+									_this.createOrderInfo['provincecityarea' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[0]);
+									_this.createOrderInfo['provincecityarea' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[1]);
+									_this.createOrderInfo['provincecityarea' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[2]);
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[0])
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[1])
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[2])
+								}else{
+									_this.createOrderInfo['provincecityarea' + key] = [];
+									_this.createOrderInfo['provincecityarea' + key].push(_this.provincecityarea[0].label);
+									_this.createOrderInfo['provincecityarea' + key].push(_this.provincecityarea[0].children[0].label);
+									_this.createOrderInfo['provincecityarea' + key].push(_this.provincecityarea[0].children[0].children[0].label);
+								}
+								
+							} else if (
+								_this.orderSubmitInfo.diyform.list[key].data.area == 'false' &&
+								_this.orderSubmitInfo.diyform.list[key].data.city == 'true' &&
+								_this.orderSubmitInfo.diyform.list[key].data.province == 'true'
+							) {
+								_this.provincecity.map(item => {
+									item.children.map(items => {
+										delete items.children;
+									});
+								});
+								if(_this.orderSubmitInfo.diyform.list[key].data.value){
+									_this.createOrderInfo['provincecity' + key] = [];
+									_this.createOrderInfo['provincecity' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[0]);
+									_this.createOrderInfo['provincecity' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[1]);
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[0])
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[1])
+								}else{
+									_this.createOrderInfo['provincecity' + key] =[];
+									_this.createOrderInfo['provincecity' + key].push(_this.provincecity[0].label);
+									_this.createOrderInfo['provincecity' + key].push(_this.provincecity[0].children[0].label);
+								}
+								
+							} else if (
+								_this.orderSubmitInfo.diyform.list[key].data.area == 'true' &&
+								_this.orderSubmitInfo.diyform.list[key].data.city == 'true' &&
+								_this.orderSubmitInfo.diyform.list[key].data.province == 'false'
+							) {
+								_this.provincecityarea.map(item => {
+									item.children.map(items => {
+										_this.cityarea.push(items);
+									});
+								});
+								if(_this.orderSubmitInfo.diyform.list[key].data.value){
+									_this.createOrderInfo['cityarea' + key] = [];
+									_this.createOrderInfo['cityarea' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[0]);
+									_this.createOrderInfo['cityarea' + key].push(_this.orderSubmitInfo.diyform.list[key].data.value[1]);
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[0])
+									_this.createOrderInfo[key].data.push(_this.orderSubmitInfo.diyform.list[key].data.value[1])
+								}else{
+									_this.createOrderInfo['cityarea' + key] = [];
+									_this.createOrderInfo['cityarea' + key].push(_this.cityarea[0].label);
+									_this.createOrderInfo['cityarea' + key].push(_this.cityarea[0].children[0].label);
+								}
+								
+							}
+				
+							// console.log(_this.provincecity);
+							
+							
+							// _this.createOrderInfo['cityarea' + key] = [cityarea[0].label,cityarea[0].children[0].label];
+							
+				
+							console.log(_this.createOrderInfo, _this.city, _this.area);
+						}
+						count++;
+					}
+					
+					// 
+				}
+				console.log(_this.createOrderInfo);
+				_this.formData = _this.orderSubmitInfo.diyform.list;
+			},
+			inputValue(e,key){
+				// this.$set(this.createOrderInfo, key, e.detail.value);
+				// console.log(this.createOrderInfo)
+				this.createOrderInfo[key].data = e.detail.value;
+				// console.log(this.inputs[key],key);
+				this.logocome = !this.logocome;
+				this.logocome = !this.logocome;
+			},
+			confirm(e,key){
+				console.log(e,key);
+				 this.$set(this.createOrderInfo, key, e.value);
+				 this.logocome = !this.logocome;
+				 this.logocome = !this.logocome;
+			},
+			bindChange(e,key,num){
+				console.log(e,key);
+				if(num == 1){
+					this.createOrderInfo[key].data = e;
+				}else if(num == 2){
+					this.createOrderInfo[key].data[0] = e;
+				}else{
+					this.createOrderInfo[key].data[1] = e;
+				}
+				
+			},
+			dycheck(key, data, index, i, ck) {
+				// createOrderInfo['p' + index];
+				let _this = this;
+				console.log(_this.formData)
+				if (!ck) {
+					_this.createOrderInfo[key + 'multiple'][index].check = true;
+					// 
+					let itemName = _this.formData[key].data.options[index];
+					_this.createOrderInfo[key].data.push(itemName);
+				} else {
+					_this.createOrderInfo[key + 'multiple'][index].check = false;
+					_this.createOrderInfo[key].data.map((item, j) => {
+						if (item == _this.formData[key].data.options[index]) {
+							_this.createOrderInfo[key].data.splice(j, 1);
+						}
+					});
+				}
+				_this.logocome = !_this.logocome;
+				_this.logocome = !_this.logocome;
+			},
+			addtime(value) {
+				// 
+				let time = value * 1000;
+				if (typeof time == 'undefined') {
+					return '';
+				} else {
+					let date = new Date(parseInt(time));
+					let y = date.getFullYear();
+					let MM = date.getMonth() + 1;
+					MM = MM < 10 ? '0' + MM : MM;
+					let d = date.getDate();
+					d = d < 10 ? '0' + d : d;
+					let h = date.getHours();
+					h = h < 10 ? '0' + h : h;
+					let m = date.getMinutes();
+					m = m < 10 ? '0' + m : m;
+					let s = date.getSeconds();
+					s = s < 10 ? '0' + s : s;
+					return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+				}
+			},
+			closePreview(item, key) {
+				let _this = this;
+				let userArray = ['a'];
+				if (_this.createOrderInfo['img' + key]) {
+					_this.createOrderInfo['img' + key].map((items, index) => {
+						if (items == item) {
+							console.log(_this.createOrderInfo['img' + key], 1111111111111);
+							_this.createOrderInfo['img' + key].splice(index, 1);
+							_this.logocome = !_this.logocome;
+							_this.logocome = !_this.logocome;
+						}
+					});
+				}
+				console.log(this.type2Url, _this.createOrderInfo['img' + key]);
+			},
+			uplodephone(length, localIds, key,numbers) {
+				let _this = this;
+				wxApi.uoloadIg(localIds[length], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									let num = length + 1;
+									if (_this.createOrderInfo['img' + key].length == numbers) {
+										uni.showToast({
+											title: `最多上传${numbers}张图片`,
+											icon: 'none'
+										});
+										return;
+									}
+									_this.createOrderInfo['img' + key].push(res.data.img);
+									if (num < _this.uploadlength) {
+										uni.setTimeout(_this.uplodephone(num, _this.localIds, key), 500);
+									}else{
+										uni.$emit('update',{msg:'页面更新'})
+									}
+									_this.logocome = !_this.logocome;
+									_this.logocome = !_this.logocome;
+									// _this.userInfo.thumbs.push(res.data.image);
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(type, key,numbers) {
+				let _this = this;
+				_this.$emit('ononahow');
+				// #ifdef H5
+					if(App.getClientType() == 2){
+					     let res = await App.browser_upload(9);
+					     if (type == 1) {
+					     	console.log(res);
+					     	let img = await App._upLoad(res.tempFilePaths[0]);
+					     	_this.type1Url = img.data.img;
+					     	_this.type1Urlon = img.data.image;
+					     	_this.imgs[key] = _this.type1Url;
+					     	_this.createOrderInfo[key].data = _this.type1Url;
+					     	console.log(_this.createOrderInfo[key]);
+					     } else if (type == 2) {
+					     	for (let i = 0; i < res.tempFilePaths.length; i++) {
+					     		let imgs = await App._upLoad(res.tempFilePaths[i]);
+					     		// _this.type2Url = _this.createOrderInfo['img' + key];
+					     		if (_this.createOrderInfo['img' + key].length == numbers) {
+					     			uni.showToast({
+					     				title: '最多上传九张图片',
+					     				icon: 'none'
+					     			});
+					     			return;
+					     		}
+					     		console.log(_this.type2Url, _this.createOrderInfo['img' + key]);
+					     		_this.createOrderInfo['img' + key].push(imgs.data.img);
+					     		_this.type2Urlon.push(imgs.data.image);
+					     		// _this.createOrderInfo['img' + key] = _this.type2Url;
+					     	}
+					     			
+					     	// res.tempFilePaths.map(item=>{
+					     	// 	let imgs = await App._upLoad(item);
+					     	// })
+					     }
+					
+					return
				}
+				if (type == 2) {
+					wxApi.choseImage(res => {
+						// let length
+						
+						_this.localIds = res.localIds;
+						_this.uploadlength = res.localIds.length;
+						_this.uplodephone(0, _this.localIds, key,numbers);
+					}, numbers);
+				} else {
+					wxApi.choseImage(res => {
+						wxApi.uoloadIg(res.localIds[0], data => {
+							if (data.errMsg === 'uploadImage:ok') {
+								uni.showLoading({});
+								let requestData = {
+									upload_type: 2,
+									id: data.serverId
+								};
+								App._post_form(
+									'&do=uploadFiles',
+									requestData,
+									res => {
+										if (type == 1) {
+											_this.type1Url = res.data.img;
+											_this.type1Urlon = res.data.image;
+											_this.imgs[key] = _this.type1Url;
+											_this.createOrderInfo[key].data = _this.type1Url;
+											uni.$emit('update',{msg:'页面更新'})
+										}
+										_this.logocome = !_this.logocome;
+										_this.logocome = !_this.logocome;
+									},
+									false,
+									() => {
+										uni.hideLoading();
+									}
+								);
+							} else {
+								uni.hideLoading();
+								App.showError('上传失败');
+							}
+						});
+					});
+				}
+			
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: numbers,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						if (type == 1) {
+							console.log(res);
+							let img = await App._upLoad(res.tempFilePaths[0]);
+							_this.type1Url = img.data.img;
+							_this.type1Urlon = img.data.image;
+							_this.imgs[key] = _this.type1Url;
+							_this.createOrderInfo[key].data = _this.type1Url;
+							console.log(_this.createOrderInfo[key]);
+						} else if (type == 2) {
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let imgs = await App._upLoad(res.tempFilePaths[i]);
+								// _this.type2Url = _this.createOrderInfo['img' + key];
+								if (_this.createOrderInfo['img' + key].length == numbers) {
+									uni.showToast({
+										title: '最多上传九张图片',
+										icon: 'none'
+									});
+									return;
+								}
+								console.log(_this.type2Url, _this.createOrderInfo['img' + key]);
+								_this.createOrderInfo['img' + key].push(imgs.data.img);
+								_this.type2Urlon.push(imgs.data.image);
+								// _this.createOrderInfo['img' + key] = _this.type2Url;
+							}
+			
+							// res.tempFilePaths.map(item=>{
+							// 	let imgs = await App._upLoad(item);
+							// })
+						}
+					}
+				});
+				// #endif
+			},
+			closeLogo(key, item) {
+				let _this = this;
+				_this.type1Url = '';
+				_this.type1Urlon = '';
+				_this.createOrderInfo[key].data = '';
+				_this.imgs[key] = ''
+				// _this.userInfo['m' + index] = '';
+				// _this.$set(_this.createOrderInfo, 'p' + index, '');
+				_this.logocome = !_this.logocome;
+				_this.logocome = !_this.logocome;
+			},
+		},
+		computed:{
+		
+		},
+		watch:{
+			gopaytwo(){
+				this.datasValue();
+			},
+			'gopay': {
+				handler(newData, oldData) {
+					let _this = this;
+					let data = Object.assign({}, _this.createOrderInfo);
+					console.log(data,_this.formData);
+					// 
+					let name = null;
+					let datas = [];
+					let thiscity = [];
+					if(_this.orderSubmitInfo.diyform){
+						for (let key in _this.formData) {
+							if (_this.formData[key].id == 'city') {
+								if (
+									_this.formData[key].data.province == 'true' &&
+									_this.formData[key].data.city == 'false' &&
+									_this.formData[key].data.area == 'false'
+								) {
+									name = 'province';
+									thiscity = _this.province[0];
+								} else if (
+									_this.formData[key].data.province == 'false' &&
+									_this.formData[key].data.city == 'true' &&
+									_this.formData[key].data.area == 'false'
+								) {
+									name = 'city';
+									thiscity = _this.city[0];
+								} else if (
+									_this.formData[key].data.province == 'false' &&
+									_this.formData[key].data.city == 'false' &&
+									_this.formData[key].data.area == 'true'
+								) {
+									name = 'area';
+									thiscity = _this.area[0];
+								} else if (
+									_this.formData[key].data.province == 'false' &&
+									_this.formData[key].data.city == 'true' &&
+									_this.formData[key].data.area == 'true'
+								) {
+									name = 'cityarea';
+									thiscity.push(_this.cityarea[0].label);
+									thiscity.push(_this.cityarea[0].children[0].label);
+								} else if (
+									_this.formData[key].data.province == 'true' &&
+									_this.formData[key].data.city == 'true' &&
+									_this.formData[key].data.area == 'false'
+								) {
+									name = 'provincecity';
+									thiscity.push(_this.provincecity[0].label);
+									thiscity.push(_this.provincecity[0].children[0].label);
+								} else if (
+									_this.formData[key].data.province == 'true' &&
+									_this.formData[key].data.city == 'true' &&
+									_this.formData[key].data.area == 'true'
+								) {
+									name = 'provincecityarea';
+									thiscity.push(_this.provincecity[0].label);
+									thiscity.push(_this.provincecity[0].children[0].label);
+									thiscity.push(_this.provincecity[0].children[0].children[0].label);
+								}
+							}
+							console.log(data)
+							// 
+							for (let j in data) {
+								if (data[j] instanceof Object) {
+									// for(let k in _this.inputs){
+									// 	if(k == j){
+									// 		data[j] = _this.inputs[k];
+									// 	}
+									// }
+									
+									if (data[j].id == 'select' && _this.formData[key].id == 'select') {
+										data[key].data = data['select' + key] || _this.formData[key].data.options[0];
+										// 
+									} else if (data[j].id == 'img' && _this.formData[key].id == 'img' && j == key) {
+										if(_this.formData[key].data.number == 1){
+											let imgs = _this.imgs[key];
+											if(data[key].data){
+												imgs = data[key].data;
+											}
+											data[key].data = new Array;
+											if(imgs){
+												data[key].data.push(imgs);
+											}
+										}else{
+											data[key].data =  data['img' + key] || [];
+										}
+										
+									} else if (data[j].id == 'city' && _this.formData[key].id == 'city') {
+										if (data[name + key]) {
+											data[key].data = data[name + key];
+										} else {
+											// 
+											data[key].data = thiscity;
+										}
+									}
+									if (data[j].id == _this.formData[key].id && j == key) {
+										console.log(j,key);
+										// 
+										datas.push(data[j]);
+										if (_this.formData[key].data.is_required == 1) {
+											if (data[j].data instanceof Array && data[j].data.length == 0) {
+												console.log(data[j].id,'进来了',_this.formData[key].id,j,key);
+												_this.ifrequired = false; 
+												return
+											} else if (!data[j].data) {
+												_this.ifrequired = false;
+												return
+											}
+											_this.ifrequired = true;
+											
+										}
+									}
+									// console.log(data)
+									
+									
+								}
+								// console.log(datas,9191919191919);
+								
+							}
+							
+						}
+										
+					}
+					_this.formList = datas;
+					
+				},
+				deep: true
+			}
+		}
+		
+	}
+</script>
+
+<style lang="less" scoped>
+	.dynamiccheck {
+		// width: 100upx;
+		padding: 0 30upx;
+		font-size: 20upx;
+		border-radius: 10upx;
+		border: 1upx solid #ff4444;
+		color: #ffffff;
+		background-color: #ff4444;
+		height: 50upx;
+		line-height: 50upx;
+		margin-right: 10upx;
+		margin-bottom: 20upx;
+		// flex: 0.15;
+	}
+	.dynamicnocheck {
+		// width: 100upx;
+		padding: 0 30upx;
+		font-size: 20upx;
+		border-radius: 10upx;
+		border: 1upx solid #ff4444;
+		color: #ff4444;
+		// flex: 0.15;
+		height: 50upx;
+		line-height: 50upx;
+		margin-right: 10upx;
+		margin-bottom: 20upx;
+	}
+	.formItem{
+	// padding: 0 30upx;
+	padding-top: 30upx;
+
+	> view {
+		// border-bottom: 1px solid #eeeeee;
+		background-color: #fafafa;
+		border-radius: 10upx;
+		margin-bottom: 20upx;
+	}
+
+	> view:last-child {
+		border: none;
+	}
+
+	> view {
+		> span {
+			display: inline-block;
+			vertical-align: middle;
+			width: 200upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		> input {
+			margin-left: 40upx;
+			display: inline-block;
+			width: 350upx;
+			height: 82upx;
+			color: rgba(51, 51, 51, 1);
+			font-size: 24upx;
+
+			vertical-align: middle;
+		}
+	}
+}
+.m-t{
+	margin-top: 14upx;
+}
+</style>
diff --git a/components/template/getVXphone.vue b/components/template/getVXphone.vue
new file mode 100644
index 0000000..4069b43
--- /dev/null
+++ b/components/template/getVXphone.vue
@@ -0,0 +1,146 @@
+<template>
+	<view class="getVXphone">
+		<popup-view :show="show" type="center" @clickmask="shows">
+			<view class="b-f" style="width: 70vw;height: 40vh;border-radius: 15upx;">
+				<image :src="imgfixUrls + 'merchant/addPhone.png'" style="width: 100%;height: 100upx;" />
+				<view class="t-c f-36 f-w" style="padding: 30upx 0;">
+					请确认授权绑定手机号
+				</view>
+				<view class="dis-flex" style="padding-top: 100upx;">
+					<view class="flex-box" style="padding: 15upx 20upx;">
+						<button type="default" style="height: 70upx;line-height: 70upx;" @click="shows">取消</button>
+					</view>
+					<view class="flex-box" style="padding: 15upx 20upx;">
+						<button type="primary" style="height: 70upx;line-height: 70upx;" @click="test()" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber">确定</button>
+					</view>
+				</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import PopupView from '@/components/template/PopManager.vue';
+	export default{
+		components:{
+			PopupView
+		},
+		data(){
+			return{
+				code:''
+			}
+		},
+		props:{
+			show:{
+				type: Boolean,
+				default: false
+			},
+		},
+		methods:{
+			shows(){
+				this.$emit('showFalse')
+			},
+			test(){
+				let _this = this;
+				uni.login({
+					provider: 'weixin',
+					scopes: 'auth_user',
+					success(res) {
+						_this.code = res.code;
+						// App._post_form('&p=member&do=getSessionKey', {code:res.code}, reson => {
+						//  = res.code;
+						// })
+					}
+				})
+			},
+			getPhoneNumber(e) {
+				let _this = this;
+				_this.shows();
+				console.log(e)
+				if (e.detail.errMsg === "getPhoneNumber:ok") {
+					
+							uni.checkSession({
+								success() {
+									console.info('登陆有效');
+									let postData = {
+										data: e.detail.encryptedData,
+										iv: e.detail.iv,
+										code:_this.code
+									};
+									App._post_form('&p=member&do=phoneDecrypt', postData, res => {
+										let a = res.data.phone.slice(0, 3);
+										let b = res.data.phone.slice(7, 11);
+										let mobile = res.data.phone;
+										uni.showModal({
+											title: '提示',
+											content: '确定绑定手机' + a + '****' + b + '?',
+											success: function(res) {
+												if (res.confirm) {
+													let data = {
+														mobile: mobile
+													};
+													App._post_form(
+														'&p=member&do=changeMobile',
+														data,
+														res => {
+															uni.showToast({
+																icon: 'none',
+																title: '绑定成功',
+																duration: 2000
+															});
+															// setTimeout(()=>{
+																_this.$emit('showFalse',true)
+															// },2000)
+															
+														},
+														res => {
+															uni.showModal({
+																title: '友情提示',
+																content: res.data.message,
+																showCancel: true,
+																success(res) {
+																	if (res.confirm) {
+																		let data = {
+																			mobile: mobile,
+																			mergeflag: 1
+																		};
+																		App._post_form('&p=member&do=changeMobile', data, res => {
+																			uni.showToast({
+																				icon: 'none',
+																				title: '修改成功',
+																				duration: 2000
+																			});
+																			uni.setStorageSync('weliam_user_token', res.data.token)
+																		});
+																	} else if (res.cancel) {
+										
+																	}
+																}
+															});
+														}
+													);
+												} else if (res.cancel) {}
+											}
+										});
+									});
+								},
+								fail() {
+									console.info('登陆失效');
+									App.navigationTo({
+										url: 'pages/mainPages/login/minLogin'
+									});
+								}
+							});
+					
+					
+				} else {
+					App.showError('手机号绑定取消')
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/components/template/goodsHeaderTitle.vue b/components/template/goodsHeaderTitle.vue
new file mode 100644
index 0000000..0816dcc
--- /dev/null
+++ b/components/template/goodsHeaderTitle.vue
@@ -0,0 +1,78 @@
+<!-- 商品头部标题 -->
+<template>
+	<view class="containar-title t-c dis-flex flex-x-center m-btm60">
+		<view class="containar-title-left lace-style p-r">
+			<view class="lace-1"></view>
+			<view class="lace-2"></view>
+		</view>
+		<view class="contar-titleBox f-30 col-3">{{titleName}}</view>
+		<view class="containar-title-right lace-style p-r">
+			<view class="lace-1"></view>
+			<view class="lace-2"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: {
+			titleName: {
+				type: String,
+				default: function(){
+					return '暂无标题'
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* 标题花边样式 */
+	uni-view{
+		overflow: inherit;
+	}
+	.containar-title-right,.containar-title-left{
+		flex: 1;
+	}
+	.lace-style .lace-1 {
+		position: absolute;
+		/* 	left: 35%; */
+		top: 14upx;
+		width: 14upx;
+		height: 14upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 50%;
+	}
+
+	.lace-style .lace-2 {
+		position: absolute;
+		/* 	left: 34%; */
+		top: 18upx;
+		width: 14upx;
+		height: 14upx;
+		background: rgba(255, 68, 68, 1);
+		opacity: 0.2;
+		border-radius: 50%;
+	}
+
+	.containar-title-left .lace-1 {
+		right: 7%;
+	}
+
+	.containar-title-right .lace-1 {
+		left: 7%;
+	}
+
+	.containar-title-left .lace-2 {
+		right: 28upx;
+	}
+
+	.containar-title-right .lace-2 {
+		left: 28upx;
+	}
+</style>
diff --git a/components/template/goodslist.vue b/components/template/goodslist.vue
new file mode 100644
index 0000000..93e69e9
--- /dev/null
+++ b/components/template/goodslist.vue
@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view class="goodslist">
+			<view class="goodslist-i" v-for="(item, key) in goodsList" :key="key" @click="navgateTo(item.jump_link)">
+				<!-- <navigator class="a" :url="'/pagesBuy/rushdetail/index?i='+item.id+'&c='+item.type" hover-class="none"> -->
+				<view class="goodslist-i-t">
+					<image class="image" :src="item.logo" mode="aspectFill"></image>
+				</view>
+				<!-- 			</navigator> -->
+				<view class="goodslist-i-c">
+					<view class="goodslist-i-c-t">
+						<view class="goodslist-i-c-t-l">{{ item.store_name }}</view>
+						<view class="goodslist-i-c-t-r">{{ item.distance }}</view>
+					</view>
+					<view class="goodslist-i-c-c">
+						<!-- <navigator class="a" :url="'/pagesBuy/rushdetail/index?i='+item.id+'&c='+item.type" hover-class="none"> -->
+						<view class="i">{{ item.group }}</view>{{ item.name }}
+						<!-- </navigator> -->
+					</view>
+					<view class="goodslist-i-c-c2">
+						<view class="h1">{{ item.price }}
+							<view class="i inline">元</view>
+						</view>
+						<view class="h2" v-if="item.levelnum > 0">
+							<view class="a" >购买</view>
+						</view>
+						<view class="h2 sell-out" v-if="item.levelnum == 0">已售罄</view>
+					</view>
+					<view class="goodslist-i-c-b">
+						<view class="p">
+							<view class="span" style="text-decoration:line-through;">市场价{{ item.oldprice }}</view>
+							<view class="em">{{ item.buyNum }}人购买</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: ['goodsList'],
+		
+		methods: {
+			navgateTo(url) {
+				App.navigationTo({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.goodslist-i {
+		margin-top: 50upx;
+	}
+
+	.goodslist-i:first-child {
+		margin-top: 0;
+	}
+
+	.goodslist-i-t {
+		width: calc(100vw - 60upx);
+		height: calc((100vw - 60upx) / 1.8);
+	}
+
+	.goodslist-i-t .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 4upx;
+	}
+
+	.goodslist-i-c-t {
+		color: #999;
+		font-size: 24upx;
+		margin-top: 20upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.goodslist-i-c-t-l {
+		padding-right: 20upx;
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.goodslist-i-c-t-l {
+		-webkit-flex: 1;
+		flex: 1;
+	}
+
+	.goodslist-i-c-c {
+		line-height: 48upx;
+		font-size: 32upx;
+		margin-top: 20upx;
+	}
+
+	.goodslist-i-c-c .i {
+		height: 48upx;
+		line-height: 48upx;
+		font-size: 28upx;
+		font-style: normal;
+		margin-right: 10upx;
+		padding: 0 18upx;
+		background-color: #FFD93F;
+		border-radius: 4upx;
+		display: inline-block;
+	}
+
+	.goodslist-i-c-c2 {
+		margin-top: 20upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.goodslist-i-c-c2 .h1 {
+		color: #FF4040;
+		font-size: 40upx;
+		font-weight: 600;
+	}
+
+	.goodslist-i-c-c2 .h1 .i {
+		font-size: 24upx;
+		font-weight: normal;
+		vertical-align: 2upx;
+		margin-left: 8upx;
+		display: inline-block;
+
+	}
+
+	.goodslist-i-c-c2 .h2 {
+		width: 144upx;
+		height: 56upx;
+		line-height: 56upx;
+		color: #fff;
+		font-size: 28upx;
+		text-align: center;
+		font-weight: normal;
+		background-color: #FF4040;
+		border-radius: 8upx;
+	}
+
+	.goodslist-i-c-c2 .sell-out {
+		color: #808080;
+		background-color: #D2D2D2;
+	}
+
+	.goodslist-i-c-b {
+		margin-top: 20upx;
+	}
+
+	.goodslist-i-c-b .p {
+		color: #999;
+		font-size: 24upx;
+		margin-top: 6upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.goodslist-i-c-b .span {
+		text-decoration: line-through;
+	}
+
+	.goodslist-i-c-b .em {
+		font-style: normal;
+	}
+</style>
diff --git a/components/template/haodiantoutiao.vue b/components/template/haodiantoutiao.vue
new file mode 100644
index 0000000..7989e7b
--- /dev/null
+++ b/components/template/haodiantoutiao.vue
@@ -0,0 +1,193 @@
+<template>
+	<view>
+		<view class="haodiantoutiao" v-if="hdttDataArr.length && hdttDataArr.length > 0">
+			<view class="hdtt-t">
+				<view class="hdtt-t-l">
+					<view class="h1">{{ hdttData.params.title }}</view>
+					<view class="p">{{ hdttData.params.detailed }}</view>
+				</view>
+				<view class="hdtt-t-r">
+					<view class="span">
+						<view class="em">{{ swiperI }}</view>/{{ hdttDataArr.length }}
+					</view>
+				</view>
+			</view>
+			<view class="hdtt-c">
+				<swiper :indicator-dots="false" :autoplay="false" :duration="500" autoplay="true" next-margin="30rpx" @change="swiperCg">
+					<block>
+						<swiper-item v-for="(item, key) in hdttDataArr" :key="key">
+							<view class="goodstop-i" @click="navgateto(item.id)">
+								<view class="goodstop-i-t">
+									<image class="image" :src="item.display_img" mode="scaleToFill"></image>
+								</view>
+								<view class="goodstop-i-c">
+									<view class="h1">{{ item.title }}</view>
+									<view class="h2">{{ item.summary }}</view>
+									<view class="p">
+										<view class="span">{{!!item.one_name || !!item.two_name?'':''}}<view class="i" v-if="item.one_name !== '' && item.one_name !== null">{{ item.one_name }}&nbsp;{{!!item.two_name?'-':''}}&nbsp;</view>
+											<view class="i" v-if="item.two_name !== '' && item.two_name !== null">{{ item.two_name }}</view>
+										</view>
+										<view class="em">阅读&nbsp;{{ item.browse }}</view>
+									</view>
+								</view>
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default {
+		props: ['hdttData'],
+		data() {
+			return {
+				swiperI: 1,
+				hdttDataArr: []
+			}
+		},
+		mounted() {
+			for (var i in this.hdttData.data) {
+				this.hdttDataArr.push(this.hdttData.data[i])
+			}
+		},
+		methods: {
+			swiperCg(e) {
+				this.swiperI = e.detail.current + 1
+			},
+			navgateto(headline_id) {
+				App.navigationTo({
+					url: `pages/mainPages/headline/headlineDetail?headline_id=${headline_id}`
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.haodiantoutiao {
+		padding-bottom: 30upx;
+	}
+
+	.hdtt-t {
+		padding: 30upx 30upx 0 30upx;
+		border-top: 0 solid #f6f6f6;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.hdtt-t .h1 {
+		font-weight: normal;
+		font-size: 36upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.hdtt-t .p {
+		color: #999;
+		font-size: 24upx;
+		margin-top: 10upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.hdtt-t-r {
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+	}
+
+	.hdtt-t-r .span {
+		font-size: 36upx;
+		display: inline-block;
+	}
+
+	.hdtt-t-r .span .em {
+		font-size: 42upx;
+		font-style: normal;
+		display: inline;
+	}
+
+	.hdtt-c {
+		margin-top: 30upx;
+	}
+
+	.hdtt-c swiper {
+		height: calc((100vw - 60upx) / 1.8 + 228upx);
+	}
+
+	.goodstop-i {
+		padding-left: 30upx;
+	}
+
+	.goodstop-i-t {
+		width: calc(100vw - 60upx);
+		height: calc((100vw - 60upx) / 1.8);
+		position: relative;
+	}
+
+	.goodstop-i-t .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.goodstop-i-c .h1 {
+		height: 42upx;
+		line-height: 42upx;
+		font-size: 32upx;
+		font-weight: normal;
+		margin-top: 20upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.goodstop-i-c .h2 {
+		height: 84upx;
+		line-height: 42upx;
+		font-size: 24upx;
+		color: #888;
+		font-weight: normal;
+		margin-top: 20upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.goodstop-i-c .p {
+		height: 42upx;
+		line-height: 42upx;
+		font-size: 28upx;
+		color: #888;
+		margin-top: 20upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.goodstop-i-c .p .span {
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.goodstop-i-c .p .span .i {
+		display: inline;
+	}
+
+	.goodstop-i-c .p .em {
+		font-style: normal;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+</style>
diff --git a/components/template/homemakingItem.vue b/components/template/homemakingItem.vue
new file mode 100644
index 0000000..2ffb220
--- /dev/null
+++ b/components/template/homemakingItem.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="omemaking" @click="navindex">
+		<view class="omemaking-img">
+			<image :src="items.logo" mode=""></image>
+		</view>
+		<view class="omemaking-content flex-box">
+			<view class="f-28 col-3 f-w dis-flex">
+				<view class="flex-box">
+					{{items.name}}
+				</view>
+				<image :src="imgfixUrls +'homemakingImg/dunpai.png'" v-if="items.is_authentication == 1" mode=""></image>
+				<image :src="imgfixUrls +'homemakingImg/yaoqian.png'" v-if="items.is_bond == 1" mode=""></image>
+			</view>
+			<view class="p-top-10 omemaking-tags">
+				<view class="omemaking-tags-item" v-for="(item,index) in items.label">
+					{{item}}
+				</view>
+			</view>
+			<view class="dis-flex f-24 col-3 p-top-20">
+				<view class="address">
+					{{items.address}}
+				</view>
+				<view class="flex-box t-r" v-if="items.distances">
+					{{items.distances}}
+				</view>
+			</view>
+			<view class="service-item" v-for="(item,index) in items.service" @click.stop="navlink(item.id)">
+				<view class="dis-flex t-l f-24 col-3" style="line-height: 45upx;">
+					<image v-if="item.thumb" :src="item.thumb" mode=""></image>
+					{{item.title}}
+				</view>
+				<view class="dis-flex p-top-20">
+					<view class="c-ff4444" style="width: 350upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+						<text class="f-24" v-if="item.pricetype == 0"></text>
+						<text class="f-24" v-if="item.pricetype == 1">预约金￥</text>
+						<text class="f-24" v-if="item.pricetype == 2">￥</text>
+						<text class="f-28 f-w" v-if="item.pricetype == 0">{{item.price_text}}</text>
+						<text class="f-28 f-w" v-else>{{item.price}}</text>
+						<text class="f-24" v-if="item.unit">/{{item.unit}}</text>
+					</view>
+					<view class="flex-box col-9 f-24 t-r" style="line-height: 50upx;">
+						已售{{item.salenum}}
+					</view>
+				</view>
+			</view>
+			<!-- <view class="f-24 t-r" style="padding-top: 20upx;border-top: 1upx solid #EEEEEE;" >
+				全部服务
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		props:{
+			items:{
+				type:Object,
+				default:{}
+			}
+		},
+		watch:{
+			'items': {
+				handler(val,oldVal) {
+					// debugger
+				},
+				deep: true, //对象内部的属性监听，也叫深度监听
+			}
+		},
+		methods:{
+			navlink(id){
+				App.navigationTo({
					url: "pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=" + id
				});
+			},
+			navindex(){
+				if(!this.items.mid){
+					App.navigationTo({
+						url: "pages/mainPages/store/index?sid=" + this.items.id
+					});
+				}else{
+					App.navigationTo({
+						url: "pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter?mid=" + this.items.mid + '&id=' + this.items.id
+					});
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.omemaking{
+		background-color: #FFFFFF;
+		display: flex;
+		margin-bottom: 20upx;
+		padding: 20upx;
+		border-radius: 20upx;
+		.omemaking-img{
+			width: 140upx;
+			height: 140upx;
+			border-radius: 20upx;
+			margin-right: 30upx;
+			image{
+				width: 100%;
+				height: 100%;
+				border-radius: 20upx;
+			}
+		}
+		.omemaking-content{
+			image{
+				width: 32upx;
+				height: 32upx;
+				vertical-align: top;
+				margin-top: 4upx;
+				margin-left: 10upx;
+			}
+			.address{
+				width: 350upx;
+				overflow:hidden; //超出的文本隐藏
+				text-overflow:ellipsis; //溢出用省略号显示
+				white-space:nowrap; //溢出不换行
+
+			}
+		}
+		.omemaking-tags{
+			height: 50upx;
+			overflow: hidden;
+			.omemaking-tags-item{
+				// width: 100upx;
+				height: 32upx;
+				line-height: 32upx;
+				text-align: center;
+				background-color: #EEEEEE;
+				color: #999999;
+				font-size: 20upx;
+				padding: 0 10upx;
+				border-radius: 6upx;
+				margin-right: 10upx;
+				margin-bottom: 10upx;
+				display: inline-block;
+			}
+			
+		}
+		.service-item{
+			padding: 20upx 0 0;
+			border-top: 1upx solid #EEEEEE;
+			margin-top: 20upx;
+			image{
+				width: 40upx;
+				height: 40upx;
+				margin-right: 20upx;
+				border-radius: 6upx;
+			}
+		}
+	}
+</style>
diff --git a/components/template/homemakingOrder.vue b/components/template/homemakingOrder.vue
new file mode 100644
index 0000000..8dcdb03
--- /dev/null
+++ b/components/template/homemakingOrder.vue
@@ -0,0 +1,302 @@
+<template>
+	<view class="homemakingOrder">
+		<view class="companyName">
+			<image :src="orderItem.artificerLogo || orderItem.avatar" mode=""></image>
+			{{ orderItem.artificerName || orderItem.nickname }}
+			<text class="iconfont icon-right" style="font-size: 24upx;padding-left: 10upx;"></text>
+			<view
+				v-if="orderItem.type == '1' || orderItem.type == '2'"
+				class="flex-box c-ff4444 f-28 t-r"
+				:style="{
+					color:
+						orderItem.status == '0'
+							? '#ff4444'
+							: orderItem.status ==' 1'
+							? '#0099ff'
+							: orderItem.status ==' 2'
+							? '#ff4444'
+							: orderItem.status == '3'
+							? '#ff4444'
+							: orderItem.status == '5'
+							? '#999999'
+							: orderItem.status == '1'
+							? '#ff4444'
+							: orderItem.status == '6' || orderItem.status == '10'
+							? '#ff4444'
+							: '#999999'
+				}"
+			>
+				<text>
+					{{
+						orderItem.status == '0'
+							? '未支付'
+							: orderItem.status == '1'
+							? '待服务'
+							: orderItem.status == '2'
+							? '待评价'
+							: orderItem.status == '3'
+							? '已完成'
+							: orderItem.status == '5'
+							? '已取消'
+							: orderItem.status == '1'
+							? '待服务'
+							: orderItem.status == '6'
+							? '待退款'
+							: orderItem.status == '10'
+							? '退款申请中'
+							: '已退款'
+					}}
+				</text>
+				<!-- <text>
+					{{orderItem.status == 0? '下架中':orderItem.status == 1? '销售中':orderItem.status == 5? '待审核':orderItem.status == 2? '待评价':'被驳回'}}
+				</text> -->
+			</view>
+		</view>
+		<view class="line"></view>
+		<view class="content">
+			<view class="dis-flex">
+				<image :src="orderItem.thumb" mode=""></image>
+				<view class="content-contnet">
+					<view class="title f-w f-32 col-3">{{ orderItem.title }}</view>
+					<view class="f-24 col-3" v-if="orderItem.express && orderItem.express.address" style="overflow: hidden;width: 490upx;text-overflow:ellipsis;white-space: nowrap;">
+						上门地址:{{orderItem.express.address}}
+					</view>
+					<view >
+						<text class="f-24 col-3" style="padding-right: 20upx;">总价:</text>
+						<text class="f-24 c-ff4444">¥</text>
+						<text class="f-32 c-ff4444 f-w">{{ orderItem.price }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="t-r btns">
+			<view class="cancel" v-if="orderItem.status == '0' && orderItem.type == '1'" @click="closeOrder">取消订单</view>
+			<view class="payment" v-if="orderItem.status == '0' && orderItem.type == '1'" @click="pay">付款</view>
+
+			<view class="payment" v-if="orderItem.type =='2'" @click="conjunction">私信联系</view>
+			<view class="payment" v-if="orderItem.type =='2' && orderItem.mobile" @click="call">电话联系</view>
+			<view class="payments" style="background-color: #0099ff;" v-if="orderItem.status == '1' && orderItem.type == '2' && hidefish != 1" @click="affirm(2)">完成</view>
+			<view class="payment" v-if="orderItem.status == '2' && orderItem.type == '1'" @click="evaluate">评价</view>
+			<view class="cancel" v-if="orderItem.status == '1' && orderItem.type == '1' && Number(orderItem.price) != '0'" @click="refund">退款</view>
+			<view class="cancel" v-if="orderItem.status == '10' && orderItem.type == '2'" @click="tuku">退款</view>
+			<view class="affirm" v-if="orderItem.status == '1' && orderItem.type == '1'" @click="affirm(1)">确认订单</view>
+			<view class="payments" style="background-color: #0099ff;" v-if="orderItem.type =='1' && orderItem.mobile" @click="call">电话联系</view>
+			<view class="cancel" v-if="(orderItem.status == '3' || orderItem.status == '7') && orderItem.type == '1'  " @click="AnotherList">再来一单</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		orderItem: {
+			type: Object,
+			default: {}
+		},
+		type: {
+			type: String,
+			default: '1'
+		},
+		hidefish:{
+			default:0
+		}
+	},
+	methods: {
+		closeOrder(){
+			let _this = this,
+				data = {
+					id: _this.orderItem.id,
+					plugin: 'housekeep'
+				};
+			uni.showModal({
+				title: '提示',
+				content: '是否取消订单？',
+				success: function(res) {
+					if (res.confirm) {
+						App._post_form('&p=pay&do=cancelOrder', data, res => {
+							uni.showToast({
+								title: res.message
+							});
+							_this.$emit('getoderList', false, 1);
+						});
+					} else if (res.cancel) {}
+				}
+			});
+		},
+		tuku(){
+			App.showError(
+					`确认完成退款？`,
+					data => {
+						if (data.confirm) {
+							App._post_form(
+								`&p=store&do=storeRefund&id=${this.orderItem.id}&plugin=${'housekeep'}`,
+								{},
+								res => {
+									console.log(res);
+									uni.showToast({
+										title: res.message
+									});
+									this.$emit('getoderList', false, 1);
+								},
+								false,
+								() => {}
+							);
+						}
+					},
+					true
+				);
+		},
+		call(){
+			uni.makePhoneCall({
+				phoneNumber: this.orderItem.mobile
+			})
+		},
+		conjunction() {
+			App.navigationTo({
+				url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.orderItem.mid + '&other_party_type=' + 1 + '&type=1' + '&id='
+			});
+		},
+		AnotherList() {
+			App.navigationTo({
+				url: `pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${this.orderItem.fkid}`
+			});
+		},
+		evaluate() {
+			App.navigationTo({
+				url: `pages/mainPages/comment/comment?goods_id=1356&order_id=${this.orderItem.id}&plugin=housekeep&a=a`
+			});
+		},
+		refund() {
+			App.navigationTo({
+				url: `pages/subPages/orderList/afterSale/afterSale?id=${this.orderItem.id}&plugin=housekeep`
+			});
+		},
+		affirm(type) {
+			App.showError(
+				`确认完成订单?`,
+				data => {
+					if (data.confirm) {
+						let data = {
+							channel: type,
+							id: this.orderItem.id
+						};
+						App._post_form(
+							`&p=housekeep&do=finishOrder`,
+							data,
+							res => {
+								console.log(res);
+								uni.showToast({
+									title: res.message
+								});
+								this.$emit('getoderList', false, 1);
+							},
+							false,
+							() => {}
+						);
+					}
+				},
+				true
+			);
+		},
+		pay() {
+			App.navigationTo({
+				url: 'pages/mainPages/payment/payment?orderid=' + this.orderItem.id + '&plugin=housekeep'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.homemakingOrder {
+	padding: 20upx;
+	background-color: #ffffff;
+	border-radius: 20upx;
+	margin-top: 20upx;
+	.companyName {
+		display: flex;
+		line-height: 60upx;
+		font-size: 28upx;
+		color: #333333;
+		image {
+			width: 60upx;
+			height: 60upx;
+			border-radius: 60upx;
+			margin-right: 20upx;
+		}
+	}
+	.line {
+		// width: 650upx;
+		height: 1px;
+		background: #eeeeee;
+		margin: 20upx 30upx;
+	}
+	.content {
+		// display: flex;
+		image {
+			width: 120upx;
+			height: 120upx;
+			border-radius: 20upx;
+		}
+		.content-contnet {
+			padding-left: 30upx;
+			.title {
+				margin-bottom: 15upx;
+			}
+		}
+	}
+	.btns {
+		display: flex;
+		flex-direction: row-reverse;
+		padding-top: 20upx;
+		.cancel {
+			width: 150upx;
+			height: 60upx;
+			line-height: 60upx;
+			border-radius: 10upx;
+			border: 1upx solid #cccccc;
+			color: #333333;
+			text-align: center;
+			font-size: 28upx;
+			margin-left: 20upx;
+		}
+		.payments {
+			width: 140upx;
+			height: 60upx;
+			line-height: 60upx;
+			border-radius: 10upx;
+			background: linear-gradient(180deg, #0099ff 0%, #0077ff 100%);
+			color: #ffffff;
+			text-align: center;
+			font-size: 28upx;
+			margin-left: 20upx;
+		}
+		.payment {
+			width: 140upx;
+			height: 60upx;
+			line-height: 60upx;
+			border-radius: 10upx;
+			background: linear-gradient(180deg, #fece01 0%, #fdad28 100%);
+			color: #ffffff;
+			text-align: center;
+			font-size: 28upx;
+			margin-left: 20upx;
+		}
+		.affirm {
+			width: 150upx;
+			height: 60upx;
+			line-height: 60upx;
+			border-radius: 10upx;
+			background: linear-gradient(180deg, #fece01 0%, #fdad28 100%);
+			color: #ffffff;
+			text-align: center;
+			font-size: 28upx;
+			margin-left: 20upx;
+		}
+	}
+}
+</style>
diff --git a/components/template/imgswipertwo.vue b/components/template/imgswipertwo.vue
new file mode 100644
index 0000000..5ed2392
--- /dev/null
+++ b/components/template/imgswipertwo.vue
@@ -0,0 +1,172 @@
+<template>
+	<view>
+		<view class="imgswiper2" v-if="imgswipertwoDataArr.length &&imgswipertwoDataArr.length > 0">
+			<view class="hdtt-t">
+				<view class="hdtt-t-l">
+					<view class="h1">{{ imgswipertwoData.params.title }}</view>
+					<view class="p">{{ imgswipertwoData.params.text }}</view>
+				</view>
+				<view class="hdtt-t-r">
+					<view class="span">
+						<view class="em">{{ swiperI }}</view>/{{ imgswipertwoDataArr.length }}
+					</view>
+				</view>
+			</view>
+			<view class="goodslist-d">
+				<swiper  :style="{height:imgswipertwoData.params.img_height  +'px'}"
+				 :indicator-dots="false" :autoplay="true" :interval="4000" :duration="500" next-margin="30rpx" @change="swiperCg">
+					<block>
+						<swiper-item v-for="(item2, key2) in imgswipertwoDataArr" :key="key2" :style="{height:imgswipertwoData.params.img_height+'px',width:imgswipertwoData.params.img_width - 30 +'px'}">
+							<view class="goodstop-i" @click="navigateTo(item2.linkurl)">
+								<!-- <navigator class="a" :url="item2.linkurl" :open-type="item2.url_type" hover-class="none"> -->
+								<view class="goodstop-i-t">
+									<image class="image"  :style="{height:imgswipertwoData.params.img_height - 30 +'px',width:imgswipertwoData.params.img_width - 30 +'px'}" :src="item2.imgurl"></image>
+								</view>
+								<view class="goodstop-i-c">
+									<view class="h1" v-if="!!item2.title" :style="'color: '+imgswipertwoData.style.titlecolor">{{ item2.title }}</view>
+									<view class="h2" v-if="!!item2.text" :style="'color: '+imgswipertwoData.style.textcolor">{{ item2.text }}</view>
+								</view>
+								<!-- </navigator> -->
+							</view>
+						</swiper-item>
+					</block>
+				</swiper>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '../../common/js/app.js'
+	export default {
+		props: ['imgswipertwoData'],
+		data() {
+			return {
+				swiperI: 1,
+				imgswipertwoDataArr: []
+			}
+		},
+		mounted() {
+			for (var i in this.imgswipertwoData.data) {
+				this.imgswipertwoDataArr.push(this.imgswipertwoData.data[i])
+			}
+			console.log()
+		},
+		methods: {
+			swiperCg(e) {
+				this.swiperI = e.detail.current + 1
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/*  banner2  图片轮播2  */
+	.imgswiper2 {
+		background-color: #fff;
+	}
+
+	.imgswiper2 .hdtt-t {
+		padding: 0 30upx;
+		border-top: 0 solid #f6f6f6;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.imgswiper2 .hdtt-t .h1 {
+		font-weight: normal;
+		font-size: 36upx;
+		margin: 0;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.imgswiper2 .hdtt-t .p {
+		color: #999;
+		font-size: 24upx;
+		margin: 0;
+		margin-top: 10upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.imgswiper2 .hdtt-t-r {
+		display: -webkit-flex;
+		display: flex;
+		align-items: center;
+	}
+
+	.imgswiper2 .hdtt-t-r .span {
+		font-size: 36upx;
+		display: inline-block;
+	}
+
+	.imgswiper2 .hdtt-t-r .span .em {
+		font-size: 42upx;
+		font-style: normal;
+		display: inline;
+	}
+
+	.imgswiper2 .goodslist {
+		padding: 30upx 0;
+	}
+
+	.imgswiper2 .goodstop-i {
+		padding: 0;
+		padding-left: 30upx;
+		padding-bottom: 30upx;
+	}
+
+	.imgswiper2 .goodstop-i-t {
+		width: 100%;
+		height: auto;
+		margin-top: 0;
+	}
+
+	.imgswiper2 .goodstop-i-t .image {
+		width: 100%;
+		display: block;
+	}
+
+	.imgswiper2 .goodslist-d {
+		margin-top: 30upx;
+	}
+
+	.imgswiper2 .goodstop-i .h1 {
+		height: 42upx;
+		line-height: 42upx;
+		font-size: 32upx;
+		font-weight: normal;
+		margin-top: 20upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.imgswiper2 .goodstop-i .h2 {
+		height: 42upx;
+		line-height: 42upx;
+		font-size: 24upx;
+		color: #888;
+		font-weight: normal;
+		margin-top: 20upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 1;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/components/template/inputPop.vue b/components/template/inputPop.vue
new file mode 100644
index 0000000..f40f735
--- /dev/null
+++ b/components/template/inputPop.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="inputPop">
+		<PopManager :show="inputShow" @clickmask="closePop">
+			<view class="replyView">
+				<view class="replyViewPackage" >
+					<view class="replyInput" ><textarea :placeholder="titleText+':'" v-if="inputShow" v-model="getText"></textarea></view>
+					<view class="sendButton" @click="returnText" ><text>确定</text></view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import PopManager from '@/components/template/PopManager';
+export default {
+	components: {
+		PopManager
+	},
+	props: {
+		inputShow: {
+			type: Boolean,
+			default: false
+		},
+		titleText:{
+			type:String,
+			default: ''
+		},
+		texts:{
+			type:String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			getText:''
+		};
+	},
+	mounted(){
+		let _this=this
+		_this.getText=_this.texts
+	},
+	watch:{
+		'texts':{
+			handler(){
+				let _this=this
+				_this.getText=_this.texts
+			}
+		}
+	},
+	methods: {
+		closePop() {
+			let _this = this;
+			this.$emit('closeInputPop');
+		},
+		returnText(){
+			let _this = this;
+			this.$emit('returnText',_this.getText);
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.inputPop {
+	font-size: 0;
+}
+.replyViewPackage {
+	padding: 30upx;
+}
+
+.coverView {
+	z-index: 2;
+	position: fixed;
+	top: 84upx;
+	background: rgba(0, 0, 0, 0);
+	width: 750upx;
+}
+
+.replyInput {
+	background: rgba(248, 248, 248, 1);
+	width: 500upx;
+	height: 200upx;
+	vertical-align: middle;
+	margin: 20upx auto 0 auto;
+	background: white;
+	font-size: 24upx;
+	font-family: Source Han Sans CN;
+
+	color: rgba(51, 51, 51, 1);
+
+	> textarea {
+		background: rgba(248, 248, 248, 1);
+		width: 500upx !important;
+		height: 200upx !important;
+	}
+}
+
+.sendButton {
+	text-align: center;
+	margin: 20upx auto 0 auto;
+	width: 292upx;
+	height: 74upx;
+	background: #3388ff;
+	border-radius: 37upx;
+	> text {
+		line-height: 74upx;
+		font-size: 24upx;
+
+		color: #ffffff;
+	}
+}
+
+.replyView {
+	border: 1upx solid rgba(0, 0, 0, 0);
+	width: 600upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx;
+	background: #f8f8f8;
+}
+</style>
diff --git a/components/template/integralGood.vue b/components/template/integralGood.vue
new file mode 100644
index 0000000..8cb3824
--- /dev/null
+++ b/components/template/integralGood.vue
@@ -0,0 +1,204 @@
+<template>
+	<view >
+		<view class="integralGood" v-if="pid == 'integral_goods'">
+			<view
+				class="integralGood-item dis-flex"
+				@click="goUrl(item.url)"
+				:style="{ padding: padding + 'px', marginBottom: index != integralGoodLsit.length - 1 ? '20upx' : '0' }"
+				v-for="(item, index) in integralGoodLsit"
+				:key="index"
+			>
+				<view class="logo-img"><image class="logo-img" :src="item.thumb" mode=""></image></view>
+				<view class="flex-box content">
+					<view class="f-30">{{ item.title }}</view>
+					<view class="f-30 c-ff4444" style="line-height: 120upx;">{{ item.price_text }}</view>
+					<view class="col-9 f-28" style="text-decoration:line-through;">
+						市场价:{{ item.old_price }}元
+						<view class="btn">去兑换</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="integralGood2" v-if="pid == 'integral_goods2'" :style="{ padding: padding + 'px' }">
+			<view class="integralGood2-item" @click="goUrl(item.url)" v-for="(item, index) in integralGoodLsit" :key="index">
+				<view class="img-box"><image class="img-box" :src="item.thumb" mode=""></image></view>
+				<view >
+					<view class="f-28">{{ item.title }}</view>
+					<view class="f-26 f-w c-ff4444" style="line-height: 60upx;">{{ item.price_text }}</view>
+					<view class="col-9 f-24" style="text-decoration:line-through;">
+						市场价:{{ item.old_price }}元
+						<view class="col-9 f-24" style="float: right;">{{ item.pv }}人喜欢</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="integralGood3" v-if="pid == 'integral_goods3'">
+			<view class="integralGood3-item" @click="goUrl(item.url)" :style="{ padding: padding + 'px' }" v-for="(item, index) in integralGoodLsit" :key="index">
+				<view class="img-box">
+					<image class="img-box" :src="item.thumb" mode=""></image>
+					<view class="top">TOP {{ index + 1 < 10 ? '0' + (index + 1) : index + 1 }}</view>
+				</view>
+				<view class="p-top-20">
+					<view class="f-28">
+						<view class="sign">积分</view>
+						{{ item.title }}
+					</view>
+					<view class="f-36 f-w c-ff4444" style="line-height: 80upx;">
+						{{ item.price_text }}
+						<view class="conversion">兑换</view>
+					</view>
+					<view class="col-9 f-24" style="text-decoration:line-through;">
+						市场价:{{ item.old_price }}元
+						<view class="col-9 f-24" style="float: right;">{{ item.pv }}人喜欢</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="integralGood4" v-if="pid == 'integral_goods4'">
+			<view class="integralGood4-item" v-for="(item, index) in integralGoodLsit" :key="index"   @click="goUrl(item.url)"
+			:style="{paddingTop: padding + 'px',paddingBottom: padding + 'px',paddingLeft: padding + 'px',paddingRight:(integralGoodLsit.length - 1) == index?padding + 'px':0 }">
+				<view class="img-box"><image class="img-box" :src="item.thumb" mode=""></image></view>
+				<view class="f-26">{{ item.title }}</view>
+				<view class="f-26 c-ff4444" style="line-height: 70upx;">{{ item.price_text }}</view>
+				<view class="col-9 f-24" style="text-decoration:line-through;">
+					市场价:{{ item.old_price }}元
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {};
+	},
+	props: {
+		padding: {
+			type: Number,
+			default: 0
+		},
+		integralGoodLsit: {
+			type: Array,
+			default: [1]
+		},
+		pid: {
+			type: String,
+			default: null
+		}
+	},
+	methods: {
+		goUrl(url) {
+			App.navigationTo({
+				url: url
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.integralGood {
+	.integralGood-item {
+		background-color: #ffffff;
+
+		.logo-img {
+			width: 200upx;
+			height: 200upx;
+		}
+		.content {
+			padding-left: 20upx;
+			.btn {
+				width: 150upx;
+				height: 50upx;
+				border-radius: 60upx;
+				background-color: #ff4444;
+				color: #ffffff;
+				line-height: 50upx;
+				text-align: center;
+				float: right;
+			}
+		}
+	}
+}
+.integralGood2 {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	background-color: #ffffff;
+	.integralGood2-item {
+		flex: 0 0 48%;
+		margin-bottom: 20upx;
+		.img-box {
+			width: 100%;
+			height: 300upx;
+			border-radius: 10upx;
+		}
+	}
+}
+.integralGood3 {
+	.integralGood3-item {
+		background-color: #ffffff;
+		margin-bottom: 20upx;
+		.img-box {
+			height: 500upx;
+			width: 100%;
+			position: relative;
+			.top {
+				height: 50upx;
+				width: 150upx;
+				border-radius: 0 60upx 60upx 0upx;
+				line-height: 50upx;
+				text-align: center;
+				font-size: 28upx;
+				color: #ffffff;
+				font-weight: 700;
+				background-color: #ff4444;
+				position: absolute;
+				left: 0;
+				top: 0;
+			}
+		}
+		.sign {
+			width: 100upx;
+			height: 50upx;
+			line-height: 50upx;
+			text-align: center;
+			color: #333333;
+			background-color: #ffd93f;
+			border-radius: 6upx;
+			margin-right: 20upx;
+			display: inline-block;
+		}
+		.conversion {
+			width: 150upx;
+			height: 50upx;
+			line-height: 50upx;
+			text-align: center;
+			color: #ffffff;
+			font-size: 28upx;
+			border-radius: 10upx;
+			background-color: #ff4444;
+			display: inline-block;
+			float: right;
+			margin-top: 15upx;
+		}
+	}
+}
+.integralGood4 {
+	width: 100%;
+	overflow: auto;
+	display: flex;
+	background-color: #FFFFFF;
+	.integralGood4-item {
+		display: inline-block;
+		
+		flex: 0 0 36%;
+		.img-box {
+			width: 250upx;
+			height: 250upx;
+		}
+	}
+}
+</style>
diff --git a/components/template/journey.vue b/components/template/journey.vue
new file mode 100644
index 0000000..449b487
--- /dev/null
+++ b/components/template/journey.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="journey" :style="{padding: boxPadding?'30rpx 0':'0'}" @click="HitchRideDetails">
+		<view class="title">
+			<view >
+				<view class="dot">
+					
+				</view>
+				<view class="name">
+					{{hitchItem.start_address}}
+				</view>
+			</view>
+			<view >
+				<view class="dot-t">
+					
+				</view>
+				<view class="name-t">
+				{{hitchItem.end_address}}
+				</view>
+			</view>
+			
+		</view>
+		<view class="carNavigation" v-if="flag" @click.stop="goMap">
+			<image :src="imgfixUrls + 'carNavigation.png'" mode=""></image>
+		</view>
+		<view class="carPhone" v-if="phones" @click.stop="callPlay">
+			拨打电话
+		</view>
+		<view class="sign dis-flex">
+			<view class="catClass">
+				{{hitchItem.transport_type_text}}
+			</view>
+			<view class="f-24 col-9 p-left-right-20">
+				{{hitchItem.start_time_text}}
+			</view>
+		</view>
+		<view class="tags">
+			<view class="tag-item" v-for="(items,indexs) in hitchItem.label_id" :key="indexs">
+				{{items}}
+			</view>
+			
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		props:{
+			hitchItem:{
+				type:Object,
+				default:{}
+			},
+			lastIndex:{
+				type:Boolean,
+				default:false
+			},
+			flag:{
+				type:Boolean,
+				default:false
+			},
+			boxPadding:{
+				type:Boolean,
+				default:true
+			},
+			phones:{
+				type:Boolean,
+				default:false
+			}
+		},
+		methods:{
+			callPlay(){
+				let _this = this
+				uni.makePhoneCall({
+					phoneNumber:_this.hitchItem.contacts_phone //仅为示例
+				});
+			},
+			goMap(){
+				let _this = this;
+				// #ifdef MP-WEIXIN
+
+						uni.openLocation({
+						    latitude: Number(_this.hitchItem.end_lat),
+						    longitude: Number(_this.hitchItem.end_lng),
+							success: function () {
+								console.log('success');
+							},
+							fail: function () {
+								console.log('success');
+							},
+						})
+				
+				//#endif
+				//#ifdef H5
+				wxApi.WxopenLocation(Number(_this.hitchItem.end_lat), Number(_this.hitchItem.end_lng), '', _this.hitchItem.end_address);
+				//#endif
+				//#ifdef APP-PLUS
+				Map.openMap(Number(_this.hitchItem.end_lat),Number(_this.hitchItem.end_lng),_this.hitchItem.end_address,'gcj02')
+				//#endif
+			},
+			HitchRideDetails(){
+				if(this.flag) return
+				App.navigationTo({
+					url: "pages/subPages2/hitchRide/hitchRideDetails/hitchRideDetails?id=" + this.hitchItem.id
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.journey{
+		// padding: 30upx 0;
+		position: relative;
+		.carNavigation{
+			position: absolute;
+			top: 30upx;
+			right: 0upx;
+			width: 120upx;
+			height: 120upx;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+		}
+		.carPhone{
+			width: 160upx;
+			height: 70upx;
+			line-height: 70upx;
+			text-align: center;
+			background: linear-gradient(180deg, #3383FF 0%, #185DE9 100%);
+			border-radius: 10upx;
+			color: #FFFFFF;
+			font-size: 28upx;
+			font-weight: bold;
+			position: absolute;
+			top: -20upx;
+			right: 0upx;
+		}
+		.title{
+			position: relative;
+			margin-top: 20upx;
+			border-left: 1upx dashed #EEEEEE;
+			
+			.dot{
+				width: 12upx;
+				height: 12upx;
+				background-color: #00C095;
+				border-radius: 50%;
+				position: absolute;
+				left: 0;
+				top: 0%;
+				transform: translate(-50%);
+				
+			}
+			.dot-t{
+				width: 12upx;
+				height: 12upx;
+				background-color: #FF4444;
+				border-radius: 50%;
+				position: absolute;
+				left: 0;
+				bottom: 0;;
+				transform: translate(-50%);
+			}
+			.name{
+				padding: 0 0 0upx 30upx;
+				color: #333333;
+				font-weight: 700;
+				font-size: 36upx;
+				position: relative;
+				top: -16upx;
+				z-index: 1;
+				width:400upx;
+				overflow:hidden;
+				text-overflow:ellipsis;
+				white-space:nowrap;
+			}
+			.name-t{
+				padding: 0 0 0upx 30upx;
+				color: #333333;
+				font-weight: 700;
+				font-size: 36upx;
+				position: relative;
+				bottom: -16upx;
+				z-index: 1;
+				width:400upx;
+				overflow:hidden;
+				text-overflow:ellipsis;
+				white-space:nowrap;
+			}
+		}
+		.sign{
+			padding-top: 50upx;
+			line-height: 40upx;
+			.catClass{
+				width: 90upx;
+				height: 40upx;
+				line-height: 40upx;
+				background: linear-gradient(180deg, #6DA5FD 0%, #6094FD 100%);
+				border-radius: 10upx;
+				text-align: center;
+				font-size: 24upx;
+				color: #FFFFFF;
+			}
+		}
+		.tags{
+			padding-top: 30upx;
+			font-size: 10upx;
+			.tag-item{
+				padding: 4upx 10upx;
+				border: 1upx solid #CCCCCC;
+				color: #999999;
+				height: 32upx;
+				line-height: 28upx;
+				font-size: 24upx;
+				text-align: center;
+				display: inline-block;
+				border-radius: 10upx;
+				margin-right: 20upx;
+			}
+		}
+	}
+</style>
diff --git a/components/template/lee-select.vue b/components/template/lee-select.vue
new file mode 100644
index 0000000..0536e61
--- /dev/null
+++ b/components/template/lee-select.vue
@@ -0,0 +1,500 @@
+<template>
+	<view class="select-page">
+		<block v-if="!isSearch">
+			<scroll-view class="scroll-list-panel" scroll-y="true" :scroll-top="scrollTop" scroll-with-animation="true" @scroll="scroll">
+				<view class="base-wrap-history m-top-btm20" v-if="!!currentCity">
+					<view class="title">当前城市</view>
+					<view class="panel">
+						<text class="item current-item" @click="chooseItem(currentCity['ad_info'])"><text class="history-icon iconfont icon-locationfill">{{currentCity['ad_info']['district'] || currentCity['ad_info']['city']}}</text></text>
+					</view>
+				</view>
+				<view class="base-wrap-history" v-if="!!recenCity && recenCity.length>0">
+					<view class="title">最近访问的城市</view>
+					<view class="panel">
+						<text v-for="(item,index) in recenCity" :key="index" class="item" v-if="index<3" @click="chooseItem(item)">{{item['ad_info']['city']}}</text>
+					</view>
+				</view>
+				<view class="base-wrap-history m-btm40" v-if="!!quickPanelData && quickPanelData.length>0">
+					<view class="title">热门城市</view>
+					<view class="panel">
+						<text v-for="(item,index) in quickPanelData" :key="index" class="item" @click="chooseItem(item)">{{item['name']}}</text>
+					</view>
+				</view>
+				<!-- <base-classes v-for="(item, index) in quickPanelData" :classesAttr="item" :key="index" @chooseItem="chooseItem"></base-classes> -->
+				<view class="main-wrap">
+					<view class="sort-wrap" v-for="(sort,index1) in listData" :key="index1" :id="'view'+ index1" :style="{backgroundColor:getListAttrListBackgroundColor}">
+						<view class="title" :style="{fontSize:getListAttrTitleFontSize,color:getListAttrTitleColor,height:getListAttrTitleHeight,background:getListAttrTitleBackground,paddingLeft:getListAttrTitlePadding}">{{sort['initial']}}</view>
+						<view class="list">
+							<text v-for="(city, index2) in sort.list" :key="index2" :style="{height:getListAttrItemHeight,fontSize:getListAttrItemFontSize,borderBottom:getListAttrItemBorderBottom,color:getListAttrItemColor,background:getListAttrItemBackgroundColor}"
+							 @click="chooseItem(city)">{{city['name']}}</text>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<!-- <view class="now-sort" :style="{fontSize:getListAttrTitleFontSize,color:getListAttrTitleColor,height:getListAttrTitleHeight,background:getListAttrTitleBackground,paddingLeft:getListAttrTitlePadding}">{{getNavData[activeIndex]}}</view> -->
+			<view v-if="!!activeIndex" :class="['now-letter', fadeFlag?'fadeIn':'']">{{getNavData[activeIndex]}}</view>
+			<view class="letter-nav" v-if="navAttr.enable" :style="{backgroundColor:getNavAttrbackgroundColor,padding:getNavAttrPadding,borderRadius:getNavAttrBorderRadius,top:marginT}">
+				<text :class="['item',index === activeIndex ? 'active': '']" v-for="(item,index) in getNavData" :key="index" @click="scrollSelect(index)"
+				 style="font-size: 24upx;padding: 6upx 0;">{{item}}</text>
+			</view>
+		</block>
+		<block v-if="isSearch">
+			<view class="base-wrap-history">
+				<view class="title">目前搜索的城市</view>
+				<view class="panel">
+					<text v-for="(listItem,index) in searchCitylist" :key="index" class="item" @click="chooseItem(listItem.list)">{{listItem.list.name}}</text>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				navData: [], // 侧边导航栏数据
+				toView: 'sort0',
+				scrollTop: 0,
+				heightFixed: '',
+				marginT: '45%',
+				disArray: [0],
+				activeIndex: 0,
+				fadeFlag: false,
+				Timer: null,
+				cityListData: ""
+			}
+		},
+		props: {
+			listData: {
+				type: Array,
+				default: []
+			},
+			quickPanelData: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			currentCity: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			iphoneModel: {
+				type: Boolean,
+				default: false
+			},
+			navAttr: {
+				type: Object,
+				default: function() {
+					return {}
+				}
+			},
+			isSearch: {
+				type: Boolean,
+				default: false
+			},
+			isFixed: {
+				type: Boolean,
+				default: false
+			},
+			locationType: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			searchCitylist: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			recenCity: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			},
+			listAttr: {
+				type: Object,
+				default: function() {
+					return {
+						listBackgroundColor: 'transport',
+						titleFontSize: 28,
+						titleColor: '#333',
+						titleHeight: 60,
+						titleBackground: '#ccc',
+						titlePadding: 20,
+						itemHeight: 80,
+						itemFontSize: 28,
+						itemBorderBottom: '1px solid rgba(0, 0, 0, 0.1)',
+						itemColor: '#333',
+						itemBackgroundColor: '',
+						itemMargin: 20
+					}
+				}
+			},
+		},
+		computed: {
+			getNavData() {
+				if (!!this.listData && this.listData.length > 0) {
+					this.navData = [];
+					this.listData.forEach((item, index) => {
+						this.navData.push(item.initial)
+					})
+					return this.navData
+				}
+			},
+			getListAttrListBackgroundColor() {
+				return this.listAttr.listBackgroundColor || 'transport'
+			},
+			getListAttrTitleColor() {
+				return this.listAttr.titleColor || '#333'
+			},
+			getListAttrTitleFontSize() {
+				return uni.upx2px(this.listAttr.titleFontSize || 24) + 'px'
+			},
+			getListAttrTitleHeight() {
+				return uni.upx2px(this.listAttr.titleHeight || 60) + 'px'
+			},
+			getListAttrTitleBackground() {
+				return this.listAttr.titleBackground || '#ccc'
+			},
+			getListAttrTitlePadding() {
+				return uni.upx2px(this.listAttr.titlePadding || 20) + 'px'
+			},
+			getListAttrItemHeight() {
+				return uni.upx2px(this.listAttr.itemHeight || 80) + 'px'
+			},
+			getListAttrItemFontSize() {
+				return uni.upx2px(this.listAttr.itemFontSize || 28) + 'px'
+			},
+			getListAttrItemColor() {
+				return this.listAttr.itemColor || '#333'
+			},
+			getListAttrItemBackgroundColor() {
+				return this.listAttr.itemBackgroundColor || ''
+			},
+			getListAttrItemBorderBottom() {
+				return this.listAttr.itemBorderBottom || '1px solid rgba(0, 0, 0, 0.1)'
+			},
+			getListAttrItemMargin() {
+				return 0 + '' + uni.upx2px(this.listAttr.itemFontSize || 20) + 'px'
+			},
+			getNavAttrbackgroundColor() {
+				return this.navAttr.backgroundColor || 'rgba(0, 0, 0, 0.4)'
+			},
+			getNavAttrColor() {
+				return this.navAttr.color || '#333'
+			},
+			getNavAttrActiveColor() {
+				return this.navAttr.activeColor || '#333'
+			},
+			getNavAttrFontSize() {
+				return uni.upx2px(this.navAttr.fontSize || 28) + 'px'
+			},
+			getNavAttrItemPadding() {
+				if (this.navAttr.itemPadding) {
+					let temp = ''
+					const arr = this.navAttr.itemPadding.split(' ')
+					arr.forEach((item, index) => {
+						temp += uni.upx2px(item) + 'px' + ' '
+					})
+					return temp
+				} else {
+					return uni.upx2px(4) + 'px' + ' ' + uni.upx2px(8) + 'px'
+				}
+			},
+			getNavAttrBorderRadius() {
+				return uni.upx2px(this.navAttr.borderRadius || 100) + 'px'
+			},
+			getNavAttrPadding() {
+				if (this.navAttr.itemPadding) {
+					let temp = ''
+					const arr = this.navAttr.padding.split(' ')
+					arr.forEach((item, index) => {
+						temp += uni.upx2px(item) + 'px' + ' '
+					})
+					return temp
+				} else {
+					return uni.upx2px(0) + 'px' + ' ' + uni.upx2px(20) + 'px'
+				}
+			}
+		},
+		methods: {
+			scrollSelect(index) {
+				clearTimeout(this.Timer)
+				let disHeight = !!this.recenCity ? (this.iphoneModel ? 220 : 175) : (this.iphoneModel ? 115 : 95);
+				this.scrollTop = this.disArray[index] + disHeight
+				this.activeIndex = index
+				this.fadeFlag = true
+				this.Timer = setTimeout(() => {
+					this.fadeFlag = false
+				}, 1000)
+			},
+			scroll(e) {
+				const length = this.disArray.length
+				for (let i = 0; i < length; i++) {
+					if (this.disArray[i] < e.detail.scrollTop && this.disArray[i + 1] > e.detail.scrollTop) {
+						this.activeIndex = i
+					}
+				}
+			},
+			getDisArray(listData) {
+				let _this = this,
+					dis = _this.disArray[0];
+				if (!!listData && listData.length > 0) {
+					listData.forEach((item, index) => {
+						const length = _this.disArray.length - 1;
+						dis = _this.disArray[length] + (parseInt(_this.getListAttrTitleHeight) + parseInt(_this.getListAttrItemHeight) *
+							item.list.length);
+						_this.disArray.push(dis)
+					})
+				}
+			},
+			cityTaptime(curCityInfo) {
+				let _this = this,
+					currentCity = _this.currentCity,
+					timestamp = (new Date()).getTime();
+				if (currentCity.ad_info.adcode !== curCityInfo.data.areaid) {
+					uni.setStorageSync('cityTimestamp', timestamp)
+				}
+			},
+			chooseItem(item) {
+				// debugger
+				let _this = this,
+					locationType = _this.locationType,
+					pages = getCurrentPages(),
+					navType = pages.length > 1 ? 'reLaunch' : 'rediRect',
+					locationArray = uni.getStorageSync('locationArray'),
+					newLocationArray = [];
+				_this.$emit('chooseItem', item);
+				uni.removeStorageSync('curLoction');
+				if (!!item.location) {
+					item.lat = item.location.lat;
+					item.lng = item.location.lng;
+					item.name = item.city || item.ad_info.city;
+					item.isCurrentAddress = "1";
+				}
+				if (locationType == '1') {
+					App.navigationTo({
+						url: 'pages/subPages/city/selectAddress?' + App.urlEncode(item)
+					})
+				} else {
+					if (locationType === 0) {
+						let cityObj = {
+							ad_info: {
+								adcode: item.id || item.adcode || item.ad_info.adcode,
+								city: item.name
+							},
+							location: {
+								lat: item.lat,
+								lng: item.lng
+							},
+							title: item.name
+						};
+						App.getAreaId(cityObj.location, "", cityObj.ad_info.adcode, (options) => {
+							console.log(options, '1')
+							
+							uni.setStorageSync('agencyData', options.data)
+							_this.cityTaptime(options)
+							App.navigationTo({
+								url: 'pages/mainPages/index/index',
+								navType: navType
+							})
+						})
+						if (locationArray) {
+							let haveArray = locationArray.filter(cityitem => (cityitem.ad_info ? cityitem.ad_info.city : cityitem.name) ===
+								item.name).length !== 0;
+							if (haveArray) {
+								return
+							} else {
+								newLocationArray.push(cityObj, ...locationArray);
+								uni.setStorageSync(`locationArray${App.siteInfo.uniacid}`, newLocationArray);
+							}
+						} else {
+							newLocationArray.push(cityObj);
+							uni.setStorageSync(`locationArray${App.siteInfo.uniacid}`, newLocationArray);
+						}
+					}
+				}
+			}
+		},
+		mounted() {
+			
+			uni.onWindowResize((res) => {
+				this.heightFixed = res.size.windowHeight;
+			})
+		},
+		watch: {
+			listData(newValue, oldValue) {
+				this.getDisArray(newValue)
+			},
+			isFixed(newValue, oldValue) {
+
+				if (newValue) {
+					this.marginT = '45%'
+
+				} else {
+					this.marginT = '75%'
+				}
+
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.select-page {
+		width: 100%;
+		box-sizing: border-box;
+		position: relative;
+		height: 100%;
+
+		.scroll-list-panel {
+			height: inherit;
+
+			.title {
+				display: flex;
+				align-items: center;
+				box-sizing: border-box;
+			}
+
+			.list {
+				box-sizing: border-box;
+				margin: 0 0 0 30upx;
+
+				text {
+					display: flex;
+					align-items: center;
+					box-sizing: border-box;
+
+					&:last-child {
+						border: none !important;
+					}
+				}
+			}
+		}
+
+		.now-sort {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			display: flex;
+			align-items: center;
+			box-sizing: border-box;
+		}
+
+		.now-letter {
+			font-size: 160upx;
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			transform: translate3d(-50%, -50%, 0);
+			opacity: 0;
+
+			&.fadeIn {
+				animation: fade 1s linear 0ms;
+			}
+		}
+
+		.letter-nav {
+			width: 100upx;
+			position: absolute;
+			transform: translateY(-50%);
+			right: 0;
+			display: flex;
+			flex-direction: column;
+			text-align: center;
+			z-index: 99999;
+		}
+	}
+
+	.base-wrap-history {
+		overflow: hidden;
+		padding: 0 50upx 0 20upx;
+
+		.title {
+			display: flex;
+			align-items: center;
+			box-sizing: border-box;
+			font-size: 28upx;
+			color: rgb(153, 153, 153);
+			height: 60upx;
+			// background: rgb(255, 255, 255);
+		}
+
+		.panel {
+			// display: inline-block;
+			display: flex;
+			flex-wrap: wrap;
+
+			.current-item {
+				background-color: #FFD940 !important;
+			}
+
+			// justify-content: space-between;
+			// text-align: justify;
+			.history-icon {
+				font-size: 30upx;
+				margin-right: 10upx;
+				color: #333333;
+			}
+
+			.item {
+				display: inline-block;
+				align-items: center;
+				text-align: center;
+				// justify-content: center;
+				width: 160upx;
+				height: 60upx;
+				line-height: 60upx;
+				overflow: hidden;
+				font-size: 28upx;
+				border-radius: 60upx;
+				padding: 0 20upx;
+				margin-top: 20upx;
+				color: rgb(51, 51, 51);
+				margin-right: 8upx;
+				background-color: #f6f6f6;
+			}
+
+			&::after {
+				display: block;
+				content: '';
+				width: 200upx;
+				border: 1px solid transparent;
+			}
+		}
+	}
+
+	@keyframes fade {
+		0% {
+			opacity: 0;
+			display: block !important;
+		}
+
+		50% {
+			opacity: 0.4;
+		}
+
+		100% {
+			display: none;
+			opacity: 0 !important;
+		}
+	}
+
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		background-color: transparent;
+	}
+</style>
diff --git a/components/template/live.vue b/components/template/live.vue
new file mode 100644
index 0000000..295b441
--- /dev/null
+++ b/components/template/live.vue
@@ -0,0 +1,515 @@
+<!-- @liveList 直播数据列表 -->
+<template>
+	<view class="container">
+		<view class="list-main padding-box">
+			<!-- 样式1 -->
+			<view class="live-list-one" v-if="false">
+				<view class="live-list-one-main p-r" :style="{'background-image':'url('+livebg+')'}">
+					<!-- 直播状态 -->
+					<view class="live-status">
+						<!-- 直播中 -->
+						<block>
+							<view class="live-style-1 dis-flex flex-y-center">
+								<view class="live-style-1-content dis-flex flex-y-center">
+									<image class="live-statusBg-1" :src="imgfixUrls + 'live/live1.png'"></image>
+									<view class="live-intro f-24 col-f">直播中</view>
+								</view>
+								<view class="watch-number">
+									<text class="col-f f-24">8455观看</text>
+								</view>
+							</view>
+						</block>
+						<!-- 预告 -->
+						<block v-if="false">
+							<view class="live-style-2 dis-flex flex-y-center">
+								<image class="live-statusBg-2" :src="imgfixUrls + 'live/live2.png'"></image>
+								<view class="live-intro f-24 col-f">预告</view>
+							</view>
+						</block>
+						<!-- 结束 -->
+						<block v-if="false">
+							<view class="live-style-3 dis-flex flex-y-center">
+								<image class="live-statusBg-3" :src="imgfixUrls + 'live/live3.png'"></image>
+								<view class="live-intro f-24 col-f">直播回看</view>
+							</view>
+						</block>
+					</view>
+					<view class="live-list-one-detail">
+						<!-- 直播人头像昵称 -->
+						<view class="live-user dis-flex flex-y-center">
+							<view class="live-userAvatar" :style="{'background-image':'url('+livebg+')'}"></view>
+							<view class="f-24 col-f">名扬天下</view>
+						</view>
+						<view class="live-title onelist-hidden f-28 col-f m-top-btm30">今晚很嗨烤鱼正儿八经的...</view>
+						<view class="live-goods dis-flex flex-y-center">
+							<view class="goodsItem p-r" v-for="(item,index) in 3" :style="{'background-image':'url('+livebg+')'}">
+								<view class="goodsItem-price col-f f-24">¥12.0</view>
+							</view>
+						</view>
+					</view>
+					<view class="live-play" :style="{'background-image':'url('+imageRoot+'live_play.png)'}"></view>
+				</view>
+			</view>
+			<!-- 样式2 -->
+			<view class="live-list-two dis-flex flex-warp flex-x-between">
+				<view class="live-left">
+					<view class="live-list-Item m-btm20" v-for="(item,index) in newLivelist" :key="index" v-if="index%2==0">
+						<view class="live-bg p-r" :style="{'background-image':'url('+item.cover_img+')'}" @click="navgateLive(item.roomid)">
+							<!-- 直播状态 -->
+							<view class="live-status">
+								<!-- 直播中 -->
+								<block v-if="item.live_status===101">
+									<view class="live-style-1 dis-flex flex-y-center">
+										<view class="live-style-1-content dis-flex flex-y-center">
+											<image class="live-statusBg-1" :src="imgfixUrls + 'live/live1.png'"></image>
+											<view class="live-intro f-24 col-f">直播中</view>
+										</view>
+										<!-- <view class="watch-number">
+										<text class="col-f f-24">8455观看</text>
+									</view> -->
+									</view>
+								</block>
+								<!-- 预告 -->
+								<block v-if="item.live_status===102">
+									<view class="live-style-2 dis-flex flex-y-center">
+										<image class="live-statusBg-2" :src="imgfixUrls + 'live/live2.png'"></image>
+										<view class="live-intro f-24 col-f">预告</view>
+									</view>
+								</block>
+								<!-- 结束 -->
+								<block v-if="item.live_status===103">
+									<view class="live-style-3 dis-flex flex-y-center">
+										<image class="live-statusBg-3" :src="imgfixUrls + 'live/live3.png'"></image>
+										<view @click.stop="backSee(item)" class="live-intro f-24 col-f">直播回看</view>
+									</view>
+								</block>
+							</view>
+							<!-- 直播人头像昵称 -->
+							<view class="live-user dis-flex flex-y-center">
+								<view class="live-userAvatar" :style="{'background-image':'url('+item.anchor_img+')'}"></view>
+								<view class="f-24 col-f">{{item.anchor_name}}</view>
+							</view>
+						</view>
+						<view class="live-content b-f">
+							<view class="live-title onelist-hidden f-28 col-3">{{item.name}}</view>
+							<view class="live-goodsDetail dis-flex flex-x-between flex-y-center m-top20" v-if="!!item.goods && !!item.goods.length>0"
+							 @click="navgateGoods(item.goods[0]['url'])">
+								<view class="goodsContent">
+									<view class="goods-title onelist-hidden col-9 f-24">{{item.goods[0]['name']}}</view>
+									<view class="goods-price col-3 f-24">¥{{ item.goods[0].price_type == '2'? (item.goods[0]['price'] + '~' +  item.goods[0]['price2']):item.goods[0]['price']}}
+									<text style="font-size: 20upx;color: #999999;text-decoration:line-through;padding-left: 10upx;" v-if="item.goods[0].price_type == '3'">{{item.goods[0]['price2']}}</text></view>
+								</view>
+								<view class="goodsImage" :style="{'background-image':'url('+item.goods[0]['cover_img']+')'}"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="live-right">
+					<view class="live-list-Item m-btm20" v-for="(item,index) in newLivelist" :key="index" v-if="index%2==1">
+						<view class="live-bg p-r" :style="{'background-image':'url('+item.cover_img+')'}" @click="navgateLive(item.roomid)">
+							<!-- 直播状态 -->
+							<view class="live-status">
+								<!-- 直播中 -->
+								<block v-if="item.live_status===101">
+									<view class="live-style-1 dis-flex flex-y-center">
+										<view class="live-style-1-content dis-flex flex-y-center">
+											<image class="live-statusBg-1" :src="imgfixUrls + 'live/live1.png'"></image>
+											<view class="live-intro f-24 col-f">直播中</view>
+										</view>
+										<!-- <view class="watch-number">
+										<text class="col-f f-24">8455观看</text>
+									</view> -->
+									</view>
+								</block>
+								<!-- 预告 -->
+								<block v-if="item.live_status===102">
+									<view class="live-style-2 dis-flex flex-y-center">
+										<image class="live-statusBg-2" :src="imgfixUrls + 'live/live2.png'"></image>
+										<view class="live-intro f-24 col-f">预告</view>
+									</view>
+								</block>
+								<!-- 结束 -->
+								<block v-if="item.live_status===103">
+									<view class="live-style-3 dis-flex flex-y-center">
+										<image class="live-statusBg-3" :src="imgfixUrls + 'live/live3.png'"></image>
+										<view class="live-intro f-24 col-f" @click.stop="backSee(item)">直播回看</view>
+									</view>
+								</block>
+							</view>
+							<!-- 直播人头像昵称 -->
+							<view class="live-user dis-flex flex-y-center">
+								<view class="live-userAvatar" :style="{'background-image':'url('+item.anchor_img+')'}"></view>
+								<view class="f-24 col-f">{{item.anchor_name}}</view>
+							</view>
+						</view>
+						<view class="live-content b-f">
+							<view class="live-title onelist-hidden f-28 col-3">{{item.name}}</view>
+							<view class="live-goodsDetail dis-flex flex-x-between flex-y-center m-top20" v-if="!!item.goods && !!item.goods.length>0"
+							 @click="navgateGoods(item.goods[0]['url'])">
+								<view class="goodsContent">
+									<view class="goods-title onelist-hidden col-9 f-24">{{item.goods[0]['name']}}</view>
+									<view class="goods-price col-3 f-26">¥{{ item.goods[0].price_type == '1'? item.goods[0]['price']:item.goods[0].price_type == '2'?`${item.goods[0]['price']} ~ ${item.goods[0]['price2']}`:item.goods[0]['price']}}
+									<text style="font-size: 20upx;color: #999999;text-decoration:line-through;padding-left: 10upx;" v-if="item.goods[0].price_type == '3'">{{item.goods[0]['price2']}}</text>
+									</view>
+								</view>
+								<view class="goodsImage" :style="{'background-image':'url('+item.goods[0]['cover_img']+')'}"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 视频 -->
+		<PopManager :show="videoshow" @clickmask="videoshow = false" type="center">
+			<view  v-if="videoshow" style="width: 100vw;height: 100vh;position: relative;">
+				<video id="myvideo" :src="videolint[videoindex].media_url" @fullscreenchange="videoControl"  style="width: 100%;height: 100%;"
+				  @click.stop="" :show-fullscreen-btn="false" autoplay ></video>
+				 <view  style="position: absolute;left: 30upx;top: 30upx;color: #ffffff;padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(255,255,255,0.3);" @click="cloce">
+				 	<text class="iconfont icon-roundleftfill" style="font-size: 36upx;"></text>
+					<text class="f-36">返回</text>
+				 </view>
+				 <view class="dis-flex" style="width: 100%;position: absolute;top: 50%;transform: translateY(-50%);">
+					 <view class="flex-box ">
+						 <view  v-if="videoindex == 0 && videopage == 1">
+						 	
+						 </view>
+					 	<view class="dis-il-block t-c col-f f-40" style="border-radius: 0 60upx 60upx 0;padding: 20upx;" 
+						v-else
+						@click="topvideo">
+					 		<text class="iconfont icon-back"></text>
+					 	</view>
+					 </view>
+				 	<view class="flex-box">
+						<view  v-if="videoindex == (videolint.length - 1) && videopage == videototal">
+							
+						</view>
+				 		<view class="dis-il-block t-c col-f f-40" style="border-radius: 60upx 0 0 60upx;float: right;padding: 20upx;" 
+						v-else
+						@click="downvideo">
+				 			<text class="iconfont icon-right"></text>
+				 		</view>
+				 	</view>
+					
+				 </view>
+			</view>
+		</PopManager>
+	</view>
+	
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	import PopManager from '@/components/template/PopManager';
+	export default {
+		components:{
+			PopManager
+		},
+		data() {
+			return {
+				img:'',
+				videoshow:false,
+				videoContext:null,
+				videolint:[],
+				videoindex:0,
+				videopage:1,
+				videototal:0,
+				roomid:0
+			}
+		},
+		mounted() {
+			this.img = this.imgfixUrl;
+			this.videoContext = uni.createVideoContext('myvideo');
+			this.videoContext.requestFullScreen();
+		},
+		props: {
+			liveList: {
+				type: Array,
+				default: function() {
+					return []
+				}
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			newLivelist() {
+				return this.liveList
+			}
+		},
+		methods: {
+			cloce(){
+				this.videoshow = false;
+				this.videopage = 1;
+				this.videoindex = 0;
+			},
+			downvideo(){
+				if(this.videoindex == this.videolint.length - 1){
+					if(this.videototal == this.videopage) return;
+					this.videopage++;
+					this.videoindex = 0;
+					this.getpagelive()
+				}else{
+					this.videoindex++;
+				}
+			},
+			topvideo(){
+				if(this.videoindex == 0){
+					// if(this.videopage == 1) return;
+					this.videopage--;
+					this.videoindex = 0;
+					this.getpagelive();
+				}else{
+					this.videoindex--;
+				}
+				
+			},
+			getpagelive(){
+				let _this = this,
+					requestData = {
+						page:this.videopage,
+						room_id:this.roomid
+					};
+				App._post_form('&p=wxapp&do=playBack', requestData, res => {
+					this.videolint  = res.data.live_replay;
+				}) 
+			},
+			videoControl(e){
+				console.log(e)
+				if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+					this.videoContext.play();
+				}else{
+					//停止播放
+					this.videoContext.pause();
+				}
+			},
+			navgateLive(room_id) {
+				App.navigationTo({
+					url: `pages/subPages/livePlayer/livePlayer?id=${room_id}`
+				})
+			},
+			navgateGoods(url) {
+				App.navigationTo({
+					url
+				})
+			},
+			backSee(item){
+				if(item.live_status == 103){
+					let _this = this,
+						requestData = {
+							page:this.videopage,
+							room_id:item.roomid
+						};
+						this.roomid = item.roomid;
+					App._post_form('&p=wxapp&do=playBack', requestData, res => {
+						this.videototal = res.data.total_page;
+						this.videolint  = res.data.live_replay;
+					}) 
+					this.videoshow = true;
+					
+					    // 获取当前视频id
+					    // let currentId = e.currentTarget.dataset.id
+					    // uni.createVideoContext获取视频上下文对象
+						this.videoContext.requestFullScreen({
+							direction:0
+						})
+					   
+				}
+				// uni.setStorageSync('coverImg',coverImg);
+				// App.navigationTo({
+				// 	url: `pages/subPages/liveBack/liveBack?id=${roomid}&name=${name}&anchor_name=${anchor_name}`
+				// })
+			}
+		},
+		onLoad() {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.live-list-one {
+		padding: 20upx 0;
+
+		.live-list-one-main {
+			width: 100%;
+			height: 690upx;
+			background-size: 100% 690upx;
+			background-repeat: no-repeat;
+			border-radius: 10upx;
+		}
+
+		.live-play {
+			width: 70upx;
+			height: 70upx;
+			background-size: 70upx 70upx;
+			background-repeat: no-repeat;
+			position: absolute;
+			left: 50%;
+			top: 40%;
+			transform: translate(-50%);
+		}
+
+		.live-list-one-detail {
+			position: absolute;
+			left: 20upx;
+			bottom: 30upx;
+
+			.live-userAvatar {
+				width: 30upx;
+				height: 30upx;
+				background-repeat: no-repeat;
+				background-size: 30upx 30upx;
+				border: 1px solid rgba(249, 249, 249, 1);
+				border-radius: 50%;
+				margin-right: 8upx;
+			}
+
+			.live-title {
+				width: 500upx;
+			}
+
+			.live-goods {
+				.goodsItem {
+					width: 120upx;
+					height: 120upx;
+					border-radius: 8upx;
+					margin-right: 24upx;
+					background-size: 120upx 120upx;
+					background-repeat: no-repeat;
+
+					.goodsItem-price {
+						position: absolute;
+						left: 10upx;
+						bottom: 10upx;
+					}
+				}
+			}
+		}
+	}
+
+	.live-list-two {
+		.live-list-Item {
+			.live-bg {
+				width: 334upx;
+				height: 334upx;
+				border-radius: 10upx 10upx 0 0;
+				background-repeat: no-repeat;
+				background-size: cover;
+				background-position: center;
+			}
+
+			.live-content {
+				padding: 20upx;
+				border-radius: 0 0 10rpx 10rpx;
+				
+				.live-title {
+					width: 294upx;
+				}
+			}
+
+			.live-goodsDetail {
+				.goodsContent {
+					.goods-title {
+						width: 200upx;
+					}
+				}
+
+				.goodsImage {
+					width: 64upx;
+					height: 64upx;
+					border-radius: 8upx;
+					background-repeat: no-repeat;
+					background-size: 64upx 64upx;
+				}
+			}
+
+			.live-user {
+				position: absolute;
+				left: 20upx;
+				bottom: 20upx;
+
+				.live-userAvatar {
+					width: 30upx;
+					height: 30upx;
+					background-repeat: no-repeat;
+					background-size: 30upx 30upx;
+					border: 1px solid rgba(249, 249, 249, 1);
+					border-radius: 50%;
+					margin-right: 8upx;
+				}
+			}
+		}
+	}
+
+	.live-status {
+		position: absolute;
+		left: 20upx;
+		top: 20upx;
+	}
+
+	.live-intro {
+		transform: scale(.9);
+	}
+
+	.live-style-1 {
+		.live-style-1-content {
+			width: 114upx;
+			height: 22upx;
+			line-height: 22upx;
+			background: linear-gradient(90deg, rgba(255, 68, 68, 1), rgba(253, 113, 55, 1));
+			border-radius: 6upx 0 0 6upx;
+			padding: 6upx;
+
+			.live-statusBg-1 {
+				width: 30upx;
+				height: 30upx;
+				display: block;
+				margin-right: 6upx;
+			}
+		}
+
+		.watch-number {
+			height: 22upx;
+			line-height: 22upx;
+			background-color: rgba(0, 0, 0, .2);
+			border-radius: 6upx;
+			padding: 6upx;
+
+			>text {
+				transform: scale(.9);
+				display: block;
+			}
+		}
+	}
+
+	.live-style-2 {
+		height: 22upx;
+		line-height: 22upx;
+		background: linear-gradient(90deg, rgba(67, 221, 107, 1), rgba(30, 217, 79, 1));
+		border-radius: 6upx;
+		padding: 6upx;
+
+		.live-statusBg-2 {
+			width: 30upx;
+			height: 30upx;
+			display: block;
+			margin-right: 6upx;
+		}
+	}
+
+	.live-style-3 {
+		height: 22upx;
+		line-height: 22upx;
+		background: linear-gradient(90deg, rgba(139, 139, 139, 1), rgba(214, 214, 214, 1));
+		border-radius: 6upx;
+		padding: 6upx;
+
+		.live-statusBg-3 {
+			width: 30upx;
+			height: 30upx;
+			display: block;
+			margin-right: 6upx;
+		}
+	}
+</style>
diff --git a/components/template/loading.vue b/components/template/loading.vue
new file mode 100644
index 0000000..98cb686
--- /dev/null
+++ b/components/template/loading.vue
@@ -0,0 +1,51 @@
+<template>
+  <view>
+    <view class="loading">
+      <view class="loading-img-s1">
+        <view class="loading-img">
+          <image class="image" :src="imgfixUrls + 'loading.svg'" mode="aspectFill" v-if="!white"></image>
+          <image class="image" :src="imgfixUrls + 'loading1.svg'" mode="aspectFill" v-if="white"></image>
+        </view>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  props: ['white'],
+  data(){
+	  return{
+		 img:'' 
+	  }
+  },
+  mounted() {
+  	this.img = this.imgfixUrl;
+  }
+}
+</script>
+
+<style scoped>
+.loading {
+  text-align: center;
+  margin: 0;
+  padding: 0;
+  position: fixed;
+  z-index: 99999;
+}
+.loading-img-s1 {
+  height: 40px;
+  line-height: 40px;
+	padding: 10px 0;
+  overflow: hidden;
+}
+.loading-img {
+  width: 140px;
+  height: 40px;
+  display: inline-block;
+}
+.loading .image {
+  width: 100%;
+  height: 100%;
+}
+</style>
diff --git a/components/template/loadlogo.vue b/components/template/loadlogo.vue
new file mode 100644
index 0000000..29d210f
--- /dev/null
+++ b/components/template/loadlogo.vue
@@ -0,0 +1,53 @@
+<template>
+	<view>
+		<view class="loadlogo-container">
+			<view class="loadlogo">
+				<image class="image" :src="loadImage || (imgfixUrls + 'loadlogo.svg')" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		mounted() {
+		},
+		computed: {
+			loadImage() {
+				let _this = this,
+					newLoadingImg = _this.$store.state.appInfo.loading;
+				return !!newLoadingImg ? newLoadingImg :'' 
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.loadlogo-container {
+		width: 100%;
+		height: 100%;
+		background-color: #FFFFFF;
+		position: fixed;
+		z-index: 999;
+	}
+
+	.loadlogo {
+		width: 80px;
+		height: 80px;
+		/* margin: -60px 0 0 -60px; */
+		position: fixed;
+		top: 50%;
+		left: 50%;
+		transform: translate(-50%, -50%);
+	}
+
+	.loadlogo .image {
+		width: 100%;
+		height: 100%;
+	}
+</style>
diff --git a/components/template/loadmore.vue b/components/template/loadmore.vue
new file mode 100644
index 0000000..d19d6bc
--- /dev/null
+++ b/components/template/loadmore.vue
@@ -0,0 +1,79 @@
+<!-- 加载更多样式组件 -->
+<!-- 传isMore : true 加载完成  false 加载更多 -->
+<template>
+	<view class="loadMore-box" :style="{backgroundColor: bgc}">
+		<block v-if="!isMore">
+			<view class="more-status dis-flex flex-y-center flex-x-center">
+				<view class="loadingImg m-right10" :style="{'background-image':'url('+loadingSrc+')'}"></view>
+				<view class="f-28 col-3">正在加载</view>
+			</view>
+		</block>
+		<block v-if="isMore">
+			<view class="not-more-status dis-flex flex-y-center flex-x-center">
+				<view class="cut-off cut-off-left"></view>
+				<view class="not-moreTitle col-9 f-28 m-left-right-20" style="flex: 0.35;text-align: center;">{{languageStatus!=1?'暂无数据':'기록이 없습니다'}}</view>
+				<view class="cut-off cut-off-right"></view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		computed: {
+			loadingSrc() {
+				return this.imageRoot + 'loadmore.svg'
+			}
+		},
+		props: {
+			isMore: {
+				type: Boolean,
+				default: function() {
+					return false
+				}
+			},
+			bgc: {
+				type: String,
+				default: '#f8f8f8'
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.loadMore-box{
+		background-color: #ffffff;
+	}
+	.more-status {
+		.loadingImg {
+			width: 38upx;
+			height: 38upx;
+			background-size: 38upx 38upx;
+			background-repeat: no-repeat;
+			animation: loading 2s linear 2s infinite;
+		}
+	}
+
+	@keyframes loading {
+		from {
+			transform: rotate(0deg);
+		}
+
+		to {
+			transform: rotate(360deg);
+		}
+	}
+
+	.not-more-status {
+		.cut-off {
+			flex: 0.3;
+			height: 2upx;
+			background-color: #EEEEEE;
+		}
+	}
+</style>
diff --git a/components/template/myserItem.vue b/components/template/myserItem.vue
new file mode 100644
index 0000000..af5a808
--- /dev/null
+++ b/components/template/myserItem.vue
@@ -0,0 +1,239 @@
+<template>
+	<view class="muserItem" v-if="load" @click="navlink(serItem.id)">
+		<view class="imgbnox">
+			<image :src="serItem.logo" class="logo" mode=""></image>
+			<view class="stateTag" v-if="states" :style="{background:serItem.status == 0?'#cccccc':serItem.status == 5?'#ff4444':serItem.status == 6?'#72AAFD':'linear-gradient(270deg, #FDAD28 0%, #FECE02 100%)'}">
+				{{serItem.status == 0?'已下架':serItem.status == 5?'审核中':serItem.status == 6?'已驳回':'销售中'}}
+			</view>
+		</view>
+		
+		<view class="content">
+			<view class="f-32 col-3 f-w">
+				{{serItem.title || serItem.name}}
+			</view>
+			<view class="tags" v-if="serItem.catearray">
+				<view class="tag-item" v-for="(item,index) in serItem.catearray" :key="index">
+					{{item}}
+				</view>
+			</view>
+			<view class="tags" v-else>
+				<view class="tag-item" v-for="(item,index) in serItem.label" :key="index">
+					{{item}}
+				</view>
+			</view>
+			<view class="prices f-30  c-ff4444">
+				<text class="c-ff4444 f-24 f-w"></text>
+				<text class="f-w">{{serItem.price}}</text>
+				<text class="f-26 col-9" style="padding-left: 20upx;">销量:</text>
+				<text class="f-26 col-9">{{serItem.salenum}}</text>
+			</view>
+		</view>
+		<view class="more" @click="openbtn" v-if="states">
+			<image :src="imgfixUrls + 'homemakingImg/gengduo.png'" mode="" ></image>
+		</view>
+		<view class="shade" v-if="serItem.checked">
+			<view class="flex-box" @click="editingService" v-if="serItem.status != 3">
+				<view class="shadeItem">
+					<image :src="imgfixUrls + 'homemakingImg/bianji.png'" mode=""></image>
+					<view class=" f-24" style="padding-top: 20upx;color: #dddddd;">
+						编辑
+					</view>
+				</view>
+			</view>
+			<view class="flex-box" v-if="serItem.status == 0" @click="state(1)">
+				<view class="shadeItem">
+					<image :src="imgfixUrls + 'homemakingImg/shangjia.png'" mode=""></image>
+					<view class=" f-24" style="padding-top: 20upx;color: #dddddd;">
+						上架
+					</view>
+				</view>
+			</view>
+			<view class="flex-box" v-if="serItem.status == 1 || serItem.status == 5" @click="state(2)">
+				<view class="shadeItem">
+					<image :src="imgfixUrls + 'homemakingImg/xiajia.png'" mode=""></image>
+					<view class=" f-24" style="padding-top: 20upx;color: #dddddd;">
+						下架
+					</view>
+				</view>
+			</view>
+			<view class="flex-box" @click="state(3)">
+				<view class="shadeItem">
+					<image :src="imgfixUrls + 'homemakingImg/shanchu.png'" mode=""></image>
+					<view class=" f-24" style="padding-top: 20upx;color: #dddddd;">
+						删除
+					</view>
+				</view>
+			</view>
+			<view class="flex-box" v-if="serItem.status == 1">
+				<view class="shadeItem" @click="sher">
+					<image :src="imgfixUrls + 'homemakingImg/tuiguang.png'" mode=""></image>
+					<view class=" f-24" style="padding-top: 20upx;color: #dddddd;">
+						推广
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		data(){
+			return{
+				load:true
+			}
+		},
+		props:{
+			serItem:{
+				type:Object,
+				default:{}
+			},
+			type:{
+				type:Number,
+				default:1
+			},
+			states:{
+				type:Boolean,
+				default:true
+			}
+		},
+		methods:{
+			navlink(id){
+				if(this.states) return
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=" + id
+				});
+			},
+			sher(){
+				App.navigationTo({
+					url: `pages/mainPages/poster/poster?id=${this.serItem.id}&type=16`
+				})
+			},
+			state(type){
+				App.showError(
+					`是否${type == 1?'上架':type==2?'下架':'删除'}此项目?`,
+					data => {
+						if (data.confirm) {
+							App._post_form(
+								`&p=housekeep&do=serviceUpdate`,
+								{doStatus:type,id:this.serItem.id},
+								res => {
+									this.$emit('getMyserList',false,1);
+								},
+								false,
+								() => {}
+							);
+						}
+					},
+					true
+				);
+				
+			},
+			openbtn(){
+				this.serItem.checked =true;
+				// debugger
+				this.load = !this.load
+				this.load = !this.load
+				this.$emit('openbtn',this.serItem.id)
+			},
+			editingService(){
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/pubService/pubService?id=" + this.serItem.id + '&type=' +this.type + '&arid=' + this.serItem.objid
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.muserItem{
+		padding: 20upx;
+		background-color: #FFFFFF;
+		border-radius: 20upx;
+		display: flex;
+		// margin-bottom: 20upx;
+		position: relative;
+		.shade{
+			width: 100%;
+			height: 100%;
+			position: absolute;
+			left: 0;
+			top: 0;
+			display: flex;
+			border-radius: 20upx;
+			background-color: rgba(0,0,0,0.3);
+			.shadeItem{
+				padding-top: 40upx;
+				margin: auto;
+				text-align: center;
+				image{
+					width: 66upx;
+					height: 66upx;
+					
+				}
+			}
+		}
+		.imgbnox{
+			width: 160upx;
+			height: 160upx;
+			border-radius: 20upx;
+			position: relative;
+			margin-right: 30upx;
+			.logo{
+				width: 160upx;
+				height: 160upx;
+				border-radius: 20upx;
+			}
+			.stateTag{
+				width: 100upx;
+				height: 40upx;
+				
+				opacity: 1;
+				border-radius: 20upx 0upx 20upx 0upx;
+				position: absolute;
+				left: 0;
+				top: 0;
+				font-size: 24upx;
+				color: #FFFFFF;
+				line-height: 40upx;
+				text-align: center;
+			}
+		}
+		.content{
+			flex: 1;
+			.tags{
+				padding: 10upx 0 20upx;
+				height: 42upx;
+				overflow: hidden;
+				.tag-item{
+					padding: 0 10upx;
+					height: 32upx;
+					background-color: #EEEEEE;
+					color: #999999;
+					font-size: 20upx;
+					border-radius: 6upx;
+					line-height: 32upx;
+					text-align: center;
+					display: inline-block;
+					margin-right: 10upx;
+				}
+			}
+			.prices{
+				padding-top: 10upx;
+			}
+		}
+		.more{
+			width: 50upx;
+			height: 160upx;
+			position: relative;
+			image{
+				width: 50upx;
+				height: 50upx;
+				position: absolute;
+				bottom: 0;
+				left: 0;
+			}
+		}
+	}
+</style>
diff --git a/components/template/navBar.vue b/components/template/navBar.vue
new file mode 100644
index 0000000..706242e
--- /dev/null
+++ b/components/template/navBar.vue
@@ -0,0 +1,127 @@
+<template>
+	<view class="navBar" :style="{'padding-bottom':isPadding?'20px':''}">
+		<view v-for="(item,index) in navList" @click="go(item.url)">
+			<view><image :src="imgfixUrls +item.img" /></view>
+			<span :class="tabBarAct==index?'check':'nCheck'">{{item.label}}</span>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+export default {
+	props:{
+		tabBarAct: {
+			type: Number,
+			default: function() {
+				return 0
+			}
+		},
+	},
+	data(){
+		return {
+			isPadding:null,
+			href:'',
+			navList:[
+				{
+					label:'首页',
+					img:'merchant/nav1.png',
+					url:'pages/subPages/merchant/merchantHome/merchantHome'
+				},
+				{
+					label:'商品',
+					img:'merchant/nav2.png',
+					url:'pages/subPages/merchant/merchantOrder/merchantOrder'
+				},
+				{
+					label:'消息',
+					img:'merchant/nav3.png',
+					url:'pages/subPages/merchant/merchantMsg/merchantMsg'
+				},
+				{
+					label:'订单',
+					img:'merchant/nav4.png',
+					url:'pages/subPages/merchant/merchantOrderList/merchantOrderList'
+				},
+				{
+					label:'我的',
+					img:'merchant/nav5.png',
+					url:'pages/subPages/merchant/merchantUerCenter/merchantUerCenter'
+				},
+			],
+			img:''
+		};
+	},
+	mounted() {
+		let _this=this
+		this.img = this.imgfixUrl;
+		uni.getSystemInfo({
+			success(res) {
+				let model = res.model,
+					iphoneModel = ["iPhone10,3", "iPhone10,6", "iPhone11,8", "iPhone11,2", "iPhone11,6"];
+				_this.isPadding = iphoneModel.includes(model) || model.indexOf("iPhone X") !== -1 || model.indexOf("iPhone12") !== -1;
+			}
+		});
+	},
+	methods: {
+		go(url){
+			let _this=this
+			App.navigationTo({
+				url:url,
+				navType:'rediRect'
+			})
+		}
+	},
+	computed: {
+		
+	}
+};
+</script>
+
+<style lang="less">
+	.check{
+		display: inline-block;
+		font-size:20upx;
+		color:rgba(44,111,255,1) !important;
+	}
+	.nCheck{
+		display: inline-block;
+		font-size: 20upx;
+		
+		
+		color: rgba(51, 51, 51, 1) !important;
+	}
+page {
+	font-size: 0;
+}
+
+.navBar {
+	justify-content: space-between;
+	position: fixed;
+	bottom: 0;
+	width: 750upx;
+	height: 98upx;
+	background: rgba(255, 255, 255, 1);
+	border: 1upx solid rgba(238, 238, 238, 1);
+	display: flex;
+	> view {
+		width: 20%;
+		text-align: center;
+		display: inline-block;
+		vertical-align: top;
+		> view {
+			padding-top: 10upx;
+			margin: auto;
+			width: 50upx;
+			height: 50upx;
+			> image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+		> span {
+			
+		}
+	}
+}
+</style>
diff --git a/components/template/nonemores.vue b/components/template/nonemores.vue
new file mode 100644
index 0000000..46c7f96
--- /dev/null
+++ b/components/template/nonemores.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="container-image">
+		<view class="iamges-box">
+			<image :src="!!propsImagesSrc?propsImagesSrc:imageSrc" mode="widthFix"></image>
+			<block v-if="propsdiyTitleType==='Data'">
+				<view class="title f-24 col-9">{{!!propsdiyTitle?propsdiyTitle:languageStatus!=1?'暂无数据，快去逛逛吧~':'쇼핑하러 가기'}}</view>
+			</block>
+			<block v-if="propsdiyTitleType==='packet'">
+				<view class="title f-24 col-9 m-btm20">您还没有红包，去红包广场领取吧！</view>
+				<view class="navPacket f-24" @click="navgateTo()">立即去领取</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods:{
+			navgateTo(){
+				App.navigationTo({
+					url:'pages/subPages/redpacket/redsquare'
+				})
+			}
+		},
+		props: {
+			// 参数:自定义图片 580* 270
+			diyImagesSrc: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			// 参数:自定义标题
+			diyTitle: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			diyTitleType: {
+				type: String,
+				default: function() {
+					return "Data"
+				}
+			}
+		},
+		computed: {
+			imageSrc() {
+				return this.imageRoot + 'noneMores.png'
+			},
+			propsImagesSrc() {
+				return this.diyImagesSrc
+			},
+			propsdiyTitle() {
+				return this.diyTitle
+			},
+			propsdiyTitleType() {
+				return this.diyTitleType
+			}
+		}
+	}
+</script>
+
+<style>
+	.container-image {
+		position: relative;
+		display: block;
+		width: 100%;
+		height: 0;
+		padding-bottom: 100%;
+		overflow: hidden
+	}
+
+	.iamges-box {
+		position: absolute;
+		display: flex;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center
+	}
+
+	.iamges-box image {
+		width: 580upx;
+		height: 270upx;
+		display: block;
+		background: transparent no-repeat;
+		background-size: cover
+	}
+	.navPacket{
+		color: #17D117;
+	}
+</style>
diff --git a/components/template/numberbox.vue b/components/template/numberbox.vue
new file mode 100644
index 0000000..df62e63
--- /dev/null
+++ b/components/template/numberbox.vue
@@ -0,0 +1,210 @@
+<template>
+	<view class="tui-numberbox-class tui-numberbox">
+		<view class="tui-numbox-icon tui-icon-reduce " :class="[disabled || min>=value?'tui-disabled':'']" @click.stop="reduce"
+		 style="border-radius: 5upx; border: 1upx solid #FF4444; color: #FF4444;font-size: 20upx;box-sizing: border-box;" v-show="value"></view>
+		<input type="number" @click.stop="" v-model="inputValue" v-show="value" :disabled="true" @blur="blur" class="tui-num-input" 
+		:style="{color:color,fontSize:size+'rpx',height:height+'rpx',width:width+'rpx',minHeight:0}" />
+		<view class="tui-numbox-icon tui-icon-plus" :class="[disabled || value>=max?'tui-disabled':'']" @click.stop="plus" style="border-radius: 5upx;background-color: #FF4444;color: #FFFFFF;font-size: 20upx;"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiNumberbox",
+		props: {
+			value: {
+				type: [Number, String],
+				default: 0
+			},
+			//最小值
+			min: {
+				type: Number,
+				default: 1
+			},
+			//最大值
+			max: {
+				type: Number,
+				default: 99
+			},
+			//迈步大小 1 1.1 10...
+			step: {
+				type: Number,
+				default: 1
+			},
+			//是否禁用操作
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			//加减图标大小 rpx
+			iconSize: {
+				type: Number,
+				default: 26
+			},
+			iconColor: {
+				type: String,
+				default: "#666666"
+			},
+			//input 高度
+			height: {
+				type: Number,
+				default: 42
+			},
+			//input 宽度
+			width: {
+				type: Number,
+				default: 80
+			},
+			size: {
+				type: Number,
+				default: 28
+			},
+			//input 背景颜色
+			bgcolor: {
+				type: String,
+				default: "#F5F5F5"
+			},
+			//input 字体颜色
+			color: {
+				type: String,
+				default: "#333"
+			},
+			//索引值，列表中使用
+			index: {
+				type: [Number, String],
+				default: 0
+			},
+			//自定义参数
+			custom: {
+				type: [Number, String],
+				default: 0
+			}
+		},
+		created() {
+			this.inputValue = +this.value
+		},
+		data() {
+			return {
+				inputValue: 0
+			};
+		},
+		watch: {
+			value(val) {
+				this.inputValue = +val;
+			}
+		},
+		methods: {
+			getScale() {
+				let scale = 1;
+				//浮点型
+				if (!Number.isInteger(this.step)) {
+					scale = Math.pow(10, (this.step + '').split('.')[1].length)
+				}
+				return scale;
+			},
+			calcNum: function(type) {
+				if (this.disabled) {
+					return
+				}
+				const scale = this.getScale()
+				let num = this.value * scale
+				let step = this.step * scale
+				if (type === 'reduce') {
+					num -= step
+				} else if (type === 'plus') {
+					num += step
+				}
+				let value = num / scale
+				if (type === "plus" && value < this.min) {
+					value = this.min
+				} else if (type === "reduce" && value > this.max) {
+					value = this.max
+				}
+				if (value < this.min || value > this.max) {
+					return
+				}
+				this.handleChange(value, type)
+			},
+			plus: function(e) {
+				this.calcNum("plus");
+			},
+			reduce: function() {
+				this.calcNum("reduce")
+			},
+			blur: function(e) {
+				let value = e.detail.value
+				if (value) {
+					if (~value.indexOf(".") && Number.isInteger(this.step)) {
+						value = value.split(".")[0]
+					}
+					value = Number(value)
+					if (value > this.max) {
+						value = this.max
+					} else if (value < this.min) {
+						value = this.min
+					}
+				} else {
+					value = this.min
+				}
+				if (value == this.value && value != this.inputValue) {
+					this.inputValue = value
+				}
+				this.handleChange(value, "blur")
+			},
+			handleChange(value, type) {
+				if (this.disabled) return;
+				this.$emit('change', {
+					value: value,
+					type: type,
+					index: this.index,
+					custom: this.custom
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	@font-face {
+		font-family: 'numberbox';
+		src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAASQAA0AAAAABtwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAEdAAAABoAAAAciBpnRUdERUYAAARUAAAAHgAAAB4AKQALT1MvMgAAAZwAAABDAAAAVjxzSINjbWFwAAAB9AAAAEYAAAFK5zLpOGdhc3AAAARMAAAACAAAAAj//wADZ2x5ZgAAAkgAAACHAAAAnIfIEjxoZWFkAAABMAAAAC8AAAA2FZWEOWhoZWEAAAFgAAAAHAAAACQH3gOFaG10eAAAAeAAAAARAAAAEgwAAAFsb2NhAAACPAAAAAwAAAAMADAATm1heHAAAAF8AAAAHwAAACABEAAobmFtZQAAAtAAAAFJAAACiCnmEVVwb3N0AAAEHAAAAC0AAABV/+8iFXjaY2BkYGAA4gVmC5Tj+W2+MnCzMIDATWsFOQT9v5GFgbkeyOVgYAKJAgDrogf+AHjaY2BkYGBu+N/AEMPCAAJAkpEBFbAAAEcKAm142mNgZGBgYGWQYQDRDAxMQMwFhAwM/8F8BgALpAE5AHjaY2BkYWCcwMDKwMDUyXSGgYGhH0IzvmYwYuQAijKwMjNgBQFprikMDs9Yn01kbvjfwBDD3MDQABRmBMkBAOXpDHEAeNpjYYAAFghmZGAAAACdAA4AAAB42mNgYGBmgGAZBkYGEHAB8hjBfBYGDSDNBqQZGZiesT6b+P8/AwOElvwnWQxVDwSMbAxwDiMTkGBiQAWMDMMeAABRZwszAAAAAAAAAAAAAAAwAE542iWKQQrCMBBF5xNpd0pQ7EIoTEnahSCTUNqdWz2A9TrieXKeXCc1qcPn/zfzh0BYv2pVH7oQgbvqdG5Yt/DTrNlPYz+wHvuuqhFSME4sFshTgKUsKfhH5lg8BSul3i5bS3mQdd0RIh2IjnvUrkXDd8zuhuFt86tY9fonIsSYgsXpB+cCGosAeNp9kD1OAzEQhZ/zByQSQiCoXVEA2vyUKRMp9Ailo0g23pBo1155nUg5AS0VB6DlGByAGyDRcgpelkmTImvt6PObmeexAZzjGwr/3yXuhBWO8ShcwREy4Sr1F+Ea+V24jhY+hRvUf4SbuFUD4RYu1BsdVO2Eu5vSbcsKZxgIV3CKJ+Eq9ZVwjfwqXMcVPoQb1L+EmxjjV7iFa2WpDOFhMEFgnEFjig3jAjEcLJIyBtahOfRmEsxMTzd6ETubOBso71dilwMeaDnngCntPbdmvkon/mDLgdSYbh4FS7YpjS4idCgbXyyc1d2oc7D9nu22tNi/a4E1x+xRDWzU/D3bM9JIbAyvkJI18jK3pBJTj2hrrPG7ZynW814IiU68y/SIx5o0dTr3bmniwOLn8owcfbS5kj33qBw+Y1kIeb/dTsQgil2GP5PYcRkAAAB42mNgYoAALjDJyIAOWMGiTIxMjMwiWZmJQJRXVQoigTgjMd9QGIsgAFDsEBsAAAAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAwAEAAEABAAAAAIAAAAAeNpjYGBgZACCq0vUOUD0TWsFORgNADPBBE4AAA==) format('woff');
+		font-weight: normal;
+		font-style: normal;
+	}
+ 
+	.tui-numbox-icon {
+		font-family: "numberbox" !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		padding: 16rpx;
+	}
+	
+	.tui-padding-wx{
+		padding: 16rpx;
+	}
+	
+	.tui-icon-reduce:before {
+		content: "\e691";
+	}
+
+	.tui-icon-plus:before {
+		content: "\e605";
+	}
+
+	.tui-numberbox {
+		display: -webkit-inline-flex;
+		display: inline-flex;
+		align-items: center;
+	}
+
+	.tui-num-input {
+		text-align: center;
+		/* margin: 0 12rpx; */
+		font-weight: 400;
+	}
+
+	.tui-disabled {
+		color: #ededed !important;
+	}
+</style>
diff --git a/components/template/partTimeJob.vue b/components/template/partTimeJob.vue
new file mode 100644
index 0000000..b3df2a6
--- /dev/null
+++ b/components/template/partTimeJob.vue
@@ -0,0 +1,255 @@
+<template>
+	<view  :style="{paddingBottom:flag?'0':'0rpx'}">
+		<view :class="tabStyle?'workList workList-two':'workList'" style="" v-if="logoding" v-for="(item,index) in inviteList" @click="goNvigeing(item)">
+			<!-- <view class="work-title" :style="{border: tabStyle?'none':'1upx solid #EEEEEE;'}">
+				<view class="dis-il-block work-name">
+					{{item.title}}
+				</view>
+				<view class="dis-il-block wprk-top" v-if="item.is_top != 0">
+					顶
+				</view>
+				<view class="wprk-pay">
+					{{item.salary}}
+				</view>
+			</view> -->
+			<!-- <view class="wprk-tag" v-if="item.welfare_list">
+				<view class="tags" v-if="item.welfare_list" :style="{height: opentags[index]?'auto':'60rpx'}">
+					<view class="tag-item" v-for="(items,indexs) in item.welfare_list" :key="indexs">
+						{{items}}
+					</view>
+				</view>
+				<view class="region" v-if="false" @click="isopen(item,index)">
+					更多<text style="font-size: 24upx;" :class="opentags[index]?'iconfont icon-fold':'iconfont icon-unfold'"></text>
+				</view>
+			</view> -->
+			<view class="dis-flex company-profile" v-if="item.release">
+				<!-- <view style="flex: 0.15;">
+					<image class="title-img" :src="item.release.logo" mode=""></image>
+				</view> -->
+				<view class="poster-img">
+					<image :src="item.recruit_img" mode="aspectFill" class="title-video"></image>
+				</view>
+				<view style="flex: 0.99;padding-left: 10upx;display: flex;flex-direction: column;justify-content: space-between;margin-bottom: 25rpx;">
+					<view class="dis-flex" style="justify-content: space-between;overflow: hidden;">
+						<view class="dis-il-block company-name" style="color: #000;font-size: 30upx;">
+							{{item.title}}
+						</view>
+						<view style="font-size: 30upx;font-family: DINPro;
+						font-weight: 600;color: #FF4444;">{{item.salary}}</view>
+						<view class="dis-il-block company-authentication" v-if="item.release.is_authentication != 0">
+							已认证
+						</view>
+					</view>
+					<view class="company-tag leave_out">
+						{{item.release.name}}
+					</view>
+					<view class="company-tag leave_out">
+						{{item.region}}
+					</view>
+					<!-- <view class="company-tag leave_out" v-if="item.release.nature"> -->
+						<!-- {{item.release.nature}} · {{item.release.scale}} · {{item.release.industry}} -->
+						<!-- {{item.sub_industry}} -->
+					<!-- </view> -->
+				</view>
+				<!-- <view style="flex: 0.25;" class="release-data">
+					<view style="font-size: 12px;color:#777;">{{item.region}}</view>
+					<view style="font-size: 12px;color:#777;">{{item.release_time}}</view>
+				</view> -->
+			</view>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		data(){
+			return{
+				opentags:{},
+				logoding:true
+			}
+		},
+		props:{
+			inviteList:{
+				type:Array,
+				default:null
+			},
+			tabStyle:{
+				type:Boolean,
+				default:false
+			},
+			flag:{
+				type:Boolean,
+				default:true
+			}
+		},
+		methods:{
+			goNvigeing(item){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails?id=" + item.id
+				});
+			},
+			isopen(item,index){
+				if(!this.opentags[index]){
+					this.opentags[index] = true;
+				}else{
+					this.opentags[index] = false;
+				}
+				this.logoding = !this.logoding;
+				this.logoding = !this.logoding;
+				console.log(this.opentags);
+				// debugger
+				// this.inviteList[index].open = !this.inviteList[index].open;
+				// this.$emit('isopen',index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.workList-two{
+		margin: 30upx!important;
+		border-radius: 20upx!important;
+		background-color: #FFFFFF!important;
+	}
+	.workList{
+		padding: 0upx 24upx 0upx;
+		background-color: #FFFFFF;
+		.work-title{
+			// border-top: 1upx solid #EEEEEE;
+			padding-top: 30upx;
+			.work-name{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.wprk-top{
+				background: #F1C426;
+				border-radius: 4upx;
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				padding: 2upx 5upx;
+				margin-left: 20upx;
+				color: #FFFFFF;
+			}
+			.wprk-pay{
+				float: right;
+				font-size: 30upx;
+				font-family: DINPro;
+				font-weight: 600;
+				color: #FF4444;
+				line-height: 52upx;
+			}
+		}
+		.wprk-tag{
+			padding-top: 30upx;
+			display: flex;
+			margin: 0;
+			width: 100%;
+			.tags{
+				flex: 0.8;
+				overflow: hidden;
+				.tag-item{
+					background: #F4F4F4;
+					border-radius: 4upx;
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					padding: 10upx 24upx;
+					display: inline-block;
+					margin-right: 20upx;
+					margin-bottom: 20upx;
+				}
+			}
+			.region{
+				flex: 0.2;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				text-align: right;
+				line-height: 50upx;
+			}
+		}
+		.company-profile{
+			width: 100%;
+			padding: 20upx 0 0upx;
+			justify-content: space-between;
+			border-bottom: 1upx solid #EEEEEE;
+			.title-img{
+				width: 120upx;
+				height: 120upx;
+				background: #F77996;
+				border-radius: 10upx;
+				margin-right: 14rpx;
+			}
+			.company-name{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				vertical-align: top;
+			}
+			.company-authentication{
+				font-size: 20upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				background: #3388FF;
+				border-radius: 4upx;
+				padding: 2upx 6upx;
+				margin-left: 20upx;
+				vertical-align: top;
+			}
+			.company-tag{
+				padding-top: 4upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+			}
+			.release-data{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				height: 120upx;
+				margin-bottom: 25upx;
+				text-align: right;
+				display: flex;
+				flex-direction: column;
+				justify-content: space-between;
+			}
+			.poster-img{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				width: 228rpx;
+				height: 128upx;
+				margin-bottom: 25upx;
+				text-align: right;
+			}
+			.title-video{
+				width: 100%;
+				height: 100%;
+				background: #F77996;
+				border-radius: 10upx;
+			}
+		}
+		.company-light{
+			font-size: 13px;
+			color: #777;
+			border-bottom: 1upx solid #EEEEEE;
+			padding-bottom: 35rpx;
+		}
+	}
+	.leave_out{
+		// 省略号样式
+		display: -webkit-box;
		-webkit-box-orient: vertical;
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+	}
+</style>
diff --git a/components/template/phoneBinding.vue b/components/template/phoneBinding.vue
new file mode 100644
index 0000000..8fe7eec
--- /dev/null
+++ b/components/template/phoneBinding.vue
@@ -0,0 +1,24 @@
+<template>
+	<view class="phoneBinding">
+		<PopManager>
+			
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import PopManager from './PopManager.vue'
+	export default {
+		components:{
+			PopManager,
+		},
+		data(){
+			return{
+				
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/components/template/phoneNavBar.vue b/components/template/phoneNavBar.vue
new file mode 100644
index 0000000..b2abff1
--- /dev/null
+++ b/components/template/phoneNavBar.vue
@@ -0,0 +1,209 @@
+<template>
+	<view class="PhoneNavbar">
+		<view class="dis-flex" v-if="page == 'hitch' &&( payclose == 0 || !flag)">
+			<view class="navbars" v-for="(item,index) in navIssueList" :key="index" @click="goURLT(item)">
+				<view :class="(checked == item.name || (item.name == '人找车' || item.name == '车找人') && checked == '发布行程' )?'check':'noCheck'">
+					<view :class="item.icon" :style="{color: checked == item.name || (item.name == '人找车' || item.name == '车找人') && checked == '发布行程'?'#ff4444':'#7C858D',fontSize: '25px' }">
+						
+					</view>
+					<view >
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="dis-flex " v-else-if="page == 'hitch' && payclose != 0 && flag">
+			<view class="navbars" v-for="(item,index) in navIssueList" :key="index" @click="goURLT(item)" v-if="index != 1">
+				<view :class="checked == item.name || (item.name == '人找车' || item.name == '车找人') && checked == '发布行程'?'check':'noCheck'">
+					<view :class="item.icon" :style="{color: checked == item.name || (item.name == '人找车' || item.name == '车找人') && checked == '发布行程'?'#ff4444':'#7C858D',fontSize: '25px' }">
+						
+					</view>
+					<view >
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="dis-flex" v-else>
+			<view class="navbar" v-for="(item,index) in navList" :key="index" @click="goURL(item)">
+				<view :class="checked == item.name?'check':'noCheck'">
+					<view :class="item.icon" :style="{color: checked == item.name?'#ff4444':'#7C858D',fontSize: '25px' }">
+						
+					</view>
+					<view >
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default{
+		data(){
+			return{
+				flag:false,
+				navList:[
+					{
+						name:'首页',
+						icon:'iconfont icon-home',
+						url:'pages/subPages2/phoneBook/phoneBook',
+						check:false
+					},
+					{
+						name:'分类',
+						icon:'iconfont icon-search_list_light',
+						url:'pages/subPages2/phoneBook/phoneClass/phoneClass',
+						check:true
+					},
+					{
+						name:'入驻',
+						icon:'iconfont icon-tianjialeimu',
+						url:'pages/subPages2/phoneBook/enterForm/enterForm',
+						check:false
+					},
+					{
+						name:'收藏',
+						icon:'iconfont icon-favor_light',
+						url:'pages/subPages2/phoneBook/yellowGoods/yellowGoods',
+						check:false
+					},
+					{
+						name:'我的',
+						icon:'iconfont icon-wode',
+						url:'pages/subPages2/phoneBook/myGoods/myGoods',
+						check:false
+					},
+				],
+				navIssueList:[
+					{
+						name:'首页',
+						icon:'iconfont icon-home',
+						url:'pages/subPages2/hitchRide/index/index',
+						check:false
+					},
+					{
+						name:'人找车',
+						icon:'iconfont icon-tianjialeimu',
+						url:'pages/subPages2/hitchRide/hitchSchedule/hitchSchedule',
+						check:false
+					},
+					{
+						name:'个人中心',
+						icon:'iconfont icon-wode',
+						url:'pages/subPages2/hitchRide/personalCenter/personalCenter',
+						check:false
+					},
+				],
+			}
+		},
+		props:{
+			checked:{
+				type:String,
+				default:'首页'
+			},
+			page:{
+				type:String,
+				default:''
+			},
+			payclose:{
+				type:Number,
+				default:0
+			},
+			type:{
+				type:Number,
+				default:1
+			}
+		},
+		watch:{
+			checked(newVal){
+				debugger
+			},
+			type(newVal,oldVal){
+				// debugger
+				if(newVal == 1){
+					this.navIssueList[1].name = '人找车';
+					this.navIssueList[1].url = 'pages/subPages2/hitchRide/hitchSchedule/hitchSchedule?index=0'
+				}else{
+					this.navIssueList[1].name = '车找人';
+					this.navIssueList[1].url = 'pages/subPages2/hitchRide/hitchSchedule/hitchSchedule?index=1'
+				}
+			}
+		},
+		mounted() {
+			let _this = this;
+			if(uni.getSystemInfoSync().system.indexOf('Android') === -1){
+				_this.flag = true;
+			}else{
+				_this.flag = false;
+			}
+		},
+		methods:{
+			goURLT(item){
+				let _this = this;
+				this.navIssueList.map(items=>{
+					_this.$set(items,'check',false);
+					if(items.name == item.name){
+						_this.$set(items,'check',true);
+						App.navigationTo({
+							url: item.url,
+							navType: 'rediRect'
+						})
+					}
+				})
+			},
+			goURL(item){
+				let _this = this;
+				this.navList.map(items=>{
+					_this.$set(items,'check',false);
+					if(items.name == item.name){
+						_this.$set(items,'check',true);
+						App.navigationTo({
+							url: item.url,
+							navType: 'rediRect'
+						})
+					}
+				})
+				console.log(this.navList);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.PhoneNavbar{
+		position: fixed;
+		background-color: #FFFFFF;
+		border-top: 1upx solid #E8E8E8;
+		bottom: 0;
+		width: 100vw;
+		padding: 5upx 0;
+		left: 0;
+		z-index: 999;
+		padding-bottom: 30upx;
+		.navbar{
+			flex: 0.2;
+			text-align: center;
+		}
+		.navbars{
+			flex: 0.5;
+			text-align: center;
+		}
+	}
+	.check{
+		color: #FF4444;
+		font-size: 20upx;
+	}
+	.noCheck{
+		color: #7C858D;
+		font-size: 20upx;
+	}
+</style>
diff --git a/components/template/pic_text/pic_text.vue b/components/template/pic_text/pic_text.vue
new file mode 100644
index 0000000..cb8ac44
--- /dev/null
+++ b/components/template/pic_text/pic_text.vue
@@ -0,0 +1,508 @@
+<template>
+	<view style="display: flex;">
+		<view class="left_area">
+			<image :src="itemInfos.avatar" mode="" class="avatar" @click.stop="goHome"></image>
+		</view>
+		<view class="right_area">
+			<view class="text-wrapper">
+				<view class="dis-flex" style="justify-content: space-between;">
+					<!-- <image :src="itemInfos.avatar" mode="" class="avatar" @click.stop="goHome"></image> -->
+					<view style="flex: 1;line-height: 18px;">
+						<view class="name"><text>{{itemInfos.nickname}}</text><text class="label" v-if="itemInfos.idType">{{itemInfos.idType}}</text></view>
+						<view style="color: #999999;font-size: 12px;">{{itemInfos.createtime+' '}}<text v-if="itemInfos.addr">{{itemInfos.addr}}</text></view>
+					</view>
+					<view class="btn" v-if="itemInfos.mid!=='0' && !itemInfos.is_interest && !itemInfos.is_it_mine" @click.stop="interest">+关注</view>
+					<view class="btn2" v-if="itemInfos.is_interest && !itemInfos.is_it_mine" @click.stop="interestCancel">取消关注</view>
+				</view>
+				<view style="margin: 5px 0;font-size: 14px;color: #333;">
+					<view style="color: #ffd900;line-height: 20px;">
+						<text v-if="itemInfos.onetype">#{{itemInfos.onetype}}#</text>
+						<text v-if="itemInfos.one_name">{{' '+'#'+itemInfos.one_name}}#</text>
+						<text v-if="itemInfos.share_title">{{' '+'#'+itemInfos.share_title}}#</text>
+					</view>
+					<view class="text-main" :class="showAllText===2?'show_all':''">
+						<text class="main">{{ itemInfos.content }}</text>
+						<text class="all" v-if="showAllText===1" @click.stop="changeShowAll(2)">全文</text>
+						<text class="all" v-if="showAllText===2" @click.stop="changeShowAll(1)">收起</text>
+					</view>
+				</view>
+			</view>
+			<view class="dis-flex img-wrapper" v-if="!itemInfos.video_link">
+				<view v-for="(item,index) in itemInfos.img" :key="index" class="img-item">
+					<image :src="item" mode="aspectFill" @click.stop="imgPre(index,itemInfos.img)"></image>
+				</view>
+				<view style="width: 25vw;"></view>
+				<view style="width: 25vw;"></view>
+			</view>
+			<view class="dis-flex video-wrapper" v-if="!!itemInfos.video_link&&itemInfos.img.length==0"
+			 style="position: relative;">
+				<!-- <image v-if="showPoster" class="videoPlay" :src="itemInfos.video_img_link" mode="aspectFill" @click.stop="changeShowPoster"></image> -->
+				<!-- 借video播放按钮,替换人工封面 -->
+				<!-- <video v-if="showPoster" object-fit="cover" :src="itemInfos.video_link" @click.stop="changeShowPoster"
+				 class="videoPlay" :poster='itemInfos.video_img_link'></video>
+				<video v-else object-fit="contain" id="myvideo" autoplay :src="itemInfos.video_link" @click.stop=""
+				 class="videoPlay"></video> -->
+				
+				<video object-fit="contain" :id="'myvideo'+index" :src="itemInfos.video_link" @click.stop=""
+				 class="videoPlay" :poster='itemInfos.video_img_link' @loadedmetadata="changeSize" 
+				 :style="{width:videoWidth, height: videoHeight}" @play="stopOther()"></video>
+				<!-- 一版视频和封面一致的 -->
+				 
+				<!-- <view class="videoPlay" style="position: absolute;left: calc(46vw - 315rpx);top: 0;"
+				 @click.stop="playing(itemInfos.video_link)">
+				</view> 旧版的点击立即全屏播放 -->
+			</view>
+			<view class="dis-flex comment-wrapper" style="font-size: 12px;height: auto;color: #999;" v-if="itemInfos.address_info">
+				<text class="iconfont icon-daohang1"></text>
+				<text style="flex:1;">{{itemInfos.address_info}}</text>
+			</view>
+			<view class="dis-flex comment-wrapper">
+				<button open-type="share" :id="itemInfos.id"
+				 style="margin: 0;background: transparent;padding: 0;line-height: normal;font-size: 13px;" @click.stop="share">
+					<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/share-two.png" mode=""></image>
+					{{itemInfos.share}}
+				</button>
+				<view class="" @click.stop="commentShow=true">
+					<image style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/fa-comment.png" mode=""></image>
+					<text v-if="itemInfos.comment_list.total">{{itemInfos.comment_list.total}}</text>
+					<text v-else>0</text>
+				</view>
+				<view class="" @click.stop="fabulous">
+					<image v-if="!itemInfos.is_fabulous" style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-grey.png" mode=""></image>
+					<image v-else style="width: 36rpx;height: 36rpx;vertical-align: middle;margin-right: 10rpx;" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-red.png" mode=""></image>
+					{{itemInfos.fabulous_num}}
+				</view>
+			</view>
+		</view>
+		
+		<!-- 评论弹窗 -->
+		<view style="width: 100%;height: 100%;position: fixed;top: 0;left: 0;z-index: 9;
+		background-color: rgba(0,0,0,.3);" v-if="commentShow" @click.stop="commentShow=false"></view>
+		<view class="reply-wrapper" v-if="commentShow">
+			<textarea @click.stop class="my-text" v-model="text" name="" id="" cols="30" rows="10" placeholder="评论"></textarea>
+			<button type="primary" style="margin: 20rpx 80rpx;border-radius: 50px;" @click.stop="submit">发送</button>
+		</view>
+		<!-- 全屏视频 -->
+		<!-- <PopManager :show="videoshow" @clickmask="videoshow = false" type="center">
+			<view v-if="videoshow" class="videoshow">
+				<video id="myvideo" :src="videolint" @fullscreenchange="videoControl"  style="width: 100%;height: 100%;"
+				 :poster='itemInfos.video_img_link' @click.stop="" :show-fullscreen-btn="false" autoplay ></video>
+				 <view  style="position: absolute;left: 30upx;top: 80upx;color: #ffffff;padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(255,255,255,0.3);" @click.stop="videoshow = false">
+				 	<text class="iconfont icon-roundleftfill" style="font-size: 36upx;"></text>
+					<text class="f-36">返回</text>
+				 </view>
+			</view>
+		</PopManager> 旧版的点击立即全屏播放-->
+	</view>
+</template>
+
+<script>
+import PopManager from '@/components/template/PopManager';
+import App from '@/common/js/app.js';
+export default {
+	name: 'picText',
+	data() {
+		return {
+			itemInfos: {},
+			commentShow: false,
+			text: '',
+			videoshow: false,
+			videolint: '',
+			showAllText: 0,
+			showPoster: true,
+			videoWidth: '0px',
+			videoHeight: '0px',
+			listVideoHeight: '40vw',
+			detailVideoHeight: '60vw',
+			videoContext: '',
+			query: ''
+		}
+	},
+	components:{
+		PopManager
+	},
+	props:{
+		info:{
+			type: Object,
+			require: true
+		},
+		isDetail: {
+			type: Boolean,
+			default: false
+		},
+		index: {// 当前帖子在列表中的索引
+			type: Number | String
+		},
+		currentPlay: {// 当前播放的视频在列表中的索引
+			type: Number | String
+		},
+		stopVideo: {
+			type: Number
+		},
+	},
+	watch: {
+		info: {
+			handler(newVal, oldVal){
+				this.itemInfos = newVal;
+				if(this.itemInfos.content.length > 44){
+					this.showAllText = 1;
+				}
+			},
+			deep: true,
+			immediate: true
+		},
+		stopVideo: {
+			handler(newVal, oldVal){
+				if(!!this.itemInfos.video_link){
+					// this.videoContext.stop();
+					
+					if(this.index!==this.currentPlay){
+						// 正在播放其他视频
+						this.videoContext.stop();
+					}else{
+						// 滚动页面
+						this.query.select('.video-wrapper').boundingClientRect(data=>{
+							if(data){
+								console.log(data.top,'视频在屏幕的高度');
+								if(this.isDetail && (data.top==0 || data.top<0) && this.index==this.currentPlay){// 详情页
+									console.log('视频暂停');
+									this.videoContext.stop();
+								}else if(!this.isDetail && (data.top==90 || data.top<90) && this.index==this.currentPlay){// 首页
+									console.log('视频暂停');
+									this.videoContext.stop();
+								}
+							}
+						}).exec();
+					}
+				}
+			}
+		}
+	},
+	methods: {
+		imgPre(index, imgs){
+			uni.previewImage({
+				current: imgs[index],
+				urls: imgs,
+				fail(err) {
+					console.log(111, err)
+				}
+			});
+		},
+		share(){
+			
+		},
+		// 提交评论
+		submit(){
+			let _this = this, 
+			data = {
+				text: _this.text,
+				id: _this.itemInfos.id
+			};
+			App._post_form('&p=pocket&do=comment', data, res => {
+				_this.commentShow = false;
+			
+				App.showSuccess('评论成功', () => {
+					// _this.isComment = false;
+				})
+				if(_this.itemInfos.comment_total){// 图文详情页需要展示评论
+					let plPush = {
+						nickname: uni.getStorageSync('userinfo').nickname,
+						mid:res.data.amid,
+						id:res.data.cid,
+						content: _this.text,
+						list:[],
+						avatar: uni.getStorageSync('userinfo').avatar,
+						createtime: _this.getTimeData(new Date().getTime())
+					};
+					_this.$emit('addComment', plPush)
+				}
+			
+				_this.text = '';
+			},fail=>{
+				// _this.isComment = false;
+				// if (fail.data.message == '未绑定手机号') {
+				// 	//#ifdef H5
+				// 	_this.popShow = true;
+				// 	//#endif
+				// 	//#ifndef H5
+				// 	_this.vxshow = true;
+				// 	//#endif
+					
+				// }
+			});
+		},
+		// 点赞
+		fabulous() {
+			let _this = this;
+			let data = {
+				id: _this.itemInfos.id
+			};
+			App._post_form('&p=pocket&do=fabulous', data, res => {
+				if (_this.itemInfos.is_fabulous == 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '取消点赞',
+						duration: 2000
+					});
+					_this.itemInfos.is_fabulous = 0;
+					_this.itemInfos.fabulous_num--;
+				} else {
+					uni.showToast({
+						icon: 'none',
+						title: '点赞成功',
+						duration: 2000
+					});
+					_this.itemInfos.is_fabulous = 1;
+					_this.itemInfos.fabulous_num++;
+				}
+			});
+		},
+		goHome(){
+			if (this.itemInfos.mid > 0) {
+				App.navigationTo({
+					url: 'pages/subPages/homepage/homepage/homepage?mid=' + this.itemInfos.mid + '&checkType=' + 1
+				});
+			}
+		},
+		videoControl(e){
+			console.log(e)
+			if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+				this.videoContext.play();
+			}else{
+				//停止播放
+				// this.videoContext.stop();   各位老板不要选择stop 选择了stop 缩小视频还会自动播放
+				this.videoContext.pause();
+			}
+		},
+		playing(lint) {
+			this.videoshow = true;
+			this.videolint = lint;
+			// 获取当前视频id
+			// let currentId = e.currentTarget.dataset.id
+			// uni.createVideoContext获取视频上下文对象
+			this.videoContext.requestFullScreen({
+				direction:0
+			})    
+		},
+		interest(){
+			let data = {
+				interest_mid: this.itemInfos.mid
+			};
+			App._post_form('&p=member&do=addInterestMember', data, res => {
+				uni.showToast({
+					title: res.message
+				})
+				this.itemInfos.is_interest = true;
+			})
+		},
+		interestCancel(){
+			let data = {
+				interest_mid: this.itemInfos.mid
+			};
+			App._post_form('&p=member&do=cancelInterestMember', data, res => {
+				uni.showToast({
+					title: res.message
+				})
+				this.itemInfos.is_interest = false;
+			})
+		},
+		// 时间戳转年月日时分
+		getTimeData(dataValue) {
+			let date = new Date(dataValue) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+			let Y = date.getFullYear() + '-'
+			let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'
+			let D = date.getDate() + ' '
+			let h = date.getHours() + ':'
+			let m = date.getMinutes()
+			let s = date.getSeconds()
+			return Y + M + D + h + m;
+		},
+		changeShowAll(type){
+			if(this.showAllText == type) return;
+			this.showAllText = type;
+		},
+		changeShowPoster(){
+			this.showPoster = false;
+			// this.playing(this.itemInfos.video_link);
+			// this.videoContext.play();
+		},
+		changeSize(e){
+			console.log(e.detail.width, e.detail.height, e.detail.duration);
+			if(e.detail.width > e.detail.height){
+				this.videoWidth = '77vw';
+				this.videoHeight = e.detail.height/e.detail.width*77+'vw';
+				// console.log(this.videoWidth, this.videoHeight)
+			}else if(e.detail.width < e.detail.height){
+				if(this.isDetail){
+					this.videoHeight = this.detailVideoHeight;
+					this.videoWidth = e.detail.width/e.detail.height*60+'vw';
+				}else{
+					this.videoHeight = this.listVideoHeight;
+					this.videoWidth = e.detail.width/e.detail.height*40+'vw';
+				}
+				// console.log(this.videoWidth, this.videoHeight)
+			}
+		},
+		stopOther(){
+			this.$emit('changePlay', this.index);
+		}
+	},
+	onReady(){
+		// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+		this.videoContext = wx.createVideoContext('myvideo'+this.index, this);
+		// console.log(this.videoContext)
+		// this.videoContext.requestFullScreen();
+		this.query = uni.createSelectorQuery().in(this);
+	},
+}
+</script>
+
+<style lang="scss" scoped>
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.left_area{
+	width: 15vw;
+	.avatar{
+		width: 40px;
+		height: 40px;
+		background: #d1d1d1;
+		border-radius: 50%;
+		margin: 8px calc(7.5vw - 20px);
+	}
+}
+.right_area{
+	
+}
+.text-wrapper{
+	width: 77vw;
+	padding-top: 5px;
+	margin: 5px auto;
+	.avatar{
+		width: 40px;
+		height: 40px;
+		background: #d1d1d1;
+		border-radius: 50%;
+		margin-right: 8px;
+	}
+	.name{
+		font-size: 14px;
+		font-weight: bold;
+	}
+	.label{
+		display: inline-block;
+		padding: 2px 8px;
+		background-color: #ffeaf1;
+		border-radius: 5px;
+		font-size: 13px;
+		color: #ff0f43;
+		font-weight: normal;
+		line-height: 16px;
+		margin-left: 7px;
+	}
+	.btn{
+		width: 56px;
+		line-height: 26px;
+		border-radius: 18px;
+		color: #ff0f43;
+		background-color: #ffeaf1;
+		border: 1px solid #ff0f43;
+		text-align: center;
+		font-size: 12px;
+	}
+	.btn2{
+		width: 72px;
+		line-height: 26px;
+		border-radius: 18px;
+		color: #ff0f43;
+		background-color: #ffffff;
+		border: 1px solid #ff0f43;
+		text-align: center;
+		font-size: 12px;
+	}
+	.text-main{
+		max-height: 72px;
+		line-height: 22px;
		overflow: hidden;
+		
+		.main{
+			width: 100%;
+			display: -webkit-box;//将盒子转换为弹性盒子
+			-webkit-box-orient: vertical;//文本显示方式，默认水平
+			-webkit-line-clamp: 2;//设置显示多少行
+			overflow: hidden;
+		}
+		.all{
+			color: #69aee2;
+			margin-left: 5rpx;
+		}
+	}
+	.text-main.show_all{
+		max-height: none;
+		
+		.main{
+			display: inline-block;
+		}
+	}
+}
+
+.img-wrapper{
+	justify-content: space-between;
+	flex-wrap: wrap;
+	width: 77vw;
+	margin: 6px auto 5px;
+	.img-item{
+		width: 25vw;
+		height: 25vw;
+		margin-bottom: 1vw;
+		border-radius: 5px;
+		overflow: hidden;
+	}
+	image{
+		width: 100%;
+		height: 100%;
+		background-color: #d1d1d1;
+	}
+	.videoPlay {
+		// width: 630upx;
+		// height: 450upx;
+	}
+}
+.video-wrapper{
+	justify-content: flex-start;
+	width: 77vw;
+	margin: 6px auto 5px;
+}
+.comment-wrapper{
+	width: 77vw;
+	height: 25px;
+	margin: 0 auto 6px;
+	justify-content: space-between;
+	font-size: 13px;
+	color: #333;
+}
+.reply-wrapper{
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	z-index: 9;
+	width: 560rpx;
+	height: 430rpx;
+	background-color: #fff;
+	border-radius: 20px;
+	transform: translate(-50%, -50%);
+	box-shadow: 0px 0px 3px 0px rgba(0,0,0,.05);
+	
+	.my-text{
+		padding: 50rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+}
+
+.videoshow{
+	width: 100vw;
+	height: 100vh;
+	position: relative;
+}
+</style>
diff --git a/components/template/pic_text/pic_text_list.vue b/components/template/pic_text/pic_text_list.vue
new file mode 100644
index 0000000..cbbd172
--- /dev/null
+++ b/components/template/pic_text/pic_text_list.vue
@@ -0,0 +1,111 @@
+<template>
+	<view class="">
+		<block v-for="(item, index) in communityList" :key="index">
+			<view @click="toDetails(item.id)" style="border-bottom: 1px solid #efefef;">
+				<pic-text :info="item" :index="index" :stopVideo="stopVideo" :currentPlay="currentPlay" @changePlay="changePlay()"></pic-text>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import picText from "@/components/template/pic_text/pic_text.vue"
+	export default {
+		data(){
+			return {
+				communityList: [],
+				stopVideo: 0,
+				scrollTimer: null,
+				currentPlay: -2,//当前正在播放的视频在列表中的索引,-2表示没有正在播放
+			}
+		},
+		props:{
+			tab1Page: {
+				type: Number
+			},
+			scrollLock: {
+				type: Boolean
+			}
+		},
+		components:{
+			picText
+		},
+		watch: {
+			tab1Page: {
+				handler(newVal, oldVal){
+					this.getList(newVal, true)
+				}
+			},
+			scrollLock: {
+				handler(newVal, oldVal){
+					this.handlerScroll();
+				}
+			}
+		},
+		created() {
+			this.getList(this.tab1Page);
+		},
+		methods: {
+			// 跳转正文详情
+			toDetails(id){
+				uni.navigateTo({
+					url:"/pagesA/pictureTextDetails/pictureTextDetails?id=" + id
+				})
+			},
+			// 获取学生社区图文列表
+			getList(page = 1, isPage = false){
+				let _this = this;
+				let data = {
+					id: 0,//0对应掌上生活的全部类目
+					two_id: undefined,
+					page,
+					page_index: 10,
+					homeflag: 1,
+					keyword: '',
+				};
+				App._post_form('&p=pocket&do=infoList', data, res => {
+					let list = [];
+					if (!isPage) {
+						if (res.data.list.length > 0) {
+							list = res.data.list;
+							_this.setData({
+								communityList: list
+							})
+						} else {
+							// _this.noMore1 = true;
+							_this.$emit('changenoMore1', true);
+						}
+					}else{//第二页走这里
+						if (res.data.list.length > 0){
+							list = [..._this.communityList, ...res.data.list];
+							_this.setData({
+								communityList: list
+							})
+						}else{
+							// _this.noMore1 = true;
+							_this.$emit('changenoMore1', true);
+						}
+					}
+				});
+			},
+			handlerScroll(){
+				if(this.scrollLock){
+					clearTimeout(this.scrollTimer);
+				}
+				this.scrollTimer = setTimeout(()=>{
+					// this.scrollLock = false;
+					this.$emit('changeScrollLock', false)
+					this.stopVideo++;
+				}, 500)
+			},
+			changePlay(e){
+				this.stopVideo++;//先关闭上一个播放的按钮，再改变当前播放索引=最新播放视频索引
+				this.currentPlay = e;
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/components/template/popAgreement.vue b/components/template/popAgreement.vue
new file mode 100644
index 0000000..0b7fb0d
--- /dev/null
+++ b/components/template/popAgreement.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class="popAgreement" >
+		<PopManager :show="show" :type="type" @clickmask="handleMaskClick">
+			<view class="mainView">
+				<view class="p30p24">
+					<view class="flex">
+						<text></text>
+						<image :src="imgfixUrls + 'merchant/close.png'" class="image23" @click="closePop"></image>
+					</view>
+					<view class="textC">
+						<text class="color333333 font30">用户协议条款</text>
+					</view>
+					<scroll-view :scroll-y="true" class="scrollMain marginT36auto ">
+						<rich-text :nodes="textInfo" class="font24 color999999">
+							
+						</rich-text>
+					</scroll-view>
+					<view class="submitButton marginT50auto textC " :style="{background:buttonColor}" @click="closePop">
+						<text class="font28 colorW lineHeight80" >同意协议</text>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import PopManager from './PopManager';
+export default {
+	components: {
+		PopManager
+	},
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		buttonColor:{
+			type: String,
+			default: 'white'
+		},
+		textInfo:{
+			type: String,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			type: 'center',
+			img:''
+		};
+	},
+	mounted() {
+		this.img = this.imgfixUrl;
+	},
+	methods: {
+		handleMaskClick() {
+			this.$emit('clickmask');
+			console.info(this.show)
+		},
+		closePop(){
+			this.$emit('clickmask');
+		}
+	}
+};
+</script>
+
+<style>
+.popAgreement {
+	font-size: 0;
+}
+.mainView {
+	width: 608upx;
+	height: 971upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx;
+}
+.image23 {
+	width: 23upx;
+	height: 23upx;
+}
+.p30p24 {
+	padding: 30upx 24upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.textC {
+	text-align: center;
+}
+.color333333{
+	color: #333333;
+}
+.font30{
+	font-size: 30upx;
+}
+.scrollMain{
+	width:535upx;
+	height:687upx;
+}
+.marginT36auto{
+		margin: 36upx auto 0 auto;
+}
+.submitButton{
+	width:460upx;
+	height:80upx;
+	border-radius:40upx;
+}
+.marginT50auto{
+		margin: 50upx auto 0 auto;
+}
+.font28{
+	font-size: 28upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.font24{
+	font-size: 24upx;
+}
+.color999999{
+	color: #999999;
+}
+.pB30{
+	padding-bottom: 30upx;
+}
+</style>
diff --git a/components/template/positionList.vue b/components/template/positionList.vue
new file mode 100644
index 0000000..48d48ea
--- /dev/null
+++ b/components/template/positionList.vue
@@ -0,0 +1,8 @@
+<template>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/components/template/postList.vue b/components/template/postList.vue
new file mode 100644
index 0000000..ca0b03c
--- /dev/null
+++ b/components/template/postList.vue
@@ -0,0 +1,1415 @@
+<template>
+	<view class="postList">
+		<!-- 帖子列表循环模板 -->
+		<view class="postListMb" @click="goPostDetails">
+			<view class="zd" v-if="itemInfos.top >0">
+				<text></text>
+				<image :src="imgfixUrls+'merchant/zd.png'" />
+			</view>
+			<view class="postListMbPackage">
+				<!-- 头部信息 -->
+				<view class="postListMbTitle">
+					<view class="postListMbTitleLeft">
+						<view class="postListHead" @click.stop="goHome(itemInfos.mid)">
+							<image :src="itemInfos.avatar" />
+						</view>
+						<text style="display: inline-block;width: 260upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ itemInfos.nickname }}</text>
+						<view class="post-label">
+							<image :src="imgfixUrls+'merchant/smrz.png'" v-if="!!itemInfos.attestation && itemInfos.attestation.attestation == 1" />
+							<!-- <image :src="imgfixUrl+'merchant/qyrz.p'ng" /> -->
+							<image :src="imgfixUrls+'merchant/gfrz.png'" v-if="!!itemInfos.attestation && itemInfos.attestation.bondflag == 1" />
+						</view>
+						<view class="hb" v-if="itemInfos.package > 0"><text>红包</text></view>
+					</view>
+					<view class="postListMbTitleRight">
+						<text>{{ itemInfos.type==''?itemInfos.onetype:itemInfos.type }}</text>
+					</view>
+				</view>
+				<!-- 头部信息 -->
+				<!-- 标签 -->
+				<view class="labelList">
+					<!-- 标签循环模板 -->
+					<view class="labelMb" :style="{ color: textTip_color[indexs % textTip_color.length].color,border:textTip_color[indexs % textTip_color.length].border }"
+					 v-for="(items, indexs) in itemInfos.keyword" :key="indexs">
+						<text>{{ items }}</text>
+					</view>
+					<!-- 标签循环模板 -->
+				</view>
+				<!-- 标签 -->
+
+				<!-- 正文区域 -->
+				<view class="postListText">
+					<view :class="textList.indexOf(indexNumber) !== -1 ? 'fullText' : 'postListTextMain'">
+						<text>{{ itemInfos.content }}</text>
+						<!-- <view v-html="itemInfos.content"></view> -->
+					</view>
+					<text @click.stop="fullText(indexNumber)" v-if="itemInfos.content.length > 50">{{ textTips }}</text>
+				</view>
+				<!-- 正文区域 -->
+
+				<!-- 图文区域 -->
+				<view class="postListMbImg" >
+					<!-- 图片循环模板 -->
+					<view class="postListMbImgShow" v-for="(items, indexs) in itemInfos.img" @click.stop="imgPre(indexs,itemInfos.img)" :key="indexs">
+						<image :src="items" mode="aspectFill" />
+					</view>
+					<!-- #ifdef H5 -->
+					<!-- <video id="myvideo" :src="itemInfos.video_link"  class="postListMbImgShow" v-if="!!itemInfos.video_link&&itemInfos.img.length!=0"
+					 :poster='itemInfos.video_img_link' @click.stop="" :controls="false" show-center-play-btn="false"></video> -->
+					<!-- #endif -->
+					
+					<view  style="position: relative;">
+						<video id="myvideo" :src="itemInfos.video_link"  class="postListMbImgShow" v-if="!!itemInfos.video_link&&itemInfos.img.length!=0"
+						 :poster='poster' @click.stop=""  :show-center-play-btn="false"></video>
+						 <view class="postListMbImgShow" 
+						 @click.stop="playing(itemInfos.video_link)" 
+						 style="font-size: 40upx;
+						 position: absolute;
+						 left:0;top: 0;
+						 width: 200upx;
+						 height: 200upx;
+						 color: #FFFFFF;
+						 text-align: center;
+						 line-height: 200upx;" 
+						 v-if="!!itemInfos.video_link&&itemInfos.img.length!=0">
+						 </view>
+					</view>
+					
+					
+					
+					<!-- 图片循环模板 -->
+				</view>
+				<!-- 图文区域 -->
+
+				<view v-if="!!itemInfos.video_link&&itemInfos.img.length==0" style="position: relative;" class="videoNewBox">
+					<!-- <view class="videoPlay" @click="playing" style="font-size: 28upx;">
+						播放
+					</view> -->
+					<!-- #ifdef H5 -->
+					<video id="myvideo" @click.stop="" :src="itemInfos.video_link" @fullscreenchange="videoControl" class="videoPlay" :poster='poster'></video>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<video id="myvideo" @click.stop="" :src="itemInfos.video_link"  class="videoPlay" :poster='poster' @loadedmetadata="changeSize"
+							:style="{width:videoWidth, height: videoHeight}" @play="stopOther()"></video>
+					<!-- <video id="myvideo" :src="itemInfos.video_link"  @fullscreenchange="videoControl" class="videoPlay" :poster='poster'></video> -->
+					<!-- <view class="videoPlay" style="position: absolute;left: 0;top: 0;" @click.stop="playing(itemInfos.video_link)">
+						
+					</view> -->
+					<!-- #endif -->
+					
+				</view>
+
+				<!-- 帖子流量 -->
+				<view class="postListMbFlow">
+					<view class="postListMbFlowLeft">
+						<text>
+							阅读
+							<text>{{ itemInfos.look }}</text>
+						</text>
+						<text>
+							<!-- 分享
+							<text>{{ itemInfos.share }}</text> -->
+						</text>
+						<text>{{ itemInfos.createtime }}发布</text>
+					</view>
+					<view class="postListMbFlowRight">
+						<view class="postListMbFlowRightPackage" @click.stop="show1">
+							<view class="dot"></view>
+							<view class="dot"></view>
+						</view>
+						<view class="operationShow" :style="{width: itemInfos.phone?'440rpx':'300rpx',right:itemInfos.phone?'480rpx':'340rpx'}" v-if="indexShow == indexNumber">
+							<view @click.stop="fabulous">
+								<image :src="imgfixUrls+'merchant/xx.png'" v-if="itemInfos.is_fabulous == 0" />
+								<image :src="imgfixUrls+'merchant/xin.png'" v-else />
+								<span>赞</span>
+							</view>
+							<view @click.stop="replyShow">
+								<image :src="imgfixUrls+'merchant/pl.png'" />
+								<span>评论</span>
+							</view>
+							<view @click.stop="kfPhone" v-if="itemInfos.phone">
+								<image :src="imgfixUrls+'merchant/dh.png'" />
+								<span>电话</span>
+							</view>
+							<view class="operationView" :style="{marginLeft:itemInfos.phone?'0rpx':'0rpx'}"></view>
+						</view>
+					</view>
+				</view>
+				<!-- 帖子流量 -->
+
+				<!-- 评论区域 -->
+				<view class="postListMbComment" :key="itemInfos.fabulous_num" v-if="(itemInfos.fabulous_num !== 0) || (itemInfos.comment_list&&(!!itemInfos.comment_list.list && itemInfos.comment_list.list.length !== 0))">
+					<!-- 点赞人数 -->
+					<view class="sj">
+
+					</view>
+					<view class="postListMbCommentTitle" v-if="itemInfos.fabulous_num !== 0" :key="itemInfos.fabulous_num">
+						<view class="postListMbCommentTitlePackage">
+							<view class="col-9 dianzan-icon iconfont icon-zan1"></view>
+							<text>{{ itemInfos.fabulous_num }}人</text>
+							<!-- 点赞头像循环 -->
+							<!-- #ifndef H5 -->
+							<view class="zanHead" v-for="(item, index) in itemInfos.fabulous_avatar" :key="index">
+								<image :src="item" />
+							</view>
+							<!-- #endif -->
+							<!-- #ifdef H5 -->
+							<view class="zanHead" v-for="(item, index) in itemInfos.fabulous_avatar" :key="index">
+								<image :src="item?item:''" />
+							</view>
+							<!-- #endif -->
+
+							<!-- 点赞头像循环 -->
+							<!-- 点赞防抖动 -->
+							<view class="zanHeadFd"></view>
+							<!-- 点赞防抖动 -->
+						</view>
+
+					</view>
+					<!-- 点赞人数 -->
+					<view class="postListMbCommentBody" v-if="!!itemInfos.comment_list && (!!itemInfos.comment_list.list && itemInfos.comment_list.list.length !== 0)">
+						<view class="postListMbCommentBodyPackage">
+							<!-- 评论循环模板 -->
+							<view v-for="(items, indexs) in comment_list.list" @click.stop="answerPop(items.id, items.mid, items, items.nickname)" :key="indexs"
+							 class="marB5" v-if="comment_list.list">
+								<text class="member">{{ items.nickname }}</text>
+								<text class="maohao">:</text>
+								<text class="memberMain">{{ items.content }}</text>
+								<view class="menbottom" v-if="items.mid == myMid">
+									<text class="f-24 iconfont icon-bianji" @click.stop="replyShow(items,indexs)" style="color: #80A9D6;padding-right: 20upx;font-size: 20upx;"></text>
+									<text class="f-24 col-f4 iconfont icon-delete" style="font-size: 20upx;" @click.stop="deleteCommit(items,indexs)"></text>
+								</view>
+								<view v-for="(itemss, indexss) in items.list" @click.stop="answerPop(items.id, itemss.smid, itemss, itemss.reply_name)" :key="indexss"
+								 class="marB5" v-if="items.list">
+									<text class="member">{{ itemss.reply_name }}</text>
+									<text class="hf">回复</text>
+									<text class="member1">{{ itemss.name }}</text>
+									<text class="maohao">:</text>
+									<text class="memberMain">{{ itemss.content }}</text>
+									<view class="menbottom" v-if="itemss.smid == myMid">
+										<text class="f-24 iconfont icon-bianji" style="color: #80A9D6;padding-right: 20upx;font-size: 20upx;" @click.stop="answerPop(items.id, items.smid, itemss, itemss.reply_name,indexs,indexss)"></text>
+										<text class="f-24 col-f4 iconfont icon-delete" style="font-size: 20upx;" @click.stop="deleteCommitIn(itemss,indexs,indexss)"></text>
+									</view>
+								</view>
+							</view>
+							<!-- 评论循环模板 -->
+						</view>
+					</view>
+				</view>
+				<!-- 评论区域 -->
+			</view>
+		</view>
+		<!-- 帖子列表 -->
+
+		<!-- 评论框 -->
+		<PopManager :show="replyShow1" @clickmask="replyClose" :type="replyType">
+			<view class="replyView" >
+				<view class="replyViewPackage" >
+					<view class="replyInput" ><textarea placeholder="评论" v-model="text" @blur="lose" v-if="replyShow1"></textarea></view>
+					<view class="sendButton" @click="comment()" ><text>发送</text></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 评论框 -->
+		
+		<!-- 视频 -->
+		<PopManager :show="videoshow" @clickmask="videoshow = false" type="center">
+			<view  v-if="videoshow" style="width: 100vw;height: 100vh;position: relative;">
+				<video id="myvideo" :src="videolint" @fullscreenchange="videoControl"  style="width: 100%;height: 100%;"
+				 :poster='poster' @click.stop="" :show-fullscreen-btn="false" autoplay ></video>
+				 <view  style="position: absolute;left: 30upx;top: 30upx;color: #ffffff;padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(255,255,255,0.3);" @click="videoshow = false">
+				 	<text class="iconfont icon-roundleftfill" style="font-size: 36upx;"></text>
+					<text class="f-36">返回</text>
+				 </view>
+			</view>
+		</PopManager>
+		
+		<!-- 回复框 -->
+		<PopManager :show="answerShow1" @clickmask="replyClose" :type="replyType">
+			<view class="replyView" v-if="answerShow1">
+				<view class="replyViewPackage" v-if="answerShow1">
+					<view class="replyInput" v-if="answerShow1"><textarea placeholder="回复:" v-model="answerText" @blur="lose" v-if="answerShow1"></textarea></view>
+					<view class="sendButton" @click="reply" v-if="answerShow1"><text>发送</text></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 回复框 -->
+
+		<!-- 遮罩层 -->
+		<view class="coverView" v-if="coverShow == true" :style="{ height: phoneHight }" @click="coverClosePop"></view>
+		<!-- 遮罩层 -->
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	import PopManager from '@/components/template/PopManager';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+
+	export default {
+		components: {
+			PopManager,
+			PhoneMask,
+			getvxphone
+		},
+		props: {
+			// 帖子信息
+			itemInfo: {
+				type: Object,
+				default: {}
+			},
+			indexNumber: {// 当前帖子在列表中的索引
+				type: Number,
+				default: 0
+			},
+			indexShow: {
+				type: Number,
+				default: -1
+			},
+			currentPlay: {// 当前播放的视频在列表中的索引
+				type: Number | String
+			},
+			stopVideo: {
+				type: Number
+			},
+		},
+		data() {
+			return {
+				itemInfos: {
+					attestation: '',
+					avatar: "",
+					comment_list: [],
+					content: "",
+					createtime: "",
+					fabulous_avatar: [],
+					fabulous_num: null,
+					id: "",
+					img: [],
+					is_fabulous: null,
+					keyword: [],
+					look: "",
+					mid: "",
+					nickname: "",
+					onetype: "",
+					package: "",
+					phone: "",
+					share: "",
+					top: "",
+					type: "",
+				},
+				videolint:'',
+				popShow: false,
+				vxshow:false,
+				comment_list: [],
+				show: false,
+				replyShow1: false,
+				answerShow1: false,
+				coverShow: false,
+				// 评论展示方向
+				replyType: 'center',
+				text: '',
+				phoneHight: 0,
+				cid: null,
+				amid: null,
+				answerText: '',
+				items: null,
+				answerName: '',
+				videoshow:false,
+				textList: [],
+				textTips: '全文',
+				videoContext:null,
+				fabulous_num: null,
+				fabulous_avatar: null,
+				isComment: false,
+				myMid:0,
+				commitem:null,
+				poster:'',
+				textTip_color: [{
+						color: '#2196F3',
+						border: '0.5px solid #2196F3'
+					},
+					{
+						color: '#25DC4C',
+						border: '0.5px solid #25DC4C'
+					},
+					{
+						color: '#F58F57',
+						border: '0.5px solid #F58F57'
+					},
+					{
+						color: '#A59DD1',
+						border: '0.5px solid #A59DD1'
+					},
+					{
+						color: '#DBB065',
+						border: '0.5px solid #DBB065'
+					}
+				],
+				videoWidth: '0px',
+				videoHeight: '0px',
+				listVideoHeight: '40vw',
+				query: ''
+			};
+		},
+		watch: {
+			itemInfo: {
+				handler(newValue, oldValue) {
+					let _this = this;
+					for (let key in newValue) {
+						_this.itemInfos[key] = newValue[key]
+					}
+					//_this.init();
+				},
+				deep: true, //对象内部的属性监听，也叫深度监听
+				immediate: true //immediate表示在watch中首次绑定的时候，是否执行handler，值为true则表示在watch中声明的时候，就立即执行handler方法，值为false，则和一般使用watch一样，在数据发生变化的时候才执行handler
+			},
+			stopVideo: {
+				handler(newVal, oldVal){
+					if(!!this.itemInfos.video_link){
+						if(this.indexNumber!==this.currentPlay){
+							// 正在播放其他视频
+							this.videoContext.stop();
+						}else{
+							// 滚动页面
+							this.query.select('.videoNewBox').boundingClientRect(data=>{
+								if(data){
+									if((data.top==160 || data.top<160) && this.indexNumber==this.currentPlay){//掌上信息
+										console.log('视频暂停');
+										this.videoContext.stop();
+									}
+								}
+							}).exec();
+						}
+					}
+				}
+			}
+		},
+		mounted() {
+			let _this = this;
+			_this.poster = uni.getStorageSync('platformInfor').videoimg;
+			_this.myMid = uni.getStorageSync('userinfo').mid;
+			for (let key in _this.itemInfo) {
+				_this.itemInfos[key] = _this.itemInfo[key]
+			}
+			_this.init();
+		},
+		onReady(){
+			// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+			this.videoContext = uni.createVideoContext('myvideo', this);
+			this.videoContext.requestFullScreen();
+			this.query = uni.createSelectorQuery().in(this);
+		},
+		onShow() {
+			let _this = this;
+			_this.isComment = false;
+		},
+		methods: {
+			deleteCommitIn(item,index,i){
+				let _this = this;
+				let datas = {
+					id:item.id,
+					type:0
+				}
+				App.showError(
+					`确认删除此条回复?`,
+					data => {
+						if (data.confirm) {
+						App._post_form('&p=pocket&do=changeReply', datas, res => {
+							_this.replyShow1 = false;
+							_this.show = false;
+							_this.answerShow1 = false;
+							_this.coverShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.isComment = false;
+							})
+							_this.comment_list.list.map((items,indexs)=>{
+								if(index == indexs){
+									items.list.map((itemss,indexss)=>{
+										if(indexss == i){
+											_this.comment_list.list[indexs].list.splice(indexss,1);
+										}
+									})
+								}
+							})
+						},fail=>{
+							_this.isComment = false;
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+							}
+					},
+					true
+				);
+			},
+			deleteCommit(item,index){
+				let _this = this;
+				let datas = {
+					id:item.id,
+					type:0
+				}
+				App.showError(
+					`确认删除此条评论?`,
+					data => {
+						if (data.confirm) {
+						App._post_form('&p=pocket&do=changeComment', datas, res => {
+							_this.replyShow1 = false;
+							_this.show = false;
+							_this.answerShow1 = false;
+							_this.coverShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.isComment = false;
+							})
+							_this.comment_list.list.map((item,indexs)=>{
+								if(index == indexs){
+									_this.comment_list.list.splice(indexs,1);
+								}
+							})
+						},fail=>{
+							_this.isComment = false;
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+							}
+					},
+					true
+				);
+				
+			},
+			videoControl(e){
+				console.log(e)
+				if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+					this.videoContext.play();
+				}else{
+					//停止播放
+					// this.videoContext.stop();   各位老板不要选择stop 选择了stop 缩小视频还会自动播放
+					this.videoContext.pause();
+				}
+			},
+			playing(lint) {
+				this.videoshow = true;
+				this.videolint = lint;
+			        // 获取当前视频id
+			        // let currentId = e.currentTarget.dataset.id
+			        // uni.createVideoContext获取视频上下文对象
+					this.videoContext.requestFullScreen({
+						direction:0
+					})
+			         
+			 },
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			goHome(mid) {
+				let _this = this;
+				if (mid > 0) {
+					App.navigationTo({
+						url: 'pages/subPages/homepage/homepage/homepage?mid=' + mid + '&checkType=' + 1
+					});
+				}
+			},
+			imgPre(index, imgList) {
+				this.$emit('lookimg');
+				uni.previewImage({
+					current: imgList[index],
+					urls: imgList
+				});
+			},
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				_this.itemInfos.comment_list = !!_this.itemInfo.comment_list ? _this.itemInfo.comment_list : "";
+				_this.fabulous_avatar = _this.itemInfos.fabulous_avatar;
+				_this.fabulous_num = _this.itemInfos.fabulous_num;
+				_this.comment_list = !!_this.itemInfo.comment_list ? _this.itemInfo.comment_list : "";
+
+			},
+
+			goPostDetails() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/postDetails/postDetails?id=' + _this.itemInfos.id
+				});
+			},
+			// 遮罩层关闭
+			coverClosePop() {
+				let _this = this;
+				_this.$emit('operationShow', -1);
+				_this.coverShow = false;
+				_this.show = false;
+				_this.replyShow1 = false;
+				_this.answerShow1 = false;
+			},
+			lose() {
+				// #ifdef H5
+				// document.body.scrollTop = document.documentElement.scrollTop = 0;
+				// #endif
+			},
+			// 帖子评论
+			comment() {
+				let _this = this,
+					data = {
+						text: _this.text,
+						id: _this.itemInfos.id
+					};
+				if (_this.isComment) return
+				_this.isComment = true;
+				setTimeout(()=>{
+					_this.isComment = false;
+				},1000)
+				// debugger
+				if(_this.commitem != null && _this.commitem.index>= 0){
+					if(_this.text == _this.commitem.item.content){
+						uni.showToast({
+							icon:'none',
+							title:'请先进行修改'
+						});
+						return
+					}
+					// console.log(_this.item.)
+					let datas = {
+						id:_this.commitem.item.id,
+						type:1,
+						text:_this.text
+					}
+					App._post_form('&p=pocket&do=changeComment', datas, res => {
+						_this.replyShow1 = false;
+						_this.show = false;
+						_this.answerShow1 = false;
+						_this.coverShow = false;
+						App.showSuccess('评论修改成功', () => {
+							_this.isComment = false;
+						})
+						_this.comment_list.list.map((item,index)=>{
+							if(index == _this.commitem.index){
+								item.content = _this.text;
+							}
+						})
+						_this.text = '';
+					},fail=>{
+						_this.isComment = false;
+							if (fail.data.message == '未绑定手机号') {
+								//#ifdef H5
+								_this.popShow = true;
+								//#endif
+								//#ifndef H5
+								_this.vxshow = true;
+								//#endif
+								
+							}
+					});
+				}else{
+					App._post_form('&p=pocket&do=comment', data, res => {
+						_this.replyShow1 = false;
+						_this.show = false;
+						_this.answerShow1 = false;
+						_this.coverShow = false;
+					
+						App.showSuccess('评论成功', () => {
+							_this.isComment = false;
+						})
+						let plPush = {
+							nickname: uni.getStorageSync('userinfo').nickname,
+							mid:res.data.amid,
+							smid:res.data.amid,
+							id:res.data.cid,
+							content: _this.text,
+							list:[]
+						};
+						_this.comment_list.list.unshift(plPush);
+					
+						_this.text = '';
+					},fail=>{
+						_this.isComment = false;
+							if (fail.data.message == '未绑定手机号') {
+								//#ifdef H5
+								_this.popShow = true;
+								//#endif
+								//#ifndef H5
+								_this.vxshow = true;
+								//#endif
+								
+							}
+					});
+				}
+				
+				
+			},
+			show1() {
+				let _this = this;
+				if (_this.indexShow === _this.indexNumber) {
+					_this.$emit('operationShow', -1);
+					_this.coverShow = false;
+				} else {
+					_this.$emit('operationShow', _this.indexNumber);
+					_this.coverShow = true;
+				}
+			},
+			// 展开全文
+			fullText(index) {
+				let _this = this;
+				if (_this.textList.indexOf(index) == -1) {
+					_this.textList.push(index);
+					_this.textTips = '收起';
+				} else {
+					_this.textTips = '展开全文';
+					for (let i = 0; i < _this.textList.length; i++) {
+						if (_this.textList[i] == index) {
+							_this.textList.splice(i, 1);
+						}
+					}
+				}
+			},
+			// 拨打电话
+			kfPhone() {
+				let _this = this;
+				_this.$emit('operationShow', -1);
+				_this.replyShow1 = false;
+				_this.answerShow1 = false;
+				_this.show = false;
+				_this.coverShow = false;
+				uni.showModal({
+					title: '联系客户',
+					content: _this.itemInfos.phone,
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: _this.itemInfos.phone //仅为示例
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			// 回复弹窗
+			answerPop(cid, amid, items, name,index,indexs) {
+				let _this = this;
+				// debugger
+				_this.$emit('operationShow', -1);
+				_this.answerShow1 = true;
+				_this.cid = cid;
+				_this.amid = amid;
+				_this.items = items;
+				_this.$set(_this.items,'index',index);
+				_this.$set(_this.items,'indexs',indexs)
+				if(index == 0 || index){
+					_this.answerText = _this.items.content;
+				}
+				_this.answerName = name;
+				console.info(_this.answerName);
+			},
+			// 关闭评论弹窗
+			replyClose() {
+				let _this = this;
+				_this.replyShow1 = false;
+				_this.answerShow1 = false;
+				_this.show = false;
+				_this.coverShow = false;
+				_this.commitem = null;
+				_this.items = {};
+			},
+			// 评论按钮
+			replyShow(item,index) {
+				let _this = this;
+				console.log(item,index)
+				if(!!item && item.type != 'click'){
+					_this.commitem = {}
+					_this.commitem.item = item;
+					_this.text = item.content;
+					console.log(_this.text)
+					_this.commitem.index = index;
+				}else{
+					_this.commitem = null;
+				}
+				_this.$emit('operationShow', -1);
+				this.replyShow1 = true;
+			},
+			// 回复评论
+			reply() {
+				let _this = this;
+				let data = {
+					id: _this.itemInfos.id,
+					cid: _this.cid,
+					amid: _this.amid,
+					text: _this.answerText
+				};
+				
+				if (_this.isComment) return
+				_this.isComment = true;
+				setTimeout(()=>{
+					_this.isComment = false;
+				},1000)
+				if(_this.items.index == 0 || !!_this.items.index){
+					if(_this.answerText == _this.items.content){
+						uni.showToast({
+							icon:'none',
+							title:'请先进行修改'
+						});
+						return
+					}
+					let datas = {
+						id:_this.items.id,
+						type:1,
+						text:_this.answerText
+					}
+					App._post_form('&p=pocket&do=changeReply', datas, res => {
+						App.showSuccess('修改回复成功', () => {
+							_this.isComment = false;
+						})
+						_this.comment_list.list.map((item,index)=>{
+							if(index == _this.items.index){
+								item.list.map((itemss,indexss)=>{
+									if(indexss == _this.items.indexs){
+										_this.$set(itemss,'content',_this.answerText)
+									}
+								})
+							}
+						})
+						_this.answerText = '';
+						_this.answerShow1 = false;
+						_this.replyShow1 = false;
+						console.log(res.data.message,'ahaha')
+					})
+				}else{
+					App._post_form('&p=pocket&do=reply', data, res => {
+						console.log(res)
+						App.showSuccess('回复成功', () => {
+							_this.isComment = false;
+						})
+						if (_this.items !== null) {
+							let list = {
+								id:res.data,
+								smid: uni.getStorageSync('userinfo').mid,
+								reply_name: uni.getStorageSync('userinfo').nickname,
+								name: _this.answerName,
+								content: _this.answerText
+							};
+							_this.comment_list.list.map((item,index)=>{
+								if(item.id == _this.cid && item.mid == _this.amid){
+									console.log(12212121212,item)
+									item.list.push(list);
+								}
+							})
+							// _this.items.list.push(list);
+						}
+						_this.answerText = '';
+						_this.answerShow1 = false;
+						_this.replyShow1 = false;
+						console.log(res.data.message,'ahaha')
+					})
+				}
+				// App._post_form('&p=pocket&do=reply', data, res => {
+				// 	App.showSuccess('回复成功', () => {
+				// 		_this.isComment = false;
+				// 	})
+				// 	if (_this.items !== null) {
+				// 		let list = {
+				// 			amid: uni.getStorageSync('userinfo').mid,
+				// 			reply_name: uni.getStorageSync('userinfo').nickname,
+				// 			name: _this.answerName,
+				// 			content: _this.answerText
+				// 		};
+				// 		_this.items.list.push(list);
+				// 	}
+				// 	_this.answerText = '';
+				// 	_this.answerShow1 = false;
+				// 	console.log(res.data.message,'ahaha')
+				// },fail=>{
+				// 			if (fail.data.message == '未绑定手机号') {
+				// 				//#ifdef H5
+				// 				_this.popShow = true;
+				// 				//#endif
+				// 				//#ifndef H5
+				// 				_this.vxshow = true;
+				// 				//#endif
+								
+				// 			}
+				// 	})
+			},
+			// 帖子点赞
+			fabulous() {
+				let _this = this;
+				let data = {
+					id: _this.itemInfos.id
+				};
+				App._post_form('&p=pocket&do=fabulous', data, res => {
+					_this.$emit('operationShow', -1);
+					_this.replyShow1 = false;
+					_this.answerShow1 = false;
+					_this.show = false;
+					_this.coverShow = false;
+					if (_this.itemInfos.is_fabulous == 1) {
+						uni.showToast({
+							icon: 'none',
+							title: '取消点赞',
+							duration: 2000
+						});
+						_this.$emit('getover',_this.itemInfos.id,false);
+					} else {
+							uni.showToast({
+								icon: 'none',
+								title: '点赞成功',
+								duration: 2000
+							});
+							_this.$emit('getover',_this.itemInfos.id,true);
+					}
+				});
+			},
+			changeSize(e){
+				console.log(e.detail.width, e.detail.height, e.detail.duration);
+				if(e.detail.width > e.detail.height){
+					this.videoWidth = '77vw';
+					this.videoHeight = e.detail.height/e.detail.width*77+'vw';
+				}else if(e.detail.width < e.detail.height){
+					this.videoHeight = this.listVideoHeight;
+					this.videoWidth = e.detail.width/e.detail.height*40+'vw';
+				}
+			},
+			stopOther(){
+				this.$emit('changePlay', this.indexNumber);
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.replyViewPackage {
+		padding: 30upx;
+	}
+
+	.coverView {
+		z-index: 2;
+		position: fixed;
+		top: 84upx;
+		background: rgba(0, 0, 0, 0);
+		width: 750upx;
+	}
+
+	.replyInput {
+		background: rgba(248, 248, 248, 1);
+		width: 500upx;
+		height: 200upx;
+		vertical-align: middle;
+		margin: 20upx auto 0 auto;
+		background: white;
+		font-size: 24upx;
+		font-family: Source Han Sans CN;
+
+		color: rgba(51, 51, 51, 1);
+
+		>textarea {
+			background: rgba(248, 248, 248, 1);
+			width: 500upx !important;
+			height: 200upx !important;
+		}
+	}
+
+	.sendButton {
+		text-align: center;
+		margin: 20upx auto 0 auto;
+		width: 292upx;
+		height: 74upx;
+		background: #3388ff;
+		border-radius: 37upx;
+
+		>text {
+			line-height: 74upx;
+			font-size: 24upx;
+
+
+			color: #ffffff;
+		}
+	}
+
+	.replyView {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		width: 600upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20upx;
+		background: #f8f8f8;
+	}
+
+	.operationView {
+		transform: rotate(45deg);
+		display: inline-block;
+		position: relative;
+		bottom: 3upx;
+		left: 15upx;
+		width: 38upx;
+		height: 38upx;
+		background: rgba(51, 51, 51, 1);
+		border: 1upx solid rgba(51, 51, 51, 1);
+	}
+
+	.sj {
+		left: 17upx;
+		position: absolute;
+		top: -12upx;
+		transform: rotate(45deg);
+		display: inline-block;
+		width: 30upx !important;
+		height: 30upx !important;
+		background: rgba(248, 248, 248, 1);
+	}
+
+	.operationShow {
+		z-index: 3;
+		position: relative;
+		right: 480upx;
+		bottom: 64upx;
+		width: 440upx;
+		height: 80upx;
+		background: rgba(51, 51, 51, 1);
+		border-radius: 10upx;
+
+		>view:nth-child(1) {
+			margin-left: 42upx;
+
+			>image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-left: 40upx;
+
+			>image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+
+		>view:nth-child(3) {
+			margin-left: 40upx;
+
+			>image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>image {
+				vertical-align: middle;
+			}
+
+			>span {
+				line-height: 80upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	.postList {
+
+		font-size: 0;
+	}
+
+	.zd {
+		display: flex;
+		justify-content: space-between;
+		float: right;
+
+		>image {
+			position: relative;
+			right: 630upx;
+			width: 58upx;
+			height: 58upx;
+		}
+	}
+	
+	.menbottom{
+		display: inline-block;
+		float: right;
+	}
+	
+	.memberMain {
+		padding-left: 10upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 250upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		font-size: 24upx;
+
+
+		color: #999999;
+	}
+
+	.member {
+		vertical-align: middle;
+		font-size: 24upx;
+
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.maohao {
+		vertical-align: middle;
+		font-size: 24upx;
+
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.member1 {
+		vertical-align: middle;
+		margin-left: 10upx;
+		font-size: 24upx;
+
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.hf {
+		vertical-align: middle;
+		margin-left: 10upx;
+		font-size: 24upx;
+
+
+		color: #333333;
+	}
+
+	.postListMbCommentBodyPackage {
+		padding: 15upx 20upx 20upx 20upx;
+	}
+
+	.zan {
+		width: 26upx;
+		height: 27upx;
+	}
+
+	.zanHead {
+		vertical-align: middle;
+		width: 38upx;
+		height: 39upx;
+		border-radius: 50%;
+		overflow: hidden;
+		display: inline-block;
+
+		>image {
+			width: 38upx;
+			height: 39upx;
+		}
+	}
+
+	.zanHeadFd {
+		vertical-align: middle;
+		width: 38upx;
+		height: 39upx;
+		border-radius: 50%;
+		overflow: hidden;
+		display: inline-block;
+	}
+
+	.postListMbCommentTitle {}
+
+	.postListMbCommentTitlePackage {
+		padding: 30upx 20upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+
+		>text {
+			margin-right: 10upx;
+			vertical-align: middle;
+			margin-left: 15upx;
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.postListMbComment {
+		position: relative;
+		margin: 40upx 0 0 0;
+		width: 630upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 4upx;
+	}
+
+	.dot {
+		margin: 20upx 0 0 0;
+		display: inline-block;
+		width: 8upx;
+		height: 8upx;
+		background: rgba(66, 128, 197, 1);
+		border-radius: 50%;
+	}
+
+	.postListMbFlowRightPackage {
+		display: flex;
+		justify-content: space-around;
+		width: 100%;
+		height: 100%;
+	}
+
+	.postListMbFlowRight {
+		display: ;
+		width: 80upx;
+		height: 50upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 6upx;
+	}
+
+	.postListMbFlowLeft {
+		line-height: 50upx;
+		>text {
+			margin-right: 20upx;
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+
+			>text {
+				margin-left: 10upx;
+			}
+		}
+	}
+
+	.postListMbFlow {
+		margin-top: 20upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+
+	.postListMbImgShow {
+		vertical-align: middle;
+		margin-right: 10upx;
+		margin-top: 10upx;
+		width: 200upx;
+		height: 200upx;
+		border-radius: 10upx;
+		overflow: hidden;
+		display: inline-block;
+
+		>image {
+			width: 202upx;
+			height: 202upx;
+		}
+	}
+
+	.videoPlay {
+		width: 630upx;
+		height: 450upx;
+	}
+
+	.postListMbImg {
+		flex-wrap: wrap;
+		margin-top: 20upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.postListTextMain {
+		font-size: 32upx;
+		color: rgba(51, 51, 51, 1);
+		text-overflow: -o-ellipsis-lastline;
+		  overflow: hidden;
+		  text-overflow: ellipsis;
+		  display: -webkit-box;
+		  -webkit-line-clamp: 3;
+		  line-clamp: 3;
+		  -webkit-box-orient: vertical;
+	}
+
+	.postListText {
+		margin-top: 30upx;
+
+		>text {
+			display: inline-block;
+			margin-top: 30upx;
+			font-size: 28upx;
+			color: rgba(66, 128, 197, 1);
+		}
+	}
+
+	.labelList {
+		margin-top: 20upx;
+	}
+
+	.labelMb {
+		margin: 0 10upx 0upx 0;
+		display: inline-block;
+		height: 34upx;
+		border-radius: 4upx;
+		line-height: 30upx;
+
+		>text {
+			padding: 0 10upx;
+			font-size: 20upx;
+		}
+	}
+
+	.postListMbTitleRight {
+		text-align: right;
+		min-width: 100upx;
+
+		>text {
+			line-height: 53upx;
+			font-size: 24upx;
+
+
+			color: rgba(66, 128, 197, 1);
+		}
+	}
+
+	.hb {
+		display: inline-block;
+		vertical-align: middle;
+		width: 63upx;
+		height: 34upx;
+		line-height: 30upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+		margin-left: 10upx;
+
+		>text {
+			font-size: 24upx;
+			font-family: Source Han Sans CN;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.fullText {
+		word-wrap: break-word;
+
+		>text {
+			font-size: 30upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.postListMbTitleLeft {
+		>text {
+			margin-left: 20upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		.post-label {
+			display: inline-block;
+			margin: 0 0 0 20upx;
+			vertical-align: middle;
+			height: 40upx;
+			line-height: 48upx;
+
+			>image {
+				margin-left: 10upx;
+				vertical-align: middle;
+				width: 40upx;
+				height: 40upx;
+			}
+		}
+	}
+
+	.postListHead {
+		display: inline-block;
+		vertical-align: middle;
+		width: 54upx;
+		height: 53upx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		>image {
+			width: 54upx;
+			height: 53upx;
+		}
+	}
+
+	.postListMbTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.full {
+		height: 80upx;
+		text-align: center;
+
+		>text {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: black;
+		}
+	}
+
+	.postListMbPackage {
+		padding: 30upx;
+	}
+
+	.postListMb {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.dianzan-icon {
+		display: inline-block;
+		font-size: 32upx;
+		vertical-align: middle;
+	}
+
+	.marB5 {
+		margin-top: 5upx;
+	}
+</style>
diff --git a/components/template/postListTwo.vue b/components/template/postListTwo.vue
new file mode 100644
index 0000000..897a4a4
--- /dev/null
+++ b/components/template/postListTwo.vue
@@ -0,0 +1,293 @@
+<template>
+	<view class="postListTwo" @click="goPostDetails">
+		<image v-if="itemInfos.img[0]" :src="itemInfos.img[0]" mode="aspectFill" @click.stop="imgPre(itemInfos.shareimg)"></image>
+		<!-- <image v-else :src="itemInfos.video_img_link" mode="aspectFill"></image> -->
+		<video v-else object-fit="cover" :src="itemInfos.video_link" @click.stop="" :poster="itemInfos.video_img_link"></video>
+		<view class="cont">
+			{{itemInfos.content}}
+		</view>
+		<view class="status" v-if="itemInfos.status==1 || itemInfos.status==2">
+			<text v-if="itemInfos.status==1">审核中</text>
+			<text v-if="itemInfos.status==2">未通过</text>
+		</view>
+		<view class="menu" @click.stop="showMenu()" v-if="isMe">•••</view>
+		<view class="pop-wrapper" v-if="isShowMenu" @click.stop="showMenu()">
+			<view class="edit" v-if="itemInfos.status==1 || itemInfos.status==2" @click.stop="edit">编辑</view>
+			<view class="remove" @click.stop="remove">删除</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// import PopManager from '@/components/template/PopManager';
+	// import PhoneMask from '@/components/template/PhoneMask';
+	// import getvxphone from '@/components/template/getVXphone.vue'
+
+	export default {
+		components: {
+			// PopManager,
+			// PhoneMask,
+			// getvxphone
+		},
+		props: {
+			// 帖子信息
+			itemInfo: {
+				type: Object,
+				default: {}
+			},
+			indexNumber: {
+				type: Number,
+				default: 0
+			},
+			indexShow: {
+				type: Number,
+				default: -1
+			},
+			isMe: {
+				type: Boolean
+			}
+		},
+		data() {
+			return {
+				itemInfos: {
+					attestation: '',
+					avatar: "",
+					comment_list: [],
+					content: "",
+					createtime: "",
+					fabulous_avatar: [],
+					fabulous_num: null,
+					id: "",
+					img: [],
+					is_fabulous: null,
+					keyword: [],
+					look: "",
+					mid: "",
+					nickname: "",
+					onetype: "",
+					package: "",
+					phone: "",
+					share: "",
+					top: "",
+					type: "",
+					status: null
+				},
+				comment_list: [],
+				show: false,
+				coverShow: false,
+				text: '',
+				phoneHight: 0,
+				videoContext:null,
+				fabulous_num: null,
+				fabulous_avatar: null,
+				isComment: false,
+				myMid:0,
+				poster:'',
+				isShowMenu: false
+				
+			};
+		},
+		watch: {
+			itemInfo: {
+				handler(newValue, oldValue) {
+					let _this = this;
+					for (let key in newValue) {
+						_this.itemInfos[key] = newValue[key]
+					}
+					//_this.init();
+				},
+				deep: true, //对象内部的属性监听，也叫深度监听
+				immediate: true //immediate表示在watch中首次绑定的时候，是否执行handler，值为true则表示在watch中声明的时候，就立即执行handler方法，值为false，则和一般使用watch一样，在数据发生变化的时候才执行handler
+			}
+		},
+		mounted() {
+			let _this = this;
+			_this.poster = uni.getStorageSync('platformInfor').videoimg;
+			_this.myMid = uni.getStorageSync('userinfo').mid;
+			// console.log(_this.poster, _this.myMid)
+			for (let key in _this.itemInfo) {
+				_this.itemInfos[key] = _this.itemInfo[key]
+			}
+			// console.log(_this.itemInfos)
+			_this.init();
+		},
+		onReady(){
+			// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+			// this.videoContext = uni.createVideoContext('myvideo');
+			// this.videoContext.requestFullScreen();
+		},
+		onShow() {
+			let _this = this;
+			_this.isComment = false;
+		},
+		methods: {
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				_this.itemInfos.comment_list = !!_this.itemInfo.comment_list ? _this.itemInfo.comment_list : "";
+				_this.fabulous_avatar = _this.itemInfos.fabulous_avatar;
+				_this.fabulous_num = _this.itemInfos.fabulous_num;
+				_this.comment_list = !!_this.itemInfo.comment_list ? _this.itemInfo.comment_list : "";
+
+			},
+			show1() {
+				let _this = this;
+				if (_this.indexShow === _this.indexNumber) {
+					_this.$emit('operationShow', -1);
+					_this.coverShow = false;
+				} else {
+					_this.$emit('operationShow', _this.indexNumber);
+					_this.coverShow = true;
+				}
+			},
+			imgPre(url){
+				uni.previewImage({
+					urls: [url]
+				});
+			},
+			goPostDetails() {
+				let _this = this;
+				// App.navigationTo({
+				// 	url: 'pages/subPages/postDetails/postDetails?id=' + _this.itemInfos.id
+				// });
+				App.navigationTo({
+					url: 'pagesA/pictureTextDetails/pictureTextDetails?id=' + _this.itemInfos.id
+				});
+			},
+			showMenu(){
+				this.isShowMenu = !this.isShowMenu;
+			},
+			remove(){
+				let _this = this;
+				let data = {
+					id: _this.itemInfos.id
+				};
+				uni.showModal({
+					title: '提示',
+					content: '确认删除，数据将无法恢复',
+					success(res) {
+						if(res.confirm){
+							App._post_form('&p=pocket&do=delete', data, res => {
+								uni.showToast({
+									icon: 'none',
+									title: '删除成功',
+									duration: 2000
+								});
+								_this.isShowMenu = !_this.isShowMenu;
+								_this.$emit('delet', _this.itemInfos.id);
+							});
+						}else{
+							_this.isShowMenu = !_this.isShowMenu;
+						}
+					}
+				})
+			},
+			edit(){
+				this.isShowMenu = !this.isShowMenu;
+				App.navigationTo({
+					url: 'pages/subPages/postRelease/postRelease?id=' + this.itemInfos.id
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.postListTwo{
+		position: relative;
+		width: 100%;
+		background-color: #fff;
+		border-radius: 8px;
+		overflow: hidden;
+		min-height: 265px;
+		-webkit-transform: translate3d(0, 0, 0);//在圆角元素上加上这个样式,关于ios圆角失效
+		
+		// video{
+		// 	border-top-left-radius: 8px;
+		// 	border-top-right-radius: 8px;
+		// 	overflow: hidden;
+		// }
+	}
+	image, video{
+		width: 100%;
+		height: 200px;
+	}
+	.cont{
+		font-size: 14px;
+		font-weight: bold;
+		line-height: 24px;
+		padding: 5px 10px;
+		display: -webkit-box;
		-webkit-box-orient: vertical;
		-webkit-line-clamp: 2;
		overflow: hidden;
+	}
+	.status{
+		position: absolute;
+		top: 0px;
+		right: 0px;
+		font-size: 12px;
+		color: #fff;
+		background: rgba(0,0,0,0.3);
+		padding: 4px 8px;
+		border-radius: 4px;
+		z-index: 1;
+	}
+	.menu{
+		position: absolute;
+		top: 0px;
+		left: 0px;
+		font-size: 12px;
+		color: #fff;
+		background: rgba(0,0,0,0.3);
+		padding: 4px 8px;
+		border-radius: 4px;
+		z-index: 3;
+	}
+	.pop-wrapper{
+		position: absolute;
+		top: 0px;
+		left: 0px;
+		width: 100%;
+		height: 100%;
+		background: rgba(0,0,0,0.3);
+		z-index: 2;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+
+		.edit{
+			color: #333;
+			background-color: #fff;
+			width: 40px;
+			height: 40px;
+			border-radius: 50%;
+			line-height: 40px;
+			text-align: center;
+			font-size: 12px;
+			margin: 10px;
+		}
+		.edit:hover{
+			background-color: #c6c6c6;
+		}
+		.remove{
+			color: #fff;
+			background-color: #ff6f6f;
+			width: 40px;
+			height: 40px;
+			border-radius: 50%;
+			line-height: 40px;
+			text-align: center;
+			font-size: 12px;
+			margin: 10px;
+		}
+		.remove:hover{
+			background-color: #c85757;
+		}
+	}
+	
+</style>
\ No newline at end of file
diff --git a/components/template/postManage.vue b/components/template/postManage.vue
new file mode 100644
index 0000000..ef55b9e
--- /dev/null
+++ b/components/template/postManage.vue
@@ -0,0 +1,1059 @@
+<template>
+	<view class="postManage">
+		<scroll-view :scroll-y="true" :style="{ height: scollHeight }" @scrolltolower="load" :lower-threshold="0">
+			<!-- 循环模板 -->
+			<view class="pmMb" v-for="(item, index) in postList" @click="goPostDetails(item.id)">
+				<view class="pmMbPackage">
+					<view class="pmMbTitle" v-if="item.status || item.status == 0">
+						<view class="pmMbTitleLeft">
+							<view class="userImg"><image :src="item.avatar" /></view>
+							<span>{{ item.nickname }}</span>
+							<view class="isRed" v-if="item.package !== '0'"><span>红包</span></view>
+						</view>
+						<view class="pmMbTitleRight">
+							<span>{{ item.onetype }}</span>
+						</view>
+					</view>
+					<!-- 置顶标签 -->
+					<view class="pmMbTips" v-if="item.top == 1"><image :src="imgfixUrls + 'merchant/zd.png'" /></view>
+					<view class="pmMbTips" v-else></view>
+					<!-- 置顶标签 -->
+					<!-- 帖子标签 -->
+					<view class="postTips aa f-20"  v-if="item.status || item.status == 0">
+						<!-- 标签循环模板 -->
+						<view
+							v-for="(items, indexs) in item.keyword"
+							:style="{ color: textTip_color[indexs % textTip_color.length].color, border: textTip_color[indexs % textTip_color.length].border }"
+						>
+							<text>{{ items }}</text>
+						</view>
+						<!-- 标签循环模板 -->
+					</view>
+					<!-- 帖子标签 -->
+					<!-- 帖子内容 -->
+					<view class="pmMbMain" :class="textList.indexOf(index) !== -1 ? 'fullText' : 'postListTextMain'">
+						<span>{{ item.content }}</span>
+					</view>
+					<!-- 帖子内容 -->
+
+					<!-- 展示全文 -->
+					<view class="zsQw" @click.stop="fullText(index)" v-if="item.content.length > 50">
+						<span>{{ textList.indexOf(index) !== -1 ? '' : '' }}</span>
+					</view>
+					<!-- 展示全文 -->
+
+					<!-- 图片 -->
+					<view class="postImg">
+						<!-- 循环模板 -->
+						<view v-for="(items, indexs) in item.img"><image :src="items" /></view>
+						<video :src="item.video_link" class="postListMbImgShow" v-if="!!item.video_link && item.img.length != 0"></video>
+						<!-- 循环模板 -->
+					</view>
+					<!-- 图片 -->
+					<view v-if="!!item.video_link && item.img.length == 0" @click.stop="">
+						<video :src="item.video_link" class="videoPlay" id="videoPlay"></video>
+					</view>
+
+					<!-- 底部 -->
+					<view class="pmMbFoot">
+						<view class="pmMbFootLeft">
+							<span>阅读 {{ item.look }}</span>
+							<span>分享 {{ item.share }}</span>
+							<span>{{ item.createtime }}发布</span>
+						</view>
+						<!-- <view class="pmMbFootRight" @click.stop="openPop(item)" v-if="source == 1"><span>管理</span></view> -->
+						<view class="pmMbFootRight1" v-if="source == 2" @click.stop="postCollection(item.id)"><span>取消收藏</span></view>
+					</view>
+					<!-- 底部 -->
+				</view>
+				<!-- 按钮组 -->
+				<view class="dis-flex pmbtn" v-if="item.status || item.status == 0">
+					<view class="f-20 pmstatus" 
+					:style="{backgroundColor: item.status == 0?'#E9FFEE':item.status == 1?'#FFE9E9':item.status == 2?'#F8F8F8':'#ff9000',
+					color: item.status == 0?'#25DC4C':item.status == 1?'#ff4444':item.status == 2?'#999999':'#ffffff'}">
+						{{item.status == 0?'显示中':item.status == 1?'审核中':item.status == 2?'未通过':'未支付'}}
+					</view>
+					<view class="flex-box">
+						
+					</view>
+					<!-- <view class="pmtop" v-if="item.status == 0" @click.stop="isshareShow(item)">
+						刷新
+					</view> -->
+					<view class="pmtop" @click.stop="zdPopShow(item)" v-if=" extension.set.is_openTop == 0 ||  ((CustomerService.payclose == 1 && platform == 'ios')?false:true) && (item.status == 0 || item.status == 1) && item.fullchnnel == 0">
+						置顶
+					</view>
+					<!-- #ifdef H5 -->
+					<!-- <view ><span>分享帖子</span></view> -->
+					<view class="pmtop" v-if="item.status == 0" @click.stop="isshareShow(item)">
+						分享
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<!-- <view class="sharGj">
+						<span></span> -->
+						<button open-type="share" @click.stop="isshareShow(item)" class="pmtop">分享</button>
+					<!-- </view> -->
+					<!-- #endif -->
+					
+					<view class="pmred" v-if="extension.set.is_openRed > 0 || (item.redpackstatus == 0 &&  ((CustomerService.payclose == 1 && platform == 'ios')?false:true) && (item.status == 0 || item.status == 1))" @click.stop="hbPopShow(item)">
+						发红包
+					</view>
+					<view class="f-36 f-w pmd" @click.stop="checked(index)">
+						··
+					</view>
+					<view class="pmboxbtns col-f dis-flex" :style="{'width':extension.set.fullchnnel == 1 && item.top == 0 && item.fullchnnel == 0? '580rpx':'400rpx'}"  v-if="index == indexs">
+						<view class="flex-box  pmcompile" v-if="extension.set.fullchnnel == 1 && item.top == 0 && item.fullchnnel == 0" @click.stop="promotion(item)">
+							<text class="iconfont icon-top" style="font-size: 24upx;padding-right: 10upx;"></text>
+							<view class="f-24 dis-il-block">全局推广</view>
+						</view>
+						<view class="flex-box  pmcompile" @click.stop="refresh(item)">
+							<text class="iconfont icon-refresh" style="font-size: 24upx;padding-right: 10upx;"></text>
+							<view class="f-24 dis-il-block">刷新</view>
+						</view>
+						<view class="flex-box  pmcompile" @click.stop="goSuccessRelease(item)">
+							<text class="iconfont icon-bianji" style="font-size: 24upx;padding-right: 10upx;"></text>
+							<view class="f-24 dis-il-block">编辑</view>
+						</view>
+						<view class="flex-box  pmcompile" @click.stop="deleShow(item)">
+							<text class="iconfont icon-delete" style="font-size: 24upx;padding-right: 10upx;"></text>
+							<view class="f-24 dis-il-block">删除</view>
+						</view>
+						<view class="operationView" :style="{'left':extension.set.fullchnnel == 1 && item.top == 0 && item.fullchnnel == 0? '564rpx':'380rpx'}"></view>
+					</view>
+				</view>
+				<!-- 按钮组 -->
+				<view class="rejection" v-if="item.reason && item.status == '2'">
+					驳回理由：{{item.reason}}
+				</view>
+			</view>
+			<!-- 循环模板 -->
+
+			<!-- 底部填充层 -->
+			<view class="bottomFull"><loadmore :isMore="isMore"></loadmore></view>
+			<!-- 底部填充层 -->
+		</scroll-view>
+
+		<!-- 操作弹窗 -->
+		<PopManager :show="show" :type="type" @clickmask="closePop">
+			<view class="operateView">
+				<view class="operateViewTop">
+					<view v-if="extension.set.is_openRed == 0 || items.package == 0 &&  (CustomerService.payclose == 1 && platform == 'ios')?false:true" @click="hbPopShow"><span>红包推广</span></view>
+					<view @click="zdPopShow" v-if="extension.set.is_openTop == 0 ||  (CustomerService.payclose == 1 && platform == 'ios')?false:true"><span>置顶推广</span></view>
+					<!-- #ifdef H5 -->
+					<view @click="isshareShow"><span>分享帖子</span></view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view class="sharGj">
+						<span>分享帖子</span>
+						<button open-type="share" class="openShare"></button>
+					</view>
+					<!-- #endif -->
+					<view @click="goSuccessRelease"><span>编辑帖子</span></view>
+					<view @click="deleShow"><span>删除帖子</span></view>
+					<view class="close" @click="closePop"><span>关闭</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 操作弹窗 -->
+
+		<!-- 红包操作弹窗 -->
+		<PopManager :show="hbShow" :type="type" @clickmask="closeHbPop">
+			<view class="operateView">
+				<view class="operateViewTop">
+					<scroll-view class="operateScroll" :scroll-y="true">
+						<view v-for="(item, index) in extension.red_list" class="scrollList" @click="createOrder(item.red_price, item.num, 3)">
+							<span>{{ item.red_price }}元红包分{{ item.num }}个</span>
+						</view>
+					</scroll-view>
+					<view class="close" @click="closeHbPop"><span>关闭</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 红包操作弹窗 -->
+
+		<!-- 置顶操作弹窗 -->
+		<PopManager :show="zdShow" :type="type" @clickmask="closeZdPop">
+			<view class="operateView">
+				<view class="operateViewTop">
+					<scroll-view class="operateScroll" :scroll-y="true">
+						<view v-for="(item, index) in extension.list" class="scrollList" @click="createOrder('', item.day, 2)">
+							<span>置顶{{ item.day }}天(收费{{ item.price }}元)</span>
+						</view>
+					</scroll-view>
+					<view class="close" @click="closeZdPop"><span>关闭</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 置顶操作弹窗 -->
+
+		<!-- 分享 -->
+		<!-- #ifdef H5 -->
+		<view class="masking" v-if="isShare" @click="isOpenShare"><image :src="imageRoot + 'share.png'" class="to-share" mode="widthFix"></image></view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import PopManager from '@/components/template/PopManager';
+import loadlogo from '@/components/template/loadlogo';
+import loadmore from '@/components/template/loadmore';
+
+import App from '@/common/js/app.js';
+import AppFunction from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	components: {
+		PopManager,
+		loadlogo,
+		loadmore
+	},
+	props: {
+		// 循环列表数据
+		postList: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		},
+		// 列表高度
+		scollHeight: {
+			type: String,
+			default: ''
+		},
+		// 加载信息
+		isMore: {
+			type: Boolean,
+			default: true
+		},
+		source: {
+			type: Number,
+			default: ''
+		}
+	},
+	data() {
+		return {
+			textTip_color: [
+				{
+					color: '#2196F3',
+					border: '0.5px solid #2196F3'
+				},
+				{
+					color: '#25DC4C',
+					border: '0.5px solid #25DC4C'
+				},
+				{
+					color: '#F58F57',
+					border: '0.5px solid #F58F57'
+				},
+				{
+					color: '#A59DD1',
+					border: '0.5px solid #A59DD1'
+				},
+				{
+					color: '#DBB065',
+					border: '0.5px solid #DBB065'
+				}
+			],
+			textList: [],
+			zsType: 0,
+			zsText: '全文',
+			scdpText: '',
+			loadTips: 0,
+			show: false,
+			type: 'bottom',
+			extension: {},
+			hbShow: false,
+			zdShow: false,
+			items: {},
+			payfor: null,
+			isShare: false, //分享遮罩
+			img:'',
+			CustomerService:{},
+			platform:'',
+			boxbtnshow:false,
+			indexs:null
+		};
+	},
+	mounted() {
+		let _this = this;
+		this.CustomerService = uni.getStorageSync('CustomerService');
+		if(uni.getSystemInfoSync().system.indexOf('Android') === -1){
+			console.log('我是iOS')
+			this.platform ='ios';
+		}else{
+			console.log('我是安卓')
+			this.platform = 'android';
+		}
+		// this.platform=uni.getSystemInfoSync().platform
+		//     if(this.platform=='ios'){
+		//           console.log('我是iOS')
+		//     }else if(this.platform=='android'){
+		//           console.log('我是安卓')
+		//     }
+		_this.img = _this.imgfixUrl;
+		_this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.getExtension();
+		},
+		captureImage() {
+			
+		},
+		checked(index){
+			if(index == this.indexs){
+				this.indexs = null
+			}else{
+				this.indexs = index;
+			}
+			// debugger
+			// this.$emit('check',item.id)
+			
+		},
+		// 展开全文
+		fullText(index) {
+			let _this = this;
+			if (_this.textList.indexOf(index) == -1) {
+				_this.textList.push(index);
+				_this.zsText = '收起';
+			} else {
+				_this.zsText = '展开全文';
+				for (let i = 0; i < _this.textList.length; i++) {
+					if (_this.textList[i] == index) {
+						_this.textList.splice(i, 1);
+					}
+				}
+			}
+		},
+		promotion(items){
+			let _this = this;
+			let data = {
+				id: items.id
+			};
+			App._post_form('&p=pocket&do=channelPocket', data, res => {
+				
+				if(res.data.prcie == 0){
+					uni.showToast({
+						title:'推广成功'
+					})
+				}else{
+					uni.showModal({
+						title: '温馨提示',
+						content: `本次推广需支付${res.data.prcie}元,是否继续?`,
+						success: function(res) {
+							if (res.confirm) {
+								let data = {
+									id: items.id,
+									num: 1,
+									payfor: 6
+								};
+								App._post_form('&p=pocket&do=createOrder', data, reson => {
+									if (reson.errno == 0) {
+										App.navigationTo({
+											url: 'pages/mainPages/payment/payment?orderid=' + reson.data.orderid + '&plugin=pocket&types=' + 1
+										});
+										
+									}
+								});
+							}
+						}
+					})
+				}
+				console.log(res);
+				
+			});
+		},
+		refresh(items){
+			let _this = this;
+			let data = {
+				id: items.id
+			};
+			App._post_form('&p=pocket&do=refreshPocket', data, res => {
+				
+				if(res.data.prcie == 0){
+					
+					this.indexs = null
+					this.$emit('refresh',items.id);
+				}else{
+					uni.showModal({
+						title: '温馨提示',
+						content: `本次刷新需支付${res.data.prcie}元,是否继续?`,
+						success: function(res) {
+							if (res.confirm) {
+								let data = {
+									id: items.id,
+									num: 1,
+									payfor: 4
+								};
+								App._post_form('&p=pocket&do=createOrder', data, reson => {
+									if (reson.errno == 0) {
+										App.navigationTo({
+											url: 'pages/mainPages/payment/payment?orderid=' + reson.data.orderid + '&plugin=pocket&types=' + 1
+										});
+										
+									}
+								});
+							}
+						}
+					})
+				}
+				console.log(res);
+				
+			});
+		},
+		// 跳转编辑帖子
+		goSuccessRelease(items) {
+			let _this = this;
+			_this.show = false;
+			App.navigationTo({
+				url: 'pages/subPages/postRelease/postRelease?id=' + items.id
+			});
+		},
+		// 用户收藏帖子
+		postCollection(id) {
+			let _this = this;
+			let data = {
+				id: id
+			};
+			App._post_form('&p=pocket&do=collection', data, res => {
+				uni.showToast({
+					icon: 'none',
+					title: '取消收藏成功',
+					duration: 2000
+				});
+				for (let i = 0; i < _this.postList.length; i++) {
+					if (_this.postList[i].id == id) {
+						_this.postList.splice(i, 1);
+					}
+				};
+				
+			});
+		},
+		// 分享
+		isOpenShare() {
+			this.isShare = !this.isShare;
+		},
+		isshareShow(item) {
+			let _this = this;
+			_this.items = item;
+			// #ifdef MP-WEIXIN
+			return
+			//#endif
+			let data = {
+				pageinfo: 'pages/subPages/postDetails/postDetails?id=' + _this.items.id
+			};
+			App._post_form(
+				'&do=Shareinfo',
+				data,
+				res => {
+					_this.isShare = true;
+					_this.show = false;
+					_this.shareinfo = res.data;
+					let shareUrl = location.hash,
+						currentPages = shareUrl.split('?')[0],
+						linkurl =
+							location.protocol +
+							'//' +
+							location.hostname +
+							location.pathname +
+							'#/' +
+							'pages/subPages/postDetails/postDetails?id=' +
+							_this.items.id +
+							'&i=' +
+							AppFunction.siteInfo.uniacid,
+						getUserinfo = uni.getStorageSync('userinfo'),
+						cityinfo = uni.getStorageSync('currentRegion'),
+						shareLinkurl = linkurl.indexOf('?') === -1 ? linkurl + '?head_id=' + getUserinfo.mid : linkurl + '&head_id=' + getUserinfo.mid;
+					shareLinkurl = encodeURIComponent(shareLinkurl);
+					wxApi.wxRegister(() => {
+						wxApi.wxShare({
+							title: _this.shareinfo.title || '',
+							link:
+								`${AppFunction.siteInfo.siteroot}/app/index.php?i=${
+									AppFunction.siteInfo.uniacid
+								}&c=entry&m=${AppFunction.siteInfo.name}&do=returnRequest&link=${shareLinkurl}&head_id=${getUserinfo.mid}` || '',
+							imgUrl: _this.shareinfo.img || '',
+							success: function() {
+								
+							},
+							trigger: function(res) {
+								let data = {
+									id: _this.items.id
+								};
+								App._post_form('&p=pocket&do=shareNum', data, res => {
+									Number(_this.items.share);
+									_this.items.share++;
+									console.log('shareNum1111')
+									// uni.showToast({
+									// 	icon: 'none',
+									// 	title: '分享成功',
+									// 	duration: 2000
+									// });
+								});
+							},
+							cancel: function() {}
+						});
+					});
+				},
+				fail => {
+					uni.showToast({
+						icon: 'none',
+						title: '分享失败',
+						duration: 2000
+					});
+				}
+			);
+		},
+		// 跳转帖子详情
+		goPostDetails(id) {
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/subPages/postDetails/postDetails?id=' + id
+			});
+		},
+		// 删除帖子
+		deletePost(items) {
+			let _this = this;
+			let data = {
+				id: items.id
+			};
+			App._post_form('&p=pocket&do=delete', data, res => {
+				uni.showToast({
+					icon: 'none',
+					title: '删除成功',
+					duration: 2000
+				});
+				for (let i = 0; i < _this.postList.length; i++) {
+					if (_this.postList[i].id == _this.items.id) {
+						_this.postList.splice(i, 1);
+					}
+				};
+				this.$emit('delet', items.id);
+			});
+		},
+		// 创建发帖订单
+		createOrder(redPrice, num, payfor) {
+			let _this = this;
+			let data = {
+				id: _this.items.id,
+				num: num,
+				payfor: payfor,
+				money: redPrice
+			};
+			App._post_form('&p=pocket&do=createOrder', data, res => {
+				_this.zdShow = false;
+				_this.hbShow = false;
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=pocket'
+				});
+			});
+		},
+		// 删除提示框
+		deleShow(items) {
+			let _this = this;
+			_this.show = false;
+			uni.showModal({
+				title: '提示',
+				content: '确定删除?删除后数据无法恢复',
+				success: function(res) {
+					if (res.confirm) {
+						_this.deletePost(items);
+					} else if (res.cancel) {
+					}
+				}
+			});
+		},
+		zdPopShow(item) {
+			let _this = this;
+			_this.items = item;
+			_this.show = false;
+			_this.zdShow = true;
+		},
+		// 关闭置顶弹窗
+		closeZdPop() {
+			let _this = this;
+			_this.zdShow = false;
+		},
+		hbPopShow(item) {
+			let _this = this;
+			_this.items = item;
+			_this.show = false;
+			_this.hbShow = true;
+		},
+		// 关闭红包弹窗
+		closeHbPop() {
+			let _this = this;
+			_this.hbShow = false;
+		},
+		// 下拉监听
+		load() {
+			this.loadTips++;
+			this.$emit('loadTips', this.loadTips);
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		openPop(item) {
+			let _this = this;
+			_this.show = true;
+			_this.items = item;
+		},
+		// 发布成功后的扩展操作
+		getExtension() {
+			let _this = this;
+			let data = {};
+			App._post_form('&p=pocket&do=extension', data, res => {
+				_this.extension = res.data;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.postListMbImgShow {
+	vertical-align: middle;
+	margin-right: 10upx;
+	margin-top: 10upx;
+	width: 200upx;
+	height: 200upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	display: inline-block;
+	> image {
+		width: 202upx;
+		height: 202upx;
+	}
+}
+.videoPlay {
+	width: 630upx;
+	height: 450upx;
+}
+.sharGj {
+	position: relative !important;
+}
+.openShare {
+	position: absolute;
+	bottom: 0;
+	height: 105upx;
+	width: 750upx;
+	background: #ffffff;
+	text-align: center;
+	border-bottom: 1upx solid #eeeeee;
+	z-index: 100;
+	opacity: 0;
+}
+.fullText {
+	font-size: 26upx;
+
+	color: rgba(51, 51, 51, 1);
+}
+
+.postListTextMain {
+	font-size: 26upx;
+	color: rgba(51, 51, 51, 1);
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	white-space: normal !important;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+
+.pmMbFootRight1 {
+	width: 122upx;
+	height: 46upx;
+	border: 1upx solid rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+	display: inline-block;
+	text-align: center;
+
+	> span {
+		line-height: 46upx;
+		font-size: 24upx;
+
+		color: rgba(255, 68, 68, 1);
+	}
+}
+
+.scrollList {
+	height: 105upx;
+	width: 750upx;
+	background: #ffffff;
+	text-align: center;
+	border-bottom: 1upx solid #eeeeee;
+
+	> span {
+		line-height: 105upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.operateScroll {
+	height: 533upx;
+}
+
+.close {
+	margin: 20upx 0 0 0;
+}
+
+.operateViewTop {
+	position: relative;
+	> view {
+		height: 105upx;
+		width: 750upx;
+		background: #ffffff;
+		text-align: center;
+		border-bottom: 1upx solid #eeeeee;
+
+		> span {
+			line-height: 105upx;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+
+.operateView {
+	overflow: hidden;
+	width: 750upx;
+	background: #f8f8f8;
+	border-radius: 20upx 20upx 0px 0px;
+}
+
+.bottomFull {
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	background-color: #f8f8f8;
+	
+
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+
+		color: black;
+	}
+}
+
+.pmMbFootLeft {
+	> span {
+		line-height: 37upx;
+		margin-right: 10upx;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+
+.pmMbFootRight {
+	width: 76upx;
+	height: 37upx;
+	background: rgba(66, 128, 197, 1);
+	border-radius: 4upx;
+	text-align: center;
+
+	> span {
+		line-height: 37upx;
+		font-size: 24upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+
+.pmMbFoot {
+	margin: 25upx 0 0 0;
+	display: flex;
+	justify-content: space-between;
+
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+
+.postImg {
+	margin: 20upx 0 0 0;
+
+	> view {
+		margin: 10upx 5upx 0 0;
+		display: inline-block;
+		vertical-align: middle;
+		width: 202upx;
+		height: 202upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 6upx;
+		overflow: hidden;
+
+		> image {
+			width: 202upx;
+			height: 202upx;
+		}
+	}
+}
+
+.zsy {
+	height: auto !important;
+}
+
+.zsQw {
+	margin: 30upx 0 0 0;
+
+	> span {
+		font-size: 28upx;
+
+		color: rgba(66, 128, 197, 1);
+	}
+}
+
+.pmMbMain {
+	overflow: hidden;
+	max-height: 100upx;
+	text-overflow: ellipsis;
+	margin: 20upx 0 0 0;
+
+	> span {
+		font-size: 26upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.pmMbPackage {
+	padding: 30upx;
+	position: relative;
+}
+
+.postManage {
+	font-size: 0;
+	background-color: #f8f8f8 !important;
+}
+
+.pmMb {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.pmbtn{
+	padding-bottom: 30upx;
+	position: relative;
+}
+
+.rejection{
+	padding: 0upx 20upx 30upx;
+	font-size: 24upx;
+	color: #ff4444;
+}
+
+.pmstatus{
+	padding: 0 20upx;
+	height: 40upx;
+	line-height: 40upx;
+	background: #FFE9E9;
+	color: #FF4444;
+	border-radius: 0upx 60upx 60upx 0 ;
+	margin-top: 6upx;
+}
+
+.pmtop{
+	width: 100upx;
+	height: 50upx;
+	font-size: 26upx;
+	line-height: 50upx;
+	text-align: center;
+	border: 1upx solid #cccccc;
+	border-radius: 6upx;
+	margin-left: 20upx;
+	padding: 0;
+	background-color: #ffffff;
+}
+.pmred{
+	width: 111upx;
+	height: 50upx;
+	font-size: 26upx;
+	line-height: 50upx;
+	text-align: center;
+	color: #FF4444;
+	border: 1upx solid #FF4444;
+	border-radius: 6upx;
+	margin-left: 20upx;
+}
+
+.pmd{
+	width: 60upx;
+	height: 50upx;
+	text-align: center;
+	border-radius: 6upx;
+	background-color: #F8F8F8;
+	color: #4280C5;
+	line-height: 50upx;
+	margin-left: 20upx;
+	margin-right: 30upx;
+}
+
+.pmboxbtns{
+	width: 400upx;
+	padding: 25upx 0;
+	position: absolute;
+	background-color: #333333;
+	border-radius: 10upx;
+	right: 110upx;
+	top: -15upx;
+}
+
+.operationView {
+		transform: rotate(45deg);
+		display: inline-block;
+		position: absolute;
+		bottom: 24upx;
+		left: 380upx;
+		width: 28upx;
+		height: 28upx;
+		background: rgba(51, 51, 51, 1);
+		border: 1upx solid rgba(51, 51, 51, 1);
+}
+
+.pmcompile{
+	height: 30upx;
+	line-height: 32upx;
+	text-align: center;
+}
+
+.pmMbTitle {
+	display: flex;
+	justify-content: space-between;
+
+	> view {
+		display: inline-block;
+	}
+}
+
+.pmMbTitleLeft {
+	> view {
+		margin-right: 10upx;
+		vertical-align: middle;
+		display: inline-block;
+	}
+
+	> span {
+		margin-right: 10upx;
+		vertical-align: middle;
+		font-size: 28upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	> image {
+		margin-right: 10upx;
+		vertical-align: middle;
+		width: 40upx;
+		height: 40upx;
+	}
+}
+
+.userImg {
+	width: 54upx;
+	height: 53upx;
+	border-radius: 50%;
+	overflow: hidden;
+
+	> image {
+		width: 54upx;
+		height: 53upx;
+	}
+}
+
+.pmMbTitleRight {
+	> span {
+		line-height: 53upx;
+		font-size: 24upx;
+
+		color: rgba(66, 128, 197, 1);
+	}
+}
+
+.isRed {
+	text-align: center;
+	width: 63upx;
+	height: 31upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+
+	> span {
+		line-height: 31upx;
+		font-size: 24upx;
+		font-family: Source Han Sans CN;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+
+.pmMbTips {
+	display: inline-block;
+	width: 58upx;
+	height: 58upx;
+	position: absolute;
+	left: 0;
+	top: 0;
+	bottom: 80upx;
+	right: 30upx;
+
+	> image {
+		width: 58upx;
+		height: 58upx;
+	}
+}
+
+.postTips {
+	padding-top: 30upx;
+	> view {
+		display: inline-block;
+		border: 1upx solid rgba(33, 150, 243, 1);
+		border-radius: 4upx;
+		height: 31upx;
+		margin-right: 10upx;
+		line-height: 31upx;
+		> text {
+			line-height: 31upx;
+			padding: 0 10upx;
+			font-size: 20upx;
+		}
+	}
+}
+
+.masking {
+	position: fixed;
+	/* 		width: 100%;
+			height: 100%; */
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 100;
+	background: rgba(0, 0, 0, 0.5);
+	/* display: none */
+}
+
+.to-share {
+	position: fixed !important;
+	z-index: 1009;
+	right: 10upx;
+	top: 0;
+	overflow: auto;
+	width: 500upx;
+	height: 380upx;
+}
+</style>
diff --git a/components/template/posterlate.vue b/components/template/posterlate.vue
new file mode 100644
index 0000000..c6a6f85
--- /dev/null
+++ b/components/template/posterlate.vue
@@ -0,0 +1,309 @@
+<template>
+	<view>
+		<scroll-view class="poster" :style="{ height: phoneHight }" :scroll-y="true" :scroll-x="false">
+			<view class="mainPackage">
+				<view class="nHaveList textC">
+					<view class="posterPackage">
+						<image :src="posterList.url" :style="{ height: phoneHight1, width: phoneWidth1 }" class="codeimg" @click="yl(posterList.url)" @load="load" />
+					</view>
+					<!--  #ifdef  H5 -->
+					<view class="nShareTips " v-if="isload">
+						<image :src="imgfixUrls + 'merchant/fx.png'" />
+						<span>长按上图保存图片，或发送给朋友</span>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view class="nShareButton" @click="saveImg(posterList.url)"><text>保存图片</text></view>
+					<!-- #endif -->
+				</view>
+			</view>
+		</scroll-view>
+		<view class="bglist-main b-f padding-box-all" v-if="!!posterList.bg_list&&posterList.bg_list.length>0">
+			<scroll-view :scroll-x="true">
+				<view class="poster-bg">
+					<view v-for="(bgItem,index) in posterList.bg_list" class="poster-bg-item p-r" :style="{'background-image':'url('+bgItem+')'}"
+					 @click="selectPost(bgItem)">
+						<image v-if="curbgImage===bgItem" :src="imgfixUrls + 'posterSelect.png'" mode=""></image>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				posterList: {},
+				id: "",
+				type: 0,
+				phoneHight: null,
+				phoneHight1: null,
+				phoneWidth: null,
+				phoneWidth1: null,
+				windowHeight: null,
+				curbgImage: "",
+				tagrt:null,
+				flag:true,
+				isload:false
+			};
+		},
+		props:{
+			postId:{
+				default:''
+			},
+			postType:{
+				default:''
+			}
+		},
+		mounted(e) {
+			let _this = this;
+			_this.tagrt = e;
+			_this.getPoster(_this.postId, _this.postType);
+			uni.showLoading({
+				title:'海报加载中'
+			});
+			this.isload = false;
+			// _this.setData(_this.tagrt);
+		},
+		methods: {
+			load(){
+				uni.hideLoading();
+				this.isload = true;
+			},
+			saveImg(images) {
+				let _this = this;
+				uni.getImageInfo({
+					src: images,
+					success: function(image) {
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showToast({
+									icon: "none",
+									title: '保存成功',
+									duration: 2000
+								});
+							}
+						});
+					}
+				});
+			},
+			yl(image) {
+				let _this = this;
+				let aa = [];
+				aa.push(image);
+				uni.previewImage({
+					current: aa[0],
+					urls: aa
+				});
+			},
+			// 获取海报信息
+			getPoster(id, type) {
+				let _this = this;
+				let data = {
+					id,
+					type,
+					bg_img: ''
+				};
+				App._post_form('&do=Poster', data, res => {
+					_this.posterList = res.data;
+					uni.getImageInfo({
+						src: res.data.url,
+						success: function(res) {
+							_this.phoneHight1 = uni.upx2px(res.height) + 'px';
+							_this.phoneWidth1 = uni.upx2px(res.width) - 25 + 'px';
+						}
+					});
+					uni.getSystemInfo({
+						success(System_res) {
+							_this.phoneHight = res.data.bg_list.length > 0 ? (System_res.windowHeight -
+								110 + 'px') : System_res.windowHeight + 'px';
+						}
+					});
+					if (res.data.bg_list.length == 0) {
+						_this.type == 0;
+					} else {
+						_this.type == 1;
+					}
+				});
+			},
+			selectPost(bg_img) {
+				this.postRequest(this.id, this.type, bg_img);
+			},
+			postRequest(id, type, bg_img) {
+				let _this = this,
+					requestData = {
+						id,
+						type,
+						bg_img
+					};
+				App._post_form('&do=Poster', requestData, res => {
+					_this.posterList = res.data;
+					_this.curbgImage = bg_img;
+					uni.getImageInfo({
+						src: res.data.url,
+						success: function(res) {
+							_this.phoneHight1 = uni.upx2px(res.height) + 'px';
+							_this.phoneWidth1 = uni.upx2px(res.width) + 'px';
+						}
+					});
+					if (res.data.bg_list.length == 0) {
+						_this.type == 0;
+					} else {
+						_this.type == 1;
+					}
+				});
+			},
+			// 切换图片
+			changeImg(url) {
+				let _this = this;
+				_this.posterList.url = url;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.nShareButton {
+		margin: 30upx auto 0 auto;
+		width: 400upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>text {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.mainPackage {
+		padding-bottom: 60upx;
+		overflow: hidden;
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	page {}
+
+	.poster {
+		// background: #323332;
+		font-size: 0;
+	}
+
+	.nShareTips {
+		margin: 10upx 0 0 0upx;
+
+		>image {
+			vertical-align: bottom;
+			width: 30upx;
+			height: 70upx;
+		}
+
+		>span {
+			vertical-align: bottom;
+			font-size: 30upx;
+			color: white;
+		}
+	}
+
+	.posterPackage {
+		margin: 30upx auto 0 auto;
+
+		>image {
+			width: 650upx;
+			max-height: 78vh;
+			min-width: 80vw;
+		}
+	}
+
+	.yPosterPackage {
+		margin: 30upx auto 0 auto;
+
+		>image {
+			width: 650upx;
+		}
+	}
+
+	.yShareTips {
+		margin: 10upx 0 0 0;
+
+		>image {
+			vertical-align: bottom;
+			width: 30upx;
+			height: 70upx;
+		}
+
+		>span {
+			vertical-align: bottom;
+			font-size: 30upx;
+			color: white;
+		}
+	}
+
+	.navBottom {
+		position: absolute;
+		bottom: 0;
+		width: 750upx;
+		background: white;
+	}
+
+	.posterListMb {
+		display: inline-block;
+		margin: 0 15upx;
+		width: 100upx;
+		height: 100upx;
+		background: red;
+
+		>image {
+			width: 100upx;
+			height: 100upx;
+		}
+	}
+
+	.posterListMbPackage {
+		padding: 30upx 15upx;
+	}
+
+	.bglist-main {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		white-space: nowrap
+	}
+
+	.poster-bg {
+		.poster-bg-item {
+			width: 150upx;
+			height: 150upx;
+			background-size: 150upx 150upx;
+			background-repeat: no-repeat;
+			background-position: center;
+			margin-right: 30upx;
+			display: inline-block;
+			border-radius: 10upx;
+
+			>image {
+				display: block;
+				width: 40upx;
+				height: 40upx;
+				position: absolute;
+				right: 0;
+				bottom: 0;
+			}
+		}
+	}
+</style>
diff --git a/components/template/publicgoodstwo.vue b/components/template/publicgoodstwo.vue
new file mode 100644
index 0000000..862610f
--- /dev/null
+++ b/components/template/publicgoodstwo.vue
@@ -0,0 +1,146 @@
+<template>
+	<view :style="{'background-color':publicgoodstwoData.style.bgColor}">
+		<view :style="{'padding':publicgoodstwoData.style.margin+'px'}">
+			<view class="public-goods padding-box" style="margin-bottom: 20upx;">
+				<view class="public-goodsHeader dis-flex flex-y-center flex-x-between">
+					<view>
+						<view class="public-goodsHeader-title f-36 col-3 m-btm10">{{publicgoodstwoData.params.title}}</view>
+						<view class="public-goodsHeader-subtitle f-24 col-9">{{publicgoodstwoData.params.sub_title}}</view>
+					</view>
+					<view class="f-36 col-3"><text class="f-42">{{ swiperI }}</text>/{{publicgoodstwoDataArr.length}}</view>
+				</view>
+				<view class="public-goodsContent">
+					<swiper :indicator-dots="false" :autoplay="true" :interval="4000" :duration="500" :style="{width: '100%',height: (imgstyle.height) + 140 + 'px'}" class="swiperMain" @change="swiperCg">
+						<swiper-item v-for="(item2, key2) in publicgoodstwoDataArr" :key="key2">
+							<view class="swiper-goodsItem" @click="navigateTo(item2.url)">
+								<view class="swiper-goodsImage m-top-btm20" :style="{'background-image':'url('+item2.long_logo+')',width: (imgstyle.width ) + 'px',height: (imgstyle.height) + 'px',backgroundSize:'100% 100%'}"></view>
+								<view class="swiper-goodsIntor">
+									<view class="f-24 col-9">{{ item2.storename }}
+									<view class="f-24" style="float: right;" v-if="item2.distance">
+										{{item2.distance}}
+									</view>
+									</view>
+									<view class="goodsName dis-flex flex-y-center m-top-btm20" style="margin-bottom: 10upx;">
+										<view class="goodsLabel f-24 col-3 t-c m-right20 f"  v-if="item2.plugin == 'rush' || item2.plugin == 'groupon' || item2.plugin == 'wlfightgroup' || item2.plugin == 'coupon' || item2.plugin == 'bargain'">{{item2.plugin == 'rush'?'抢购':(item2.plugin == 'groupon'?'团购':item2.plugin == 'wlfightgroup'?'拼团':item2.plugin == 'bargain'?'砍价':'优惠券')}}</view>
+										<view class="f-28 col-3 twolist-hidden swiperTitle" style="width: 80%;">{{ item2.goods_name }}</view>
+									</view>
+									<view >
+										<view class="dis-flex flex-y-center flex-x-between">
+											<view class="dis-flex flex-y-center">
+												<view class="goods-price col-f4 f-40 m-right20" v-if="item2.plugin != 'coupon' || item2.is_charge == '1'">{{ item2.price }}元</view>
+												<view class="goods-price col-f4 f-40 m-right20" v-else>免费</view>
+												<view class="vip-goodsPrice dis-flex flex-y-center" v-if="(item2.plugin == 'rush' || item2.plugin == 'groupon' || item2.plugin == 'wlfightgroup') && item2.vipstatus == 1 && item2.discount_price && item2.discount_price !== null && item2.discount_price !== ''">
+													<view class="viplabel m-right10">会员</view>
+													<view class="col-3 f-24">优惠{{ item2.discount_price }}元</view>
+												</view>
+											</view>
+											<view class="buyBtn t-c col-f f-28" v-if="item2.plugin != 'coupon' || item2.is_charge == '1'">{{!!publicgoodstwoData.params.button_name?publicgoodstwoData.params.button_name:'购买'}}</view>
+											<view class="buyBtn t-c col-f f-28" v-else>领取</view>
+										</view>
+										<view class="dis-flex flex-y-center flex-x-between" style="height: 5rpx;margin-top: 20rpx;vertical-align: text-top;">
+											<view class="f-24 col-9" v-if="item2.plugin !== 'coupon'" style="text-decoration:line-through;">市场价:{{ item2.oldprice }}</view>
+											<view class="f-24 col-9">{{ item2.buy_num }}人购买</view>
+										</view>
+									</view>
+									
+									
+								</view>
+							</view>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default {
+		props: ['publicgoodstwoData'],
+		data() {
+			return {
+				swiperI: 1,
+				publicgoodstwoDataArr: [],
+				imgstyle:{},
+				ratio:0
+			}
+		},
+		mounted() {
+			let _this = this;
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			// setTimeout(()=>{
+			// 	uni.getSystemInfo({
+			// 	    success: function (wh) {
+			// 			// debugger
+			// 			_this.ratio = wh.windowWidth / _this.imgstyle.width;
+						
+			// 	    }
+			// 	});
+			// })
+			for (var i in this.publicgoodstwoData.data) {
+				this.publicgoodstwoDataArr.push(this.publicgoodstwoData.data[i])
+			}
+		},
+		methods: {
+			swiperCg(e) {
+				this.swiperI = e.detail.current + 1
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/*  public_goods2  通用商品2  */
+	/* .swiperMain {
+		height: calc(90vw);
+	} */
+	
+	.public-goods {
+		padding: 0 30upx;
+	}
+
+	.swiper-goodsImage {
+		width: 100%;
+		height: calc((100vw - 60upx) / 1.8);
+		background-repeat: no-repeat;
+		background-size: 100% calc((100vw - 60upx) / 1.8);
+	}
+
+	.goodsLabel {
+		width: 100upx;
+		height: 50upx;
+		line-height: 50upx;
+		background-color: #ffd93f;
+		border-radius: 4upx;
+	}
+
+	.buyBtn {
+		display: inline-block;
+		padding: 0 20upx;
+		height: 56upx;
+		line-height: 56upx;
+		background-color: #ff4040;
+		border-radius: 8upx;
+	}
+
+	.viplabel {
+		height: 28upx;
+		line-height: 30upx;
+		color: #DDCDA0;
+		font-size: 24upx;
+		padding: 0 4upx;
+		background-color: #363636;
+		border-radius: 6upx;
+	}
+</style>
diff --git a/components/template/rate.vue b/components/template/rate.vue
new file mode 100644
index 0000000..a5ee017
--- /dev/null
+++ b/components/template/rate.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="tui-rate-class tui-rate-box" @touchmove="touchMove">
+		<block v-for="(item,index) in quantity" :key="index">
+			<view class="tui-icon tui-relative" :class="['tui-icon-collection'+(hollow && (current<=index || (disabled && current<=index+1))?'':'-fill')]"
+			 :data-index="index" @tap="handleTap" :style="{fontSize:size+'px',color:(current>index+1 || (!disabled && current>index))?active:normal}">
+				<view class="tui-icon tui-icon-main tui-icon-collection-fill" v-if="disabled && current==index+1" :style="{fontSize:size+'px',color:active,width:percent+'%'}"></view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "tuiRate",
+		props: {
+			//数量
+			quantity: {
+				type: Number,
+				default: 5
+			},
+			//当前选中
+			current: {
+				type: [Number, String],
+				default: 0
+			},
+			//当前选中星星分数(大于0，小于等于1的数)
+			score: {
+				type: [Number, String],
+				default: 1
+			},
+			//禁用点击
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			//大小
+			size: {
+				type: Number,
+				default: 20
+			},
+			//未选中颜色
+			normal: {
+				type: String,
+				default: "#b2b2b2"
+			},
+			//选中颜色
+			active: {
+				type: String,
+				default: "#e41f19"
+			},
+			//未选中是否为空心
+			hollow: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				pageX: 0,
+				percent: 0
+			};
+		},
+		created() {
+			this.percent = Number(this.score || 0) * 100
+		},
+		watch: {
+			score(newVal, oldVal) {
+				this.percent = Number(newVal || 0) * 100
+			}
+		},
+		methods: {
+			handleTap(e) {
+				if (this.disabled) {
+					return;
+				}
+				const index = e.currentTarget.dataset.index;
+				this.$emit('change', {
+					index: Number(index) + 1
+				})
+			},
+			touchMove(e) {
+				if (this.disabled) {
+					return;
+				}
+				if (!e.changedTouches[0]) {
+					return;
+				}
+				const movePageX = e.changedTouches[0].pageX;
+				const distance = movePageX - this.pageX;
+
+				if (distance <= 0) {
+					return;
+				}
+				let index = Math.ceil(distance / this.size);
+				index = index > this.count ? this.count : index;
+				this.$emit('change', {
+					index: index
+				})
+			}
+		},
+		// #ifdef H5
+		mounted() {
+			const className = '.tui-rate-box';
+			let query = uni.createSelectorQuery().in(this)
+			query.select(className).boundingClientRect((res) => {
+				this.pageX = res.left || 0
+			}).exec()
+		},
+
+		// #endif
+		onReady() {
+			const className = '.tui-rate-box';
+			let query = uni.createSelectorQuery().in(this)
+			query.select(className).boundingClientRect((res) => {
+				this.pageX = res.left || 0
+			}).exec()
+		}
+	}
+</script>
+
+<style>
+	@font-face {
+		font-family: 'rateFont';
+		src: url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAAT4AA0AAAAAB4wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAAE3AAAABoAAAAciBprQUdERUYAAAS8AAAAHgAAAB4AKQALT1MvMgAAAaAAAABDAAAAVj1YSN1jbWFwAAAB+AAAAEIAAAFCAA/qlmdhc3AAAAS0AAAACAAAAAj//wADZ2x5ZgAAAkgAAADwAAABZLMTdXtoZWFkAAABMAAAADAAAAA2FZKISmhoZWEAAAFgAAAAHQAAACQHYgOFaG10eAAAAeQAAAARAAAAEgx6AHpsb2NhAAACPAAAAAwAAAAMAEYAsm1heHAAAAGAAAAAHgAAACABEQBPbmFtZQAAAzgAAAFJAAACiCnmEVVwb3N0AAAEhAAAAC0AAABHLO3vkXjaY2BkYGAA4t2/VF7G89t8ZeBmYQCBm9ZKMnC6ikGMuYXpP5DLwcAEEgUAHPQJOXjaY2BkYGBu+N/AEMPCAALMLQyMDKiABQBQwgLwAAAAeNpjYGRgYGBlcGZgYgABEMkFhAwM/8F8BgAPigFhAAB42mNgZGFgnMDAysDA1Ml0hoGBoR9CM75mMGLkAIoysDIzYAUBaa4pDA7PXj17zdzwv4EhhrmBoQEozAiSAwD/YA2wAHjaY2GAABYIrmKoAgACggEBAAAAeNpjYGBgZoBgGQZGBhCwAfIYwXwWBgUgzQKEQP6z1///A8lX//9LSkJVMjCyMcCYDIxMQIKJARUwMgx7AAA/9QiLAAAAAAAAAAAAAABGALJ42mNgZKhiEGNuYfrPoMnAwGimps+ox6jPqKbEz8jHCMLyjHJAmk1czMie0cxInlHMDChrZs6cJyaosI+NlzmU34I/lImPdb+CoHgXCyujIosYtzTfKlYBtlWyuqwKjKwsjNvFTdlkGDnZ1srKrmXjZJRhMxVvZxFgA+rgYI9iYoriV1TYzybAwsDABHeLBIMT0DUg29VBTjEHucvcjtGeUVyOUZ6JaFcybefnZ5HuFdEX6ZVm5uMvniemxuXmzqUmNs+FeOfHCeiKzfPi4vKaJ6YrUCDOIiM8YYKwDIu4OMRbrOtkZdex4vMWACzGM5B42n2QPU4DMRCFn/MHJBJCIKhdUQDa/JQpEyn0CKWjSDbekGjXXnmdSDkBLRUHoOUYHIAbINFyCl6WSZMia+3o85uZ57EBnOMbCv/fJe6EFY7xKFzBETLhKvUX4Rr5XbiOFj6FG9R/hJu4VQPhFi7UGx1U7YS7m9JtywpnGAhXcIon4Sr1lXCN/CpcxxU+hBvUv4SbGONXuIVrZakM4WEwQWCcQWOKDeMCMRwskjIG1qE59GYSzExPN3oRO5s4GyjvV2KXAx5oOeeAKe09t2a+Sif+YMuB1JhuHgVLtimNLiJ0KBtfLJzV3ahzsP2e7ba02L9rgTXH7FENbNT8Pdsz0khsDK+QkjXyMrekElOPaGus8btnKdbzXgiJTrzL9IjHmjR1OvduaeLA4ufyjBx9tLmSPfeoHD5jWQh5v91OxCCKXYY/k9hxGQAAAHjaY2BigAAuMMnIgA5YwaJMjEyMzPzJ+Tk5qcklmfl58WmZOTlcCD4Ak9QKlAAAAAAAAAH//wACAAEAAAAMAAAAFgAAAAIAAQADAAQAAQAEAAAAAgAAAAB42mNgYGBkAIKrS9Q5QPRNayUZGA0AM8UETgAA) format('woff');
+		font-weight: normal;
+		font-style: normal;
+	}
+
+	.tui-icon {
+		font-family: "rateFont" !important;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+		display: block;
+	}
+
+	.tui-relative {
+		position: relative;
+	}
+
+	.tui-icon-main {
+		position: absolute;
+		height: 100%;
+		left: 0;
+		top: 0;
+		overflow: hidden;
+	}
+
+	.tui-icon-collection-fill:before {
+		content: "\e6ea";
+	}
+
+	.tui-icon-collection:before {
+		content: "\e6eb";
+	}
+
+	.tui-rate-box {
+		display: -webkit-inline-flex;
+		display: inline-flex;
+		align-items: center;
+		margin: 0;
+		padding: 0;
+	}
+</style>
diff --git a/components/template/redPagDown.vue b/components/template/redPagDown.vue
new file mode 100644
index 0000000..f104ea5
--- /dev/null
+++ b/components/template/redPagDown.vue
@@ -0,0 +1,381 @@
+<template>
+	<view class="container">
+		<PopManager :show="redPagss" :type="type" @clickmask="closeBtn">
+			<!-- style="text-align: center;position: relative;" -->
+			<view class="b-f redPag">
+				<view class="redpacket-title dis-flex flex-y-center">
+					<view class="f-34 redText dis-flex flex-x-center f-30 col-3">我的红包</view>
+					<view class="i iocn iconfont icon-close_light closeBtn f-24 dis-flex flex-box col-3" @click="closeBtn"></view>
+				</view>
+				<scroll-view scroll-y="true" class="scroll-Y">
+					<!-- <radio-group @change="radioChange"> -->
+					<evan-radio-group @change="radioChange" v-model="redPagId">
+						<view v-for="(item,index) in orderSubmitInfo" :key="index">
+							<view class="usedpacket m-top-btm10">
+								<view class="usedpacket-list">
+									<view class="usedpacket-list-item dis-flex">
+										<view class="usedpacket-itemleft p-r dis-flex flex-dir-column flex-x-center">
+											<view class="usedpacket-priceStyle col-f f-50 t-c">
+												<text class="f-30">¥</text>
+												{{ item.cut_money }}
+											</view>
+											<view class="f-24 col-f t-c">满{{ item.full_money }}可用</view>
+											<view class="itemleft_bgstyle"></view>
+											<view class="itemleft_bgstyle2"></view>
+										</view>
+										<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+											<view class="usedpacket_titleType dis-flex flex-y-center">
+												<view class="usedpacketType t-c m-right10 dis-flex flex-y-center">
+													<text class="col-f f-24">{{ item.label }}</text>
+												</view>
+												<view class="usedpacketTitle onelist-hidden f-28 col-3">{{ item.title }}</view>
+											</view>
+											<view class="col-9 f-24 m-top-btm10">范围：{{ item.use_where }}</view>
+											<view class="col-9 f-24">{{ item.time }}</view>
+											<view class="getDraw t-c col-f f-24">
+												
+												<!-- <evan-radio :value="item.id" clearable color="#ff4444"  /> -->
+												<!-- <evan-radio-group @change="radioChange" v-model="color"> -->
+													<!-- <view class="evan-radio-show__group-item" v-for="item in colorList" > -->
+														<evan-radio clearable :label="item.id" primaryColor="#ff4444"></evan-radio>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</evan-radio-group>
+					<view class="f-28" style="padding: 20upx 0;color: #333333;" v-if="noorderSubmitInfo.length > 0">
+						暂不可用红包({{noorderSubmitInfo.length}})
+					</view>
+					<evan-radio-group @change="radioChange" v-model="redPagId" v-if="noorderSubmitInfo.length > 0">
+						<view v-for="(item,index) in noorderSubmitInfo" :key="index">
+							<view class="usedpacket m-top-btm10">
+								<view class="usedpacket-list">
+									<view class="usedpacket-list-item dis-flex">
+										<view class="usedpacket-itemleft-l p-r dis-flex flex-dir-column flex-x-center">
+											<view class="usedpacket-priceStyle col-f f-50 t-c">
+												<text class="f-30">¥</text>
+												{{ item.cut_money }}
+											</view>
+											<view class="f-24 col-f t-c">满{{ item.full_money }}可用</view>
+											<view class="itemleft_bgstyle"></view>
+											<view class="itemleft_bgstyle2"></view>
+										</view>
+										<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+											<view class="usedpacket_titleType dis-flex flex-y-center">
+												<view class="usedpacketType t-c m-right10 dis-flex flex-y-center">
+													<text class="col-f f-24">{{ item.label }}</text>
+												</view>
+												<view class="usedpacketTitle onelist-hidden f-28 col-3">{{ item.title }}</view>
+											</view>
+											<view class="col-9 f-24 m-top-btm10">范围：{{ item.use_where }}</view>
+											<view class="col-9 f-24">{{ item.time }}</view>
+											<view class="getDraw t-c col-f f-24">
+												
+												<!-- <evan-radio :value="item.id" clearable color="#ff4444"  /> -->
+												<!-- <evan-radio-group @change="radioChange" v-model="color"> -->
+													<!-- <view class="evan-radio-show__group-item" v-for="item in colorList" > -->
+														<evan-radio clearable disabled :label="item.id" primaryColor="#ff4444"></evan-radio>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</evan-radio-group>
+				</scroll-view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import PopManager from '@/components/template/PopManager';
+import EvanRadioGroup from '@/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue'
+import EvanRadio from '@/pages/subPages2/tamplate/evan-radio/evan-radio.vue'
+
+export default {
+	components: {
+		PopManager,
+		EvanRadio,
+		EvanRadioGroup
+	},
+	data() {
+		return {
+			colorList: [{
+					label: '红色',
+					value: 'red'
+				},
+				{
+					label: '绿色',
+					value: 'green'
+				},
+				{
+					label: '蓝色',
+					value: 'blue'
+				},
+				{
+					label: '粉色',
+					value: 'pink'
+				},
+				{
+					label: '黑色',
+					value: 'black'
+				},
+			],
+			redPagId:'',
+			type: 'bottom',
+			redPagss: false,
+			MoneyOff: '',
+			current: 0,
+			radioList: [
+				{
+					value: 1
+				},
+				{
+					value: 2
+				},
+				{
+					value: 3
+				},
+				{
+					value: 4
+				},
+				{
+					value: 5
+				},
+				{
+					value: 6
+				},
+				{
+					value: 7
+				}
+			],
+			flage:false
+		};
+	},
+	methods: {
+		closeBtn() {
+			let _this = this;
+			_this.redPagss = false;
+			// for (let i = 0; i < this.orderSubmitInfo.length; i++) {
+			// 	_this.orderSubmitInfo[i].checked = false;
+			// }
+		},
+		radioChange: function(e,flag) {
+			let _this = this;
+			let num = _this.orderSubmitInfo.length;
+			console.log(e,_this.redPagId);
+			// debugger
+			_this.orderSubmitInfo.forEach((item,index)=>{
+				if(item.id == e){
+					let obj = JSON.parse(JSON.stringify(item));
+					obj.check = true;
+					_this.$emit('priceis', obj);
+				}else if(item.id == flag){
+						let obj = JSON.parse(JSON.stringify(item));
+						obj.check = false;
+						_this.$emit('priceis', obj);
+				}
+				})
+			 // console.log(_this.redPagId);
+			 // console.log(_this.orderSubmitInfo);
+			// for (let i = 0; i < _this.orderSubmitInfo.length; i++) {
+			// 	if (_this.orderSubmitInfo[i].id == evt.target.value) {
+			// 		// _this.orderSubmitInfo[i].isCheked = !_this.orderSubmitInfo[i].isCheked;
+			// 		
+			// 	} else {
+			// 		// _this.orderSubmitInfo[i].isCheked = false;
+			// 	}
+			// }
+			// console.log(_this.orderSubmitInfo);
+			_this.closeBtn();
+		}
+	},
+	props: {
+		orderSubmitInfo: {
+			type: Array,
+			default: []
+		},
+		// 红包弹出框显示
+		noorderSubmitInfo:{
+			type: Array,
+			default: []
+		}
+	},
+	watch: {
+		'orderSubmitInfo': {
+			handler(val,oldVal) {
+				// debugger
+				setTimeout(()=>{
+					if(val.length == 0){
+						this.redPagId = ''
+					}
+					if(this.redPagId == ''){
+						this.redPagId = this.orderSubmitInfo[0].id;
+						let obj = JSON.parse(JSON.stringify(this.orderSubmitInfo[0]));
+						obj.check = true;
+						this.$emit('priceis',obj);
+					}else{
+						
+					}
+					
+					
+				})
+			},
+			immediate: true,
+			deep: true, //对象内部的属性监听，也叫深度监听
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.redPag {
+	width: 100vw;
+	height: 830upx;
+	padding: 40upx 30upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20px 20px 0px 0px;
+	box-sizing: border-box;
+}
+.scroll-Y {
+	height: 750upx;
+}
+.redpacket-title {
+	width: 100%;
+}
+.redText {
+	width: 95%;
+	flex-shrink: 0;
+}
+.usedpacket {
+	.usedpacket-list {
+		.usedpacket-list-item {
+			height: 170upx;
+			.usedpacket-itemleft-l {
+				width: 28%;
+				height: 100%;
+				background-color: #CCCCCC;
+				padding: 0 20upx;
+				flex-shrink: 0;
+			
+				.usedpacket-priceStyle {
+					margin-right: 12upx;
+			
+					> text {
+						display: inline-block;
+						vertical-align: top;
+						margin-top: 4upx;
+					}
+				}
+			
+				.itemleft_bgstyle {
+					width: 30upx;
+					height: 30upx;
+					border-radius: 50%;
+					position: absolute;
+					left: -16upx;
+					top: 50%;
+					transform: translateY(-50%);
+					background-color: #f8f8f8;
+				}
+			
+				.itemleft_bgstyle2 {
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 1%;
+					height: 170upx;
+					padding-left: 4upx;
+					color: #fff;
+					box-sizing: border-box;
+					background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+					background-size: 16upx 16upx;
+					background-position: 16upx 0px;
+					background-color: #fff;
+				}
+			}
+			.usedpacket-itemleft {
+				width: 28%;
+				height: 100%;
+				background: linear-gradient(129deg, rgba(251, 131, 81, 1) 0%, rgba(255, 68, 68, 1) 100%);
+				padding: 0 20upx;
+				flex-shrink: 0;
+
+				.usedpacket-priceStyle {
+					margin-right: 12upx;
+
+					> text {
+						display: inline-block;
+						vertical-align: top;
+						margin-top: 4upx;
+					}
+				}
+
+				.itemleft_bgstyle {
+					width: 30upx;
+					height: 30upx;
+					border-radius: 50%;
+					position: absolute;
+					left: -16upx;
+					top: 50%;
+					transform: translateY(-50%);
+					background-color: #f8f8f8;
+				}
+
+				.itemleft_bgstyle2 {
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 1%;
+					height: 170upx;
+					padding-left: 4upx;
+					color: #fff;
+					box-sizing: border-box;
+					background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+					background-size: 16upx 16upx;
+					background-position: 16upx 0px;
+					background-color: #fff;
+				}
+			}
+
+			.usedpacket-itemright {
+				height: 100%;
+
+				.usedpacket_titleType {
+					.usedpacketType {
+						padding: 0 6upx;
+						height: 28upx;
+						background-color: #ff4444;
+						border-radius: 14upx;
+
+						> text {
+							display: inline-block;
+							transform: scale(0.85);
+						}
+					}
+
+					.usedpacketTitle {
+						width: 240upx;
+					}
+				}
+			}
+
+			.getDraw {
+				position: absolute;
+				right: 30upx;
+				top: 50%;
+				transform: translateY(-50%);
+				line-height: 40upx;
+				border-radius: 20upx;
+			}
+		}
+	}
+}
+</style>
diff --git a/components/template/redpacket.vue b/components/template/redpacket.vue
new file mode 100644
index 0000000..e8bb1c0
--- /dev/null
+++ b/components/template/redpacket.vue
@@ -0,0 +1,300 @@
+<template>
+	<view class="container">
+		<pop-manager :show="isRedpacket" @clickmask="isRedpacket_listBtn">
+			<!-- 红包样式1 -->
+			<block v-if="isRedpacket_list">
+				<view class="redpacket-main">
+					<view class="redpacket-header" :style="{'background-image':'url('+image+')'}"></view>
+					<view class="redpacket-content" :style="{'background-color':color.bg_color}">
+						<scroll-view scroll-y="true" class="redpacket-list-scroll">
+							<view class="redpacket-list">
+								<view class="redpacket-list-item m-btm20 dis-flex flex-y-center p-r b-f" v-for="(listItem,index) in list" :key="index">
+									<view class="item-left dis-flex t-c">
+										<view class="redpacket-value-main dis-flex flex-dir-column flex-x-center ">
+											<view class="redpacket-value f-44" :style="{'color':color.price_color}"><text class="f-24 col-f4">¥</text>{{listItem.cut_money}}</view>
+											<view class="f-24 col-9 t-c">{{listItem.full_money>0?'满'+listItem.full_money+'可用':'无门槛'}}</view>
+										</view>
+									</view>
+									<view class="dis-flex flex-y-center" style="height: 100%;">
+										<view class="cut-off"></view>
+									</view>
+									<view class="item-right dis-flex flex-box flex-dir-column flex-x-center">
+										<view class="red-packetDetail">
+											<view class="f-24 col-3">{{listItem.title}}</view>
+											<view class="f-24 col-9 m-top-btm6">{{listItem.usetime_text}}</view>
+											<view class="redpacket-label onelist-hidden"><text class="f-24 col-9">{{listItem.use_where}}</text></view>
+										</view>
+									</view>
+									<view class="item-borStyle item-borStyle-left" :style="{'background-color':color.bg_color}"></view>
+									<view class="item-borStyle item-borStyle-right" :style="{'background-color':color.bg_color}"></view>
+								</view>
+							</view>
+						</scroll-view>
+						<view class="get_redpakect" @click="getredPacket">
+							<view class="get_btn t-c f-28" :style="{'background-color':color.button_color,'color':color.text_color}">立即领取</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</pop-manager>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	import PopManager from "@/components/template/PopManager.vue"
+	export default {
+		data() {
+			return {
+				color: {}, // 红包颜色设置,
+				image: "", // 红包主题设置,
+				list: [], // 红包列表,
+				status: "", //是否开启红包,
+				current: "", //当前节日红包领取id
+				next: 0, //下次节日红包领取id	
+				isRedpacket: false, // 红包领取蒙版显示
+				isRedpacket_list: false, // 红包领取列表显示
+				intervalmin:180, //红包显示间隔
+				isGet:false
+			}
+		},
+		props:['pagenum'],
+		watch:{
+			pagenum(newval,oldval){
+				this.redPacketData();
+			}
+		},
+		components: {
+			PopManager
+		},
+		computed: {
+			redPacketGetType() {
+				let _this = this,
+					couplePacket = _this.$store.state.couplePacket; //新人红包
+				return couplePacket === 0 ? 'couplePacket' : 'festivalPacket'
+			}
+		},
+		mounted() {
+			this.redPacketData();
+		},
+		methods: {
+			// 新人,节日红包
+			redPacketData() {
+				if (this.redPacketGetType == 'festivalPacket') {
+					var rpType = '2'
+				} else if (this.redPacketGetType == 'couplePacket') {
+					var rpType = '1'
+				}
+				let _this = this,
+					nextId = _this.next,
+					redPacketrq = rpType === "1" ? '&p=redpack&do=newRedPackInfo' : '&p=redpack&do=festivalRedPackDesc',
+					requestData = {},
+					redPacketGetType = _this.redPacketGetType,
+					curtimestamp = new Date().getTime(), //当前时间
+					lastredpackeTime = uni.getStorageSync('redPacketGetTime'), // 最后次红包窗口关闭时间;
+					now_packetTime = !!lastredpackeTime ? ((curtimestamp - lastredpackeTime) / 1000 / 60 % 60) : "";
+					// debugger
+				if (!!now_packetTime && now_packetTime < _this.intervalmin) return
+				if (rpType === '2' && (!(!!nextId) && nextId !== 0) && redPacketGetType === "festivalPacket") {
+					let timestamp = (new Date()).getTime();
+					uni.setStorageSync('redPacketGetTime', timestamp)
+					_this.isRedpacket = false;
+					_this.isRedpacket_list = false;
+					return false
+				}
+				if (rpType === '2') {
+					requestData = {
+						id: (!!nextId && nextId !== 0) ? nextId : ""
+					}
+				};
+				App._post_form(redPacketrq, requestData, res => {
+					let redPacketData = res.data;
+					_this.intervalmin = res.data.intervalmin;
+					if (redPacketData.switch === 1) {
+						if (redPacketData.list.length > 0) {
+							_this.setData(redPacketData)
+							_this.isRedpacket = true;
+							_this.isRedpacket_list = true;
+						} else if (redPacketData.list.length == 0 || rpType == '1') {
+								_this.$store.commit('COUPLEPACKET', 1)
+								_this.redPacketData();
+						} else {
+							if (redPacketData.next !== 0) {
+								_this.next = redPacketData.next;
+								_this.redPacketData('2')
+							}
+						}
+					} else {
+						if (redPacketData.get_status === 1) {
+							_this.$store.commit('COUPLEPACKET', 1)
+							_this.redPacketData('2')
+						} else {
+							_this.isRedpacket = false;
+							_this.isRedpacket_list = false;
+						}
+					}
+				})
+			},
+			// 红包领取
+			getredPacket() {
+				if(this.isGet) return;
+				this.isGet = true;
+				setTimeout(()=>{
+					this.isGet = false;
+				},2000);
+				let _this = this,
+					redPacketList = _this.list,
+					getRedPacket_arr = [],
+					redPacketGetType = _this.redPacketGetType,
+					festival_id = _this.current,
+					getRedPacket_id = "";
+				if (redPacketList.length > 0) {
+					if (redPacketList.length === 1) {
+						getRedPacket_id = redPacketList[0]['id'];
+					} else {
+						redPacketList.map(val => {
+							getRedPacket_arr.push(val.id);
+						});
+						getRedPacket_id = getRedPacket_arr.join(',');
+					}
+					let getRedPackRq = {
+						id: getRedPacket_id,
+						red_pack_source: !!festival_id ? '3' : '2'
+					};
+					if (redPacketGetType === "festivalPacket") {
+						Object.assign(getRedPackRq, {
+							festival_id
+						})
+					}
+					uni.showLoading()
+					App._post_form('&p=redpack&do=getRedPack', getRedPackRq, res => {
+						if (redPacketGetType === 'couplePacket') {
+							_this.$store.commit('COUPLEPACKET', 1)
+						}
+						if (res.errno === 0) {
+							_this.isGet = false;
+							App.showSuccess('领取成功', () => {
+								_this.redPacketData('2')
+								uni.hideLoading()
+							})
+						}
+					})
+				}
+			},
+			// 红包领取列表显示
+			isRedpacket_listBtn() {
+				let _this = this,
+					redPacketGetType = _this.redPacketGetType;
+				redPacketGetType === 'couplePacket' && _this.$store.commit('COUPLEPACKET', 1);
+				_this.redPacketData('2');
+				_this.isRedpacket_list = false;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.redpacket-main {
+		.redpacket-header {
+			width: 620upx;
+			height: 310upx;
+			background-repeat: no-repeat;
+			background-size: 620upx 310upx;
+		}
+
+		.redpacket-content {
+			width: 620upx;
+			height: 570upx;
+
+			.redpacket-list-scroll {
+				height: 400upx;
+			}
+
+			.redpacket-list {
+				padding: 20upx 40upx 0 40upx;
+
+				.redpacket-list-item:last-child {
+					margin-bottom: 0 !important;
+				}
+
+				.redpacket-list-item {
+					height: 150upx;
+					border-radius: 20upx;
+
+					.cut-off {
+						margin: 0 20upx 0 10upx;
+						border-right: 1px solid #eee;
+						height: 108upx;
+						transform-origin: 0 0;
+						transform: scaleX(0.5);
+					}
+
+					.item-left {
+						width: 35%;
+						height: 100%;
+
+						.redpacket-value-main {
+							width: 100%;
+							height: 100%;
+						}
+
+						.redpacket-value {
+							>text {
+								display: inline-block;
+								vertical-align: top;
+								margin: 4upx 8upx 0 0;
+							}
+						}
+					}
+
+					.item-right {
+						height: 100%;
+
+						.redpacket-label {
+							display: inline-block;
+							padding: 0 12upx;
+							height: 32upx;
+							line-height: 22upx;
+							border-radius: 16upx;
+							border: 1px solid #eee;
+							max-width: 260upx;
+
+							>text {
+								display: inline-block;
+								transform: scale(.85);
+							}
+						}
+					}
+
+					.item-borStyle {
+						position: absolute;
+						width: 40upx;
+						height: 40upx;
+						border-radius: 50%;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+
+					.item-borStyle-left {
+						left: -20upx;
+					}
+
+					.item-borStyle-right {
+						right: -20upx;
+					}
+				}
+			}
+
+			.get_redpakect {
+				padding: 36upx 40upx;
+
+				.get_btn {
+					width: 100%;
+					height: 80upx;
+					line-height: 80upx;
+					border-radius: 40upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/template/screening.vue b/components/template/screening.vue
new file mode 100644
index 0000000..c738c62
--- /dev/null
+++ b/components/template/screening.vue
@@ -0,0 +1,279 @@
+<template>
+	<view class="screening">
+		<PopManager :show="check" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="close">
+			<view class="ruleShow-box" v-if="logoding">
+				<view class="iconfont icon-close t-r" style="position: absolute;right: 30upx;top: 20upx;" @click="close(true)"></view>
+				<view class="type-of-work" v-for="(item,index) in moreData.top" v-if="index > 2" :key="index">
+					<view class="type-work">{{item.title}}</view>
+					<!-- <view class="dis-flex" style="padding-top: 40upx;" v-if="item.subscript == 'salary'">
+						<view style="flex: 4.5;">
+							<input type="number" v-model="least" placeholder="最低月薪" class="inputs"  value="" />
+						</view>
+						<view style="flex: 1;text-align: center;line-height: 70upx;">
+							-
+						</view>
+						<view style="flex: 4.5;">
+							<input type="number" v-model="atMost" placeholder="最高月薪" class="inputs"  value="" />
+						</view>
+					</view> -->
+					<view class="classify dis-flex">
+						<view :class="items.checked?'classify-item':'classify-item-two'" v-for="(items,indexs) in moreData[item.subscript]" :key="indexs" @click="checkeda(items,indexs,item.subscript)">
+							{{items.title}}
+						</view>
+					</view>
+				</view>
+				<!-- <view class="type-of-work">
+					<view class="type-work">学历要求</view>
+					<view class="classify dis-flex">
+						<view :class="item.checked?'classify-item':'classify-item-two'" v-for="(item,index) in datalist.b" :key="index" @click="checkedb(item,index)">
+							{{item.name}}
+						</view>
+					</view>
+				</view>
+				<view class="type-of-work">
+					<view class="type-work">学历要求<text class="f-24 col-9">(元/月)</text></view>
+					<view class="dis-flex" style="padding-top: 40upx;">
+						<view style="flex: 4.5;">
+							<input type="number" placeholder="最低月薪" class="inputs"  value="" />
+						</view>
+						<view style="flex: 1;text-align: center;line-height: 70upx;">
+							-
+						</view>
+						<view style="flex: 4.5;">
+							<input type="number" placeholder="最高月薪" class="inputs"  value="" />
+						</view>
+					</view>
+					<view class="classify dis-flex">
+						<view :class="item.checked?'classify-item':'classify-item-two'" v-for="(item,index) in datalist.c" :key="index" @click="checkedc(item,index)">
+							{{item.name}}
+						</view>
+					</view>
+				</view> -->
+				<view class="btn-box f-30 dis-flex">
+					<view class="eliminate" @click="close(false)">
+						清除
+					</view>
+					<view style="flex: 0.05;">
+						
+					</view>
+					<view class="confirm" @click="confirm">
+						确定
+					</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import PopManager from '@/components/template/PopManager';
+export default {
+	data() {
+		return {
+			ruleShow: true,
+			logoding:true,
+			least:'',
+			atMost:''
+		};
+	},
+	components: {
+		PopManager
+	},
+	props:{
+		check:{
+			type:Boolean,
+			default:false
+		},
+		moreData:{
+			type:Object,
+			default() {
+				return {}
+			}
+		},
+		num:{
+			type:Number,
+			default:0
+		}
+	},
+	watch:{
+		// 'num':{
+		// 	handler(val){
+		// 		debugger
+		// 		this.moreDatas = {...this.moreData}
+		// 		// this.moreDatas = this.moreData;
+		// 		this.logoding = !this.logoding;
+		// 		this.logoding = !this.logoding;
+		// 	},
+		// 	deep: true, //对象内部的属性监听，也叫深度监听
+		// },
+		'moreData': {
+			handler(val,oldVal) {
+				console.log('数据来了的哦',this.check)
+				this.logoding = !this.logoding;
+				this.logoding = !this.logoding;
+			},
+			deep: true, //对象内部的属性监听，也叫深度监听
+			immediate: true
+		}
+	},
+	methods:{
+		confirm(){
+			let data = {};
+			this.moreData.top.map(item=>{
+				for(let key in this.moreData){
+					this.moreData[key].map(items=>{
+						
+						if(items.checked){
+							if(key == 'salary'){
+								data.salary_min = items.salary_min;
+								data.salary_max = items.salary_max;
+							}else{
+								data[key] = items.val;
+							}
+						}
+					})
+				}
+			})
+			console.log(data);
+			// debugger
+			this.$emit('confirm',data)
+		},
+		close(flag){
+			this.$emit('close',flag);
+		},
+		checkeda(item,index,key){
+			// console.log(this.moreData[key][index].checked);
+			// this.moreData[key].map(item=>{
+			// 	item.checked = false
+			// })
+			// if(this.moreData[key][index].checked){
+			// 	this.moreData[key][index].checked = false
+			// }else{
+			// 	this.moreData[key][index].checked = true;
+			// }
+			// this.moreDatas = this.moreData;
+			// console.log(this.moreDatas[key][index].checked);
+			// this.logoding = !this.logoding;
+			// this.logoding = !this.logoding;
+			// debugger
+			this.$emit('checkeda',index,key,item.checked?false:true)
+		},
+		checkedb(item,index){
+			this.datalist.b.map((items,indexs)=>{
+				items.checked = false;
+				if(index == indexs){
+					items.checked = true;
+				}
+			})
+			// this.ruleShow = !this.ruleShow;
+			// this.ruleShow = !this.ruleShow;
+			console.log(item,index)
+		},
+		checkedc(item,index){
+			this.datalist.c.map((items,indexs)=>{
+				items.checked = false;
+				if(index == indexs){
+					items.checked = true;
+				}
+			})
+			// this.ruleShow = !this.ruleShow;
+			// this.ruleShow = !this.ruleShow;
+			console.log(item,index)
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.screening {
+	.ruleShow-box {
+		width: 100vw;
+		height: 100vh;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		padding: 50upx 30upx 80upx;
+		overflow: auto;
+		padding-bottom: 300rpx;
+		.type-of-work {
+			.type-work {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.classify {
+				display: flex;
+				    justify-content: space-between;
+				    flex-wrap: wrap;
+					padding-top: 40upx;
+				.classify-item {
+					flex:0 0 30%; 
+					height: 70upx;
+					border: 1upx solid #3388ff;
+					margin-bottom: 20upx;
+					border-radius: 4upx;
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #3388FF;
+					line-height: 70upx;
+					text-align: center;
+				}
+				.classify-item-two {
+					flex:0 0 30%; 
+					height: 70upx;
+					border: 1upx solid #f8f8f8;
+					margin-bottom: 20upx;
+					border-radius: 4upx;
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					line-height: 70upx;
+					text-align: center;
+					background: #F8F8F8;
+					border-radius: 4px;
+				}
+			}
+			.classify:after {
+				content: '';
+				flex:0 0 30%;
+			}
+			.inputs{
+				width: 318upx;
+				height: 74upx;
+				border: 1px solid #EEEEEE;
+				text-align: center;
+				font-size: 26upx;
+			}
+		}
+	}
+	.btn-box{
+		padding: 30upx;
+		position: fixed;
+		bottom: 140upx;
+		left: 0;
+		width: 92vw;
+		border-top: 1upx solid #EEEEEE;
+		background-color: #fff;
+		z-index: 9;
+		.eliminate{
+			flex: 0.4;
+			padding: 20upx 0;
+			color: #3388FF;
+			border: 1upx solid #3388FF;
+			text-align: center;
+			border-radius: 8upx;
+		}
+		.confirm{
+			flex: 0.55;
+			padding: 20upx 0;
+			text-align: center;
+			background-color: #3388FF;
+			color: #FFFFFF;
+			border-radius: 8upx;
+			
+		}
+	}
+}
+</style>
diff --git a/components/template/searchView.vue b/components/template/searchView.vue
new file mode 100644
index 0000000..9f25b55
--- /dev/null
+++ b/components/template/searchView.vue
@@ -0,0 +1,209 @@
+<template>
+	<view class="searchView">
+		<view class="searchViewPackage">
+			<view class="searchInput">
+				<!-- <view @click.stop="goCity">
+					<span>{{ address }}</span>
+					<image :src="imgfixUrls + 'merchant/city.png'" />
+				</view> -->
+				<view :class="type == 1 ? 'white' : ''">
+					<view>
+						<image :src="seachImg" />
+						<input @click="goSearch" v-model="inputSearch" :placeholder="languageStatus != 1?'请输入名称或者内容':'검색하기'" :placeholder-style="color" />
+						<text v-if="showSearch" @click="goSearch" class="showSearch">搜索</text>
+					</view>
+
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		props: {
+			type: {
+				type: Number,
+				default: 0
+			}
+		},
+		data() {
+			return {
+				address: '',
+				color: 'white',
+				seachImg: 'merchant/serach.png',
+				search: 'merchant/serach.png',
+				searchGray: 'merchant/searchGray.png',
+				inputSearch: '',
+				showSearch: false,
+				img:''
+			};
+		},
+		mounted() {
+			this.img = this.imgfixUrl;
+			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+			let curRoute = routes[routes.length - 1].route
+			if (curRoute == 'pages/mainPages/pocketIInformant/pocketIInformant') {
+				this.showSearch = true;
+
+			} else {
+				this.showSearch = false;
+			}
+			let _this = this;
+			if (_this.type == 1) {
+				_this.color = 'color:rgba(153,153,153,1)';
+				_this.seachImg = _this.imgfixUrl + _this.searchGray;
+			} else {
+				_this.seachImg = _this.imgfixUrl + _this.seachImg;
+				_this.color = 'color:white';
+			}
+			_this.init();
+			uni.getStorage({
+				key: 'agencyData',
+				success: function(res) {
+					console.info(res);
+					_this.address = res.data.areaname;
+				},
+				fail: function(res) {
+					console.info('我失败了');
+					uni.getLocation({
+						type: 'wgs84',
+						success: function(res) {
+							console.log('当前位置的经度：' + res.longitude);
+							console.log('当前位置的纬度：' + res.latitude);
+							let data = {
+								lat: res.latitude,
+								lng: res.longitude
+							};
+							App._post_form('&do=cityLocation', data, res => {
+								_this.address = res.data.address_component.city;
+							});
+						},
+						fail: function() {
+							_this.address = '获取定位失败';
+							uni.showToast({
+								icon: 'none',
+								title: '获取定位失败',
+								duration: 2000
+							});
+						}
+					});
+				}
+			});
+		},
+		methods: {
+			init() {
+				let _this = this;
+			},
+			goCity() {
+				App.navigationTo({
+					url: 'pages/subPages/city/city'
+				});
+			},
+			goSearch() {
+				let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
+				let curRoute = routes[routes.length - 1].route
+				if (curRoute == 'pages/mainPages/pocketIInformant/pocketIInformant') {
+					this.$emit("getChild", this.inputSearch);
+
+				} else {
+					App.navigationTo({
+						url: 'pages/subPages/search/search'
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.showSearch {
+		font-size: 28rpx;
+		position: absolute;
+		z-index: 999;
+		top: 14rpx;
+		right: 20rpx;
+		color: rgba(255, 255, 255, 1);
+	}
+
+	.white {
+		background: rgba(255, 255, 255, 1) !important;
+	}
+
+	.searchViewPackage {
+		padding: 0 30upx;
+	}
+
+	.searchInput {
+		position: absolute;
+		top: 27upx;
+
+		// >view:nth-child(1) {
+		// 	vertical-align: middle;
+		// 	text-align: right;
+
+		// 	>span {
+		// 		display: inline-block;
+		// 		width: 150upx;
+		// 		overflow: hidden;
+		// 		white-space: nowrap;
+		// 		text-overflow: ellipsis;
+		// 		vertical-align: middle;
+		// 		font-size: 30upx;
+
+
+		// 		color: rgba(255, 255, 255, 1);
+		// 	}
+
+		// 	>image {
+		// 		margin-left: 15upx;
+		// 		vertical-align: middle;
+		// 		width: 40upx;
+		// 		height: 40upx;
+		// 	}
+		// }
+
+		>view:nth-child(1) {
+			margin-left: 30upx;
+			vertical-align: middle;
+			display: inline-block;
+			width: 680upx;
+			height: 63upx;
+			background: rgba(0, 0, 0, 0.1);
+			border-radius: 32upx;
+
+			>view {
+				padding-left: 30upx;
+				height: 63upx;
+
+				>image {
+					vertical-align: middle;
+					width: 28upx;
+					height: 28upx;
+				}
+
+				>input {
+					height: 100%;
+					padding-left: 25upx;
+					display: inline-block;
+					vertical-align: middle;
+					width: 500upx;
+					font-size: 28upx;
+					font-family: Source Han Sans CN;
+
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+</style>
diff --git a/components/template/serveItem.vue b/components/template/serveItem.vue
new file mode 100644
index 0000000..d0c409b
--- /dev/null
+++ b/components/template/serveItem.vue
@@ -0,0 +1,62 @@
+<template>
+	<view class="serveItem dis-flex" @click="opendelit(serItem)">
+		<image :src="serItem.logo" mode=""></image>
+		<view class="list-content flex-box">
+			<view class="f-28 f-w">
+				{{serItem.title}}
+			</view>
+			<view class="dis-flex" style="padding-top: 30upx;">
+				<view class="flex-box">
+					<text class="f-26 f-w c-ff4444">{{serItem.price}}</text>
+					<!-- <text class="f-32 c-ff4444 f-w">158.00</text>
+					<text class="f-20 c-ff4444">/小时</text> -->
+				</view>
+				<view class="f-20 col-9 t-r" style="line-height: 50upx;">
+					已售{{serItem.salenum}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		data(){
+			return{
+				
+			}
+		},
+		props:{
+			serItem:{
+				type:Object,
+				default:{}
+			}
+		},
+		methods:{
+			opendelit(serItem){
+				App.navigationTo({
+					url:`pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${serItem.pid}`
+				});
+			},
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.serveItem{
+		background-color: #FFFFFF;
+		padding: 20upx;
+		border-radius: 20upx;
+		margin-bottom: 20upx;
+		image{
+			width: 120upx;
+			height: 120upx;
+			border-radius: 20upx;
+		}
+		.list-content{
+			padding-left: 20upx;
+		}
+	}
+</style>
diff --git a/components/template/shareBottom.vue b/components/template/shareBottom.vue
new file mode 100644
index 0000000..89fdf11
--- /dev/null
+++ b/components/template/shareBottom.vue
@@ -0,0 +1,310 @@
+<!-- @closeShareShow 打开底部弹出框  -->
+<!-- @shareImgShow 分享图片弹出框遮罩层点击事件 -->
+<!-- @clickmask 关闭底部弹出框-->
+
+<template>
+	<view class="shareBottom">
+		<PopManager :show="shareBottomShow" :type="type" @clickmask="closeShareBottom">
+			<view class="viewMain">
+				<view class="mainTitle">
+					<!--  #ifdef H5||APP-PLUS -->
+					<view class="titleButton" @click="shareImgShow" :style="{width:postType==3||postType==4||postType==6||postType==7?'33%':'50%'}">
+						<view class="buttonImage">
+							<image :src="imgfixUrls+ 'merchant/shareWx.png'"></image>
+						</view>
+						<view class="buttonText"><text>微信好友</text></view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="titleButton" :style="{width:postType==3||postType==4||postType==6||postType==7?'33%':'50%'}">
+						<button open-type="share" class="shareButton"></button>
+						<view class="wxShareView">
+							<view class="buttonImage">
+								<image :src="imgfixUrls+ 'merchant/shareWx.png'"></image>
+							</view>
+							<view class="buttonText"><text>微信好友</text></view>
+						</view>
+					</view>
+					<!-- #endif -->
+					<view class="titleButton" @click="goHb" :style="{width:postType==3||postType==4||postType==6||postType==7?'33%':'50%'}">
+						<view class="buttonImage">
+							<image :src="imgfixUrls+ 'merchant/shareHb.png'"></image>
+						</view>
+						<view class="buttonText"><text>生成海报</text></view>
+					</view>
+					<view class="titleButton" @click="goTg" :style="{width:postType==3||postType==4||postType==6||postType==7?'33%':'50%'}"
+					 v-if="postType==3||postType==4||postType==6||postType==7">
+						<view class="buttonImage">
+							<image :src="imgfixUrls+ 'merchant/tgsc.png'"></image>
+						</view>
+						<view class="buttonText"><text>推广素材</text></view>
+					</view>
+				</view>
+				<view class="closeButton" @click="closeShareBottom"><text>关闭</text></view>
+			</view>
+		</PopManager>
+		<!-- #ifdef H5 -->
+		<PopManager :show="shareShow" :type="'top'" @clickmask="closeShareShow">
+			<cover-view>
+				<cover-image :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="iscardPost" :type="'center'" @clickmask="iscardPost = false">
+			<view class="iconfont icon-roundclose col-f card-postImageClose f-28" @click="closeCardPost"></view>
+			<view class="card-postImage-box">
+				<image :src="cardPostImage"  mode="" v-if="postType !== '13'"></image>
+				<image :src="cardPostImage"  mode="" style="width: 90vw;height: 80vh;" v-else></image>
+			</view>
+			<view class="f-28 saveCrad t-c col-6 b-f" @click="saveCardImage(cardPostImage)">保存名片</view>
+		</PopManager>
+		<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false">
+			<view  v-if="showCommunity" style="width: 90vw;height: 80vh;padding: 30upx;overflow: hidden;background-color: #323332;border-radius: 20upx;">
+				<posterlate :postId="postId" :postType="postType"></posterlate>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import PopManager from '@/components/template/PopManager.vue';
+	import posterlate from '@/components/template/posterlate';
+	export default {
+		data() {
+			return {
+				shareType: 'top',
+				type: 'bottom',
+				// shareShow:false
+				cardPostImage: null,
+				iscardPost: false,
+				img:'',
+				showCommunity:false
+			};
+		},
+		components: {
+			PopManager,
+			posterlate
+		},
+		props:{
+			// 分享图片显示
+			shareShow: {
+				type: Boolean,
+				default: false
+			},
+			// 分享弹出框显示
+			shareBottomShow: {
+				type: Boolean,
+				default: false
+			},
+			// 海报类型 详情见海报接口
+			postType: {
+				type: String,
+				default: ''
+			},
+			// 商户或商品id
+			postId: {
+				type: String,
+				default: ''
+			},
+			isCard: {
+				type: Boolean,
+				default: function() {
+					return false
+				}
+			}
+		},
+		mounted() {
+			this.img = this.imgfixUrl;
+		},
+		methods: {
+			closeShareShow() {
+				this.$emit('closeShareShow');
+			},
+			shareImgShow() {
+				this.$emit('shareImgShow', 'imageShow');
+			},
+			saveCardImage(cardImageUrl) {
+				let _this = this;
+				uni.downloadFile({
+					url: cardImageUrl,
+					success: (result) => {
+						if (result.statusCode === 200) {
+							uni.saveImageToPhotosAlbum({
+								filePath: result.tempFilePath,
+								success: function(res) {
+									App.showSuccess('保存成功')
+								},
+								complete: function() {
+									uni.hideLoading()
+								}
+							});
+						}
+					}
+				});
+			},
+			goHb() {
+				let _this = this,
+					isCard = this.isCard;
+				console.log(_this.postId,_this.postType);
+				// debugger
+				if (isCard) {
+					uni.showLoading({})
+					if(_this.postType == 12 || _this.postType == 13  || _this.postType == 14){
+						App._post_form('&do=Poster', {
+							type: _this.postType,
+							id: _this.postId
+						}, res => {
+							_this.setData({
+								cardPostImage: res.data.url,
+								iscardPost: true
+							})
+						}, false, () => {
+							uni.hideLoading()
+						});
+					}else{
+						App._post_form('&do=Poster', {
+							type: '11',
+							id: _this.postId
+						}, res => {
+							_this.setData({
+								cardPostImage: res.data.url,
+								iscardPost: true
+							})
+						}, false, () => {
+							uni.hideLoading()
+						});
+					}
+					
+					_this.$emit('gohb', 'showPost')
+				} else {
+					if(_this.postType == 12 || _this.postType == 13){
+						_this.showCommunity = true;
+						_this.closeShareBottom();
+					}else{
+						App.navigationTo({
+							url: 'pages/mainPages/poster/poster?id=' + _this.postId + '&type=' + _this.postType
+						});
+					}
+				}
+				// _this.shareImgShow();
+			},
+			goTg() {
+				let _this = this
+				App.navigationTo({
+					url: 'pages/subPages/shareMaterials/index?id=' + _this.postId + '&type=' + _this.postType
+				});
+			},
+			closeShareBottom() {
+				this.$emit('clickmask');
+			},
+			closeCardPost() {
+				this.iscardPost = false;
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.coverImg {
+		width: 750upx;
+	}
+
+	.closeButton {
+		height: 88upx;
+		width: 750upx;
+		text-align: center;
+
+		>text {
+			line-height: 88upx;
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.buttonText {
+		text-align: center;
+
+		>text {
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.buttonImage {
+		margin: auto;
+		width: 120upx;
+		height: 120upx;
+
+		>image {
+			width: 120upx;
+			height: 120upx;
+		}
+	}
+
+	.titleButton {
+		position: relative;
+		margin: 47upx 0 0 0;
+		display: inline-block;
+		width: 50%;
+	}
+
+	.mainTitle {
+		width: 750upx;
+		height: 255upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	}
+
+	.shareBottom {
+		font-size: 0;
+	}
+
+	.viewMain {
+		width: 750upx;
+		height: 344upx;
+		padding-bottom: 140upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20upx 20upx 0upx 0upx;
+	}
+
+	.shareButton {
+		width: 100%;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		background: rgba(0, 0, 0, 0);
+	}
+
+	.wxShareView {
+		width: 100%;
+		height: 100%;
+	}
+
+	.card-postImage-box {
+		width: 700upx;
+	}
+
+	.card-postImage-box>image {
+		width: 100%;
+		height: 700upx;
+		border-radius: 10upx;
+	}
+
+	.card-postImageClose {
+		text-align: right;
+		margin-bottom: 40upx;
+		font-size: 48upx;
+	}
+
+	.saveCrad {
+		width: 300upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-radius: 40upx;
+		margin: 40upx auto 0 auto;
+	}
+</style>
diff --git a/components/template/storeComment.vue b/components/template/storeComment.vue
new file mode 100644
index 0000000..a073831
--- /dev/null
+++ b/components/template/storeComment.vue
@@ -0,0 +1,230 @@
+<template>
+	<view class="content">
+		<view class="comment-content">
+			<view scroll-y class="scrollView" @scrolltolower="ReachBottom" @scroll="scrolly" :scroll-top="slide_Top">
+				<view class="comment-list">
+					<view class="comment-item p-top-bom-30" v-for="(commentItem,indexs) in commentData" :key="indexs">
+						<view class="comment-header dis-flex flex-x-between m-btm40">
+							<view class="comment-header-left dis-flex flex-y-center">
+								<view class="user-avatar m-right20" :style="{'background-image':'url('+commentItem.headimg+')'}"></view>
+								<view class="user-info">
+									<view class="user-nickname col-3 f-28">{{commentItem.nickname}}</view>
+									<view class="comment-time col-9 f-24">{{commentItem.datetime}}</view>
+								</view>
+							</view>
+							<view class="comment-header-right">
+								<view class="dis-flex m-right10">
+									<view class="favor-item select iconfont icon-favor_fill_light" v-for="(item,index) in commentItem.star" :key="index"></view>
+									<view class="favor-item not-select iconfont icon-favor_fill_light" v-for="(item,index) in commentItem.noStar"
+									 :key="index"></view>
+								</view>
+							</view>
+						</view>
+						<view class="commentInfo twolist-hidden f-24 col-3 m-btm30">{{commentItem.text}}</view>
+						<block v-if="!!commentItem && !!commentItem.pic">
+							<view class="commentPhoto dis-flex flex-warp ">
+								<view class="photo-item" :style="{'background-image':'url('+photoItem+')'}" v-for="(photoItem,index) in commentItem.pic"
+								 :key="index" @click="prevPhoto(index,commentData[indexs].pic)"></view>
+							</view>
+						</block>
+						<block v-if="!!commentItem.replytextone || commentItem.replypicone">
+							<view class="comment-reply">
+								<block v-if="!!commentItem.replytextone">
+									<view class="comment-reply-text dis-flex flex-y-center m-btm20">
+										<view class="dis-flex flex-y-center">
+											<view class="iconfont icon-comment m-right10"></view>
+											<view class="f-24 col-9">商家回复:<text class="m-left10 col-3">{{commentItem.replytextone}}</text></view>
+										</view>
+									</view>
+								</block>
+								<block v-if="!!commentItem.replypicone && commentItem.replypicone.length>0">
+									<view class="comment-reply-image dis-flex flex-warp">
+										<view class="reply-image-item" :style="{'background-image':'url('+coment_imageItem+')'}" v-for="(coment_imageItem,index) in commentItem.replypicone"
+										 :key="index" @click="prevPhoto(index,commentItem.replypicone)"></view>
+									</view>
+								</block>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				commentData: [],
+				totalPage: null,
+				current_page: 1, //当前页数
+				slide_Top: 0, // 滚动距离
+			}
+		},
+		methods: {
+			/**
+			 * 评论详情
+			 */
+			getStoreComment(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						sid: _this.storeId,
+						page,
+					};
+				App._post_form('&p=store&do=getStoreComment', requestData, res => {
+					let commentData = res.data;
+					console.log(commentData,'akakaki')
+					commentData.list.map((val) => {
+						val.noStar = 5 - val.star;
+						return val
+					});
+					if (isPage) {
+						if (commentData.list.length > 0) {
+							_this["commentData"].push(...commentData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData({
+							commentData: res.data.list,
+							totalPage: res.data.total
+						})
+						// _this.loading = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				let _this = this;
+				if (_this.current_page >= _this.totalPage) {
+					// _this.loading = true;
+					return false;
+				}
+				_this.getStoreComment(++_this.current_page, true);
+			},
+			tabbarShow() {
+				let _this = this;
+				uni.showLoading()
+				_this.slide_Top = 0;
+				_this.current_page = 1;
+				_this.getStoreComment();
+			},
+			prevPhoto(currentIndex, image_urls) {
+				console.log(currentIndex, image_urls,'12313424123')
+				let _this = this;
+				uni.previewImage({
+					current:image_urls[currentIndex],
+					urls: [image_urls[currentIndex]],
+					indicator: "default",
+					success:function(res){
+						console.log(res)
+					}
+				})
+			}
+		},
+		props: {
+			storeId: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			tabType: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			}
+		},
+		onLoad(e) {
+			
+		},
+		mounted() {
+			// console.log(this.commentItem)
+		},
+		computed: {
+
+		},
+		components: {
+
+		},
+		computed: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.comment-content {
+		.scrollView {
+			min-height: calc(100vw);
+		}
+	}
+
+	.comment-item {
+		border-bottom: 1px solid #EEEEEE;
+
+		.comment-header {
+			.comment-header-left {
+				.user-avatar {
+					width: 76upx;
+					height: 76upx;
+					background: rgba(238, 238, 238, 1);
+					border-radius: 38upx;
+					background-repeat: no-repeat;
+					background-size: 76upx 76upx;
+				}
+			}
+
+			.comment-header-right {
+				.favor-item.select {
+					color: #FF4444;
+				}
+
+				.favor-item.not-select {
+					color: #CCCCCC;
+				}
+			}
+		}
+		
+		.commentPhoto {
+			width: 100%;
+			flex-grow: 1;
+
+			.photo-item {
+				width: 31.33%;
+				height: 216upx;
+				border-radius: 10upx;
+				background-repeat: no-repeat;
+				background-size: 100% 216upx;
+				margin: 0 0 20upx 20upx;
+			}
+		}
+		.commentPhoto .photo-item:first-child{
+			margin-left: 0;
+		}
+		.comment-reply {
+			.comment-reply-image {
+				.reply-image-item {
+					width: 150upx;
+					height: 150upx;
+					background-size: 150upx 150upx;
+					background-repeat: no-repeat;
+					background-position: center;
+					border-radius: 10upx;
+					margin: 0 20upx 20upx 0;
+				}
+			}
+		}
+	}
+</style>
diff --git a/components/template/storeDynamic.vue b/components/template/storeDynamic.vue
new file mode 100644
index 0000000..9429630
--- /dev/null
+++ b/components/template/storeDynamic.vue
@@ -0,0 +1,171 @@
+<template>
+	<view class="content">
+		<view class="comment-content">
+			<view scroll-y class="scrollView" @scrolltolower="ReachBottom" @scroll="scrolly" :scroll-top="slide_Top">
+				<view class="comment-list">
+					<view class="comment-item p-top-bom-30" v-for="(DynamicItem,index) in DynamicData" :key="index">
+						<view class="comment-header dis-flex flex-x-between m-btm40">
+							<view class="comment-header-left dis-flex flex-y-center">
+								<view class="user-avatar m-right20" :style="{'background-image':'url('+DynamicItem.logo+')'}"></view>
+								<view class="user-info">
+									<view class="user-nickname col-3 f-28">{{DynamicItem.storename}}</view>
+									<view class="comment-time col-9 f-24">{{DynamicItem.datetime}}</view>
+								</view>
+							</view>
+						</view>
+						<view class="commentInfo twolist-hidden f-24 col-3 m-btm30">{{DynamicItem.content}}</view>
+						<block v-if="!!DynamicItem && !!DynamicItem.imgs">
+							<view class="commentPhoto dis-flex flex-warp">
+								<view class="photo-item inlinBlock" :style="{'background-image':'url('+imgsItem+')'}" v-for="(imgsItem,index) in DynamicItem.imgs"
+								 :key="index" @click="prevPhoto(index,DynamicItem.imgs)"></view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	export default {
+		data() {
+			return {
+				DynamicData:[],
+				totalPage: null,
+				slide_Top: 0, // 滚动距离
+				current_page: 1, // 当前页数
+			}
+		},
+		onLoad(e) {
+
+		},
+		mounted() {
+
+		},
+		computed: {
+
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		props: {
+			storeId: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			tabType: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			}
+		},
+		methods: {
+			getStoreDynamic(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						sid: _this.storeId,
+						page,
+					};
+				App._post_form('&p=store&do=getStoreDynamic', requestData, res => {
+					let DynamicData = res.data;
+					console.log(DynamicData)
+					if (isPage) {
+						if (goodsData.list.length > 0) {
+							_this["DynamicData"].push(...DynamicData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData({
+							DynamicData: res.data.list,
+							totalPage: res.data.total
+						})
+						// _this.loading = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				let _this = this;
+				if (_this.current_page >= _this.totalPage) {
+					// _this.loading = true;
+					return false;
+				}
+				_this.getStoreDynamic(++_this.current_page, true);
+			},
+			prevPhoto(currentIndex, image_urls) {
+				let _this = this;
+				uni.previewImage({
+					current:image_urls[currentIndex],
+					urls: image_urls,
+					indicator: "default"
+				})
+			},
+			tabbarShow() {
+				let _this = this;
+				uni.showLoading()
+				_this.slide_Top = 0;
+				_this.current_page = 1;
+				_this.getStoreDynamic();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.inlinBlock{
+		display: inline-block;
+	}
+	.comment-content{
+		.scrollView{
+			min-height: calc(100vw);
+		}
+	}
+	.comment-item {
+		border-bottom: 1px solid #EEEEEE;
+
+		.comment-header {
+			.comment-header-left {
+				.user-avatar {
+					width: 76upx;
+					height: 76upx;
+					background: rgba(238, 238, 238, 1);
+					border-radius: 38upx;
+					background-repeat: no-repeat;
+					background-size: 76upx 76upx;
+				}
+			}
+		}
+
+		.commentPhoto {
+			width: 100%;
+			flex-grow: 1;
+
+			.photo-item {
+				
+				width: 31.33%;
+				height: 216upx;
+				border-radius: 10upx;
+				background-repeat: no-repeat;
+				background-size: 100% 216upx;
+				margin: 0 10upx 10upx 0;
+			}
+		}
+	}
+</style>
diff --git a/components/template/storeGoods.vue b/components/template/storeGoods.vue
new file mode 100644
index 0000000..fa34b20
--- /dev/null
+++ b/components/template/storeGoods.vue
@@ -0,0 +1,436 @@
+<template>
+	<view class="container">
+		<block v-if="tabType==='goods'">
+			<view class="storeGoods-content">
+				<view class="scrollView">
+					<view class="goods-list">
+						<view class="goods-item dis-flex m-btm50" v-for="(goodsItem,index) in goodsData" :key="index" @click="naviGoods(goodsItem.id,goodsItem.type)">
+							<view class="goods-item-left m-right30" :style="{'background-image':'url('+(goodsItem.logo || goodsItem.thumb)+')'}"></view>
+							<view class="goods-item-right dis-flex flex-dir-column flex-x-between">
+								<!-- 团购 -->
+								<block v-if="goodsItem.type==='2'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-1-icon t-c col-f m-right10">团购</text>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.price}}</view>
+											<view class="goodsOldPrice-1 f-24 col-9" style="text-decoration:line-through;" v-if="TextSubstitution.flag074 != 1">¥{{goodsItem.oldprice}}</view>
+											<view class="dis-flex flex-y-center member-coupon-view" v-else-if="goodsItem.discount_price != 0 && TextSubstitution.flag074 == 1">
+												<view class="member-price-label f-22" >{{goodsItem.levelarmy == 1?'拥军价格':'会员价格'}}</view>
+												<!-- <view class="member-price-label f-22" v-else>{{goodsDetail.levelname}}</view> -->
+												<view class="f-22 col-f onelist-hidden b-0 coupon-price-2">立减<text class="member-coupon-price">{{goodsItem.discount_price}}</text>元</view>
+											</view>
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">{{languageStatus!=1?'购买':'구매'}}</view>
+									</view>
+								</block>
+								<!-- 拼团 -->
+								<block v-if="goodsItem.type==='3'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<view class="goodstype-2-icon flex-x-between flex-y-center m-right10">
+											<view class="goodstype-2-labelIcon iconfont icon-friend"></view>
+											<view class="f-24 goodstype-2-peoplenum">{{goodsItem.peoplenum}}人团</view>
+										</view>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="col-9 f-24">已拼{{goodsItem.buy_num}}件</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.price}}</view>
+											<view class="goodsOldPrice-1 f-24 col-9" style="text-decoration:line-through;">¥{{goodsItem.oldprice}}</view>
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">去拼团</view>
+									</view>
+								</block>
+								<!-- 卡券 -->
+								<block v-if="goodsItem.type==='5'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-3-icon t-c p-r b-f f-24 m-right10">卡券</text>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="goodsPrice-1">
+										<view class="goodsNowPrice-1 f-36 m-right10" v-if="goodsItem.is_charge != '0'"><text class="f-24">¥</text>{{goodsItem.price}}</view>
+										<view class="goodsNowPrice-1 f-36 m-right10" v-else><text class="f-28">免费</text></view>
+									</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="goods3-progress p-r m-right10">
+												<view class="already-progress" :style="'width:'+Number(goodsItem.buy_percentage)+'%'"></view>
+											</view>
+											<view class="f-24 col-3" v-if="goodsItem.is_charge != '0'">已售{{goodsItem.buy_percentage}}%</view>
+											<view class="f-24 col-3" v-else>已领{{goodsItem.buy_percentage}}%</view>
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f" v-if="goodsItem.is_charge != '0'">{{languageStatus!=1?'购买':'구매'}}</view>
+										<view class="goods-1-buybtn f-24 t-c col-f" v-else>领取</view>
+									</view>
+								</block>
+								<!-- 抢购 -->
+								<block v-if="goodsItem.type==='1'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-1-icon t-c col-f m-right10"><text class="iconfont icon-hotfill hotfill-icon"></text>抢购</text>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="goodsPrice-1 dis-flex">
+										<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.price}}</view>
+										<view class="dis-flex flex-y-center member-coupon-view" v-if="TextSubstitution.flag074 == 1 && goodsItem.discount_price != 0">
+											<view class="member-price-label f-22" >{{goodsItem.levelarmy == 1?'拥军价格':'会员价格'}}</view>
+											<!-- <view class="member-price-label f-22" v-else>{{goodsDetail.levelname}}</view> -->
+											<view class="f-22 col-f onelist-hidden b-0 coupon-price-2">立减<text class="member-coupon-price">{{goodsItem.discount_price}}</text>元</view>
+										</view>
+									</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="goods3-progress p-r m-right10">
+												<view class="already-progress" :style="'width:'+Number(goodsItem.buy_percentage)+'%'"></view>
+											</view>
+											<view class="f-24 col-3">已售{{goodsItem.buy_percentage}}%</view>
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">{{languageStatus!=1?'购买':'구매'}}</view>
+									</view>
+								</block>
+								<!-- 砍价 -->
+								<block v-if="goodsItem.type==='7'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-1-icon t-c col-f m-right10"><text class="new_iconfont icon-kanjia hotfill-icon"></text>砍价</text>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="col-9 f-24">{{goodsItem.buy_num}}人砍价成功</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center">
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.price}}</view>
+											<view class="goodsOldPrice-1 f-24 col-9" style="text-decoration:line-through;">¥{{goodsItem.oldprice}}</view>
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">去砍价</view>
+									</view>
+								</block>
+								<!-- 活动 -->
+								<block v-if="goodsItem.type==='9'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-1-icon t-c col-f m-right10">活动</text>
+										{{goodsItem.goods_name}}
+									</view>
+									<view class="col-9 f-24" v-if="goodsItem.buy_num">{{goodsItem.buy_num}}人报名成功</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<view class="dis-flex flex-y-center" v-if="goodsItem.minprice && goodsItem.maxprice">
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.minprice}} ~ </view>
+											<view class="goodsNowPrice-1 f-36 m-right10">¥{{goodsItem.maxprice}}</view>
+										</view>
+										<view class="dis-flex flex-y-center" v-else>
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.price}} </view>
+											<!-- <view class="goodsNowPrice-1 f-36 m-right10">¥{{goodsItem.maxprice}}</view> -->
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">去报名</view>
+									</view>
+								</block>
+								<block v-if="goodsItem.type=='10'">
+									<view class="goods-title twolist-hidden f-26 col-3">
+										<text class="goodstype-1-icon t-c col-f m-right10">家政</text>
+										{{goodsItem.title}}
+									</view>
+									<view class="col-9 f-24" v-if="goodsItem.salenum">{{goodsItem.salenum}}人下单成功</view>
+									<view class="goodsPrice-1 dis-flex flex-x-between flex-y-center">
+										<!-- <view class="dis-flex flex-y-center" v-if="goodsItem.minprice && goodsItem.maxprice">
+											<view class="goodsNowPrice-1 f-36 m-right10"><text class="f-24">¥</text>{{goodsItem.minprice}} ~ </view>
+											<view class="goodsNowPrice-1 f-36 m-right10">¥{{goodsItem.maxprice}}</view>
+										</view> -->
+										<view class="dis-flex flex-y-center">
+											<view class="goodsNowPrice-1 f-30 m-right10" ><text class="f-24"></text>{{goodsItem.price}} </view>
+											<!-- <view class="goodsNowPrice-1 f-36 m-right10" v-else><text class="f-24">¥</text>{{goodsItem.price}} </view> -->
+											<!-- <view class="goodsNowPrice-1 f-36 m-right10">¥{{goodsItem.maxprice}}</view> -->
+										</view>
+										<view class="goods-1-buybtn f-24 t-c col-f">去下单</view>
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+	export default {
+		data() {
+			return {
+				goodsData: [],
+				totalPage: null,
+				slide_Top: 0, // 滚动距离
+				current_page: 1, // 当前页数
+				loading: false,
+				TextSubstitution:{}
+			}
+		},
+		props: {
+			storeId: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			tabType: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			}
+		},
+		methods: {
+			getStoreGoods(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						sid: _this.storeId,
+						page,
+					};
+				if(!_this.storeId)	return
+				App._post_form('&p=store&do=getStoreDetailGoods', requestData, res => {
+					let goodsData = res.data;
+					if (isPage) {
+						if (goodsData.list.length > 0) {
+							_this["goodsData"].push(...goodsData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData({
+							goodsData: res.data.list,
+							totalPage: res.data.total
+						})
+						// _this.loading = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+					}
+					_this.$emit('goodsListlength',_this.goodsData.length);
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				console.info('ReachBottomGoods')
+				let _this = this;
+				if (_this.current_page >= _this.totalPage) {
+					// _this.loading = true;
+					return false;
+				}
+				_this.getStoreGoods(++_this.current_page, true);
+			},
+			tabbarShow() {
+				let _this = this;
+				uni.showLoading()
+				_this.slide_Top = 0;
+				_this.current_page = 1;
+				_this.getStoreGoods();
+			},
+			naviGoods(goods_id, goodsType) {
+				let _this = this,
+					navData = {
+						id:goods_id,
+						type:goodsType
+					};
+					if(goodsType != '9' && goodsType != '10'){
+						App.navigationTo({
+							url:'pages/subPages/goods/index?'+ App.urlEncode(navData)
+						});
+					}else if(goodsType == '10'){
+						// debugger
+						App.navigationTo({
+							url:`pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${navData.id}`
+						});
+					}else{
+						
+						App.navigationTo({
+							url:'pages/subPages2/coursegoods/coursegoods?'+ App.urlEncode(navData)
+						});
+					}
+				
+			}
+		},
+		onLoad(e) {
+		},
+		mounted() {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		},
+		computed: {
+
+		},
+		components: {
+
+		},
+		watch:{
+			storeId(newValue,oldValue){
+				this.getStoreGoods()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.storeGoods-content {
+		.scrollView {
+			.goods-list {
+				.goods-item {
+					.goods-item-left {
+						width: 160upx;
+						height: 160upx;
+						background-size: 160upx 160upx;
+						background-repeat: no-repeat;
+						border-radius: 10upx;
+						flex-shrink: 0;
+					}
+
+					.goods-item-right {
+						flex: 1;
+
+						.goods-title {
+							height: 2.6em;
+							line-height: 1.3em;
+						}
+
+						.goodstype-1-icon {
+							width: 52upx;
+							height: 30upx;
+							line-height: 30upx;
+							background: rgba(255, 68, 68, 1);
+							border-radius: 4upx;
+							font-size: 24upx;
+							padding: 0 8upx;
+
+							.hotfill-icon {
+								font-size: 24upx;
+								color: #FFFFFF;
+							}
+						}
+
+						.goodstype-2-icon {
+							display: inline-flex;
+							border: 1px solid #FF4444;
+							color: #FF4444;
+							border-radius: 10upx;
+
+							.goodstype-2-labelIcon {
+								color: #FFFFFF;
+								background-color: #FF4444;
+								font-size: 24upx;
+								padding: 0 6upx;
+							}
+
+							.goodstype-2-peoplenum {
+								padding: 0upx 6upx;
+							}
+						}
+
+						.goodstype-3-icon {
+							display: inline-block;
+							color: #FF4444;
+							border: 1px solid #FF4444;
+							border-radius: 10upx;
+							padding: 0 8upx;
+						}
+
+						.goodstype-3-icon::before {
+							content: " ";
+							position: absolute;
+							left: -8upx;
+							top: 50%;
+							transform: translateY(-50%);
+							width: 10upx;
+							height: 12upx;
+							border-radius: 50%;
+							background-color: #FFFFFF;
+							border-right: 1px solid #ff4444;
+						}
+
+						.goodstype-3-icon::after {
+							content: " ";
+							position: absolute;
+							right: -8upx;
+							top: 50%;
+							transform: translateY(-50%);
+							width: 10upx;
+							height: 10upx;
+							border-radius: 50%;
+							background-color: #FFFFFF;
+							border-left: 1px solid #ff4444;
+						}
+						
+						.goodsPrice-1 {
+							.goods3-progress {
+								width: 140upx;
+								height: 18upx;
+								border: 1px solid rgba(255, 68, 68, 1);
+								border-radius: 10upx;
+
+								.already-progress {
+									position: absolute;
+									left: 0;
+									right: 0;
+									top: 0;
+									bottom: 0;
+									background: linear-gradient(90deg, rgba(242, 64, 64, 1) 0%, rgba(239, 27, 27, 1) 100%);
+									opacity: 0.7;
+									border-radius: 9px 0px 0px 9px;
+								}
+							}
+
+							.goodsNowPrice-1 {
+								color: #FF4444;
+
+								&>text {
+									color: #FF4444;
+								}
+							}
+
+							.goodsOldPrice-1 {
+								text-decoration: line-through;
+							}
+
+							.goods-1-buybtn {
+								width: 98upx;
+								height: 50upx;
+								line-height: 50upx;
+								background: rgba(255, 68, 68, 1);
+								border-radius: 10upx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	.member-coupon-view {
+		position: relative;
+		margin-left: 12upx;
+		// top: -6rpx;
+	}
+	.member-price-label {
+		color: #333333;
+		height: 0;
+		line-height: 30upx;
+		border-width: 0upx 10upx 30upx 0;
+		border-style: none solid solid;
+		border-color: transparent #000 #efd68f;
+		position: relative;
+		left: 10upx;
+		padding-left: 6upx;
+		border-radius: 4upx 0 0 4upx;
+		margin-left: -10upx;
+	}
+	.coupon-price-2 {
+		padding: 0 10upx;
+		height: 30upx;
+		line-height: 30upx;
+		border-radius: 0 4upx 4upx 0;
+	}
+</style>
diff --git a/components/template/storelist.vue b/components/template/storelist.vue
new file mode 100644
index 0000000..517044f
--- /dev/null
+++ b/components/template/storelist.vue
@@ -0,0 +1,342 @@
+<template>
+	<view>
+		<view class="storelist">
+			<view class="storelist-i" v-for="(item, key) in storeList" :key="key">
+				<!-- <navigator class="a" :url="'/pagesGoodstore/storedetail/index?i='+item.id" hover-class="none"> -->
+				<view class="storelist-i-t"  @click="navgateTo(item.jump_link)">
+					<view class="store-rank " :class="{storeRankNormal: key > 2}" v-if="!search">
+						<view class="store-rank-d">
+							<view class="p">本周排名</view>
+							<view class="h1">{{ key+1 }}</view>
+						</view>
+					</view>
+					<image class="image"  @load="imgload" :src="item.logo" mode="aspectFill"></image>
+				</view>
+				<!-- </navigator> -->
+				<view class="storelist-i-b" :class="{searchStyle: search}">
+					<!-- <navigator class="a" :url="'/pagesGoodstore/storedetail/index?i='+item.id" hover-class="none"> -->
+					<view class="storelist-i-b-t1" @click="navgateTo(item.jump_link)">
+						<view class="h1">{{ item.storename }}</view>
+						<view class="p">{{ item.pv }}人气值</view>
+					</view>
+					<view class="storelist-i-b-t2 dis-flex flex-y-center">
+						<view class="h1">
+							<view class="i icon iconfont icon-locationfill inline"></view>{{ item.address }}
+						</view>
+						<view class="p">{{ item.distance }}</view>
+					</view>
+					<!-- </navigator> -->
+					<view class="storelist-i-b-t3">
+						<!-- 						<navigator class="a song" :url="'/pagesHeadline/headlinedetail/index?i='+item.headline.id" hover-class="none"
+						 v-if="!!item.headline"> -->
+						<!-- <view class="a song" @click="navgateTo(item.headline.jump_link)">
+							<view class="span">
+								<view class="em song">送</view>{{ item.headline.title }}
+							</view>
+							<view class="i icon iconfont icon-right"></view>
+						</view> -->
+						<!-- </navigator> -->
+						<view class="a qiang" v-for="(item2, key2) in item.goods" :key="key2" v-if="!!item2 && (key2 == 'active' || key2 == 'fightgroup' || key2 == 'groupon' || key2 == 'coupon')"
+						 @click="navgateTo(item2.jump_link)">
+							<view class="span">
+								<view class="em qiang" v-if="key2 == 'active'">抢</view>
+								<view class="em pin" v-else-if="key2 == 'fightgroup'">拼</view>
+								<view class="em tuan" v-else-if="key2 == 'groupon'">团</view>
+								<view class="em quan" v-else-if="key2 == 'coupon'">券</view>
+									<view class="em kan" v-else-if="key2 == 'bargain'">砍</view>
+									<view class="em zhe" v-else-if="key2 == 'halfcard'">折</view>
+									<view class="em li" v-else-if="key2 == 'packages'">礼</view>
+								{{ item2.name }}
+							</view>
+							<view class="i icon iconfont icon-right"></view>
+						</view>
+						<!-- <navigator class="a qiang" :url="'/pagesBuy/rushdetail/index?i='+item2.id+'&c='+key2" hover-class="none" > -->
+						<!-- </navigator> -->
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	export default {
+		data() {
+			return {
+				width:345,
+				height:345
+			}
+		},
+		props: ['search', 'storeList'],
+
+		methods: {
+			imgload(e){
+				let ratios;
+				uni.getSystemInfo({
+					success: function(wh) {
+						ratios = wh.windowWidth / e.detail.width;
+					}
+				});
+				this.width = ratios * e.detail.width,
+				this.height = ratios * e.detail.height
+				// debugger
+			},
+			navgateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.storelist-i {
+		margin-top: 50upx;
+	}
+
+	.storelist-i:first-child {
+		margin-top: 0;
+	}
+
+	.storelist-i-t {
+		width: 690upx;
+		height: 690upx;
+		position: relative;
+	}
+
+	.storelist-i-t .store-rank {
+		width: 84upx;
+		height: 76upx;
+		padding: 7upx;
+		background: -webkit-linear-gradient(180deg, #FFEDAB, #E5B406);
+		background: linear-gradient(180deg, #FFEDAB, #E5B406);
+		border-radius: 8upx 8upx 0 0;
+		position: absolute;
+		top: -6upx;
+		left: 30upx;
+	}
+
+	.storelist-i-t .store-rank:after {
+		content: "";
+		width: 100%;
+		height: 30upx;
+		background-color: #E5B406;
+		border-radius: 50%;
+		position: absolute;
+		top: calc(100% - 18upx);
+		left: 0;
+	}
+
+	.storelist-i-t .store-rank-d {
+		width: 84upx;
+		height: 76upx;
+		background: -webkit-linear-gradient(180deg, #FFBB02, #FFDF73);
+		background: linear-gradient(180deg, #FFBB02, #FFDF73);
+		position: relative;
+	}
+
+	.storelist-i-t .store-rank-d:after {
+		content: "";
+		width: 100%;
+		height: 30upx;
+		background: -webkit-linear-gradient(180deg, #FFD75B, #FFDF73);
+		background: linear-gradient(180deg, #FFD75B, #FFDF73);
+		border-radius: 50%;
+		position: absolute;
+		top: calc(100% - 18upx);
+		left: 0;
+		z-index: 1;
+	}
+
+	.storelist-i-t .store-rank-d .p {
+		height: 40upx;
+		line-height: 40upx;
+		font-size: 20upx;
+		text-align: center;
+	}
+
+	.storelist-i-t .store-rank-d .h1 {
+		height: 40upx;
+		line-height: 40upx;
+		color: #FF0000;
+		font-size: 40upx;
+		text-align: center;
+		margin-top: -2upx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.storelist-i-t .image {
+		width: 100%;
+		height: 100%;
+		background-color: #fff;
+		border-radius: 8upx 8upx 0 0;
+	}
+
+	.storelist-i-t .storeRankNormal {
+		background: #DC2F1D;
+	}
+
+	.storelist-i-t .storeRankNormal:after {
+		background: #DC2F1D;
+	}
+
+	.storelist-i-t .storeRankNormal .store-rank-d {
+		background: #DC2F1D;
+	}
+
+	.storelist-i-t .storeRankNormal .store-rank-d:after {
+		background: #DC2F1D;
+	}
+
+	.storelist-i-t .storeRankNormal .store-rank-d .p {
+		color: rgba(255, 255, 255, .9);
+	}
+
+	.storelist-i-t .storeRankNormal .store-rank-d .h1 {
+		color: #fff;
+	}
+
+	.storelist-i-b {
+		padding: 20upx 20upx 0 20upx;
+		background-color: #fff;
+		border-radius: 0 0 8upx 8upx;
+	}
+
+	.searchStyle {
+		padding: 20upx 0 0;
+	}
+
+	.storelist-i-b-t1 {
+		margin-top: 10upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.storelist-i-b-t1 .h1 {
+		line-height: 46upx;
+		font-size: 36upx;
+		font-weight: 600;
+		padding-right: 20upx;
+		-webkit-flex: 1;
+		flex: 1;
+	}
+
+	.storelist-i-b-t1 .p {
+		line-height: 52upx;
+		color: #999;
+		font-size: 24upx;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.storelist-i-b-t2 {
+		margin-top: 30upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.storelist-i-b-t2 .h1 {
+		font-size: 24upx;
+		color: #999;
+		padding-right: 20upx;
+		-webkit-flex: 1;
+		flex: 1;
+	}
+
+	.storelist-i-b-t2 .h1 .i {
+		font-size: 26upx;
+		margin-right: 6upx;
+		vertical-align: 0;
+		display: inline-block;
+	}
+
+	.storelist-i-b-t2 .p {
+		color: #666;
+		font-size: 24upx;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.storelist-i-b-t3 {
+		margin-top: 30px;
+		border-top: .12upx solid #f6f6f6;
+	}
+
+	.storelist-i-b-t3 .a {
+		height: 42upx;
+		line-height: 42upx;
+		font-size: 24upx;
+		padding: 20upx 0;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.storelist-i-b-t3 .a .span {
+		-webkit-flex: 1;
+		flex: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.storelist-i-b-t3 .em.song {
+		background-color: #38C286;
+	}
+
+	.storelist-i-b-t3 .em.qiang {
+		background-color: #ff6d6c;
+	}
+
+	.storelist-i-b-t3 .em.pin {
+		background-color: #fe433f;
+	}
+
+	.storelist-i-b-t3 .em.tuan {
+		background-color: #46C8D8;
+	}
+
+	.storelist-i-b-t3 .em.quan {
+		background-color: #ff8400;
+	}
+
+	.storelist-i-b-t3 .em.zhe {
+		background-color: #b9976f;
+	}
+	.storelist-i-b-t3 .em.kan {
+		background-color: #FF7FCA;
+	}
+
+	.storelist-i-b-t3 .em.li {
+		background-color: #c56dfd;
+	}
+
+	.storelist-i-b-t3 .a .span .em {
+		width: 36upx;
+		height: 36upx;
+		line-height: 36upx;
+		color: #fff;
+		text-align: center;
+		font-style: normal;
+		margin-right: 10upx;
+		border-radius: 4upx;
+		display: inline-block;
+	}
+
+	.storelist-i-b-t3 .a .i {
+		color: #d9d9d9;
+		font-size: 26upx;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+</style>
diff --git a/components/template/tabBar.vue b/components/template/tabBar.vue
new file mode 100644
index 0000000..cca1e65
--- /dev/null
+++ b/components/template/tabBar.vue
@@ -0,0 +1,341 @@
+<template>
+	<view v-if="!!TabBarsData">
+		<view class="diy-tabbar" :style="{'background':TabBarsData?TabBarsData.style.bgcolor:'#ffffff','padding-bottom':isPadding?'20px':'','borderTop': '1px solid #efefef'}">
+			<view class="tabbar-item" v-for="(item,index) in TabBarsData.data" :key="index" @click="onTabItem(item.linkurl,item.name,index)">
+				<view v-if="TabBarsData.params.navstyle==='1'">
+					<image class="image" :src="item.imgurl"></image>
+				</view>
+				<view v-if="TabBarsData.params.navstyle==='0'">
+					<view class="tabbar-sever" v-if="item.page_path == 'pages/subPages2/homemaking/postDemand/postDemand'">
+						<image class="tabbar-severImg" :src="imgfixUrls + 'homemakingImg/enterCheck.png'" mode=""></image>
+					</view>
+					<view  v-else>
+						<view class="iconfont tabbar-item-icon" :class="item.iconclass" :style="current===index?'color:'+TabBarsData.style.iconcoloron:'color:'+TabBarsData.style.iconcolor"></view>
+						<view class="f-24" :style="current===index?'color:'+TabBarsData.style.textcoloron:'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
+					</view>
+					
+				</view>
+				<view class="navstyle-3-item" v-if="TabBarsData.params.navstyle==='2'" :class="(isTip && index=='2')?'msg_tip':''">
+					<view class="navstyle-image" :style="{'background-image':current===index?'url('+item.select_img+')':'url('+item.default_img+')'}"></view>
+					<view class="f-24 t-c" :style="current===index?'color:'+TabBarsData.style.textcoloron:'color:'+TabBarsData.style.textcolor">{{item.text}}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				current: 0,
+				isPadding: null,
+				menu: null,
+				isTip: false,//是否红点消息提示
+			}
+		},
+		props: {
+			tabBarAct: {
+				type: Number,
+				default: function() {
+					return 0
+				}
+			},
+			
+			tabBarData: {
+				default: function() {
+					return null
+				}
+			},
+			
+
+		
+			pageType: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			pageId: {
+				type: String,
+				default: function() {
+					return ""
+				}
+			},
+			menuList: {
+				default: function() {
+					return ""
+				}
+			}
+		},
+		mounted() {
+			let _this = this;
+			_this.current =  uni.getStorageSync('tabbarindex');
+			uni.getSystemInfo({
+				success(res) {
+					let model = res.model,
+						iphoneModel = ["iPhone10,3", "iPhone10,6", "iPhone11,8", "iPhone11,2", "iPhone11,6"];
+					_this.isPadding = iphoneModel.includes(model) || model.indexOf("iPhone X") !== -1 || model.indexOf("iPhone12") !== -1;
+				}
+			});
+			_this.getbtmNavBar()
+		},
+		methods: {
+			onTabItem(url, pageName,index) {
+				uni.setStorageSync('tabbarindex',index);
+				if(url.indexOf('indet') != -1){
+					//#ifdef H5
+					// let loc = url.split('?')[1];
+					// debugger
+					App.navigationToH5(false,`${App.base}#/${url}`);
+					window.location.reload();
+					//#endif
+					//#ifndef H5
+					App.navigationTo({
+						url:url
+					});
+					//#endif
+					return
+				}
+				// #ifdef H5
+				App.navigationTo({
+					url: url
+				});
+				// #endif
+				// #ifndef H5
+				App.navigationTo({
+					url: url,
+					navType:'rediRect'
+				});
+				// #endif
+				
+			},
+			getbtmNavBar() {
+				let _this = this,
+					requestData = {};
+				if (!!_this.pageType) {
+					requestData = {
+						type: _this.pageType
+					}
+				}
+				if (!!_this.pageId) {
+					Object.assign(requestData, {
+						id: _this.pageId
+					})
+				}
+				if(_this.pageType == 'draw'){
+						_this.setData({
+							menu: _this.tabBarData
+						});
+						let pages = getCurrentPages(),
+							currentPage = pages[pages.length - 1],
+							pageRoute = currentPage.route || currentPage.__route__;
+							let tablist = [];
+							// for (let i in _this.menu.data) {
+							// 	tablist.push(_this.menu.data[i]);
+							// };
+							
+							// let result_one = tablist.m(function(item) {
+							//     if (item.page_path.split('?')[0] == pageRoute) { 
+							//         return true;  //返回false
+							//     }
+							// });
+							let result_one = false;
+							tablist = _this.menu.data;
+							// for(let i = 0;i<tablist.length;i++){
+							// 	if(tablist[i].page_path.split('?')[0] == pageRoute){
+							// 		result_one = true;
+							// 		return  //返回false
+							// 	}
+							// }
+							for (let key in tablist) {
+								if(tablist[key].page_path.split('?')[0] == pageRoute){
+									result_one = true;
+									  //返回false
+								}
+							};
+							if(!result_one){
+								uni.removeStorageSync('tabbarindex');
+								_this.current = 0;
+							}
+				}else{
+				App._post_form('&do=BottomMenu', requestData, res => {
+						_this.setData({
+							menu: res.data.data
+						});
+						// uni.showToast({
+						// 	title:'成功了'
+						// })
+					let pages = getCurrentPages(),
+						currentPage = pages[pages.length - 1],
+						pageRoute = currentPage.route || currentPage.__route__;
+						let tablist = [];
+						// for (let i in _this.menu.data) {
+						// 	tablist.push(_this.menu.data[i]);
+						// };
+						
+						// let result_one = tablist.m(function(item) {
+						//     if (item.page_path.split('?')[0] == pageRoute) { 
+						//         return true;  //返回false
+						//     }
+						// });
+						let result_one = false;
+						tablist = _this.menu.data;
+						// for(let i = 0;i<tablist.length;i++){
+						// 	if(tablist[i].page_path.split('?')[0] == pageRoute){
+						// 		result_one = true;
+						// 		return  //返回false
+						// 	}
+						// }
+						for (let key in tablist) {
+							if(tablist[key].page_path.split('?')[0] == pageRoute){
+								result_one = true;
+								  //返回false
+							}
+						};
+						if(!result_one){
+							uni.removeStorageSync('tabbarindex');
+							_this.current = 0;
+						}
+						if(res.data.data.is_icon){
+							//有新消息
+							// _this.isTip = true;
+						}else{
+							// _this.isTip = false;
+						}
+				})
+				}
+			},
+		},
+		computed: {
+			TabBarsData() {
+				let pages = getCurrentPages(),
+					currentPage = pages[pages.length - 1],
+					pageRoute = currentPage.route || currentPage.__route__,
+					TabBarsData = {
+						data: !!this.tabBarData && this.tabBarData.length > 0 ? this.tabBarData : this.menu
+					},
+					pageIndex;
+					console.log(this.tabBarData, this.menu)
+					// #ifdef H5
+				let	pageObj = currentPage.$mp.query;
+					// debugger
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				let pageObj = currentPage.$vm.$mp.query;
+				// #endif
+				//#ifdef APP-PLUS
+				let pageObj = currentPage.options;
+				//#endif
+				if(!!TabBarsData.data) {
+					let tablist = [];
+					for (let key in TabBarsData.data.data) {
+						tablist.push(TabBarsData.data.data[key])
+					};
+					// debugger
+					if (pageRoute === 'pages/mainPages/index/diypage') {
+						// 检测自定义页面的参数，判断高亮
+						pageRoute = pageRoute + '?i=' + pageObj.i + (pageObj['aid']?'&aid=' + pageObj['aid']:'') + (pageObj['id']?'&id=' + pageObj['id']:'') + '&type=' + pageObj['type'];
+						//之前使用for in 循环给每一个K添加上链接，但是因为小程序在移动端表现参数的位置不同，所以修改为固定位置添加参数
+						pageIndex = tablist.findIndex(item => item.linkurl === pageRoute);
+						this.current = pageIndex;
+					}else{
+						pageIndex = tablist.findIndex(item => item.linkurl.split('?')[0] === pageRoute);
+						this.current = pageIndex;
+						
+					}
+					TabBarsData.data.data = tablist;
+					console.log(TabBarsData.data)
+					return TabBarsData.data
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.diy-tabbar {
+		border-color: rgba(0, 0, 0, 0.33);
+		position: fixed;
+		z-index: 9999;
+		height: 130upx;
+		left: 0;
+		background-color: rgb(255, 255, 255);
+		color: rgb(110, 109, 107);
+		bottom: 0;
+		width: 100%;
+		display: flex;
+	}
+
+	.tabbar-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		flex-direction: column;
+		flex: 1;
+		font-size: 0;
+		color: #6e6d6b;
+		text-align: center;
+		z-index: 5;
+		padding-bottom: 30upx;
+	}
+	
+	.tabbar-sever{
+		
+	}
+	.tabbar-severImg{
+		width: 84upx;
+		height: 84upx;
+		position: relative;
+		top: -20upx;
+	}
+	.tabbar-item .tabbar-item-icon {
+		font-size: 44upx;
+	}
+
+	.tabbar-item.item-on {
+		/* color: #fd4a5f; */
+	}
+
+	.tabbar-item .image {
+		display: inline-block;
+		width: 100upx;
+		height: 100upx;
+	}
+
+	.tabbat-item-text {
+		padding-top: 0;
+		padding-bottom: 0;
+		font-size: 20upx;
+		line-height: 1.8;
+		text-align: center;
+	}
+
+	.navstyle-image {
+		width: 60upx;
+		height: 60upx;
+		background-repeat: no-repeat;
+		background-size: 60upx 60upx;
+		display: block;
+		margin: 0 auto;
+	}
+
+	.navstyle-3-item {
+		padding: 10upx 0;
+	}
+	.msg_tip{
+		position: relative;
+	}
+	.msg_tip::after{
+		position: absolute;
+		top: 6px;
+		right: 0px;
+		content: '';
+		background-color: #f00;
+		width: 6px;
+		height: 6px;
+		border-radius: 3px;
+	}
+</style>
diff --git a/components/template/tabs/tabs.vue b/components/template/tabs/tabs.vue
new file mode 100644
index 0000000..1e68225
--- /dev/null
+++ b/components/template/tabs/tabs.vue
@@ -0,0 +1,260 @@
+<template>
+	<view class="">
+		<scroll-view class="tabs-bar" :scroll-x="true">
+			<view class="tabs-bar-item" v-for="(item1,index1) in tabList" :key="index1"
+			 :class="current_index==index1?'active': ''" @click="changeIndex(index1)">
+				{{item1.name}}
+			</view>
+		</scroll-view>
+		<view class="tabs-content">
+			<swiper class="tabs-banner" :indicator-dots="true">
+				<swiper-item v-for="(item2,index2) in bannerList" :key="index2" @click="navigatorTo(item2.link)">
+					<image :src="item2.thumb" mode="widthFix"></image>
+				</swiper-item>
+			</swiper>
+			<scroll-view class="tabs-video" :scroll-x="true">
+				<view v-for="(item3,index3) in videoList" :key="index3" class="tabs-video-item">
+					<view style="">
+						<video @click="handleV(item3)" :src="item3.video_link" object-fit="cover"
+						 :show-center-play-btn="false" :controls="false" :direction="0"></video>
+						
+					</view>
+					<view class="video-txt">
+						{{item3.title}}
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		
+		<PopManager :show="videoshow" type="center">
+			<view v-if="videoshow" style="width: 100vw;height: 100vh;position: relative;background-color: #000;">
+				<video id="myvideo" :src="videolint" @fullscreenchange="videoControl"
+				  style="width: 100%;position: absolute;top: 50%;transform: translateY(-50%);"
+				  @click.stop="" :show-fullscreen-btn="false" :autoplay="true" :direction="0"></video>
+				<view class="status_bar"></view>
+				<view class="videoNavBar">
+				 	<text class="iconfont icon-roundleftfill" style="font-size: 48upx;" @click="videoshow = false"></text>
+				</view>
+				<cover-view class="videoTxt">
+					{{videoTxt}}
+				</cover-view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	export default{
+		data(){
+			return {
+				current_index: 0,
+				tabList: [],
+				child_id: 0,
+				bannerList: [],
+				videoList: [],
+				videoshow: false,
+				videolint: '',
+				videoTxt: '',
+			}
+		},
+		components: {
+			PopManager
+		},
+		props: {
+			pageType: {
+				type: Number | String,
+				default: ''
+			},
+			cc_id: {
+				type: Number | String,
+				default: 0
+			}
+		},
+		created() {
+			this.getTabData();
+		},
+		mounted() {
+			// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+			// this.videoContext = uni.createVideoContext('myvideo', this);
+			// this.videoContext.requestFullScreen();
+		},
+		methods: {
+			getTabData(){
+				App._post_form(
+					`&p=cultivateClass&do=getCultivateClassChildList`,
+					{cc_id: this.cc_id},
+					res => {
+						if(res.data.length>0){
+							this.tabList = res.data;
+							console.log(res.data);
+							this.child_id = res.data[0].id;
+							this.getInfoData();
+							this.$emit('changeChildType',this.child_id);
+						}
+					},
+					false,
+					() => {
+						// this.loadlogo = true;
+					}
+				);
+			},
+			getInfoData(){
+				App._post_form(
+					`&p=cultivateClass&do=getCultivateClassInfo`,
+					{cc_id: this.child_id},
+					res => {
+						this.bannerList = res.data.advs;
+						this.videoList = res.data.video;
+						// this.videoList = [...res.data.video, ...res.data.video, ...res.data.video, ...res.data.video];
+					},
+					false,
+					() => {
+						// this.loadlogo = true;
+					}
+				);
+			},
+			changeIndex(i){
+				this.current_index = i;
+				this.child_id = this.tabList[i].id;
+				this.getInfoData();
+				this.$emit('changeChildType',this.child_id);
+			},
+			navigatorTo(link){
+				console.log(23232)
+				uni.navigateTo({
+					url:'/'+link
+				})
+			},
+			handleV(content){
+				console.log(111, content);
+				this.videoshow = true;
+				this.videolint = content.video_link;
+				this.videoTxt = content.title;
+				// this.videoContext.requestFullScreen({
+				// 	direction:0
+				// })
+			},
+			videoControl(e){
+				// console.log(e)
+				// if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+				// 	this.videoContext.play();
+				// }else{
+				// 	//停止播放
+				// 	// this.videoContext.stop();   各位老板不要选择stop 选择了stop 缩小视频还会自动播放
+				// 	this.videoContext.pause();
+				// }
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	.tabs-bar{
+		width: 100%;
+		height: 40px;
+		padding: 0px 10upx;
+		box-sizing: border-box;
+		white-space: nowrap;
+		
+		::-webkit-scrollbar{
+			display: none;
+		}
+		
+		.tabs-bar-item{
+			display: inline-block;
+			line-height: 20px;
+			padding: 10px;
+			font-size: 14px;
+			color: #666;
+			&.active{
+				font-weight: bold;
+				color: #333;
+				position: relative;
+			}
+			&.active::after{
+				content: '';
+				width: 20px;
+				height: 3px;
+				position: absolute;
+				bottom: 0px;
+				left: 50%;
+				transform: translateX(-50%);
+				background-color: #f00;
+			}
+		}
+	}
+	.tabs-content{
+		width: 100%;
+		padding: 30upx;
+		box-sizing: border-box;
+		
+		.tabs-banner{
+			width: 100%;
+			height: 300upx;
+			border-radius: 20upx;
+			transform: translate3d(0, 0, 0);
+			overflow: hidden;
+			background-color: #fff;
+			margin-bottom: 40upx;
+			
+			image{
+				width:100%;
+			}
+		}
+		.tabs-video{
+			width: 100%;
+			white-space: nowrap;
+			
+			::-webkit-scrollbar{
+				display: none;
+			}
+			
+			.tabs-video-item{
+				width: 200upx;
+				display: inline-block;
+				margin-right: 20upx;
+			}
+			video{
+				width: 200upx;
+				height: 300upx;
+				border-radius: 20upx;
+				overflow: hidden;
+			}
+			.video-txt{
+				width: 100%;
+				font-size: 14px;
+				white-space: nowrap;
				text-overflow: ellipsis;
				overflow: hidden;
+			}
+		}
+	}
+	.status_bar{
+		height: calc(var(--status-bar-height) * 2);
+		width: 100%;
+	}
+	.videoNavBar{
+		width: 100vw;
+		position: absolute;
+		left: 0upx;
+		top: calc(var(--status-bar-height) * 2);
+		z-index: 1;
+		color: #999;
+		padding: 10upx 30upx 16upx;
+	}
+	.videoTxt{
+		width: 100vw;
+		position: absolute;
+		left: 0upx;
+		bottom: 0;
+		z-index: 1;
+		font-size: 28upx;
+		padding: 20upx 30upx 80upx;
+		box-sizing: border-box;
+		color: #ddd;
+		// background-color: rgba(255,255,255,0.1);
+		white-space: break-spaces;
+	}
+</style>
\ No newline at end of file
diff --git a/components/template/toplist.vue b/components/template/toplist.vue
new file mode 100644
index 0000000..dea4554
--- /dev/null
+++ b/components/template/toplist.vue
@@ -0,0 +1,114 @@
+<template>
+	<view>
+		<view class="toplist">
+			<view class="toplist-i" v-for="(item, key) in topList" :key="key" @click="navgateTo(item.jump_link)">
+				<!-- <navigator class="a" :url="'/pagesHeadline/headlinedetail/index?i='+item.id" hover-class="none"> -->
+				<view class="toplist-i-t">
+					<image class="image" :src="item.display_img" mode="aspectFill"></image>
+				</view>
+				<view class="toplist-i-c dis-flex">
+					
+					<view class="flex-box">
+						{{ item.title }}
+					</view>
+					<view class="flex-box t-r f-20 col-9" style="letter-spacing: 0px;">
+						{{ item.browse }}人参与
+					</view>
+				</view>
+				<!-- </navigator> -->
+				<view class="toplist-i-b" v-if="false">
+					<view class="h1">
+						<view class="span">免费</view>
+						<view class="a">立即领取</view>
+						<!-- 	<navigator class="a" url="/pages/index/index" hover-class="none">立即领取</navigator> -->
+					</view>
+					<view class="p"></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		props: ['topList'],
+
+		methods: {
+			navgateTo(url) {
+				App.navigationTo({
+					url:url
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.toplist-i {
+		margin-top: 50upx;
+	}
+
+	.toplist-i:first-child {
+		margin-top: 0;
+	}
+
+	.toplist-i-t {
+		width: calc(100vw - 60upx);
+		height: calc((100vw - 60upx) / 1.8);
+		position: relative;
+	}
+
+	.toplist-i-t .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 8upx 8upx 0 0;
+	}
+
+	.toplist-i-c {
+		line-height: 50upx;
+		font-size: 36upx;
+		letter-spacing: 4upx;
+		margin-top: 30upx;
+	}
+
+	.toplist-i-b {
+		margin-top: 20upx;
+	}
+
+	.toplist-i-b .h1 {
+		height: 60upx;
+		line-height: 60upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.toplist-i-b .h1 .span {
+		color: #FF5050;
+		font-size: 44upx;
+		display: block;
+	}
+
+	.toplist-i-b .h1 .a {
+		height: 60upx;
+		line-height: 60upx;
+		color: #fff;
+		padding: 0 30upx;
+		background-color: #FF5050;
+		border-radius: 100upx;
+		display: block;
+	}
+
+	.toplist-i-b .p {
+		height: 42upx;
+		line-height: 42upx;
+		color: #999;
+		font-size: 24upx;
+	}
+</style>
diff --git a/components/template/user.vue b/components/template/user.vue
new file mode 100644
index 0000000..821457b
--- /dev/null
+++ b/components/template/user.vue
@@ -0,0 +1,389 @@
+<template>
+	<view class="user-item" :class="{'item-select' : isSelect}">
+		<view @click="toDetail('top')" class="top-info">
+			<!-- 头像 -->
+			<!-- <block v-if="!isShowPlay">
+				<image class="poster" :src="memberInfo.cover" mode=""></image>
+			</block> -->
+			<block v-if="isVideoPlay">
+				<video 
+					x5-video-player-type='h5' 
+					x5-video-player-fullscreen='true' 
+					x5-video-orientation='portraint' 
+					:class="isVideoPlay?'openvideo':'video'" 
+					:id="videoId"
+					:src="memberInfo.video" 
+					:show-center-play-btn="false"
+					object-fit="contain"
+					controls>
+				</video>
+				<view class="iconfont icon-close videoClose" @click="closeVideo">
+					
+				</view>
+			</block>
+			<block v-else>
+				<image class="poster" :src="memberInfo.cover" mode=""></image>
+			</block>
+			<view class="istop" v-if="memberInfo.is_top == 2">
+				<view class="iconfont icon-favor_fill_light"></view>
+				<view class="text">置顶</view>
+			</view>
+			<block v-if="isShowPlayBtn">
+				<image class="play-btn" :src="imgfixUrls + 'dating/bd_play_video.png'" mode="" @click.stop="videoPlay"></image>
+			</block>
+			<!-- 浏览量 -->
+			<block v-if="isShowViews">
+				<view class="look-box">
+					<view class="iconfont icon-attention"></view>
+					<view class="num">{{memberInfo.pv}}</view>
+				</view>
+			</block>
+			<!-- 操作 -->
+			<block v-else>
+				<image class="operation" :src="imgfixUrls + 'dating/bd_message2.png'" mode="" @click.stop="extension"></image>
+			</block>
+			<!-- 位置 -->
+			<view class="location">
+				<view class="iconfont icon-locationfill"></view>
+				<view>{{memberInfo.area}}<span v-if="memberInfo.distances_text">{{memberInfo.distances_text}}</span></view>
+			</view>
+		</view>
+		<view @click="toDetail('bottom')" class="user-info">
+			<view class="info">
+				<view class="name">{{memberInfo.nickname}}</view>
+				<view class="sex woman" :class="{'man': memberInfo.gneder == 1}">
+					<view v-if="memberInfo.gneder == 2" class="iconfont icon-female"></view>
+					<view v-else class="iconfont icon-male"></view>
+					<view class="age">{{memberInfo.age}}</view>
+				</view>
+			</view>
+			<view class="property" style="position: relative;" v-if="propertyInfo.is_show_property || memberInfo.work">
+				<view v-if="propertyInfo.is_have_house" class="property-item" style="margin-left: 30rpx;">
+					<view class="iconfont icon-home"></view>
+					<view>有房</view>
+				</view>
+				<view v-if="propertyInfo.is_have_car" class="property-item">
+					<view class="iconfont icon-qiche"></view>
+					<view>有车</view>
+				</view>
+				<view v-if="memberInfo.work" class="property-item" style="position: absolute;right: 0;width: auto;">
+					<view class="iconfont icon-wode"></view>
+					<view>{{memberInfo.work}}</view>
+				</view>
+			</view>
+			<view v-if="isShowSelect" @click.stop="select">
+				<view v-if="!isSelect" class="iconfont icon-round select"></view>
+				<view v-else class="iconfont icon-chenggong select"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	let videoContext = null;
+	export default {
+		data() {
+			return {
+				isSelect: false,
+				isVideoPlay: false,  //显示video组件
+				videoId: '',
+				isShowPlayBtn: false,  //显示播放按钮
+			}
+		},
+		computed: {
+			propertyInfo() {
+				return {
+					is_have_car: this.memberInfo.travel == 2,
+					is_have_house: (this.memberInfo.live == 1 || this.memberInfo.live == 2),
+					is_show_property: this.memberInfo.travel == 2 || (this.memberInfo.live == 1 || this.memberInfo.live == 2)
+				}
+			}
+		},
+		watch: {
+			isVideoPlay() {
+				videoContext = uni.createVideoContext(this.videoId, this)
+				console.log(videoContext,'创建后')
+			}
+		},
+		onReady() {
+			this.videoId = this.memberInfo.id
+			videoContext = uni.createVideoContext(this.videoId, this);
+		},
+		mounted() {
+			this.isShowPlayBtn = this.isShowPlay
+		},
+
+		props: {
+			// 是否显示浏览量
+			isShowViews: {
+				type: Boolean,
+				default: true
+			},
+			// 是否可以选择
+			isShowSelect: {
+				type: Boolean,
+				default: false
+			},
+			// 播放按钮
+			isShowPlay: {
+				type: Boolean,
+				default: false,
+			},
+			// 会员信息
+			memberInfo: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+
+		methods: {
+			// 推荐点击
+			extension() {
+				this.$emit('extension',this.memberInfo.id)
+			},
+			
+			// 选择
+			select() {
+				this.isSelect = !this.isSelect
+				this.$emit('select',this.isSelect,this.memberInfo.id)
+			},
+			// 跳转去详情页面
+			toDetail(type) {
+				// 有视频时必须点信息区域才跳转，没有视频不要求
+				if((this.isShowPlay && type === 'bottom') || !this.isShowPlay) {
+					App.navigationTo({
+						url: `pages/subPages2/blindDate/member/detail?id=${this.memberInfo.id}`
+					})
+				}
+			},
+			
+			// 点击播放视频
+			videoPlay(e) {
+				let that = this;
+				that.isVideoPlay = true;
+				that.isShowPlayBtn = false
+				//延时操作,防止视频组件获取失败
+				setTimeout(() => {
+					console.log("video play");
+					console.log(videoContext,'videoContext2222')
+					videoContext.play();
+					// videoContext.requestFullScreen()
+					
+				}, 200);
+			},
+			
+			// 退出或进入全屏
+			fullscreenchange(e) {
+				console.log(e,'全屏信息')
+				if(!e.detail.fullScreen) {
+					this.isVideoPlay = false
+					this.isShowPlayBtn = true
+				}
+			},
+			closeVideo(){
+				this.isVideoPlay = false
+				this.isShowPlayBtn = true
+			}
+		}
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-item {
+		width: 335rpx;
+		height: auto;
+		border-radius: 20rpx;
+		background-color: #F8F8F8;
+		overflow: hidden;
+		padding-bottom: 20rpx;
+		.top-info {
+			width: 100%;
+			height: 445rpx;
+			// height: 335rpx;
+			position: relative;
+			.poster,.video {
+				width: 100%;
+				height: 100%;
+			}
+			/deep/ .openvideo{
+				width: 100vw;
+				height: 100vh;
+				position: fixed;
+				top: 0;
+				left: 0;
+				z-index: 99999;
+			}
+			.videoClose{
+				position: fixed;
+				top: 30upx;
+				right: 30upx;
+				color: #ffffff;
+				font-size: 50upx;
+				font-weight: 700;
+				z-index: 100000;
+			}
+			.istop {
+				width: auto;
+				height: 30rpx;
+				padding: 0 10rpx;
+				border-radius: 15rpx;
+				background: linear-gradient(90deg, #FB5A8C 0%, #F65D10 100%);
+				display: flex;
+				position: absolute;
+				left: 20rpx;
+				top: 20rpx;
+				color: #fff;
+				font-size: 20rpx;
+				align-items: center;
+				justify-content: center;
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+			.play-btn {
+				width: 80rpx;
+				height: 80rpx;
+				position: absolute;
+				top: 184rpx;
+				left: 128rpx;
+			}
+			.look-box {
+				width: 60rpx;
+				height: 68rpx;
+				position: absolute;
+				top: 20rpx;
+				right: 16rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.iconfont {
+					font-size: 34rpx;
+					color: #fff;
+				}
+				.num {
+					font-size: 20rpx;
+					color: #fff;
+					margin-top: 6rpx;
+				}
+			}
+			.operation {
+				width: 50rpx;
+				height: 50rpx;
+				position: absolute;
+				top: 20rpx;
+				right: 20rpx;
+			}
+			.location {
+				width: auto;
+				height: 30rpx;
+				padding: 0 10rpx;
+				background-color: #fff;
+				opacity: 0.8;
+				border-radius: 10rpx;
+				display: flex;
+				color: #333;
+				font-size: 20rpx;
+				align-items: center;
+				justify-content: center;
+				position: absolute;
+				bottom: 20rpx;
+				right: 20rpx;
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+		}
+		
+		.user-info {
+			width: 100%;
+			height: auto;
+			overflow: hidden;
+			position: relative;
+			.info {
+				width: 100%;
+				height: 45rpx;
+				margin-top: 20rpx;
+				display: flex;
+				align-items: center;
+				.name {
+					height: 45rpx;
+					width: 200rpx;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: bold;
+					margin-left: 30rpx;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					white-space: nowrap;
+				}
+				.sex {
+					width: 70rpx;
+					height: 30rpx;
+					border-radius: 15rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: #fff;
+					margin-left: 20rpx;
+					.iconfont {
+						font-size: 22rpx;
+					}
+					.icon-female {
+						transform: rotate(45deg);
+					}
+					.age {
+						font-size: 20rpx;
+					}
+				}
+				.woman {
+					background-color: #FE83AF;
+				}
+				.man {
+					background-color: #0084FF;
+				}
+			}
+			.property {
+				width: 100%;
+				height: 40rpx;
+				margin-top: 20rpx;
+				display: flex;
+				.property-item {
+					width: 90rpx;
+					height: 40rpx;
+					border-radius: 20rpx;
+					background-color: #fff;
+					color: #333;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 20rpx;
+					margin-right: 13rpx;
+					.iconfont {
+						font-size: 24rpx;
+					}
+				}
+			}
+			.select {
+				font-size: 40rpx;
+				position: absolute;
+				right: 20rpx;
+				bottom: 0;
+			}
+			.icon-round {
+				color: #ccc;
+			}
+			.icon-chenggong {
+				color: #FDAD28;
+			}
+		}
+	}
+	
+	.item-select {
+		box-sizing: border-box;
+		border: 1rpx solid #FDAD28;
+	}
+</style>
diff --git a/components/template/workList.vue b/components/template/workList.vue
new file mode 100644
index 0000000..d1e1790
--- /dev/null
+++ b/components/template/workList.vue
@@ -0,0 +1,242 @@
+<template>
+	<view  :style="{paddingBottom:flag?'0':'0rpx'}">
+		<view :class="tabStyle?'workList workList-two':'workList'" style="" v-if="logoding" v-for="(item,index) in inviteList" @click="goNvigeing(item)">
+			<view class="work-title" :style="{border: tabStyle?'none':'1upx solid #EEEEEE;'}">
+				<view class="dis-il-block work-name">
+					{{item.title}}
+				</view>
+				<view class="dis-il-block wprk-top" v-if="item.is_top != 0">
+					顶
+				</view>
+				<view class="wprk-pay">
+					{{item.salary}}
+				</view>
+			</view>
+			<!-- <view class="wprk-tag" v-if="item.welfare_list">
+				<view class="tags" v-if="item.welfare_list" :style="{height: opentags[index]?'auto':'60rpx'}">
+					<view class="tag-item" v-for="(items,indexs) in item.welfare_list" :key="indexs">
+						{{items}}
+					</view>
+				</view>
+				<view class="region" v-if="false" @click="isopen(item,index)">
+					更多<text style="font-size: 24upx;" :class="opentags[index]?'iconfont icon-fold':'iconfont icon-unfold'"></text>
+				</view>
+			</view> -->
+			<view class="dis-flex company-profile" v-if="item.release">
+				<view style="flex: 0.15;" v-if="0">
+					<image class="title-img" :src="item.release.logo" mode=""></image>
+				</view>
+				<view style="flex: 0.95;display: flex;flex-direction: column;justify-content: space-between;margin-bottom: 25rpx;">
+					<view>
+						<view class="dis-il-block company-name">
+							{{item.release.name}}
+						</view>
+						<view class="dis-il-block company-authentication" v-if="item.release.is_authentication != 0">
+							已认证
+						</view>
+					</view>
+					<view style="font-size: 12px;color:#777;">
+						{{item.region}}
+					</view>
+					<!-- <view class="company-tag leave_out" v-if="item.release.nature">
+						{{item.release.nature}} · {{item.release.scale}} · {{item.release.industry}}
+					</view> -->
+					<!-- <view class="company-tag" v-else>
+						个人招聘
+					</view> -->
+					<view class="company-tag">
+						企业亮点：<text style="color: #2196f3;">{{item.recruit_brighten}}</text>
+					</view>
+				</view>
+				<view class="release-data">
+					<image :src="item.video_img_link" mode="aspectFill" class="title-video"></image>
+				</view>
+			</view>
+			<!-- <view class="company-light">
+				企业亮点：<text style="color: #2196f3;">{{item.recruit_brighten}}</text>
+			</view> -->
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		data(){
+			return{
+				opentags:{},
+				logoding:true
+			}
+		},
+		props:{
+			inviteList:{
+				type:Array,
+				default:null
+			},
+			tabStyle:{
+				type:Boolean,
+				default:false
+			},
+			flag:{
+				type:Boolean,
+				default:true
+			}
+		},
+		methods:{
+			goNvigeing(item){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails?id=" + item.id
+				});
+			},
+			isopen(item,index){
+				if(!this.opentags[index]){
+					this.opentags[index] = true;
+				}else{
+					this.opentags[index] = false;
+				}
+				this.logoding = !this.logoding;
+				this.logoding = !this.logoding;
+				console.log(this.opentags);
+				// debugger
+				// this.inviteList[index].open = !this.inviteList[index].open;
+				// this.$emit('isopen',index);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.workList-two{
+		margin: 30upx!important;
+		border-radius: 20upx!important;
+		background-color: #FFFFFF!important;
+	}
+	.workList{
+		padding: 0upx 30upx 0upx;
+		background-color: #FFFFFF;
+		.work-title{
+			// border-top: 1upx solid #EEEEEE;
+			padding-top: 30upx;
+			.work-name{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.wprk-top{
+				background: #F1C426;
+				border-radius: 4upx;
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				padding: 2upx 5upx;
+				margin-left: 20upx;
+				color: #FFFFFF;
+			}
+			.wprk-pay{
+				float: right;
+				font-size: 32upx;
+				font-family: DINPro;
+				font-weight: 600;
+				color: #FF4444;
+				line-height: 52upx;
+			}
+		}
+		.wprk-tag{
+			padding-top: 30upx;
+			display: flex;
+			margin: 0;
+			width: 100%;
+			.tags{
+				flex: 0.8;
+				overflow: hidden;
+				.tag-item{
+					background: #F4F4F4;
+					border-radius: 4upx;
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					padding: 10upx 24upx;
+					display: inline-block;
+					margin-right: 20upx;
+					margin-bottom: 20upx;
+				}
+			}
+			.region{
+				flex: 0.2;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				text-align: right;
+				line-height: 50upx;
+			}
+		}
+		.company-profile{
+			width: 100%;
+			padding: 14upx 0 0upx;
+			justify-content: space-between;
+			border-bottom: 1upx solid #EEEEEE;
+			.title-img{
+				width: 120upx;
+				height: 120upx;
+				background: #F77996;
+				border-radius: 10upx;
+				margin-right: 14rpx;
+			}
+			.company-name{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color:#777;
+				vertical-align: top;
+			}
+			.company-authentication{
+				font-size: 20upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				background: #3388FF;
+				border-radius: 4upx;
+				padding: 2upx 6upx;
+				margin-left: 20upx;
+				vertical-align: top;
+			}
+			.company-tag{
+				padding-top: 4upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+			}
+			.release-data{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				width: 338rpx;
+				height: 190upx;
+				margin-bottom: 25upx;
+				text-align: right;
+			}
+			.title-video{
+				width: 100%;
+				height: 100%;
+				background: #F77996;
+				border-radius: 10upx;
+			}
+		}
+		.company-light{
+			font-size: 13px;
+			color: #777;
+			border-bottom: 1upx solid #EEEEEE;
+			padding-bottom: 35rpx;
+		}
+	}
+	.leave_out{
+		// 省略号样式
+		display: -webkit-box;
		-webkit-box-orient: vertical;
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+	}
+</style>
diff --git a/components/threeComponents/graceChecker.js b/components/threeComponents/graceChecker.js
new file mode 100644
index 0000000..2785d9a
--- /dev/null
+++ b/components/threeComponents/graceChecker.js
@@ -0,0 +1,119 @@
+/**
+数据验证（表单验证）
+来自 grace.hcoder.net 
+作者 hcoder 深海
+
+版权声明 : 
+GraceUI 的版权约束是不能转售或者将 GraceUI 直接发布到公开渠道！
+侵权必究，请遵守版权约定！
+*/
+module.exports = {
+	error:'',
+	check : function (data, rule){
+		for(var i = 0; i < rule.length; i++){
+			if (!rule[i].checkType){return true;}
+			if (!rule[i].name) {return true;}
+			if (!rule[i].errorMsg) {return true;}
+			if (!data[rule[i].name] || data[rule[i].name] == '') {this.error = rule[i].errorMsg; return false;}
+			// 检查前去除内容的空格及换行
+			if(typeof(data[rule[i].name]) == 'string'){data[rule[i].name] = data[rule[i].name].replace(/\s/g,"");}
+			switch (rule[i].checkType){
+				case 'string':
+					var reg = new RegExp('^.{' + rule[i].checkRule + '}$');
+					if(!reg.test(data[rule[i].name])) {this.error = rule[i].errorMsg; return false;}
+				break;
+				case 'int':
+					var ruleArr = rule[i].checkRule.split(',');
+					if(rule.length < 2){
+						ruleArr[0] = Number(ruleArr[0]) - 1;
+						ruleArr[1] = '';
+					}else{
+						ruleArr[0] = Number(ruleArr[0]) - 1;
+						ruleArr[1] = Number(ruleArr[1]) - 1;
+					}
+					var reg = new RegExp('^(-[1-9]|[1-9])[0-9]{' + ruleArr[0] + ',' + ruleArr[1] + '}$');
+					if(!reg.test(data[rule[i].name])) {this.error = rule[i].errorMsg; return false;}
+					break;
+				break;
+				case 'between':
+					if (!this.isNumber(data[rule[i].name])){
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+				break;
+				case 'betweenD':
+					var reg = /^-?\d+$/;
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+				break;
+				case 'betweenF': 
+					var reg = /^-?[0-9][0-9]?.+[0-9]+$/;
+					if (!reg.test(data[rule[i].name])){this.error = rule[i].errorMsg; return false;}
+					var minMax = rule[i].checkRule.split(',');
+					minMax[0] = Number(minMax[0]);
+					minMax[1] = Number(minMax[1]);
+					if (data[rule[i].name] > minMax[1] || data[rule[i].name] < minMax[0]) {
+						this.error = rule[i].errorMsg;
+						return false;
+					}
+				break;
+				case 'same':
+					if (data[rule[i].name] != rule[i].checkRule) { this.error = rule[i].errorMsg; return false;}
+				break;
+				case 'notsame':
+					if (data[rule[i].name] == rule[i].checkRule) { this.error = rule[i].errorMsg; return false; }
+				break;
+				case 'email':
+					var reg = /^\w+([-+.']\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/;
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+				break;
+				case 'phoneno':
+					var reg = /^\d{11}$/;
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+				break;
+				case 'zipcode':
+					var reg = /^[0-9]{6}$/;
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+				break;
+				case 'reg':
+					var reg = new RegExp(rule[i].checkRule);
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+				break;
+				case 'in':
+					if(rule[i].checkRule.indexOf(data[rule[i].name]) == -1){
+						this.error = rule[i].errorMsg; return false;
+					}
+				break;
+				case 'notnull':
+					if(data[rule[i].name] == null || data[rule[i].name].length < 1){this.error = rule[i].errorMsg; return false;}
+				break;
+				case 'samewith': 
+					if(data[rule[i].name] != data[rule[i].checkRule]){this.error = rule[i].errorMsg; return false;}
+				break;
+				case 'numbers':
+					var reg = new RegExp('^[0-9]{' + rule[i].checkRule + '}$');
+					if (!reg.test(data[rule[i].name])) { this.error = rule[i].errorMsg; return false; }
+				break;
+			}
+		}
+		return true;
+	},
+	isNumber : function (checkVal){
+		checkVal = Number(checkVal);
+		if(checkVal == NaN){return false;}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/components/v-tabs/.DS_Store b/components/v-tabs/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/components/v-tabs/.DS_Store differ
diff --git a/components/v-tabs/v-tabs.vue b/components/v-tabs/v-tabs.vue
new file mode 100644
index 0000000..2ccd820
--- /dev/null
+++ b/components/v-tabs/v-tabs.vue
@@ -0,0 +1,339 @@
+<template>
+  <view :id="elId" class="v-tabs">
+    <scroll-view
+      id="scrollContainer"
+      :scroll-x="scroll"
+      :scroll-left="scroll ? scrollLeft : 0"
+      :scroll-with-animation="scroll"
+      :style="{ position: fixed ? 'fixed' : 'relative', zIndex: 1 }"
+    >
+      <view
+        class="v-tabs__container"
+        :style="{
+          display: scroll ? 'inline-flex' : 'flex',
+          whiteSpace: scroll ? 'nowrap' : 'normal',
+          background: bgColor,
+          height,
+          padding
+        }"
+      >
+        <view
+          class="v-tabs__container-item"
+          v-for="(v, i) in tabs"
+          :key="i"
+          :style="{
+            color: current == i ? activeColor : color,
+            fontSize: current == i ? activeFontSize : fontSize,
+            fontWeight: bold && current == i ? 'bold' : '',
+            justifyContent: !scroll ? 'center' : '',
+            flex: scroll ? '' : 1,
+            padding: paddingItem
+          }"
+          @click="change(i)"
+        >
+          {{ field ? v[field] : v }}
+        </view>
+        <view
+          v-if="!pills"
+          class="v-tabs__container-line"
+          :style="{
+            background: lineColor,
+            width: lineWidth + 'px',
+            height: lineHeight,
+            borderRadius: lineRadius,
+            left: lineLeft + 'px',
+            transform: `translateX(-${lineWidth / 2}px)`
+          }"
+        ></view>
+        <view
+          v-else
+          class="v-tabs__container-pills"
+          :style="{
+            background: pillsColor,
+            borderRadius: pillsBorderRadius,
+            left: pillsLeft + 'px',
+            width: currentWidth + 'px',
+            height
+          }"
+        ></view>
+      </view>
+    </scroll-view>
+    <view
+      class="v-tabs__placeholder"
+      :style="{
+        height: fixed ? height : '0',
+        padding
+      }"
+    ></view>
+  </view>
+</template>
+
+<script>
+/**
+ * v-tabs
+ * @property {Number} value 选中的下标
+ * @property {Array} tabs tabs 列表
+ * @property {String} bgColor = '#fff' 背景颜色
+ * @property {String} color = '#333' 默认颜色
+ * @property {String} activeColor = '#2979ff' 选中文字颜色
+ * @property {String} fontSize = '28rpx' 默认文字大小
+ * @property {String} activeFontSize = '28rpx' 选中文字大小
+ * @property {Boolean} bold = [true | false] 选中文字是否加粗
+ * @property {Boolean} scroll = [true | false] 是否滚动
+ * @property {String} height = '60rpx' tab 的高度
+ * @property {String} lineHeight = '10rpx' 下划线的高度
+ * @property {String} lineColor = '#2979ff' 下划线的颜色
+ * @property {Number} lineScale = 0.5 下划线的宽度缩放比例
+ * @property {String} lineRadius = '10rpx' 下划线圆角
+ * @property {Boolean} pills = [true | false] 是否胶囊样式
+ * @property {String} pillsColor = '#2979ff' 胶囊背景色
+ * @property {String} pillsBorderRadius = '10rpx' 胶囊圆角大小
+ * @property {String} field 如果是对象，显示的键名
+ * @property {Boolean} fixed = [true | false] 是否固定
+ * @property {String} paddingItem = '0 22rpx' 选项的边距
+ *
+ * @event {Function(current)} change 改变标签触发
+ */
+export default {
+  props: {
+    value: {
+      type: Number,
+      default: 0
+    },
+    tabs: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
+    bgColor: {
+      type: String,
+      default: '#fff'
+    },
+    padding: {
+      type: String,
+      default: '0'
+    },
+    color: {
+      type: String,
+      default: '#333'
+    },
+    activeColor: {
+      type: String,
+      default: '#2979ff'
+    },
+    fontSize: {
+      type: String,
+      default: '28rpx'
+    },
+    activeFontSize: {
+      type: String,
+      default: '32rpx'
+    },
+    bold: {
+      type: Boolean,
+      default: true
+    },
+    scroll: {
+      type: Boolean,
+      default: true
+    },
+    height: {
+      type: String,
+      default: '70rpx'
+    },
+    lineColor: {
+      type: String,
+      default: '#2979ff'
+    },
+    lineHeight: {
+      type: String,
+      default: '10rpx'
+    },
+    lineScale: {
+      type: Number,
+      default: 0.5
+    },
+    lineRadius: {
+      type: String,
+      default: '10rpx'
+    },
+    pills: {
+      type: Boolean,
+      deafult: false
+    },
+    pillsColor: {
+      type: String,
+      default: '#2979ff'
+    },
+    pillsBorderRadius: {
+      type: String,
+      default: '10rpx'
+    },
+    field: {
+      type: String,
+      default: ''
+    },
+    fixed: {
+      type: Boolean,
+      default: false
+    },
+    paddingItem: {
+      type: String,
+      default: '0 22rpx'
+    }
+  },
+  data() {
+    return {
+      elId: '',
+      lineWidth: 30,
+      currentWidth: 0, // 当前选项的宽度
+      lineLeft: 0, // 滑块距离左侧的位置
+      pillsLeft: 0, // 胶囊距离左侧的位置
+      scrollLeft: 0, // 距离左边的位置
+      containerWidth: 0, // 容器的宽度
+      current: 0 // 当前选中项
+    }
+  },
+  watch: {
+    value(newVal) {
+      this.current = newVal
+      this.$nextTick(() => {
+        this.getTabItemWidth()
+      })
+    },
+    current(newVal) {
+      this.$emit('input', newVal)
+    },
+    tabs(newVal) {
+      this.$nextTick(() => {
+        this.getTabItemWidth()
+      })
+    }
+  },
+  methods: {
+    // 产生随机字符串
+    randomString(len) {
+      len = len || 32
+      let $chars =
+        'ABCDEFGHJKMNPQRSTWXYZabcdefhijkmnprstwxyz2345678' /****默认去掉了容易混淆的字符oOLl,9gq,Vv,Uu,I1****/
+      let maxPos = $chars.length
+      let pwd = ''
+      for (let i = 0; i < len; i++) {
+        pwd += $chars.charAt(Math.floor(Math.random() * maxPos))
+      }
+      return pwd
+    },
+    // 切换事件
+    change(index) {
+      if (this.current !== index) {
+        this.current = index
+
+        this.$emit('change', index)
+      }
+    },
+    // 获取左移动位置
+    getTabItemWidth() {
+      let query = uni
+        .createSelectorQuery()
+        // #ifndef MP-ALIPAY
+        .in(this)
+      // #endif
+      // 获取容器的宽度
+      query
+        .select(`#scrollContainer`)
+        .boundingClientRect((data) => {
+          if (!this.containerWidth && data) {
+            this.containerWidth = data.width
+          }
+        })
+        .exec()
+      // 获取所有的 tab-item 的宽度
+      query
+        .selectAll('.v-tabs__container-item')
+        .boundingClientRect((data) => {
+          if (!data) {
+            return
+          }
+          let lineLeft = 0
+          let currentWidth = 0
+          if (data) {
+            for (let i = 0; i < data.length; i++) {
+              if (i < this.current) {
+                lineLeft += data[i].width
+              } else if (i == this.current) {
+                currentWidth = data[i].width
+              } else {
+                break
+              }
+            }
+          }
+          // 当前滑块的宽度
+          this.currentWidth = currentWidth
+          // 缩放后的滑块宽度
+          this.lineWidth = currentWidth * this.lineScale * 1
+          // 滑块作移动的位置
+          this.lineLeft = lineLeft + currentWidth / 2
+          // 胶囊距离左侧的位置
+          this.pillsLeft = lineLeft
+          // 计算滚动的距离左侧的位置
+          if (this.scroll) {
+            this.scrollLeft = this.lineLeft - this.containerWidth / 2
+          }
+        })
+        .exec()
+    }
+  },
+  mounted() {
+    this.elId = 'xfjpeter_' + this.randomString()
+    this.current = this.value
+    this.$nextTick(() => {
+      this.getTabItemWidth()
+    })
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.v-tabs {
+  width: 100%;
+  box-sizing: border-box;
+  overflow: hidden;
+
+  ::-webkit-scrollbar {
+    display: none;
+  }
+
+  &__container {
+    min-width: 100%;
+    position: relative;
+    display: inline-flex;
+    align-items: center;
+    white-space: nowrap;
+    overflow: hidden;
+
+    &-item {
+      display: flex;
+      align-items: center;
+      height: 100%;
+      position: relative;
+      z-index: 10;
+      // padding: 0 11px;
+      transition: all 0.3s;
+      white-space: nowrap;
+    }
+
+    &-line {
+      position: absolute;
+      bottom: 0;
+      transition: all 0.3s linear;
+    }
+
+    &-pills {
+      position: absolute;
+      transition: all 0.3s linear;
+      z-index: 9;
+    }
+  }
+}
+</style>
diff --git a/components/w-picker/date-picker.vue b/components/w-picker/date-picker.vue
new file mode 100644
index 0000000..c0154d5
--- /dev/null
+++ b/components/w-picker/date-picker.vue
@@ -0,0 +1,742 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='day'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='hour'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='minute'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='second'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{
+					years:[],
+					months:[],
+					days:[],
+					hours:[],
+					minutes:[],
+					seconds:[]
+				},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			startYear:{
+				type:[String,Number],
+				default:""
+			},
+			endYear:{
+				type:[String,Number],
+				default:""
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			},
+			fields:{
+				type:String,
+				default:"day"
+			}
+		},
+		watch:{
+			fields(val){
+				this.initData();
+			},
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg,example
+				switch(this.fields){
+					case "year":
+						strReg=/^\d{4}$/;
+						example="2019";
+						break;
+					case "month":
+						strReg=/^\d{4}-\d{2}$/;
+						example="2019-02";
+						break;
+					case "day":
+						strReg=/^\d{4}-\d{2}-\d{2}$/;
+						example="2019-02-01";
+						break;
+					case "hour":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}(:\d{2}){1,2}?$/;
+						example="2019-02-01 18:00:00或2019-02-01 18";
+						break;
+					case "minute":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2}){0,1}?$/;
+						example="2019-02-01 18:06:00或2019-02-01 18:06";
+						break;
+					case "second":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+						example="2019-02-01 18:06:01";
+						break;
+				}
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day,hour,minute){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let months=[],days=[],hours=[],minutes=[],seconds=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
+				let hoursLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)?24:curHour+1):24;
+				let minutesLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour)?60:curMinute+1):60;
+				let secondsLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour||minute*1<curMinute)?60:curSecond+1):60;
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				for(let hour=0;hour<hoursLen;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<minutesLen;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<secondsLen;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return{
+					months,
+					days,
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			isLeapYear (Year) {
+				if (((Year % 4)==0) && ((Year % 100)!=0) || ((Year % 400)==0)) {
+					return true;
+				} else { 
+					return false; 
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let fields=this.fields;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonthdays=curDate.curMonthdays;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let defaultDate=this.getDefaultDate();
+				let startYear=this.getStartDate().getFullYear();
+				let endYear=this.getEndDate().getFullYear();
+				//颗粒度，禁用当前之后日期仅对year,month,day,hour生效;分钟秒禁用没有意义,
+				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
+				let year=dVal[0]*1;
+				let month=dVal[1]*1;
+				let day=dVal[2]*1;
+				let hour=dVal[3]*1;
+				let minute=dVal[4]*1;
+				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
+				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
+				let hoursLen=disabledAfter?((year<curYear||month<curMonth||day<curDay)?24:curHour+1):24;
+				let minutesLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour)?60:curMinute+1):60;
+				let secondsLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour||minute<curMinute)?60:curSecond+1):60;
+				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
+					years.push(year.toString())
+				}
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				}
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				for(let hour=0;hour<hoursLen;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<minutesLen;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				// for(let second=0;second<(disabledAfter?curDate.curSecond+1:60);second++){
+				// 	seconds.push(this.formatNum(second));
+				// }
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return {
+					years,
+					months,
+					days,
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth()+1;
+				let curMonthdays=new Date(curYear,curMonth,0).getDate();
+				let curDay=curDate.getDate();
+				let curHour=curDate.getHours();
+				let curMinute=curDate.getMinutes();
+				let curSecond=curDate.getSeconds();
+				return{
+					curDate,
+					curYear,
+					curMonth,
+					curMonthdays,
+					curDay,
+					curHour,
+					curMinute,
+					curSecond
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getStartDate(){
+				let start=this.startYear;
+				let startDate="";
+				let reg=/-/g;
+				if(start){
+					startDate=new Date(start+"/01/01");
+				}else{
+					startDate=new Date("1970/01/01");
+				}
+				return startDate;
+			},
+			getEndDate(){
+				let end=this.endYear;
+				let reg=/-/g;
+				let endDate="";
+				if(end){
+					endDate=new Date(end+"/12/01");
+				}else{
+					endDate=new Date();
+				}
+				return endDate;
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let hour=this.formatNum(aDate.getHours());
+				let minute=this.formatNum(aDate.getMinutes());
+				let second=this.formatNum(aDate.getSeconds());
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[year,month,day,hour,minute,second]
+					}else{
+						switch(this.fields){
+							case "year":
+								dVal=value?[value]:[];	
+								break;
+							case "month":
+								dVal=value?value.split("-"):[];
+								break;
+							case "day":
+								dVal=value?value.split("-"):[];
+								break;
+							case "hour":
+								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
+								break;
+							case "minute":
+								dVal=value?[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")]:[];
+								break;
+							case "second":
+								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
+								break;
+						}
+					}
+				}else{
+					dVal=[year,month,day,hour,minute,second]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",year,month,day,hour,minute,second,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curMonthdays=curDate.curMonthdays;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let dateData=[];
+				dVal=this.getDval();
+				
+				startDate=this.getStartDate();
+				endDate=this.getEndDate();
+				startYear=startDate.getFullYear();
+				startMonth=startDate.getMonth();
+				startDay=startDate.getDate();
+				endYear=endDate.getFullYear();
+				endMonth=endDate.getMonth();
+				endDay=endDate.getDate();
+				dateData=this.getData(dVal);
+				years=dateData.years;
+				months=dateData.months;
+				days=dateData.days;
+				hours=dateData.hours;
+				minutes=dateData.minutes;
+				seconds=dateData.seconds;
+				switch(this.fields){
+					case "year":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
+						]:(curFlag?[
+							years.indexOf(curYear+'')
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
+						]);
+						range={years};
+						year=dVal[0]?dVal[0]:years[0];
+						result=full=`${year}`;
+						obj={
+							year
+						}
+						break;
+					case "month":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth))
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
+						]);
+						range={years,months};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						result=full=`${year+'-'+month}`;
+						obj={
+							year,
+							month
+						}
+						break;
+					case "day":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
+						]);
+						range={years,months,days};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						result=full=`${year+'-'+month+'-'+day}`;
+						obj={
+							year,
+							month,
+							day
+						}
+						break;
+					case "hour":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
+						]);
+						range={years,months,days,hours};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						result=`${year+'-'+month+'-'+day+' '+hour}`;
+						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
+						obj={
+							year,
+							month,
+							day,
+							hour
+						}
+						break;
+					case "minute":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+							minutes.indexOf(this.formatNum(curMinute)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
+						]);
+						range={years,months,days,hours,minutes};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						minute=dVal[4]?dVal[4]:minutes[0];
+						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
+						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute
+						}
+						break;
+					case "second":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
+							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+							minutes.indexOf(this.formatNum(curMinute)),
+							seconds.indexOf(this.formatNum(curSecond)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
+							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
+						]);
+						range={years,months,days,hours,minutes,seconds};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						minute=dVal[4]?dVal[4]:minutes[0];
+						second=dVal[5]?dVal[5]:seconds[0];
+						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute,
+							second
+						}
+						break;
+					default:
+						range={years,months,days};
+						break;
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				});
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let year="",month="",day="",hour="",minute="",second="";
+				let result="",full="",obj={};
+				let months=null,days=null,hours=null,minutes=null,seconds=null;
+				let disabledAfter=this.disabledAfter;
+				let leapYear=false,resetData={};
+				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
+				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
+				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
+				hour=(arr[3]||arr[3]==0)?data.hours[arr[3]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[4]||arr[4]==0)?data.minutes[arr[4]]||data.minutes[data.minutes.length-1]:"";
+				second=(arr[5]||arr[5]==0)?data.seconds[arr[5]]||data.seconds[data.seconds.length-1]:"";
+				resetData=this.resetData(year,month,day,hour,minute);//重新拉取当前日期数据;
+				leapYear=this.isLeapYear(year);//判断是否为闰年;
+				switch(this.fields){
+					case "year":
+						result=full=`${year}`;
+						obj={
+							year
+						};
+						break;
+					case "month":
+						result=full=`${year+'-'+month}`;
+						if(this.disabledAfter)months=resetData.months;
+						if(months)this.range.months=months;
+						obj={
+							year,
+							month
+						}
+						break;
+					case "day":
+						result=full=`${year+'-'+month+'-'+day}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						obj={
+							year,
+							month,
+							day
+						}
+						break;
+					case "hour":
+						result=`${year+'-'+month+'-'+day+' '+hour}`;
+						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						obj={
+							year,
+							month,
+							day,
+							hour
+						}
+						break;
+					case "minute":
+						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
+						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+							minutes=resetData.minutes;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						if(minutes)this.range.minutes=minutes;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute
+						};
+						break;
+					case "second":
+						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+							minutes=resetData.minutes;
+							//seconds=resetData.seconds;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						if(minutes)this.range.minutes=minutes;
+						//if(seconds)this.range.seconds=seconds;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute,
+							second
+						}
+						break;
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/half-picker.vue b/components/w-picker/half-picker.vue
new file mode 100644
index 0000000..0fdfb33
--- /dev/null
+++ b/components/w-picker/half-picker.vue
@@ -0,0 +1,345 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.sections" :key="index">{{item}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			startYear:{
+				type:String,
+				default:""
+			},
+			endYear:{
+				type:String,
+				default:""
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2} [\u4e00-\u9fa5]{2}$/,example;
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let months=[],days=[],sections=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
+				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
+				sections=["上午","下午"];
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				if(sectionFlag){
+					sections=["上午"];
+				}
+				return{
+					months,
+					days,
+					sections
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonthdays=curDate.curMonthdays;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let defaultDate=this.getDefaultDate();
+				let startYear=this.getStartDate().getFullYear();
+				let endYear=this.getEndDate().getFullYear();
+				let years=[],months=[],days=[],sections=[];
+				let year=dVal[0]*1;
+				let month=dVal[1]*1;
+				let day=dVal[2]*1;
+				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
+				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
+				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
+				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
+					years.push(year.toString())
+				}
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				}
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				if(sectionFlag){
+					sections=["下午"];
+				}else{
+					sections=["上午","下午"];
+				}
+				return {
+					years,
+					months,
+					days,
+					sections
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth()+1;
+				let curMonthdays=new Date(curYear,curMonth,0).getDate();
+				let curDay=curDate.getDate();
+				let curHour=curDate.getHours();
+				let curSection="上午";
+				if(curHour>=12){
+					curSection="下午";
+				}
+				return{
+					curDate,
+					curYear,
+					curMonth,
+					curMonthdays,
+					curDay,
+					curHour,
+					curSection
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.split(" ")[0].replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getStartDate(){
+				let start=this.startYear;
+				let startDate="";
+				let reg=/-/g;
+				if(start){
+					startDate=new Date(start+"/01/01");
+				}else{
+					startDate=new Date("1970/01/01");
+				}
+				return startDate;
+			},
+			getEndDate(){
+				let end=this.endYear;
+				let reg=/-/g;
+				let endDate="";
+				if(end){
+					endDate=new Date(end+"/12/31");
+				}else{
+					endDate=new Date();
+				}
+				return endDate;
+			},
+			getDval(){
+				let value=this.value;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let hour=aDate.getHours();
+				let section="上午";
+				if(hour>=12)section="下午";
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[year,month,day,section]
+					}else{
+						let v=value.split(" ");
+						dVal=[...v[0].split("-"),v[1]];
+					}
+				}else{
+					dVal=[year,month,day,section]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let years=[],months=[],days=[],sections=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",year,month,day,section,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curMonthdays=curDate.curMonthdays;
+				let curDay=curDate.curDay;
+				let curSection=curDate.curSection;
+				let dateData=[];
+				dVal=this.getDval();
+				startDate=this.getStartDate();
+				endDate=this.getEndDate();
+				startYear=startDate.getFullYear();
+				startMonth=startDate.getMonth();
+				startDay=startDate.getDate();
+				endYear=endDate.getFullYear();
+				endMonth=endDate.getMonth();
+				endDay=endDate.getDate();
+				dateData=this.getData(dVal);
+				years=dateData.years;
+				months=dateData.months;
+				days=dateData.days;
+				sections=dateData.sections;
+				pickVal=disabledAfter?[
+					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
+				]:(curFlag?[
+					years.indexOf(curYear+''),
+					months.indexOf(this.formatNum(curMonth)),
+					days.indexOf(this.formatNum(curDay)),
+					sections.indexOf(curSection),
+				]:[
+					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
+				]);
+				range={years,months,days,sections};
+				year=dVal[0]?dVal[0]:years[0];
+				month=dVal[1]?dVal[1]:months[0];
+				day=dVal[2]?dVal[2]:days[0];
+				section=dVal[3]?dVal[3]:sections[0];
+				result=full=`${year+'-'+month+'-'+day+' '+section}`;
+				obj={
+					year,
+					month,
+					day,
+					section
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let year="",month="",day="",section="";
+				let result="",full="",obj={};
+				let months=null,days=null,sections=null;
+				let disabledAfter=this.disabledAfter;
+				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
+				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
+				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
+				section=(arr[3]||arr[3]==0)?data.sections[arr[3]]||data.sections[data.sections.length-1]:"";
+				result=full=`${year+'-'+month+'-'+day+' '+section}`;
+				let resetData=this.resetData(year,month,day);
+				if(this.disabledAfter){
+					months=resetData.months;
+					days=resetData.days;
+					sections=resetData.sections;
+				}else{
+					if(year%4==0||(month!=this.checkObj.month)){
+						days=resetData.days;
+					}
+				}
+				if(months)this.range.months=months;
+				if(days)this.range.days=days;
+				if(sections)this.range.sections=sections;
+				obj={
+					year,
+					month,
+					day,
+					section
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/linkage-picker.vue b/components/w-picker/linkage-picker.vue
new file mode 100644
index 0000000..290422d
--- /dev/null
+++ b/components/w-picker/linkage-picker.vue
@@ -0,0 +1,274 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column v-for="(group,gIndex) in range" :key="gIndex">
+				<view class="w-picker-item" v-for="(item,index) in group" :key="index">{{item[nodeKey]}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:[],
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[Array,String],
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			options:{
+				type:Array,
+				default(){
+					return []
+				}
+			},
+			defaultProps:{
+				type:Object,
+				default(){
+					return{
+						lable:"label",
+						value:"value",
+						children:"children"
+					}
+				}
+			},
+			level:{
+				//多级联动层级，表示几级联动
+				type:[Number,String],
+				default:2
+			}
+		},
+		computed:{
+			nodeKey(){
+				return this.defaultProps.label;
+			},
+			nodeVal(){
+				return this.defaultProps.value;
+			},
+			nodeChild(){
+				return this.defaultProps.children;
+			}
+		},
+		watch:{
+			value(val){
+				if(this.options.length!=0){
+					this.initData();
+				}
+			},
+			options(val){
+				this.initData();
+			}
+		},
+		created() {
+			if(this.options.length!=0){
+				this.initData();
+			}
+		},
+		methods:{
+			getData(){
+				//用来处理初始化数据
+				let options=this.options;
+				let col1={},col2={},col3={},col4={};
+				let arr1=options,arr2=[],arr3=[],arr4=[];
+				let col1Index=0,col2Index=0,col3Index=0,col4Index=0;
+				let a1="",a2="",a3="",a4="";
+				let dVal=[],obj={};
+				let value=this.value;
+				let data=[];
+				a1=value[0];
+				a2=value[1];
+				if(this.level>2){
+					a3=value[2];
+				}
+				if(this.level>3){
+					a4=value[3];
+				};
+				/*第1列*/
+				col1Index=arr1.findIndex((v)=>{
+					return v[this.defaultType]==a1
+				});
+				col1Index=value?(col1Index!=-1?col1Index:0):0;
+				col1=arr1[col1Index];
+				
+				/*第2列*/
+				arr2=arr1[col1Index][this.nodeChild];
+				col2Index=arr2.findIndex((v)=>{
+					return v[this.defaultType]==a2
+				});
+				col2Index=value?(col2Index!=-1?col2Index:0):0;
+				col2=arr2[col2Index];
+				
+				/*第3列*/
+				if(this.level>2){
+					arr3=arr2[col2Index][this.nodeChild];
+					col3Index=arr3.findIndex((v)=>{
+						return v[this.defaultType]==a3;
+					});
+					col3Index=value?(col3Index!=-1?col3Index:0):0;
+					col3=arr3[col3Index];
+				};
+				
+				
+				/*第4列*/
+				if(this.level>3){
+					arr4=arr3[col4Index][this.nodeChild];
+					col4Index=arr4.findIndex((v)=>{
+						return v[this.defaultType]==a4;
+					});
+					col4Index=value?(col4Index!=-1?col4Index:0):0;
+					col4=arr4[col4Index];
+				};
+				switch(this.level*1){
+					case 2:
+						dVal=[col1Index,col2Index];
+						obj={
+							col1,
+							col2
+						}
+						data=[arr1,arr2];
+						break;
+					case 3:
+						dVal=[col1Index,col2Index,col3Index];
+						obj={
+							col1,
+							col2,
+							col3
+						}
+						data=[arr1,arr2,arr3];
+						break;
+					case 4:
+						dVal=[col1Index,col2Index,col3Index,col4Index];
+						obj={
+							col1,
+							col2,
+							col3,
+							col4
+						}
+						data=[arr1,arr2,arr3,arr4];
+						break
+				}
+				return {
+					data,
+					dVal,
+					obj
+				}
+			},
+			initData(){
+				let dataData=this.getData();
+				let data=dataData.data;
+				let arr1=data[0];
+				let arr2=data[1];
+				let arr3=data[2]||[];
+				let arr4=data[3]||[];
+				let obj=dataData.obj;
+				let col1=obj.col1,col2=obj.col2,col3=obj.col3||{},col4=obj.col4||{};
+				let result="",value=[];
+				let range=[];
+				switch(this.level){
+					case 2:
+						value=[col1[this.nodeVal],col2[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]}`;
+						range=[arr1,arr2];
+						break;
+					case 3:
+						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]}`;
+						range=[arr1,arr2,arr3];
+						break;
+					case 4:
+						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal],col4[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]+col4[this.nodeKey]}`;
+						range=[arr1,arr2,arr3,arr4];
+						break;
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=dataData.dVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let col1Index=arr[0],col2Index=arr[1],col3Index=arr[2]||0,col4Index=arr[3]||0;
+				let arr1=[],arr2=[],arr3=[],arr4=[];
+				let col1,col2,col3,col4,obj={};
+				let result="",value=[];
+				arr1=this.options;
+				arr2=(arr1[col1Index]&&arr1[col1Index][this.nodeChild])||arr1[arr1.length-1][this.nodeChild]||[];
+				col1=arr1[col1Index]||arr1[arr1.length-1]||{};
+				col2=arr2[col2Index]||arr2[arr2.length-1]||{};
+				if(this.level>2){
+					arr3=(arr2[col2Index]&&arr2[col2Index][this.nodeChild])||arr2[arr2.length-1][this.nodeChild];
+					col3=arr3[col3Index]||arr3[arr3.length-1]||{};
+				}
+				if(this.level>3){
+					arr4=(arr3[col3Index]&&arr3[col3Index][this.nodeChild])||arr3[arr3.length-1][this.nodeChild]||[];
+					col4=arr4[col4Index]||arr4[arr4.length-1]||{};
+				}
+				switch(this.level){
+					case 2:
+						obj={
+							col1,
+							col2
+						}
+						this.range=[arr1,arr2];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||''];
+						break;
+					case 3:
+						obj={
+							col1,
+							col2,
+							col3
+						}
+						this.range=[arr1,arr2,arr3];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||''];
+						break;
+					case 4:
+						obj={
+							col1,
+							col2,
+							col3,
+							col4
+						}
+						this.range=[arr1,arr2,arr3,arr4];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')+(col4[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||'',col4[this.nodeVal]||''];
+						break;
+				}
+				this.checkObj=obj;
+				this.pickVal=arr;
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/range-picker.vue b/components/w-picker/range-picker.vue
new file mode 100644
index 0000000..7dd8b5b
--- /dev/null
+++ b/components/w-picker/range-picker.vue
@@ -0,0 +1,344 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view  class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fyears" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fmonths" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fdays" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex1">
+				<view class="w-picker-item">-</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tyears" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tmonths" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tdays" :key="index">{{item}}日</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array],
+				default(){
+					return []
+				}
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			startYear:{
+				type:[String,Number],
+				default:1970
+			},
+			endYear:{
+				type:[String,Number],
+				default:new Date().getFullYear()
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2}$/,example="2020-04-03";
+				if(!strReg.test(value[0])||!strReg.test(value[1])){
+					console.log(new Error("请传入与mode匹配的value值，例["+example+","+example+"]"))
+				}
+				return strReg.test(value[0])&&strReg.test(value[1]);
+			},
+			resetToData(fmonth,fday,tyear,tmonth){
+				let range=this.range;
+				let tmonths=[],tdays=[];
+				let yearFlag=tyear!=range.tyears[0];
+				let monthFlag=tyear!=range.tyears[0]||tmonth!=range.tmonths[0];
+				let ttotal=new Date(tyear,tmonth,0).getDate();
+				for(let i=yearFlag?1:fmonth*1;i<=12;i++){
+					tmonths.push(this.formatNum(i))
+				}
+				for(let i=monthFlag?1:fday*1;i<=ttotal;i++){
+					tdays.push(this.formatNum(i))
+				}
+				return{
+					tmonths,
+					tdays
+				}
+			},
+			resetData(fyear,fmonth,fday,tyear,tmonth){
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
+				let startYear=this.startYear;
+				let endYear=this.endYear;
+				let ftotal=new Date(fyear,fmonth,0).getDate();
+				let ttotal=new Date(tyear,tmonth,0).getDate();
+				for(let i=startYear*1;i<=endYear;i++){
+					fyears.push(this.formatNum(i))
+				}
+				for(let i=1;i<=12;i++){
+					fmonths.push(this.formatNum(i))
+				}
+				for(let i=1;i<=ftotal;i++){
+					fdays.push(this.formatNum(i))
+				}
+				for(let i=fyear*1;i<=endYear;i++){
+					tyears.push(this.formatNum(i))
+				}
+				for(let i=fmonth*1;i<=12;i++){
+					tmonths.push(this.formatNum(i))
+				}
+				for(let i=fday*1;i<=ttotal;i++){
+					tdays.push(this.formatNum(i))
+				}
+				return {
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays
+				}
+			},
+			getData(dVal){
+				let start=this.startYear*1;
+				let end=this.endYear*1;
+				let value=dVal;
+				let flag=this.current;
+				let aToday=new Date();
+				let tYear,tMonth,tDay,tHours,tMinutes,tSeconds,pickVal=[];
+				let initstartDate=new Date(start.toString());
+				let endDate=new Date(end.toString());
+				if(start>end){
+					initstartDate=new Date(end.toString());
+					endDate=new Date(start.toString());
+				};
+				let startYear=initstartDate.getFullYear();
+				let startMonth=initstartDate.getMonth()+1;
+				let endYear=endDate.getFullYear();
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[],returnArr=[],startDVal=[],endDVal=[];
+				let curMonth=flag?value[1]*1:(startDVal[1]*1+1);
+				let curMonth1=flag?value[5][1]*1:(value[5]*1+1);
+				let totalDays=new Date(value[0],value[1],0).getDate();
+				let totalDays1=new Date(value[4],value[5],0).getDate();
+				for(let s=startYear;s<=endYear;s++){
+					fyears.push(this.formatNum(s));
+				};
+				for(let m=1;m<=12;m++){
+					fmonths.push(this.formatNum(m));
+				};
+				for(let d=1;d<=totalDays;d++){
+					fdays.push(this.formatNum(d));
+				};
+				for(let s=value[0]*1;s<=endYear;s++){
+					tyears.push(this.formatNum(s));
+				};
+				
+				if(value[4]*1>value[0]*1){
+					for(let m=1;m<=12;m++){
+						tmonths.push(this.formatNum(m));
+					};
+					for(let d=1;d<=totalDays1;d++){
+						tdays.push(this.formatNum(d));
+					};
+				}else{
+					for(let m=value[1]*1;m<=12;m++){
+						tmonths.push(this.formatNum(m));
+					};
+					for(let d=value[2]*1;d<=totalDays1;d++){
+						tdays.push(this.formatNum(d));
+					};
+				};
+				
+				pickVal=[
+					fyears.indexOf(value[0])==-1?0:fyears.indexOf(value[0]),
+					fmonths.indexOf(value[1])==-1?0:fmonths.indexOf(value[1]),
+					fdays.indexOf(value[2])==-1?0:fdays.indexOf(value[2]),
+					0,
+					tyears.indexOf(value[4])==-1?0:tyears.indexOf(value[4]),
+					tmonths.indexOf(value[5])==-1?0:tmonths.indexOf(value[5]),
+					tdays.indexOf(value[6])==-1?0:tdays.indexOf(value[6])
+				];
+				return {
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays,
+					pickVal
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let fyear=this.formatNum(aDate.getFullYear());
+				let fmonth=this.formatNum(aDate.getMonth()+1);
+				let fday=this.formatNum(aDate.getDate());
+				let tyear=this.formatNum(aDate.getFullYear());
+				let tmonth=this.formatNum(aDate.getMonth()+1);
+				let tday=this.formatNum(aDate.getDate());
+				if(value&&value.length>0){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
+					}else{
+						dVal=[...value[0].split("-"),"-",...value[1].split("-")];
+					}
+				}else{
+					dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
+				}
+				return dVal;
+			},
+			initData(){
+				let range=[],pickVal=[];
+				let result="",full="",obj={};
+				let dVal=this.getDval();
+				let dateData=this.getData(dVal);
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
+				let fyear,fmonth,fday,tyear,tmonth,tday;
+				pickVal=dateData.pickVal;
+				fyears=dateData.fyears;
+				fmonths=dateData.fmonths;
+				fdays=dateData.fdays;
+				tyears=dateData.tyears;
+				tmonths=dateData.tmonths;
+				tdays=dateData.tdays;
+				range={
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays,
+				}
+				fyear=range.fyears[pickVal[0]];
+				fmonth=range.fmonths[pickVal[1]];
+				fday=range.fdays[pickVal[2]];
+				tyear=range.tyears[pickVal[4]];
+				tmonth=range.tmonths[pickVal[5]];
+				tday=range.tdays[pickVal[6]];
+				obj={
+					fyear,
+					fmonth,
+					fday,
+					tyear,
+					tmonth,
+					tday
+				}
+				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:result.split("至"),
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let result="",full="",obj={};
+				let year="",month="",day="",hour="",minute="",second="",note=[],province,city,area;
+				let checkObj=this.checkObj;
+				let days=[],months=[],endYears=[],endMonths=[],endDays=[],startDays=[];
+				let mode=this.mode;
+				let col1,col2,col3,d,a,h,m;
+				let xDate=new Date().getTime();
+				let range=this.range;
+				let fyear=range.fyears[arr[0]]||range.fyears[range.fyears.length-1];
+				let fmonth=range.fmonths[arr[1]]||range.fmonths[range.fmonths.length-1];
+				let fday=range.fdays[arr[2]]||range.fdays[range.fdays.length-1];
+				let tyear=range.tyears[arr[4]]||range.tyears[range.tyears.length-1];
+				let tmonth=range.tmonths[arr[5]]||range.tmonths[range.tmonths.length-1];
+				let tday=range.tdays[arr[6]]||range.tdays[range.tdays.length-1];
+				let resetData=this.resetData(fyear,fmonth,fday,tyear,tmonth);
+				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth||fday!=checkObj.fday){
+					arr[4]=0;
+					arr[5]=0;
+					arr[6]=0;
+					range.tyears=resetData.tyears;
+					range.tmonths=resetData.tmonths;
+					range.tdays=resetData.tdays;
+					tyear=range.tyears[0];
+					checkObj.tyears=range.tyears[0];
+					tmonth=range.tmonths[0];
+					checkObj.tmonths=range.tmonths[0];
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				}
+				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth){
+					range.fdays=resetData.fdays;
+				};
+				if(tyear!=checkObj.tyear){
+					arr[5]=0;
+					arr[6]=0;
+					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
+					range.tmonths=toData.tmonths;
+					range.tdays=toData.tdays;
+					tmonth=range.tmonths[0];
+					checkObj.tmonths=range.tmonths[0];
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				};
+				if(tmonth!=checkObj.tmonth){
+					arr[6]=0;
+					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
+					range.tdays=toData.tdays;
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				};
+				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
+				obj={
+					fyear,fmonth,fday,tyear,tmonth,tday
+				}
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=arr;
+				})
+				this.$emit("change",{
+					result:result,
+					value:result.split("至"),
+					obj:obj
+				})
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/region-picker.vue b/components/w-picker/region-picker.vue
new file mode 100644
index 0000000..0fb4d8f
--- /dev/null
+++ b/components/w-picker/region-picker.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.provinces" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.citys" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column v-if="!hideArea">
+				<view class="w-picker-item" v-for="(item,index) in range.areas" :key="index">{{item.label}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	// import areaData from "./areadata/areadata.js"
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{
+					provinces:[],
+					citys:[],
+					areas:[]
+				},
+				checkObj:{},
+				areaData:[]
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[Array,String],
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			hideArea:{
+				type:Boolean,
+				default:false
+			},
+			agencyInfo: {
+				type: Array,
+				default() {
+					return []
+				}
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			
+		},
+		mounted() {
+			// 有代理信息时用代理信息
+			let areaData = this.agencyInfo.length > 0 ? this.agencyInfo : uni.getStorageSync('cityList');
+			let value= JSON.stringify(areaData).replace(/id/g,"value");
+			let label = value.replace(/name/g,"label");
+			let area = label.replace(/area/g,"children");
+			this.areaData = JSON.parse(area.replace(/dist/g,"children"));
+			this.initData(this.areaData);
+			// debugger
+		},
+		methods:{
+			getData(){
+				//用来处理初始化数据
+				let provinces=this.areaData;
+				let dVal=[];
+				let value=this.value;
+				let a1=value[0];//默认值省
+				let a2=value[1];//默认值市
+				let a3=value[2];//默认值区、县
+				let province,city,area;
+				let provinceIndex=provinces.findIndex((v)=>{
+					return v[this.defaultType]==a1
+				});
+				provinceIndex=value?(provinceIndex!=-1?provinceIndex:0):0;
+				let citys=provinces[provinceIndex].children;
+				let cityIndex=citys.findIndex((v)=>{
+					return v[this.defaultType]==a2
+				});
+				cityIndex=value?(cityIndex!=-1?cityIndex:0):0;
+				let areas=citys[cityIndex].children;
+				let areaIndex=areas.findIndex((v)=>{
+					return v[this.defaultType]==a3;
+				});
+				areaIndex=value?(areaIndex!=-1?areaIndex:0):0;
+				dVal=this.hideArea?[provinceIndex,cityIndex]:[provinceIndex,cityIndex,areaIndex];
+				province=provinces[provinceIndex];
+				city=citys[cityIndex];
+				area=areas[areaIndex];
+				let obj=this.hideArea?{
+					province,
+					city
+				}:{
+					province,
+					city,
+					area
+				}
+				return this.hideArea?{
+					provinces,
+					citys,
+					dVal,
+					obj
+				}:{
+					provinces,
+					citys,
+					areas,
+					dVal,
+					obj
+				}
+			},
+			initData(){
+				let dataData=this.getData();
+				let provinces=dataData.provinces;
+				let citys=dataData.citys;
+				let areas=this.hideArea?[]:dataData.areas;
+				let obj=dataData.obj;
+				let province=obj.province,city=obj.city,area=this.hideArea?{}:obj.area;
+				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
+				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
+				this.range=this.hideArea?{
+					provinces,
+					citys,
+				}:{
+					provinces,
+					citys,
+					areas
+				};
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=dataData.dVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let provinceIndex=arr[0],cityIndex=arr[1],areaIndex=this.hideArea?0:arr[2];
+				let provinces=this.areaData;
+				let citys=(provinces[provinceIndex]&&provinces[provinceIndex].children)||provinces[provinces.length-1].children||[];
+				let areas=this.hideArea?[]:((citys[cityIndex]&&citys[cityIndex].children)||citys[citys.length-1].children||[]);
+				let province=provinces[provinceIndex]||provinces[provinces.length-1],
+				city=citys[cityIndex]||[citys.length-1],
+				area=this.hideArea?{}:(areas[areaIndex]||[areas.length-1]);
+				let obj=this.hideArea?{
+					province,
+					city
+				}:{
+					province,
+					city,
+					area
+				}
+				if(this.checkObj.province.label!=province.label){
+					//当省更新的时候需要刷新市、区县的数据;
+					this.range.citys=citys;
+					if(!this.hideArea){
+						this.range.areas=areas;
+					}
+					
+				}
+				if(this.checkObj.city.label!=city.label){
+					//当市更新的时候需要刷新区县的数据;
+					if(!this.hideArea){
+						this.range.areas=areas;
+					}
+				}
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=arr;
+				})
+				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
+				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/selector-picker.vue b/components/w-picker/selector-picker.vue
new file mode 100644
index 0000000..6ce2ced
--- /dev/null
+++ b/components/w-picker/selector-picker.vue
@@ -0,0 +1,129 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range" :key="index">{{item[nodeKey]}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			options:{
+				type:[Array,Object],
+				default(){
+					return []
+				}
+			},
+			value:{
+				type:String,
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			defaultProps:{
+				type:Object,
+				default(){
+					return{
+						label:"label",
+						value:"value"
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				pickVal:[]
+			};
+		},
+		computed:{
+			nodeKey(){
+				return this.defaultProps.label;
+			},
+			nodeValue(){
+				return this.defaultProps.value;
+			},
+			range(){
+				return this.options
+			}
+		},
+		watch:{
+			value(val){
+				if(this.options.length!=0){
+					this.initData();
+				}
+			},
+			options(val){
+				this.initData();
+			}
+		},
+		created() {
+			if(this.options.length!=0){
+				this.initData();
+			}
+		},
+		methods:{
+			initData(){
+				let dVal=this.value||"";
+				let data=this.range;
+				let pickVal=[0];
+				let cur=null;
+				let label="";
+				let value,idx;
+				if(this.defaultType==this.nodeValue){
+					value=data.find((v)=>v[this.nodeValue]==dVal);
+					idx=data.findIndex((v)=>v[this.nodeValue]==dVal);
+				}else{
+					value=data.find((v)=>v[this.nodeKey]==dVal);
+					idx=data.findIndex((v)=>v[this.nodeKey]==dVal);
+				}
+				pickVal=[idx!=-1?idx:0];
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				if(this.defaultType==this.nodeValue){
+					this.$emit("change",{
+						result:value?value[this.nodeKey]:data[0][this.nodeKey],
+						value:dVal||data[0][this.nodeKey],
+						obj:value?value:data[0]
+					})
+				}else{
+					this.$emit("change",{
+						result:dVal||data[0][this.nodeKey],
+						value:value?value[this.nodeValue]:data[0][this.nodeValue],
+						obj:value?value:data[0]
+					})
+				}
+				
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let pickVal=[arr[0]||0];
+				let data=this.range;
+				let cur=data[arr[0]];
+				let label="";
+				let value="";
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:cur[this.nodeKey],
+					value:cur[this.nodeValue],
+					obj:cur
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/shortterm-picker.vue b/components/w-picker/shortterm-picker.vue
new file mode 100644
index 0000000..3263572
--- /dev/null
+++ b/components/w-picker/shortterm-picker.vue
@@ -0,0 +1,240 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.dates" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item.label}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item.label}}分</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			expand:{
+				type:[Number,String],
+				default:30
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/,example="2019-12-12 18:05:00或者2019-12-12 18:05";
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let months=[],days=[],sections=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				return{
+					months,
+					days,
+					sections
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let dates=[],hours=[],minutes=[];
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth();
+				let curDay=curDate.getDate();
+				let aDate=new Date(curYear,curMonth,curDay);
+				for(let i=0;i<this.expand*1;i++){
+					aDate=new Date(curYear,curMonth,curDay+i);
+					let year=aDate.getFullYear();
+					let month=aDate.getMonth()+1;
+					let day=aDate.getDate();
+					let label=year+"-"+this.formatNum(month)+"-"+this.formatNum(day);
+					
+					dates.push({
+						label:label,
+						value:year+"-"+this.formatNum(month)+"-"+this.formatNum(day)
+					})
+				};
+				for(let i=0;i<24;i++){
+					hours.push({
+						label:this.formatNum(i),
+						value:this.formatNum(i)
+					})
+				}
+				for(let i=0;i<60;i++){
+					minutes.push({
+						label:this.formatNum(i),
+						value:this.formatNum(i)
+					})
+				}
+				return {
+					dates,
+					hours,
+					minutes
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let date=this.formatNum(year)+"-"+this.formatNum(month)+"-"+this.formatNum(day);
+				let hour=aDate.getHours();
+				let minute=aDate.getMinutes();
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[date,hour,minute]
+					}else{
+						let v=value.split(" ");
+						dVal=[v[0],...v[1].split(":")];
+					}
+				}else{
+					dVal=[date,hour,minute]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let dates=[],hours=[],minutes=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",date,hour,minute,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let dateData=[];
+				dVal=this.getDval();
+				dateData=this.getData(dVal);
+				dates=dateData.dates;
+				hours=dateData.hours;
+				minutes=dateData.minutes;
+				pickVal=[
+					dates.findIndex(n => n.value == dVal[0])!=-1?dates.findIndex(n => n.value == dVal[0]):0,
+					hours.findIndex(n => n.value == dVal[1])!=-1?hours.findIndex(n => n.value == dVal[1]):0,
+					minutes.findIndex(n => n.value == dVal[2])!=-1?minutes.findIndex(n => n.value == dVal[2]):0,
+				];
+				range={dates,hours,minutes};
+				date=dVal[0]?dVal[0]:dates[0].label;
+				hour=dVal[1]?dVal[1]:hours[0].label;
+				minute=dVal[2]?dVal[2]:minutes[0].label;
+				result=full=`${date+' '+hour+':'+minute}`;
+				obj={
+					date,
+					hour,
+					minute
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let date="",hour="",minute="";
+				let result="",full="",obj={};
+				let disabledAfter=this.disabledAfter;
+				date=(arr[0]||arr[0]==0)?data.dates[arr[0]]||data.dates[data.dates.length-1]:"";
+				hour=(arr[1]||arr[1]==0)?data.hours[arr[1]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[2]||arr[2]==0)?data.minutes[arr[2]]||data.minutes[data.minutes.length-1]:"";
+				result=full=`${date.label+' '+hour.label+':'+minute.label+':00'}`;
+				obj={
+					date,
+					hour,
+					minute
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/time-picker.vue b/components/w-picker/time-picker.vue
new file mode 100644
index 0000000..b00b0ab
--- /dev/null
+++ b/components/w-picker/time-picker.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+			<picker-view-column v-if="second">
+				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			second:{
+				type:Boolean,
+				default:true
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{2}:\d{2}:\d{2}$/,example="18:00:05";
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day,hour,minute){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				for(let hour=0;hour<24;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<60;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return{
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			getData(curDate){
+				//用来处理初始化数据
+				let hours=[],minutes=[],seconds=[];
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let fields=this.fields;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				for(let hour=0;hour<24;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<60;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return this.second?{
+					hours,
+					minutes,
+					seconds
+				}:{
+					hours,
+					minutes
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curHour=curDate.getHours();
+				let curMinute=curDate.getMinutes();
+				let curSecond=curDate.getSeconds();
+				return this.second?{
+					curHour,
+					curMinute,
+					curSecond
+				}:{
+					curHour,
+					curMinute,
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let hour=this.formatNum(aDate.getHours());
+				let minute=this.formatNum(aDate.getMinutes());
+				let second=this.formatNum(aDate.getSeconds());
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[hour,minute,second]
+					}else{
+						dVal=value?value.split(":"):[];
+					}
+				}else{
+					dVal=this.second?[hour,minute,second]:[hour,minute]
+				}
+				return dVal;
+			},
+			initData(){
+				let curDate=this.getCurrenDate();
+				let dateData=this.getData(curDate);
+				let pickVal=[],obj={},full="",result="",hour="",minute="",second="";
+				let dVal=this.getDval();
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let hours=dateData.hours;
+				let minutes=dateData.minutes;
+				let seconds=dateData.seconds;
+				let defaultArr=this.second?[
+					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
+					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0,
+					dVal[2]&&seconds.indexOf(dVal[2])!=-1?seconds.indexOf(dVal[2]):0
+				]:[
+					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
+					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0
+				];
+				pickVal=disabledAfter?defaultArr:(curFlag?(this.second?[
+					hours.indexOf(this.formatNum(curDate.curHour)),
+					minutes.indexOf(this.formatNum(curDate.curMinute)),
+					seconds.indexOf(this.formatNum(curDate.curSecond)),
+				]:[
+					hours.indexOf(this.formatNum(curDate.curHour)),
+					minutes.indexOf(this.formatNum(curDate.curMinute))
+				]):defaultArr);
+				this.range=dateData;
+				this.checkObj=obj;
+				hour=dVal[0]?dVal[0]:hours[0];
+				minute=dVal[1]?dVal[1]:minutes[0];
+				if(this.second)second=dVal[2]?dVal[0]:seconds[0];
+				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
+				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let hour="",minute="",second="",result="",full="",obj={};
+				hour=(arr[0]||arr[0]==0)?data.hours[arr[0]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[1]||arr[1]==0)?data.minutes[arr[1]]||data.minutes[data.minutes.length-1]:"";
+				if(this.second)second=(arr[2]||arr[2]==0)?data.seconds[arr[2]]||data.seconds[data.seconds.length-1]:"";
+				obj=this.second?{
+					hour,
+					minute,
+					second
+				}:{
+					hour,
+					minute
+				};
+				this.checkObj=obj;
+				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
+				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/w-picker.css b/components/w-picker/w-picker.css
new file mode 100644
index 0000000..fb42e78
--- /dev/null
+++ b/components/w-picker/w-picker.css
@@ -0,0 +1,26 @@
+.w-picker-flex2{
+	flex:2;
+}
+.w-picker-flex1{
+	flex:1;
+}
+.w-picker-view {
+	width: 100%;
+	height: 476upx;
+	overflow: hidden;
+	background-color: rgba(255, 255, 255, 1);
+	z-index: 666;
+}
+.d-picker-view{
+	height: 100%;
+}
+
+.w-picker-item {
+  text-align: center;
+  width: 100%;
+  height: 88upx;
+  line-height: 88upx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 30upx;
+}
\ No newline at end of file
diff --git a/components/w-picker/w-picker.vue b/components/w-picker/w-picker.vue
new file mode 100644
index 0000000..e14660b
--- /dev/null
+++ b/components/w-picker/w-picker.vue
@@ -0,0 +1,348 @@
+<template name="w-picker">
+	<view class="w-picker" :key="createKey" :data-key="createKey">
+		<view class="mask" :class="{'visible':visible}" @tap="onCancel" @touchmove.stop.prevent catchtouchmove="true"></view>
+		<view class="w-picker-cnt" :class="{'visible':visible}">
+			<view class="w-picker-header"  @touchmove.stop.prevent catchtouchmove="true">
+				<text @tap.stop.prevent="onCancel">取消</text>
+				<slot></slot>
+				<text :style="{'color':themeColor}" @tap.stop.prevent="pickerConfirm">确定</text>
+			</view>
+			<date-picker 
+				v-if="mode=='date'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:fields="fields"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</date-picker>
+			
+			<range-picker
+				v-if="mode=='range'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</range-picker>
+			
+			<half-picker
+				v-if="mode=='half'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</half-picker>
+			
+			<shortterm-picker
+				v-if="mode=='shortTerm'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				expand="60"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</shortterm-picker>
+			
+			<time-picker
+				v-if="mode=='time'"
+				class="w-picker-wrapper"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				:second="second"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</time-picker>
+			
+			<selector-picker
+				v-if="mode=='selector'"
+				class="w-picker-wrapper"
+				:value="value"
+				:item-height="itemHeight"
+				:options="options"
+				:default-type="defaultType"
+				:default-props="defaultProps"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</selector-picker>
+			
+			<region-picker
+				v-if="mode=='region'"
+				class="w-picker-wrapper"
+				:value="value"
+				:hide-area="hideArea"
+				:default-type="defaultType"
+				:item-height="itemHeight"
+				:agency-info="agencyInfo"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</region-picker>
+			
+			<linkage-picker
+				v-if="mode=='linkage'"
+				class="w-picker-wrapper"
+				:value="value"
+				:options="options"
+				:level="level"
+				:default-type="defaultType"
+				:default-props="defaultProps"
+				:item-height="itemHeight"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</linkage-picker>
+		</view>
+	</view>
+</template>
+
+<script>
+	import datePicker from "./date-picker.vue"
+	import rangePicker from "./range-picker.vue"
+	import halfPicker from "./half-picker.vue"
+	import shorttermPicker from "./shortterm-picker.vue"
+	import timePicker from "./time-picker.vue"
+	import selectorPicker from "./selector-picker.vue"
+	import regionPicker from "./region-picker.vue"
+	import linkagePicker from "./linkage-picker.vue"
+	export default {
+		name:"w-picker",
+		components:{
+			datePicker,
+			rangePicker,
+			halfPicker,
+			timePicker,
+			selectorPicker,
+			shorttermPicker,
+			regionPicker,
+			linkagePicker
+		},
+		props:{
+			mode:{
+				type:String,
+				default:"date"
+			},
+			value:{//默认值
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认显示当前时间，如果是，传的默认值将失效
+				type:Boolean,
+				default:false
+			},
+			themeColor:{//确认按钮主题颜色
+				type:String,
+				default:"#f5a200"
+			},
+			fields:{//日期颗粒度:year、month、day、hour、minute、second
+				type:String,
+				default:"date"
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			},
+			second:{//time-picker是否显示秒
+				type:Boolean,
+				default:true
+			},
+			options:{//selector,region数据源
+				type:[Array,Object],
+				default(){
+					return []
+				}
+			},
+			defaultProps:{//selector,linkagle字段转换配置
+				type:Object,
+				default(){
+					return{
+						label:"label",
+						value:"value",
+						children:"children"
+					}
+				}
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			hideArea:{//mode=region时，是否隐藏区县列
+				type:Boolean,
+				default:false
+			},
+			level:{
+				//多级联动层级，表示几级联动,区间2-4;
+				type:[Number,String],
+				default:2
+			},
+			timeout:{//是否开启点击延迟,当快速滚动 还没有滚动完毕点击关闭时得到的值是不准确的
+				type:Boolean,
+				default:false
+			},
+			expand:{//mode=shortterm 默认往后拓展天数
+				type:[Number,String],
+				default:30
+			},
+			startYear:{
+				type:[String,Number],
+				default:1970
+			},
+			endYear:{
+				type:[String,Number],
+				default:new Date().getFullYear()
+			},
+			visible:{
+				type:Boolean,
+				default:false
+			},
+			// 代理位置信息
+			agencyInfo: {
+				type: Array,
+				default() {
+					return []
+				}
+			}
+		},
+		created() {
+			this.createKey=Math.random()*1000;
+		},
+		data() {
+			return {
+				itemHeight:`height: ${uni.upx2px(88)}px;`,
+				result:{},
+				confirmFlag:true
+			};
+		},
+		methods:{
+			touchStart(){
+				if(this.timeout){
+					this.confirmFlag=false;
+				}
+			},
+			touchEnd(){
+				if(this.timeout){
+					setTimeout(()=>{
+						this.confirmFlag=true;
+					},500)
+				}
+			},
+			handlerChange(res){
+				let _this=this;
+				this.result={...res};
+			},
+			show(){
+				this.$emit("update:visible",true);
+			},
+			hide(){
+				this.$emit("update:visible",false);
+			},
+			onCancel(res){
+				this.$emit("update:visible",false);
+				this.$emit("cancel");
+			},
+			pickerConfirm(){
+				if(!this.confirmFlag){
+					return;
+				};
+				this.$emit("confirm",this.result);
+				this.$emit("update:visible",false);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.w-picker-item {
+	  text-align: center;
+	  width: 100%;
+	  height: 88upx;
+	  line-height: 88upx;
+	  text-overflow: ellipsis;
+	  white-space: nowrap;
+	  font-size: 30upx;
+	}
+	.w-picker{
+		z-index: 888;
+		.mask {
+		  position: fixed;
+		  z-index: 1000;
+		  top: 0;
+		  right: 0;
+		  left: 0;
+		  bottom: 0;
+		  background: rgba(0, 0, 0, 0.6);
+		  visibility: hidden;
+		  opacity: 0;
+		  transition: all 0.3s ease;
+		}
+		.mask.visible{
+			visibility: visible;
+			opacity: 1;
+		}
+		.w-picker-cnt {
+		  position: fixed;
+		  bottom: 0;
+		  left: 0;
+		  width: 100%;
+		  transition: all 0.3s ease;
+		  transform: translateY(100%);
+		  z-index: 3000;
+		  background-color: #fff;
+		}
+		.w-picker-cnt.visible {
+		  transform: translateY(0);
+		}
+		.w-picker-header{
+		  display: flex;
+		  align-items: center;
+		  padding: 0 30upx;
+		  height: 88upx;
+		  background-color: #fff;
+		  position: relative;
+		  text-align: center;
+		  font-size: 32upx;
+		  justify-content: space-between;
+		  border-bottom: solid 1px #eee;
+		  .w-picker-btn{
+		  	font-size: 30upx;
+		  }
+		}
+		
+		.w-picker-hd:after {
+		  content: ' ';
+		  position: absolute;
+		  left: 0;
+		  bottom: 0;
+		  right: 0;
+		  height: 1px;
+		  border-bottom: 1px solid #e5e5e5;
+		  color: #e5e5e5;
+		  transform-origin: 0 100%;
+		  transform: scaleY(0.5);
+		}
+	}
+</style>
diff --git a/detailStyle.css b/detailStyle.css
new file mode 100644
index 0000000..e0b6a11
--- /dev/null
+++ b/detailStyle.css
@@ -0,0 +1,315 @@
+.carduserInfo-box {
+	box-shadow: 0 0 10upx 0 rgba(86, 86, 86, 0.2);
+	border-radius: 20upx;
+}
+
+.carduserInfo-box .carduserInfo-top {
+	padding: 60upx 50upx;
+}
+
+.businessCard_detail_bg {
+	position: absolute;
+	width: 182upx;
+	height: 248upx;
+	background-size: 182upx 248upx;
+	background-repeat: no-repeat;
+	right: 0;
+	bottom: 0;
+}
+
+.carduserInfo-top .cardInfo-left .seg {
+	width: 104upx;
+	height: 2upx;
+	background-color: #333333;
+	margin: 10upx 0;
+}
+
+.carduserInfo-top .cardInfo-right {
+	width: 90upx;
+	height: 90upx;
+	border-radius: 45upx;
+	background-size: 90upx 90upx;
+	background-repeat: no-repeat;
+}
+
+.carduserInfo-top .cardInfo-contact .icon-Class {
+	font-size: 32upx;
+	width: 32upx;
+}
+
+.carduserInfo-top .cardInfo-contact {
+	margin-top: 60upx;
+}
+
+.carduserInfo-top .cardInfo-tab {
+	margin-top: 60upx;
+}
+
+.carduserInfo-btm,
+.carduserPayInfo-bottom {
+	padding-bottom: 30upx;
+}
+
+.carduserInfo-btm .shadow-seg,
+.carduserPayInfo-bottom .shadow-seg {
+	width: 100%;
+	height: 30upx;
+	background: linear-gradient(0deg, rgba(255, 255, 255, 1) 0%, rgba(0, 0, 0, 1) 100%);
+	opacity: 0.06;
+}
+
+.carduserInfo-btm .cardDataList {
+	padding: 0 50upx;
+}
+
+.carduserfcbtn-box {
+	padding: 0 14upx;
+}
+
+.fcbtn-list {
+	margin: 50upx 0 30upx;
+}
+
+.fcbtn-list .fcbtn-item .fcbtn-itemIconfont {
+	font-size: 30upx;
+}
+
+.fcbtn-list .fcbtn-item.defau-btn {
+	width: 180upx;
+	height: 60upx;
+	line-height: 60upx;
+	border: 1px solid #EEEEEE;
+	border-radius: 30upx;
+}
+
+.cardusertabbar-box {
+	margin: 0 -30upx 60upx;
+}
+
+.cardusertabbar-box .tabbar-list {
+	height: 60upx;
+	line-height: 80upx;
+}
+
+.tabbar-item .selectabbar-item {
+	width: 48upx;
+	height: 6upx;
+	background-color: #FF4444;
+	border-radius: 6upx 6upx 0 0;
+	position: absolute;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+}
+
+.bottomFixedTabbar {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 20upx 30upx;
+	border-top: 1px solid #eeeeee;
+	border-radius: 6upx 6upx 0 0;
+	z-index: 100;
+}
+
+.bottomFixedTabbar-left {
+	width: 40%;
+	margin-right: 5%;
+}
+
+.menu-item .menu-itemImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin: 0 auto;
+	font-size: 0;
+}
+
+.tabbar-btnStyle {
+	padding: 10upx 30upx;
+	border-radius: 30px;
+	height: 44upx;
+}
+
+.tabbar-btnStyle.tabbar-chat {
+	background-color: #17D117;
+}
+
+.tabbar-btnStyle.tabbar-phone {
+	background-color: #FF4444;
+}
+
+.tabbar-itemImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin-right: 10upx;
+	font-size: 0;
+}
+
+.tabbar-btnlist {
+	width: 100%;
+}
+
+.fctabbar-box {
+	padding: 0 60upx;
+}
+
+.fctabbarImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin: 0 auto 10upx;
+}
+
+.carduserPayInfo-top {
+	padding: 80upx 0;
+}
+
+.carduserPayInfo-top .carduserPayBtn {
+	width: 240upx;
+	height: 50upx;
+	line-height: 50upx;
+	border: 1px dotted #666666;
+	border-radius: 25upx;
+	text-align: center;
+}
+
+.cardInfo-contact .wx>image {
+	width: 30upx;
+	height: 30upx;
+	font-size: 0;
+	margin-right: 24upx;
+}
+
+.fnclick-dz {
+	border-color: #ff4444 !important;
+	color: #ff4444 !important;
+}
+
+.coverImg {
+	width: 750upx;
+}
+
+.closeButton {
+	height: 88upx;
+	width: 750upx;
+	text-align: center;
+}
+
+.closeButton>text {
+	line-height: 88upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.buttonText {
+	text-align: center;
+}
+
+.buttonText>text {
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.buttonImage {
+	margin: auto;
+	width: 120upx;
+	height: 120upx;
+}
+
+.buttonImage>image {
+	width: 120upx;
+	height: 120upx;
+}
+
+.titleButton {
+	position: relative;
+	margin: 47upx 0 0 0;
+	display: inline-block;
+	width: 50%;
+}
+
+.mainTitle {
+	width: 750upx;
+	height: 255upx;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+}
+
+.shareBottom {
+	font-size: 0;
+}
+
+.viewMain {
+	width: 750upx;
+	height: 344upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx 20upx 0upx 0upx;
+}
+
+.shareButton {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	background: rgba(0, 0, 0, 0);
+}
+
+.wxShareView {
+	width: 100%;
+	height: 100%;
+}
+.full{
+	height: 100upx;
+	width: 750upx;
+	background: #F8F8F8;
+}
+.cardEndTime {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 240upx;
+	padding: 0 30upx;
+	height: 40upx;
+	line-height: 40upx;
+	background-color: #ff4444;
+	border-radius: 0 20upx 0 10upx;
+}
+
+.checkbox-content {
+	width: 100vw;
+	height: 500upx;
+	border-radius: 20upx 20upx 0upx 0upx;
+}
+
+.scrollView {
+	width: 100vw;
+	height: 360upx;
+	padding: 30upx;
+}
+
+.labeStyle:last-child .labeStyle-btm {
+	margin-bottom: 0;
+}
+
+.checkbox-submit {
+	height: 80upx;
+	line-height: 80upx;
+	background-color: #FF4444;
+}
+
+.briefTextwh {
+	word-break: break-all;
+}
+
+.shop-content,
+.issue-content {
+	background-color: #F8F8F8 !important;
+}
+.issue-content{
+	padding: 15upx 0 30upx;
+}
diff --git a/index.html b/index.html
new file mode 100644
index 0000000..9028cc5
--- /dev/null
+++ b/index.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<html lang="zh-CN" manifest="IGNORE.manifest">
+	<head>
+		<meta charset="utf-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"> 
+		<meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
+		<meta http-equiv="Pragma" content="no-cache" />
+		<meta http-equiv="Expires" content="0" />
+		<!-- <meta name="referrer" content="no-referrer" /> -->
+		<title>
+			
+		</title>
+		<!-- <script type="text/javascript" src="./common/js/recorder.js"></script> -->
+		<script src="https://res.wx.qq.com/open/js/jweixin-1.6.0.js" type="text/javascript"></script>
+		<script type="text/javascript" src="https://webapi.amap.com/maps?v=1.4.15&key=3523000d4cc65ace6ca12c44703d8c62"></script>
+		<script>
+			document.addEventListener('DOMContentLoaded', function() {
+				document.documentElement.style.fontSize = document.documentElement.clientWidth / 20 + 'px'
+			});
+		</script>
+		<link rel="stylesheet" href="<%= BASE_URL %>static/index.css" />
+		<!-- <textarea  id="#clipboard" style=" z-index: -9999"></textarea> -->
+	</head>
+	<body>
+		<noscript>
+			<strong>Please enable JavaScript to continue.</strong>
+		</noscript>
+		<div id="app"></div>
+		<!-- built files will be auto injected -->
+	</body>
+	<style type="text/css">
+		body,html{
+		　　position:fixed!important;
+		　　top:0!important;
+		　　left:0!important;
+		　　width:100%!important;
+		　　height:100%!important;
+		}
+		#app{
+			position: relative;
+			z-index: 1;
+		}
+	</style>
+</html>
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..8762887
--- /dev/null
+++ b/main.js
@@ -0,0 +1,565 @@
+import Vue from 'vue'
+import App from './App'
+import setData from "./common/js/setData.js"
+import Utils from "./common/js/util.js"
+import Store from './store'
+import AppFunction from "./common/js/app.js"
+import wxApi from "./common/js/wxApi.js"
+// import ican_H5Api from './common/js/ican-H5Api'
+import FarBottom from './components/template/farbottom.vue'
+
+Vue.config.productionTip = false
+
+
+Vue.prototype.setData = setData
+Vue.prototype.$util = Utils
+Vue.prototype.$store = Store
+Vue.prototype.imgfixUrl = AppFunction.imgfix
+Vue.prototype.language = AppFunction.languageStatus
+Vue.component('far-bottom', FarBottom)
+
+App.mpType = 'app'
+Vue.mixin({
+	data() {
+		return {
+			languageStatus:AppFunction.languageStatus,
+			imgfixUrls: AppFunction.imgfix,
+			imageRoot: AppFunction.img_root,
+			imageRootNew: AppFunction.img_root_new,
+			shareDataInfo: {},
+			onShowPageTitle: false
+		}
+	},
+	computed: {
+
+	},
+	mounted() {
+
+	},
+	onLoad(e) {
+		// #ifndef H5
+		this.pageHeaderColor()
+		this.pageTitle()
+		// #endif
+		// #ifdef H5
+		wxApi.wxRegister();
+		
+		this.pageTitle()
+		// #endif
+	},
+	onReady() {
+		// #ifdef H5
+		
+		// #endif
+	},
+	methods: {
+		pageHeaderColor() {
+			// #ifndef H5
+			uni.setNavigationBarColor({
+				frontColor: this.Textbuff.textc,
+				backgroundColor: this.Textbuff.bgc
+			})
+			// #endif
+		},
+		pageTitle() {
+			
+			let page = 'pages/mainPages/index/index';
+			// let diyPage = 'pages/mainPages/index/diypage';
+			let pageinfo;
+				// #ifdef H5
+			pageinfo = location.href.split("#/")[1];
+			let pagetitle = uni.getStorageSync('TextSubstitution');
+			document.title = pagetitle.sysname || '⁣​';
+				// #endif
+				// #ifndef H5
+			let curPage = getCurrentPages();
+			pageinfo = curPage[curPage.length - 1].route;
+				// #endif
+			// let isPage = pageinfo.indexOf(page) != -1 || pageinfo.indexOf(diyPage) != -1 || pageinfo.indexOf('pages') == -1;
+				let isPage = pageinfo.indexOf(page) != -1  || pageinfo.indexOf('pages') == -1;
+			let indexname = uni.getStorageSync('platformInfor');
+			if (!isPage) {
+				if (!!Store.state.appInfo && !!Store.state.appInfo.name) {
+					let appInfo_title = Store.state.appInfo.name;
+					if(pageinfo.indexOf('pages/subPages2/redClothes/redClothes') != -1){
+						appInfo_title = '选择转赠对象';
+					}
+					// #ifdef H5
+					// let pagetitle = uni.getStorageSync('TextSubstitution').sysname;
+					console.log(Store.state.appInfo.name,'非主页名称')
+					document.title = appInfo_title || '⁣​';
+					// #endif
+					// #ifndef H5
+					// 这个功能不需要吧
+					// uni.setNavigationBarTitle({
+					// 	title: appInfo_title
+					// });
+					
+					// #endif
+					this.onShowPageTitle = true;
+				}
+			}else{
+				//#ifdef H5
+				let name = uni.getStorageSync('indexName');
+				let appInfo_title = name;
+				setTimeout(()=>{
+					if(appInfo_title){
+						console.log('在main。js当中率先执行',appInfo_title);
+						document.title = appInfo_title;
+					}
+				},200)
+				//#endif
+				
+				// if(name && (pageinfo.indexOf('pages/mainPages/index/index') != -1 || pageinfo.indexOf('pages') == -1 )){
+				// 	let appInfo_title = name;
+				// 	
+				// 	uni.setNavigationBarTitle({
+				// 		title: appInfo_title
+				// 	});
+				// 	console.log('在main。js当中率先执行',appInfo_title)
+				// }
+				
+			}
+		},
+		saveForm(temp_type) {
+			// #ifdef MP-WEIXIN
+			AppFunction.saveFormId(temp_type)
+			// #endif
+		},
+		mprequestShareInfo(dataInfo = "") {
+			// 
+			let _this = this,
+				hideSharelist = [
+					"pages/subPages/businesscard/mycard/mycard",
+					"pages/subPages/businesscard/carddetail/renewcarddetail"
+				],
+				head_id = uni.getStorageSync('head_id'),
+				pages = getCurrentPages(),
+				currentPageObj = pages[pages.length - 1],
+				currentPage = currentPageObj.route,
+				
+				currentPageOptions = currentPageObj.options,
+				isOptions = Object.keys(currentPageOptions).length === 0,
+				currentUrl = isOptions ? currentPage : currentPage + '?' + AppFunction.urlEncode(currentPageOptions),
+				cardListPage = 'pages/subPages/businesscard/carddetail/renewcarddetail';
+
+			if (hideSharelist.includes(currentPage)) {
+				uni.hideShareMenu()
+			}
+			if (currentPage.indexOf(cardListPage) !== -1) {
+				currentUrl = !!dataInfo ? `pages/subPages/businesscard/carddetail/carddetail?cardid=${dataInfo}` : currentUrl;
+			}
+			let requestData = {
+				pageinfo: currentUrl
+			};
+			if (head_id && !!head_id) {
+				Object.assign(requestData, {
+					head_id
+				})
+			};
+			AppFunction._post_form('&do=Shareinfo', requestData, res => {
+				_this.setData({
+					shareDataInfo: res.data
+				});
+				uni.setStorageSync('shareDataInfo', _this.shareDataInfo);
+				//#ifdef APP-PLUS
+				// let datainfo = {
+				// 	title: shareData.title || "", // 分享标题
+				// 	desc: shareData.desc || "", // 分享描述
+				// 	link: shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+				// 	imgUrl: shareData.img || "" // 分享图标
+				// }
+				uni.setStorageSync('AppShareData',_this.shareDataInfo);
+				//#endif
+				if (_this.shareDataInfo.mpurl.split('?')[0] == 'pages/subPages2/drawGame/drawGame') {
+					uni.setStorageSync('drawGameShareData', _this.shareDataInfo);
+				}
+				if (_this.shareDataInfo.mpurl.split('?')[0] == 'pages/subPages2/drawGame/gameIntegral') {
+					// let endurl = _this.shareDataInfo.mpurl.split('?')[1];
+					_this.shareDataInfo = uni.getStorageSync('drawGameShareData');
+				}
+				// _this.onShareAppMessage();
+				// _this.onShareTimeline();
+				// _this.setSharePages(res.data);
+				// uni.setStorageSync('ss','123')
+				// _this.setSharePages(res.data);
+				if (!!res.data.cleanheadid) {
+					uni.removeStorageSync('head_id');
+				}
+			}, false, () => {})
+		},
+		requestShareInfo(dataInfo = "") {
+			let _this = this,
+				pageinfo = location.href.split("#/")[1],
+				head_id = uni.getStorageSync('head_id'),
+				cardListPage = 'pages/subPages/businesscard/carddetail/renewcarddetail';
+			if (pageinfo.indexOf(cardListPage) !== -1) {
+				pageinfo = !!dataInfo ? `pages/subPages/businesscard/carddetail/carddetail?cardid=${dataInfo}` : pageinfo;
+			}
+			let requestData = {
+				pageinfo
+			};
+			if (head_id && !!head_id) {
+				Object.assign(requestData, {
+					head_id
+				})
+			};
+			AppFunction._post_form('&do=Shareinfo', requestData, res => {
+				_this.setData({
+					shareDataInfo: res.data
+				})
+				if (_this.shareDataInfo.mpurl.split('?')[0] == 'pages/subPages2/drawGame/drawGame') {
+					uni.setStorageSync('drawGameShareData', _this.shareDataInfo);
+				}
+				if (_this.shareDataInfo.mpurl.split('?')[0] == 'pages/subPages2/drawGame/gameIntegral') {
+					// let endurl = _this.shareDataInfo.mpurl.split('?')[1];
+					_this.shareDataInfo = uni.getStorageSync('drawGameShareData');
+				}
+				// uni.setStorageSync('ss','123')
+				_this.setSharePages(_this.shareDataInfo);
+				// _this.onShareAppMessage();
+				// _this.onShareTimeline();
+				if (!!res.data.cleanheadid) {
+					// 
+					uni.removeStorageSync('head_id');
+				}
+			}, false, () => {})
+		},
+		setSharePages(shareData) {
+			let sharePages = [
+					"#/pages/subPages/orderList/orderList",
+					"#/pages/subPages/consumptionRecords/consumptionRecords",
+					"#/pages/subPages/myPost/myPost",
+					"#/pages/subPages/dealer/apply/apply",
+					"#/pages/subPages/bargin/barginlist/barginlist",
+					"#/pages/subPages/receivingAddress/receivingAddress",
+					"#/pages/mainPages/userCenter/userCenter",
+					"#/pages/mainPages/submitOrder/submitOrder",
+					"#/pages/subPages/attestationCenter/index",
+					"#/pages/mainPages/userset/userset",
+					"#/pages/subPages/businesscard/mycard/mycard",
+					"#/pages/subPages/businesscard/carddetail/renewcarddetail",
+					"#/pages/subPages/city/city",
+					"#/pages/subPages/dealer/setshop/setshop",
+					"#/pages/subPages/postRelease/postRelease",
+					"#/pages/mainPages/Settled/Settled",
+					"#/pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress",
+					"#/pages/subPages/createCommodity/index",
+					"/#pages/subPages2/management/addGoods/addGoods",
+					"/#pages/subPages/merchant/merchantHome/merchantHome",
+					"/#pages/subPages2/redClothes/redClothes",
+					"/#pages/subPages/coupon/coupon",
+					"/#pages/subPages/redpacket/myredpacket"
+				],
+				// 列表单个信息分享过滤
+				listSharefilt = [
+					"#/pages/subPages/businesscard/carddetail/renewcarddetail"
+				],
+				shareUrl = location.hash,
+				fullUrl = location.protocol + '//' + location.host + location.pathname + '#/pages/mainPages/index/index?i=' +
+				AppFunction.siteInfo.uniacid,
+				currentPages = shareUrl.split("?")[0],
+				islistPage = listSharefilt.includes(currentPages),
+				isCardItem = shareData.mpurl.indexOf('businesscard/carddetail/carddetail') !== -1,
+				getUserinfo = uni.getStorageSync('userinfo'),
+				agencyData = uni.getStorageSync('agencyData'),
+				Dparameterid = uni.getStorageSync('Dparameterid'),
+				// storeSid = uni.getStorageSync()
+				// 列表单个信息分享链接
+				listShare = location.protocol + '//' + location.host + location.pathname + '#/' + shareData.mpurl + (shareData.mpurl
+					.indexOf('i=' + AppFunction.siteInfo.uniacid) === -1 ? (shareData.mpurl.indexOf('?') === -1 ? '?i=' +
+						AppFunction.siteInfo.uniacid : '&i=' + AppFunction.siteInfo.uniacid) : ""),
+				ifSid = location.href.indexOf('sid') === -1 ? false : true,
+				loclink = location.href.split('&head_id')[0],
+				locationParameter = location.href.split('&head_id')[1],
+				// 判断用哪种分享链接
+				linkurl = isCardItem && islistPage ? listShare : (sharePages.includes(currentPages) ? fullUrl : loclink),
+				// 分享link后面是否有head_id完整链接
+				shareLinkurls = linkurl.indexOf('head_id') === -1 ? (linkurl.indexOf('?') === -1 ? linkurl + '?head_id=' +
+					getUserinfo.mid : linkurl + '&head_id=' + getUserinfo.mid) : linkurl,
+				// 分享link后面是否有aid完整链接
+				shareLinkurl = shareLinkurls.indexOf('aid') === -1 ? (shareLinkurls.indexOf('?') === -1 ? shareLinkurls + '?aid=' +
+					agencyData.aid : shareLinkurls + '&aid=' + agencyData.aid) : shareLinkurls;
+			let parameter;
+			if (!!locationParameter && locationParameter.indexOf('&') !== -1) {
+				parameter = locationParameter.split('&')[1];
+			}
+
+			if (parameter) {
+				shareLinkurl = shareLinkurl + parameter;
+			}
+			// shareLinkurl = encodeURIComponent(shareLinkurl);
+			// let urltitle = shareLinkurl.split('?')[0];
+			// let urlend = shareLinkurl.split('?')[1];
+			// shareLinkurl = urltitle + encodeURIComponent(urlend);
+			if (shareLinkurl.split('?')[0].split('/#/')[1] == 'pages/subPages2/phoneBook/logistics/logistics') {
+				shareLinkurl = shareLinkurl.indexOf('share') === -1 ? shareLinkurl + '&share=1' : shareLinkurl;
+			}
+			if (shareLinkurl.split('?')[0].split('/#/')[1] == 'pages/subPages2/drawGame/drawGame' || shareLinkurl.split('?')[0]
+				.split('/#/')[1] == 'pages/subPages2/drawGame/gameIntegral') {
+				let titleUrl = shareLinkurl.split('?')[0].split('/#/')[0];
+				let canshu = shareLinkurl.split('?')[1];
+				shareLinkurl = titleUrl + '/#/' + 'pages/subPages2/drawGame/drawGame?' + canshu;
+				shareLinkurl = shareLinkurl.indexOf('id') === -1 ? shareLinkurl + '&id=' + Dparameterid : shareLinkurl;
+			}
+			if (shareLinkurl.indexOf("/h5/?#/pages/") === -1) {
+				let reg = new RegExp("\/h5/.*?\#/");
+				shareLinkurl = shareLinkurl.replace(reg, "/h5/#/");
+			}
+			uni.setStorageSync('shareLinkurl',shareLinkurl);
+			// wxApi.wxRegister(() => {
+				if(shareLinkurl.indexOf('pages/subPages/redpacket/myredpacket') != -1){
+					uni.$emit('myredpacketShare');
+				}
+				if(shareLinkurl.indexOf('pages/subPages/coupon/coupon') != -1){
+					uni.$emit('couponShare');
+				}
+				//#ifdef H5
+				// uni.showModal({
+				// 	content:shareLinkurl
+				// })
+				console.log(shareData,shareLinkurl)
+				jWeixin.ready(() => {
+					wxApi.wxShare({
+						title: shareData.title || "", // 分享标题
+						desc: shareData.desc || "", // 分享描述
+						link: shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+						imgUrl: shareData.img || "", // 分享图标
+						success: function(res) {
+							let cardUrl = 'pages/subPages/businesscard/carddetail/carddetail';
+							if (linkurl.indexOf(cardUrl) !== -1) {
+								let cardshare = Store.state.isCardshare;
+								Store.commit("ISCARDSHARE", (cardshare + 1))
+							};
+							// if (shareLinkurl.split('?')[0].split('/#/')[1] == 'pages/subPages2/phoneBook/logistics/logistics') {
+							// 	uni.$emit('shareLogistics');
+							// }
+						},
+						trigger: function(res) {
+							if (shareLinkurl.split('?')[0].split('/#/')[1] == 'pages/subPages2/phoneBook/logistics/logistics') {
+								uni.$emit('shareLogistics');
+							}
+							if (shareLinkurl.split('?')[0].split('/#/')[1] == 'pages/subPages/postDetails/postDetails') {
+								let id = uni.getStorageSync('DetailsId'),
+									data = {
+										id: id
+									};
+								AppFunction._post_form('&p=pocket&do=shareNum', data, res => {
+									uni.showToast({
+										icon: 'none',
+										title: '分享成功',
+										duration: 2000
+									});
+									uni.$emit('shareNum');
+								});
+							}
+						}
+					})
+				})
+				//#endif
+			
+			// });
+		}
+	},
+	onShareTimeline(e) {
+		let sharePages = [
+				"pages/subPages/orderList/orderList",
+				"pages/subPages/consumptionRecords/consumptionRecords",
+				"pages/subPages/myPost/myPost",
+				"pages/subPages/dealer/apply/apply",
+				"pages/subPages/bargin/barginlist/barginlist",
+				"pages/subPages/receivingAddress/receivingAddress",
+				"pages/mainPages/userCenter/userCenter",
+				"pages/subPages/submitOrder/submitOrder",
+				"pages/subPages/attestationCenter/index",
+				"pages/mainPages/userset/userset",
+				"pages/subPages/city/city",
+				"pages/subPages/dealer/setshop/setshop",
+				"pages/subPages/postRelease/postRelease",
+				"pages/mainPages/Settled/Settled",
+				"pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress",
+				"pages/subPages/createCommodity/index",
+				"pages/subPages2/management/addGoods/addGoods",
+				"pages/subPages/merchant/merchantHome/merchantHome",
+				"pages/subPages2/redClothes/redClothes",
+				"pages/subPages/coupon/coupon",
+				"pages/subPages/redpacket/myredpacket"
+			],
+			getUserinfo = uni.getStorageSync('userinfo'),
+			agencyData = uni.getStorageSync('agencyData'),
+			Dparameterid = uni.getStorageSync('Dparameterid'),
+			pages = getCurrentPages(),
+			currentPageObj = pages[pages.length - 1],
+			currentPage = currentPageObj.route,
+			ShareData = Store.state.mpshareInfo,
+			shareDataInfo = this.shareDataInfo,
+			mpwxUrl = shareDataInfo.mpurl,
+			ismpwxUrl = mpwxUrl.indexOf('?') !== -1,
+			cardUrl = 'pages/subPages/businesscard/carddetail/carddetail',
+			shareObj = {
+				title: sharePages.includes(currentPage) ? ShareData.title : shareDataInfo.title,
+				desc: sharePages.includes(currentPage) ? ShareData.desc : shareDataInfo.desc,
+				imageUrl: sharePages.includes(currentPage) ? ShareData.img : shareDataInfo.img,
+				path: sharePages.includes(currentPage) ? ("pages/mainPages/index/index?head_id=" + getUserinfo.mid + '&aid=' +
+					agencyData.aid) : (ismpwxUrl ?
+					mpwxUrl + "&head_id=" + getUserinfo.mid + '&aid=' + agencyData.aid : mpwxUrl + "?head_id=" + getUserinfo.mid +
+					'&aid=' + agencyData.aid)
+			};
+		if (mpwxUrl.split('?')[0] == 'pages/subPages2/phoneBook/logistics/logistics') {
+			shareObj.path = shareObj.path + '&share=1';
+			uni.$emit('shareLogistics');
+		}
+		if ((mpwxUrl.split('?')[0] == 'pages/subPages2/drawGame/drawGame') || (mpwxUrl.split('?')[0] ==
+				'pages/subPages2/drawGame/gameIntegral')) {
+
+			shareObj.path = ((shareObj.path.indexOf('&id') !== -1) && (shareObj.path.indexOf('?id') !== -1)) ? shareObj.path +
+				'&id=' + Dparameterid : shareObj.path;
+		}
+		if (currentPage.indexOf(cardUrl) !== -1) {
+			let cardshare = Store.state.isCardshare;
+			Store.commit("ISCARDSHARE", (cardshare + 1))
+		}
+		
+
+		// let query={
+		//       head_id:getUserinfo.mid,
+		// 	  aid:agencyData.aid
+		//     };
+		let query = shareObj.path.split('?')[1];
+		let redlink = uni.getStorageSync('redItem');
+		uni.removeStorageSync('redItem');
+		
+		if(redlink){
+			shareObj.title = redlink.title;
+			shareObj.imageUrl = redlink.shareimg;
+			query = query + '&isred=' +  redlink.recordid
+		}
+		shareObj.query = query;
+		uni.setStorageSync('shareObj', shareObj);
+		return {
+			title: shareObj.title,
+			imageUrl: shareObj.imageUrl,
+			query: query
+		}
+	},
+	onShareAppMessage(e) {
+		let sharePages = [
+				"pages/subPages/orderList/orderList",
+				"pages/subPages/consumptionRecords/consumptionRecords",
+				"pages/subPages/myPost/myPost",
+				"pages/subPages/dealer/apply/apply",
+				"pages/subPages/bargin/barginlist/barginlist",
+				"pages/subPages/receivingAddress/receivingAddress",
+				"pages/mainPages/userCenter/userCenter",
+				"pages/subPages/submitOrder/submitOrder",
+				"pages/subPages/attestationCenter/index",
+				"pages/mainPages/userset/userset",
+				"pages/subPages/city/city",
+				"pages/subPages/dealer/setshop/setshop",
+				"pages/subPages/postRelease/postRelease",
+				"pages/mainPages/Settled/Settled",
+				"pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress",
+				"pages/subPages/createCommodity/index",
+				"pages/subPages2/management/addGoods/addGoods",
+				"pages/subPages2/redClothes/redClothes",
+				"pages/subPages/coupon/coupon",
+				"pages/subPages/redpacket/myredpacket"
+			],
+			getUserinfo = uni.getStorageSync('userinfo'),
+			agencyData = uni.getStorageSync('agencyData'),
+			Dparameterid = uni.getStorageSync('Dparameterid'),
+			pages = getCurrentPages(),
+			currentPageObj = pages[pages.length - 1],
+			currentPage = currentPageObj.route,
+			ShareData = Store.state.mpshareInfo,
+			shareDataInfo = this.shareDataInfo,
+			mpwxUrl = shareDataInfo.mpurl,
+			ismpwxUrl = mpwxUrl.indexOf('?') !== -1,
+			cardUrl = 'pages/subPages/businesscard/carddetail/carddetail',
+			shareObj = {
+				title: sharePages.includes(currentPage) ? ShareData.title : shareDataInfo.title,
+				desc: sharePages.includes(currentPage) ? ShareData.desc : shareDataInfo.desc,
+				imageUrl: sharePages.includes(currentPage) ? ShareData.img : shareDataInfo.img,
+				path: sharePages.includes(currentPage) ? ("pages/mainPages/index/index?head_id=" + getUserinfo.mid + '&aid=' +
+					agencyData.aid) : (ismpwxUrl ?
+					mpwxUrl + "&head_id=" + getUserinfo.mid + '&aid=' + agencyData.aid : mpwxUrl + "?head_id=" + getUserinfo.mid +
+					'&aid=' + agencyData.aid)
+			};
+		if (mpwxUrl.split('?')[0] == 'pages/subPages2/phoneBook/logistics/logistics') {
+			shareObj.path = shareObj.path + '&share=1';
+			uni.$emit('shareLogistics');
+		}
+		if ((mpwxUrl.split('?')[0] == 'pages/subPages2/drawGame/drawGame') || (mpwxUrl.split('?')[0] ==
+				'pages/subPages2/drawGame/gameIntegral')) {
+
+			shareObj.path = ((shareObj.path.indexOf('&id') !== -1) && (shareObj.path.indexOf('?id') !== -1)) ? shareObj.path +
+				'&id=' + Dparameterid : shareObj.path;
+		}
+		if (currentPage.indexOf(cardUrl) !== -1) {
+			let cardshare = Store.state.isCardshare;
+			Store.commit("ISCARDSHARE", (cardshare + 1))
+		}
+		uni.setStorageSync('shareObj', shareObj);
+		let redlink = uni.getStorageSync('redItem');
+		uni.removeStorageSync('redItem');
+		if(redlink){
+			shareObj.title = redlink.title;
+			shareObj.imageUrl = redlink.shareimg;
+			shareObj.desc = redlink.desc;
+			shareObj.path = shareObj.path.indexOf('?') == -1?shareObj.path + '?isred=' +  redlink.recordid:shareObj.path + '&isred=' +  redlink.recordid;
+		}
+		return shareObj
+	},
+	onShow(options) {
+		// uni.$emit('shareNum');
+		uni.$emit('getFarBtn');
+		//#ifdef H5 
+		let pages = location.href.split('?')[0].split('#/')[1];
+		let pagetitle = uni.getStorageSync('TextSubstitution');
+		document.title = pagetitle.sysname || '⁣​';
+		if (pages == 'pages/mainPages/login/login' || pages == 'pages/subPages2/cleanCustom/bindingPhone') {
+			return
+		} else {
+			AppFunction.getInt();
+		}
+		setTimeout(() => {
+			this.requestShareInfo()
+		}, 200)
+		//#endif
+		//#ifdef MP-WEIXIN || APP-PLUS
+		let pages = getCurrentPages();
+		if(pages.length==0) return;
+		let currentPageObj = pages[pages.length - 1],
+			currentPage = currentPageObj.route;
+			if(currentPage == 'pages/subPages2/cleanCustom/bindingPhone'){
+				return
+			}else{
+				AppFunction.getInt();
+			}
+		setTimeout(() => {
+			this.mprequestShareInfo();
+		}, 200)
+		wx.showShareMenu({
+			withShareTicket: false,
+			menus: ['shareAppMessage', 'shareTimeline']
+		})
+		//#endif
+		
+		this.onShowPageTitle && this.pageTitle()
+		
+
+	},
+	computed: {
+		Textbuff() {
+			return uni.getStorageSync('TextSubstitution');
+		},
+		resouCliType() {
+			return AppFunction.getClientType()
+		}
+	}
+})
+
+const app = new Vue({
+	...App
+})
+app.$mount()
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..1da4a35
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,186 @@
+{
+    "name" : "smartcity",
+    "appid" : "__UNI__9C0B115",
+    "description" : "测试使用",
+    "versionName" : "1.0.0",
+    "versionCode" : "100",
+    "transformPx" : false,
+    /* 5+App特有相关 */
+    "app-plus" : {
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        /* 模块配置 */
+        "modules" : {
+            "Geolocation" : {},
+            "OAuth" : {},
+            "VideoPlayer" : {},
+            "Webview-x5" : {},
+            "Share" : {},
+            "Payment" : {},
+            "Push" : {},
+            "LivePusher" : {},
+            "Maps" : {}
+        },
+        /* 应用发布信息 */
+        "distribute" : {
+            /* android打包配置 */
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
+            },
+            /* ios打包配置 */
+            "ios" : {},
+            /* SDK配置 */
+            "sdkConfigs" : {
+                "ad" : {},
+                "maps" : {
+                    "baidu" : {
+                        "appkey_ios" : "L5O7yZmjg5Qsf950XXxeR4zubeTtKNUi",
+                        "appkey_android" : "L5O7yZmjg5Qsf950XXxeR4zubeTtKNUi"
+                    }
+                },
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx0c70dd5cbbd75583",
+                        "appsecret" : "3602eca05a90222d9e0f46e40122ebd9",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wx0c70dd5cbbd75583",
+                        "UniversalLinks" : ""
+                    },
+                    "alipay" : {}
+                },
+                "geolocation" : {
+                    "baidu" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "L5O7yZmjg5Qsf950XXxeR4zubeTtKNUi",
+                        "appkey_android" : "L5O7yZmjg5Qsf950XXxeR4zubeTtKNUi"
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx0c70dd5cbbd75583",
+                        "UniversalLinks" : ""
+                    }
+                },
+                "push" : {}
+            },
+            "splashscreen" : {
+                "androidStyle" : "common"
+            },
+            "icons" : {
+                "ios" : {
+                    "appstore" : "C:/Users/Administrator/Desktop/.png",
+                    "ipad" : {
+                        "notification@2x" : "C:/Users/Administrator/Desktop/.png",
+                        "notification" : "C:/Users/Administrator/Desktop/.png",
+                        "app" : "C:/Users/Administrator/Desktop/.png",
+                        "app@2x" : "C:/Users/Administrator/Desktop/.png"
+                    }
+                },
+                "android" : {
+                    "hdpi" : "C:/Users/Administrator/Desktop/.png",
+                    "xhdpi" : "C:/Users/Administrator/Desktop/.png",
+                    "xxhdpi" : "C:/Users/Administrator/Desktop/.png",
+                    "xxxhdpi" : "C:/Users/Administrator/Desktop/.png"
+                }
+            }
+        }
+    },
+    /* 快应用特有相关 */
+    "quickapp" : {},
+    /* 小程序特有相关 */
+    "mp-weixin" : {
+        "appid" : "wx0c70dd5cbbd75583",
+        "setting" : {
+            "urlCheck" : true,
+            "es6" : true,
+            "postcss" : false,
+            "minified" : true,
+            "showES6CompileOption" : true
+        },
+        "usingComponents" : true,
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序位置接口的效果展示"
+            }
+        },
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
+        "plugins" : {
+            "WechatSI" : {
+                "version" : "0.3.5",
+                "provider" : "wx069ba97219f66d99"
+            }
+        }
+    },
+    "networkTimeout" : {
+        "request" : 15000
+    },
+    "mp-alipay" : {
+        "usingComponents" : true
+    },
+    "mp-baidu" : {
+        "usingComponents" : true
+    },
+    "mp-toutiao" : {
+        "usingComponents" : true
+    },
+    "uniStatistics" : {
+        "enable" : false //全局关闭  
+    },
+    "h5" : {
+        "title" : "smartcity",
+        "domain" : "https://citydev.weliam.com.cn",
+        "router" : {
+            "base" : "/addons/weliam_smartcity/h5/",
+            "mode" : "hash"
+        },
+        "devServer" : {
+            "https" : true
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF"
+                }
+            }
+        },
+        "template" : "index.html",
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : false
+            }
+        }
+    }
+}
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..96db541
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,29 @@
+{
+  "name": "1",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/html5plus": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@types/html5plus/-/html5plus-1.0.1.tgz",
+      "integrity": "sha512-ska1eyYbGO7zsru2KTjZ/CWtSjOXh92/K/QMdgSddkyr1ZplIybOzeS1u61scyxAKRvz6Yd9TRL+LQSBVyGUJw==",
+      "dev": true
+    },
+    "@types/uni-app": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/@types/uni-app/-/uni-app-1.4.3.tgz",
+      "integrity": "sha512-i2P+ARDpMWrAlubqp54LYBEAxZhPML3kHW9qLxwK7ZvInoI8xaYDDhqukp5xisBftVrZ7+jUa7spCDXy6qBMvQ==",
+      "dev": true,
+      "requires": {
+        "vue": "^2.6.8"
+      }
+    },
+    "vue": {
+      "version": "2.6.11",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-2.6.11.tgz",
+      "integrity": "sha512-VfPwgcGABbGAue9+sfrD4PuwFar7gPb1yl1UK1MwXoQPAw0BKSqWfoYCT/ThFrdEVWoI51dBuyCoiNU9bZDZxQ==",
+      "dev": true
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..2bd8817
--- /dev/null
+++ b/package.json
@@ -0,0 +1,35 @@
+{
+  "name": "1",
+  "version": "1.0.0",
+  "description": "",
+  "main": "main.js",
+  "dependencies": {},
+  "devDependencies": {
+    "@types/html5plus": "^1.0.1",
+    "@types/uni-app": "^1.4.3"
+  },
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+	"build:test": {
+		"title": "build:test",
+		"env": {
+			"UNI_PLATFORM": "h5",
+			"H_NODE_ENV": "development",
+			"MY_TEST": "jdsfh",
+			"kjdsh": "888899999"
+		}
+	},
+	"build:pro": {
+		"title": "build:pro",
+		"env": {
+			"UNI_PLATFORM": "h5",
+			"H_NODE_ENV": "production",
+			"MY_TEST": "jdsfh8888",
+			"kjdsh": "88889990000000"
+		}
+	}
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..c03c002
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,2023 @@
+{
+	"lazyCodeLoading": "requiredComponents",
+	"pages": [{
+			"path": "pages/mainPages/index/index",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "首页"
+			}
+		},
+		{
+			"path": "pages/mainPages/index/diypage",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "-"
+				// "enableScroll" : false
+			}
+		},
+		{
+			"path": "pages/mainPages/userCenter/userCenter",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "个人中心"
+			}
+		},
+		{
+			"path": "pages/mainPages/store/index",
+			"style": {
+				"navigationBarTitleText": "商铺详情"
+			}
+		},
+		{
+			"path": "pages/mainPages/Settled/Settled",
+			"style": {
+				"navigationBarTitleText": "企业认证"
+			}
+		},
+		{
+			"path": "pages/mainPages/sendInformation/sendInformation",
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": "信息发布"
+			}
+		},
+		{
+			"path": "pages/mainPages/store/list",
+			"style": {
+				"navigationBarTitleText": "商户列表"
+			}
+		},
+		{
+			"path": "pages/mainPages/businessDetails/businessDetails",
+			"style": {
+				"navigationBarTitleText": "智慧城市同城"
+			}
+		},
+		{
+			"path": "pages/mainPages/login/login",
+			"style": {
+				"navigationBarTitleText": "登陆"
+			}
+		},
+		{
+			"path": "pages/mainPages/login/minLogin",
+			"style": {
+				"navigationBarTitleText": "登陆"
+			}
+		},
+		{
+			"path": "pages/mainPages/registerSuses/registerSuses",
+			"style": {
+				"navigationBarTitleText": "注册成功"
+			}
+		},
+		{
+			"path": "pages/mainPages/orderWrite/orderWrite",
+			"style": {
+				"navigationBarTitleText": "自助核销"
+			}
+		},
+		{
+			"path": "pages/mainPages/poster/poster",
+			"style": {
+				"navigationBarTitleText": "生成海报"
+			}
+		},
+		{
+			"path": "pages/mainPages/successRelease/successRelease",
+			"style": {
+				"navigationBarTitleText": "发布成功"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"homeButton": true,
+				// 		"autoBackButton": false
+				// 	}
+				// }
+			}
+		},
+		{
+			"path": "pages/mainPages/realCard/realCard",
+			"style": {
+				"navigationBarTitleText": "实卡绑定"
+			}
+		}
+	],
+	"subPackages": [
+		{
+			"root": "pages/mainPages/cashApplication",
+			"name": "cashApplication",
+			"pages": [
+				{
+					"path": "cashApplication",
+					"style": {
+						"navigationBarTitleText": "提现申请"
+					}
+				}
+			]
+		},{
+			"root": "pages/mainPages/comment",
+			"name": "comment",
+			"pages": [
+				{
+					"path": "comment",
+					"style": {
+						"navigationBarTitleText": "发表评论"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/pocketIInformant",
+			"name": "pocketIInformant",
+			"pages": [
+				{
+					"path": "pocketIInformant",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "掌上信息",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/econdaryClassification",
+			"name": "econdaryClassification",
+			"pages": [
+				{
+					"path": "econdaryClassification",
+					"style": {
+						"navigationBarTitleText": "帖子二级列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/noticeDetail",
+			"name": "noticeDetail",
+			"pages": [
+				{
+					"path": "noticeDetail",
+					"style": {
+						"navigationBarTitleText": "公告详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/agreement",
+			"name": "agreement",
+			"pages": [
+				{
+					"path": "agreement",
+					"style": {
+						"navigationBarTitleText": "用户协议"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/userset",
+			"name": "userset",
+			"pages": [
+				{
+					"path": "userset",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/express",
+			"name": "express",
+			"pages": [
+				{
+					"path": "express",
+					"style": {
+						"navigationBarTitleText": "查看物流"
+					}
+				}
+			]
+		},{
+			"root": "pages/mainPages/payment",
+			"name": "payment",
+			"pages": [{
+					"path": "payment",
+					"style": {
+						"navigationBarTitleText": "订单支付"
+					}
+				},
+				{
+					"path": "pay",
+					"style": {
+						"navigationBarTitleText": "订单支付"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/headline",
+			"name": "headline",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "好店头条"
+					}
+				},
+				{
+					"path": "message",
+					"style": {
+						"navigationBarTitleText": "头条留言"
+					}
+				},
+				{
+					"path": "headlineDetail",
+					"style": {
+						"navigationBarTitleText": "头条详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/memberCard",
+			"name": "memberCard",
+			"pages": [{
+					"path": "memberCard",
+					"style": {
+						"navigationBarTitleText": "会员中心"
+					}
+				},
+				{
+					"path": "interests",
+					"style": {
+						"navigationBarTitleText": "会员权益"
+					}
+				},
+				{
+					"path": "getMembership/getMembership",
+					"style": {
+						"navigationBarTitleText": "开通一卡通"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/mainPages/notOpen",
+			"name": "notOpen",
+			"pages": [{
+				"path": "notOpen",
+				"style": {
+					"navigationBarTitleText": "城市代理"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/livePlayer",
+			"name": "livePlayer",
+			"pages": [{
+				"path": "livePlayer",
+				"style": {
+					"navigationStyle": "custom",
+					"navigationBarTitleText": ""
+				}
+			}]
+			// "plugins" : {
+			//     "live-player-plugin" : {
+			//         "version" : "1.3.2",
+			//         "provider" : "wx2b03c6e691cd7370" 
+			//     }
+			// },
+			// "usingComponents" : {
+			//     "subscribe" : "plugin-private://wx2b03c6e691cd7370/components/subscribe/subscribe"
+			// },
+			// "navigateToMiniProgramAppIdList" : [ "wxf5a94b5644a98c06" ]
+		},
+		{
+			"root": "pages/subPages/dealer", //分销
+			"name": "dealer",
+			"pages": [{
+					"path": "apply/apply",
+					"style": {
+						"navigationBarTitleText": "分销申请"
+					}
+				},
+				{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "分销中心"
+					}
+				},
+				{
+					"path": "withdraw/withdraw",
+					"style": {
+						"navigationBarTitleText": "提现中心"
+					}
+				},
+				{
+					"path": "setshop/setshop",
+					"style": {
+						"navigationBarTitleText": "推广商品"
+					}
+				},
+				{
+					"path": "client/client",
+					"style": {
+						"navigationBarTitleText": "我的客户"
+					}
+				},
+				{
+					"path": "gener/gener",
+					"style": {
+						"navigationBarTitleText": "推广订单"
+					}
+				},
+				{
+					"path": "level/level",
+					"style": {
+						"navigationBarTitleText": "等级说明"
+					}
+				},
+				{
+					"path": "earnings/earnings",
+					"style": {
+						"navigationBarTitleText": "累计收益"
+					}
+				},
+				{
+					"path": "contactway/contactway",
+					"style": {
+						"navigationBarTitleText": "联系方式"
+					}
+				},
+				{
+					"path": "rank/rank",
+					"style": {
+						"navigationBarTitleText": "排行榜"
+					}
+				},
+				{
+					"path": "withdraw/withdrawrecord",
+					"style": {
+						"navigationBarTitleText": "提现记录"
+					}
+				},
+				{
+					"path": "richtext/setrich",
+					"style": {
+						"navigationBarTitleText": "帮助说明"
+					}
+				},
+				{
+					"path": "myStore/myStore",
+					"style": {
+						"navigationBarTitleText": "我的商家"
+					}
+				},
+				{
+					"path": "myStoreDetails/myStoreDetails",
+					"style": {
+						"navigationBarTitleText": "我的商家"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/forgetPassword",
+			"name": "forgetPassword",
+			"pages": [{
+				"path": "forgetPassword",
+				"style": {
+					"navigationBarTitleText": "修改密码"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/city",
+			"name": "city",
+			"pages": [{
+					"path": "city",
+					"style": {
+						"navigationBarTitleText": "切换城市"
+					}
+				},
+				{
+					"path": "selectAddress",
+					"style": {
+						"navigationBarTitleText": "选择地址"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/afterSale",
+			"name": "afterSale",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "退款/售后"
+					}
+				},
+				{
+					"path": "afterDatli/afterDatli",
+					"style": {
+						"navigationBarTitleText": "退款详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/search",
+			"name": "search",
+			"pages": [{
+				"path": "search",
+				"style": {
+					"navigationBarTitleText": "搜索"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/postRelease",
+			"name": "postRelease",
+			"pages": [{
+				"path": "postRelease",
+				"style": {
+					"navigationBarTitleText": "发布帖子"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/register",
+			"name": "register",
+			"pages": [{
+				"path": "register",
+				"style": {
+					"navigationBarTitleText": "注册"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/paySuccess",
+			"name": "paySuccess",
+			"pages": [{
+				"path": "paySuccess",
+				"style": {
+					"navigationBarTitleText": "支付成功"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/callpge",
+			"name": "callpge",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "调用首页"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/buyOrder",
+			"name": "buyOrder",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "买单"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/commentList",
+			"name": "commentList",
+			"pages": [{
+				"path": "commentList",
+				"style": {
+					"navigationBarTitleText": "商品评论"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/liveBack",
+			"name": "liveBack",
+			"pages": [{
+				"path": "liveBack",
+				"style": {
+					"navigationBarTitleText": "直播回看"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/submitOrder",
+			"name": "submitOrder",
+			"pages": [{
+				"path": "submitOrder",
+				"style": {
+					"navigationBarTitleText": "提交订单"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/redpacket",
+			"name": "redpacket",
+			"pages": [{
+					"path": "myredpacket",
+					"style": {
+						"navigationBarTitleText": "我的红包"
+					}
+				},
+				{
+					"path": "redsquare",
+					"style": {
+						"navigationBarTitleText": "红包广场"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/group",
+			"name": "group",
+			"pages": [{
+				"path": "assemble/assemble",
+				"style": {
+					"navigationBarTitleText": "拼团详情"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/createCommodity",
+			"name": "createCommodity",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "添加商品"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/attestationCenter",
+			"name": "attestationCenter",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "认证中心"
+					}
+				},
+				{
+					"path": "personAttestation/personAttestation",
+					"style": {
+						"navigationBarTitleText": "个人认证"
+					}
+				},
+				{
+					"path": "enterpriseAttestation/enterpriseAttestation",
+					"style": {
+						"navigationBarTitleText": "企业认证"
+					}
+				},
+				{
+					"path": "bond/bond",
+					"style": {
+						"navigationBarTitleText": "诚信保证金"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/bargin",
+			"name": "bargin",
+			"pages": [{
+					"path": "barginDetail/barginDetail",
+					"style": {
+						"navigationBarTitleText": "砍价详情"
+					}
+				},
+				{
+					"path": "barginlist/barginlist",
+					"style": {
+						"navigationBarTitleText": "砍价列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/coupon",
+			"name": "coupon",
+			"pages": [{
+					"path": "coupon",
+					"style": {
+						"navigationBarTitleText": "优惠券"
+					}
+				},
+				{
+					"path": "couponDetails/couponDetails",
+					"style": {
+						"navigationBarTitleText": "卡券详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/customer",
+			"name": "customer",
+			"pages": [{
+				"path": "customer",
+				"style": {
+					"navigationBarTitleText": "客服"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/webview",
+			"name": "webview",
+			"pages": [{
+				"path": "webview",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/IntegralRecord",
+			"name": "IntegralRecord",
+			"pages": [{
+				"path": "IntegralRecord",
+				"style": {
+					"navigationBarTitleText": "积分记录"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/mineCollection",
+			"name": "mineCollection",
+			"pages": [{
+				"path": "mineCollection",
+				"style": {
+					"navigationBarTitleText": "我的收藏"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/orderList",
+			"name": "orderList",
+			"pages": [{
+					"path": "orderList",
+					"style": {
+						"navigationBarTitleText": "订单列表"
+					}
+				},
+				{
+					"path": "orderDetails/orderDetails",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "orderTakeout/orderTakeout",
+					"style": {
+						"navigationBarTitleText": "同城订单详情"
+					}
+				},
+				{
+					"path": "afterSale/afterSale",
+					"style": {
+						"navigationBarTitleText": "售后"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/receivingAddress",
+			"name": "receivingAddress",
+			"pages": [{
+					"path": "receivingAddress",
+					"style": {
+						"navigationBarTitleText": "收货地址"
+					}
+				},
+				{
+					"path": "addReceivingAddress/addReceivingAddress",
+					"style": {
+						"navigationBarTitleText": "收货地址"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/special",
+			"name": "special",
+			"pages": [{
+				"path": "rushspeci/rushspeci",
+				"style": {
+					"navigationBarTitleText": "抢购专题"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/consumptionRecords",
+			"name": "consumptionRecords",
+			"pages": [{
+					"path": "consumptionRecords",
+					"style": {
+						"navigationBarTitleText": "消费记录"
+					}
+				},
+				{
+					"path": "details",
+					"style": {
+						"navigationBarTitleText": "消费详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/integral",
+			"name": "integralShop",
+			"pages": [{
+				"path": "integralShop/integralShop",
+				"style": {
+					"navigationBarTitleText": "积分商城"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/shareMaterials",
+			"name": "shareMaterials",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "推广素材"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/homepage",
+			"name": "homepage",
+			"pages": [{
+					"path": "homepage/homepage",
+					"style": {
+						"navigationStyle": "custom",
+						"navigationBarTitleText": "个人主页"
+					}
+				},
+				{
+					"path": "private/private",
+					"style": {
+						"navigationBarTitleText": "我的私信"
+					}
+				},
+				{
+					"path": "chat/chat",
+					"style": {
+						"navigationBarTitleText": "聊天记录"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/signdesk",
+			"name": "signdesk",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "签到首页"
+					}
+				},
+				{
+					"path": "rank/rank",
+					"style": {
+						"navigationBarTitleText": "签到排行"
+					}
+				},
+				{
+					"path": "record/record",
+					"style": {
+						"navigationBarTitleText": "签到记录"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/balance/",
+			"name": "balance",
+			"pages": [{
+					"path": "balance",
+					"style": {
+						"navigationBarTitleText": "余额充值"
+					}
+				},
+				{
+					"path": "cash/cash",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				},
+				{
+					"path": "balanceRecord/balanceRecord",
+					"style": {
+						"navigationBarTitleText": "余额记录"
+					}
+				},
+				{
+					"path": "newPage/newPage",
+					"style": {
+						"navigationBarTitleText": "selfGood"
+					}
+				},
+				{
+					"path": "presentMoney/presentMoney",
+					"style": {
+						"navigationBarTitleText": "余额转赠"
+					}
+				},
+				{
+					"path": "previous/previous",
+					"style": {
+						"navigationBarTitleText": "往期记录"
+					}
+				},
+				{
+					"path": "activityEntry/activityEntry",
+					"style": {
+						"navigationBarTitleText": "转赠活动"
+					}
+				},
+				{
+					"path": "collectMoney/collectMoney",
+					"style": {
+						"navigationBarTitleText": "转赠收款"
+					}
+				},
+				{
+					"path": "getTheDetails/getTheDetails",
+					"style": {
+						"navigationBarTitleText": "领取记录"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/helpCenter",
+			"name": "helpCenter",
+			"pages": [{
+					"path": "helpCenter",
+					"style": {
+						"navigationBarTitleText": "帮助中心"
+					}
+				},
+				{
+					"path": "helpDetails/helpDetails",
+					"style": {
+						"navigationBarTitleText": "帮助详情"
+					}
+				},
+				{
+					"path": "problemList/problemList",
+					"style": {
+						"navigationBarTitleText": "问题列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/businesscard",
+			"name": "businesscard",
+			"pages": [{
+					"path": "mycard/mycard",
+					"style": {
+						"navigationBarTitleText": "我的名片"
+					}
+				},
+				{
+					"path": "carddetail/carddetail",
+					"style": {
+						"navigationBarTitleText": "名片"
+					}
+				},
+				{
+					"path": "carddetail/renewcarddetail",
+					"style": {
+						"navigationBarTitleText": "名片"
+					}
+				},
+				{
+					"path": "formcard/formcard",
+					"style": {
+						"navigationBarTitleText": "添加名片"
+					}
+				},
+				{
+					"path": "formcard/editformcard",
+					"style": {
+						"navigationBarTitleText": "编辑名片"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/writeRecord",
+			"name": "writeRecord",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "核销记录"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/goods",
+			"name": "index",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "商品详情"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/myPost",
+			"name": "myPost",
+			"pages": [{
+				"path": "myPost",
+				"style": {
+					"navigationStyle": "custom",
+					"navigationBarTitleText": "我的帖子"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/postDetails/",
+			"name": "postDetails",
+			"pages": [{
+				"path": "postDetails",
+				"style": {
+					"navigationBarTitleText": "帖子详情"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages/live",
+			"name": "live",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "直播列表"
+					}
+				},
+				{
+					"path": "newLive",
+					"style": {
+						"navigationBarTitleText": "直播列表",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages/merchant",
+			"name": "merchant",
+			"pages": [{
+					"path": "merchantHome/merchantHome",
+					"style": {
+						// "navigationStyle": "custom",
+						"navigationBarTitleText": "店铺中心",
+						"app-plus": {
+							"titleNView": {
+								"titleText": "店铺中心",
+								"homeButton": true,
+								"autoBackButton": false
+							}
+						}
+					}
+				},
+				{
+					"path": "merchantChangeShop/merchantChangeShop",
+					"style": {
+						"navigationBarTitleText": "切换店铺"
+					}
+				},
+				{
+					"path": "merchantVerification/merchantVerification",
+					"style": {
+						"navigationBarTitleText": "验证"
+					}
+				},
+				{
+					"path": "merchantRecord/merchantRecord",
+					"style": {
+						"navigationBarTitleText": "验证记录"
+					}
+				},
+				{
+					"path": "merchantPayDetails/merchantPayDetails",
+					"style": {
+						"navigationBarTitleText": "交易明细"
+					}
+				},
+				{
+					"path": "merchantComment/merchantComment",
+					"style": {
+						"navigationBarTitleText": "评价列表"
+					}
+				},
+				{
+					"path": "merchantReply/merchantReply",
+					"style": {
+						"navigationBarTitleText": "商家回复"
+					}
+				},
+				{
+					"path": "merchantUerCenter/merchantUerCenter",
+					"style": {
+						"navigationBarTitleText": "个人中心"
+					}
+				},
+				{
+					"path": "merchantMsg/merchantMsg",
+					"style": {
+						"navigationBarTitleText": "消息"
+					}
+				},
+				{
+					"path": "merchantNotice/merchantNotice",
+					"style": {
+						"navigationBarTitleText": "系统通知"
+					}
+				},
+				{
+					"path": "merchantChat/merchantChat",
+					"style": {
+						"navigationBarTitleText": "我的客户"
+					}
+				},
+				{
+					"path": "merchantOrderList/merchantOrderList",
+					"style": {
+						"navigationBarTitleText": "我的店铺"
+					}
+				},
+				{
+					"path": "merchantClerkList/merchantClerkList",
+					"style": {
+						"navigationBarTitleText": "店员列表"
+					}
+				},
+				{
+					"path": "merchantClerkEdit/merchantClerkEdit",
+					"style": {
+						"navigationBarTitleText": "编辑店员"
+					}
+				},
+				{
+					"path": "merchantSuccess/merchantSuccess",
+					"style": {
+						"navigationBarTitleText": "操作成功"
+					}
+				},
+				{
+					"path": "merchantCash/merchantCash",
+					"style": {
+						"navigationBarTitleText": "商户提现"
+					}
+				},
+				{
+					"path": "set/set",
+					"style": {
+						"navigationBarTitleText": "编辑店铺"
+					}
+				},
+				{
+					"path": "merchantOrder/merchantOrder",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					}
+				},
+				{
+					"path": "bindingClerk/bindingClerk",
+					"style": {
+						"navigationBarTitleText": "绑定店员"
+					}
+				},
+				{
+					"path": "dynamicList/dynamicList",
+					"style": {
+						"navigationBarTitleText": "我的动态"
+					}
+				},
+				{
+					"path": "sendDynamic/sendDynamic",
+					"style": {
+						"navigationBarTitleText": "发布动态"
+					}
+				},
+				{
+					"path": "merchantTips/merchantTips",
+					"style": {
+						"navigationBarTitleText": "系统公告"
+					}
+				},
+				{
+					"path": "storePcLogin/storePcLogin",
+					"style": {
+						"navigationBarTitleText": "商户登录"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/businessCenter",
+			"name": "businessCenter",
+			"pages": [{
+					"path": "businessCenter",
+					"style": {
+						"navigationBarTitleText": "商铺列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "foodIntroduced/foodIntroduced",
+					"style": {
+						"navigationBarTitleText": "商品详情"
+					}
+				},
+				{
+					"path": "foodShopping/foodShopping",
+					"style": {
+						"navigationBarTitleText": "购物车"
+					}
+				},
+				{
+					"path": "foodOrder/foodOrder",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "foodList/foodList",
+					"style": {
+						"navigationBarTitleText": "商品列表"
+					}
+				},
+				{
+					"path": "redReceive/redReceive",
+					"style": {
+						"navigationBarTitleText": "使用红包"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/drawGame",
+			"name": "drawGame",
+			"pages": [{
+					"path": "drawGame",
+					"style": {
+						"navigationBarTitleText": "抽奖页面"
+					}
+				},
+				{
+					"path": "myPrize",
+					"style": {
+						"navigationBarTitleText": "我的奖品"
+					}
+				},
+				{
+					"path": "gameIntegral",
+					"style": {
+						"navigationBarTitleText": "获取积分"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/redClothes",
+			"name": "redClothes",
+			"pages": [{
+				"path": "redClothes",
+				"style": {
+					"navigationBarTitleText": "红包转赠"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/coursegoods",
+			"name": "coursegoods",
+			"pages": [{
+					"path": "coursegoods",
+					"style": {
+						"navigationBarTitleText": "课程报名"
+					}
+				},
+				{
+					"path": "establishDoods/establishDoods",
+					"style": {
+						"navigationBarTitleText": "新增活动"
+					}
+				},
+				{
+					"path": "localindex/localindex",
+					"style": {
+						"navigationBarTitleText": "商品分类"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/storeClass",
+			"name": "storeClass",
+			"pages": [{
+				"path": "storeClass",
+				"style": {
+					"navigationBarTitleText": "商家分类"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/homemaking",
+			"name": "homemaking",
+			"pages": [{
+					"path": "homemakingDetails/homemakingDetails",
+					"style": {
+						"navigationBarTitleText": "服务详情"
+					}
+				},
+				{
+					"path": "homemakingMerchant/homemakingMerchant",
+					"style": {
+						"navigationBarTitleText": "服务商家"
+					}
+				},
+				{
+					"path": "myDemand/myDemand",
+					"style": {
+						"navigationBarTitleText": "我的需求"
+					}
+				},
+				{
+					"path": "myServiceList/myServiceList",
+					"style": {
+						"navigationBarTitleText": "我的服务"
+					}
+				},
+				{
+					"path": "customerDemand/customerDemand",
+					"style": {
+						"navigationBarTitleText": "客户需求"
+					}
+				},
+				{
+					"path": "myorderForm/myorderForm",
+					"style": {
+						"navigationBarTitleText": "我的订单"
+					}
+				},
+				{
+					"path": "homeUser/homeUser",
+					"style": {
+						"navigationBarTitleText": "个人中心"
+					}
+				},
+				{
+					"path": "postDemand/postDemand",
+					"style": {
+						"navigationBarTitleText": "发布需求"
+					}
+				},
+				{
+					"path": "serviceIn/serviceIn",
+					"style": {
+						"navigationBarTitleText": "服务入驻"
+					}
+				},
+				{
+					"path": "pubService/pubService",
+					"style": {
+						"navigationBarTitleText": "发布服务"
+					}
+				},
+				{
+					"path": "homepersonalCenter/homepersonalCenter",
+					"style": {
+						"navigationBarTitleText": "个人主页"
+					}
+				},
+				{
+					"path": "homemaSearch/homemaSearch",
+					"style": {
+						"navigationBarTitleText": "服务搜索"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/hitchRide",
+			"name": "hitchRide",
+			"pages": [{
+					"path": "index/index",
+					"style": {
+						"navigationBarTitleText": "顺风车"
+					}
+				},
+				{
+					"path": "hitchRideDetails/hitchRideDetails",
+					"style": {
+						"navigationBarTitleText": "顺风车详情"
+					}
+				},
+				{
+					"path": "hitchList/hitchList",
+					"style": {
+						"navigationBarTitleText": "顺风车列表"
+					}
+				},
+				{
+					"path": "personalCenter/personalCenter",
+					"style": {
+						"navigationBarTitleText": "个人中心"
+					}
+				},
+				{
+					"path": "hitchSchedule/hitchSchedule",
+					"style": {
+						"navigationBarTitleText": "行程发布"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/phoneBook",
+			"name": "phoneBook",
+			"pages": [{
+					"path": "phoneBook",
+					"style": {
+						"navigationBarTitleText": "电话本"
+					}
+				},
+				{
+					"path": "phoneClass/phoneClass",
+					"style": {
+						"navigationBarTitleText": "分类"
+					}
+				},
+				{
+					"path": "logistics/logistics",
+					"style": {
+						"navigationBarTitleText": "商户详情"
+					}
+				},
+				{
+					"path": "enterForm/enterForm",
+					"style": {
+						"navigationBarTitleText": "商户入驻"
+					}
+				},
+				{
+					"path": "myGoods/myGoods",
+					"style": {
+						"navigationBarTitleText": "商户管理"
+					}
+				},
+				{
+					"path": "yellowGoods/yellowGoods",
+					"style": {
+						"navigationBarTitleText": "收藏夹"
+					}
+				},
+				{
+					"path": "goodsClass/goodsClass",
+					"style": {
+						"navigationBarTitleText": "商户筛选"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/management",
+			"name": "management",
+			"pages": [{
+					"path": "management",
+					"style": {
+						"navigationBarTitleText": "商铺列表"
+					}
+				},
+				{
+					"path": "foodclassify/foodclassify",
+					"style": {
+						"navigationBarTitleText": "分类列表"
+					}
+				},
+				{
+					"path": "addGoods/addGoods",
+					"style": {
+						"navigationBarTitleText": "添加商品"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/booked",
+			"name": "booked",
+			"pages": [{
+					"path": "bookedInformation/bookedInformation",
+					"style": {
+						"navigationBarTitleText": "预约信息"
+					}
+				},
+				{
+					"path": "bookedTime/bookedTime",
+					"style": {
+						"navigationBarTitleText": "预约时间"
+					}
+				},
+				{
+					"path": "reservationList/reservationList",
+					"style": {
+						"navigationBarTitleText": "预约列表"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/lottery",
+			"name": "lottery",
+			"pages": [{
+					"path": "lotteryIndex/lotteryIndex",
+					"style": {
+						"navigationBarTitleText": "抽奖详情"
+					}
+				},
+				{
+					"path": "lotteryList/lotteryList",
+					"style": {
+						"navigationBarTitleText": "购物抽奖"
+					}
+				},
+				{
+					"path": "lotteryCode/lotteryCode",
+					"style": {
+						"navigationBarTitleText": "抽奖码"
+					}
+				},
+				{
+					"path": "previous/previous",
+					"style": {
+						"navigationBarTitleText": "往期活动"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/subscription",
+			"name": "subscription",
+			"pages": [{
+				"path": "subscription",
+				"style": {
+					"navigationBarTitleText": "订阅信息"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/voucherCenter",
+			"name": "voucherCenter",
+			"pages": [{
+					"path": "voucherCenter",
+					"style": {
+						"navigationBarTitleText": "话费充值"
+					}
+				},
+				{
+					"path": "phoneOrders",
+					"style": {
+						"navigationBarTitleText": "话费订单"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/userInfo",
+			"name": "userInfo",
+			"pages": [{
+				"path": "userInfo",
+				"style": {
+					"navigationBarTitleText": "个人资料"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/orderLink",
+			"name": "orderLink",
+			"pages": [{
+				"path": "orderLink",
+				"style": {
+					"navigationBarTitleText": "订单信息"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/newBuyOrder",
+			"name": "newBuyOrder",
+			"pages": [{
+					"path": "newBuyOrder",
+					"style": {
+						"navigationBarTitleText": "在线买单详情"
+					}
+				},
+				{
+					"path": "buyOrder",
+					"style": {
+						"navigationBarTitleText": "在线买单"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/cleanCustom",
+			"name": "cleanCustom",
+			"pages": [{
+					"path": "cleanCustom",
+					"style": {
+						"navigationBarTitleText": "积分转赠"
+					}
+				},
+				{
+					"path": "bindingPhone",
+					"style": {
+						"navigationBarTitleText": "手机绑定"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesA/instantMessenger",
+			"name": "instantMessenger",
+			"pages": [{
+				"path": "instantMessenger",
+				"style": {
+					"navigationBarTitleText": "在线聊天",
+					"enablePullDownRefresh": true
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/map",
+			"name": "map",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "地图",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "address-search",
+					"style": {
+						"navigationBarTitleText": "位置搜索",
+						"enablePullDownRefresh": true
+					}
+				}
+
+			]
+		},
+		{
+			"root": "pages/subPages2/hirePlatform",
+			"name": "hirePlatform",
+			"pages": [{
+					"path": "companyDetails/companyDetails",
+					"style": {
+						"navigationBarTitleText": "企业详情"
+					}
+				},
+				{
+					"path": "resume/resume",
+					"style": {
+						"navigationBarTitleText": "简历详情"
+					}
+				},
+				{
+					"path": "recruitmentList/recruitmentList",
+					"style": {
+						"navigationBarTitleText": "招聘列表"
+					}
+				},
+				{
+					"path": "recruitmentEnter/recruitmentEnter",
+					"style": {
+						"navigationBarTitleText": "我的招聘"
+					}
+				},
+				{
+					"path": "curriculumVitae/curriculumVitae",
+					"style": {
+						"navigationBarTitleText": "简历"
+					}
+				},
+				{
+					"path": "hiringResume/hiringResume",
+					"style": {
+						"navigationBarTitleText": "招聘简历列表"
+					}
+				},
+				{
+					"path": "recruitmentDetails/recruitmentDetails",
+					"style": {
+						"navigationBarTitleText": "招聘详情"
+					}
+				},
+				{
+					"path": "companiesList/companiesList",
+					"style": {
+						"navigationBarTitleText": "企业列表"
+					}
+				},
+				{
+					"path": "addResume/addResume",
+					"style": {
+						"navigationBarTitleText": "简历编辑"
+					}
+				},
+				{
+					"path": "postRecruitment/postRecruitment",
+					"style": {
+						"navigationBarTitleText": "发布招聘"
+					}
+				},
+				{
+					"path": "deliverList/deliverList",
+					"style": {
+						"navigationBarTitleText": "求职列表"
+					}
+				},
+				{
+					"path": "serchWork/serchWork",
+					"style": {
+						"navigationBarTitleText": "职位搜索"
+					}
+				},
+				{
+					"path": "workClassList/workClassList",
+					"style": {
+						"navigationBarTitleText": "招聘分类"
+					}
+				}
+			]
+		},
+		{
+			"root": "pages/subPages2/panorama",
+			"name": "panorama",
+			"pages": [{
+				"path": "panorama",
+				"style": {
+					"navigationBarTitleText": "VR全景"
+				}
+			}]
+		},
+		{
+			"root": "pages/subPages2/blindDate",
+			"name": "blindDate",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "首页"
+					}
+				},
+				{
+					"path": "personal",
+					"style": {
+						"navigationBarTitleText": "个人中心"
+					}
+				},
+				{
+					"path": "record",
+					"style": {
+						"navigationBarTitleText": "记录"
+					}
+				},
+				{
+					"path": "recommend",
+					"style": {
+						"navigationBarTitleText": "推荐"
+					}
+				},
+				{
+					"path": "extension",
+					"style": {
+						"navigationBarTitleText": "推广中心"
+					}
+				},
+				{
+					"path": "withdraw",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				},
+				{
+					"path": "matchmakerService",
+					"style": {
+						"navigationBarTitleText": "红娘服务"
+					}
+				},
+				{
+					"path": "member/all",
+					"style": {
+						"navigationBarTitleText": "全部会员"
+					}
+				},
+				{
+					"path": "member/open",
+					"style": {
+						"navigationBarTitleText": "开通会员"
+					}
+				},
+				{
+					"path": "member/detail",
+					"style": {
+						"navigationBarTitleText": "会员详情"
+					}
+				},
+				{
+					"path": "member/recommend",
+					"style": {
+						"navigationBarTitleText": "推荐会员"
+					}
+				},
+				{
+					"path": "dynamics/index",
+					"style": {
+						"navigationBarTitleText": "动态"
+					}
+				},
+				{
+					"path": "dynamics/detail",
+					"style": {
+						"navigationBarTitleText": "动态详情"
+					}
+				},
+				{
+					"path": "dynamics/myself",
+					"style": {
+						"navigationBarTitleText": "我的动态"
+					}
+				},
+				{
+					"path": "dynamics/edit",
+					"style": {
+						"navigationBarTitleText": "编辑动态"
+					}
+				},
+				{
+					"path": "form/matchmakerApply",
+					"style": {
+						"navigationBarTitleText": "红娘申请"
+					}
+				},
+				{
+					"path": "form/userInfo",
+					"style": {
+						"navigationBarTitleText": "个人信息"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesA/pictureTextDetails",
+			"name": "pictureTextDetails",
+			"pages": [{
+				"path": "pictureTextDetails",
+				"style": {
+					"navigationBarTitleText": "正文详情"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/articleDetails",
+			"name": "articleDetails",
+			"pages": [{
+				"path": "articleDetails",
+				"style": {
+					"navigationBarTitleText": "文章详情"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/informationHot",
+			"name": "informationHot",
+			"pages": [{
+				"path": "informationHot",
+				"style": {
+					"navigationBarTitleText": "资讯热榜",
+					"enablePullDownRefresh": false
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/topSearch",
+			"name": "topSearch",
+			"pages": [{
+				"path": "topSearch",
+				"style": {
+					"navigationStyle": "custom",
+					// "navigationBarTitleText": "热搜",
+					"enablePullDownRefresh": false
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/commentSubject",
+			"name": "commentSubject",
+			"pages": [{
+				"path": "commentSubject",
+				"style": {
+					"navigationBarTitleText": "热议内容"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/campusActivities",
+			"name": "campusActivities",
+			"pages": [{
+					"path": "index",
+					"style": {
+						"navigationBarTitleText": "校园活动"
+					}
+
+				},
+				{
+					"path": "campusActivities",
+					"style": {
+						"navigationBarTitleText": "校园活动"
+					}
+
+				},
+				{
+					"path": "myActivities",
+					"style": {
+						"navigationBarTitleText": "我的校园活动"
+					}
+
+				}
+			]
+		},
+		{
+			"root": "pagesA/studentIdentification",
+			"name": "studentIdentification",
+			"pages": [{
+				"path": "studentIdentification",
+				"style": {
+					"navigationBarTitleText": "学生认证"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/follow_fans",
+			"name": "follow_fans",
+			"pages": [{
+				"path": "follow",
+				"style": {
+					"navigationBarTitleText": "我的关注"
+				}
+
+			},{
+				"path": "fans",
+				"style": {
+					"navigationBarTitleText": "我的粉丝"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/rule_center",
+			"name": "rule_center",
+			"pages": [{
+				"path": "rule_center",
+				"style": {
+					"navigationBarTitleText": "规则中心"
+				}
+
+			}]
+		},
+		{
+			"root": "pagesA/identityList",
+			"name": "identityList",
+			"pages": [{
+				"path": "identityList",
+				"style": {
+					"navigationBarTitleText": "认证中心"
+				}
+			},{
+				"path": "teacherCertification",
+				"style": {
+					"navigationBarTitleText": "教师认证"
+				}
+			},{
+				"path": "bloggerCertification",
+				"style": {
+					"navigationBarTitleText": "博主认证"
+				}
+			}]
+		},
+		{
+			"root": "pagesA/businessCooperation",
+			"name": "businessCooperation",
+			"pages": [{
+				"path": "index",
+				"style": {
+					"navigationBarTitleText": "商务合作"
+				}
+			}]
+		}
+		// ,
+		// {
+		// 	"root": "pages/subPages2/practice",
+		// 	"name": "practice",
+		// 	"pages": [{
+		// 			"path": "practice",
+		// 			"style": {
+		// 				"navigationBarTitleText": "实习实践"
+		// 			}
+
+		// 		},
+		// 		{
+		// 			"path": "partTimeJob",
+		// 			"style": {
+		// 				"navigationBarTitleText": "学校兼职"
+		// 			}
+
+		// 		}
+		// 	]
+		// }
+	],
+	"globalStyle": {
+		"navigationStyle" : "default",
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "uni-app",
+		"navigationBarBackgroundColor": "#F8F8F8",
+		"backgroundColor": "#F7F7F7"
+	},
+	"app-plus": {
+		"softinputNavBar": "none"
+	},
+	"condition": {
+		"current": 0,
+		"list": [{
+				"name": "分销申请",
+				"path": "pages/subPages/dealer/apply/apply",
+				"query": ""
+			},
+			{
+				"name": "分销申请1",
+				"path": "pages/mainPages/pocketIInformant/pocketIInformant",
+				"query": "i=26"
+			},
+			{
+				"name": "抢购专题",
+				"path": "pages/subPages/special/rushspeci/rushspeci",
+				"query": "i=26"
+			},
+			{
+				"name": "我的卡片",
+				"path": "pages/subPages/businesscard/formcard/formcard",
+				"query": "i=26"
+			},
+			{
+				"name": "名片",
+				"path": "pages/subPages/businesscard/mycard/mycard",
+				"query": ""
+			},
+			{
+				"name": "海报",
+				"path": "pages/mainPages/poster/poster",
+				"query": "id=190&type=3"
+			},
+			{
+				"name": "掌上信息",
+				"path": "pages/mainPages/pocketIInformant/pocketIInformant",
+				"query": "i=26"
+			},
+			{
+				"name": "我的红包",
+				"path": "pages/subPages/redpacket/myredpacket",
+				"query": "i=26"
+			},
+			{
+				"name": "红包广场",
+				"path": "pages/subPages/redpacket/redsquare",
+				"query": "i=26"
+			},
+			{
+				"name": "直播",
+				"path": "pages/subPages/live/index",
+				"query": "i=26"
+			},
+			{
+				"name": "商户列表",
+				"path": "pages/mainPages/store/list",
+				"query": "i=26"
+			}
+		]
+	}
+}
diff --git a/pages/mainPages/Settled/Settled.vue b/pages/mainPages/Settled/Settled.vue
new file mode 100644
index 0000000..5fb60cd
--- /dev/null
+++ b/pages/mainPages/Settled/Settled.vue
@@ -0,0 +1,2520 @@
+<template>
+	<!-- 商铺入驻 -->
+	<view id="app">
+		<loadlogo v-if="!isWxaudit" />
+		<block v-else>
+			<far-bottom></far-bottom>
+			<scroll-view v-if="userInfo.havestore == 1 && page == 1" :scroll-x="false" scroll-y :style="{ height: phoneHeight }"
+			 class="scoll_view">
+				<view class="icon_view"><text class="iconfont icon-check"></text></view>
+				<view class="tips_view"><text class="tips_text">恭喜您,入驻成功</text></view>
+				<view class="tips_view1"><text class="tips_text1">您可以在手机端管理您的企业</text></view>
+				<view class="button_package">
+					<view class="bittons color49BA64 textWhite" @click="goStoreList"><text>管理企业</text></view>
+					<view class="bittons colorWhite" @click="userInfo.havestore = 0"><text>企业入驻</text></view>
+				</view>
+				<view class="page-footer">
+					<TabBars :tabBarAct="0" />
+				</view>
+			</scroll-view>
+			<view class="demo" v-else>
+				<view class="pagesOne" v-if="page == 1">
+					<view class="backImages" :style="{ 'background-image': 'url(' + (userInfo.top_img) + ')' }">
+						<view class="main">
+							<view  style="height: 255upx;" @click="navigation">
+								
+							</view>
+							<view class="mainPackage">
+								<!-- 用户信息区域 -->
+								<view class="userInfo">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span>{{languageStatus!=1?'请填写企业信息':'점포 정보 입력하세요'}}</span>
+											</view>
+											<view class="firstTitleTips" @click="kfPhone">
+												<span>{{languageStatus!=1?'直接联系客服':'고객센터를 직접 연락하세요'}}</span>
+												<image :src="imgfixUrls + 'merchant/right.svg'" />
+											</view>
+										</view>
+										<view class="userInfoInput">
+											<view class="userInfoInputPackage">
+												<view class="userInfoInputMain">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'企业名称':'점포 명칭'}}</span>
+													<input :placeholder="languageStatus!=1?'请输入企业名称':'점포 명칭을 입력하세요'" v-model="userInfo.storename" />
+												</view>
+												<view class="userInfoInputMain">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'姓名':'이름'}}</span>
+													<input :placeholder="languageStatus!=1?'请输入姓名':'이름을 입력하세요'" v-model="userInfo.name" />
+												</view>
+												<view class="userInfoInputMain">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'职务':'이름'}}</span>
+													<input :placeholder="languageStatus!=1?'请输入职务名称':'이름을 입력하세요'" v-model="userInfo.name" />
+												</view>
+												<view class="userInfoInputMain">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'电话':'전화번호'}}</span>
+													<input :placeholder="languageStatus!=1?'请输入联系电话':'전화번호를 입력하세요'" v-model="userInfo.mobile" type="text" />
+												</view>
+												<view class="userInfoInputMain">
+													<span>{{languageStatus!=1?'所在地区':'현재주소'}}</span>
+													<view class="timePickerView">
+														
+													
+													<w-pickerb :visible.sync="visiblec" mode="region" :value="[provinceidName,areaidName,distidName]"
+													 default-type="label" :hide-area="false" @confirm="onConfirm($event,'region')" @cancel="onCancel" ref="region"></w-pickerb>
+													<view class="uni-input" @tap="visble">{{ provinceidName }} {{ areaidName }} {{ distidName }}</view>
+												
+														
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain dire">
+													<span style="color:red;width:6rpx;">*</span>
+													<span>{{languageStatus!=1?'详细地址':'상세주소'}}</span>
+													<input @click="getDisabled" style="width: 280upx;" :disabled="addressDisabled" :placeholder="languageStatus!=1?'请输入详细地址':'상세주소를 입력하세요'" v-model="userInfo.address" />
+													<view @click="getLocation">
+														<image :src="imgfixUrls + 'merchant/where.svg'" />
+														<span>{{languageStatus!=1?'定位':'위치설정'}}</span>
+													</view>
+												</view>
+												<view class="userInfoInputMain">
+													<span style="color:red;width:6rpx;">*</span>
+													<span>{{languageStatus!=1?'行业分类':'항업분류'}}</span>
+													<view class="timePickerView" @click="showThePic">
+														<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+														 range-key="name" :value="typeIndex"> -->
+
+														<view v-if="hangYe" class="uni-input twoLevelList">{{languageStatus!=1?'请选择行业分类':'항업분류를 선택하세요'}}</view>
+														<view v-else class="uni-input twoLevelList">{{ twoLevelList }}</view>
+														<!-- 			</picker> -->
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain">
+													<span>{{languageStatus!=1?'上班时间':'영업시간'}}</span>
+													<view class="timePickerView">
+														
+														
+														<w-pickerb :visible.sync="visibletimeone" mode="time" :value="storehours[0].startTime + ':00'" :current="false"
+														 :second="false" @confirm="bindTimeChangeStar($event)" @cancel="onCancel" ref="time"></w-pickerb>
+														<!-- <w-picker
+															mode="time"
+															value="00:00:00"
+															:current="false"
+															:second="false"
+															@confirm="bindTimeChangeStar($event)"
+															@cancel="onCancel"
+															ref="time"
+														></w-picker> -->
+														<span @tap="showPicker('time')">{{ storehours[0].startTime }}</span>
+														<span>-</span>
+														->
+														<span @tap="showPicker('timeend')">{{ storehours[0].endTime }}</span>
+														<!-- <w-pickera
+															mode="time"
+															value="00:00:00"
+															:current="false"
+															:second="false"
+															@confirm="bindTimeChangeEnd($event)"
+															@cancel="onCancelEnd"
+															ref="timeend"
+														></w-pickera> -->
+														<w-pickerb :visible.sync="visibletimeend" mode="time" :value="storehours[0].endTime + ':00'" :current="false"
+														 :second="false" @confirm="bindTimeChangeEnd($event)" @cancel="onCancelEnd" ref="timeend"></w-pickerb>
+														<!-- 	<hTimePicker sTime="0" cTime="23" interval="1" @changeTime="changeTime">
+														  <view slot="pCon" class="changeTime">
+														    点击选择时间
+														  </view>
+														</hTimePicker>
+														<hTimePicker sTime="0" cTime="23" interval="1" @changeTime="changeTime">
+														  <view slot="pCon" class="changeTime">
+														    点击选择时间
+														  </view>
+														</hTimePicker> -->
+
+														
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												
+												<view class="userInfoInputMain" v-if="0">
+													<span>分段营业</span>
+													<view class="timePickerView">
+														<picker @change="multistageChange" class="dataPicker" :value="multistageIndex" range-key="title" :range="multistageList">
+														    <view class="uni-input">{{multistageList[multistageIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="multistageIndex == 1 && 0">
+													<span>分段时间</span>
+													<view class="timePickerView">
+														<w-pickerb :visible.sync="visibletimeoneT" mode="time" :value="storehours[1].startTime + ':00'" :current="false"
+														 :second="false" @confirm="bindTimeChangeStarT($event)" @cancel="onCancel" ref="timeT"></w-pickerb>
+														<span @tap="showPicker('timeT')">{{ storehours[1].startTime }}</span>
+														<span>-</span>->
+														<span @tap="showPicker('timeendT')">{{ storehours[1].endTime }}</span>
+														<w-pickerb :visible.sync="visibletimeendT" mode="time" :value="storehours[1].endTime + ':00'" :current="false"
+														 :second="false" @confirm="bindTimeChangeEndT($event)" @cancel="onCancelEnd" ref="timeendT"></w-pickerb>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<!-- 用户信息区域 -->
+								<!-- 营业执照 -->
+								<view class="userImg">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span style="color:red;width:6rpx;">*</span>
+												<span>企业营业执照</span>
+											</view>
+											<view class="firstTitleTips"></view>
+										</view>
+										<view class="twiceTitle1">
+											<view>
+												<!-- 图片预览循环模板 -->
+												<view class="imgPreview" v-if="userInfo.business_license !== ''">
+													<image :src="userInfo.business_license" />
+													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(7)" />
+												</view>
+												<!-- 图片预览循环模板 -->
+												<view class="userImgUpdata" @click="uploadFiles(7, 1)" v-if="userInfo.business_license == ''">
+													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<!-- 营业执照 -->
+								
+								<!-- 企业信息区域 -->
+								<view class="userInfo" style="margin-top: 30upx;" v-if="userInfo.is_recruit == 1">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span>{{languageStatus!=1?'请填写企业信息':'기업정보를 입력하세요'}}</span>
+											</view>
+											<view class="firstTitleTips" >
+												
+											</view>
+										</view>
+										<view class="userInfoInput" >
+											<view class="userInfoInputPackage">
+												<view class="userInfoInputMain">
+													<span>招聘状态</span>
+													<view class="timePickerView">
+														<picker @change="switchChange" class="dataPicker" :value="switchIndex" range-key="title" :range="switchList">
+														    <view class="uni-input">{{switchList[switchIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span>企业性质</span>
+													<view class="timePickerView">
+														<picker @change="natureChange" class="dataPicker" :value="natureIndex" range-key="title" :range="userInfo.nature">
+														    <view class="uni-input">{{userInfo.nature[natureIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span>企业规模</span>
+													<view class="timePickerView">
+														<picker @change="scaleChange" class="dataPicker" :value="scaleIndex" range-key="title" :range="userInfo.scale">
+														    <view class="uni-input">{{userInfo.scale[scaleIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span>所属行业</span>
+													<view class="timePickerView">
+														<picker @change="industryChange" class="dataPicker" :value="industryIndex" range-key="title" :range="userInfo.industry">
+														    <view class="uni-input">{{userInfo.industry[industryIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="switchIndex == 1">
+													<span style="color:red;width:10rpx;">*</span>
+													<span>{{languageStatus!=1?'企业亮点':''}}</span>
+													<input :placeholder="languageStatus!=1?'请输入企业亮点':''" v-model="userInfo.recruit_brighten" />
+												</view>
+												<view class="twiceTitle" v-if="switchIndex == 1">
+													<span>企业幻灯片(750X560)</span>
+													<view>
+														<!-- 图片预览循环模板 -->
+														<view class="imgPreview" v-for="(item, index) in type4Url">
+															<image :src="item" />
+															<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(4, item)" />
+														</view>
+														<!-- 图片预览循环模板 -->
+														<view class="userImgUpdata" @click="uploadFiles(4, 6)">
+															<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+														</view>
+													</view>
+												</view>
+												<view class="twiceTitle" v-if="switchIndex == 1">
+													<span>企业长图</span>
+													<view>
+														<!-- 图片预览循环模板 -->
+														<view class="imgPreview" v-for="(item,index) in userInfo.recruit_long_img" :key="index">
+															<image :src="item" />
+															<image :src="imgfixUrls + 'merchant/close.png'" class="close"
+															 @click="closePreview(6, item)" />
+														</view>
+														<!-- 图片预览循环模板 -->
+														<view class="userImgUpdata" @click="uploadFiles(6, 6)">
+															<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+														</view>
+													</view>
+												</view>
+											</view>
+										</view>
+										
+									</view>
+								</view>
+								<!-- 企业信息区域 -->
+								
+								<!-- 家政信息区域 -->
+								<view class="userInfo" style="margin-top: 30upx;" v-if="userInfo.is_housekeep == 1 && 1===0">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span>请填写家政信息</span>
+											</view>
+											<view class="firstTitleTips" >
+												
+											</view>
+										</view>
+										<view class="userInfoInput" >
+											<view class="userInfoInputPackage">
+												<view class="userInfoInputMain">
+													<span>家政状态</span>
+													<view class="timePickerView">
+														<picker @change="homemaChange" class="dataPicker" :value="homemaIndex" range-key="title" :range="homemaking">
+														    <view class="uni-input">{{homemaking[homemaIndex].title}}
+															</view>
+														</picker>
+														<span></span>
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+												<view class="userInfoInputMain" v-if="homemaIndex == 1">
+													<span>家政类目</span>
+													<view class="timePickerView" @click="showoccupation = true" :style="{height: userInfo.store_housekeep_cate.length < 2?'82rpx':'auto'}">
+														<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+														 range-key="name" :value="typeIndex"> -->
+
+														<view v-if="userInfo.store_housekeep_cate.length == 0" class="uni-input homema">请选择家政类目</view>
+														<view v-else class="uni-input homema" style="margin-top: 20upx;">
+															<view class="check-item" v-for="(item, index) in userInfo.store_housekeep_cate" :key="index">
+																{{ item.title }}
+																<image :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode="" @click.stop="deletcheck(item.id)"></image>
+															</view>
+														</view>
+														<!-- 			</picker> -->
+														<!-- <span></span> -->
+													</view>
+													<image :src="imgfixUrls + 'merchant/right.svg'" />
+												</view>
+											</view>
+										</view>
+										
+									</view>
+								</view>
+								<!-- 家政信息区域 -->
+								
+								<!-- 店铺图片区域 -->
+								<view class="userImg">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span>企业图片</span>
+											</view>
+											<view class="firstTitleTips"></view>
+										</view>
+										<view class="twiceTitle1">
+											<span>企业LOGO(200X200)</span>
+											<view>
+												<!-- 图片预览循环模板 -->
+												<view class="imgPreview" v-if="type1Url !== ''">
+													<image :src="type1Url" />
+													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo" />
+												</view>
+												<!-- 图片预览循环模板 -->
+												<view class="userImgUpdata" @click="uploadFiles(1, 1)" v-if="type1Url == ''">
+													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+												</view>
+											</view>
+										</view>
+										<view class="twiceTitle">
+											<span>企业幻灯片(750X560)</span>
+											<view>
+												<!-- 图片预览循环模板 -->
+												<view class="imgPreview" v-for="(item, index) in type2Url">
+													<image :src="item" />
+													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(2, item)" />
+												</view>
+												<!-- 图片预览循环模板 -->
+												<view class="userImgUpdata" @click="uploadFiles(2, 6)">
+													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+												</view>
+											</view>
+										</view>
+										<view class="twiceTitle">
+											<span>企业相册(320X320)</span>
+											<view>
+												<!-- 图片预览循环模板 -->
+												<view class="imgPreview" v-for="(item, index) in type3Url">
+													<image :src="item" />
+													<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(3, item)" />
+												</view>
+												<!-- 图片预览循环模板 -->
+												<view class="userImgUpdata" @click="uploadFiles(3, 6)">
+													<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+												</view>
+											</view>
+										</view>
+										<!-- <view class="twiceTitle">
+								<span>店铺资质(320X320)</span>
+								<view>
+									
+									<view class="imgPreview" v-for="(item, index) in type4Url">
+										<image :src="item" />
+										<image :src="imgfixUrls + 'merchant/close.png" class="close" @click="closePreview(4, item)" />
+									</view>
+									
+									<view class="userImgUpdata" @click="uploadFiles(4)"><image :src="imgfixUrls + 'merchant/addImg.svg" /></view>
+								</view>
+							</view> -->
+									</view>
+								</view>
+								<!-- 店铺图片区域 -->
+
+								<!-- 店铺图片区域 -->
+								<view class="userIntroduce">
+									<view class="userInfoPackage">
+										<view class="firstTitle">
+											<view class="firstTitleName">
+												<view class="line"></view>
+												<span style="color:red;width:10rpx;">*</span>
+												<span>企业介绍</span>
+											</view>
+											<view class="firstTitleTips"></view>
+										</view>
+										<view class="userIntroduceInput">
+											<view class="userIntroduceInputPackage"><textarea placeholder="请输入企业介绍文本" v-model="userInfo.introduction"></textarea></view>
+										</view>
+										<view class="userIntroduceUpdata">
+											<!-- 图片预览循环模板 -->
+											<view class="imgPreview" v-for="(item, index) in type5Url">
+												<image :src="item" />
+												<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(5, item)" />
+											</view>
+											<!-- 图片预览循环模板 -->
+											<view class="userImgUpdata" @click="uploadFiles(5, 6)">
+												<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+											</view>
+										</view>
+									</view>
+								</view>
+								<!-- 店铺图片区域 -->
+
+								<view class="agreement1">
+									<label class="radio">
+										<image :src="imgfixUrls + 'merchant/checked.svg'" @click="storeChecked = false" v-if="storeChecked" />
+										<view  v-else @click="storeChecked = true" style="height: 20upx;width: 20upx;border: 1px solid #FF4444;border-radius: 50%;display: inline-block;margin-bottom: -12upx;">
+
+										</view>
+										<!-- 	<view  style="display: inline-block;"> -->
+										<span>
+											<text @click="storeChecked = !storeChecked">阅读并同意</text>
+											<span @click="toLoginAgreement('store')">《企业入驻相关条款》</span>
+										</span>
+										<!-- </view> -->
+									</label>
+								</view>
+
+								<!-- 表单提交按钮 -->
+								<view class="submitButtom" @click="saveUserInfo" v-if="userInfo.chargestatus == 0"><span>{{languageStatus!=1?'提交申请':'올리기'}}</span></view>
+								<view class="submitButtom" @click="saveUserInfo" v-else><span>{{languageStatus!=1?'下一步':'올리기'}}</span></view>
+								<!-- 表单提交按钮 -->
+
+								<!-- 填充 -->
+								<view class="full"></view>
+								<!-- 填充 -->
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 第二页 -->
+				<scroll-view class="pageTwo" v-if="page == 2" :scroll-y="true" :style="{ height: phoneHeight }">
+					<view class="mainTwo">
+						<view class="userImg">
+							<view class="userInfoPackage">
+								<view class="twoPageTitle">
+									<view class="twoPageTitleLeft">
+										<view class="line"></view>
+										<span>付费入驻</span>
+									</view>
+									<view class="twoPageTitleRight" @click="toLoginAgreement('ff')"><span>付费说明</span></view>
+								</view>
+								<view class="checkType">
+									<radio-group class="checkBox" @change="radioChange">
+										<label class="radio" v-for="(item, index) in chargeList" :key="item.id">
+											<radio :value="item.id" color="#FF4444" :checked="index === current" />
+											<span>{{ item.name }}({{ item.days }}天/{{ item.price }})</span>
+										</label>
+									</radio-group>
+								</view>
+							</view>
+						</view>
+						<view class="agreement" @click="toLoginAgreement('store')">
+							<label class="radio">
+								<image :src="imgfixUrls + 'merchant/checked.svg'" />
+								<span>
+									阅读并同意
+									<span>《企业入驻相关条款》</span>
+								</span>
+							</label>
+						</view>
+						<!-- 提交按钮 -->
+						<view class="submitButtom" @click="createChargeOrder"><span>提交申请</span></view>
+						<!-- 提交按钮 -->
+					</view>
+
+					<!-- 填充 -->
+					<view class="full"></view>
+					<!-- 填充 -->
+				</scroll-view>
+				<!-- 第二页 -->
+				
+				<PopManager :show="showoccupation" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="showoccupation = false">
+					<view class="cicupation">
+						<view class="cicupation-left">
+							<view :class="item.checked ? 'left-item' : 'left-nocheck'" v-for="(item, index) in cate" :key="index" @click="checkLeft(item.id)">{{ item.title }}</view>
+						</view>
+						<view class="cicupation-right">
+							<view :class="item.checked ? 'right-item' : 'right-nocheck'" v-for="(item, index) in rightList" :key="index" @click="checkRight(item.id)">
+								{{ item.title }}
+							</view>
+						</view>
+					</view>
+				</PopManager>
+				
+				<view class="page-footer">
+					<TabBars :tabBarAct="0" />
+				</view>
+				<follow :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+				 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+				<!-- #ifdef H5 -->
+				<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+					<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+						<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+					</view>
+					<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+						<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+					</view>
+				</PopManager>
+				<!-- #endif -->
+			</view>
+		</block>
+		<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		<view class="showPic" v-if="showP">
+			<view class="showOne" @click="closeMo"></view>
+			<view>
+				<view class="showTwo">
+					<scroll-view scroll-y="true" style="height: 360rpx;margin-top:50rpx;width: 300upx;">
+						<block v-for="(picItem, index) in typelist[0]" ::key="index">
+							<view style="display: flex;flex-wrap: wrap;" :class="picItemid == picItem.id ? 'viperCheck': 'NOviperCheck'">
+								<view class="picName" @click="picCli(index, picItem.id)">{{ picItem.name }}</view>
+								<text v-if="picItem.twotype.length > 0" class="iconfont icon-right" style="margin-top: 30rpx;"></text>
+							</view>
+						</block>
+					</scroll-view>
+					<!-- <view style="height: 300rpx;width: 300rpx;margin-top:50rpx;" v-if="!showPicTwo"></view> -->
+					<scroll-view scroll-y="true" style="height: 360rpx;width: 300rpx;margin-top:50rpx;" v-if="showPicTwo || typelist[0][indexPic].twotype">
+						<view v-for="(picItem1, index1) in typelist[0][indexPic].twotype" :key="index1" style="display: flex;flex-wrap:wrap">
+							<view @click="picCli1(index1, picItem1.id, picItem1)" class="picName" :class="picItem1.checked ? 'noCheckedPic' : 'checkedPic'">
+								{{ picItem1.name }}
+							</view>
+						</view>
+				
+					</scroll-view>
+				</view>
+				<view class="suolBT">
+					<button type="warn" style="font-size: 32upx;" @click="closeMo">确定</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import uniSelect from '@/components/template/lee-select.vue';
+	import TabBars from '@/components/template/tabBar';
+	import follow from '@/components/template/follow.vue';
+	import PopManager from '@/components/template/PopManager';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import wPickerb from '@/components/w-picker/w-picker.vue'
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components: {
+			uniSelect,
+			TabBars,
+			follow,
+			PopManager,
+			Loadlogo,
+			PhoneMask,
+			wPickerb,
+			getvxphone
+		},
+		data() {
+			return {
+				storeChecked: true,
+				showPicTwo: false,
+				showoccupation:false,
+				show1: false,
+				followTitleShow: true,
+				followShow: false,
+				showP: false,
+				followType: '0',
+				indexPic: 0,
+				hangYe: true,
+				typeIndex: [0, 0],
+				cityIndex: [],
+				cate:[],
+				rightList:[],
+				title: 'hello',
+				show: true,
+				page: 1,
+				date: '',
+				time: '00:00',
+				time1: '00:00',
+				jobType: '美食餐饮 甜点饮品',
+				typelist: [],
+				typeList: [],
+				citylist: [],
+				defaultRegion: ["150000", "150100", "150103"],
+				chargeList: [],
+				id: '',
+				typeid: '',
+				current: 0,
+				onelevelName: '请选择行业分类',
+				twoLevelList: [],
+				twolevelName: '',
+				provinceidName: '请选择省市区',
+				areaidName: '',
+				distidName: '',
+				imgPath: '',
+				type1Url: '',
+				type2Url: [],
+				type3Url: [],
+				type4Url: [],
+				type5Url: [],
+				visiblec: false,
+				userInfo: {
+					storename: '',
+					name: '',
+					mobile: '',
+					lat: '',
+					lng: '',
+					startTime: '00:00',
+					endTime: '00:00',
+					address: '',
+					onelevel: '',
+					twolevel: '',
+					provinceid: '',
+					areaid: '',
+					distid: '',
+					introduction: '',
+					logo: '',
+					adv: [],
+					album: [],
+					examine: [],
+					thumbimages: [],
+					cateidArray: [],
+					business_license: '',// 营业执照
+					recruit_brighten: '',// 企业亮点
+					recruit_adv: [],//企业幻灯片
+					recruit_long_img: [],
+				},
+				phoneHeight: null,
+				isOpenLaction: false,
+				e: {},
+				onshowIshow: false,
+				picItemid: null,
+				vxshow: false,
+				latlngs: null,
+				num: 0,
+				onkoc: 0,
+				owenscitylist: {},
+				klis: false,
+				thelat: '',
+				lblis: null,
+				visibletimeone: false,
+				visibletimeend: false,
+				visibletimeoneT: false,
+				visibletimeendT: false,
+				industryIndex:0,
+				homemaIndex:0,
+				homemaking:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				switchList:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				multistageList:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				multistageIndex:0,
+				switchIndex:1,
+				natureIndex:0,
+				scaleIndex:0,
+				storehours:[{
+					endTime:'00:00',
+					startTime:'00:00'
+				}],
+				btnOff:false,
+				addressDisabled:true
+			};
+		},
+		computed: {
+			backImages() {
+				return this.imageRoot + 'demoBackImg.png';
+			},
+			isWxaudit() {
+				return this.$store.state.isWxAudit;
+			}
+		},
+		onLoad(e) {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			
+			_this.e = e;
+			_this.owenscitylist = uni.getStorageSync('cityList')
+			_this.latlngs = uni.getStorageSync('curLoction');
+
+			if (!!_this.e.page) {
+				_this.page = Number(_this.e.page);
+				if (!!_this.e.storeid) {
+					_this.userInfo.storeid = _this.e.storeid;
+					_this.getChargeList(_this.e.storeid);
+				} else {
+					uni.getStorage({
+						key: 'checkStoreid',
+						success: function(res) {
+							_this.userInfo.storeid = res.data;
+							_this.getChargeList(res.data);
+						}
+					});
+				}
+			}
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			_this.init();
+			_this.storeChecked = false;
+			_this.provinceidName = _this.languageStatus != 1?'请选择省市区':'성/시/구 선택 입력하세요'
+			// _this.getloctions();
+			//	_this.init();
+		},
+		onHide() {},
+		watch: {
+			thelat() {
+				this.getloctions(this.lblis);
+			}
+		},
+		onShow() {
+			let _this = this;
+			
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					_this.onshowIshow = true;
+					if (_this.klis) {
+						return
+					}
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						_this.thelat = loc.latlng.lat;
+						_this.userInfo.address = loc.poiaddress;
+						_this.userInfo.lat = loc.latlng.lat;
+						_this.userInfo.lng = loc.latlng.lng;
+						_this.isOpenLaction = false;
+						_this.addressDisabled = false;
+						_this.lblis = {
+							lat: loc.latlng.lat,
+							lng: loc.latlng.lng,
+							detailed_address: loc.poiaddress
+						}
+
+					}
+					_this.klis = true;
+					setTimeout(() => {
+						_this.klis = false;
+					}, 1000)
+				},
+				false
+			);
+			// #endif
+
+			if (_this.onkoc == 0) {
+				_this.onkoc++;
+				return
+			}
+			
+			if (this.onshowIshow) {
+				this.onshowIshow = false;
+				return
+			}
+			_this.init(999);
+		},
+		methods: {
+			deletcheck(id) {
+				let _this = this;
+				_this.cate.map((item, index) => {
+					item.list.map((items, indexs) => {
+						if (items.id == id) {
+							items.checked = false;
+						}
+					});
+				});
+				_this.userInfo.store_housekeep_cate.map((items, indexs) => {
+					if (items.id == id) {
+						_this.userInfo.store_housekeep_cate.splice(indexs, 1);
+					}
+				});
+				_this.rightList.map((items, indexs) => {
+					if (items.id == id) {
+						items.checked = false;
+					}
+				});
+			},
+			scaleChange(e){
+				this.scaleIndex = e.detail.value;
+			},
+			natureChange(e){
+				this.natureIndex = e.detail.value;
+			},
+			homemaChange(e){
+				this.homemaIndex = e.detail.value;
+			},
+			switchChange(e){ //招聘开关
+				this.switchIndex = e.detail.value;
+				this.isWxaudit = !this.isWxaudit;
+				this.isWxaudit = !this.isWxaudit;
+				// console.log(this.multistageIndex,this.multistageList[this.multistageindex].title);
+			},
+			multistageChange(e){
+				this.multistageIndex = e.detail.value;
+				if(e.detail.value == 1){
+					this.storehours.push({
+						endTime:'00:00',
+						startTime:'00:00'
+					});
+				}else{
+					this.storehours.splice(1,1);
+				}
+				console.log(this.multistageIndex,this.multistageList[this.multistageIndex].title);
+			},
+			industryChange(e){
+				this.industryIndex = e.detail.value;
+			},
+
+			getloctions(lblis) {
+				
+				console.log(lblis, '666666');
+				let _this = this;
+				let curLoction = uni.getStorageSync('curLoction')
+				let lbli = lblis || {};
+				if(!lblis){
+					lbli.lng = curLoction.longitude;
+					lbli.lat = curLoction.latitude;
+				}
+				App._post_form(`&p=member&do=lng2areaid&lng=${lbli.lng}&lat=${lbli.lat}`, {}, res => {
+					// debugger
+					// _this.userInfo.detailed_address = lbli.detailed_address;
+					_this.userInfo.provinceid = res.data.provinceid;
+					_this.userInfo.distid = res.data.countyid;
+					_this.userInfo.areaid = res.data.cityid;
+					_this.owenscitylist.map((item, index) => {
+						if (item.id == _this.userInfo.provinceid) {
+							_this.provinceidName = item.name;
+							item.area.map(items => {
+								if (items.id == _this.userInfo.areaid) {
+									_this.areaidName = items.name;
+									items.dist.map(itemss => {
+										if (itemss.id == _this.userInfo.distid) {
+											_this.distidName = itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+				});
+			},
+			visble() {
+				console.log(11111)
+				this.visiblec = true;
+			},
+			showFalse() {
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closeMo() {
+				if (this.twoLevelList.length == 0) {
+					this.hangYe = true;
+				}
+				this.showP = false;
+			},
+			picCli(index, id) {
+				let that = this;
+				that.picItemid = id;
+				that.showPicTwo = true;
+				that.indexPic = index;
+				that.typelist[0].map(item => {
+					if (!item.checked) {
+						item.checked = false;
+					} else {
+						item.checked = true;
+					}
+				});
+				that.typelist[0][index].twotype.map(item => {
+					if (!item.checked) {
+						item.checked = false;
+					} else {
+						item.checked = true;
+					}
+				});
+				that.typelist[0].forEach(value => {
+					if (value.id == id && value.checked == false) {
+						that.$set(value, 'checked', true);
+						that.showP = !that.showP;
+						that.showP = !that.showP;
+					} else if (value.id == id && value.checked == true) {
+						that.$set(value, 'checked', false);
+						that.showP = !that.showP;
+						that.showP = !that.showP;
+					}
+				});
+			},
+			picCli1(index, id, item) {
+				let that = this;
+				let i = that.indexPic;
+				let newObj = {};
+				that.typelist[0][i].twotype.forEach(value => {
+					if (value.id == id && value.checked == false) {
+						that.$set(value, 'checked', true);
+						that.showP = !that.showP;
+						that.showP = !that.showP;
+					} else if (value.id == id && value.checked == true) {
+						that.$set(value, 'checked', false);
+						that.showP = !that.showP;
+						that.showP = !that.showP;
+					}
+				});
+				/** typelist = [
+					[
+						{
+							twotype:[
+								{checked: true, id: null}, 
+								itemT
+							]
+						},
+						{twotype:[]}, 
+						{twotype:[]}, 
+						itemI, 
+						itemI
+					],
+					1,
+					2
+				]
+				**/
+				that.typelist[0].forEach((itemI, index) => {
+					// that.typelist[0][index].twotype.forEach(itemT => {
+					itemI.twotype.forEach(itemT => {
+						if (itemT.checked && itemT.id == id) {
+							newObj.onelevel = itemI.id;
+							newObj.twolevel = itemT.id;
+							that.userInfo.cateidArray.push(newObj);
+							that.twoLevelList.push(itemT.name);
+						} else if (!itemT.checked && itemT.id == id) {
+							that.userInfo.cateidArray.forEach((itemZ, index) => {
+								if (itemZ.onelevel == itemI.id && itemZ.twolevel == itemT.id) {
+									that.userInfo.cateidArray.splice(index, 1);
+									that.twoLevelList.splice(index, 1);
+								}
+							});
+						}
+					});
+				});
+			},
+			showThePic() {
+				this.showP = true;
+				this.hangYe = false;
+			},
+
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+			},
+			changeTime(e) {},
+			showPicker(type) {
+				this.$refs[type].show();
+				console.log(this.$refs[type]);
+			},
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			closePreview(type, url) {
+				let _this = this;
+				if (type == 2) {
+					for (let i = 0; i < _this.type2Url.length; i++) {
+						if (url == _this.type2Url[i]) {
+							_this.type2Url.splice(i, 1);
+							_this.userInfo.adv.splice(i, 1);
+							console.log(_this.type2Url, _this.userInfo.adv)
+						}
+					}
+				}
+				if (type == 3) {
+					for (let i = 0; i < _this.type3Url.length; i++) {
+						if (url == _this.type3Url[i]) {
+							_this.type3Url.splice(i, 1);
+							_this.userInfo.album.splice(i, 1);
+						}
+					}
+				}
+				if (type == 4) {
+					for (let i = 0; i < _this.type4Url.length; i++) {
+						if (url == _this.type4Url[i]) {
+							_this.type4Url.splice(i, 1);
+							_this.userInfo.recruit_adv.splice(i, 1);
+						}
+					}
+				}
+				if (type == 5) {
+					for (let i = 0; i < _this.type5Url.length; i++) {
+						if (url == _this.type5Url[i]) {
+							_this.type5Url.splice(i, 1);
+							_this.userInfo.thumbimages.splice(i, 1);
+						}
+					}
+				}
+				if (type == 6) {
+					for (let i = 0; i < _this.userInfo.recruit_long_img.length; i++) {
+						if (url == _this.userInfo.recruit_long_img[i]) {
+							_this.userInfo.recruit_long_img.splice(i, 1);
+						}
+					}
+				}
+				if (type == 7) {
+					_this.userInfo.business_license='';
+				}
+			},
+			closeLogo() {
+				let _this = this;
+				_this.type1Url = '';
+				_this.userInfo.logo = '';
+			},
+			radioChange: function(e) {
+				let _this = this;
+				_this.typeid = e.target.value;
+			},
+			init(id = 111) {
+				let _this = this;
+				_this.getUserInfo(id);
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+			},
+			navigation(){
+				App.navigationTo({
+					url: this.userInfo.top_link
+				});
+			},
+			toLoginAgreement(type) {
+				App.navigationTo({
+					url: 'pages/mainPages/agreement/agreement?agremType=' + type
+				});
+			},
+			// 城市列表三级联动
+			changeCity: function(e) {
+				let _this = this;
+				let cityListCenter = [];
+				let cityListRight = [];
+
+				if (e.target.column == 0) {
+					for (let i = 0; i < _this.cityList.length; i++) {
+						if (e.target.value == i) {
+							for (let a = 0; a < _this.cityList[i].area.length; a++) {
+								cityListCenter.push(_this.cityList[i].area[a]);
+							}
+						}
+					}
+					_this.citylist.splice(1, 2, cityListCenter);
+					_this.citylist.splice(2, 3, cityListCenter[0].dist);
+				}
+				if (e.target.column == 1) {
+					for (let a = 0; a < _this.citylist[1].length; a++) {
+						if (e.target.value == a) {
+							for (let c = 0; c < _this.citylist[1][a].dist.length; c++) {
+								cityListRight.push(_this.citylist[1][a].dist[c]);
+							}
+						}
+					}
+					_this.citylist.splice(2, 3, cityListRight);
+				}
+			},
+			uoloadIgs(length, ids = 0, resImg, type) {
+				let _this = this;
+				_this.onshowIshow = true;
+				wxApi.uoloadIg(resImg.localIds[ids], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									if (type == 1) {
+										_this.type1Url = res.data.img;
+										_this.userInfo.logo = res.data.image;
+									}
+									if (type == 2) {
+										_this.type2Url.push(res.data.img);
+										_this.userInfo.adv.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										}
+									}
+									if (type == 3) {
+										_this.type3Url.push(res.data.img);
+										_this.userInfo.album.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										}
+									}
+									if (type == 4) {
+										_this.type4Url.push(res.data.img);
+										_this.userInfo.recruit_adv.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										}
+									}
+									if (type == 5) {
+										_this.type5Url.push(res.data.img);
+										_this.userInfo.thumbimages.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										}
+									}
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(type, num) {
+				let _this = this;
+				_this.onshowIshow = true;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+				     let res = await App.browser_upload(num);
+				     for (let i = 0; i < res.tempFilePaths.length; i++) {
+				     	let aa = await App._upLoad(res.tempFilePaths[i]);
+				     	if (type == 1) {
+				     		_this.type1Url = aa.data.img;
+				     		_this.userInfo.logo = aa.data.image;
+				     	}
+				     	if (type == 2) {
+				     		_this.type2Url.push(aa.data.img);
+				     		_this.userInfo.adv.push(aa.data.img);
+				     	}
+				     	if (type == 3) {
+				     		_this.type3Url.push(aa.data.img);
+				     		_this.userInfo.album.push(aa.data.img);
+				     	}
+				     	if (type == 4) {
+				     		_this.type4Url.push(aa.data.img);
+				     		_this.userInfo.recruit_adv.push(aa.data.img);
+				     	}
+				     	if (type == 5) {
+				     		_this.type5Url.push(aa.data.img);
+				     		_this.userInfo.thumbimages.push(aa.data.img);
+				     	}
+				     	if (type == 6) {
+				     		_this.userInfo.recruit_long_img.push(aa.data.img);
+				     	}
+				     	if (type == 7) {
+				     		_this.userInfo.business_license=aa.data.img;
+				     	}
+				     }
+				
+				     return
+				    }
+				wxApi.choseImage(res => {
+					let i = res.localIds.length;
+					_this.uoloadIgs(i, 0, res, type);
+				}, num);
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: num,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.type1Url = aa.data.img;
+								_this.userInfo.logo = aa.data.image;
+							}
+							if (type == 2) {
+								_this.type2Url.push(aa.data.img);
+								_this.userInfo.adv.push(aa.data.img);
+							}
+							if (type == 3) {
+								_this.type3Url.push(aa.data.img);
+								_this.userInfo.album.push(aa.data.img);
+							}
+							if (type == 4) {
+								_this.type4Url.push(aa.data.img);
+								_this.userInfo.recruit_adv.push(aa.data.img);
+							}
+							if (type == 5) {
+								_this.type5Url.push(aa.data.img);
+								_this.userInfo.thumbimages.push(aa.data.img);
+							}
+							if (type == 6) {
+								_this.userInfo.recruit_long_img.push(aa.data.img);
+							}
+				     	if (type == 7) {
+				     		_this.userInfo.business_license=aa.data.img;
+				     	}
+						}
+					}
+				});
+				// #endif
+			},
+			// 生成分销入驻付费订单
+			createChargeOrder() {
+				let _this = this;
+				let data = {
+					storeid: _this.userInfo.storeid,
+					typeid: _this.typeid
+				};
+				App._post_form(
+					'&p=store&do=createChargeOrder',
+					data,
+					res => {
+						if (res.data.status == '0') {
+							App.navigationTo({
+								url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
+							});
+						} else {
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid
+							});
+						}
+					},
+					fail => {
+						if (fail.data.message == '未绑定手机号') {
+							let _this = this;
+							//#ifdef H5
+							_this.show1 = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+						}
+					}
+				);
+			},
+			// 获取用户信息
+			getUserInfo(idis = 111) {
+				let _this = this;
+				let data = {
+					id: ''
+				};
+				_this.citylist = [];
+				let listLeft = [];
+				let listRight = [];
+				let cityListLeft = [];
+				let cityListCenter = [];
+				let cityListRight = [];
+				App._post_form('&p=store&do=storeSettled', data, res => {
+					_this.userInfo = { ..._this.userInfo,
+						...res.data
+					};
+					if(!_this.userInfo.top_img){
+						_this.userInfo.top_img = _this.backImages;
+					}
+					// uni.setStorageSync('agreement', res.data.registerdetail);
+					// 获取分类列表数据
+					_this.cate = res.data.all_housekeep_cate;
+					if (res.data.typelist.length == 0) {
+						_this.typelist.push([{
+							name: '该地区暂无分类',
+							id: ''
+						}]);
+					} else {
+						_this.typeList = res.data.typelist;
+						for (let i = 0; i < res.data.typelist.length; i++) {
+							listLeft.push(res.data.typelist[i]);
+						}
+						for (let a = 0; a < res.data.typelist[0].twotype.length; a++) {
+							listRight.push(res.data.typelist[0].twotype[a]);
+						}
+						_this.typelist.push(listLeft);
+						_this.typelist.push(listRight);
+					}
+					// 获取分类列表数据
+					// 获取城市列表数据
+					_this.cityList = res.data.citylist;
+					let oneNumber = 0;
+					let twoNumber = 0;
+					let threeNumber = 0;
+					setTimeout(()=>{
+						
+					})
+					for (let i = 0; i < res.data.citylist.length; i++) {
+						cityListLeft.push(res.data.citylist[i]);
+						if (res.data.citylist[i].id == res.data.provinceid) {
+							// _this.provinceidName = res.data.citylist[i].name;
+							_this.userInfo.provinceid = res.data.citylist[i].id;
+							oneNumber = i;
+							_this.cityIndex.push(oneNumber);
+							for (let a = 0; a < res.data.citylist[i].area.length; a++) {
+								cityListCenter.push(res.data.citylist[i].area[a]);
+								if (res.data.citylist[i].area[a].id == res.data.areaid) {
+									// _this.areaidName = res.data.citylist[i].area[a].name;
+									_this.userInfo.areaid = res.data.citylist[i].area[a].id;
+									twoNumber = a;
+									_this.cityIndex.push(twoNumber);
+									for (let c = 0; c < res.data.citylist[i].area[a].dist.length; c++) {
+										cityListRight.push(res.data.citylist[i].area[a].dist[c]);
+										if (res.data.citylist[i].area[a].dist[c].id == res.data.distid) {
+											// _this.distidName = res.data.citylist[i].area[a].dist[c].name;
+											_this.distid = res.data.citylist[i].area[a].dist[c].id;
+											threeNumber = c;
+											_this.cityIndex.push(threeNumber);
+										}
+									}
+								}
+							}
+						}
+					}
+					_this.citylist.push(cityListLeft);
+					_this.citylist.push(cityListCenter);
+					_this.citylist.push(cityListRight);
+					
+					// _this.getloctions(_this.lblis);
+					
+					// 获取城市列表数据；
+					if (idis == 999) {
+						_this.userInfo.havestore = 0;
+					} else {
+						if (_this.userInfo.havestore == 0) {
+							return
+						}
+						_this.userInfo.havestore = 1;
+					};
+					
+					console.log(idis);
+				});
+			},
+			checkRight(id) {
+				let _this = this;
+				_this.rightList.map((item, index) => {
+					// item.checked = false;
+					if (item.id == id) {
+						item.checked = !item.checked;
+			
+						if (item.checked) {
+							_this.userInfo.store_housekeep_cate.push(item);
+						} else {
+							_this.userInfo.store_housekeep_cate.map((items, indexs) => {
+								if (items.id == item.id) {
+									_this.userInfo.store_housekeep_cate.splice(indexs, 1);
+								}
+							});
+						}
+					}
+				});
+				_this.isWxaudit = !_this.isWxaudit;
+				_this.isWxaudit = !_this.isWxaudit;
+			},
+			checkLeft(id) {
+				let _this = this;
+				_this.cate.map((item, index) => {
+					item.checked = false;
+					if (item.id == id) {
+						item.checked = true;
+						_this.rightList = item.list;
+					}
+				});
+				_this.isWxaudit = !_this.isWxaudit;
+				_this.isWxaudit = !_this.isWxaudit;
+			},
+			// 提交商户信息
+			saveUserInfo() {
+				let _this = this;
+				if(_this.btnOff == true) return
+				_this.btnOff = true;
+				setTimeout(()=>{
+					_this.btnOff = false;
+				},2000)
+				// 判断
+				if (_this.userInfo.storename == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业名称不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.name == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '姓名不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				let phone_reg = new RegExp(/^(\(\d{3,4}\)|\d{3,4}-|\s)?\d{7,14}$/);
+				let myreg = /^(((13[0-9]{1})|(14[0-9]{1})|(15[0-9]{1})|(16[0-9]{1})|(17[0-9]{1})|(19[0-9]{1})|(18[0-9]{1}))+\d{8})$/;
+				if (!myreg.test(_this.userInfo.mobile) && !phone_reg.test(_this.userInfo.mobile)) {
+					App.showError("电话号码格式不正确");
+					return
+				}
+				// if (_this.userInfo.provinceid == '' || _this.userInfo.areaid == '') {
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请选择所在地区',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				if (_this.userInfo.address == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '详细地址不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.twoLevelList.length == 0) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择所属行业',
+						duration: 2000
+					});
+					return;
+				}
+				// 页面展示：所属行业:industryIndex，行业分类：twoLevelList
+				
+				if (_this.userInfo.business_license == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传营业执照',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业亮点不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.introduction == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业介绍不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				
+				if (!_this.storeChecked) {
+					uni.showToast({
+						icon: 'none',
+						title: '请先阅读《企业入驻相关条款》',
+						duration: 2000
+					});
+					return
+				}
+				if (_this.switchIndex == 1) {
+					this.userInfo.recruit_switch = this.switchList[this.switchIndex].id;
+					this.userInfo.recruit_nature_id = this.userInfo.nature[this.natureIndex].id;
+					this.userInfo.recruit_scale_id = this.userInfo.scale[this.scaleIndex].id;
+					this.userInfo.recruit_industry_id = this.userInfo.industry[this.industryIndex].id;
+				}
+				let store_housekeep = [];
+				// if(_this.userInfo.is_housekeep == 1){
+				// 	if (_this.homemaIndex != 0) {
+				// 		this.userInfo.housekeepstatus = this.homemaking[this.homemaIndex].id;
+						
+				// 		if (_this.userInfo.store_housekeep_cate.length == 0) {
+				// 			uni.showToast({
+				// 				icon: 'none',
+				// 				title: '请至少选择一个家政类目',
+				// 				duration: 2000
+				// 			});
+				// 			return
+				// 		}
+				// 	}
+				// 	if(_this.userInfo.store_housekeep_cate != false){
+				// 		_this.userInfo.store_housekeep_cate.map((item,index)=>{
+				// 			store_housekeep.push(item.id)
+				// 		})
+				// 	}
+					
+				// }
+				
+				
+				let housekeep_cate = JSON.stringify(store_housekeep);
+				let jsonString = JSON.stringify(this.userInfo.cateidArray);
+				let storehours = JSON.stringify(this.storehours);
+				let base64 = new this.$util.Base64();
+				this.userInfo.cateidArray = base64.encode(jsonString);
+				let data = this.userInfo;
+				data.storehours = base64.encode(storehours);
+				data.store_housekeep_cate = base64.encode(housekeep_cate);
+				this.userInfo.sale_id = this.e.sale_id;
+				App._post_form('&p=store&do=createStore', data, res => {
+					uni.setStorageSync('userId', res.data);
+					_this.userInfo.storeid = res.data.storeid;
+					_this.page = 2;
+					_this.getChargeList();
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
+				}, err=>{
+					_this.btnOff = false;
+					_this.userInfo.store_housekeep_cate = [];
+				});
+			},
+			// 通过地区id获取商户分类
+			getAreaTypeList() {
+				let _this = this;
+				_this.typelist = [];
+				let listLeft = [];
+				let listRight = [];
+				_this.hangYe = true;
+				_this.twoLevelList = [];
+				let data = {
+					provinceid: _this.userInfo.provinceid,
+					areaid: _this.userInfo.areaid,
+					distid: _this.userInfo.distid
+				};
+				App._post_form('&p=store&do=area2type', data, res => {
+					if (res.data.length == 0) {
+						_this.typelist.push([{
+							name: '该地区暂无分类',
+							id: ''
+						}]);
+					} else {
+						_this.typeList = res.data;
+						for (let i = 0; i < res.data.length; i++) {
+							listLeft.push(res.data[i]);
+							for (let a = 0; a < res.data[0].length; a++) {
+								listRight.push(res.data[0].twotype[a]);
+							}
+						}
+						_this.typelist.push(listLeft);
+						_this.typelist.push(listRight);
+					}
+				});
+			},
+			// 获取付费入驻列表
+			getChargeList(storeid) {
+				let _this = this;
+				let data = {
+					storeid: storeid || _this.userInfo.storeid
+				};
+				App._post_form('&p=store&do=chargeList', data, res => {
+					_this.chargeList = res.data.typelist;
+					_this.typeid = _this.chargeList[0].id;
+				});
+			},
+			goStoreList() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
+				});
+			},
+			// 联系客服
+			kfPhone() {
+				let _this = this;
+				uni.showModal({
+					title: '联系客服',
+					content: _this.userInfo.systemphone,
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: _this.userInfo.systemphone //仅为示例
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			onConfirm(e) {
+				console.log(e);
+				let _this = this;
+				// _this.citytext = e.result;
+				_this.userInfo.provinceid = e.obj.province.value;
+				_this.userInfo.areaid = e.obj.city.value;
+				_this.userInfo.distid = e.obj.area.value;
+				_this.provinceidName = e.obj.province.label;
+				_this.areaidName = e.obj.city.label;
+				_this.distidName = e.obj.area.label;
+				console.log(_this.provinceidName, _this.areaidName, _this.distidName)
+			},
+			onCancel(e) {
+				console.log(e);
+
+			},
+			// 城市列表确定按钮
+			checkCity: function(e) {
+				let _this = this;
+				console.log(_this.citylist, e.target.value, _this.cityIndex, _this.citylist[2]);
+				_this.provinceidName = _this.citylist[0][e.target.value[0]].name;
+				_this.areaidName = _this.citylist[1][e.target.value[1]].name;
+
+				_this.userInfo.provinceid = _this.citylist[0][e.target.value[0]].id;
+				_this.userInfo.areaid = _this.citylist[1][e.target.value[1]].id;
+
+				if (_this.citylist[2].length == 0) {
+					_this.distidName = '';
+					_this.userInfo.distid = '';
+				} else {
+					_this.distidName = _this.citylist[2][e.target.value[2]].name;
+					_this.userInfo.distid = _this.citylist[2][e.target.value[2]].id;
+				}
+				_this.userInfo.onelevel = '';
+				_this.userInfo.twolevel = '';
+				_this.onelevelName = '请选择行业分类';
+				_this.twolevelName = '';
+				_this.getAreaTypeList();
+			},
+			// 行业分类确定按钮
+			checkType: function(e) {
+				let _this = this;
+				_this.onelevelName = '';
+				_this.twolevelName = '';
+				_this.userInfo.onelevel = '';
+				_this.userInfo.twolevel = '';
+				if (_this.typelist[0][e.target.value[0]] !== undefined) {
+					_this.onelevelName = _this.typelist[0][e.target.value[0]].name;
+					_this.userInfo.onelevel = _this.typelist[0][e.target.value[0]].id;
+				}
+				if (!!_this.typelist[1][e.target.value[1]]) {
+					_this.twolevelName = _this.typelist[1][e.target.value[1]].name;
+					_this.userInfo.twolevel = _this.typelist[1][e.target.value[1]].id;
+				}
+			},
+			// 行业分类二级
+			changeKey: function(e) {
+				let _this = this;
+				let listRight = [];
+				for (let i = 0; i < _this.typeList.length; i++) {
+					if (e.target.value == i && e.target.column == 0) {
+						for (let a = 0; a < _this.typeList[i].twotype.length; a++) {
+							listRight.push(_this.typeList[i].twotype[a]);
+						}
+						_this.typelist.splice(1, 2, listRight);
+						console.info(listRight);
+					}
+				}
+			},
+
+			getDisabled(){
+				if(this.addressDisabled == false) return
+				uni.showToast({
+					icon:'none',
+					title:'请先选择定位'
+				})
+			},
+			// 获取定位
+			getLocation() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					success: function(e) {
+						_this.userInfo.address = e.address;
+						_this.userInfo.lat = e.latitude;
+						_this.userInfo.lng = e.longitude;
+						_this.lblis = {};
+						_this.lblis.lat = e.latitude;
+						_this.lblis.lng = e.longitude;
+						// console.log('AAAAAAA',e);
+						_this.onkoc = 0;
+						_this.addressDisabled = false;
+						_this.getloctions(_this.lblis)
+					},
+					// fail(err){
+						// console.log('-----',err);
+					// }
+				});
+				// #endif
+				//#ifdef APP-PLUS
+				App.navigationTo({
+					url: 'pages/subPages2/map/index'
+				});
+				//#endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+			},
+			// 选择开始营业时间
+			bindTimeChangeStarT: function(e) {
+				let _this = this;
+				console.log(e);
+				// #ifdef H5
+				_this.storehours[1].startTime = e.result;
+				// #endif
+				// #ifndef H5
+				_this.storehours[1].startTime = e.result;
+				// #endif
+			},
+			// 选择开始营业时间
+			bindTimeChangeStar: function(e) {
+				let _this = this;
+				console.log(e);
+				// #ifdef H5
+				_this.storehours[0].startTime = e.result;
+				// #endif
+				// #ifndef H5
+				_this.storehours[0].startTime = e.result;
+				// #endif
+			},
+			onCancel(e) {
+				console.log(e);
+			},
+			onCancelEnd(e) {
+				console.log(e);
+			},
+			// 选择结束营业时间
+			bindTimeChangeEnd: function(e) {
+				let _this = this;
+				console.log(e);
+				// #ifdef H5
+				_this.storehours[0].endTime = e.result;
+				// #endif
+				// #ifndef H5
+				_this.storehours[0].endTime = e.result;
+				// #endif
+			},
+			// 选择结束营业时间
+			bindTimeChangeEndT: function(e) {
+				let _this = this;
+				console.log(e,this.storehours);
+				// #ifdef H5
+				_this.storehours[1].endTime = e.result;
+				// #endif
+				// #ifndef H5
+				_this.storehours[1].endTime = e.result;
+				// #endif
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.viperCheck {
+		background-color: #F8F8F8;
+	}
+
+	.NOviperCheck {
+		background-color: #FFFFFF;
+	}
+
+	.scoll_view {
+		background: #f8f8f8;
+	}
+
+	.button_package {
+		position: absolute;
+		bottom: 400upx;
+		width: 750upx;
+	}
+
+	.textWhite {
+		color: white;
+	}
+
+	.color49BA64 {
+		background: #49ba64;
+	}
+
+	.marT20 {
+		margin-top: 20upx;
+	}
+
+	.colorWhite {
+		background: white;
+	}
+
+	.bittons {
+		text-align: center;
+		margin: 20upx auto 0 auto;
+		width: 300upx;
+		height: 70upx;
+		border-radius: 10upx;
+
+		>text {
+			line-height: 70upx;
+			font-size: 36upx;
+		}
+	}
+
+	.tips_view1 {
+		text-align: center;
+		margin-top: 10upx;
+	}
+
+	.tips_text1 {
+		font-size: 24upx;
+		color: rgba(102, 102, 102, 1);
+	}
+
+	.tips_view {
+		text-align: center;
+		margin-top: 60upx;
+	}
+
+	.tips_text {
+		font-size: 36upx;
+		color: rgba(0, 0, 0, 1);
+	}
+
+	.icon_view {
+		margin: 200upx auto 0 auto;
+		width: 100upx;
+		height: 100upx;
+		border-radius: 50%;
+		background: #49ba64;
+		text-align: center;
+
+		>text {
+			color: white;
+			font-size: 60upx;
+			line-height: 100upx;
+		}
+	}
+
+	page {
+		background: #f6f6f6 !important;
+	}
+
+	.demo {
+		background: #f6f6f6 !important;
+		font-size: 0;
+		width: 750upx;
+	}
+
+	.uni-input {
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.dataPicker {
+		width: 350upx;
+		height: 82upx;
+		display: inline-block;
+	}
+
+	.dataPicker1 {
+		width: 70upx;
+		height: 82upx;
+		display: inline-block;
+	}
+
+	.main {
+		width: 750upx;
+		padding-bottom: 100upx;
+		overflow-x: hidden;
+	}
+
+	.mainPackage {
+		margin: 0upx 31upx 0 31upx;
+		width: 688upx;
+	}
+
+	.backImages {
+		z-index: 1;
+		width: 750upx;
+		background-size: 750upx 344upx;
+		background-repeat: no-repeat;
+	}
+
+	.userInfo {
+		width: 688upx;
+		background: white;
+		border-radius: 10upx;
+	}
+
+	.firstTitle {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.line {
+		display: inline-block;
+		width: 8upx;
+		height: 27upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+	}
+
+	.firstTitleName {
+		>view {
+			vertical-align: middle;
+		}
+
+		>span {
+			vertical-align: middle;
+			margin-left: 16upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.firstTitleTips {
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+			margin-right: 14upx;
+		}
+
+		>image {
+			vertical-align: middle;
+			width: 18upx;
+			height: 26upx;
+		}
+	}
+
+	.userInfoInput {
+		margin-top: 15upx;
+	}
+
+	.userInfoInputPackage {
+		border: 1px solid rgba(0, 0, 0, 0);
+		display: inline-block;
+		width: 614upx;
+		border-radius: 10upx;
+	}
+
+	.userInfoInputMain {
+		background: rgba(250, 250, 250, 1);
+		margin-top: 18upx;
+		padding: 0 22upx;
+
+		>span {
+			text-align: right;
+			vertical-align: middle;
+			display: inline-block;
+			width: 106upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			border: none;
+			outline: none;
+			vertical-align: middle;
+			display: inline-block;
+			width: 340upx;
+			margin-left: 49upx;
+			height: 83upx;
+			background: rgba(250, 250, 250, 1);
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-left: 50upx;
+			vertical-align: middle;
+			width: 20upx;
+			height: 28upx;
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>image {
+				vertical-align: middle;
+				width: 21upx;
+				height: 24upx;
+				margin-right: 9upx;
+			}
+
+			>span {
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+
+		/deep/.uni-input {
+			margin-top: 27upx;
+		}
+
+		.timePickerView {
+			vertical-align: middle;
+			display: inline-block;
+			margin-left: 49upx;
+			width: 340upx;
+			height: 83upx;
+
+			>span {
+				line-height: 83upx;
+				vertical-align: top;
+				margin: 0 10upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	input::placeholder {
+		font-size: 24upx;
+
+		color: rgba(204, 204, 204, 1);
+	}
+
+	.userInfoPackage {
+		padding: 34upx;
+	}
+
+	.checkInput::placeholder {
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.userImg {
+		margin-top: 26upx;
+		display: inline-block;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+	}
+
+	.twiceTitle {
+		margin-top: 62upx;
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			vertical-align: middle;
+			overflow: visible !important;
+			margin-top: 43upx;
+
+			>view {
+				vertical-align: middle;
+				display: inline-block;
+			}
+		}
+	}
+
+	.twiceTitle1 {
+		margin-top: 40upx;
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			margin-top: 43upx;
+
+			>view {
+				vertical-align: middle;
+				display: inline-block;
+			}
+		}
+	}
+
+	.twiceTitle2 {
+		margin-left: 36upx;
+	}
+
+	.submitButtom {
+		margin-top: 57upx;
+		width: 686upx;
+		height: 83upx;
+		background: #509DFD;
+		border-radius: 42upx;
+		text-align: center;
+
+		>span {
+			line-height: 83upx;
+			font-size: 28upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.fill {
+		width: 750upx;
+		height: 36upx;
+	}
+
+	.userIntroduce {
+		margin-top: 23upx;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+	}
+
+	.userIntroduceInput {
+		width: 554upx;
+		height: 150upx;
+		margin-top: 37upx;
+		background: rgba(250, 250, 250, 1);
+		border-radius: 10upx;
+		padding: 30upx 23upx;
+	}
+
+	.userIntroduceInputPackage {
+		>textarea {
+			width: 554upx;
+			height: 150upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	textarea::placeholder {
+		font-size: 24upx;
+
+		color: rgba(204, 204, 204, 1);
+	}
+
+	.userImgUpdata {
+		width: 157upx;
+		height: 157upx;
+		background: rgba(246, 246, 246, 1);
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 10upx;
+		text-align: center;
+
+		>image {
+			margin-top: 53upx;
+			width: 53upx;
+			height: 53upx;
+		}
+	}
+
+	.imgPreview {
+		overflow: hidden;
+		width: 157upx;
+		height: 157upx;
+		background: gray;
+		margin-right: 37upx;
+		margin-bottom: 10upx;
+		border-radius: 10upx;
+
+		>image {
+			width: 157upx;
+			height: 157upx;
+		}
+	}
+
+	.userIntroduceUpdata {
+		margin-top: 39upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.mainTwo {
+		margin-left: 31upx;
+	}
+
+	.twoPageTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+
+	.twoPageTitleLeft {
+		>view {
+			vertical-align: middle;
+		}
+
+		>span {
+			margin-left: 16upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.twoPageTitleRight {
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+
+	.checkType {}
+
+	.checkBox {
+		>label {
+			margin-top: 57upx;
+			display: block;
+
+			>span {
+				margin-left: 24upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.agreement {
+		margin-top: 50upx;
+
+		>label {
+			>span {
+				margin-left: 10upx;
+				font-size: 24upx;
+
+				color: #999999;
+
+				>span {
+					color: #4f6d8c;
+				}
+			}
+		}
+	}
+
+	.agreement1 {
+		margin-top: 30upx;
+
+		>label {
+			>span {
+				margin-left: 10upx;
+				font-size: 24upx;
+
+				color: #999999;
+
+				>span {
+					color: #4f6d8c;
+				}
+			}
+		}
+	}
+
+	.agreementButton {
+		width: 21upx !important;
+		height: 21upx !important;
+	}
+
+	.radio {
+		>span {
+			vertical-align: middle;
+		}
+
+		>image {
+			vertical-align: middle;
+			width: 25upx;
+			height: 25upx;
+		}
+	}
+
+	.close {
+		width: 32upx !important;
+		height: 32upx !important;
+		position: relative;
+		bottom: 150upx;
+		left: 120upx;
+		z-index: 30;
+	}
+
+	.full {
+		width: 750upx;
+		height: 118upx;
+	}
+
+	.iframe-wid-hgt {
+		width: 100vw;
+		position: fixed;
+		bottom: 0;
+		left: -50vw;
+	}
+	
+	.cicupation {
+		width: 750upx;
+		height: 650upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		border-radius: 30upx 30upx 0 0;
+		display: flex;
+		padding-bottom: 150upx;
+		
+		.cicupation-left {
+			padding-right: 10upx;
+			height: 450upx;
+			flex: 1;
+			overflow: auto;
+			.left-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				color: #ffffff;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				font-weight: bold;
+			}
+			.left-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+		.cicupation-right {
+			flex: 1;
+			padding-left: 10upx;
+			height: 450upx;
+			overflow: auto;
+			.right-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				color: #ffffff;
+			}
+			.right-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+	}
+	
+	.dire {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.showPic {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 9999;
+
+		.showOne {
+			width: 100%;
+			height: 60%;
+			background: black;
+			position: fixed;
+			opacity: 0.5;
+			left: 0;
+			bottom: 40%;
+		}
+
+		.showTwo {
+			width: 100%;
+			height: 560upx;
+			background: white;
+			position: fixed;
+			left: 0;
+			display: flex;
+			bottom: 0;
+			justify-content: space-around;
+
+			.picName {
+				width: 245rpx;
+				height: 80rpx;
+				line-height: 80rpx;
+				margin-top: 10rpx;
+				text-align: center;
+				border-radius: 15rpx;
+				font-size: 30upx;
+				padding: 0 10upx;
+			}
+		}
+
+		.suolBT {
+			width: 84vw;
+			padding: 0 60upx;
+			position: absolute;
+			bottom: 30upx;
+		}
+	}
+
+	.noCheckedPic {
+		background: #ff4444;
+		color: white;
+	}
+
+	.checkedPic {
+		background: white;
+		color: black;
+	}
+
+	.twoLevelList {
+		width: 350rpx;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+		word-break: break-all;
+	}
+	.homema{
+		.check-item {
+			padding: 0 10upx;
+			border-radius: 10upx;
+			background-color: #ff4444;
+			color: #ffffff;
+			height: 40upx;
+			line-height: 40upx;
+			text-align: center;
+			display: inline-block;
+			margin-right: 10upx;
+			margin-bottom: 10upx;
+			position: relative;
+			>image {
+				width: 30upx;
+				height: 30upx;
+				margin-top: 5upx;
+				vertical-align: top;
+				margin-left: 10upx;
+			}
+		}
+	}
+</style>
diff --git a/pages/mainPages/agreement/agreement.vue b/pages/mainPages/agreement/agreement.vue
new file mode 100644
index 0000000..558fba0
--- /dev/null
+++ b/pages/mainPages/agreement/agreement.vue
@@ -0,0 +1,71 @@
+<template>
+	<!-- 用户协议 -->
+	<view class="agreement">
+		<loadlogo v-if="!loadlogo" />
+		
+		<view class="agreementPackage" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view v-html="agreementMain" v-if="type == 1">{{agreementMain}}</view>
+			<view v-html="privacy" v-else>{{privacy}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	export default {
+		data() {
+			return {
+				agreementMain: null,
+				privacy:null,
+				loadlogo:false,
+				type:1
+			};
+		},
+		onLoad(e) {
+			if(e.type){
+				this.type = e.type;
+			}
+			let _this = this,
+				{
+					agremType
+				} = e,
+				requestUrl = e.agremType === "user" ? '&p=member&do=getRegisterSet' :e.agremType==='store'?'&p=store&do=storeSettled':'&p=store&do=chargeList';
+			App._post_form(requestUrl, {}, res => {
+				_this.setData({
+					agreementMain: res.data.describe,
+					privacy:res.data.privacy
+				})
+			}, false, () => {
+				_this.loadlogo = true
+			})
+			if(e.agremType=='user'){
+				uni.setNavigationBarTitle({
+				    title: '用户协议'
+				});
+			}else if(e.agremType=='store'){
+				uni.setNavigationBarTitle({
+				    title: '入驻协议'
+				});
+			}else{
+				uni.setNavigationBarTitle({
+				    title: '付费说明'
+				});
+			}
+		},
+		components:{
+			Loadlogo
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.agreementPackage {
+		padding: 30upx;
+		font-size: 23upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+</style>
diff --git a/pages/mainPages/businessDetails/businessDetails.vue b/pages/mainPages/businessDetails/businessDetails.vue
new file mode 100644
index 0000000..7b6646e
--- /dev/null
+++ b/pages/mainPages/businessDetails/businessDetails.vue
@@ -0,0 +1,25 @@
+<template>
+	<!-- 智慧城市同城 -->
+	<view class="businessDetails">
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+page{
+	background: #F6F6F6;
+}	
+.businessDetails{
+	font-size: 0;
+}
+</style>
diff --git a/pages/mainPages/cashApplication/cashApplication.vue b/pages/mainPages/cashApplication/cashApplication.vue
new file mode 100644
index 0000000..bfe4393
--- /dev/null
+++ b/pages/mainPages/cashApplication/cashApplication.vue
@@ -0,0 +1,392 @@
+<template>
+	<!-- 提现申请 -->
+	<view class="cashApplication">
+		<far-bottom></far-bottom>
+		<!-- 提现信息 -->
+		<view class="cashInfoTitle">
+			<view class="cashInfoTitlePackage">
+				<view>
+					<image :src="imgfixUrls+ 'merchant/qd.png'" />
+					<span>待提现金额</span>
+				</view>
+				<view>
+					<span>
+						¥
+						<span>{{ creditCashPage.nowmoney }}</span>
+					</span>
+				</view>
+				<view>
+					<span>
+						已提现：
+						<span>
+							¥
+							<span>{{ creditCashPage.alcredit }}</span>
+						</span>
+					</span>
+					<view @click="goCash"><span>提现</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 提现信息 -->
+
+		<!-- 导航栏 -->
+		<view class="nav">
+			<view @click="checkStatus(0)">
+				<view :class="status == 0 ? 'check' : ''"><span>全部</span></view>
+			</view>
+			<view @click="checkStatus(1)">
+				<view :class="status == 1 ? 'check' : ''"><span>处理中</span></view>
+			</view>
+			<view @click="checkStatus(2)">
+				<view :class="status == 2 ? 'check' : ''"><span>已完成</span></view>
+			</view>
+			<view @click="checkStatus(3)">
+				<view :class="status == 3 ? 'check' : ''"><span>驳回</span></view>
+			</view>
+		</view>
+		<!-- 导航栏 -->
+
+		<!-- 提现列表 -->
+		<scroll-view :style="{ height: scrollHeight }">
+			<!-- 列表循环模板 -->
+			<view class="txMb" v-for="(item, index) in list" v-if="type.indexOf(item.status) !== -1 || status == 0">
+				<view class="txMbPackage">
+					<view class="txMbLeft">
+						<view class="txMbImg">
+							<image :src="imgfixUrls+ 'merchant/payPal.svg'" v-if="item.payment_type == 1" />
+							<image :src="imgfixUrls+ 'merchant/wechatPay.svg'" v-if="item.payment_type == 2" />
+						</view>
+						<view class="txMbInfoTips">
+							<view v-if="item.payment_type == 1"><span>提现到{{examineing==0?'支付宝':'渠道1'}}</span></view>
+							<view v-if="item.payment_type == 2"><span>提现到微信</span></view>
+							<view v-if="item.payment_type == 3"><span>提现到{{examineing==0?'银行卡':'渠道2'}}</span></view>
+							<view>
+								<span>服务费：¥{{ item.sapplymoney }}</span>
+							</view>
+							<view>
+								<span>{{ item.applytime }}</span>
+							</view>
+						</view>
+					</view>
+					<view class="txMbRight">
+						<view class="txMbInfoNr">
+							<view>
+								<span>¥{{ item.sapplymoney }}</span>
+							</view>
+							<view><span>预计到账</span></view>
+							<view v-if="item.status == 5"><span style="color:#DEA85F">提现成功</span></view>
+							<view v-if="item.status == 1 || item.status == 2 || item.status == 3"><span style="color:#00C800">审核中...</span></view>
+							<view v-if="item.status == -1 || item.status == -2"><span style="color:#FE504F">提现失败</span></view>
+						</view>
+					</view>
+				</view>
+				<view class="line"></view>
+			</view>
+			<!-- 列表循环模板 -->
+		</scroll-view>
+		<!-- 提现列表 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import util from '@/common/js/util.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			type: [],
+			scrollHeight: null,
+			status: 0,
+			page: 1,
+			list: [],
+			pagetotal: null,
+			creditCashPage: {},
+			img:'',
+			examineing:1
+		};
+	},
+	mounted() {
+		let _this = this;
+		_this.img = _this.imgfixUrl;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight;
+			}
+		});
+		uni.createSelectorQuery()
+			.select('.cashInfoTitle')
+			.boundingClientRect(data => {
+				_this.scrollHeight = _this.phoneHight - 15 - data.height;
+			})
+			.exec();
+		uni.createSelectorQuery()
+			.select('.nav')
+			.boundingClientRect(data => {
+				_this.scrollHeight = _this.scrollHeight - data.height + 'px';
+				console.info(_this.scrollHeight);
+			})
+			.exec();
+	},
+	onLoad: function() {
+		this.init();
+		let TextSubstitution = uni.getStorageSync('TextSubstitution');
		this.examineing = TextSubstitution.examineing || 0;
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.creditCashRecord();
+			_this.creditCashPageInfo();
+		},
+		// 余额提现页面
+		creditCashPageInfo() {
+			let _this = this;
+			let data = {};
+			App._post_form('&p=member&do=creditCashPage', data, res => {
+				_this.creditCashPage = res.data;
+			});
+		},
+		// 余额提现记录
+		creditCashRecord() {
+			let _this = this;
+			let data = {
+				page: _this.page,
+				status: _this.status
+			};
+			App._post_form('&p=member&do=creditCashRecord', data, res => {
+				for (let i = 0; i < res.data.list.length; i++) {
+					res.data.list[i].applytime = util.formatTime(res.data.list[i].applytime, 'info', '-');
+					res.data.list[i].status = Number(res.data.list[i].status);
+				}
+				_this.list = res.data.list;
+				_this.pagetotal = res.data.pagetotal;
+			});
+		},
+		// 跳转提现
+		goCash() {
+			App.navigationTo({
+				url: 'pages/subPages/balance/cash/cash'
+			});
+		},
+		checkStatus(status) {
+			let _this = this;
+			_this.type = [];
+			_this.status = status;
+			if (status == 0) {
+				_this.type.push(0);
+			}
+			if (status == 1) {
+				_this.type.push(1);
+				_this.type.push(2);
+				_this.type.push(3);
+			}
+			if (status == 2) {
+				_this.type.push(5);
+			}
+			if (status == 3) {
+				_this.type.push(-1);
+				_this.type.push(-2);
+			}
+			console.info(_this.type);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.line{
+
+		margin: auto;
+		width:688upx;
+		height:2upx;
+		background:rgba(238,238,238,1);
+	}
+	.txMbLeft{
+		>view{
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+.cashApplication {
+	font-size: 0;
+	border: 1upx solid rgba(0, 0, 0, 0);
+	overflow-x:hidden;
+}
+page {
+	background: #ffffff;
+}
+.cashInfoTitle {
+	margin: 20upx auto 0 auto;
+	width: 688upx;
+	background: linear-gradient(119deg, rgba(255, 68, 68, 1) 0%, rgba(253, 113, 55, 1) 100%);
+	box-shadow: 0px 12upx 19upx 5upx rgba(196, 23, 45, 0.35);
+	border-radius: 20upx 20upx 0px 0px;
+}
+.cashInfoTitlePackage {
+	padding: 30upx;
+	> view:nth-child(1) {
+		> image {
+			vertical-align: middle;
+			width: 30upx;
+			height: 33upx;
+		}
+		> span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 24upx;
+			
+			
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin: 10upx 0 0 0;
+		> span {
+			font-size: 24upx;
+			
+			font-weight: 800;
+			color: rgba(255, 255, 255, 1);
+			> span {
+				font-size: 48upx;
+			}
+		}
+	}
+	> view:nth-child(3) {
+		display: flex;
+		justify-content: space-between;
+		margin: 50upx 0 0 0;
+		> span {
+			line-height: 64upx;
+			font-size: 24upx;
+			
+			
+			color: rgba(255, 255, 255, 1);
+			> span {
+				font-size: 24upx;
+				
+				font-weight: bold;
+				color: rgba(255, 255, 255, 1);
+				> span {
+					font-size: 32upx;
+				}
+			}
+		}
+		> view {
+			display: inline-block;
+			width: 140upx;
+			height: 64upx;
+			border: 1upx solid rgba(255, 255, 255, 1);
+			border-radius: 32upx;
+			text-align: center;
+			> span {
+				line-height: 64upx;
+				font-size: 28upx;
+				
+				font-weight: bold;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+}
+.nav {
+	width: 750upx;
+	height: 75upx;
+	background: #ffffff;
+	display: flex;
+	justify-content: space-between;
+	overflow: hidden;
+	> view {
+		display: inline-block;
+		width: 25%;
+		> view {
+			margin: auto;
+			width: 85upx;
+			height: 69upx;
+			text-align: center;
+			border-bottom:6upx solid rgba(0,0,0,0);
+			> span {
+				line-height: 75upx;
+				font-size: 28upx;
+				
+				
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+}
+.check{
+	border-bottom:6upx solid #FF4444 !important;
+	>span{
+		color:rgba(255,68,68,1) !important;
+	}
+}
+.txMb{
+
+}
+.txMbPackage{
+	padding: 30upx;
+	display:flex;
+	justify-content:space-between;
+	>view{
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.txMbImg{
+	width:50upx;
+	height:40upx;
+	>image{
+		width:50upx;
+	}
+}
+.txMbInfoTips{
+	margin-left:30upx;
+	>view:nth-child(1){
+		>span{
+			font-size:28upx;
+			color:rgba(51,51,51,1);
+		}
+	}
+	>view:nth-child(2){
+		margin:10upx 0 0 0;
+		>span{
+			font-size:24upx;
+			color:rgba(153,153,153,1);
+		}
+	}
+	>view:nth-child(3){
+		margin:10upx 0 0 0;
+		>span{
+			font-size:24upx;
+			color:rgba(153,153,153,1);
+		}
+	}
+}
+.txMbInfoNr{
+	text-align:right;
+	>view:nth-child(1){
+		>span{
+			font-size:28upx;
+				color:rgba(51,51,51,1);
+		}
+	}
+	>view:nth-child(2){
+		margin:10upx 0 0 0;
+		>span{
+			font-size:24upx;
+			color:rgba(153,153,153,1);
+		}
+	}
+	>view:nth-child(3){
+		margin:10upx 0 0 0;
+		>span{
+			font-size:24upx;
+
+	}
+}
+}
+</style>
diff --git a/pages/mainPages/comment/comment.vue b/pages/mainPages/comment/comment.vue
new file mode 100644
index 0000000..14f3b35
--- /dev/null
+++ b/pages/mainPages/comment/comment.vue
@@ -0,0 +1,576 @@
+<template>
+	<!-- 发表评论 -->
+	<view class="comment">
+		<far-bottom></far-bottom>
+		<view class="orderInfo">
+			<view class="orderInfoPackage" v-if="goodsDetail || oderData">
+				<view class="orderInfoImg">
+					<image :src="goodsDetail.thumb?goodsDetail.thumb:goodsDetail.logo?goodsDetail.logo:oderData.storelist[0].goodlist[0].thumb" />
+				</view>
+				<view class="info">
+					<view class="nameUp">
+						{{ goodsDetail.goodsname?goodsDetail.goodsname:goodsDetail.goods_name?goodsDetail.goods_name:oderData.storelist[0].storename}}
+					</view>
+					<view v-if="type !== '9'">
+						<span>
+							¥{{ goodsDetail.price?goodsDetail.price:oderData.storelist[0].allmoney}}
+							<span v-if="type!='8'&&type!='6' && !oderData && goodsDetail.oldprice" style="text-decoration:line-through;">¥ {{ goodsDetail.oldprice }}</span>
+						</span>
+						<!-- <view><span>订单详情</span></view> -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品详情 -->
+
+		<!-- 评论区域 -->
+		<view class="plView">
+			<view class="plPackage">
+				<view class="checkStar">
+					<span>评分</span>
+					<view class="starPackage">
+						<view>
+							<image :src="imgfixUrls+ 'merchant/nStar.png'" v-if="stars.indexOf(1) == -1" @click="checkedStar(1)" />
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" v-else @click="checkedStar(1)" />
+						</view>
+						<view>
+							<image :src="imgfixUrls+ 'merchant/nStar.png'" v-if="stars.indexOf(2) == -1" @click="checkedStar(2)" />
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" v-else @click="checkedStar(2)" />
+						</view>
+						<view>
+							<image :src="imgfixUrls+ 'merchant/nStar.png'" v-if="stars.indexOf(3) == -1" @click="checkedStar(3)" />
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" v-else @click="checkedStar(3)" />
+						</view>
+						<view>
+							<image :src="imgfixUrls+ 'merchant/nStar.png'" v-if="stars.indexOf(4) == -1" @click="checkedStar(4)" />
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" v-else @click="checkedStar(4)" />
+						</view>
+						<view>
+							<image :src="imgfixUrls+ 'merchant/nStar.png'" v-if="stars.indexOf(5) == -1" @click="checkedStar(5)" />
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" v-else @click="checkedStar(5)" />
+						</view>
+					</view>
+				</view>
+				<view class="plInput">
+					<textarea placeholder="请输入评论" maxlength="140" v-model="text"></textarea>
+					<view class="plLength">
+						<span></span>
+						<span>{{ text.length }}/140</span>
+					</view>
+
+					<view class="plUpload">
+						<view class="picMb" v-for="(item,index) in picArray">
+							<image :src="item" />
+							<image @click="closePic(item)" :src="imgfixUrls+ 'merchant/close.png'" class="closeButton" />
+						</view>
+						<view class="upLoad" @click="uploadFiles">
+							<image :src="imgfixUrls+ 'merchant/cream.png'" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 评论区域 -->
+
+		<view class="tips"><span>tips：内容丰富的评论有机会成为优质点评哦~</span></view>
+
+		<!-- 提交按钮 -->
+		<view class="plSubmit" @click="orderComment"><span>发表</span></view>
+		<!-- 提交按钮 -->
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components:{
+			getvxphone,
+			PhoneMask
+		},
+		data() {
+			return {
+				id: null,
+				type: null,
+				goodsDetail: null,
+				stars: [],
+				pic: [],
+				text: '',
+				star: null,
+				table: null,
+				picArray: [],
+				id1: null,
+				imageArr: [],
+				oderData:null,
+				img:'',
+				popShow: false,
+				vxshow:false
+			};
+		},
+		onLoad: function(option) {
+			this.img= this.imgfixUrl;
+			this.id = option.goods_id; //商品id  type=9时为商户id
+			this.id1 = option.order_id; //订单id
+			this.type = option.plugin; //商品类型：1=抢购  2=团购  3=拼团 4=大礼包 5=优惠卷 6=折扣卡 7=砍价商品 8=积分商品  9=买单评价，获取商户信息
+			this.table = option.a;
+			this.init(option.order_id);
+			if(option.plugin == 'citydelivery'){
+				this.getorder(option)
+			}
+		},
+		methods: {
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			getorder(option){
+				App._post_form(
+					`&p=citydelivery&do=orderDetail&id=${option.order_id}&idstatus=${2}`,
+					{},
+					res => {
+						this.setData({
+							oderData:res.data
+						})
+						console.log(this.oderData);
+					},
+					false,
+					() => {
+						// _this.loadlogo = true
+					}
+				);
+			},
+			init(order_id) {
+				let _this = this;
+				// #ifdef H5	
+				wxApi.wxRegister();
+				// #endif
+				//判断获取商品详情还是获取商户详情
+				if (_this.type === '9') {
+					//获取商户详情
+					_this.getStoreDetail();
+				} else if (_this.type === '6') {
+					// 
+					_this.getPayOnlieOrder(order_id)
+				} else {
+					//获取商品详情
+					_this.getGoodsDetail();
+				}
+			},
+			getPayOnlieOrder(order_id) {
+				let _this = this
+				let data = {
+					orderid: order_id
+				}
+				App._post_form('&p=Goods&do=getPayOnlieOrder', data, res => {
+					// _this.goodsDetail = res.data;
+					_this.setData({
+						goodsDetail:res.data
+					})
+				})
+			},
+			// 加星星
+			checkedStar(xin) {
+				let _this = this;
+				_this.stars = [];
+				for (let i = 0; i < xin; i++) {
+					_this.stars.push(i + 1);
+				}
+				console.info(_this.stars);
+			},
+			// 商品详情信息获取
+			getGoodsDetail() {
+				let _this = this;
+				let data = {
+					order_id: _this.id1,
+					plugin: _this.type
+				};
+				App._post_form('&p=order&do=commentPage', data, res => {
+					_this.goodsDetail = res.data;
+					
+				});
+			},
+			getStoreDetail() {
+				let _this = this;
+				let data = {
+					sid: _this.id,
+				};
+				App._post_form('&p=store&do=detail', data, res => {
+					console.log(res.data);
+					let storeData = {
+						logo: res.data.logo,
+						goods_name: res.data.storename + '在线买单',
+					};
+					
+					_this.goodsDetail = storeData;
+				});
+			},
+			// 用户对订单进行评论
+			orderComment() {
+				let _this = this;
+				let data = {
+					id: _this.id1,
+					pic: _this.pic,
+					text: _this.text,
+					star: _this.stars.length,
+					table: _this.table
+				};
+				// uni.showLoading({
+					
+				// })
+				App._post_form('&p=pay&do=orderComment', data, res => {
+					if (res.errno === 0) {
+						App.showSuccess('评价成功', () => {
+							// App.navigationTo({
+							// 	url: 'pages/subPages/orderList/orderList',
+							// 	navType: 'rediRect'
+							// })
+							uni.navigateBack({
+								delta:1
+							})
+						})
+					}
+				},fail=>{
+					// _this.gouniond();
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							
+						}
+				});
+			},
+			gouniond(){
+				uni.hideLoading();
+			},
+			// 删除图片
+			closePic(item) {
+				let _this = this
+				for (let i = 0; i < _this.picArray.length; i++) {
+					if (item == _this.picArray[i]) {
+						_this.picArray.splice(i, 1)
+						_this.pic.splice(i, 1)
+					}
+				}
+			},
+			// 文件上传接口
+			async uploadFiles(type) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+				     let res = await App.browser_upload(9);
+				     for (let i = 0; i < res.tempFilePaths.length; i++) {
+				     	let aa = await App._upLoad(res.tempFilePaths[i])
+				     	_this.pic.push(aa.data.image);
+				     	_this.picArray.push(aa.data.img);
+				     }
+				
+				     return
+				    }
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										_this.pic.push(res.data.image);
+										_this.picArray.push(res.data.img);
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i])
+							_this.pic.push(aa.data.image);
+							_this.picArray.push(aa.data.img);
+						}
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.closeButton {
+		width: 34upx !important;
+		height: 34upx !important;
+		position: relative;
+		bottom: 130upx;
+		left: 95upx;
+	}
+
+	page {
+		overflow-x: hidden;
+	}
+
+	.comment {
+		border: 1px solid rgba(0, 0, 0, 0);
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	.orderInfo {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.orderInfoPackage {
+		padding: 30upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.orderInfoImg {
+		width: 128upx;
+		height: 128upx;
+		border-radius: 6upx;
+		overflow: hidden;
+
+		>image {
+			width: 128upx;
+			height: 128upx;
+		}
+	}
+
+	.info {
+		margin-left: 30upx;
+		width: 456upx;
+
+		>view:nth-child(1) {
+			height: 70upx;	
+		}
+
+		.nameUp {
+			display: -webkit-box;
+			-webkit-line-clamp: 2;
+			-webkit-box-orient: vertical;
+			word-break: break-all;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view:nth-child(2) {
+			width: 450upx;
+			margin-top: 20upx;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				line-height: 55upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+
+				>span {
+					margin-left: 15upx;
+					font-size: 24upx;
+
+
+					text-decoration: line-through;
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view {
+				vertical-align: middle;
+				text-align: center;
+				width: 139upx;
+				height: 55upx;
+				border: 1upx solid rgba(238, 238, 238, 1);
+				border-radius: 28upx;
+
+				>span {
+					font-size: 24upx;
+
+
+					color: rgba(153, 153, 153, 1);
+					line-height: 55upx;
+				}
+			}
+		}
+	}
+
+	.plView {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.plPackage {
+		padding: 30upx;
+	}
+
+	.checkStar {
+		text-align: center;
+
+		>span {
+			vertical-align: middle;
+			font-size: 28upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.starPackage {
+		display: inline-block;
+		vertical-align: middle;
+		margin-left: 5upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+			margin-left: 20upx;
+			width: 49upx;
+			height: 47upx;
+
+			>image {
+				width: 49upx;
+				height: 47upx;
+			}
+		}
+	}
+
+	.plInput {
+		width: 630upx;
+		background: rgba(253, 251, 254, 1);
+		border-radius: 6upx;
+		margin: 50upx 0 0 0;
+
+		>textarea {
+			height: 180upx;
+			padding: 30upx;
+			width: 570upx;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.plLength {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			margin-right: 30upx;
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.plUpload {
+		padding: 30upx;
+	}
+
+	.picMb {
+		vertical-align: top;
+		margin: 10upx 10upx 0 0;
+		display: inline-block;
+		width: 133upx;
+		height: 132upx;
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 6upx;
+
+		>image {
+			width: 133upx;
+			height: 132upx;
+		}
+	}
+
+	.upLoad {
+		margin: 10upx 0 0 0;
+		vertical-align: top;
+		display: inline-block;
+		width: 133upx;
+		height: 132upx;
+		border: 1upx dashed rgba(204, 204, 204, 1);
+		border-radius: 6upx;
+		text-align: center;
+
+		>image {
+			margin: 33upx 0 0 0;
+			width: 66upx;
+			height: 66upx;
+		}
+	}
+
+	.tips {
+		margin: 40upx 0 0 0;
+		text-align: center;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.plSubmit {
+		margin: 70upx auto 0 auto;
+		width: 688upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+</style>
diff --git a/pages/mainPages/econdaryClassification/econdaryClassification.vue b/pages/mainPages/econdaryClassification/econdaryClassification.vue
new file mode 100644
index 0000000..6b6ab0b
--- /dev/null
+++ b/pages/mainPages/econdaryClassification/econdaryClassification.vue
@@ -0,0 +1,869 @@
+<template>
+	<!-- 帖子二级头条 -->
+	<view class="econdaryClassification">
+		<far-bottom></far-bottom>
+		<!-- 头部导航栏 -->
+		<view class="love"></view>
+		<view class="topNav">
+			<view class="searchInput">
+				<image :src="imgfixUrls + 'merchant/serach.png'" />
+				<input placeholder="请输入关键字进行搜索" v-model="keyword" @blur="doSearch" />
+			</view>
+			<view style="padding-top: 30upx;" v-if="adv.length > 0">
+				<swiper class="swiper" :indicator-dots="true" indicator-active-color="#ffffff" :autoplay="true" :interval="2000" :duration="500">
+					<swiper-item v-for="(item, index) in adv" :key="index" >
+						<image :src="item" mode="aspectFill" style="width: 100%; height: 100%;"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="tags" v-if="!!children && children.length > 0">
+				<view :class="two_id == item.id?'tagsItem':'notagsItem'" v-for="(item,index) in children" :key="index" @click="tagcheck(item)">
+					{{item.title}}
+				</view>
+			</view>
+			<filtertab :requestType="'1'" ref="filtertab" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid"
+			 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+		</view>
+
+		<!-- 头部导航栏 -->
+
+		<!-- 帖子列表 :style="{ height: phoneHight }" -->
+		<scroll-view  class="listShow" :scroll-y="true" @scrolltolower="listLoad" @scroll="scrollClose">
+			<!-- 顶部填充层 -->
+			<!-- <view class="topFull" style="height:640rpx;" v-if="adv.length > 0 && children.length > 0"></view>
+			<view class="topFull" style="height:530rpx;" v-else-if="adv.length > 0 && children.length == 0"></view>
+			<view class="topFull" style="height:300rpx;" v-else-if="adv.length == 0 && children.length > 0"></view>
+			<view class="topFull" style="height:180rpx;" v-else> </view> -->
+			<!-- 顶部填充层 -->
+			<nonemores v-if="total == '0'"></nonemores>
+			<!-- 循环模板 -->
+			<postList :itemInfo="item"  :indexNumber="index" :indexShow="indexShow" @changePlay="changePlay" :currentPlay="currentPlay" :stopVideo="stopVideo" @operationShow="operationShow" v-for="(item, index) in list"
+			 v-else></postList>
+			<!-- 循环模板 -->
+
+			<!-- 底部填充层 -->
+			<view class="full" v-else>
+				<span>{{ scdpText }}</span>
+			</view>
+			<!-- 底部填充层 -->
+			<view style="height: 220rpx;"></view>
+		</scroll-view>
+		<!-- 帖子列表 -->
+		<TabBars :tabBarAct="0" :pageType="'9'" />
+	</view>
+</template>
+
+<script>
+	import nonemores from '@/components/template/nonemores';
+	import postList from '@/components/template/postList';
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue'
+	import TabBars from '@/components/template/tabBar'
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components: {
+			filtertab,
+			postList,
+			nonemores,
+			TabBars
+		},
+		data() {
+			return {
+				sortList: [{
+						label: '发帖时间',
+						sort: 0
+					},
+					{
+						label: '浏览数量',
+						sort: 1
+					},
+					{
+						label: '分享数量',
+						sort: 2
+					},
+					{
+						label: '点赞数量',
+						sort: 3
+					}
+				],
+				sortScroLeft: 0,
+				sortShow: false,
+				typeScroLeft: 0,
+				cityScroLeft: 0,
+				cityScroCenter: 0,
+				cityScroRight: 0,
+				cityLeft: [],
+				cityCenter: [],
+				cityRight: [],
+				cityShow: false,
+				typeShow: false,
+				id: 0,
+				title: '',
+				phoneHight: 0,
+				fullHeight: 0,
+				page_index: 5,
+				page: 1,
+				list: [],
+				scdpText: '',
+				total: null,
+				indexShow: -1,
+				keyword: '',
+				adcode: null,
+				cityList: [],
+				region_id: null,
+				checkShort: null,
+				itempx: null,
+				cityRR: null,
+				cityRC: null,
+				cityRL: null,
+				itempx: null,
+				cityListInfo: [],
+				typeScroLeft: 0,
+				typeScroRight: 0,
+				typeIndex: null,
+				typeList: [],
+				sort: 0,
+				two_id: 0,
+				img: '',
+				cate_one:null,
+				cate_two:null,
+				adv:[],
+				children:[],
+				currentPlay: -2,//当前正在播放的视频在列表中的索引,-2表示没有正在播放
+				stopVideo: 0,
+				scrollLock: false,
+				scrollTimer: null,
+			};
+		},
+		onLoad: function(option) {
+			
+			//#ifndef H5
+			this.title = decodeURI(option.title);
+			//#endif
+			//#ifdef H5
+			this.title = option.title;
+			//#endif
+			
+			this.cate_one = option.id;
+			this.cate_two = option.two_id || 0;
+			this.two_id = option.two_id || 0;
+			this.id = option.id;
+			this.init();
+		},
+		mounted() {
+			let _this = this;
+			_this.img = _this.imgfixUrl;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			uni.createSelectorQuery()
+				.select('.topNav')
+				.boundingClientRect(data => {
+					_this.fullHeight = data.height + 'px';
+				})
+				.exec();
+			uni.createSelectorQuery()
+				.select('.love')
+				.boundingClientRect(data => {
+					_this.itempx = data.height;
+				})
+				.exec();
+		},
+		onReady() {
+			let _this = this;
+		},
+		methods: {
+			tagcheck(item){
+				this.two_id = item.id;
+				this.cate_two = item.id;
+				this.title = item.title;
+				this.page = 1;
+				this.getInfoList();
+			},
+			selectOrders(data) {
+				console.log('1分类',data);
+				let _this = this;
+				console.info('selectOrders', data)
+				_this.sort = data.val;
+				// _this.two_id = 0;
+				_this.page = 1;
+				_this.getInfoList();
+			},
+			selectClassTwoid(data) {
+				console.log('2分类');
+				let _this = this;
+				console.info('selectClassTwoid', data)
+				// debugger
+				_this.two_id = data.id;
+				// _this.id = data.id;
+				_this.cate_two = data.id;
+				_this.title = '';
+				_this.page = 1;
+				this.init()
+				// _this.getInfoList();
+
+			},
+			selectClassid(data) {
+				console.log('3分类',data);
+				let _this = this;
+				console.info('selectClassid', data)
+				_this.id = data.id;
+				_this.cate_one = data.id;
+				_this.cate_two = '';
+				_this.title = data.name;
+				_this.two_id = 0;
+				_this.page = 1;
+				this.init()
+			},
+			selectAreaid(data) {
+				console.log('4分类');
+				let _this = this;
+				console.info('selectAreaid', data)
+				_this.region_id = data.id;
+				// _this.two_id = 0;
+				_this.page = 1;
+				_this.getInfoList();
+			},
+			getType() {
+				let _this = this;
+				let data = {};
+				App._post_form(
+					'&p=pocket&do=homeInfo',
+					data,
+					res => {
+						if(res.data.adv){
+							_this.adv = [];
+							if(JSON.stringify(res.data.adv) == '[]'){
+								_this.adv = res.data.adv;
+							}else{
+								res.data.adv.map(item=>{
+									_this.adv.push(item.img);
+								})
+							}
+							
+						}
+						if(_this.id != '0'){
+							res.data.cate_list.map(item=>{
+								if(item.id == _this.id){
+									if(item.adv){
+										_this.adv = item.adv;
+									}else{
+										_this.adv = [];
+									}
+								}
+							})
+						}
+						console.log(_this.adv,'我是adv')
+						for (let i = 0; i < res.data.cate_list.length; i++) {
+							if (_this.id == res.data.cate_list[i].id) {
+								// debugger
+								// _this.title = res.data.cate_list[i].title;
+								_this.typeIndex = i;
+								_this.typeList = res.data.cate_list;
+							}
+							
+							
+						}
+						
+					},
+					fail => {
+						if (fail.message == '掌上信息已关闭') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							});
+						}
+					}
+				);
+			},
+			cityClose(type) {
+				let _this = this;
+				_this.cityShow = false;
+				_this.checkShort = null;
+				_this.doSearch();
+			},
+			checkSort(sort) {
+				let _this = this;
+				_this.sort = sort;
+			},
+			sortClose(type) {
+				let _this = this;
+				_this.sortShow = false;
+				_this.checkShort = null;
+				_this.doSearch();
+			},
+			typeClose(type) {
+				let _this = this;
+				_this.typeShow = false;
+				_this.checkShort = null;
+				for (let i = 0; i < _this.typeList.length; i++) {
+					if (_this.id == _this.typeList[i].id) {
+						_this.title = _this.typeList[i].title;
+						uni.setNavigationBarTitle({
+							title: _this.title
+						});
+					}
+				}
+				_this.doSearch();
+			},
+			checkCity(id, type) {
+				let _this = this;
+				_this.region_id = id;
+				if (type == 0) {
+					_this.cityRight = [];
+					_this.cityCenter = [];
+					for (let i = 0; i < _this.cityLeft.length; i++) {
+						_this.cityLeft[i].select = 0;
+						if (_this.cityLeft[i].id == id) {
+							_this.cityLeft[i].select = 1;
+							_this.cityRL = i;
+							_this.cityScroLeft = (_this.cityRL - 2) * _this.itempx;
+							for (let a = 0; a < _this.cityLeft[i].list.length; a++) {
+								_this.cityLeft[i].list[a].select = 0;
+								_this.cityCenter.push(_this.cityLeft[i].list[a]);
+							}
+						}
+					}
+				}
+				if (type == 1) {
+					_this.cityRight = [];
+					for (let i = 0; i < _this.cityCenter.length; i++) {
+						_this.cityCenter[i].select = 0;
+						if (id == _this.cityCenter[i].id) {
+							_this.cityCenter[i].select = 1;
+							_this.cityRC = i;
+							_this.cityScroCenter = (_this.cityRC - 2) * _this.itempx;
+							for (let a = 0; a < _this.cityCenter[i].list.length; a++) {
+								_this.cityCenter[i].list[a].select = 0;
+								_this.cityRight.push(_this.cityCenter[i].list[a]);
+							}
+						}
+					}
+				}
+				if (type == 2) {
+					for (let i = 0; i < _this.cityRight.length; i++) {
+						_this.cityRight[i].select = 0;
+						if (id == _this.cityRight[i].id) {
+							_this.cityRight[i].select = 1;
+							_this.cityRR = i;
+							_this.cityScroRight = (_this.cityRR - 2) * _this.itempx;
+						}
+					}
+				}
+			},
+			init() {
+				let _this = this;
+				_this.getloca();
+				uni.setNavigationBarTitle({
+					title: _this.title
+				});
+				uni.getStorage({
+					key: 'agencyData',
+					success: function(res) {
+						_this.region_id = res.data.areaid;
+					}
+				});
+				_this.getInfoList();
+				_this.getType();
+			},
+			// 滚动关闭
+			scrollClose() {
+				let _this = this;
+				if (_this.indexShow !== -1) {
+					_this.indexShow = -1;
+				} else {}
+			},
+			checkSortll() {
+				let _this = this;
+				if (_this.sortShow == true) {
+					_this.sortShow = false;
+					_this.checkShort = null;
+				} else {
+					_this.sortShow = true;
+					_this.typeShow = false;
+					_this.cityShow = false;
+					_this.checkShort = 2;
+				}
+			},
+			checkTypell() {
+				let _this = this;
+				if (_this.typeShow == true) {
+					_this.typeShow = false;
+					_this.checkShort = null;
+				} else {
+					_this.typeShow = true;
+					_this.cityShow = false;
+					_this.sortShow = false;
+					_this.checkShort = 1;
+					for (let i = 0; i < _this.typeList.length; i++) {
+						if (_this.typeList[i].id == _this.id) {
+							if (i > 3) {
+								_this.typeScroLeft = (i - 2) * _this.itempx;
+							}
+						}
+					}
+				}
+			},
+			checkType(id) {
+				let _this = this;
+				_this.id = id;
+				for (let i = 0; i < _this.typeList.length; i++) {
+					if (_this.typeList[i].id == id) {
+						if (i > 3) {
+							_this.typeScroLeft = (i - 2) * _this.itempx;
+						}
+					}
+				}
+			},
+			checkll(id) {
+				let _this = this;
+				if (_this.checkShort == 0) {
+					_this.checkShort = null;
+				} else if (_this.checkShort != 0) {
+					_this.checkShort = 0;
+				}
+
+				if (_this.cityShow == true) {
+					_this.cityShow = false;
+					_this.cityScroRight = 0;
+					_this.cityScroLeft = 0;
+					_this.cityScroCenter = 0;
+				} else {
+					_this.cityShow = true;
+					_this.typeShow = false;
+					_this.sortShow = false;
+					if (!!_this.cityRR && _this.cityRR > 3) {
+						_this.cityScroRight = (_this.cityRR - 2) * _this.itempx;
+						console.info(_this.cityScroRight);
+					}
+					if (!!_this.cityRL && _this.cityRL > 3) {
+						_this.cityScroLeft = (_this.cityRL - 2) * _this.itempx;
+						console.info(_this.cityScroLeft);
+					}
+					if (!!_this.cityRC && _this.cityRC > 3) {
+						_this.cityScroCenter = (_this.cityRC - 2) * _this.itempx;
+						console.info(_this.itempx);
+					}
+				}
+			},
+			getloca() {
+				let _this = this;
+				uni.getStorage({
+					key: 'agencyData',
+					success: function(res) {
+						_this.adcode = res.data.areaid;
+						let data = {
+							city_id: res.data.areaid
+						};
+						App._post_form('&do=WholeCityList', data, res => {
+							_this.cityListInfo = res.data;
+							for (let i = 0; i < res.data.length; i++) {
+								_this.cityLeft.push(res.data[i]);
+								if (res.data[i].select == 1) {
+									_this.cityRL = i;
+									console.info(_this.cityRL);
+									for (let a = 0; a < res.data[i].list.length; a++) {
+										_this.cityCenter.push(res.data[i].list[a]);
+										if (res.data[i].list[a].select == 1) {
+											_this.cityRC = a;
+											console.info(_this.cityRC);
+											for (let c = 0; c < res.data[i].list[a].list.length; c++) {
+												_this.cityRight.push(res.data[i].list[a].list[c]);
+												if (res.data[i].list[a].list[c].select == 1) {
+													_this.cityRR = c;
+													console.info(_this.cityRR);
+												}
+											}
+										}
+									}
+								}
+							}
+						});
+					}
+				});
+			},
+			operationShow(e) {
+				console.log(e)
+				let _this = this;
+				_this.indexShow = e;
+			},
+			doSearch() {
+				let _this = this;
+				_this.page = 1;
+				_this.scdpText = '... ...加载中';
+				let data = {
+					keyword: _this.keyword,
+					region_id: _this.region_id,
+					sort: _this.sort,
+					page_index: _this.page_index,
+					page: _this.page,
+					two_id: _this.two_id || '',
+					id: _this.id
+				};
+				App._post_form(
+					'&p=pocket&do=infoList',
+					data,
+					res => {
+						_this.list = res.data.list;
+						_this.total = res.data.total;
+						_this.scdpText = '';
+						if (_this.page == _this.total || _this.total == 0) {
+							_this.scdpText = '已无更多数据了';
+						} else {
+							_this.scdpText = '';
+						}
+					},
+					fail => {
+						_this.scdpText = '加载失败请刷新';
+					}
+				);
+			},
+			// 信息列表切换
+			// getInfoList1() {
+			// 	let _this = this;
+			// 	_this.page = 1
+			// 	_this.scdpText = '... ...加载中';
+			// 	let data = {
+			// 		keyword: _this.keyword,
+			// 		region_id: _this.region_id,
+			// 		sort: _this.sort,
+			// 		page_index: _this.page_index,
+			// 		page: _this.page,
+			// 		two_id: 0,
+			// 		id: _this.id
+			// 	};
+			// 	App._post_form(
+			// 		'&p=pocket&do=infoList',
+			// 		data,
+			// 		res => {
+			// 			_this.list = res.data.list;
+			// 			_this.total = res.data.total;
+			// 			_this.scdpText = '';
+			// 			if (_this.page == _this.total || _this.total == 0) {
+			// 				_this.scdpText = '已无更多数据了';
+			// 			} else {
+			// 				_this.scdpText = '';
+			// 			}
+			// 		},
+			// 		fail => {
+			// 			_this.scdpText = '加载失败请刷新';
+			// 		}
+			// 	);
+			// },
+			// 信息列表获取
+			getInfoList() {
+				let _this = this;
+				_this.scdpText = '... ...加载中';
+				let data = {
+					keyword: _this.keyword,
+					region_id: _this.region_id,
+					sort: _this.sort,
+					page_index: _this.page_index,
+					page: _this.page,
+					two_id: _this.two_id,
+					id: _this.id
+				};
+				App._post_form(
+					'&p=pocket&do=infoList', 
+					data,
+					res => {
+						_this.list = res.data.list;
+						_this.total = res.data.total;
+						_this.scdpText = '';
+						if(!!res.data.children && _this.two_id == 0){
+							_this.children = res.data.children;
+						}else if(!res.data.children && _this.two_id == 0){
+							_this.children = [];
+						}
+						console.log(_this.list, '000000')
+						if (_this.page == _this.total || _this.total == 0) {
+							_this.scdpText = '已无更多数据了';
+						} else {
+							_this.scdpText = '';
+						}
+					},
+					fail => {
+						_this.scdpText = '加载失败请刷新';
+					}
+				);
+			},
+			// 下拉加载
+			listLoad() {
+				
+			},
+			handlerScroll(){
+				if(this.scrollLock){
+					clearTimeout(this.scrollTimer);
+				}
+				this.scrollTimer = setTimeout(()=>{
+					this.scrollLock = false;
+					this.stopVideo++;
+				}, 500)
+			},
+			changePlay(e){
+				this.stopVideo++;//先关闭上一个播放的按钮，再改变当前播放索引=最新播放视频索引
+				this.currentPlay = e;
+			}
+		},
+		onPageScroll(e){
+			//页面滚动，视频暂停
+			this.scrollLock = true;
+			this.handlerScroll();
+		},
+		onReachBottom() {
+			let _this = this;
+			if (_this.page == _this.total) {
+				_this.scdpText = '已无更多数据了';
+			} else {
+				_this.page = _this.page + 1;
+				_this.scdpText = '... ...加载中';
+				let data = {
+					keyword: _this.keyword,
+					region_id: _this.region_id,
+					sort: _this.sort,
+					page_index: _this.page_index,
+					page: _this.page,
+					two_id: _this.two_id,
+					id: _this.id
+				};
+				App._post_form(
+					'&p=pocket&do=infoList',
+					data,
+					res => {
+						_this.list = _this.list.concat(res.data.list);
+						_this.total = res.data.total;
+						_this.scdpText = '';
+						console.log(_this.page, _this.list, '000000')
+						if (_this.page == _this.total || _this.total == 0) {
+							_this.scdpText = '已无更多数据了';
+						} else {
+							_this.scdpText = '';
+						}
+					},
+					fail => {
+						_this.scdpText = '加载失败请刷新';
+					}
+				);
+				//_this.getInfoList();
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.checkViewButton {
+		>view {
+			display: inline-block;
+			width: 49%;
+			height: 50upx;
+			line-height: 50upx;
+			text-align: center;
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view:nth-child(1) {
+			border-right: 1upx solid rgba(248, 248, 248, 1);
+		}
+
+		>view:nth-child(2) {
+			color: #2196f3;
+		}
+	}
+
+	.item {
+		line-height: 100%;
+		height: 60upx !important;
+		font-size: 28upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.checkShort {
+		color: rgba(255, 68, 68, 1) !important;
+	}
+
+	.check {
+		font-size: 28upx !important;
+		color: rgba(255, 68, 68, 1) !important;
+	}
+
+	.cityScro {
+		height: 300upx;
+		text-align: center;
+		width: 32%;
+		display: inline-block;
+		vertical-align: top;
+	}
+
+	.typeScro {
+		height: 300upx;
+		text-align: center;
+		width: 100%;
+		display: inline-block;
+		vertical-align: top;
+	}
+
+	.checkView1 {
+		width: 750upx;
+		padding: 0 0 20upx 0;
+	}
+
+	.checkView {
+		width: 750upx;
+		padding: 0 0 20upx 0;
+
+		>.cityScro:nth-child(1) {
+			border-right: 0.5upx solid rgba(248, 248, 248, 1);
+		}
+
+		>.cityScro:nth-child(2) {
+			border-right: 0.5upx solid rgba(248, 248, 248, 1);
+		}
+	}
+
+	page {
+		overflow-x: hidden;
+	}
+
+	.econdaryClassification {
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	.full {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: black;
+		}
+	}
+
+	.love {
+		position: absolute;
+		height: 60upx;
+	}
+
+	.topNav {
+		z-index: 999;
+		// position: fixed;
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+	}
+	.tags{
+		padding: 30upx 10upx 30upx 30upx; 
+		// display: flex;
+		// width: auto;
+		// justify-content: space-between;
+		// flex-wrap: wrap;
+		width: 95%;
+		// max-height: 80upx;
+		overflow: auto;
+		.tagsItem{
+			display: inline-block;
+			padding: 0 20upx;
+			font-size: 28upx;
+			text-align: center;
+			margin-bottom: 10upx;
+			border-radius: 10upx;
+			height: 50upx;
+			line-height: 50upx;
+			background-color: #333333;
+			color: #FFFFFF;
+			margin-right: 20upx;
+			font-weight: 700;
+			// flex: 0.17;
+			// height: 200upx;
+			min-width: 11%;
+		}
+		.notagsItem{
+			display: inline-block;
+			padding: 0 20upx;
+			font-size: 28upx;
+			text-align: center;
+			margin-bottom: 10upx;
+			border-radius: 10upx;
+			height: 50upx;
+			line-height: 50upx;
+			background-color: #FFFFFF;
+			color: #333333;
+			margin-right: 20upx;
+			font-weight: 700;
+			// flex: 0.17;
+			// height: 200upx;
+			min-width: 11%;
+		}
+	}
+	
+	// .tags:after {
+	//     content: "";
+	//     flex: 0.17;
+	// 	min-width: 17%;
+	// }
+	
+	.searchInput {
+		z-index: 9999 !important;
+		margin: 25upx auto 0 auto;
+		width: 690upx;
+		height: 76upx;
+		background: rgba(246, 246, 246, 1);
+		border-radius: 38upx;
+
+		>image {
+			padding-left: 30upx;
+			width: 35upx;
+			height: 35upx;
+			vertical-align: middle;
+		}
+
+		>input {
+			padding-left: 25upx;
+			vertical-align: middle;
+			height: 100%;
+			width: 400upx;
+			display: inline-block;
+			font-size: 24upx;
+
+			color: black;
+		}
+	}
+
+	.typeList {
+		width: 750upx;
+
+		>view {
+			display: inline-block;
+			width: 33%;
+			height: 107upx;
+			text-align: center;
+
+			>span {
+				vertical-align: middle;
+				line-height: 107upx;
+				font-size: 28upx;
+
+				color: black;
+			}
+
+			>image {
+				margin-left: 10upx;
+				vertical-align: middle;
+				width: 20upx;
+				height: 15upx;
+			}
+		}
+	}
+
+	.listShow {}
+
+	.topFull {
+		width: 750upx;
+	}
+</style>
diff --git a/pages/mainPages/express/express.vue b/pages/mainPages/express/express.vue
new file mode 100644
index 0000000..c13539b
--- /dev/null
+++ b/pages/mainPages/express/express.vue
@@ -0,0 +1,217 @@
+<template>
+	<!-- 查看物流 -->
+	<view class="page">
+		<Loadlogo v-if="!loadlogo" />
+		<view v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header m-btm20">
+				<view class="goods_detail dis-flex m-btm20 padding-box-all b-f">
+					<view class="goods_image" :style="'background-image:url('+loggDataDetail.goods_logo+')'"></view>
+					<view class="goods_text dis-flex flex-dir-column flex-x-between flex-box" >
+						<view class="f-28 col-3 m-btm20">{{loggDataDetail.goods_name}}</view>
+						<view class="col-9 f-24" v-if="!!loggDataDetail.spec">规格:{{loggDataDetail.spec}}</view>
+						<view class="col-9 f-24">数量：{{loggDataDetail.num}}件</view>
+					</view>
+				</view>
+				<view class="loggDataDetail-info m-btm20 padding-box-all b-f">
+					<view class="f-24 col-9 m-btm20">快递公司:<text class="col-3 m-left10">{{loggDataDetail.express_name}}</text></view>
+					<view class="f-24 col-9">物流单号:<text class="col-3 m-left10">{{loggDataDetail.express_no}}</text> <text style="float: right;color: #4D8CF4;" @click="copy(loggDataDetail.express_no)">点击复制</text></view>
+				</view>
+			</view>
+			<block v-if="loggDataDetail.is_have===1">
+				<view class="logis bor-radius-10 b-f m-btm20">
+					<view class="p-right-30">
+						<view class="logis-list p-top-bom-40">
+							<view class="loggis-section">
+								<view v-for="(items,index) in loggDataDetail.list" :key="index">
+									<view class="loggis-move">
+										<view class="dis-flex flex-y-center">
+											<block v-if="index===0">
+												<view class="Icon-bg">
+													<view class="icon-line iconfont icon-check col-f"></view>
+												</view>
+											</block>
+											<block v-else>
+												<view class="circle-seg"></view>
+											</block>
+											<view class="flex-box ">
+												<view class="f-24 m-btm10" :class="index===0?'col-3':'col-9'">{{items.AcceptStation}}</view>
+												<view class="f-24" :class="index===0?'col-3':'col-9'">{{items.AcceptTime}}</view>
+											</view>
+										</view>
+									</view>
+									<view class="logg-dotted" v-if="loggDataDetail.list.length>0&&index<loggDataDetail.list.length-1"></view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	export default {
+		data() {
+			return {
+				order_id: null,
+				table_id: null,
+				loggDataList: [], // 物流信息列表
+				goodsData: [], // 商品信息列表
+				loadlogo: false,
+				loggDataDetail: {}
+			}
+		},
+		components: {
+			Loadlogo
+		},
+		computed: {
+
+		},
+		/**
+		 * 生命周期函数--监听页面加载
+		 */
+		onLoad(options) {
+			this.getlogDetail(options.order_id,options.table_id)
+			this.order_id = options.order_id;
+			this.table_id = options.table_id;
+		},
+		onShow() {
+
+		},
+		mounted() {
+			
+		},
+		methods: {
+			// 点击复制物流单号
+			copy(value){
+				//#ifdef H5
+					App.clipboard(value); //复制到剪贴板
+				//#endif
+				uni.setClipboardData({ 
+						data: value
+				});
+				//#ifdef H5
+				uni.showToast({
+					title:'内容已复制'
+				})
+				//#endif
+			},
+			//获取物流数据
+			getlogDetail(order_id, table) {
+				let _this = this;
+				App._post_form('&p=Pay&do=getLogisticsInfo', {
+					id: order_id,
+					table
+				}, (result) => {
+					if (result.errno === 0) {
+						_this.setData({
+							loggDataDetail: result.data
+						})
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	/**
+	 * 头部
+	 */
+	page {
+		background-color: #F9F9F9;
+	}
+
+	/* 	.header {
+		padding: 46upx 30upx 40upx;
+	} */
+
+	.goods_detail .goods_image {
+		margin-right: 28upx;
+		width: 170upx;
+		height: 170upx;
+		border-radius: 6upx;
+		background-repeat: no-repeat;
+		background-size: 170upx 170upx;
+		background-position: center;
+	}
+
+	/**
+	 * 订单物流
+	 */
+	.logis-title {
+		border-bottom: 1px solid #F0F0F0;
+	}
+
+	.logis-list .logis-date {
+		word-wrap: break-word;
+		word-break: normal;
+	}
+
+	.Icon-bg {
+		width: 30upx;
+		height: 30upx;
+		line-height: 30upx;
+		border-radius: 50%;
+		background: #FF4444;
+		text-align: center;
+		margin: 0 34upx;
+		position: relative;
+		z-index: 5;
+	}
+
+	.icon-line {
+		font-size: 28upx !important;
+	}
+
+	.loggis-move .address {
+		display: -webkit-box;
+		-webkit-box-orient: vertical;
+		-webkit-line-clamp: 3;
+		overflow: hidden;
+	}
+
+	.logis-list-header::after {
+		content: " ";
+		position: relative;
+		left: 7%;
+		width: 2upx;
+		height: 120upx;
+		border-left: 1px solid #EEEEEE;
+		margin: -46upx 0;
+	}
+
+	.pd-left {
+		padding-left: 6%;
+	}
+
+	.logg-dotted {
+		position: relative;
+		left: 7%;
+		width: 2upx;
+		height: 120upx;
+		border-left: 1px solid #EEEEEE;
+		margin: -46upx 0;
+	}
+
+	.circle-seg {
+		width: 16upx;
+		height: 16upx;
+		border-radius: 50%;
+		background: #F0F0F0;
+		margin: 0 42upx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.Icon-bg-presen {
+		background-color: #FFD940;
+		color: #333333 !important;
+	}
+</style>
diff --git a/pages/mainPages/headline/headlineDetail.vue b/pages/mainPages/headline/headlineDetail.vue
new file mode 100644
index 0000000..0507df4
--- /dev/null
+++ b/pages/mainPages/headline/headlineDetail.vue
@@ -0,0 +1,1393 @@
+<template>
+	<view class="container" :class="{containerOvf: barD}">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-hdetail" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="hdetail-call-mask" v-if="call" @click="call = false"></view>
+			<view class="hdetail-call" v-if="call">
+				<view class="send-call" v-if="sendCall">
+					<view class="send-call-mask" @click="sendCall = false"></view>
+					<view class="send-call-d">
+						<view class="send-call-close" @click="sendCall = false">
+							<view class="i icon iconfont icon-close"></view>
+						</view>
+						<view class="send-call-d-t">
+							<view class="send-call-d-t-stl"></view>
+							<view class="send-call-d-t-d"></view>
+						</view>
+						<view class="send-call-d-c">
+							<view class="send-call-d-c-t">
+								<image class="image" :src="imgfixUrls + 'send_call.png'" mode="aspectFill"></image>
+							</view>
+							<view class="send-call-d-c-c">
+								<view class="h1">集Call说明</view>
+								<view class="p">1、集齐要求的打Call数量，即可获得领取奖品资格；</view>
+								<view class="p">2、每个用户在同一个活动内只能为一个好友打Call；</view>
+								<view class="p">3、每个活动奖品数量有限，先集齐并领取者先得。</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="send-h">
+					<view class="send-h-t">
+						<view class="send-h-t-d">
+							<image class="image" :src="datas.call.logo" mode="aspectFill"></image>
+						</view>
+					</view>
+					<view class="send-h-c">{{ datas.call.title }}</view>
+					<view class="send-h-b">剩余{{ datas.call.stk }}份</view>
+				</view>
+				<view class="send-t1">
+					<view class="send-t1-t">
+						<view class="send-t1-t-l">
+							<image class="image" :src="datas.call.avatar" mode="aspectFill"></image>
+						</view>
+						<view class="send-t1-t-r">
+							还差<view class="em">{{ datas.call.surplus }}</view>个Call就可以免费领取，求助攻~
+						</view>
+					</view>
+					<view class="send-t1-c">
+						<view class="span" @click="hitCall()">为TA打call</view>
+					</view>
+					<view class="send-t1-b">
+						<view class="h1">
+							<view class="h1-l">
+								<view class="i" v-for="(item, key) in 4" :key="key">
+									<image class="image" :src="datas.call.hit_call[key]" mode="aspectFill" v-if="datas.call.hit_call[key] !== '' && datas.call.hit_call[key] !== null"></image>
+								</view>
+								<view class="i">···</view>
+							</view>
+							<view class="h1-r">
+								已有<view class="em">{{ datas.call.number - datas.call.surplus }}</view>人为TA打call
+							</view>
+						</view>
+						<view class="h3">
+							<view class="span" @click="sendCall = true">查看集Call说明</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="hdetail-bar-bottom">
+				<view class="bar-i pag-index" @click="navToBack">
+					<view class="bar-i-link weui-grid">
+						<view class="bar-i-t">
+							<view class="i icon iconfont icon-home"></view>
+						</view>
+						<view class="bar-i-c">首页</view>
+					</view>
+				</view>
+				<view class="bar-i pag-rushdetail">
+					<view class='a' @click="skip_goods" v-if="!!datas['basic'] && !!datas['basic']['goods']">去购买</view>
+				</view>
+			</view>
+			<view class="hdetail-h" v-if="!!datas.basic && !!datas.basic.display_img && !datas.basic.advs">
+				<image class="image" :src="datas.basic.display_img" mode="widthFix"></image>
+			</view>
+			<view  v-else>
+				<swiper class="swiper" :style="{width: imgStyle.width + 'px', height:imgStyle.height + 'px' }" :indicator-dots="true" indicator-active-color="#ffffff" :autoplay="true" :interval="2000" :duration="500">
+						<swiper-item v-for="(item, index) in datas.basic.advs" :key="index" >
+							<image :src="item.img" mode="aspectFill" style="width: 100%;height: 100%;" @click="goIndex(item.url)"></image>
+						</swiper-item>
+					</swiper>
+			</view>
+			<view class="hdetail-c">
+				<view class="hdetail-c-t" v-if="!!datas.basic && !!datas.basic.title">
+					{{ datas.basic.title }}
+				</view>
+				<view class="hdetail-c-c" v-if="!!datas.basic && !!datas.basic.author_img">
+					<view class="span">
+						<view class="i">
+							<image class="image" :src="datas.basic.author_img" mode="aspectFill"></image>
+						</view>
+						
+						<text class="span-text" v-if="!!datas.basic && !!datas.basic.author">{{ datas.basic.author }}</text>
+					</view>
+					<button over-class="none" plain="true" open-type="share" @click="isOpenShare" v-if="clientType==='1'">
+						<view class="em">
+							<view class="i icon iconfont icon-fenxiang"></view>分享
+						</view>
+					</button>
+				</view>
+				<view class="hdetail-c-b"  v-if="datas.basic.content">
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+					show-with-animation use-anchor  :html="datas.basic.content" @error="error" @imgtap="imgtap" @linkpress="linkpress" @parse="parse" @ready="ready"></jyf-parser>
+				</view>
+				<view class="hd-goods bor-radius-10upx m-top20" v-if="!!datas['basic'] && !!datas['basic']['goods']">
+					<view class="hdetail-bar-r-i dis-flex" @click="goods_skip(datas['basic']['goods']['id'],datas['goods_plugin'])">
+						<view class="hdetail-bar-r-i-l" :style="{'background-image':'url('+datas['basic']['goods']['thumb']+')'}"></view>
+						<view class="hdetail-bar-r-i-r">
+							<view class="h1">{{datas['basic']['goods']['name']}}</view>
+							<view class="p dis-flex flex-x-between flex-y-center">
+								<view class="span">{{datas['basic']['goods']['price']}}元</view>
+								<view class="em" v-if="datas['basic']['goods_plugin']!=='coupon'" style="text-decoration:line-through;">￥{{datas['basic']['goods']['oldprice']}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="hdetail-b">
+				<view class="hdetail-b-t4 f-28" v-if="!!datas.basic && !!datas.basic.browse">阅读&nbsp;{{ datas.basic.browse }}</view>
+				<view class="hdetail-b-t5">
+					<view class="hdetail-b-t5-t">
+						<view class="span">精选留言</view>
+						<view @click="leaveSkip()">写留言<text class="i icon iconfont icon-write"></text></view>
+					</view>
+					<view class="hdetail-b-t5-c">
+						<view class="hdetail-cmt" v-if="comment_list.length > 0">
+							<view class="hdetail-cmt-i" v-for="(item, key) in comment_list" :key="key">
+								<view class="hdetail-cmt-i-l">
+									<image class="image" :src="item.avatar" mode="aspectFill"></image>
+								</view>
+								<view class="hdetail-cmt-i-r">
+									<view class="h1">
+										<view class="span">{{ item.nickname }}</view>
+										<view class="em" :class="{isagree: item.fabulousState}" @click="leaveAgree(item.id, key)" v-if="item.fabulousNum > 0">
+											<view class="i icon iconfont icon-zan1"></view>{{ item.fabulousNum }}
+										</view>
+										<view class="em" :class="{isagree: item.fabulousState}" @click="leaveAgree(item.id, key)" v-if="item.fabulousNum == 0">
+											<view class="i icon iconfont icon-zan1"></view>
+										</view>
+									</view>
+									<view class="p f-28">{{ item.text }}</view>
+									<view class="h2 f-28" v-if="item.reply !== null">作者</view>
+									<view class="p f-28" v-if="item.reply !== null">{{ item.reply }}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<view class="masking" v-if="isShare" @click="isOpenShare">
+			<image :src="imageRoot+'share.png'" class="to-share" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import Foooter from '@/components/template/footer'
+	import Loadlogo from '@/components/template/loadlogo'
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				sendCall: false,
+				barD: false,
+				barMask: false,
+				call: false,
+				param: {
+					headline_id: '',
+					callid: '',
+					creatuid: ''
+				},
+				imageProp: {
+					mode: 'widthFix'
+				},
+				datas: {
+					basic: null,
+					goods: null,
+					call: null
+				},
+				storename: '',
+				shareData: {},
+				isShare: false,
+				headline_id: null,
+				img:'',
+				comment_list:[],
+				page:1,
+				total:1,
+				pagenum:1,
+				imgStyle:{},
+				clickImg:false
+			}
+		},
+		computed: {
+
+		},
+		components: {
+			Foooter,
+			Loadlogo,
+			jyfParser
+		},
+		onLoad(option) {
+			let _this = this,
+				headline_id = option.headline_id || option.id;
+			_this.setData({
+				headline_id
+			});
+			_this.imgStyle = uni.getStorageSync('imgstyle');
+			_this.setmpShare(option.headline_id);
+			_this.img = _this.imgfixUrl;
+			this.getheadlinedl(headline_id);
+		},
+		onShow() {
+			if(this.pagenum == 1){
+				this.pagenum++;
+				return
+			}
+			if(this.clickImg){
+				this.clickImg = false;
+				return
+			}
+			this.getConmmit(false,1);
+		},
+		mounted() {
+
+		},
+		computed: {
+			clientType() {
+				return App.getClientType();
+			}
+		},
+		onReachBottom() {
+			if(this.page == this.total) return
+			this.page++;
+			this.getConmmit(true);
+		},
+		methods: {
+			parse(e) {
+				console.log('parse finish', e);
+			},
+			ready(e) {
+				console.log('ready', e);
+				// console.log('api: getText', this.$refs.article.getText());
+				console.log('imgList',this.$refs.article.imgList);
+			},
+			imgtap(e) {
+				this.clickImg = true;
+				console.log('imgtap', e);
+			},
+			linkpress(e) {
+				console.log('linkpress', e);
+			},
+			error(e) {
+				console.error(e);
+			},
+			barShow() {
+				this.barD = true
+				this.barMask = true
+			},
+			barHide() {
+				var that = this
+				that.barD = false
+				setTimeout(() => {
+					that.barMask = false
+				}, 300)
+			},
+			getheadlinedl(headline_id) {
+				let _this = this,
+					requestData = {
+						id: headline_id
+					};
+				App._post_form('&p=headline&do=HeadlineInfo', requestData, res => {
+					if (!!res.data && res.errno === 0) {
+						console.log(res,this.$refs.article);
+						// this.setData({
+						// 	_this.datas.basic = res.data
+						// })
+						_this.datas.basic = res.data;
+						let newStr  = res.data.content;
+						if(_this.datas.basic.content.indexOf('></iframe') !== -1){
+							let index =  _this.datas.basic.content.indexOf('></iframe');
+							newStr = _this.datas.basic.content.slice(0,index)+'style="width: 100%;border-right:1px solid #cccccc"' +_this.datas.basic.content.slice(index);
+						}
+						this.$set(_this.datas.basic, 'content', newStr);
+						// this.$refs.article.setContent(_this.datas.basic.content);
+						// this.$refs.article.setContent('<div>Hello World!</div>');
+						_this.getConmmit();
+						// #ifdef H5
+						wxApi.wxRegister();
+						// #endif 
+						
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			getConmmit(flag,page){
+				let _this = this;
+				App._post_form('&p=headline&do=getComment', {
+					page: page || _this.page,
+					id:_this.datas.basic.id
+				}, res => {
+					if(flag){
+						_this.comment_list = _this.comment_list.concat(res.data.list);
+						if(page){
+							if(page > _this.total)return
+							_this.getConmmit(true,page+1);
+						}
+					}else{
+						_this.comment_list = res.data.list;
+						_this.total = res.data.total;
+						if(page){
+							_this.getConmmit(true,page+1);
+						}
+					}
+					
+					// debugger
+				})
+			},
+			skip_goods() {
+				let _this = this,
+					url = _this['datas']['basic']['goods_url'];
+				App.navigationTo({
+					url
+				})
+			},
+			setmpShare(id, type = "9") {
+				let _this = this;
+				App._post_form('&do=Shareinfo', {
+					type,
+					id
+				}, res => {
+					_this.shareData = res.data
+				})
+			},
+			isOpenShare() {
+				this.isShare = !this.isShare
+			},
+			leaveAgree(relation_id, key) {
+				let _this = this,
+					requestUrl = {
+						// mid: 982,
+						'class': 2,
+						id: relation_id
+					},
+					basicData = _this.comment_list;
+				App._post_form('&p=headline&do=Fabulous', requestUrl, res => {
+					if (res.errno === 0) {
+						if (basicData[key].fabulousState) {
+							basicData[key].fabulousState = false
+							basicData[key].fabulousNum += -1
+						} else {
+							basicData[key].fabulousState = true
+							basicData[key].fabulousNum += 1
+							App.showSuccess('点赞成功')
+						}
+					}
+				}, false, () => {})
+			},
+			leaveSkip() {
+				let _this = this;
+				App.navigationTo({
+					url: `pages/mainPages/headline/message?title=${_this['datas']['basic']['title']}&headline_id=${_this['datas']['basic']['id']}`
+				})
+			},
+			goIndex(url){
+				if(!url) return
+				App.navigationTo({
+					url: url
+				})
+			},
+			goods_skip(goods_id, goods_type) {
+				let _this = this,
+					urlData = {};
+				// #ifdef H5
+				if (goods_type === "rush") {
+					urlData = {
+						urlData_p: 'rush',
+						urlData_ac: 'home',
+						urlData_do: 'detail'
+					};
+				}
+				// #endif
+			},
+			navToBack() {
+				let _this = this,
+					pages = getCurrentPages();
+				if (pages.length > 1) {
+					uni.navigateBack({
+						delta: 1
+					})
+				} else {
+					App.navigationTo({
+						url: 'pages/mainPages/index/index',
+						navType: 'rediRect'
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #fff;
+	}
+
+	.containerOvf {
+		height: 100vh;
+		overflow: hidden;
+	}
+
+	.page-hdetail {
+		background-color: #fff;
+	}
+
+	.hdetail-h .image {
+		width: 100%;
+	}
+
+	button {
+		margin: 0;
+		padding: 0;
+		border: none;
+	}
+
+	.send-call-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .65);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 102;
+	}
+
+	.send-call-d {
+		width: calc(100vw - 200upx);
+		margin-top: -65upx;
+		padding-bottom: 50upx;
+		background-color: #fff;
+		border-radius: 20upx;
+		position: fixed;
+		top: 50%;
+		left: 100upx;
+		z-index: 103;
+		transform: translateY(-50%);
+	}
+
+	.send-call-d-t {
+		width: 100%;
+		height: 260upx;
+		border-radius: 20upx 20upx 0 0;
+		position: absolute;
+		overflow: hidden;
+	}
+
+	.send-call-d-t-d {
+		height: 100%;
+		background-color: #FFD93F;
+		position: relative;
+	}
+
+	.send-call-d-t-stl {
+		width: 240%;
+		height: 600upx;
+		position: absolute;
+		top: -450upx;
+		left: calc(-70% - 80upx);
+		z-index: 1;
+		border: 80upx solid #fff;
+		border-radius: 50%;
+	}
+
+	.send-call-d-c {
+		padding: 60upx 50upx 0 50upx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.send-call-d-c-t {
+		width: 130upx;
+		height: 130upx;
+		margin: 0 auto;
+		margin-top: 16upx;
+	}
+
+	.send-call-d-c-t .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.send-call-d-c-c {
+		margin-top: 60upx;
+	}
+
+	.send-call-d-c-c .h1 {
+		font-size: 28upx !important;
+		text-align: center;
+		font-weight: normal;
+		margin-bottom: 30upx;
+	}
+
+	.send-call-d-c-c .p {
+		line-height: 44upx;
+		color: #666;
+	}
+
+	.send-call-close {
+		width: 80upx;
+		height: 80upx;
+		line-height: 80upx;
+		text-indent: 4upx;
+		text-align: center;
+		margin-left: -40upx;
+		background-color: #fff;
+		border-radius: 50%;
+		position: absolute;
+		left: 50%;
+		bottom: -130upx;
+	}
+
+	.send-call-close .i {
+		font-size: 36upx !important;
+		display: inline;
+	}
+
+	.hdetail-call-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .65);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+	}
+
+	.hdetail-call {
+		width: 100%;
+		padding-bottom: 30upx;
+		background-color: #fff;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 101;
+	}
+
+	.send-h {
+		text-align: center;
+		padding: 50upx 30upx 20upx 30upx;
+	}
+
+	.send-h-t-d {
+		width: 136upx;
+		height: 136upx;
+		border-radius: 50%;
+		display: inline-block;
+	}
+
+	.send-h-t-d .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.send-h-c {
+		margin-top: 20upx;
+	}
+
+	.send-h-b {
+		color: #999;
+		font-size: 24upx !important;
+		margin-top: 20upx;
+	}
+
+	.send-t1 {
+		margin: 20upx 30upx 0 30upx;
+		padding: 40upx 40upx 30upx 40upx;
+		border-radius: 12upx;
+		box-shadow: 0 0 16upx #d9d9d9;
+	}
+
+	.send-t1-t {
+		position: relative;
+	}
+
+	.send-t1-t-l {
+		width: 80upx;
+		height: 80upx;
+		background-color: #eee;
+		border-radius: 50%;
+		position: absolute;
+	}
+
+	.send-t1-t-l button {
+		border: none;
+	}
+
+	.send-t1-t-l .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.send-t1-t-r {
+		height: 80upx;
+		line-height: 80upx;
+		font-size: 24upx !important;
+		padding: 0 40upx 0 120upx;
+	}
+
+	.send-t1-t-r .em {
+		color: #FF5050;
+		margin-right: 8upx;
+		display: inline;
+	}
+
+	.send-t1-c {
+		height: 80upx;
+		line-height: 80upx;
+		margin-top: 20upx;
+	}
+
+	.send-t1-c .span {
+		height: 80upx;
+		line-height: 80upx;
+		font-size: 28upx !important;
+		text-align: center;
+		background-color: #FFD93F;
+		border-radius: 100upx;
+		display: block;
+	}
+
+	.send-t1-b {
+		margin-top: 50upx;
+	}
+
+	.send-t1-b .h1 {
+		display: -webkit-flex;
+		display: flex;
+		-webkit-justify-content: space-between;
+		justify-content: space-between;
+	}
+
+	.send-t1-b .h1 .h1-l {
+		height: 60upx;
+		line-height: 60upx;
+	}
+
+	.send-t1-b .h1 .h1-l:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+
+	.send-t1-b .h1 .h1-l .i {
+		width: 60upx;
+		height: 60upx;
+		line-height: 60upx;
+		color: #999;
+		font-size: 28upx !important;
+		text-align: center;
+		margin-left: -26upx;
+		background-color: #E8E8E8;
+		border: 2upx solid #fff;
+		border-radius: 50%;
+		float: left;
+	}
+
+	.send-t1-b .h1 .h1-l .i:first-child {
+		margin-left: 0;
+	}
+
+	.send-t1-b .h1 .h1-l .i .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.send-t1-b .h1 .h1-r {
+		height: 60upx;
+		line-height: 60upx;
+		font-size: 24upx !important;
+	}
+
+	.send-t1-b .h1 .h1-r .em {
+		color: #F53421;
+		margin-right: 8upx;
+		display: inline;
+	}
+
+	.send-t1-b .h3 {
+		font-size: 24upx !important;
+		font-weight: normal;
+		text-align: left;
+		margin-top: 30upx;
+	}
+
+	.send-t1-b .h3 .span {
+		height: 42upx;
+		line-height: 42upx;
+		color: #999;
+		display: inline-block;
+	}
+
+	.hdetail-bar-bottom {
+		width: calc(100vw - 60upx);
+		height: 92upx;
+		line-height: 92upx;
+		position: fixed;
+		left: 30upx;
+		bottom: 30upx;
+		z-index: 99;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.pag-index {
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.pag-sendetail {
+		padding: 0 30upx;
+		-webkit-flex: 1;
+		flex: 1;
+	}
+
+	.pag-rushdetail {
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.pag-index .bar-i-link {
+		width: 92upx;
+		height: 92upx;
+		color: #fff;
+		padding: 0;
+		background-color: #505050;
+		border-radius: 50%;
+	}
+
+	.pag-sendetail {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.pag-sendetail .bar-i-link {
+		height: 76upx;
+		padding: 8upx 30upx;
+		background-color: #FFD93F;
+		border-radius: 100upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: block;
+	}
+
+	.pag-sendetail .bar-i-link .h1 {
+		height: 40upx;
+		line-height: 40upx;
+		font-weight: normal;
+		text-align: center;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.pag-sendetail .bar-i-link .p {
+		width: 100%;
+		height: 36upx;
+		line-height: 36upx;
+		font-size: 24upx !important;
+		text-align: center;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.bar-i-t {
+		width: 46upx;
+		height: 46upx;
+		line-height: 46upx;
+		text-align: center;
+		margin: 0 auto;
+		padding-top: 6upx;
+	}
+
+	.bar-i-t .i {
+		font-size: 28upx !important;
+	}
+
+	.bar-i-t .image {
+		width: 100%;
+		height: 100%;
+		display: none;
+	}
+
+	.bar-i-c {
+		height: 24upx;
+		line-height: 24upx;
+		font-size: 20upx !important;
+		text-align: center;
+	}
+
+	.hdetail-bar-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, .5);
+		opacity: 0;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 100;
+		transition: opacity .3s;
+	}
+
+	.maskHide {
+		display: none;
+	}
+
+	@keyframes barMaskAni {
+		0% {
+			opacity: 0;
+		}
+
+		100% {
+			opacity: 1.0;
+		}
+	}
+
+	.barMask {
+		opacity: 1.0;
+		animation: barMaskAni .3s;
+	}
+
+	.hdetail-bar-r-d {
+		width: 88%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 100%;
+		z-index: 101;
+		transition: left .3s;
+	}
+
+	.barDShow {
+		left: 12%;
+	}
+
+	.hdetail-bar-r-d-fold-d {
+		width: 50upx;
+		height: 100%;
+		line-height: 108upx;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.hdetail-bar-r-d-fold {
+		width: 50upx;
+		height: 108upx;
+		line-height: 108upx;
+		margin-top: -54upx;
+		background-color: #fff;
+		border-radius: 8upx 0 0 8upx;
+		position: absolute;
+		top: 50%;
+		left: 2upx;
+	}
+
+	.hdetail-bar-r-d-fold .i {
+		color: #666;
+		font-size: 36upx !important;
+		text-indent: -10upx;
+	}
+
+	.hdetail-bar-r-d-scroll {
+		width: calc(100% - 50upx);
+		height: 100%;
+		background-color: #fff;
+		position: absolute;
+		top: 0;
+		left: 50upx;
+		padding-top: 80upx;
+	}
+
+	.hdetail-bar-r-i {
+		margin: 0 30upx;
+		padding: 30upx 0;
+		border-bottom: 2upx solid #f3f3f3;
+		position: relative;
+	}
+
+	.hdetail-bar-r-i:last-child {
+		border-bottom: none;
+	}
+
+	.hdetail-bar-r-i-l {
+		width: 180upx;
+		height: 180upx;
+		border-radius: 4upx;
+		background-repeat: no-repeat;
+		background-size: 180upx 180upx;
+		background-position: center;
+		flex-shrink: 0;
+		/* position: absolute; */
+	}
+
+	.hdetail-bar-r-i-r {
+		width: 100%;
+		height: 180upx;
+		margin-left: 20upx;
+		position: relative;
+	}
+
+	.hdetail-bar-r-i-r .h1 {
+		line-height: 42upx;
+		font-size: 24upx !important;
+		font-weight: normal;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.hdetail-bar-r-i-r .p {
+		width: 100%;
+		height: 42upx;
+		line-height: 42upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+		position: absolute;
+		bottom: 0;
+	}
+
+	.hdetail-bar-r-i-r .p .span {
+		color: #FF4040;
+		font-size: 28upx !important;
+		display: block;
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.hdetail-bar-r-i-r .p .em {
+		color: #CCCCCC;
+		font-size: 24upx !important;
+		font-style: normal;
+		text-decoration: line-through;
+		display: block;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.pag-rushdetail .a {
+		width: 92upx;
+		height: 92upx;
+		line-height: 92upx;
+		color: #fff;
+		text-align: center;
+		padding: 0 50upx;
+		background-color: #FE504F;
+		border-radius: 100upx;
+		font-size: 28upx;
+	}
+
+	.hdetail-c {
+		padding: 30upx;
+	}
+
+	.hdetail-c-t {
+		line-height: 52upx;
+		font-size: 36upx !important;
+		letter-spacing: 4upx;
+		font-weight: 600;
+	}
+
+	.hdetail-c-c {
+		height: 60upx;
+		line-height: 60upx;
+		font-size: 28upx !important;
+		color: #888;
+		margin-top: 30upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.hdetail-c-c button {
+		border: none;
+	}
+
+	.hdetail-c-c .span {
+		line-height: 60upx;
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.hdetail-c-c .span .i {
+		width: 60upx;
+		height: 60upx;
+		margin-right: 20upx;
+		border-radius: 50%;
+		display: block;
+		font-size: 28upx !important;
+	}
+
+	.hdetail-c-c .span .span-text {
+		font-size: 24upx;
+		font-weight: normal;
+		display: block;
+	}
+
+	.hdetail-c-c .span .i .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.hdetail-c-c .em {
+		height: 60upx;
+		line-height: 60upx;
+		color: #333;
+		font-size: 24upx !important;
+		font-style: normal;
+		padding: 0 30upx;
+		background-color: #FFD83F;
+		border-radius: 100upx;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+
+	.hdetail-c-c .em .i {
+		font-size: 28upx !important;
+		margin-right: 10upx;
+		vertical-align: -2upx;
+		display: inline;
+	}
+
+	.hdetail-c-b {
+		margin-top: 40upx;
+	}
+
+	.hdetail-b {
+		margin-top: 40upx;
+	}
+
+	.hdetail-b-t1 {
+		padding: 0 30upx;
+	}
+
+	.hdetail-b-t1 .h1 {
+		text-align: center;
+	}
+
+	.hdetail-b-t1 .h1 .span {
+		color: #fff;
+		font-size: 36upx !important;
+		font-weight: normal;
+		padding: 6upx 14upx;
+		background-color: #C0504E;
+		border-radius: 4upx;
+		display: inline-block;
+	}
+
+	.hdetail-b-t1 .p {
+		font-size: 30upx !important;
+		text-align: center;
+		margin-top: 30upx;
+	}
+
+	.hdetail-b-t1 .p .i {
+		width: 40upx;
+		height: 40upx;
+		display: inline-block;
+	}
+
+	.hdetail-b-t1 .p .i .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.hdetail-b-t2 {
+		margin: 40upx 30upx 0 30upx;
+		border-radius: 12upx;
+		box-shadow: 0 0 16upx #d9d9d9;
+	}
+
+	.hdetail-b-t2-t {
+		padding: 30upx;
+	}
+
+	.hdetail-b-t2-t .h1 {
+		height: 60upx;
+		line-height: 60upx;
+		font-weight: normal;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.hdetail-b-t2-t .h1 .i {
+		width: 60upx;
+		height: 60upx;
+		border-radius: 50%;
+		display: block;
+	}
+
+	.hdetail-b-t2-t .h1 .i .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.hdetail-b-t2-t .h1 .span {
+		font-size: 24upx !important;
+		color: #999;
+		margin-left: 20upx;
+		display: block;
+	}
+
+	.hdetail-b-t2-t .h2 {
+		font-size: 32upx !important;
+		line-height: 44upx;
+		font-weight: normal;
+		margin-top: 30upx;
+	}
+
+	.hdetail-b-t2-c .image {
+		width: 100%;
+	}
+
+	.hdetail-b-t2-b {
+		height: 60upx;
+		line-height: 60upx;
+		padding: 30upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.hdetail-b-t2-b .p {
+		color: #FE504F;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+	}
+
+	.hdetail-b-t2-b .p .span {
+		font-size: 36upx !important;
+		display: inline;
+	}
+
+	.hdetail-b-t2-b .p .i {
+		font-style: normal;
+		vertical-align: 2upx;
+		margin-left: 8upx;
+	}
+
+	.hdetail-b-t2-b .p .em {
+		color: #CCCCCC;
+		text-decoration: line-through;
+		margin-left: 30upx;
+		display: inline;
+	}
+
+	.hdetail-b-t2-b .h1 {
+		height: 60upx;
+		line-height: 60upx;
+		color: #fff;
+		font-weight: normal;
+		padding: 0 50upx;
+		background-color: #FE504F;
+		border-radius: 10upx;
+	}
+
+	.hdetail-b-t3 {
+		text-align: center;
+		margin: 0 60upx 0 60upx;
+		padding: 60upx 0;
+		border-bottom: 2upx solid #eee;
+	}
+
+	.hdetail-b-t3-d {
+		display: inline-block;
+	}
+
+	.hdetail-b-t3:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+
+	.hdetail-b-t3 .i {
+		height: 50upx;
+		line-height: 50upx;
+		color: #8F8F8F;
+		font-size: 28upx !important;
+		margin: 10upx;
+		padding: 0 30upx;
+		background-color: #FBFBFB;
+		border-radius: 100upx;
+		float: left;
+	}
+
+	.hdetail-b-t4 {
+		color: #8C8C8C;
+		padding: 40upx 30upx;
+	}
+
+	.hdetail-b-t5 {
+		padding: 30upx 30upx 120upx 30upx;
+		background-color: #F3F3F3;
+	}
+
+	.hdetail-b-t5-t {
+		font-size: 28upx !important;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.hdetail-b-t5-t .span {
+		color: #999;
+	}
+
+	.hdetail-b-t5-t .a {
+		color: #8185A2;
+	}
+
+	.hdetail-b-t5-t .a .i {
+		font-size: 32upx !important;
+		margin-right: 4upx;
+		vertical-align: 0;
+		display: inline;
+	}
+
+	.hdetail-b-t5-c {
+		margin-top: 40upx;
+	}
+
+	.hdetail-cmt-i {
+		margin-bottom: 40upx;
+		position: relative;
+	}
+
+	.hdetail-cmt-i:last-child {
+		margin-bottom: 0;
+	}
+
+	.hdetail-cmt-i-l {
+		width: 60upx;
+		height: 60upx;
+		border-radius: 50%;
+		position: absolute;
+	}
+
+	.hdetail-cmt-i-l .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.hdetail-cmt-i-r {
+		min-height: 60upx;
+		padding-left: 80upx;
+	}
+
+	.hdetail-cmt-i-r .h1 {
+		height: 44upx;
+		line-height: 44upx;
+		font-weight: normal;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.hdetail-cmt-i-r .h1 .span {
+		color: #999;
+		font-size: 24upx !important;
+		display: block;
+	}
+
+	.hdetail-cmt-i-r .h1 .em {
+		color: #8185A2;
+		font-size: 32upx !important;
+		font-style: normal;
+		display: block;
+	}
+
+	.hdetail-cmt-i-r .h1 .em.isagree {
+		color: #FF7F18;
+	}
+
+	.hdetail-cmt-i-r .h1 .em.isagree .i {
+		color: #FF7F18;
+	}
+
+	.hdetail-cmt-i-r .h1 .em .i {
+		color: #8185A2;
+		font-size: 40upx !important;
+		margin-right: 4upx;
+		display: inline;
+	}
+
+	.hdetail-cmt-i-r .p {
+		line-height: 44upx;
+		margin-top: 6upx;
+	}
+
+	.hdetail-cmt-i-r .h2 {
+		height: 44upx;
+		line-height: 44upx;
+		color: #999;
+		margin-top: 6upx;
+		padding-left: 26upx;
+		position: relative;
+	}
+
+	.hdetail-cmt-i-r .h2:before {
+		content: "";
+		width: 6upx;
+		height: 66%;
+		background-color: #FE504F;
+		position: absolute;
+		top: 17%;
+		left: 0;
+	}
+
+	.hdetail-b-t5-b {
+		margin-bottom: 92upx;
+	}
+
+	.masking {
+		position: fixed;
+		/* 		width: 100%;
+		height: 100%; */
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 100;
+		background: rgba(0, 0, 0, .5);
+		/* display: none */
+	}
+
+	.to-share {
+		position: fixed !important;
+		z-index: 1009;
+		right: 10upx;
+		top: 0;
+		overflow: auto;
+		width: 500upx;
+		height: 380upx;
+	}
+
+	.hd-goods {
+		border: 1px solid #F6F6F6;
+	}
+</style>
diff --git a/pages/mainPages/headline/index.vue b/pages/mainPages/headline/index.vue
new file mode 100644
index 0000000..308df26
--- /dev/null
+++ b/pages/mainPages/headline/index.vue
@@ -0,0 +1,343 @@
+<template>
+	<!-- 好店头条 -->
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-headline" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<block v-if="!!head&&head.length>0">
+				<view class="page-section-spacing">
+					<swiper-banner :styles="banner_set" :itemData="head"></swiper-banner>
+				</view>
+			</block>
+			<view >
+				<view  style="height: 20upx;background-color: #f8f8f8;">
+					
+				</view>
+				<filtertab  :requestType="'文章头条'" :isPageScroll="'1'" @selectClassid="selectClassid" 
+				 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+				<view  style="height: 20upx;background-color: #f8f8f8;">
+					
+				</view>
+			</view>
+			<view class="hdline-c">
+				<view class="goodstop-i" v-for="(item, key) in list" :key="key" @click="handleSkip(item.id)">
+					<!-- <navigator class="a" :url="'/pagesHeadline/headlinedetail/index?i='+item.id" hover-class="none"> -->
+					<view class="h1 twolist-hidden">{{ item.title }}</view>
+					<view class="goodstop-i-t">
+						<view class="goodstop-i-t-tag">
+							<view class="i" v-if="item.one_name !== '' && item.one_name !== null">{{ item.one_name }}</view>
+							<view class="i" v-if="item.two_name !== '' && item.two_name !== null">{{ item.two_name }}</view>
+						</view>
+						<image class="image" :src="item.display_img" mode="aspectFill"></image>
+					</view>
+					<view class="goodstop-i-c">
+						<view class="h2">{{ item.summary }}</view>
+						<view class="p">
+							<view class="span">
+								<view class="i">
+									<image class="image" :src="item.author_img" mode="aspectFill"></image>
+								</view>
+								<view class="b">{{ item.author }}</view>
+							</view>
+							<view class="em">阅读&nbsp;{{ item.browse }}</view>
+						</view>
+					</view>
+					<!-- </navigator> -->
+				</view>
+			</view>
+			<Loooading v-if="!loading" />
+		</view>
+		<TabBars :tabBarAct="0" :pageType="'12'"/>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import Loooading from '@/components/template/loading'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	import swiperBanner from '@/components/template/Swiper.vue'
+	import filtertab from '@/components/template/filtertab.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				loading: false,
+				loadOver: false,
+				current_page: 1,
+				banner_set:{},
+				head: null,
+				list: null,
+				total: null,
+				menu: null,
+				cate_one:'',
+				cate_two:'',
+				title:'',
+				sorts:'',
+				oninPage:false
+			}
+		},
+		components: {
+			Loadlogo,
+			Loooading,
+			TabBars,
+			swiperBanner,
+			filtertab
+		},
+		onShow() {
+
+		},
+		onLoad(e) {
+			if(e.cate_one){
+				this.cate_one = e.cate_one;
+			}
+			if(e.cate_two){
+				this.cate_two = e.cate_two;
+			}
+			if(e.title){
+				this.title = e.title;
+			}
+		},
+		mounted() {
+			this.getHeadlineInfo(1, false)
+		},
+		methods: {
+			selectOrders(data){
+				console.log(data);
+				// debugger
+				this.sorts = data.val;
+				this.getHeadlineInfo(1);
+			},
+			selectClassid(data){
+				console.log(data);
+				// this.cate_two = ''
+				// this.cate_one = data.id;
+				this.setData({
+					cate_one:data.id,
+					cate_two:'未选择'
+				})
+				this.getHeadlineInfo(1);
+			},
+			selectClassTwoid(data){
+				console.log(data);
+				// debugger
+				this.setData({
+					cate_two:data.id
+				})
+				// this.cate_two = 
+				this.getHeadlineInfo(1);
+			},
+			//获取头条信息
+			getHeadlineInfo(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						page:page,
+						one_id:_this.cate_one,
+						two_id:_this.cate_two,
+						sort:_this.sorts
+					};
+					// debugger
+					// if(_this.oninPage) return
+					// _this.oninPage = true;
+					// setTimeout(()=>{
+					// 	_this.oninPage = false;
+					// },2000)
+				App._post_form('&p=headline&do=HeadlineList', requestData, res => {
+					let HeadlineData = res.data;
+					// _this.oninPage = false;
+					if (isPage) {
+						if (HeadlineData.list.length > 0) {
+							_this["list"].push(...HeadlineData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this["list"] = HeadlineData.list;
+						_this.loading = HeadlineData.list.length === 0 || _this.current_page === HeadlineData.total;
+						// debugger
+						
+							let imageWidth = HeadlineData['banner_set'].img_width,
+								imageHeight = HeadlineData['banner_set'].img_height,
+								imageRatio = imageWidth / imageHeight,
+								windowHeight = uni.getSystemInfoSync().windowWidth / imageRatio;
+							// _this.diypagesData[i].autoHeight = windowHeight;
+								let ratio;
+								// console.log(item.params.img_width,'jinx')
+								uni.getSystemInfo({
+									success: function(wh) {
+										// debugger
+										ratio = wh.windowWidth / HeadlineData['banner_set'].img_width;
+										HeadlineData['banner_set'].img_width = (ratio * imageWidth) -30;
+										HeadlineData['banner_set'].img_height = ratio * imageHeight -30;
+										_this.setData(HeadlineData);
+										
+									}
+								});
+						
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			handleSkip(headline_id) {
+				App.navigationTo({
+					url:`pages/mainPages/headline/headlineDetail?headline_id=${headline_id}`
+				})
+			},
+			swiperSkip(url) {
+				App.navigationToH5(url)
+			}
+		},
+		onPullDownRefresh() {
+			//下拉刷新 初始化数据
+			// this.loading = false
+			// this.loadOver = false
+			// this.page = 0
+			// this.getInfo(1)
+		},
+		onReachBottom() {
+			let _this = this;
+			if (_this.current_page >= _this.total) {
+				_this.loading = true;
+				return false;
+			}
+			_this.getHeadlineInfo(++_this.current_page, true);
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #F4F4F4;
+	}
+
+	.page-headline {
+		min-height: 100vh;
+		background-color: #F4F4F4;
+		padding-bottom: 88upx;
+	}
+
+	.hdline-h .image {
+		width: 100%;
+		display: block;
+	}
+
+	.hdline-c {
+		margin-top: 0;
+	}
+
+	.goodstop-i {
+		width: calc(100vw - 60upx);
+		margin-bottom: 20upx;
+		padding: 40upx 30upx;
+		background-color: #fff;
+	}
+
+	.goodstop-i:last-child {
+		margin-bottom: 60upx;
+	}
+
+	.goodstop-i .h1 {
+		line-height: 52upx;
+		font-size: 30upx;
+		letter-spacing: 4upx;
+		font-weight: normal;
+	}
+
+	.goodstop-i-t {
+		width: calc(100vw - 60upx);
+		height: calc((100vw - 30upx) / 1.8);
+		margin-top: 30upx;
+		position: relative;
+	}
+
+	.goodstop-i-t-tag {
+		position: absolute;
+		top: 20upx;
+		left: 20upx;
+		z-index: 2;
+	}
+
+	.goodstop-i-t-tag .i {
+		height: 52upx;
+		line-height: 52upx;
+		font-size: 24upx;
+		font-style: normal;
+		margin-left: 10upx;
+		padding: 6upx 14upx;
+		background-color: #FFD93F;
+		border-radius: 4upx;
+		display: inline;
+	}
+
+	.goodstop-i-t-tag .i:first-child {
+		margin-left: 0;
+	}
+
+	.goodstop-i-t .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.goodstop-i-c .h2 {
+		height: 84upx;
+		line-height: 42upx;
+		font-size: 24upx;
+		color: #888;
+		font-weight: normal;
+		margin-top: 20upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.goodstop-i-c .p {
+		height: 60upx;
+		line-height: 60upx;
+		font-size: 28upx;
+		color: #888;
+		margin-top: 20upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.goodstop-i-c .p .span {
+		line-height: 60upx;
+		-webkit-flex-shrink: 1;
+		flex-shrink: 1;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.goodstop-i-c .p .span .i {
+		width: 60upx;
+		height: 60upx;
+		margin-right: 20upx;
+		border-radius: 50%;
+		display: block;
+	}
+
+	.goodstop-i-c .p .span .b {
+		font-weight: normal;
+		display: block;
+	}
+
+	.goodstop-i-c .p .span .i .image {
+		width: 100%;
+		height: 100%;
+		border-radius: 50%;
+	}
+
+	.goodstop-i-c .p .em {
+		font-style: normal;
+		-webkit-flex-shrink: 0;
+		flex-shrink: 0;
+	}
+</style>
diff --git a/pages/mainPages/headline/message.vue b/pages/mainPages/headline/message.vue
new file mode 100644
index 0000000..9c05452
--- /dev/null
+++ b/pages/mainPages/headline/message.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class="container">
+		<far-bottom></far-bottom>
+		<view class="page-message" style="min-height: 100vh;">
+			<view class="msg-h">
+				{{ param.title }}
+			</view>
+			<view class="msg-c">
+				<textarea name="msg" focus='ture' auto-height cursor-spacing="80" placeholder="请在这里输入您的留言" v-model="content" />
+				</view>
+		  <view class="msg-b">
+		    <view class="span" @click="comment()">留言</view>
+		  </view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				loading: false,
+				mid: '',
+				token: '',
+				param: {
+					headline_id: '',
+					title: ''
+				},
+				content: ""
+			}
+		},
+		computed: {
+		
+		},
+		onLoad(option) {
+			this.param = {
+				headline_id: option.headline_id,
+				title: option.title
+			};
+		},
+		mounted() {
+	
+		},
+		methods: {
+			comment() {
+				let _this = this;
+				if (_this.content.replace(/\s/g, "").length == 0) {
+					uni.showToast({
+						title: '请输入留言',
+						icon: 'none',
+						duration: 1000,
+						mask: true
+					})
+					return false
+				}
+				uni.showLoading({})
+				let requestData = {
+					hid: _this['param']['headline_id'],
+					text: _this.content
+				};
+				App._post_form('&p=headline&do=HeadlineComment', requestData, res => {
+					if (res.errno === 0) {
+						uni.hideLoading()
+						App.showSuccess('留言成功', () => {
+							uni.navigateBack({
+								delta: 1
+							});
+						})
+					}
+				}, false, () => {
+					uni.hideLoading();
+				})
+			},
+			// navToLogin() {
+			// 	uni.navigateTo({
+			// 		url: '/pagesIndex/login/index'
+			// 	})
+			// }
+		}
+	}
+</script>
+
+<style scoped>
+	page{
+		background-color: #F3F3F3 !important;
+	}
+	.container {
+		background-color: #F3F3F3;
+	}
+
+	.page-message {
+		background-color: #F3F3F3;
+	}
+
+	.msg-h {
+		line-height: 48upx;
+		font-size: 32upx;
+		padding: 30upx;
+	}
+
+	.msg-c {
+		background-color: #fff;
+	}
+
+	.msg-c textarea {
+		width: calc(100vw - 80upx);
+		min-height: 160upx;
+		line-height: 40upx;
+		margin: 0;
+		padding: 40upx;
+		font-size: 28upx;
+		resize: none;
+		border: none;
+		display: block;
+	}
+
+	.msg-b {
+		height: 90upx;
+		line-height: 90upx;
+		font-size: 32upx;
+		text-align: center;
+		padding: 30upx;
+	}
+
+	.msg-b .span {
+		background-color: #FFD93F;
+		border-radius: 100upx;
+		display: block;
+	}
+</style>
diff --git a/pages/mainPages/index/diypage.vue b/pages/mainPages/index/diypage.vue
new file mode 100644
index 0000000..78e4d9b
--- /dev/null
+++ b/pages/mainPages/index/diypage.vue
@@ -0,0 +1,932 @@
+<template>
+	<view class="app" :style="{paddingBottom:pageType == '13'?'0rpx':'130rpx', paddingTop: '90px'}">
+		<!-- 上面代码移除掉的样式backgroundColor: datas.page.background,  -->
+		<view class="status_bar">
+			<!-- 这里是状态栏 -->
+		</view>
+		<navigationBar custom="true">
+			<view :style="{width: '100vw',height: '50px'}" style="background-color: #FFFFFF;position: fixed;z-index: 999;top:40px;">
+				<view :style="{padding: '10px', paddingLeft: '20px'}" style="display: flex;">
+					<!-- <image :style="{verticalAlign: 'middle', width: 94 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image> -->
+					<image :style="{verticalAlign: 'middle', width: 30 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image>
+					<view style="font-size: 18px;font-weight: bold;line-height: 30px;margin-left: 4px;">粤职才</view>
+				</view>
+			</view>
+		</navigationBar>
+	
+	<!-- :style="{'background-color:'!!pageInfo?pageInfo.background:'#FFD93F'}" -->
+	<view class="container" >
+		<loadlogo v-if="!loadlogo" />
+		<!-- :style="'height:'windowHeight+'rpx;''background-color: '+datas.page.background" -->
+		<view class="page-index" :class="!!bottomMenu ? 'bottomPadding' : ''" v-if="loadlogo" >
+			<far-bottom></far-bottom>
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages :diypagesData="diypagesData" :city_id="city_id" :pageData="datas.page" :btngroupData="btngroup" @getChild="getChild" />
+			<block v-if="pageType === '13'">
+				<filtertab
+					@selectAreaid="selectAreaid"
+					@selectAllarea="selectAllarea"
+					@selectClassid="selectClassid"
+					@selectClassTwoid="selectClassTwoid"
+					@selectOrders="selectOrders"
+					:requestType="'4'"
+					@pageScrollHeight="pageScrollHeight"
+					:isPageScroll="'1'"
+					:businessCard="true"
+					:title="title"
+					:cate_one="cate_one"
+					:cate_two="cate_two"
+				></filtertab>
+				<block v-if="!!cardlist && cardlist.length >= 0">
+					<view class="business-card-box">
+						<business-card :businCard_list="cardlist" :is_collcet="'0'" :is_have="is_have"></business-card>
+						<load-more :isMore="loadingMore"></load-more>
+					</view>
+				</block>
+				<block v-else><none-mores></none-mores></block>
+			</block>
+			<view class="page-footer" v-if="pageType!=3"><!-- 抢购首页type==3 --><TabBars :tabBarAct="0" :TabBarsData="datas.page.menu" :TabBarsType="datas.page.type" :pageType="pageType" :pageId="pageId" /></view>
+			<view class="audio-main" @click="playAudio" v-if="!!pageInfo.music">
+				<view class="audio-bg" :class="{ 'stop-audio': !play_Audio }">
+					<view class="audio-gif" :style="{ 'background-image': 'url(' + imageRoot + 'musicgif.gif)' }">
+						<view class="audio-png" :style="{ 'background-image': 'url(' + imageRoot + 'music.png)' }"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<follow
+			:followShow="followShow"
+			:followType="followType"
+			:followTitleShow="followTitleShow"
+			@clickmask="openQrShow"
+			@closeFollowPop="closeFollowPop"
+			@closeFollowTitle="closeFollowTitle"
+		></follow>
+	</view>
+	<view style="height: 100%;flex: 1;">
+		
+	</view>
+	</view>
+</template>
+<script>
+let innerAudioContext = uni.createInnerAudioContext();
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import diypages from '@/components/template/diypages.vue';
+import Advert from '@/components/template/advert.vue';
+import TabBars from '@/components/template/tabBar.vue';
+import wxApi from '@/common/js/wxApi.js';
+import follow from '@/components/template/follow.vue';
+import filtertab from '@/components/template/filtertab.vue';
+import businessCard from '@/components/page/pageComponents/businessCard.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import noneMores from '@/components/template/nonemores.vue';
+export default {
+	data() {
+		return {
+			followTitleShow: true,
+			followShow: false,
+			followType: '0',
+			loadlogo: false,
+			swiperI: 1,
+			loading: false,
+			loadAgain: false,
+			datas: {
+				basic: [],
+				adv: '',
+				page: {}
+			},
+			play_Audio: false,
+			diypagesData: [],
+			richtext: {
+				imageProp: {
+					mode: 'widthFix'
+				}
+			},
+			pageInfo: {},
+			btngroup: {
+				backgroundColor: '#ffffff',
+				btnBordeRadius: '',
+				displayMode: '',
+				eachLineNum: '',
+				eachPageNum: '',
+				list: [],
+				indicatorDots: true,
+				duration: 300,
+				btngroupHandleData: [],
+				swiperHeight: ''
+			},
+			pageType: null,
+			pageId: null,
+			bottomMenu: null,
+			shareData: {},
+			current_page: 1,
+			order: '',
+			cate_one: '0',
+			cate_two: '',
+			city_id: '',
+			total: null,
+			cardhave: null,
+			cardlist: [],
+			loadingMore: true,
+			is_have: null,
+			mobileHeight: '',
+			ids: {},
+			title:'',
+			seTime:false,
+			height: 40,
+			newCC_id: null,
+			sort: ''
+		};
+	},
+	components: {
+		Loadlogo,
+		diypages,
+		Advert,
+		TabBars,
+		follow,
+		filtertab,
+		businessCard,
+		loadMore,
+		noneMores
+	},
+
+	created() {},
+	onLoad(e) {
+		console.log('onload------', e)
+		if(e.cate_id){
+			this.cate_id = e.cate_id;
+			uni.setStorageSync('cate_id',e.cate_id)
+		}else{
+			uni.removeStorageSync('cate_id');
+		}
+		// #ifdef H5
+		let pagetitle = uni.getStorageSync('TextSubstitution');
+		document.title = pagetitle.sysname || '⁣​';
+		// #endif
+		this.ids = e;
+		this.playAudio();
+		this.homePageInfo(this.ids);
+		this.newCC_id = e.cc_id;// 这个是新的商品分类
+		this.sort = e.sort;//
+	},
+	onHide() {
+		let _this = this,
+			play_Audio = false,
+			pageAudio = _this.pageInfo.music;
+		if (!play_Audio) {
+			innerAudioContext.pause();
+			innerAudioContext.onPause(() => {
+				console.log('暂停播放');
+			});
+		}
+		_this.play_Audio = play_Audio;
+	},
+	onShow() {
+		// #ifdef H5
+		let pagetitle = uni.getStorageSync('TextSubstitution');
+		document.title = pagetitle.sysname || '⁣​';
+		// #endif
+		
+		if (!!this.pageInfo && this.pageInfo.title) {
+			// #ifndef H5
+			uni.setNavigationBarTitle({
+				title: this.pageInfo.title
+			});
+			// #endif
+			// #ifdef H5
+			document.title = this.pageInfo.title || '⁣​';
+			// #endif
+		}
+		
+	},
+	mounted() {},
+	computed: {
+		currentLoction() {
+			return uni.getStorageSync('curLoction');
+		}
+	},
+	methods: {
+		getMbtype() {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.mobileHeight = res.windowHeight;
+				}
+			});
+		},
+		homePageInfo(opt) {
+			let _this = this,
+				{ id, type } = opt,
+				// 当前位置信息
+				curLoction = uni.getStorageSync('curLoction'),
+				// 手动选择位置信息
+				agencyData = uni.getStorageSync('agencyData'),
+				client = App.getClientType();
+				
+			_this.setData({
+				pageType: type,
+				pageId: id
+			});
+			setTimeout(()=>{
+				if(opt.cate_two){
+					this.cate_two = opt.cate_two;
+				}
+				if(opt.cate_one){
+					this.cate_one = opt.cate_one;
+				}
+				if(opt.title){
+					this.title = opt.title;
+				}
+			},500)
+			_this.pageId = id;
+			if (client === '1' || client === '3') {
+				App.getAreaId(agencyData, '', '', options => {
+					_this.$nextTick(function() {
+						_this.getPagesData(opt.type, opt.id, options.data.aid);
+					});
+				});
+			} else {
+				_this.getPagesData(opt.type, opt.id);
+				_this.setmpShare(opt.type, opt.id);
+			}
+			_this.getMbtype();
+		},
+		closeFollowTitle() {
+			let _this = this;
+			_this.followTitleShow = false;
+		},
+		closeFollowPop() {
+			let _this = this;
+			_this.followShow = false;
+		},
+		openQrShow() {
+			let _this = this;
+			_this.followShow = true;
+			// App._post_form(
+			// 	'&do=AAAA',
+			// 	requestData,
+			// 	res => {
+					
+			// 		逻辑111111
+					
+			// 		if(条件成立){
+			// 			App._post_form(
+			// 				'&do=BBBB',
+			// 				requestData,
+			// 				res => {
+			// 					逻辑22222
+			// 				}
+			// 			)
+			// 		}
+					
+			// 		逻辑333333
+					
+					
+			// 	}
+			// )
+		},
+		getPagesData(type = '1', page_id = 232, aid = '') {
+			let _this = this,
+			agencyData = uni.getStorageSync('agencyData'),
+				requestData = {
+					aid,
+					type,
+					page_id,
+					lat:agencyData.lat,
+					lng:agencyData.lng
+				};
+			
+			// let pagetitle = uni.getStorageSync('TextSubstitution').sysname;
+			// #ifdef H5
+			let pagetitle = uni.getStorageSync('TextSubstitution');
+			document.title = pagetitle.sysname || '⁣​';
+			// #endif
+			
+			if (!_this.pageId) {
+				requestData.page_id = '';
+			} else if (_this.pageId) {
+				requestData.page_id = _this.pageId;
+			}
+			if (type === '13') {
+				_this.setData({
+					city_id: agencyData.areaid
+				});
+				// _this.getShoplist(1, '', '', '', _this.city_id, _this.currentLoction.latitude, _this.currentLoction.longitude);
+			}
+			App._post_form(
+				'&do=HomePage',
+				requestData,
+				// async res => {
+				async res => {
+					if (res.errno === 0) {
+						_this.datas.adv = !!res.data.adv && res.data.adv.length !== 0 ? res.data.adv : '';
+						_this.datas.page = !!res.data.page ? res.data.page : '';
+						_this.bottomMenu = res.data.menu;
+						_this.pageInfo = res.data.page;
+						//修改页面标题
+						if (!!res.data.page.title) {
+							// #ifdef MP-WEIXIN
+							uni.setNavigationBarTitle({
+								title: res.data.page.title
+							});
+							// #endif
+							// #ifdef H5
+							let pagetitle = uni.getStorageSync('TextSubstitution').sysname;
+							document.title = res.data.page.title || pagetitle || '⁣​';
+							
+							// #endif
+						}
+						if (!!res.data.page.music) {
+							innerAudioContext.src = res.data.page.music;
+							// innerAudioContext.autoplay = true;
+							innerAudioContext.loop = true;
+							setTimeout(()=>{
+								jWeixin.ready(() => {
+									innerAudioContext.play();
+								});
+								// _this.playAudio();
+							})
+							
+						}
+						let diypagesData = res.data.item,
+							diypagesDataArray = [];
+
+						for (let i in diypagesData) {
+							diypagesDataArray.push(diypagesData[i]);
+						}
+						//抢购首页特殊处理
+						if(type==3 && diypagesDataArray[1].id == 'options2'){
+							// const res = await _this.getCultivateClassList();
+							App._post_form('&p=store&do=getCultivateClassList', {}, res => {
+									console.log(res, '78123791840294-23o5')
+									diypagesDataArray[1].data = res.data;
+									diypagesDataArray[1].newCC_id = _this.newCC_id;
+									laterProcedure();
+									
+								}, false, () => {
+									
+								}
+							)
+						}else{
+							laterProcedure();
+						}
+						
+						let laterProcedure = function(){
+							_this.diypagesData = diypagesDataArray;
+							//处理数据
+							for (let i in _this.diypagesData) {
+								/*
+								if(that.diypagesData[i].id == 'public_goods2'){ //查询
+								}
+								*/
+							
+								//处理按钮组数据
+								if (_this.diypagesData[i].id == 'menu' || _this.diypagesData[i].id == 'menu2') {
+									//初始化
+									_this.diypagesData[i].btngroupData = {};
+									let btngroupData = {};
+									btngroupData.list = [];
+									btngroupData.indicatorDots = true;
+									btngroupData.duration = 300;
+									btngroupData.btngroupHandleData = [];
+									btngroupData.swiperHeight = '';
+							
+									btngroupData.backgroundColor = _this.diypagesData[i].style.background;
+									btngroupData.btnBordeRadius = _this.diypagesData[i].style.navstyle;
+									btngroupData.displayMode = _this.diypagesData[i].style.showtype;
+									btngroupData.eachLineNum = _this.diypagesData[i].style.rownum;
+									btngroupData.eachPageNum = _this.diypagesData[i].style.pagenum;
+									for (let n in _this.diypagesData[i].data) {
+										btngroupData.list.push(_this.diypagesData[i].data[n]);
+									}
+									if (_this.diypagesData[i].style.showdot == 0) {
+										btngroupData.indicatorDots = false;
+									} else {
+										btngroupData.indicatorDots = true;
+									}
+									let eachPageFactNum = ''; //每页实际显示的数量
+									if (btngroupData.list.length > btngroupData.eachPageNum) {
+										eachPageFactNum = btngroupData.eachPageNum;
+									} else {
+										eachPageFactNum = btngroupData.list.length;
+									}
+									btngroupData.swiperHeight = Math.ceil(eachPageFactNum / btngroupData.eachLineNum) * 87 + 15;
+									if (btngroupData.list && btngroupData.list.length > 0) {
+										let listsLength = Math.ceil(btngroupData.list.length / btngroupData.eachPageNum);
+										for (let j = 0; j < listsLength; j++) {
+											let arr = [];
+											let arrIndex = j * btngroupData.eachPageNum;
+											for (let m = arrIndex; m < btngroupData.eachPageNum * (j + 1) && m < btngroupData.list.length; m++) {
+												arr.push(btngroupData.list[m]);
+											}
+											btngroupData.btngroupHandleData.push(arr);
+										}
+									}
+									_this.diypagesData[i].btngroupData = btngroupData;
+								}
+								//处理图片橱窗风格4
+								if (_this.diypagesData[i].id == 'picturew4') {
+									let picturewArr = [];
+									for (let p in _this.diypagesData[i].data) {
+										picturewArr.push(_this.diypagesData[i].data[p]);
+									}
+									_this.diypagesData[i].data = picturewArr;
+								}
+								//处理图片橱窗风格5
+								if (_this.diypagesData[i].id == 'picturew5') {
+									let picturewArr = [];
+									for (let p in _this.diypagesData[i].data) {
+										picturewArr.push(_this.diypagesData[i].data[p]);
+									}
+									_this.diypagesData[i].data = picturewArr;
+								}
+								//处理图片展播
+								if (_this.diypagesData[i].id == 'pictures') {
+									let picturesArr = [];
+									for (let p in _this.diypagesData[i].data) {
+										picturesArr.push(_this.diypagesData[i].data[p]);
+									}
+									_this.diypagesData[i].data = picturesArr;
+								}
+								//处理商家信息
+								if (_this.diypagesData[i].id == 'shop') {
+									let shopArr = [];
+									for (let s in _this.diypagesData[i].data) {
+										let goodsArr = [];
+										for (let g in _this.diypagesData[i].data[s].goods) {
+											if (_this.diypagesData[i].data[s].goods[g] !== '') {
+												if (g == 'active') {
+													_this.diypagesData[i].data[s].goods[g].css = 'qiang';
+													_this.diypagesData[i].data[s].goods[g].tag = '抢';
+												} else if (g == 'coupon') {
+													_this.diypagesData[i].data[s].goods[g].css = 'hui';
+													_this.diypagesData[i].data[s].goods[g].tag = '券';
+												} else if (g == 'fightgroup') {
+													_this.diypagesData[i].data[s].goods[g].css = 'pin';
+													_this.diypagesData[i].data[s].goods[g].tag = '拼';
+												} else if (g == 'groupon') {
+													_this.diypagesData[i].data[s].goods[g].css = 'tuan';
+													_this.diypagesData[i].data[s].goods[g].tag = '团';
+												} else if (g == 'halfcard') {
+													_this.diypagesData[i].data[s].goods[g].css = 'ka';
+													_this.diypagesData[i].data[s].goods[g].tag = '卡';
+												} else if (g == 'packages') {
+													_this.diypagesData[i].data[s].goods[g].css = 'li';
+													_this.diypagesData[i].data[s].goods[g].tag = '礼';
+												} else if (g == 'bargain') {
+													_this.diypagesData[i].data[s].goods[g].css = 'kan';
+													_this.diypagesData[i].data[s].goods[g].tag = '砍';
+												}
+												goodsArr.push(_this.diypagesData[i].data[s].goods[g]);
+											}
+										}
+										_this.diypagesData[i].data[s].goods = goodsArr;
+										shopArr.push(_this.diypagesData[i].data[s]);
+									}
+									_this.diypagesData[i].shopArr = shopArr;
+								}
+								if (_this.diypagesData[i].id == 'banner' || _this.diypagesData[i].id == 'banner2') {
+									let imageWidth = _this.diypagesData[i].width,
+										imageHeight = _this.diypagesData[i].height,
+										imageRatio = imageWidth / imageHeight,
+										windowHeight = uni.getSystemInfoSync().windowWidth / imageRatio;
+									_this.diypagesData[i].autoHeight = windowHeight;
+										let ratio;
+										uni.getSystemInfo({
+											success: function(wh) {
+												ratio = wh.windowWidth / _this.diypagesData[i].params.img_width;
+												_this.diypagesData[i].params.img_width = (ratio * _this.diypagesData[i].params.img_width);
+												_this.diypagesData[i].params.img_height = ratio * _this.diypagesData[i].params.img_height;
+												
+											}
+										});
+								}
+							}
+							_this.datas.basic = _this.diypagesData;
+						};
+					}
+				},
+				false,
+				() => {
+					_this.loadAgain = true;
+					_this.loadlogo = true;
+				}
+			);
+		},
+		async getCultivateClassList(){
+			const res = await App._post_form('&p=store&do=getCultivateClassList', {}
+			// , res => {
+				// item.data = res.data;
+				// item.newCC_id = _this.newCC_id;
+			// }, false, () => {
+				
+			// }
+			)
+			console.log(res, 'uiaehdfafdiaerfhwsefef')
+			return res;
+		},
+		playAudio() {
+			let _this = this,
+				play_Audio = _this.play_Audio ? false : true,
+				pageAudio = _this.pageInfo.music;
+			if (play_Audio) {
+				//#ifdef H5
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							innerAudioContext.play();
+						}
+					});
+				});
+				//#endif
+				//#ifndef H5
+				innerAudioContext.play();
+				//#endif
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+				});
+			}
+			if (!play_Audio) {
+				innerAudioContext.pause();
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			_this.play_Audio = play_Audio;
+		},
+		setmpShare(type, id = '') {
+			let _this = this;
+			App._post_form(
+				'&do=Shareinfo',
+				{
+					type,
+					id
+				},
+				res => {
+					_this.shareData = res.data;
+				}
+			);
+		},
+		selectAllarea() {
+			let _this = this,
+				{ sort, cate_one, cate_two } = _this;
+			_this.setData({
+				city_id: '',
+				current_page: 1
+			});
+			_this.getShoplist(1, sort, cate_one, cate_two, '', _this.currentLoction.latitude, _this.currentLoction.longitude);
+		},
+		selectAreaid(cityItemData) {
+			let _this = this,
+				{ sort, cate_one, cate_two } = _this;
+			_this.setData({
+				city_id: cityItemData.id,
+				current_page: 1
+			});
+			_this.getShoplist(1, sort, cate_one, cate_two, cityItemData.id, _this.currentLoction.latitude, _this.currentLoction.longitude);
+		},
+		selectClassid(classItemData) {
+			let _this = this,
+				{ sort, city_id } = _this;
+				
+			if (classItemData.list.length === 0) {
+				_this.getShoplist(1, sort, classItemData.cate_one, '', city_id, _this.currentLoction.latitude, _this.currentLoction.longitude);
+				_this.setData({
+					current_page: 1,
+					cate_two: ''
+				});
+				_this.cate_one = '';
+				_this.cate_two = '';
+				_this.title = '';
+			}
+			_this.setData({
+				cate_one: classItemData.cate_one
+			});
+			
+		},
+		selectClassTwoid(classItemTwoData) {
+			let _this = this,
+				{ sort, city_id, cate_one } = _this;
+				console.log(_this.seTime);
+				// if(_this.seTime) return
+				// debugger
+			_this.getShoplist(1, sort, cate_one, classItemTwoData.cate_two, city_id, _this.currentLoction.latitude, _this.currentLoction.longitude);
+			_this.setData({
+				cate_two: classItemTwoData.cate_two,
+				current_page: 1
+			});
+			// _this.cate_two = '';
+			// _this.title = '';
+		},
+		selectOrders(ordersItem) {
+			let _this = this,
+				{ city_id, cate_one, cate_two } = _this;
+			_this.getShoplist(1, ordersItem.val, cate_one, cate_two, city_id, _this.currentLoction.latitude, _this.currentLoction.longitude);
+			_this.setData({
+				sort: ordersItem.val,
+				current_page: 1
+			});
+		},
+		pageScrollHeight(isshowTabbar) {
+			if (isshowTabbar === '1') {
+				uni.pageScrollTo({
+					scrollTop: 190
+				});
+			} else {
+				uni.pageScrollTo({
+					scrollTop: 0
+				});
+			}
+		},
+		getChild(e) {
+			let _this = this,
+				{ sort, cate_one, cate_two, city_id, current_page, total } = _this;
+			_this.getShoplist(1, sort, cate_one, cate_two, city_id, _this.currentLoction.latitude, _this.currentLoction.longitude, false, e);
+		},
+		getShoplist(page = 1, sort = '', cate_one = '', cate_two = '', city_id = '', lat = '', lng = '', isPage = false, search = '') {
+			let _this = this,
+				requestData = {
+					page,
+					sort,
+					cate_one:cate_one || _this.cate_one,
+					cate_two:cate_two || _this.cate_two,
+					city_id:city_id || _this.city_id,
+					lat,
+					lng,
+					is_collect: 0,
+					search
+				};
+				if(_this.seTime) return
+				_this.seTime = true;
+				setTimeout(()=>{
+					_this.seTime = false;
+				},1000)
+			App._post_form('&p=citycard&do=homeList', requestData, res => {
+				let cardlist = res.data.list;
+				if (isPage) {
+					if (cardlist.length > 0) {
+						_this['cardlist'].push(...cardlist);
+					} else {
+						_this.loadingMore = true;
+					}
+				} else {
+					_this.setData({
+						cardlist,
+						loadingMore: cardlist.length === 0 || _this.current_page === res.data.total,
+						total: res.data.total,
+						is_have: res.data.is_have
+					});
+				}
+			});
+		},
+		cardOnReachBottom() {
+			let _this = this,
+				{ sort, cate_one, cate_two, city_id, current_page, total } = _this;
+			if (current_page >= total) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getShoplist(++_this.current_page, sort, cate_one, cate_two, city_id, _this.currentLoction.latitude, _this.currentLoction.longitude, true);
+		}
+	},
+	destroyed() {
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			console.log('页面跳转暂停播放');
+		});
+	},
+	onUnload() {
+		this.play_Audio = false;
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			console.log('页面跳转暂停播放');
+		});
+	},
+	onPullDownRefresh() {},
+	onReachBottom() {
+		if (this.pageType !== '13') {
+			uni.$emit('isBottomMore');
+			uni.$emit('tabisBottomMore');
+		} else {
+			this.cardOnReachBottom();
+		}
+	}
+};
+</script>
+
+<style scoped>
+.app{
+	display:flex;
+	flex-flow:column nowrap;
+	height:100%;
+	
+	padding-bottom: 130upx;
+}
+uni-page-body, uni-page-refresh{
+	height: 100%;
+	
+}
+.container {
+	/* background-color: #ffd93f; */
+	/* overflow: auto; */
+	/* min-height: 100vh; */
+	
+}
+
+.page-index {
+	width: 100vw;
+	overflow: hidden;
+	position: relative;
+}
+
+.index-right-bar {
+	width: 80px;
+	height: 80px;
+	padding: 16px;
+	position: fixed;
+	right: 30px;
+	bottom: 60px;
+	z-index: 99;
+}
+
+.right-bar-i {
+	width: 100%;
+	height: 100%;
+	padding: 6px;
+}
+
+.right-bar-i-t {
+	height: 40px;
+	text-align: center;
+	margin-top: 0;
+	padding-top: 6px;
+}
+
+.right-bar-i-t .i {
+	width: 44px;
+	height: 44px;
+	display: inline-block;
+}
+
+.right-bar-i-t .i .image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.right-bar-i-c {
+	height: 32px;
+	line-height: 32px;
+	font-size: 20px;
+	margin-top: 0;
+}
+
+.index-h {
+	height: 80px;
+	line-height: 80px;
+	padding: 10px 30px 20px 30px;
+	display: flex;
+	justify-content: space-between;
+	background-color: #ffd93f;
+	position: relative;
+}
+
+.index-h-l {
+	color: #000;
+	font-size: 36px;
+	font-style: italic;
+}
+
+.index-h-r-d {
+	width: 180px;
+	height: 56px;
+	line-height: 56px;
+	color: #808080;
+	font-size: 28px;
+	text-align: center;
+	margin-top: 12px;
+	background-color: #fff0b2;
+	border-radius: 40px;
+}
+
+.index-h-r-d .i {
+	color: #333;
+	font-size: 32px;
+	margin-right: 10px;
+	vertical-align: -2px;
+}
+
+@keyframes move_wave {
+	0% {
+		transform: translateX(0) translateZ(0) scaleY(1);
+	}
+
+	100% {
+		transform: translateX(-66.66666%) translateZ(0) scaleY(1);
+	}
+}
+
+.index-wave {
+	width: 100%;
+	height: 60px;
+	position: absolute;
+	top: -72px;
+	left: 0;
+	overflow: hidden;
+}
+
+.index-wave-d {
+	width: 300%;
+	height: 100%;
+	animation: move_wave 4s linear infinite;
+	animation-delay: 0s;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: flex-start;
+}
+
+.index-wave-i {
+	width: 100%;
+	height: 100%;
+	position: relative;
+}
+
+.index-wave-i .image {
+	width: 100%;
+	height: 100%;
+}
+
+.index-t1 {
+	margin-top: 40px;
+	padding: 0 30px;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+	z-index: 1;
+}
+
+.index-t1-l {
+	padding-right: 30px;
+	flex: 1;
+	display: -webkit-flex;
+	display: flex;
+	justify-content: space-around;
+}
+
+.index-t1-l-i {
+	width: 140px;
+}
+
+.index-t1-l-i-t {
+	width: 100px;
+	height: 100px;
+	padding: 0 20px;
+}
+
+.index-t1-l-i-t .image {
+	width: 100px;
+	height: 100px;
+}
+
+.index-t1-l-i-b {
+	height: 42px;
+	line-height: 42px;
+	text-align: center;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+
+.index-t1-r {
+	width: 140px;
+	border-left: 1.2px solid #f6f6f6;
+}
+
+.index-t1-r .image {
+	width: 110px;
+	height: 110px;
+	margin: 10px 0 0 30px;
+}
+
+.bottomPadding {
+	padding-bottom: 100upx;
+}
+
+.business-card-box {
+	padding: 30upx 0 120upx;
+	background-color: #f8f8f8;
+}
+// 
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background-color: #fff;
+	position: fixed;
+	padding-bottom: 15px;
+	z-index: 99;
+	top: 0px;
+}
+</style>
diff --git a/pages/mainPages/index/index.vue b/pages/mainPages/index/index.vue
new file mode 100644
index 0000000..294b120
--- /dev/null
+++ b/pages/mainPages/index/index.vue
@@ -0,0 +1,1170 @@
+<template>
+	<!-- 首页 -->
+	<view class="container" style="padding-top: 90px;background-color: #FFFFFF;">
+		<view class="status_bar">
+			<!-- 这里是状态栏 -->
+		</view>
+		<navigationBar custom="true">
+			<view :style="{width: '100vw',height: '50px'}" style="background-color: #FFFFFF;position: fixed;z-index: 999;top:40px;">
+				<view :style="{padding: '10px', paddingLeft: '20px'}" style="display: flex;">
+					<!-- <image :style="{verticalAlign: 'middle', width: 94 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image> -->
+					<image :style="{verticalAlign: 'middle', width: 30 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image>
+					<view style="font-size: 18px;font-weight: bold;line-height: 30px;margin-left: 4px;">粤职才</view>
+				</view>
+			</view>
+		</navigationBar>
+		<view v-if="seeting">
+			<far-bottom></far-bottom>
+		</view>
+		<!-- #ifdef MP-WEIXIN -->
+		<view>
+			<official-account></official-account>
+		</view>
+		<view class="hintModule" v-if="hintShow">
+			点击“
+			<view class="smallCircle dis-il-block"></view>
+			<view class="bigCircle dis-il-block"></view>
+			<view class="smallCircle dis-il-block"></view>
+			”添加到我的小程序,微信首页下拉即可快速访问
+			<view class="hintClose iconfont icon-roundclose" @click="closeHint"></view>
+			<view class="hintIndicate"></view>
+		</view>
+		<!-- #endif -->
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-index" :style="'background-color: ' + datas.page.background" :class="!!bottomMenu ? 'bottomPadding' : ''" v-if="loadlogo">
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages ref="diypages" :isred="isred" :diypagesData.sync="diypagesData" :pageData="datas.page" @diyhomepage="diyhomepage" :btngroupData="btngroup" />
+			<!-- 自定义首页插入固定内容start -->
+			<view class="">
+				<view class="hot-wrapper" v-if="0">
+					<view class="dis-flex hot-title">
+						<text>热议话题</text>
+						<navigator style="flex: 1;text-align: right;margin-right: 20px;" url="/pagesA/topSearch/topSearch">
+							更多热搜
+						</navigator>
+					</view>
+					<view class="hot-list">
+						<block v-for="(hotDataItem) in hotSearchData" :key="hotDataItem">
+							<view class="hot-item1" @click="toSubject(hotDataItem)">{{hotDataItem}}</view>
+						</block>
+					</view>
+				</view>
+				<view style="margin-top: 10px;"><!-- 临时行间样式，上面模块放出后无需margin-top -->
+					<view class="dis-flex" style="padding: 0px 10rpx;">
+						<view class="tab-item" :class="tabIndex==1?'active':''" @click="tabIndex=1">学生社区</view>
+						<view class="tab-item" :class="tabIndex==2?'active':''" @click="tabIndex=2">资讯</view>
+					</view>
+					<view class="list-con" v-show="tabIndex==1">
+						<pic-text-list :tab1Page="tab1Page" @changenoMore1="changenoMore1" :scrollLock="scrollLock" @changeScrollLock="changeScrollLock"></pic-text-list>
+						<!-- <block v-for="(item, index) in communityList" :key="index">
+							<view @click="toDetails(item.id)" style="border-bottom: 1px solid #efefef;">
+								<pic-text :info="item" :index="index" :stopVideo="stopVideo" :currentPlay="currentPlay" @changePlay="changePlay()"></pic-text>
+							</view>
+						</block> -->
+					</view>
+					<view class="hot-wrapper" v-show="tabIndex==2">
+						<navigator hover-class="none" class="dis-flex hot-title" url="/pagesA/informationHot/informationHot">
+							<image style="width: 96px;height: 35px;" src="../../../static/hot_list_logo.png" mode=""></image>
+						</navigator>
+						<view class="hot-list">
+							<view class="hot-item" v-for="(item, index) in HeadlineDataRank" :key="index" @click="toArticle(item.id)">
+								<text :style="{color:index === 0 ? '#f00' : (index === 1?'#ff8c00':'#ffd900')}"
+								 style="margin-right: 8px;">{{ index+1 }}</text>
+								{{ item.title }}
+							</view>
+						</view>
+					</view>
+					<view class="list-con" v-show="tabIndex==2">
+						<view class="">
+							<view @click="toArticle(item.id)" class="list-item" v-for="(item, index) in HeadlineDataList" :key="index">
+								<view style="flex: 1;">
+									<view class="list-title">{{item.title}}</view>
+									<view style="color: #999999;font-size: 12px;">{{item.author}}&nbsp;{{item.release_time}}</view>
+								</view>
+								<image class="list-img" :src="item.display_img" mode="aspectFill"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 自定义首页插入固定内容end -->
+			<view style="">
+				<block v-for="(item, index) in datas.page.copytext" :key="index">
+					<view class="f-22" style="text-align: center;color: #999;">{{ item }}</view>
+				</block>
+				<view  style="text-align: center;margin-top: 10rpx;padding-bottom: 50upx;">
+					<block v-for="(item, index) in datas.page.copyurl" :key="index">
+						<text class="borderLast f-22" style="padding:0 15rpx 0 15rpx;color: #4395FF;" @click="versionCli(item.url)">{{ item.text }}</text>
+					</block>
+				</view>
+			</view>
+			<view class="full"></view>
+			<view class="page-footer" v-if="isTabbars">
+				<TabBars :tabBarAct="0" :tabBarData="bottomMenu" :TabBarsType="datas.page.type" />
+				</view>
+			<view class="audio-main" @click="playAudio" v-if="!!pageInfo.music" id="playAudios">
+				<view class="audio-bg" :class="{ 'stop-audio': !play_Audio }">
+					<view class="audio-gif" :style="{ 'background-image': 'url(' + imageRoot + 'musicgif.gif)' }">
+						<view class="audio-png" :style="{ 'background-image': 'url(' + imageRoot + 'music.png)' }"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<follow
+			:followShow="followShow"
+			:followType="followType"
+			:followTitleShow="followTitleShow"
+			@clickmask="openQrShow"
+			@closeFollowPop="closeFollowPop"
+			@closeFollowTitle="closeFollowTitle"
+		></follow>
+		<red-packet v-if="pageInfo.redpackflag === 1" :pagenum="pagenum"></red-packet>
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image v-if="shareShow"  :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+	</view>
+</template>
+<script>
+let innerAudioContext = uni.createInnerAudioContext();
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import diypages from '@/components/template/diypages.vue';
+import Advert from '@/components/template/advert.vue';
+import TabBars from '@/components/template/tabBar.vue';
+import recommendGoods from '@/components/page/pageComponents/Recommend_goods.vue';
+import wxApi from '@/common/js/wxApi.js';
+import follow from '@/components/template/follow.vue';
+import redPacket from '@/components/template/redpacket.vue';
+import PopManager from '@/components/template/PopManager.vue';
+// import picText from "@/components/template/pic_text/pic_text.vue"
+import picTextList from "@/components/template/pic_text/pic_text_list.vue"
+
+export default {
+	data() {
+		return {
+			followTitleShow: true,
+			followShow: false,
+			followType: '0',
+			loadlogo: false,
+			swiperI: 1,
+			loadAgain: false,
+			isTabbars: true,
+			datas: {
+				basic: [],
+				adv: '',
+				page: {}
+			},
+			pageInfo: {},
+			play_Audio: false,
+			diypagesData: [],
+			btngroup: {
+				backgroundColor: '#ffffff',
+				btnBordeRadius: '',
+				displayMode: '',
+				eachLineNum: '',
+				eachPageNum: '',
+				list: [],
+				indicatorDots: true,
+				duration: 300,
+				btngroupHandleData: [],
+				swiperHeight: ''
+			},
+			bottomMenu: null,
+			bgAudioMannager:'',
+			muiick:'',
+			seeting:null,
+			pagenum:0,
+			isred:0,
+			height:40,
+			isRedId:null,
+			isRedShare:null,
+			shareShow:false,
+			hintShow:false,
+			tabIndex: 1,
+			communityList: [],
+			tab1Page: 1,
+			tab2Page: 1,
+			page_index: 10,
+			hotSearchData: [],
+			HeadlineDataList: [],
+			HeadlineDataRank: [],
+			indexShow: -1,
+			noMore1: false,
+			noMore2: false,
+			// stopVideo: 0,
+			scrollLock: false,
+			// scrollTimer: null,
+			// currentPlay: -2,//当前正在播放的视频在列表中的索引,-2表示没有正在播放
+		};
+	},
+	components: {
+		Loadlogo,
+		diypages,
+		Advert,
+		TabBars,
+		recommendGoods,
+		follow,
+		redPacket,
+		PopManager,
+		// picText,
+		picTextList
+	},
+	onReady(){
+		console.log('onReady比onLoad慢')
+	},
+	onLoad(e) {
+		console.log('onLoad')
+		this.stopVideo = 0;
+		let _this = this;
+		let url = 'pages/mainPages/index/index';
+		let Twodaystime = uni.getStorageSync('Twodaystime');
+		if(Twodaystime < new Date().getTime()){ //当前时间大于之前记录的时间则显示提示框
+			_this.hintShow = true;
+		}
+		if(e.isred){
+			url = url + '?isred=' + e.isred
+			this.isred = e.isred;
+		}
+		if(e.isRedShare && !e.isred){
+			this.isRedId = e.isRedId; //id
+			this.isRedShare = e.isRedShare; //类型：1卡券，2红包
+			
+			//展示分享的遮罩指示
+		}else{
+			uni.removeStorageSync('redItem');
+		}
+		uni.getSystemInfo({
+			success:function(data){
+				// 将其赋值给this
+				_this.height=data.statusBarHeight;
+			}
+		})
+		//#ifdef H5
+		setTimeout(()=>{
+			App.navigationTo({
+				url: url
+			})
+		},1000)
+		//#endif
+		// this.getList(this.tab1Page);//获取学生社区列表/
+		this.getinfoHot();
+		this.getHeadlineInfo(this.tab2Page);
+		this.getHeadlineInfoHot()
+	},
+	onShow() {
+			this.pagenum = this.pagenum + 1;
+			setTimeout(()=>{
+				App.wxApiCallback('pages/mainPages/index/index');	
+			},500)
+			// let name = uni.getStorageSync('indexName');
+			// console.log(this.pageInfo, 'bbbbbbaaaaa')
+		if (this.pageInfo && !!this.pageInfo.title) {
+			// #ifndef H5
+			// debugger
+			setTimeout(()=>{
+				uni.setNavigationBarTitle({
+					title: this.pageInfo.title || ''
+				});
+			},500)
+			
+			// #endif
+			// #ifdef H5
+			setTimeout(()=>{
+				document.title = this.pageInfo.title
+				console.log('在首页onshow当中率先执行',this.pageInfo.title)
+			},500)
+			
+			
+			// #endif
+			
+		}
+		
+		if(this.pageInfo && this.pageInfo.music){
+			this.playAudio();
+		}
+		//#ifdef APP-PLUS
+		this.isTabbars = true;
+		//#endif
+		
+		// this.isTabbars = true;
+		// this.tab1Page = 1;
+		// this.tab2Page = 1;
+		
+	},
+	onHide() {
+		let _this = this,
+			play_Audio = false,
+			pageAudio = _this.pageInfo.music;
+		if (!play_Audio) {
+			innerAudioContext.pause();
+			innerAudioContext.onPause(() => {
+				console.log('暂停播放');
+			});
+		}
+		// _this.isTabbars = false;
+		_this.play_Audio = play_Audio;
+	},
+	created() {},
+	mounted() {
+		// this.playAudio();
+		this.goseeting();
+		this.homePageInfo();
+		this.$nextTick(function() {
+			this.getcurCityTime();
+		});
+	},
+	watch:{
+		muiick(newold){
+			console.log('监听音乐')
+			// this.playAudio();
+		}
+	},
+	methods: {
+		closeHint(){ //关闭提示弹窗并记录当前时间
+			let _this = this;
+			_this.hintShow = false;
+			uni.setStorageSync('Twodaystime',new Date().getTime() + (48 * 60 * 60 * 1000)) //计算两天后的时间戳
+			// console.log(,new Date().getTime());
+		},
+		redShare(id,type){
+			return new Promise((resolve, reject) => {
+				App._post_form('&p=Order&do=planTransfer', {
+					id,
+					type
+				}, res => {
+					resolve(res.data);
+				})
+			})
+		},
+		diyhomepage(){
+			this.homePageInfo();
+		},
+		goseeting(){
+			let _this = this;
+			App._post_form('&do=CustomerService', {}, function(result) {
+				uni.removeStorageSync('CustomerService');
+				uni.setStorageSync('CustomerService',result.data);
+				_this.seeting = uni.getStorageSync('CustomerService');
+			});
+		},
+		btnTouchend(){
+			
+		},
+		// btnClick(){
+		// 	console.log(3)
+		// },
+		// btnTouchstart(){
+			
+		// },
+		versionCli(url) {
+			console.log(url, 'oooo');
+			let oneContent = url.substring(0, 1);
+			// if (oneContent != '/') {
+			// 	url = '/' + url;
+			// }
+			// uni.navigateTo({
+			// 	url: url
+			// });
+			App.navigationTo({
+				url
+			})
+		},
+		getcurCityTime() {
+			let _this = this,
+				agencyData = uni.getStorageSync('agencyData'),
+				timestamp = new Date().getTime(),
+				cityTime = uni.getStorageSync('cityTimestamp'),
+				nowTime = !!cityTime ? timestamp - cityTime : '';
+			if (!!nowTime) {
+				let nowTime_m = parseInt((nowTime / 1000 / 60) % 60);
+				if (nowTime_m > 120) {
+					// #ifdef H5
+					wxApi.wxRegister(() => {
+						jWeixin.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								App.getAreaId(
+									res,
+									'',
+									'',
+									options => {
+										console.log('拿到了');
+										if (agencyData.areaid !== options.data.areaid) {
+											uni.showModal({
+												title: `定位到您在${options.data.areaname}`,
+												content: `是否切换至该城市进行探索`,
+												confirmText: '切换',
+												success: function(calback) {
+													if (calback.confirm) {
+														uni.setStorageSync('agencyData', options.data);
+														_this.$nextTick(function() {
+															_this.getPagesData(res, options.data.aid);
+															_this.$refs.diypages.currentaidCity = options.data.areaname;
+															uni.setStorageSync('curLoction', res);
+														});
+													}
+												}
+											});
+										}
+									},
+									true
+								);
+							}
+						});
+					});
+					// #endif
+					// #ifdef MP-WEIXIN
+					App.getLocation().then(res => {
+						App.getAreaId(
+							res,
+							'',
+							'',
+							options => {
+								if (agencyData.areaid !== options.data.areaid) {
+									uni.showModal({
+										title: `定位到您在${options.data.areaname}`,
+										content: `是否切换至该城市进行探索`,
+										confirmText: '切换',
+										success: function(calback) {
+											if (calback.confirm) {
+												uni.setStorageSync('agencyData', options.data);
+												_this.$nextTick(function() {
+													_this.getPagesData(options.data.aid);
+													_this.$refs.diypages.currentaidCity = options.data.areaname;
+													uni.setStorageSync('curLoction', res);
+												});
+											}
+										}
+									});
+								}
+							},
+							true
+						);
+					});
+					// #endif
+				}
+			}
+		},
+		homePageInfo() {
+			// this.playAudio();
+			let _this = this,
+				agencyData = uni.getStorageSync('agencyData');
+			App.getAreaId(agencyData, '', '', options => {
+				_this.$nextTick(function() {
+					_this.getPagesData(options.data.aid);
+				});
+			});
+		},
+		closeFollowTitle() {
+			let _this = this;
+			_this.followTitleShow = false;
+		},
+		closeFollowPop() {
+			let _this = this;
+			_this.followShow = false;
+		},
+		openQrShow() {
+			let _this = this;
+			_this.followShow = true;
+		},
+		getPageItem(keys,index){
+			let _this = this;
+			if(keys.length > 3 ){
+				if(index == 3){
+					_this.loadAgain = true;
+					_this.loadlogo = true;
+					
+					if(_this.isRedId){
+						_this.shareShow = true;
+					}
+				}
+			}else{
+				_this.loadAgain = true;
+				_this.loadlogo = true;
+				if(_this.isRedId){
+					_this.shareShow = true;
+				}
+			}
+			if(index > keys.length - 1) return;
+			let myLocation = uni.getStorageSync('curLoction');
+			var lng = myLocation.longitude || '';
+			var lat = myLocation.latitude || '';
+			let data = {
+				item_key:keys[index],
+				lng,
+				lat
+			}
+			App._post_form('&do=getItemParams', data, function(result) {
+				// console.log(result,'getItemParams');
+				// for (let i in diypagesData) {
+				// 	diypagesDataArray.push(diypagesData[i]);
+				// }
+				_this.diypagesData.push(result.data);
+				//处理数据
+				for (let i in _this.diypagesData) {
+					//处理按钮组数据
+					if (_this.diypagesData[i].id == 'menu' || _this.diypagesData[i].id == 'menu2') {
+						//初始化
+						_this.diypagesData[i].btngroupData = {};
+						let btngroupData = {};
+						btngroupData.list = [];
+						btngroupData.indicatorDots = true;
+						btngroupData.duration = 300;
+						btngroupData.btngroupHandleData = [];
+						btngroupData.swiperHeight = '';
+				
+						btngroupData.backgroundColor = _this.diypagesData[i].style.background;
+						btngroupData.btnBordeRadius = _this.diypagesData[i].style.navstyle;
+						btngroupData.displayMode = _this.diypagesData[i].style.showtype;
+						btngroupData.eachLineNum = _this.diypagesData[i].style.rownum;
+						btngroupData.eachPageNum = _this.diypagesData[i].style.pagenum;
+						for (let n in _this.diypagesData[i].data) {
+							btngroupData.list.push(_this.diypagesData[i].data[n]);
+						}
+						if (_this.diypagesData[i].style.showdot == 0) {
+							btngroupData.indicatorDots = false;
+						} else {
+							btngroupData.indicatorDots = true;
+						}
+						let eachPageFactNum = ''; //每页实际显示的数量
+						if (btngroupData.list.length > btngroupData.eachPageNum) {
+							eachPageFactNum = btngroupData.eachPageNum;
+						} else {
+							eachPageFactNum = btngroupData.list.length;
+						}
+						btngroupData.swiperHeight = Math.ceil(eachPageFactNum / btngroupData.eachLineNum) * 87 + 15;
+						if (btngroupData.list && btngroupData.list.length > 0) {
+							let listsLength = Math.ceil(btngroupData.list.length / btngroupData.eachPageNum);
+							for (let j = 0; j < listsLength; j++) {
+								let arr = [];
+								let arrIndex = j * btngroupData.eachPageNum;
+								for (let m = arrIndex; m < btngroupData.eachPageNum * (j + 1) && m < btngroupData.list.length; m++) {
+									arr.push(btngroupData.list[m]);
+								}
+								btngroupData.btngroupHandleData.push(arr);
+							}
+						}
+						_this.diypagesData[i].btngroupData = btngroupData;
+					}
+					//处理图片橱窗风格4
+					if (_this.diypagesData[i].id == 'picturew4') {
+						let picturewArr = [];
+						for (let p in _this.diypagesData[i].data) {
+							picturewArr.push(_this.diypagesData[i].data[p]);
+						}
+						_this.diypagesData[i].data = picturewArr;
+					}
+					//处理图片橱窗风格5
+					if (_this.diypagesData[i].id == 'picturew5') {
+						let picturewArr = [];
+						for (let p in _this.diypagesData[i].data) {
+							picturewArr.push(_this.diypagesData[i].data[p]);
+						}
+						_this.diypagesData[i].data = picturewArr;
+					}
+					//处理图片展播
+					if (_this.diypagesData[i].id == 'pictures') {
+						let picturesArr = [];
+						for (let p in _this.diypagesData[i].data) {
+							picturesArr.push(_this.diypagesData[i].data[p]);
+						}
+						_this.diypagesData[i].data = picturesArr;
+					}
+					//处理商家信息
+					if (_this.diypagesData[i].id == 'shop') {
+						let shopArr = [];
+						for (let s in _this.diypagesData[i].data) {
+							let goodsArr = [];
+							for (let g in _this.diypagesData[i].data[s].goods) {
+								if (_this.diypagesData[i].data[s].goods[g] !== '') {
+									if (g == 'active') {
+										_this.diypagesData[i].data[s].goods[g].css = 'qiang';
+										_this.diypagesData[i].data[s].goods[g].tag = '抢';
+									} else if (g == 'coupon') {
+										_this.diypagesData[i].data[s].goods[g].css = 'hui';
+										_this.diypagesData[i].data[s].goods[g].tag = '券';
+									} else if (g == 'fightgroup') {
+										_this.diypagesData[i].data[s].goods[g].css = 'pin';
+										_this.diypagesData[i].data[s].goods[g].tag = '拼';
+									} else if (g == 'groupon') {
+										_this.diypagesData[i].data[s].goods[g].css = 'tuan';
+										_this.diypagesData[i].data[s].goods[g].tag = '团';
+									} else if (g == 'halfcard') {
+										_this.diypagesData[i].data[s].goods[g].css = 'ka';
+										_this.diypagesData[i].data[s].goods[g].tag = '卡';
+									} else if (g == 'packages') {
+										_this.diypagesData[i].data[s].goods[g].css = 'li';
+										_this.diypagesData[i].data[s].goods[g].tag = '礼';
+									} else if (g == 'bargain') {
+										_this.diypagesData[i].data[s].goods[g].css = 'kan';
+										_this.diypagesData[i].data[s].goods[g].tag = '砍';
+									}
+									goodsArr.push(_this.diypagesData[i].data[s].goods[g]);
+								}
+							}
+							_this.diypagesData[i].data[s].goods = goodsArr;
+							shopArr.push(_this.diypagesData[i].data[s]);
+						}
+						_this.diypagesData[i].shopArr = shopArr;
+					}
+					if (_this.diypagesData[i].id == 'banner' || _this.diypagesData[i].id == 'banner2') {
+						let imageWidth = _this.diypagesData[i].width,
+							imageHeight = _this.diypagesData[i].height,
+							imageRatio = imageWidth / imageHeight,
+							windowHeight = uni.getSystemInfoSync().windowWidth / imageRatio;
+						_this.diypagesData[i].autoHeight = windowHeight;
+							let ratio;
+							// console.log(item.params.img_width,'jinx')
+							uni.getSystemInfo({
+								success: function(wh) {
+									ratio = wh.windowWidth / _this.diypagesData[i].params.img_width;
+									_this.diypagesData[i].params.img_width = (ratio * _this.diypagesData[i].params.img_width);
+									_this.diypagesData[i].params.img_height = ratio * _this.diypagesData[i].params.img_height;
+									
+								}
+							});
+					}
+				}
+				_this.datas.basic = _this.diypagesData;
+				_this.getPageItem(keys,index+1);
+			});
+		},
+		getPagesData(aid = '') {
+			let _this = this;
+			let myLocation = uni.getStorageSync('curLoction');
+			var lng = myLocation.longitude || '';
+			var lat = myLocation.latitude || '';
+			
+			App._post_form(
+				'&do=newHomePage',
+				{
+					aid,
+					lng,
+					lat
+				},
+				res => {
+					if (res.errno === 0) {
+						_this.datas.adv = (!!res.data.adv && res.data.adv.length !== 0) ? res.data.adv : '';
+						_this.datas.page = !!res.data.page ? res.data.page : '';
+						_this.bottomMenu = res.data.menu;
+						_this.pageInfo = res.data.page;
+						// uni.setStorageSync('imgstyle',res.data.page.imgstyle);
+						_this.$store.commit('ISTABCONTRO', 1);
+						//修改页面标题
+						if (!!res.data.page.title) {
+							// #ifndef H5
+							uni.setNavigationBarTitle({
+								title: res.data.page.title
+							});
+							// #endif
+							// #ifdef H5
+							setTimeout(()=>{
+								document.title = res.data.page.title;
+								uni.setStorageSync('indexName',res.data.page.title);
+								console.log('在首页当中率先执行',res.data.page.title)
+							},500)
+								
+							// #endif
+						}
+						if (!!res.data.page.music) {
+							setTimeout(()=>{
+								innerAudioContext.src = res.data.page.music;
+								innerAudioContext.loop = true;
+								// setTimeout(()=>{
+								// 	_this.playAudio();
+								// })
+								//#ifdef H5
+								jWeixin.ready(() => {
+									jWeixin.getLocation({
+										type: 'gcj02',
+										success: function(res) {
+											innerAudioContext.play();
+										}
+									});
+								});
+								//#endif
+								innerAudioContext.play();
+								this.play_Audio = true;
+							})
+							
+							// let jweixin = require('jweixin-module');
+							
+							// document.addEventListener("WeixinJSBridgeReady", function () {
+							//     innerAudioContext
+							// }, false);
+						}
+						let diypagesData = res.data.item,
+							diypagesDataArray = [];
+							_this.diypagesData = [];
+							_this.getPageItem(diypagesData,0);
+						
+							// uni.showToast({
+							// 	title:'111',
+							// 	duration:5000
+							// })
+					}
+				},
+				false,
+				() => {
+					
+				}
+			);
+		},
+		playAudio() {
+			let _this = this,
+				play_Audio = _this.play_Audio ? false : true,
+				pageAudio = _this.pageInfo.music;
+			if (play_Audio) {
+				//#ifdef H5
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							innerAudioContext.play();
+						}
+					});
+				});
+				//#endif
+				//#ifndef H5
+				innerAudioContext.play();
+				//#endif
+				
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+				});
+			}
+			if (!play_Audio) {
+				innerAudioContext.pause();
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			innerAudioContext.onError(res => {
+				console.log(res.errMsg);
+				console.log(res.errCode);
+				_this.playAudio(); //发生错误后，销毁实例
+			});
+			_this.play_Audio = play_Audio;
+		},
+		// // 跳转正文详情
+		// toDetails(id){
+		// 	uni.navigateTo({
+		// 		url:"/pagesA/pictureTextDetails/pictureTextDetails?id=" + id
+		// 	})
+		// },
+		toArticle(id){
+			App.navigationTo({
+				url:`pages/mainPages/headline/headlineDetail?headline_id=${id}`
+			})
+			// uni.navigateTo({
+			// 	url:"/pagesA/articleDetails/articleDetails?id="+id
+			// })不想用自己写的页面了
+		},
+		toSubject(t){
+			uni.navigateTo({
+				url:"/pagesA/commentSubject/commentSubject?keyword="+t
+			})
+		},
+		// 热门话题
+		getinfoHot(){
+			let _this = this;
+			App._post_form('&do=GetPlatformInfor&type=2', {}, res => {
+				let data = res.data.data.slice(0, 3);
+				_this.setData({
+					hotSearchData: data
+				});
+			}, false, () => {
+				
+			})
+		},
+		// 获取学生社区图文列表
+		getList(page = 1, isPage = false){
+			let _this = this;
+			let data = {
+				id: 0,//0对应掌上生活的全部类目
+				two_id: undefined,
+				page,
+				page_index: _this.page_index,
+				homeflag: 1,
+				keyword: '',
+			};
+			App._post_form('&p=pocket&do=infoList', data, res => {
+				let list = [];
+				if (!isPage) {
+					if (res.data.list.length > 0) {
+						list = res.data.list;
+						_this.setData({
+							communityList: list
+						})
+					} else {
+						_this.noMore1 = true;
+					}
+				}else{//第二页走这里
+					if (res.data.list.length > 0){
+						list = [..._this.communityList, ...res.data.list];
+						_this.setData({
+							communityList: list
+						})
+					}else{
+						_this.noMore1 = true;
+					}
+				}
+			});
+		},
+		//按发布时间获取头条资讯
+		getHeadlineInfo(page = 1, isPage = false) {
+			let _this = this,
+				requestData = {
+					page:page,
+					one_id:'',
+					two_id:'',
+					sort:0
+				};
+			App._post_form('&p=headline&do=HeadlineList', requestData, res => {
+				if (!isPage) {
+					if (res.data.list.length > 0) {
+						let HeadlineDataList = res.data.list;
+						// console.log(HeadlineDataList);
+						_this.setData({
+							HeadlineDataList
+						})
+					} else {
+						_this.noMore2 = true;
+					}
+				}else{//第二页走这里
+					if (res.data.list.length > 0){
+						let HeadlineDataList = [..._this.HeadlineDataList, ...res.data.list];
+						// console.log(HeadlineDataList);
+						_this.setData({
+							HeadlineDataList
+						})
+					}else{
+						_this.noMore2 = true;
+					}
+				}
+			}, false, () => {
+				
+			})
+		},
+		//按浏览量时间获取头条资讯
+		getHeadlineInfoHot(page = 1, isPage = false) {
+			let _this = this,
+				requestData = {
+					page:page,
+					one_id:'',
+					two_id:'',
+					sort:1
+				};
+			App._post_form('&p=headline&do=HeadlineList', requestData, res => {
+				if (res.data.list.length > 0) {
+					let HeadlineDataList = res.data.list.slice(0,3);
+					_this.setData({
+						HeadlineDataRank: HeadlineDataList
+					})
+				} else {
+					_this.noMore2 = true;
+				}
+			}, false, () => {
+				
+			})
+		},
+		lookimg(){
+			// this.isOnshow = false;
+		},
+		operationShow(e) {
+			// let _this = this;
+			// _this.indexShow = e;
+		},
+		getover(id,bor){
+			
+		},
+		// handlerScroll(){
+		// 	if(this.scrollLock){
+		// 		clearTimeout(this.scrollTimer);
+		// 	}
+		// 	this.scrollTimer = setTimeout(()=>{
+		// 		this.scrollLock = false;
+		// 		this.stopVideo++;
+		// 	}, 500)
+		// },
+		// changePlay(e){
+		// 	this.stopVideo++;//先关闭上一个播放的按钮，再改变当前播放索引=最新播放视频索引
+		// 	this.currentPlay = e;
+		// }
+		changenoMore1(e){
+			this.noMore1 = e;
+		},
+		changeScrollLock(e){
+			this.scrollLock = e;
+		}
+	},
+	destroyed() {
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			
+		});
+	},
+	onUnload() {
+		uni.removeStorageSync('redItem');
+		this.play_Audio = false;
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			
+		});
+	},
+	onPullDownRefresh() {
+		//停止下拉刷新
+		uni.stopPullDownRefresh();
+	},
+	onPageScroll(e){
+		//页面滚动，视频暂停
+		this.scrollLock = true;
+		// this.handlerScroll();
+	},
+	onReachBottom(e) {
+		uni.$emit('isBottomMore');
+		uni.$emit('tabisBottomMore');
+		// console.log(this.tabIndex, this.noMore1, this.noMore2)
+		if(this.tabIndex==2){
+			if(!this.noMore2){
+				this.tab2Page++;
+				this.getHeadlineInfo(this.tab2Page, true);
+			}else{
+				uni.showToast({
+					title: '没有更多了',
+					icon: 'none'
+				})
+			}
+		}
+		if(this.tabIndex==1){
+			if(!this.noMore1){
+				this.tab1Page++;
+				// this.getList(this.tab1Page, true);
+			}else{
+				uni.showToast({
+					title: '没有更多了',
+					icon: 'none'
+				})
+			}
+		}
+	},
+	onShareAppMessage(res){
+		let _this = this;
+		if (res.from === 'button') {// 来自页面内分享按钮
+			let listId = res.target.id;
+			let title = res.target.dataset.title;
+			App._post_form('&p=pocket&do=shareNum', { id: listId }, res => {
+				for(let index=0;index<_this.communityList.length;index++){
+					if(_this.communityList[index].id == listId){
+						_this.communityList[index].share++;
+					}
+				}
+				setTimeout(()=>{
+					uni.showToast({
+						icon: 'none',
+						title: '分享成功',
+						duration: 2000
+					});
+				}, 2000)
+			});
+			return {
+				title: '粤职才',
+				path: '/pagesA/pictureTextDetails/pictureTextDetails?id='+listId
+			}
+		}else{
+			return {
+				title: '粤职才',
+				path: '/pages/mainPages/index/index'
+			}
+		}
+	}
+};
+</script>
+
+<style scoped lang="scss">
+.container {
+	background-color: #ffd93f;
+	 -webkit-overflow-scrolling: touch;
+}
+
+.hintModule{
+	position: fixed;
+	top: 180upx;
+	right: 20upx;
+	width: 440upx;
+	padding: 15upx 50upx 15upx 15upx;
+	background-color: #ffffff;
+	z-index: 99999;
+	font-size: 28upx;
+	border-radius: 6upx;
+	box-shadow: 0px 0px 20upx #999999;
+	.hintClose{
+		font-size: 28upx;
+		color: #cccccc;
+		position: absolute;
+		right: 20upx;
+		top: 15upx;
+	}
+	.hintIndicate{
+		width: 0;
+		height: 0;
+		border-left: 15rpx solid transparent;
+		border-right: 15rpx solid transparent;
+		border-bottom: 15rpx solid #ffffff;
+		position: absolute;
+		top: -14rpx;
+		right: 100upx;
+	}
+	.smallCircle{
+		width: 10upx;
+		height: 10upx;
+		background-color: #000000;
+		border-radius: 50%;
+		vertical-align: middle;
+	}
+	.bigCircle{
+		margin:  0 10upx;
+		width: 15upx;
+		height: 15upx;
+		background-color: #000000;
+		border-radius: 50%;
+	}
+}
+
+.coverImg {
+		/* #ifdef H5 */
+		width: 750upx;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		width: 540upx;
+		/* #endif */
+	}
+
+.page-index {
+	width: 100vw;
+	overflow: hidden;
+	background-color: #fff;
+	position: relative;
+}
+
+.bottomPadding {
+	padding-bottom: 100upx;
+}
+
+.full {
+	width: 750upx;
+	height: 110upx;
+	background: #f8f8f8;
+}
+
+.borderLast {
+	border-right: 1rpx solid #4395ff;
+}
+
+.borderLast:last-child {
+	border-right: none;
+}
+// 
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background-color: #fff;
+	position: fixed;
+	padding-bottom: 15px;
+	z-index: 99;
+	top: 0px;
+}
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.hot-wrapper{
+	padding: 10rpx 30rpx;
+	.hot-title{
+		color: #999999;
+		position: relative;
+		line-height: 35px;
+	}
+	.hot-title::before{
+		content: '';
+		position: absolute;
+		top: 50%;
+		right: 12rpx;
+		width: 10rpx;
+		height: 10rpx;
+		border-top: 2px solid #999;
+		border-left: 2px solid transparent;
+		border-right: 2px solid #999;
+		border-bottom: 2px solid transparent;
+		transform: rotate(45deg) translateY(-50%);
+	}
+	.hot-list{
+		.hot-item1{
+			line-height: 60rpx;
+		}
+		.hot-item1::before{
+			content: '#';
+			color: #f00;
+			padding-right: 10rpx;
+		}
+		.hot-item{
+			line-height: 60rpx;
+			font-size: 15px;
+			display: -webkit-box;
+			-webkit-box-orient: vertical;
+			-webkit-line-clamp: 1;
+			overflow: hidden;
+		}
+	}
+}
+
+.list-con{
+	padding: 0px 10px;
+	.list-item{
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid #efefef;
+		padding: 10px 4px;
+	}
+	.list-title{
+		display:-webkit-box;//将盒子转换为弹性盒子
+		-webkit-box-orient:vertical;//文本显示方式，默认水平
+		-webkit-line-clamp:2;//设置显示多少行
+		overflow:hidden;
+		font-size: 14px;
+		color: #333;
+		margin-bottom: 7px;
+	}
+	.list-img{
+		width: 80px;
+		height: 60px;
+		border-radius: 8px;
+		margin-left: 20px;
+		background-color: #d1d1d1;
+	}
+}
+.tab-item{
+	color: #999;
+	font-size: 14px;
+	padding: 10rpx 20rpx;
+	&.active{
+		color: #000;
+		font-size: 16px;
+		position: relative;
+	}
+	&.active::before{
+		content: '';
+		width: 20px;
+		height: 12rpx;
+		border-radius: 6rpx;
+		background-color: #f00;
+		position: absolute;
+		bottom: -2rpx;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+}
+
+</style>
diff --git a/pages/mainPages/login/login.vue b/pages/mainPages/login/login.vue
new file mode 100644
index 0000000..0bb2f30
--- /dev/null
+++ b/pages/mainPages/login/login.vue
@@ -0,0 +1,618 @@
+<template>
+	<!-- 登录页 -->
+	<view>
+		<view class="login">
+			<far-bottom></far-bottom>
+			<view class="loginPackage" v-if="page == 1 || page == 2">
+				<view class="title" v-if="page == 1">登录注册更精彩</view>
+				<view class="title" v-if="page == 2">请输入手机号码</view>
+				<view class="loginAgreement" v-if="userSet.describe || userSet.privacy">
+					<image :src="imgfixUrls + 'merchant/checked.svg'" style="width: 25upx;height: 25upx;margin-bottom: -2upx;" @click="storeChecked = false" v-if="storeChecked" />
+					<view  v-else  @click="storeChecked = true" style="height: 20upx;width: 20upx;border: 1px solid #FF4444;border-radius: 50%;display: inline-block;margin-bottom: -2upx">
+					</view>
+					<span style="padding-left: 10upx;">
+						<text @click="storeChecked = !storeChecked">登录注册表示同意</text>
+						<span @click="toLoginAgreement(1)" v-if="userSet.describe">《用户协议》</span>
+						<span @click="toLoginAgreement(2)" v-if="userSet.privacy">,《隐私协议》</span>
+					</span>
+				</view>
+				<!-- 用户输入区域 -->
+				<view class="loginInput">
+					<!-- 账号密码登陆 -->
+					<view>
+						<input placeholder="请输入手机号" type="number" v-model="phone" />
+						<span></span>
+					</view>
+					<view v-if="page == 1">
+						<input placeholder="请输入密码" v-model="password" type="password" v-if="see == false" />
+						<input placeholder="请输入密码" v-model="password" v-if="see == true" />
+						<view>
+							<image :src="imgfixUrls + 'merchant/show.png'" @click="show(true)" v-if="see == false" />
+							<image :src="imgfixUrls + 'merchant/cshow.png'" @click="show(false)" v-if="see == true" />
+							<span @click="goForgetPassword">忘记密码</span>
+						</view>
+					</view>
+					<!-- 账号密码登陆 -->
+					<!-- 短信验证码登陆 -->
+					<view v-if="page == 2 && userSet.img_switch == 1">
+						<input placeholder="请输入图形验证码" v-model="passwords" />
+						<image :src="getImgUrl" @click="GVC" />
+					</view>
+					<!-- 短信验证码登陆 -->
+				</view>
+				<!-- 用户输入区域 -->
+				<!-- 提交按钮 -->
+				<view class="loginSubimt" v-if="page == 1" @click="userLogin(1)"><span>登陆</span></view>
+				<view class="loginSubimt" v-if="page == 2" @click="sendSms"><span>获取短信验证码</span></view>
+				<!-- 提交按钮 -->
+				<!-- 切换登陆方式区域 -->
+				<view class="checkLoginType">
+					<span @click="toPassword(1)" v-show="page == 2">账号密码登录</span>
+					<span @click="toPassword(2)" v-if="page == 1 && userSet.sms_switch == 0">短信验证码登录</span>
+					<span @click="go()">新用户注册</span>
+				</view>
+				<!-- 切换登陆方式区域 -->
+				<!-- 第三方登录方式 -->
+				<!-- <view class="OtherType">
+					<view class="OtherTypeTitle"><span>其他登录方式</span></view>
+					<view class="OtherTypeButton">
+						<view><img src="@img + 'merchan:t/qq.png" '/></view>
+						<view><img src="@img + 'merchan:t/wechat.png'" /></view>
+					</view>
+				</view> -->
+				<!-- 第三方登录方式 -->
+			</view>
+			<view v-if="page == 3">
+				<view class="loginPackage">
+					<view class="smsTitle"><span>我们将以短信形式将验证码发送至</span></view>
+					<view class="smsTitle1"><span>{{phone}}</span></view>
+					<view class="smsCodeInput">
+						<view><input type="number" v-model="sms1" maxlength="1" id="text1" :focus="text1Focus" /></view>
+						<view><input type="number" v-model="sms2" maxlength="1" id="text2" :focus="text2Focus" /></view>
+						<view><input type="number" v-model="sms3" maxlength="1" id="text3" :focus="text3Focus" /></view>
+						<view><input type="number" v-model="sms4" maxlength="1" id="text4" :focus="text4Focus" /></view>
+					</view>
+					<view class="sendSmsCode" v-if="timeCount == 0" @click="sendSms"><span>重新发送验证码</span></view>
+					<view class="sendSmsCode" v-else>
+						<span>{{ timeEnd }}</span>
+					</view>
+					<view class="smsCodeSubimt" @click="userLogin(2)"><span>登陆</span></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				text1Focus: true,
+				text2Focus: false,
+				text3Focus: false,
+				text4Focus: false,
+				sms1: '',
+				sms2: '',
+				sms3: '',
+				sms4: '',
+				page: 1,
+				see: false,
+				password: '',
+				getImgUrl: '',
+				getImgCode: '',
+				getSmsCode: '',
+				timeCount: 0,
+				smsCode: '',
+				timeEnd: '重新获取短信验证码',
+				userSet: {
+					sms_switch: '',
+					img_switch: ''
+				},
+				phone: '',
+				passwords: '',
+				currentPageUrl: '',
+				img:'',
+				codeTime:'',
+				storeChecked:true
+			};
+		},
+		onLoad() {
+			if (uni.getStorageSync('weliam_user_token').length > 1) {
+				App.navigationTo({
+					url: 'pages/mainPages/index/index'
+				})
+			}
+			this.init();
+			this.img = this.imgfixUrl;
+			this.storeChecked =false;
+			console.info(uni.getStorageSync('currentPage'))
+		},
+		watch: {
+			// 切换输入框
+			sms1: {
+				handler() {
+					let _this = this;
+					if (_this.sms1.length == 1) {
+						_this.text2Focus = true;
+						_this.text1Focus = false;
+					}
+				}
+			},
+			sms2: {
+				handler() {
+					let _this = this;
+					if (_this.sms2.length == 1) {
+						_this.text3Focus = true;
+						_this.text2Focus = false;
+					}
+					if (_this.sms2.length == 0) {
+						_this.text1Focus = true;
+						_this.text2Focus = false;
+					}
+				}
+			},
+			sms3: {
+				handler() {
+					let _this = this;
+					if (_this.sms3.length == 1) {
+						_this.text4Focus = true;
+						_this.text3Focus = false;
+					}
+					if (_this.sms3.length == 0) {
+						_this.text2Focus = true;
+						_this.text3Focus = false;
+					}
+				}
+			},
+			sms4: {
+				handler() {
+					let _this = this;
+					if (_this.sms4.length == 0) {
+						console.info(_this.text3Focus);
+						_this.text3Focus = true;
+						_this.text4Focus = false;
+					}
+				}
+			}
+			// 切换输入框
+		},
+		methods: {
+			init() {
+				let _this = this;
+				_this.getRegisterSet();
+			},
+			toLoginAgreement(type) {
+				if(type == 1){
+					App.navigationTo({
+						url: 'pages/mainPages/agreement/agreement?agremType=user&type=1'
+					});
+				}else{
+					App.navigationTo({
+						url: 'pages/mainPages/agreement/agreement?agremType=user&type=2'
+					});
+				}
+				
+			},
+			// 发送短信验证码
+			sendSms() {
+				let _this = this;
+				if (_this.page !== 3) {
+					if (_this.phone == '' || _this.phone.length !== 11) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入正确格式的手机号',
+							duration: 2000
+						});
+						_this.GVC();
+						return;
+					}
+					if (_this.passwords == '' && _this.userSet.img_switch == 1) {
+						uni.showToast({
+							icon: 'none',
+							title: '验证码不能为空',
+							duration: 2000
+						});
+						_this.GVC();
+						_this.passwords = '';
+						return;
+					}
+				}
+				let data = {
+					type: 2,
+					phone: _this.phone,
+					code:_this.passwords,
+					time:_this.codeTime
+				};
+				App._post_form('&do=PIN', data, res => {
+					// 60s倒计时
+					let timer_num = 60;
+					let timeClock = setInterval(function() {
+						timer_num--;
+						_this.timeEnd = timer_num + 's后重新获取验证码';
+						_this.timeCount = timer_num;
+						if (timer_num == 0) {
+							clearInterval(timeClock);
+						}
+					}, 1000);
+					// 60s倒计时
+					_this.getSmsCode = res.data.code;
+					if (_this.page !== 3) {
+						_this.page = 3;
+					}
+				});
+			},
+			// 用户登录
+			userLogin(type) {
+				console.log(1)
+				let _this = this;
+				// 密码登陆验证
+				if (_this.page == 1) {
+					if (_this.phone == '' || _this.phone.length !== 11) {
+						uni.showToast({
+							icon: 'none',
+							title: '请输入正确格式的手机号',
+							duration: 2000
+						});
+						return;
+					}
+					if (_this.password == '') {
+						uni.showToast({
+							icon: 'none',
+							title: '密码不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if(!_this.storeChecked){
+						uni.showToast({
+							icon: 'none',
+							title: '请先阅读用户协议并勾选',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				_this.smsCode = `${_this.sms1}${_this.sms2}${_this.sms3}${_this.sms4}`;
+				console.log(2)
+				let data = {
+					type: type,
+					phone: _this.phone,
+					password: _this.page == 3 ? _this.smsCode : _this.password,
+					backurl: ''
+				};
+				data.head_id = uni.getStorageSync('head_id');
+				// debugger
+				App._post_form('&p=member&do=userLogin', data, res => {
+					console.log('&p=member&do=userLogin');
+					console.log(3)
+					uni.setStorageSync('weliam_user_token', res.data.token);
+					console.log(uni.getStorageSync('currentPage'))
+					// console.log(4);
+					console.info(_this.currentPageUrl)
+					console.info(_this.currentPageUrl)
+					debugger
+					
+					if (uni.getStorageSync('currentPage') == '' || uni.getStorageSync('currentPage').route == 'pages/mainPages/index/index') {
+						App.navigationTo({
+							url: 'pages/mainPages/index/index',
+							navType:'reLaunch'
+						});
+						
+					} else if(uni.getStorageSync('currentPage').route && uni.getStorageSync('currentPage').route.indexOf('pages/mainPages/login/login') === -1){
+						// #ifdef APP-PLUS
+						_this.currentPageUrl = uni.getStorageSync('currentPage').route
+						// #endif
+						//#ifndef APP-PLUS
+						_this.currentPageUrl = uni.getStorageSync('currentPage').route + '?i=' + uni.getStorageSync('currentPage').options.i
+						//#endif
+						
+						for (let key in uni.getStorageSync('currentPage').options) {
+							console.info(key)
+							if (key !== 'i') {
+								_this.currentPageUrl = _this.currentPageUrl + '&' + key + '=' + (uni.getStorageSync('currentPage').options)[key]
+							}
+						}
+						console.info(_this.currentPageUrl)
+						// debugger
+						App.navigationTo({
+							url: _this.currentPageUrl
+						})
+					}else{
+						App.navigationTo({
+							url: 'pages/mainPages/index/index',
+							navType:'reLaunch'
+						});
+					}
+				});
+			},
+			// 获取用户注册设置信息
+			getRegisterSet() {
+				let _this = this;
+				let data = {};
+				App._post_form('&p=member&do=getRegisterSet', data, res => {
+					_this.userSet = res.data;
+					if (_this.userSet.img_switch == 1) {
+						_this.GVC();
+					}
+					if(!_this.userSet.privacy){
+						_this.storeChecked = true;
+					}
+					// uni.setStorageSync('agreement', res.data.describe);
+				});
+			},
+			// 获取图形验证码信息
+			GVC() {
+				let _this = this;
+				let data = {};
+				App._post_form('&do=GVC', data, res => {
+					_this.getImgUrl = res.data.image_data;
+					// _this.getImgCode = res.data.time;
+					_this.codeTime = res.data.time;
+				});
+			},
+			toPassword(pages) {
+				let _this = this;
+				_this.phone = '';
+				_this.password = '';
+				_this.page = pages;
+				console.info(_this.page);
+			},
+			go() {
+				App.navigationTo({
+					url: 'pages/subPages/register/register'
+				});
+			},
+			goForgetPassword() {
+				App.navigationTo({
+					url: 'pages/subPages/forgetPassword/forgetPassword'
+				});
+			},
+			show(see) {
+				let _this = this;
+				_this.see = see;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	page {
+		background: rgba(255, 255, 255, 1);
+	}
+
+	.login {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		font-size: 0;
+	}
+
+	.loginPackage {
+		padding: 64upx;
+	}
+
+	.title {
+		margin-top: 26upx;
+		font-size: 48upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.loginAgreement {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: #999999;
+
+			>span {
+				color: #2e6b9e;
+			}
+		}
+	}
+
+	.loginInput {
+		margin-top: 115upx;
+
+		>view {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 25upx;
+			height: 81upx;
+			width: 622upx;
+			border-bottom: 1px solid #eeeeee;
+
+			>input {
+				width: 400upx;
+				margin-top: 10upx;
+				vertical-align: top;
+				font-size: 28upx;
+
+
+				color: #333333;
+			}
+
+			>image {
+				vertical-align: top;
+				width: 128upx;
+				height: 57upx;
+			}
+
+			>view {
+				vertical-align: middle;
+				display: inline-block;
+
+				>image {
+					vertical-align: middle;
+					width: 48upx;
+					height: 48upx;
+					margin-right: 18upx;
+				}
+
+				>span {
+					line-height: 60upx;
+					vertical-align: middle;
+					font-size: 24upx;
+
+
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+		}
+	}
+
+	input::placeholder {
+		font-size: 28upx;
+
+
+		color: rgba(153, 153, 153, 1);
+	}
+
+	.loginSubimt {
+		margin: 60upx auto 0 auto;
+		width: 622upx;
+		height: 88upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 44px;
+		text-align: center;
+
+		>span {
+			line-height: 88upx;
+			font-size: 30upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.checkLoginType {
+		margin: 60upx auto 0 auto;
+		width: 622upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.OtherType {
+		margin-top: 159upx;
+	}
+
+	.OtherTypeTitle {
+		text-align: center;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.OtherTypeButton {
+		width: 220upx;
+		margin: 51upx auto 0 auto;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+			width: 74upx;
+			height: 74upx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			>image {
+				width: 74upx;
+				height: 74upx;
+			}
+		}
+	}
+
+	.smsTitle {
+		margin-top: 64upx;
+		text-align: center;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.smsTitle1 {
+		margin-top: 19upx;
+		text-align: center;
+
+		>span {
+			font-size: 36upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.smsCodeInput {
+		margin: 104upx auto 0 auto;
+		display: flex;
+		justify-content: space-between;
+		width: 622upx;
+
+		>view {
+			text-align: center;
+			display: inline-block;
+			width: 120upx;
+			border-bottom: 1px solid #eeeeee;
+
+			>input {
+				font-size: 50upx;
+
+
+				color: #333333;
+			}
+		}
+	}
+
+	.smsCodeSubimt {
+		margin: 79upx auto 0 auto;
+		width: 622upx;
+		height: 88upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 44upx;
+		text-align: center;
+
+		>span {
+			line-height: 88upx;
+			font-size: 30upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.sendSmsCode {
+		margin-top: 30upx;
+		width: 250upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+</style>
diff --git a/pages/mainPages/login/minLogin.vue b/pages/mainPages/login/minLogin.vue
new file mode 100644
index 0000000..4e1d22a
--- /dev/null
+++ b/pages/mainPages/login/minLogin.vue
@@ -0,0 +1,455 @@
+<template>
+	<view class="container">
+		<view class="wechatapp">
+			<!-- <image class="header" src="/images/wechatapp.png"></image> -->
+			<view class="header">
+				<image :src="appInfo.logo"></image>
+				<view class="app-name t-c f-26 col-3">{{ appInfo.name }}</view>
+			</view>
+		</view>
+		<view class="auth-title">申请获取以下权限:</view>
+		<view class="auth-subtitle">• 获得你的公开信息（昵称、头像等）</view>
+		<view class="dis-flex flex-x-around">
+			<button class="login-btn login-cancel" @click="cancelLogin">暂不登录</button>
+			<!-- #ifdef MP-WEIXIN -->
+			<button class="login-btn" :disabled="disabled" @click="authorLogin">立即登录</button>
+			<!-- #endif -->
+			<!-- #ifdef H5  -->
+			<button class="login-btn" :disabled="disabled" @click="authorLogin">授权登录</button>
+			<!-- #endif -->
+			<!-- #ifdef APP-PLUS  -->
+			<button class="login-btn" :disabled="disabled" @click="appLogin">授权登录</button>
+			<!-- #endif -->
+		</view>
+		<!-- #ifdef APP-PLUS -->
+		<view class="t-c f-30 c-ff4444 p-top-50" @click="pasLogin">账号密码登陆</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {
+			disabled: false
+		};
+	},
+	components: {},
+	computed: {
+		appInfo() {
+			return this.$store.state.appInfo;
+		}
+	},
+	onLoad(options) {
+		this.authorLogin()
+	},
+	onShow() {},
+	mounted() {},
+	methods: {
+		pasLogin() {
+			uni.reLaunch({
+				url: '/pages/mainPages/login/login'
+			});
+		},
+		appLogin: function() {
+			let _this = this;
+			let postData = {};
+			uni.getProvider({
+				service: 'oauth',
+				success: function(res) {
+					//支持微信、qq和微博等
+					uni.login({
+						provider: 'weixin',
+						success: function(loginRes) {
+							let pages = getCurrentPages();
+							let access_token = loginRes.authResult.access_token;
+							let openid = loginRes.authResult.openid;
+							console.log('-------获取openid(unionid)-----');
+							console.log('token', access_token);
+							console.log('openid', openid);
+							console.log(JSON.stringify(loginRes));
+							// console.log(JSON.stringify(pages));
+							// 获取用户信息
+							uni.getUserInfo({
+								provider: 'weixin',
+								success: function(infoRes) {
+									console.log('-------获取微信用户所有-----');
+									console.log(JSON.stringify(infoRes.userInfo));
+									postData.head_id = uni.getStorageSync('head_id');
+									postData = Object.assign(postData, {
+										nickName: infoRes.userInfo.nickName || '',
+										avatarUrl: infoRes.userInfo.avatarUrl,
+										access_token,
+										openid,
+										source1: '4'
+									});
+									postData = Object.assign(postData, loginRes.authResult, infoRes.userInfo);
+									_this.getUserInfo(postData);
+								}
+							});
+						}
+					});
+				}
+			});
+		},
+		vu() {},
+		/**
+		 * 取消登录
+		 */
+		cancelLogin() {
+			uni.navigateBack({
+				delta: 2
+			});
+		},
+		//1-导入 2-微信小程序 3-H5 4-公众号 5-安卓 6-苹果 7-渠道1小程序 8-百度小程序 9-头条小程序
+		/**
+		 * 授权登录
+		 */
+		authorLogin(e) {
+			let _this = this,
+				clientType = _this.$store.state.clientType;
+			_this.disabled = true;
+			
+			// uni.showToast({
+			// 	title: 'clientType：'+clientType
+			// });
+			console.log(clientType, e, 'clientType')
+			// console.log("systemInfo", this.$store.state.systemInfo);
+			if (clientType === '2') {
+				if (e.detail.errMsg !== 'getUserInfo:ok') {
+					App.showError('登录失败,请重试');
+					_this.disabled = false;
+					return false;
+				}
+			}
+			_this.userLogin('weixin');
+			// #ifndef MP-WEIXIN
+			uni.getProvider({
+				service: 'oauth',
+				success(res) {
+					console.log('getProvider', res.provider);
+					_this.userLogin(res.provider[0], e.detail);
+				}
+			});
+			// #endif
+		},
+
+		/**
+		 * 获取用户登录信息
+		 * @param {Object} encryptionData 加密用户信息
+		 */
+		getLoginData(provider, encryptionData) {
+			let _this = this;
+			return new Promise((resolve, reject) => {
+				if (encryptionData.iv && encryptionData.encryptedData) {
+					// debugger
+					console.log('encryptionData.iv && encryptionData.encryptedData');
+					// uni.showToast({
+					// 	title:'encryptionDataencryptionData'
+					// })
+					resolve(encryptionData);
+				} else {
+					// debugger
+					uni.getUserInfo({
+						// provider,
+						withCredentials: true,
+						success(data) {
+							console.log(data, '----11-');
+							// uni.showToast({
+							// 	title:'----11-',
+							// 	duration: 5000
+							// })
+						},
+						complete(optinos) {
+							// console.log(optinos, '--22---');
+							setTimeout(()=>{
+								if (!!optinos.iv || provider === 'alipay') {
+									if (!optinos.encryptedData && !!optinos.data) {
+										optinos.encryptedData = optinos.data;
+									}
+									resolve(optinos);
+								} else {
+									reject();
+								}
+							}, 5000)
+							//是否获取成功
+							// if (!!optinos.iv || provider === 'alipay') {
+							// 	if (!optinos.encryptedData && !!optinos.data) {
+							// 		optinos.encryptedData = optinos.data;
+							// 	}
+							// 	resolve(optinos);
+							// } else {
+							// 	reject();
+							// }
+						}
+					});
+				}
+			});
+		},
+
+		/**
+		 * 用户登录操作
+		 */
+		userLogin(provider, loginData) {
+			let _this = this,
+				clientType = App.getClientType(),
+				postData = {}; //登录所需参数
+
+			//登录
+			uni.login({
+				provider: 'weixin',
+				scopes: 'auth_user',
+				success(res) {
+					
+					postData.code = res.code;
+					postData.head_id = uni.getStorageSync('head_id');
+					// #ifndef H5
+					uni.showModal({
+						content: '授权微信登录',
+						success: function (res) {
+							if (res.confirm) {
+								uni.showLoading({
+									title: '正在登录'
+								});
+								uni.getUserProfile({
+									desc: 'Wexin', // 这个参数是必须的
+									success: res => {
+										console.log(res, '----加密用户信息1111-')
+										// uni.showToast({
+										// 	title:'----加密用户信息1111-'
+										// })
+									_this.getLoginData(provider, res).then(data => {
+										if (clientType === '3') {
+											console.log('clientType === 3')
+											// uni.showToast({
+											// 	title:'----clientType === 3-'
+											// })
+											postData = Object.assign(postData, {
+												source: '3',
+												mode: '2',
+												encryptedData: data.encryptedData,
+												iv: data.iv
+											});
+										}
+										if (clientType === '7') {
+											console.log('clientType === 7')
+											postData = Object.assign(postData, {
+												nickName: data.userInfo.nickName || '',
+												avatarUrl: data.userInfo.avatarUrl
+											});
+										}
+										// 发送用户信息
+										console.log('发送用户信息')
+										// uni.showToast({
+										// 	title:'----发送用户信息-'
+										// })
+										_this.getUserInfo(postData);
+										}).catch(() => {
+										//拒绝获取用户信息后操作
+										_this.disabled = false;
+										uni.navigateBack();
+										if (clientType === '9') {
+											//头条小程序
+											//用户拒绝授权后，需要打开用户设置页面才能再次调起getUserInfo
+											uni.showModal({
+												title: '登录失败',
+												content: '请点击确定允许授权后,重新登录',
+												success(result) {
+													if (result.confirm) {
+														uni.openSetting({
+															success(res) {
+																if (res.authSetting['scope.userInfo']) {
+																	App.showError('授权成功,请重新登录');
+																}
+															}
+														});
+													}
+												}
+											});
+										} else {
+											App.showError('登录失败,请重试');
+										}
+									});
+									},
+									fail: err => {
+
+										//拒绝获取用户信息后操作
+										_this.disabled = false;
+										uni.navigateBack();
+										if (clientType === '9') {
+											//头条小程序
+											//用户拒绝授权后，需要打开用户设置页面才能再次调起getUserInfo
+											uni.showModal({
+												title: '登录失败',
+												content: '请点击确定允许授权后,重新登录',
+												success(result) {
+													if (result.confirm) {
+														uni.openSetting({
+															success(res) {
+																if (res.authSetting['scope.userInfo']) {
+																	App.showError('授权成功,请重新登录');
+																}
+															}
+														});
+													}
+												}
+											});
+										} else {
+											App.showError('登录失败,请重试');
+										}
+										console.log(err);
+									}
+								});
+							} else if (res.cancel) {
+								_this.disabled = false;
+							}
+						}
+					});
+					// #endif
+				}
+			});
+		},
+
+		/**
+		 * 获取用户信息
+		 */
+		getUserInfo(postData) {
+			let _this = this;
+			// console.log('登陆的参数', JSON.stringify(postData));
+			// uni.showToast({
+			// 	title:'----登陆的参数-'
+			// })
+			App._post_form(
+				'&p=member&do=login',
+				{
+					...postData
+				},
+				result => {
+					// console.log(result, 'getUserInfo--success');
+					// console.log('登陆的参数', postData.source);
+					// uni.showToast({
+					// 	title:'----登陆的参数3333-'
+					// })
+					let { token } = result.data;
+					uni.setStorageSync('weliam_user_token', token);
+					_this.disabled = false;
+					_this.$store.commit('WXLOGIN', 1);
+					
+					//设置用户信息
+					// App.setUserinfo(token, user_id, status);
+					//绑定分销上下级关系
+					// if(App.getRefereId()){
+					// 	App.saveRefereeQuest()
+					// }
+					// 跳转回原页面
+					_this.navigateBack();
+				},
+				false,
+				() => {
+					uni.hideLoading();
+				}
+			);
+		},
+
+		/**
+		 * 授权成功 跳转回原页面
+		 */
+		navigateBack() {
+			let _this = this,
+				pages = getCurrentPages(),
+				prevPages = pages[pages.length - 2],
+				currentOptins = uni.getStorageSync('currentPage').options;
+			//清除登录缓存信息
+			App.removeCurrentPage();
+
+			if (prevPages.route === 'pages/mainPages/write/write') {
+				uni.reLaunch({
+					url: '/pages/mainPages/index/index'
+				});
+			} else {
+				//处理字节跳动小程序，手动调用onLoad函数之后，无法获$refs问题
+				// #ifdef MP-TOUTIAO
+				if (prevPages.route !== 'pages/mainPages/flow/checkout') {
+					prevPages.onLoad(currentOptins);
+				}
+				// #endif
+				uni.navigateBack();
+			}
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background: #fff;
+	font-size: 32upx;
+}
+
+.container {
+	padding: 0 60upx;
+}
+
+.wechatapp {
+	padding: 15% 0px 10%;
+	border-bottom: 1upx solid #e3e3e3;
+	margin-bottom: 45upx;
+	text-align: center;
+}
+
+.wechatapp .header {
+	margin: 0 auto;
+}
+
+.wechatapp .header .app-name {
+	margin-top: 30upx;
+}
+
+.wechatapp .header image {
+	width: 100upx;
+	height: 100upx;
+	margin: 0 auto;
+	display: block;
+	border-radius: 50%;
+	border: 2px solid #fff;
+	box-shadow: 1px 0px 5px rgba(50, 50, 50, 0.3);
+	background-size: 100% 100%;
+}
+
+.auth-title {
+	color: #585858;
+	font-size: 28upx;
+	margin-bottom: 40upx;
+}
+
+.auth-subtitle {
+	color: #999;
+	margin-bottom: 72upx;
+	font-size: 22upx;
+}
+
+.login-btn {
+	border: none;
+	height: 80upx;
+	line-height: 80upx;
+	background: #ffd940;
+	color: #333333;
+	font-size: 10pt;
+	border-radius: 6upx;
+	width: 45%;
+}
+
+.login-btn::after {
+	display: none;
+}
+
+.login-btn.button-hover {
+	/* box-shadow: inset 0 5upx 30upx rgba(0, 0, 0, 0.15); */
+}
+
+.login-btn.login-cancel {
+	color: #999999;
+	background: #efefef;
+}
+</style>
diff --git a/pages/mainPages/memberCard/getMembership/getMembership.vue b/pages/mainPages/memberCard/getMembership/getMembership.vue
new file mode 100644
index 0000000..43fc847
--- /dev/null
+++ b/pages/mainPages/memberCard/getMembership/getMembership.vue
@@ -0,0 +1,865 @@
+<template>
+	<!-- 开通一卡通 -->
+	<loadlogo v-if="loading==true"></loadlogo>
+	<view class="getMembership" v-else :style="{height:phoneHight}">
+		<far-bottom></far-bottom>
+		<!-- 选择套餐 -->
+		<scroll-view :style="{height:scollHeight}" :scroll-y="true" :scroll-x="false">
+			<block v-if="payclose=='1' && model=='ios'"></block>
+			<view class="checkMemberMeal" v-else>
+				<view class="checkMemberMealPackage">
+					<view class="checkMemberTitle">
+						<image :src="imgfixUrls+ 'merchant/Memship.png'" />
+						<span>{{ halfcardtext }}会员开通</span>
+					</view>
+					<view >
+						<view class="checkMemberBody">
+							<!-- 套餐循环模板 -->
+							<view class="tcMb" :class="[mbChck == index ? 'tcMbCheck' : '']" @click="checkMb(index, item.price, item.id,item.detail)"
+							 v-for="(item, index) in cardList.list">
+								<view class="tcMbPackage">
+									<view class="carte" v-if="item.is_hot == '1'">
+										<view class="shing">
+											推荐
+										</view>
+										<view class="shaer">
+											
+										</view>
+									</view>
+									<view class="tcMbTitle">
+										<span>{{ item.name }}</span>
+										<view class="yCheck" v-if="mbChck == index">
+											<image :src="imgfixUrls+ 'merchant/membercheck.png'" />
+										</view>
+										<view class="nCheck" v-else></view>
+									</view>
+									<view class="tcMbFoot">
+										<span>
+											<span>¥</span>
+											{{ item.price }}
+											<span>元</span>
+										</span>
+									</view>
+								</view>
+							</view>
+							<!-- 套餐循环模板 -->
+							
+						</view>
+						<view class="checksupper" :class="{supportBtn:cardList.list.length == mbChck}" v-if="flagsta == 1" @click="checkMb(cardList.list.length)">
+							拥军专属优待卡
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 会员详细信息 -->
+			<view class='detail'>
+				<view class='detail-title'>会员卡详细信息</view>
+				<!-- 	<view></view> -->
+				<scroll-view scroll-x class="detail-de" >
+					<!-- <jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+					show-with-animation use-anchor  :html="vipDetail" ></jyf-parser> -->
+					<textarea class="textarea" value="" disabled v-model="vipDetail" placeholder="" />
+				</scroll-view>
+				
+			</view>
+			<!-- 激活码 -->
+			<view class="CDKEY" @click="show = true" v-if="cardList.activation_code == 0">
+				<span>使用激活码激活会员</span>
+				<image :src="imgfixUrls+ 'merchant/right.svg'" />
+			</view>
+			<!-- 激活码 -->
+
+			<!-- 用户个人信息 -->
+			<view class="userInfoInput">
+				<view class="userInfoInputPackage">
+					<view class="userInfoInputTitle">
+						<view class="line"></view>
+						<span>个人信息</span>
+					</view>
+					<view class="userInput">
+						<view class="userName">
+							<span>姓名</span>
+							<input placeholder="请输入您的姓名" @blur="pushus" v-model="username" />
+						</view>
+						<view class="userName">
+							<span>联系电话</span>
+							<input placeholder="请输入联系电话" @blur="pushus" v-model="mobile" />
+						</view>
+						<view class="userName" v-if="bankflag == 1">
+							<span>{{examineing==0?'银行卡号':'渠道2'}}</span>
+							<input type="number" :placeholder="examineing==0?'请输入参与优惠的银行卡号':'请输入参与优惠的渠道2'" @blur="pushus" v-model="banknum" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 用户个人信息 -->
+			
+			<!-- 其他信息 -->
+			<view class="userInfoInput" v-if="orderSubmitInfoData.diyform">
+				<view class="userInfoInputPackage">
+					<view class="userInfoInputTitle">
+						<view class="line"></view>
+						<span>更多信息</span>
+					</view>
+					<view class="userInput">
+						<form-item ref="formItem" :gopay="gopay" :gopaytwo="gopaytwo" :orderSubmitInfo="orderSubmitInfoData"></form-item>
+					</view>
+				</view>
+			</view>
+			
+
+			<!-- 填充层 -->
+			<view class="full"></view>
+			<!-- 填充层 -->
+		</scroll-view>
+		<!-- 开通按钮 -->
+		<block v-if="payclose=='1' && model=='ios'"></block>
+		<view class="bottomView" v-else>
+			<view class="submitMembership" @click="halfcardOrder(false)" v-if="cardList.list.length!==0">
+				<span class="f-w" v-if="flagsta == 1 && cardList.list.length == mbChck">使用激活码激活优待特权</span>
+				<span v-else>{{ price }}元{{ card == 'nhave' ? '开通' : '续费' }}{{ halfcardtext }}</span>
+			</view>
+		</view>
+		<!-- 开通按钮 -->
+
+		<!-- 激活码弹窗 -->
+		<PopManager :show="show" @clickmask="closePop">
+			<view class="popCDKEY">
+				<view class="popCDKEYPackage">
+					<view class="popCDKEYTitle">
+						<span></span>
+						<span>会员激活码</span>
+						<image :src="imgfixUrls+ 'merchant/close.png'" @click="closePop" />
+					</view>
+					<view class="popCDKEYInput"><input v-if="show" @blur="pushus" :class="show?'chas':'uchas'" placeholder="请输入会员激活码" v-model="cardpa" /></view>
+					<view class="popCDKEYInput" v-if="show && code"><input v-if="show && code" :class="show?'chas':'uchas'" placeholder="请输入姓名" v-model="username" /></view>
+					<view class="popCDKEYInput" v-if="show && code"><input v-if="show && code" :class="show?'chas':'uchas'" placeholder="请输入联系电话" v-model="mobile" /></view>
+					<view class="popCDKEYSubmit" @click="activationHalfcard"><span>确认激活</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 激活码弹窗 -->
+
+		<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import PopManager from '@/components/template/PopManager';
+	import loadlogo from '@/components/template/loadlogo';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	import formItem from '@/components/template/formItem.vue';
+
+	export default {
+		components: {
+			PopManager,
+			loadlogo,
+			PhoneMask,
+			getvxphone,
+			formItem,
+			jyfParser
+		},
+		data() {
+			return {
+				show1: false,
+				payclose: null,
+				model: '',
+				vipDetail: '',
+				mbChck: 0,
+				show: false,
+				price: '',
+				banknum: '',
+				bankflag: '',
+				id: '',
+				username: '',
+				mobile: '',
+				cardList: {},
+				cardpa: '',
+				card: null,
+				halfcardtext: '',
+				loading: true,
+				phoneHight: null,
+				client: null,
+				scollHeight: null,
+				img: '',
+				vxshow:false,
+				code:null,
+				gopay:true,
+				orderSubmitInfoData:{},
+				gopaytwo:true,
+				examineing:1,
+				flagsta:0
+			};
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.card = e.card || 'nhave';
+			_this.img = _this.imgfixUrl;
+			let TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.examineing = TextSubstitution.examineing || 0;
+			// if(TextSubstitution.flag074){
+				
+			// }
+			
+			if(e.code){
+				_this.code = e.code;
+				_this.show = true;
+				_this.cardpa = e.code;
+			};
+			_this.init();
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+					_this.scollHeight = res.windowHeight - uni.upx2px(110) + 'px'
+				}
+			});
+			uni.getSystemInfo({
+				success(res) {
+					_this.model = res.platform
+				}
+			});
+			_this.client = App.getClientType();
+
+		},
+		methods: {
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			pushus(){
+				uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+				});
+			},
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+			},
+			init() {
+				let _this = this;
+				_this.getCardList();
+				uni.getStorage({
+					key: 'TextSubstitution',
+					success: function(res) {
+						console.info(res.data.halfcardtext);
+						_this.halfcardtext = res.data.halfcardtext;
+					}
+				});
+			},
+			// 开卡续费接口
+			halfcardOrder(flag = false) {
+				let _this = this;
+				if(_this.flagsta == 1 && !flag && _this.cardList.list.length == _this.mbChck){
+					_this.show = true;
+					return
+				}
+				_this.gopay = false;
+				setTimeout(()=>{
+					_this.gopay = true;
+				},2000)
+				if (_this.username == '' || _this.username == null) {
+					uni.showToast({
+						icon: 'none',
+						title: '姓名不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (!(/^1[3456789]\d{9}$/.test(_this.mobile))) {
+					uni.showToast({
+						icon: 'none',
+						title: '电话格式不正确',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.bankflag == 1) {
+					if (_this.banknum.length < 13 || _this.banknum.length > 25) {
+						uni.showToast({
+							icon: "none",
+							title: _this.examineing==0?'请输入正确银行卡号':'请输入正确渠道2号',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				uni.showLoading({
+					title:'处理中',
+					mask:true
+				})
+				let data = {
+					typeid: _this.id,
+					username: _this.username,
+					mobile: _this.mobile,
+					banknum: _this.banknum
+				};
+				setTimeout(()=>{
+					let datas;
+					if(_this.$refs.formItem && _this.orderSubmitInfoData.diyform){
+						if( _this.$refs.formItem.ifrequired == false){
+							uni.showToast({
+								icon: 'none',
+								title: '请完善必填信息'
+							});
+							return
+						}
+						datas = _this.$refs.formItem.formList;
+						data.datas = JSON.stringify(datas);
+						data.diyformid = _this.orderSubmitInfoData.diyformid;
+						// _this.userInfo.datas = JSON.stringify(datas);
+					}
+					App._post_form(
+						'&p=halfcard&do=halfcardOrder',
+						data,
+						res => {
+							if (res.data.status == 0) {
+								App.navigationTo({
+									url: 'pages/mainPages/memberCard/memberCard'
+								});
+							} else {
+								App.navigationTo({
+									url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=opencard'
+								});
+							}
+							uni.hideLoading()
+						},
+						fail => {
+							if (fail.data.message == '未绑定手机号') {
+								let _this = this;
+								//#ifdef H5
+								_this.show1 = true;
+								//#endif
+								//#ifndef H5
+								_this.vxshow = true;
+								//#endif
+								
+							}
+							uni.hideLoading()
+						})
+				})
+				
+				
+			},
+			// 激活码激活一卡通
+			activationHalfcard() {
+				let _this = this;
+				if (_this.username == '' || _this.username == null) {
+					uni.showToast({
+						icon: 'none',
+						title: '姓名不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (!(/^1[3456789]\d{9}$/.test(_this.mobile))) {
+					uni.showToast({
+						icon: 'none',
+						title: '电话格式不正确',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.bankflag == 1) {
+					if (_this.banknum.length < 13 || _this.banknum.length > 19) {
+						uni.showToast({
+							icon: "none",
+							title: _this.examineing==0?'请输入正确银行卡号':'请输入正确渠道2号',
+							duration: 2000
+						});
+						return;
+					}
+				}
+
+				_this.show = false;
+				uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+				});
+				let data = {
+					cardpa: _this.cardpa,
+					username: _this.username,
+					mobile: _this.mobile,
+					banknum: _this.banknum
+				};
+				App._post_form(
+					'&p=halfcard&do=activationHalfcard',
+					data,
+					res => {
+						console.info(22222222)
+						uni.showToast({
+							icon: 'none',
+							title: '激活成功',
+							duration: 2000
+						});
+						setTimeout(go, 2000)
+
+						function go() {
+							App.navigationTo({
+								url: 'pages/mainPages/memberCard/memberCard'
+							});
+						}
+
+					},
+					fail => {
+						if (fail.data.message == '未绑定手机号') {
+							let _this = this;
+							//#ifdef H5
+							_this.show1 = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							
+						}
+					}
+				);
+			},
+			// 获取开卡页面信息
+			getCardList() {
+				let _this = this;
+				let data = {};
+				App._post_form('&p=halfcard&do=cardList', data, res => {
+					_this.gopaytwo = false;
+					setTimeout(()=>{
+						_this.gopaytwo = true;
+					},2000)
+					_this.loading = false
+					_this.cardList = res.data;
+					_this.flagsta = res.data.flag074;
+					_this.orderSubmitInfoData = res.data;
+					_this.id = res.data.list[0].id;
+					_this.price = res.data.list[0].price;
+					_this.vipDetail = res.data.list[0].detail;
+					_this.username = res.data.realname;
+					_this.mobile = res.data.mobile;
+					_this.payclose = res.data.payclose;
+					_this.bankflag = res.data.bankflag;
+					_this.banknum = res.data.banknum;
+					console.info('滴滴', _this.model, _this.client, _this.payclose)
+					console.info('操了', _this.payclose != '1' && _this.client != '3' && _this.model != 'ios')
+					let aa = '';
+					if (_this.card == 'nhave') {
+						aa = '开通';
+					} else {
+						aa = '续费';
+					}
+					uni.setNavigationBarTitle({
+						title: aa + _this.halfcardtext
+					});
+				});
+			},
+			checkMb(index, price, id, detail) {
+				let _this = this;
+				_this.mbChck = index;
+				_this.price = price;
+				_this.id = id;
+				_this.vipDetail = detail;
+				if(index == _this.cardList.list.length){
+					_this.vipDetail = '本卡为现役军人,退役军人和其他优抚对象专属卡,需在线联系客服实名免费申请,不支持在线开通。';
+				}
+			},
+			closePop() {
+				let _this = this;
+				_this.show = false;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.full {
+		width: 750upx;
+		height: 20upx;
+	}
+	
+	.uchas{
+		min-height:0!important ;
+		min-width: 0!important;
+	}
+	.chas{
+		
+	}
+	.popCDKEYSubmit {
+		margin: 30upx auto 0 auto;
+		width: 480upx;
+		height: 80upx;
+		background: rgba(253, 219, 54, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.popCDKEYInput {
+		margin: 50upx 0 0 0;
+		width: 480upx;
+		height: 80upx;
+		background: rgba(246, 246, 246, 1);
+		border-radius: 10upx;
+
+		>input {
+			padding: 0 30upx;
+			height: 80upx;
+			font-size: 24upx;
+
+			color: #333333;
+		}
+	}
+
+	.popCDKEYTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-top: 10upx;
+			width: 30upx;
+			height: 30upx;
+		}
+	}
+
+	.popCDKEYPackage {
+		padding: 30upx;
+	}
+
+	.popCDKEY {
+		width: 540upx;
+		// height: 338upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.bottomView {
+		position: absolute;
+		bottom: 0upx;
+		left: 0upx;
+		width: 750upx;
+		height: 110upx;
+		background: rgba(255, 255, 255, 1);
+	}
+
+	.submitMembership {
+		margin: 10upx auto 0 auto;
+		width: 688upx;
+		height: 88upx;
+		background: linear-gradient(90deg, rgba(252, 218, 49, 1) 0%, rgba(255, 223, 78, 1) 100%);
+		border-radius: 44upx;
+		text-align: center;
+
+		>span {
+			line-height: 88upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.userName {
+		margin-top: 20upx;
+		width: 630upx;
+		height: 86upx;
+		background: rgba(250, 250, 250, 1);
+		border-radius: 10upx;
+
+		>span {
+			margin-left: 30upx;
+			vertical-align: middle;
+			display: inline-block;
+			width: 96upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			margin-left: 40upx;
+			vertical-align: middle;
+			display: inline-block;
+			width: 400upx;
+			height: 86upx;
+			font-size: 24upx;
+
+			color: #333333;
+		}
+	}
+
+	.userInput {
+		margin: 20upx 0 0 0;
+	}
+
+	.userInfoInputTitle {
+		>view {
+			display: inline-block;
+			width: 8upx;
+			height: 28upx;
+			background: linear-gradient(0deg, rgba(252, 218, 49, 1) 0%, rgba(255, 223, 78, 1) 100%);
+			border-radius: 4upx;
+			vertical-align: middle;
+		}
+
+		>span {
+			vertical-align: middle;
+			margin-left: 15upx;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.userInfoInputPackage {
+		padding: 40upx 30upx;
+	}
+
+	.userInfoInput {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.detail {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		height: 250upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+
+		.detail-title {
+			width: 690upx;
+			height: 80upx;
+			text-align: center;
+			line-height: 80upx;
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		.detail-de {
+			width: 672upx;
+			height: 155upx;
+			margin-top: 10upx;
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+			padding-left: 12rpx;
+			 /deep/.textarea{
+				font-size: 28upx;
+				width: 100%;
+				height: 100%;
+			}
+		}
+	}
+
+	.CDKEY {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		height: 110upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			margin-left: 30upx;
+			line-height: 110upx;
+			vertical-align: middle;
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin: 45upx 30upx 0 0;
+			vertical-align: middle;
+			width: 20upx;
+			height: 30upx;
+		}
+	}
+
+	.yCheck {
+		width: 40upx;
+		height: 40upx;
+		border-radius: 50%;
+		overflow: hidden;
+		border: 1upx solid rgba(0, 0, 0, 0);
+
+		>image {
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+
+	.tcMbCheck {
+		border: none !important;
+		background: #ffdf4e !important;
+		box-shadow: 0px 2upx 12upx 0px #fcda31 !important;
+		border-radius: 10upx !important;
+	}
+
+	.nCheck {
+		width: 40upx;
+		height: 40upx;
+		border: 1upx solid rgba(238, 238, 238, 1);
+		border-radius: 50%;
+	}
+
+	.tcMbFoot {
+		>span {
+			font-size: 40upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+
+			>span:nth-child(1) {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>span:nth-child(2) {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.tcMbTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			vertical-align: top;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.tcMbPackage {
+		position: relative;
+		padding: 30upx 15upx;
+	}
+	.carte{
+		position: absolute;
+		top: -34upx;
+		right: 0;
+		width:92upx;
+	}
+	.shing{
+		font-size: 24upx;
+		text-align: center;
+		color: #FFFFFF;
+		line-height: 40upx;
+		width:92upx;
+		height:40upx;
+		background:rgba(255,68,68,1);
+		border-radius:10upx;
+	}
+	.shaer{
+		width: 0;
+		height: 0;
+		border: 8upx solid transparent;
+		border-top-color: rgba(255,68,68,1) ;
+		margin-left: 50upx;
+	}
+	.tcMb {
+		border: 1px solid rgba(238, 238, 238, 1);
+		margin: 30upx 0 0 0;
+		display: inline-block;
+		width: 300upx;
+		height: 144upx;
+		border-radius: 10upx;
+	}
+
+	.checkMemberBody {
+		flex-wrap: wrap;
+		display: flex;
+		justify-content: space-between;
+		margin: 20upx 0 0 0;
+	}
+	
+	.supportBtn{
+		background-color: #FFE051 !important;
+
+		// border: 4upx solid #333333;
+	}
+	
+	.checksupper{
+		width: 100%;
+		height: 100upx;
+		font-size: 36upx;
+		font-weight: 700;
+		text-align: center;
+		background-color: #FFFFFF;
+		line-height: 100upx;
+		margin-top: 20upx;
+		border-radius: 10upx;
+		border: 1upx solid #EEEEEE;
+	}
+	
+	.checkMemberMealPackage {
+		padding: 30upx;
+	}
+
+	.checkMemberTitle {
+		margin: 20upx 0 0 0;
+		text-align: center;
+
+		>image {
+			vertical-align: middle;
+			width: 34upx;
+			height: 36upx;
+		}
+
+		>span {
+			margin-left: 15upx;
+			vertical-align: middle;
+			font-size: 30upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	page {
+
+		overflow-x: hidden;
+	}
+
+	.getMembership {
+		position: relative;
+		background: #f8f8f8;
+		font-size: 0;
+	}
+
+	.checkMemberMeal {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+</style>
diff --git a/pages/mainPages/memberCard/interests.vue b/pages/mainPages/memberCard/interests.vue
new file mode 100644
index 0000000..a11a34b
--- /dev/null
+++ b/pages/mainPages/memberCard/interests.vue
@@ -0,0 +1,46 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="content" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+			show-with-animation use-anchor  :html="wxContent" ></jyf-parser>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo'
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				wxContent:""
+			}
+		},
+		methods: {
+			interInfo() {
+				let _this = this;
+				App._post_form('&p=halfcard&do=getMembershipInterests', {}, res => {
+					_this.setData({
+						wxContent:res.data
+					})
+				}, false, () => {
+					_this.loadlogo = true
+				})
+			}
+		},
+		mounted() {
+			this.interInfo()
+		},
+		components:{
+			Loadlogo,
+			jyfParser
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/mainPages/memberCard/memberCard.less b/pages/mainPages/memberCard/memberCard.less
new file mode 100644
index 0000000..4fb698c
--- /dev/null
+++ b/pages/mainPages/memberCard/memberCard.less
@@ -0,0 +1,1224 @@
+.full {
+	height: 116upx;
+}
+.memberPrice {
+	font-size: 0;
+	margin: 149upx 0 0 0;
+	> span {
+		font-size: 24upx;
+	}
+}
+.payQrcodeView {
+	font-size: 0;
+	width: 500upx;
+	height: 500upx;
+	> image {
+		width: 500upx;
+		height: 500upx;
+	}
+}
+.showtetxDiv{
+	width: 80vw;
+	height: 60vh;
+	// padding: 30upx;
+	border-radius: 20upx;
+	background-color: #ffffff;
+	position: relative;
+	overflow: hidden;
+}
+.tetxsluo{
+	background-color: #ff4444;
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	color: #ffffff;
+	font-size: 34upx;
+	font-weight: bold;
+}
+.tetxcolse{
+	background-color: #eeeeee;
+	color: #999999;
+	height: 80upx;
+	line-height: 80upx;
+	text-align: center;
+	font-size: 34upx;
+	font-weight: bold;
+}
+.showtetxBtn{
+	display: flex;
+	position: absolute;
+	left: 0;
+	bottom: 0;
+	width: 100%;
+}
+.showparserDiv{
+	padding: 30upx;
+	overflow: auto;
+}
+.closeButton {
+	font-size: 0;
+	margin: 50upx auto 0 auto;
+	width: 44upx;
+	height: 44upx;
+	border: 2upx solid rgba(255, 255, 255, 1);
+	border-radius: 50%;
+	overflow: hidden;
+	> image {
+		width: 44upx;
+		height: 44upx;
+	}
+}
+.qrCode {
+	font-size: 0;
+	margin: 40upx auto 0 auto;
+	width: 271upx;
+	height: 271upx;
+	overflow: hidden;
+	> image {
+		width: 271upx;
+		height: 271upx;
+	}
+}
+.qrCodeType {
+	font-size: 0;
+	margin: 50upx 0 0 0;
+	padding: 0 30upx 30upx 30upx;
+}
+.qrCodeTypeTitle {
+	font-size: 0;
+	text-align: center;
+	> span {
+		font-size: 30upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.qrCodeTypeFoot {
+	font-size: 0;
+	margin: 30upx 0 0 0;
+	text-align: center;
+	padding: 0 0 30upx 0;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(151, 149, 159, 1);
+	}
+}
+.popCheck {
+	font-size: 0;
+	width: 191upx !important;
+	height: 62upx !important;
+	background: #fdda32 !important;
+	border: none !important;
+}
+.checkPopBotton {
+	font-size: 0;
+	margin: 40upx auto 0 auto;
+	text-align: center;
+	> view:nth-child(1) {
+		vertical-align: middle;
+		border-radius: 30upx 0 0 30upx;
+	}
+	> view:nth-child(2) {
+		vertical-align: middle;
+		border-radius: 0 30upx 30upx 0;
+	}
+	> view {
+		margin: auto;
+		display: inline-block;
+		width: 189upx;
+		height: 60upx;
+		border: 1upx solid #eeeeee;
+		background: #ffffff;
+		> span {
+			line-height: 60upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.font24{
+	font-size: 24upx;
+}
+.color255{
+	
+	color:rgba(151, 149, 159, 1);;
+}
+.qrCodeTypeFoot1 {
+	height: 400upx;
+	
+}
+.qrCodeAddress{
+	font-size: 26upx;
+	color: #666666;
+}
+.popPackage {
+	overflow: hidden;
+}
+.radiusDot {
+	font-size: 0;
+	display: flex;
+	justify-content: space-between;
+	> view:nth-child(1) {
+		margin: -25upx 0 0 -25upx;
+	}
+	> view:nth-child(2) {
+		margin: -25upx -25upx 0 0;
+	}
+	> view {
+		width: 50upx;
+		height: 50upx;
+		border-radius: 50%;
+		background: gray;
+	}
+}
+.popMainTitle {
+	font-size: 0;
+	border: 1upx solid rgba(0, 0, 0, 0);
+}
+.storeMeal {
+	font-size: 0;
+	height: 100upx;
+	margin: 20upx 0 0 0;
+	text-align: center;
+	word-wrap: break-word;
+	padding-bottom: 20upx;
+}
+.scorlltext {
+	width: 492upx;
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+.storeName {
+	font-size: 0;
+	margin: 30upx 0 0 0;
+	text-align: center;
+	> span {
+		font-size: 30upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.popMainImg {
+	font-size: 0;
+	margin: 30upx auto 0 auto;
+	width: 80upx;
+	height: 80upx;
+	border-radius: 50%;
+	overflow: hidden;
+	> image {
+		width: 80upx;
+		height: 80upx;
+	}
+}
+.popMainTitle {
+	width: 610upx;
+	background: linear-gradient(0deg, rgba(252, 218, 49, 1) 0%, rgba(255, 223, 78, 1) 100%);
+	border-radius: 20upx;
+}
+.popMain {
+	width: 610upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx;
+}
+page {
+	overflow-x: hidden;
+	background: #f8f8f8;
+}
+.memberCard {
+	// font-size: 0;
+	padding-bottom: 140upx;
+}
+.memberCardTitle {
+	font-size: 0;
+	border: 1upx solid rgba(0, 0, 0, 0);
+	width: 750upx;
+	height: 400upx;
+	background-size: 100%;
+}
+.memberCardSearch {
+	padding: 30upx 30upx 0 30upx;
+	display: flex;
+	justify-content: space-between;
+	font-size: 0;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.checkCity {
+	font-size: 0;
+	> span {
+		line-height: 74upx;
+		vertical-align: middle;
+		font-size: 30upx;
+
+		font-weight: bold;
+		color: rgba(255, 255, 255, 1);
+	}
+	> image {
+		vertical-align: middle;
+		width: 24upx;
+		height: 12upx;
+	}
+}
+.searchInput {
+	font-size: 0;
+	width: 534upx;
+	height: 74upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 37upx;
+	> image {
+		margin-left: 30upx;
+		vertical-align: middle;
+		width: 31upx;
+		height: 32upx;
+	}
+	> input {
+		margin-left: 20upx;
+		vertical-align: middle;
+		width: 300upx;
+		display: inline-block;
+		height: 74upx;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.memberCardInfo {
+	font-size: 0;
+	background-size: 100%;
+	margin: 140upx auto 0 auto;
+	width: 645upx;
+	height: 252upx;
+	border-radius: 20upx;
+	background-size: cover;
+}
+.memberCardInfoPackage {
+	font-size: 0;
+	padding: 30upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+.cardInfoLeftTitle {
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+	> view:nth-child(1) {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50%;
+		overflow: hidden;
+		> image {
+			width: 80upx;
+			height: 80upx;
+		}
+	}
+	> view:nth-child(2) {
+		margin-left: 15upx;
+		> view:nth-child(1) {
+			> span {
+				font-size: 28upx;
+
+				
+			}
+		}
+		> view:nth-child(2) {
+			margin-top: 10upx;
+			height: 32upx;
+			border: 1upx solid rgba(51, 51, 51, 1);
+			border-radius: 4upx;
+			text-align: center;
+			> span {
+				padding: 0 10upx;
+				line-height: 32upx;
+				font-size: 20upx;
+
+				
+			}
+		}
+	}
+}
+.cardInfoLeftFoot {
+	font-size: 0;
+	margin-top: 20upx;
+	> span {
+		font-size: 24upx;
+
+		
+	}
+}
+.cardInfoLeftFoot1 {
+	font-size: 0;
+	margin-top: 15upx;
+	> span {
+		font-size: 24upx;
+
+		
+	}
+}
+.cardInfoRight {
+	font-size: 0;
+	> .cardInfoRightTitle {
+		height: 80upx;
+		> image {
+			float: right;
+			width: 42upx;
+			height: 42upx;
+		}
+	}
+	> .cardInfoRightFoot {
+		> span {
+			font-size: 24upx;
+
+			
+		}
+		margin-top: 40upx;
+	}
+}
+.memberEquity {
+	font-size: 0;
+	margin: -30upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.memberEquityPackage {
+	padding: 30upx;
+}
+.memberEquityTitle {
+	margin-top: 20upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+.line {
+	margin-top: 10upx;
+	width: 1upx;
+	height: 50upx;
+	background: rgba(238, 238, 238, 1);
+}
+.memberEquityMoney {
+	margin: auto;
+	text-align: center;
+	> view:nth-child(1) {
+		font-size: 30upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+	> view:nth-child(2) {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.memberEquityBody {
+	margin-top: 50upx;
+}
+.nMargin {
+	margin-top: 0upx;
+}
+.equityBodyTitle {
+	text-align: center;
+	> image {
+		vertical-align: middle;
+		width: 543upx;
+		height: 30upx !important;
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 30upx;
+		font-style: italic;
+		color: rgba(51, 51, 51, 1);
+		> span {
+			margin-left: 10upx;
+			color: #fddb36;
+		}
+	}
+}
+.equityBodyFoot {
+	flex-wrap: wrap;
+	display: flex;
+	justify-content: flex-start;
+	text-align: center;
+	margin-top: 50upx;
+	> view {
+		width: 25%;
+		display: inline-block;
+		text-align: center;
+		> view:nth-child(1) {
+			margin: auto;
+			width: 70upx;
+			height: 70upx;
+			background: linear-gradient(-50deg, rgba(252, 218, 49, 1), rgba(255, 223, 78, 1));
+			border-radius: 50%;
+			overflow: hidden;
+			image {
+				width: 70upx;
+				height: 70upx;
+			}
+		}
+		> view:nth-child(2) {
+			margin-top: 20upx;
+			> span {
+				font-size: 24upx;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+}
+.renewButton {
+	width: 630upx;
+	height: 86upx;
+	background: linear-gradient(90deg, rgba(252, 218, 49, 1) 0%, rgba(255, 223, 78, 1) 100%);
+	border-radius: 43upx;
+	text-align: center;
+	margin: 50upx auto 0 auto;
+	> span {
+		line-height: 86upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbPackage {
+	margin: auto;
+	width: 690upx;
+}
+.discount {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin: 20upx auto 0 auto;
+}
+.discountPackage {
+	padding: 30upx 30upx 30upx 30upx;
+}
+.discountTitle {
+	font-size: 0;
+	overflow-y: hidden;
+	height: 70upx;
+	width: 630upx;
+	white-space: nowrap;
+	overflow-x: scroll;
+	> view:nth-child(1) {
+		margin-left: 0;
+	}
+}
+.mbThree {
+	padding: 30upx;
+	background: #ffffff;
+	margin: 20upx 0;
+	border-radius: 10upx;
+}
+.acactiveClass {
+	height: 70upx;
+	text-align: center;
+	display: inline-block;
+	margin-left: 51upx;
+	> span {
+		font-size: 28upx;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> view {
+		margin: 16upx auto 0 auto;
+		width: 40upx;
+		height: 6upx;
+		background: rgba(252, 219, 54, 1);
+		border-radius: 2upx;
+	}
+}
+.errorClass {
+	height: 70upx;
+	text-align: center;
+	display: inline-block;
+	margin-left: 51upx;
+	span {
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbPackage {
+}
+.mbOne {
+	border-radius: 10upx;
+	display: flex;
+	justify-content: space-between;
+	margin: 20upx 0;
+	padding: 20upx;
+	background: #ffffff;
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.mbOneImg {
+	width: 156upx;
+	border-radius: 10upx;
+	height: 157upx;
+	overflow: hidden;
+	> image {
+		width: 156upx;
+		height: 157upx;
+	}
+	.mbOneImgtext{
+		position: absolute;
+		top: 0;
+		left: 10upx;
+		padding: 5upx 10upx;
+		background-color: #FF4444;
+		border-radius: 0upx 0upx 8upx 8upx;
+		font-size: 24upx;
+		color: #FFFFFF;
+	}
+}
+.mbOneInfoPackage {
+	// height: 157upx;
+	display: flex;
+	justify-content: space-between;
+	flex-direction: column;
+}
+.mbOneInfo {
+	width: 470upx;
+	margin-left: 20upx;
+}
+.mbOneInfoTitle {
+	display: flex;
+	justify-content: space-between;
+	> span {
+		vertical-align: middle;
+	}
+	> span:nth-child(1) {
+		text-align: left;
+		overflow: hidden; /*超出部分隐藏*/
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+		white-space: nowrap; /*规定段落中的文本不进行换行 */
+		display: inline-block;
+		width: 300upx;
+		font-size: 28upx;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> span:nth-child(2) {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbOneInfoBody {
+	margin-top: 10upx;
+	> span {
+		display: inline-block;
+		font-size: 24upx;
+		width: 400upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbOneInfoBody {
+	display: flex;
+	justify-content: space-between;
+}
+.mbOneInfoFoot {
+	margin-top: 10upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+	}
+}
+.mbOneInfoFootLeft {
+	vertical-align: middle;
+	> view:nth-child(1) {
+		> span {
+			font-size: 24upx;
+			font-weight: bold;
+			color: rgba(254, 80, 79, 1);
+		}
+	}
+	> view:nth-child(2) {
+		position: absolute;
+		margin-top: 5upx;
+		width: 236upx;
+		height: 30upx;
+		background: rgba(255, 232, 128, 0.4);
+		border-radius: 13upx;
+		overflow: hidden;
+		> view:nth-child(1) {
+			position: absolute;
+			height: 30upx;
+			border-radius: 13upx;
+			background-color: rgba(255, 223, 78, 1);
+			white-space: nowrap;
+			display: flex;
+			justify-content: space-between;
+		}
+		> view:nth-child(2) {
+			position: absolute;
+			height: 30upx;
+			width: 236upx;
+			display: flex;
+			justify-content: space-between;
+			> span:nth-child(1) {
+				z-index: 95;
+				padding-left: 10upx;
+				font-size: 18upx;
+				color: rgba(160, 134, 12, 1);
+			}
+			> span:nth-child(2) {
+				padding-right: 10upx;
+				font-size: 18upx;
+
+				color: rgba(160, 134, 12, 1);
+			}
+		}
+	}
+}
+.mbOneInfoFootRight {
+	margin-top: 25upx;
+	width: 90upx;
+	height: 46upx;
+	line-height: 46upx;
+	border-radius: 6upx;
+	vertical-align: middle;
+	background: #fdd839;
+	text-align: center;
+	// display: inline-block;
+	line-height: 46upx;
+	font-size: 22upx;
+	color: #333;
+	> span {
+		
+	}
+}
+
+.mbTwo {
+	display: flex;
+	justify-content: space-between;
+	padding: 20upx;
+	background: #ffffff;
+	margin: 20upx 0upx;
+	border-radius: 10upx;
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.mbTwoTitle {
+	font-size: 0;
+	overflow: auto;
+	height: 110upx;
+	margin-top: 20upx;
+	white-space: nowrap;
+	padding: 0 0 20upx 0;
+	// display: flex;
+	// justify-content: space-between;
+	border-radius: 0 0 10upx 10upx;
+	background: #ffffff;
+	> view:nth-child(1) {
+		margin-left: 0;
+	}
+	> view {
+		display: inline-block;
+		margin-left: 10upx;
+	}
+}
+.mbTwoCheck {
+	display: inline-block;
+	width: 100upx;
+	height: 100upx;
+	background: rgba(255, 222, 78, 0.3);
+	border: 1upx solid rgba(252, 219, 54, 1);
+	border-radius: 50%;
+	text-align: center;
+	margin-right: 10upx;
+	> view:nth-child(1) {
+		padding-top: 10upx;
+	}
+	> view {
+		> span {
+			font-size: 20upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.mbTwoNCheck {
+	display: inline-block;
+	width: 100upx;
+	height: 100upx;
+	margin-right: 10upx;
+	border: 1upx solid rgba(238, 238, 238, 1);
+	border-radius: 50%;
+	text-align: center;
+	> view:nth-child(1) {
+		padding-top: 10upx;
+	}
+	> view {
+		> span {
+			font-size: 20upx;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.mbTwoImg {
+	width: 156upx;
+	height: 157upx;
+	border-radius: 10upx;
+	> image {
+		width: 156upx;
+		height: 157upx;
+	}
+}
+.mbTwoInfo {
+	width: 450upx;
+	margin-left: 20upx;
+}
+.mbTwoInfoTitle {
+	display: flex;
+	justify-content: space-between;
+	> span {
+		overflow: hidden; /*超出部分隐藏*/
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+		white-space: nowrap; /*规定段落中的文本不进行换行 */
+		vertical-align: middle;
+		display: inline-block;
+		width: 269upx;
+		font-size: 28upx;
+		font-weight: bold;
+		color: rgba(0, 0, 0, 1);
+	}
+	> view {
+		vertical-align: middle;
+		> image {
+			vertical-align: middle;
+			width: 9upx;
+			height: 15upx;
+		}
+		> span {
+			vertical-align: middle;
+			font-size: 22upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.mbTwoInfoBody {
+	margin-top: 15upx;
+	> span {
+		overflow: hidden; /*超出部分隐藏*/
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+		white-space: nowrap; /*规定段落中的文本不进行换行 */
+		display: inline-block;
+		width: 420upx;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbTwoInfoFoot {
+	font-size: 0;
+	margin-top: 10upx;
+	display: flex;
+	justify-content: space-between;
+	> span {
+		vertical-align: middle;
+		font-size: 36upx;
+
+		font-weight: bold;
+		color: rgba(254, 80, 79, 1);
+		> span {
+			font-size: 24upx;
+		}
+	}
+	> view {
+		width: 90upx;
+		height: 46upx;
+
+		vertical-align: middle;
+		display: inline-block;
+		background: #fdd839;
+		border-radius: 6upx 6upx 6upx 6upx;
+		text-align: center;
+		> span {
+			color: #333;
+			line-height: 46upx;
+			font-size: 22upx;
+		}
+	}
+}
+.mbThreeCheck {
+	vertical-align: middle;
+	height: 56upx;
+	background: rgba(252, 218, 51, 1);
+	border-radius: 28upx;
+	padding: 0 20upx;
+	> span {
+		line-height: 56upx;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbThreeNCheck {
+	vertical-align: middle;
+	> span {
+		line-height: 56upx;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbThreeTitle1 {
+	width: 600upx;
+	background: #ffffff;
+	min-height: 0;
+	white-space: nowrap;
+	overflow-x: scroll;
+	overflow-y: hidden;
+	border-radius: 0 0 10upx 10upx;
+	> view {
+		padding: 0 20upx 20upx 20upx;
+		> view:nth-child(1) {
+			margin-left: 0;
+		}
+		> view {
+			display: inline-block;
+			margin-left: 50upx;
+		}
+	}
+}
+.mbThreeTitle {
+	min-height: 0;
+	white-space: nowrap;
+	overflow-x: scroll;
+	overflow-y: hidden;
+	> view:nth-child(1) {
+		margin-left: 0;
+	}
+	> view {
+		display: inline-block;
+		margin-left: 50upx;
+	}
+}
+.mbThree {
+	> view {
+		display: flex;
+		justify-content: space-between;
+	}
+}
+.mbThreeTitle {
+	> span {
+		vertical-align: middle;
+		
+	}
+	> span:nth-child(1) {
+		font-size: 28upx;
+		display: inline-block;
+		width: 500upx;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow:ellipsis;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> span:nth-child(2) {
+		font-size: 24upx;
+
+		font-weight: bold;
+		color: rgba(254, 80, 79, 1);
+	}
+}
+.mbThreeBody {
+	margin-top: 15upx;
+	> text {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbThreeFoot {
+	margin-top: 20upx;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+.mbThreeFootLeft {
+	font-size: 0upx;
+	> view:nth-child(1) {
+		display: inline-block;
+		vertical-align: middle;
+		width: 46upx;
+		height: 46upx;
+		border-radius: 50%;
+		overflow: hidden;
+		> image {
+			width: 46upx;
+			height: 46upx;
+		}
+	}
+	> span {
+		vertical-align: middle;
+		margin-left: 15upx;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbThreeFootRight {
+	font-size: 0upx;
+	width: 90upx;
+	height: 46upx;
+	background: #fdd839;
+	border-radius: 6upx 6upx 6upx 6upx;
+	text-align: center;
+	> span {
+		line-height: 46upx;
+		font-size: 22upx;
+		color: #333;
+	}
+}
+.mbFour {
+	font-size: 0upx;
+	padding: 20upx;
+	background: #ffffff;
+	margin: 20upx 0;
+	display: flex;
+	justify-content: space-between;
+	border-radius: 10upx;
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+.mbFourImg {
+	font-size: 0upx;
+	width: 156upx;
+	height: 157upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 156upx;
+		height: 157upx;
+	}
+}
+.mbFourInfo {
+	margin-left: 20upx;
+	width: 450upx;
+}
+.mbFourInfoTitle {
+	font-size: 0upx;
+	> span {
+		overflow: hidden; /*超出部分隐藏*/
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+		white-space: nowrap; /*规定段落中的文本不进行换行 */
+		display: inline-block;
+		width: 454upx;
+		height: 62upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbFourInfoFoot {
+	font-size: 0upx;
+	margin-top: 10upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+.mbFourInfoFootLeft {
+	font-size: 0upx;
+	> view:nth-child(1) {
+		font-size: 36upx;
+
+		font-weight: bold;
+		color: rgba(254, 80, 79, 1);
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		font-size: 24upx;
+
+		text-decoration: line-through;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.mbFourInfoFootRight {
+	font-size: 0upx;
+	width: 90upx;
+	height: 46upx;
+	border-radius: 6upx 6upx 6upx 6upx;
+	background: #fdd839;
+	text-align: center;
+	margin-top: 35upx;
+	> span {
+		line-height: 46upx;
+		font-size: 22upx;
+		color: #333;
+	}
+}
+
+.mbFive {
+	font-size: 0upx;
+	padding: 20upx;
+	margin: 20upx 0;
+	background: #ffffff;
+	border-radius: 10upx;
+}
+.mbFiveTitle {
+	font-size: 0upx;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		width: 46upx;
+		height: 46upx;
+		border-radius: 50%;
+		overflow: hidden;
+		> image {
+			width: 46upx;
+			height: 46upx;
+		}
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+		margin-left: 15upx;
+	}
+	> image {
+		vertical-align: middle;
+		margin-left: 13upx;
+		width: 10upx;
+		height: 17upx;
+	}
+}
+
+.mbFiveFoot {
+	font-size: 0upx;
+	margin-top: 20upx;
+	display: flex;
+	justify-content: space-between;
+	> span {
+		line-height: 56upx;
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 118upx;
+		height: 56upx;
+		background: linear-gradient(90deg, rgba(252, 218, 49, 1) 0%, rgba(255, 223, 78, 1) 100%);
+		border-radius: 28upx;
+		text-align: center;
+		> span {
+			line-height: 56upx;
+			font-size: 22upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.mbFiveBody {
+	font-size: 0upx;
+	justify-content: space-between;
+	display: flex;
+	> view {
+		vertical-align: top;
+	}
+}
+.mbFiveImg {
+	font-size: 0upx;
+	width: 156upx;
+	height: 157upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 156upx;
+		height: 157upx;
+	}
+}
+.mbFiveInfo {
+	width: 450upx;
+}
+.mbFiveInfoTitle {
+	font-size: 0upx;
+	> span {
+		overflow: hidden; /*超出部分隐藏*/
+		text-overflow: ellipsis; /* 超出部分显示省略号 */
+		white-space: nowrap; /*规定段落中的文本不进行换行 */
+		display: inline-block;
+		width: 424upx;
+		height: 55upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbFiveInfoBody {
+	font-size: 0upx;
+	margin-top: 10upx;
+	> span {
+		font-size: 30upx;
+		font-weight: bold;
+		color: rgba(254, 80, 79, 1);
+		> span {
+			font-size: 24upx;
+		}
+	}
+}
+.mbFiveInfoFoot {
+	font-size: 0upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		width: 90upx;
+		height: 46upx;
+		background: #fdd839;
+		border-radius: 6upx;
+		text-align: center;
+		> span {
+			line-height: 46upx;
+			font-size: 22upx;
+			color: #333;
+		}
+	}
+	> span {
+		width: 200upx;
+		display: inline-block;
+		margin-top: 15upx;
+		font-size: 24upx;
+		text-decoration: line-through;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+/deep/.uni-scroll-view::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+}
diff --git a/pages/mainPages/memberCard/memberCard.vue b/pages/mainPages/memberCard/memberCard.vue
new file mode 100644
index 0000000..1560431
--- /dev/null
+++ b/pages/mainPages/memberCard/memberCard.vue
@@ -0,0 +1,1868 @@
+<template>
+	<!-- 开通一卡通 -->
+	<loadlogo v-if="!HomeType"></loadlogo>
+	<view class="memberCard"  v-else>
+		<far-bottom></far-bottom>
+		<scroll-view  :scroll-y="true" :lower-threshold="0" >
+			<view class="memberCardTitle" :style="{ 'background-image': 'url(' + imageRoot + 'memberBacImg.png)' }">
+				<!-- 搜索 -->
+				<searchView :type="1"></searchView>
+				<!-- 搜索 -->
+				<view class="memberCardInfo" :style="memberCardInfoImg + ';color:' + memberCardHomeInfo.cardTextColor + ';'">
+					<view class="memberCardInfoPackage">
+						<view class="cardInfoLeft" v-if="card == 'have'">
+							<view class="cardInfoLeftTitle">
+								<view>
+									<image :src="memberCardHomeInfo.info.avatar" />
+								</view>
+								<view>
+									<view>
+										<span>{{ memberCardHomeInfo.info.username }}</span>
+									</view>
+									<view v-if="memberCardHomeInfo.switch_set.levelstatus == '1'" :style="'border:' + '1rpx solid '+ memberCardHomeInfo.cardTextColor + ';'">
+										<span>{{ memberCardHomeInfo.info.name }}</span>
+									</view>
+								</view>
+							</view>
+							<view class="cardInfoLeftFoot">
+								<span>到期时间：{{ memberCardHomeInfo.info.endtime }}</span>
+							</view>
+							<view v-if="memberCardHomeInfo.info.banknum" class="cardInfoLeftFoot">
+								<span>{{examineing==0?'银行卡号':'渠道2号'}}：{{ memberCardHomeInfo.info.banknum }}</span>
+							</view>
+							<view class="cardInfoLeftFoot1" v-if="!!memberCardHomeInfo.info.cardsn">
+								<span>No.{{ memberCardHomeInfo.info.cardsn }}</span>
+							</view>
+						</view>
+						<view class="cardInfoRight" v-if="card == 'have'">
+							<view class="cardInfoRightTitle">
+								<image :src="imgfixUrls+ 'merchant/qrS.png'" @click="payQrcodeShow = true" />
+							</view>
+							<view class="cardInfoRightFoot"><span></span></view>
+						</view>
+						<view class="memberPrice" v-if="card == 'nhave'" :style="'color:' + (memberCardHomeInfo.cardTextColor?memberCardHomeInfo.cardTextColor:'#333333') + ';'">
+							<span>开通新的{{ halfcardtext }},享受更多{{ privilege }}</span>
+						</view>
+					</view>
+					<view class="t-r" style="font-size: 26upx;padding-right: 30upx;" v-if="memberCardHomeInfo.payback && card == 'have' && memberCardHomeInfo.credit !== ''">
+						{{moneytext}}:<text style="font-weight: 700;">{{memberCardHomeInfo.credit}}元</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="memberEquity">
+				<view class="memberEquityPackage">
+					<view class="memberEquityTitle" v-if="card == 'have' && memberCardHomeInfo.switch_set.statistics == '1'">
+						<view class="memberEquityMoney">
+							<view>
+								<span>{{ memberCardHomeInfo.info.total_price }}</span>
+							</view>
+							<view><span>已消费(元)</span></view>
+						</view>
+						<view class="line"></view>
+						<view class="memberEquityMoney">
+							<view>
+								<span>{{ memberCardHomeInfo.info.price }}</span>
+							</view>
+							<view><span>已为您节省(元)</span></view>
+						</view>
+					</view>
+					<view :class="card == 'have' ? 'memberEquityBody' : 'nMargin'">
+						<view class="equityBodyTitle">
+							<image :src="equityMemberImg" />
+						</view>
+						<view class="equityBodyFoot">
+							<view v-for="(item, index) in memberCardHomeInfo.list" @click="goEquity(item.link)">
+								<view>
+									<image :src="item.thumb" />
+								</view>
+								<view>
+									<span :style="colorEquity[index]">{{ item.name }}</span>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- <view class="renewButton" @click="goGetMember" v-if="textObj.flag074 == 1"><span>拥军专属优待卡</span></view> -->
+					<view class="renewButton" @click="goGetMember" v-if="card == 'have'"><span>{{textObj.hljxftext}}</span></view>
+					<view class="renewButton" @click="goGetMember" v-else-if="card == 'nhave'"><span>{{textObj.hljkttext}}</span></view>
+				</view>
+			</view>
+			<view class="equity" v-if="memberCardHomeInfo.nodescribe">
+				<view class="f-34 f-w t-c" style="padding-bottom: 20upx;">
+					非会员权益说明
+				</view>
+				<!-- <rich-text :nodes="memberCardHomeInfo.nodescribe"></rich-text> -->
+				<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+				 selectable show-with-animation use-anchor :html="memberCardHomeInfo.nodescribe"></jyf-parser>
+			</view>
+			<view class="discount" v-if="memberCardHomeInfo.switch_set.option_switch === 1 && memberCardHomeInfo.unshowtab != '1'">
+				<view class="discountPackage">
+					<view class="discountTitle" scroll-x="true">
+						<!-- <view :class="[isActive == index ? 'acactiveClass' : 'errorClass']" @click="checkDiscount(index, item.type,item['sort'])"
+						 v-if="item.status == 1" v-for="(item, index) in tabBarSetList">
+							<span>{{ item.name }}</span>
+							<view></view>
+						</view> -->
+						<v-tabs
+						:lineScale="0.3" 
+						:lineRadius="'100rpx'" 
+						:lineHeight="'6rpx'" 
+						:fontSize="'28rpx'" 
+						:paddingItem="'0 22rpx 20rpx'" 
+						:activeColor="'#FCDB36'" 
+						:lineColor="'#FCDB36'"
+						v-model="sort" 
+						:scroll="true"
+						field="name"
+						@change="vtabschange"
+						:tabs="tabBarSetList">
+						</v-tabs>
+					</view>
+					<view class="discountBdoy"></view>
+					<view class="mbTwoTitle" v-if="(type == 'zk' || memberCardHomeInfo.moreset == 1) && type !== 'pr'">
+						<view :class="[mbTwoChecks == index ? 'mbTwoCheck' : 'mbTwoNCheck']" @click="checkMbTwoData(index, item.timeData,type)"
+						 v-for="(item, index) in timeList">
+							<view>
+								<span>{{ weekList[index] }}</span>
+							</view>
+							<view>
+								<span>{{ timeList[index].time }}</span>
+							</view>
+						</view>
+					</view>
+					<view class="mbThreeTitle1" v-if=" ((type == 'pr' && memberCardHomeInfo.switch_set.halfcard == '1') || memberCardHomeInfo.moreset == 1) && type !== 'lb'">
+						<view>
+							<view :class="[mbPr == 0 ? 'mbThreeCheck' : 'mbThreeNCheck']" @click="checkPr(0, '',type)"><span>全部</span></view>
+							<view :class="[mbPr == index + 1 ? 'mbThreeCheck' : 'mbThreeNCheck']" @click="checkPr(index + 1, item.id,type)" v-for="(item, index) in homeList">
+								<span>{{ item.name }}</span>
+							</view>
+						</view>
+					</view>
+					<view class="mbThreeTitle1" v-if=" !!memberCardHomeInfo.switch_set && memberCardHomeInfo.switch_set.package == '1' && type == 'lb'">
+						<view>
+							<view :class="[mbThreeChecks == 0 ? 'mbThreeCheck' : 'mbThreeNCheck']" @click="checkMbThree(0, '')"><span>全部</span></view>
+							<view :class="[mbThreeChecks == index + 1 ? 'mbThreeCheck' : 'mbThreeNCheck']" @click="checkMbThree(index + 1, item.id)"
+							 v-for="(item, index) in homeList">
+								<span>{{ item.name }}</span>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view v-if="memberCardHomeInfo.switch_set.option_switch === 1 && memberCardHomeInfo.unshowtab != '1'">
+				<!-- 特权折扣 -->
+				<view class="mbPackage" v-if="type == 'qg'">
+					<!-- 特权折扣循环模板 -->
+					<view class="mbOne " v-for="(item, index) in qgList">
+						<view class="mbOneImg">
+							<image :src="item.logo" />
+						</view>
+						<view class="mbOneInfo">
+							<view class="mbOneInfoPackage">
+								<veiw class="mbOneInfoTitle">
+									<span>{{ item.goods_name }}</span>
+									<!-- <span>关注</span> -->
+								</veiw>
+								<veiw class="mbOneInfoBody">
+									<span>{{ item.storename }}</span>
+								</veiw>
+								<veiw class="mbOneInfoFoot">
+									<view class="mbOneInfoFootLeft">
+										<view>
+											<span>¥{{ item.price }}</span>
+										</view>
+										<view>
+											<view :style="{ width: item.buy_percentage + '%' }"></view>
+											<view>
+												<span>已售{{ item.buy_num }}份</span>
+												<span>{{ item.buy_percentage }}%</span>
+											</view>
+										</view>
+									</view>
+									<view class="mbOneInfoFootRight" @click="go(item.url,item)">去购买</view>
+								</veiw>
+							</view>
+						</view>
+					</view>
+					<!-- 特权折扣循环模板 -->
+				</view>
+				
+				<!-- 拼团 -->
+				<view class="mbPackage" v-if="type == 'pt'">
+					<!-- 特权折扣循环模板 -->
+					<view class="mbOne " v-for="(item, index) in ptList">
+						<view class="mbOneImg" style="position: relative;">
+							<image :src="item.logo" />
+							<view class="mbOneImgtext" >
+								拼团
+							</view>
+						</view>
+						<view class="mbOneInfo" style="position: relative;">
+							<view class="f-30">
+								{{item.goods_name}}
+							</view>
+							<view  style="padding-top: 10upx;">
+								<view class="dis-il-block" style="padding: 3upx;border-radius: 5upx;background-color: #FFF6F6;color: #FF4444;font-size: 24upx;">
+									已团{{item.buy_num}}人
+								</view>
+								<view class="dis-il-block" style="padding: 1upx 10upx;border: 1upx solid #FF4444;color: #FF4444;margin-left: 10upx;font-size: 24upx;border-radius: 8upx;">
+									{{item.peoplenum}}人团
+								</view>
+							</view>
+							<view class="f-36" style="color: #FF4444;padding-top: 10upx;">
+								<text style="font-size: 20upx;">¥</text>{{item.price}}
+							</view>
+							<view class="f-24" style="color: #999999; text-decoration:line-through;padding-top: 10upx;">
+								市场价:{{item.oldprice}}
+								<view class="t-c" @click="go(item.url,item)" style="height: 50upx;line-height: 50upx;width: 130upx;border-radius: 60upx;color: #FFFFFF;background-color: #FF4444;position: absolute;bottom: 0upx;right: 0upx;">
+									去拼团
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 特权折扣循环模板 -->
+				</view>
+				
+				<!-- 砍价 -->
+				<view class="mbPackage" v-if="type == 'kj'">
+					<!-- 特权折扣循环模板 -->
+					<view class="mbOne " v-for="(item, index) in kjList">
+						<view class="mbOneImg" style="position: relative;">
+							<image :src="item.logo" />
+							<view class="mbOneImgtext" >
+								砍价
+							</view>
+						</view>
+						<view class="mbOneInfo" style="position: relative;">
+							<view class="f-30">
+								{{item.goods_name}}
+							</view>
+							<view class="f-24" style="padding-top: 10upx;color: #999999;">
+								{{item.buy_num}}人砍价成功
+							</view>
+							<view class="f-36" style="color: #FF4444;padding-top: 10upx;">
+								<text style="font-size: 20upx;">可砍至¥</text>{{item.price}}
+							</view>
+							<view class="f-24" style="color: #999999; text-decoration:line-through;padding-top: 10upx;">
+								市场价:{{item.oldprice}}
+								<view class="t-c" @click="go(item.url,item)" style="height: 50upx;line-height: 50upx;width: 130upx;border-radius: 60upx;color: #FFFFFF;background-color: #FF4444;position: absolute;bottom: 0upx;right: 0upx;">
+									去砍价
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 特权折扣循环模板 -->
+				</view>
+				
+				<view class="mbPackage" v-if="type == 'kq'">
+					<!-- 特权折扣循环模板 -->
+					<view class="mbOne " v-for="(item, index) in kqList">
+						<view class="mbOneImg">
+							<image :src="item.logo" />
+						</view>
+						<view class="mbOneInfo">
+							<view class="mbOneInfoPackage">
+								<veiw class="mbOneInfoTitle">
+									<span>{{ item.goods_name }}</span>
+									<!-- <span>关注</span> -->
+								</veiw>
+								<veiw class="mbOneInfoFoot">
+									<view class="mbOneInfoFootLeft">
+										<view>
+											<span>¥{{ item.price }}</span>
+										</view>
+										<view>
+											<view :style="{ width: item.buy_percentage + '%' }"></view>
+											<view>
+												<span>已售{{ item.buy_num }}份</span>
+												<span>{{ item.buy_percentage }}%</span>
+											</view>
+										</view>
+									</view>
+									<view class="mbOneInfoFootRight" @click="go(item.url,item)">
+										{{ item.price == '0' ? '去领取' : '去购买' }}
+									</view>
+								</veiw>
+							</view>
+						</view>
+					</view>
+					<!-- 特权折扣循环模板 -->
+				</view>
+				<!-- 折扣 -->
+				<view class="mbPackage" v-if="type == 'pr' || type == 'zk'">
+					<view class="mbTwoPackage">
+						<!-- 特权折扣日期模板 -->
+
+						<!-- 特权折扣日期模板 -->
+						<!-- 折扣循环模板 -->
+						<view class="mbTwo" v-for="(item, index) in zkList" @click="goshop(item.shop_url,item.url)">
+							<view class="mbTwoImg">
+								<image :src="item.logo" />
+							</view>
+							<view class="mbTwoInfo">
+								<view class="mbOneInfoPackage">
+									<view class="mbTwoInfoTitle">
+										<span>{{ item.name }}</span>
+										<view>
+											<image src="" />
+											<span>{{ item.distance }}</span>
+										</view>
+									</view>
+									<view class="mbTwoInfoBody">
+										<span>{{ item.limit }}</span>
+									</view>
+									<view class="dis-flex f-24" style="position: relative;margin-top: 15upx;font-family: '黑体';" v-if="(users.halfcardflag == 0 && platformInfor.newpayonline == 1) || !platformInfor.newpayonline"><view class="dis-il-block" style="background-color: #E8C977;height: 40upx;line-height: 40upx;padding-left: 20upx;border-radius: 60upx 0upx 0upx 60upx;color: #333333;padding: 0 3upx 0 15upx;letter-spacing:2upx;">会员</view><view  style="position: relative;">	<view class="dis-il-block"	style="width: 0;	height: 0;	border-bottom: 40upx solid #E8C977;	border-right: 8upx solid transparent;	position: absolute;	left: 0;">	</view>	<view class="dis-il-block" 	style="width: 0;	height: 0;	border-top: 40upx solid #484743;	border-left: 8upx solid transparent;	position: absolute;	left: 0;">	</view></view><view class="dis-il-block" style="background-color: #484743;margin-left: 4upx;height: 40upx;line-height: 40upx;padding-right: 10upx;border-radius: 0upx 60upx 60upx 0upx;color: #FFFFFF;letter-spacing: 2upx;padding-left: 4upx;">	{{item.lowtip==1?'最低立享':'立享'}}	<text style="font-size: 24upx;">{{!platformInfor.newpayonline?item.discount:item.activediscount}}</text>折</view></view>
+									<view class="mbTwoInfoFoot" :style="{marginTop: (users.halfcardflag == 0)?'0upx':'20upx'}" v-if="platformInfor.newpayonline == 1 && users.halfcardflag == 0 && token">
+										<span>
+											{{ item.discount }}
+											<span>折</span>
+										</span>
+										<view @click.stop="getInfo(item.is_link, item.id, 0, item.url, item.use_where, item.payonline, item.sid)"><span>去买单</span></view>
+									</view>
+									<view class="mbTwoInfoFoot" :style="{marginTop: (users.halfcardflag == 0)?'0upx':'20upx'}" v-if="platformInfor.newpayonline == 1 && users.halfcardflag !== 0 && token">
+										<span>
+											{{ item.discount }}
+											<span>折</span>
+										</span>
+										<view @click.stop="getInfo(item.is_link, item.id, 0, item.url, item.use_where, item.payonline, item.sid)"><span>去买单</span></view>
+									</view>
+									<view class="mbTwoInfoFoot" :style="{marginTop: (users.halfcardflag == 0)?'0upx':'20upx'}" v-if="platformInfor.newpayonline == 1 && !token">
+										<span>
+											{{ item.discount }}
+											<span>折</span>
+										</span>
+										<view @click.stop="getInfo(item.is_link, item.id, 0, item.url, item.use_where, item.payonline, item.sid)"><span>去买单</span></view>
+									</view>
+									<view class="mbTwoInfoFoot" :style="{marginTop: (users.halfcardflag == 0)?'0upx':'20upx'}" v-if="!platformInfor.newpayonline">
+										<span>
+											<!-- {{ item.discount }} -->
+											<span></span>
+										</span>
+										<view @click.stop="getInfo(item.is_link, item.id, 0, item.url, item.use_where, item.payonline, item.sid)"><span>去买单</span></view>
+									</view>
+									<!-- <view class="mbTwoInfoFoot" :style="{marginTop: (users.halfcardflag == 0)?'0upx':'20upx'}" v-else>
+										<span>
+											{{ item.discount }}
+											<span>折</span>
+										</span>
+										<view @click.stop="getInfo(item.is_link, item.id, 0, item.url, item.use_where, item.payonline, item.sid)"><span>去买单</span></view>
+									</view> -->
+								</view>
+							</view>
+						</view>
+						<!-- 折扣循环模板 -->
+					</view>
+				</view>
+				<!-- 折扣 -->
+
+				<!-- 免费礼包 -->
+				<view class="mbPackage" v-if="type == 'lb'">
+					<view class="mbTwoPackage">
+						<view class="mbTwoBody">
+							<!-- 免费礼包循环模板 -->
+							<block v-for="(item, index) in lbList" :key="index" @click="goshop(item.shop_url.item.url)">
+								<view class="mbThree " v-if="item.surplus != '0'">
+									<view class="mbThreeTitle">
+										<span>{{ item.name }}</span>
+										<span>价值{{ item.price }}元</span>
+									</view>
+									<view class="mbThreeBody" v-if="item.exttype==='0'">
+										<text v-if="item.datestatus == '1'">共{{ item.usetimes }}次</text>
+										<text v-else-if="item.datestatus == '2'">每周{{ item.usetimes }}次</text>
+										<text v-else-if="item.datestatus == '3'">每月{{ item.usetimes }}次</text>
+										<text v-else-if="item.datestatus == '4'">每年{{ item.usetimes }}次</text>
+										<text v-else></text>
+										<text>
+											
+											当前剩余{{ item.surplus }}次
+										</text>
+									</view>
+									<view class="mbThreeFoot">
+										<view class="mbThreeFootLeft">
+											<view>
+												<image :src="item.shop_logo" />
+											</view>
+											<span v-if="item.storename">{{ item.storename }}</span>
+										</view>
+										<view v-if="!item.nolevel" class="mbThreeFootRight" @click.stop="getInfo(item.is_link, item.id, 1, item.url, item.use_where, item.payonline, item.id)">
+											<span>去使用</span>
+										</view>
+										<view v-if="item.nolevel == 1" class="mbThreeFootRight" style="background-color: #999999;width: 220upx;"><span
+											 style="color: #FFFFFF;">当前等级无法使用</span></view>
+									</view>
+								</view>
+							</block>
+							<!-- 免费礼包循环模板 -->
+						</view>
+					</view>
+				</view>
+				<!-- 免费礼包 -->
+
+				<!-- 积分购买 -->
+				<view class="mbPackage" v-if="type == 'jf'">
+					<view class="mbFour " v-for="(item, index) in jfList"> 
+						<view class="mbFourImg">
+							<image :src="item.thumb" />
+						</view>
+						<view class="mbFourInfo">
+							<view class="mbOneInfoPackage">
+								<view class="mbFourInfoTitle">
+									<span>{{ item.title }}</span>
+								</view>
+								<view class="mbFourInfoFoot">
+									<view class="mbFourInfoFootLeft">
+										<view>
+											<span>{{ item.use_credit1 }}<text v-if="credittext">{{credittext}}</text><text v-else>{{credittext}}</text>
+												+ {{ item.use_credit2 }}元</span>
+										</view>
+										<view>
+											<span>市场价:{{ item.old_price }}元</span>
+										</view>
+									</view>
+									<view class="mbFourInfoFootRight" @click="go(item.url,item)"><span>去兑换</span></view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 积分购买 -->
+
+				<!-- 专享卡券 -->
+				<view class="mbPackage" v-if="type == 'tg'">
+					<view class="mbFive " v-for="(item, index) in tgList">
+						<!-- <view class="mbFiveTitle">
+							<view><imgfixUrls:src="item.shop_logo" /></view>
+							<span>{{ item.storename }}</span>
+							<imgfixUrlssrc="" />
+						</view> -->
+						<view class="mbFiveBody">
+							<view class="mbFiveImg">
+								<image :src="item.logo" />
+							</view>
+							<view class="mbFiveInfo">
+								<view class="mbFiveInfoTitle">
+									<span>{{ item.goods_name }}</span>
+								</view>
+								<view class="mbFiveInfoBody">
+									<span>
+										<span>¥</span>
+										{{ item.price }}
+									</span>
+								</view>
+								<view class="mbFiveInfoFoot">
+									<span style="text-decoration:line-through;">市场价：¥ {{ item.oldprice }}</span>
+									<view @click="go(item.url,item)"><span>去购买</span></view>
+								</view>
+							</view>
+						</view>
+						<!-- <view class="mbFiveFoot">
+							<span>结束时间：{{ item.endtime }}</span>
+							
+						</view> -->
+					</view>
+					<!-- 专享卡券 -->
+				</view>
+				<!-- 特权折扣 -->
+
+				<!-- 填充层 -->
+				<loadmore :isMore="isMore" v-if="memberCardHomeInfo.unshowtab!= '1'  "></loadmore>
+				
+				<view class="full"></view>
+			</view>
+			<!-- 填充层 -->
+
+			<!-- 卡劵使用弹出框 -->
+			<PopManager :show="show" @clickmask="closeShow">
+				<view class="popPackage">
+					<view class="popMain">
+						<view class="popMainTitle">
+							<view class="popMainImg">
+								<image :src="itemInfo.shop_logo" />
+							</view>
+							<view class="storeName">
+								<span v-if="itemInfo.storename">{{ itemInfo.storename }}</span>
+							</view>
+							<scroll-view class="storeMeal" :scroll-y="true">
+								<text class="scorlltext">{{ itemInfo.limit }}</text>
+							</scroll-view>
+						</view>
+						<view class="radiusDot">
+							<view></view>
+							<view></view>
+						</view>
+						<view class="popMainBody">
+							<view class="checkPopBotton">
+								<view :class="[popChecked == 0 ? 'popCheck' : '']" @click="popChecks(0)"><span>使用</span></view>
+								<view :class="[popChecked == 1 ? 'popCheck' : '']" @click="popChecks(1)"><span>说明</span></view>
+							</view>
+							<view class="qrCodeType" v-if="popChecked == 0">
+								<view class="qrCodeTypeTitle" v-if="!!itemInfo.discount">
+									<span>{{ itemInfo.discount }}折(特权日)</span>
+								</view>
+								<view class="qrCode">
+									<image :src="itemInfo.qrcode" />
+								</view>
+								<view class="qrCodeTypeFoot">
+									<span>该服务项目由{{ itemInfo.storename }}提供</span>
+								</view>
+								<view class="f-28 t-c qrCodeAddress" @click="goAddress(itemInfo)">
+									{{itemInfo.address}}
+									<text class="iconfont icon-location" style="font-size: 26upx;color: #666666;padding-left: 10upx;"></text>
+								</view>
+							</view>
+							<view class="qrCodeType" v-if="popChecked == 1">
+								<scroll-view class="qrCodeTypeFoot1" scroll-y>
+									<rich-text class="font24 color255" :nodes="itemInfo.describe"></rich-text>
+								</scroll-view>
+							</view>
+						</view>
+					</view>
+					<view class="closeButton" @click="show = false">
+						<image :src="imgfixUrls+ 'merchant/close.png'" />
+					</view>
+				</view>
+			</PopManager>
+			<!-- 卡劵使用弹出框 -->
+
+			<!-- 在线买单弹出框 -->
+			<PopManager :show="payQrcodeShow" :type="center" @clickmask="closePayQr" v-if="card == 'have'">
+				<view class="payQrcodeView">
+					<image :src="memberCardHomeInfo.info.qrcode" />
+				</view>
+			</PopManager>
+			<!-- 在线买单弹出框 -->
+			
+			<!-- 富文本弹出框 -->
+			<PopManager :show="showtetx" :type="center" @clickmask="showtetx = false">
+				<view class="showtetxDiv">
+					<view class="showparserDiv">
+						<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+						 selectable show-with-animation use-anchor :html="exdetail"></jyf-parser>
+					</view>
+					<view class="showtetxBtn">
+						<view class="flex-box tetxcolse"  @click="showtetx = false">
+							取消
+						</view>
+						<view class="flex-box tetxsluo"  @click="shougo">
+							确定
+						</view>
+					</view>
+				</view>
+				
+			</PopManager>
+			
+			<!-- 弹幕 -->
+			<barrage :barrageList="barrageList" v-if="!!memberCardHomeInfo.switch_set && memberCardHomeInfo.switch_set.noticestatus == '1' && barrageType == true"
+			 ref="getset" :barrageType="barrageType"></barrage>
+			<!-- 弹幕 -->
+
+			<TabBars :tabBarAct="0" :pageType="'17'" />
+			<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+			 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+		</scroll-view>
+		<!-- 整页加载 -->
+
+		<!-- 整页加载 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import util from '@/common/js/util.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import PopManager from '@/components/template/PopManager';
+	import searchView from '@/components/template/searchView';
+	import TabBars from '@/components/template/tabBar';
+	import barrage from '@/components/template/barrage';
+	import loadmore from '@/components/template/loadmore';
+	import loadlogo from '@/components/template/loadlogo';
+	import follow from '@/components/template/follow.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+
+	export default {
+		components: {
+			PopManager,
+			searchView,
+			TabBars,
+			barrage,
+			loadmore,
+			loadlogo,
+			follow,
+			vTabs,
+			jyfParser
+		},
+		data() {
+			return {
+				showtetx:false,
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				privilege: '',
+				halfcardtext: '一卡通',
+				credittext: '积分',
+				scdpText: '',
+				center: 'center',
+				isActive: 0,
+				type: 0,
+				mbTwoChecks: 0,
+				mbThreeChecks: 0,
+				mbPr: 0,
+				show: false,
+				popChecked: 0,
+				memberCardInfoImg: '',
+				memberCardHomeInfo: {
+					credit: ''
+				},
+				card: null,
+				colorEquity: [],
+				zkList: [],
+				total: null,
+				page: 1,
+				cardpa: '',
+				timeList: [],
+				weekList: ['今日', '明日'],
+				time: null,
+				jfList: [],
+				qgList: [],
+				tgList: [],
+				ptList:[],
+				kjList:[],
+				phoneHight: null,
+				itemInfo: {},
+				homeList: {},
+				lbList: [],
+				payQrcodeShow: false,
+				kqList: [],
+				mid: null,
+				barrageList: [],
+				isMore: true,
+				loadingPop: true,
+				HomeType: false,
+				barrageType: true,
+				sortType: "",
+				img: '',
+				credit2: 0,
+				moneytext: '',
+				platformInfor: {},
+				users:{},
+				token:'',
+				curLoction:'',
+				oldid:'',
+				sort:0,
+				textObj:{},
+				goUrl:'',
+				exdetail:'',
+				examineing:1,
+				equityMemberImg:''
+			};
+		},
+		computed: {
+			tabBarSetList() {
+				let _this = this,
+					option_set = _this.memberCardHomeInfo.option_set;
+				if (!!option_set && option_set.length > 0) {
+					let newOption_set = [];
+					option_set.map(item => {
+						if (item.status === '1') {
+							newOption_set.push(item);
+						}
+					});
+					return newOption_set;
+				}
+			}
+		},
+		onHide() {
+			let _this = this;
+		},
+		onUnload() {
+			let _this = this;
+			_this.set = _this.$refs['getset'];
+			_this.set.clearSet();
+		},
+		onReady() {
+			let _this = this;
+		},
+		onShow() {
+			let _this = this;
+			uni.getStorage({
+				key: 'TextSubstitution',
+				success: function(res) {
+					_this.halfcardtext = res.data.halfcardtext;
+					_this.privilege = res.data.privilege;
+					_this.credittext = res.data.credittext;
+					_this.moneytext = res.data.moneytext;
+					_this.textObj = res.data;
+					_this.examineing = res.data.examineing || 0;
+				}
+			});
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.img = _this.imgfixUrl;
+			let TextSubstitution = uni.getStorageSync('TextSubstitution');
+						this.examineing = TextSubstitution.examineing || 0;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			_this.platformInfor = uni.getStorageSync('platformInfor');
+			console.log(this.platformInfor.newpayonline,66666,!this.platformInfor.newpayonline)
+			// this.platformInfor.newpayonline = 1;
+			_this.token = uni.getStorageSync('weliam_user_token');
+			
+			_this.users = uni.getStorageSync('userinfo');
+			_this.curLoction = uni.getStorageSync('curLoction');
+			// uni.getStorage({
+			// 	key: 'userinfo',
+			// 	success: function(res) {
+			// 		_this.mid = res.data.mid;
+			// 		_this.credit2 = res.data.credit2;
+			// 	}
+			// });
+			if (e.type == 6) {
+				// 折扣卡使用信息获取
+				let data = {
+					id: e.id
+				};
+				App._post_form('&p=halfcard&do=useDiscountCard', data, res => {
+					_this.showPup(res.data.is_link, res.data);
+				});
+			}
+			if (e.type == 4) {
+				// 折扣卡使用信息获取
+				let data = {
+					id: e.id
+				};
+				App._post_form('&p=halfcard&do=useGiftPackage', data, res => {
+					_this.showPup(res.data.is_link, res.data);
+				});
+			}
+			_this.init();
+			_this.id = e.id;
+			_this.openType = e.type;
+		},
+		watch: {
+			barrageList: {
+				handler() {
+					let _this = this;
+				},
+				deep: true
+			}
+		},
+		methods: {
+			shougo(){
+				App.navigationTo({
+					url: this.goUrl
+				});
+				this.goUrl = '';
+			},
+			goAddress(item){
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				
+						uni.openLocation({
+						    latitude: Number(item.lat),
+						    longitude: Number(item.lng),
+							success: function () {
+								console.log('success');
+							},
+							fail: function () {
+								console.log('success');
+							},
+						})
+				
+				//#endif
+				//#ifdef H5
+				wxApi.WxopenLocation(Number(item.lat), Number(item.lng), '', item.address);
+				//#endif
+				//#ifdef APP-PLUS
+				Map.openMap(Number(item.lat),Number(item.lng),item.address,'gcj02')
+				//#endif
+			},
+			vtabschange(e){
+				console.log(e);
+				this.tabBarSetList.map((item,index)=>{
+					if(index == e){
+						this.checkDiscount(index, item.type,item['sort'])
+					}
+				})
+			},
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			clickclick() {
+				let _this = this;
+				_this.barrageType = false;
+				console.info(_this.barrageType);
+			},
+			closeShow() {
+				let _this = this;
+				_this.show = false;
+			},
+			goshop(url,urls){
+				if(url.indexOf('sid') == -1){
+					if(this.users.halfcardflag == 0){
+						App.showError('对不起，您不符合使用要求');
+						return
+					}
+					App.navigationTo({
+						url: urls
+					});
+				}else{
+					App.navigationTo({
+						url: url
+					});
+				}
+				
+			},
+			getInfo(islink, id, type, url, use_where, payonline, sid) {
+				
+				let _this = this;
+				if (islink == 1) {
+					if (payonline == '1') {
+						if (type == '0') {
+							if (_this.platformInfor.newpayonline == 1) {
+								App.navigationTo({
+									url: 'pages/subPages2/newBuyOrder/newBuyOrder?type=' + '' + '&sid=' + sid + '&mid=' + _this.mid
+								});
+							} else {
+								App.navigationTo({
+									url: 'pages/subPages2/newBuyOrder/buyOrder?type=' + '' + '&sid=' + sid + '&mid=' + _this.mid
+								});
+							}
+						} else {
+							if (_this.platformInfor.newpayonline == 1) {
+								// debugger
+								App.navigationTo({
+									url: 'pages/subPages2/newBuyOrder/newBuyOrder?type=' + '' + '&pack_id=' + sid + '&mid=' + _this.mid
+								});
+							} else {
+								// debugger
+								App.navigationTo({
+									url: 'pages/subPages2/newBuyOrder/buyOrder?type=' + '' + '&pack_id=' + sid + '&mid=' + _this.mid
+								});
+							}
+
+						}
+					} else {
+						if (type == 0) {
+							// 折扣卡使用信息获取
+							let data = {
+								id: id
+							};
+							App._post_form('&p=halfcard&do=useDiscountCard', data, res => {
+								console.log(11111111)
+								_this.showPup(res.data.is_link, res.data);
+							}, fail => {
+								console.log(fail);
+								if (fail.data.message == '请先开通会员通') {
+									App.navigationTo({
+										url: 'pages/mainPages/memberCard/getMembership/getMembership?card=' + _this.card
+									});
+								}
+							});
+						}
+						if (type == 1) {
+							// 折扣卡使用信息获取
+							let data = {
+								id: id
+							};
+							App._post_form('&p=halfcard&do=useGiftPackage', data, res => {
+								_this.showPup(res.data.is_link, res.data);
+							});
+						}
+					}
+				} else {
+					if (use_where == 1) {
+						App.navigationTo({
+							url: url
+						});
+					} else {
+						uni.showModal({
+							title: '提示',
+							content: '对不起，您不符合使用要求',
+							showCancel: false,
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				}
+			},
+			init() {
+				let _this = this;
+				_this.memberCardHome();
+
+				let one = new Date(new Date().setHours(0, 0, 0, 0)) / 1000;
+				let week = new Date().getDay();
+				for (let a = 0; a < 7; a++) {
+					let w = week++;
+					if (w > 5) {
+						week = 0;
+					}
+					if (a > 1) {
+						_this.weekList.push(_this.getWeek(w));
+					}
+				}
+				for (let i = 0; i < 7; i++) {
+					let t = _this.formDat(one + 86400 * i).substring(0, 5);
+					let td = one + 86400 * i;
+					let data = {
+						time: t,
+						timeData: td
+					};
+					_this.timeList.push(data);
+					console.info(_this.timeList);
+				}
+				_this.time = _this.timeList[0].timeData;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				_this.payBarrageList();
+			},
+			// 商品购买弹幕获取
+			payBarrageList() {
+				let _this = this;
+				let data = {
+					type: 4
+				};
+				App._post_form('&do=payBarrageList', data, res => {
+					_this.barrageList = res.data;
+				});
+			},
+			// 商户分类信息列表
+			getHomeList() {
+				let _this = this;
+				let data = {
+					type: 0
+				};
+				App._post_form('&p=store&do=cateList', data, res => {
+					_this.homeList = res.data;
+					_this.oldHomeList = res.data;
+				});
+			},
+			// 其他分类获取
+			getElseList(type) {
+				let _this = this;
+				if(type == 'qg'){
+					App._post_form('&p=rush&do=cateList', {}, res => {
+						_this.homeList = res.data;
+					});
+				}else if(type == 'tg'){
+					App._post_form('&p=groupon&do=cateList', {}, res => {
+						_this.homeList = res.data;
+					});
+				}else if(type == 'jf'){
+					App._post_form('&p=consumption&do=cateList', {}, res => {
+						_this.homeList = res.data;
+					});
+				}else if(type == 'pt'){
+					App._post_form('&p=wlfightgroup&do=cateList', {}, res => {
+						_this.homeList = res.data;
+					});
+				}else if(type == 'kj'){
+					App._post_form('&p=bargain&do=cateList', {}, res => {
+						_this.homeList = res.data;
+					});
+				}else{
+					_this.homeList = _this.oldHomeList;
+				}
+				
+			},
+			closePayQr() {
+				let _this = this;
+				_this.payQrcodeShow = false;
+			},
+			// 权益跳转
+			goEquity(url) {
+				App.navigationTo({
+					url: url
+				});
+			},
+			// 跳转
+
+			go(url,item) {
+				if(item.exdetail){
+					this.exdetail = item.exdetail;
+					this.showtetx = true;
+					this.goUrl = url;
+					return
+				}
+				App.navigationTo({
+					url: url
+				});
+			},
+			// 列表无限加载
+			load() {
+				
+			},
+			formDat(time) {
+				return util.formatTime(time, 'normal', '-');
+			},
+			getWeek(time) {
+				if (time == 0) {
+					return '周日';
+				} else if (time == 1) {
+					return '周一';
+				} else if (time == 2) {
+					return '周二';
+				} else if (time == 3) {
+					return '周三';
+				} else if (time == 4) {
+					return '周四';
+				} else if (time == 5) {
+					return '周五';
+				} else if (time == 6) {
+					return '周六';
+				}
+			},
+			loadShow() {
+				let _this = this;
+
+				console.info('我才刚刚执行');
+			},
+			// 获取一卡通首页信息
+			memberCardHome() {
+				let _this = this;
+				let data = {};
+				App._post_form(
+					'&p=halfcard&do=memberCardHome',
+					data,
+					res => {
+						_this.HomeType = true;
+						_this.barrageType = true;
+						_this.memberCardHomeInfo = res.data;
+						// _this.memberCardHomeInfo.moreset = 0;
+						let checkType = !!_this.tabBarSetList && _this.tabBarSetList.length > 0 ? _this.tabBarSetList[0].type : 0,
+							sortType = !!_this.tabBarSetList && _this.tabBarSetList.length > 0 ? _this.tabBarSetList[0]['sort'] : "";
+						_this.sortType = sortType;
+						_this.type = checkType;
+						if (res.data.switch_set.option_switch === 1) {
+							_this.getHomeList();
+							_this.checkDiscount(0, checkType, sortType);
+						}
+						let TextSubstitution = uni.getStorageSync('TextSubstitution');
+						if(TextSubstitution.flag074  == 1 && res.data.info.levelarmy == 1){							
+							this.equityMemberImg = this.imgfixUrls + 'newmemberImg.png';						
+						}else{							
+							this.equityMemberImg = this.imageRoot + 'memberImg.png';
+							// debugger						
+						}
+						if (!!res.data.info.id) {
+							_this.card = 'have';
+							if (res.data.info.cardimg == '') {
+								_this.memberCardInfoImg = 'background-image:' + 'url(' + "'" + res.data.info.cardimg + "'" + ')';
+							} else {
+								_this.memberCardInfoImg = 'background-image:url(' + "'" + res.data.info.cardimg + "'" + ');';
+							}
+						} else {
+							_this.card = 'nhave';
+							_this.memberCardInfoImg = 'background-image:' + 'url(' + "'" + res.data.info.cardimg + "'" + ')';
+						}
+						for (let i = 0; i < res.data.list.length; i++) {
+							_this.colorEquity.push('color:' + res.data.list[i].color);
+							// console.info(_this.colorEquity);
+						}
+					},
+					fail => {
+						// console.info();
+						if ( fail.data.message == '一卡通功能已关闭') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							});
+						}
+					}
+				);
+			},
+			goGetMember() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/getMembership/getMembership?card=' + _this.card
+				});
+			},
+			popChecks(id) {
+				let _this = this;
+				_this.popChecked = id;
+			},
+			showPup(islink, itemInfo) {
+				let _this = this;
+				_this.itemInfo = itemInfo;
+				if (islink == 1) {
+					_this.show = true;
+				}
+				if (islink == 0) {
+					console.info(String(itemInfo.url));
+					window.open(itemInfo.url);
+				}
+			},
+			checkPr(index, id,type) {
+				let _this = this;
+				_this.mbPr = index;
+				_this.page = 1;
+				_this.isMore = false;
+				_this.oldid = id;
+				let data = {
+					page: _this.page,
+					page_index: 5,
+					lng: _this.curLoction.longitude,
+					lat: _this.curLoction.latitude,
+					time:_this.time,
+					sort: _this.sortType,
+					is_total: 1,
+					cate_id: id,
+					is_vip: 1
+				};
+				if(type == 'tg'){
+					data.status = 2;
+					App._post_form('&p=groupon&do=homeList', data, res => {
+						
+						if(type == 'tg'){
+							_this.tgList = res.data.list;
+						}else{
+							_this.zkList = res.data.list;
+						}
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'jf'){
+					data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						time:_this.time,
+						sort: _this.sortType,
+						cate_id: id,
+						is_vip: 1
+					};
+					App._post_form('&p=consumption&do=homeList', data, res => {
+						
+						
+							_this.jfList = res.data.list;
+						
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'kq'){
+					App._post_form('&p=wlcoupon&do=homeList', data, res => {
+						_this.kqList = res.data.list;
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'qg'){
+					App._post_form('&p=rush&do=homeList', data, res => {
+						_this.qgList = res.data.list;
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'zk'){
+					data.type = 1;
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						_this.zkList = res.data.list;
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'pt'){
+					App._post_form('&p=wlfightgroup&do=homeList', data, res => {
+						_this.ptList = res.data.list;
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else if(type == 'kj'){
+					App._post_form('&p=bargain&do=homeList', data, res => {
+						_this.kjList = res.data.list;
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}else{
+					data.type = 2;
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						
+						if(type == 'tg'){
+							_this.tgList = res.data.list;
+						}else{
+							_this.zkList = res.data.list;
+						}
+						_this.total = res.data.total;
+						if (_this.page == res.data.total || res.data.total == 0) {
+							_this.isMore = true;
+						}
+					});
+				}
+				
+			},
+			checkMbThree(index, id) {
+				let _this = this;
+				_this.mbThreeChecks = index;
+				_this.page = 1;
+				_this.isMore = false;
+				console.log(123)
+				let data = {
+					page: _this.page,
+					page_index: 5,
+					lng: '',
+					lat: '',
+					status: 1,
+					sort: _this.sortType,
+					is_total: 1,
+					cate_id: id
+				};
+				App._post_form('&p=halfcard&do=packageList', data, res => {
+					_this.lbList = res.data.list;
+					_this.total = res.data.total;
+					console.info(_this.lbList);
+					if (_this.page == res.data.total || res.data.total == 0) {
+						_this.isMore = true;
+					}
+				});
+			},
+			checkDiscount(index, type, sortType) {
+				let _this = this;
+				_this.isActive = index;
+				_this.page = 1;
+				_this.type = type;
+				_this.mbPr = 0;
+				// _this.mbTwoChecks = 0;
+				// _this.time = _this.timeList[0].timeData;
+				_this.isMore = false;
+				_this.sortType = sortType;
+				_this.getElseList(type);
+				// 折扣
+				if (type == 'zk') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						type: 1,
+						time: _this.time,
+						sort: sortType,
+						is_total: 1
+					};
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						_this.zkList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 平日折扣
+				if (type == 'pr') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						type: 2,
+						time: _this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						sort: sortType,
+						is_total: 1
+					};
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						_this.zkList = res.data.list;
+						_this.total = res.data.total;
+
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 积分商品信息列表
+				if (type == 'jf') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						sort: sortType,
+						type: '',
+						cate_id: '',
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						is_vip: 1,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+					};
+					App._post_form('&p=consumption&do=homeList', data, res => {
+						_this.jfList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 抢购
+				if (type == 'qg') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status:'',
+						sort: sortType,
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=rush&do=homeList', data, res => {
+						_this.qgList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 拼团
+				if (type == 'pt') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status:'',
+						sort: sortType,
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=wlfightgroup&do=homeList', data, res => {
+						_this.ptList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 砍价
+				if (type == 'kj') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status:'',
+						sort: sortType,
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=bargain&do=homeList', data, res => {
+						_this.kjList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 团购
+				if (type == 'tg') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: 2,
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:'',
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=groupon&do=homeList', data, res => {
+						for (let i = 0; i < res.data.list.length; i++) {
+							res.data.list[i].endtime = util.formatTime(res.data.list[i].endtime, 'rule', '-');
+						}
+						_this.tgList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 礼包
+				if (type == 'lb') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: 1,
+						sort: sortType,
+						is_total: 1,
+						cate_id: '',
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:''
+					};
+					App._post_form('&p=halfcard&do=packageList', data, res => {
+						_this.lbList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+				// 卡劵
+				if (type == 'kq') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1,
+						time:_this.memberCardHomeInfo.moreset == 1?_this.time:''
+					};
+					App._post_form('&p=wlcoupon&do=homeList', data, res => {
+						_this.kqList = res.data.list;
+						_this.total = res.data.total;
+						_this.isMore = res.data.list.length === 0 || _this.page === res.data.total;
+					});
+				}
+			},
+			checkMbTwoData(id, time,type) {
+				let _this = this;
+				_this.mbTwoChecks = id;
+				_this.zkList = [];
+				_this.page = 1;
+				_this.time = time;
+				let datas = {
+					page: _this.page,
+					page_index: 5,
+					lng: _this.curLoction.longitude,
+					lat: _this.curLoction.latitude,
+					type: 1,
+					time: time,
+					sort: _this.sortType,
+					is_total: 1,
+					cate_id: _this.oldid
+				};
+				if(type == 'lb'){
+					// _this.lbList = [];
+						App._post_form('&p=halfcard&do=packageList', datas, res => {
+							_this.lbList = res.data.list;
+							_this.total = res.data.total;
+							// _this.isMore = true;
+							if (res.data.list.length < 5) {
+								_this.isMore = true;
+								console.log('变成true了', _this.page, _this.total)
+							}
+						});
+				}else{
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						time:_this.time,
+						sort: _this.sortType,
+						is_total: 1,
+						cate_id: _this.oldid,
+						is_vip: 1
+					};
+					if(type == 'tg'){
+						data.status = 2;
+						App._post_form('&p=groupon&do=homeList', data, res => {
+							
+							if(type == 'tg'){
+								_this.tgList = res.data.list;
+							}else{
+								_this.zkList = res.data.list;
+							}
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type == 'jf'){
+						data = {
+							page: _this.page,
+							page_index: 5,
+							lng: _this.curLoction.longitude,
+							lat: _this.curLoction.latitude,
+							time:_this.time,
+							sort: _this.sortType,
+							cate_id: id,
+							is_vip: 1
+						};
+						App._post_form('&p=consumption&do=homeList', data, res => {
+							
+							
+								_this.jfList = res.data.list;
+							
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type == 'kq'){
+						App._post_form('&p=wlcoupon&do=homeList', data, res => {
+							
+							
+								_this.kqList = res.data.list;
+							
+							
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type == 'qg'){
+						App._post_form('&p=rush&do=homeList', data, res => {
+							if(type == 'tg'){
+								_this.tgList = res.data.list;
+							}else{
+								_this.qgList = res.data.list;
+							}
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type =='zk'){
+						data.type = 1;
+						App._post_form('&p=halfcard&do=homeList', data, res => {
+							
+							if(type == 'tg'){
+								_this.tgList = res.data.list;
+							}else{
+								_this.zkList = res.data.list;
+							}
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type =='pr'){
+						data.type = 2;
+						App._post_form('&p=halfcard&do=homeList', data, res => {
+							
+							if(type == 'tg'){
+								_this.tgList = res.data.list;
+							}else{
+								_this.zkList = res.data.list;
+							}
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type =='pt'){
+						App._post_form('&p=wlfightgroup&do=homeList', data, res => {
+							_this.ptList = res.data.list;
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}else if(type =='kj'){
+						App._post_form('&p=bargain&do=homeList', data, res => {
+							_this.kjList = res.data.list;
+							_this.total = res.data.total;
+							if (_this.page == res.data.total || res.data.total == 0) {
+								_this.isMore = true;
+							}
+						});
+					}
+				};
+				
+				
+			}
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom: function() {
+			let _this = this,
+				type = _this.type,
+				sortType = _this.sortType;
+				if(_this.total == _this.page){
+					_this.isMore = true;
+					return
+				}
+			if (_this.total !== _this.page) {
+				_this.page++;
+				_this.isMore = false;
+				console.log('变成false了', _this.page, _this.total)
+				// 折扣
+				if (type == 'zk') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						type: 1,
+						time: _this.time,
+						sort: sortType,
+						is_total: 1,
+						cate_id: _this.oldid
+					};
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						_this.zkList = [..._this.zkList, ...res.data.list];
+						_this.total = res.data.total;
+						// _this.isMore = true;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						};
+					});
+				}
+				// 平日折扣
+				if (type == 'pr') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						type: 2,
+						time: '',
+						sort: sortType,
+						is_total: 1,
+						cate_id: _this.oldid
+					};
+					App._post_form('&p=halfcard&do=homeList', data, res => {
+						_this.zkList = [..._this.zkList, ...res.data.list];
+						_this.total = res.data.total;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+						// _this.isMore = true;
+					});
+				}
+				// 积分商品信息列表
+				if (type == 'jf') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						sort: sortType,
+						type: '',
+						cate_id: '',
+						is_vip: 1,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+					};
+					App._post_form('&p=consumption&do=homeList', data, res => {
+						_this.jfList = [..._this.jfList, ...res.data.list];
+						_this.total = res.data.total;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+						// _this.isMore = true;
+					});
+				}
+				// 抢购
+				// if (type == 'qg') {
+				// 	let data = {
+				// 		page: _this.page,
+				// 		page_index: 5,
+				// 		lng: _this.curLoction.longitude,
+				// 		lat: _this.curLoction.latitude,
+				// 		status: '',
+				// 		sort: sortType,
+				// 		is_total: 1,
+				// 		is_vip: 1
+				// 	};
+				// 	App._post_form('&p=rush&do=homeList', data, res => {
+				// 		_this.qgList = [..._this.qgList, ...res.data.list];
+				// 		_this.total = res.data.total;
+				// 		console.log()
+				// 		if (res.data.list.length < 5) {
+				// 			_this.isMore = true;
+				// 			console.log('变成true了', _this.page, _this.total)
+				// 		}
+				// 		// _this.isMore = true;
+				// 	});
+				// }// 抢购
+				if (type == 'qg') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: '',
+						cate_id: _this.oldid,
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=rush&do=homeList', data, res => {
+						_this.qgList = [..._this.qgList, ...res.data.list];
+						_this.total = res.data.total;
+						console.log()
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+						// _this.isMore = true;
+					});
+				}
+				// 拼团
+				if (type == 'pt') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: '',
+						cate_id: _this.oldid,
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=wlfightgroup&do=homeList', data, res => {
+						_this.ptList = [..._this.qgList, ...res.data.list];
+						_this.total = res.data.total;
+						console.log()
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+						// _this.isMore = true;
+					});
+				}
+				// 砍价
+				if (type == 'kj') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: '',
+						cate_id: _this.oldid,
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=bargain&do=homeList', data, res => {
+						// _this.kjList.concat(_this.kjList,res.data.list)
+						_this.kjList = [..._this.kjList, ...res.data.list];
+						// _this.qgList = res.data.list;
+						_this.total = res.data.total;
+						console.log(_this.kjList,'抢购下拉加载');
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+						}
+						// _this.isMore = true;
+					});
+				}
+				// 团购
+				if (type == 'tg') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: 2,
+						cate_id: _this.oldid,
+						sort: sortType,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=groupon&do=homeList', data, res => {
+						for (let i = 0; i < res.data.list.length; i++) {
+							res.data.list[i].endtime = util.formatTime(res.data.list[i].endtime, 'rule', '-');
+						}
+						_this.tgList = [..._this.tgList, ...res.data.list];
+						_this.total = res.data.total;
+						// _this.isMore = true;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+					});
+				}
+				// 礼包
+				if (type == 'lb') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						status: 1,
+						sort: sortType,
+						is_total: 1,
+						cate_id: ''
+					};
+					App._post_form('&p=halfcard&do=packageList', data, res => {
+						_this.lbList = [..._this.lbList, ...res.data.list];
+						_this.total = res.data.total;
+						// _this.isMore = true;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+					});
+				}
+				// 卡劵
+				if (type == 'kq') {
+					let data = {
+						page: _this.page,
+						page_index: 5,
+						lng: _this.curLoction.longitude,
+						lat: _this.curLoction.latitude,
+						sort: sortType,
+						cate_id: _this.oldid,
+						is_total: 1,
+						is_vip: 1
+					};
+					App._post_form('&p=wlcoupon&do=homeList', data, res => {
+						_this.kqList = [..._this.kqList, ...res.data.list];
+						_this.total = res.data.total;
+						// _this.isMore = true;
+						if (res.data.list.length < 5) {
+							_this.isMore = true;
+							console.log('变成true了', _this.page, _this.total)
+						}
+					});
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	@import '../memberCard/memberCard.less';
+
+	.memberCard {
+		background: #f6f6f6 !important;
+		overflow-x: hidden;
+	}
+
+	.tips {
+		height: 180upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: black;
+		}
+	}
+
+	.backW {
+		background: #ffffff;
+	}
+	.equity{
+		padding: 30upx;
+		overflow: auto;
+		margin: 30upx;
+		border-radius: 10upx;
+		background-color: #FFFFFF;
+		width: 630upx;
+		min-height: 350upx;
+	}
+</style>
diff --git a/pages/mainPages/notOpen/notOpen.vue b/pages/mainPages/notOpen/notOpen.vue
new file mode 100644
index 0000000..be97849
--- /dev/null
+++ b/pages/mainPages/notOpen/notOpen.vue
@@ -0,0 +1,251 @@
+<template>
+	<!-- 城市代理 -->
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-index" :style="'background-color: '+datas.page.background" :class="!!bottomMenu?'bottomPadding':''"
+		 v-if="loadlogo">
+		 <far-bottom></far-bottom>
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages :diypagesData="diypagesData" :pageData="datas.page" :btngroupData="btngroup" />
+			<view class="audio-main" @click="playAudio" v-if="!!pageInfo.music">
+				<view class="audio-bg" :class="{'stop-audio':!play_Audio}">
+					<view class="audio-gif" :style="{'background-image':'url('+imageRoot+'musicgif.gif)'}">
+						<view class="audio-png" :style="{'background-image':'url('+imageRoot+'music.png)'}"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 1=显示加盟申请；2=显示暂未开通 OR 加载总后台数据 -->
+		<!-- 显示加盟申请 -->
+		<view class="applyJoin" v-if="cityAgentStatus == 1">
+			<view class="applyJoin-image" :style="{'background-image':'url('+imageUrl+')'}"></view>
+			<view class="text">代理<view class="inlineblock">{{TextSubstitution.sysname}}</view>，携手<view class="inlineblock">共赢未来</view>
+				<view class="apply" @click="callphone()">
+					<view>申请成为城市代理</view>
+				</view>
+			</view>
+
+			<!-- 显示暂未开通 -->
+			
+		</view>
+		
+		<view class="notOpen" v-if="cityAgentStatus == 2">
+			<view class="notOpen-image" :style="{'background-image':'url('+imageUrl+')'}"></view>
+			<view class="text">附近暂时没有商家，马上就来哦！</view>
+		</view>
+	</view>
+</template>
+<script>
+	let innerAudioContext = uni.createInnerAudioContext();
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	import {
+		RUZHU,
+		KEFU
+	} from '@/store/mutation-types'
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import diypages from '@/components/template/diypages.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				swiperI: 1,
+				loadAgain: false,
+				datas: {
+					basic: [],
+					adv: '',
+					page: {},
+				},
+				diypagesData: [{
+					currentTime: 1571394201,
+					group_key: 1,
+					group_name: "search",
+					id: "search2",
+					params: {
+						areaname: "",
+						placeholder: "请输入关键字进行搜索",
+						url: "pages/subPages/search/search",
+					},
+					style: {
+						areaColor: "#333333",
+						background: "#FFFFFF",
+						color: "#999999",
+						iconcolor: "#b4b4b4",
+						inputbackground: "#F7F7F7",
+						marginBottom: 0,
+						searchstyle: "round",
+						textalign: "left"
+					}
+				}],
+				richtext: {
+					imageProp: {
+						mode: 'widthFix'
+					}
+				},
+				pageInfo: {},
+				btngroup: {
+					backgroundColor: '#ffffff',
+					btnBordeRadius: '',
+					displayMode: '',
+					eachLineNum: '',
+					eachPageNum: '',
+					list: [],
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: [],
+					swiperHeight: '',
+					phone: null,
+				},
+				//城市代理
+				cityAgentStatus: 1, //1=显示加盟申请；2=显示暂未开通 OR 加载总后台数据
+				cityAgentName: '智慧城市', //平台名称
+				joinPhone: null //电话
+			}
+		},
+		components: {
+			diypages,
+		},
+		computed: {
+			...mapState([
+				'ruzhushow', 'kefushow'
+			]),
+			imageUrl() {
+				let platformInfor = uni.getStorageSync('platformInfor');
+				let agent_iamge = platformInfor.agent_iamge;
+				return this.cityAgentStatus == 1 ? agent_iamge || this.imageRoot + 'apply_city.png' : this.imageRoot + 'not_shop.png'
+			},
+			TextSubstitution() {
+				return uni.getStorageSync('TextSubstitution')
+			},
+		},
+		onLoad(e) {
+			//城市代理
+			let {
+				city_agent_status,
+				city_agent_name,
+				joinPhone
+			} = e;
+			this.setData({
+				cityAgentStatus: city_agent_status,
+				city_agent_name: city_agent_name,
+				joinPhone
+			});
+			console.info('cityAgentStatus',this.cityAgentStatus)
+			//diy
+			let location = uni.getStorageSync('location'),
+				client = App.getClientType(),
+				getBrowser = App.getBrowser(),
+				_this = this,
+				{
+					id,
+					type
+				} = e;
+			if (getBrowser === "chrome53.0") {
+				_this.loadlogo = true;
+				uni.showModal({
+					content: '微信浏览器版本过低,请使用系统浏览器',
+					showCancel: false
+				})
+				return false
+			}
+			_this.phone = uni.getStorageSync('phone');
+			
+			_this.loadAgain = true
+			_this.loadlogo = true;
+			_this.pageType = type;
+		},
+		methods: {
+			callphone() {
+				let _this = this,
+					phone = _this.phone;
+				if (!!phone) {
+					uni.makePhoneCall({
+						phoneNumber: phone
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.applyJoin {
+		width: 100vw;
+
+		>view {
+			text-align: center;
+		}
+
+		.applyJoin-image {
+			width: 500upx;
+			height: 500upx;
+			background-size: 500upx 500upx;
+			background-repeat: no-repeat;
+			margin: 0 auto;
+		}
+
+		.text {
+			height: 60upx;
+			line-height: 60upx;
+			font-size: 32upx;
+			width: 100vw;
+			margin: 10px 0px;
+		}
+
+		.apply {
+			width: 100vw;
+			height: 60upx;
+			line-height: 60upx;
+			font-size: 28upx;
+
+			>view {
+				border: 2upx solid #FF4444;
+				border-radius: 100upx;
+				width: auto;
+				display: inline-block;
+				padding: 10upx 40upx;
+				color: #FF4444;
+				font-size: 28upx;
+				margin: 20upx 0upx;
+
+
+			}
+		}
+	}
+
+	.inlineblock {
+		display: inline-block;
+		color: #FF4444;
+	}
+
+	.notOpen {
+		margin-top: 232upx;
+
+		.notOpen-image {
+			width: 440upx;
+			height: 320upx;
+			background-size: 440upx 320upx;
+			background-repeat: no-repeat;
+			margin: 0 auto;
+		}
+
+		>view {
+			width: 100vw;
+			text-align: center;
+			font-size: 24upx;
+			color: #999999;
+		}
+
+		.text {
+			height: 60upx;
+			line-height: 60upx;
+		}
+	}
+</style>
diff --git a/pages/mainPages/noticeDetail/noticeDetail.vue b/pages/mainPages/noticeDetail/noticeDetail.vue
new file mode 100644
index 0000000..edfa07b
--- /dev/null
+++ b/pages/mainPages/noticeDetail/noticeDetail.vue
@@ -0,0 +1,61 @@
+<template>
+	<!-- 公告详情 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="content padding-box-all" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="title f-36 col-3 m-btm20">{{title}}</view>
+			<view class="f-28 col-9 m-btm20" >{{createtime}} 发布</view>
+			<view class="p-top-20 border-line border-top">
+			<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+			show-with-animation use-anchor  :html="wxContent" ></jyf-parser>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo'
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				title:"", 
+				wxContent:"",
+				createtime:null
+			}
+		},
+		methods: {
+			interInfo(id) {
+				let _this = this;
+				App._post_form('&do=noticeDetail', {
+					id
+				}, res => {
+					_this.setData({
+						title:res.data.title,
+						wxContent:res.data.content,
+						createtime:res.data.createtime
+					})
+				}, false, () => {
+					_this.loadlogo = true
+				})
+			}
+		},
+		mounted() {
+			
+		},
+		onLoad(e) {
+			this.interInfo(e.id)
+		},
+		components:{
+			Loadlogo,
+			jyfParser
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/mainPages/orderWrite/orderWrite.vue b/pages/mainPages/orderWrite/orderWrite.vue
new file mode 100644
index 0000000..6bf6ee7
--- /dev/null
+++ b/pages/mainPages/orderWrite/orderWrite.vue
@@ -0,0 +1,379 @@
+<template>
+	<!-- 自助核销 -->
+	<view class="orderWrite">
+		<far-bottom></far-bottom>
+		<view class="orderWritePackage">
+			<view class="orderInfo">
+				<view class="orderInfoPackage">
+					<view class="orderInfoImg"><image :src="hxInfo.goodsLogo" /></view>
+					<view class="Info">
+						<view>
+							<span>{{ hxInfo.goodsName }}</span>
+						</view>
+						<view>
+							<span>
+								{{hxInfo.optionName}}
+							</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 选择核销码 -->
+			<view class="checkOrderWrite">
+				<view class="checkOrderWritePackage">
+					<view class="checkOrderWriteTitle">
+						<view class="line"></view>
+						<span>核销码</span>
+						<view class="dis-il-block" style="position: relative;top: 3upx;">
+							<switch type="checkbox" color="#FF4444" :checked="switchs" style="transform:scale(0.6)" @change="switch2Change" />
+						</view>
+					</view>
+					<view class="checkOrderWriteBody">
+						<!-- 核销码循环模板 -->
+						<view :class="[ids.indexOf(item.id)==-1?'orderWriteMb':'orderWriteMbCheck']" v-for="(item, index) in hxInfo.checkcodes" @click="pushCode(item.id)" v-if="item.status==1">
+							<span>{{ item.checkcode }}</span>
+						</view>
+						<!-- 核销码循环模板 -->
+					</view>
+				</view>
+			</view>
+			<!-- 选择核销码 -->
+
+			<!-- 输入核销码 -->
+			<view class="orderWriteInput" v-if="hxInfo.useStatua == 1">
+				<view class="orderWriteInputPackage">
+					<view class="checkOrderWriteTitle">
+						<view class="line"></view>
+						<span>核销密码</span>
+					</view>
+					<view class="orderWriteInputBody"><input placeholder="请输入核销密码" v-model="verkey" /></view>
+				</view>
+			</view>
+			<!-- 输入核销码 -->
+
+			<!-- 核销按钮 -->
+			<view class="orderWriteSubmit" @click="useCheckcode"><span>确认核销</span></view>
+			<!-- 核销按钮 -->
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			id: '',
+			plugin: '',
+			ids: [],
+			verkey: '',
+			hxInfo: {},
+			e:{},
+			switchs:false
+		};
+	},
+	onLoad: function(e) {
+		let _this=this
+		_this.e=e
+	},
+	onShow(){
+		let _this=this
+		_this.id = _this.e.id;
+		_this.plugin = _this.e.plugin;
+		_this.init();
+	},
+	methods: {
+		switch2Change(e){
+			this.ids = [];
+			if(e.target.value){
+				this.switchs = true;
+				this.hxInfo.checkcodes.map(item=>{
+					this.ids.push(item.id);
+				})
+			}else{
+				this.switchs = false;
+			}
+			console.log('switch1 发生 change 事件，携带值为', e.target.value)
+		},
+		init() {
+			let _this = this;
+			_this.selfUse();
+		},
+		// 选择核销码
+		pushCode(id){
+			let _this=this
+			if(_this.ids.indexOf(id)==-1){
+				_this.ids.push(id);
+				if(_this.ids.length == _this.hxInfo.checkcodes.length){
+					_this.switchs = true;
+				}
+				console.info(_this.ids)
+			}
+			else{
+				for(let i=0;i<_this.ids.length;i++){
+					if(_this.ids[i]==id){
+						_this.ids.splice(i,1);
+						_this.switchs = false;
+						console.info(_this.ids)
+					}
+				}
+			}
+			
+		},
+		// 核销订单页面
+		selfUse() {
+			let _this = this;
+			let data = {
+				id: _this.id,
+				plugin: _this.plugin
+			};
+			App._post_form('&p=pay&do=selfUse', data, res => {
+				_this.hxInfo = res.data;
+				let aa = {
+					"checkcode": "37119154",
+					"id": "5923",
+					"status": "1"
+				}
+				if(_this.hxInfo.checkcodes.length == 0){
+					App.showError(
+						`已核销,请勿重复使用!`,
+						data => {
+							if (data.confirm) {
+								setTimeout(()=>{
+									// uni.hideLoading()
+									uni.reLaunch({
+										url:'/pages/mainPages/index/index'
+									})
+								},1000)
+							}
+						},
+						true
+					);
+					
+					
+				}
+				// _this.hxInfo.checkcodes.push(aa);
+				// _this.ids.push(_this.hxInfo.checkcodes[0].id);
+				this.pushCode(_this.hxInfo.checkcodes[0].id)
+			},
+			fail =>{
+				App.navigationTo({
+					url:fail.data.url
+				})
+			});
+		},
+		// 使用核销码
+		useCheckcode() {
+			let _this = this;
+			uni.showModal({
+				title: '提示',
+				content: '是否确认进行核销？',
+				success: function(res) {
+					if (res.confirm) {
+						
+						let data = {
+							ids: _this.ids,
+							usestatus: _this.hxInfo.useStatua,
+							verkey: _this.verkey
+						};
+						if(_this.hxInfo.useStatua==1){
+							if(_this.verkey==""){
+								uni.showToast({
+									icon:"none",
+								    title: '请输入核销密码',
+								    duration: 2000
+								});
+							}
+						}
+						App._post_form('&p=pay&do=useCheckcode', data, res => {
+							uni.showModal({
+								content:'核销成功',
+								showCancel:false,
+							    success: function (res) {
+									uni.reLaunch({
+										url:'/pages/mainPages/index/index'
+									})
+							    }
+							});
+							
+							// _this.selfUse();
+						});
+					} else if (res.cancel) {
+					}
+				}
+			});
+			
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	
+}
+.orderWrite {
+	background: #f6f6f6;
+	overflow-x: hidden;
+	font-size: 0;
+}
+.orderWritePackage {
+	border: 1px solid rgba(0, 0, 0, 0);
+}
+.orderInfo {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin: 20upx auto 0 auto;
+}
+.orderInfoPackage {
+	padding: 30upx;
+	> view {
+		display: inline-block;
+	}
+}
+.orderInfoImg {
+	vertical-align: top;
+	width: 124upx;
+	height: 124upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 124upx;
+		height: 124upx;
+	}
+}
+.Info {
+	width: 483upx;
+	margin-left: 20upx;
+	vertical-align: top;
+	> view:nth-child(1) {
+		> span {
+			font-size: 28upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		> span {
+			margin-top: 20upx;
+			display: inline-block;
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.checkOrderWrite {
+	background: rgba(255, 255, 255, 1);
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+}
+.checkOrderWritePackage {
+	padding: 30upx;
+}
+.orderWriteMbCheck {
+	width: 300upx;
+	height: 75upx;
+	background: #ff4444;
+	border: 1upx solid rgba(255, 68, 68, 1);
+	border-radius: 10upx;
+	text-align: center;
+	> span {
+		line-height: 75upx;
+		font-size: 24upx;
+		
+		
+		color: #FFFFFF;
+	}
+}
+.orderWriteMb {
+	width: 300upx;
+	height: 75upx;
+	border: 1upx solid rgba(204, 204, 204, 1);
+	border-radius: 10upx;
+	text-align: center;
+	> span {
+		line-height: 75upx;
+		font-size: 24upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.checkOrderWriteTitle {
+	> span {
+		vertical-align: middle;
+		margin-left: 15upx;
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.line {
+	display: inline-block;
+	vertical-align: middle;
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+
+.checkOrderWriteBody {
+	display: flex;
+	flex-wrap: wrap;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		margin-top: 30upx;
+	}
+}
+.orderWriteInput {
+	margin: 20upx auto 0 auto;
+	width: 688upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.orderWriteInputPackage {
+	padding: 30upx;
+}
+.orderWriteInputBody {
+	margin: 30upx 0 0 0;
+	width: 630upx;
+	height: 90upx;
+	background: rgba(246, 246, 246, 1);
+	border-radius: 10upx;
+	> input {
+		padding: 0 30upx;
+		height: 90upx;
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.orderWriteSubmit {
+	margin: 50upx auto 0 auto;
+	width: 687upx;
+	height: 90upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 45upx;
+	text-align: center;
+	> span {
+		line-height: 90upx;
+		font-size: 28upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+</style>
diff --git a/pages/mainPages/pay/pay.vue b/pages/mainPages/pay/pay.vue
new file mode 100644
index 0000000..9c2a12f
--- /dev/null
+++ b/pages/mainPages/pay/pay.vue
@@ -0,0 +1,29 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<web-view :src="Url" class="hello">
+			
+		</web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				Url:'',
+			};
+		},
+		onLoad:function(option){
+			let _this=this
+			_this.Url=option.Url
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+.hello{
+	width: 300upx;
+	height: 300upx;
+}
+</style>
diff --git a/pages/mainPages/payment/pay.vue b/pages/mainPages/payment/pay.vue
new file mode 100644
index 0000000..447df0a
--- /dev/null
+++ b/pages/mainPages/payment/pay.vue
@@ -0,0 +1,116 @@
+<template>
+	<!-- 订单支付 -->
+	<view class="body">
+		<far-bottom></far-bottom>
+		<view class="J-weixin-tip weixin-tip" :class="{'show':display}">
+			<view class="weixin-tip-content">
+				请在菜单中选择在浏览器中打开,<br />
+				以完成支付
+			</view>
+		</view>
+		<view class="J-weixin-tip-img weixin-tip-img" :class="[className,{'show':display}]"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				display: false,
+				className: "",
+			};
+		},
+		onLoad(options) {
+			// window.location = window.location;
+			if (location.hash.indexOf('error') != -1) {
+				alert('参数错误，请检查');
+			} else {
+				var ua = navigator.userAgent.toLowerCase();
+				var tip = document.querySelector(".weixin-tip");
+				var tipImg = document.querySelector(".J-weixin-tip-img");
+				if (ua.indexOf('micromessenger') != -1) {
+					this.display = true;
+					if (ua.indexOf('iphone') != -1 || ua.indexOf('ipad') != -1 || ua.indexOf('ipod') != -1) {
+						this.className = "iphone";
+					} else {
+						this.className = 'android';
+					}
+				} else {
+					// var getQueryString = function(url, name) {
+					// 	var reg = new RegExp("(^|\\?|&)" + name + "=([^&]*)(\\s|&|$)", "i");
+					// 	if (reg.test(url)) return RegExp.$2.replace(/\+/g, " ");
+					// };
+					// var param = getQueryString(location.href, 'goto') || '';
+					let base64 = new this.$util.Base64(),
+						param = options.goto;
+					location.href = param ? base64.decode(options.goto) : location.href + '#error';
+				}
+			}
+		},
+		methods: {}
+	}
+</script>
+
+<style>
+	.body {
+		position: fixed;
+		z-index: 999;
+		width: 100vw;
+		height: 100vh;
+		top: 0px;
+		background: #F4F4F8;
+		-webkit-touch-callout: none;
+		touch-callout: none;
+		-webkit-user-select: none;
+		user-select: none;
+		-webkit-tap-highlight-color: transparent;
+		tap-highlight-color: transparent;
+		margin: 0;
+		padding: 0;
+		text-align: center;
+		font-size: 15px;
+		
+	}
+
+	.show {
+		display: block !important;
+	}
+
+	.weixin-tip {
+		display: none;
+		-webkit-box-sizing: border-box;
+		box-sizing: border-box;
+		position: absolute;
+		top: 15px;
+		right: 20px;
+		width: 265px;
+		padding: 55px 0 0;
+		text-align: left;
+		background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAACICAMAAABQgAwUAAAAMFBMVEUAAADY2NjY2NjY2NjY2NjY2NjY2NjY2NjX19fY2NjY2NjY2NjY2NjY2NjY2NjY2Njr/TvvAAAAD3RSTlMAxy89c9CdTRyG7lvcD7FzqbJAAAACFklEQVR42uWYy4rkMBAErZdlPdzx/3+7LAw0tH0Y2orDsnnyKQlSVaWytoc6xrEpigFoinUAIBnWABAE5woW9o6GPbGwI1jYGSzsgoV9goU9wMLe0bA7FnYCC7uBhV2wsE+wsAdY2AENGyzsBBZ2Q8MuWNgH94pLbgELO6Bhg4VdwcJuaNgTCzuChZ3Bwg5o2GBhV7CwdzTsjoUdwcLOYGEXLOwTLOwBFvaOht2xsBNY2I1f6lhaenvhrfpkAblab+k9b/OD0iuX2F9/x8D+7ZL2pmpbuj+6o3Vg//oWmPU9p65VkXL6+oIJ8S738nwj62Pb1lvHACH+fBs7sG59U3yrVD3rce3GVcp8qGkPAGTprQUYy6xfaE8i82b6S7/pfZnzdYQIHeOXdfYKpHoFcmrvWlM8RW+CDO8JMWoNM/+FeyB4UfMpL48g5qG1Iqc29YI3mqq2knXvEJu2onJoQy9ok4mkQZf/GjqitUvQyqN6SU8NOvOhHq25xNCWj6LFQdLiyKuaZWpxBC2OrFVHxdryElbQsVtBx6KN0qAd4a71yo610uxa2b0s5xg052I5p26d4MCqusZFwzrAnqQhSogSMnkNcr+GUS3kEKWS62NJFlNCToWLZpWMe14RReGqdjz2PfNECbkGbrQ/Nj5q5y7j8/HRTW5UhvHfA7Mdzitji8rfWsgX3gVZ91eO22odKed6LLf9A/sRnc74RV7lAAAAAElFTkSuQmCC) no-repeat right top;
+		background-size: 45px 68px
+	}
+
+	.weixin-tip-img {
+		display: none;
+		padding: 110px 0 0
+	}
+
+	.weixin-tip-img::after {
+		display: block;
+		margin: 15px auto;
+		content: ' ';
+		background-size: cover
+	}
+
+	.weixin-tip-img.iphone::after {
+		width: 150px;
+		height: 150px;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAMAAABOo35HAAAAXVBMVEUAAADq6vHs7PLu7vPu7vPu7vMeiPL///8cm/UarfcfdfAavvkczvvG5/oDAABd0/qh2/r7ExFSovWGvPPi3c4FCkfSv6VWBwCIhpJPir+pSCoFSZG8hWdPUE/v7/SejHF2AAAABnRSTlMAI0XUl2pd6vM9AAARD0lEQVR4XuzYwY3EMAxD0Ugk21D/ZS529ziXITCTODFfCR+y7ORYQlVLJPFr/uEPSamrjjiqRWLeAFJdG2fC2LBdsnrpZBfbI1gT8xFgP32i5qOo2nukMmDN+SL2fqXSq4g5BVjHvQlzIujOQzWnY2VTGdg5fwbomamSS7MAZaoM0HNSJVdjloI+VlWY5aDyBDWwcgUadNsTmLPIWRxzBxrQGSsDM1YGdMbKwFyCBlTeVgblCBq4+BHMUey5rc66MijrysCsKwMqrZxaWe2Gzmo3dFoZlFYG5clgYFoZmFYGppWBaWVgWhmYN4NBaWVQWhl0zbdzvhNrHq8u+H+V/1uYDSAPLANzERqUi9DQuQgNleX+PmS5G3j5cv9h145WHIdhKIBu65SwxOLex5kX/f9nbuVoiKHDslltpIFZpa2MHw9XhtZdc0rX2kP+lisVr8pjq2VT1XO1qgNrLamaY+teYVXPdS8YwrWw8gdxqbGqj9aSPoRrbSUNYv0Q1g9i8hCWV+Yg3vQ7Y+kteQi/zyA+aq3qtR6pQ/h9BnH5j7UEgpWDpUIC6KMAgKIBrJRotQorIfqnBUqFVvuyX6AF/bcFyY/WPSNYGpD6p16aEK2HpmJxprI1n331jtkR1EwsfXyxn0eVfS7os6ljjTUM8ChqIlZLCJb+XaogA8nfE5o42GmuhNuLloYleEmUYkrWtC+YUNOwWsLl18kJhCMZiHLv6540GhgdjWfDpZdHS+N1MlZibzEV7yNZo9PA4NtyNlwar8uDpSdiZTD06ICHyLo3woMHX38QU+JY8Wi1FCz1WB2RGTsvWHLswgPoBUnBavXX9fPJjj1a5KF0NJ0Cxmc3Ujggg1jxaLUMLJlSRPvA5NL7Zn1vLijwzmkSOzOw2tV/XPvTXJEeLQfZDMhe47G+r+FmNCfioNQAVvymZ7keS2UQAJ4YiIvAoT4Rw442rAhX69tGvR5rCdxSRLGUGAr8gOpjw11eX9b9Id2UOqze3zsDWNG7i+V6LKPZngLww2qI2Ybtvjy2ty89h7aA0D7f3n52MIAVjJZejiXov2i3ux5HdRgMwGf7MYdoJ7JLbgCh/P+fubFx91UQdKeVXtMhZkSQeOSYqzQAkfaXNTganwV0MAIQ9337xLKuc7uQTMeq3M1Mr6xcRbSNkjWI3CR0Isc/AhKZakundZn96pUWdRPUlY1V3QpafgkSyCAJKCRq0NNjmaLUpLKxrsftnY2lvgatoKCF6Lwg1Ycxp/XxmJKoignqqRZzD9SNjbXZSDazLbXze2FfwaVZDZKDWpSNdWNuZ3pl5Vrd+ns3JrNKkjWkz5s8cQvUpZKx1Hmg9VEks1pmUZVYzOdti7hN5UbGciBR/fbzh1rD+jArVTzM2tYJFm8dViIWvoThJB9pWbtqMcvuGZK5WJW4+etFx4LWB1hps1qHbbLgOUrGuvA26ZwWlkjnlNrR//ZpDHHz5FbLDL5vyXretXhbeioPCx0rq2xKHp51VshwVwrWYXpsVpgj+vwmKher7lYhF6sWvF3UTIrCgRUucPy9Z14fHtNzDqgsr1ysC22r3ElhBZeqhMpPD7QrtwrN5ydVXF+5WP06vFKxqrYaEZHgEtTMD48prNbZZvpsPM3HSsW60jb3HhWWvWExpjaKXx3/9tc+WruKhhX/s2pzMTUzu85MrH5n3Z2LFaUkRSWFx4nWkd28dlbh5UTiZM7Gxbp3LYuJVcVrwU4gQBlZQGfPZe0qolklTIgSE1Fto1QiVt+0KhUrm4O3LASoUCmR9gGrdQgq3OQf2KyWZSpWhdWFi1VMQbN/6dNb4e0qYhlSBKREs+oGXrhYF6xCLpZEg9GsIudcB5AzrJZ5DzmWrHicVCoW1uGVipVHAwgv1fTDwBJEw+px40M4ihhdpmJd0bKoWM4j8ny1z6ymYW8F/1wsUSYWmtYvLlYxgKKq8na7Om9YWIsS/IWJhU0Edy6WPGvgLay5s/r6N65wse7o70SsOnb14j8f+z+kntsSRMz7KXhQGkWk2FipWDdKf69H/b0UkRFaOPnYpUdWoOzmGpTmFmp5pmJd0bKIWNoAxu2VioOhgjAitdPXFEpo7gOEwCuaFQ9VHhaa1oWO5SFFNeuYhheVFUdvtXR11U/E4qZjXdDfeVjFAfbv60M/Pm/7WnqrGRPswAR4jZYUHhY6/I2LJcYwjikB5+CAwuhWiPkfcyS3KMPAxEKHv/KxJOeay6YVZLsf0rzuGhZuOynGNHgIDwsdvpKxhi1QWQGGM9LBOs/aW4EKc5BGJDpWxceQhzW6QTsQZ1wp1hK0FpAc4KLD29VIxvqFjyEVaxQZZWyRIDUgR0h7R9NCc99iX5KB+4cbe9ttG4bBANw1iaUVIMb9vNmGgu//mANFsYwXL7UvZBSi5Qg+wAA/ULQRCQAeipWvw9sJWC0pb8RPA1pWWma1L4Zi5evwOhxrd3wnp9Ku9esA1fiedf1aWFxcqvet933CvrprxQlYl3PehsCnauJU2rby/mfZZ0WkbXnLMKz8dtDBWGIrhPTTflWh3conqodiPJbal8NwrH0BU0orrl8O69t4LK51CRCgHSzrzU+RIQWVSvXbfGxvFaTEzHAsHo/1OhwLzuT/0qAhrMLPsCHFIEcNsM3wCxBSVbsfw7FeX26jsTwRjaa1WSq+htKq5j3/L6yEBOyHRmPdxmOpZWL7s7yhSaWyErH52RZPho7Huo7GKvCEt7UcMKwc995nu2WlO4QFjRRlNNb1BCypi+UCZmOwsd69uUdZEfyeHDZv7u4sTGS+MgVWMxIlQct8Y11JY2pcFBA5HlZigAP9efZg8AlYl+FYBANyqArBsg6z0qgsCaIcMWUEohDl00DDsS4nYJVMiD29LJHesKKy4BKr341y/MADq5J7ocyBJTUSYywPASrdl0I1qRJqHWkoVLxlzYAVCFLI0B6iUq8r5WVvrOkqnHwOrBJNayskvhhkOR748EeZBYsRMlIfrUxLFQed+tLuLb7yCVj6oidgkfT24mpIGKgXFmE5GEIILptoGqzCLa1ORSlTqVkpH6WK52SBzoOVPEIkCcAl29XxEA0u0ERYRSKpyC+bez/zZuPtfs4pz8QII+3VWmbCaiDggPFsoXHJj4PM55jySs7J7R2LZ8HK0oLIXfJupRxEtgWXH+f8zxnYLxhBhr/snUFr6zAQhPuaZxkEC8vsXf//Zz4mmku7xM85rE1FNbWVqrn0Y3YkElsmm0WWDvKPPOHeWkcARlaRCk6dhqj0DvnJQuysGpZUD0tytC//J0uHVZloZER5LDw0v5JW7Is5ix7qvYXTYfREzGjvHJXYJWn8Gza4obcGjmEsB2s39D4zJwZZCd//JGA85nmeQFpsXH+sB2v31tmaj6AbLARCLPSTDo3rVaAJuT9hswhXhDWCrGAGrbeao38Hk3GJmF6Eg7YKGnQW9rgOVvXHyrkQAbrCwABLYF6h0hjhOJE9aXEgzYQ/9DP4LFfMxDA6w1o/1YRLv7iDAR+dDb6vCms48TSwb0Gj5TLMkSUB6o3ewgwsH5fC2oph5fWDEsdCEKyfajDhg4UgpsD64d9IZ1oN9ATIqpGX83RGQcas5DDRIqtLYX3Ww8qV2GEM9wgZhiOvAwyKOgvNhoEmVpfC+iy85OiYViMnEaAcB5bSWww0oqhmVgtcn/WCFlmB7viaXJOL1EKWak+6zVyFKFaXw/q4CFZeQYBFOFhaOqghPOpkKehNxNtStl8Fq+oC3GMZupqxEolAQxAl+U1dWJvZZjxR8LFfDetRf2n3MS2+gNNhJMD8/gKLCDkHDsxZE3HE6udeB38sU9VBRWZGEpNIEyw6KfRnn6aTwsZ+D6ztDlj7kLmU4gOTCiOMKb5Pw7lNs4WMl2x1Jayt9EanY5k34RIMOmcnsP6E1Yzj7FWPUti+3wLrs/oWumNzRVdDzDLDTmATFqFhCBROVWD9LXQfF8PKuCTIYUOwBg+BkkBUd8GqvO33fVya7UywXDmVcv0eWI/KG8rP40JPLQ/hDKr6G8q3+2AJV+aVSRHVrbC2wk0w3uf1AhhOkyrfBOO26TDz8ggA30GFJ1I3TYbVG/e8bzBzDzV3e89S1Rv3FCV8jW7Pd2r7hXUq36tCq0T3Rxb1C+v/Kth6U1qP1eP8PtS/sLaK7YKldVjlZw0UwFqL1ajZ4lxaDNbfqs3zpaWMtVU9lkFaB5VWWUWLB2kdVo/0KJkCrYFKkVW4eJAWQJUfFjbK2n4VsH/snc2O5CAMhPf3SKm1MYYEyPs/5jahe0ryTCtpsWgv1IUZy6dPZafg0vs4Xf1htSlOIedw6nwKz+dw6v2fGZ1TeH0O5xSe5dIpJtL353BOob0fTtl7Yccczik07zRT5nXmctSaIev6ip/r/eqKn+u911rTWOcpfqb38/Qwc0NHepi54cRa01gd1prGMsF0ily6rDWNZbfW3FijraVDAIi4/2GswdYSYB3AKiDVk1JgHW6s0dZSYLE1ueulYy7C8rdPFfdVo5XrMdZoa2VYY2lAVXJfMSBaIw2rQWNhpXtTiVSpHQFGaYCx+m+IGfC+FMCXhxqIDfAx1vptt9rgi3vl0AuwMqiKveHL8LHqONaOW+E4a2UAOFg1Wh7A2nYLt47RRoAvnJVj1Lsy/KJVMR6kns5SObRhFVFHjjzGGav/XStgseZZuXY+w3Kni93It2HjP1WZw3wCq+Md65+/a+W2mnJcCGsxf4moGFismZwg4eEotDM3PvkY8lIGwOI71mhrScDSjtU6q84M1/1R3FC1sPbYVRlY68ldZU+iGAOLxhoYHzYkO1512+yUPtf9Wv0BX4pjbW0NQPmvsBgbRu74Dd5ZWBIqCjFGU3jX+mxN22fzEiwN6wBY3O4DB1E2ILUPVPA3EVH3KFeV6IxDGixb08rqEqyWogjrOdjeA/4uJq2OIRy04yWgwgqglgdFLe1fJnYlLFPTCuAclmQAPu4WVot6KFVHjPFIHdt90CBmADGkPddQHVoqdGyQ/ISnMZYAjqGpNUiE5eMhoJ1Hj+QAcBcSFvMsx3DAEHbkeF5c2pYgBNuRPj58hbBMzcKCUesBAl4u+ExYHdl95CBKWPYvYElZ+SFMuwJpkdpBWKx96axF7tLn+YC8ulfRgYGOHR1DOOyLaGDxUkdYGYnl1mdqhPV+dOBVgR2Dh5CD2A+L+bRBUSy7jQ6sWVj1cIa57GewCD91DeHgL6KAsDghH1bBn+d1SANhmZqB9dmgZ7AUWNjRMYSDB1Hb24gqsKrWP2/VWkc1AIkBHvDlxp3FWjcsCUjs6BvCodFUYbW00FDlV14N060arsEytbdhiYoGLPSVdwTcH0eH3REVSVXlKVVtdalVPimI4/IxtavPyhuTuaLq9lE335aOO+GotcVwMEZi3skymEkDSvkwVkiOPveuY2ENW1vjpZHOeu1B69c3Wf1t185uGwaCIIjO0Z2G8w/TsAX/qyHJosh6IRRmDxK79ZjmlV9geLgWMC8bArrw69Hc8grkfn2BWtv1JM1BGBgOwoA5CAOmVcC0CogLVkC0CohWAdEqIFoFRKuAuTMETKuAaRUYvp0Dvfy/SmrRKiCuDAGztQeGrT3Qy3YVENtVwGxXgV6WYEAswcB8zHDt1PuJsQrMMlYBMVaBXg7BgLlbBVrHTKWuI+plBQZmOQMDPlCudR2dl1QBcwQmvExVwEuqwOg9qTT1iVpcQRNe1l+g9U+9Vl0nMGKnSowolZjXrMfV1Cm1nzxgcteZjZaRSrQfK7Zy15X03Irlnabrmnqs+5qtbpnQPbak/fWX54cke/oYlb4BOpAsA4h+WeAAAAAASUVORK5CYII=)
+	}
+
+	.weixin-tip-img.android::after {
+		width: 173px;
+		height: 240px;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQwAAAFwCAMAAAB6srUbAAAAYFBMVEUAAAAAAABkZWg1OTwAAAAAAAAAAAAAAAA0ODs0ODsiKSw0OTs0ODo2Oz07P0FYWlxDRkhMT1FlZmh/gIFyc3SLjI2bnJ2tra6kpaWUlZXl5OQbIST+/v65ubrX1tfHx8i05zY7AAAACnRSTlMCYqz/GzFKC/335XMVHQAAG3FJREFUeAHs2NtuGjEQh/GKJkpysSd8ruT4/d+y88ljAup6U6k3GPpX6cKKIPxjPGvvj/38z9tTZl/idDpv68dTZd3Op9ONh1I4c17WeXp/okzzupyNE44di00wfj5RBGNTjV2L58LY0cDCMkfU4qk0mCm2aYDxov1i32JqeUgN7Rsvb83ipBa9twufPB6TQzVOVQMM6RdYdOTWjYjHo2pI3/jCWMRinjpstBiyPCrHNIvGAgYWrxvD3G8vUFhjnDH2XzgoMT3cpca6vaIBho6xR+F8jNG7ynGoMd1m9yS5w2vKBeNj2rVoFCFLAhytOPoU8yX6Pj23rvPV4b48+I4fXxjv/fWIj7mU8lmKcKRWHF3geZVsa808Ec5t11nX+2s+74cYWEhZpBhy+awRDi2Og2YrWTSbFgNnzoT/OSwbUONgYLFYZkgRi18SNEqOqbMk0T9h2DUWNcJcs0Zi20E8uHqNgqErkURZVAvlyFFqg9LoXK4tkQEbCRwS+o5zKSXn9GAsHzEKhk4SF0OtC02dKcburtB0XhFnGLarNYCFSz5G75P3UY6JuTYKhv7K2jBuKgOMzlCoJUqAJCfj9s4ZPGzFQMPHEIJo4DkOBr+ycR6MplFbKJcUR5X/URrVT6eClkCiPG4x0BgOg+7JV8+VgxQsdCzrvIsBhIycUcvgJcldY0TRbR8wEMZG98yaUpQiBx7RHWHIP0YesKjrVuPEVSO6Q2L4XACoJI2Cc8Gb83ZQGSDQGqiQ5GiodXpgQeg6g2G4mEubGjkQrZGSjzEoDIbMMwqjWZDIY0yM1inqj1opwIjfY2hlpIoBJKicrhjbaBgsMaoGGLleZeXMX2Bc+qexutMjWACbBsVoSy0pjPbyGAMCICJRjHiDEQbHKFktvsVQC50rrN3PF4zQksCYhsRAg97Ji0MM1ia1JLxzzgcwrGAkxVCNPG5lEDDKFYbvYpgERkyORpF3K0MO42GYmFtl3GKULgZLeFbiPrXKaD0DDWGoiX7IRZdqKEbbrIWkY9nbwsMBhpQIGLfrDI13Fs1ppL2JblmvK0NvadjOtrXduyCeVAyBaYHlstAYadea0CCKQfRm1zZ37iDDobv4GuYJOrqZhcW3fe84N3fa/QzFaE9C7C6mf7NztruN20AU/bH/4mbj1VesBn3/1yx1dKxM4JWUogVMVXMDx/RIDqADcqSQnBuWWdqe+T1+OemHJOT80GFgTAmgZQ60CBi83QbW69fXIqExqZnkXBef+AiX7lDTftCIiybMa5S3wfnL9ZUTZ4XLy3nyX0W88Q4T16KOtFRgl+e2QOb7zqJaWKe+llYQH5eVkyOtm8QMQP7jtbvc6teUTQNxtY0/cSQYZgBwtKTCXRRoXkV7XZXHfhwLhp1jwjGLhbBvXcc3zjkaDHGEkf6E7l0LDLQy0k8IA60M9FPCQIJIGP+VEkbCSBgJI2EkjISRMBLG5eRagZEw/ji9EkZQHCZnZ5E5IxPoLox8zngqjISRMBJGwkgYCSNhJIzXu84OI5ZzA+TEMNyPoARyVhjuVFFxe8bpYFj03HTKCvZ9GvSf7WX80A6Rh1ZFMGDB5mdLtu/eKrsoomLMT6viGFoaVcCgY1jni9j22O0V9Jtmfirzrk4Sy6eoEImtkLergMFeekqei+ZK576VxqYJ2KSQdsFDUEhXj/ObyNwOLRq2wPFUGFbDjxgDuGmcil1tm9ZZsDcwZl2ycENQBhzxd5ERTqVlqKFFmqrAP2MpOYGGld9bFammGZwymk4Ai38GORgwXbfsK0dNR5tTaREya0Pj+f4ZHXW+oUyNyu/1shl9JqiuaBFZ5o2YG4wnFMFXBAqk6baDAVHO4Y+4O7sO/4xYmVW01TUcWb3+CN6DqCkgRgoGwsyqn/AAhOKlvgWLUULDzA/4T4aBsUqs2SuiomrF7cEaFW4/c4WvV0jdijekInuJ1Vt0oFEHAU4traIBpsNIEcPTYcyOO6Gac6ax6jLDdzBjIbkgroWOQcHe0PcTigEKPQCgMR2339iERZFeHT+fCuPVCxNGoEHXWKlDopTrNp0EDPqCda3AuMFgqm4chMGQoFbenkGTEmFx1gCDCyN/Bo8ZHjgoSt2DgYTRRRjW7j3CwEfC7DJGGG11MKCBVopaY28KNOgZDANgDF4mPWO0/rXtJ1iMP8B51tS7dJeoDwY8/qSQExirCfQBRsfVCmOwIppMMdMQBvkFGMNIpMRqhkHq2ILBOJGGpc1zZZcwhgcYiDuQQ0qjoqPD8DnjE8aNpxJKQoGhDQ/DRBhDhMHdBATD9AVhdDXDeF+D4f92jpP7veBNWydi0qBnFEJ0lXHsoTE70pArQs8YK4WB1mHQMwKM9y8wkENgGBgmPqk+wmCYoOqHyft2zgjDJMDgqQMW6GvO6JenLoOkVHhW+pyhtmFYJH2nAYwGhxHk1c9WZv34CYO0Sc7gIHTAoZHgIXsGMOga5fUJYzRVeCtdfIlKY/GX4NGdYN/66BGnDI53awXGiC1EoeFTJVXC3FK1MAsw0KgtojCi5cbxYQy3OG860+ByZdF74QwJYIwBRkHTAePmnbUaGNEO1Efyv/Zg0A1UT9doOnDMjpheb4kS4zXRGIXR6xNpn2GesQoYA/YZaud/E2F8zt0g56+c96ObcJxoF1w1IAW1tpPePPVTyTDBWBpnaX/W/2uNNjNIr4xO51x4NI3znUZLrAS7YKoBNecGdeBw2u/58xk+OUZtOSnpncE1M+HttUzSQuPKCUaBhO6m00yJS0/9qmFCGBgjZpaLuDV649/0zriir4slk3gnSJSYVIiGb/vm+u7TYeCBS6JX47g9XQ0NZesaF9VowoCmwYhKvX42OLEOd2lTG2p7hvV2v339nTxA8zGoZGYjqgrfcVZ7oljn+Wf9ljN3g2Kp2pHeJPjGT+NqHyhOtT8juogEuZB+0s0qDwLFCWG4vS38TMp9oP9KCSNhJIyEkTASRsJIGJfLeUlcLumfERVhpDFAWkYErcJI/4zLiZX+GRv+GT9OrfTPiNqFkTASxkfqY4HxknpJGAkjYSSMhJEwEkbCSBgJI2EkjISRMP4PMD4+EgYcXtgf+zd55rbjNq+D0Yu5Cu3oZMmyyU/S+7/lNuUcnHaS7gLG34tZxYSykqDhAkkZifVfJD9chpBdKmOD6+p/uIzQ8ISLlx8rQ8YZr/D0U2XItaDT5gZg75aZlL+ct7JvyvHpw0ro/0JEfrn+D2Vc1EUNkeswViD6WXWs9EdM9K/XTojIR0c7MdwVWE8kdjLHhJXD4omfPB2xcXi8QyFFXjlNxgygGJGESRpQjbgMYBL6AzNmoSfX1rsrYdFdkQGNNqZIIxciKfD3Dy5LVZqnpXYOQ0pmrHRgf5/PednJUT3fro57J8iQoC5GIZlQEwPIJLQA7N7bEOXCsPKAyCzAMohFvYiY6MYuQ5Xon1jwFJWRSBpqrQxL98XeR52EJDsHGREPMpFkvJJPqowGtCvRZWJ0+hUVYKF3XFpVgPqg10hkxNG37K4UkehFBjXc8ELS2BEtKoNHXXQZIXYyco9d22DGgjCMo9+wFdF7bTbnfWAO256bMeveGTJ6YQQh8m1mKGx12zLY0RvGyhsAP9lbIyTeKb/JWNGmNE8bA6mMaENRGQjBli5jrHhFtZX9/ykkG9TgHzPDMF9lY8J02szIQCPlKhM6tWsun6aGMeYroTpjfIpXszFo3iLUWqsVyL/KGAo7SRxvM6Oh4++Lm4xZaWg9sspYtIlqXW4V2V/YURlGo8qgc2SMDVily5gylF2CJKDQe2So+jqxyEI7c41ELrq+91tlfHmhdO89iWsnhW3RSlpNl8G00WfGLsz3WDT+FzLEsyYvQlRwp6iM0EvkLaFoqkcZlwXIY0ShgPkpY2yzUJmlY+stsfGyQR51IM/V0ZWeMlYk+oMMEVEZX482ETlDhgWQxDma8KD3vwfYC72jAVYOMpTI7KhgSpjuMpQQw4N5z9PyDnB/iPJRhnmRcbUbERy24GfMGs6Q0Q9WKnXBkyBEZPZO/h6xjJWccyaiGI37bujVW2GfMsQxDkw9P99aKRXgBnAprbWwyzgcrQcZqbSjDIn4jfp1kgy2RxW3U8R9kCGmAjbgSX3cOMukVy8yOKU053V7zEhye6GdKjhIAierDnqbOPU6Y+1+uwwhWwG08VgZdtloqMse2/aYLie1CUrgowzTn/jQJtemptyS81LAW8iJFLuY3kH5VUYlkcRBRALSnkypALITolCBWuaoMsAKcIsqY+0qwkhHGaIErKLE82bGXsQ5NDyJRIOJ0On2LTKjt8LrAO3dPvVDuY6vMkbdjNIVdRkMbsmL9BqJmYHSZVSFwT12GQ3M354mtGCSk49WalAmsplxg1urZYGm+T2+2ILwm4xRDfXGS7/IEKoI5iGDzMxNR0WkpbXSKk++z4zrMAyXGeu4RWpamTaM5VsZV53WJ8uQBYrVLp4rnjAQhd7SfpOhazZiKgp4DJiOMjy4wT5kSELvg5V4X/QcY3y5z/DhokG+lSETCp0uwwK36SAyhsIHHVf6KxmUsQhlNMqYyI3jLsOUrF2yaCKhRjFjTzia66Qy2DlT7qPgeLTqpfKtDDGMIGfL0BT6LCNFqOFBoo8yrCgqQ9nvTKysKjagqVq0W1JmBvs9EfE8q4zeUF2GiCz3HI8ylFcZQg8ZlFGITpchnrHB8TBPO3X4LCM1pYJ7SL0mhgUchGhy12B8l2GcDkiOWktEl8uCtctoeWkqAznn+l6Gd1/tJsMYX2/LIavzU2U81CqrqPqMGz2pzzL4yKwegwXHRxkzContdosVKl1bPyNUhtJlKO9lzGA8br4AvpBS+sc7XYYyY6OQkJnxIAp9Ym7WuAMDUVhGmh5ZpVabJXGt5cmRENlSlRJ7BjU6N9WJSvPezdUfZCSeDiOt1bruy9hai9SZ2u6ib9d4pozdRk5z/buvx+Xw7yPy6dtk0cURY6//9HeTyHihWfqHCP1TGeKWg466XuVn/9ZqplJ5o+b/sXPHJgCAMBQFC5soIaRw/1l1DMHLCNfm8/al8IXP6q5cr1PYZ8CAAQMGDBgwYMCAAQMGDBgwYMCYMfLrC2UVmRkYMGDAgAHjsHc2vW3zQBA+9GykDh2GOhT9//+ynn12sAJYBe5pcyjfAytaMqxHsx9i8GI6YdwY/2GUrcc/0ADdhQvQjvZixdN3giHDFw1ovIZC6JIhIOuwVgpDnePVPGb6NjBwiXuOF63MENLJFQyQeXg/rxQgLxW2PCzXsH4Y3BqOeTj+vcQijdDKFU5HPrzbWq54aYUlGPAF5cHW7Za1GUu+6lOPkjAVtNGWffPKPjBWzIsPtAQSvkD/TB++fh+18l/Ep/0jTPW2fHetJFtMppNk+UrmSvEKq7ZhbpIOUmSyPVczDJ4zxuafM6VxyndXwggMOJLGsOHoETbXrGopfTp13tRZQBKiMbhE9MrDrh+GhCEjyvUR3pMicemHWDB0Y+HaODXKlxeLc7yNi9cs22t7IKfdL36//a6c5eUtx1akgYnkF06Zt4Ihw+oY2OGPoxzBxQRXYxv5LqjZvfZAQUFPS/1+rRUl4UuqrJHJjeDeaegCpQzEf2B+Dgx7YBeOhGGXy9KQvdCT3pLlb7v7t6PEP0op9Mki810+rouUEVLA2hQYuKP/hobs84FBnJx9wQcs1nHgmvtLubtdGa6rz7soR3J7lhLdWyRTS3QKynBIAEP/H2IpQ87PxiEYeGOL0KF/yyQ/LhC19/acUbVkSe8RJzh7o2gX2w1GuFlfwdCxYSjiRCNPXWn+Lfrzubo+JaWVftf9MIiSNfVrl+y6HeYSsopt/UbjAwZ3SJisChOFWy7b8Fo4gBEawEg5YEzCk36vGwbCmPHLAol9ynmUZNQNRkTSDoMEGjDmImeoigLDwggY4I/rbbL/Box2W+NjGUZI4+GyGYc7jJRGwSAxjhHfIBY5FGag4CNggJtiMgMRJ34D92+ajMxmyJiUx88/BjD2cqI4we/fPQWPXwMWdFNCK2qiFGoYD9qMNakwqatHd2l1+rSyaTUyTHRMG7YXV2AcCEMjYWiBJXegmT75cgqrswYDGJZGLwxacbSteVEk4ka/huEHmzA+3G0axiRKREPrWhQeXukKBueGNFphOEpQMDA+5xEKfgHGOo+CMYmVFAbvpSMT0vCLfF7u5sM+9J0w6oWVAK7sp+z4FYw3w+DCEwwnRWCwy0HGpLiw9xOXo7+VwfPeqwyihLxJ/eCZcqxqcgGDeuz7QA7AmFZGPm32LoChnpvNLlWjYyqZxhU40ffmDEfJihqikgoNUoCryQWM95EdOy9svMIbxgoWCeMnMLKfzT0/XR5Bw8x2V2c14QkP9KtXdiWChEHOECUiee/IVYCpDHRpI/vMHOJ0giF0bjNvkXOcSZnv7HX9aIWBXvXIEG9tUBAFNF0Xm6APdu58R1RRD0lGH2vTl0/cStC1xbX6lpjZS2+FgV55OZV61WV780Gz2+S/b497J1x3pBqhiTFyRvwCBzeyAizfAkH9jaJ7Q9hyZy8h3zk0/GTHVV+Yf/eIbAiXoCKV6D9NoALynQVYBA1dy2fMRtFaTbxlTyjr6Dn8XL3XdfUntT/sm0FqxDAMRQ/Qeeqi97/rdGJ/EWPHdFMw6L+dlBiGZwgD+hJ9HNfmIw2NRSKAaP2rGIdQfA7HGUMkiPyZWX1/0ITj+ROPkBdigZ6ruLvUYQ4ZL+qKIKuLdq1/nfyxQS+oEFkeNHimkxXTzVaKJMw3NuDkzn9gGZZhGZZhGZZhGZZhGZZhGV/FeZJhGa/i3GW8yrOWYRn+ZixlWIb/Z1iGZViGZViGZViGZVjGATIQc6uaDIgO4t4qJUMhI61la5Gz9SIoJIPoQa4eWuoafqtcyy4jA3ItsyXcLxFaU96uVzIwdzchJzVvjw+QoeBzW87LvO+P4uCbcDss0k4wdsZeAjCG397UnV1u5CAQhI+wmsxPQiRn7n/L3eqPz3glL9I+2e4XoM08dE0HcDNVcfbBYAxSK6QIqXXxyNf7t/yIghkVT60/eo1VH7ZKRjhlTjQ/gmKxvMugCoVooWNQ1HaXGn8Ii1QGPyS9lVPtDH0lDqFtZDNkmt9E42gw2uf7BwslNUTTdbxHURucvQ9/Ip024Yy1+IOQ9WFDaiPIpAlOW6L54WDcX8v7J//ypsJfloxq/P1ntEs3kbKXKFx8/ZF4OdXEYHtKuBD3uklPCmqdO83nTwLGd1nlRvLC4Q4YJIYyCZL7Vi4F0FTEMVhHYMBMWCjBgAYRBXUBDgbjQzBE470ZLV/7YMA/GPoXhUZSHuKJKioSMMoLEq11Gl/H617UYrnwZwODv5kZGDIzCoTnCwJrdmEVQmBD+xexYaG0AkPSM/zWZ5Fq3cVPlxlzMCRmhHP2ChZy8ypAQhUoo34KhiSWoAAYnQn9apI5rgWG/KUv+NuyNiV1FxiQQTutdWQFlJ7WSdV3KZ6mxu149uJ/g0FiQHEMGAvc3UdRXQHjtfKdJc3Ddy2IVOIBDEmwUe64HBgqWSn58CXbOYthObOolpM99K7+EKzeDCA8qjajesL1wHD5bMYNGDk2DTBgyrrBSJoXDOnAvcEtF/5ia4ZgZD8kzWHvdn676RLfDTCQhkCvSgGiLRjoslxyAR2byRaMnLBrMwEM1Hv+BkMZCci9gsGDhgDRVXeTJ8pcCUYwslF69sAVX4HRVjDcWvtRRPEZj6AXPWe0WjIaYPCe0XnNAQoOdVVHWmxIWAkGMxv+8h2/ZvyankAnugA9CQADUcNOcA9E6Aw9MhAMidT1zM9X6cTUOBcYZoaDCRj3CkYJK/bWDgYJ8khL8nQStXgAxrq8qGx1BjCsZxh/Bulm8PmynrFLoW/NQDl6P7Zg9NdUMmOkB3pXlRmgiczMKcCw0mU5J2a/Kl0TMNRCaKoX8tJKpPUgmKSBTV6hkwTBzc9yRheMM9RAASGlPjrpLbs1UM+gfOPqYPqm1hvShvwoIJRlqgWUd1nwiVVzPBhuk1SAA4DN7Ihc2wkR8Boe49x1p6l0UDHVawiENlDXQTeBMhmtC+jx9ybIKH1qijPu7f1CmAgQvjWWFDbj8CYGEKyRIi3BVIqfeSZMCkqc4UZN+T03B+LYvVFTETTBEGR6NVlR6XhG6Rdfr4QzMwMr68CkiMbxd61EodqvWT25a1UEoqakZ7ib+r/K2vi8I2GqQhPeKTjpeKXYftXsvaJAzIRf+keYsulheHDqwpzqCLN7BnVptRFUjvGrm12BekHYbfTsGKa2Bb4Px3y6x+uOa35vZVMgtN/t3dHOlDAQxfEsF6vmS7cW4/u/qk5z+NMGC1yZTpijCSzGi/522l02MLRjZJethUEf/hdhn0yAgQclEdd0/a9yjQvcAiMwAiMwAiMwAiMwAiMwAuPr0YlmIm2iZUS0jAiMy/RrxrMton9G9M8YJDACIzACIzACIzACIzACIzDikgRXGPu1VYGxXcd0pUEVsTMsMn8YWKjJwR2NpJDDQdpiOMVQk4MbV+r2Dw7TuHVQm61DhjsMLNTf4HOhsV/RuXcq4hj9i9RVwxkGLTG4tPsKg6t7S2muHNUx2+Qa0/CIwcMGz3tZAGfDVdsmPUmwb7ayZh12iEFh/L4ujcTqUiksddj0k9HB1ScGK8avO6WR6B3DsFcwWqBcHGJQGDcxdFfGSlqMIgyfawbjMwz7ywfKOYZp5K08bNwdRtOkyRlGEoYyLg0wTKNaaGJkfbRwM06WhkMMLLhValAa0Akjqxb0MQJGXvnIdYaRwFgtV32zkkpDDbn4TlG2ytDk8VgZPHO5WuR7GHpSMemmiUVfM9xhpHZFzFlbNEaVAcOGYUKloMEs8YXB9wZhWG5ioKF783oMZ+cmFEaWhTQ038/O9bVa6k/hJsTKIaCPYwy+JjBPxpVhAEou3ZmaDmZvZ60shyx5WXt6XwcY+wmq8lMYWEA0MUZK18vh6YzHzwCkoVEzT2Ca7+edlHaMw/BYAQRgYfcEY28J2xRGfSml6dpT8zaCwfgONQ+FVj+tiacYaOz3Pit9N9ypLAoYudeg5P8dxnJSGYowMGhu9J7MIoPBGdgIo98/wfgwMxi+biKf9Bn7nIKBsXQavMtMfUX7Y4zUjVgby747q8UCxls/VaRjw4Njxm0SGKsIxplqjtTGKW/DUGn0GoyL9JU+Gs1w4OxpO53FIotaGqbRraIU9zEMx334lWJ57xho2LrxZRHHuMoHN7EQvdZ2D/80QWy9wEIYtTRMwzC+PyqGYRa1MIRRNV6LlcaPR8UKY3lVC8NAwzieGKPYLNAwjifGKLBAwzgeF5NoLOD462EiD8u3AwUeD0xPECF/AOs1Ff6YfFsmAAAAAElFTkSuQmCC)
+	}
+</style>
diff --git a/pages/mainPages/payment/payment.vue b/pages/mainPages/payment/payment.vue
new file mode 100644
index 0000000..6220190
--- /dev/null
+++ b/pages/mainPages/payment/payment.vue
@@ -0,0 +1,895 @@
+<template>
+	<scroll-view class="payment" :scroll-y="true" :scroll-x="false" :style="{ height: phoneHight }">
+		<view class="paymentPackage">
+			<view class="surplusTime" v-if="payInfo.sytime !== 0">
+				<span>支付剩余时间 {{ time }}</span>
+			</view>
+			<view class="price">
+				<span>
+					￥
+					<span>{{ payInfo.price }}</span>
+				</span>
+			</view>
+			<view class="goodsInfo">
+				<span>{{ payInfo.goodname }}</span>
+			</view>
+
+			<!-- 选择支付方式 -->
+			<view class="paymentTypePackage">
+				<view class="paymentTypeList" @click="checkPay(1)" v-if="payInfo.credit == 1 && !payInfo.diy_userInfo">
+					<view class="imgPackage"><image :src="imgfixUrls + 'merchant/balancePay.svg'" /></view>
+					<view class="inputPackage">
+						<view class="inputPackageMain">
+							<view class="inputPackageLeft">
+								<view class="inputPackageLeftTitle">{{ textSubData.moneytext }}支付</view>
+								<view class="inputPackageLeftBody">账户余额：￥{{ payInfo.balance }}</view>
+							</view>
+							<view class="inputPackageRightCheck" v-if="type == 1"><image :src="imgfixUrls + 'merchant/payCheck.svg'" /></view>
+							<view class="inputPackageRight" v-if="type !== 1"></view>
+						</view>
+					</view>
+				</view>
+				<view class="paymentTypeList" @click="checkPay(4)" v-if="payInfo.diy_userInfo">
+					<view class="imgPackage"><image :src="imgfixUrls + 'merchant/balancePay.svg'" /></view>
+					<view class="inputPackage">
+						<view class="inputPackageMain">
+							<view class="inputPackageLeft" style="flex: 1;">
+								<view class="inputPackageLeftTitle">
+									兑换券抵扣
+									<text style="padding: 0 10upx;">:</text>
+									可用兑换券金额
+									<text style="padding: 0 10upx;color: #EF4740;font-weight: 700;">{{ payInfo.balance }}</text>
+									<text style="padding: 0 10upx;">
+										(可抵用
+										<text style="padding: 0 10upx;color: #EF4740;font-weight: 700;">{{ payInfo.diy_userInfo.dkprice }}</text>
+										元)
+									</text>
+								</view>
+								<view class="inputPackageLeftBody dis-flex" style="color: #333333;">
+									<view >{{ payInfo.diy_userInfo.dhtip2 }}</view>
+
+									<view class="conversion" @click.stop="goduurUrl(payInfo.diy_userInfo.dhurl)">
+										去兑换
+										<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+									</view>
+								</view>
+							</view>
+							<view class="inputPackageRightCheck" v-if="type == 4"><image :src="imgfixUrls + 'merchant/payCheck.svg'" /></view>
+							<view class="inputPackageRight" v-if="type !== 4"></view>
+						</view>
+					</view>
+				</view>
+				<view class="paymentTypeList" @click="checkPay(2)" v-if="payInfo.wechat == 1">
+					<view class="imgPackage"><image :src="imgfixUrls + 'merchant/wechatPay.svg'" /></view>
+					<view class="inputPackage">
+						<view class="inputPackageMain">
+							<view class="inputPackageLeft">
+								<view class="inputPackageLeftTitle">微信支付</view>
+								<view class="inputPackageLeftBody">微信支付，安全快捷</view>
+							</view>
+							<view class="inputPackageRightCheck" v-if="type == 2"><image :src="imgfixUrls + 'merchant/payCheck.svg'" /></view>
+							<view class="inputPackageRight" v-if="type !== 2"></view>
+						</view>
+					</view>
+				</view>
+				<view class="paymentTypeList" @click="checkPay(5)" v-if="payInfo.yunpay == 1">
+					<view class="imgPackage"><image :src="payInfo.yunset.logo?payInfo.yunset.logo:imgfixUrls + 'merchant/wechatPay.svg'" /></view>
+					<view class="inputPackage">
+						<view class="inputPackageMain">
+							<view class="inputPackageLeft">
+								<view class="inputPackageLeftTitle">{{payInfo.yunset.title}}</view>
+								<view class="inputPackageLeftBody">{{payInfo.yunset.desc}}</view>
+							</view>
+							<view class="inputPackageRightCheck" v-if="type == 5"><image :src="imgfixUrls + 'merchant/payCheck.svg'" /></view>
+							<view class="inputPackageRight" v-if="type !== 5"></view>
+						</view>
+					</view>
+				</view>
+				<view class="paymentTypeList" @click="checkPay(3)" v-if="payInfo.alipay == 1">
+					<view class="imgPackage"><image :src="imgfixUrls + 'merchant/payPal.svg'" /></view>
+					<view class="inputPackage1">
+						<view class="inputPackageMain">
+							<view class="inputPackageLeft">
+								<view class="inputPackageLeftTitle">{{examineing==0?'支付宝账号':'渠道1'}}支付</view>
+								<view class="inputPackageLeftBody">简单、安全、快速</view>
+							</view>
+							<view class="inputPackageRightCheck" v-if="type == 3"><image :src="imgfixUrls + 'merchant/payCheck.svg'" /></view>
+							<view class="inputPackageRight" v-if="type !== 3"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 选择支付方式 -->
+			<!-- 混合支付提示 -->
+
+			<!-- 提交支付 -->
+			<view class="paySubmitPackage" :style="{ marginTop: payInfo.diy_userInfo ? '0' : '100upx' }">
+				<view class="t-c" style="padding-top: 70upx;padding-bottom: 200upx;" v-if="payInfo.diy_userInfo">
+					<view class="t-c f-24" style="color: #E44131;">实付款</view>
+					<view class="f-w" style="color: #E44131;padding-top: 10upx;">
+						<text class="f-38" style="padding-right: 10upx;">¥</text>
+						<text style="font-size: 60upx;" v-if="type == 2 || type == 3">{{ payInfo.price }}</text>
+						<text style="font-size: 60upx;" v-if="type !== 2 && type !== 3">
+							{{ Math.round((Math.abs(parseFloat(payInfo.diy_userInfo.dkprice) - parseFloat(payInfo.price)) + Number.EPSILON) * 100) / 100 }}
+						</text>
+					</view>
+					<view class="f-24" style="color: #999999;padding-top: 10upx;" v-if="type == 2 || type == 3">总价:¥{{ payInfo.price }},兑换券抵扣:0.00</view>
+					<view class="f-24" style="color: #999999;padding-top: 10upx;" v-if="type !== 2 && type !== 3">
+						总价:¥{{ payInfo.price }},兑换券抵扣:¥{{ payInfo.diy_userInfo.dkprice }}
+					</view>
+				</view>
+				<view class="paySubmit" @click="goPay"><span>确认支付</span></view>
+			</view>
+			<!-- 提交支付 -->
+		</view>
+	</scroll-view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			time: '',
+			type: 1,
+			orderid: '',
+			payInfo: {},
+			plugin: '',
+			types: null,
+			phoneHight: null,
+			deliverystring: null,
+			img: '',
+			pageName:'',
+			examineing:1
+		};
+	},
+	onLoad: function(option) {
+		let _this = this;
+		_this.img = this.imgfixUrl;
+		let TextSubstitution = uni.getStorageSync('TextSubstitution');
+		this.examineing = TextSubstitution.examineing || 0;
+		//option为object类型，会序列化上个页面传递的参数
+		this.orderid = option.orderid;
+		this.plugin = option.plugin;
+		this.deliverystring = option.deliverystring;
+		this.init();
+		if (!!option.types) {
+			this.types = option.types;
+		}
+		if(!!option.page){
+			this.pageName = option.page
+		}
+		 // #ifdef APP-PLUS
+		            uni.getProvider({
+		                service: "payment",
+		                success: (e) => {
+		                    console.log("payment success:" + JSON.stringify(e));
+		                    let providerList = [];
+		                    e.provider.map((value) => {
+		                        switch (value) {
+		                            case 'alipay':
+		                                providerList.push({
+		                                    name: this.examineing==0?'支付宝':'渠道1',
+		                                    id: value,
+		                                    loading: false
+		                                });
+		                                break;
+		                            case 'wxpay':
+		                                providerList.push({
+		                                    name: '微信',
+		                                    id: value,
+		                                    loading: false
+		                                });
+		                                break;
+		                            default:
+		                                break;
+		                        }
+		                    })
+		                    // this.providerList = providerList;
+							console.log('providerList',JSON.stringify(providerList));
+		                },
+		                fail: (e) => {
+		                    console.log("获取支付通道失败：", e);
+		                }
+		            });
+		            // #endif
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+	},
+	onShow() {
+		// #ifdef H5
+		// let url = location.href;
+		// if(url.indexOf('/#/')){
+		
+		// }
+		//#endif
+	},
+	methods: {
+		goduurUrl(url) {
+			// #ifdef H5
+			let locations = window.location.href;
+			let urls = url + '&backurl=' + encodeURIComponent(locations);
+			console.log(urls);
+			// location.href();
+			location.href = urls;
+			//#endif
+			//#ifndef H5
+			let pages = getCurrentPages();
+			let pageObj = pages[pages.length - 1];
+			let wxurl = pageObj.route + '?orderid=' + pageObj.options.orderid + '&plugin=' + pageObj.options.plugin;
+			let urls = url + '&backurl=' + wxurl;
+			console.log(urls);
+			uni.navigateTo({
+				url: `/pages/subPages/webview/webview?urlsrc=${encodeURIComponent(urls)}`
+			});
+			//#endif
+
+			url = encodeURIComponent(url);
+			// App.navigationTo({
+			// 	url: `pages/subPages/webview/webview?urlsrc=${url}`
+			// })
+		},
+		init() {
+			let _this = this;
+			_this.getOrderInfo();
+		},
+		checkPay(type) {
+			let _this = this;
+			// if (_this.type == 4 && type == 2) {
+			// 	_this.type = 5;
+			// } else if (_this.type == 2 && type == 4) {
+			// 	_this.type = 5;
+			// } else if (_this.type == 5 && type == 4) {
+			// 	_this.type = 2;
+			// } else if (_this.type == 5 && type == 2) {
+			// 	_this.type = 4;
+			// } else if (_this.type == type) {
+			// 	uni.showToast({
+			// 		title: '请选择至少一个支付方式',
+			// 		icon: 'none'
+			// 	});
+			// } else {
+			// 	_this.type = type;
+			// }
+			if (_this.type == type) {
+				uni.showToast({
+					title: '请选择至少一个支付方式',
+					icon: 'none'
+				});
+			} else {
+				_this.type = type;
+			}
+		},
+		// 获取订单信息
+		getOrderInfo() {
+			let _this = this;
+			let data = {
+				orderid: _this.orderid == '0' ? '' : !_this.orderid ? 1645 : _this.orderid,
+				plugin: _this.plugin || 'wlfightgroup',
+				deliverystring: _this.deliverystring
+			};
+			App._post_form('&p=pay&do=getOrderInfo', data, res => {
+				_this.payInfo = res.data;
+				if (!!res.data.diy_userInfo) {
+					_this.type = 5;
+				} else {
+					if (res.data.wechat == 0) {
+						if (res.data.credit == 0) {
+							_this.type = 3;
+						} else {
+							_this.type = 1;
+						}
+					} else {
+						_this.type = 2;
+					}
+					
+				}
+				if(res.data.wechat == 0 && res.data.yunpay != 0 && res.data.credit == 0 && res.data.alipay == 0){
+					_this.type = 5;
+				}
+				if (res.data.sytime !== undefined && res.data.sytime != 0) {
+					let timeClock = setInterval(function() {
+						_this.payInfo.sytime--;
+						_this.time = _this.payInfo.sytime;
+						var min = Math.floor(_this.time % 3600);
+						_this.time = Math.floor(_this.time / 3600) + ':' + Math.floor(min / 60) + ':' + (_this.time % 60);
+						if (_this.payInfo.sytime == 0) {
+							clearInterval(timeClock);
+						}
+					}, 1000);
+				}
+				if (res.data.sytime == 0) {
+					_this.time = '00:00:00';
+				}
+			});
+		},
+		// 跳转支付
+		goPay() {
+			let _this = this,
+				payInfo = _this.payInfo,
+				pay_type = _this.type,
+				pay_title = pay_type === 1 ? _this.textSubData.moneytext : pay_type === 2 ? '微信' : pay_type === 4 ? '余额支付' :pay_type === 5?'银联云收单':_this.examineing==0?'支付宝':'渠道1',
+				source = App.getClientType(),
+				payData = {
+					order_no: payInfo.tid,
+					name: payInfo.goodname,
+					pay_type: pay_type === 4 ? 1 : pay_type
+				};
+			if (pay_type === 1) {
+				uni.showModal({
+					title: '温馨提示',
+					content: `确认使用${pay_title}方式付款`,
+					success(res) {
+						if (res.confirm) {
+							uni.showLoading({
+								title: '正在处理...'
+							});
+							App._post_form(
+								'&p=pay&do=requestPay',
+								payData,
+								res => {
+									if (_this.types == 1) {
+										if(_this.pageName == 'postDetails'){
+											App.showSuccess('支付成功', () => {
+												uni.navigateBack({
+												    delta: 1
+												});
+											});
+											
+										}else if(_this.plugin == 'mobilerecharge' && !_this.pageName){
+											App.showSuccess('支付成功', () => {
+												App.navigationTo({
+													url: 'pages/subPages2/voucherCenter/phoneOrders',
+													navType: 'rediRect'
+												});
+											});
+											
+										}else{
+											App.navigationTo({
+												url: 'pages/mainPages/successRelease/successRelease?id=' + res.data.tieziid
+											});
+										}
+									} else {
+										if (pay_type === 1 || pay_type === 4) {
+											if (res.data.status === 1) {
+												App.showSuccess('支付成功', () => {
+													App.navigationTo({
+														url: 'pages/subPages/paySuccess/paySuccess?tid=' + payInfo.tid + '&plugin=' + _this.plugin,
+														navType: 'rediRect'
+													});
+												});
+											} else if (res.data.status === 2) {
+												payData.pay_type = 2;
+												payData.blendflag = 1;
+												App._post_form(
+													'&p=pay&do=requestPay',
+													payData,
+													res => {
+														_this.wechatPayment(res.data, source);
+														uni.hideLoading();
+													},
+													fail => {
+														// debugger
+														console.log(fail.data.data.neworder)
+														if (fail.data.data.neworder && fail.data.data.neworder != '') {
+															console.log(_this.payInfo.tid,fail.data.data.neworder)
+															_this.payInfo.tid = fail.data.data.neworder;
+															
+														}
+														uni.hideLoading();
+													}
+												);
+											} else {
+												if(_this.plugin == 'mobilerecharge'){
+													App.showError('支付失败', () => {
+														App.navigationTo({
+															url: 'pages/subPages2/voucherCenter/voucherCenter',
+															navType: 'rediRect'
+														});
+													});
+												}else{
+													App.showError('支付失败', () => {
+														App.navigationTo({
+															url: 'pages/subPages/orderList/orderList?type=0',
+															navType: 'reLaunch'
+														});
+													});
+												}
+											}
+										}
+									}
+									uni.hideLoading();
+								},
+								fail => {
+									// debugger
+									console.log(fail)
+									if (fail.data.data.neworder && fail.data.data.neworder != '') {
+										console.log(_this.payInfo.tid,fail.data.data.neworder)
+										_this.payInfo.tid = fail.data.data.neworder;
+									}
+									if(fail.data.message == '余额不足'){
+										App.navigationTo({
+											url: 'pages/subPages/balance/balance'
+										});
+									}
+									uni.hideLoading();
+								}
+							);
+						}
+					}
+				});
+			} else if (pay_type === 4) {
+				uni.showLoading({
+					title: '正在处理...'
+				});
+				App._post_form(
+					'&p=pay&do=requestPay',
+					payData,
+					res => {
+						if (_this.types == 1) {
+							console.info(111111);
+								if(_this.pageName == 'postDetails'){
+									App.showSuccess('支付成功', () => {
+										uni.navigateBack({
+										    delta: 1
+										});
+									});
+									
+								}else if(_this.plugin == 'mobilerecharge' && !_this.pageName){
+									App.showSuccess('支付成功', () => {
+										App.navigationTo({
+											url: 'pages/subPages2/voucherCenter/phoneOrders',
+											navType: 'rediRect'
+										});
+									});
+									
+								}else{
+									App.navigationTo({
+										url: 'pages/mainPages/successRelease/successRelease?id=' + res.data.tieziid
+									});
+								}
+						} else {
+							console.info(22222);
+							if (pay_type === 4) {
+								if (res.data.status === 1) {
+									App.showSuccess('支付成功', () => {
+										App.navigationTo({
+											url: 'pages/subPages/paySuccess/paySuccess?tid=' + payInfo.tid + '&plugin=' + _this.plugin,
+											navType: 'rediRect'
+										});
+									});
+								} else if (res.data.status === 2) {
+									_this.type = 5;
+									payData.pay_type = 2;
+									payData.blendflag = 1;
+									App._post_form(
+										'&p=pay&do=requestPay',
+										payData,
+										res => {
+											_this.wechatPayment(res.data, source);
+											uni.hideLoading();
+										},
+										fail => {
+											// debugger
+											console.log(fail.data.data.neworder)
+											if (fail.data.data.neworder && fail.data.data.neworder != '') {
+												console.log(_this.payInfo.tid,fail.data.data.neworder)
+												_this.payInfo.tid = fail.data.data.neworder;
+											}
+											uni.hideLoading();
+										}
+									);
+								} else {
+									if(_this.plugin == 'mobilerecharge'){
+										App.showError('支付失败', () => {
+											App.navigationTo({
+												url: 'pages/subPages2/voucherCenter/voucherCenter',
+												navType: 'rediRect'
+											});
+										});
+									}else{
+										App.showError('支付失败', () => {
+											App.navigationTo({
+												url: 'pages/subPages/orderList/orderList?type=0',
+												navType: 'reLaunch'
+											});
+										});
+									}
+								}
+							}
+						}
+					},
+					fail => {
+						console.log(fail.data.data.neworder)
+						if (fail.data.data.neworder && fail.data.data.neworder != '') {
+							console.log(_this.payInfo.tid,fail.data.data.neworder)
+							_this.payInfo.tid = fail.data.data.neworder;
+						}
+						uni.hideLoading();
+					}
+				);
+			} else {
+				uni.showLoading({
+					title: '正在处理...'
+				});
+				console.log('进来了',JSON.stringify(payData))
+				App._post_form(
+					'&p=pay&do=requestPay',
+					payData,
+					res => {
+						if (pay_type === 2 || pay_type === 5) {
+							console.log('进来了')
+							_this.wechatPayment(res.data, source);
+						}
+						if (pay_type === 3) {
+							_this.aliPayment(res.data);
+						}
+						uni.hideLoading();
+					},
+					fail => {
+						// debugger
+						console.log(fail)
+						if (fail.data.data.neworder && fail.data.data.neworder != '') {
+							_this.payInfo.tid = fail.data.data.neworder;
+						}
+						uni.hideLoading();
+					}
+				);
+			}
+		},
+		/**
+		 * 渠道1H5支付
+		 */
+		aliPayment(result) {
+			console.log(result);
+			let base64 = new this.$util.Base64(),
+				param = base64.encode(result);
+			App.navigationTo({
+				url: 'pages/mainPages/payment/pay?goto=' + param
+			});
+		},
+		/**
+		 * 微信H5支付
+		 * @param {Object} result 支付信息
+		 * @param {String} clientType 支付平台
+		 */
+		wechatPayment(result, clientType) {
+			console.log(result, clientType);
+			let _this = this,
+				payment = result;
+			if (clientType === '2') {
+				location.href = payment;
+			} else if (clientType === '1') {
+				// #ifdef H5
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest',
+					{
+						appId: payment.appId, //公众号名称，由商户传入
+						timeStamp: payment.timeStamp, //时间戳，自1970年以来的秒数
+						nonceStr: payment.nonceStr, //随机串
+						package: payment.package,
+						signType: payment.signType, //微信签名方式：
+						paySign: payment.paySign //微信签名
+					},
+					res => {
+						if (res.err_msg == 'get_brand_wcpay_request:ok') {
+							// 使用以上方式判断前端返回,微信团队郑重提示：
+							//res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+							//支付成功
+							if (_this.types == 1) {
+								if(_this.pageName == 'postDetails'){
+									App.showSuccess('支付成功', () => {
+										uni.navigateBack({
+										    delta: 1
+										});
+									});
+									
+								}else if(_this.plugin == 'mobilerecharge' && !_this.pageName){
+									App.showSuccess('支付成功', () => {
+										App.navigationTo({
+											url: 'pages/subPages2/voucherCenter/phoneOrders',
+											navType: 'rediRect'
+										});
+									});
+									
+								}else{
+									App.navigationTo({
+										url: 'pages/subPages/paySuccess/paySuccess?tid=' + _this.payInfo.tid,
+										navType: 'rediRect'
+									});
+								}
+							}else{
+								App.navigationTo({
+									url: 'pages/subPages/paySuccess/paySuccess?tid=' + _this.payInfo.tid,
+									navType: 'rediRect'
+								});
+							}
+							
+						} else {
+							//支付失败
+							if(_this.plugin == 'mobilerecharge'){
+								App.showError('支付失败', () => {
+									App.navigationTo({
+										url: 'pages/subPages2/voucherCenter/voucherCenter',
+										navType: 'rediRect'
+									});
+								});
+							}else{
+								App.showError('支付失败', () => {
+									App.navigationTo({
+										url: 'pages/subPages/orderList/orderList?type=0',
+										navType: 'reLaunch'
+									});
+								});
+							}
+							
+						}
+					}
+				);
+				// #endif
+			} else if (clientType === '3') {
+				// #ifndef H5
+				console.log('payment',JSON.stringify(payment));
+				let payRequestData = {
+					timeStamp: payment.timeStamp,
+					nonceStr: payment.nonceStr,
+					package: payment.package,
+					signType: 'MD5',
+					paySign: payment.paySign
+				};
+				uni.requestPayment({
+					provider: 'wxpay',
+					...payRequestData,
+					success(res) {
+						uni.hideLoading();
+						console.log('支付成功', res);
+						//支付成功
+						if (_this.types == 1) {
+							if(_this.pageName == 'postDetails'){
+								App.showSuccess('支付成功', () => {
+									uni.navigateBack({
+									    delta: 1
+									});
+								});
+								
+							}else if(_this.plugin == 'mobilerecharge' && !_this.pageName){
+								App.showSuccess('支付成功', () => {
+									App.navigationTo({
+										url: 'pages/subPages2/voucherCenter/phoneOrders',
+										navType: 'rediRect'
+									});
+								});
+								
+							}else{
+								App.navigationTo({
+									url: 'pages/subPages/paySuccess/paySuccess?tid=' + _this.payInfo.tid,
+									navType: 'rediRect'
+								});
+							}
+						}else{
+							App.navigationTo({
+								url: 'pages/subPages/paySuccess/paySuccess?tid=' + _this.payInfo.tid,
+								navType: 'rediRect'
+							});
+						}
+					},
+					fail(res) {
+						uni.hideLoading();
+						//支付失败
+						if(_this.plugin == 'mobilerecharge'){
+							App.showError('支付失败', () => {
+								App.navigationTo({
+									url: 'pages/subPages2/voucherCenter/voucherCenter',
+									navType: 'rediRect'
+								});
+							});
+						}else{
+							App.showError('支付失败', () => {
+								App.navigationTo({
+									url: 'pages/subPages/orderList/orderList?type=0',
+									navType: 'reLaunch'
+								});
+							});
+						}
+					}
+				});
+				// #endif
+				//#ifdef APP-PLUS
+				//#endif
+			}
+		}
+	},
+	computed: {
+		textSubData() {
+			return uni.getStorageSync('TextSubstitution');
+		}
+	}
+};
+</script>
+
+<style lang="less">
+page {
+	background: rgba(255, 255, 255, 1) !important;
+	overflow-x: hidden;
+}
+
+.payment {
+	font-size: 0;
+	background: rgba(255, 255, 255, 1) !important;
+	padding-bottom: 50upx;
+}
+
+.paymentPackage {
+	border: 1px solid rgba(0, 0, 0, 0);
+}
+
+.surplusTime {
+	margin-top: 99upx;
+	text-align: center;
+
+	> span {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+
+.conversion {
+	padding: 6upx 10upx;
+	margin-left: 20upx;
+	min-width: 100upx;
+	height: 40upx;
+	line-height: 38upx;
+	display: inline-block;
+	color: #ffffff;
+	background: linear-gradient(to right, #ee3023, #fa6033);
+	border-radius: 7upx;
+}
+
+.price {
+	margin-top: 29upx;
+	text-align: center;
+
+	> span {
+		font-size: 48upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+
+		> span {
+			font-size: 72upx;
+		}
+	}
+}
+
+.goodsInfo {
+	text-align: center;
+	width: 367upx;
+	margin: 28upx auto 0 auto;
+
+	> span {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+
+.paymentTypePackage {
+	margin-top: 60upx;
+	padding: 0 30upx;
+}
+
+.paymentTypeList {
+	margin-top: 39upx;
+
+	> view {
+		display: inline-block;
+	}
+}
+
+.imgPackage {
+	vertical-align: top;
+	width: 45upx;
+	height: 50upx;
+
+	> image {
+		width: 45upx;
+		height: 50upx;
+	}
+}
+
+.inputPackage {
+	vertical-align: top;
+	margin-left: 38upx;
+	width: 600upx;
+	border-bottom: 1px solid rgba(238, 238, 238, 1);
+}
+
+.inputPackage1 {
+	vertical-align: top;
+	margin-left: 38upx;
+	width: 600upx;
+}
+
+.inputPackageLeft {
+}
+
+.inputPackageLeftTitle {
+	font-size: 28upx;
+
+	color: rgba(51, 51, 51, 1);
+}
+
+.inputPackageMain {
+	width: 600upx;
+	padding-bottom: 40upx;
+	display: flex;
+	justify-content: space-between;
+
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+
+.inputPackageLeftBody {
+	margin-top: 9upx;
+	font-size: 24upx;
+
+	color: rgba(153, 153, 153, 1);
+}
+
+.paySubmitPackage {
+	// position: absolute;
+}
+
+.paySubmit {
+	position: fixed;
+	bottom: 10vh;
+	margin-left: 60upx;
+	width: 630upx;
+	height: 80upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 10upx;
+	text-align: center;
+
+	> span {
+		font-size: 28upx;
+
+		color: rgba(255, 255, 255, 1);
+		line-height: 80upx;
+	}
+}
+
+.inputPackageRight {
+	margin-top: 20upx;
+	width: 40upx;
+	height: 40upx;
+	border: 1upx solid rgba(204, 204, 204, 1);
+	border-radius: 50%;
+}
+
+.inputPackageRightCheck {
+	margin-top: 20upx;
+	width: 40upx;
+	height: 40upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 50%;
+	text-align: center;
+	overflow: hidden;
+
+	> image {
+		margin-top: 11upx;
+		width: 28upx;
+		height: 23upx;
+	}
+}
+</style>
diff --git a/pages/mainPages/pocketIInformant/pocketIInformant.vue b/pages/mainPages/pocketIInformant/pocketIInformant.vue
new file mode 100644
index 0000000..f296926
--- /dev/null
+++ b/pages/mainPages/pocketIInformant/pocketIInformant.vue
@@ -0,0 +1,1254 @@
+<template>
+	<!-- 掌上信息 -->
+	<loadlogo v-if="loading == true"></loadlogo>
+	<view class="pocketIInformant" v-else>
+		<!-- <view class="status_bar" :class="isBlack?'bg1':'bg2'">这里是状态栏</view> -->
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true" :scroll-x="false" @scrolltolower="pocketIInformantLoad"
+		 @scroll="scrollClose">
+			<web-view v-if="aa" :src="url" class="webView"></web-view>
+			<view class="pocketIInformantTitle" v-else>
+				<swiper :indicator-dots="indicatorDots" :indicator-active-color="indicatorActiveColor" :autoplay="autoplay"
+				 :interval="interval" :circular="circular" class="pocketIInformantTitle-swiper">
+					<!-- 循环模板 -->
+					<swiper-item v-for="(item, index) in homeInfo.adv" :key="index" @click="go(item.url)">
+						<view class="swiperImg" :style="{'background-image':'url('+item.img+')'}"></view>
+					</swiper-item>
+					<!-- 循环模板 -->
+				</swiper>
+				<!-- 搜索 -->
+				<view style="position: fixed;width: 107vw;top: 70px;left:-20px;height: 120upx;z-index: 9;" :class="isBlack?'bg1':'bg2'">
+					<searchView :type="type" @getChild="getChild"></searchView>
+				</view>
+				<!-- 搜索 -->
+			</view>
+			<!-- 我的浏览信息 -->
+			<view class="minePocketInfo">
+				<view class="minePocketInfoPackage">
+					<view>
+						<image :src="imgfixUrls+ 'merchant/tj.png'" />
+					</view>
+					<view>
+						<span>
+							浏览：
+							<span>{{ homeInfo.info.look }}</span>
+						</span>
+						<span>
+							发布：
+							<span>{{ homeInfo.info.total }}</span>
+						</span>
+						<span>
+							分享：
+							<span>{{ homeInfo.info.share }}</span>
+						</span>
+					</view>
+				</view>
+			</view>
+			<!-- 我的浏览信息 -->
+
+			<!-- 分类区域 -->
+			<view class="pocketIInformantBody">
+				<view class="classificationListPackage">
+					<swiper class="classificationList" :indicator-dots="arr.length > 1" indicator-active-color="#ff4444" :style="{ height: swiperHeight }">
+						<!-- 循环模板 -->
+						<swiper-item v-for="(item, index) in arr" :key="index">
+							<view class="classificationLists" v-for="(items, indexs) in item" @click="goSecondList(items.id, items.title, items.isnav, items.url)">
+								<view>
+									<image :src="items.img" />
+								</view>
+								<view>
+									<span :style="{ color: items.color }">{{ items.title }}</span>
+								</view>
+							</view>
+						</swiper-item>
+						<!-- 循环模板 -->
+					</swiper>
+				</view>
+				<!-- 滚动新闻区域 -->
+				<view class="swiperNews">
+					<view class="swiperNewsLeft">
+						<view><span>最新</span></view>
+						<view><span>发布</span></view>
+					</view>
+					<view class="linePackage">
+						<view class="line"></view>
+					</view>
+					<swiper class="swiperNewShow" :vertical="vertical" :autoplay="autoplay" :interval="interval" :circular="circular">
+						<swiper-item v-for="(item, index) in homeInfo.release_list" :key="index" @click="goPostDetail(item.id)">
+							<span class="text">[{{ item.createtime }}]{{ item.nickname }}发布了{{ item.title }}</span>
+						</swiper-item>
+					</swiper>
+					<view class="swiperNewsButton" @click="goSendInformation"><span>我要发布</span></view>
+				</view>
+				<!-- 滚动新闻区域 -->
+
+				<!-- 列表分类 -->
+				<scroll-view class="bottomNav" :scroll-x="true" :scroll-left="scroll_left">
+					<view class="bottomNavMb" @click="checkType(0, 0)">
+						<span :class="id == 0 ? 'check' : ''">全部</span>
+						<view class="bottomNavLine" v-if="id == 0"></view>
+					</view>
+					<block v-for="(item, index) in homeInfo.cate_list">
+						<view class="bottomNavMb" v-if="item.isnav == '0'" @click="checkType(item.id, index)">
+							<span :class="id == item.id ? 'check' : ''">{{ item.title }}</span>
+							<view class="bottomNavLine" v-if="id == item.id"></view>
+						</view>
+					</block>
+				</scroll-view>
+				<!-- 列表分类 -->
+				
+				<!-- 二级分类 -->
+				<view class="bottomtabs" v-if="children.length > 0">
+				<v-tabs
+				:color="'#333333'" 
+				:bgColor="'#ffffff'" 
+				:activeColor="'#ffffff'" 
+				:height="'40rpx'" 
+				:paddingItem="'2rpx 20rpx'" 
+				:fontSize="'24rpx'" 
+				:activeFontSize="'24rpx'"
+				:pillsColor="'#ff4444'" 
+				:pillsBorderRadius="'60rpx'" 
+				v-model="sort" 
+				:field="'title'" 
+				:tabs="children" 
+				:pills="true" 
+				line-height="0" 
+				:bold="false" 
+				@change="vtabschange"></v-tabs>
+					<!-- <v-tabs
+					:lineScale="0.3" 
+					:lineRadius="'100rpx'" 
+					:lineHeight="'6rpx'" 
+					:fontSize="'28rpx'" 
+					:paddingItem="'0 22rpx 20rpx'" 
+					:activeColor="'#FCDB36'" 
+					:lineColor="'#FCDB36'"
+					v-model="sort" 
+					:scroll="true"
+					:pills="true"
+					field="title"
+					@change="vtabschange"
+					:tabs="children">
+					</v-tabs> -->
+				</view>
+				
+			</view>
+			<!-- 分类区域 -->
+
+			<noneMores v-if="total == 0"></noneMores>
+
+			<!-- 帖子列表循环模板 -->
+
+				<block v-if="total !== 0" :key="total">
+					<postList :itemInfo="item" @lookimg="lookimg" :indexNumber="index" :indexShow="indexShow" @changePlay="changePlay" :currentPlay="currentPlay" :stopVideo="stopVideo" @operationShow="operationShow" @getover="getover" v-for="(item, index) in homeList"
+					 :key="index"></postList>
+				</block>
+			<!-- 帖子列表 -->
+
+			<!-- 填充层 -->
+			<view class="full">
+				<loadmore :isMore="isMore" v-if="total != 0"></loadmore>
+			</view>
+			<!-- 填充层 -->
+
+			<TabBars :tabBarAct="0" :pageType="'9'" />
+			<follow :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+			 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+		</scroll-view>
+	<!-- 	<view  style="height: 100vh;width: 100vw;position: fixed;left: 0;top: 0;" v-if="aolist">
+			
+		</view> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	import TabBars from '@/components/template/tabBar';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import postList from '@/components/template/postList';
+	import searchView from '@/components/template/searchView';
+	import loadlogo from '@/components/template/loadlogo';
+	import loadmore from '@/components/template/loadmore';
+	import noneMores from '@/components/template/nonemores.vue';
+	import follow from '@/components/template/follow.vue';
+
+	export default {
+		components: {
+			postList,
+			TabBars,
+			searchView,
+			loadlogo,
+			loadmore,
+			noneMores,
+			vTabs
+		},
+		data() {
+			return {
+				url: null,
+				aa: false,
+				aolist:true,
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				id: 0,
+				phoneHight: 0,
+				background: ['color1', 'color2', 'color3'],
+				indicatorDots: true,
+				indicatorActiveColor: 'white',
+				vertical: true,
+				autoplay: true,
+				interval: 2000,
+				circular: true,
+				homeInfo: {},
+				classificationListsPage: [],
+				arr: [],
+				cateList: [],
+				homeList: [],
+				page: 1,
+				page_index: 5,
+				total: null,
+				scdpText: '',
+				indexShow: -1,
+				swiperHeight: null,
+				type: 0,
+				loading: true,
+				isMore: true,
+				scroll_left: 0,
+				img:'',
+				agencyData:{},
+				isOnshow:true,
+				children:[],
+				sort:0,
+				isBlack: false,
+				lock1: false,
+				lock2: false,
+				currentPlay: -2,//当前正在播放的视频在列表中的索引,-2表示没有正在播放
+				stopVideo: 0,
+				scrollLock: false,
+				scrollTimer: null,
+			};
+		},
+		onLoad: function() {
+			if(!this.isOnshow){
+				this.isOnshow = true;
+				return
+			}
+			this.img= this.imgfixUrl;
+			this.getHomeList();
+			this.agencyData = uni.getStorageSync('agencyData');
+			// let curLoction = uni.getStorageSync('curLoction');
+			// if(!curLoction){
+			// 	App.wxApiCallback();
+			// }
+			if(!this.agencyData){
+				App.getAreaId();
+			}
+		},
+		onPullDownRefresh() {
+			this.getHomeList();
+			this.agencyData = uni.getStorageSync('agencyData');
+			// let curLoction = uni.getStorageSync('curLoction');
+			// if(!curLoction){
+			// 	App.wxApiCallback();
+			// }
+			if(!this.agencyData){
+				App.getAreaId();
+			}
+		},
+		onShow() {
+			if(!this.isOnshow){
+				this.isOnshow = true;
+				return
+			}
+			this.init();
+			// #ifdef H5
+			uni.hideTabBar();
+			// #endif
+		},
+		methods: {
+			vtabschange(e){
+				console.log(e);
+				this.twoId = this.children[e].id;
+				this.sort = e;
+				this.page = 1;
+				this.homeList = [];
+				this.getHomeList(false,1,'',true);
+			},
+			lookimg(){
+				this.isOnshow = false;
+			},
+			goPostDetail(id) {
+				console.log(this.homeInfo)
+				App.navigationTo({
+					url: 'pages/subPages/postDetails/postDetails?id=' + id
+				});
+			},
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				_this.getHomeInfo();
+			},
+			operationShow(e) {
+				let _this = this;
+				_this.indexShow = e;
+			},
+			// 滚动关闭
+			scrollClose(e) {
+				let _this = this;
+				if (_this.indexShow !== -1) {
+					_this.indexShow = -1;
+				} else {}
+				let myTop = e.detail.scrollTop;
+				// if(myTop>175 || myTop==175){
+				// 	if(!this.lock1){
+				// 		this.lock1 = true;
+				// 		this.isBlack = true;
+				// 		this.lock1 = false;
+				// 		this.lock2 = true;
+				// 	}
+				// }else{
+				// 	if(!this.lock1 && this.lock2){
+				// 		this.lock1 = true;
+				// 		this.isBlack = false;
+				// 		this.lock1 = false;
+				// 		this.lock2 = false;
+				// 	}
+				// }
+				//页面滚动，视频暂停
+				this.scrollLock = true;
+				this.handlerScroll();
+			},
+			// 跳转
+			go(url) {
+				App.navigationTo({
+					url: url
+				});
+			},
+			// 去分类
+			goSendInformation() {
+				App.navigationTo({
+					url: 'pages/mainPages/sendInformation/sendInformation'
+				});
+			},
+			// 跳转二级分类
+			goSecondList(id, title, isnav, url) {
+				// console.log(id, title, isnav, url);//3 彩妆 0 
+				let _this = this;
+				if (isnav == '0') {
+					App.navigationTo({
+						url: 'pages/mainPages/econdaryClassification/econdaryClassification?id=' + id + '&title=' + title
+					});
+				} else if (isnav == '1') {
+					// // #ifdef H5
+					// window.open(url);
+					// // #endif
+					// // #ifndef H5
+					// _this.aa = true;
+					// _this.url = url;
+					// // #endif
+					if(!url)return
+					// #ifdef H5
+					if(url.indexOf('appid') !=  -1){
+						uni.showModal({
+							showCancel:false,
+							title:'温馨提示',
+							content:'此链接无法在公众号端打开,请在小程序中打开'
+						});
+						return
+					}
+					// #endif
+					if(url.indexOf('indet') != -1){
+						//#ifdef H5
+						// let loc = url.split('?')[1];
+						// debugger
+						App.navigationToH5(false,`${App.base}#/${url}`);
+						window.location.reload();
+						//#endif
+						//#ifndef H5
+						App.navigationTo({
+							url:url
+						});
+						//#endif
+						return
+					}else{
+						
+						// let linkUrl = url.indexOf('?') != -1?url.split('?')[0]:url;
+						// if(url.indexOf('pages/subPages2/homemaking/serviceIn/serviceIn') != -1){
+						// 	this.showEnter = true;
+						// 	return
+						// }
+						App.navigationTo({
+							url:url
+						});
+					}
+				}
+			},
+			goSearch() {
+				App.navigationTo({
+					url: 'pages/subPages/search/search'
+				});
+			},
+			// 掌上信息首页信息
+			getHomeInfo() {
+				let _this = this,
+					data = {},
+					tabList = [],
+					newTabList = [];
+				App._post_form(
+					'&p=pocket&do=homeInfo',
+					data,
+					res => {
+						_this.loading = false;
+						// res.data.info.look = '11111';
+						if (res.data.info.look.length > 4) {
+							res.data.info.look = res.data.info.look.substring(0, res.data.info.look.length - 3) / 10 + '万';
+						}
+						if (res.data.info.share.length > 4) {
+							res.data.info.share = res.data.info.share.substring(0, res.data.info.share.length - 3) / 10 + '万';
+						}
+						if (res.data.info.total.length > 4) {
+							res.data.info.total = res.data.info.total.substring(0, res.data.info.total.length - 3) / 10 + '万';
+						}
+						if (res.data.cate_list.length <= 4) {
+							_this.swiperHeight = 90 + 'px';
+						}else if(res.data.cate_list.length <= 8 && res.data.cate_list.length > 4) {
+							_this.swiperHeight = 180 + 'px';
+						}else{
+							_this.swiperHeight = 210 + 'px';
+						}
+						for (let i = 0; i < res.data.cate_list.length; i++) {
+							tabList.push(res.data.cate_list[i]);
+						}
+						for (let i = 0; i < tabList.length / 8; i++) {
+							_this.classificationListsPage.push(i);
+						}
+						for (let i = 0; i = tabList.length ; i++) {
+							// debugger
+							newTabList.push(tabList.splice(0, 8));
+						}
+						_this.homeInfo = res.data;
+						_this.setData({
+							arr: newTabList
+						});
+						// _this.arr.push(_this.arr[0]);
+					},
+					fail => {
+						if (fail.message == '掌上信息已关闭') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							});
+						}
+					}
+				);
+			},
+			getChild(e) {
+				this.getHomeList(false,1,e)
+			},
+			getover(id,bor){
+				console.log(bor)
+				let _this = this;
+				_this.homeList.forEach(item=>{
+					if(item.id == id){
+						if(bor){
+							_this.$set(item,'fabulous_num',item.fabulous_num + 1);
+							item.look++;
+							_this.$set(item,'is_fabulous',1);
+							item.fabulous_avatar.push(uni.getStorageSync('userinfo').avatar);
+							// item.fabulous_avatar.forEach((items,index)=>{
+							// 	if(items == uni.getStorageSync('userinfo').avatar){
+							// 		item.fabulous_avatar.splice(index, 1);
+							// 	}
+							// })
+						}else{
+							_this.$set(item,'fabulous_num',item.fabulous_num - 1);
+							item.look--;
+							_this.$set(item,'is_fabulous',0);
+							item.fabulous_avatar.forEach((items,index)=>{
+								if(items == uni.getStorageSync('userinfo').avatar){
+									item.fabulous_avatar.splice(index, 1);
+								}
+							})
+						}
+						
+						console.info(id,item);
+					}
+				})
+				
+				this.aolist = false;
+				this.aolist = true;
+
+			},
+			// 获取掌上信息列表
+			getHomeList(isPage = false, page = 1,keyword = '',sore = false) {
+				console.log('chufa')
+				let _this = this;
+				_this.isMore = false;
+				let data = {
+					id: _this.id,
+					two_id: _this.twoId,
+					page,
+					page_index: _this.page_index,
+					homeflag: 1,
+					keyword
+				};
+				App._post_form(
+					'&p=pocket&do=infoList',
+					data,
+					res => {
+						uni.stopPullDownRefresh();
+						if (isPage) {
+							if (res.data.list.length > 0) {
+								_this["homeList"].push(...res.data.list);
+							} else {
+								_this.isMore = true;
+							}
+						} else {
+							_this.setData({
+								total: res.data.total,
+								homeList: res.data.list,
+								scdpText: ''
+							})
+						}
+						if(res.data.children && _this.id != 0){
+							_this.children = res.data.children;
+							_this.sort = 0;
+							_this.twoId = 0;
+							// debugger
+						}else if(!sore){
+							_this.children = []
+							_this.sort = 0;
+							_this.twoId = 0;
+						}
+						
+						console.info('homeList', _this.homeList);
+					},
+					fail => {
+						_this.scdpText = '加载失败请重试';
+					}
+				);
+			},
+			changeItem(index1) {
+				let _this = this;
+				let index = index1 + 2;
+				if (index > 2 && index < _this.homeInfo.cate_list.length - 1) {
+					if (index == 3) {
+						_this.scroll_left = 0;
+					} else if (index == _this.homeInfo.cate_list.length - 2) {
+						_this.scroll_left = uni.upx2px(150 * (_this.homeInfo.cate_list.length + 3));
+					} else {
+						_this.scroll_left = uni.upx2px(150 * (index - 3));
+					}
+				} else if (index < 3) {
+					_this.scroll_left = 0;
+				} else if (index > _this.homeInfo.cate_list.length - 2) {
+					_this.scroll_left = uni.upx2px(150 * (_this.homeInfo.cate_list.length + 3));
+				}
+			},
+			checkType(id, index) {
+				let _this = this;
+				_this.id = id;
+				_this.page = 1;
+				_this.homeList = [];
+				_this.changeItem(index);
+				_this.getHomeList();
+			},
+			// 帖子下拉加载
+			pocketIInformantLoad() {
+				let _this = this;
+				if (_this.total == _this.page) {
+					_this.isMore = true;
+				} else {
+					_this.getHomeList(true, ++_this.page);
+				}
+			},
+			handlerScroll(){
+				if(this.scrollLock){
+					clearTimeout(this.scrollTimer);
+				}
+				this.scrollTimer = setTimeout(()=>{
+					this.scrollLock = false;
+					this.stopVideo++;
+					console.log(this.stopVideo)
+				}, 500)
+			},
+			changePlay(e){
+				this.stopVideo++;//先关闭上一个播放的按钮，再改变当前播放索引=最新播放视频索引
+				this.currentPlay = e;
+				console.log(this.stopVideo)
+			}
+		},
+		onPageScroll(e){},
+		onShareAppMessage(e) {
+			let getUserinfo = uni.getStorageSync('userinfo'),
+				ShareData =  uni.getStorageSync('shareObj');
+				let aid  = this.agencyData.aid;
+				console.log(getUserinfo,ShareData)
+			return {
+				title: ShareData.title || '',
+				imageUrl: ShareData.imageUrl || '',
+				path: ShareData.path?ShareData.path:'pages/mainPages/pocketIInformant/pocketIInformant?head_id=' + getUserinfo.mid + '&aid=' + aid
+			};
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	view {
+		font-size: 0 !important;
+	}
+
+	.linePackage {
+		height: 100%;
+		background: #f6f6f6;
+	}
+
+	.classificationListPackage {
+		padding: 0 0 30upx 0;
+	}
+
+	.check {
+		font-size: 28upx !important;
+
+		color: rgba(255, 68, 68, 1) !important;
+	}
+
+	.zd {
+		display: flex;
+		justify-content: space-between;
+		float: right;
+
+		>image {
+			position: relative;
+			right: 630upx;
+			width: 58upx;
+			height: 58upx;
+		}
+	}
+
+	.memberMain {
+		padding-left: 10upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 250upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		font-size: 24upx;
+		r: #999999;
+	}
+
+	.member {
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.maohao {
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.member1 {
+		vertical-align: middle;
+		margin-left: 10upx;
+		font-size: 24upx;
+
+		color: rgba(66, 128, 197, 1);
+	}
+
+	.hf {
+		vertical-align: middle;
+		margin-left: 10upx;
+		font-size: 24upx;
+
+		color: #333333;
+	}
+
+	.postListMbCommentBodyPackage {
+		padding: 20upx;
+	}
+
+	.zan {
+		width: 26upx;
+		height: 27upx;
+	}
+
+	.zanHead {
+		vertical-align: middle;
+		width: 38upx;
+		height: 39upx;
+		border-radius: 50%;
+		overflow: hidden;
+		display: inline-block;
+
+		>image {
+			width: 38upx;
+			height: 39upx;
+		}
+	}
+
+	.zanHeadFd {
+		vertical-align: middle;
+		width: 38upx;
+		height: 39upx;
+		border-radius: 50%;
+		overflow: hidden;
+		display: inline-block;
+	}
+
+	.postListMbCommentTitle {}
+
+	.postListMbCommentTitlePackage {
+		padding: 30upx 20upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+
+		>span {
+			margin-right: 10upx;
+			vertical-align: middle;
+			margin-left: 15upx;
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.postListMbComment {
+		margin: 40upx 0 0 0;
+		width: 630upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 4upx;
+	}
+
+	.dot {
+		margin: 15upx 0 0 0;
+		display: inline-block;
+		width: 8upx;
+		height: 8upx;
+		background: rgba(66, 128, 197, 1);
+		border-radius: 50%;
+	}
+
+	.postListMbFlowRightPackage {
+		display: flex;
+		justify-content: space-between;
+		padding: 0 14upx;
+	}
+
+	.postListMbFlowRight {
+		display: ;
+		width: 54upx;
+		height: 34upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 6upx;
+	}
+
+	.postListMbFlowLeft {
+		>span {
+			margin-right: 20upx;
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+
+			>span {
+				margin-left: 10upx;
+			}
+		}
+	}
+
+	.postListMbFlow {
+		margin-top: 20upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+
+	.postListMbImgShow {
+		margin-right: 5upx;
+		margin-top: 10upx;
+		width: 202upx;
+		height: 202upx;
+		border-radius: 10px;
+		overflow: hidden;
+
+		>image {
+			width: 202upx;
+			height: 202upx;
+		}
+	}
+
+	.postListMbImg {
+		flex-wrap: wrap;
+		margin-top: 20upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.postListTextMain {
+		font-size: 28upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.postListText {
+		margin-top: 30upx;
+
+		>span {
+			display: inline-block;
+			margin-top: 30upx;
+			font-size: 28upx;
+
+			color: rgba(66, 128, 197, 1);
+		}
+	}
+
+	.labelList {
+		margin-top: 20upx;
+	}
+
+	.labelMb {
+		margin-left: 10upx;
+		display: inline-block;
+		height: 31upx;
+		border: 1upx solid rgba(33, 150, 243, 1);
+		border-radius: 4upx;
+
+		>span {
+			line-height: 31upx;
+			padding: 0 10upx;
+			font-size: 20upx;
+
+			color: rgba(33, 150, 243, 1);
+		}
+	}
+
+	.postListMbTitleRight {
+		>span {
+			line-height: 53upx;
+			font-size: 24upx;
+
+			color: rgba(66, 128, 197, 1);
+		}
+	}
+
+	.hb {
+		display: inline-block;
+		vertical-align: middle;
+		width: 63upx;
+		height: 31upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+		margin-left: 10upx;
+
+		>span {
+			line-height: 31upx;
+			font-size: 24upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.postListMbTitleLeft {
+		>span {
+			margin-left: 20upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-left: 10upx;
+			vertical-align: middle;
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+
+	.postListHead {
+		display: inline-block;
+		vertical-align: middle;
+		width: 54upx;
+		height: 53upx;
+		border-radius: 50%;
+		overflow: hidden;
+
+		>image {
+			width: 54upx;
+			height: 53upx;
+		}
+	}
+
+	.postListMbTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.full {
+		height: 166upx;
+		text-align: center;
+
+		>span {
+			line-height: 56upx;
+			font-size: 28upx;
+
+			color: black;
+		}
+	}
+
+	.postListMbPackage {
+		padding: 30upx;
+	}
+
+	.postListMb {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	/deep/.uni-scroll-view::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+	}
+
+	.bottomNavLine {
+		margin: auto;
+		width: 67upx;
+		height: 7upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4px 4px 0px 0px;
+	}
+	
+	.bottomtabs{
+		padding: 30upx;
+	}
+	
+	.bottomNavMb {
+		height: 60upx;
+		width: 150upx;
+		display: inline-block;
+		vertical-align: bottom;
+		text-align: center;
+
+		>span {
+			height: 53upx;
+			display: inline-block;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.bottomNav {
+		height: 60upx;
+		white-space: nowrap;
+		margin: 50upx 0 0 0;
+	}
+
+	.text {
+		line-height: 76upx;
+		font-size: 24upx;
+
+		color: black;
+	}
+
+	.swiperNewsButton {
+		width: 144upx;
+		height: 76upx;
+		background: linear-gradient(0deg, rgba(252, 104, 104, 1) 0%, rgba(255, 68, 68, 1) 100%);
+		text-align: center;
+		border-radius: 0 50upx 50upx 0;
+		
+		>span {
+			line-height: 76upx;
+			font-size: 24upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.swiperNewShow {
+		background: rgba(246, 246, 246, 1);
+		padding: 0 30upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 383upx;
+		height: 76upx;
+	}
+
+	.line {
+		margin-top: 25upx;
+		width: 2upx;
+		height: 33upx;
+		background: rgba(221, 221, 221, 1);
+	}
+
+	.swiperNewsLeft {
+		height: 100%;
+		background: rgba(246, 246, 246, 1);
+		width: 100upx;
+		
+
+		>view:nth-child(1) {
+			// margin-top: 10upx;
+			padding-top: 6upx;
+			>span {
+				font-style: italic;
+				padding: 0 0 0 30upx;
+				font-size: 22upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			>span {
+				font-style: italic;
+				padding: 0 0 0 30upx;
+				font-size: 22upx;
+
+				color: #333333;
+			}
+		}
+	}
+
+	.swiperNews {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		overflow: hidden;
+		margin: auto;
+		width: 690upx;
+		height: 76upx;
+
+		border-radius: 50upx 0upx 0upx 50upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.classificationLists {
+		margin-top: 40upx;
+		display: inline-block;
+		width: 25%;
+
+		>view:nth-child(1) {
+			margin: auto;
+			width: 70upx;
+			height: 70upx;
+
+			>image {
+				width: 70upx;
+				height: 70upx;
+			}
+		}
+
+		>view:nth-child(2) {
+			margin: 20upx 0 0 0;
+			text-align: center;
+
+			>span {
+				font-size: 28upx;
+				color: rgba(0, 0, 0, 1);
+			}
+		}
+	}
+
+	.classificationList {
+		margin-top: 43upx;
+		width: 750upx;
+	}
+
+	.pocketIInformantBody {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		border: 1upx solid rgba(0, 0, 0, 0);
+		box-sizing: border-box;
+		padding-top: 180px;
+	}
+
+	.minePocketInfoPackage {
+		height: 40upx;
+		display: flex;
+		justify-content: space-between;
+		padding: 20upx 30upx;
+
+		>view {
+			display: inline-block;
+		}
+
+		>view:nth-child(1) {
+			>image {
+				height: 40upx;
+				width: 50upx;
+			}
+		}
+
+		>view:nth-child(2) {
+			width: 600upx;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				margin-left: 10upx;
+				font-size: 28upx;
+				color: rgba(51, 51, 51, 1);
+
+				>span {
+					font-size: 28upx;
+					color: rgba(255, 68, 68, 1);
+				}
+			}
+		}
+	}
+
+	.minePocketInfo {
+		left: 30upx;
+		position: absolute;
+		top: 315upx;
+		z-index: 3;
+		width: 688upx;
+		height: 80upx;
+		background: rgba(255, 255, 255, 1);
+		box-shadow: 0px 2upx 24upx 0px rgba(221, 221, 221, 0.5);
+		border-radius: 20upx;
+	}
+
+	page {
+		overflow-x: hidden;
+	}
+
+	.pocketIInformant {
+		font-size: 0;
+		background: #f6f6f6;
+		overflow-x: hidden;
+	}
+
+	.pocketIInformantTitle {
+		width: 750upx;
+		position: fixed;
+		z-index: 4;
+	}
+
+	.pocketIInformantTitle-swiper {
+		width: 100%;
+		height: 310upx;
+	}
+
+	.swiperImg {
+		width: 100%;
+		height: 300upx;
+		background-size: 100% 300upx;
+		background-repeat: no-repeat;
+	}
+
+	.searchInput {
+		position: absolute;
+		top: 27upx;
+
+		>view:nth-child(1) {
+			margin: 0 0 0 30upx;
+
+			>span {
+				vertical-align: middle;
+				font-size: 30upx;
+
+				color: rgba(255, 255, 255, 1);
+			}
+
+			>image {
+				margin: 0 0 0 15upx;
+				vertical-align: middle;
+				width: 25upx;
+				height: 25upx;
+			}
+		}
+
+		>view:nth-child(2) {
+			margin: 0 0 0 25upx;
+			display: inline-block;
+			width: 500upx;
+			height: 63upx;
+			background: rgba(0, 0, 0, 0.1);
+			border-radius: 32upx;
+
+			>view {
+				padding: 20upx 30upx;
+
+				>image {
+					vertical-align: middle;
+					width: 28upx;
+					height: 28upx;
+				}
+
+				>input {
+					padding-left: 25upx;
+					display: inline-block;
+					vertical-align: middle;
+					width: 330upx;
+					font-size: 24upx;
+
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+	//
+	.status_bar {
+		width: 100%;
+		height: calc(var(--status-bar-height) + 35px);
+		padding-bottom: 15px;
+		// background-color: transparent;
+		position: fixed;
+		top: 0px;
+		z-index: 99;
+	}
+	.bg1{
+		// background-color: #ef4e4e;
+	}
+	.bg2{
+		background-color: transparent;
+	}
+</style>
diff --git a/pages/mainPages/poster/poster.vue b/pages/mainPages/poster/poster.vue
new file mode 100644
index 0000000..db2578e
--- /dev/null
+++ b/pages/mainPages/poster/poster.vue
@@ -0,0 +1,307 @@
+<template>
+	<!-- 生成海报 -->
+	<view>
+		<far-bottom></far-bottom>
+		<scroll-view class="poster" :style="{ height: phoneHight }" :scroll-y="true" :scroll-x="false">
+			<view class="mainPackage">
+				<view class="nHaveList textC">
+					<view class="posterPackage">
+						<image :src="posterList.url" :style="{ height: phoneHight1, width: phoneWidth1 }" @click="yl(posterList.url)" @load="load" />
+					</view>
+					<!--  #ifdef  H5 -->
+					<view class="nShareTips ">
+						<image :src="imgfixUrls + 'merchant/fx.png'" />
+						<span>长按上图保存图片，或发送给朋友</span>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view class="nShareButton" @click="saveImg(posterList.url)"><text>保存图片</text></view>
+					<!-- #endif -->
+				</view>
+			</view>
+		</scroll-view>
+		<view class="bglist-main b-f padding-box-all" v-if="!!posterList.bg_list&&posterList.bg_list.length>0">
+			<scroll-view :scroll-x="true">
+				<view class="poster-bg">
+					<view v-for="(bgItem,index) in posterList.bg_list" class="poster-bg-item p-r" :style="{'background-image':'url('+bgItem+')'}"
+					 @click="selectPost(bgItem)">
+						<image v-if="curbgImage===bgItem" :src="imgfixUrls + 'posterSelect.png'" mode=""></image>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				posterList: {},
+				id: "",
+				type: 0,
+				phoneHight: null,
+				phoneHight1: null,
+				phoneWidth: null,
+				phoneWidth1: null,
+				windowHeight: null,
+				curbgImage: "",
+				tagrt:null,
+				flag:true
+			};
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.tagrt = e;
+			uni.showLoading({
+				title:'海报加载中'
+			})
+			_this.getPoster(_this.tagrt.id, _this.tagrt.type);
+			_this.setData(_this.tagrt);
+		},
+		onShow() {
+			let _this = this;
+			if(_this.flag){
+				_this.flag = false;
+				return
+			}
+			_this.getPoster(_this.tagrt.id, _this.tagrt.type);
+			_this.setData(_this.tagrt);
+		},
+		methods: {
+			load(){
+				uni.hideLoading()
+				console.log('加载完毕')
+			},
+			saveImg(images) {
+				let _this = this;
+				uni.getImageInfo({
+					src: images,
+					success: function(image) {
+						uni.saveImageToPhotosAlbum({
+							filePath: image.path,
+							success: function() {
+								uni.showToast({
+									icon: "none",
+									title: '保存成功',
+									duration: 2000
+								});
+							}
+						});
+					}
+				});
+			},
+			yl(image) {
+				let _this = this;
+				let aa = [];
+				aa.push(image);
+				uni.previewImage({
+					current: aa[0],
+					urls: aa
+				});
+			},
+			// 获取海报信息
+			getPoster(id, type) {
+				let _this = this;
+				let data = {
+					id,
+					type,
+					bg_img: ''
+				};
+				App._post_form('&do=Poster', data, res => {
+					_this.posterList = res.data;
+					uni.getImageInfo({
+						src: res.data.url,
+						success: function(res) {
+							_this.phoneHight1 = uni.upx2px(res.height) + 'px';
+							_this.phoneWidth1 = uni.upx2px(res.width) + 'px';
+						}
+					});
+					uni.getSystemInfo({
+						success(System_res) {
+							_this.phoneHight = res.data.bg_list.length > 0 ? (System_res.windowHeight -
+								110 + 'px') : System_res.windowHeight + 'px';
+						}
+					});
+					if (res.data.bg_list.length == 0) {
+						_this.type == 0;
+					} else {
+						_this.type == 1;
+					}
+				});
+			},
+			selectPost(bg_img) {
+				this.postRequest(this.id, this.type, bg_img);
+			},
+			postRequest(id, type, bg_img) {
+				let _this = this,
+					requestData = {
+						id,
+						type,
+						bg_img
+					};
+				App._post_form('&do=Poster', requestData, res => {
+					_this.posterList = res.data;
+					_this.curbgImage = bg_img;
+					uni.getImageInfo({
+						src: res.data.url,
+						success: function(res) {
+							_this.phoneHight1 = uni.upx2px(res.height) + 'px';
+							_this.phoneWidth1 = uni.upx2px(res.width) + 'px';
+						}
+					});
+					if (res.data.bg_list.length == 0) {
+						_this.type == 0;
+					} else {
+						_this.type == 1;
+					}
+				});
+			},
+			// 切换图片
+			changeImg(url) {
+				let _this = this;
+				_this.posterList.url = url;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.nShareButton {
+		margin: 30upx auto 0 auto;
+		width: 400upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>text {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.mainPackage {
+		padding-bottom: 60upx;
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	page {}
+
+	.poster {
+		background: #323332;
+		font-size: 0;
+	}
+
+	.nShareTips {
+		margin: 10upx 0 0 0upx;
+
+		>image {
+			vertical-align: bottom;
+			width: 30upx;
+			height: 70upx;
+		}
+
+		>span {
+			vertical-align: bottom;
+			font-size: 30upx;
+			color: white;
+		}
+	}
+
+	.posterPackage {
+		margin: 30upx auto 0 auto;
+
+		>image {
+			width: 650upx;
+		}
+	}
+
+	.yPosterPackage {
+		margin: 30upx auto 0 auto;
+
+		>image {
+			width: 650upx;
+		}
+	}
+
+	.yShareTips {
+		margin: 10upx 0 0 0;
+
+		>image {
+			vertical-align: bottom;
+			width: 30upx;
+			height: 70upx;
+		}
+
+		>span {
+			vertical-align: bottom;
+			font-size: 30upx;
+			color: white;
+		}
+	}
+
+	.navBottom {
+		position: absolute;
+		bottom: 0;
+		width: 750upx;
+		background: white;
+	}
+
+	.posterListMb {
+		display: inline-block;
+		margin: 0 15upx;
+		width: 100upx;
+		height: 100upx;
+		background: red;
+
+		>image {
+			width: 100upx;
+			height: 100upx;
+		}
+	}
+
+	.posterListMbPackage {
+		padding: 30upx 15upx;
+	}
+
+	.bglist-main {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		white-space: nowrap
+	}
+
+	.poster-bg {
+		.poster-bg-item {
+			width: 150upx;
+			height: 150upx;
+			background-size: 150upx 150upx;
+			background-repeat: no-repeat;
+			background-position: center;
+			margin-right: 30upx;
+			display: inline-block;
+			border-radius: 10upx;
+
+			>image {
+				display: block;
+				width: 40upx;
+				height: 40upx;
+				position: absolute;
+				right: 0;
+				bottom: 0;
+			}
+		}
+	}
+</style>
diff --git a/pages/mainPages/realCard/realCard.vue b/pages/mainPages/realCard/realCard.vue
new file mode 100644
index 0000000..2fd0c3c
--- /dev/null
+++ b/pages/mainPages/realCard/realCard.vue
@@ -0,0 +1,171 @@
+<template>
+	<view class="mainContent">
+		<far-bottom></far-bottom>
+		<view class="headerImg">
+			<view :style="{'background-image':' url('+imageRoot+'bg_vip.png)'}">绑定实卡</view>
+		</view>
+		<view class="formContent">
+			<view>
+				<view class="title">到期时间</view>
+				<view class="inputInfo">
+					<input type="text" v-model="endTime" :disabled="true" />
+				</view>
+			</view>
+			<view>
+				<view class="title">持卡人姓名</view>
+				<view class="inputInfo">
+					<input type="text" placeholder="请输入持卡人姓名" v-model="name" />
+				</view>
+			</view>
+			<view>
+				<view class="title">持卡人电话</view>
+				<view class="inputInfo">
+					<input type="text" placeholder="请输入持卡人电话" v-model="mobile" />
+				</view>
+			</view>
+			<view class="submitButton" @click="requestBinding">确认激活</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				cardsn: '', //卡号
+				salt: '', //加密盐
+				endTime: '', //到期时间
+				name: '',
+				mobile: '',
+			}
+		},
+		onLoad(option) {
+			this.cardsn = option.cardsn;
+			this.salt = option.salt;
+			this.getCardInfo();
+		},
+		methods: {
+			//获取实体卡到期时间
+			getCardInfo() {
+				let _this = this;
+				let data = {
+					cardsn: _this.cardsn,
+					salt: _this.salt
+				};
+				App._post_form('&p=halfcard&do=getRealCardInfo', data, res => {
+					if (res.errno === 0 && !!res.data.url) {
+						App.navigationTo({
+							url: res.data.url
+						})
+					} else {
+						_this.endTime = res.data + '到期';
+					}
+				})
+			},
+			//提交信息 绑定实体卡
+			requestBinding() {
+				let _this = this;
+				if (!_this.name) {
+					_this.tips('请输入持卡人姓名');
+					return;
+				}
+				if (!_this.mobile) {
+					_this.tips('请输入持卡人电话');
+					return;
+				}
+				let data = {
+					cardsn: _this.cardsn,
+					salt: _this.salt,
+					name: _this.name,
+					mobile: _this.mobile,
+				};
+				App._post_form('&p=halfcard&do=realCardBinding', data, res => {
+					App.navigationTo({
+						url: 'pages/mainPages/memberCard/memberCard'
+					})
+				});
+			},
+			tips(tips) {
+				uni.showToast({
+					icon: 'none',
+					title: tips,
+					duration: 2000
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="less" scoped>
+	.mainContent {
+		width: 100%;
+		height: 90vh;
+		background: linear-gradient(180deg, #F9D521, #FFE676, #FFFFFF, #FFFFFF, #FFFFFF, #FFFFFF);
+	}
+
+	.headerImg {
+		height: 182upx;
+		text-align: center;
+		line-height: 272upx;
+		color: #FFFBE9;
+		font-size: 27upx;
+		padding-top: 10upx;
+
+		>view {
+			height: 100%;
+			background-size: 182upx;
+			background-position: center;
+			background-repeat: no-repeat;
+		}
+	}
+
+	.formContent {
+		background-color: #FFFFFF;
+		margin: 0upx 56upx;
+		border-radius: 10upx;
+		padding: 56upx;
+		position: relative;
+		top: -10upx;
+
+		>view {
+			height: 80upx;
+			width: 100%;
+			background-color: #FAFAFA;
+			border-radius: 10upx;
+			font-size: 24upx;
+			line-height: 80upx;
+			margin-bottom: 36upx;
+
+			.title {
+				width: 27%;
+				float: left;
+				height: 100%;
+				text-align: right;
+			}
+
+			.inputInfo {
+				height: 80upx;
+				float: right;
+				width: 70%;
+
+				>input {
+					height: 80upx;
+					font-size: 24upx;
+				}
+			}
+		}
+	}
+
+	.submitButton {
+		border-radius: 40upx !important;
+		text-align: center !important;
+		font-size: 26upx !important;
+		color: #333333 !important;
+		background-color: #FFDF4E !important;
+		margin-top: 32upx !important;
+	}
+</style>
diff --git a/pages/mainPages/registerSuses/registerSuses.vue b/pages/mainPages/registerSuses/registerSuses.vue
new file mode 100644
index 0000000..46d079f
--- /dev/null
+++ b/pages/mainPages/registerSuses/registerSuses.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="registerSuses">
+		<far-bottom></far-bottom>
+		<view class="registerSusesPackage">
+			<view class="registerSusesImg"><image :src="imgfixUrls + 'merchant/registerSusesImg.png'" /></view>
+			<view class="registerSusesTips"><span>恭喜您，注册成功！赶紧去登陆吧~</span></view>
+			<view class="registerSusesSubmit" @click="goLogin"><span>去登陆</span></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif	
+	
+export default {
+	data() {
+		return {};
+	},
+	methods:{
+		goLogin(){
+			App.navigationTo({
+				url: 'pages/mainPages/login/login'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background: rgba(255, 255, 255, 1);
+}
+.registerSuses {
+	font-size: 0;
+}
+.registerSusesPackage {
+	width: 750upx;
+	border: 1px solid rgba(0, 0, 0, 0);
+}
+.registerSusesImg {
+	margin: 75upx auto 0 auto;
+	width: 250upx;
+	height: 250upx;
+	overflow: hidden;
+	border: 1px dashed #333333;
+	> image {
+		width: 250upx;
+		height: 250upx;
+	}
+}
+.registerSusesTips {
+	text-align: center;
+	> span {
+		font-size: 30upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.registerSusesSubmit {
+	margin: 100upx auto 0 auto;
+	width: 622upx;
+	height: 88upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 44upx;
+	text-align: center;
+	> span {
+		line-height: 88upx;
+		font-size: 30upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+</style>
diff --git a/pages/mainPages/sendInformation/sendInformation.vue b/pages/mainPages/sendInformation/sendInformation.vue
new file mode 100644
index 0000000..2c4b8f3
--- /dev/null
+++ b/pages/mainPages/sendInformation/sendInformation.vue
@@ -0,0 +1,457 @@
+<template>
+	<!-- 信息发布 -->
+	<view class="sendInformation" style="padding-top: 90px;background-color: #FFFFFF;">
+		<view class="status_bar">
+			<!-- 这里是状态栏 -->
+		</view>
+		<navigationBar custom="true">
+			<view :style="{width: '100vw',height: '50px'}" style="background-color: #FFFFFF;position: fixed;z-index: 999;top:40px;">
+				<view :style="{padding: '10px', paddingLeft: '20px'}" style="display: flex;">
+					<!-- <image :style="{verticalAlign: 'middle', width: 94 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image> -->
+					<image :style="{verticalAlign: 'middle', width: 30 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image>
+					<view style="font-size: 18px;font-weight: bold;line-height: 30px;margin-left: 4px;">粤职才</view>
+				</view>
+			</view>
+		</navigationBar>
+		<far-bottom></far-bottom>
+		<!-- 分类列表 -->
+		<view class="sendInformationType">
+			<view class="sendInformationPackage">
+				<view class="typeTips">
+					<image :src="imgfixUrls + 'merchant/ts.png'" />
+					<span>免责声明：{{mzsmText}}</span>
+				</view>
+
+				<!-- 跳转入驻 -->
+				<view class="goRz" @click="goSettled" v-if="hidesettle == 0 && 0">
+					<view class="goRzPackage">
+						<view class="goRzleft">
+							<image :src="imgfixUrls + 'merchant/sjrz.png'" />
+							<view>
+								<view><span> {{korea == 1?'가계,매장,회사 등 업체는 한밥상을 이용하여 사업하세요!':`我是企业，点击入驻${TextSubstitution.sysname}`}} </span></view>
+								<view><span>{{korea == 1?'업체홍보 , 상품판매 , 음식배달 , 고객확보':`超低成本、本地宣传、简单有效、方便快捷！`}}</span></view>
+							</view>
+						</view>
+						<view class="goRzRight"><image :src="imgfixUrls + 'merchant/right.svg'" /></view>
+					</view>
+				</view>
+				<!-- 跳转入驻 -->
+				
+				
+				<!-- 选择类型提示 -->
+				<view class="checkTips"><span>—— 请选择发布类别 ——</span></view>
+				<!-- 选择类型提示 -->
+
+				<!-- 选择分类列表 -->
+				<!-- <swiper class="classificationList"> -->
+					<!-- 循环模板 -->
+					<!-- 如果需要换回滑动切换的菜单，itme标签应循环arr,打开arr的数组切割 -->
+					<!-- <swiper-item > -->
+						<view class="classificationLists" v-for="(items, indexs) in arrshop" @click="goPostRelease(items)">
+							<view><image :src="items.img" /></view>
+							<view>
+								<span :style="{ color: items.color }">{{ items.title }}</span>
+							</view>
+						</view>
+					<!-- </swiper-item> -->
+					<!-- 循环模板 -->
+				<!-- </swiper> -->
+				<!-- 选择分类列表 -->
+			</view>
+		</view>
+		<!-- 分类列表 -->
+
+		<!-- 二级分类弹窗 -->
+		<PopManager :show="show" :type="type" @clickmask="closePop">
+			<view class="checkSecond">
+				<scroll-view class="checkSecondPackage" :scroll-y="true">
+					<view class="checkSeconds" v-for="(item, index) in itemsList" @click="checkSecond(item)">
+						<span>{{ item.title }}</span>
+					</view>
+				</scroll-view>
+				<view class="closePopView" @click="closePop"><span>关闭</span></view>
+			</view>
+		</PopManager>
+		<!-- 二级分类弹窗 -->
+		<!-- 会员开通提示 -->
+		<PopManager :show="showVip" :type="'center'" @clickmask="closeVip">
+			<view class="advfei">
+				<!-- <view class="iconfont icon-roundclose" style="font-size: 40upx;color: #FFFFFF;font-weight: 700;flex: 0.1;line-height: 70upx;position: absolute;right: 20upx;top: 0upx;"
+				 @click="closeadv">
+			
+				</view> -->
+				<view class="col-f t-l" style="flex: 0.6;padding: 30upx 0 40upx;">
+					<!-- <view class="f-28 t-c"></view> -->
+					<view class="f-28 t-c">此分类为会员专区,请先成为会员</view>
+				</view>
+				<view class="dis-flex">
+					<view class="flex-box">
+						<view class="t-c f-28" style="background-color: #ffffff;color: #333333;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;margin: auto;"
+						  @click="closeadv">
+							取 消
+						</view>
+					</view>
+					<view class="flex-box">
+						<view class="t-c f-28" style="background-color: #FFC3C2;color: #B90C1F;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;margin: auto;"
+						 @click="gohomefxs">
+							开通会员
+						</view>
+					</view>
+					
+					
+				</view>
+				
+			</view>
+		</PopManager>
+		
+		<TabBars :tabBarAct="0" :pageType="'9'" /> 
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import PopManager from '@/components/template/PopManager';
+import TabBars from '@/components/template/tabBar';
+
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	components: {
+		PopManager,
+		TabBars
+	},
+	data() {
+		return {
+			cateList: [],
+			arr: [],
+			classificationListsPage: [],
+			type: 'bottom',
+			show: false,
+			showVip:false,
+			itemsList: {},
+			itemsInfo:{},
+			mzsmText:'本平台发布的所有信息展示，内容本身与平台本身无关，平台不负任何责任！',
+			TextSubstitution:null,
+			phoneHight:null,
+			hidesettle:0,
+			arrshop:[],
+			is_ios:0,
+			korea:0,
+			height:40,
+		};
+	},
+	onLoad(e) {
+		let _this=this
+		if(uni.getSystemInfoSync().platform == 'ios'){
+			_this.is_ios = 1;
+		}
+		uni.getStorage({
+			key: 'weliam_user_token',
+			success: function(res) {
+				_this.login = true;
+				_this.init();
+			},
+			fail: function(res) {
+				uni.showToast({
+					title: '请先登录',
+					icon:'none'
+				})
+				setTimeout(()=>{
+					uni.navigateTo({
+						url: '/pages/mainPages/login/minLogin'
+					})
+				}, 2000)
+			}
+		});
+		this.TextSubstitution=uni.getStorageSync('TextSubstitution');
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+	},
+	onShow(){
+		this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.getHomeInfo();
+			_this.getDisclaimer();
+		},
+		// 关闭弹窗
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		closeVip(){
+			let _this = this;
+			_this.showVip = false;
+		},
+		gohomefxs(){
+			App.navigationTo({
+				url: "pages/mainPages/memberCard/getMembership/getMembership?card=nhave"
+			})
+		},
+		closeadv(){
+			let _this = this;
+			_this.showVip = false;
+		},
+		// 跳转入驻
+		goSettled(){
+			App.navigationTo({
+				url:'pages/mainPages/Settled/Settled'
+			})
+		},
+		// 获取掌上信息免责声明
+		getDisclaimer(){
+			let _this=this
+			let data={}
+			App._post_form('&p=pocket&do=getDisclaimer',data,res=>{
+				_this.mzsmText=res.data.disclaimer;
+				_this.hidesettle = res.data.hidesettle;
+				_this.korea = res.data.korea;
+			},
+			fail=>{
+				if(fail.message=="掌上信息已关闭"){
+					App.navigationTo({
+						url:'pages/mainPages/index/index'
+					})
+				}
+			})
+		},
+		// 掌上信息首页信息
+		getHomeInfo() {
+			let _this = this;
+			let data = {
+				is_two: 1,
+				is_set: 0,
+				is_ios:_this.is_ios
+			};
+			App._post_form('&p=pocket&do=classList', data, res => {
+				// for (let i = 0; i < res.data.list.length / 8; i++) {
+				// 	_this.classificationListsPage.push(i);
+				// }
+				// for (let i = 0; i < _this.classificationListsPage.length; i++) {
+				// 	_this.arr.push(res.data.list.splice(0, 8));
+				// }
+				this.arrshop = res.data.list;
+			});
+		},
+		// 选择二级分类
+		checkSecond(itemss){
+			let _this=this;
+			if(itemss.noflag == 1){
+				this.showVip = true;
+				return
+			}
+			_this.show=false
+			App.navigationTo({
+				url:'pages/subPages/postRelease/postRelease?onetype='+_this.itemsInfo.id+'&type='+itemss.id
+			})
+		},
+		// 跳转发布
+		goPostRelease(items) {
+			console.log(items);
+			if(items.noflag == 1){
+				this.showVip = true;
+				return
+			}
+			let _this = this;
+			_this.itemsList = items.list;
+			_this.itemsInfo = items;
+			if (items.list.length !== 0) {
+				_this.show = true;
+			}
+			else{
+				App.navigationTo({
+					url:'pages/subPages/postRelease/postRelease?onetype='+items.id+'&type='+items.id
+				})
+			}
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.checkSecondPackage {
+	max-height: 530upx;
+}
+.closePopView {
+	margin: 20upx 0 0 0;
+	height: 105upx;
+	background: #ffffff;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	text-align: center;
+	> span {
+		line-height: 105upx;
+		font-size: 28upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.checkSeconds {
+	height: 105upx;
+	background: #ffffff;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	text-align: center;
+	> span {
+		line-height: 105upx;
+		font-size: 28upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.checkSecond {
+	width: 750upx;
+	background: #f8f8f8;
+	padding-bottom: 140upx;
+	border-radius: 20upx 20upx 0px 0px;
+	overflow: hidden;
+}
+.advfei{
+		background: -webkit-linear-gradient(90deg, #ff4444 ,#FF8032 ); /* Safari 5.1 - 6.0 */
+		background: -o-linear-gradient(90deg,  #ff4444, #FF8032); /* Opera 11.1 - 12.0 */
+		background: -moz-linear-gradient(90deg, #ff4444 , #FF8032); /* Firefox 3.6 - 15 */
+		background: linear-gradient(90deg, #ff4444 , #FF8032); /* 标准的语法（必须放在最后） */
+		position: relative;
+		font-size: 28upx;
+		// bottom: 120upx;
+		// left: 20upx;
+		width: 70vw;
+		padding: 20upx 20upx 40upx;
+		// background-color: #FFF0B2;
+		// display: flex;
+		border-radius: 10upx;
+		z-index: 99;
+}
+.classificationLists {
+	margin-top: 40upx;
+	display: inline-block;
+	width: 25%;
+	> view:nth-child(1) {
+		margin: auto;
+		width: 52upx;
+		height: 46upx;
+		> image {
+			width: 52upx;
+			height: 52upx;
+		}
+	}
+	> view:nth-child(2) {
+		margin: 20upx 0 0 0;
+		text-align: center;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(0, 0, 0, 1);
+		}
+	}
+}
+.checkTips {
+	margin: 60upx;
+	text-align: center;
+	> span {
+		font-size: 32upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.goRzPackage {
+	display: flex;
+	justify-content: space-between;
+	padding: 30upx;
+}
+.goRzRight {
+	margin: 25upx 0 0 0;
+	display: inline-block;
+	vertical-align: middle;
+	> image {
+		height: 25upx;
+		width:25upx;
+	}
+}
+.goRzleft {
+	display: inline-block;
+	vertical-align: middle;
+	> image {
+		vertical-align: middle;
+		width: 80upx;
+		height: 80upx;
+	}
+	> view {
+		margin: 0 0 0 20upx;
+		vertical-align: middle;
+		display: inline-block;
+		> view:nth-child(1) {
+			width: 400upx;
+			> span {
+				font-size: 30upx;
+				
+				font-weight: bold;
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+		> view:nth-child(2) {
+			> span {
+				font-size: 24upx;
+				
+				
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+}
+.goRz {
+	margin: 30upx 0 0 0;
+	width: 690upx;
+	background: rgba(255, 251, 251, 1);
+	border-radius: 10upx;
+}
+.typeTips {
+	> span {
+		vertical-align: middle;
+		font-size: 24upx;
+		
+		
+		color: rgba(153, 153, 153, 1);
+	}
+	> image {
+		vertical-align: middle;
+		width: 30upx;
+		height: 30upx;
+	}
+}
+.sendInformation {
+	font-size: 0;
+	background: #f8f8f8;
+}
+page {
+	
+}
+.sendInformationPackage {
+	padding: 30upx;
+	padding-bottom: 150upx;
+}
+.sendInformationType {
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+}
+// 
+.status_bar {
+	height: var(--status-bar-height);
+	width: 100%;
+	background-color: #fff;
+	position: fixed;
+	padding-bottom: 15px;
+	z-index: 99;
+	top: 0px;
+}
+</style>
diff --git a/pages/mainPages/store/index.css b/pages/mainPages/store/index.css
new file mode 100644
index 0000000..aac14d0
--- /dev/null
+++ b/pages/mainPages/store/index.css
@@ -0,0 +1,289 @@
+/* 商品头部 */
+.goods-header {
+	position: relative;
+	z-index: 1;
+}
+.store{
+	background: #F8F8F8;
+}
+.goods-viewed {
+	position: absolute;
+	bottom: 5%;
+	right: 0;
+	font-size: 24upx;
+	padding: 6upx 12upx;
+	border-radius: 50upx 0 0 50upx;
+	background: rgba(0, 0, 0, .4);
+	color: #FFFFFF;
+	z-index: 5;
+}
+
+.goods-swiper,
+.goods-video {
+	width: 100vw;
+	height: 75vw;
+	position: relative;
+	z-index: 1;
+}
+
+.goods-video video {
+	width: 100vw;
+	height: 66vw;
+}
+.business-hours{
+	line-height: 50upx;
+	display: flex;
+	justify-content: space-between;
+}
+.lx{
+	width: 50upx;
+	height: 50upx;
+}
+.lxImg{
+	width: 50upx;
+	height: 50upx;
+}
+.show-video {
+	position: relative;
+}
+
+.video {
+	position: relative;
+	height: 100%;
+}
+
+.video-muted {
+	position: absolute;
+	top: 20upx;
+	right: 20upx;
+	border-radius: 60upx;
+	background: rgba(0, 0, 0, 0.6);
+	text-align: center;
+	padding: 10upx;
+	justify-content: center;
+	align-items: center;
+	z-index: 10;
+}
+
+.video-muted-img {
+	width: 40upx;
+	height: 40upx;
+	line-height: 40upx;
+}
+
+.iframeView{
+	width: 100%;
+	height: 75vw;
+}
+.swiper-item {
+	height: 75vw;
+}
+
+.goods-swiper .swiper-item image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.goods-header .swiper-index {
+	position: absolute;
+	right: 42upx;
+	bottom: 33upx;
+	z-index: 2;
+	background: rgba(0, 0, 0, 1);
+	opacity: 0.2;
+	border-radius: 32upx;
+	font-size: 20upx;
+	font-weight: bold;
+	color: #FFFFFF;
+	padding: 0 10upx;
+	line-height: 1.5em;
+	text-align: center;
+}
+
+.banner-change {
+	width: 340upx;
+	height: 46upx;
+	text-align: center;
+	position: absolute;
+	left: 50%;
+	bottom: 80upx;
+	transform: translateX(-50%);
+	z-index: 2;
+}
+
+.change-item {
+	width: 80upx;
+	height: 40upx;
+	line-height: 40upx;
+	background: rgba(255, 255, 255, 0.5);
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 20upx;
+	font-size: 24upx;
+	padding: 0 6upx;
+	/* 	font-size: 24upx;
+	line-height: 46upx;
+	text-align: center;
+	color: #333333;
+	width: 50%; */
+}
+
+.change-item-text {
+	display: inline-block;
+	transform: scale(.9);
+}
+
+.change-item-text-icon {
+	font-size: 24upx !important;
+	transform: scale(.9);
+	display: inline-block;
+	margin-right: 6upx;
+}
+
+.change-item.active {
+	border-radius: 20px;
+	border: 1px solid #FF4444;
+	background-color: #FF4444;
+}
+
+.change-item-text.textActive {
+	color: #FFFFFF;
+}
+
+/* 商铺 */
+.store-content {
+	position: relative;
+	z-index: 3;
+}
+.haveMedia{
+	margin-top: -4%;
+}
+
+.store-detail {
+	border-radius: 20upx;
+	padding: 40upx 30upx;
+}
+
+.store-detail-top .store-detail-topLeft {
+	width: 170upx;
+	height: 170upx;
+	background-size: 170upx 170upx;
+	background-repeat: no-repeat;
+	flex-shrink: 0;
+}
+
+.store-detail-top .store-detail-topLeft>.store-detail-topLeft-detail {
+	width: 100%;
+	height: 46upx;
+	line-height: 46upx;
+	background: rgba(0, 0, 0, .6);
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	border-radius: 0 0 10upx 10upx;
+}
+
+.store-detail-topRight .store-detail-topRight-title {
+	width: 500upx;
+}
+
+.store-detail-topRight-favor .favor-item.select {
+	color: #F5D145;
+}
+
+.store-detail-topRight-favor .favor-item.not-select {
+	color: #CCCCCC;
+}
+
+.store-detail-topRight .topRight-icon {
+	font-size: 26upx;
+}
+
+.store-detail-topRight .collect-btn {
+	width: 88upx;
+	height: 50upx;
+	background: linear-gradient(90deg, rgba(255, 68, 68, 1) 0%, rgba(252, 86, 86, 1) 100%);
+	border-radius: 6upx;
+	line-height: 50upx;
+}
+
+.store-detail-topRight .collect-btn text {
+	font-size: 28upx;
+}
+
+.store-detail-topRight .popularity-icon {
+	display: block;
+	width: 18upx;
+	height: 22upx;
+}
+
+.store-detail-bottom .site-location {
+	width: 560upx;
+}
+
+.store-detail-bottom .mobile-icon {
+	color: #666666;
+	font-size: 48upx;
+}
+
+.store-detail-bottom .buyOrder {
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 10upx;
+}
+
+.buyOrder .buyOrder-icon {
+	display: block;
+	width: 38upx;
+	height: 30upx;
+}
+
+/* 
+ 选项卡详情
+ */
+.tabbar-header {
+	padding: 40upx 30upx;
+}
+
+.tabbar-header .tab-item {
+	height: 60upx;
+}
+
+.tabbar-header .tab-item.tabItemActive {
+	color: #FF4444;
+}
+
+.tabbar-header .tab-item .tabItemActive-bm {
+	position: absolute;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: 0;
+	width: 40upx;
+	height: 6upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 2upx;
+}
+
+/* 选项卡详情 */
+.tabbar-content {
+	border-radius: 20upx 20upx 0 0;
+}
+
+.tabbar-content .photoPad {
+	padding: 30upx 0 30upx 30upx;
+}
+
+.photo-content {
+	min-height: calc(100vw);
+	width: 100%;
+	flex-grow: 1;
+}
+
+.photo-content .photo-item {
+	width: 30.33%;
+	height: 216upx;
+	border-radius: 10upx;
+	background-repeat: no-repeat;
+	background-size: 100% 216upx;
+	margin: 0 20upx 20upx 0;
+}
diff --git a/pages/mainPages/store/index.less b/pages/mainPages/store/index.less
new file mode 100644
index 0000000..1bc084b
--- /dev/null
+++ b/pages/mainPages/store/index.less
@@ -0,0 +1,468 @@
+/* 商品头部 */
+.goods-header {
+	position: relative;
+	z-index: 1;
+}
+
+.store {
+	background: #F8F8F8;
+}
+
+.goods-viewed {
+	position: absolute;
+	bottom: 5%;
+	right: 0;
+	font-size: 24upx;
+	padding: 6upx 12upx;
+	border-radius: 50upx 0 0 50upx;
+	background: rgba(0, 0, 0, .4);
+	color: #FFFFFF;
+	z-index: 5;
+}
+
+.goods-swiper{
+	width: 100vw;
+	// height: 0;
+	position: relative;
+	z-index: 1;
+}
+.goods-video {
+	width: 100vw;
+	height: 35vh;
+	position: relative;
+	z-index: 1;
+}
+
+.goods-video video {
+	width: 100vw;
+	height: 66vw;
+}
+
+.business-hours {
+	line-height: 50upx;
+	display: flex;
+	justify-content: space-between;
+}
+
+.lx {
+	width: 50upx;
+	height: 50upx;
+}
+
+.lxImg {
+	width: 50upx;
+	height: 50upx;
+}
+
+.show-video {
+	position: relative;
+}
+
+.video {
+	position: relative;
+	height: 100%;
+}
+
+.video-muted {
+	position: absolute;
+	top: 20upx;
+	right: 20upx;
+	border-radius: 60upx;
+	background: rgba(0, 0, 0, 0.6);
+	text-align: center;
+	padding: 10upx;
+	justify-content: center;
+	align-items: center;
+	z-index: 10;
+}
+
+.video-muted-img {
+	width: 40upx;
+	height: 40upx;
+	line-height: 40upx;
+}
+
+.iframeView {
+	width: 100%;
+	height: 75vw;
+}
+
+.swiper-item {
+	height: 75vw;
+}
+
+.goods-swiper .swiper-item image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+.goods-header .swiper-index {
+	position: absolute;
+	right: 42upx;
+	bottom: 33upx;
+	z-index: 2;
+	background: rgba(0, 0, 0, 1);
+	opacity: 0.2;
+	border-radius: 32upx;
+	font-size: 20upx;
+	font-weight: bold;
+	color: #FFFFFF;
+	padding: 0 10upx;
+	line-height: 1.5em;
+	text-align: center;
+}
+
+.banner-change {
+	width: 340upx;
+	height: 46upx;
+	text-align: center;
+	position: absolute;
+	left: 50%;
+	bottom: 80upx;
+	transform: translateX(-50%);
+	z-index: 2;
+}
+
+.replyViewPackage {
+	padding: 30upx;
+}
+.full {
+	width: 750upx;
+	height: 98upx;
+}
+.marT10{
+	margin-top: 18upx;
+}
+.marT18{
+	margin-top: 18upx;
+}
+.qbBottomNavLeft {
+	font-size: 0;
+	display: flex !important;
+	justify-content: space-around !important;
+	vertical-align: top;
+	height: 98upx;
+	width: 100%;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		text-align: center;
+		> view {
+			width: 50upx;
+			margin: auto;
+			> image {
+				width: 40upx;
+				height: 40upx;
+			}
+		}
+		> span {
+			font-size: 20upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.qbBottomNavCenter {
+	display: inline-block;
+	vertical-align: top;
+	width: 180upx;
+	height: 60upx;
+	background: rgba(23, 209, 23, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		margin: 10upx auto 0 auto;
+		width: 40upx;
+		> image {
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+	> span {
+		line-height: 60upx;
+		vertical-align: middle;
+		font-size:24upx !important;
+		color:rgba(255,255,255,1) !important;
+	}
+}
+.qbBottomNavRight {
+	vertical-align: top;
+	width: 180upx;
+	height: 60upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		margin: 10upx auto 0 auto;
+		width: 40upx;
+		> image {
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+	> span {
+		line-height: 60upx;
+		vertical-align: middle;
+		font-size:24upx !important;
+		color:rgba(255,255,255,1) !important;
+	}
+}
+
+.change-item {
+	min-width: 80upx;
+	height: 40upx;
+	line-height: 40upx;
+	background: rgba(255, 255, 255, 0.5);
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 20upx;
+	font-size: 24upx;
+	padding: 0 6upx;
+	/* 	font-size: 24upx;
+	line-height: 46upx;
+	text-align: center;
+	color: #333333;
+	width: 50%; */
+}
+
+.bottom-nav {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	z-index: 666;
+	width:750upx;
+	height:97upx;
+	background:rgba(255,255,255,1);
+	border:1upx solid rgba(238,238,238,1);
+}
+
+.change-item-text {
+	display: inline-block;
+	transform: scale(.9);
+}
+
+.change-item-text-icon {
+	font-size: 24upx !important;
+	transform: scale(.9);
+	display: inline-block;
+	margin-right: 6upx;
+}
+
+.change-item.active {
+	border-radius: 20px;
+	border: 1px solid #FF4444;
+	background-color: #FF4444;
+}
+
+.change-item-text.textActive {
+	color: #FFFFFF;
+}
+
+/* 商铺 */
+.flex-around {
+	text-align: center;
+	display: flex;
+	justify-content: space-between;
+}
+
+.storeButton {
+	width: 25%;
+	display: inline-block;
+}
+
+.storeButton-image {
+	width: 60upx;
+	height: 60upx;
+	margin: auto;
+}
+
+.rq-image {
+	width: 50upx;
+	height: 50upx;
+	margin: auto;
+}
+
+.font0 {
+	font-size: 0;
+}
+
+.storeButton-text {
+	text-align: center;
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.rq-image-main {
+	width: 50upx;
+	height: 50upx;
+}
+
+.rq-number {
+	font-size: 20upx;
+	color: #333333;
+}
+
+.rq-text {
+	font-size: 20upx;
+	color: #999999;
+}
+
+.rq {
+	font-size: 0;
+	text-align: center;
+	vertical-align: middle;
+	display: inline-block;
+	width: 84upx;
+	height: 120upx;
+	background: rgba(255, 255, 255, 1);
+	box-shadow: 0px 2upx 12upx 0px rgba(221, 221, 221, 0.35);
+	border-radius: 8upx;
+}
+
+.store-content {
+	position: relative;
+	z-index: 3;
+}
+
+.haveMedia {
+	margin-top: -4%;
+}
+
+.store-detail {
+	border-radius: 20upx;
+	padding: 40upx 30upx;
+}
+
+.store-detail-top .store-detail-topLeft {
+	width: 170upx;
+	height: 170upx;
+	background-size: 170upx 170upx;
+	background-repeat: no-repeat;
+	flex-shrink: 0;
+}
+
+.store-detail-top .store-detail-topLeft>.store-detail-topLeft-detail {
+	width: 100%;
+	height: 46upx;
+	line-height: 46upx;
+	background: rgba(0, 0, 0, .6);
+	position: absolute;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	border-radius: 0 0 10upx 10upx;
+}
+
+.store-detail-topRight .store-detail-topRight-title {
+	width: 500upx;
+}
+
+.store-detail-topRight-favor .favor-item.select {
+	color: #F5D145;
+}
+
+.store-detail-topRight-favor .favor-item.not-select {
+	color: #CCCCCC;
+}
+
+.store-detail-topRight .topRight-icon {
+	font-size: 26upx;
+}
+
+.store-detail-topRight .collect-btn {
+	width: 88upx;
+	height: 50upx;
+	background: linear-gradient(90deg, rgba(255, 68, 68, 1) 0%, rgba(252, 86, 86, 1) 100%);
+	border-radius: 6upx;
+	line-height: 50upx;
+}
+
+.store-detail-topRight .collect-btn text {
+	font-size: 28upx;
+}
+
+.store-detail-topRight .popularity-icon {
+	display: block;
+	width: 18upx;
+	height: 22upx;
+}
+
+.store-detail-bottom .site-location {
+	width: 560upx;
+}
+
+.store-detail-bottom .mobile-icon {
+	color: #666666;
+	font-size: 48upx;
+}
+
+.store-detail-bottom .buyOrder {
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 10upx;
+}
+
+.buyOrder .buyOrder-icon {
+	display: block;
+	width: 38upx;
+	height: 30upx;
+}
+
+/* 
+ 选项卡详情
+ */
+.tabbar-header {
+	padding: 40upx 30upx;
+}
+
+.tabbar-header .tab-item {
+	height: 60upx;
+	background-color: #EEEEEE;
+	border-radius: 10upx;
+	padding: 0upx 15upx;
+	line-height: 60upx;
+	margin-right: 15upx;
+}
+
+.tabbar-header .tab-item.tabItemActive {
+	color: #ffffff;
+	background-color: #FF4444;
+	font-weight: 700;
+}
+
+.tabbar-header .tab-item .tabItemActive-bm {
+	position: absolute;
+	left: 50%;
+	transform: translateX(-50%);
+	bottom: 0;
+	width: 40upx;
+	height: 6upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 2upx;
+}
+
+/* 选项卡详情 */
+.tabbar-content {
+	border-radius: 20upx 20upx 0 0;
+}
+
+.tabbar-content .photoPad {
+	padding: 30upx 0 30upx 30upx;
+}
+
+.photo-content {
+	width: 100%;
+	flex-grow: 1;
+}
+
+.photo-content .photo-item {
+	width: 30.33%;
+	height: 216upx;
+	border-radius: 10upx;
+	background-repeat: no-repeat;
+	background-size: 100% 216upx;
+	margin: 0 20upx 20upx 0;
+}
diff --git a/pages/mainPages/store/index.vue b/pages/mainPages/store/index.vue
new file mode 100644
index 0000000..7baa8d1
--- /dev/null
+++ b/pages/mainPages/store/index.vue
@@ -0,0 +1,1415 @@
+<template>
+	<!-- 商铺详情 -->
+	<view class="store">
+		<loading v-if="loadlogo"></loading>
+		<scroll-view class="container" scroll-y @scrolltolower="loadmore" :scroll-top="slide_Top" :style="{ height: scrollHeight }">
+			<!-- 商品头部banner -->
+			<view class="goods-header" v-if="!!StoreData.videourl || !!StoreData.panorama || (!!StoreData.adv && StoreData.adv.length > 0)">
+				<block v-if="bannerType === 'imgs'">
+					<swiper @change="bindchange"  :autoplay="true" :interval="3000" :circular="true" class="goods-swiper" :style="{ height: (deliverystatus['imgstyle'].height * ratio) + 'px',width: (deliverystatus['imgstyle'].width * ratio) + 'px' }" >
+						<swiper-item class="swiper-item" v-for="(adv_item, index) in StoreData.adv" :key="index">
+							<image :src="adv_item" @load="imageLoad" :data-id="index" @error="imageError"></image>
+							
+							<!-- <view class="swiper-item-img" :style="{backgroundImage: 'url(' + adv_item + ')'}" @load="imageLoad" :data-id="index"></view> -->
+						</swiper-item>
+					</swiper>
+				</block>
+				<block v-if="bannerType === 'video'">
+					<view class="goods-video">
+						<view class="show-video">
+							<video id="shopVideo" :loop="true" class="video" style="width:100%;" objectFit="contain" :src="StoreData.videourl" :muted="muted"
+							 @play="showVideoStatus" @ended="showVideoStatus">
+								<view class="video-muted flex-row" v-if="isVideoPlay" @click="videoMuted">
+									<image class="video-muted-img" :src="imgUrl + 'diypage/notification_fill.png'" v-if="!muted"></image>
+									<image class="video-muted-img" :src="imgUrl + 'diypage/notification_forbid_fill.png'" v-if="muted"></image>
+								</view>
+							</video>
+						</view>
+					</view>
+				</block>
+				<block v-if="bannerType === 'full'">
+					<!-- #ifdef H5 -->
+					<iframe :src="StoreData.panorama" frameborder="0" class="iframeView"></iframe>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<!-- <web-view :src="StoreData.panorama" class="iframeView" style="height:75vh;position: fixed;" /> -->
+					<!-- #endif -->
+				</block>
+				<view class="banner-change dis-flex flex-dir-row flex-x-center">
+					<view class="change-item m-right20" :class="{ active: bannerType === 'video' }" @click="bannerChange('video')"
+					 v-if="!!StoreData.videourl">
+						<text class="col-3 change-item-text" :class="{ textActive: bannerType === 'video' }">
+							<text class="iconfont icon-playfill change-item-text-icon"></text>
+							视频
+						</text>
+					</view>
+					
+					<view class="change-item m-right20" :class="{ active: bannerType === 'imgs' }" @click="bannerChange('imgs')" v-if="!!StoreData.adv && StoreData.adv.length > 0 && imgiferror">
+						<text class="col-3 change-item-text" :class="{ textActive: bannerType === 'imgs' }">图片</text>
+					</view>
+					
+					<view class="change-item " :class="{ active: bannerType === 'full' }" @click="bannerChange('full')" v-if="!!StoreData.panorama">
+						<text class="col-3 change-item-text" :class="{ textActive: bannerType === 'full' }">
+							<text class="iconfont icon-dangmianfu change-item-text-icon"></text>
+							全景
+						</text>
+					</view>
+					
+					
+				</view>
+			</view>
+			<!-- 商铺详情 -->
+			<view class="store-content" :class="!!StoreData.videourl || !!StoreData.panorama || (!!StoreData.adv && StoreData.adv.length > 0) ? 'haveMedia' : ''">
+				<!-- 店铺信息 -->
+				<view class="b-f store-detail">
+					<view class="store-detail-top dis-flex">
+						<view class="store-detail-topLeft p-r bor-radius-10upx m-right30" :style="{ 'background-image': 'url(' + StoreData.logo + ')' }">
+							<view class="store-detail-topLeft-detail t-c col-f f-24" v-if="StoreData.is_business != 1">
+								{{ StoreData.is_business === 1 ? '营业中' : '休息中' }}
+							</view>
+						</view>
+						<view class="store-detail-topRight">
+							<view class="store-detail-topRight-title col-3 f-36 onelist-hidden">
+								{{ StoreData.storename }}
+								<image :src="imgUrl + 'homePage/home_logo2.png'" class="home_logo2" mode="" v-if="StoreData['attestation']['attestation'] == 2"></image>
+								<image :src="imgUrl + 'homePage/home_logo3.png'" class="home_logo3" mode="" v-if="StoreData['attestation']['bondflag'] == 1"></image>
+							</view>
+							<view class="dis-flex flex-y-center flex-x-between">
+								<view>
+									<view class="store-detail-topRight-favor dis-flex flex-y-center m-btm10">
+										<view class="dis-flex m-right10">
+											<view class="favor-item select iconfont icon-favor_fill_light" v-for="(item, index) in StoreData.score" :key="index"></view>
+											<view class="favor-item not-select iconfont icon-favor_fill_light" v-for="(item, index) in StoreData.noScore"
+											 :key="index"></view>
+										</view>
+										<view class="col-3 f-24">{{ StoreData.score }}分</view>
+									</view>
+									<!-- <view class="dis-flex flex-y-center m-btm10"> -->
+									<!-- <view class="col-3 f-24">{{ StoreData.one_name }} | {{ StoreData.two_name }}</view> -->
+									<!-- <view class="topRight-icon iconfont icon-right col-9"></view> -->
+									<!-- </view> -->
+									<view class="dis-flex flex-y-center m-btm10">
+										<!-- <image :src="imgUrl + 'store/popularity.png'" mode="" class="popularity-icon m-right10"></image> -->
+										<view class="col-3 f-24">营业时间：{{ StoreData.storehours }}</view>
+									</view>
+									<view class="dis-flex flex-y-center" >
+										<!-- <image :src="imgUrl + 'store/popularity.png'" mode="" class="popularity-icon m-right10"></image> -->
+										<view class="col-3 f-24" style="width: 50vw;">商铺地址：{{ StoreData.address }}</view>
+									</view>
+								</view>
+								<view class="rq" @click="collectStore(1)">
+									<view class="rq-image" v-if="StoreData.is_collection != 1">
+										<!-- <image :src="imgUrl + 'merchant/storeScY.png'" class="rq-image-main"></image> -->
+										<view class="rq-image-main iconfont icon-xihuan" style="color: #999999;" >
+											
+										</view>
+									</view>
+									<view class="rq-image" v-if="StoreData.is_collection == 1">
+										<!-- <image :src="imgUrl + 'merchant/xh.png'" class="rq-image-main"></image> -->
+										<view class="rq-image-main iconfont icon-xihuan" style="color: #FF4444;">
+											
+										</view>
+									</view>
+									<view>
+										<span class="rq-number">{{ StoreData.pv }}</span>
+									</view>
+									<view><span class="rq-text">人喜欢</span></view>
+								</view>
+								<!-- 	<view class="col-f f-24 collect-btn t-c" @click="collectStore">
+									<text v-if="StoreData.is_collection === 0">+</text>
+									{{ StoreData.is_collection === 1 ? '已收藏' : '收藏' }}
+								</view> -->
+							</view>
+						</view>
+					</view>
+					<view class="store-detail-bottom">
+						<view class="labelView wzd"  v-if="tags.length != 0">
+							<!-- 标签循环模板 -->
+							<view class="labelLeft" @click="labelZd">
+								<view class="labelMb" v-for="(item, index) in StoreData.tags">
+									<text class="labelText">{{ item }}</text>
+								</view>
+							</view>
+							<view class="labelRight t-r" @click="labelZd" v-if="tags.length != 0">
+								<text style="font-size: 24upx;padding-right: 10upx;color: #999999;">查看详情</text>
+								<image :src="imgUrl + 'merchant/topBlack.png'" v-if="zd == '1'"></image>
+								<image :src="imgUrl + 'merchant/bottomBlack.png'" v-else></image>
+							</view>
+						</view>
+						<view class="font0 flex-around m-top30">
+							<!-- <view class="business-hours f-24 col-3 m-btm20">
+								<text>营业时间：{{ StoreData.storehours }}</text>
+								<view class="lx" ><image :src="imgUrl + 'merchant/dpLt.png" class="lxImg" /></view>
+							</view>
+							<view class="dis-flex flex-x-between flex-y-center">
+								<view class="site-location col-3 f-24 twolist-hidden" >{{ StoreData.address }}></view>
+								<view class="mobile-icon iconfont icon-dianhua" ></view>
+							</view> -->
+							<view class="storeButton" @click="supple(StoreData, 'mobile')">
+								<view class="storeButton-image">
+									<image class="storeButton-image" :src="imgUrl + 'merchant/storePhone.png'"></image>
+								</view>
+								<text class="storeButton-text">{{languageStatus!=1?'电话':'전화번호'}}</text>
+							</view>
+							<view class="storeButton" @click="supple(StoreData, 'address')">
+								<view class="storeButton-image">
+									<image class="storeButton-image" :src="imgUrl + 'merchant/storeDw.png'"></image>
+								</view>
+								<text class="storeButton-text" v-if="StoreData.distance">约{{StoreData.distance}}</text>
+								<text class="storeButton-text" v-else>{{languageStatus!=1?'未定位':'위치 미설정'}}</text>
+							</view>
+							<view class="storeButton" @click="shareBottomShow = true">
+								<view class="storeButton-image">
+									<image class="storeButton-image" :src="imgUrl + 'merchant/storeFx.png'"></image>
+								</view>
+								<text class="storeButton-text">{{languageStatus!=1?'分享':'공유'}}</text>
+							</view>
+							<view class="storeButton" @click="collectStore(2)">
+								<view class="storeButton-image">
+									<image class="storeButton-image" :src="imgUrl + 'merchant/storeSc.png'" v-if="StoreData.is_collection != 1"></image>
+									<image class="storeButton-image" :src="imgUrl + 'merchant/storeScY.png'" v-if="StoreData.is_collection === 1"></image>
+								</view>
+								<text class="storeButton-text" :style="{ color: StoreData.is_collection === 1 ? '#FF4444' : 'rgba(51, 51, 51, 1)' }">
+									{{ StoreData.is_collection === 1 ? '取消收藏' : (languageStatus!=1?'收藏':'저장') }}
+								</text>
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view class="flex-box buyOrder dis-flex flex-y-center flex-x-center p-top-bom-20 m-top30 flex-box col-3 f-28" v-if="deliverystatus.deliverystatus == '1'" @click="goTakeout">
+								<view class="iconfont icon-cart_fill_light col-3" style="font-size: 40upx;line-height: 30upx;padding-right: 20upx;color: #F79247;height: 100%;">
+								</view>
+								{{texty.shangchengtext}}
+							</view>
+							<view class="buyOrder dis-flex flex-y-center flex-x-center p-top-bom-20 m-top30 flex-box" @click="naviBuyOrder(shareId, StoreData.mid)"
+							 v-if="StoreData.payonline != 0">
+								<image :src="imgUrl + 'store/buy.png'" mode="" class="buyOrder-icon m-right20"></image>
+								<view class="f-28 col-3">{{texty.maidantext}}</view>
+							</view>
+						</view>
+					</view>
+					
+					<!-- 社群 -->
+					<view  v-if="StoreData.community">
+						<view class="diyPages-community community-bd  dis-flex flex-x-between flex-y-center" style="margin-bottom: 4upx;background-color: #FFFFFF;margin-top: 20upx;border-radius: 10upx;">
+							<view class="community-user dis-flex flex-y-center flex-box ">
+								<image :src="StoreData.community.imgUrl" class="community-user-img" style="width: 80upx;height: 80upx;"></image>
+								<view class="community-user-info flex-box">
+									<view class="community-user-name col-0 f-28">{{ StoreData.community.name }}</view>
+									<view class="community-user-des f-24 col-9 onelist-hidden">{{ StoreData.community.introduce }}</view>
+								</view>
+							</view>
+							<view class="community-btn">
+								<button class="community-add f-24" style="color: #FFFFFF;background-color: #28BC17;" @click="showCommunity = true" >添加社群</button>
+							</view>
+						</view>
+						<!-- 社群弹窗 -->
+						<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false">
+							<view class="community-detail b-f t-c">
+								<view class="community-header f-w f-36 p-r col-f">
+									<text class="community-header-text p-r">{{ StoreData.community.name }}</text>
+								</view>
+								<!-- #ifdef H5 -->
+								<view class="community-body">
+									<image :src="StoreData.community.qrcodeUrl" class="community-qrcodeimg"></image>
+									<view class="community-toreply f-26 col-3">长按识别二维码</view>
+								</view>
+								<!-- #endif -->
+								<!-- #ifndef H5 -->
+								<view class="community-body f-26 col-3">
+									有任何疑问，点击“
+									<text class="col-m">去回复</text>
+									”发送“
+									<text class="col-m">{{ StoreData.community.community_id }}</text>
+									”,即可添加{{ StoreData.community.name }}
+								</view>
+								<!-- #endif -->
+								<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!StoreData.community.phone">
+									<view class="community-number dis-flex flex-y-center">
+										<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon" style="width: 80upx;height: 80upx;"></image>
+										<view class="f-24 col-3">{{ StoreData.community.phone }}</view>
+									</view>
+									<view class="community-bdial f-24" @click="callPhone(StoreData.community.phone)">拨号</view>
+								</view>
+								<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType === '3'">去回复</button>
+							</view>
+						</PopManager>
+					</view>
+				</view>
+				
+				
+			</view>
+			<!-- 选项卡详情 -->
+			<view class="tab-Control-content">
+				<view class="tabbar-header " style="width: 92%;overflow: auto;">
+					<view  style="width: 155vw;">
+						
+					
+					<view v-for="(tabItem,index) in tabbar" :key="index"  style="float: left;">
+						<view class="tab-item p-r col-3 f-28"  @click="curtabBar(tabItem.type)" :class="{ tabItemActive: currentTab === tabItem.type }"
+						 v-if="tabItem.status == 1">
+							{{ tabItem.title }}
+							<!-- <view class="tabItemActive-bm" v-if="currentTab === tabItem.type"></view> -->
+						</view>
+					</view>
+					</view>
+				</view>
+				<!-- 选项卡内容 -->
+				<view class="tabbar-content b-f">
+					<!-- 商品列表 -->
+					<view v-show="currentTab === 'goods'">
+						<view class="tabbar-goods padding-box-all">
+							<view class="f-30 col-3 m-btm40">{{languageStatus!=1?'商品列表':'상품순서'}}</view>
+							<store-goods ref="storeGoods" :tabType="currentTab" :storeId="shareId"></store-goods>
+						</view>
+					</view>
+					<!-- 商品相册 -->
+					<block v-if="currentTab === 'photo'">
+						<view class="tabbar-goods photoPad">
+							<view class="f-30 col-3 m-btm40">商品相册</view>
+							<view class="photo-content dis-flex flex-warp">
+								<!-- <view class="photo-item" :style="{ 'background-image': 'url(' + photoItem + ')' }" ></view> -->
+								 <image :src="photoItem" class="photo-item" v-for="(photoItem, index) in StoreData.album"
+								 :key="index" @click="prevPhoto(index, 'shopPhoto')" mode="scaleToFill"></image>
+							</view>
+						</view>
+					</block>
+					<!-- 详情 -->
+					<view v-if="currentTab === 'detail'">
+						<view class="tabbar-goods padding-box-all" v-if="StoreData.introduction">
+							<view class="f-30 col-3 m-btm40">商家详情</view>
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+							show-with-animation use-anchor  :html="StoreData.introduction" ></jyf-parser>
+						</view>
+					</view>
+					<!-- 评论 -->
+					<view v-show="currentTab === 'comment'">
+						<view class="tabbar-goods padding-box-all">
+							<view class="f-30 col-3">商家评价</view>
+							<store-comment ref="storeComment" :tabType="currentTab" :storeId="shareId"></store-comment>
+						</view>
+					</view>
+					<!-- 招聘 -->
+					<view v-show="currentTab === 'recruit'">
+						<view class="tabbar-goods padding-box-all">
+							<view class="f-30 col-3" style="padding-bottom: 30upx;">商家招聘</view>
+							<work-List :inviteList="companyList"></work-List>
+						</view>
+					</view>
+					<!-- 动态 -->
+					<view v-show="currentTab === 'state'">
+						<view class="tabbar-goods padding-box-all">
+							<view class="f-30 col-3">商家动态</view>
+							<store-dynamic ref="storeDynamic" :tabType="currentTab" :storeId="shareId"></store-dynamic>
+						</view>
+					</view>
+					<view v-if="currentTab === 'qrCode' && !!StoreData.wxapp_qrcode">
+						<view class="tabbar-goods padding-box-all">
+							<view class="f-30 col-3">小程序二维码</view>
+							<!-- <store-dynamic ref="storeDynamic" :tabType="currentTab" :storeId="shareId"></store-dynamic> -->
+							<view class="qrcodeView">
+								<view class="qrcodeMainView">
+									<image :src="StoreData.wxapp_qrcode" bindtap="previewImage" :data-src="StoreData.wxapp_qrcode" show-menu-by-longpress></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- <view v-if="currentTab === 'qrCode' && !!StoreData.wxapp_qrcode">
+						
+					</view> -->
+					<!-- 商家资质 -->
+					<view  style="padding: 30upx;" v-if="currentTab === 'certification'">
+						<view class="f-32" style="padding-bottom: 30upx;">
+							商家资质
+						</view>
+						<view  v-for="(value,key,index) in StoreData.moreinfo" >
+							<view class="dis-flex" style="padding-bottom: 20upx;border-radius: 10upx;background-color: #f9f9f9;padding: 30upx 10upx;margin-bottom: 10upx;" v-if="value.type != 'img' &&  value.type != 'pic'">
+								<view class="f-26" style="flex: 0.2;color: #999999;">
+									{{key}}<text>:</text>
+								</view>
+								<view class="f-26 t-l" style="flex: 0.8;">
+									{{value.value }}
+								</view>
+							</view>
+							<view  style="padding-bottom: 20upx;border-radius: 10upx;background-color: #f9f9f9;padding: 30upx 10upx;margin-bottom: 10upx;" v-if="value.type == 'img' || value.type == 'pic'">
+								<view class="f-26" style="flex: 0.2;color: #999999;">
+									{{key}}
+								</view>
+								<view  style="padding-top: 20upx;" v-if="value.type == 'pic'">
+									<image style="border-radius: 15upx;width: 200upx;height: 200upx;" :src="value.value" mode="" @click="lookimg(value)"></image>
+								</view>
+								<view class="dis-flex" style="padding-top: 20upx;justify-content: flex-start;flex-direction: row;align-items: center;text-align: left;flex-wrap: wrap;" v-if="value.type == 'img'">
+									<image  
+									style="border-radius: 15upx;width: 200upx;height: 200upx;min-width: 25vw;margin-right: 23upx;" 
+									v-for="(items,indexs) in value.value"
+									:key="indexs"
+									:src="items"
+									mode=""
+									@click="lookimg(value,indexs)"></image>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 商家资质 -->
+					<view class="fullView" :style="{ 'padding-bottom': isPadding ? '20px' : '' }"></view>
+
+					<!-- 底部导航栏 -->
+					<view class="bottom-nav font0" :style="{ 'padding-bottom': isPadding ? '20px' : '' }">
+						<view class="qbBottomNavLeft">
+							<view @click="goHome" class="marT10">
+								<view>
+									<image :src="imgUrl + 'goods/home.png'" class="bottom-image" />
+								</view>
+								<span class="bottom-text1">{{languageStatus!=1?'首页':'홈'}}</span>
+							</view>
+							<!--  #ifdef  H5 -->
+							<view @click="shareBottomShow = true" class="marT10">
+								<view>
+									<image :src="imgUrl + 'goods/flow.png'" class="bottom-image" />
+								</view>
+								<span class="bottom-text1">{{languageStatus!=1?'分享':'공유'}}</span>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view @click="shareBottomShow = true" class="marT10">
+								<view>
+									<image :src="imgUrl + 'goods/flow.png'" class="bottom-image" />
+								</view>
+								<span class="bottom-text1">{{languageStatus!=1?'分享':'공유'}}</span>
+							</view>
+							<!-- 		<view class="p-r marT10">
+								<view><image :src="imgUrl + 'goods/flow.png" class="bottom-image"/></view>
+								<span class="bottom-text">分享</span>
+								<button open-type="share" class="shareBtn"></button>
+							</view> -->
+							<!-- #endif -->
+							<view class="marT10">
+								<view>
+									<image :src="imgUrl + 'goods/my.png'" @click="goMine()" class="bottom-image" />
+								</view>
+								<span class="bottom-text1">{{languageStatus!=1?'我的':'내정보'}}</span>
+							</view>
+							<view class="qbBottomNavCenter marT18" @click="goLt" v-if="StoreData.mid != '0'">
+								<view>
+									<image :src="imgUrl + 'merchant/messageW1.png'" />
+								</view>
+								<span class="bottom-text">在线聊</span>
+							</view>
+							<view class="qbBottomNavRight marT18" :class="StoreData.mid != '0' ? '' : 'allRight'" @click="supple(StoreData, 'mobile')">
+								<view>
+									<image :src="imgUrl + 'merchant/phoneW1.png'" />
+								</view>
+								<span class="bottom-text">{{languageStatus!=1?'打电话':'전화하기'}}</span>
+							</view>
+						</view>
+					</view>
+					<!-- 底部导航栏 -->
+				</view>
+			</view>
+		</scroll-view>
+		<shareBottom :shareBottomShow="shareBottomShow" @clickmask="closeShareBottom" :postType="postType" :postId="postId"
+		 :shareShow="shareShow" @closeShareShow="closeShareShow" @shareImgShow="shareImgShow"></shareBottom>
+		 <far-bottom></far-bottom>
+		 <!-- 查看tag详情 -->
+		 <PopManager :show="zd" :type="'bottom'" @clickmask="zd = 0">
+		 	<view class="b-f" style="width: 92vw;border-radius: 30upx 30upx 0upx 0upx;padding: 30upx;">
+		 		<view class="f-30 f-w">
+		 			商户标签
+		 		</view>
+				<view  style="padding: 30upx 0;height: 650upx;overflow: auto;">
+					<view  style="padding-bottom: 20upx;" v-for="(tag,index) in deliverystatus.tagslist" :key="index">
+						<view  style="flex: 0.2;">
+							<view class="t-c f-26 dis-il-block" style="padding: 5upx 20upx;color: #FF4444;border: 1upx solid pink;border-radius: 8upx;">
+								{{tag.title}}
+							</view>
+						</view>
+						<view  style="flex: 0.8;">
+							<view class="t-c f-26 dis-il-block" style="padding: 0upx 0upx;color: #6f6f6f;border: 1upx solid #FFFFFF;line-height: 38upx;height: 38upx;border-radius: 5upx;">
+								{{tag.content}}
+							</view>
+						</view>
+					</view>
+				</view>
+		 	</view>
+		 </PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import DiyVideo from '@/components/page/pageComponents/Video.vue';
+	import storeGoods from '@/components/template/storeGoods.vue';
+	import storeComment from '@/components/template/storeComment.vue';
+	import storeDynamic from '@/components/template/storeDynamic.vue';
+	import loading from '@/components/template/loadlogo';
+	import PopManager from '@/components/template/PopManager';
+	import shareBottom from '@/components/template/shareBottom';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import workList from '@/components/template/workList.vue';
+	let videoContext = null;
+	export default {
+		data() {
+			return {
+				currentBannerHeight: null,
+				shareId: null,
+				bannerHeightList: [],
+				tags: [],
+				// 标签折叠 0关闭，1打开
+				zd: 0,
+				scrollHeight: null,
+				isPadding: null,
+				postId: '',
+				postType: '8',
+				shareBottomShow: false,
+				shareShow: false,
+				shareType: 'top',
+				companyList:[],
+				lat: null,
+				lng: null,
+				showCommunity:false,
+				slide_Top: 0,
+				currentTab: 'goods', // 当前选项卡类型
+				options: {},
+				StoreData: {
+					attestation: {
+						attestation: 0,
+						bondflag: 0
+					}
+				}, //商铺详情
+				bannerType: null, // 头部播放内类
+				tabbar: null,
+				isVideoPlay: false,
+				muted: false,
+				sid: null,
+				loadlogo: true ,//加载动画
+				deliverystatus:{
+					deliverystatus:0
+				},
+				texty:'',
+				imgiferror:true,
+				platformInfor:{},
+				ratio:0,
+				page:1,
+				pageIndex:10,
+				total:1,
+				imgUrl:'',
+				phoneOpen:true,
+				videoContexts:null,
+				clienType:''
+			};
+		},
+		onReady() {
+			let _this = this;
+			this.platformInfor = uni.getStorageSync('platformInfor');
+			videoContext = uni.createVideoContext('shopVideo', this);
+			this.videoContexts = uni.createVideoContext('shopVideo', this);
+		},
+		mounted() {},
+		watch: {
+			isVideoPlay(newValue, oldValue) {
+				videoContext = uni.createVideoContext('shopVideo', this);
+				this.videoContexts = uni.createVideoContext('shopVideo', this);
+			}
+		},
+		computed: {},
+		components: {
+			shareBottom,
+			DiyVideo,
+			storeGoods,
+			storeComment,
+			storeDynamic,
+			loading,
+			PopManager,
+			workList,
+			jyfParser
+		},
+		created() {
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+		},
+		previewImage(e) {
+		    let current = e.target.dataset.src;
+		    wx.previewImage({
+		      current: current,
+		      urls: [current]
+		    })
+		 }, 
+		 onReachBottom() {
+		 	if(this.page == this.total) return
+		 	this.page++;
+		 	// this.isMore = false;
+		 	this.getCompanyList(true);
+		 },
+		methods: {
+			lookimg(item,index){
+				if(item.type == 'pic'){
+					let img = [item.value];
+					uni.previewImage({
+					    current:0, //预览图片的下标
+					    urls: img//预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+					})
+				}else{
+					uni.previewImage({
+					    current:index, //预览图片的下标
+					    urls:item.value //预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+					})
+				}
+			},
+			goTakeout(){
+				console.log(1111)
+				App.navigationTo({
+					url:'pages/subPages2/businessCenter/foodList/foodList?id=' + this.deliverystatus.id + '&storeid=' + this.deliverystatus.id
+				})
+			},
+			imageError: function(e) {
+				if(this.StoreData.videourl){
+					this.bannerType = 'video';
+				}else if(this.StoreData.panorama){
+					this.bannerType = 'full'
+				}else {
+					this.StoreData.adv.map((item,index)=>{
+						if(item == e.detail.errMsg){
+							this.StoreData.adv.split(index,1);
+						}
+					})
+				}
+				
+				this.imgiferror = false;
+				this.loadlogo = false;
+				// console.error('image发生error事件，携带值为' + e.detail.errMsg);
+			},
+			imageLoad(e) {
+				let _this = this;
+				//当图片载入完毕时
+				let imgwidth = e.detail.width,
+					imgheight = e.detail.height,
+					//宽高比
+					ratio = imgwidth / imgheight;
+				// 计算的高度值
+				let viewHeight = 750 / ratio,
+					imgheightList = viewHeight,
+					bannerHeightList = _this.bannerHeightList;
+				//把每一张图片的对应的高度记录到数组里
+				bannerHeightList[e.target.dataset.id] = imgheightList;
+				this.setData({
+					bannerHeightList
+				});
+				if(bannerHeightList[0]){
+					this.bindchange();
+				}else{
+					this.loadlogo = false;
+				}
+			},
+			bindchange(e) {
+				if(e){
+					this.setData({
+						currentBannerHeight: e.detail.current || 0
+					});
+				}else{
+					this.setData({
+						currentBannerHeight: 0
+					});
+					if(!this.bannerHeightList[0]){
+						setTimeout(()=>{
+							this.bindchange();
+						},500)
+					}else{
+						this.loadlogo = false;
+					}
+					console.log(this.bannerHeightList[0],this.loadlogo);
+				}
+				
+				
+			},
+			getCompanyList(flag){
+				let data = {
+					page:this.page,
+					page_index:this.pageIndex,
+					release_sid:this.shareId,
+					is_total:1
+				}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						console.log(res);
+						if(flag){
+							this.companyList = this.companyList.concat(res.data.list);
+						}else{
+							this.companyList = res.data.list;
+							this.total = res.data.total;
+						}
+					},
+					false,
+					() => {
+						// this.isMore = true;
+					}
+				);
+			},
+			loadmore() {
+				let _this = this;
+				if (_this.currentTab == 'goods') {
+					_this.$refs.storeGoods.ReachBottom();
+				} else if (_this.currentTab == 'state') {
+					_this.$refs.storeDynamic.ReachBottom();
+				} else if (_this.currentTab == 'comment') {
+					_this.$refs.storeComment.ReachBottom();
+				}else if(_this.currentTab == "recruit"){
+					
+				}
+			},
+			// 标签折叠
+			labelZd() {
+				let _this = this;
+				if (_this.zd == '0') {
+					_this.zd = 1;
+				} else {
+					_this.zd = 0;
+				}
+			},
+			closeShareBottom() {
+				let _this = this;
+				_this.shareBottomShow = false;
+			},
+			goMine() {
+				App.navigationTo({
+					url: 'pages/mainPages/userCenter/userCenter'
+				});
+			},
+			goHome() {
+				App.navigationTo({
+					url: 'pages/mainPages/index/index'
+				});
+			},
+			/**
+			 * 广告类型切换
+			 */
+			bannerChange(type) {
+				// if(type == 'full'){
+				// 	//#ifndef H5
+				// 	console.log(this.StoreData.panorama);
+				// 	// App.navigationTo({
+				// 	// 	url: 'pages/subPages2/panorama/panorama?url=' + this.StoreData.panorama
+				// 	// });
+				// 	uni.navigateTo({
+				// 		url:'/pages/subPages2/panorama/panorama?url=' + this.StoreData.panorama
+				// 	})
+				// 	return
+				// 	//#endif
+				// }
+				//#ifndef H5
+				if(type == 'full'){
+					// debugger
+						uni.navigateTo({
+							url:'/pages/subPages/webview/webview?urlsrc=' + encodeURI(this.StoreData.panorama)
+						})
+					return
+				}
+				 //#endif
+				
+				this.bannerType = type;
+				if (type === 'video') {
+					setTimeout(()=>{
+						this.loadlogo = false;
+						videoContext.play();
+						this.videoContexts.play();
+					},500)
+					
+				};
+			},
+			// 关闭分享弹框
+			closeShareShow() {
+				let _this = this;
+				_this.shareShow = false;
+				_this.shareBottomShow = false;
+			},
+			shareImgShow() {
+				let _this = this;
+				_this.shareShow = true;
+				_this.shareBottomShow = false;
+			},
+			/**
+			 * 商铺详情
+			 */
+			getStoreDetail(sid = '', location = '') {
+				let _this = this,
+					tablist = [{
+							title: '商品',
+							type: 'goods',
+							status: true
+						},
+						{
+							title: '详情',
+							type: 'detail',
+							status: true
+						},
+						{
+							title: '动态',
+							type: 'state',
+							status: true
+						},
+						{
+							title: '评论',
+							type: 'comment',
+							status: true
+						},
+						{
+							title: '相册',
+							type: 'photo',
+							status: true
+						},
+						{
+							title: '小程序码',
+							type: 'qrCode',
+							status: true
+						},
+						{
+							title: '商家资质',
+							type: 'certification',
+							status: true
+						},
+						{
+							title: '招聘',
+							type: 'recruit',
+							status: true
+						}
+					];
+					App._post_form(
+						'&p=store&do=detail', {
+							sid,
+							lat: !!location ? location.latitude : '',
+							lng: !!location ? location.longitude : ''
+						},
+						res => {
+							_this.postId = res.data.id;
+							let StoreData = res.data;
+							this.$nextTick(function(){
+								setTimeout(()=>{
+									// #ifdef H5
+									document.title = res.data.storename
+									// #endif
+									// #ifndef H5
+									uni.setNavigationBarTitle({
+										title: res.data.storename
+									});
+									// #endif
+								})
+							})
+							for(let k in StoreData.moreinfo){
+								if(StoreData.moreinfo[k].type != 'img' && StoreData.moreinfo[k].type != 'pic'){
+									if(StoreData.moreinfo[k].value instanceof Array){
+										StoreData.moreinfo[k].value = StoreData.moreinfo[k].value.join(' - ');
+									}
+								}
+							}
+							_this.deliverystatus = res.data;
+							_this.tags = res.data.tags;
+							StoreData.score = Number(StoreData.score);
+							StoreData.noScore = Number(5 - StoreData.score);
+							uni.getSystemInfo({
+							    success: function (res) {
+							        console.log(res.windowWidth);
+									_this.ratio = res.windowWidth / _this.deliverystatus.imgstyle.width;
+							    }
+							});
+							console.log(_this.ratio,'宽高比例')
+							if(_this.deliverystatus.deliverystatus == '1'){
+								tablist[0].title = '活动';
+							}
+							if(res.data.attestation.attestation == '2'){
+								let labobj = {
+									title: '商家资质',
+									type: 'certification',
+									status: true
+								}
+								tablist.push(labobj);
+							}
+							if(res.data.hiderecruit != 1){
+								let labobj = {
+									title: '招聘',
+									type: 'recruit',
+									status: true
+								}
+								tablist.push(labobj);
+							}
+							if (!(!!StoreData.wxapp_qrcode)) {
+								tablist[5]['status'] = false;
+							};
+							_this.bannerType = !!StoreData.adv && StoreData.adv.length > 0 ? 'imgs' : !!StoreData.videourl ? 'video' :
+								'full';
+							_this.setData({
+								tabbar: res.data.order
+							});
+							// _this.tabbar.map((item,index)=>{
+							// 	// debugger
+							// 	// if()
+							// 	if(item.type == 'goods'){
+							// 		if(res.data.hidegoodslist == 1){
+							// 			item.status = false;
+							// 		}
+							// 	}
+							// 	if(item.type == 'detail'){
+							// 		if(res.data.hidedetail == 1){
+							// 			item.status = false;
+							// 		}
+							// 	}
+							// 	if(item.type == 'state'){
+							// 		if(res.data.hidedynamic == 1){
+							// 			item.status = false;
+							// 		}
+							// 	}
+							// 	if(item.type == 'comment'){
+							// 		if(res.data.hidecomment == 1){
+							// 			item.status = false;
+							// 		}
+							// 	}
+							// 	if(item.type == 'photo'){
+							// 		if(res.data.hidethumbs == 1){
+							// 			item.status = false;
+							// 		}
+							// 	}
+								_this.setData({
+									StoreData
+								});
+							// })
+							console.log(_this.tabbar);
+							
+							for(let i=0;i<=_this.tabbar.length;i++) { 
+							    if(_this.tabbar[i].status == 1) { 
+									_this.currentTab = _this.tabbar[i].type;
+									_this.curtabBar(_this.tabbar[i].type);
+							        return; 
+							    } 
+							    // document.write(i); 
+							}
+							
+							
+						},
+						false,
+						() => {
+							console.log(_this.StoreData.adv)
+							if(!_this.StoreData.adv){
+								_this.loadlogo = false;
+							}
+							if(_this.StoreData.videourl){
+								// _this.bannerType = 'video';
+								setTimeout(()=>{
+									_this.bannerChange('video');
+									
+								})
+								
+								// videoContext.play();
+							}
+							
+						}
+					);
+			
+			},
+			// 联系商家
+			goLt() {
+				let _this = this;
+				// App.navigationTo({
+				// 	url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.sid + '&other_party_type=2' + '' + '&type=1'
+				// });
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + _this.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+					})
+				}
+			},
+			// 收藏商户
+			collectStore(type) {
+				let _this = this,
+					options = _this.options;
+
+				App._post_form(
+					'&p=store&do=collection', {
+						sid: _this.sid
+					},
+					res => {
+						if (res.errno === 0) {
+							_this.StoreData.is_collection = _this.StoreData.is_collection === 1 ? 0 : 1;
+							_this.StoreData.pv = _this.StoreData.is_collection === 1 ?_this.StoreData.pv+1:_this.StoreData.pv-1;
+							if(type == 2){
+								App.showSuccess(_this.StoreData.is_collection === 1 ? '收藏成功' : '取消收藏');
+							}else{
+								App.showSuccess(_this.StoreData.is_collection === 1 ? '收藏成功' : '取消收藏');
+							}
+							
+						}
+					}
+				);
+			},
+			// 拨号跟地址
+			supple(storeInfo, supType) {
+				let _this = this;
+				if (supType === 'mobile') {
+					uni.makePhoneCall({
+						phoneNumber: storeInfo['mobile']
+					});
+				}
+
+				if (supType === 'address') {
+					console.info('storeInfo', storeInfo);
+					let store = {
+						storename: storeInfo['storename'],
+						address: storeInfo['address'],
+						location: {
+							lat: storeInfo['location']['lat'],
+							lng: storeInfo['location']['lng']
+						}
+					};
+					// #ifdef MP-WEIXIN
+					App.openLocation(store);
+					// #endif
+					// #ifdef H5
+					wxApi.wxRegister(function() {
+						wxApi.WxopenLocation(storeInfo['location']['lat'], storeInfo['location']['lng'], storeInfo['storename'],
+							storeInfo['address']);
+					});
+
+					// #endif
+					//#ifdef APP-PLUS
+					Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['storename'],'gcj02')
+					//#endif
+				}
+			},
+			//选
+			curtabBar(current) {
+				let _this = this;
+				if (current === 'goods') {
+					_this.$refs.storeGoods.tabbarShow();
+				}
+				if (current === 'comment') {
+					_this.$refs.storeComment.tabbarShow();
+				}
+				if (current === 'state') {
+					_this.$refs.storeDynamic.tabbarShow();
+				}
+				if(current === 'recruit'){
+					_this.getCompanyList()
+				}
+				_this.currentTab = current;
+			},
+			prevPhoto(currentIndex, photoType) {
+				let _this = this;
+				_this.phoneOpen = true;
+				if (photoType === 'shopPhoto') {
+					uni.previewImage({
+						current: _this.StoreData.album[currentIndex],
+						urls: _this.StoreData.album,
+						indicator: 'default',
+						success: function(res) {
+							console.log(res);
+						}
+					});
+				}
+			},
+			showVideoStatus(e) {
+				let moduleId = e.currentTarget.id,
+					playType = e.type,
+					isVideoPlay;
+				if (playType == 'play') {
+					isVideoPlay = true;
+				} else {
+					isVideoPlay = false;
+				}
+				this.isVideoPlay = isVideoPlay;
+			},
+			videoMuted(e) {
+				console.log('muted');
+				this.muted = !this.muted;
+			},
+			naviBuyOrder(sid, mid) {
+				if(this.platformInfor.newpayonline == 1){
+					App.navigationTo({
+						url: 'pages/subPages2/newBuyOrder/newBuyOrder?sid=' + sid + '&mid=' + mid
+					});
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages2/newBuyOrder/buyOrder?sid=' + sid + '&mid=' + mid
+					});
+				}
+			},
+			previewImage(e) {
+			    let current = e.target.dataset.src;
+			    wx.previewImage({
+			      current: current,
+			      urls: [current]
+			    })
+			 }, 
+			//导入定位
+			wxApiCallback() {
+				let _this = this;
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							App.getAreaId(res, '', '', options => {
+								_this.$nextTick(function() {
+									_this.getStoreDetail(options.sid, res);
+								});
+							});
+							_this.setData({
+								currentLoction: res
+							});
+							uni.setStorageSync('curLoction', res);
+						},
+						fail: function() {
+							App.getAreaId('', '', '', options => {
+								_this.$nextTick(function() {
+									_this.getStoreDetail(options.sid, '');
+								});
+							});
+						},
+						cancel: function() {
+							App.getAreaId('', '', '', options => {
+								_this.$nextTick(function() {
+									_this.getStoreDetail(options.sid, '');
+								});
+							});
+						}
+					});
+				});
+			}
+		},
+		onShow() {
+			if(this.phoneOpen){
+				this.phoneOpen = false;
+				return
+			}
+			let curLoction = uni.getStorageSync('curLoction')
+			this.getStoreDetail(this.sid,curLoction);
+		},
+		onLoad(options) {
+			let _this = this,
+				{
+					sid
+				} = options,
+				client = App.getClientType();
+			_this.shareId = options.sid;
+			_this.clienType = App.getClientType();
+			_this.imgUrl = uni.getStorageSync('imgPrefix')
+			uni.getSystemInfo({
+				success(res) {
+					let model = res.model,
+						iphoneModel = ['iPhone10,3', 'iPhone10,6', 'iPhone11,8', 'iPhone11,2', 'iPhone11,6'];
+					_this.isPadding = iphoneModel.includes(model) || model.indexOf('iPhone X') !== -1 || model.indexOf('iPhone12') !==
+						-1;
+					_this.phoneHight = res.windowHeight;
+					_this.scrollHeight = _this.phoneHight + 'px';
+				}
+			});
+			_this.texty = uni.getStorageSync('TextSubstitution');
+			let curLoction = uni.getStorageSync('curLoction'),
+				// 手动选择位置信息
+				agencyData = uni.getStorageSync('agencyData');
+			if (client === '1' || client === '3') {
+				if (!!curLoction) {
+					if (!!agencyData) {
+						_this.getStoreDetail(options.sid, curLoction);
+					} else {
+						App.getAreaId(curLoction, '', '', options => {
+							_this.getStoreDetail(options.sid, curLoction);
+						});
+					}
+				} else {
+					if (!!agencyData) {
+						_this.getStoreDetail(options.sid, _this.currentLoction);
+						console.log(_this.currentLoction, '_this.currentLoction');
+					} else {
+						// #ifdef H5
+						_this.wxApiCallback();
+						// #endif
+						// #ifndef H5
+						App.getLocation().then(res => {
+							App.getAreaId(res, '', '', options => {
+								_this.$nextTick(function() {
+									_this.getStoreDetail(_this.shareId, res);
+								});
+							});
+							_this.setData({
+								currentLoction: res
+							});
+							uni.setStorageSync('curLoction', res);
+						});
+						// #endif
+					}
+				}
+			} else {
+				_this.getStoreDetail(options.sid);
+			}
+			_this.setData(options);
+			_this.sid = options.sid;
+		},
+		onReachBottom(e) {
+			let _this = this,
+				currentTab = _this.currentTab,
+				refsData = currentTab === 'goods' ? 'storeGoods' : currentTab === 'state' ? 'storeDynamic' : currentTab ===
+				'comment' ? 'storeComment' : '';
+			!!refsData && _this.$refs.refsData.ReachBottom()
+		}
+	};
+</script>
+
+
+<style scoped lang="less">
+	@import 'index.less';
+	.labelRight {
+		margin: 15upx 10upx;
+		vertical-align: top;
+		display: inline-block;
+		width: 140upx;
+		height: 20upx;
+		line-height: 20upx;
+
+		>image {
+			width: 20upx;
+			height: 18upx;
+		}
+	}
+
+	.swiper-item-img {
+		width: 100%;
+		height: 89%;
+		background-size: 100% 100%;
+	}
+
+	.labelLeft {
+		vertical-align: top;
+		// width: 0upx;
+		width: 530upx;
+		display: inline-block;
+	}
+
+	.labelMb {
+		margin: 0 10upx 10upx 0;
+		display: inline-block;
+		height: 40upx;
+		border: 1upx solid rgba(238, 238, 238, 1);
+		border-radius: 20upx 20upx 20upx 20upx;
+	}
+
+	.labelText {
+		display: inline-block;
+		max-width: 500upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		padding: 0 17upx;
+		line-height: 40upx;
+		font-size: 20upx;
+		color: rgba(102, 102, 102, 1);
+	}
+
+	.labelView {
+		flex-wrap: wrap;
+		padding: 30upx 0 42upx 0;
+		font-size: 0;
+	}
+
+	.zd {
+		height: 10upx;
+		overflow: hidden;
+	}
+
+	.wzd {
+		height: auto;
+	}
+
+	page {
+		background-color: #f6f6f6;
+	}
+	
+	.bottom-image {
+		width: 35upx !important;
+		height: 35upx !important;
+	}
+
+	.bottom-text1 {
+		display: inline-block;
+		margin-top: 5upx !important;
+		font-size: 20upx !important;
+		color: rgba(51, 51, 51, 1) !important;
+	}
+
+	.bottom-text {
+		font-size: 20upx !important;
+		color: rgba(51, 51, 51, 1) !important;
+	}
+
+	.coverImg {
+		width: 750upx;
+	}
+
+	.qrcodeView {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		width: 750upx;
+		min-height: calc(100vw);
+		background: #ffffff;
+	}
+
+	.qrcodeMainView {
+		width: 300upx;
+		height: 300upx;
+		margin: 30upx auto 0 auto;
+
+		>image {
+			width: 300upx;
+			height: 300upx;
+		}
+	}
+	
+	.diyPages-community{
+		padding: 20upx 30upx;
+	}
+	
+	/* 社群 */
+	.goods-community {
+		padding-top: 20upx;
+	}
+	
+	.community-user .community-user-img {
+		width: 68upx;
+		height: 68upx;
+		display: block;
+		margin-right: 20upx;
+		border-radius: 50%;
+	}
+	
+	.community-add {
+		width: 110upx;
+		height: 54upx;
+		line-height: 54upx;
+		border-radius: 10upx;
+		font-size: 24upx;
+	}
+	
+	.community-add-bgcolor {
+		background-color: #2AC418;
+	}
+	
+	.community-detail {
+		border-radius: 20upx;
+		overflow: hidden;
+	}
+	
+	.community-detail .community-header {
+		width: 70vw;
+		height: 120upx;
+		line-height: 120upx;
+		overflow: hidden !important;
+	}
+	
+	.community-detail .community-header .community-header-text {
+		z-index: 2;
+	}
+	
+	.community-detail .community-header::after {
+		content: " ";
+		position: absolute;
+		top: -160upx;
+		left: -25%;
+		width: 150%;
+		height: 280upx;
+		border-radius: 60%;
+		background: linear-gradient(0deg, rgba(228, 63, 53, 1), rgba(253, 92, 79, 1));
+		z-index: 1;
+	}
+	
+	.community-detail .community-body {
+		padding: 50upx;
+	}
+	
+	.community-detail .community-phone {
+		height: 80upx;
+		line-height: 80upx;
+		margin: 0 30upx 30upx;
+		padding: 0 20upx 0 8upx;
+		border-radius: 10upx;
+		background: #F6F6F6;
+	}
+	
+	.community-detail .community-number .community-number-icon {
+		width: 60upx;
+		height: 60upx;
+		display: block;
+		/* margin-right: 15upx; */
+	}
+	
+	.community-detail .community-bdial {
+		width: 96upx;
+		height: 52upx;
+		line-height: 52upx;
+		background-color: #FF4444;
+		border-radius: 10upx;
+		color: #FFFFFF;
+	}
+	
+	.community-detail .community-reply {
+		width: 200upx;
+		height: 70upx;
+		line-height: 70upx;
+		background: linear-gradient(0deg, rgba(255, 115, 115, 1) 0%, rgba(255, 68, 68, 1) 100%);
+		border-radius: 35upx;
+		margin: 0 auto 30upx;
+	}
+	
+	.community-detail .community-qrcodeimg {
+		width: 366upx;
+		height: 366upx;
+		display: block;
+		margin: 0 auto 30upx;
+	}
+	
+	.community-bd{
+		border: 1upx solid #EEEEEE;
+	}
+	
+	.fullView {
+		width: 750upx;
+		height: 97upx;
+		background: #f6f6f6;
+	}
+
+	.home_logo1 {
+		display: block;
+		width: 40upx;
+		height: 40upx;
+	}
+
+	.home_logo2 {
+		display: inline-block;
+		width: 40upx;
+		height: 40upx;
+		vertical-align: middle;
+		margin: 0 5upx;
+	}
+
+	.home_logo3 {
+		vertical-align: middle;
+		display: inline-block;
+		width: 40upx;
+		height: 40upx;
+		margin: 0 5upx;
+	}
+
+	.info-logo {
+		vertical-align: middle;
+		display: inline-block;
+	}
+
+	.store-detail-topRight-title {
+		vertical-align: middle;
+		display: inline-block;
+	}
+</style>
diff --git a/pages/mainPages/store/index/diypage.vue b/pages/mainPages/store/index/diypage.vue
new file mode 100644
index 0000000..0b57d58
--- /dev/null
+++ b/pages/mainPages/store/index/diypage.vue
@@ -0,0 +1,769 @@
+<template>
+	<!-- :style="{'background-color:'!!pageInfo?pageInfo.background:'#FFD93F'}" -->
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-index" :style="'background-color: '+datas.page.background" :class="!!bottomMenu?'bottomPadding':''"
+		 v-if="loadlogo">
+		 <far-bottom></far-bottom>
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages :diypagesData="diypagesData" :pageData="datas.page" :btngroupData="btngroup" @getChild="getChild"/>
+			<block v-if="pageType==='13'">
+				<filtertab @selectAreaid="selectAreaid" @selectClassid="selectClassid" @selectClassTwoid="selectClassTwoid"
+				 @selectOrders="selectOrders" :requestType="'4'" @pageScrollHeight="pageScrollHeight" :isPageScroll="'1'"></filtertab>
+				<block v-if="!!cardlist&&cardlist.length>0">
+					<view class="business-card-box">
+						<business-card :businCard_list="cardlist" :is_collcet="'0'" :is_have="is_have"></business-card>
+						<load-more :isMore="loadingMore"></load-more>
+					</view>
+				</block>
+				<block v-else>
+					<none-mores></none-mores>
+				</block>
+			</block>
+			<view class="page-footer">
+				<TabBars :tabBarAct="0" :TabBarsData="datas.page.menu" :TabBarsType="datas.page.type" :pageType="pageType" :pageId="pageId" />
+			</view>
+			<view class="audio-main" @click="playAudio" v-if="!!pageInfo.music">
+				<view class="audio-bg" :class="{'stop-audio':!play_Audio}">
+					<view class="audio-gif" :style="{'background-image':'url('+imageRoot+'musicgif.gif)'}">
+						<view class="audio-png" :style="{'background-image':'url('+imageRoot+'music.png)'}"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+		 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+	</view>
+</template>
+<script>
+	let innerAudioContext = uni.createInnerAudioContext();
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import diypages from '@/components/template/diypages.vue'
+	import Advert from '@/components/template/advert.vue'
+	import TabBars from '@/components/template/tabBar.vue'
+	import wxApi from "@/common/js/wxApi.js"
+	import follow from '@/components/template/follow.vue'
+	import filtertab from "@/components/template/filtertab.vue"
+	import businessCard from "@/components/page/pageComponents/businessCard.vue"
+	import loadMore from '@/components/template/loadmore.vue'
+	import noneMores from '@/components/template/nonemores.vue'
+	export default {
+		data() {
+			return {
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				loadlogo: false,
+				swiperI: 1,
+				loading: false,
+				loadAgain: false,
+				datas: {
+					basic: [],
+					adv: '',
+					page: {},
+				},
+				play_Audio: false,
+				diypagesData: [],
+				richtext: {
+					imageProp: {
+						mode: 'widthFix'
+					}
+				},
+				pageInfo: {},
+				btngroup: {
+					backgroundColor: '#ffffff',
+					btnBordeRadius: '',
+					displayMode: '',
+					eachLineNum: '',
+					eachPageNum: '',
+					list: [],
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: [],
+					swiperHeight: ''
+				},
+				pageType: null,
+				pageId: null,
+				bottomMenu: null,
+				shareData: {},
+				current_page: 1,
+				order: "",
+				cate_one: "",
+				cate_two: "",
+				city_id: "",
+				total: null,
+				cardhave: null,
+				cardlist: [],
+				loadingMore: true,
+				is_have: null
+			}
+		},
+		components: {
+			Loadlogo,
+			diypages,
+			Advert,
+			TabBars,
+			follow,
+			filtertab,
+			businessCard,
+			loadMore,
+			noneMores
+		},
+		computed: {
+
+		},
+		onLoad(e) {
+			let client = App.getClientType(),
+				getBrowser = App.getBrowser(),
+				_this = this,
+				{
+					id,
+					type
+				} = e;
+			if (getBrowser === "chrome53.0") {
+				_this.loadlogo = true;
+				uni.showModal({
+					content: '微信浏览器版本过低,请使用系统浏览器',
+					showCancel: false
+				})
+				return false
+			};
+			if (client === "1" || client === "3") {
+				if (!!_this.agencyData) {
+					let location = {
+						latitude: _this.myLocation.latitude,
+						longitude: _this.myLocation.longitude
+					};
+					_this.getPagesData(location, type, id, _this.agencyData.aid)
+				} else {
+					// #ifdef H5
+					jWeixin.ready(() => {
+						jWeixin.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								App.getAreaId(res, "", "", (options) => {
+									uni.setStorageSync('agencyData', options.data)
+									uni.setStorageSync('myLocation', res)
+									_this.getPagesData(res, type, id, options.data.aid)
+								})
+							},
+							fail: function(err) {
+								console.log(err, '定位失败回调')
+								_this.getPagesData();
+							}
+						});
+					});
+					// #endif
+					// #ifndef H5
+					App.getLocation().then(res => {
+						App.getAreaId(res, "", "", (options) => {
+							uni.setStorageSync('agencyData', options.data)
+							uni.setStorageSync('myLocation', res)
+							_this.getPagesData(res, type, id, options.data.aid)
+						})
+					})
+					// #endif
+				}
+			} else {
+				_this.getPagesData("", type, id)
+				_this.setmpShare(type, id)
+			}
+			_this.setData({
+				pageType: type,
+				pageId: id
+			})
+		},
+		onShow() {
+
+		},
+		onHide() {
+			let _this = this,
+				play_Audio = false,
+				pageAudio = _this.pageInfo.music;
+			if (!play_Audio) {
+				innerAudioContext.pause()
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			_this.play_Audio = play_Audio
+		},
+		mounted() {
+
+		},
+		computed: {
+			agencyData() {
+				return uni.getStorageSync('agencyData')
+			},
+			myLocation() {
+				return uni.getStorageSync('myLocation')
+			}
+		},
+		methods: {
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			getPagesData(location = "", type = "1", page_id = 232, aid = "") {
+				let _this = this,
+					requestData = {
+						aid,
+						type,
+						lat: !!location ? location.latitude : "",
+						lng: !!location ? location.longitude : ""
+					};
+				if (type === "13") {
+					_this.setData({
+						city_id: _this.agencyData.areaid
+					})
+					_this.getShoplist(1, "", "", "", _this.city_id, _this.myLocation.latitude, _this.myLocation.longitude)
+				};
+				if (type === "1") {
+					Object.assign(requestData, {
+						page_id
+					});
+				};
+				App._post_form('&do=HomePage', requestData, res => {
+					if (res.errno === 0) {
+						_this.datas.adv = !!res.data.adv && res.data.adv.length !== 0 ? res.data.adv : "";
+						_this.datas.page = !!res.data.page ? res.data.page : "";
+						_this.bottomMenu = res.data.menu;
+						_this.pageInfo = res.data.page;
+						//修改页面标题
+						uni.setNavigationBarTitle({
+							title: _this.datas.page.title == null ? '暂无标题' : _this.datas.page.title
+						})
+
+						if (!!res.data.page.music) {
+							innerAudioContext.src = res.data.page.music;
+							_this.playAudio();
+						}
+						let diypagesData = res.data.item,
+							diypagesDataArray = [];
+
+						for (let i in diypagesData) {
+							diypagesDataArray.push(diypagesData[i])
+						}
+						// console.log(diypagesDataArray)
+						_this.diypagesData = diypagesDataArray;
+						//处理数据
+						for (let i in _this.diypagesData) {
+							/*
+							if(that.diypagesData[i].id == 'public_goods2'){ //查询
+								console.log(that.diypagesData[i])
+							}
+							*/
+
+							//处理按钮组数据
+							if (_this.diypagesData[i].id == 'menu') {
+								//初始化
+								_this.diypagesData[i].btngroupData = {}
+								let btngroupData = {}
+								btngroupData.list = []
+								btngroupData.indicatorDots = true
+								btngroupData.duration = 300
+								btngroupData.btngroupHandleData = []
+								btngroupData.swiperHeight = ''
+
+								btngroupData.backgroundColor = _this.diypagesData[i].style.background
+								btngroupData.btnBordeRadius = _this.diypagesData[i].style.navstyle
+								btngroupData.displayMode = _this.diypagesData[i].style.showtype
+								btngroupData.eachLineNum = _this.diypagesData[i].style.rownum
+								btngroupData.eachPageNum = _this.diypagesData[i].style.pagenum
+								for (let n in _this.diypagesData[i].data) {
+									btngroupData.list.push(_this.diypagesData[i].data[n])
+								}
+								if (_this.diypagesData[i].style.showdot == 0) {
+									btngroupData.indicatorDots = false
+								} else {
+									btngroupData.indicatorDots = true
+								}
+								let eachPageFactNum = '' //每页实际显示的数量
+								if (btngroupData.list.length > btngroupData.eachPageNum) {
+									eachPageFactNum = btngroupData.eachPageNum
+								} else {
+									eachPageFactNum = btngroupData.list.length
+								}
+								btngroupData.swiperHeight = Math.ceil(eachPageFactNum / btngroupData.eachLineNum) * 87 + 15
+								if (btngroupData.list && btngroupData.list.length > 0) {
+									let listsLength = Math.ceil(btngroupData.list.length / btngroupData.eachPageNum)
+									for (let j = 0; j < listsLength; j++) {
+										let arr = []
+										let arrIndex = j * btngroupData.eachPageNum
+										for (let m = arrIndex; m < btngroupData.eachPageNum * (j + 1) && m < btngroupData.list.length; m++) {
+											arr.push(btngroupData.list[m])
+										}
+										btngroupData.btngroupHandleData.push(arr)
+									}
+								}
+								_this.diypagesData[i].btngroupData = btngroupData
+							}
+							//处理图片橱窗风格4
+							if (_this.diypagesData[i].id == 'picturew4') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片橱窗风格5
+							if (_this.diypagesData[i].id == 'picturew5') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片展播
+							if (_this.diypagesData[i].id == 'pictures') {
+								let picturesArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturesArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturesArr
+							}
+							//处理商家信息
+							if (_this.diypagesData[i].id == 'shop') {
+								let shopArr = []
+								for (let s in _this.diypagesData[i].data) {
+									let goodsArr = []
+									for (let g in _this.diypagesData[i].data[s].goods) {
+										if (_this.diypagesData[i].data[s].goods[g] !== '') {
+											if (g == 'active') {
+												_this.diypagesData[i].data[s].goods[g].css = 'qiang'
+												_this.diypagesData[i].data[s].goods[g].tag = '抢'
+											} else if (g == 'coupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'hui'
+												_this.diypagesData[i].data[s].goods[g].tag = '券'
+											} else if (g == 'fightgroup') {
+												_this.diypagesData[i].data[s].goods[g].css = 'pin'
+												_this.diypagesData[i].data[s].goods[g].tag = '拼'
+											} else if (g == 'groupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'tuan'
+												_this.diypagesData[i].data[s].goods[g].tag = '团'
+											} else if (g == 'halfcard') {
+												_this.diypagesData[i].data[s].goods[g].css = 'ka'
+												_this.diypagesData[i].data[s].goods[g].tag = '卡'
+											} else if (g == 'packages') {
+												_this.diypagesData[i].data[s].goods[g].css = 'li'
+												_this.diypagesData[i].data[s].goods[g].tag = '礼'
+											} else if (g == 'bargain') {
+												_this.diypagesData[i].data[s].goods[g].css = 'kan'
+												_this.diypagesData[i].data[s].goods[g].tag = '砍'
+											}
+											goodsArr.push(_this.diypagesData[i].data[s].goods[g])
+										}
+									}
+									_this.diypagesData[i].data[s].goods = goodsArr
+									shopArr.push(_this.diypagesData[i].data[s])
+								}
+								_this.diypagesData[i].shopArr = shopArr
+							}
+						}
+						_this.datas.basic = _this.diypagesData;
+					}
+				}, false, () => {
+					_this.loadAgain = true
+					_this.loadlogo = true;
+				})
+			},
+			playAudio() {
+				let _this = this,
+					play_Audio = _this.play_Audio ? false : true,
+					pageAudio = _this.pageInfo.music;
+				if (play_Audio) {
+					//#ifdef H5
+					         jWeixin.ready(() => {
+					          jWeixin.getLocation({
+					           type: 'gcj02',
+					           success: function(res) {
+					            innerAudioContext.play();
+					           }
+					          });
+					         });
+					         //#endif
+					      //#ifndef H5
+					      innerAudioContext.play()
+					      //#endif
+					innerAudioContext.onPlay(() => {
+						console.log('开始播放');
+					});
+				}
+				if (!play_Audio) {
+					innerAudioContext.pause()
+					innerAudioContext.onPause(() => {
+						console.log('暂停播放');
+					});
+				}
+				_this.play_Audio = play_Audio
+			},
+			setmpShare(type, id = "") {
+				let _this = this;
+				App._post_form('&do=Shareinfo', {
+					type,
+					id
+				}, res => {
+					_this.shareData = res.data
+				})
+			},
+			selectAreaid(cityItemData) {
+				let _this = this,
+					{
+						sort,
+						cate_one,
+						cate_two
+					} = _this;
+				_this.setData({
+					city_id: cityItemData.id,
+					current_page: 1,
+				})
+				_this.getShoplist(1, sort, cate_one, cate_two, cityItemData.id, _this.myLocation.latitude, _this.myLocation.longitude);
+			},
+			selectClassid(classItemData) {
+				let _this = this,
+					{
+						sort,
+						city_id
+					} = _this;
+				if (classItemData.list.length === 0) {
+					_this.getShoplist(1, sort, classItemData.cate_one, "", city_id, _this.myLocation.latitude, _this.myLocation.longitude);
+					_this.setData({
+						current_page: 1,
+						cate_two: ""
+					})
+				}
+				_this.setData({
+					cate_one: classItemData.cate_one
+				})
+			},
+			selectClassTwoid(classItemTwoData) {
+				let _this = this,
+					{
+						sort,
+						city_id,
+						cate_one
+					} = _this;
+				_this.getShoplist(1, sort, cate_one, classItemTwoData.cate_two, city_id, _this.myLocation.latitude, _this.myLocation
+					.longitude);
+				_this.setData({
+					cate_two: classItemTwoData.cate_two,
+					current_page: 1,
+				})
+			},
+			selectOrders(ordersItem) {
+				console.log(ordersItem)
+				let _this = this,
+					{
+						city_id,
+						cate_one,
+						cate_two
+					} = _this;
+				_this.getShoplist(1, ordersItem.val, cate_one, cate_two, city_id, _this.myLocation.latitude, _this.myLocation.longitude);
+				_this.setData({
+					sort: ordersItem.val,
+					current_page: 1
+				})
+			},
+			pageScrollHeight(isshowTabbar) {
+				if (isshowTabbar === '1') {
+					uni.pageScrollTo({
+						scrollTop: 190
+					})
+				} else {
+					uni.pageScrollTo({
+						scrollTop: 0
+					})
+				}
+			},
+			getChild(e) {
+				let _this = this,
+					{
+						sort,
+						cate_one,
+						cate_two,
+						city_id,
+						current_page,
+						total
+					} = _this;
+				_this.getShoplist(1, sort, cate_one, cate_two, city_id, _this.currentLoction.latitude, _this.currentLoction.longitude, false,e)
+			},
+			getShoplist(page = 1, sort = "", cate_one = "", cate_two = "", city_id = "", lat = "", lng = "", isPage = false,search = '') {
+				let _this = this,
+					requestData = {
+						page,
+						sort,
+						cate_one,
+						cate_two,
+						city_id,
+						lat,
+						lng,
+						is_collect: 0,
+						search
+					};
+				App._post_form('&p=citycard&do=homeList', requestData, res => {
+					let cardlist = res.data.list;
+					if (isPage) {
+						if (cardlist.length > 0) {
+							_this["cardlist"].push(...cardlist);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						console.log(cardlist,'0000000')
+						_this.setData({
+							cardlist,
+							loadingMore: cardlist.length === 0 || _this.current_page === res.data.total,
+							total: res.data.total,
+							is_have: res.data.is_have
+						})
+					}
+				})
+			},
+			cardOnReachBottom() {
+				console.log('Bottom')
+				let _this = this,
+					{
+						sort,
+						cate_one,
+						cate_two,
+						city_id,
+						current_page,
+						total
+					} = _this;
+				if (current_page >= total) {
+					_this.loadingMore = true;
+					return false;
+				}
+				_this.getShoplist(++_this.current_page, sort, cate_one, cate_two, city_id, _this.myLocation.latitude, _this.myLocation
+					.longitude, true)
+			}
+		},
+		destroyed() {
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+		},
+		onUnload() {
+			this.play_Audio = false;
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+		},
+		onPullDownRefresh() {
+
+		},
+		onReachBottom() {
+			console.log()
+			if (this.pageType !== '13') {
+				uni.$emit('isBottomMore')
+				uni.$emit('tabisBottomMore')
+			} else {
+				this.cardOnReachBottom()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #FFD93F;
+	}
+
+	.page-index {
+		width: 100vw;
+		overflow: hidden;
+		background-color: #fff;
+		position: relative;
+	}
+
+	.index-right-bar {
+		width: 80px;
+		height: 80px;
+		padding: 16px;
+		position: fixed;
+		right: 30px;
+		bottom: 60px;
+		z-index: 99;
+	}
+
+	.right-bar-i {
+		width: 100%;
+		height: 100%;
+		padding: 6px;
+	}
+
+	.right-bar-i-t {
+		height: 40px;
+		text-align: center;
+		margin-top: 0;
+		padding-top: 6px;
+	}
+
+	.right-bar-i-t .i {
+		width: 44px;
+		height: 44px;
+		display: inline-block;
+	}
+
+	.right-bar-i-t .i .image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.right-bar-i-c {
+		height: 32px;
+		line-height: 32px;
+		font-size: 20px;
+		margin-top: 0;
+	}
+
+	.index-h {
+		height: 80px;
+		line-height: 80px;
+		padding: 10px 30px 20px 30px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #FFD93F;
+		position: relative;
+	}
+
+	.index-h-l {
+		color: #000;
+		font-size: 36px;
+		font-style: italic;
+
+	}
+
+	.index-h-r-d {
+		width: 180px;
+		height: 56px;
+		line-height: 56px;
+		color: #808080;
+		font-size: 28px;
+		text-align: center;
+		margin-top: 12px;
+		background-color: #FFF0B2;
+		border-radius: 40px;
+	}
+
+	.index-h-r-d .i {
+		color: #333;
+		font-size: 32px;
+		margin-right: 10px;
+		vertical-align: -2px;
+	}
+
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1);
+		}
+
+		100% {
+			transform: translateX(-66.66666%) translateZ(0) scaleY(1);
+		}
+	}
+
+	.index-wave {
+		width: 100%;
+		height: 60px;
+		position: absolute;
+		top: -72px;
+		left: 0;
+		overflow: hidden;
+	}
+
+	.index-wave-d {
+		width: 300%;
+		height: 100%;
+		animation: move_wave 4s linear infinite;
+		animation-delay: 0s;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.index-wave-i {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.index-wave-i .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.index-t1 {
+		margin-top: 40px;
+		padding: 0 30px;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 1;
+	}
+
+	.index-t1-l {
+		padding-right: 30px;
+		flex: 1;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.index-t1-l-i {
+		width: 140px;
+	}
+
+	.index-t1-l-i-t {
+		width: 100px;
+		height: 100px;
+		padding: 0 20px;
+	}
+
+	.index-t1-l-i-t .image {
+		width: 100px;
+		height: 100px;
+	}
+
+	.index-t1-l-i-b {
+		height: 42px;
+		line-height: 42px;
+		text-align: center;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.index-t1-r {
+		width: 140px;
+		border-left: 1.2px solid #f6f6f6;
+	}
+
+	.index-t1-r .image {
+		width: 110px;
+		height: 110px;
+		margin: 10px 0 0 30px;
+	}
+
+	.bottomPadding {
+		padding-bottom: 100upx;
+	}
+
+	.business-card-box {
+		padding: 30upx 0 120upx;
+		background-color: #F8F8F8;
+	}
+</style>
diff --git a/pages/mainPages/store/index/index.vue b/pages/mainPages/store/index/index.vue
new file mode 100644
index 0000000..5ad1957
--- /dev/null
+++ b/pages/mainPages/store/index/index.vue
@@ -0,0 +1,453 @@
+<template>
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-index" :style="'background-color: '+datas.page.background" :class="!!bottomMenu?'bottomPadding':''"
+		 v-if="loadlogo">
+		 <far-bottom></far-bottom>
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages ref="diypages" :diypagesData="diypagesData" :pageData="datas.page" :btngroupData="btngroup" />
+			<view class="full"></view>
+			<view class="page-footer" v-if="isTabbars">
+				<TabBars :tabBarAct="0" :tabBarData="bottomMenu" :TabBarsType="datas.page.type" />
+			</view>
+			<view class="audio-main" @click="playAudio" v-if="!!pageInfo.music">
+				<view class="audio-bg" :class="{'stop-audio':!play_Audio}">
+					<view class="audio-gif" :style="{'background-image':'url('+imageRoot+'musicgif.gif)'}">
+						<view class="audio-png" :style="{'background-image':'url('+imageRoot+'music.png)'}"></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+		 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+	</view>
+</template>
+<script>
+	let innerAudioContext = uni.createInnerAudioContext();
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import diypages from '@/components/template/diypages.vue'
+	import Advert from '@/components/template/advert.vue'
+	import TabBars from '@/components/template/tabBar.vue'
+	import recommendGoods from "@/components/page/pageComponents/Recommend_goods.vue"
+	import wxApi from "@/common/js/wxApi.js"
+	import follow from '@/components/template/follow.vue';
+	export default {
+		data() {
+			return {
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				loadlogo: false,
+				swiperI: 1,
+				loading: false,
+				loadAgain: false,
+				isTabbars: true,
+				datas: {
+					basic: [],
+					adv: '',
+					page: {},
+				},
+				pageInfo: {},
+				play_Audio: false,
+				diypagesData: [],
+				richtext: {
+					imageProp: {
+						mode: 'widthFix'
+					}
+				},
+				btngroup: {
+					backgroundColor: '#ffffff',
+					btnBordeRadius: '',
+					displayMode: '',
+					eachLineNum: '',
+					eachPageNum: '',
+					list: [],
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: [],
+					swiperHeight: '',
+				},
+				bottomMenu: null
+			}
+		},
+		components: {
+			Loadlogo,
+			diypages,
+			Advert,
+			TabBars,
+			recommendGoods,
+			follow
+		},
+		computed: {
+
+		},
+		onShow() {
+		 this.playAudio();
+		},
+		onHide() {
+			let _this = this,
+				play_Audio = false,
+				pageAudio = _this.pageInfo.music;
+			if (!play_Audio) {
+				innerAudioContext.pause()
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			_this.play_Audio = play_Audio
+		},
+		mounted() {
+			
+				let agencyData = uni.getStorageSync('agencyData'),
+					myLocation = uni.getStorageSync('myLocation'),
+					client = App.getClientType(),
+					getBrowser = App.getBrowser(),
+					_this = this;
+				if (getBrowser === "chrome53.0") {
+					_this.loadlogo = true;
+					_this.isTabbars = false;
+					uni.showModal({
+						content: '微信浏览器版本过低,请使用系统浏览器',
+						showCancel: false
+					})
+					return false
+				}
+				if (client === "1" || client === "3") {
+					if (!!agencyData) {
+						let location = {
+							latitude: myLocation.latitude,
+							longitude: myLocation.longitude
+						};
+						_this.getPagesData(location, agencyData.aid)
+					} else {
+						// #ifdef H5
+						jWeixin.ready(() => {
+							jWeixin.getLocation({
+								type: 'gcj02',
+								success: function(res) {
+									App.getAreaId(res, "", "", (options) => {
+										uni.setStorageSync('agencyData', options.data);
+										uni.setStorageSync('myLocation', res);
+										_this.getPagesData(res, options.data.aid);
+									})
+								},
+								fail: function(err) {
+									console.log(err, '定位失败回调')
+									_this.getPagesData();
+								}
+							});
+						});
+						// #endif
+						// #ifndef H5
+						App.getLocation().then(res => {
+							App.getAreaId(res, "", "", (options) => {
+								uni.setStorageSync('agencyData', options.data);
+								uni.setStorageSync('myLocation', res);
+								_this.getPagesData(res, options.data.aid);
+							})
+						})
+						// #endif
+					}
+				} else {
+					_this.getPagesData()
+				}
+			
+		},
+		methods: {
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			getPagesData(location = "", aid = "") {
+				let _this = this;
+				App._post_form('&do=HomePage', {
+					lat: !!location ? location.latitude : "",
+					lng: !!location ? location.longitude : "",
+					aid
+				}, res => {
+					if (res.errno === 0) {
+						_this.datas.adv = !!res.data.adv && res.data.adv.length !== 0 ? res.data.adv : "";
+						_this.datas.page = !!res.data.page ? res.data.page : "";
+						_this.bottomMenu = res.data.menu;
+						_this.pageInfo = res.data.page;
+						_this.$store.commit('ISTABCONTRO', 1)
+						if (!!res.data.page.music) {
+							innerAudioContext.src = res.data.page.music;
+							setTimeout(()=>{
+								jWeixin.ready(() => {
+									innerAudioContext.play();
+								});
+								// _this.playAudio();
+							})
+						}
+						let diypagesData = res.data.item,
+							diypagesDataArray = [];
+
+						for (let i in diypagesData) {
+							diypagesDataArray.push(diypagesData[i])
+						}
+						_this.diypagesData = diypagesDataArray;
+						//处理数据
+						for (let i in _this.diypagesData) {
+
+							//处理按钮组数据
+							if (_this.diypagesData[i].id == 'menu') {
+								//初始化
+								_this.diypagesData[i].btngroupData = {}
+								let btngroupData = {}
+								btngroupData.list = []
+								btngroupData.indicatorDots = true
+								btngroupData.duration = 300
+								btngroupData.btngroupHandleData = []
+								btngroupData.swiperHeight = ''
+
+								btngroupData.backgroundColor = _this.diypagesData[i].style.background
+								btngroupData.btnBordeRadius = _this.diypagesData[i].style.navstyle
+								btngroupData.displayMode = _this.diypagesData[i].style.showtype
+								btngroupData.eachLineNum = _this.diypagesData[i].style.rownum
+								btngroupData.eachPageNum = _this.diypagesData[i].style.pagenum
+								for (let n in _this.diypagesData[i].data) {
+									btngroupData.list.push(_this.diypagesData[i].data[n])
+								}
+								if (_this.diypagesData[i].style.showdot == 0) {
+									btngroupData.indicatorDots = false
+								} else {
+									btngroupData.indicatorDots = true
+								}
+								let eachPageFactNum = '' //每页实际显示的数量
+								if (btngroupData.list.length > btngroupData.eachPageNum) {
+									eachPageFactNum = btngroupData.eachPageNum
+								} else {
+									eachPageFactNum = btngroupData.list.length
+								}
+								btngroupData.swiperHeight = Math.ceil(eachPageFactNum / btngroupData.eachLineNum) * 87 + 15
+								if (btngroupData.list && btngroupData.list.length > 0) {
+									let listsLength = Math.ceil(btngroupData.list.length / btngroupData.eachPageNum)
+									for (let j = 0; j < listsLength; j++) {
+										let arr = []
+										let arrIndex = j * btngroupData.eachPageNum
+										for (let m = arrIndex; m < btngroupData.eachPageNum * (j + 1) && m < btngroupData.list.length; m++) {
+											arr.push(btngroupData.list[m])
+										}
+										btngroupData.btngroupHandleData.push(arr)
+									}
+								}
+								_this.diypagesData[i].btngroupData = btngroupData
+							}
+							//处理图片橱窗风格4
+							if (_this.diypagesData[i].id == 'picturew4') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片橱窗风格5
+							if (_this.diypagesData[i].id == 'picturew5') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片展播
+							if (_this.diypagesData[i].id == 'pictures') {
+								let picturesArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturesArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturesArr
+							}
+							//处理商家信息
+							if (_this.diypagesData[i].id == 'shop') {
+								let shopArr = []
+								for (let s in _this.diypagesData[i].data) {
+									let goodsArr = []
+									for (let g in _this.diypagesData[i].data[s].goods) {
+										if (_this.diypagesData[i].data[s].goods[g] !== '') {
+											if (g == 'active') {
+												_this.diypagesData[i].data[s].goods[g].css = 'qiang'
+												_this.diypagesData[i].data[s].goods[g].tag = '抢'
+											} else if (g == 'coupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'hui'
+												_this.diypagesData[i].data[s].goods[g].tag = '券'
+											} else if (g == 'fightgroup') {
+												_this.diypagesData[i].data[s].goods[g].css = 'pin'
+												_this.diypagesData[i].data[s].goods[g].tag = '拼'
+											} else if (g == 'groupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'tuan'
+												_this.diypagesData[i].data[s].goods[g].tag = '团'
+											} else if (g == 'halfcard') {
+												_this.diypagesData[i].data[s].goods[g].css = 'ka'
+												_this.diypagesData[i].data[s].goods[g].tag = '卡'
+											} else if (g == 'packages') {
+												_this.diypagesData[i].data[s].goods[g].css = 'li'
+												_this.diypagesData[i].data[s].goods[g].tag = '礼'
+											} else if (g == 'bargain') {
+												_this.diypagesData[i].data[s].goods[g].css = 'kan'
+												_this.diypagesData[i].data[s].goods[g].tag = '砍'
+											}
+											goodsArr.push(_this.diypagesData[i].data[s].goods[g])
+										}
+									}
+									_this.diypagesData[i].data[s].goods = goodsArr
+									shopArr.push(_this.diypagesData[i].data[s])
+								}
+								_this.diypagesData[i].shopArr = shopArr
+							}
+							if (_this.diypagesData[i].id == 'banner') {
+								let imageWidth = _this.diypagesData[i].width,
+									imageHeight = _this.diypagesData[i].height,
+									imageRatio = imageWidth / imageHeight;
+								uni.getSystemInfo({
+									success(res) {
+										let windowHeight = res.windowWidth / imageRatio;
+										_this.diypagesData[i].autoHeight = windowHeight;
+									}
+								})
+
+							}
+						}
+						_this.datas.basic = _this.diypagesData;
+					}
+				}, false, () => {
+					_this.loadAgain = true;
+					_this.loadlogo = true;
+				})
+			},
+			playAudio() {
+				let _this = this,
+					play_Audio = _this.play_Audio ? false : true,
+					pageAudio = _this.pageInfo.music;
+				if (play_Audio) {
+					//#ifdef H5
+					    jWeixin.ready(() => {
+					     jWeixin.getLocation({
+					      type: 'gcj02',
+					      success: function(res) {
+					       innerAudioContext.play();
+					      }
+					     });
+					    });
+					    //#endif
+						//#ifndef H5
+						innerAudioContext.play()
+						//#endif
+					innerAudioContext.onPlay(() => {
+						console.log('开始播放');
+					});
+				}
+				if (!play_Audio) {
+					innerAudioContext.pause()
+					innerAudioContext.onPause(() => {
+						console.log('暂停播放');
+					});
+				}
+				_this.play_Audio = play_Audio
+			}
+		},
+		destroyed() {
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+		},
+		onUnload() {
+			this.play_Audio = false;
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			//console.log('')
+
+			//停止下拉刷新
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom(e) {
+			uni.$emit('isBottomMore')
+			uni.$emit('tabisBottomMore');
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #FFD93F;
+	}
+
+	.page-index {
+		width: 100vw;
+		overflow: hidden;
+		background-color: #fff;
+		position: relative;
+	}
+
+	.bottomPadding {
+		padding-bottom: 100upx;
+	}
+
+	@keyframes rotate2d {
+		from {
+			transform: rotate(0)
+		}
+
+		to {
+			transform: rotate(360deg)
+		}
+	}
+	.full{
+		width: 750upx;
+		height: 110upx;
+		background: #F8F8F8;
+	}
+	.audio-main {
+		position: fixed;
+		right: 50upx;
+		top: 10%;
+		z-index: 10;
+	}
+
+	.audio-bg {
+		position: relative;
+	}
+
+	.audio-bg .audio-gif {
+		width: 100upx;
+		height: 100upx;
+		background-size: 100upx 100upx;
+		background-repeat: no-repeat;
+	}
+
+	.audio-bg .audio-gif .audio-png {
+		position: absolute;
+		background-size: 80upx 80upx;
+		animation: rotate2d 1.2s linear infinite;
+		z-index: -1;
+		width: 80upx;
+		height: 80upx;
+	}
+
+	.audio-bg.stop-audio .audio-gif {
+		background: none !important;
+	}
+
+	.audio-bg.stop-audio .audio-png {
+		animation: none;
+	}
+</style>
diff --git a/pages/mainPages/store/list.vue b/pages/mainPages/store/list.vue
new file mode 100644
index 0000000..f9671f9
--- /dev/null
+++ b/pages/mainPages/store/list.vue
@@ -0,0 +1,357 @@
+<template>
+	<!-- 商户列表 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="content" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<filtertab @selectAreaid="selectAreaid" @selectClassid="selectClassid" @selectClassTwoid="selectClassTwoid"
+			 @selectOrders="selectOrders" :requestType="'2'" :cate_one="cate_one" :cate_two="cate_two" :title="title" @getOrderId="shopInit"></filtertab>
+			<view class="shop b-color-f8">
+				<block v-if="!!shopInfoList && shopInfoList.length>0">
+					<view class="shangjia">
+						<view class="shangjia-i" :class="{shangjiaISty: item2.goods.length == 0}" v-for="(item2, key2) in shopInfoList"
+						 :key="key2">
+							<view class="a shangjia-i-t" @click="navigateTo(item2.shop_url)">
+								<view class="shangjia-i-l">
+									<image class="image" :src="item2.logo" mode="aspectFill"></image>
+								</view>
+								<view class="shangjia-i-r">
+									<view class="shangjia-i-r-d">
+										<view class="dis-flex flex-y-center flex-x-between">
+											<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+											<view class="store-containerIcon dis-flex flex-y-center">
+												<image :src="imgfixUrls + 'homePage/home_logo2.png'" class="image30" v-if="item2['attestation']['attestation'] == 2" />
+												<!-- <img src="@imgfixUrls + 'merchant/qyrz.png" /> -->
+												<image :src="imgfixUrls + 'homePage/home_logo3.png'" class="image30" v-if="item2['attestation']['bondflag'] == 1" />
+												<image :src="imgfixUrls + 'diypage/720icon.png'" mode="" class="m-right10" v-if="item2.panorama===1"></image>
+												<image :src="imgfixUrls + 'diypage/videoicon.png'" mode="" v-if="item2.videourl===1"></image>
+											</view>
+										</view>
+										<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+											<view class="dis-flex flex-y-center">
+												<view class="shangjia-i-r-t2-icon">
+													<view class="star star-dark">
+														<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+													</view>
+													<view class="star star-light">
+														<view class="star-width" :style="'width:'+(item2.score / 5) * 100+'%;'">
+															<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+														</view>
+													</view>
+												</view>
+												<view class="f-28 col-6 star-grade">{{item2.score}}分</view>
+											</view>
+											<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{item2.distance}}</view>
+										</view>
+										<view class="shangjia-i-r-t3 over-omit">
+											<view class="p" v-html="item2.storehours"></view>
+										</view>
+										<view class="shangjia-i-r-t4 over-omit">
+											<view v-for="(item3,index3) in item2.tags" class="tags_view">{{item3}}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || (shopFoldIndex !== key2)) && item2.goods.length > 0">
+								<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+									<view class="i icon iconfont icon-unfold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+								<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+									<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="!shopFold && shopFoldIndex == key2 &&  item2.goods.length > 2">
+								<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+									<view class="i icon iconfont icon-fold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<load-more :isMore="loadingMore"></load-more>
+					</view>
+				</block>
+				<block v-else>
+					<none-mores></none-mores>
+				</block>
+			</view>
+		</view>
+		<GoTopBtn :page-scroll="pageScroll"></GoTopBtn>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo'
+	import loadMore from '@/components/template/loadmore.vue'
+	import GoTopBtn from "@/components/template/GoTopBtn.vue"
+	import listMixin from "@/common/js/pageListMixin.js"
+	import noneMores from '@/components/template/nonemores.vue'
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+	import filtertab from "@/components/template/filtertab.vue"
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				showTabbar: false,
+				homeInfoData: {},
+				goodsListData: [],
+				loadlogo: false, //页面是否加载完成,
+				currentType: null,
+				current_page: 1,
+				order: "",
+				cate_one: "",
+				cate_two: "",
+				region_id: "",
+				lat: "",
+				lng: "",
+				shopInfoList: [],
+				pageScroll: 0,
+				total: null,
+				shopFold: true,
+				shopFoldIndex: -1,
+				loadingMore: true,
+				title:'',
+				search:'',
+				onPage:true
+			}
+		},
+		watch: {
+
+		},
+		components: {
+			Loadlogo,
+			GoTopBtn,
+			loadMore,
+			noneMores,
+			filtertab
+		},
+		computed: {
+			agencyData() {
+				return uni.getStorageSync('agencyData')
+			},
+			curLoction(){
+				return uni.getStorageSync('curLoction')
+			}
+		},
+		onLoad(option) {
+			let _this = this;
+			_this.setData({
+				cate_one: option.cate_one > 0 ? option.cate_one : "",
+				cate_two: option.cate_two > 0 ? option.cate_two : "",
+				title: option.title? option.title : "",
+				search:option.search?option.search:""
+			})
+			
+			console.log(_this.cate_one,_this.cate_two,_this.title)
+			_this.shopInit('',option.title,true)
+		},
+		methods: {
+			shopInit(orderid,title,flag) {
+				if(this.onPage && !flag) return
+				let _this = this;
+				// _this.title = title;
+				_this.setData({
+					orderid
+				});
+				_this.getShoplist(1, orderid, _this.cate_one, _this.cate_two, _this.agencyData.areaid, _this.curLoction.latitude, _this.curLoction.longitude)
+			},
+			getShoplist(page = 1, order = "", cate_one = "", cate_two = "", region_id = "", lat = "", lng = "", isPage = false) {
+				let _this = this,
+					requestData = {
+						page,
+						order,
+						cate_one,
+						cate_two,
+						region_id,
+						lat,
+						lng,
+						is_total: 1,
+						search:_this.search
+					};
+				App._post_form('&p=store&do=homeList', requestData, res => {
+					let storeList = res.data.list;
+					if (!!storeList && storeList.length > 0) {
+						for (let i = 0; i < storeList.length; i++) {
+							let goodsList = [];
+							for (let j in storeList[i].goods) {
+								let goodsData = storeList[i].goods[j];
+								if (goodsData !== '') {
+
+									if (j == 'active') {
+										goodsData.css = 'qiang'
+										goodsData.tag = '抢'
+									} else if (j == 'coupon') {
+										goodsData.css = 'hui'
+										goodsData.tag = '券'
+									} else if (j == 'fightgroup') {
+										goodsData.css = 'pin'
+										goodsData.tag = '拼'
+									} else if (j == 'groupon') {
+										goodsData.css = 'tuan'
+										goodsData.tag = '团'
+									} else if (j == 'halfcard') {
+										goodsData.css = 'ka'
+										goodsData.tag = '卡'
+									} else if (j == 'packages') {
+										goodsData.css = 'li'
+										goodsData.tag = '礼'
+									} else if (j == 'bargain') {
+										goodsData.css = 'kan'
+										goodsData.tag = '砍'
+									}
+									goodsList.push(goodsData);
+								}
+							}
+							storeList[i].goods = goodsList;
+						}
+					}
+					if (isPage) {
+						if (storeList.length > 0) {
+							_this["shopInfoList"].push(...storeList);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData({
+							shopInfoList: storeList,
+							loadingMore: storeList.length === 0 || _this.current_page === res.data.total,
+							total: res.data.total
+						})
+					}
+				}, false, () => {
+					_this.search = '';
+					_this.loadlogo = true;
+				})
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			},
+			shangjiaFold(key2) {
+				this.shopFold = false
+				this.shopFoldIndex = key2
+			},
+			shangjiaUpFold(key2) {
+				this.shopFold = true
+				this.shopFoldIndex = key2
+			},
+			selectAreaid(cityItemData) {
+				if(this.onPage){
+					this.onPage = false;
+					return
+				}
+				let _this = this,
+					{
+						order,
+						cate_one,
+						cate_two
+					} = _this;
+				_this.setData({
+					region_id: cityItemData.id,
+					current_page: 1,
+				})
+				_this.getShoplist(1, order, cate_one, cate_two, cityItemData.id, _this.curLoction.latitude, _this.curLoction.longitude);
+			},
+			selectClassid(classItemData) {
+				if(this.onPage) return
+				let _this = this,
+					{
+						order,
+						region_id
+					} = _this;
+				if (classItemData.list.length === 0) {
+					_this.getShoplist(1, order, classItemData.cate_one, "", region_id, _this.curLoction.latitude, _this.curLoction.longitude);
+					_this.setData({
+						current_page: 1,
+					})
+				}
+				_this.setData({
+					cate_one: classItemData.cate_one
+				});
+				// _this.title = '';
+			},
+			selectClassTwoid(classItemTwoData) {
+				if(this.onPage) return
+				let _this = this,
+					{
+						order,
+						region_id,
+						cate_one
+					} = _this;
+				_this.getShoplist(1, order, cate_one, classItemTwoData.cate_two, region_id, _this.curLoction.latitude, _this.curLoction.longitude);
+				_this.setData({
+					cate_two: classItemTwoData.cate_two,
+					current_page: 1,
+				});
+				// _this.title = '';
+			},
+			selectOrders(ordersItem) {
+				if(this.onPage) return
+				let _this = this,
+					{
+						region_id,
+						cate_one,
+						cate_two
+					} = _this;
+				_this.getShoplist(1, ordersItem.val, cate_one, cate_two, region_id, _this.curLoction.latitude, _this.curLoction.longitude);
+				_this.setData({
+					order: ordersItem.val,
+					current_page: 1
+				})
+			}
+		},
+		mounted() {
+
+		},
+		onReachBottom(e) {
+			console.log('Bottom')
+			let _this = this,
+				{
+					order,
+					cate_one,
+					cate_two,
+					region_id,
+					current_page,
+					total
+				} = _this;
+			if (current_page >= total) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getShoplist(++_this.current_page, order, cate_one, cate_two, region_id, _this.curLoction.latitude, _this.curLoction.longitude, true)
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../../common/css/old_diyPages";
+
+	page {
+		background-color: #f7f7f7;
+	}
+</style>
diff --git a/pages/mainPages/successRelease/successRelease.vue b/pages/mainPages/successRelease/successRelease.vue
new file mode 100644
index 0000000..0ed5ce1
--- /dev/null
+++ b/pages/mainPages/successRelease/successRelease.vue
@@ -0,0 +1,250 @@
+<template>
+	<!-- 发布成功 -->
+	<view class="successRelease">
+		<far-bottom></far-bottom>
+		<!-- 头部背景图区域 -->
+		<view class="successReleaseTitle" :style="{'background-image':' url('+imageRoot+'succesImg.png)'}">
+			<view class="titleTips">
+				<image :src="imgfixUrls + 'merchant/success.png'"/>
+				<span>发布成功!</span>
+			</view>
+			<view class="tips">
+				<span>完善信息或置顶、红包，可以大幅度提高信息传播效果哦！</span>
+			</view>
+			<view class="titleButton">
+				<view  @click="goMyPost">
+					<span>查看信息</span>
+				</view>
+				<view  @click="goPostRelease">
+					<span>再发一条</span>
+				</view>
+			</view>
+		</view>
+		<!-- 头部背景图区域 -->
+		
+		<!-- 置顶选项 -->
+		<view class="zdView" v-if="extension.set.is_openTop !== 0 && (CustomerService.payclose == 1 && platform == 'ios') || extension.list.length  == 0?false:true">
+			<view class="zdViewTitle">
+				<span>置顶信息，提高10倍曝光率！</span>
+			</view>
+			<scroll-view class="zdScroll" > 
+				<view class="zdScrollPackage" >
+					<view class="button" v-for="(item,index) in extension.list" @click="goPayment(item.day)">
+						<span>置顶{{item.day}}天(收费{{item.price}}元)</span>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 置顶选项 -->
+		
+		<!-- 红包选项 -->
+		<view class="hbView" v-if="extension.set.is_openRed !== '0' && (CustomerService.payclose == 1 && platform == 'ios') || extension.red_list.length == 0?false:true">
+			<view class="zdViewTitle">
+				<span>红包推广，提高10倍曝光率！</span>
+			</view>
+			<scroll-view class="zdScroll">
+				<view class="zdScrollPackage">
+					<view class="button" v-for="(item,index) in extension.red_list" @click="goPayment1(item.num,item.red_price)">
+						<span>{{item.num}}个红包{{item.red_price}}元</span>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- 红包选项 -->
+		
+		<view class="full">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif	
+	
+	export default {
+		data() {
+			return {
+				extension:{},
+				status:null,
+				platform:'',
+				CustomerService:{},
+				id:null
+			};
+		},
+		onLoad(e){
+			let _this=this
+			_this.status=e.status
+			_this.id=e.id
+			this.CustomerService = uni.getStorageSync('CustomerService');
+			if(uni.getSystemInfoSync().system.indexOf('Android') === -1){
+				console.log('我是iOS')
+				this.platform ='ios';
+			}else{
+				console.log('我是安卓')
+				this.platform = 'android';
+			}
+			this.init();
+		},
+		methods:{
+			init(){
+				let _this=this
+				_this.getExtension()
+			},
+			// 发布成功后的扩展操作
+			getExtension(){
+				let _this=this
+				let data={}
+				App._post_form('&p=pocket&do=extension',data,res=>{
+						_this.extension=res.data;
+						console.log(_this.extension.set)
+				})
+			},
+			goMyPost(){
+				let mid = uni.getStorageSync('userinfo').mid;
+				App.navigationTo({
+					url:'pages/subPages/homepage/homepage/homepage?mid='+mid+'&checkType=1',
+					navType: 'rediRect'
+				})
+			},
+			goPostRelease(){
+				App.navigationTo({
+					url:'pages/mainPages/sendInformation/sendInformation',
+					navType: 'rediRect'
+				})
+			},
+			goPayment(num){
+				let _this=this
+				let data={
+					id:_this.id,
+					num:num,
+					payfor:2
+				}
+				App._post_form('&p=pocket&do=createOrder',data,res=>{
+					App.navigationTo({
+						url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+'&plugin=pocket'
+					})
+				})
+			},
+			goPayment1(num,money){
+				let _this=this
+				let data={
+					id:_this.id,
+					num:num,
+					money:money,
+					payfor:3
+				}
+				App._post_form('&p=pocket&do=createOrder',data,res=>{
+					App.navigationTo({
+						url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+'&plugin=pocket'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+.full{
+	height: 140upx;
+}	
+.zdScrollPackage{
+	padding: 0 30upx;
+}	
+.button{
+	height: 105upx;
+	border-bottom: 1upx solid rgba(238,238,238,1);
+	>span{
+		line-height: 105upx;
+		font-size:28upx;
+		lor:rgba(51,51,51,1);
+	}
+}	
+.zdScroll{
+
+}	
+.zdViewTitle{
+	border-bottom: 1upx solid rgba(238,238,238,1);
+	height: 85upx;
+	>span{
+		padding-left: 30upx;
+		line-height: 85upx;
+		font-size:24upx;
+		lor:rgba(153,153,153,1);
+	}
+}
+.hbView{
+	overflow: hidden;
+	margin:20upx auto 0 auto;
+	width:690upx;
+	background:rgba(255,255,255,1);
+	border-radius:20upx 20upx 0px 0px;
+}	
+.zdView{
+	overflow: hidden;
+	margin:-180upx auto 0 auto;
+	width:690upx;
+	background:rgba(255,255,255,1);
+	border-radius:20upx 20upx 0px 0px;
+}	
+.titleButton{
+	margin: 50upx 0 0 0;
+	text-align:center;
+	>view{
+		margin:0 20upx;
+		display: inline-block;
+		width:200upx;
+		height:70upx;
+		border:1upx solid rgba(255,255,255,1);
+		border-radius:35upx;
+		text-align: center;
+		>span{
+			line-height: 70upx;
+			font-size:28upx;
+			color:rgba(255,255,255,1);
+		}
+	}
+}	
+.tips{
+	margin: 20upx 0 0 0;
+	text-align:center;
+	>span{
+		font-size:24upx;
+		color:rgba(255,228,228,1);
+	}
+}	
+.successRelease{
+	font-size: 0;
+	background: #F8F8F8;
+}
+page{
+	overflow-x: hidden;
+	background: #F8F8F8;
+}
+.successReleaseTitle{
+	border: 1upx solid rgba(0,0,0,0);
+	width:750upx;
+	height:562upx;
+	background-size: 100%;
+	background-repeat:no-repeat ;
+}
+.titleTips{
+	
+	margin: 90upx 0 0 0;
+	text-align:center;
+	>image{
+		vertical-align: middle;
+		width:50upx;
+		height: 50upx;
+	}
+	>span{
+		margin-left: 10upx;
+		vertical-align: middle;
+		font-size:42upx;
+		color:rgba(255,255,255,1);
+	}
+}
+</style>
diff --git a/pages/mainPages/userCenter/userCenter.vue b/pages/mainPages/userCenter/userCenter.vue
new file mode 100644
index 0000000..0b83e42
--- /dev/null
+++ b/pages/mainPages/userCenter/userCenter.vue
@@ -0,0 +1,1410 @@
+<template>
+	<!-- 个人中心 -->
+	<web-view v-if="aa" :src="kfInfo.url" class="webView"></web-view>
+	<view v-else>
+		<loadlogo v-if="loading == true"></loadlogo>
+		<scroll-view class="userCenter" v-else :style="{height: phoneHeight}" scroll-y :scroll-x="false">
+			<view class="userCenterPackage">
+				<view class="userCenterMain">
+					<!-- 个人信息区域 -->
+					<view class="userCenterInfo" :style="{'background-image': 'url(' + memberInfo.bgimg + ')'}">
+						<view class="userCenterInfoTitle">
+							<button class="userInfoHeader" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+								<image :src="memberInfo.avatar" />
+							</button>
+							<view class="userInfoName">
+								<span @click="goAppLogin" v-if="login == false" class="loginN">去登陆 ></span>
+								<span v-else-if="login == true && !reviseName" class="nickname_text" @click="revisename">
+									<text class="nick">{{ memberInfo.nickname }}</text>
+									<text class="label">{{ memberInfo.identity }}</text>
+								</span>
+								<input v-else-if="login == true && reviseName" class="nickname_text input_txt" :focus="true" @blur="reviseOK"
+								 type="nickname" v-model="memberInfo.nickname" :placeholder="memberInfo.nickname" placeholder-style="color: #333;">
+								<view v-if="memberInfo.mid" style="font-size: 24upx;padding: 5upx 0;color: #FFFFFF;background-color: transparent;padding-left: 5upx;padding-top: 0;">MID:{{memberInfo.mid}}</view>
+								<view class="userInfoPhone" v-if="login == true">
+									<image :src="imgfixUrls + 'merchant/phone.png'" />
+									<span v-if="!!memberInfo.mobile">{{ memberInfo.mobile }} </span>
+									<!-- #ifdef H5 -->
+									<span v-else @click="show1 = true">未绑定手机 </span>
+									<!-- #endif -->
+									<!-- #ifndef H5 -->
+									<!-- <span v-else @click="show1 = true">未绑定手机 </span> -->
+									<button v-else open-type="getPhoneNumber" @click="test" @getphonenumber="getPhoneNumber" class="titlegetphone">
+										未绑定手机
+									</button>
+									<!-- #endif -->
+								</view>
+							</view>
+						</view>
+						<view class="userCenterInfoBody">
+							<view class="userCenterMoney" @click="gobalance">
+								<view>{{ memberInfo.credit2 }}</view>
+								<view class="userCenterMoneyTitle">{{ textList.moneytext }}</view>
+							</view>
+							<view class="line"></view>
+							<view class="userCenterMoney" @click="goIntegralRecord">
+								<view>{{ memberInfo.credit1 }}</view>
+								<view class="userCenterMoneyTitle">{{ textList.credittext }}</view>
+							</view>
+							<view class="line"></view>
+							<view class="userCenterMoney" @click="goCollection">
+								<view>{{ memberInfo.collectnum }}</view>
+								<view class="userCenterMoneyTitle">{{languageStatus!=1?'收藏':'저장'}}</view>
+							</view>
+							<view class="line"></view>
+							<view class="userCenterMoney" @click="goPrivate" :class="memberInfo.news_total>0?'news_tip':''">
+								<view>{{ memberInfo.news_total }}</view>
+								<view class="userCenterMoneyTitle">{{languageStatus!=1?'消息':'소식'}}</view>
+							</view>
+						</view>
+						<view class="userCenterInfoFoot" :style="{'background-image': 'url(' + imgfixUrls + memberCard +  ')','backgroundSize': '100% 100%'}">
+							<view v-if="memberInfo.halfcardstatus == '1'">
+								<view style="padding: 4rpx 4rpx 4rpx 4rpx;">
+									<image :src="imgfixUrls + 'merchant/member.png'" />
+									<span>{{ textList.halfcardtext }}</span>
+									<view class="memberLine"></view>
+									<span v-if="memberInfo.halfcardflag == 0">{{languageStatus!=1?'开通':'개통'}}{{ textList.halfcardtext }}，{{languageStatus!=1?'立享优惠折扣':'쿠폰할인 받기'}}</span>
+									<span v-else>已为您节省{{ memberInfo.ellipsismoney }}元</span>
+								</view>
+								<view class="goButton" @click="goMemberCard">
+									<span v-if="memberInfo.halfcardflag == 0">{{languageStatus!=1?'立即开通':'즉시 개통'}}</span>
+									<span v-else>立即续费</span>
+									<image :src="imgfixUrls + 'merchant/right.svg'" />
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 积分签到区域 -->
+					<view class="signIn" @click="goSigndesk" v-if="login && memberInfo.signstatus === '1'">
+						<image :src="imgfixUrls + 'merchant/signInLogo.png'" class="signInLeft" />
+						<span>{{ textList.credittext }}签到</span>
+						<image :src="imgfixUrls+ 'merchant/rightWhite.png'" class="signInRight" />
+					</view>
+					<!-- 积分签到区域 -->
+					<!-- 个人信息区域 -->
+
+					<!-- 订单区域 不需要显示设置v-if="0" -->
+					<view class="mineOrder" v-if="0">
+						<view class="mineOrderTitle border-line diy-nav-list border-bottom">
+							<view class="mineOrderTitlePackage">
+								<span>{{languageStatus!=1?'我的订单':'나의 주문'}}</span>
+								<view @click="orderList(10)">
+									<span>{{languageStatus!=1?'查看全部':'전체 보기'}}</span>
+									<image :src="imgfixUrls + 'merchant/right.svg'" />
+								</view>
+							</view>
+						</view>
+						<view :class="memberInfo.mobile == undefined ? 'mineOrderBody border-line diy-nav-list border-bottom' : 'mineOrderBody'">
+							<view class="mineOrderBodyPackage">
+								<view @click="orderList(0)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/paymentNo.png'" />
+									</view>
+									<span>{{languageStatus != 1?'待付款':'미지불'}}</span>
+									<view class="dis-flx">
+										<view></view>
+										<view class="numberMessage" v-if="memberInfo.ordernum1 !== undefined && memberInfo.ordernum1 !== 0">
+											<span>{{ memberInfo.ordernum1 }}</span>
+										</view>
+									</view>
+								</view>
+								<view @click="orderList(1)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/useNo.png'" />
+									</view>
+									<span> {{languageStatus != 1?`待${memberInfo.changeflag===1?'发货':'使用'}`:'미사용'}} </span>
+									<view class="dis-flx">
+										<view></view>
+										<view class="numberMessage" v-if="memberInfo.ordernum2 !== undefined && memberInfo.ordernum2 !== 0">
+											<span>{{ memberInfo.ordernum2 }}</span>
+										</view>
+									</view>
+								</view>
+								<view @click="orderList(4)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/dsh.png'" />
+									</view>
+									<span>{{languageStatus != 1?'待收货':'미수납'}}</span>
+									<view class="dis-flx">
+										<view></view>
+										<view class="numberMessage" v-if="memberInfo.ordernum4 !== undefined && memberInfo.ordernum4 !== 0">
+											<span>{{ memberInfo.ordernum4 }}</span>
+										</view>
+									</view>
+								</view>
+								<view @click="orderList(2)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/evaluateNo.png'" />
+									</view>
+									<span>{{languageStatus != 1?'待评价':'미평가'}}</span>
+									<view class="dis-flx">
+										<view></view>
+										<view class="numberMessage" v-if="memberInfo.ordernum3 !== undefined && memberInfo.ordernum3 !== 0">
+											<span>{{ memberInfo.ordernum3 }}</span>
+										</view>
+									</view>
+								</view>
+								<view @click="afterSale">
+									<view>
+										<image :src="imgfixUrls + 'merchant/refunNo.png'" />
+									</view>
+									<span>{{languageStatus != 1?'退款/售后':'환불/A/S'}}</span>
+									<view class="dis-flx">
+										<view></view>
+										<!-- 	<view class="numberMessage" v-if="memberInfo.ordernum3 !== undefined && memberInfo.ordernum3 !== 0">
+											<span>{{ memberInfo.ordernum3 }}</span>
+										</view> -->
+									</view>
+								</view>
+							</view>
+						</view>
+
+						<view class="mineOrderFoot" v-if="mobilediv == 1">
+							<span>找不到订单和优惠券？绑定手机号试试</span>
+							<view>
+								<view @click="show1 = true" v-if="ptType == 1"><span>立即绑定</span></view>
+								<button v-if="ptType == 2" open-type="getPhoneNumber"  @click="test" @getphonenumber="getPhoneNumber" class="getPhone">
+									立即绑定
+								</button>
+						<!-- 		<view v-if="ptType == 1"><span>立即绑定</span></view> -->
+							</view>
+						</view>
+					</view>
+					<!-- 订单区域 --> 
+					
+					<!-- <navigator class="content_box1" url="/pages/subPages/merchant/merchantChangeShop/merchantChangeShop">
+						<view style="font-size: 14px!important;">商户中心</view>
+					</navigator> -->
+					
+					<!-- 新增简历、主页入口 -->
+					<view class="mineHomepage">
+						<!-- 企业用户 -->
+						<navigator class="content_box1" :url="'/pagesA/rule_center/rule_center'"
+						 v-if="memberInfo.identity==='企业' || memberInfo.identity==='商家'">
+							<view style="font-size: 14px!important;">规则中心</view>
+							<image src="../../../static/rule.png" mode=""></image>
+						</navigator>
+						<!-- 普通用户 -->
+						<navigator class="content_box1" :url="'/pages/subPages2/hirePlatform/addResume/addResume'"
+						 v-else>
+							<view style="font-size: 14px!important;">我的简历</view>
+							<image :src="imageRootNew+'stLine-newspaper-l@2x.png'" mode=""></image>
+						</navigator>
+						<!-- 主页入口 -->
+						<navigator class="content_box1" :url="'/pages/subPages/homepage/homepage/homepage?mid='+memberInfo.mid+'&checkType=1'">
+							<view style="font-size: 14px!important;">我的主页</view>
+							<image src="../../../static/home_123.png" mode="" v-if="memberInfo.identity!=='企业' && memberInfo.identity!=='商家'"></image>
+							<image :src="imageRootNew+'stLine-home-l@2x.png'" mode="" v-else></image>
+						</navigator>
+					</view>
+					
+					<!-- 工具区域 -->
+					<view class="mineTool" v-if="!!memberInfo.user_set && memberInfo.user_set.length>0">
+						<view class="mineToolTitle border-line diy-nav-list border-bottom"><span>{{languageStatus!=1?'我的工具':'나의 공구'}}</span></view>
+						<view class="mineToolBody ">
+							<view class="mineToolBodyPackage">
+								<view @click="go(userTabItem.link,userTabItem.title,userTabItem)" v-for="(userTabItem,index) in memberInfo.user_set" :key="index">
+									<view v-if="userTabItem.kefuflag != 1" style="display: flex;justify-content: center;align-items: center;">
+										<image :src="userTabItem.icon" style="width: 80upx;height: 80upx;" />
+									</view>
+									<button
+										class="buttondrag"
+										open-type="contact"
+										hover-class="none"
+										v-else
+									 style="display: flex;justify-content: center;align-items: center;">
+										<image :src="userTabItem.icon"  mode="aspectFit" style="width: 80upx;height: 80upx;"></image>
+									</button>
+									<span>{{ userTabItem.title }}</span>
+								</view>
+								<view class=""></view>
+								<view class=""></view>
+							</view>
+						</view>
+					</view>
+					<!-- 工具区域 -->
+
+					<!-- 认证入口 -->
+					<view class="mineHomepage" v-if="memberInfo.identity=='游客'|| 1">
+						<navigator class="content_box2" :url="'/pagesA/identityList/identityList'">
+						<!-- <navigator class="content_box2" :url="'/pages/subPages/attestationCenter/index'"> -->
+							<image src="../../../static/icon_certificate.png" mode=""></image>
+							<view style="font-size: 14px!important;">我要认证</view>
+						</navigator>
+					</view>
+					<!-- /pages/subPages/attestationCenter/index.vue -->
+					<!-- <view class="mineHomepage">
+						<view class="content_box2">
+							<image :src="imageRootNew+'if-hat@2x.png'" mode=""></image>
+							<view style="font-size: 14px!important;">达人认证</view>
+						</view>
+					</view> -->
+					
+					<!-- 填充区域 -->
+					<view class="full"></view>
+					<!-- 填充区域 -->
+
+					<view class="page-footer">
+						<TabBars :tabBarAct="0" />
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+		 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+		<!-- 绑定手机	 -->
+			<PhoneMask :show1="show1" @clickmask1="closePop1" @getMemberInfo='getMemberInfo'></PhoneMask>
+		<!-- 绑定手机	 -->
+		<!-- <far-bottom></far-bottom> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	import util from '@/common/js/util.js';
+
+	import TabBars from '@/components/template/tabBar';
+	import loadlogo from '@/components/template/loadlogo';
+	import follow from '@/components/template/follow.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
+
+	export default {
+		components: {
+			TabBars,
+			loadlogo,
+			follow,
+			PhoneMask
+		},
+		data() {
+			return {
+					show1: false,
+				mobilediv:1,
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				memberInfo: {
+					nickname: ''
+				},
+				pinText: '获取验证码',
+				show: false,
+				phone: '',
+				smsCode: '',
+				getSmsCode: '',
+				textList: {},
+				TextSubstitution: {},
+				scollHeight: null,
+				fullHeight: null,
+				card: '',
+				timeCount: 0,
+				timeEnd: '',
+				login: true,
+				loading: true,
+				phoneHeight: null,
+				kfInfo: {},
+				ptType: null,
+				aa: false,
+				userCenterBackImg: null,
+				nLogin: null,
+				img:'',
+				code:'',
+				memberCard:'merchant/memberCard.png',
+				CustomerService:{},
+				reviseName: false,//正在修改昵称
+				lsName: '',//临时存放名字的
+			};
+		},
+		onLoad(e) {
+			this.img = this.imgfixUrl;
+			let _this = this;
+			this.textList = uni.getStorageSync('TextSubstitution');
+			if (!!e.show) {
+				this.show = e.show;
+			}
+			// #ifdef H5
+			_this.ptType = 1;
+			// #endif
+			// #ifdef MP-WEIXIN
+			_this.ptType = 2;
+			wx.showShareMenu({
+			  withShareTicket: false,
+			  menus: ['shareAppMessage', 'shareTimeline']
+			})
+			// #endif
+		},
+		// onShareTimeline(e) {
+		//     console.error("点击分享pyq", e)
+		//     var query={
+		//       data:"dsadbiujasdoinsa"
+		//     };
+		//     return {
+		//       title: "xxxxxxxxx",
+		//       imageUrl: "",
+		//       query: query,
+		//     }
+		//   },
+		onShow() {
+			this.init();
+		},
+		mounted() {
+			this.img = this.imgfixUrl;
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			uni.createSelectorQuery()
+				.select('.userCenterMain')
+				.boundingClientRect(data => {
+					console.info('data', data);
+					_this.scollHeight = uni.upx2px(1866) + 'px';
+				})
+				.exec();
+		},
+		computed: {
+			userImg() {
+				return this.imageRoot + 'userCenterImg.png';
+			}
+		},
+		methods: {
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+				_this.init();
+			},
+			mobileBlur(e) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
+				});
+			},
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			afterSale() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/afterSale/index'
+				});
+			},
+			phonereon(postData){
+				let _this = this;
+				App._post_form('&p=member&do=phoneDecrypt', postData, res => {
+					let a = res.data.phone.slice(0, 3);
+					let b = res.data.phone.slice(7, 11);
+					let mobile = res.data.phone;
+					uni.showModal({
+						title: '提示',
+						content: '确定绑定手机' + a + '****' + b + '?',
+						success: function(res) {
+							if (res.confirm) {
+								let data = {
+									mobile: mobile
+								};
+								App._post_form(
+									'&p=member&do=changeMobile',
+									data,
+									res => {
+										uni.showToast({
+											icon: 'none',
+											title: '绑定成功',
+											duration: 2000
+										});
+										_this.getMemberInfo();
+									},
+									res => {
+										uni.showModal({
+											title: '友情提示',
+											content: res.data.message,
+											showCancel: true,
+											success(res) {
+												if (res.confirm) {
+													let data = {
+														mobile: mobile,
+														mergeflag: 1
+													};
+													App._post_form('&p=member&do=changeMobile', data, res => {
+														uni.showToast({
+															icon: 'none',
+															title: '修改成功',
+															duration: 2000
+														});
+														uni.setStorageSync('weliam_user_token', res.data.token)
+														_this.getMemberInfo();
+													});
+												} else if (res.cancel) {
+											
+												}
+											}
+										});
+									}
+								);
+							} else if (res.cancel) {}
+						}
+					});
+				},fail => {
+					console.log('111111111111111',fail);
+					App.showError(fail.data.message)
+					if(fail.data.message == '绑定失败，请重试！'){
+						// setTimeout(()=>{
+						// 	_this.phonereon(postData);
+						// },1000)
+						
+					}
+				});
+			},
+			test(){
+				let _this = this;
+				uni.login({
+					provider: 'weixin',
+					scopes: 'auth_user',
+					success(res) {
+						_this.code = res.code;
+						// App._post_form('&p=member&do=getSessionKey', {code:res.code}, reson => {
+						//  = res.code;
+						// })
+					}
+				})
+			},
+			getPhoneNumber(e) {
+				let _this = this;
+				console.log(e)
+				if (e.detail.errMsg === "getPhoneNumber:ok") {
+					uni.checkSession({
+						success() {
+							
+							
+								// reson.data = uni.setStorageSync('session_key');
+							// let session_key = uni.getStorageSync('session_key');
+							console.info('登陆有效');
+							// debugger
+							let postData = {
+								data: e.detail.encryptedData,
+								iv: e.detail.iv,
+								code:_this.code
+							};
+							_this.phonereon(postData);
+							// };
+						},
+						fail() {
+							console.info('登陆失效');
+							App.navigationTo({
+								url: 'pages/mainPages/login/minLogin'
+							});
+						}
+					});
+					
+				} else {
+					App.showError('手机号绑定取消')
+				}
+			},
+			goAppLogin() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/login/minLogin'
+				});
+			},
+			init() {
+				let _this = this;
+				_this.getMemberInfo();
+				// #ifdef H5
+				_this.getMemberInfo();
+				// #endif
+				//#ifndef H5
+				_this.loading = false;
+				uni.getStorage({
+					key: 'weliam_user_token',
+					success: function(res) {
+						_this.login = true;
+						_this.getMemberInfo();
+					},
+					fail: function(res) {
+						_this.memberInfo.avatar = _this.imageRoot + 'nLogin.png';
+						_this.userCenterBackImg = _this.userImg;
+						_this.login = false;
+						_this.memberInfo.halfcardflag = '--';
+						_this.memberInfo.credit2 = '--';
+						_this.memberInfo.credit1 = '--';
+						_this.memberInfo.collectnum = '--';
+						_this.memberInfo.news_total = '--';
+						_this.memberInfo.ellipsismoney = '--';
+						uni.showToast({
+							title: '请先登录',
+							icon:'none'
+						})
+						setTimeout(()=>{
+							uni.navigateTo({
+								url: '/pages/mainPages/login/minLogin'
+							})
+						}, 2000)
+					}
+				});
+				//#endif
+				_this.KefuInfo();
+			},
+			go(url,title,item) {
+				// console.log(url,title,item, '32567686797897-----------')
+				// return;
+				if(item.kefuflag == 2){//客服
+					//#ifdef H5
+					App.navigationTo({
+						url:item.customerurl
+					});
+					// #endif
+					//#ifdef MP-WEIXIN
+					this.CustomerService = uni.getStorageSync('CustomerService');
+					wx.openCustomerServiceChat({
+					  extInfo: {url: item.customerurl},
+					  corpId: this.CustomerService.enterpriseid,
+					  success(res) {
+						  
+					  }
+					})
+					//#endif
+					return
+				}else if(item.kefuflag == 1){
+					return
+				}
+				if(url.indexOf('pages/subPages/redpacket/myredpacket') != -1 || url.indexOf('pages/subPages/coupon/coupon') != -1){
+					App.navigationTo({
+						url:url + `?title=${title}`
+					});
+					return;
+				}
+				if(this.memberInfo.identity=='企业' || this.memberInfo.identity=='商家'){//企业版-传入店铺id
+					App.navigationTo({
+						url:url + `?sid=${this.memberInfo.storeid}`
+					});
+					return;
+				}
+				App.navigationTo({
+					url
+				});
+				
+			},
+			KefuInfo() {
+				let _this = this;
+				let data = {};
+				App._post_form('&do=CustomerService', data, res => {
+					_this.kfInfo = res.data;
+				});
+			},
+			goSigndesk() {
+				App.navigationTo({
+					url: 'pages/subPages/signdesk/index/index'
+				});
+			},
+			// 跳转消息
+			goPrivate() {
+				App.navigationTo({
+					url: 'pages/subPages/homepage/private/private'
+				});
+			},
+			// 跳转余额
+			gobalance() {
+				if(this.memberInfo.diy_userInfo && this.memberInfo.diy_userInfo.dhurl){
+					
+						// this.duurUrl = url;
+						// url = encodeURIComponent(this.memberInfo.diy_userInfo.dhurl);
+						// App.navigationTo({
+						// 	url: `pages/subPages/webview/webview?urlsrc=${url}`
+						// })
+						// #ifdef H5
+						let locations = window.location.href;
+						// let urls = encodeURIComponent(this.memberInfo.diy_userInfo.dhurl + '&backurl=' + encodeURIComponent(locations))
+						let urls = this.memberInfo.diy_userInfo.dhurl + '&backurl=' + encodeURIComponent(locations);
+						location.href = urls;
+						//#endif
+						//#ifndef H5
+						let pages = getCurrentPages();
+						let pageObj = pages[pages.length - 1];
+						let wxurl = pageObj.route + '?i=' + pageObj.options.i + '&aid=' + pageObj.options.aid;
+						let urls = this.memberInfo.diy_userInfo.dhurl + '&backurl=' + wxurl;
+						console.log(urls,pageObj.options)
+						uni.navigateTo({
+							url: `/pages/subPages/webview/webview?urlsrc=${encodeURIComponent(urls)}`
+						})
+						//#endif
+						
+						// uni.redirectTo({
+						// 	url: `/pages/subPages/webview/webview?urlsrc=${url}`
+						// });
+					
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/balance/balance'
+					});
+				}
+				
+			},
+			// 跳转收藏
+			goCollection() {
+				App.navigationTo({
+					url: 'pages/subPages/mineCollection/mineCollection'
+				});
+			},
+			// 跳转积分
+			goIntegralRecord() {
+				App.navigationTo({
+					url: 'pages/subPages/IntegralRecord/IntegralRecord'
+				});
+			},
+			gokf() {
+				console.info(11111111)
+				let _this = this;
+				App.navigationTo({
+					url: _this.kfInfo.url
+				})
+			},
+			// 跳转卡劵
+			goCoupon() {
+				App.navigationTo({
+					url: 'pages/subPages/coupon/coupon'
+				});
+			},
+			closePop() {
+				let _this = this;
+				_this.show = false;
+			},
+			// 跳转会员卡
+			goMemberCard() {
+				let _this = this;
+				if (_this.memberInfo.halfcardflag == 0) {
+					_this.card = 'nhave';
+				} else {
+					_this.card = 'have';
+				}
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/getMembership/getMembership?card=' + _this.card
+				});
+			},
+			// 跳转平团
+			goPt() {
+				let _this = this;
+				_this.aa = true;
+			},
+			// 设置
+			goSet() {
+				App.navigationTo({
+					url: 'pages/mainPages/userset/userset'
+				});
+			},
+			close() {
+				let _this = this;
+				_this.show = false;
+			},
+			// 用户个人中心信息
+			getMemberInfo() {
+				// console.log(this.imageRootNew, 'this.imageRootNew');
+				let _this = this;
+				let data = {};
+				App._post_form('&p=member&do=memberInfo', data, res => {
+					if(res.data.nickname == '' && res.data.avatar == '' && res.data.mid == ''){
+						// _this.memberInfo.avatar = _this.imageRoot + 'nLogin.png';
+						// _this.userCenterBackImg = res.data.bgimg;
+						_this.memberInfo = res.data;
+						_this.login = false;
+						
+						_this.memberInfo.halfcardflag = '--';
+						_this.memberInfo.credit2 = '--';
+						_this.memberInfo.credit1 = '--';
+						_this.memberInfo.collectnum = '--';
+						_this.memberInfo.news_total = '--';
+						_this.memberInfo.ellipsismoney = '--';
+					}else{
+						_this.memberInfo = res.data;
+					}
+					
+					_this.userCenterBackImg = res.data.bgimg;
+					_this.loading = false;
+					_this.mobilediv = res.data.mobilediv;
+					if(res.data.news_total>0){
+						// 新消息提示
+					}
+					uni.setStorageSync('userinfo', _this.memberInfo);
+					console.log('缓存用户信息', uni.getStorageSync('userinfo').nickname)
+				});
+			},
+			orderList(type) {
+				App.navigationTo({
+					url: 'pages/subPages/orderList/orderList?type=' + type
+				});
+			},
+			// 收货地址
+			goAddress() {
+				App.navigationTo({
+					url: 'pages/subPages/receivingAddress/receivingAddress'
+				});
+			},
+			async onChooseAvatar(e){
+				console.log(e, 12312421421)
+				const { avatarUrl } = e.detail;
+				// this.memberInfo.avatar = avatarUrl;
+				let data = uni.getStorageSync('userinfo');
+				data.avatar = avatarUrl;
+				uni.setStorageSync('userinfo', data);
+				
+				let result = await App._MYupLoad(avatarUrl);
+				console.log(result);
+				this.memberInfo.avatar = result.data.img;
+				App._post_form('&p=member&do=updateUserInfo', {
+					avatar: result.data.img,
+					nickname: this.memberInfo.nickname
+				}, res => {
+					uni.showToast({
+						title: res.message
+					})
+				})
+			},
+			revisename(){
+				this.reviseName = true;
+				this.lsName = this.memberInfo.nickname;
+			},
+			reviseOK(){
+				this.reviseName = false;
+				if(!this.memberInfo.nickname){
+					this.memberInfo.nickname = this.lsName;
+				}else if(this.memberInfo.nickname == this.lsName){
+					return;
+				}else{
+					let data = uni.getStorageSync('userinfo');
+					data.nickname = this.memberInfo.nickname;
+					uni.setStorageSync('userinfo', data);
+					App._post_form('&p=member&do=updateUserInfo', {
+						nickname: this.memberInfo.nickname,
+						avatar: this.memberInfo.avatar
+					}, res => {
+						uni.showToast({
+							title: res.message
+						})
+					})
+				}
+			}
+		},
+		
+	};
+</script>
+
+<style lang="less" scoped>
+	.nickname_text {
+		display: flex;
+		align-items: center;
+		width: 350upx;
+		.nick{
+			display: inline-block;
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+		}
+		.label{
+			display: inline-block;
+			padding: 2px 8px;
+			background-color: #ffeaf1;
+			border-radius: 5px;
+			font-size: 13px;
+			color: #ff0f43;
+			font-weight: normal;
+			line-height: 16px;
+			margin-left: 2px;
+			flex-shrink: 0;
+		}
+	}
+	input.nickname_text.input_txt{
+		background-color: #f0f0f0;
+		color: #333!important;
+	}
+	view {
+		font-size: 0;
+	}
+
+	.dis-flx {
+		display: flex !important;
+		justify-content: space-between !important;
+		position: relative !important;
+
+		>view {
+			display: inline-block;
+		}
+	}
+
+	.getPhoneSpan {
+		line-height: 50upx;
+		font-size: 24upx;
+		color: rgba(255, 68, 68, 1);
+	}
+
+	.getPhone {
+		vertical-align: middle;
+		margin: 18upx 30upx 0 0;
+		display: inline-block;
+		width: 160upx;
+		height: 50upx;
+		border: 2upx solid rgba(255, 68, 68, 1);
+		border-radius: 10upx;
+		text-align: center;
+		line-height: 50upx;
+		font-size: 24upx;
+		color: rgba(255, 68, 68, 1);
+	}
+	.titlegetphone{
+		vertical-align: middle;
+		// margin: 18upx 30upx 0 0;
+		display: inline-block;
+		// width: 160upx;
+		// height: 50upx;
+		padding: 0;
+		border: none;
+		border-radius: 10upx;
+		text-align: left;
+		line-height: 34upx;
+		font-size: 24upx;
+		color: #ffffff;
+		background-color: transparent;
+	}
+	.goLogin {
+		text-align: center;
+
+		>span {
+			font-size: 24upx;
+			font-family: Source Han Sans CN;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	page {
+		font-size: 0 !important;
+		background: #f6f6f6 !important;
+	}
+
+	// #ifdef H5
+	body,
+	html {
+		background: #f6f6f6 !important;
+	}
+
+	// #endif
+	.userCenter {
+		font-size: 0 !important;
+		background: #f6f6f6 !important;
+	}
+
+	.userCenterBackImg {
+		width: 750upx;
+		height: 385upx;
+
+		>image {
+			width: 750upx;
+			height: 385upx;
+		}
+	}
+
+	.userCenterInfo {
+		background-size: 750upx 385upx;
+		padding-top: var(--status-bar-height);
+		background-repeat: no-repeat;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+
+	.userCenterInfoTitle {
+		margin-top: 45upx;
+		margin-left: 40upx;
+
+		>view {
+			display: inline-block;
+		}
+	}
+
+	.userCenterMain {
+		width: 750upx;
+		position: absolute;
+		top: 0;
+		z-index: 1;
+		// background: #f6f6f6;
+	}
+
+	.userInfoName {
+		margin-left: 28upx;
+		vertical-align: middle;
+
+		>span {
+			font-size: 36upx;
+
+			font-weight: bold;
+			color: rgba(255, 255, 255, 1);
+		}
+
+		>view {
+			height: 36upx;
+			background: rgba(121, 51, 9, 0.3);
+			border-radius: 10upx;
+			margin-top: 9upx;
+		}
+	}
+
+	.userInfoHeader {
+		vertical-align: middle;
+		width: 99upx;
+		height: 100upx;
+		border-radius: 50%;
+		overflow: hidden;
+		
+		margin: 0;
+		padding: 0;
+		display: inline-block;
+
+		>image {
+			width: 99upx;
+			height: 100upx;
+		}
+	}
+
+	.userInfoPhone {
+		width: 160upx;
+		display: flex;
+		>image {
+			vertical-align: middle;
+			width: 30upx;
+			height: 30upx;
+		}
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.userCenterInfoBody {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 47upx;
+        height: 105upx;
+		>view {
+			display: inline-block;
+		}
+	}
+
+	.line {
+		margin-top: 30upx;
+		width: 1upx;
+		height: 32upx;
+		background: rgba(255, 255, 255, 0.5);
+	}
+
+	.userCenterMoney {
+		width: 24%;
+
+		>view {
+			text-align: center;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.userCenterMoneyTitle {
+		margin-top: 10upx;
+	}
+
+	.userCenterInfoFoot {
+		width: 690upx;
+		margin: 30upx auto 0 auto;
+		border-style: none;
+		border-width: 0;
+		border: none;
+
+		>view {
+			padding: 14upx 17upx 12upx 17upx;
+			display: flex;
+			justify-content: space-between;
+
+			>view {
+				display: inline-block;
+
+				>image {
+					vertical-align: middle;
+					width: 60upx;
+					height: 60upx;
+				}
+
+				>span {
+					vertical-align: middle;
+					font-size: 24upx;
+					color: rgba(238, 209, 150, 1);
+				}
+			}
+		}
+	}
+
+	.loginN {
+		line-height: 100upx;
+		font-size: 36upx;
+		font-family: Source Han Sans CN;
+		font-weight: bold;
+		color: rgba(255, 255, 255, 1);
+	}
+
+	.memberLine {
+		margin: 0 20upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 1upx;
+		height: 32upx;
+		background: rgba(238, 209, 150, 0.5);
+	}
+
+	.goButton {
+		margin-top: 10upx;
+		margin-left: 41upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 144upx;
+		height: 40upx;
+		background: linear-gradient(-90deg, rgba(241, 206, 128, 1), rgba(255, 232, 181, 1));
+		border-radius: 20upx;
+
+		>span {
+			margin-left: 16upx !important;
+			line-height: 40upx !important;
+			vertical-align: middle !important;
+			font-size: 24upx !important;
+			font-weight: normal !important;
+			color: rgba(129, 82, 36, 1) !important;
+			margin-right: 5upx !important;
+		}
+
+		>image {
+			vertical-align: middle !important;
+			width: 20upx !important;
+			height: 26upx !important;
+		}
+	}
+
+	.mineOrder {
+		margin: 30upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.mineOrderTitle {
+		width: 690upx;
+		height: 88upx;
+	}
+
+	.mineOrderTitlePackage {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			margin-left: 30upx;
+			line-height: 88upx;
+			vertical-align: middle;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			margin-right: 30upx;
+			display: inline-block;
+			vertical-align: middle;
+
+			>span {
+				line-height: 88upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>image {
+				margin-left: 8upx;
+				vertical-align: middle;
+				width: 20upx;
+				height: 30upx;
+			}
+		}
+	}
+
+	.mineOrderBody {
+		width: 690upx;
+		height: 164upx;
+	}
+
+	.mineOrderFoot {
+		width: 690upx;
+		height: 90upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			vertical-align: middle;
+			margin-left: 30upx;
+			line-height: 90upx;
+			font-size: 24upx;
+
+			color: rgba(102, 102, 102, 1);
+		}
+
+		>view {
+			display: inline-block;
+
+			>view {
+				vertical-align: middle;
+				margin: 18upx 30upx 0 0;
+				display: inline-block;
+				width: 130upx;
+				height: 50upx;
+				border: 2upx solid rgba(255, 68, 68, 1);
+				border-radius: 10upx;
+				text-align: center;
+
+				>span {
+					line-height: 50upx;
+					font-size: 24upx;
+
+					color: rgba(255, 68, 68, 1);
+				}
+			}
+		}
+	}
+
+	.mineOrderBodyPackage {
+		position: relative;
+		width: 596upx;
+		margin: 20upx auto 0 auto;
+		display: flex;
+		justify-content: space-between;
+		text-align: center;
+
+		>view {
+			display: inline-block;
+
+			>view {
+				margin: auto;
+				width: 80upx;
+				height: 80upx;
+
+				>image {
+					width: 80upx;
+					height: 80upx;
+				}
+			}
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.numberMessage {
+		font-size: 0;
+		overflow: hidden;
+		width: 27upx !important;
+		height: 27upx !important;
+		background: rgba(255, 255, 255, 1);
+		border: 2upx solid rgba(255, 61, 60, 1);
+		border-radius: 50%;
+		position: absolute;
+		top: -108upx;
+		right: 7upx;
+		text-align: center;
+
+		>span {
+			line-height: 27upx;
+			font-size: 18upx !important;
+
+			color: rgba(244, 79, 68, 1);
+		}
+	}
+
+	.mineTool {
+		margin: 18upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.full {
+		width: 750upx;
+		// height: 118upx;
+		height: 100px;
+	}
+
+	.mineToolTitle {
+		height: 89upx;
+		width: 688upx;
+
+		>span {
+			line-height: 89upx;
+			margin-left: 33upx;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.webView {
+		text-align: center;
+		display: inline-block;
+		margin-bottom: 20upx;
+		width: 25%;
+
+		>view {
+			margin: auto;
+			width: 120upx;
+			height: 120upx;
+
+			>image {
+				width: 120upx;
+				height: 120upx;
+			}
+		}
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.mineToolBodyPackage {
+		padding: 10upx 20upx;
+		flex-wrap: wrap;
+		margin-bottom: 70upx;
+		display: flex;
+		justify-content: space-around;
+
+		>view {
+			text-align: center;
+			display: inline-block;
+			margin-bottom: 20upx;
+			width: 30%;
+			
+			>button{
+				margin: auto;
+				width: 120upx;
+				height: 120upx;
+				background-color: transparent!important;
+				padding: 0;
+				>image {
+					width: 120upx;
+					height: 120upx;
+				}
+			}
+			
+			>view {
+				margin: auto;
+				width: 120upx;
+				height: 120upx;
+
+				>image {
+					width: 120upx;
+					height: 120upx;
+				}
+			}
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.signIn {
+		height: 60upx;
+		border-radius: 180upx 0 0 180upx;
+		background: #d75731;
+		position: absolute;
+		right: 0;
+		top: 63upx;
+
+		>image {
+			vertical-align: middle;
+		}
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(254, 254, 254, 1);
+		}
+	}
+
+	.signInLeft {
+		width: 60upx;
+		height: 60upx;
+	}
+
+	.signInRight {
+		width: 20upx;
+		height: 25upx;
+		margin-left: 10upx;
+	}
+// 
+.mineHomepage{
+	margin: 18rpx auto 0 auto;
+	width: 688rpx;
+	border-radius: 10rpx;
+	display: flex;
+	justify-content: space-between;
+	.content_box1{
+		width: 48%;
+		height: 50px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #ffffff;
+	}
+	.content_box2{
+		width: 100%;
+		height: 50px;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background: #ffffff;
+	}
+	image{
+		width: 25px;
+		height: 25px;
+		margin: 0px 5px;
+	}
+}
+.news_tip{
+	position: relative;
+}
+.news_tip::after{
+	position: absolute;
+	top: 2px;
+	right: 28px;
+	content: '';
+	background-color: #f00;
+	width: 6px;
+	height: 6px;
+	border-radius: 3px;
+}
+</style>
diff --git a/pages/mainPages/userset/userset.vue b/pages/mainPages/userset/userset.vue
new file mode 100644
index 0000000..e608417
--- /dev/null
+++ b/pages/mainPages/userset/userset.vue
@@ -0,0 +1,315 @@
+<template>
+	<!-- 设置 -->
+	<view class="page">
+		<far-bottom></far-bottom>
+		<view class="container padding-box-all">
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="goSet">
+				<view class="f-28 col-3">{{languageStatus!=1?'个人资料':'개인정보'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="goXgmm">
+				<view class="f-28 col-3">{{languageStatus!=1?'修改密码':'비밀번호 수정'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="paw" v-if="TextSubstitution.flag074 == 1">
+				<view class="f-28 col-3">修改支付密码</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="phoneS">
+				<view class="f-28 col-3">{{languageStatus!=1?'修改手机号码':'핸드폰번호 수정'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="skipagreement(1)">
+				<view class="f-28 col-3">{{languageStatus!=1?'用户协议':'고객협의'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="skipagreement(2)">
+				<view class="f-28 col-3">{{languageStatus!=1?'隐私协议':'개인정보 협의'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<!-- #ifndef H5 -->
+			<view class="content-box b-f m-btm20 dis-flex flex-x-between flex-y-center padding-box-all bor-radius-10upx" @click="subscription">
+				<view class="f-28 col-3">{{languageStatus!=1?'订阅消息':'구독정보'}}</view>
+				<view class="content-box-iconRight iconfont icon-right"></view>
+			</view>
+			<!-- #endif -->
+			
+			<view class="content-box b-f padding-box-all bor-radius-10upx f-28 t-c" @click="clearToken">{{languageStatus!=1?'退出登录':'로그아웃'}}</view>
+		</view>
+		<view style="color: gray;width: 300rpx;text-align: center;position: fixed;bottom: 30rpx;left: 50%;margin-left: -150rpx;font-size: 23rpx;">当前版本号:1.0.11</view>
+		<!-- <bindPhone :phoneShow="phoneShow" @clickmask="closePop" @mobileBulr="mobileBulr"></bindPhone> -->
+			<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+		<PopManager :show="show2" @clickmask="closeshow">
+			<view class="popView">
+				<view class="popViewTitle textC font28 color333333">
+					<span>修改支付密码</span>
+				</view>
+				
+				<view class="wid400 backFAFAFA  bor10 overHidden height60 marT20Auto">
+					<input v-if="show2" placeholder="请输入支付密码" class="font26 color333333 disInline wid360 pL20 height60" v-model="password" type="password" />
+				</view>
+				<view class="dis-flex inputbox marT20Auto" style="margin-top: 40upx;">
+					<!-- <view class="f-28 col-9">
+						
+					</view> -->
+					<input v-if="show2" class="inputclass" placeholder="请输入验证码" v-model="smsCode"  maxlength="11" type="number" value="" />
+					<view class="f-28 col-f4" v-if="min>0">
+						请等待{{min}}s
+					</view>
+					<view class="f-28 col-f4" v-else @click="PIN()">
+						发送验证码
+					</view>
+				</view>
+				<view class="submitButtom textC">
+					<span class="font28 line80 colorW" @click="showTips">提交</span>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import PhoneMask from '@/components/template/PhoneMask'
+	import PopManager from '@/components/template/PopManager'
+	export default {
+		components: {
+			PhoneMask,
+			PopManager
+		},
+		data() {
+			return {
+				phoneShow: false,
+				show1: false,
+				show2:false,
+				TextSubstitution:{},
+				min:0,
+				smsCode:'',
+				phone:'',
+				password:''
+			}
+		},
+		onLoad(e) {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.phone = uni.getStorageSync('userinfo').truemobile;
+		},
+		methods: {
+			showTips(){
+				let _this = this;
+				let data = {
+					pwd: _this.password,
+					code:_this.smsCode
+				};
+				App._post_form('&p=member&do=integralpwd', data, res => {
+					uni.showToast({
+						title:'操作成功'
+					})
+				});
+			},
+			PIN() {
+				let _this = this;
+				let data = {
+					phone: _this.phone,
+					type: 2,
+					code:'',
+					time:''
+				};
+				App._post_form('&do=PIN', data, res => {
+					_this.getSmsCode = res.data.code;
+					_this.min = 60;
+					_this.sendcode();
+				});
+			},
+			sendcode(){
+				let _this = this;
+				if(_this.min != 0){
+					_this.min--;
+					setTimeout(()=>{
+						_this.sendcode()
+					},1000)
+				}
+			},
+			closeshow(){
+				this.show2 = false;
+			},
+			paw(){
+				this.show2 = true;
+			},
+			phoneS(){
+				this.show1 = true
+			},
+			mobileBulr(data) {
+				uni.pageScrollTo({
+					scrollTop: 0,
+					duration: 0
+				});
+			},
+			goXgmm() {
+				App.navigationTo({
+					url: 'pages/subPages/forgetPassword/forgetPassword?type=' + 1
+				})
+			},
+			subscription(){
+				App.navigationTo({
+					url: 'pages/subPages2/subscription/subscription'
+				})
+			},
+			skipagreement(type) {
+				App.navigationTo({
+					url: 'pages/mainPages/agreement/agreement?agremType=user&type=' + type
+				})
+			},
+			// 退出
+			clearToken() {
+				uni.removeStorage({
+					key: 'weliam_user_token',
+					success: function(res) {
+						App.showSuccess('退出成功', () => {
+							
+							// App.navigationTo({
+							// 	url: 'pages/mainPages/login/login'
+							// })pages/mainPages/userCenter/userCenter
+							uni.navigateBack({
+								delta: 1
+							})
+						})
+					}
+				});
+			},
+			goSet() {
+				App.navigationTo({
+					url: 'pages/subPages2/userInfo/userInfo'
+				})
+			},
+			closePop() {
+				let _this = this
+				_this.phoneShow = false
+			},
+			closePop1() {
+				let _this = this
+				_this.show1 = false
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.submitButtom {
+		width: 360upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		margin: 60upx auto 0;
+	}
+
+	.marT20upx {
+		margin-top: 20upx;
+	}
+
+	.pL20 {
+		padding: 0 20upx;
+	}
+
+	page {
+		background-color: #F5F5F5;
+	}
+
+	.content-box-iconRight {
+		font-size: 28upx;
+	}
+
+	.popView {
+		width: 500upx;
+		height: 460upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.inputbox{
+		// border-bottom: 1upx solid #cccccc;
+		height: 60upx;
+		width: 400upx;
+		line-height: 60upx;
+		background: #FAFAFA;
+		.inputclass{
+			flex: 1;
+			text-align: left;
+			height: 60upx;
+			line-height: 60upx;
+			font-size: 28upx;
+			padding-left: 20upx;
+		}
+	}
+	
+	.popViewTitle {
+		padding: 30upx;
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	.font28 {
+		font-size: 28upx;
+	}
+
+	.font26 {
+		font-size: 26upx;
+	}
+
+	.color333333 {
+		color: #333333;
+	}
+
+	.disInline {
+		display: inline-block;
+	}
+
+	.wid400 {
+		width: 400upx;
+	}
+
+	.wid500 {
+		width: 500upx;
+	}
+
+	.backFAFAFA {
+		background: #FAFAFA;
+	}
+
+	.marAuto {
+		margin: auto;
+	}
+
+	.bor10 {
+		border-radius: 10upx;
+	}
+
+	.overHidden {
+		overflow: hidden;
+	}
+
+	.wid360 {
+		width: 360upx;
+	}
+
+	.height60 {
+		height: 60upx;
+	}
+
+	.marT20Auto {
+		margin: 10upx auto 0 auto;
+	}
+
+	.marT30Auto {
+		margin: 20upx auto 0 auto;
+	}
+
+	.line80 {
+		line-height: 80upx;
+	}
+
+	.colorW {
+		color: rgba(255, 255, 255, 1);
+	}
+</style>
diff --git a/pages/subPages/IntegralRecord/IntegralRecord.vue b/pages/subPages/IntegralRecord/IntegralRecord.vue
new file mode 100644
index 0000000..5687b80
--- /dev/null
+++ b/pages/subPages/IntegralRecord/IntegralRecord.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="IntegralRecord">
+		<far-bottom></far-bottom>
+		<view class="IntegralRecordImg">
+			<view><span>{{creditRecordInfo.mycredit}}</span></view>
+			<view><span>{{languageStatus!=1?'我的':'내꺼'}}{{textList.credittext}}</span></view>
+		</view>
+
+		<!-- 按钮 -->
+		<view class="IntegralRecordButton">
+			<view @click="go('pages/subPages/signdesk/index/index')">
+				<view><image :src="imgfixUrls + 'merchant/jfqd.png'" /></view>
+				<span>{{textList.credittext}}{{languageStatus!=1?'签到':'출석체크'}}</span>
+			</view>
+			<view @click="go('pages/subPages/integral/integralShop/integralShop')">
+				<view><image :src="imgfixUrls + 'merchant/jfdh.png'" /></view>
+				<span>{{textList.credittext}}{{languageStatus!=1?'兑换':'교환'}}</span>
+			</view>
+			<view @click="go('pages/subPages2/cleanCustom/cleanCustom')" v-if="textList.flag074 == 1">
+				<view><image style="width: 50upx;height: 50upx;margin-top: 10upx;" :src="imageRoot+'gift-fill.png'" /></view>
+				<span>{{textList.credittext}}转赠</span>
+			</view>
+		</view>
+		<!-- 按钮 -->
+
+		<!-- 列表区域 -->
+		<scroll-view class="IntegralRecordList" :scroll-y="true" @scrolltolower="jfjlLoad">
+			<view class="IntegralRecordListPackage">
+				<!-- 循环模板 -->
+				<view class="IntegralRecordMb" v-for="(item,index) in list" >
+					<view>
+						<view><span>{{item.remark}}</span></view>
+						<view><span>{{item.createtime}}</span></view>
+					</view>
+					<view v-if="item.num>0"><span>+{{item.num}}</span></view>
+					<view v-if="item.num<0"><span>{{item.num}}</span></view>
+				</view>
+				<!-- 循环模板 -->
+				<view class="tips">
+					<span>{{ scdpText }}</span>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 列表区域 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif	
+	
+export default {
+	data() {
+		return {
+			page:1,
+			creditRecordInfo:{},
+			scdpText:'',
+			pagetotal:null,
+			list:[],
+			textList:{}
+		};
+	},
+	onLoad:function(){
+		this.init();
+		this.textList = uni.getStorageSync('TextSubstitution');
+	},
+	methods: {
+		init() {
+			let _this=this
+			_this.creditRecord();
+		},
+		go(url){
+			App.navigationTo({
+				url:url
+			})
+		},
+		// 积分余额变更记录
+		creditRecord(){
+			let _this =this
+			_this.scdpText='... ...加载中'
+			let data={
+				page:_this.page,
+				type:1
+			}
+			App._post_form('&p=member&do=creditRecord',data,res=>{
+				_this.creditRecordInfo={..._this.creditRecordInfo,...res.data}
+				_this.list=[..._this.list,...res.data.list]
+				_this.pagetotal=res.data.pagetotal
+				_this.scdpText=''
+			})
+		},
+		// 积分记录下拉加载
+		jfjlLoad(){
+			let _this=this
+			if(_this.pagetotal==_this.page){
+				_this.scdpText="没有更多数据了"
+			}else{
+				_this.page++
+				_this.creditRecord();
+			}
+		},
+		back(){
+			uni.navigateBack({
+				delta: 1
+			})
+		},
+	},
+};
+</script>
+
+<style lang="less" scoped>
+.tips {
+	height: 80upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		
+		
+		color: black;
+	}
+}		
+page {
+	background: #f6f6f6;
+	overflow-x: hidden;
+}
+.IntegralRecord {
+	font-size: 0;
+	background: #f6f6f6;
+}
+.IntegralRecordImg {
+	border: 1upx solid rgba(0, 0, 0, 0);
+	width: 750upx;
+	height: 300upx;
+	background: linear-gradient(-59.28999999999999deg, rgba(254, 80, 79, 1) 0%, rgba(254, 133, 79, 1) 100%);
+	> view:nth-child(1) {
+		margin-top: 50upx;
+		text-align: center;
+		> span {
+			font-size: 70upx;
+			
+			font-weight: bold;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	> view:nth-child(2) {
+		text-align: center;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+}
+.IntegralRecordButton {
+	margin: -80upx auto 0 auto;
+	width: 688upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		text-align: center;
+		width: 49%;
+		> view {
+			margin-top: 17upx;
+			width: 73upx;
+			height: 74upx;
+			display: inline-block;
+			vertical-align: top;
+			> image {
+				width: 73upx;
+				height: 74upx;
+			}
+		}
+		> span {
+			line-height: 100upx;
+			vertical-align: top;
+			font-size: 28upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.IntegralRecordList {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	height: 870upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.IntegralRecordListPackage {
+	padding: 0 30upx 30upx 30upx;
+}
+.IntegralRecordMb {
+	border-bottom: 1upx solid rgba(246, 246, 246, 1);
+	padding: 30upx 0;
+	display: flex;
+	justify-content: space-between;
+	> view:nth-child(1) {
+		> view:nth-child(1) {
+			> span {
+				font-size: 28upx;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		> view:nth-child(2) {
+			> span {
+				font-size: 24upx;
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+	> view:nth-child(2) {
+		> span {
+			line-height: 70upx;
+			font-size: 30upx;
+			
+			font-weight: bold;
+			color: rgba(244, 79, 68, 1);
+		}
+	}
+	>view{
+		display: inline-block;
+	}
+}
+</style>
diff --git a/pages/subPages/afterSale/afterDatli/afterDatli.vue b/pages/subPages/afterSale/afterDatli/afterDatli.vue
new file mode 100644
index 0000000..f647e1f
--- /dev/null
+++ b/pages/subPages/afterSale/afterDatli/afterDatli.vue
@@ -0,0 +1,525 @@
+<template>
+	<loadlogo v-if="loading == true"></loadlogo>
+	
+	<scroll-view class="afterDatli" v-else :style="{ height: phoneHight, backgroundImage: afterBack }" :scroll-y="true">
+		<far-bottom></far-bottom>
+		<view class="main">
+			<view class="mainPackage">
+				<view class="tips">
+					<image :src="afterDetail.status == '1' ? cl : afterDetail.status == '2' ? wc : jjue"></image>
+					<text>{{ statusList[afterDetail.status] }}</text>
+				</view>
+				<view class="goods">
+					<view class="goodsPackage">
+						<view class="goodsTitle">
+							<view class="titleLeft"><image :src="afterDetail.goodsthumb"></image></view>
+							<view class="titleRight">
+								<view class="rightTitle">{{ afterDetail.goodsname }}</view>
+								<view class="rightBody" v-if="afterDetail.optionname">规格：{{ afterDetail.optionname }}</view>
+								<view class="rightFoot">
+									<text>¥{{ afterDetail.price }}</text>
+									<text v-if="afterDetail.optionname > 0">x{{ afterDetail.num }}</text>
+								</view>
+							</view>
+						</view>
+						<view class="bodyBottom">
+							<view>
+								<text>售后类型</text>
+								<text>{{ typeList[afterDetail.type] }}</text>
+							</view>
+							<view>
+								<text>退款金额</text>
+								<text class="colorFF4444">¥{{ afterDetail.refundmoney }}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="afterProcess">
+					<view class="afterProcessPackage">
+						<block>
+							<view class="logis bor-radius-10 b-f m-btm20">
+								<view class="p-right-30">
+									<view class="logis-list p-top-bom-40">
+										<view class="loggis-section">
+											<view v-for="(items, index) in afterDetail.journal" :key="index">
+												<view class="loggis-move">
+													<view class="flex-y-center">
+														<view class="dis-flex">
+															<block v-if="index === 0">
+																<view class="Icon-bg"><view class="icon-line iconfont icon-check col-f"></view></view>
+															</block>
+															<block v-else><view class="circle-seg"></view></block>
+															<view class="flex-box ">
+																<view class="title">
+																	<text>{{ items.title }}</text>
+																</view>
+															</view>
+														</view>
+														<view class="dis-flex">
+															<view class="flex-box ">
+																<view class="title">
+																	<text style="padding-left: 50upx;">{{ items.detail }}</text>
+																</view>
+															</view>
+														</view>
+														<!-- <view class="dis-flex">
+															<view class="flex-box ">
+																<view class="title">
+																	<text style="padding-left: 50upx;">手机号码:{{ items.ascflag }}</text>
+																</view>
+															</view>
+														</view> -->
+														<view class="dis-flex">
+															<view class="flex-box ">
+																<view class="title">
+																	<text style="padding-left: 50upx;">申请时间:{{ items.time }}</text>
+																</view>
+															</view>
+														</view>
+														<view class="verMid uploadButton f-r dis-flex vox" style="flex-wrap: wrap;justify-content: space-between;">
+															<!-- 图片预览循环模板 -->
+															<block v-for="(itemis, index) in items.thumbs" class="verMid" style="flex: 0.33;" >
+																<view class="imgPreview verMid" style="position: relative;padding: 10upx;">
+																	<image :src="itemis" style="width: 180upx;height: 180upx;" />
+																</view>
+															</block>
+														</view>
+														
+														<view class="processBody dis-flex">
+															<block><view class="floatLeft"></view></block>
+															<text>{{ items.content }}</text>
+														</view>
+													</view>
+												</view>
+												<!-- <view class="logg-dotted" v-if="loggDataDetail.list.length>0&&index<loggDataDetail.list.length-1"></view> -->
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<view class="processImage">
+							<view v-for="(items, index) in afterDetail.thumbs" :key="index"><image :src="items"></image></view>
+						</view>
+					</view>
+				</view>
+				<view class="foot" v-if="afterDetail.status != '2'">
+					<view class="buttonViewPackage">
+						<view></view>
+						<view class="buttonView">
+							<view class="cx" v-if="afterDetail.status == '3'" @click="goTk"><text>重新申请</text></view>
+							<view class="cex" @click="revokeSaleAfter" :class="dontCheck?'':'cantCheck'" v-if="afterDetail.status == '1' && afterDetail.hiderevoke == 0"><text>撤销申请</text></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import loadlogo from '@/components/template/loadlogo';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	components: {
+		loadlogo
+	},
+	data() {
+		return {
+			loading: true,
+			phoneHight: null,
+			back: null,
+			afterDetail: {},
+			typeList: ['', '退款'],
+			statusList: ['', '处理中', '已完成', '被驳回'],
+			dontCheck:true,
+			id:null,
+			orderno:'',
+			plugin:''
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.init(e.id);
+		_this.plugin=e.plugin
+		_this.orderno=e.orderno
+		_this.id=e.id
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+	},
+	computed: {
+		afterBack() {
+			let _this = this;
+			return 'url(' + _this.imageRoot + 'afterBack.png' + ')';
+		},
+		cl() {
+			let _this = this;
+			return _this.imageRoot + 'cl.png';
+		},
+		jjue() {
+			let _this = this;
+			return _this.imageRoot + 'jjue.png';
+		},
+		wc() {
+			let _this = this;
+			return _this.imageRoot + 'wc.png';
+		}
+	},
+	methods: {
+		init(id) {
+			let _this = this;
+			_this.saleAfterDetail(id);
+		},
+		goTk(){
+			let _this=this
+			App.navigationTo({
+				navType:'rediRect',
+				url:'pages/subPages/orderList/afterSale/afterSale?afterid='+_this.id+"&id="+_this.orderno+"&plugin="+_this.plugin
+			})
+		},
+		// 撤销申请接口
+		revokeSaleAfter(){
+			let _this=this
+			uni.showModal({
+			    title: '提示',
+			    content: '确定撤销申请?',
+			    success: function (res) {
+			        if (res.confirm) {
+						let data={
+							id:_this.id
+						}
+			           App._post_form('&p=pay&do=revokeSaleAfter',data,res=>{
+			           	uni.showToast({
+							icon:"none",
+			           	    title: '撤销成功',
+			           	    duration: 2000
+			           	});
+						_this.dontCheck=false
+						setTimeout(over,2000)
+						function over(){
+							App.navigationTo({
+								navType:'rediRect',
+								url:'pages/subPages/afterSale/index'
+							})
+						}
+			           },
+					   fail=>{
+						   uni.showToast({
+						   	icon:"none",
+						       title: '撤销失败',
+						       duration: 2000
+						   });
+					   })
+			        } else if (res.cancel) {
+			            
+			        }
+			    }
+			});
+			
+		},
+		// 售后详情页面
+		saleAfterDetail(id) {
+			let _this = this;
+			let data = {
+				id: id
+			};
+			App._post_form('&p=pay&do=saleAfterDetail', data, res => {
+				_this.loading = false;
+				_this.afterDetail = res.data;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.cantCheck{
+	pointer-events:none;
+}
+.vox{
+	padding-top: 8upx;
+}
+.vox:after{
+		content: '';
+		width: 30%;
+	}
+.cx {
+	display: inline-block;
+	width: 164upx;
+	height: 60upx;
+	border: 1upx solid rgba(238, 238, 238, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> text {
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+		line-height: 60upx;
+	}
+}
+.cex {
+	margin-left: 24upx;
+	display: inline-block;
+	width: 164upx;
+	height: 60upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> text {
+		font-size: 24upx;
+		color: rgba(255, 255, 255, 1);
+		line-height: 60upx;
+	}
+}
+.foot {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 750upx;
+	height: 97upx;
+	background: rgba(255, 255, 255, 1);
+	border-top: 1upx solid rgba(238, 238, 238, 1);
+}
+.buttonViewPackage {
+	display: flex;
+	justify-content: space-between;
+	padding: 19upx 30upx;
+}
+.processImage {
+	margin-left: 55upx;
+	> view {
+		margin: 0 10upx 10upx 0;
+		display: inline-block;
+		width: 179upx;
+		height: 179upx;
+		background: rgba(0, 0, 0, 1);
+		border-radius: 8upx;
+		overflow: hidden;
+		> image {
+			width: 179upx;
+			height: 179upx;
+		}
+	}
+}
+.processBody {
+	margin-top: 19upx;
+	> text {
+		font-size: 24upx;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.title {
+	display: flex;
+	justify-content: space-between;
+	padding-bottom: 20upx;
+	font-size: 28upx;
+	> text:nth-child(1) {
+		font-size: 28upx;
+		color: rgba(153, 153, 153, 1);
+	}
+	> text:nth-child(2) {
+		font-size: 24upx;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.afterProcessPackage {
+	padding: 0 30upx 40upx 30upx;
+}
+.afterProcess {
+	margin-top: 20upx;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.colorFF4444 {
+	color: #ff4444 !important;
+}
+.bodyBottom {
+	margin-top: 35upx;
+	> view {
+		margin-top: 30upx;
+		display: flex;
+		justify-content: space-between;
+		> text {
+			font-size: 24upx;
+			color: rgba(102, 102, 102, 1);
+		}
+	}
+}
+.rightFoot {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 30upx;
+	> text:nth-child(1) {
+		font-size: 28upx;
+		color: rgba(255, 68, 68, 1);
+	}
+	> text:nth-child(2) {
+		font-size: 28upx;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.rightBody {
+	margin-top: 10upx;
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+}
+.rightTitle {
+	height: 70upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.titleRight {
+	height: 170upx;
+	width: 440upx;
+}
+
+.goodsTitle {
+	display: flex;
+	justify-content: space-between;
+}
+.titleLeft {
+	width: 170upx;
+	height: 170upx;
+	border-radius: 6upx;
+	overflow: hidden;
+	> image {
+		width: 170upx;
+		height: 170upx;
+	}
+}
+.goodsPackage {
+	padding: 27upx 30upx;
+}
+.goods {
+	margin-top: 37upx;
+	width: 690upx;
+	height: 369upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.tips {
+	margin-top: ;
+	> image {
+		vertical-align: middle;
+		width: 30upx;
+		height: 30upx;
+	}
+	> text {
+		vertical-align: middle;
+		margin-left: 17upx;
+		font-size: 30upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.afterDatli {
+	background-image: ;
+	font-size: 0;
+	background: #f8f8f8;
+	background-size: 750upx auto;
+	background-repeat: no-repeat;
+}
+.mainPackage {
+	padding: 53upx 30upx 127upx 30upx;
+}
+
+.goods_detail .goods_image {
+	margin-right: 28upx;
+	width: 170upx;
+	height: 170upx;
+	border-radius: 6upx;
+	background-repeat: no-repeat;
+	background-size: 170upx 170upx;
+	background-position: center;
+}
+
+/**
+	 * 订单物流
+	 */
+.logis-title {
+	border-bottom: 1px solid #f0f0f0;
+}
+
+.logis-list .logis-date {
+	word-wrap: break-word;
+	word-break: normal;
+}
+
+.Icon-bg {
+	width: 30upx;
+	height: 30upx;
+	line-height: 30upx;
+	border-radius: 50%;
+	background: #ff4444;
+	text-align: center;
+	margin: 0 22upx 0 0;
+	position: relative;
+	z-index: 5;
+}
+
+.icon-line {
+	font-size: 28upx !important;
+}
+
+.loggis-move .address {
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 3;
+	overflow: hidden;
+}
+
+.logis-list-header::after {
+	content: ' ';
+	position: relative;
+	left: 7%;
+	width: 2upx;
+	height: 120upx;
+	border-left: 1px solid #eeeeee;
+	margin: -46upx 0;
+}
+
+.pd-left {
+	padding-left: 6%;
+}
+
+.logg-dotted {
+	position: relative;
+	left: 7%;
+	width: 2upx;
+	height: 120upx;
+	border-left: 1px solid #eeeeee;
+	margin: -46upx 0;
+}
+
+.circle-seg {
+	width: 16upx;
+	height: 16upx;
+	border-radius: 50%;
+	background: #f0f0f0;
+	margin: 0 30upx 0 10upx;
+	position: relative;
+	z-index: 2;
+}
+.floatLeft {
+	width: 16upx;
+	height: 16upx;
+	margin: 0 30upx 0 10upx;
+	position: relative;
+	z-index: 2;
+}
+.Icon-bg-presen {
+	background-color: #ffd940;
+	color: #333333 !important;
+}
+</style>
diff --git a/pages/subPages/afterSale/index.vue b/pages/subPages/afterSale/index.vue
new file mode 100644
index 0000000..e30d2a5
--- /dev/null
+++ b/pages/subPages/afterSale/index.vue
@@ -0,0 +1,373 @@
+<template>
+	<loadlogo v-if="false"></loadlogo>
+	
+	<scroll-view class="afterSale" v-else :style="{ height: phoneHeight }" :scroll-y="true" :lower-threshold="0" @scrolltolower="load">
+		<far-bottom></far-bottom>
+		<!-- 头部导航栏 -->
+		<view class="topNav">
+			<view :class="type == 0 ? 'check' : ''" @click="checkType(0)">
+				<view><span>{{languageStatus!=1?'全部':'전체'}}</span></view>
+				<view v-if="type == 0"></view>
+			</view>
+			<view :class="type == 1 ? 'check' : ''" @click="checkType(1)">
+				<view><span>{{languageStatus!=1?'处理中':'처리중'}}</span></view>
+				<view v-if="type == 1"></view>
+			</view>
+			<view :class="type == 2 ? 'check' : ''" @click="checkType(2)">
+				<view><span>{{languageStatus!=1?'已完成':'완료'}}</span></view>
+				<view v-if="type == 2"></view>
+			</view>
+		</view>
+		<!-- 头部导航栏 -->
+		<!-- 填充区域 -->
+		<view class="full"></view>
+		<!-- 填充区域 -->
+		<!-- 列表区域 -->
+		<noneMores v-if="total == 0"></noneMores>
+		<view class="mian" v-if="total != 0">
+			<view class="Listmb" v-for="(item, index) in list" @click="godatli(item.id,item.plugin,item.orderid)">
+				<view class="ListmbPackage">
+					<view class="mbTitle diy-nav-list border-line border-bottom">
+						<span class="color333333 font24">订单号：{{item.orderno}}</span>
+						<span class="font24 colorFF4444">{{ typeList[item.status] }}</span>
+					</view>
+					<view class="mbBody ">
+						<view class="mbBodyPackage diy-nav-list border-line border-bottom">
+							<view class="bodyLeft"><image :src="item.goodsthumb"></image></view>
+							<view class="bodyRight">
+								<view class="rightTitle">{{item.goodsname}}</view>
+								<view class="rightBody" v-if="item.optionname"><text>规格：{{item.optionname}}</text></view>
+								<view class="rightFoot">
+									<text>¥{{item.price}}</text>
+									<text v-if="item.num > 0">x{{item.num}}</text>
+								</view>
+							</view>
+							
+						</view>
+					</view>
+					<view class="mbFoot">
+						<view class="mbFootPackage">
+							<view></view>
+							<view class="buttonPackage">
+								<view class="xqButton"><text>查看详情</text></view>
+								<view class="cxButton" v-if="item.status=='1'" @click.stop="revokeSaleAfter(item.id)"><text>撤销申请</text></view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="tips" v-if="total != 0"><loadmore :isMore="isMore"></loadmore></view>
+		<!-- 列表区域 -->
+	</scroll-view>
+</template>
+
+<script>
+import loadlogo from '@/components/template/loadlogo';
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import loadmore from '@/components/template/loadmore';
+import noneMores from '@/components/template/nonemores.vue';
+export default {
+	components: {
+		loadlogo,
+		loadmore,
+		noneMores,
+	},
+	data() {
+		return {
+			phoneHeight: null,
+			type: 0,
+			typeList: ['','处理中', '已完成', '已拒绝'],
+			isMore:true,
+			page:1,
+			total:null,
+			list:[]
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			_this.saleAfterList()
+		},
+		godatli(id,plugin,orderid){
+			App.navigationTo({
+				url:'pages/subPages/afterSale/afterDatli/afterDatli?id='+id+"&plugin="+plugin+"&orderno="+orderid
+			})
+		},
+		checkType(type) {
+			let _this = this;
+			_this.type = type;
+			_this.list=[]
+			_this.page=1
+			_this.saleAfterList();
+		},
+		load(){
+			let _this=this
+			if(_this.total==_this.page){
+				_this.isMore=true
+			}else{
+				_this.page++
+				_this.saleAfterList();
+			}
+		},
+		// 撤销申请接口
+		revokeSaleAfter(id){
+			let _this=this
+			uni.showModal({
+			    title: '提示',
+			    content: '确定撤销申请?',
+			    success: function (res) {
+			        if (res.confirm) {
+						let data={
+							id:id
+						}
+			           App._post_form('&p=pay&do=revokeSaleAfter',data,res=>{
+			           	uni.showToast({
+							icon:"none",
+			           	    title: '撤销成功',
+			           	    duration: 2000
+			           	});
+						_this.list=[]
+						_this.page=1
+						_this.saleAfterList()
+			           },
+					   fail=>{
+						   uni.showToast({
+						   	icon:"none",
+						       title: '撤销失败',
+						       duration: 2000
+						   });
+					   })
+			        } else if (res.cancel) {
+			            
+			        }
+			    }
+			});
+			
+		},
+		// 售后列表接口
+		saleAfterList(){
+			let _this=this
+			let data={
+				pindex:_this.page,
+				status:_this.type
+			}
+			_this.isMore=false
+			App._post_form('&p=pay&do=saleAfterList',data,res=>{
+				_this.list=[..._this.list,...res.data.list] 
+				_this.total=res.data.total
+				_this.isMore=true
+			})
+		},
+	}
+};
+</script>
+
+<style lang="less">
+	
+.tips {
+	width: 750upx;
+	height: 60upx;
+}
+.xqButton {
+	display: inline-block;
+	width: 163upx;
+	height: 60upx;
+	border: 1upx solid rgba(238, 238, 238, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> text {
+		line-height: 60upx;
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.cxButton {
+	margin-left: 24upx;
+	display: inline-block;
+	width: 164upx;
+	height: 60upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> text {
+		line-height: 60upx;
+		font-size: 24upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.mbFootPackage {
+	padding: 20upx 0 0 0;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+	}
+}
+.rightFoot {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 30upx;
+	> text:nth-child(1) {
+		font-size: 28upx;
+		color: rgba(255, 68, 68, 1);
+	}
+	> text:nth-child(2) {
+		font-size: 28upx;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.rightBody {
+	margin-top: 10upx;
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+}
+.rightTitle {
+	height: 70upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.bodyRight {
+	height: 170upx;
+	width: 440upx;
+}
+.bodyLeft {
+	width: 170upx;
+	height: 170upx;
+	border-radius: 6upx;
+	overflow: hidden;
+	> image {
+		width: 170upx;
+		height: 170upx;
+	}
+}
+.font24 {
+	font-size: 24upx;
+}
+.color333333 {
+	color: #333333;
+}
+.colorFF4444 {
+	color: #ff4444;
+}
+.mbBodyPackage {
+	padding: 26upx 0upx;
+	height: 178upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+	}
+}
+.mbBody {
+	height: 230upx;
+}
+.mbTitle {
+	display: flex;
+	justify-content: space-between;
+	height: 50upx;
+}
+.ListmbPackage {
+	padding: 30upx;
+}
+.Listmb {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	height: 414upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.full {
+	height: 84upx;
+}
+.mian {
+	padding: 0 30upx 0upx 30upx;
+}
+.check {
+	overflow: hidden;
+	display: inline-block;
+	vertical-align: top;
+	width: 20%;
+
+	> view {
+		overflow: hidden;
+		height: 76upx;
+		margin: auto;
+		width: 85upx;
+		text-align: center;
+
+		> span {
+			line-height: 80upx !important;
+			font-size: 28upx !important;
+
+			font-weight: bold !important;
+			color: rgba(51, 51, 51, 1) !important;
+		}
+	}
+}
+.afterSale {
+	font-size: 0;
+	background: #f9f9f9;
+}
+.topNav {
+	display: flex;
+	justify-content: space-around;
+	z-index: 999;
+	position: fixed;
+	width: 750upx;
+	height: 84upx;
+	background: rgba(255, 255, 255, 1);
+	overflow: hidden;
+	> view {
+		overflow: hidden;
+		display: inline-block;
+		vertical-align: top;
+		width: 20%;
+		position: relative;
+		> view:nth-child(1) {
+			overflow: hidden;
+			height: 77upx;
+			margin: auto;
+			width: 85upx;
+			text-align: center;
+			> span {
+				line-height: 77upx;
+				font-size: 24upx;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		> view:nth-child(2) {
+			margin: auto;
+			position: absolute;
+			left: 50%;
+			bottom: 0;
+			width: 32px;
+			height: 4px;
+			background: #ff4444;
+			border-radius: 4px 4px 0 0;
+			-webkit-transform: translateX(-50%);
+			-ms-transform: translateX(-50%);
+			transform: translateX(-50%);
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/attestationCenter/bond/bond.vue b/pages/subPages/attestationCenter/bond/bond.vue
new file mode 100644
index 0000000..67877b5
--- /dev/null
+++ b/pages/subPages/attestationCenter/bond/bond.vue
@@ -0,0 +1,374 @@
+<template>
+	<!-- 诚信保证金 -->
+	<view class="bond">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<image :src="rzType == 1 ? bondBackGz : bondBackQz" class="wid750 "></image>
+			<view class="absolute0 ">
+				<!-- 价格 -->
+				<view v-if="priceList">
+					<view class="priceList">
+						<radio-group @change="radioChange">
+							<label class="price-item" v-for="(item, index) in priceList" :key="index">
+								<view><radio color="#FF4444" :value="item" :checked="index === current" /></view>
+								<view style="font-size: 28upx;">¥{{ item }}</view>
+							</label>
+						</radio-group>
+					</view>
+				</view>
+				<view class="marginAuto mainView">
+					<view class="mainTitle p30">
+						<view class="flex">
+							<text class="font24  color999999 inlineBlock marinT2">诚信保证金</text>
+							<text class="font28" :style="{ color: attMoneyInfo.is_money == 0 ? '#4ECA8F' : '#999999' }">
+								{{ attMoneyInfo.is_money == 0 ? '未缴纳' : '已缴纳' }}
+							</text>
+						</view>
+						<view class="marginT38">
+							<text class="font24 colorFF4444">
+								¥
+								<text class="font46">{{ attMoneyInfo.money }}</text>
+							</text>
+						</view>
+					</view>
+					<view class="mainLine marinT9auto">
+						<view class="leftdot"></view>
+						<view class="rightdot"></view>
+					</view>
+					<view class="mainBody marinT9auto p30">
+						<view><text class="font24 color333333">保证金说明:</text></view>
+						<view class=" marginT17"><rich-text class="font24 color999999 pB30" :nodes="attMoneyInfo.bonddescription"></rich-text></view>
+					</view>
+				</view>
+
+				
+
+				
+
+				<!-- 协议 -->
+				<view class="marginT40">
+					<view class="pL30">
+						<view class="bor1gray" v-if="agree == false" @click="agree = true"></view>
+						<image :src="imgfixUrls + 'merchant/tyXy.png'" class="image22" v-if="agree == true" @click="agree = false"></image>
+						<text class="font24 color999999 marginL10">阅读并同意</text>
+						<text class="font24 color4F6D8C" @click="showPop">《用户协议条款》</text>
+					</view>
+				</view>
+				<!-- 协议 -->
+
+				<!-- 提交按钮 -->
+				<view
+					class="submitButton marginT70Auto textC"
+					:class="attMoneyInfo.is_money == 1 ? 'buttonJn' : rzType == 1 ? 'buttonGr' : 'buttonQy'"
+					@click="bondOrder"
+					v-if="agree == true"
+				>
+					<text class="colorW font28 lineHeight80">{{ attMoneyInfo.is_money == 0 ? '立即缴纳' : '已缴纳' }}</text>
+				</view>
+				<view class="submitButton1 marginT70Auto textC" v-if="agree == false">
+					<text class="lineHeight80 colorW font28">{{ attMoneyInfo.is_money == 0 ? '立即缴纳' : '已缴纳' }}</text>
+				</view>
+				<!-- 提交按钮 -->
+
+				<popAgreement :show="show" @clickmask="closePop" :buttonColor="buttonColor" :textInfo="attMoneyInfo.bondagreement"></popAgreement>
+			</view>
+		</scroll-view>
+		<view  v-if="types == 1"><TabBars :tabBarAct="0" pageType="18"></TabBars></view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import TabBars from '@/components/template/tabBar.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import popAgreement from '@/components/template/popAgreement';
+export default {
+	components: {
+		popAgreement,
+		TabBars
+	},
+	data() {
+		return {
+			agree: false,
+			rzType: null,
+			type: 1,
+			show: false,
+			buttonColor: '',
+			phoneHight: null,
+			attMoneyInfo: {},
+			id: null,
+			types: null,
+			priceList:null,
+			current:0
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.types = e.type;
+		// debugger
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		console.log(e, '0000000000000000');
+		_this.rzType = e.rzType;
+		if (_this.rzType == 1) {
+			_this.buttonColor = 'rgba(255,68,68,1)';
+			uni.getStorage({
+				key: 'userinfo',
+				success: async function(res) {
+					_this.id = res.data.mid;
+					_this.init(res.data.mid);
+				}
+			});
+		} else {
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.id = res.data;
+					_this.init(res.data);
+				}
+			});
+			_this.buttonColor = 'rgba(51,136,255,1)';
+		}
+	},
+	computed: {
+		bondBackGz() {
+			let _this = this;
+			return _this.imageRoot + 'bondBackGz.png';
+		},
+		bondBackQz() {
+			let _this = this;
+			return _this.imageRoot + 'bondBackQz.png';
+		}
+	},
+	methods: {
+		radioChange(e){
+			this.priceList.map((item,index)=>{
+				if(e.detail.value == item){
+					this.current = index;
+				}
+			})
+			console.log(e,this.current);
+		},
+		init(mid) {
+			let _this = this;
+			_this.attMoney(mid);
+		},
+		// 保证金缴纳生成订单接口
+		bondOrder() {
+			let _this = this;
+			let data = {
+				type: _this.rzType,
+				storeid: _this.id
+			};
+			if(_this.priceList){
+				data.money = _this.priceList[_this.current];
+			}
+			App._post_form('&p=attestation&do=bondOrder', data, res => {
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=attestation'
+				});
+			});
+		},
+		// 获取保证金设置信息
+		attMoney(mid) {
+			let _this = this;
+			let data = {
+				type: _this.rzType,
+				sid: mid
+			};
+			App._post_form('&p=attestation&do=attMoney', data, res => {
+				_this.attMoneyInfo = res.data;
+				_this.priceList = res.data.moneyarray;
+			});
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		showPop() {
+			let _this = this;
+			_this.show = true;
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.bor1gray {
+	width: 21upx;
+	height: 21upx;
+	display: inline-block;
+	background: white;
+	border: 1upx solid #999999;
+	border-radius: 50%;
+}
+.buttonGr {
+	background: rgba(255, 68, 68, 1);
+}
+.buttonQy {
+	background: rgba(51, 136, 255, 1);
+}
+.buttonJn {
+	pointer-events: none;
+	background: #999999;
+}
+.pB30 {
+	padding-bottom: 30upx;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+.marginT70Auto {
+	margin: 70upx auto 20upx auto;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	border-radius: 40upx;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.color4F6D8C {
+	color: #4f6d8c;
+}
+.image22 {
+	width: 22upx;
+	height: 22upx;
+}
+.pL30 {
+	padding: 0 30upx;
+}
+.marginT40 {
+	margin-top: 40upx;
+}
+.marinT39 {
+	margin-top: 39upx;
+}
+.pT30 {
+	padding: 30upx 30upx 0 30upx;
+}
+.leftdot {
+	display: inline-block;
+	position: relative;
+	right: 55upx;
+	bottom: 20upx;
+	background: #f8f8f8;
+	width: 40upx;
+	height: 40upx;
+	border-radius: 50%;
+}
+.rightdot {
+	display: inline-block;
+	position: relative;
+	left: 595upx;
+	bottom: 20upx;
+	background: #f8f8f8;
+	width: 40upx;
+	height: 40upx;
+	border-radius: 50%;
+}
+.pL30 {
+	padding: 0 30upx;
+}
+.marginT17 {
+	margin-top: 17upx;
+}
+.color333333 {
+	color: #333333;
+}
+.marginT38 {
+	margin-top: 38upx;
+}
+.marinT2 {
+	margin-top: 2upx;
+}
+.marinT9auto {
+	margin: 9upx auto 0 auto;
+}
+.mainLine {
+	width: 620upx;
+	height: 2upx;
+	background: repeating-linear-gradient(to right, rgba(238, 238, 238, 1), rgba(238, 238, 238, 1) 3%, white 3%, white 5%, rgba(238, 238, 238, 1) 5%);
+}
+.priceList {
+	padding: 30upx;
+	background-color: #ffffff;
+	margin: 30upx;
+	border-radius: 10upx;
+}
+.price-item{
+	height: 100upx;
+	line-height: 100upx;
+	display: flex;
+	// margin: 20upx 0;
+	border-bottom: 1upx dashed  #EEEEEE;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.color999999 {
+	color: #999999;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.colorFF4444 {
+	color: #ff4444;
+}
+.font24 {
+	font-size: 24upx;
+}
+.font46 {
+	font-size: 46upx;
+}
+.font28 {
+	font-size: 28upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.bond {
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.wid750 {
+	width: 750upx;
+	height: 340upx;
+}
+.absolute0 {
+	position: absolute;
+	top: 179upx;
+	width: 750upx;
+}
+.mainView {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.marginAuto {
+	margin: auto;
+}
+.p30 {
+	padding: 30upx;
+}
+.textC {
+	text-align: center;
+}
+</style>
diff --git a/pages/subPages/attestationCenter/enterpriseAttestation/enterpriseAttestation.vue b/pages/subPages/attestationCenter/enterpriseAttestation/enterpriseAttestation.vue
new file mode 100644
index 0000000..4f5b2fd
--- /dev/null
+++ b/pages/subPages/attestationCenter/enterpriseAttestation/enterpriseAttestation.vue
@@ -0,0 +1,723 @@
+<template>
+	<view class="enterpriseAttestation" v-if="logocome">
+		<far-bottom></far-bottom>
+		<!-- <scroll-view :style="{ height: phoneHight }" :scroll-y="true"> -->
+			<view>
+			<image :src="qyrzBack" class="wid750 "></image>
+			<view class="mainView absolute0">
+				<!-- 基本信息 -->
+				<view class="informationView marginAuto">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">企业/个体工商户认证</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">主体名称</text>
+								<input placeholder="请输入企业/个体工商户认证" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="userInfo.name" />
+							</view>
+							<!-- <view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">主体类型</text>
+								<input placeholder="请输入主体类型" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="storeType" :disabled="true"/>
+							</view> --> 
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">执照注册号</text>
+								<input placeholder="请输入执照注册号" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="userInfo.cardnum" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">联系电话</text>
+								<input placeholder="请输入联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" type="number" v-model="userInfo.phone" />
+							</view>
+							<!-- <view :class="(item.type == 'text'|| item.type == 'number')?'inputView marginT18':'inputImg marginT18'" v-for="(item,index) in userInfo.moreset" :key="index" v-if="item.type == 'number' || item.type == 'text'">
+								<text class="colorBlack font24 verticalM" >{{item.content}}</text>
+								<input v-if="item.type == 'number'" :placeholder="'请输入' +item.content" class="colorBlack font24 inlineBlock verticalM p0p50"
+								 type="number" v-model="userInfo['m' + index]" />
+								<input v-if="item.type == 'text'" :placeholder="'请输入' + item.content" class="colorBlack font24 inlineBlock verticalM p0p50"
+								 v-model="userInfo['m' + index]" />
+							</view> -->
+						</view>
+					</view>
+				</view>
+				<!-- 基本信息 -->
+				<!-- 上传证件 -->
+				<view class="uploadView marginAuto marginT35">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">上传营业执照</text>
+						</view>
+						<view class="marginT29 flex">
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles(3)" v-if="picArray.length==0">
+								<image :src="yyzz" class="upLoadImg"></image>
+							</view>
+							<view class="uploadButton inlineBlock textC color0" v-if="picArray.length==0">
+								<image :src="qyal" class="upLoadImg"></image>
+							</view>
+							<view class="uploadButton inlineBlock textC color0" v-else @click="uploadFiles(3)">
+								<image v-for="(item,index) in picArray" :src="item" class="upLoadImg"></image>
+							</view>
+						</view>
+						<view class="marginT29">
+							<text class="color999999  font24">请上传清晰的营业执照</text>
+						</view>
+					</view>
+
+				</view>
+				<!-- 上传证件 -->
+
+				<!-- 店铺详情 -->
+				<view  style="margin: 30upx;padding: 30upx;background-color: #FFFFFF;border-radius: 15upx;" v-if="orderSubmitInfoData.diyform">
+					<view class="f-26">
+						<view class="line inlineBlock verticalM"></view>
+						<text style="padding-left: 10upx;">完善更多信息</text>
+					</view>
+					<form-item ref="formItem" :gopay="gopay" :gopaytwo="gopaytwo" :orderSubmitInfo="orderSubmitInfoData"></form-item>
+				</view>
+				<!-- 店铺详情 -->
+
+				<!-- 协议 -->
+				<view class="marginT40">
+					<view class="pL30">
+						<view class="bor1gray" v-if="agree==false" @click="agree=true"></view>
+						<image :src="imgfixUrls + 'merchant/tyXy.png'" class="image22" v-if="agree==true" @click="agree=false"></image>
+						<text class="font24 color999999 marginL10" @click="agree=!agree">阅读并同意</text>
+						<text class="font24 color4F6D8C" @click="showPop">《用户协议条款》</text>
+					</view>
+				</view>
+				<!-- 协议 -->
+
+				<!-- 提交按钮 -->
+				<view class="marginT70auto textC" @click="setInfo" :class="agree==true?'submitButton':'submitButton1'"><text class="lineHeight80 colorW font28">提交</text></view>
+				<!-- 提交按钮 -->
+				<popAgreement :show="show" @clickmask="closePop" :buttonColor="buttonColor" :textInfo="userInfo.agreement"></popAgreement>
+
+			</view>
+			</view>
+		<!-- </scroll-view> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import popAgreement from '@/components/template/popAgreement';
+	import formItem from '@/components/template/formItem.vue'
+	export default {
+		components: {
+			popAgreement,
+			formItem
+		},
+		data() {
+			return {
+				agree: false,
+				phoneHight: null,
+				show: false,
+				buttonColor: 'rgba(51,136,255,1)',
+				userInfo: {},
+				picArray: [],
+				storeType: '个体商户',
+				type1Url: '',
+				type1Urlon: '',
+				type2Url: [],
+				type2Urlon:[],
+				user:{},
+				logocome:true,
+				gopay:true,
+				orderSubmitInfoData:{},
+				gopaytwo:true
+			};
+		},
+		computed: {
+			qyrzBack() {
+				let _this = this;
+				return _this.imageRoot + 'qyrzBack.png';
+			},
+			yyzz() {
+				let _this = this;
+				return _this.imageRoot + 'yyzz.png';
+			},
+			qyal() {
+				let _this = this;
+				return _this.imageRoot + 'qyal.png';
+			},
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.rzType = e.rzType;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.id = res.data
+					_this.init(res.data);
+				}
+			});
+		},
+		methods: {
+			closePreview(item,indexs){
+				this.logocome = false;
+				let userArray = ['a']
+				if(this.userInfo['m' + indexs]){
+					this.userInfo['m' + indexs].map((items,index)=>{
+						if(items == item){
+							console.log(this.userInfo['m' + indexs],1111111111111);
+							userArray = this.userInfo['m' + indexs].splice(index,1);
+						}
+					});
+				}else{
+					this.type2Url.map((items,index)=>{
+						if(items == item){
+							this.type2Url.splice(index,1);
+							this.type2Urlon.splice(index,1);
+							this.userInfo['m' + indexs].splice(index,1);
+						}
+					});
+				}
+				console.log(this.type2Url,this.userInfo['m' + indexs])
+				this.logocome = true;
+			},
+			closeLogo(index,item) {
+				let _this = this;
+				
+				_this.type1Url = '';
+				_this.type1Urlon = '';
+				_this.userInfo.moreset.map((items,indexs)=>{
+					if(item == items.value){
+						_this.userInfo.moreset[indexs].value = '';
+					}
+				})
+				_this.logocome = !_this.logocome;
+				_this.logocome = !_this.logocome;
+				// _this.userInfo.logo = '';
+			},
+			closePop() {
+				let _this = this
+				_this.show = false
+			},
+			showPop() {
+				let _this = this
+				_this.show = true
+			},
+			init(mid) {
+				let _this = this;
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+				_this.getInfo(mid);
+			},
+			setInfo() {
+				let _this = this;
+				_this.gopay = false;
+				setTimeout(()=>{
+					_this.gopay = true;
+				},2000)
+				// let data = {
+				// 	type: 2,
+				// 	sid: _this.id,
+				// 	operation: 'set',
+				// 	att_id: _this.userInfo.att_id,
+				// 	name: _this.userInfo.name,
+				// 	phone: _this.userInfo.phone,
+				// 	pic: _this.userInfo.pic,
+				// 	cardnum: _this.userInfo.cardnum,
+				// 	m0:_this.type1Urlon,
+				// 	m1:_this.userInfo.m1,
+				// 	m2:_this.type2Urlon,
+				// 	m3:_this.userInfo.m3,
+				// };
+				delete this.userInfo.agreement //true
+				delete this.userInfo.id //true
+				delete this.userInfo.moreinfo //true
+				delete this.userInfo.moreset
+				this.userInfo.type = 2;
+				this.userInfo.sid = _this.id;
+				this.userInfo.operation = 'set';
+				// this.userInfo.moreset.map((item,index)=>{
+				// 	this.userInfo['m'+index] = item.text;
+				// });
+				if (  _this.userInfo.name == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '主体名称不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (  _this.userInfo.phone == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '联系电话不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (  _this.userInfo.cardnum == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '执照注册号不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (  _this.userInfo.pic.length < 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '请上传营业执照',
+						duration: 2000
+					});
+					return;
+				}
+				// if(_this.userInfo.moreset.length !== 0 &&  !_this.userInfo.m1){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '店长姓名不能为空',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if( _this.userInfo.moreset.length !== 0 && !_this.userInfo.m3){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '客服电话不能为空',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if(_this.userInfo.moreset.length !== 0 && _this.userInfo.type1Url == ''){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请上传食品安全证',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				// if(_this.userInfo.moreset.length !== 0 && _this.type2Url.length == 0){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请上传店内图片',
+				// 		duration: 2000
+				// 	});
+				// 	return;
+				// }
+				setTimeout(()=>{
+					if(_this.$refs.formItem){
+						if( _this.$refs.formItem.ifrequired == false){
+							uni.showToast({
+								icon: 'none',
+								title: '请完善必填信息'
+							});
+							return
+						}
+						let datas = _this.$refs.formItem.formList;
+						_this.userInfo.datas = JSON.stringify(datas);
+						App._post_form('&p=attestation&do=infoSet', _this.userInfo, res => {
+							App.navigationTo({
+								url: 'pages/subPages/attestationCenter/index?rzType=' + _this.rzType
+							});
+						});
+					}else{
+						App._post_form('&p=attestation&do=infoSet', _this.userInfo, res => {
+							App.navigationTo({
+								url: 'pages/subPages/attestationCenter/index?rzType=' + _this.rzType
+							});
+						});
+					}
+					
+				})
+				
+			},
+			// 信息设置接口
+			getInfo(mid) {
+				let _this = this;
+				let data = {
+					type: 2,
+					sid: mid,
+					operation: 'get'
+				};
+				App._post_form('&p=attestation&do=infoSet', data, res => {
+					_this.userInfo = res.data;
+					_this.orderSubmitInfoData = res.data;
+					_this.gopaytwo = false;
+					setTimeout(()=>{
+						_this.gopaytwo = true;
+					},2000)
+					if(_this.userInfo.moreset){
+						_this.userInfo.moreset.map((item,index)=>{
+							if(item.type == 'pic'){
+								_this.userInfo['m' + index] = !item.value?'':item.value;
+							}else if(item.type == 'pics'){
+								_this.userInfo['m' + index] =  !item.value?[]:item.value;
+							}else{
+								_this.userInfo['m' + index] = !item.value?'':item.value;
+							}
+						});
+					}
+					
+					_this.picArray = res.data.pic
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(type,indexs) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+				     let res = await App.browser_upload(1);
+				     if (type == 1) {
+				     	console.log(res);
+				     	let img = await App._upLoad(res.tempFilePaths[0]);
+				     	_this.type1Url = img.data.img;
+				     	_this.type1Urlon = img.data.image;
+				     	_this.userInfo['m' + indexs] = _this.type1Url;
+				     } else if (type == 3) {
+				     	for (let i = 0; i < res.tempFilePaths.length; i++) {
+				     		let aa = await App._upLoad(res.tempFilePaths[i]);
+				     		_this.userInfo.pic.splice(0, 1, aa.data.image)
+				     		_this.picArray.splice(0, 1, aa.data.img)
+				     	}
+				     } else if (type == 2) {
+				     	_this.type2Url = _this.userInfo['m' + indexs];
+				     	if (_this.type2Url.length == 9) {
+				     		uni.showToast({
+				     			title: '最多上传九张图片',
+				     			icon: 'none'
+				     		});
+				     		return
+				     	}
+				     	let imgs = await App._upLoad(res.tempFilePaths[0]);
+				     	console.log(_this.type2Url,_this.userInfo['m' + indexs])
+				     	_this.type2Url.push(imgs.data.img);
+				     	_this.type2Urlon.push(imgs.data.image);
+				     	_this.userInfo['m' + indexs] = _this.type2Url;
+				     	// res.tempFilePaths.map(item=>{
+				     	// 	let imgs = await App._upLoad(item);
+				     	// })
+				     }
+				
+				     return
+				    }
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (type == 1) {
+										_this.type1Url = res.data.img;
+										_this.type1Urlon = res.data.image;
+										_this.userInfo['m' + indexs] = _this.type1Url;
+									} else if (type == 3) {
+										if (res.errno === 0) {
+											_this.userInfo.pic[0] = res.data.image;
+											_this.picArray[0] = res.data.img;
+											console.info('picArray', _this.picArray)
+										}
+									} else if (type == 2) {
+										_this.type2Url = _this.userInfo['m' + indexs] || [];
+										if (_this.type2Url.length == 9) {
+											uni.showToast({
+												title: '最多上传九张图片',
+												icon: 'none'
+											});
+											return
+										}
+										console.log(_this.userInfo['m' + indexs]);
+										_this.type2Url.push(res.data.img);
+										_this.type2Urlon.push(res.data.image);
+										_this.userInfo['m' + indexs] = _this.type2Url;
+										
+									}
+									_this.logocome = !_this.logocome;
+									_this.logocome = !_this.logocome;
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 1,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						if (type == 1) {
+							console.log(res);
+							let img = await App._upLoad(res.tempFilePaths[0]);
+							_this.type1Url = img.data.img;
+							_this.type1Urlon = img.data.image;
+							_this.userInfo['m' + indexs] = _this.type1Url;
+						} else if (type == 3) {
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+								_this.userInfo.pic.splice(0, 1, aa.data.image)
+								_this.picArray.splice(0, 1, aa.data.img)
+							}
+						} else if (type == 2) {
+							_this.type2Url = _this.userInfo['m' + indexs];
+							if (_this.type2Url.length == 9) {
+								uni.showToast({
+									title: '最多上传九张图片',
+									icon: 'none'
+								});
+								return
+							}
+							let imgs = await App._upLoad(res.tempFilePaths[0]);
+							console.log(_this.type2Url,_this.userInfo['m' + indexs])
+							_this.type2Url.push(imgs.data.img);
+							_this.type2Urlon.push(imgs.data.image);
+							_this.userInfo['m' + indexs] = _this.type2Url;
+							// res.tempFilePaths.map(item=>{
+							// 	let imgs = await App._upLoad(item);
+							// })
+						}
+					}
+				});
+				// #endif
+			},
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.bor1gray {
+		width: 21upx;
+		height: 21upx;
+		display: inline-block;
+		background: white;
+		border: 1upx solid #999999;
+		border-radius: 50%;
+	}
+
+	.enterpriseAttestation {
+		font-size: 0;
+		background-color: #f8f8f8;
+	}
+
+	.wid750 {
+		width: 750upx;
+		height: 340upx;
+	}
+
+	.informationView {
+		width: 690upx;
+		// height:496upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.marginAuto {
+		margin: auto;
+	}
+
+	
+
+	.close {
+		width: 32upx !important;
+		height: 32upx !important;
+		position: relative;
+		bottom: 150upx;
+		left: 120upx;
+		z-index: 30;
+	}
+
+	
+
+	.absolute0 {
+		position: absolute;
+		top: 179upx;
+		width: 750upx;
+	}
+
+	.line {
+		width: 8upx;
+		height: 27upx;
+		background: rgba(51, 136, 255, 1);
+		border-radius: 4upx;
+	}
+
+	.colorBlack {
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.font28 {
+		font-size: 28upx;
+	}
+
+	.font24 {
+		font-size: 24upx;
+	}
+
+	.inlineBlock {
+		display: inline-block;
+	}
+
+	.verticalM {
+		vertical-align: middle;
+	}
+
+	.marginL10 {
+		margin-left: 10upx;
+	}
+
+	.p30 {
+		padding: 30upx;
+	}
+
+	.pL30 {
+		padding: 0 30upx;
+	}
+
+	.marginT29 {
+		margin-top: 29upx;
+	}
+
+	.marginT40 {
+		margin-top: 40upx;
+	}
+
+	.inputView {
+		width: 630upx;
+		height: 83upx;
+		background: rgba(250, 250, 250, 1);
+		border-radius: 10upx;
+
+		>text {
+			display: inline-block;
+			line-height: 83upx;
+			width: 126upx;
+			text-align: right;
+		}
+
+		>input {
+			height: 100%;
+			width: 400upx;
+		}
+	}
+
+	.inputImg {
+		width: 630upx;
+		// background: rgba(250, 250, 250, 1);
+		border-radius: 10upx;
+
+		>text {
+			display: inline-block;
+			line-height: 83upx;
+			width: 126upx;
+			text-align: right;
+		}
+
+		>input {
+			height: 100%;
+			width: 400upx;
+		}
+	}
+
+	.marginT18 {
+		margin-top: 18upx;
+	}
+
+	.marginT35 {
+		margin-top: 35upx;
+	}
+
+	.marginT30auto {
+		margin: 30upx auto 0 auto;
+	}
+
+	.p0p50 {
+		padding: 0 50upx;
+	}
+
+	.uploadView {
+		width: 690upx;
+		height: 533upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.uploadButton {
+		width: 290upx;
+		height: 344upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+	}
+
+	.color0 {
+		background: rgba(248, 248, 248, 0) !important;
+	}
+
+	.flex {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.upLoadImg {
+		width: 262upx;
+		height: 319upx;
+		margin-top: 13upx;
+	}
+
+	.color999999 {
+		color: rgba(153, 153, 153, 1);
+	}
+
+	.color4F6D8C {
+		color: #4f6d8c;
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	.image22 {
+		width: 22upx;
+		height: 22upx;
+	}
+
+	.submitButton {
+		width: 690upx;
+		height: 80upx;
+		background: rgba(51, 136, 255, 1);
+		border-radius: 40upx;
+	}
+
+	.submitButton1 {
+		width: 690upx;
+		height: 80upx;
+		background: #999999;
+		border-radius: 40upx;
+		pointer-events: none
+	}
+
+	.marginT70auto {
+		margin: 70upx auto 20upx auto;
+	}
+
+	.lineHeight80 {
+		line-height: 80upx;
+	}
+
+	.colorW {
+		color: rgba(255, 255, 255, 1);
+	}
+</style>
diff --git a/pages/subPages/attestationCenter/index.vue b/pages/subPages/attestationCenter/index.vue
new file mode 100644
index 0000000..a9634fa
--- /dev/null
+++ b/pages/subPages/attestationCenter/index.vue
@@ -0,0 +1,257 @@
+<template>
+	<!-- 认证中心 -->
+	<view class="attestationCenter">
+		<far-bottom></far-bottom>
+		<view class="mainPackage margin20">
+			<!-- 认证模块 -->
+			<!-- 个人认证 -->
+			<view class="mainView  back12CC53"  @click="go('pages/subPages/attestationCenter/personAttestation/personAttestation')">
+				<view class="p43p35 flex">
+					<view class="inlineBlock verticalM">
+						<image :src="imgfixUrls + 'merchant/rzgr.png'" class="rzImage verticalM"></image>
+						<view class="inlineBlock verticalM marginLeft20">
+							<view><text class="colorW font28">个人认证</text></view>
+							<view><text class="colorW font24">Personal authentication</text></view>
+						</view>
+					</view>
+					<view class="inlineBlock verticalM">
+						<view class="inlineBlock verticalM">
+							<text class="font24 colorW lineHeight70">{{ infoList.is_attestation == 0 ? '未认证' : infoList.is_attestation == 1 ? '待审核' : infoList.is_attestation == 2?'已审核':'被驳回' }}</text>
+						</view>
+						<image :src="rzimage" class="rzimage verticalM marginLeft10"></image>
+					</view>
+				</view>
+				<view class="f-26 back12CC53 col-f dis-flex" style="padding: 30upx;border-radius: 0upx 0upx 20upx 20upx;" v-if="infoList.is_attestation == 3">
+					<view  style="flex: 0.7;">
+						{{infoList.reason}}
+					</view>
+					<view  style="flex: 0.3;">
+						<view class="dis-il-block" style="padding: 5upx 20upx;color: #ffffff;border: 2upx solid #ffffff;float: right;border-radius: 8upx;">
+							认证
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 个人认证 -->
+			<!-- 企业认证 -->
+			<view class="mainView  backFD8834"  @click="go('pages/subPages/attestationCenter/enterpriseAttestation/enterpriseAttestation')">
+				<view class="p43p35 flex">
+					<view class="inlineBlock verticalM">
+						<image :src="imgfixUrls + 'merchant/rzqy.png'" class="rzImage verticalM"></image>
+						<view class="inlineBlock verticalM marginLeft20">
+							<view><text class="colorW font28">企业认证</text></view>
+							<view><text class="colorW font24">Enterprise certification</text></view>
+						</view>
+					</view>
+					<view class="inlineBlock verticalM">
+						<view class="inlineBlock verticalM">
+							<text class="font24 colorW lineHeight70">{{ infoList.is_attestation == 0 ? '未认证' : infoList.is_attestation == 1 ? '待审核' : infoList.is_attestation == 2?'已审核':'被驳回' }}</text>
+							
+						</view>
+						<image :src="rzimage" class="rzimage verticalM marginLeft10"></image>
+					</view>
+				</view>
+				<view class="f-26 backFD8834 col-f dis-flex" style="padding: 30upx;border-radius: 0upx 0upx 20upx 20upx;" v-if="infoList.is_attestation == 3">
+					<view  style="flex: 0.7;">
+						{{infoList.reason}}
+					</view>
+					<view  style="flex: 0.3;">
+						<view class="dis-il-block" style="padding: 5upx 20upx;color: #ffffff;border: 2upx solid #ffffff;float: right;border-radius: 8upx;">
+							认证
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 企业认证 -->
+			<!-- 缴纳金 -->
+			<view class="mainView  back297FF3 marginTop30" @click="naviGo()" v-if="infoList.money_switch==1">
+				<view class="p43p35 flex">
+					<view class="inlineBlock verticalM">
+						<image :src="imgfixUrls + 'merchant/rzbzj.png'" class="rzImage verticalM"></image>
+						<view class="inlineBlock verticalM marginLeft20">
+							<view><text class="colorW font28">诚信保证金</text></view>
+							<view><text class="colorW font24">Good faith deposit</text></view>
+						</view>
+					</view>
+					<view class="inlineBlock verticalM">
+						<view class="inlineBlock verticalM">
+							<text class="font24 colorW lineHeight70" style="padding-left: 20upx;">{{ infoList.is_money == 0 ? '未缴费' :	infoList.is_money == 3 ? '被驳回': '已缴费' }}</text>
+							<view class=" f-w" style="font-size: 24upx;color: #FFFFFF;" v-if="infoList.money">
+								￥{{infoList.money}}
+							</view>
+						</view>
+						<image :src="bzjimage" class="rzimage verticalM marginLeft10"></image>
+					</view>
+				</view>
+			</view>
+			<!-- 缴纳金 -->
+			<!-- 认证模块 -->
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	data() {
+		return {
+			type: 2,
+			yrz: 'merchant/rzyrz.png',
+			dsh: 'merchant/rzdsh.png',
+			wrz: 'merchant/rzwrz.png',
+			rzimage: null,
+			rzType: null,
+			id:null,
+			infoList:{},
+			bzjimage:null,
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.rzType=e.rzType
+		if(e.rzType==1){
+			uni.getStorage({
+			    key: 'userinfo',
+			    success: function (res) {
+			        _this.id=res.data.mid
+					_this.init(res.data.mid);
+			    }
+			});
+		}else{
+			uni.getStorage({
+			    key: 'checkStoreid',
+			    success: function (res) {
+			        _this.id=res.data
+					_this.init(res.data);
+			    }
+			});
+		}
+		
+	},
+	methods: {
+		naviGo(){
+			if(this.infoList.is_money == 0) {
+				App.navigationTo({
+					url:'pages/subPages/attestationCenter/bond/bond?rzType=' +this.rzType
+				})
+			} 
+		},
+		init(mid){
+			let _this=this
+			_this.getInfo(mid);
+		},
+		go(url) {
+			let _this = this;
+			App.navigationTo({
+				url: url+'?rzType='+_this.rzType
+			});
+		},
+		getInfo(mid){
+			let _this=this
+			let data={
+				type:_this.rzType,
+				sid:mid
+			}
+			App._post_form('&p=attestation&do=getInfo',data,res=>{
+				_this.infoList=res.data
+				console.info(res.data.is_attestation)
+				if (res.data.is_attestation == 0) {
+					_this.rzimage = _this.wrz + _this.imgfixUrl;
+				} else if (_this.type == 1) {
+					_this.rzimage = _this.dsh+ _this.imgfixUrl;	
+				} else if(_this.type == 2){
+					_this.rzimage = _this.yrz+ _this.imgfixUrl;
+				}else{
+					_this.rzimage = _this.wrz+ _this.imgfixUrl;
+				}
+				if (res.data.is_money == 0) {
+					_this.bzjimage = _this.wrz+ _this.imgfixUrl;
+				}else if(res.data.is_money == 1){
+					_this.bzjimage = _this.yrz+ _this.imgfixUrl;
+				} 
+			})
+		}
+	}
+};
+</script>
+
+<style style="less">
+.attestationCenter {
+	border: 1upx solid rgba(0, 0, 0, 0);
+	overflow-x: hidden;
+	font-size: 0;
+}
+.marginTop30 {
+	margin: 30upx auto 0 auto !important;
+}
+.margin20 {
+	margin: 20upx 0;
+}
+.p30 {
+	padding: 30upx;
+}
+.mainView {
+	width: 690upx;
+	/* height: 160upx; */
+	margin: auto;
+	margin-bottom: 30upx;
+	border-radius: 20upx;
+}
+
+.back12CC53 {
+	background: linear-gradient(90deg, rgba(17, 204, 83, 1) 0%, rgba(43, 225, 116, 1) 100%);
+	box-shadow: 0px 2upx 12upx 0px rgba(18, 83, 204, 0.35);
+}
+.back297FF3 {
+	background: linear-gradient(90deg, rgba(41, 127, 243, 1) 0%, rgba(72, 171, 255, 1) 100%);
+	box-shadow: 0px 2upx 12upx 0px rgba(41, 243, 127, 0.35);
+}
+.backFD8834 {
+	background: linear-gradient(90deg, rgba(254, 136, 52, 1) 0%, rgba(234, 167, 44, 1) 100%);
+	box-shadow: 0px 2upx 12upx 0px rgba(253, 52, 136, 0.35);
+}
+.rzImage {
+	width: 70upx;
+	height: 70upx;
+}
+.rzimage {
+	width: 60upx;
+	height: 60upx;
+}
+
+.font24 {
+	font-size: 24upx;
+}
+.font28 {
+	font-size: 28upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.lineHeight70 {
+	line-height: 40upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginLeft20 {
+	margin-left: 20upx;
+}
+.marginLeft10 {
+	margin-left: 10upx;
+}
+.p43p35 {
+	padding: 43upx 35upx;
+}
+</style>
diff --git a/pages/subPages/attestationCenter/personAttestation/personAttestation.vue b/pages/subPages/attestationCenter/personAttestation/personAttestation.vue
new file mode 100644
index 0000000..de0ab0e
--- /dev/null
+++ b/pages/subPages/attestationCenter/personAttestation/personAttestation.vue
@@ -0,0 +1,508 @@
+<template>
+	<view class="personAttestation">
+		<!-- <view class="status_bar">这里是状态栏</view> -->
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<!-- <image :src="grrzBack" class="wid750 "></image> -->
+			<view class="mainView absolute0">
+				<!-- 基本信息 -->
+				<view class="informationView marginAuto">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">基本信息</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">姓名</text>
+								<input placeholder="请输入真实姓名" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="userInfo.name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">身份证</text>
+								<input placeholder="请输入正确的身份证号码" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="userInfo.cardnum" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">联系电话</text>
+								<input placeholder="请输入联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" type="number" v-model="userInfo.phone" />
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 基本信息 -->
+				<!-- 上传证件 -->
+				<view class="uploadView marginAuto marginT35">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">上传证件</text>
+						</view>
+						<view class="marginT29 flex">
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles(1)" v-if="picArray[0] == '' || picArray[0] == undefined">
+								<image :src="sfzZ" class="upLoadImg marginT30auto"></image>
+								<view class="marginT35"><text class="color999999 font24 ">身份证正面</text></view>
+							</view>
+							<view class="uploadButton inlineBlock textC" v-else @click="uploadFiles(1)"><image :src="picArray[0]" class="imageHave"></image></view>
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles(2)" v-if="picArray[1] == '' || picArray[1] == undefined">
+								<image :src="sfzB" class="upLoadImg marginT30auto"></image>
+								<view class="marginT35"><text class="color999999 font24 ">身份证反面</text></view>
+							</view>
+							<view class="uploadButton inlineBlock textC" v-else @click="uploadFiles(2)"><image :src="picArray[1]" class="imageHave"></image></view>
+						</view>
+					</view>
+				</view>
+				<!-- 上传证件 -->
+				
+				<!-- 更多信息 -->
+				<view class="uploadView marginAuto marginT35" style="height: auto;" v-if="orderSubmitInfoData.diyformid">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">更多信息</text>
+						</view>
+						<form-item ref="formItem" :gopay="gopay" :gopaytwo="gopaytwo" :orderSubmitInfo="orderSubmitInfoData"></form-item>
+					</view>
+				</view>
+				
+				<!-- 协议 -->
+				<view class="marginT40">
+					<view class="pL30">
+						<view class="bor1gray" v-if="agree == false" @click="agree = true"></view>
+						<image :src="imgfixUrls + 'merchant/tyXy.png'" class="image22" v-if="agree == true" @click="agree = false"></image>
+						<text class="font24 color999999 marginL10"  @click="agree = !agree">阅读并同意</text>
+						<text class="font24 color4F6D8C" @click="showPop">《用户协议条款》</text>
+					</view>
+				</view>
+				<!-- 协议 -->
+
+				<!-- 提交按钮 -->
+				<view class="marginT70auto textC" :class="agree == true ? 'submitButton' : 'submitButton1'" @click="setInfo">
+					<text class="lineHeight80 colorW font28">提交</text>
+				</view>
+				<!-- 提交按钮 -->
+				<popAgreement :show="show" @clickmask="closePop" :buttonColor="buttonColor" :textInfo="userInfo.agreement"></popAgreement>
+			</view>
+		</scroll-view>
+		<view  v-if="type == 1">
+			<TabBars :tabBarAct="0" pageType="18"></TabBars>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import TabBars from '@/components/template/tabBar.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import popAgreement from '@/components/template/popAgreement';
+import formItem from '@/components/template/formItem.vue'
+export default {
+	components: {
+		popAgreement,
+		TabBars,
+		formItem
+	},
+	data() {
+		return {
+			agree: false,
+			phoneHight: null,
+			show: false,
+			buttonColor: 'rgba(255,68,68,1)',
+			userInfo: {},
+			picArray: [],
+			id: null,
+			rzType: null,
+			type:null,
+			gopay:true,
+			orderSubmitInfoData:{},
+			gopaytwo:true
+		};
+	},
+	computed: {
+		grrzBack() {
+			let _this = this;
+			return _this.imageRoot + 'grrzBack.png';
+		},
+		sfzZ() {
+			let _this = this;
+			return _this.imageRoot + 'sfzZ.png';
+		},
+		sfzB() {
+			let _this = this;
+			return _this.imageRoot + 'sfzB.png';
+		}
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.type  = e.type;
+		_this.rzType = e.rzType;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		uni.getStorage({
+			key: 'userinfo',
+			success: async function(res) {
+				_this.init(res.data.mid);
+				_this.id = res.data.mid;
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+			_this.getInfo(mid);
+		},
+		// 信息设置接口
+		getInfo(mid) {
+			let _this = this;
+			let data = {
+				type: 1,
+				sid: mid,
+				operation: 'get'
+			};
+			App._post_form('&p=attestation&do=infoSet', data, res => {
+				_this.userInfo = res.data;
+				_this.orderSubmitInfoData = res.data;
+				_this.gopaytwo = false;
+				setTimeout(()=>{
+					_this.gopaytwo = true;
+				},2000)
+				for(let i=0;i<res.data.pic.length;i++){
+					_this.picArray.push(res.data.pic[i])
+				}
+			});
+		},
+		setInfo() {
+			let _this = this;
+			_this.gopay = false;
+			setTimeout(()=>{
+				_this.gopay = true;
+			},2000)
+			let data = {
+				type: 1,
+				sid: _this.id,
+				operation: 'set',
+				att_id: _this.userInfo.att_id,
+				name: _this.userInfo.name,
+				phone: _this.userInfo.phone,
+				pic: _this.userInfo.pic,
+				cardnum: _this.userInfo.cardnum
+			};
+			if(_this.userInfo.name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.userInfo.phone==''){
+				uni.showToast({
+					icon:'none',
+				    title: '联系电话不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.userInfo.cardnum==''){
+				uni.showToast({
+					icon:'none',
+				    title: '身份证号不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.userInfo.pic.length<2){
+				uni.showToast({
+					icon:'none',
+				    title: '请上传证件正反面',
+				    duration: 2000
+				});
+				return ;
+			}
+			setTimeout(()=>{
+				if(_this.$refs.formItem){
+					if( _this.$refs.formItem.ifrequired == false){
+						uni.showToast({
+							icon: 'none',
+							title: '请完善必填信息'
+						});
+						return
+					}
+					let datas = _this.$refs.formItem.formList;
+					data.datas = JSON.stringify(datas);
+					App._post_form('&p=attestation&do=infoSet',data, res => {
+						App.navigationTo({
+							url: 'pages/subPages/attestationCenter/index?rzType=' + _this.rzType
+						});
+					});
+				}else{
+					App._post_form('&p=attestation&do=infoSet',data, res => {
+						App.navigationTo({
+							url: 'pages/subPages/attestationCenter/index?rzType=' + _this.rzType
+						});
+					});
+				}
+				
+			})
+			// App._post_form('&p=attestation&do=infoSet', data, res => {
+			// 	App.navigationTo({
+			// 		url: 'pages/subPages/attestationCenter/index?rzType=' + _this.rzType
+			// 	});
+			// });
+		},
+		// 文件上传接口
+		async uploadFiles(type) {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+			     let res = await App.browser_upload(6);
+			     for (let i = 0; i < res.tempFilePaths.length; i++) {
+			     	let aa = await App._upLoad(res.tempFilePaths[i]);
+			     	if (type == 1) {
+			     		_this.userInfo.pic.splice(0, 1, aa.data.image);
+			     		_this.picArray.splice(0, 1, aa.data.img);
+			     	} else {
+			     		_this.userInfo.pic.splice(1, 1, aa.data.image);
+			     		_this.picArray.splice(1, 1, aa.data.img);
+			     	}
+			     }
+			
+			     return
+			    }
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									if (type == 1) {
+										_this.userInfo.pic.splice(0, 1, res.data.image);
+										_this.picArray.splice(0, 1, res.data.img);
+									} else {
+										_this.userInfo.pic.splice(1, 1, res.data.image);
+										_this.picArray.splice(1, 1, res.data.img);
+									}
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 6,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let aa = await App._upLoad(res.tempFilePaths[i]);
+						if (type == 1) {
+							_this.userInfo.pic.splice(0, 1, aa.data.image);
+							_this.picArray.splice(0, 1, aa.data.img);
+						} else {
+							_this.userInfo.pic.splice(1, 1, aa.data.image);
+							_this.picArray.splice(1, 1, aa.data.img);
+						}
+					}
+				}
+			});
+			// #endif
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		showPop() {
+			let _this = this;
+			_this.show = true;
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.bor1gray {
+	width: 21upx;
+	height: 21upx;
+	display: inline-block;
+	background: white;
+	border: 1upx solid #999999;
+	border-radius: 50%;
+}
+.personAttestation {
+	padding-bottom: 100upx;
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.wid750 {
+	width: 750upx;
+	height: 340upx;
+}
+.informationView {
+	width: 690upx;
+	height: 402upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.marginAuto {
+	margin: auto;
+}
+.absolute0 {
+	// position: absolute;
+	// top: 179upx;
+	width: 750upx;
+}
+.line {
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.colorBlack {
+	color: rgba(51, 51, 51, 1);
+}
+.font28 {
+	font-size: 28upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.p30 {
+	padding: 30upx;
+}
+.pL30 {
+	padding: 0 30upx;
+}
+.marginT29 {
+	margin-top: 29upx;
+}
+.marginT40 {
+	margin-top: 40upx;
+}
+.inputView {
+	width: 630upx;
+	height: 83upx;
+	background: rgba(250, 250, 250, 1);
+	border-radius: 10upx;
+	> text {
+		display: inline-block;
+		line-height: 83upx;
+		width: 126upx;
+		text-align: right;
+	}
+	> input {
+		height: 100%;
+		width: 400upx;
+	}
+}
+.marginT18 {
+	margin-top: 18upx;
+}
+.marginT35 {
+	margin-top: 35upx;
+}
+.marginT30auto {
+	margin: 30upx auto 0 auto;
+}
+.p0p50 {
+	padding: 0 50upx;
+}
+.uploadView {
+	width: 690upx;
+	height: 379upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.uploadButton {
+	width: 290upx;
+	height: 263upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10upx;
+}
+.imageHave {
+	width: 290upx;
+	height: 263upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.upLoadImg {
+	width: 212upx;
+	height: 141upx;
+}
+.color999999 {
+	color: rgba(153, 153, 153, 1);
+}
+.color4F6D8C {
+	color: #4f6d8c;
+}
+.textC {
+	text-align: center;
+}
+.image22 {
+	width: 22upx;
+	height: 22upx;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 40upx;
+}
+.marginT70auto {
+	margin: 70upx auto 20upx auto;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+//
+.status_bar{
+	width: 100%;
+	height: var(--status-bar-height);
+	padding-bottom: 15px;
+	background-color: transparent;
+	position: fixed;
+	top: 0px;
+	z-index: 99;
+}
+</style>
diff --git a/pages/subPages/balance/activityEntry/activityEntry.vue b/pages/subPages/balance/activityEntry/activityEntry.vue
new file mode 100644
index 0000000..0f769d0
--- /dev/null
+++ b/pages/subPages/balance/activityEntry/activityEntry.vue
@@ -0,0 +1,88 @@
+<template>
+	<!-- 转赠活动 -->
+	<view class="activityEntry" style="background: url(../../../../static/chooseCade/reddogbg.png);">
+		<far-bottom></far-bottom>
+		<view >
+			<view class="dis-flex" style="justify-content:center;align-items:center;padding-top: 180upx;">
+				<image style="width: 120upx;height: 120upx;border-radius: 50%;" :src="particulars.avatar" mode="aspectFill"></image>
+			</view>
+			<view class="t-c f-36 " style="padding: 30upx 0 0;color: #FFFFFF;">{{ particulars.title }}</view>
+			<view class="t-c f-30 " style="padding: 30upx 0;color: #FFFFFF;">{{ particulars.nickname }}转赠{{ particulars.money }}元</view>
+			<view class="dis-flex" style="justify-content:center;align-items:center;" @longpress="saveImg(particulars.qrlink)">
+				<image :src="particulars.qrlink" mode="" style="width: 45vw;height: 45vw;padding: 40upx;background-color: #FFFFFF;border-radius: 15upx;"></image>
+			</view>
+			<view class="t-c f-30" style="padding: 30upx 30upx;color: #FDC15E;width: 88vw;overflow: hidden;">{{ particulars.pageurl }}</view>
+			<view class="dis-flex" style="justify-content:center;align-items:center;">
+				<view class="t-c f-30" style="width: 55vw;height: 80upx;border-radius: 15upx;background-color: #FEEC62;line-height: 80upx;color: #333333;" @click="goshouqian">
+					复制链接
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import noneMores from '@/components/template/nonemores.vue';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	data() {
+		return {
+			particulars: {},
+			id: 0
+		};
+	},
+	onLoad(e) {
+		this.id = e.id;
+		this.getActivityDetails(e.id);
+	},
+	methods: {
+		saveImg(imgURL) {
+			console.log(imgURL);
+			uni.downloadFile({
+				//下载图片
+				url: imgURL,
+				success: res => {
+					console.log(res.tempFilePath);
+					uni.saveImageToPhotosAlbum({
+						//将图片保存在手机
+						filePath: res.tempFilePath, //保存的位置
+						success: res => {
+							console.log(res);
+							console.log('长按保存图片');
+						}
+					});
+				}
+			});
+		},
+		getActivityDetails(id) {
+			App._post_form(`&p=member&do=transferDetail&id=${id}`, {}, res => {
+				this.particulars = { ...this.particulars, ...res.data };
+				console.log(this.particulars);
+			});
+		},
+		goshouqian() {
+			//#ifdef H5
+				App.clipboard(this.particulars.pageurl);
+			//#endif
+			uni.setClipboardData({
+				data: this.particulars.pageurl
+			});
+			uni.showToast({
+				title: '链接已复制到粘贴板'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.activityEntry {
+	width: 100vw;
+	height: 100vh;
+	background-size: 100% 100%;
+}
+</style>
diff --git a/pages/subPages/balance/balance.vue b/pages/subPages/balance/balance.vue
new file mode 100644
index 0000000..1a7e1f1
--- /dev/null
+++ b/pages/subPages/balance/balance.vue
@@ -0,0 +1,325 @@
+<template>
+	<view class="balance" :style="{height:phoneHight}">
+		<far-bottom></far-bottom>
+		<view class="balances">
+			<view class="balanceTitle">
+				<view><span>{{moneytext}}</span></view>
+				<view>
+					<span>
+						¥
+						<span>{{rechargeInfo.credit}}</span>
+					</span>
+				</view>
+			</view>
+			<view class="balanceBody">
+				<view class="balanceBodyPackage dis-flex">
+					<view class="balanceBodyLeft flex-box t-c" @click="goYejl">
+						<view><image :src="imgfixUrls + 'merchant/yejl.png'" /></view>
+						<view style="font-size: 24upx;display: block;">{{moneytext}}{{languageStatus!=1?'记录':'기록'}}</view>
+					</view>
+					<view class="balanceBodyLeft flex-box t-c" @click="goYezz" v-if="rechargeInfo.transfer == 1">
+						<view><image src="../../../static/chooseCade/qian.png" style="width: 60upx;height: 60upx;padding:8upx 0 12upx;" /></view>
+						<view style="font-size: 24upx;display: block;">{{moneytext}}转赠</view>
+					</view>
+					<view class="balanceBodyRight flex-box t-c" @click="goYetx" v-if="rechargeInfo.nowithdrawals!==1">
+						<view><image :src="imgfixUrls + 'merchant/yetx.png'" /></view>
+						<view style="font-size: 24upx;display: block;">{{moneytext}}{{languageStatus!=1?'提现':'업무를'}}</view>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<!-- <view style="padding: 30upx;">
+			<button type="warn" plain="true" @click="goNewPage">newPage</button>
+		</view> -->
+		<view class="balanceInput" v-if="norecharge">
+			<view class="balanceInputPackage">
+				<view class="balanceInputTitle">
+					<view><span>输入金额</span></view>
+					<view>
+						<span>¥</span>
+						<input placeholder="请输入充值金额" v-model="money"/>
+					</view>
+				</view>
+				<view class="balanceInputFoot">
+					<view v-for="(item,index) in rechargeInfo.activity"><span>* <span>充值满{{item.kilometre}}元即送{{item.kilmoney}}元</span></span></view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 重置按钮 -->
+		<view class="balanceButton" @click="rechargeOrder" v-if="norecharge"><span>下一步</span></view>
+		<!-- 重置按钮 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif	
+	
+export default {
+	data() {
+		return {
+			rechargeInfo:{},
+			money:'',
+			moneytext:'',
+			norecharge:false,
+			phoneHight:null,
+			check:true
+		};
+	},
+	onLoad:function(){
+		let _this=this
+		this.init()
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+	},
+	methods: {
+		goYezz(){
+			App.navigationTo({
+				url:'pages/subPages/balance/presentMoney/presentMoney'
+			})
+		},
+		goNewPage(){
+			uni.navigateTo({
+				url:'newPage/newPage'
+			})
+		},
+		init() {
+			let _this=this
+			_this.rechargePage();
+			uni.getStorage({
+			    key: 'TextSubstitution',
+			    success: function (res) {
+			       _this.moneytext=res.data.moneytext
+			    }
+			});
+			uni.setNavigationBarTitle({
+			    title: _this.moneytext+'充值'
+			});
+		},
+		goYejl(){
+			App.navigationTo({
+				url:'pages/subPages/balance/balanceRecord/balanceRecord'
+			})
+		},
+		goYetx(){
+			App.navigationTo({
+				url:'pages/subPages/balance/cash/cash'
+			})
+		},
+		// {{moneytext}}充值页面
+		rechargePage(){
+			let _this=this
+			let data={}
+			App._post_form('&p=member&do=rechargePage',data,res=>{
+				_this.rechargeInfo=res.data
+				if(!!res.data.norecharge){
+					_this.norecharge = false;
+				}else{
+					_this.norecharge = true;
+				}
+			})
+		},
+		// {{moneytext}}充值订单生成
+		rechargeOrder(){
+			let _this=this
+			if(!this.check) return
+			if(_this.money==''){
+				uni.showToast({
+					icon:"none",
+				    title: '充值金额不能为空',
+				    duration: 2000
+				});
+			}
+			let data={
+				money:_this.money
+			};
+			this.check = false;
+			setTimeout(()=>{
+				this.check = true;
+			},2000)
+			App._post_form('&p=member&do=rechargeOrder',data,res=>{
+				App.navigationTo({
+					url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+'&plugin='+res.data.plugin
+				});
+				this.check = true;
+			})
+		}
+	},
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	
+	overflow-x: hidden;
+}
+.balance {
+	background: #f8f8f8;
+	font-size: 0;
+	border: 1upx solid rgba(0, 0, 0, 0);
+}
+.balances {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx;
+	overflow: hidden;
+}
+.balanceTitle {
+	width: 690upx;
+	background: rgba(255, 68, 68, 1);
+	border: 1upx solid rgba(0, 0, 0, 0);
+	> view:nth-child(1) {
+		margin-left: 30upx;
+		margin-top: 40upx;
+		> span {
+			font-size: 30upx;
+			
+			
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-left: 30upx;
+		margin-top: 30upx;
+		padding-bottom: 40upx;
+		> span {
+			font-size: 30upx;
+			
+			font-weight: 800;
+			color: rgba(255, 255, 255, 1);
+			> span {
+				font-size: 50upx;
+			}
+		}
+	}
+}
+.balanceBody {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+}
+.balanceBodyPackage {
+	padding: 30upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.balanceBodyLeft {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		border-radius: 50%;
+		> image {
+			width: 80upx;
+			height: 80upx;
+		}
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.balanceBodyRight {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		border-radius: 50%;
+		> image {
+			width: 80upx;
+			height: 80upx;
+		}
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.balanceInput {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.balanceButton {
+	margin: 30upx auto 0 auto;
+	width: 690upx;
+	height: 90upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 45upx;
+	text-align: center;
+	> span {
+		line-height: 90upx;
+		font-size: 28upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.balanceInputPackage {
+	padding: 30upx;
+}
+.balanceInputTitle {
+	padding-bottom: 20upx;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	> view:nth-child(1) {
+		> span {
+			font-size: 28upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin: 30upx 0 0 0;
+		> span {
+			vertical-align: bottom;
+			font-size: 30upx;
+			
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+		> input {
+			padding-left: 20upx;
+			vertical-align: bottom;
+			width: 500upx;
+			display: inline-block;
+			font-size: 48upx;
+			
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.balanceInputFoot {
+	> view {
+		margin-top: 20upx;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+			>span{
+				margin-left: 10upx;
+				color:#999999;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/balance/balanceRecord/balanceRecord.vue b/pages/subPages/balance/balanceRecord/balanceRecord.vue
new file mode 100644
index 0000000..06ed62d
--- /dev/null
+++ b/pages/subPages/balance/balanceRecord/balanceRecord.vue
@@ -0,0 +1,192 @@
+<template>
+	<view class="balanceRecord">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true" @scrolltolower="yejlLoad" >
+			<!-- 循环模板 -->
+			<view  v-if="list.length > 0">
+				<view class="yejlMb" v-for="(item,index) in list">
+					<view class="yejlMbPackage">
+						<view>
+							<view class="yejlMbImg" v-if="item.num>0">
+								<image :src="imgfixUrls + 'merchant/rmb.png'"/>
+							</view>
+							<view class="yejlMbImg" v-if="item.num<0" style="background:#DDDDDD">
+								<image :src="imgfixUrls + 'merchant/rmb.png'"/>
+							</view>
+							<view class="yejlMbInfo">
+								<view><span>{{item.remark}}</span></view>
+								<view><span>{{item.createtime}}</span></view>
+							</view>
+						</view>
+						<view>
+							<span v-if="item.num>0">+{{item.num}}</span>
+							<span v-if="item.num<0" style="color:#999999">{{item.num}}</span>
+						</view>
+					</view>
+				</view>
+				<!-- 循环模板 -->
+				<view class="tips">
+					<span>{{ yejlText }}</span>
+				</view>
+			</view>
+			
+			<block v-else>
+				<none-mores></none-mores>
+			</block>
+		</scroll-view>
+		
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import noneMores from '@/components/template/nonemores.vue'
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif			
+	
+	export default {
+		components:{
+			noneMores
+		},
+		data() {
+			return {
+				phoneHight:0,
+				page:1,
+				pagetotal:null,
+				list:[],
+				yejlText:'',
+			};
+		},
+		onLoad:function(){
+			this.init();
+		},
+		methods:{
+			init(){
+				let _this=this
+				_this.creditRecord();
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight+'px';
+					}
+				});
+				uni.getStorage({
+				    key: 'TextSubstitution',
+				    success: function (res) {
+				       _this.moneytext=res.data.moneytext
+					   uni.setNavigationBarTitle({
+					       title: res.data.moneytext+'记录'
+					   });
+				    }
+				});
+				
+			},
+			// 积分余额变更记录
+			creditRecord(){
+				let _this=this
+				_this.yejlText="... ...加载中"
+				let	data={
+						page:_this.page,
+						type:2
+					};
+				App._post_form('&p=member&do=creditRecord',data,res=>{
+					_this.list=[..._this.list,...res.data.list];
+					_this.pagetotal=res.data.pagetotal
+					_this.yejlText=""
+				})	
+			},
+			yejlLoad(){
+				let _this=this
+				if(_this.pagetotal==_this.page){
+					_this.yejlText="没有更多数据了"
+				}
+				else{
+					_this.page++
+					_this.creditRecord();
+				}
+				
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+page{
+	background: #F6F6F6;
+}	
+.balanceRecord{
+	font-size: 0;
+}
+.yejlMb{
+	background: #FFFFFF;
+}
+.yejlMbPackage{
+	border-bottom: 1upx solid rgba(246,246,246,1);
+	padding: 40upx 30upx;
+	display: flex;
+	justify-content: space-between;
+	>view{
+		display: inline-block;
+	}
+	>view:nth-child(2){
+		>span{
+			line-height: 64upx;
+			font-size:28upx;
+				color:rgba(244,79,68,1);
+		}
+	}
+	>view:nth-child(1){
+		>view{
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+}
+
+.yejlMbImg{
+	vertical-align: middle;
+	display: inline-block;
+	width:64upx;
+	height:64upx;
+	overflow:hidden;
+	border-radius:50%;
+	background:#F44F44;
+	>image{
+			width:64upx;
+			height:64upx;
+	}
+}
+.yejlMbInfo{
+	margin-left:20upx;
+	>view:nth-child(1){
+		>span{
+			width: 400upx;
+			display: inline-block;
+			overflow: hidden;
+			text-overflow: ellipsis;
+			word-wrap: break-word;
+			white-space: nowrap !important;
+		}
+		font-size:28upx;
+		width:400upx;
+		font-weight:400;
+		color:rgba(51,51,51,1);
+	}
+	>view:nth-child(2){
+		font-size:24upx;
+		olor:rgba(153,153,153,1);
+	}
+}
+.tips {
+	height: 80upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		
+		
+		color: black;
+	}
+}
+</style>
diff --git a/pages/subPages/balance/cash/cash.vue b/pages/subPages/balance/cash/cash.vue
new file mode 100644
index 0000000..48657a8
--- /dev/null
+++ b/pages/subPages/balance/cash/cash.vue
@@ -0,0 +1,540 @@
+<template>
+	<view class="cash">
+		<far-bottom></far-bottom>
+		<!-- 提现输入框 -->
+		<view class="cashInput">
+		
+			<view class="cashInputPackage">	
+				<view><span>提现金额</span></view>
+				<view>
+					<span>¥</span>
+					<input placeholder="请输入金额" v-model="settlementmoney" />
+				</view>
+
+				<view>
+					<block class="dis-flex">
+						<span style="line-height: 20upx;">可提现(元)：{{creditCashInfo.nowmoney}}</span>
+					</block>
+					
+					<view @click="allWithdrawal"><span>全部提现</span></view>
+				</view>
+				<view style="color: #FF4444;font-size: 22upx;">提现金额{{creditCashInfo.lowsetmoney}}元起<text v-if="creditCashInfo.maxsetmoney !== 99999999">,单次最高可提现金额{{creditCashInfo.maxsetmoney}}元</text>,提现手续费{{creditCashInfo.syssalepercent}}%</view>
+				<view>
+					<view @click="allWithdrawal"><span>全部提现</span></view>
+				</view>
+				
+			</view>
+		</view>
+		<!-- 提现输入框 -->
+
+		<!-- 选择支付方式 -->
+		<view class="checkPayType">
+			<view class="checkPayTypePackage">
+				<view><span>提现到</span></view>
+				<!-- 微信 -->
+				<view class="type" v-if="creditCashInfo.wechatstatus==1" @click="cashtype=2">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/wechatPay.svg'" />
+							<span>微信零钱</span>
+						</view>
+						<view class="checked" v-if="cashtype==2">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+				</view>
+				<!-- 微信 -->
+				<!-- 渠道1 -->
+				<view class="type" v-if="creditCashInfo.alipaystatus==1" @click="cashtype=1">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/payPal.svg'" />
+							<span>{{examineing==0?'支付宝':'渠道1'}}</span>
+						</view>
+						<view class="checked" v-if="cashtype==1">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+					<view class="yhkInput" v-if="cashtype==1">
+						<view>
+							<span>真实姓名</span>
+							<input placeholder="请填写真实姓名" v-model="creditCashInfo.realname" />
+						</view>
+						<view>
+							<span>{{examineing==0?'支付宝':'渠道1'}}</span>
+							<input :placeholder="examineing==0?'请输入支付宝账号':'请输入渠道1账号'" v-model="creditCashInfo.alipay" />
+						</view>
+					</view>
+				</view>
+				<!-- 渠道1 -->
+				<!-- 渠道2 -->
+				<view class="type" v-if="creditCashInfo.bankcardstatus==1" @click="cashtype=3">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/yhk.png'" />
+							<span>{{examineing==0?'银行':'渠道2'}}账户</span>
+						</view>
+						<view class="checked" v-if="cashtype==3">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+					<view class="yhkInput" v-if="cashtype==3">
+						<view>
+							<span>真实姓名</span>
+							<input placeholder="请输入姓名" v-model="creditCashInfo.bank_username" />
+						</view>
+						<view>
+							<span>开户{{examineing==0?'银行':'渠道2'}}</span>
+							<input :placeholder="examineing==0?'请输入开户行名称/地址':'请输入渠道2备注'" v-model="creditCashInfo.bank_name" />
+						</view>
+						<view>
+							<span>{{examineing==0?'银行卡号':'渠道2'}}</span>
+							<input :placeholder="examineing==0?'请输入银行卡号':'请输入渠道2号'" type="number" v-model="creditCashInfo.card_number" />
+						</view>
+					</view>
+				</view>
+				<!-- 渠道2 -->
+				<view class="inputFoot">
+					<span></span>
+					<view>
+						<span>请务必填写真实信息</span>
+						<span>*</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 选择支付方式 -->
+
+
+		<!-- 提交按钮 -->
+		<view class="cashSubmit" @click="creditCashing">
+			<span>提交审核</span>
+		</view>
+		<!-- 提交按钮 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif		
+
+	export default {
+		data() {
+			return {
+				creditCashInfo: {},
+				settlementmoney: "",
+				cashtype: '',
+				examineing:1
+			};
+		},
+		onLoad: function() {
+			this.init();
+			let TextSubstitution = uni.getStorageSync('TextSubstitution');
		this.examineing = TextSubstitution.examineing || 0;
+		},
+		methods: {
+			allWithdrawal(){
+				let _this = this;
+				if( Number(_this.creditCashInfo.maxsetmoney) < Number(_this.creditCashInfo.nowmoney)){
+					uni.showToast({
+						icon: 'none',
+						title: `单次最大提现金额为${_this.creditCashInfo.maxsetmoney}`,
+						duration: 2000
+					});
+					_this.settlementmoney = _this.creditCashInfo.maxsetmoney;
+				}else{
+					_this.settlementmoney = _this.creditCashInfo.nowmoney;
+				}
+			},
+			init() {
+				let _this = this
+				_this.creditCashPage();
+			},
+			// 余额提现页面
+			creditCashPage() {
+				let _this = this,
+					data = {};
+				App._post_form('&p=member&do=creditCashPage', data, res => {
+					_this.creditCashInfo = res.data;
+					// _this.creditCashInfo.maxsetmoney = 0;
+					if(Number(_this.creditCashInfo.maxsetmoney) == 0){
+						_this.creditCashInfo.maxsetmoney = 99999999;
+					}
+					if (res.data.wechatstatus == 1) {
+						_this.cashtype = 2
+					} else {
+						if (res.data.alipaystatus == 1) {
+							_this.cashtype = 1
+						} else {
+							_this.cashtype = 3
+						}
+					}
+				}, fail => {
+					console.info()
+					if (fail.data.message == '余额提现已关闭') {
+						App.navigationTo({
+							url: 'pages/subPages/balance/balance'
+						})
+					}
+				})
+			},
+			// 确认提现
+			withdraw(fromData) {
+				App._post_form('&p=member&do=creditCashing', fromData, res => {
+					if (res.errno === 0) {
+						App.showSuccess('提现申请成功', () => {
+							uni.navigateBack()
+						})
+					}
+				})
+			},
+			// 余额提现申请
+			creditCashing() {
+				let _this = this,
+					datas = {
+						settlementmoney: _this.settlementmoney,
+						cashtype: _this.cashtype,
+						alipay: _this.creditCashInfo.alipay,
+						realname: _this.creditCashInfo.realname || '',
+						bank_name: _this.creditCashInfo.bank_name,
+						card_number: _this.creditCashInfo.card_number,
+						bank_username: _this.creditCashInfo.bank_username,
+					};
+				if (_this.settlementmoney == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '提现金额不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if(Number(_this.settlementmoney)  >Number(_this.creditCashInfo.nowmoney) || Number(_this.settlementmoney)  >Number(_this.creditCashInfo.maxsetmoney)){
+					if(_this.creditCashInfo.nowmoney > _this.creditCashInfo.maxsetmoney){
+						uni.showToast({
+							icon: 'none',
+							title: `单次最大提现金额为${_this.creditCashInfo.maxsetmoney}`,
+							duration: 2000
+						});
+					}else{
+						uni.showToast({
+							icon: 'none',
+							title: `本次最大提现金额为${_this.creditCashInfo.nowmoney}`,
+							duration: 2000
+						});
+					}
+					
+					_this.allWithdrawal();
+					return;
+				};
+				if (_this.cashtype == 1) {
+					if (_this.creditCashInfo.alipay == '') {
+						uni.showToast({
+							icon: 'none',
+							title: _this.examineing==0?'支付宝账号不能为空':'渠道1账号不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (!_this.creditCashInfo.realname) {
+						uni.showToast({
+							icon: 'none',
+							title: '真实姓名不能为空',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				if (_this.cashtype == 3) {
+					if (_this.creditCashInfo.bank_username == '') {
+						uni.showToast({
+							icon: 'none',
+							title: '真实姓名不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (_this.creditCashInfo.bank_name == '') {
+						uni.showToast({
+							icon: 'none',
+							title: '开户行不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (_this.creditCashInfo.card_number.length < 13 || _this.creditCashInfo.card_number.length > 25) {
+						uni.showToast({
+							icon: 'none',
+							title: _this.examineing==0?'银行卡号不能为空':'渠道2号格式不正确',
+							duration: 2000
+						});
+						return;
+					}
+					
+				}
+				let currentPrice = _this.settlementmoney; //实际金额
+				let serviceCharge = _this.creditCashInfo.syssalepercent; //手续费
+				let calculate = {
+					money: currentPrice,
+					percent: serviceCharge
+				}
+				App._post_form('&p=pay&do=calculationCash', calculate, res => {
+					if (res.errno === 0) {
+						let conpmoney = res.data.realmoney;
+						console.log(conpmoney);
+						if(Number(conpmoney) < 1){
+							uni.showToast({
+								title:'最小实得金额不能小于1元,当前实得金额为'+conpmoney+'元',
+								icon:'none'
+							})
+							return
+						}
+						App.showError(
+							`确认提现${currentPrice}元,实得${conpmoney}元`, (data) => {
+								if (data.confirm) {
+									!!data && _this.withdraw(datas)
+								}
+							}, true)
+					}
+				})
+				// let realTimePrice = Math.round((currentPrice - (Number(serviceCharge) / 100 * currentPrice)) * 100) / 100;//四舍五入
+				// 
+
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.cash {
+		font-size: 0;
+		border: 1upx solid rgba(0, 0, 0, 0);
+	}
+
+	page {
+		background: #f6f6f6;
+		overflow-x: hidden;
+	}
+
+	.cashInput {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.cashInputPackage {
+		padding: 30upx;
+
+		>view:nth-child(1) {
+			>span {
+				font-size: 28upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 48upx;
+			padding-bottom: 20upx;
+			border-bottom: 1upx solid rgba(246, 246, 246, 1);
+
+			>span {
+				vertical-align: bottom;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>input {
+				display: inline-block;
+				width: 500upx;
+				font-size: 36upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(3) {
+			margin: 20upx 0 0 0;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				line-height: 70upx;
+				font-size: 24upx;
+
+
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>view {
+				display: inline-block;
+				width: 184upx;
+				height: 70upx;
+				background: rgba(244, 79, 68, 1);
+				border-radius: 35upx;
+				text-align: center;
+
+				>span {
+					line-height: 70upx;
+					font-size: 24upx;
+
+
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+		}
+	}
+
+	.checkPayType {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.checkPayTypePackage {
+		padding: 30upx;
+
+		>view:nth-child(1) {
+			>span {
+				font-size: 30upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 10upx;
+		}
+	}
+
+	.typePackage {
+		padding: 20upx 0;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1upx solid rgba(246, 246, 246, 1);
+
+		>view:nth-child(1) {
+			vertical-align: middle;
+
+			>image {
+				vertical-align: middle;
+				width: 60upx;
+				height: 60upx;
+			}
+
+			>span {
+				margin-left: 15upx;
+				vertical-align: middle;
+				font-size: 28upx;
+
+
+				color: rgba(81, 81, 81, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 15upx;
+			vertical-align: middle;
+			width: 35upx;
+			height: 35upx;
+			border: 2upx solid rgba(238, 238, 238, 1);
+			border-radius: 50%;
+
+			>image {
+				width: 35upx;
+				height: 35upx;
+			}
+		}
+	}
+
+	.yhkInput {
+		padding: 20upx;
+
+		>view {
+			border-bottom: 1upx solid rgba(246, 246, 246, 1);
+			padding: 20upx 0;
+
+			>span {
+				vertical-align: middle;
+				display: inline-block;
+				width: 100upx;
+				font-size: 24upx;
+
+
+				color: rgba(81, 81, 81, 1);
+			}
+
+			>input {
+				padding-left: 30upx;
+				vertical-align: middle;
+				width: 400upx;
+				display: inline-block;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: rgba(81, 81, 81, 1);
+			}
+		}
+	}
+
+	.inputFoot {
+		margin-top: 20upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+
+			>span:nth-child(1) {
+				vertical-align: top;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>span:nth-child(2) {
+				vertical-align: top;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: #EF4949;
+			}
+		}
+	}
+
+	.cashSubmit {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		height: 84upx;
+		background: rgba(244, 79, 68, 1);
+		border-radius: 42upx;
+		text-align: center;
+
+		>span {
+			line-height: 84upx;
+			font-size: 28upx;
+
+			font-weight: 400;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.checked {
+		width: 35px;
+		height: 35px;
+		background: #F44F44;
+		border-radius: 50%;
+	}
+</style>
diff --git a/pages/subPages/balance/collectMoney/collectMoney.vue b/pages/subPages/balance/collectMoney/collectMoney.vue
new file mode 100644
index 0000000..e4000e4
--- /dev/null
+++ b/pages/subPages/balance/collectMoney/collectMoney.vue
@@ -0,0 +1,106 @@
+<template>
+	<!-- 转赠收款 -->
+	<view class="activityEntry" style="background: url(../../../../static/chooseCade/reddogbg.png);">
+		<far-bottom></far-bottom>
+		<view >
+			<view class="dis-flex" style="justify-content:center;align-items:center;padding-top: 180upx;">
+				<image style="width: 120upx;height: 120upx;border-radius: 50%;" :src="particulars.avatar" mode="aspectFill"></image>
+			</view>
+			<view class="t-c f-36 " style="padding: 30upx 0 0;color: #FFFFFF;">
+				{{particulars.title}}
+			</view>
+			<view class="t-c f-30 " style="padding: 30upx 0 200upx;color: #FFFFFF;">
+				{{particulars.nickname}}转赠{{particulars.money}}元
+			</view>
+			<view class="dis-flex" style="justify-content:center;align-items:center;padding-bottom: 30upx;">
+				<input class="uni-input t-c" v-model="message.realname" :adjust-position="false" @blur="inputBlur"@confirm="inputBlur" placeholder="请输入你的姓名" maxlength="4" placeholder-style="text-align: center;" style="padding: 10upx 20upx;background-color: #FFFFFF;width: 70vw;height: 70upx;border-radius: 10upx;"/>
+			</view>
+			<view class="dis-flex" style="justify-content:center;align-items:center;">
+				<input class="uni-input t-c" v-model="message.mobile" :adjust-position="false" placeholder="请输入你的手机号" @blur="inputBlur"@confirm="inputBlur" type="number" maxlength="11" placeholder-style="text-align: center;" style="padding: 10upx 20upx;background-color: #FFFFFF;width: 70vw;height: 70upx;border-radius: 10upx;" />
+			</view>
+			<view class="t-c f-28" style="padding: 30upx 30upx;color: #FE9894;overflow: hidden;">
+				输入你的信息,收到的人民币自动放入你的账户
+			</view>
+			<view class="dis-flex" style="justify-content:center;align-items:center;padding-top: 50upx;">
+				<view class="t-c f-30" style="width: 55vw;height: 80upx;border-radius: 15upx;background-color: #FEEC62;line-height: 80upx;color: #FF4444;" @click="goshouqian">
+					确认
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import noneMores from '@/components/template/nonemores.vue'
+	
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				particulars:{},
+				message:{
+					realname:'',
+					mobile:'',
+					id:null
+				},
+			}
+		},
+		onLoad(e) {
+			console.log(e.transfer_id);
+			this.message.id = e.transfer_id;
+			this.getParticulars(e.transfer_id);
+		},
+		methods:{
+			inputBlur(){
+				uni.pageScrollTo({
+				scrollTop: 0,
+				duration: 0
+				});
+			},
+			getParticulars(id){
+				App._post_form(`&p=member&do=transferpage&id=${id}`,{},res=>{
+					this.particulars = {...this.particulars,...res.data};
+				})
+			},
+			goshouqian(){
+				let phone = new RegExp(/^1[3-9]\d{9}$/);
+				if(this.message.realname == ''){
+					uni.showToast({
+						icon:'none',
+						title:'姓名不能为空'
+					});
+					return
+				}
+				if(!phone.test(this.message.mobile)){
+					uni.showToast({
+						icon:'none',
+						title:'请输入正确的手机号' 
+					});
+					return
+				}
+				App._post_form(`&p=member&do=getTransfer`,this.message,res=>{
+					uni.showLoading({
+					    title: '获取成功,为您跳转回到首页'
+					});
+					setTimeout(()=>{
+						uni.hideLoading();
+						uni.reLaunch({
+						    url: '/pages/mainPages/index/index'
+						});
+					},1000)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.activityEntry{
+		width: 100vw;
+		height: 100vh;
+		background-size: 100% 100%;
+	}
+</style>
diff --git a/pages/subPages/balance/getTheDetails/getTheDetails.vue b/pages/subPages/balance/getTheDetails/getTheDetails.vue
new file mode 100644
index 0000000..0494d0d
--- /dev/null
+++ b/pages/subPages/balance/getTheDetails/getTheDetails.vue
@@ -0,0 +1,132 @@
+<template>
+	<view class="getTheDetails">
+		<far-bottom></far-bottom>
+		<view >
+			<view class="bg" style="padding: 30upx;background-color: #FF4444;color: #FFFFFF;border-radius: 15upx 15upx 0 0;">
+				<view class="dis-flex" style="padding-bottom: 20upx;">
+					<view class="flex-box  f-32">
+						{{transferRecord.transfer.title}}
+					</view>
+					<view class="flex-box f-28  t-r" style="line-height: 46upx;">
+						共{{transferRecord.transfer.allnum}}份,剩{{transferRecord.transfer.surplus}}份
+					</view>
+				</view>
+				<view class="dis-flex">
+					<view class="flex-box f-w f-48">
+						¥{{transferRecord.transfer.allmoney}}
+					</view>
+					<view class="flex-box f-28  t-r" style="line-height: 70upx;">
+						{{transferRecord.transfer.createtime}}
+					</view>
+				</view>
+				
+			</view>
+			<view class="f-34 t-c b-f" style="height: 120upx;line-height: 120upx;">
+				领取记录
+			</view>
+		</view>
+		<view  style="margin-top: 10upx;">
+			<view class="dis-flex b-f" v-for="(item,index) in record" :key="index" style="margin-bottom: 10upx;border-radius: 10upx;">
+				<view class="t-c" style="flex: 0.2;padding: 20upx;padding-top: 40upx;">
+					<image :src="item.avatar" mode="aspectFill" style="width: 110upx;height: 110upx;border-radius: 50%;"></image>
+				</view>
+				<view  style="flex: 0.8;padding: 20upx;">
+					<view class="dis-flex">
+						<view class="flex-box f-30">
+							{{item.nickname}}
+						</view>
+						<view class="flex-box t-r f-w f-28">
+							¥{{item.money}}
+						</view>
+					</view>
+					<view class="dis-flex f-24" style="color: #999999;padding: 10upx 0;">
+						<view  style="flex: 0.4;">
+							<text class="iconfont icon-wode"></text>
+							<text style="padding-left: 10upx;">{{item.realname}}</text>
+						</view>
+						<view class=" t-r"  style="flex: 0.6;">
+							{{item.createtime}}
+						</view>
+					</view>
+					<view class="f-24" style="color: #999999;">
+						<text class="iconfont icon-dianhua"></text>
+						<text>{{item.mobile}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<load-more :isMore="isMore" v-if="count > 1"></load-more>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import noneMores from '@/components/template/nonemores.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		components:{
+			loadMore
+		},
+		data(){
+			return{
+				page:1,
+				transferRecord:{
+					transfer:{
+						allmoney:'',
+						allnum:'',
+						createtime:'',
+						surplus:'',
+						title:''
+					}
+				},
+				isMore:false,
+				count:0,
+				record:[]
+			}
+		},
+		onLoad(e) {
+			this.id = e.id;
+			this.getTheDetails();
+		},
+		methods:{
+			getTheDetails(flag){
+				App._post_form(`&p=member&do=getTransferRecord&id=${this.id}&page=${this.page}`,{},res=>{
+					if(flag){
+						this.record.push(...res.data.record);
+					}else{
+						this.transferRecord = res.data;
+						this.count = res.data.allpage;
+						this.record = res.data.record;
+					}
+					
+				})
+			}
+		},
+		onReachBottom() {
+			if(this.page == this.count){
+				this.isMore = true;
+				return
+			};
+			this.page++;
+			this.getTheDetails(true);
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.getTheDetails{
+		padding: 30upx;
+	}
+	.bg{
+		background: url(../../../../static/chooseCade/BG.png) no-repeat right ;
+		background-size: 30% 100%;
+	}
+</style>
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages/balance/newPage/newPage.vue b/pages/subPages/balance/newPage/newPage.vue
new file mode 100644
index 0000000..a92aa87
--- /dev/null
+++ b/pages/subPages/balance/newPage/newPage.vue
@@ -0,0 +1,11 @@
+<template>
+	<view class="newPage">
+		newWork self 
+	</view>
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/pages/subPages/balance/presentMoney/presentMoney.vue b/pages/subPages/balance/presentMoney/presentMoney.vue
new file mode 100644
index 0000000..569b926
--- /dev/null
+++ b/pages/subPages/balance/presentMoney/presentMoney.vue
@@ -0,0 +1,133 @@
+<template>
+	<!-- 余额转赠 -->
+	<view class="presentMoney">
+		<far-bottom></far-bottom>
+		<view  style="padding: 30upx;">
+			<view >
+				<view class="dis-flex" style="padding: 30upx;background-color: #FFFFFF;border-radius: 10upx;">
+					<view class="f-30 flex-box f-w" style="color: #333333;">
+						<view class="dis-il-block" style="padding: 2.5upx 6upx;color: #FFFFFF;background-color: #FF4444;border-radius: 5upx;margin-right: 10upx;font-weight: 500;font-size: 16upx;">
+							活
+						</view>
+						活动标题
+					</view>
+					<view class="t-r flex-box">
+						<input class="uni-input"  style="font-size: 28upx;" v-model="activity.title" placeholder="请输入活动标题" placeholder-style="font-size:28upx" />
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 30upx;background-color: #FFFFFF;border-radius: 10upx;margin-top: 20upx;">
+					<view class="f-30 flex-box f-w" style="color: #333333;">
+						转赠人数
+					</view>
+					<view class="t-r flex-box dis-flex">
+						<input class="uni-input "  type="number" v-model="activity.allnum" style="font-size: 28upx;" placeholder="填写人数" placeholder-style="font-size:28upx" />
+						<view class="f-28 f-w" style="padding-left: 10upx;">人</view>
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 30upx;background-color: #FFFFFF;border-radius: 10upx;margin-top: 20upx;">
+					<view class="f-30 flex-box f-w" style="color: #333333;">
+						转赠金额
+					</view>
+					<view class="t-r flex-box dis-flex">
+						<input class="uni-input " type="digit" v-model="activity.money" style="font-size: 28upx;" placeholder="0.00" placeholder-style="font-size:28upx" />
+						<view class="f-28 f-w" style="padding-left: 10upx;">元</view>
+					</view>
+				</view>
+			</view>
+			<view class="t-c dis-flex" style="justify-content:center;align-items:center;margin: 50upx 0;color: #333333;">
+				<view style="font-size: 40upx;font-weight: 700;vertical-align: top;padding-right: 10upx;">¥</view>
+				<view style="font-size: 80upx;font-weight: 700;">{{activity.allnum * activity.money || '0.00'}}</view>
+			</view>
+			<view  style="padding: 0 160upx;">
+				<button type="warn" style="font-size: 32upx;" @click="goHD">创建活动</button>
+			</view>
+			<view class="t-c f-28" style="color: #999999;padding: 20upx 0;" @click="goWqjl">
+				<text>往期活动</text><text class="iconfont icon-right" style="font-size: 28upx;"></text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import noneMores from '@/components/template/nonemores.vue'
+	
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				activity:{
+					title:'',
+					allnum:'',
+					money:''
+				}
+			}
+		},
+		methods:{
+			goPmony(){
+				uni.showLoading({
+				    title: '跳转活动页面'
+				});
+				App._post_form('&p=member&do=createTransfer',this.activity,res=>{
+					if(res.errno == 0){
+						this.activity = {
+							title:'',
+							allnum:'',
+							money:''
+						}
+						uni.hideLoading();
+						App.navigationTo({
+							url:'pages/subPages/balance/activityEntry/activityEntry' + '?id=' + res.data.transid
+						})
+					}
+				})
+				
+			},
+			goHD(){
+				if(this.activity.title == ''){
+					uni.showToast({
+						icon:'none',
+						title:'请输入活动名称'
+					});
+					return
+				}
+				if(this.activity.allnum == ''){
+					uni.showToast({
+						icon:'none',
+						title:'请输入转增人数'
+					});
+					return
+				}
+				if(this.activity.money == ''){
+					uni.showToast({
+						icon:'none',
+						title:'请输入人均转增金额'
+					});
+					return
+				}
+				App.showError(
+					`即将进行总计金额${this.activity.allnum * this.activity.money}元,人数为${this.activity.allnum}的余额转赠活动,确认发起？`,
+					data => {
+						if (data.confirm) {
+							!!data && this.goPmony();
+						}
+					},
+					true
+				);
+			},
+			goWqjl(){
+				App.navigationTo({
+					url:'pages/subPages/balance/previous/previous'
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
diff --git a/pages/subPages/balance/previous/previous.vue b/pages/subPages/balance/previous/previous.vue
new file mode 100644
index 0000000..03ffb86
--- /dev/null
+++ b/pages/subPages/balance/previous/previous.vue
@@ -0,0 +1,124 @@
+<template>
+	<view class="previous" style="padding: 30upx;">
+		<far-bottom></far-bottom>
+		<view >
+			<view >
+				<view >
+					<view  style="padding:30upx;background-color: #FFFFFF;margin-bottom: 30upx;border-radius: 10upx;position: relative;" v-for="(item,index) in previousList" :key="index" >
+						<view class="dis-flex" style="position: absolute;right: 0;top: 0;" v-if="item.is_over == '1'">
+							<view class="negSix">
+								
+							</view>
+							<view class="f-20 f-w" style="height: 30upx;padding: 0upx 20upx;background-color: #FF4444;color: #FFFFFF;">
+								已过期
+							</view>
+						</view>
+						<view class="dis-flex" style="padding-bottom: 20upx;">
+							<view class="t-l flex-box f-w">
+								<text class="iconfont icon-activityfill" style="font-size: 24upx;color: #FF4444;"></text>
+								<text style="font-size: 30upx;padding-left: 30upx;">{{item.title}}</text>
+							</view>
+							<view class="t-r flex-box" style="font-size: 30upx;color: #FF4444;font-weight: 600;">
+								<text>-{{item.allmoney}}</text>
+							</view>
+						</view>
+						<view class="f-26" style="color: #999999;padding-left: 50upx;padding-bottom: 30upx;">
+							<view  style="padding-bottom: 20upx;">
+								<text>发布时间:</text>
+								<text style="padding-left: 20upx;">{{item.createtime}}</text>
+							</view>
+							<view >
+								<text>转赠数量:</text>
+								<text style="padding-left: 20upx;">{{item.allnum}}个,剩余{{item.surplus}}个</text>
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view  style="flex: 0.6;">
+								
+							</view>
+							<view class="flex-box dis-flex">
+								<view class="flex-box t-r">
+									<button class="mini-btn" style="border: 2upx solid #F1F1F1;" type="default" plain="true" size="mini" @click="gowq(item)" v-if="item.is_over !== '1'">查看详情</button>
+								</view>
+								<view class="flex-box t-r">
+									<button class="mini-btn" style="border: 2upx solid #FF4444;" type="warn" plain="true" size="mini" @click="gojl(item)">领取记录</button>
+								</view>
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<load-more :isMore="isMore" v-if="count > 1"></load-more>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import noneMores from '@/components/template/nonemores.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		components:{
+			loadMore
+		},
+		data(){
+			return{
+				previousList:[],
+				count:1,
+				page:1,
+				isMore:false
+			}
+		},
+		onLoad() {
+			this.getPreviousList();
+		},
+		methods:{
+			gojl(item){
+				App.navigationTo({
+					url:'pages/subPages/balance/getTheDetails/getTheDetails' + '?id=' + item.id
+				})
+			},
+			gowq(item){
+				App.navigationTo({
+					url:'pages/subPages/balance/activityEntry/activityEntry' + '?id=' + item.id
+				})
+			},
+			getPreviousList(flag){
+				App._post_form(`&p=member&do=oldTransferList&page=${this.page}`,{},res=>{
+					if(flag){
+						this.previousList.push(...res.data.list);
+					}else{
+						this.setData({
+							previousList:res.data.list,
+							count:res.data.pagetotal
+						});
+					}
+				})
+			},
+		},
+		onReachBottom() {
+			if(this.page == this.count){
+				this.isMore = true;
+				return
+			};
+			this.page++;
+			this.getPreviousList(true);
+		},
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+	.negSix{
+		width: 0;
+		height: 0;
+		border-top: 30upx solid #FF4444;
+		border-left: 30upx solid transparent;
+	}
+</style>
diff --git a/pages/subPages/bargin/barginDetail/barginDetail.vue b/pages/subPages/bargin/barginDetail/barginDetail.vue
new file mode 100644
index 0000000..b1dec39
--- /dev/null
+++ b/pages/subPages/bargin/barginDetail/barginDetail.vue
@@ -0,0 +1,1164 @@
+<template>
+	<!-- 砍价详情 -->
+	<view>
+		<loading v-if="loading"></loading>
+		<view class="container" style="padding-bottom: 120upx;" v-if="!loading">
+			<far-bottom></far-bottom>
+			<view class="header">
+				<swiper :autoplay="true" :interval="3000" :circular="true" class="goods-swiper" :style="{height: height}">
+					<swiper-item class="swiper-item" v-for="(banner_item, index) in barginData['thumbs']" :key="index">
+						<image :src="banner_item"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="section p-r">
+				<view class="section-header" :style="{ 'background-image': 'url(' + (barginData.bar_image?barginData.bar_image + ')':imageRoot + 'bargin_stn_header_bg.png)') }"></view>
+				<view class="section-content" :style="{backgroundColor: barginData.bar_bgc}">
+					<!-- 砍价测试 -->
+					<view class="section-box">
+						<view class="section-box-top p-r">
+							<view class="bargin-section-title t-c f-30 f-w">{{ barginData['name'] }}</view>
+							<block v-if="!!barginData['timeobj']">
+								<view class="section-title t-c">
+									<view class="section-title-content f-28 t-c p-r">距离活动结束还有</view>
+								</view>
+								<view class="bargin-endTime f-24 t-c p-top-bom-40 p-r">
+									<text class="bargin-endTime-style b-f">{{ !!barginData['timeobj'] ? barginData['timeobj']['dd'] : '00' }}</text>
+									天
+									<text class="bargin-endTime-style b-f">{{ !!barginData['timeobj'] ? barginData['timeobj']['hh'] : '00' }}</text>
+									时
+									<text class="bargin-endTime-style b-f">{{ !!barginData['timeobj'] ? barginData['timeobj']['mm'] : '00' }}</text>
+									分
+									<text class="bargin-endTime-style b-f">{{ !!barginData['timeobj'] ? barginData['timeobj']['ss'] : '00' }}</text>
+									秒
+								</view>
+							</block>
+							<block v-else>
+								<view class="bargin-endTime-await">
+									<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+								</view>
+							</block>
+						</view>
+						<view class="section-box-bottom b-f">
+							<view class="user-info t-c m-btm20">
+								<view class="user-avatar" :style="{ 'background-image': 'url(' + barginData['avatar'] + ')' }"></view>
+								<view class="user-nickName f-28">{{ barginData['nickname'] }}</view>
+							</view>
+							<view class="t-c m-btm20">
+								<view class="bargin-nowPrice f-28">
+									现价:
+									<text>{{ barginData['price'] }}元</text>
+								</view>
+							</view>
+							<view class="bargin-progress-box">
+								<view class="bargin-progress p-r m-btm10">
+									<view class="already-progress" :style="'width:' + Number(barginData['proportion']) * 100 + '%;'"></view>
+								</view>
+								<view class="dis-flex flex-y-center flex-x-between">
+									<view class="bargin-oldPrice f-28" style="text-decoration:line-through;">市场价：{{ barginData['oldprice'] }}元</view>
+									<view class="bargin-floorPrice f-28">底价：{{ barginData['goods_price'] }}元</view>
+								</view>
+							</view>
+							<view class="bargin-btn-box dis-flex flex-x-around flex-y-center flex-warp">
+								<block v-if="is_bgnSuccess && barginData['is_originator'] === 0 && barginData['status'] !== '3'" >
+									<view class="bargin-btn-style bargin-success m-btm20">砍价成功</view>
+								</block>
+								<block v-if="barginData['is_originator'] === 0 && barginData['status'] !== '3'">
+									<view class="bargin-btn-style go-bargin m-btm20" @click="navgateToGoods(barginData['goods_id'])">我也要玩</view>
+								</block>
+								<block v-if="barginData['is_bargain'] === 0 && !is_bgnSuccess && barginData['status'] !== '3'">
+									<view class="bargin-btn-style go-bargin m-btm20" v-if="barginData['price'] !== barginData['goods_price'] && barginData['status'] !== '3'"
+									 @click="isbargainAniShow">
+										{{ barginData['is_originator'] === 1 ? '砍一刀' : '帮他砍价' }}
+									</view>
+								</block>
+								<block v-if="barginData['is_originator'] == 1 &&
+											barginData['is_bargain'] == 1 &&
+											barginData['price'] != barginData['goods_price'] &&
+											barginData['status'] == '1' &&
+											barginData['orderid'] == '0'">
+									<!-- #ifdef H5 -->
+									<view class="bargin-btn-style go-bargin m-btm20 p-r" @click="isOpenShare">找人帮忙</view>
+									<!-- #endif -->
+									<!-- #ifndef H5 -->
+									<view class="bargin-btn-style go-bargin m-btm20 p-r">找人帮忙
+										<button open-type="share"></button>
+									</view>
+									<!-- #endif -->
+								</block>
+								<block v-if="barginData['buytip'] > 0 ">
+									<view class="bargin-btn-style hand-buy m-btm20" @click="buyOrder">立即购买</view>
+								</block>
+								<block v-if="barginData['orderid'] !== '0' && barginData['is_originator'] === 1 && barginData['status'] !== '3'">
+									<view class="bargin-btn-style hand-buy m-btm20" @click="exOrder(barginData)">查看订单</view>
+								</block>
+								<block v-if="barginData['status'] === '3'">
+									<view class="bargin-btn-style hand-buy m-btm20" style="background: linear-gradient(90deg, #999999, #999999);color: #FFFFFF;">砍价失败</view>
+								</block>
+							</view>
+						</view>
+					</view>
+
+					<!-- 活动介绍 -->
+					<view class="section-box">
+						<view class="section-box-top-2  p-r p-top-bom-30 section-box-top-2">
+							<view class="section-title t-c">
+								<view class="section-title-content-2 f-28 t-c p-r">活动介绍</view>
+							</view>
+						</view>
+						<view class="section-box-bottom b-f">
+							<view class="dis-flex flex-y-center m-left-right-30 p-top-bom-30 section-box-btmStyle">
+								<view class="prize-box f-28">
+									本期奖品
+									<text>{{ barginData['stock'] }}</text>
+									份
+								</view>
+								<view class="prize-box f-28">
+									剩余
+									<text>{{ barginData['stk'] }}</text>
+									份
+								</view>
+							</view>
+							<view class="dis-flex flex-y-center flex-x-between m-left-right-30 p-top-bom-30">
+								<view class="address">
+									<view class="f-28 col-3 m-btm10">{{ barginData['storename'] }}</view>
+									<view class="f-28 col-9">{{ barginData['address'] }}</view>
+								</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-f iconfont icon-daohang1 address-icon-style icon-location m-right20" @click="supple(barginData['location'], 'address')"></view>
+									<view class="col-f iconfont icon-dianhua1 address-icon-style icon-call" @click="supple(barginData['mobile'], 'mobile')"></view>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 砍价帮团 -->
+					<view class="section-box">
+						<view class="section-box-top-2  p-r p-top-bom-30 section-box-top-2">
+							<view class="section-title t-c">
+								<view class="section-title-content-2 f-28 t-c p-r">砍价帮帮团</view>
+							</view>
+						</view>
+						<view class="section-box-bottom b-f padding-box-all Bargainrecord" :style="{height: barginData['list'].length < 9?'auto':'800upx'}" v-if="barginData['list']">
+							<view class="bargin-ranklist">
+								<view class="bargin-list-item dis-flex flex-y-center flex-x-between m-btm20" v-for="(item, index) in barginData['list']"
+								 :key="index">
+									<view class="dis-flex flex-y-center">
+										<view class="rank-avatar m-right20" :style="{ 'background-image': 'url(' + item['avatar'] + ')' }"></view>
+										<view class="f-28 col-6">{{ item['nickname'] }}</view>
+									</view>
+									<view class="bargin-list-itemRank f-28">帮忙砍价{{ item['price'] }}元</view>
+								</view>
+							</view>
+							
+						</view>
+					</view>
+
+					<!-- 推荐商品 -->
+					<view class="section-box" v-if="recommendGoodlength > 0">
+						<view class="section-box-top-2  p-r p-top-bom-30 section-box-top-2">
+							<view class="section-title t-c">
+								<view class="section-title-content-2 f-28 t-c p-r">推荐商品</view>
+							</view>
+						</view>
+						<view class="section-box-bottom b-f padding-box-all">
+							<view class="recommend-goodsbox">
+								<recommendGoods @recommendGoodNoOff="recommendGoodNoOff"></recommendGoods>
+							</view>
+						</view>
+					</view>
+					<view  style="padding: 60upx 0;" v-else>
+						
+					</view>
+					
+
+					<!-- 帮他砍价 -->
+					<view class="ani-bargain" v-if="bargainAniShow">
+						<view class="ani-bargain-mask" @click="closeAniShow"></view>
+						<view class="ani-bargain-d" v-if="bargainAni">
+							<view class="ani-bargain-d-a">
+								<view class="ani-bargain-knife" :class="{ knifeAni: bargainAni }">
+									<view class="ani-bargain-knife-kn"></view>
+								</view>
+								<view class="ani-bargain-circle">
+									<view class="circle-l" :class="{ circlerightani: bargainAni }">
+										<view class="circle-d"></view>
+									</view>
+									<view class="circle-r" :class="{ circleleftani: bargainAni }">
+										<view class="circle-d"></view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="alreadyBarginPrice-box" :style="{ 'background-image': ' url(' + imageRoot + 'alreadyBargin.png)' }"
+						 v-if="!bargainAni">
+							<view class="already-Price-title t-c ">
+								<view class="already-Price col-f f-38 m-btm20">
+									WOW! 您已砍
+									<text>{{ presenBarginPrice }}</text>
+									元!
+								</view>
+								<view class="f-31 col-f">召唤小伙伴，可多砍一刀哦！</view>
+							</view>
+							<!-- #ifdef H5 -->
+							<view class="barginShare-btn t-c f-30" @click="barginSharebtn">召唤小伙伴帮砍</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view class="barginShare-btn t-c f-30">召唤小伙伴帮砍<button class=" t-c f-30 op0" open-type="share"></button></view>
+							<!-- #endif -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" pageType="7" />
+		<!-- #ifdef H5 -->
+		<view class="masking" v-if="isShare" @click="isOpenShare">
+			<image :src="imageRoot + 'share.png'" class="to-share" mode="widthFix"></image>
+		</view>
+		<!-- #endif -->
+		<view  v-if="followShow">
+			<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+			 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle" :shareId="shareId"></follow>
+		</view>
+		
+		<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+<script>
+	import follow from '@/components/template/follow.vue';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	import PartLoading from '@/components/template/PartLoading.vue';
+	import recommendGoods from '@/components/page/pageComponents/Recommend_goods.vue';
+	import App from '@/common/js/app.js';
+	import loading from '@/components/template/loadlogo';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	import TabBars from '@/components/template/tabBar';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	let setEndTime = null;
+	export default {
+		data() {
+			return {
+				continuityCli: true,
+				show1: false,
+				shareId: null,
+				followType: '7',
+				bargin_id: null, //砍价活动id
+				order_id: null, //砍价活动订单id
+				followTitleShow: true,
+				followShow: false,
+				barginData: {}, // 砍价详情
+				bargainAniShow: false, //砍价蒙版
+				bargainAni: false, // 砍价动画
+				loading: true, // 加载动画
+				is_bgnSuccess: false, // 是否砍价成功
+				presenBarginPrice: '0.00', //当前砍掉的价格
+				isShare: false ,// 是否分享
+				optionis:null,
+				vxshow:false,
+				width:'',
+				height:'',
+				recommendGoodlength:1
+			};
+		},
+		onLoad(options) {
+			let _this = this;
+			_this.width = options.width;
+			_this.height = options.height;
+			console.log(options,111)
+			_this.optionis = options;
+			_this.shareId = options.bargin_id;
+			_this.setData(options);
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+
+		},
+		onShow() {
+			let _this = this;
+			_this.continuityCli = true;
+			_this.getbarginDetail(_this.optionis.bargin_id, _this.optionis.order_id);
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+		},
+		methods: {
+			recommendGoodNoOff(res){
+				console.log(res.length,'推荐奖长度');
+				this.recommendGoodlength = res.length;
+			},
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+			},
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			// 砍价详情
+			getbarginDetail(bargin_id = '50', order_id = '') {
+				let _this = this,
+					requestData = {
+						id: bargin_id,
+						order_id
+					};
+				App._post_form(
+					'&p=bargain&do=detail',
+					requestData,
+					res => {
+						let barginData = res.data;
+						if (res.data.is_originator == 1) {
+							_this.followType = '7';
+						} else {
+							_this.followType = '8';
+						}
+						_this.setData({
+							barginData: barginData
+						});
+						_this.goodsEndTime();
+					},
+					false,
+					() => {
+						_this.loading = false;
+					}
+				);
+			},
+			/**
+			 * 购买商品
+			 */
+			buyOrder() {
+				let _this = this,
+					barginData = _this.barginData,
+					buy_barginData = {
+						goods_id: barginData.goods_id,
+						plugin: '7',
+						specid: barginData.id,
+						goods_num: 1
+					};
+				App.navigationTo({
+					url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode(buy_barginData)
+				});
+			},
+			// 跳转到商品详情
+			navgateToGoods(goods_id) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/goods/index?goods_id=' + goods_id + '&goodsType=7'
+				});
+			},
+			// 查看订单
+			exOrder(barginData) {
+				let _this = this,
+					orderData = {
+						orderid: barginData.orderid,
+						plugin: 'bargain'
+					};
+				App.navigationTo({
+					url: 'pages/subPages/orderList/orderDetails/orderDetails?' + App.urlEncode(orderData)
+				});
+			},
+			/**
+			 * 砍价倒计时
+			 */
+			goodsEndTime() {
+				let _this = this,
+					barginData = _this.barginData,
+					// 截止时间
+					endTime = Number(barginData.endtime) * 1000;
+				// 抢购\拼团\砍价倒计时
+				clearInterval(setEndTime);
+				setEndTime = setInterval(() => {
+					let nowTime = new Date().getTime(),
+						// 	距离结束时间
+						leftTime = parseInt((endTime - nowTime) / 1000),
+						// 每个商品活动时间
+						timeobj = {},
+						callback = function(dataTime) {
+							let dd = parseInt(dataTime / 60 / 60 / 24),
+								hh = parseInt((dataTime / 60 / 60) % 24),
+								mm = parseInt((dataTime / 60) % 60),
+								ss = parseInt(dataTime % 60),
+								timeobj = {
+									dd: dd < 10 ? `0${dd}` : dd,
+									hh: hh < 10 ? `0${hh}` : hh,
+									mm: mm < 10 ? `0${mm}` : mm,
+									ss: ss < 10 ? `0${ss}` : ss
+								};
+							_this.$set(_this.barginData, 'timeobj', timeobj);
+						};
+					if (leftTime > 0) {
+						callback(leftTime);
+					} else {
+						timeobj = {
+							dd: '00',
+							hh: '00',
+							mm: '00',
+							ss: '00'
+						};
+						_this.$set(_this.barginData, 'timeobj', timeobj);
+						clearInterval(setEndTime);
+					}
+				}, 1000);
+			},
+			closeAniShow() {
+				this.bargainAniShow = false;
+			},
+			isbargainAniShow() {
+				let _this = this;
+				let data = {
+					type: _this.followType,
+					id: _this.shareId
+				};
+				if (_this.continuityCli) {
+					_this.continuityCli = false;
+					App._post_form('&do=Follow', data, res => {
+						if (res.data.status == '0') {
+							let barginData = _this.barginData;
+							App._post_form(
+								'&p=bargain&do=cut', {
+									id: _this.bargin_id
+								},
+								res => {
+									if (res.errno === 0) {
+										_this.presenBarginPrice = res.data.price;
+										_this.bargainAniShow = true;
+										_this.bargainAni = true;
+										_this.is_bgnSuccess = barginData.is_originator === 0 ? true : false;
+										_this.isbargainAni();
+									}
+								},
+								fail => {
+									let _this = this;
+									_this.continuityCli = true;
+									if (fail.data.message == '未绑定手机号') {
+										
+										//#ifdef H5
+										_this.show1 = true;
+										//#endif
+										//#ifndef H5
+										_this.vxshow = true;
+										//#endif
+										
+									}
+								}
+							);
+						} else {
+							_this.followShow = true;
+							_this.continuityCli = true;
+						}
+					});
+				}
+
+
+			},
+			isbargainAni() {
+				let _this = this;
+				clearInterval(barginTimer);
+				let barginTimer = setInterval(() => {
+					_this.bargainAni = false;
+					if (!_this.bargainAni) {
+						clearInterval(barginTimer);
+					}
+				}, 1500);
+				_this.getbarginDetail(_this.bargin_id, _this.order_id);
+			},
+			barginSharebtn() {
+				this.bargainAniShow = false;
+				this.isShare = true;
+			},
+			isOpenShare() {
+				this.isShare = !this.isShare;
+			},
+			// 拨号跟地址
+			supple(storeInfo, supType) {
+				let _this = this,
+					barginData = _this.barginData;
+				if (supType === 'mobile') {
+					uni.makePhoneCall({
+						phoneNumber: storeInfo
+					});
+				}
+				if (supType === 'address') {
+					// #ifdef H5
+					wxApi.WxopenLocation(Number(storeInfo['lat']), Number(storeInfo['lng']), barginData['storename'], barginData[
+						'address']);
+					// #endif
+					// #ifdef MP-WEIXIN
+					// debugger
+					// console.log(storeInfo);
+					// let locationOptions = {
+					// 	storename: barginData['storename'],
+					// 	address: barginData['address'],
+					// 	latitude: Number(storeInfo.lat),
+					// 	longitude: Number(storeInfo.lng)
+					// };
+					// App.openLocation(locationOptions);
+					uni.openLocation({
+					    latitude: Number(storeInfo.lat),
+					    longitude: Number(storeInfo.lng),
+						success: function () {
+							console.log('success');
+						},
+						fail: function () {
+							console.log('success');
+						},
+					})
+					// #endif
+					//#ifdef APP-PLUS
+					Map.openMap(Number(storeInfo.lat),Number(storeInfo.lng),barginData['storename'],'gcj02')
+					//#endif
+				}
+			}
+		},
+		components: {
+			recommendGoods,
+			loading,
+			PartLoading,
+			follow,
+			PhoneMask,
+			getvxphone,
+			TabBars
+		},
+		computed: {}
+	};
+</script>
+<style lang="scss" scoped>
+	.op0 {
+		top: 0;
+		opacity: 0;
+		width: 380upx;
+		height: 84upx;
+		position: absolute;
+	}
+
+	.header {
+		.goods-swiper {
+			width: 100vw;
+			height: 70vw;
+			position: relative;
+			z-index: 1;
+
+			.swiper-item {
+				height: 70vw;
+
+				&>image {
+					width: 100%;
+					height: 100%;
+					display: block;
+				}
+			}
+		}
+	}
+
+	.section {
+		margin-top: -52upx;
+		z-index: 2;
+
+		.section-header {
+			width: 100%;
+			height: 92upx;
+			background-size: 100% 92upx;
+			background-repeat: no-repeat;
+		}
+
+		.section-content {
+			background-color: rgb(104, 211, 255);
+			padding-bottom: 40upx;
+
+			.section-box {
+				margin: 0 30upx 20upx;
+				border-radius: 20upx;
+				box-shadow: -10upx 10upx 0 0 rgba(0, 0, 0, 0.1);
+			}
+
+			.section-box-top::before {
+				content: ' ';
+				width: 80upx;
+				height: 80upx;
+				background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAwICQoJBwwKCQoNDAwOER0TERAQESMZGxUdKiUsKyklKCguNEI4LjE/MigoOk46P0RHSktKLTdRV1FIVkJJSkf/2wBDAQwNDREPESITEyJHMCgwR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0f/wgARCABTAFQDAREAAhEBAxEB/8QAGAABAQEBAQAAAAAAAAAAAAAAAAQDAgf/xAAYAQEBAQEBAAAAAAAAAAAAAAAAAwQCAf/aAAwDAQACEAMQAAAA9LxXAAAAAAAAAAAAAAAAA31RPcMtRvqie4ZagAVbYCXFcVbYCfJUDnnoVbYCXFcVbYAAS4rirbAS4rirbAADDPQb6JjGFDza/AAAAGUexrbgAAACbHYU7IgAAAYw7PdrzAA//8QAHhAAAgIDAQADAAAAAAAAAAAAAQIAAxIwUhAgQFD/2gAIAQEAAT8A/DRQojLl6ihRGXLZi3JmLcmYtyfrtWYtZ9avmJV1qayJZqMGqyVD5f/EACARAAICAgICAwAAAAAAAAAAAAECABEDMBJREDEgQFD/2gAIAQIBAT8A/DVAsZA3lUCxkDbOLdTi3U4t19dkI9REJ9+Wxm7EXGbs6myUaETJZo6xqyCYx8v/xAAcEQEAAwEBAAMAAAAAAAAAAAABAAIRMBAgQFD/2gAIAQMBAT8A/DXYOersHOmk0mn1yxGx6WjbkVjXkc6R+X//2Q==');
+				background-size: 80upx 80upx;
+				background-repeat: no-repeat;
+				position: absolute;
+				left: 0;
+				bottom: -15.5%;
+			}
+
+			.section-box-top::after {
+				content: ' ';
+				width: 80upx;
+				height: 76upx;
+				background-image: url('data:image/jpg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7KCIoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozv/wgARCABTAFMDAREAAhEBAxEB/8QAGQABAQEBAQEAAAAAAAAAAAAAAAMEAgEH/8QAGAEBAQEBAQAAAAAAAAAAAAAAAAMCBAH/2gAMAwEAAhADEAAAAPrXB0AAAAAAAAAAAAAAAAAAUrO/TPNyW5xqlZ36Zx56TnoPPfPPb9Mq2xn5azlu/VKtcADPy1nLd+qVa4z8tZy3fqlWuABn5azlu/VKtcZ+Ws5bt0ytbAAlLcufd+qXe/Jz1KG79M+teAAADifs5brfHWvAAABn5qTjS/TGtsgAADnPsOWmjrl76H//xAAlEAABAgUDBAMAAAAAAAAAAAABAgMAEBESMiBxgTAxUpEhUFH/2gAIAQEAAT8A+lZQDUmKAwtNqpMoBqTFAYLPzFi/FXqLF+KvUUIkxid5PZ8SYxO+l7PiTGJ3k9nxJjE76Xs+JMYneT2fEmMTvpcbuFR3ixfjCE2JpJxF4gMrhKbU0HRWsIEB8/kAhQqOi/kDJnDoqAKTWEAXQO0//8QAIhEAAQMDBAMBAAAAAAAAAAAAAQACAxASMhEgITETMFFQ/9oACAECAQE/APxYmg8rQJ7bTSJoPK0CMXKtcrXIgikONJe6Q47Ze6Q40l7pDjtl7pDjSXKkOO2Rlysd8TG2ij2XIROTRaNPS51q8x+IEEaj0zdikWPpcAQmgXbP/8QAHREAAgICAwEAAAAAAAAAAAAAAQIQMQAREiAwUP/aAAgBAwEBPwD4rGFOxDGOWbGbEvcJUPfVKh7hKh76pUPcJUPfVTrOQwncKdZzGE7PiBvOHklQ1+I6/wD/2Q==');
+				background-size: 80upx 76upx;
+				background-repeat: no-repeat;
+				position: absolute;
+				right: 0;
+				bottom: -14.5%;
+			}
+
+			.section-box-top-2::before {
+				content: ' ';
+				width: 80upx;
+				height: 80upx;
+				background-image: url('data:image/jpeg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAwICQoJBwwKCQoNDAwOER0TERAQESMZGxUdKiUsKyklKCguNEI4LjE/MigoOk46P0RHSktKLTdRV1FIVkJJSkf/2wBDAQwNDREPESITEyJHMCgwR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0dHR0f/wgARCABTAFQDAREAAhEBAxEB/8QAGAABAQEBAQAAAAAAAAAAAAAAAAQDAgf/xAAYAQEBAQEBAAAAAAAAAAAAAAAAAwQCAf/aAAwDAQACEAMQAAAA9LxXAAAAAAAAAAAAAAAAA31RPcMtRvqie4ZagAVbYCXFcVbYCfJUDnnoVbYCXFcVbYAAS4rirbAS4rirbAADDPQb6JjGFDza/AAAAGUexrbgAAACbHYU7IgAAAYw7PdrzAA//8QAHhAAAgIDAQADAAAAAAAAAAAAAQIAAxIwUhAgQFD/2gAIAQEAAT8A/DRQojLl6ihRGXLZi3JmLcmYtyfrtWYtZ9avmJV1qayJZqMGqyVD5f/EACARAAICAgICAwAAAAAAAAAAAAECABEDMBJREDEgQFD/2gAIAQIBAT8A/DVAsZA3lUCxkDbOLdTi3U4t19dkI9REJ9+Wxm7EXGbs6myUaETJZo6xqyCYx8v/xAAcEQEAAwEBAAMAAAAAAAAAAAABAAIRMBAgQFD/2gAIAQMBAT8A/DXYOersHOmk0mn1yxGx6WjbkVjXkc6R+X//2Q==');
+				background-size: 80upx 80upx;
+				background-repeat: no-repeat;
+				position: absolute;
+				left: 0;
+				bottom: -36.5%;
+			}
+
+			.section-box-top-2::after {
+				content: ' ';
+				width: 80upx;
+				height: 76upx;
+				background-image: url('data:image/jpg;base64,/9j/4AAQSkZJRgABAQAAAQABAAD/2wBDAAoHBwgHBgoICAgLCgoLDhgQDg0NDh0VFhEYIx8lJCIfIiEmKzcvJik0KSEiMEExNDk7Pj4+JS5ESUM8SDc9Pjv/2wBDAQoLCw4NDhwQEBw7KCIoOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozv/wgARCABTAFMDAREAAhEBAxEB/8QAGQABAQEBAQEAAAAAAAAAAAAAAAMEAgEH/8QAGAEBAQEBAQAAAAAAAAAAAAAAAAMCBAH/2gAMAwEAAhADEAAAAPrXB0AAAAAAAAAAAAAAAAAAUrO/TPNyW5xqlZ36Zx56TnoPPfPPb9Mq2xn5azlu/VKtcADPy1nLd+qVa4z8tZy3fqlWuABn5azlu/VKtcZ+Ws5bt0ytbAAlLcufd+qXe/Jz1KG79M+teAAADifs5brfHWvAAABn5qTjS/TGtsgAADnPsOWmjrl76H//xAAlEAABAgUDBAMAAAAAAAAAAAABAgMAEBESMiBxgTAxUpEhUFH/2gAIAQEAAT8A+lZQDUmKAwtNqpMoBqTFAYLPzFi/FXqLF+KvUUIkxid5PZ8SYxO+l7PiTGJ3k9nxJjE76Xs+JMYneT2fEmMTvpcbuFR3ixfjCE2JpJxF4gMrhKbU0HRWsIEB8/kAhQqOi/kDJnDoqAKTWEAXQO0//8QAIhEAAQMDBAMBAAAAAAAAAAAAAQACAxASMhEgITETMFFQ/9oACAECAQE/APxYmg8rQJ7bTSJoPK0CMXKtcrXIgikONJe6Q47Ze6Q40l7pDjtl7pDjSXKkOO2Rlysd8TG2ij2XIROTRaNPS51q8x+IEEaj0zdikWPpcAQmgXbP/8QAHREAAgICAwEAAAAAAAAAAAAAAQIQMQAREiAwUP/aAAgBAwEBPwD4rGFOxDGOWbGbEvcJUPfVKh7hKh76pUPcJUPfVTrOQwncKdZzGE7PiBvOHklQ1+I6/wD/2Q==');
+				background-size: 80upx 76upx;
+				background-repeat: no-repeat;
+				position: absolute;
+				right: 0;
+				bottom: -35.5%;
+			}
+
+			.section-box-top,
+			.section-box-top-2 {
+				border-radius: 10upx 10upx 0 0;
+				background-color: #fdf0cf;
+
+				.bargin-section-title {
+					padding: 30upx 0;
+					color: #936749;
+				}
+
+				.section-title-content,
+				.section-title-content-2 {
+					display: inline-block;
+					background-color: #fad553;
+					color: #936749;
+					padding: 10upx 20upx;
+					border-radius: 24upx;
+				}
+
+				.section-title-content::before {
+					content: ' ';
+					width: 20upx;
+					height: 28upx;
+					background-size: 20upx 28upx;
+					background-repeat: no-repeat;
+					background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAMAAADeH4ToAAAATlBMVEX98M/71VP98Mv711j978f+7bz82F/+7sL95p795Jb967P84IL82mT97Lf96av96Kb956L83HD96q7844784or833z72Fz722n85Zn83nkZlL3jAAAAnElEQVQY013Q2xLEEAyAYUGUouhx9/1fdE2zafFd/iMyE0G0c1oM0mnGOAUA8+nbAZWybcoKblYKFi8gp9W80yv4C/wyG3iYfEcs0FBLTXID6KMUywk9MwsXhncbCo3JmybxZrkcCshWE9PJX0ZBweEQaf/SpIwo36xpqISyZ+wn6Hfj7SR5YIVH2AVx8PLNiZnj/xAxxrla14nSD12fBUgJiKSkAAAAAElFTkSuQmCC');
+					position: absolute;
+					left: -10%;
+					top: -10%;
+				}
+
+				.section-title-content::after {
+					content: ' ';
+					width: 20upx;
+					height: 28upx;
+					background-size: 20upx 28upx;
+					background-repeat: no-repeat;
+					background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAMAAADeH4ToAAAAS1BMVEX98M/71VP98M3711f978n72F795JX97sL97Lr95p382WP+78b+7b797LX96rD956L96av96Kf84YL833383HD844784or822n83ngTVmF9AAAAnklEQVQY012Q2wKEEBBADQa5JFLt/3/p2pWJzpM5zA0jpFKSgq4Q08spBLjcpBYBlX0wfIE/InKqtSA0LkPKwo3IriVGCwS27E3AQPH1VVMPh2QBYQY35o/XO6t+XQeJORnHqjz6IPtGI5sCAq+c3LTZ50yazTjN6d6HdqY4nsUW2UOu425bp17lHFZeb5fhQd1OkXk+W6+VEIIxxusvXW4FntGkuOQAAAAASUVORK5CYII=');
+					position: absolute;
+					right: -10%;
+					top: -10%;
+				}
+
+				.section-title-content-2::before {
+					content: ' ';
+					width: 20upx;
+					height: 28upx;
+					background-size: 20upx 28upx;
+					background-repeat: no-repeat;
+					background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAMAAADeH4ToAAAATlBMVEX98M/71VP98Mv711j978f+7bz82F/+7sL95p795Jb967P84IL82mT97Lf96av96Kb956L83HD96q7844784or833z72Fz722n85Zn83nkZlL3jAAAAnElEQVQY013Q2xLEEAyAYUGUouhx9/1fdE2zafFd/iMyE0G0c1oM0mnGOAUA8+nbAZWybcoKblYKFi8gp9W80yv4C/wyG3iYfEcs0FBLTXID6KMUywk9MwsXhncbCo3JmybxZrkcCshWE9PJX0ZBweEQaf/SpIwo36xpqISyZ+wn6Hfj7SR5YIVH2AVx8PLNiZnj/xAxxrla14nSD12fBUgJiKSkAAAAAElFTkSuQmCC');
+					position: absolute;
+					left: -15%;
+					top: -10%;
+				}
+
+				.section-title-content-2::after {
+					content: ' ';
+					width: 20upx;
+					height: 28upx;
+					background-size: 20upx 28upx;
+					background-repeat: no-repeat;
+					background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAAXCAMAAADeH4ToAAAAS1BMVEX98M/71VP98M3711f978n72F795JX97sL97Lr95p382WP+78b+7b797LX96rD956L96av96Kf84YL833383HD844784or822n83ngTVmF9AAAAnklEQVQY012Q2wKEEBBADQa5JFLt/3/p2pWJzpM5zA0jpFKSgq4Q08spBLjcpBYBlX0wfIE/InKqtSA0LkPKwo3IriVGCwS27E3AQPH1VVMPh2QBYQY35o/XO6t+XQeJORnHqjz6IPtGI5sCAq+c3LTZ50yazTjN6d6HdqY4nsUW2UOu425bp17lHFZeb5fhQd1OkXk+W6+VEIIxxusvXW4FntGkuOQAAAAASUVORK5CYII=');
+					position: absolute;
+					right: -15%;
+					top: -10%;
+				}
+
+				.bargin-endTime-await {
+					padding: 90upx 0;
+				}
+
+				// 倒计时
+				.bargin-endTime {
+					color: #936749;
+
+					&>text {
+						font-size: 28upx;
+						border-radius: 4upx;
+						padding: 10upx 14upx;
+						border: 1px solid #ecc29c;
+						margin: 0 6upx;
+					}
+				}
+			}
+
+			.section-box-bottom {
+				border-radius: 0 0 10upx 10upx;
+
+				.user-avatar {
+					width: 80upx;
+					height: 80upx;
+					border-radius: 50%;
+					background-repeat: no-repeat;
+					background-size: 80upx 80upx;
+					border: 1px solid #ecc29c;
+					margin: 0 auto 20upx;
+				}
+
+				.bargin-nowPrice {
+					padding: 8upx 20upx;
+					background-color: #eee;
+					border-radius: 24upx;
+					display: inline-block;
+					margin: 0 auto;
+
+					&>text {
+						color: #ff433f;
+						margin-left: 10upx;
+					}
+				}
+
+				.bargin-progress-box {
+					margin: 0 30upx;
+
+					.bargin-progress {
+						height: 12upx;
+						border-radius: 10upx;
+						background-color: #fef1cf;
+
+						.already-progress {
+							position: absolute;
+							left: 0;
+							right: 0;
+							top: 0;
+							bottom: 0;
+							background-color: #fbd553;
+							border-radius: 10upx;
+						}
+					}
+				}
+
+				.section-box-btmStyle {
+					border-bottom: 1px dashed #cccccc;
+
+					.prize-box {
+						position: relative;
+						z-index: 3;
+
+						&>text {
+							border-radius: 4upx;
+							border: 1px solid #ecc29c;
+							margin: 0 20upx;
+							padding: 6upx 30upx;
+							color: #ff433f;
+						}
+					}
+				}
+
+				.bargin-btn-box {
+					padding: 40upx 0;
+					margin: 0 20upx;
+
+					.bargin-btn-style {
+						color: #fff;
+						font-weight: 600;
+						padding: 24upx 70upx;
+						border-radius: 60upx;
+						font-size: 32upx;
+
+						button {
+							position: absolute;
+							left: 0;
+							right: 0;
+							top: 0;
+							bottom: 0;
+							opacity: 0;
+						}
+					}
+
+					.bargin-success {
+						background: linear-gradient(90deg, #cacbca, #9b9b9b);
+						box-shadow: 2upx 6upx 10upx #e0e0e0;
+					}
+
+					.go-bargin {
+						background: linear-gradient(180deg, #58d6fe, #3eabf9);
+						box-shadow: 2upx 6upx 10upx #c8e7fd;
+					}
+
+					.hand-buy {
+						background: linear-gradient(90deg, #fd9201, #fe433f);
+						box-shadow: 2upx 6upx 10upx #e0e0e0;
+					}
+				}
+
+				.address-icon-style {
+					font-size: 28upx;
+					width: 50upx;
+					height: 50upx;
+					line-height: 50upx;
+					text-align: center;
+					border-radius: 50%;
+				}
+
+				.icon-location {
+					background-color: #29b0ef;
+				}
+
+				.icon-call {
+					background-color: #ffa824;
+				}
+
+				.bargin-ranklist {
+					position: relative;
+					z-index: 3;
+
+					.bargin-list-item {
+						.rank-avatar {
+							width: 80upx;
+							height: 80upx;
+							background-size: 80upx 80upx;
+							background-repeat: no-repeat;
+							border-radius: 50%;
+						}
+
+						.bargin-list-itemRank {
+							color: #ff433f;
+						}
+					}
+				}
+
+				.recommend-goodsbox {
+					position: relative;
+					z-index: 3;
+				}
+			}
+		}
+	}
+
+	.ani-bargain-mask {
+		width: 100%;
+		height: 100%;
+		background-color: rgba(0, 0, 0, 0.7);
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10000;
+	}
+
+	.ani-bargain-d {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		z-index: 10001;
+	}
+
+	.ani-bargain-d-a {
+		width: 15rem;
+		height: 25.98rem;
+		margin: -12.99rem 0 0 -7.5rem;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		overflow: hidden;
+	}
+
+	@-webkit-keyframes knifeAni {
+		0% {
+			top: -4rem;
+			left: -2.3094rem;
+			opacity: 0.9;
+		}
+
+		70% {
+			opacity: 0.9;
+		}
+
+		100% {
+			top: 25rem;
+			left: 14.43375rem;
+			opacity: 0;
+		}
+	}
+
+	@keyframes knifeAni {
+		0% {
+			top: -4rem;
+			left: -2.3094rem;
+			opacity: 0.9;
+		}
+
+		70% {
+			opacity: 0.9;
+		}
+
+		100% {
+			top: 25rem;
+			left: 14.43375rem;
+			opacity: 0;
+		}
+	}
+
+	.knifeAni {
+		-webkit-animation: 0.8s knifeAni;
+		animation: 0.8s knifeAni;
+	}
+
+	.ani-bargain-knife {
+		width: 1px;
+		height: 1px;
+		position: absolute;
+		top: -4rem;
+		left: -2.3094rem;
+		-webkit-transform: rotate(60deg);
+		transform: rotate(33deg);
+		opacity: 0;
+		z-index: 1;
+	}
+
+	.ani-bargain-knife-kn {
+		width: 5rem;
+		height: 0.25rem;
+		background-color: #fff;
+		border-radius: 50%;
+		box-shadow: 0 0 8px #fff;
+		position: absolute;
+		top: -0.125rem;
+		left: 0;
+	}
+
+	.ani-bargain-circle {
+		width: 1px;
+		height: 1px;
+		margin: 3rem 0 0 1.5rem;
+		position: absolute;
+		top: 50%;
+		left: 50%;
+		-webkit-transform: rotate(330deg);
+		transform: rotate(330deg);
+	}
+
+	@-webkit-keyframes circleleftani {
+		0% {
+			opacity: 1;
+		}
+
+		10% {
+			opacity: 1;
+		}
+
+		30% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+
+	@keyframes circleleftani {
+		0% {
+			opacity: 1;
+		}
+
+		10% {
+			opacity: 1;
+		}
+
+		30% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+
+	.circleleftani {
+		-webkit-animation: 2s circleleftani;
+		animation: 2s circleleftani;
+	}
+
+	@-webkit-keyframes circlerightani {
+		0% {
+			top: 0;
+			left: 0;
+			opacity: 1;
+		}
+
+		10% {
+			top: 0;
+			left: 0;
+			opacity: 1;
+		}
+
+		30% {
+			top: 0.5rem;
+			left: 0.25rem;
+			opacity: 1;
+		}
+
+		100% {
+			top: 0.5rem;
+			left: 0.25rem;
+			opacity: 0;
+		}
+	}
+
+	@keyframes circlerightani {
+		0% {
+			top: 0;
+			left: 0;
+			opacity: 1;
+		}
+
+		10% {
+			top: 0;
+			left: 0;
+			opacity: 1;
+		}
+
+		30% {
+			top: 0.5rem;
+			left: 0.25rem;
+			opacity: 1;
+		}
+
+		100% {
+			top: 0.5rem;
+			left: 0.25rem;
+			opacity: 0;
+		}
+	}
+
+	.circlerightani {
+		-webkit-animation: 2s circlerightani;
+		animation: 2s circlerightani;
+	}
+
+	.ani-bargain-circle .circle-l {
+		width: 1px;
+		height: 1px;
+		position: absolute;
+	}
+
+	.ani-bargain-circle .circle-l .circle-d {
+		width: 3rem;
+		height: 6rem;
+		background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAABU1BMVEUAAAD550X46EP/5j/550P550H550T450D55kD85D356UL450H65T/450H45kL66EH+6T/550L35UL550L55kH550H55kL56EL56UL66EP56EL550L55kD46EP56EL56EP56EL550H55kL550L66EL450L65kP450L55kP550P46EP55kL550H550P66EH76EL66EP56EL650P550L550L550P76UP650L76UX9xy/7sRv760b9yC/7sBn9xS377Uf76ET7rhj+yjH56ET77kj78En9wyz75kL9wSn76UT8th78rBf8vib8vCT8uSL9wyr7qRX80zX80DP8qxb83j384T78uCD81zf83Dv6sxz9zDH780z81Tb84j/8tB382Tn82zr8xSr85EH88Ur8yCz8yy78zjD9zjL8wSb8uyL7qRT+wSv7pxP8sxz8pRH8rxj8pxPtK54wAAAAOHRSTlMA/vYF/ir7GR4J6iQTVfo3DbryY0cx0Y7546p9Pe6/tZde56accN1Ox6HLaZOJWdjUwrCEd/PfQj5FzXwAABspSURBVHja1Nf/b5pAFADwuwNEEREFoVL8hpsWbeuydu1L+MFLHsSwdF3SrO4nl9guS/r//wMDXbIfN1ZA97m7lxw/3cu9F4AUqCp1pKY7bRjTpus2O65ZV5OnOvlP6LosucZwMG5ZykmbKd0PiudpGmv3vNlsMLbnbl0SBHLkZPV25PQnk1Ul5gjAebKAwg5FpCiCIiqWbxtmtUqOlNQc2QuFi4DpqXeBAmAy9nabX3ib9Z3TW10lR6YqjYb9LovF9MC7AH8QQyzevPcvZbVGjoSgyg1bwX0SCBlQztg7/7pxDKkINclo3ezLiMK/wDYbG/VDN4w8d3rpNaTrNVr+SCaHY9qLHooxIMIrITLrWjpMianmlabFkBcuwuy8UX6F1Ro2Q4T80GTixDdLTmXqa5j2d95iy7lUSWmmzgkAIhQANe+NKZBSuI6CgJRCMZB1z11SOEE+tQAQikMBWPtCIgWbtjCG4jFrVCMFqg8RkULRKECla3dIUVRjwbBCoRS8dzavkiII+oWXtnhpcDKUdJI/c4CAUB4KcdzK/wtMftuuQPkWVyRfqq9AZhx4nIbfW8is4nfyLqtMeLKCYBlE4XMYLZdBMnYxhqzoWUPNr6wmWoYm58DTY4dhFMHqcbVZ8aenDQR8maT2HKbpBJAB5vZKqRldzPD3F0RRGHJ4/PLwY/v55W79sr7/dv9x/elu+3378HWzSS4omX+dCwX0Tkke9J+0mdlzEkEQxsto8D7wPhITTWlZaml5lC4zNLMddrLsmSEcLgJJliMFVNT//80dLd/cmQHCDxYo9oH96uuvu7fY9jxDK6jFHObZg95BGBMg2AhEIHDWCDAj+zyDIG5PTuqJO+g6zNyXwqf1sxjma5YRLuOcUrc3jskpiAYGgJmYfwCAfMVAfv9rMjlo9b0hdQzFrD3duLysjp2CiRc2zVS4x+MITgVCRofkIU9nctphWm+6lFPboLosr7hk81rfMoiHzLZj1UdtEIAARAsQEiBCYzo66g+5UY09LG4ss5V8fbqm10GZw91xdBoEiMQYAERs+GF90DWKfvX1vcXvt24WDfxgDj1OfYGosEIl5nCceCZh8YpXl6krfbNl9X2iUKFGtjbhj49ch+nn/tbXxerq5ttNXTao4xylEDTI4nRk9KNRMhgybU4+LOTJpY8Goy9JiQjIkgCiiNNvdpdqmteF4voCOrarGj84748ONTLMwwKHaZNyS8PjuT259eaLWka2hpxMG4LoMJdCop7LmdKTauHBvEJebNrqdPDmGGYdcnYAYjttWQ5VVlfhycW5/Lj+Up2Ort3zZ+SMASSTuqXZjR/dmWuAvFINEHvIklT+7JmDgT92uxZVbStfrp83X7C2qhdUCwk9joggKwAwEGGTc9dWNeF75kF/pBronB5MfwJZEYidurIRe96Oaet6pgiIzXj/BBDJykDhpy1lUDYfmE30jQ8PVRviYASCrJTGYdpnKinPjXaVaztVlR+tKECyWgBEdMSZnRuUwv1rBgH5vKaYguzbZIYLXh1kh3HmOz1LNRs/66fJxntPsVy1pnPFAySYPf5A/n6SB2gjP02G1M5twrfvajvv4+q5/LpqRqdzqiAd34+jaRxFURjGUdxu+/6fU5rFH8Q0Uewr1Y+aHnz53ZVMb44OmkwQTTcnqSGOarW9/VKlXN7dzZ7ypVKqlPb2w7jtS4MIKMqrnbB8JTeeaO6litU8P+xuKxZotmmA70dhpSwFfN8tZ5SyoyLfJPLrSrlWi/wfBHPLDEV4zFlu4K8o/2m8uH3DyoHxJBZglOlOXNvLLraUSSj9F6lI2lPKrPEJyauyIGzle2LvqAz5Tal1dqsJBNH03nvvPTnpyUEWdlmliaACiqI+NdEY0///twxJBMsskv2SvHPyApc7d+bu3QWvuFtkd9tTzgugcFy7lLykUtq24N8AVNrwHI5nL83a3BK7lT3HczZTQqVrE206DPNRwNsMPQogUCLwlVRZSbGjH2hrVjlYSCLYmkinD4lPOh9URQOEBFv6DLxIHbgoraKglBZhpgR6QaCAhfgkCiW06pmz/5+akMk4ruWiADJsmpT9OgwKqwAU2nChwhC3MpgYwqTrqGimXxcOwrH3MxdHXDdBGSsvVzJLfmc8GgVlWqjEaMl1wP2oa8X1oyM0XWeeCgh5pAlwEOuDyvParWMq5Q0yBi2mM6ZbrR4tBkVRXOfXWoHx5rxtCGQiPTiEEyJqvbo0k5t5MOzNJgU4NEMiEiGMjXu0qPKp56wpRQ2njGi43qtP92It60lFNNE7jlDoXHXcEtKm6OePhEja386NAMEX0Gp6v1bJb9bFXuUC4h33nhW5XmMHCkvcqqCqkI9rBtJiKhP2mZaU4u3YjVbLq+laIiAaopKDr0UWqxrIQhyxW+phL0RpN3t4f2D3oPYKs0I9uZZBgb8HVUMUB2+e/4BbFHSsrsdVQVl5H0Q2pDFiWa+YqnWYMEUXkGJGyzXQHI5AJqjc91zdsL0X36E4rP7H+XcVp8NxaVnUW5Wxng2hWcgjigPGSVGAFFXN9D63BJ2remNd7udeCgqLfXJwHNyxhTCgtJbbf/CVqy5GiZgU6sbZSAnljk40FMid52sb9Xu41DXDckMVLauIpurAgCwxwgY1Wa3jKhGXl73UKrlj4VHqbu3WWu99pO3GN+kzVUW7lUeVch6QkZ4FekEo8xjHIV7lRsR5mkD6eKpyQDuyetJwVpAAsY9zTOk89lI+REAysRs+kBqhcs/vXvWlB+4IbPCRVTd/ryqY6cGQI3wM7W2FYo7STwiMcFAUxYDkl1fjyy/13yNrMwlvXJUVuR+9INpNuQgh6tAVllU2R5YmagBmcIjPxPzpqHiLNlwbdicC67hcW7cv44VFZnG4WVdDexuOktLosIyRTzGMTqS0tnNS8uJFk5zhjWtf5f6S1E9rOBBrjux2ftjbX4nSrLSsvg+MxEhpbV+gk3+Kb84taB8Ykitpbe09L+hZ/Y78ddOVAB/bt0pmJ2szLPil8uF2IHhM8eXvPGnGvkFQRl4ezHrWdVzqbLNl1RCdo2IfsHRoGb4KJtkspBFkNNb/vENcmxoMF8ntvQtG8Gmo6W2nuXHA7xaLFsylxm/MajLCSMEFxosnUL7HXXy6V9JThvMXKnjg8GmdEPWXV1CzSWllFRrKatQoCAThxPmr1KlglFw+nL8TYR9dvtav5HrR79oYLB2p+FzlsYn/prI1aymX5zFPVBIJDNeBa/9q620FBzJwwjWhR42i08AMSDbZB/Aewwb+mxAFg4eGP/M4sWPghPMxQ9vWgYuH/22pDlTQ7P0T52vGxC7s/GhAMiQD6Fqi9mvSYNzeafm5Mim5cgJkhjnHSkV6/ZeRk5clDEjfir6vEeIWd7DU1zJGRk34oFRBqsqkfldiTCcfBzbNQxIllHwhTEOQSHdO/d0bXsIzoIGzRkgd3dbiy/zMWKqRUZJTbzKifKNBS9LJn6yl+lnJKy4TXiaULVztJ/b/nSLv8C1uoKqrzqTIJo+mKQrJcuMOh5hyY458o5+7HwHGP7Qt08wbjJ6qgnNEr0Du2/f0j0ROo82XSfPVU88f3rYJQmGZdKERK2XE6MAnGa50LYWCxMctxjIhaT2q5BUXzEU+1zG5V0/8mSTHHmFAqv32il9Us/xADKPnB8G/rNcM0jKwjIEcquA0VyF3WqtXf/v+t56SZ0NlNRzu6Bo2Em/+sfDvcQfvq+pK0mDnE6J8U8aaXq22fPja4LU+aykjkyDZ9tNeJvKG6bfWT9LZLMrjXOm5EGm3cOP4ZP+fwx1cIlPOl4F4yhZCPrUII4ToUgKFmp+tbLKPkl2FXc6qKkhgkLW4ZiSrjXIOEtNp1mYMV3uyTbyKznWdeOFKYdFthTUghvVXttaop9hlK22VbCxzmOy9BYzeyCJsM64JwjDKm7c9O+Yf+ugkefcMgFy8hKYnO1+a8apXzPXu35bEzdhOh35Of64aXWi/ceK1gCqqDHYYUulw1ApfLi80KtPoZ6yRKgKkckV0Y0ObjIZ82ZvQ3lbbnjUgibHuwCLawn0mjMgJEKDDbxMdeZzemTeTI+n8YVKTu6hIqgDk0GP08ntS18XNu2KW24a2PE2hrlJgk3Et2Y/9FUcFAGvrPtuwOnVeiyENMPNbcC3A861XYFBeolNEm9aWZmG0zfTS3lpivvw41kqOe20Ykp2PZDPFJQZpzdU/R9/Am5Lnuezwk4E64DNHd518gRuUD0vZK/z329Ifc0cX36uFA0iVe+XBR6IjMPSdD3LI0yflbnx/zA0iiFLO3UElQqJmRkiBcE0ZENH5K9HHDm/KPUvaqCqNMeA+qoWLL5ZPPRiVuYUyUjm56zjafUk7675cLhSbdAnBkWh6K2xGI00nm1OXsVm92cymbmObFj9YE+whB87veoieHBqtKNU6tKwiQHotgzEUC+nWZx+x5MDQfS8Ml4aVaCBmFu1DF0+3jsNNZZyRuJa1LFooNzEHHycoK5q2IxnI3WHmz9Uwzam5k5NfZuam3UdL6/auN5UKxkh3mAJB+MZJMb9MtT4hSOdgG1XFdDJuRCkdnA89WmDbRhsdZJgChKu77h1AndZIri3Cyq3BCf2bHihl92vk9ydkk3xt7SdGdGv65fvCO/Dk+ke50PbT7hjYjqT6bBd6j0abDGp8UblbbC81qdJLsEAFO19/el1DF6g+W33p05efYXb/A2D0lOIx0+YCj3J3H9ox/YX35Q7t5faRkt+2rNbgs2ICcxH/qk7bfcbEUDTSl2ZffvIFDP7LsYvfKPoGpYUDuVfdjZr4r2nioCi5fPgaMSSD7Iw+U+Dli8y/xoHe14kQhubPOVdTNhwXQyFOZ/Dg9NauWzgjszRkdMv50ahl/LW8WjtIKsyOZKivjmHgQIg1tmGOZ0dGLnaEl5+XYevxb2Ku9FdpIIgD8TbeR7xvo0aN8Yip7Ha3tKUU2nJfAuUSRHle//8nZ1nUPphi1xidxMTkfej7vdm5fzOpe3hZ9X5tiHpppzNhtCmSp3Ud0qxT6Le5pewnoMJwPPUZDb819J80lrIKDBC210FH7um7MUBIPZeT39o5jaV7NWIbERbReEEZrfjD5bIW87SmtY86IJAwwKwUe/RujWMmYj1J3cInCuuKXd/9shhrRs2akGI4EAwat1QJ8S1JzvNhvQRxQ8RxpgZDPmWNGyiQuxkLo/IP1u/482+yhqa9EfoKrRpQfGiXk9h12Px4Psy99ZVhgFC3oxEsjjxNXdHSaEBs6NL5vqE7NbK5IEE4L3QXDFxZLH9Y47bRmf/huMRF40j6AHitQ9sR0SB2R5c2Ut5tjGy87Q05Ccch33WBgPA8GZuOMgr5QSyOFF6lrmqYvBvIyd3vMnjHbG7/hWRlElUSIVtQyJiyP8DhjFBVG1djsl+7O1x5lt+WItAtiXao0JgUtvq2QbbAdtifaKSJj9vvp+4XMSOB8WFDNq57v/sTLZpTsush5QsTb2L0+dYnmpSp42DosCd98nHqXMbCrN36UJXhkP5W2XQ+NuKhAHGt5FXb9XyfbDayXGUOAXVoIY/FkTsPUicuaWmM//fxk7T1BBz3j8NJi+Rj3G0/rHhQPi0/jvr7dw+A8llW9cCUzQpoQMw8AMYZVlnx/MR7i2SMeJ/8cxVqWSNP8BwhK0o0L+fNmn1OIghh+v6RqgZ2imfxF4+nLjxDNUImy1UtYibhtrvZT96HgUGQIEiMTju32niBBeX3xV9Q8sUAWlmBItWGDdBUS1CZDz/UMI2Qgfj6WzdRvdMDjtinLGwME46luxPRDfLL2eqXdoe/WxeM/fc60NE+V6hiYOcEmyI+PJw6egMdhdojDyZESAcT7wkwv1T9UpoDFLL1tqAf+iFbMmmlrS8bH5p9m3Otz7tvqyJxVKMRsEoLdVqZewDk1iULS+4M6GfpQ0aT8pFYMKw2AqCHIa0H3hr0TIie/ufc0pt1Rc1eA9aPAOJSJSDgtLAk3roq5iOHDmEayZd18L6JHaQJhtjWv3yqY2uQoIKwI6j+bqB7y2wwmZRzq1wO4UPsdisUn+uePCfG7BkLzVJnVTHeUVnOYW6uPc7j9Y1tNAerArKcAwyeLBLEB5RMxK/ja5bXz4th6B0MiCQitqmp5OUrA/wvJhP8bt2UBaSuY+OKJLPvlo0Ssp+tBu3P8YZQFwb0EA+VgNRlTz4OSzjqmYw6ARRWsqkcMDUTYS1uoLdfTgsyOc7ut1uBasByaFMju4BwEnYoM8FU3q7WXcuOqWgiU47u6kvG1n0DRzL5pKvFK+io8P2/+BYUUug4jFLml4d6KVAtrvY6BB8qPJbLh5Z2AAMyynmBEg5zSvY5cIvw7aii1QCISRnoD0StXn8T4s73zjVJc3qGASn0iyUAQpMbyBtIUki07J/UiLalFB6usndTGQbIrMXjMi25RpnGubLzZUnhY3u9kEedReh/yc5aZJM9Yk+VAETFnxs4he5eSspjDZX8aNk2FVzjOGrpnMxKnlctz6fw330qCd0IfU3NuY84x55W+v6aCni+aB3CVKK1v1KqYOmEROrCZiCStUbDl1lxdGDx1v0jpewtNBtVyOtTP9ar4PQ7BoRPvib1K3SjC5HXmL7KQfRlDqZlhEfa456H8UESkrsRsZ7/YMefvqnhEgJbOXFzubDP0kfthhwIl7xP2V9ZsdFvZquSw6YstBsD5OVPSvnVooVmwLbv0KRpaZdHIi1YulQIUDKCz41qUCcgYhpN/JzIqiemMgxnDt4dBSJMRMq1O/j6t133WUIgvZCQSFu0tt4r8k2TQdVV9Xx4F+9IvzBvNKDNr/vqGvEHBM9/bhz8tYN4Me7oBmU04cuKEkDfteTGX070KanJXHhfbye1aasWgNWIJEtdI+7MwO8mZJ4c/bUV+gS5Ai+3oxIylln9Fz3LgAgk+pSCIrNytPAv+OxVhwBALsXrJaUyRM6lOxwHYr2KLu8dws838TFLZCXU6RUie4dyBRPoJzJgiBjOynrVy/2YVQTK/tftGbjvLV48GN1Nulk8gFNN63s0oW/8wWEsvIPWor4edkWqrkpZJu/iB8ohkcH8guOm/mjflutjy7LwHnCFJfuSOTYkT5H338vtAh0sPbrRAqYCL0twA9RbjHt1NDsBeXZt/4Gay3GLoTXnTUIkg+nUtjU4ediW9fgGvxaMHkoqMalSDuxU5j+YWGcO71/VvRdz4oy3XJbwcbHFbDDta92yNOjs1u8LUJjv+4yqD9wWIcGBZJ5uLOs+yMRNyjroh3GK8bA8n5Q8Wcd+xKq/1dmdP8hOOjEKSR87v3lV64aWxuvTKXOSvoByFcJ2br1TxiiY6N8RtmjGKMR4tH2Y8dABXCX2yGE06a6dLvyV9LCgkL8jdC92tKplzm28LEGRN6w0fqtt4bCkXbpguIoVCh2xRK69QGKAvECOPryMG13aIUveORXRAuaoCTheCqyNaZxCLj9AznAcfY5bica1TmIzMUUvMSt2yuhfe1jmlGu4WHcPY9cAn1oaLpwskqbzdHXcBGD8vYfljngckNcn8KttcWcmCW/2HKaw8xwPQ138nsircYk7Lv30khYbTFwA8j+EsW4c9cu6fD/uFOvZuPtzwLkQBv/PhbKKJNFgcuiFVAhmJRkt9srL7D/ohDIGXVgSA+TZ7VScSMI/biatOaP/WifMqU1lBEErwyM7zrF+b+7eehIHojiAT7mJlZsoAouAFxRlhaDIekib6SRTCpOYNBAIhEhkN7v6wPd/3xbZfevQQlv9oTHWB/vP6aEtbWcsSwLdKdY7/pKfh0yxHFVaPEfWomWwojDz2U1fa4L7I8V6lLB6CnEkResk0qSjdfyDNbxQVAIWSqeIq9XmDJD79uxfw8vPM86ov+w6jviiNaCCZU1eNc2vrcvcrsBSYPMozI28ZRBJUV87/tQEa/KEdcFS8wltEjsDa5KxdWl+RFnK64+LrXYhQcS1PjEBS6q68KPjNfzKHQg/u4c2Cx6JvCuz6nzm8dGKrPXf56CCFQFuwsiWVg4E6yjk9afuYRQZ485g3uXVI2J3YqvMJaVgSemOZn0PNy+sT4jCm4KI1veRTeGaAJYIqLDAniXprx4E5EgcRh1MmptmQDmN0p2a9/p4QMd/eoxbD2geIweOLoAKwGmU6Ux2PwrG/cVcVTkxBKhVkRN7d8BlHK+8uJ/keThVugQ4WLu6j5ypUwI8qjR+wxi72h0DohCJ+29pATl1UBL4NQG194o1d5pe7mBNex8ZhebFCEH7NoocC9/TjTOKjQfGXtiNGLg/M2KoBPjKSbSFg1oO+CRVGb2Yq2GszE67wOVsCqoKm3wLo20EG3nYRFLIdPgHa9s3i6xh/fe011UJA76cebVwO8cnsJGimk9TLnW83QhzGsZvI7K+a56LHj6hbaXO2yGwURUmTd905+/G2GgNPBwxxUYMoKUk2kGjyTYHMY+JpcXgvdPHBtuNoXV0YxAIFRSwIdDMoJ0cH4ItRrP05i8/O7jf4WZZX3XHRuj3yRi6q8EsNmO3SbSb1NN9wFYQ885xdT4ezZ6xjg2rDjDJ62+DsRQvl3iJdU02UkjrEQk2EaD4bT+IdpW8JWALgdVsuqPF5PdM1jt9vNTwSsf8acTQzJc8GwxGRikUxV4tDDTgzrzzwXqIguBkemMm9SbTl8HgfajPzL6RZV3uY3n4MpxM50ySQDH3fXbR9iNyR6xSZGCb9LGZdZWetHr9Go1H4zEZrc7JzGcuJKczHTdSyCUHj2kK9pF/aUCRDEamrmQGMJeaf3UkUosjF8UfVk3nGPlYdWJ8rX93iFX2kKtiZ0XwH2kepZDbGiUC/hISpdMgct3+waXIwD8CBOpR5InMXT7iV1UiQO+rQeSRVKN8IYAPBBDSrQzyUPTxOsAYeC1Ey3HksWRWDHidhJauUsh71UsxAt5hUKtkkC8Ozms5Cl65PjwKIr9kCjfX4LoQgV7uWwP5KhmvXDABXMVo4u4Y+S5Wzf5wNQUVC8kU+gRBlKwEIhTcUTwsPMXQpzltlU9gJ1SIAAk0z66i6HOFk1clsQ2UggCOhUIAkUTipBBGX0H4uFVqEyMLdR4klKsVTtGXEUuFz07uEwmwSVh1d+DHzd15eA99MXux7/Xb+7QIof8nghT+WRdLWC9l6UTgonKViaEvan+v2siWb8SiSEOUQWQVga5a+iNBiFCWv755KHzP7KOvLhrNxK+y2cvSIRWZmCum05SSBM33xPzDZaV1FM9Eg+6n+Atk4vsYxDmZlgAAAABJRU5ErkJggg==');
+		background-size: 200%;
+		background-repeat: no-repeat;
+		position: absolute;
+		background-position: 100% 0;
+		left: 0;
+		top: -6rem;
+		opacity: 1;
+	}
+
+	.ani-bargain-circle .circle-r {
+		width: 1px;
+		height: 1px;
+		position: absolute;
+	}
+
+	.ani-bargain-circle .circle-r .circle-d {
+		width: 3rem;
+		height: 6rem;
+		background-image: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAADICAMAAACahl6sAAABU1BMVEUAAAD550X46EP/5j/550P550H550T450D55kD85D356UL450H65T/450H45kL66EH+6T/550L35UL550L55kH550H55kL56EL56UL66EP56EL550L55kD46EP56EL56EP56EL550H55kL550L66EL450L65kP450L55kP550P46EP55kL550H550P66EH76EL66EP56EL650P550L550L550P76UP650L76UX9xy/7sRv760b9yC/7sBn9xS377Uf76ET7rhj+yjH56ET77kj78En9wyz75kL9wSn76UT8th78rBf8vib8vCT8uSL9wyr7qRX80zX80DP8qxb83j384T78uCD81zf83Dv6sxz9zDH780z81Tb84j/8tB382Tn82zr8xSr85EH88Ur8yCz8yy78zjD9zjL8wSb8uyL7qRT+wSv7pxP8sxz8pRH8rxj8pxPtK54wAAAAOHRSTlMA/vYF/ir7GR4J6iQTVfo3DbryY0cx0Y7546p9Pe6/tZde56accN1Ox6HLaZOJWdjUwrCEd/PfQj5FzXwAABspSURBVHja1Nf/b5pAFADwuwNEEREFoVL8hpsWbeuydu1L+MFLHsSwdF3SrO4nl9guS/r//wMDXbIfN1ZA97m7lxw/3cu9F4AUqCp1pKY7bRjTpus2O65ZV5OnOvlP6LosucZwMG5ZykmbKd0PiudpGmv3vNlsMLbnbl0SBHLkZPV25PQnk1Ul5gjAebKAwg5FpCiCIiqWbxtmtUqOlNQc2QuFi4DpqXeBAmAy9nabX3ib9Z3TW10lR6YqjYb9LovF9MC7AH8QQyzevPcvZbVGjoSgyg1bwX0SCBlQztg7/7pxDKkINclo3ezLiMK/wDYbG/VDN4w8d3rpNaTrNVr+SCaHY9qLHooxIMIrITLrWjpMianmlabFkBcuwuy8UX6F1Ro2Q4T80GTixDdLTmXqa5j2d95iy7lUSWmmzgkAIhQANe+NKZBSuI6CgJRCMZB1z11SOEE+tQAQikMBWPtCIgWbtjCG4jFrVCMFqg8RkULRKECla3dIUVRjwbBCoRS8dzavkiII+oWXtnhpcDKUdJI/c4CAUB4KcdzK/wtMftuuQPkWVyRfqq9AZhx4nIbfW8is4nfyLqtMeLKCYBlE4XMYLZdBMnYxhqzoWUPNr6wmWoYm58DTY4dhFMHqcbVZ8aenDQR8maT2HKbpBJAB5vZKqRldzPD3F0RRGHJ4/PLwY/v55W79sr7/dv9x/elu+3378HWzSS4omX+dCwX0Tkke9J+0mdlzEkEQxsto8D7wPhITTWlZaml5lC4zNLMddrLsmSEcLgJJliMFVNT//80dLd/cmQHCDxYo9oH96uuvu7fY9jxDK6jFHObZg95BGBMg2AhEIHDWCDAj+zyDIG5PTuqJO+g6zNyXwqf1sxjma5YRLuOcUrc3jskpiAYGgJmYfwCAfMVAfv9rMjlo9b0hdQzFrD3duLysjp2CiRc2zVS4x+MITgVCRofkIU9nctphWm+6lFPboLosr7hk81rfMoiHzLZj1UdtEIAARAsQEiBCYzo66g+5UY09LG4ss5V8fbqm10GZw91xdBoEiMQYAERs+GF90DWKfvX1vcXvt24WDfxgDj1OfYGosEIl5nCceCZh8YpXl6krfbNl9X2iUKFGtjbhj49ch+nn/tbXxerq5ttNXTao4xylEDTI4nRk9KNRMhgybU4+LOTJpY8Goy9JiQjIkgCiiNNvdpdqmteF4voCOrarGj84748ONTLMwwKHaZNyS8PjuT259eaLWka2hpxMG4LoMJdCop7LmdKTauHBvEJebNrqdPDmGGYdcnYAYjttWQ5VVlfhycW5/Lj+Up2Ort3zZ+SMASSTuqXZjR/dmWuAvFINEHvIklT+7JmDgT92uxZVbStfrp83X7C2qhdUCwk9joggKwAwEGGTc9dWNeF75kF/pBronB5MfwJZEYidurIRe96Oaet6pgiIzXj/BBDJykDhpy1lUDYfmE30jQ8PVRviYASCrJTGYdpnKinPjXaVaztVlR+tKECyWgBEdMSZnRuUwv1rBgH5vKaYguzbZIYLXh1kh3HmOz1LNRs/66fJxntPsVy1pnPFAySYPf5A/n6SB2gjP02G1M5twrfvajvv4+q5/LpqRqdzqiAd34+jaRxFURjGUdxu+/6fU5rFH8Q0Uewr1Y+aHnz53ZVMb44OmkwQTTcnqSGOarW9/VKlXN7dzZ7ypVKqlPb2w7jtS4MIKMqrnbB8JTeeaO6litU8P+xuKxZotmmA70dhpSwFfN8tZ5SyoyLfJPLrSrlWi/wfBHPLDEV4zFlu4K8o/2m8uH3DyoHxJBZglOlOXNvLLraUSSj9F6lI2lPKrPEJyauyIGzle2LvqAz5Tal1dqsJBNH03nvvPTnpyUEWdlmliaACiqI+NdEY0///twxJBMsskv2SvHPyApc7d+bu3QWvuFtkd9tTzgugcFy7lLykUtq24N8AVNrwHI5nL83a3BK7lT3HczZTQqVrE206DPNRwNsMPQogUCLwlVRZSbGjH2hrVjlYSCLYmkinD4lPOh9URQOEBFv6DLxIHbgoraKglBZhpgR6QaCAhfgkCiW06pmz/5+akMk4ruWiADJsmpT9OgwKqwAU2nChwhC3MpgYwqTrqGimXxcOwrH3MxdHXDdBGSsvVzJLfmc8GgVlWqjEaMl1wP2oa8X1oyM0XWeeCgh5pAlwEOuDyvParWMq5Q0yBi2mM6ZbrR4tBkVRXOfXWoHx5rxtCGQiPTiEEyJqvbo0k5t5MOzNJgU4NEMiEiGMjXu0qPKp56wpRQ2njGi43qtP92It60lFNNE7jlDoXHXcEtKm6OePhEja386NAMEX0Gp6v1bJb9bFXuUC4h33nhW5XmMHCkvcqqCqkI9rBtJiKhP2mZaU4u3YjVbLq+laIiAaopKDr0UWqxrIQhyxW+phL0RpN3t4f2D3oPYKs0I9uZZBgb8HVUMUB2+e/4BbFHSsrsdVQVl5H0Q2pDFiWa+YqnWYMEUXkGJGyzXQHI5AJqjc91zdsL0X36E4rP7H+XcVp8NxaVnUW5Wxng2hWcgjigPGSVGAFFXN9D63BJ2remNd7udeCgqLfXJwHNyxhTCgtJbbf/CVqy5GiZgU6sbZSAnljk40FMid52sb9Xu41DXDckMVLauIpurAgCwxwgY1Wa3jKhGXl73UKrlj4VHqbu3WWu99pO3GN+kzVUW7lUeVch6QkZ4FekEo8xjHIV7lRsR5mkD6eKpyQDuyetJwVpAAsY9zTOk89lI+REAysRs+kBqhcs/vXvWlB+4IbPCRVTd/ryqY6cGQI3wM7W2FYo7STwiMcFAUxYDkl1fjyy/13yNrMwlvXJUVuR+9INpNuQgh6tAVllU2R5YmagBmcIjPxPzpqHiLNlwbdicC67hcW7cv44VFZnG4WVdDexuOktLosIyRTzGMTqS0tnNS8uJFk5zhjWtf5f6S1E9rOBBrjux2ftjbX4nSrLSsvg+MxEhpbV+gk3+Kb84taB8Ykitpbe09L+hZ/Y78ddOVAB/bt0pmJ2szLPil8uF2IHhM8eXvPGnGvkFQRl4ezHrWdVzqbLNl1RCdo2IfsHRoGb4KJtkspBFkNNb/vENcmxoMF8ntvQtG8Gmo6W2nuXHA7xaLFsylxm/MajLCSMEFxosnUL7HXXy6V9JThvMXKnjg8GmdEPWXV1CzSWllFRrKatQoCAThxPmr1KlglFw+nL8TYR9dvtav5HrR79oYLB2p+FzlsYn/prI1aymX5zFPVBIJDNeBa/9q620FBzJwwjWhR42i08AMSDbZB/Aewwb+mxAFg4eGP/M4sWPghPMxQ9vWgYuH/22pDlTQ7P0T52vGxC7s/GhAMiQD6Fqi9mvSYNzeafm5Mim5cgJkhjnHSkV6/ZeRk5clDEjfir6vEeIWd7DU1zJGRk34oFRBqsqkfldiTCcfBzbNQxIllHwhTEOQSHdO/d0bXsIzoIGzRkgd3dbiy/zMWKqRUZJTbzKifKNBS9LJn6yl+lnJKy4TXiaULVztJ/b/nSLv8C1uoKqrzqTIJo+mKQrJcuMOh5hyY458o5+7HwHGP7Qt08wbjJ6qgnNEr0Du2/f0j0ROo82XSfPVU88f3rYJQmGZdKERK2XE6MAnGa50LYWCxMctxjIhaT2q5BUXzEU+1zG5V0/8mSTHHmFAqv32il9Us/xADKPnB8G/rNcM0jKwjIEcquA0VyF3WqtXf/v+t56SZ0NlNRzu6Bo2Em/+sfDvcQfvq+pK0mDnE6J8U8aaXq22fPja4LU+aykjkyDZ9tNeJvKG6bfWT9LZLMrjXOm5EGm3cOP4ZP+fwx1cIlPOl4F4yhZCPrUII4ToUgKFmp+tbLKPkl2FXc6qKkhgkLW4ZiSrjXIOEtNp1mYMV3uyTbyKznWdeOFKYdFthTUghvVXttaop9hlK22VbCxzmOy9BYzeyCJsM64JwjDKm7c9O+Yf+ugkefcMgFy8hKYnO1+a8apXzPXu35bEzdhOh35Of64aXWi/ceK1gCqqDHYYUulw1ApfLi80KtPoZ6yRKgKkckV0Y0ObjIZ82ZvQ3lbbnjUgibHuwCLawn0mjMgJEKDDbxMdeZzemTeTI+n8YVKTu6hIqgDk0GP08ntS18XNu2KW24a2PE2hrlJgk3Et2Y/9FUcFAGvrPtuwOnVeiyENMPNbcC3A861XYFBeolNEm9aWZmG0zfTS3lpivvw41kqOe20Ykp2PZDPFJQZpzdU/R9/Am5Lnuezwk4E64DNHd518gRuUD0vZK/z329Ifc0cX36uFA0iVe+XBR6IjMPSdD3LI0yflbnx/zA0iiFLO3UElQqJmRkiBcE0ZENH5K9HHDm/KPUvaqCqNMeA+qoWLL5ZPPRiVuYUyUjm56zjafUk7675cLhSbdAnBkWh6K2xGI00nm1OXsVm92cymbmObFj9YE+whB87veoieHBqtKNU6tKwiQHotgzEUC+nWZx+x5MDQfS8Ml4aVaCBmFu1DF0+3jsNNZZyRuJa1LFooNzEHHycoK5q2IxnI3WHmz9Uwzam5k5NfZuam3UdL6/auN5UKxkh3mAJB+MZJMb9MtT4hSOdgG1XFdDJuRCkdnA89WmDbRhsdZJgChKu77h1AndZIri3Cyq3BCf2bHihl92vk9ydkk3xt7SdGdGv65fvCO/Dk+ke50PbT7hjYjqT6bBd6j0abDGp8UblbbC81qdJLsEAFO19/el1DF6g+W33p05efYXb/A2D0lOIx0+YCj3J3H9ox/YX35Q7t5faRkt+2rNbgs2ICcxH/qk7bfcbEUDTSl2ZffvIFDP7LsYvfKPoGpYUDuVfdjZr4r2nioCi5fPgaMSSD7Iw+U+Dli8y/xoHe14kQhubPOVdTNhwXQyFOZ/Dg9NauWzgjszRkdMv50ahl/LW8WjtIKsyOZKivjmHgQIg1tmGOZ0dGLnaEl5+XYevxb2Ku9FdpIIgD8TbeR7xvo0aN8Yip7Ha3tKUU2nJfAuUSRHle//8nZ1nUPphi1xidxMTkfej7vdm5fzOpe3hZ9X5tiHpppzNhtCmSp3Ud0qxT6Le5pewnoMJwPPUZDb819J80lrIKDBC210FH7um7MUBIPZeT39o5jaV7NWIbERbReEEZrfjD5bIW87SmtY86IJAwwKwUe/RujWMmYj1J3cInCuuKXd/9shhrRs2akGI4EAwat1QJ8S1JzvNhvQRxQ8RxpgZDPmWNGyiQuxkLo/IP1u/482+yhqa9EfoKrRpQfGiXk9h12Px4Psy99ZVhgFC3oxEsjjxNXdHSaEBs6NL5vqE7NbK5IEE4L3QXDFxZLH9Y47bRmf/huMRF40j6AHitQ9sR0SB2R5c2Ut5tjGy87Q05Ccch33WBgPA8GZuOMgr5QSyOFF6lrmqYvBvIyd3vMnjHbG7/hWRlElUSIVtQyJiyP8DhjFBVG1djsl+7O1x5lt+WItAtiXao0JgUtvq2QbbAdtifaKSJj9vvp+4XMSOB8WFDNq57v/sTLZpTsush5QsTb2L0+dYnmpSp42DosCd98nHqXMbCrN36UJXhkP5W2XQ+NuKhAHGt5FXb9XyfbDayXGUOAXVoIY/FkTsPUicuaWmM//fxk7T1BBz3j8NJi+Rj3G0/rHhQPi0/jvr7dw+A8llW9cCUzQpoQMw8AMYZVlnx/MR7i2SMeJ/8cxVqWSNP8BwhK0o0L+fNmn1OIghh+v6RqgZ2imfxF4+nLjxDNUImy1UtYibhtrvZT96HgUGQIEiMTju32niBBeX3xV9Q8sUAWlmBItWGDdBUS1CZDz/UMI2Qgfj6WzdRvdMDjtinLGwME46luxPRDfLL2eqXdoe/WxeM/fc60NE+V6hiYOcEmyI+PJw6egMdhdojDyZESAcT7wkwv1T9UpoDFLL1tqAf+iFbMmmlrS8bH5p9m3Otz7tvqyJxVKMRsEoLdVqZewDk1iULS+4M6GfpQ0aT8pFYMKw2AqCHIa0H3hr0TIie/ufc0pt1Rc1eA9aPAOJSJSDgtLAk3roq5iOHDmEayZd18L6JHaQJhtjWv3yqY2uQoIKwI6j+bqB7y2wwmZRzq1wO4UPsdisUn+uePCfG7BkLzVJnVTHeUVnOYW6uPc7j9Y1tNAerArKcAwyeLBLEB5RMxK/ja5bXz4th6B0MiCQitqmp5OUrA/wvJhP8bt2UBaSuY+OKJLPvlo0Ssp+tBu3P8YZQFwb0EA+VgNRlTz4OSzjqmYw6ARRWsqkcMDUTYS1uoLdfTgsyOc7ut1uBasByaFMju4BwEnYoM8FU3q7WXcuOqWgiU47u6kvG1n0DRzL5pKvFK+io8P2/+BYUUug4jFLml4d6KVAtrvY6BB8qPJbLh5Z2AAMyynmBEg5zSvY5cIvw7aii1QCISRnoD0StXn8T4s73zjVJc3qGASn0iyUAQpMbyBtIUki07J/UiLalFB6usndTGQbIrMXjMi25RpnGubLzZUnhY3u9kEedReh/yc5aZJM9Yk+VAETFnxs4he5eSspjDZX8aNk2FVzjOGrpnMxKnlctz6fw330qCd0IfU3NuY84x55W+v6aCni+aB3CVKK1v1KqYOmEROrCZiCStUbDl1lxdGDx1v0jpewtNBtVyOtTP9ar4PQ7BoRPvib1K3SjC5HXmL7KQfRlDqZlhEfa456H8UESkrsRsZ7/YMefvqnhEgJbOXFzubDP0kfthhwIl7xP2V9ZsdFvZquSw6YstBsD5OVPSvnVooVmwLbv0KRpaZdHIi1YulQIUDKCz41qUCcgYhpN/JzIqiemMgxnDt4dBSJMRMq1O/j6t133WUIgvZCQSFu0tt4r8k2TQdVV9Xx4F+9IvzBvNKDNr/vqGvEHBM9/bhz8tYN4Me7oBmU04cuKEkDfteTGX070KanJXHhfbye1aasWgNWIJEtdI+7MwO8mZJ4c/bUV+gS5Ai+3oxIylln9Fz3LgAgk+pSCIrNytPAv+OxVhwBALsXrJaUyRM6lOxwHYr2KLu8dws838TFLZCXU6RUie4dyBRPoJzJgiBjOynrVy/2YVQTK/tftGbjvLV48GN1Nulk8gFNN63s0oW/8wWEsvIPWor4edkWqrkpZJu/iB8ohkcH8guOm/mjflutjy7LwHnCFJfuSOTYkT5H338vtAh0sPbrRAqYCL0twA9RbjHt1NDsBeXZt/4Gay3GLoTXnTUIkg+nUtjU4ediW9fgGvxaMHkoqMalSDuxU5j+YWGcO71/VvRdz4oy3XJbwcbHFbDDta92yNOjs1u8LUJjv+4yqD9wWIcGBZJ5uLOs+yMRNyjroh3GK8bA8n5Q8Wcd+xKq/1dmdP8hOOjEKSR87v3lV64aWxuvTKXOSvoByFcJ2br1TxiiY6N8RtmjGKMR4tH2Y8dABXCX2yGE06a6dLvyV9LCgkL8jdC92tKplzm28LEGRN6w0fqtt4bCkXbpguIoVCh2xRK69QGKAvECOPryMG13aIUveORXRAuaoCTheCqyNaZxCLj9AznAcfY5bica1TmIzMUUvMSt2yuhfe1jmlGu4WHcPY9cAn1oaLpwskqbzdHXcBGD8vYfljngckNcn8KttcWcmCW/2HKaw8xwPQ138nsircYk7Lv30khYbTFwA8j+EsW4c9cu6fD/uFOvZuPtzwLkQBv/PhbKKJNFgcuiFVAhmJRkt9srL7D/ohDIGXVgSA+TZ7VScSMI/biatOaP/WifMqU1lBEErwyM7zrF+b+7eehIHojiAT7mJlZsoAouAFxRlhaDIekib6SRTCpOYNBAIhEhkN7v6wPd/3xbZfevQQlv9oTHWB/vP6aEtbWcsSwLdKdY7/pKfh0yxHFVaPEfWomWwojDz2U1fa4L7I8V6lLB6CnEkResk0qSjdfyDNbxQVAIWSqeIq9XmDJD79uxfw8vPM86ov+w6jviiNaCCZU1eNc2vrcvcrsBSYPMozI28ZRBJUV87/tQEa/KEdcFS8wltEjsDa5KxdWl+RFnK64+LrXYhQcS1PjEBS6q68KPjNfzKHQg/u4c2Cx6JvCuz6nzm8dGKrPXf56CCFQFuwsiWVg4E6yjk9afuYRQZ485g3uXVI2J3YqvMJaVgSemOZn0PNy+sT4jCm4KI1veRTeGaAJYIqLDAniXprx4E5EgcRh1MmptmQDmN0p2a9/p4QMd/eoxbD2geIweOLoAKwGmU6Ux2PwrG/cVcVTkxBKhVkRN7d8BlHK+8uJ/keThVugQ4WLu6j5ypUwI8qjR+wxi72h0DohCJ+29pATl1UBL4NQG194o1d5pe7mBNex8ZhebFCEH7NoocC9/TjTOKjQfGXtiNGLg/M2KoBPjKSbSFg1oO+CRVGb2Yq2GszE67wOVsCqoKm3wLo20EG3nYRFLIdPgHa9s3i6xh/fe011UJA76cebVwO8cnsJGimk9TLnW83QhzGsZvI7K+a56LHj6hbaXO2yGwURUmTd905+/G2GgNPBwxxUYMoKUk2kGjyTYHMY+JpcXgvdPHBtuNoXV0YxAIFRSwIdDMoJ0cH4ItRrP05i8/O7jf4WZZX3XHRuj3yRi6q8EsNmO3SbSb1NN9wFYQ885xdT4ezZ6xjg2rDjDJ62+DsRQvl3iJdU02UkjrEQk2EaD4bT+IdpW8JWALgdVsuqPF5PdM1jt9vNTwSsf8acTQzJc8GwxGRikUxV4tDDTgzrzzwXqIguBkemMm9SbTl8HgfajPzL6RZV3uY3n4MpxM50ySQDH3fXbR9iNyR6xSZGCb9LGZdZWetHr9Go1H4zEZrc7JzGcuJKczHTdSyCUHj2kK9pF/aUCRDEamrmQGMJeaf3UkUosjF8UfVk3nGPlYdWJ8rX93iFX2kKtiZ0XwH2kepZDbGiUC/hISpdMgct3+waXIwD8CBOpR5InMXT7iV1UiQO+rQeSRVKN8IYAPBBDSrQzyUPTxOsAYeC1Ey3HksWRWDHidhJauUsh71UsxAt5hUKtkkC8Ozms5Cl65PjwKIr9kCjfX4LoQgV7uWwP5KhmvXDABXMVo4u4Y+S5Wzf5wNQUVC8kU+gRBlKwEIhTcUTwsPMXQpzltlU9gJ1SIAAk0z66i6HOFk1clsQ2UggCOhUIAkUTipBBGX0H4uFVqEyMLdR4klKsVTtGXEUuFz07uEwmwSVh1d+DHzd15eA99MXux7/Xb+7QIof8nghT+WRdLWC9l6UTgonKViaEvan+v2siWb8SiSEOUQWQVga5a+iNBiFCWv755KHzP7KOvLhrNxK+y2cvSIRWZmCum05SSBM33xPzDZaV1FM9Eg+6n+Atk4vsYxDmZlgAAAABJRU5ErkJggg==');
+		background-size: 200%;
+		background-repeat: no-repeat;
+		background-position: 0;
+		position: absolute;
+		top: -6rem;
+		right: 0;
+		opacity: 1;
+	}
+
+	.alreadyBarginPrice-box {
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		width: 500upx;
+		height: 520upx;
+		background-size: 500upx 520upx;
+		background-repeat: no-repeat;
+		z-index: 10001;
+
+		.already-Price-title {
+			padding-top: 40%;
+
+			.already-Price text {
+				color: #fcd456;
+				font-size: 52upx;
+			}
+		}
+
+		.barginShare-btn {
+			position: relative;
+			width: 380upx;
+			height: 84upx;
+			line-height: 84upx;
+			background: linear-gradient(0deg, rgba(253, 199, 47, 1) 0%, rgba(251, 233, 69, 1) 100%);
+			border-radius: 42upx;
+			color: #906955;
+			margin: 40upx auto 0;
+		}
+	}
+
+	.masking {
+		position: fixed;
+		/* 		width: 100%;
+		height: 100%; */
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 100;
+		background: rgba(0, 0, 0, 0.5);
+		/* display: none */
+	}
+
+	.to-share {
+		position: fixed !important;
+		z-index: 1009;
+		right: 10upx;
+		top: 0;
+		overflow: auto;
+		width: 500upx;
+		height: 380upx;
+	}
+	.Bargainrecord{
+		overflow: auto;
+	}
+</style>
diff --git a/pages/subPages/bargin/barginlist/barginlist.vue b/pages/subPages/bargin/barginlist/barginlist.vue
new file mode 100644
index 0000000..92c7128
--- /dev/null
+++ b/pages/subPages/bargin/barginlist/barginlist.vue
@@ -0,0 +1,221 @@
+<template>
+	<view class="page">
+		<Loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<noneMores v-if="total==0"></noneMores>
+			<view class="bargin-list m-left-right-30" v-else>
+				<view class="list-item dis-flex border-line border-bottom" @click="skpageType(item,'bargin')" v-for="(item,index) in barginList"
+				 :key="index">
+					<view class="item-left" :style="{'background-image':'url('+item.goodsimg+')'}"></view>
+					<view class="item-right p-r flex-box dis-flex flex-dir-column flex-x-between">
+						<view class="bar-title f-28 col-3 twolist-hidden">{{item.goodsname}}</view>
+						<!-- 进度条 -->
+						<view class="progress-box" v-if="item.status==='1' && item.redrate !=='100'">
+							<view class="default-progress p-r">
+								<view class="resi-progress" :style="'width:'+item.redrate+'%'"></view>
+								<view class="barginregIcon" v-if="item.status==='1' && item.redrate >0" :style="{'background-image':'url('+imageRoot+'barginregIcon.png)','left':(item.redrate-5)+'%'}"></view>
+							</view>
+						</view>
+						<!-- 砍价成功 -->
+						<view class="bargin-success f-24" v-if="item.redrate ==='100' || item.status==='3' || item.status==='2'">
+							<text>{{item.successnum}}人砍价成功</text>
+						</view>
+						<!-- 当前砍价状态 -->
+						<view class="f-24 col-9" v-if="item.status==='1' && item.redrate !=='100'">已砍<text class="col-f4">¥{{item.alprice}},</text>还差<text
+							 class="col-f4">¥{{item.needprice}}</text></view>
+
+						<view class="f-24 col-f4" v-if="item.status==='1' && item.redrate ==='100'">已砍至<text class="m-left-right-6">¥</text>{{item.price}}</view>
+
+						<view class="f-24 col-9" v-if="item.status!=='1'">{{item.status==='2'?'已下单':'已结束'}}</view>
+
+						<view class="f-24 col-f4" v-if="item.redrate ==='100' || item.status==='2'">砍价成功<text class="m-left-right-6">¥</text>{{item.price}}</view>
+						<view class="f-24 col-f4" v-if="item.status==='3'">砍价失败</view>
+						<!-- 砍价结束时间 -->
+						<view class="bargin-time f-24 col-3" v-if="item.status==='1' && !!item.barginTime">{{item.barginTime.hh}}:{{item.barginTime.mm}}:{{item.barginTime.ss}}后结束</view>
+
+						<!-- 按钮 -->
+						<view class="bargin-btn f-24 t-c col-f" v-if="item.status==='1' && item.redrate>=0" @click.stop="skpageType(item,'goods')">{{item.redrate ==='100'?'立即购买':'继续砍价'}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import noneMores from '@/components/template/nonemores.vue';
+	let barginTimer = null;
+	export default {
+		data() {
+			return {
+				barginList: [],
+				loadlogo: false,
+				total:null
+			}
+		},
+		onLoad(e) {
+			this.getMybarginList()
+		},
+		methods: {
+			/**
+			 * 拼团列表倒计时 
+			 */
+			barginListTime(dataInfo) {
+				let _this = this,
+					groupList = dataInfo;
+				groupList.map((val, index) => {
+					val.endtime = Number(val.endtime * 1000);
+					barginTimer = setInterval(() => {
+						let nowTime = new Date().getTime(),
+							// 	距离结束时间
+							leftTime = parseInt((val.endtime - nowTime) / 1000),
+							// 每个商品活动时间
+							timeobj = {};
+						if (leftTime > 0 && nowTime < val.endtime) {
+							let hh = parseInt(leftTime / 60 / 60 / 24 * 24),
+								mm = parseInt(leftTime / 60 % 60),
+								ss = parseInt(leftTime % 60),
+								timeobj = {
+									hh: hh < 10 ? `0${hh}` : hh,
+									mm: mm < 10 ? `0${mm}` : mm,
+									ss: ss < 10 ? `0${ss}` : ss
+								};
+							_this.$set(val, 'barginTime', timeobj);
+						} else if (nowTime > val.endtime) {
+							_this.$set(val, 'status', '3');
+						}
+					}, 1000)
+					return val
+				});
+			},
+			/**
+			 * 砍价列表
+			 */
+			getMybarginList() {
+				let _this = this;
+				App._post_form('&p=member&do=memberBargain', {}, res => {
+					_this.barginListTime(res.data)
+					_this.setData({
+						barginList: res.data
+					})
+					_this.total=res.data.length
+				}, false, () => {
+					_this.loadlogo = true
+				})
+			},
+			/**
+			 * 跳转
+			 */
+			skpageType(barginItem, skipType) {
+				let _this = this,
+					buy_barginData = {
+						goods_id: barginItem.activityid,
+						plugin: '7',
+						specid: barginItem.id,
+						goods_num: 1
+					};
+				if (skipType === "goods") {
+					if (barginItem.redrate === "100") {
+						App.navigationTo({
+							url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode(buy_barginData)
+						});
+					} else {
+						App.navigationTo({
+							url: 'pages/subPages/bargin/barginDetail/barginDetail?bargin_id=' + barginItem.id
+						})
+					}
+				} else {
+					App.navigationTo({
+						url: 'pages/subPages/bargin/barginDetail/barginDetail?bargin_id=' + barginItem.id
+					})
+				}
+			}
+		},
+		components: {
+			Loadlogo,
+			noneMores
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list-item {
+		padding: 30upx 0upx;
+
+		.item-left {
+			width: 200upx;
+			height: 200upx;
+			background-repeat: no-repeat;
+			background-size: 200upx 200upx;
+			border-radius: 10upx;
+			flex-shrink: 0;
+			margin-right: 28upx;
+		}
+
+		.item-right {
+			.bar-title {
+				height: 2.6em;
+				line-height: 1.3em;
+			}
+
+			.progress-box {
+				.default-progress {
+					width: 290upx;
+					height: 10upx;
+					background: #EEEEEE;
+					border-radius: 6upx;
+					margin: 20upx 0;
+
+					.resi-progress {
+						position: absolute;
+						left: 0;
+						right: 0;
+						top: 0;
+						height: 10upx;
+						background: linear-gradient(90deg, rgba(255, 68, 68, 1) 0%, rgba(253, 113, 55, 1) 100%);
+						border-radius: 6upx;
+					}
+
+					.barginregIcon {
+						width: 50upx;
+						height: 50upx;
+						background-size: 50upx 50upx;
+						background-repeat: no-repeat;
+						position: absolute;
+						top: -20upx;
+					}
+				}
+			}
+
+			.bargin-success {
+				width: 190upx;
+				height: 30upx;
+				line-height: 30upx;
+				text-align: center;
+				background: rgba(255, 242, 242, 1);
+				border-radius: 16upx;
+				margin: 14upx 0;
+
+				&>text {
+					display: inline-block;
+					transform: scale(.85);
+					color: #FF4444;
+				}
+			}
+
+			.bargin-btn {
+				position: absolute;
+				right: 0;
+				bottom: 0;
+				width: 130upx;
+				height: 50upx;
+				line-height: 50upx;
+				background: rgba(255, 68, 68, 1);
+				border-radius: 24upx;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/businesscard/carddetail/carddetail.vue b/pages/subPages/businesscard/carddetail/carddetail.vue
new file mode 100644
index 0000000..0861281
--- /dev/null
+++ b/pages/subPages/businesscard/carddetail/carddetail.vue
@@ -0,0 +1,654 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="carddetail-content padding-box-all">
+				<view class="carduserInfo-box">
+					<view class="carduserInfo-top p-r">
+						<view class="cardInfo dis-flex flex-x-center flex-x-between">
+							<view class="cardInfo-left">
+								<view class="cardInfo-nameBox dis-flex flex-y-center">
+									<view class="col-3 f-36 m-right30">{{ cardInfoData.name }}</view>
+									<view class="col-9 f-28">{{ cardInfoData.position }}</view>
+								</view>
+								<view class="seg"></view>
+								<view class="f-24 col-3">{{ cardInfoData.company }} | {{ cardInfoData.branch }}</view>
+							</view>
+							<view class="cardInfo-right" :style="{ 'background-image': 'url(' + cardInfoData.logo + ')' }"></view>
+						</view>
+						<view class="cardInfo-contact">
+							<view class="f-24 f-w m-btm20" >									主营行业<text style="padding: 0 10upx;">:</text>{{cardInfoData.one_class_title}} <text style="padding: 0 10upx;">-</text> {{cardInfoData.two_class_title}}							</view>
+							<view class="address dis-flex flex-y-center m-btm20" v-if="!!cardInfoData.address && cardInfoData.show_addr === '1'">
+								<view class="iconfont icon-location icon-Class m-right20 col-9"></view>
+								<view class="col-3 f-24">{{ cardInfoData.address }}</view>
+							</view>
+							<view class="phone dis-flex flex-y-center m-btm20" v-if="!!cardInfoData.mobile">
+								<view class="iconfont icon-dianhua icon-Class m-right20 col-9"></view>
+								<view class="col-3 f-24">{{ cardInfoData.mobile }}</view>
+							</view>
+							<view class="wx dis-flex flex-y-center m-btm20" v-if="!!cardInfoData.wechat && cardInfoData.show_wechat === '1'">
+								<image :src="imgfixUrls + 'businesscard/wx.png'"></image>
+								<view class="col-3 f-24 m-right20">{{ cardInfoData.wechat }}</view>
+								<view class="copy f-24 col-f4" @click="copy(cardInfoData.wechat)">
+									点击复制
+								</view>
+							</view>
+							<view class="brief dis-flex flex-y-center" v-if="!!cardInfoData.desc">
+								<view class="iconfont icon-xiangqing icon-Class m-right20 col-9"></view>
+								<view class="col-3 f-24 briefTextwh">{{ cardInfoData.desc }}</view>
+							</view>
+						</view>
+						<view class="businessCard_detail_bg" :style="{ 'background-image': 'url(' + imageRoot + 'businessCard_detail_bg.png)' }"></view>
+					</view>
+					<view class="carduserInfo-btm">
+						<view class="shadow-seg"></view>
+						<view class="cardDataList dis-flex flex-y-center flex-x-between">
+							<view class="cardDataItem">
+								<view class="col-3 f-28 t-c">{{ cardInfoData.pv }}</view>
+								<view class="col-9 f-24 t-c">人气</view>
+							</view>
+							<view class="cardDataItem">
+								<view class="col-3 f-28 t-c">{{ cardInfoData.laud }}</view>
+								<view class="col-9 f-24 t-c">点赞</view>
+							</view>
+							<view class="cardDataItem">
+								<view class="col-3 f-28 t-c">{{ cardInfoData.total_collect }}</view>
+								<view class="col-9 f-24 t-c">收存</view>
+							</view>
+							<view class="cardDataItem">
+								<view class="col-3 f-28 t-c">{{ cardInfoData.share }}</view>
+								<view class="col-9 f-24 t-c">转发</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="carduserfcbtn-box">
+					<view class="fcbtn-list dis-flex flex-y-center flex-x-between">
+						<view
+							class="fcbtn-item dis-flex flex-y-center flex-x-center defau-btn"
+							:class="{ 'fnclick-dz': cardInfoData.is_laud === 1 }"
+							@click="fnClick('laud', cardInfoData.id)"
+						>
+							<view class="iconfont icon-appreciate_light fcbtn-itemIconfont m-right12"></view>
+							<view class="f-28" :class="cardInfoData.is_laud === 1 ? 'col-f4' : 'col-3'">{{ cardInfoData.is_laud === 1 ? '已赞' : '赞' }}</view>
+						</view>
+						<view
+							class="fcbtn-item dis-flex flex-y-center flex-x-center defau-btn"
+							:class="{ 'fnclick-dz': cardInfoData.is_collect === 1 }"
+							@click="fnClick('collect', cardInfoData.id)"
+						>
+							<view class="iconfont icon-punch_light fcbtn-itemIconfont m-right12"></view>
+							<view class="col-3 f-28" :class="cardInfoData.is_collect === 1 ? 'col-f4' : 'col-3'">{{ cardInfoData.is_collect === 1 ? '已收存' : '收存' }}</view>
+						</view>
+						<view class="fcbtn-item dis-flex flex-y-center flex-x-center defau-btn" @click="fnClick('share', cardInfoData.id)">
+							<view class="iconfont icon-share_light fcbtn-itemIconfont m-right12"></view>
+							<view class="col-3 f-28">转发</view>
+						</view>
+					</view>
+				</view>
+				<view class="cardusertabbar-box">
+					<view class="tabbar-list dis-flex flex-y-center">
+						<view
+							class="tabbar-item dis-flex flex-box flex-x-center f-28 p-r"
+							:class="currentabType === tabbarItem.tabType ? 'col-f4' : 'col-3'"
+							v-for="(tabbarItem, index) in tabbar"
+							:key="index"
+							@click="tabbarSelect(tabbarItem)"
+						>
+							{{ tabbarItem.title }}
+							<view class="selectabbar-item" v-if="currentabType === tabbarItem.tabType"></view>
+						</view>
+					</view>
+					<!-- 店铺 -->
+					<view class="shop-content " v-if="currentabType === 'shop'">
+						<block v-if="!!shopData && shopData.length > 0">
+							<view class="post-list-scrollView1">
+								<view class="shop-list b-f">
+									<view class="shop b-color-f8">
+										<view class="shangjia">
+											<view class="shangjia-i" :class="{ shangjiaISty: item2.goods.length == 0 }" v-for="(item2, key2) in shopData" :key="key2">
+												<view class="a shangjia-i-t" @click="navgateTo(item2.id)">
+													<view class="shangjia-i-l"><image class="image" :src="item2.logo" mode="aspectFill"></image></view>
+													<view class="shangjia-i-r">
+														<view class="shangjia-i-r-d">
+															<view class="dis-flex flex-y-center flex-x-between">
+																<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+																<view class="store-containerIcon dis-flex flex-y-center">
+																	<image :src="imgfixUrls + 'diypage/720icon.png'" mode="" class="m-right10" v-if="item2.panorama === 1"></image>
+																	<image :src="imgfixUrls + 'diypage/videoicon.png'" mode="" v-if="item2.videourl === 1"></image>
+																</view>
+															</view>
+															<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+																<view class="dis-flex flex-y-center">
+																	<view class="shangjia-i-r-t2-icon">
+																		<view class="star star-dark">
+																			<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+																		</view>
+																		<view class="star star-light">
+																			<view class="star-width" :style="'width:' + (item2.score / 5) * 100 + '%;'">
+																				<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+																			</view>
+																		</view>
+																	</view>
+																	<view class="f-28 col-6 star-grade">{{ item2.score }}分</view>
+																</view>
+																<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{ item2.distance }}</view>
+															</view>
+															<view class="shangjia-i-r-t3 over-omit"><view class="p" v-html="item2.storehours"></view></view>
+															<view class="shangjia-i-r-t4 over-omit">
+																<view v-for="(item3, index3) in item2.tags" class="tags_view">{{ item3 }}</view>
+															</view>
+														</view>
+													</view>
+												</view>
+												<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || shopFoldIndex !== key2) && item2.goods.length > 0">
+													<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+														<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+															<view class="em" :class="tag.css">{{ tag.tag }}</view>
+															<view class="span">{{ tag.name }}</view>
+														</view>
+													</view>
+													<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+														<view class="i icon iconfont icon-unfold"></view>
+														<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+															<view class="em" :class="tag.css">{{ tag.tag }}</view>
+															<view class="span">{{ tag.name }}</view>
+														</view>
+													</view>
+													<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+														<view class="em" :class="tag.css">{{ tag.tag }}</view>
+														<view class="span">{{ tag.name }}</view>
+													</view>
+													<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+														<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+													</view>
+												</view>
+												<view class="shangjia-i-b" v-if="!shopFold && shopFoldIndex == key2 && item2.goods.length > 2">
+													<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+														<view class="i icon iconfont icon-fold"></view>
+														<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+															<view class="em" :class="tag.css">{{ tag.tag }}</view>
+															<view class="span">{{ tag.name }}</view>
+														</view>
+													</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</block>
+						<nonemores v-else></nonemores>
+					</view>
+					<!-- 发布 -->
+					<view class="issue-content" v-if="currentabType === 'post' && tabbar.length > 0">
+						<block v-if="!!invitationListData && invitationListData.length > 0">
+							<view class="post-list-scrollView">
+								<view v-for="(issueItem, index) in invitationListData">
+									<post-list :itemInfo="issueItem" :indexNumber="index" :indexShow="indexShow" @operationShow="operationShow"></post-list>
+								</view>
+								<loadmore :isMore="postMore" />
+							</view>
+						</block>
+						<nonemores v-else></nonemores>
+					</view>
+				</view>
+			</view>
+			<view class="bottomFixedTabbar dis-flex flex-y-center flex-x-between b-f">
+				<view class="bottomFixedTabbar-left">
+					<view class="menuList dis-flex flex-y-center flex-x-between">
+						<view class="menu-item" @click="fnbottomClick('index')">
+							<image :src="imgfixUrls + 'businesscard/index.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">首页</view>
+						</view>
+						<view class="menu-item" @click="fnbottomClick('mycard')">
+							<image :src="imgfixUrls + 'businesscard/card.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">我的名片</view>
+						</view>
+						<view class="menu-item" @click="fnClick('share', cardInfoData.id)">
+							<image :src="imgfixUrls + 'businesscard/share.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">转发</view>
+						</view>
+					</view>
+				</view>
+				<view class="bottomFixedTabbar-right dis-flex flex-box">
+					<view class="tabbar-btnlist dis-flex flex-y-center flex-x-between">
+						<view class="tabbar-chat tabbar-btnStyle dis-flex flex-y-center">
+							<image :src="imgfixUrls + 'businesscard/chat.png'" class="tabbar-itemImage"></image>
+							<view class="menu-name f-24 col-f" @click="fnbottomClick('chat', cardInfoData.mid)">在线聊</view>
+						</view>
+						<view
+							class="tabbar-phone tabbar-btnStyle dis-flex flex-y-center"
+							@click="fnbottomClick('phone', cardInfoData.mobile)"
+							:class="cardInfoData.show_mobile == '1' ? '' : 'cantCall'"
+						>
+							<text
+								class="icon iconfont icon-dianhua1 f-24 col-f menu-name ver_mid"
+								v-if="cardInfoData.show_mobile == '0'"
+								:class="cardInfoData.show_mobile == '1' ? '' : 'cantCall_text'"
+							></text>
+							<image :src="imgfixUrls + 'businesscard/phone.png'" class="tabbar-itemImage" v-if="cardInfoData.show_mobile == '1'"></image>
+							<view class="menu-name f-24 col-f ver_mid" :class="cardInfoData.show_mobile == '1' ? '' : 'cantCall_text'">打电话</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<view  v-if="cardInfoData.id">
+			<shareBottom
+				:shareBottomShow="shareBottomShow"
+				@clickmask="closeShareBottom"
+				:shareShow="shareShow"
+				@closeShareShow="closeShareShow"
+				@shareImgShow="shareImgShow"
+				:isCard="isCard"
+				:postId="cardInfoData.id"
+				@gohb="goPost"
+				:postType="11"
+			></shareBottom>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import postList from '@/components/template/postList.vue';
+import Loadlogo from '@/components/template/loadlogo';
+import nonemores from '@/components/template/nonemores.vue';
+import loadmore from '@/components/template/loadmore.vue';
+import shareBottom from '@/components/template/shareBottom';
+export default {
+	data() {
+		return {
+			loadlogo: false,
+			currentabType: 'post',
+			cardInfoData: {},
+			shopData: [],
+			current_page: 1,
+			total: null,
+			index: -1,
+			indexShow: -1,
+			invitationListData: [],
+			agencyData: {},
+			postMore: true,
+			shareBottomShow: false,
+			shareShow: false,
+			tabbar: [
+				{
+					title: 'Ta的动态',
+					tabType: 'post'
+				},
+				{
+					title: 'Ta的店铺',
+					tabType: 'shop'
+				}
+			]
+		};
+	},
+	methods: {
+		copy(text){
+			//#ifdef H5
+				App.clipboard(text);
+			//#endif
+			//#ifndef H5
+				uni.setClipboardData({
+				    data: text,
+				    success: function () {
+				        uni.showToast({
+				        	title:'订单号已复制到粘贴板',
+							icon:'none'
+				        })
+				    }
+				});
+			//#endif
+			
+			// uni.setClipboardData({
+			//     data: text,
+			//     success: function () {
+			//        uni.showToast({
+			//        	title:'复制成功',
+			// 		icon:'none'
+			//        })
+			// 	   uni.hideToast()
+			//     }
+			// });
+		},
+		// tabbar选项
+		tabbarSelect(tabbarItem) {
+			let _this = this,
+				cardInfoData = _this.cardInfoData,
+				agencyData = _this.agencyData;
+			uni.showLoading({});
+			if (tabbarItem.tabType === 'shop') {
+				_this.getuserShopList(cardInfoData.mid, agencyData.lat, agencyData.lng);
+			} else {
+				_this.getuserList(cardInfoData.mid, 1, 0, false);
+				_this.current_page = 1;
+			}
+			_this.currentabType = tabbarItem.tabType;
+		},
+		navgateTo(sid) {
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/mainPages/store/index?sid=' + sid
+			});
+		},
+		//
+		// 获取名片信息
+		getCardDetail(id = 4) {
+			let _this = this,
+				agencyData = uni.getStorageSync('agencyData');
+			App._post_form(
+				'&p=citycard&do=cardInfo',
+				{
+					id
+				},
+				res => {
+					if (res.errno === 0) {
+						_this.setData({
+							cardInfoData: res.data,
+							agencyData
+						});
+						// debugger
+						if( _this.cardInfoData.showstore == 0 && _this.cardInfoData.showpocket == 0 ){
+							_this.tabbar = [];
+							return
+						}else if(_this.cardInfoData.showpocket == 0 &&  _this.cardInfoData.showstore ==1) {
+							_this.tabbar = [
+								{
+									title: 'Ta的店铺',
+									tabType: 'shop'
+								}
+							];
+							_this.tabbarSelect(_this.tabbar[0]);
+							return
+						}else if (_this.cardInfoData.showpocket == 1 && _this.cardInfoData.showstore == 0) {
+							_this.tabbar = [
+								{
+									title: 'Ta的动态',
+									tabType: 'post'
+								}
+							];
+							_this.getuserList(res.data.mid);
+							return
+						}else if(_this.cardInfoData.showpocket == 1 && _this.cardInfoData.showstore == 1){
+							_this.getuserList(res.data.mid);
+						}
+						
+					}
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		// 点赞
+		laudCollect(type, id) {
+			let _this = this,
+				cardInfoData = _this.cardInfoData,
+				requestUrl = type === 'laud' ? '&p=citycard&do=cardFabulous' : '&p=citycard&do=cardCollect',
+				islaudCollect = type === 'laud' ? 'is_laud' : 'is_collect',
+				laudCollect = type === 'laud' ? 'laud' : 'total_collect';
+			console.log(islaudCollect);
+			App._post_form(
+				requestUrl,
+				{
+					id
+				},
+				res => {
+					if (res.errno === 0) {
+						if (cardInfoData[islaudCollect] === 0) {
+							_this.$set(_this.cardInfoData, islaudCollect, 1);
+							cardInfoData[laudCollect] = Number(cardInfoData[laudCollect]) + 1;
+						} else {
+							if (cardInfoData[islaudCollect] === 1) {
+								_this.$set(_this.cardInfoData, islaudCollect, 0);
+								cardInfoData[laudCollect] = cardInfoData[laudCollect] - 1;
+							}
+						}
+					}
+				}
+			);
+		},
+		fnClick(type, id, isShow = true) {
+			let _this = this;
+			if (type === 'laud' || type === 'collect') {
+				_this.laudCollect(type, id);
+			}
+			if (type === 'share') {
+				if (isShow) {
+					_this.shareBottomShow = true;
+				}
+			}
+		},
+		goPost(data) {
+			let _this = this;
+			_this.shareBottomShow = false;
+		},
+		closeShareBottom() {
+			let _this = this;
+			_this.shareBottomShow = false;
+		},
+		// 关闭分享弹框
+		closeShareShow() {
+			let _this = this;
+			_this.shareShow = false;
+			_this.shareBottomShow = false;
+		},
+		shareImgShow() {
+			let _this = this;
+			_this.shareShow = true;
+			_this.shareBottomShow = false;
+		},
+		shangjiaFold(key2) {
+			this.shopFold = false;
+			this.shopFoldIndex = key2;
+		},
+		shangjiaUpFold(key2) {
+			this.shopFold = true;
+			this.shopFoldIndex = key2;
+		},
+		operationShow(e) {
+			let _this = this;
+			_this.indexShow = e;
+		},
+		// 获取店铺信息列表
+		getuserShopList(mid = '', lat = '', lng = '') {
+			let _this = this;
+			App._post_form(
+				'&p=store&do=userShopList',
+				{
+					mid,
+					lat,
+					lng
+				},
+				res => {
+					if (res.errno === 0) {
+						for (let i = 0; i < res.data.length; i++) {
+							let goodsList = [];
+							for (let j in res.data[i].goods) {
+								let goodsData = res.data[i].goods[j];
+								if (goodsData !== '') {
+									if (j == 'active') {
+										goodsData.css = 'qiang';
+										goodsData.tag = '抢';
+									} else if (j == 'coupon') {
+										goodsData.css = 'hui';
+										goodsData.tag = '券';
+									} else if (j == 'fightgroup') {
+										goodsData.css = 'pin';
+										goodsData.tag = '拼';
+									} else if (j == 'groupon') {
+										goodsData.css = 'tuan';
+										goodsData.tag = '团';
+									} else if (j == 'halfcard') {
+										goodsData.css = 'ka';
+										goodsData.tag = '卡';
+									} else if (j == 'packages') {
+										goodsData.css = 'li';
+										goodsData.tag = '礼';
+									}
+									goodsList.push(goodsData);
+								}
+							}
+							res.data[i].goods = goodsList;
+						}
+						_this.setData({
+							shopData: res.data
+						});
+					}
+				},
+				false,
+				() => {
+					uni.hideLoading();
+				}
+			);
+		},
+
+		getuserList(mid = '', page = 1, status = 0, isPage = false) {
+			let _this = this;
+			App._post_form(
+				'&p=pocket&do=userList',
+				{
+					mid,
+					page,
+					status
+				},
+				res => {
+					if (res.errno === 0) {
+						let invitationData = res.data;
+						if (isPage) {
+							if (invitationData.list.length > 0) {
+								_this['invitationListData'].push(...invitationData.list);
+							} else {
+								_this.postMore = true;
+							}
+						} else {
+							_this.setData({
+								invitationListData: invitationData.list,
+								total: res.data.total,
+								postMore: invitationData.list.length === 0 || _this.current_page === res.data.total
+							});
+						}
+					}
+				},
+				false,
+				() => {
+					uni.hideLoading();
+				}
+			);
+		},
+		fnbottomClick(type, clickData) {
+			let _this = this;
+			switch (type) {
+				case 'chat':
+					// App.navigationTo({
+					// 	url: `pages/subPages/homepage/chat/chat?other_party_id=${clickData}&type=1&other_party_type=1`
+					// });
+					let getSetInfo = uni.getStorageSync('getSetInfo');
+					if (getSetInfo.type == 1) {
+						App.navigationTo({
+							url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + clickData + '&other_party_type=' + 1 + '&type=1' + '&id='
+						});
+					} else {
+						App.navigationTo({
+							url: 'pages/subPages/homepage/chat/chat?other_party_id=' + clickData + '&other_party_type=' + 1 + '&type=1' + '&id='
+						});
+					}
+					break;
+				case 'phone':
+					uni.makePhoneCall({
+						phoneNumber: clickData //仅为示例
+					});
+					break;
+				case 'index':
+					App.navigationTo({
+						url: 'pages/mainPages/index/diypage?i=26&type=13'
+					});
+					break;
+				case 'mycard':
+					App.navigationTo({
+						url: 'pages/subPages/businesscard/carddetail/renewcarddetail',
+						navType: 'rediRect'
+					});
+					break;
+			}
+		}
+	},
+	computed: {
+		isCard() {
+			let ClientType = App.getClientType();
+			return ClientType !== '3' ? false : true;
+		},
+		cardShare() {
+			return this.$store.state.isCardshare;
+		}
+	},
+	watch: {
+		cardShare(newValue, oldValue) {
+			let _this = this;
+			if (newValue > oldValue) {
+				App._post_form(
+					'&p=citycard&do=cardShare',
+					{
+						id: _this.cardInfoData.id
+					},
+					res => {
+						if (res.errno === 0) {
+							_this.$set(_this.cardInfoData, 'share', Number(_this.cardInfoData.share) + 1);
+						}
+					}
+				);
+			}
+		}
+	},
+	components: {
+		postList,
+		Loadlogo,
+		nonemores,
+		loadmore,
+		shareBottom
+	},
+	onLoad(e) {
+		let _this = this;
+		console.log(e, 66666666111);
+		_this.getCardDetail(e.cardid);
+	},
+	//加载更多
+	onReachBottom(e) {
+		let _this = this,
+			currentType = _this.currentabType,
+			cardInfoData = _this.cardInfoData,
+			agencyData = _this.agencyData;
+		if (_this.current_page >= _this.total) {
+			_this.postMore = true;
+			return false;
+		}
+		if (currentType === 'post') {
+			_this.getuserList(cardInfoData.mid, ++_this.current_page, 0, true);
+		} else if (currentType === 'shop') {
+			_this.getuserShopList(cardInfoData.mid, agencyData.lat, agencyData.lng);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+@import '/detailStyle.css';
+@import '../../../../common/css/old_diyPages';
+
+.cantCall {
+	background: #eeeeee !important;
+	pointer-events: none;
+}
+
+.ver_mid {
+	vertical-align: middle;
+}
+
+.cantCall_text {
+	color: rgba(153, 153, 153, 1) !important;
+}
+</style>
diff --git a/pages/subPages/businesscard/carddetail/detailStyle.css b/pages/subPages/businesscard/carddetail/detailStyle.css
new file mode 100644
index 0000000..b7e9de6
--- /dev/null
+++ b/pages/subPages/businesscard/carddetail/detailStyle.css
@@ -0,0 +1,318 @@
+.carduserInfo-box {
+	box-shadow: 0 0 10upx 0 rgba(86, 86, 86, 0.2);
+	border-radius: 20upx;
+}
+
+.carduserInfo-box .carduserInfo-top {
+	padding: 60upx 50upx;
+}
+
+.businessCard_detail_bg {
+	position: absolute;
+	width: 182upx;
+	height: 248upx;
+	background-size: 182upx 248upx;
+	background-repeat: no-repeat;
+	right: 0;
+	bottom: 0;
+}
+
+.carduserInfo-top .cardInfo-left .seg {
+	width: 104upx;
+	height: 2upx;
+	background-color: #333333;
+	margin: 10upx 0;
+}
+
+.carduserInfo-top .cardInfo-right {
+	width: 90upx;
+	height: 90upx;
+	border-radius: 45upx;
+	background-size: 90upx 90upx;
+	background-repeat: no-repeat;
+}
+
+.carduserInfo-top .cardInfo-contact .icon-Class {
+	font-size: 32upx;
+	width: 32upx;
+}
+
+.carduserInfo-top .cardInfo-contact {
+	margin-top: 60upx;
+}
+
+.carduserInfo-top .cardInfo-tab {
+	margin-top: 60upx;
+}
+
+.carduserInfo-btm,
+.carduserPayInfo-bottom {
+	padding-bottom: 30upx;
+}
+
+.carduserInfo-btm .shadow-seg,
+.carduserPayInfo-bottom .shadow-seg {
+	width: 100%;
+	height: 30upx;
+	background: linear-gradient(0deg, rgba(255, 255, 255, 1) 0%, rgba(0, 0, 0, 1) 100%);
+	opacity: 0.06;
+}
+
+.carduserInfo-btm .cardDataList {
+	padding: 0 50upx;
+}
+
+.carduserfcbtn-box {
+	padding: 0 14upx;
+}
+
+.fcbtn-list {
+	margin: 50upx 0 30upx;
+}
+
+.fcbtn-list .fcbtn-item .fcbtn-itemIconfont {
+	font-size: 30upx;
+}
+
+.fcbtn-list .fcbtn-item.defau-btn {
+	width: 180upx;
+	height: 60upx;
+	line-height: 60upx;
+	border: 1px solid #EEEEEE;
+	border-radius: 30upx;
+}
+
+.cardusertabbar-box {
+	margin: 0 -30upx 60upx;
+}
+
+.cardusertabbar-box .tabbar-list {
+	height: 60upx;
+	line-height: 80upx;
+}
+
+.tabbar-item .selectabbar-item {
+	width: 48upx;
+	height: 6upx;
+	background-color: #FF4444;
+	border-radius: 6upx 6upx 0 0;
+	position: absolute;
+	left: 50%;
+	bottom: 0;
+	transform: translateX(-50%);
+}
+
+.bottomFixedTabbar {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	padding: 20upx 30upx;
+	border-top: 1px solid #eeeeee;
+	border-radius: 6upx 6upx 0 0;
+	z-index: 100;
+}
+
+.bottomFixedTabbar-left {
+	width: 40%;
+	margin-right: 5%;
+}
+
+.menu-item .menu-itemImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin: 0 auto;
+	font-size: 0;
+}
+
+.tabbar-btnStyle {
+	padding: 10upx 30upx;
+	border-radius: 30px;
+	height: 44upx;
+}
+
+.tabbar-btnStyle.tabbar-chat {
+	background-color: #17D117;
+}
+
+.tabbar-btnStyle.tabbar-phone {
+	background-color: #FF4444;
+}
+
+.tabbar-itemImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin-right: 10upx;
+	font-size: 0;
+}
+
+.tabbar-btnlist {
+	width: 100%;
+}
+
+.fctabbar-box {
+	padding: 0 60upx;
+}
+
+.fctabbar-item{
+	flex: 0 0 25%;
+}
+
+.fctabbarImage {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	margin: 0 auto 10upx;
+}
+
+.carduserPayInfo-top {
+	padding: 80upx 0;
+}
+
+.carduserPayInfo-top .carduserPayBtn {
+	width: 240upx;
+	height: 50upx;
+	line-height: 50upx;
+	border: 1px dotted #666666;
+	border-radius: 25upx;
+	text-align: center;
+}
+
+.cardInfo-contact .wx>image {
+	width: 30upx;
+	height: 30upx;
+	font-size: 0;
+	margin-right: 24upx;
+}
+
+.fnclick-dz {
+	border-color: #ff4444 !important;
+	color: #ff4444 !important;
+}
+
+.coverImg {
+	width: 750upx;
+}
+
+.closeButton {
+	height: 88upx;
+	width: 750upx;
+	text-align: center;
+}
+
+.closeButton>text {
+	line-height: 88upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.buttonText {
+	text-align: center;
+}
+
+.buttonText>text {
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.buttonImage {
+	margin: auto;
+	width: 120upx;
+	height: 120upx;
+}
+
+.buttonImage>image {
+	width: 120upx;
+	height: 120upx;
+}
+
+.titleButton {
+	position: relative;
+	margin: 47upx 0 0 0;
+	display: inline-block;
+	width: 50%;
+}
+
+.mainTitle {
+	width: 750upx;
+	height: 255upx;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+}
+
+.shareBottom {
+	font-size: 0;
+}
+
+.viewMain {
+	width: 750upx;
+	height: 344upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx 20upx 0upx 0upx;
+}
+
+.shareButton {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	background: rgba(0, 0, 0, 0);
+}
+
+.wxShareView {
+	width: 100%;
+	height: 100%;
+}
+.full{
+	height: 100upx;
+	width: 750upx;
+	background: #F8F8F8;
+}
+.cardEndTime {
+	display: flex;
+	justify-content: space-between;
+	position: absolute;
+	right: 0;
+	top: 0;
+	width: 240upx;
+	padding: 0 30upx;
+	height: 40upx;
+	line-height: 40upx;
+	border-radius: 0 20upx 0 10upx;
+}
+
+.checkbox-content {
+	width: 100vw;
+	height: 500upx;
+	border-radius: 20upx 20upx 0upx 0upx;
+}
+
+.scrollView {
+	width: 100vw;
+	height: 360upx;
+	padding: 30upx;
+}
+
+.labeStyle:last-child .labeStyle-btm {
+	margin-bottom: 0;
+}
+
+.checkbox-submit {
+	height: 80upx;
+	line-height: 80upx;
+	background-color: #FF4444;
+}
+
+.briefTextwh {
+	word-break: break-all;
+}
+
+.shop-content,
+.issue-content {
+	background-color: #F8F8F8 !important;
+}
+.issue-content{
+	padding: 15upx 0 30upx;
+}
diff --git a/pages/subPages/businesscard/carddetail/renewcarddetail.vue b/pages/subPages/businesscard/carddetail/renewcarddetail.vue
new file mode 100644
index 0000000..c913eaa
--- /dev/null
+++ b/pages/subPages/businesscard/carddetail/renewcarddetail.vue
@@ -0,0 +1,408 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="carddetail-content padding-box-all">
+				<view v-for="(cardItem,index) in cardData.list" :key="index" v-if="!!cardData.list && cardData.list.length>0">
+					<view class="carduserInfo-box m-btm30" v-if="cardItem.paystatus==='1' && cardItem.checkstatus==='1'">
+						<view class="carduserInfo-top p-r">
+							<view class="cardInfo dis-flex flex-x-center flex-x-between">
+								<view class="cardInfo-left">
+									<view class="cardInfo-nameBox dis-flex flex-y-center">
+										<view class="col-3 f-36 m-right30">{{cardItem.name}}</view>
+										<view class="col-9 f-28">{{cardItem.position}}</view>
+									</view>
+									<view class="seg"></view>
+									<view class="f-24 col-3">{{cardItem.company}}{{!!cardItem.branch?'|'+cardItem.branch:''}}</view>
+								</view>
+								<view class="cardInfo-right" :style="{'background-image':'url('+cardItem.logo+')'}"></view>
+							</view>
+							<view class="cardInfo-contact">
+								<view class="f-24 f-w m-btm20" >
+										主营行业<text style="padding: 0 10upx;">:</text>{{cardItem.one_class_title}} <text style="padding: 0 10upx;">-</text> {{cardItem.two_class_title}}
+								</view>
+								<view class="address dis-flex flex-y-center m-btm20" v-if="!!cardItem.address && cardItem.show_addr==='1'">
+									<view class="iconfont icon-location icon-Class m-right20 col-9"></view>
+									<view class="col-3 f-24">{{cardItem.address}}</view>
+								</view>
+								<view class="phone dis-flex flex-y-center m-btm20" v-if="!!cardItem.mobile">
+									<view class="iconfont icon-dianhua icon-Class m-right20 col-9"></view>
+									<view class="col-3 f-24">{{cardItem.mobile}}</view>
+								</view>
+								<view class="wx dis-flex flex-y-center m-btm20" v-if="!!cardItem.wechat && cardItem.show_wechat==='1'">
+									<image :src="imgfixUrls + 'businesscard/wx.png'"></image>
+									<view class="col-3 f-24 m-right20">{{ cardItem.wechat }}</view>
+									<view class="copy f-24 col-f4" @click="copy(cardItem.wechat)">
+										点击复制
+									</view>
+								</view>
+								<view class="brief dis-flex flex-y-center" v-if="!!cardItem.desc">
+									<view class="iconfont icon-xiangqing icon-Class m-right20 col-9"></view>
+									<view class="col-3 f-24 briefTextwh">{{cardItem.desc}}</view>
+								</view>
+							</view>
+							<view class="cardInfo-tab dis-flex flex-y-center padding-box">
+								<view class="dis-flex cardInfo-tabItem col-3 f-24">人气:<text class="col-f4">{{cardItem.pv}}</text></view>
+								<view class="dis-flex flex-box flex-x-center cardInfo-tabItem col-3 f-24">点赞:<text class="col-f4">{{cardItem.laud}}</text></view>
+								<view class="dis-flex cardInfo-tabItem col-3 f-24">收存:<text class="col-f4">{{cardItem.total_collect}}</text></view>
+							</view>
+							<view class="businessCard_detail_bg" :style="{'background-image':'url('+imageRoot+'businessCard_detail_bg.png)'}"></view>
+							<view class="cardEndTime" :style="{backgroundColor: cardItem.is_endtime===1?'#ff4444':'#31C418'}">
+								<text class="col-f f-24">{{cardItem.meal_endtime}}</text>
+								<text class="col-f f-24">{{cardItem.is_endtime===1?'已过期':'未过期'}}</text>
+							</view>
+						</view>
+						<view class="carduserInfo-btm">
+							<view class="shadow-seg"></view>
+							<view class="fctabbar-box" style="padding: 0;">
+								<view class="fctabbar-list dis-flex flex-y-center flex-x-between">
+									<view class="fctabbar-item" :style="{flex: tops.length == 0 && meals.length == 0?'0 0 50%':((tops.length > 0 && meals.length == 0) || (tops.length == 0 && meals.length > 0))?'0 0 33.33%':'0 0 25%'}" @click="fnclick(cardItem,tabbarList[0]['tabtype'])" v-if="meals.length > 0">
+										<image :src="tabbarList[0]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[0]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" :style="{flex: tops.length == 0 && meals.length == 0?'0 0 50%':((tops.length > 0 && meals.length == 0) || (tops.length == 0 && meals.length > 0))?'0 0 33.33%':'0 0 25%'}" @click="fnclick(cardItem,tabbarList[1]['tabtype'])">
+										<image :src="tabbarList[1]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[1]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" :style="{flex: tops.length == 0 && meals.length == 0?'0 0 50%':((tops.length > 0 && meals.length == 0) || (tops.length == 0 && meals.length > 0))?'0 0 33.33%':'0 0 25%'}" @click="fnclick(cardItem,tabbarList[2]['tabtype'])" v-if="tops.length > 0">
+										<image :src="tabbarList[2]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[2]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" :style="{flex: tops.length == 0 && meals.length == 0?'0 0 50%':((tops.length > 0 && meals.length == 0) || (tops.length == 0 && meals.length > 0))?'0 0 33.33%':'0 0 25%'}" @click="fnclick(cardItem,tabbarList[3]['tabtype'])">
+										<image :src="tabbarList[3]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[3]['title']}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="carduserInfo-box m-btm30" v-if="cardItem.paystatus==='0'">
+						<view class="carduserPayInfo-top dis-flex flex-dir-column flex-y-center p-r">
+							<view class="f-24 col-9 m-btm20">{{cardItem.name}}名片等待支付</view>
+							<view class="carduserPayBtn f-24 col-6" @click="fnclick(cardItem,tabbarList[0]['tabtype'])">立即支付</view>
+							<view class="businessCard_detail_bg" :style="{'background-image':'url('+imageRoot+'businessCard_detail_bg.png)'}"></view>
+						</view>
+						<view class="carduserPayInfo-bottom">
+							<view class="shadow-seg"></view>
+							<view class="fctabbar-box">
+								<view class="fctabbar-list dis-flex flex-y-center flex-x-between">
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[0]['tabtype'])">
+										<image :src="tabbarList[0]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[0]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[1]['tabtype'])">
+										<image :src="tabbarList[1]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[1]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[2]['tabtype'])">
+										<image :src="tabbarList[2]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[2]['title']}}</view>
+									</view>
+									<view v-if="cardItem.checkstatus!='0'" class="fctabbar-item" @click="fnclick(cardItem,tabbarList[3]['tabtype'])">
+										<image :src="tabbarList[3]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[3]['title']}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="carduserInfo-box m-btm30" v-if="cardItem.paystatus==='1'&&(cardItem.checkstatus==='0' || cardItem.checkstatus==='2')">
+						<view class="carduserPayInfo-top dis-flex flex-dir-column flex-y-center p-r">
+							<block v-if="cardItem.checkstatus==='0'">
+								<view class="f-24 col-9 m-btm20">{{cardItem.name}}名片等待审核</view>
+							</block>
+							<block v-else>
+								<view class="f-24 col-9 m-btm20">{{cardItem.name}}名片被驳回</view>
+							</block>
+							<view class="businessCard_detail_bg" :style="{'background-image':'url('+imageRoot+'businessCard_detail_bg.png)'}"></view>
+						</view>
+						<view class="carduserPayInfo-bottom">
+							<view class="shadow-seg"></view>
+							<view class="fctabbar-box">
+								<view class="fctabbar-list dis-flex flex-y-center flex-x-between">
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[0]['tabtype'])">
+										<image :src="tabbarList[0]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[0]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[1]['tabtype'])">
+										<image :src="tabbarList[1]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[1]['title']}}</view>
+									</view>
+									<view class="fctabbar-item" @click="fnclick(cardItem,tabbarList[2]['tabtype'])">
+										<image :src="tabbarList[2]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[2]['title']}}</view>
+									</view>
+									<view v-if="cardItem.checkstatus!='0'" class="fctabbar-item" @click="fnclick(cardItem,tabbarList[3]['tabtype'])">
+										<image :src="tabbarList[3]['tabImage']" class="fctabbarImage"></image>
+										<view class="col-3 f-24">{{tabbarList[3]['title']}}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="carduserInfo-box" v-if="cardData.surplus>0">
+					<view class="carduserPayInfo-top dis-flex flex-dir-column flex-y-center p-r">
+						<view class="f-24 col-9 m-btm20">您还可以再创建{{cardData.surplus===999?'多':cardData.surplus}}张名片</view>
+						<view class="carduserPayBtn f-24 col-6" style="width: 280rpx !important;" @click="creatCard()">点击立即创建</view>
+						<view class="businessCard_detail_bg" :style="{'background-image':'url('+imageRoot+'businessCard_detail_bg.png)'}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="full"></view>
+		</block>
+		<view  v-if="currentPostId">
+			<shareBottom :shareBottomShow="shareBottomShow" @clickmask="closeShareBottom" :shareShow="shareShow" @closeShareShow="closeShareShow"
+			 @shareImgShow="shareImgShow" :isCard="isCard" :postId="currentPostId" :postType="'11'" @gohb="goPost"></shareBottom>
+		</view>
+		<PopManager :show="iscardRelevantInfo" :type="'bottom'" @clickmask="iscardRelevantInfo = false">
+			<view class="b-f checkbox-content" style="padding-bottom: 150upx;">
+				<scroll-view scroll-y="true" class="scrollView" v-if="currentTabType==='zhiding'">
+					<radio-group @change="radioChange">
+						<view class="scroll-tops">
+							<label v-for="(topsItem,index) in tops" :key="index" class="labeStyle">
+								<view class="tops-item">
+									<view class="dis-flex flex-y-center m-btm40 labeStyle-btm">
+										<view class="m-right20">
+											<radio :value="topsItem.id" color="#FF4444" style="transform: scale(0.8);" />
+										</view>
+										<view class="f-28 col-3">{{topsItem.name}} {{topsItem.day}}天(
+										<text v-if="topsItem.is_free != 1">收费¥{{topsItem.price}}</text>
+										<text v-else>免费</text>)</view>
+									</view>
+								</view>
+							</label>
+						</view>
+					</radio-group>
+				</scroll-view>
+				<scroll-view scroll-y="true" class="scrollView" v-if="currentTabType==='xufei'">
+					<radio-group @change="radioChange">
+						<view class="scroll-tops">
+							<label v-for="(mealsItem,index) in meals" :key="index" class="labeStyle">
+								<view class="tops-item">
+									<view class="dis-flex flex-y-center m-btm40 labeStyle-btm">
+										<view class="m-right20">
+											<radio :value="mealsItem.id" color="#FF4444" style="transform: scale(0.8);" />
+										</view>
+										<view class="f-28 col-3" v-if="mealsItem.is_free != 1">{{mealsItem.name}} {{mealsItem.day}}天(收费¥{{mealsItem.price}})</view>
+										<view class="f-28 col-3" v-else>免费</view>
+									</view>
+								</view>
+							</label>
+						</view>
+					</radio-group>
+				</scroll-view>
+				<view class="checkbox-submit f-28 col-f t-c" @click="Submit">确认</view>
+			</view>
+		</PopManager>
+		<TabBars :tabBarAct="0" pageType="13"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import shareBottom from '@/components/template/shareBottom'
+	import PopManager from '@/components/template/PopManager'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				tabbarList: [{
+						title: '续费',
+						tabImage: 'businesscard/xufei.png',
+						tabtype: 'xufei'
+					},
+					{
+						title: '编辑',
+						tabImage: 'businesscard/bianji.png',
+						tabtype: 'bianji'
+					},
+					{
+						title: '置顶',
+						tabImage: 'businesscard/zhiding.png',
+						tabtype: 'zhiding'
+					},
+					{
+						title: '递名片',
+						tabImage: 'businesscard/dimingpian.png',
+						tabtype: 'dimingpian'
+					}
+				],
+				cardData: {},
+				meals: null,
+				tops: null,
+				shareBottomShow: false,
+				shareShow: false,
+				isCard: true,
+				postId: null,
+				iscardRelevantInfo: false,
+				currentTabType: null,
+				cardRelevantId: null
+			}
+		},
+		methods: {
+			copy(text){
+				//#ifdef H5
+					App.clipboard(value);
+				//#endif
+				
+				//#ifndef H5
+				uni.setClipboardData({
+				    data: text,
+				    success: function () {
+				       uni.showToast({
+				       	title:'复制成功',
+						icon:'none'
+				       })
+				    }
+				});
+				//#endif
+				
+			},
+			getMyCard() {
+				let _this = this;
+				App._post_form('&p=citycard&do=myCard', {
+					page: 1,
+					page_index: 999
+				}, res => {
+					_this.setData({
+						cardData: res.data
+					})
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			getcardRelevantInfo() {
+				let _this = this;
+				App._post_form('&p=citycard&do=cardRelevantInfo', {}, res => {
+					console.log('getcardRelevantInfo', res)
+					_this.setData(res.data);
+				})
+			},
+			fnclick(cardData, tabType) {
+				let _this = this;
+				if (tabType === 'dimingpian') {
+					_this.shareBottomShow = true;
+					// #ifdef H5
+					_this.requestShareInfo(cardData.id)
+					// #endif
+					// #ifndef H5
+					_this.mprequestShareInfo(cardData.id)
+					// #endif
+				}
+				if (tabType === 'zhiding' || tabType === 'xufei') {
+					_this.iscardRelevantInfo = true;
+				}
+				if (tabType === 'bianji') {
+					App.navigationTo({
+						url: `pages/subPages/businesscard/formcard/editformcard?id=${cardData.id}`
+					})
+				}
+				_this.postId = cardData.id;
+				_this.currentTabType = tabType;
+			},
+
+			creatCard() {
+				App.navigationTo({
+					url: 'pages/subPages/businesscard/formcard/formcard'
+				})
+			},
+			Submit() {
+				let _this = this,
+					objid = _this.cardRelevantId,
+					cardid = _this.currentPostId,
+					currentTabType = _this.currentTabType;
+				if (!!objid) {
+					App._post_form('&p=citycard&do=renewCityCard', {
+						cardid,
+						objid,
+						type: currentTabType === 'zhiding' ? '2' : '1'
+					}, res => {
+						uni.showLoading()
+						let cityCardData = res.data;
+						if (cityCardData.paystatus === 1) {
+							_this.setData({
+								shareShow: false,
+								shareBottomShow: false,
+								iscardRelevantInfo: false
+							});
+							App.navigationTo({
+								url: `pages/mainPages/payment/payment?orderid=${cityCardData.orderid}&plugin=citycard`
+							})
+						} else {
+							App.navigationTo({
+								url: `pages/subPages/businesscard/carddetail/carddetail?cardid=${cardid}`,
+								navType: 'rediRect'
+							})
+						}
+					}, false, () => {
+						uni.hideLoading()
+					})
+				} else {
+					App.showError('请选择套餐')
+				}
+			},
+			radioChange(e) {
+				this.cardRelevantId = e.detail.value;
+			},
+			goPost(data) {
+				let _this = this;
+				console.log(data)
+				_this.shareBottomShow = false;
+				_this.cardRelevantId = null;
+			},
+			closeShareBottom() {
+				let _this = this;
+				_this.shareBottomShow = false;
+				_this.cardRelevantId = null;
+			},
+			// 关闭分享弹框
+			closeShareShow() {
+				let _this = this;
+				_this.shareShow = false;
+				_this.shareBottomShow = false;
+				_this.cardRelevantId = null;
+			},
+			shareImgShow() {
+				let _this = this;
+				_this.shareShow = true;
+				_this.shareBottomShow = false;
+				_this.cardRelevantId = null;
+			},
+		},
+		computed: {
+			currentPostId() {
+				return this.postId
+			}
+		},
+		components: {
+			shareBottom,
+			PopManager,
+			Loadlogo,
+			TabBars
+		},
+		onShow() {
+			let _this = this;
+			_this.getMyCard();
+			_this.getcardRelevantInfo();
+		},
+		onLoad(e) {
+			let imgPrefix = uni.getStorageSync('imgPrefix')
+			this.tabbarList.map(item=>{
+				item.tabImage = imgPrefix + item.tabImage;
+			})
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import '/detailStyle.css';
+	.fctabbar-item{
+		flex: 0 0 25%;
+		text-align: center;
+	}
+</style>
diff --git a/pages/subPages/businesscard/formcard/editformcard.vue b/pages/subPages/businesscard/formcard/editformcard.vue
new file mode 100644
index 0000000..4087641
--- /dev/null
+++ b/pages/subPages/businesscard/formcard/editformcard.vue
@@ -0,0 +1,778 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header p-r">
+				<view class="iconfont icon-info col-f4 header-Icon"></view>
+				<view class="header-title col-9 f-24">{{schoolText == 1?'完善个人名片的用户，更容易获得学校人脉，并得到平台名片榜单推荐': '完善个人名片的用户，更容易获得商业人脉，并得到平台名片榜单推荐'}}</view>
+			</view>
+			<view class="formData-box">
+				<form @submit="sbformData">
+					<view class="userData-box bor-radius-10upx b-f">
+						<view class="user-avatar" :style="{'background-image':'url('+avatarLogo+')'}" @click="upImages"></view>
+						<view class="user-name-inputBox">
+							<view class="f-28 col-3 t-c m-btm20">真实姓名</view>
+							<input type="text" :value="cardinfo.name" name="name" placeholder="请填写姓名" class="user-name-input f-28 col-9" />
+						</view>
+						<view class="user-contact-inputBox dis-flex flex-y-center">
+							<view class="user-contact-item flex-box">
+								<view class="user-contact-phone f-24 col-3 t-c m-btm20">手机号</view>
+								<input type="number" :value="cardinfo.mobile" name="mobile" placeholder="请填写电话" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="user-contact-item flex-box">
+								<view class="user-contact-wx f-24 col-3 t-c m-btm20">微信号</view>
+								<input type="text" :value="cardinfo.wechat" name="wechat" placeholder="请填写微信号" class="user-contact-input f-28 col-9" />
+							</view>
+						</view>
+					</view>
+					<view class="enter-title padding-box-all f-24 col-9">{{schoolText == 1?'个人信息':"企业信息"}}</view>
+					<view class="enterData-box bor-radius-10upx b-f">
+						<view class="enterData-content">
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28 m-right70 titile">{{schoolText == 1?'年级':"公司"}}</view>
+								<input type="text" :value="cardinfo.company" name="company" :placeholder="schoolText == 1?'请填写年级(选填)':'请填写公司'" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28 m-right70 titile">{{schoolText == 1?'专业':"部门"}}</view>
+								<input type="text" :value="cardinfo.branch" name="branch" :placeholder="schoolText == 1?'请填写专业(选填)':'请填写部门'" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28  titile" :class="schoolText == 1?'m-right40':'m-right70'">{{schoolText == 1?'校内职务':"职位"}}</view>
+								<input type="text" :value="cardinfo.position" name="position" :placeholder="schoolText == 1?'请填写校内职务(选填)':'请填写职位'" class="user-contact-input f-28 col-9">
+							</view>
+							<view class="enterData-input-box enterData-textarea border-line border-bottom">
+								<textarea :value="cardinfo.desc" placeholder="" name="desc" :placeholder="schoolText == 1?'请简要介绍你自己(例如:获奖经历)':'请填写一句话介绍负责业务'" class="f-28 col-9"></textarea>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom p-r">
+								<view class="f-28 m-right70 titile">省市</view>
+								<view >
+									<view class="uni-input" style="font-size: 24upx;line-height: 80upx;display: inline-block;height: 80upx;vertical-align: middle;" @tap="visble">{{citytext}}</view>
+									<w-pickerb
+										:visible.sync="visiblec"
+										mode="region"
+										:value="[userAddress.provinceid,userAddress.cityid,userAddress.countyid]"
+										default-type="value"
+										:hide-area="false"
+										@confirm="onConfirm($event,'region')"
+										@cancel="onCancel"
+										ref="region" 
+									></w-pickerb>
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom p-r">
+								<view class="f-28 m-right70 titile">地址</view>
+								<input type="text" @click="getLocation" disabled :value="address" name="address" placeholder="请输入详细地址" class="user-contact-input f-28 col-9">
+								<view class="location dis-flex flex-y-center" @click="getLocation">
+									<view class="locationIconClass iconfont icon-location col-f4 m-right10"></view>
+									<view class="f-24 col-f4">定位</view>
+								</view>
+							</view>
+							<picker mode="multiSelector" class="dataPicker" :range="catesList" @change="checkType" @columnchange="changeKey"
+							 range-key="name" :value="typeIndex">
+								<view class="enterData-input-box dis-flex flex-y-center p-r">
+									<view class="dis-flex flex-y-center ">
+										<view class="f-28 m-right70 titile">行业</view>
+										<view class="f-28 col-3">{{onelevelName}} {{twolevelName}}</view>
+									</view>
+									<view class="iconfont icon-right rightIconClass col-9"></view>
+								</view>
+							</picker>
+						</view>
+					</view>
+					<view class="enter-title padding-box-all f-24 col-9">隐私设置</view>
+					<view class="enterData-box bor-radius-10upx b-f">
+						<view class="enterData-content">
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开手机号</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在名片中显示手机号</view>
+									<switch name="show_mobile" :checked="cardinfo.show_mobile==='1'" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开微信号</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在名片中显示微信号</view>
+									<switch name="show_wechat" :checked="cardinfo.show_wechat==='1'" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开位置信息</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在您的名片中公开显示</view>
+									<switch name="show_addr" :checked="cardinfo.show_addr==='1'" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 				<view class="enter-title padding-box-all f-24 col-9">付费入驻</view>
+				<view class="enterData-box bor-radius-10upx b-f padding-box-all">
+					<radio-group @change="radioChange" name="meal_id">
+						<label v-for="(mealsItem, index) in meals" :key="index" class="labeStyle">
+							<view class="dis-flex flex-y-center m-btm40 labeStyle-btm">
+								<view class="m-right20">
+									<radio :value="mealsItem.id" color="#FF4444" style="transform: scale(0.8);" />
+								</view>
+								<view class="f-28 col-3">{{mealsItem.name}}有效期{{mealsItem.day}}天(收费¥{{mealsItem.price}})</view>
+							</view>
+						</label>
+					</radio-group>
+				</view> -->
+					<button form-type="submit" class="submit-btn f-28 t-c col-f">保存</button>
+				</form>
+			</view>
+		</block>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo'
+	const graceChecker = require("../../../../components/threeComponents/graceChecker.js");
+	import wxApi from "@/common/js/wxApi.js"
+	import PopManager from '@/components/template/PopManager';
+	import checkCity from '@/components/template/checkCity.vue';
+	import wPickerb from '@/components/w-picker/w-picker.vue'
+	export default {
+		data() {
+			return {
+				visiblec:false,
+				loadlogo: false,
+				phoneHeight: null,
+				isOpenLaction: false,
+				meals: [],
+				catesList: [],
+				typeIndex: [0, 0],
+				onelevel: "",
+				twolevel: "",
+				onelevelName: "",
+				twolevelName: "",
+				lat: "",
+				lng: "",
+				address: "",
+				cardinfo: {},
+				cardid: null,
+				avatarLogo: "",
+				isOpenLaction: false,
+				userAddress: {
+					id: '',
+					name: '',
+					tel: '',
+					detailed_address: '',
+					provinceidName: '',
+					provinceid:'',
+					areaidName: '',
+					countyid:'',
+					cityid:'',
+					distidName: '',
+					status: 0,
+					lat:'',
+					lng:'',
+					
+				},
+				counts:true,
+				citytext:'请选择省市区',
+				owenscitylist:[],
+				latlngs:{},
+				userInfo:{},
+				lblis:{},
+				schoolText:0
+			}
+		},
+		components: {
+			Loadlogo,
+			PopManager,
+			checkCity,
+			wPickerb
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.latlngs = uni.getStorageSync('curLoction');
+			_this.owenscitylist = uni.getStorageSync('cityList');
+			_this.cardid = e.id;
+			_this.getCardPage(e.id)
+			//#ifdef H5
+			_this.locationListener()
+			//#endif
+		},
+		onShow(){
+			//#ifdef APP-PLUS
+			if(this.lblis.lat){
+				this.setData({
+					address: this.userInfo.address,
+					lat: this.userInfo.lat,
+					lng: this.userInfo.lng
+				});
+				_this.getloctions(this.lblis);
+			}
+			//#endif
+			
+		},
+		methods: {
+			onConfirm(e){
+				console.log(e);
+				this.userAddress.provinceid  = e.obj.province.value;
+				this.userAddress.cityid  = e.obj.city.value;
+				this.userAddress.countyid  = e.obj.area.value;
+				this.citytext = e.result;
+			},
+			visble(){
+				this.visiblec = true;
+			},
+			returnData(e) {
+				let _this = this;
+				_this.userAddress = { ..._this.userAddress,
+					...e
+				};
+				console.log(_this.userAddress);
+				// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+			},
+			galadata(e) {
+				let _this = this;
+				_this.userAddress.areaidName = e.areaidName;
+				_this.userAddress.distidName = e.distidName;
+				_this.userAddress.provinceidName = e.provinceidName;
+				// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+			},
+			getCardPage(id = 3) {
+				let _this = this;
+				App._post_form('&p=citycard&do=createCityCardPage', {
+					id
+				}, res => {
+					if (res.errno === 0) {
+						let cates = res.data.cates
+						if (!!cates) {
+							let leftCheck = [],
+								rightCheck = [];
+							for (let i = 0; i < cates.length; i++) {
+								leftCheck.push(cates[i])
+							}
+							for (let j = 0; j < cates[0]['childrens']['length']; j++) {
+								rightCheck.push(cates[0]['childrens'][j]);
+							}
+							_this.catesList.push(leftCheck)
+							_this.catesList.push(rightCheck)
+						}
+						// console.log(res.cardinfo.lat)
+						let latlng = {
+							lat:res.data.cardinfo.lat,
+							lng:res.data.cardinfo.lng
+						}
+						console.log(latlng)
+						_this.getloctions(latlng);
+						setTimeout(()=>{
+							// _this.userAddress.provinceid = res.data.cardinfo.provinceid;
+							// _this.userAddress.countyid = res.data.cardinfo.countyid;
+							// _this.userAddress.cityid = res.data.cardinfo.cityid;
+							// _this.userAddress.areaidName = '';
+							// _this.userAddress.provinceidName = '';
+							// _this.userAddress.distidName = '';
+							
+						
+						// console.log(_this.$refs.checkCity)
+						// console.log(_this.$refs.checkCity.userAddress);
+						_this.userAddress = { ..._this.userAddress,
+							...res.data.cardinfo
+						};
+						// _this.$refs.checkcity.userAddress.provinceid = res.data.cardinfo.provinceid;
+						// _this.$refs.checkcity.userAddress.countyid = res.data.cardinfo.countyid;
+						// _this.$refs.checkcity.userAddress.cityid = res.data.cardinfo.cityid;
+						// _this.$refs.checkcity.userAddress.areaidName = '';
+						// _this.$refs.checkcity.userAddress.provinceidName = '';
+						// _this.$refs.checkcity.userAddress.distidName = '';
+						// console.log(_this.userAddress,'我是傻逼',_this.$refs.checkcity)
+						})
+						_this.setData(res.data);
+						_this.setData({
+							onelevel: res.data.cardinfo.one_class,
+							twolevel: res.data.cardinfo.two_class,
+							onelevelName: res.data.cardinfo.onecatename,
+							twolevelName: res.data.cardinfo.twocatename,
+							address: res.data.cardinfo.address,
+							lat: res.data.cardinfo.lat,
+							lng: res.data.cardinfo.lng,
+							avatarLogo: res.data.cardinfo.logo,
+							schoolText: res.data.schoolText
+						})
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			//定位
+			getLocation() {
+				let _this = this;
+				let latlng;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: "",
+					success: function(res) {
+						_this.setData({
+							address: res.name,
+							lat: res.latitude,
+							lng: res.longitude
+						});
+						latlng = {
+							lat:res.latitude,
+							lng:res.longitude
+						}
+						_this.getloctions(latlng);
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				      //#endif
+			},
+			// 注册 腾讯地图
+			locationListener() {
+				let _this = this;
+				let count = 1;
+				uni.getSystemInfo({
+					success(res) {
+						_this.setData({
+							phoneHeight: res.windowHeight + 'px'
+						})
+					}
+				});
+				// #ifdef H5
+				window.addEventListener('message', function(event) {
+					
+						// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					let latlng;
+					if(count > 1 || _this.counts){
+						if (loc && loc.module == 'locationPicker') { //防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+							console.log('location', loc,count);
+							_this.address = loc.poiaddress;
+							_this.lat = loc.latlng.lat;
+							_this.lng = loc.latlng.lng;
+							_this.isOpenLaction = false;
+							latlng = {
+								lat:loc.latlng.lat,
+								lng:loc.latlng.lng
+							}
+								_this.getloctions(latlng)
+						}
+					}else{
+						return false
+					}
+					count++;
+					_this.counts = false;
+					
+				}, false);
+				// #endif
+			},
+			getloctions(lblis){
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					_this.userAddress.lat = lblis.lat;
+					_this.userAddress.lng = lblis.lng;
+					_this.userAddress.provinceid = res.data.provinceid;
+					_this.userAddress.countyid = res.data.countyid;
+					_this.userAddress.cityid = res.data.cityid;
+					_this.userAddress.areaidName = '';
+					_this.userAddress.provinceidName = '';
+					_this.userAddress.distidName = '';
+					console.log(_this.userAddress);
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userAddress.provinceid){
+							_this.citytext  = item.name;
+							_this.userAddress.provinceidName = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userAddress.cityid){
+									_this.citytext = `${_this.citytext}${items.name}`;
+									_this.userAddress.areaidName = items.name;
+									console.log(_this.citytext,items.name);
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userAddress.countyid){
+											_this.citytext = `${_this.citytext}${itemss.name}`;
+											_this.userAddress.distidName = itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+					return false
+				});
+			},
+			radioChange(e) {
+
+			},
+			sbformData(e) {
+				let _this = this,
+					fromData = e.detail.value;
+				//定义表单规则
+				fromData = {
+					...fromData,
+					show_addr: fromData.show_addr ? '1' : '0',
+					show_mobile: fromData.show_mobile ? '1' : '0',
+					show_wechat: fromData.show_wechat ? '1' : '0',
+					lat: _this.lat,
+					lng: _this.lng,
+					one_class: _this.onelevel,
+					two_class: _this.twolevel,
+					id: _this.cardid,
+					logo: _this.avatarLogo
+				};
+				let rule = [{
+							name: "name",
+							checkType: "string",
+							checkRule: "1,4",
+							errorMsg: "姓名应为1-4个字符"
+						},
+						{
+							name: "mobile",
+							checkType: "phoneno",
+							errorMsg: "请输入正确手机号"
+						},
+						{
+							name: "wechat",
+							checkType: "notnull",
+							errorMsg: "请输入微信号"
+						},
+						{
+							name: "company",
+							checkType: "notnull",
+							errorMsg: "公司名字不能为空"
+						},
+						{
+							name: "branch",
+							checkType: "notnull",
+							errorMsg: "部门内容不能为空"
+						},
+						{
+							name: "position",
+							checkType: "notnull",
+							errorMsg: "职位内容不能为空"
+						},
+						{
+							name: "desc",
+							checkType: "notnull",
+							errorMsg: "简介内容不能为空"
+						},
+						{
+							name: "address",
+							checkType: "notnull",
+							errorMsg: "请输入地址或直接定位"
+						},
+						{
+							name: "one_class",
+							checkType: "notnull",
+							errorMsg: "行业内容不能为空"
+						}
+					],
+					checkRes = graceChecker.check(fromData, rule);
+				if (checkRes) {
+					uni.showLoading();
+					fromData.provinceid = _this.userAddress.provinceid;
+					fromData.cityid = _this.userAddress.cityid;
+					fromData.countyid = _this.userAddress.countyid;
+					App._post_form('&p=citycard&do=createCityCardApi', fromData, (res) => {
+						if (res.errno === 0) {
+							let cityCardData = res.data;
+							if (cityCardData.paystatus === 0) {
+								App.showSuccess('修改成功', () => {
+									uni.navigateBack({
+										delta: 1
+									})
+								})
+							}
+						}
+					}, false, () => {
+						uni.hideLoading()
+					})
+				} else {
+					uni.showToast({
+						title: graceChecker.error,
+						icon: "none"
+					});
+				}
+			},
+			// 行业分类确定按钮
+			checkType(e) {
+				let _this = this,
+					catesList = _this.catesList;
+				if (!!catesList[0][e.target.value[0]]) {
+					_this.onelevelName = catesList[0][e.target.value[0]].name;
+					_this.onelevel = catesList[0][e.target.value[0]].id;
+				}
+				if (!!catesList[1][e.target.value[1]]) {
+					_this.twolevelName = catesList[1][e.target.value[1]].name;
+					_this.twolevel = catesList[1][e.target.value[1]].id;
+				}
+			},
+			// 行业分类二级联动
+			changeKey(e) {
+				let _this = this,
+					listRight = [];
+				for (let i = 0; i < _this.catesList.length; i++) {
+					for (let j = 0; j < _this.catesList[i]['length']; j++) {
+						if (e.target.value == j && e.target.column == 0 && !!_this.catesList[i][j]['childrens']) {
+							for (let a = 0; a < _this.catesList[i][j]['childrens']['length']; a++) {
+								listRight.push(_this.catesList[i][j]['childrens'][a]);
+							}
+							_this.catesList.splice(1, 2, listRight);
+						}
+					}
+				}
+			},
+			uploadImageFiles(requestData) {
+				let _this = this;
+				App._post_form('&do=uploadFiles', requestData, res => {
+					if (res.errno === 0) {
+						_this.setData({
+							avatarLogo: res.data.img
+						})
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			// 上传图片
+			async upImages() {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+				     let res = await App.browser_upload(1);
+				     uni.showLoading();
+				     let imageUrl = res.tempFilePaths[0],
+				     	rnImageData = App._upLoad(imageUrl);
+				     rnImageData.then(options => {
+				     	console.log(options, 'options')
+				     	let file = options.data;
+				     	_this.setData({
+				     		avatarLogo: file.img
+				     	})
+				     	uni.hideLoading()
+				     })
+				
+				     return
+				    }
+				wxApi.choseImage((res) => {
+					wxApi.uoloadIg(res.localIds[0], (data) => {
+						if (data.errMsg === "uploadImage:ok") {
+							uni.showLoading({})
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							_this.uploadImageFiles(requestData)
+						} else {
+							App.showError('上传失败')
+						}
+					})
+				})
+				// #endif
+				// #ifndef H5
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						uni.showLoading();
+						let imageUrl = res.tempFilePaths[0],
+							rnImageData = App._upLoad(imageUrl);
+						rnImageData.then(options => {
+							console.log(options, 'options')
+							let file = options.data;
+							_this.setData({
+								avatarLogo: file.img
+							})
+							uni.hideLoading()
+						})
+					},
+					fail: function() {
+						App.showError('上传失败')
+					}
+				});
+				// #endif
+			}
+		},
+		computed: {
+			userInfo() {
+				return uni.getStorageSync('userinfo')
+			}
+		},
+		
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.header-Icon {
+		position: absolute;
+		left: 80upx;
+		top: 0;
+		font-size: 26upx;
+	}
+
+	.header-title {
+		width: 505upx;
+		text-align: center;
+		margin: 30upx auto 100upx;
+	}
+
+	.formData-box {
+		padding: 0 30upx;
+	}
+
+	.userData-box {
+		.user-avatar {
+			position: relative;
+			width: 140upx;
+			height: 140upx;
+			background-size: 140upx 140upx;
+			background-repeat: no-repeat;
+			border-radius: 50%;
+			left: 50%;
+			transform: translateX(-50%);
+			top: -60upx;
+		}
+	}
+
+	.user-name-inputBox {
+		padding-bottom: 40upx;
+		margin: 0 30upx;
+		border-bottom: 1px solid #eeeeee;
+
+		.user-name-input {
+			margin: 0 auto;
+			width: 200upx;
+			text-align: center;
+		}
+	}
+
+	.user-contact-inputBox {
+		padding: 30upx 0;
+
+		.user-contact-input {
+			margin: 0 auto;
+			width: 180upx;
+			text-align: center;
+		}
+	}
+
+	.enterData-content {
+		margin: 0 30upx;
+
+		.enterData-input-box {
+			padding: 30upx 0;
+			
+		}
+	}
+	.titile{
+		min-width: 80upx;
+	}
+	.enterData-textarea textarea {
+		height: 220upx;
+	}
+
+	.location {
+		position: absolute;
+		right: 0;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.locationIconClass {
+		font-size: 32upx;
+	}
+
+	.rightIconClass {
+		font-size: 24upx;
+		position: absolute;
+		top: 50%;
+		transform: translateY(-50%);
+		right: 0;
+	}
+
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+
+	/* #ifndef H5 */
+	/*swtich样式-start*/
+	/*swtich整体大小*/
+	.wx-switch-input {
+		width: 82upx !important;
+		height: 40upx !important;
+	}
+
+	/*白色样式（false的样式）*/
+	.wx-switch-input::before {
+		width: 80upx !important;
+		height: 36upx !important;
+	}
+
+	/*绿色样式（true的样式）*/
+	.wx-switch-input::after {
+		width: 40upx !important;
+		height: 36upx !important;
+	}
+
+	/* #endif */
+	/* #ifdef H5 */
+	.switchStyle {
+		height: 60upx;
+	}
+
+	.switchStyle /deep/ .uni-switch-input {
+		width: 82upx !important;
+		height: 40upx !important;
+	}
+
+	.switchStyle /deep/ .uni-switch-input::before {
+		width: 80upx !important;
+		height: 36upx !important;
+	}
+
+	.switchStyle /deep/ .uni-switch-input::after {
+		width: 40upx !important;
+		height: 36upx !important;
+	}
+
+	/* #endif */
+	.labeStyle:last-child .labeStyle-btm {
+		margin-bottom: 0;
+	}
+
+	.submit-btn {
+		background-color: #FF4444;
+		margin: 60upx 0;
+		border-radius: 10upx;
+		height: 80upx;
+		line-height: 80upx;
+	}
+</style>
diff --git a/pages/subPages/businesscard/formcard/formcard.vue b/pages/subPages/businesscard/formcard/formcard.vue
new file mode 100644
index 0000000..15c04fe
--- /dev/null
+++ b/pages/subPages/businesscard/formcard/formcard.vue
@@ -0,0 +1,872 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header p-r">
+				<view class="iconfont icon-info col-f4 header-Icon"></view>
+				<view class="header-title col-9 f-24">{{schoolText == 1?'完善个人名片的用户，更容易获得学校人脉，并得到平台名片榜单推荐': '完善个人名片的用户，更容易获得商业人脉，并得到平台名片榜单推荐'}}</view>
+			</view>
+			<view class="formData-box">
+				<form @submit="sbformData">
+					<view class="userData-box bor-radius-10upx b-f">
+						<view class="user-avatar" :style="{ 'background-image': 'url(' + avatar + ')' }" @click="upImages"></view>
+						<view class="user-name-inputBox">
+							<view class="f-28 col-3 t-c m-btm20">真实姓名</view>
+							<input type="text" value="" name="name" placeholder="请填写姓名" class="user-name-input f-28 col-9" />
+						</view>
+						<view class="user-contact-inputBox dis-flex flex-y-center">
+							<view class="user-contact-item flex-box">
+								<view class="user-contact-phone f-24 col-3 t-c m-btm20">手机号</view>
+								<input type="number" value="" name="mobile" placeholder="请填写电话" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="user-contact-item flex-box">
+								<view class="user-contact-wx f-24 col-3 t-c m-btm20">微信号</view>
+								<input type="text" value="" name="wechat" placeholder="请填写微信号" class="user-contact-input f-28 col-9" />
+							</view>
+						</view>
+					</view>
+					<view class="enter-title padding-box-all f-24 col-9">{{schoolText == 1?'个人信息':"企业信息"}}</view>
+					<view class="enterData-box bor-radius-10upx b-f">
+						<view class="enterData-content">
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28 m-right70 titile">{{schoolText == 1?'年级':"公司"}}</view>
+								<input type="text" value="" name="company" :placeholder="schoolText == 1?'请填写年级(选填)':'请填写公司'" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28 m-right70 titile">{{schoolText == 1?'专业':"部门"}}</view>
+								<input type="text" value="" name="branch" :placeholder="schoolText == 1?'请填写专业(选填)':'请填写部门'" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom">
+								<view class="f-28  titile" :class="schoolText == 1?'m-right40':'m-right70'">{{schoolText == 1?'校内职务':"职位"}}</view>
+								<input type="text" value="" name="position" :placeholder="schoolText == 1?'请填写校内职务(选填)':'请填写职位'" class="user-contact-input f-28 col-9" />
+							</view>
+							<view class="enterData-input-box enterData-textarea border-line border-bottom">
+								<textarea value="" placeholder="" name="desc" :placeholder="schoolText == 1?'请简要介绍你自己(例如:获奖经历)':'请填写一句话介绍负责业务'" class="f-28 col-9"></textarea>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom p-r">
+								<view class="f-28 m-right70 titile">省市</view>
+								<view >
+									<view class="uni-input" style="font-size: 24upx;line-height: 80upx;display: inline-block;height: 80upx;vertical-align: middle;" @tap="visble">{{citytext}}</view>
+									<w-pickerb
+										:visible.sync="visiblec"
+										mode="region"
+										:value="[userAddress.provinceid,userAddress.cityid,userAddress.countyid]"
+										default-type="value"
+										:hide-area="false"
+										@confirm="onConfirm($event,'region')"
+								
+										ref="region" 
+									></w-pickerb>
+									</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom p-r">
+								<view class="f-28 titile" style="margin-right: 60upx;">地址<text class="f-20 c-ff4444">*</text></view>
+								<input @click="getLocation" type="text" disabled :value="address" name="address" placeholder="请输入详细地址" class="user-contact-input f-28 col-9" />
+								<view class="location dis-flex flex-y-center" @click="getLocation">
+									<view class="locationIconClass iconfont icon-location col-f4 m-right10"></view>
+									<view class="f-24 col-f4">定位</view>
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center border-line border-bottom p-r">
+								<view class="f-28 m-right70 titile">行业</view>
+								<view >
+									<view class="uni-input" 
+									v-if="onelevelName || twolevelName"
+									style="font-size: 24upx;line-height: 80upx;display: inline-block;height: 80upx;vertical-align: middle;" 
+									@tap="visblelinkage">{{ onelevelName }} {{ twolevelName }}
+									</view>
+									<view class="uni-input"
+									v-else
+									style="font-size: 24upx;line-height: 80upx;display: inline-block;height: 80upx;vertical-align: middle;" 
+									@tap="visblelinkage">请选择所属行业
+									</view>
+									<w-pickerb
+										:visible.sync="visibleclinkage"
+										mode="linkage"
+										:value="[onelevelName,twolevelName]"
+										default-type="name"
+										:level="2"
+										:default-props="defaultprops"
+										:hide-area="false"
+										@confirm="onConfirmlinkage($event,'linkage')"
+										:options="catesList"
+										ref="linkage" 
+									></w-pickerb>
+									</view>
+							</view>
+							<!-- <picker mode="multiSelector" class="dataPicker" :range="catesList" @change="checkType" @columnchange="changeKey" range-key="name" :value="typeIndex">
+								<view class="enterData-input-box dis-flex flex-y-center p-r">
+									<view class="dis-flex flex-y-center ">
+										<view class="f-28 m-right70">行业</view>
+										<view class="f-28 col-3">{{ onelevelName }} {{ twolevelName }}</view>
+									</view>
+									<view class="iconfont icon-right rightIconClass col-9"></view>
+								</view>
+							</picker> -->
+						</view>
+					</view>
+					<view class="enter-title padding-box-all f-24 col-9">隐私设置</view>
+					<view class="enterData-box bor-radius-10upx b-f">
+						<view class="enterData-content">
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开手机号</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在名片中显示手机号</view>
+									<switch name="show_mobile" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开微信号</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在名片中显示微信号</view>
+									<switch name="show_wechat" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+							<view class="enterData-input-box dis-flex flex-y-center flex-x-between border-line border-bottom">
+								<view class="f-28 m-right70">公开位置信息</view>
+								<view class="dis-flex flex-y-center">
+									<view class="col-9 f-24 m-right30">在您的名片中公开显示</view>
+									<switch name="show_addr" class="switchStyle" color="#FF4444" />
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="enter-title padding-box-all f-24 col-9">付费入驻</view>
+					<view class="enterData-box bor-radius-10upx b-f padding-box-all">
+						<radio-group @change="radioChange" name="meal_id">
+							<label v-for="(mealsItem, index) in meals" :key="index" class="labeStyle">
+								<view class="dis-flex flex-y-center m-btm40 labeStyle-btm">
+									<view class="m-right20"><radio :value="mealsItem.id" color="#FF4444" style="transform: scale(0.8);" /></view>
+									<view class="f-28 col-3">{{ mealsItem.name }}有效期{{ mealsItem.day }}天(
+									<text v-if="mealsItem.is_free != 1">收费¥{{ mealsItem.price }}</text>
+									<text v-else>免费</text>)</view>
+								</view>
+							</label>
+						</radio-group>
+					</view>
+					<view class="agreement dis-flex flex-y-center" @click="openAgreement">
+						<view class="iconfont icon-roundcheck col-f4 agreementIcon m-right10"></view>
+						<view class="agreementIconText f-24 col-9">
+							阅读并同意
+							<text>《名片发布协议条款》</text>
+						</view>
+					</view>
+					<button form-type="submit" class="submit-btn f-28 t-c col-f">保存</button>
+				</form>
+			</view>
+		</block>
+		<PopManager :show="showRule" type="center" @clickmask="showRule = false">
+			<view class="wxParse-box b-f">
+				<scroll-view scroll-y="true" class="scrollView-parse">
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+					 selectable show-with-animation use-anchor :html="agreement"></jyf-parser>
+					<!-- <wx-parse :content=""></wx-parse> -->
+				</scroll-view>
+				<view class="closeRule col-f f-28 t-c" @click="openAgreement">知道了</view>
+			</view>
+		</PopManager>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import wxApi from '@/common/js/wxApi.js';
+import PopManager from '@/components/template/PopManager';
+import checkCity from '@/components/template/checkCity.vue';
+import wPickerb from '@/components/w-picker/w-picker.vue'
+const graceChecker = require('../../../../components/threeComponents/graceChecker.js');
+export default {
+	data() {
+		return {
+			loadlogo: false,
+			phoneHeight: null,
+			isOpenLaction: false,
+			meals: [],
+			catesList: [],
+			visiblec:false,
+			visibleclinkage:false,
+			typeIndex: [0, 0],
+			onelevel: '',
+			twolevel: '',
+			onelevelName: '',
+			twolevelName: '',
+			lat: '',
+			lng: '',
+			address: '',
+			avatarLogo: '',
+			isOpenLaction: false,
+			showRule: false,
+			owenscitylist:[],
+			agreement: '',
+			defaultprops:{
+				"label":"name",
+				"value":"id",
+				"children":"childrens"
+			},
+			userAddress: {
+				id: '',
+				name: '',
+				tel: '',
+				detailed_address: '',
+				provinceidName: '',
+				areaidName: '',
+				distidName: '',
+				status: 0,
+				lat: '',
+				lng: ''
+			},
+			counts: true,
+			citytext:'请选择省市区',
+			latlngs:{},
+			userInfo:{},
+			lblis:{},
+			upImg:false,
+			schoolText:0
+		};
+	},
+	onShow(){
+		//#ifdef APP-PLUS
+		if(this.lblis.lat){
+			this.setData({
+				address: this.userInfo.address,
+				lat: this.userInfo.lat,
+				lng: this.userInfo.lng
+			});
+			_this.getloctions(this.lblis);
+		}
+		//#endif
+		if(this.upImg){
+			this.upImg = false;
+			return
+		}
+		this.getCardPage();
+	},
+	methods: {
+		onConfirm(e){
+			console.log(e);
+			this.userAddress.provinceid  = e.obj.province.value;
+			this.userAddress.cityid  = e.obj.city.value;
+			this.userAddress.countyid  = e.obj.area.value;
+			this.citytext = e.result;
+		},
+		onConfirmlinkage(e){
+			let _this = this;
+			console.log(e);
+			_this.onelevel = e.obj.col1.id;
+			_this.onelevelName = e.obj.col1.name;
+			_this.twolevel = e.obj.col2.id;
+			_this.twolevelName = e.obj.col2.name;
+		},
+		visble(){
+			this.visiblec = true;
+		},
+		visblelinkage(){
+			this.visibleclinkage = true;
+		},
+		galadata(e) {
+			let _this = this;
+			_this.userAddress.areaidName = e.areaidName;
+			_this.userAddress.distidName = e.distidName;
+			_this.userAddress.provinceidName = e.provinceidName;
+			// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+		},
+		returnData(e) {
+			let _this = this;
+			_this.userAddress = { ..._this.userAddress, ...e };
+			console.log(_this.userAddress);
+			// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+		},
+		getCardPage() {
+			let _this = this;
+			let data = {
+				
+			}
+			App._post_form(
+				'&p=citycard&do=createCityCardPage',
+				{},
+				res => {
+					if (res.errno === 0) {
+						_this.catesList = res.data.cates;
+						
+						// if (!!cates) {
+						// 	let leftCheck = [],
+						// 		rightCheck = [];
+						// 	for (let i = 0; i < cates.length; i++) {
+						// 		leftCheck.push(cates[i]);
+						// 	}
+						// 	for (let j = 0; j < cates[0]['childrens']['length']; j++) {
+						// 		rightCheck.push(cates[0]['childrens'][j]);
+						// 	}
+						// 	_this.catesList.push(leftCheck);
+						// 	_this.catesList.push(rightCheck);
+						// 	console.log(res.data.cates,_this.catesList);
+						// }
+						_this.setData(res.data);
+						_this.schoolText = res.data.schoolText;
+					}
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		//定位
+		getLocation() {
+			let _this = this;
+			let latlng;
+			// #ifdef MP-WEIXIN
+			uni.chooseLocation({
+				keyword: '',
+				success: function(res) {
+					_this.setData({
+						address: res.name,
+						lat: res.latitude,
+						lng: res.longitude
+					});
+					latlng = {
+						lat: res.latitude,
+						lng: res.longitude
+					};
+					_this.getloctions(latlng);
+				}
+			});
+			// #endif
+			// #ifdef H5
+			_this.isOpenLaction = true;
+			// #endif
+			//#ifdef APP-PLUS
+			console.log('app得嘛')
+			      App.navigationTo({
+			       url: 'pages/subPages2/map/index'
+			      });
+			//#endif
+		},
+		getloctions(lblis) {
+			let _this = this;
+			App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+				_this.userAddress.lat = lblis.lat;
+				_this.userAddress.lng = lblis.lng;
+				_this.userAddress.provinceid = res.data.provinceid;
+				_this.userAddress.countyid = res.data.countyid;
+				_this.userAddress.cityid = res.data.cityid;
+				(_this.userAddress.provinceidName = ''), (_this.userAddress.areaidName = ''), (_this.userAddress.distidName = ''), console.log(_this.userAddress);
+				_this.owenscitylist.map((item,index)=>{
+					if(item.id == _this.userAddress.provinceid){
+						_this.citytext  = item.name;
+						_this.userAddress.provinceidName = item.name;
+						item.area.map(items=>{
+							if(items.id == _this.userAddress.cityid){
+								_this.citytext = `${_this.citytext}${items.name}`;
+								_this.userAddress.areaidName = items.name;
+								console.log(_this.citytext,items.name);
+								items.dist.map(itemss=>{
+									if(itemss.id == _this.userAddress.countyid){
+										_this.citytext = `${_this.citytext}${itemss.name}`;
+										_this.userAddress.distidName = itemss.name;
+									}
+								})
+							}
+						})
+					}
+				})
+			});
+		},
+		// 注册 腾讯地图
+		locationListener() {
+			let _this = this;
+			let count = 1;
+			uni.getSystemInfo({
+				success(res) {
+					_this.setData({
+						phoneHeight: res.windowHeight + 'px'
+					});
+				}
+			});
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					let latlng;
+					if (count > 1 || _this.counts) {
+						if (loc && loc.module == 'locationPicker') {
+							//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+							console.log('location', loc);
+
+							_this.address = loc.poiaddress;
+							_this.lat = loc.latlng.lat;
+							_this.lng = loc.latlng.lng;
+							_this.isOpenLaction = false;
+							latlng = {
+								lat: loc.latlng.lat,
+								lng: loc.latlng.lng
+							};
+							_this.getloctions(latlng);
+							// debugger
+						}
+					}
+					_this.counts = false;
+					count++;
+				},
+				false
+			);
+
+			// #endif
+		},
+
+		radioChange(e) {},
+		sbformData(e) {
+			let _this = this,
+				fromData = e.detail.value;
+			//定义表单规则
+			fromData = {
+				...fromData,
+				show_addr: fromData.show_addr ? '1' : '0',
+				show_mobile: fromData.show_mobile ? '1' : '0',
+				show_wechat: fromData.show_wechat ? '1' : '0',
+				lat: _this.lat,
+				lng: _this.lng,
+				one_class: _this.onelevel,
+				two_class: _this.twolevel,
+				logo: _this.avatarLogo
+			};
+			let rule = [
+					{
+						name: 'name',
+						checkType: 'string',
+						checkRule: '1,4',
+						errorMsg: '姓名应为1-4个字符'
+					},
+					{
+						name: 'mobile',
+						checkType: 'phoneno',
+						errorMsg: '请输入正确手机号'
+					},
+					{
+						name: 'wechat',
+						checkType: 'notnull',
+						errorMsg: '请输入微信号'
+					},
+					{
+						name: 'company',
+						checkType: 'notnull',
+						errorMsg: '公司名字不能为空'
+					},
+					{
+						name: 'branch',
+						checkType: 'notnull',
+						errorMsg: '部门内容不能为空'
+					},
+					{
+						name: 'position',
+						checkType: 'notnull',
+						errorMsg: '职位内容不能为空'
+					},
+					{
+						name: 'desc',
+						checkType: 'notnull',
+						errorMsg: '简介内容不能为空'
+					},
+					{
+						name: 'address',
+						checkType: 'notnull',
+						errorMsg: '请输入地址或直接定位'
+					},
+					{
+						name: 'meal_id',
+						checkType: 'notnull',
+						errorMsg: '请选择入驻套餐'
+					},
+					{
+						name: 'one_class',
+						checkType: 'notnull',
+						errorMsg: '行业内容不能为空'
+					}
+				],
+				checkRes = graceChecker.check(fromData, rule);
+			if (checkRes) {
+				uni.showLoading();
+				fromData.provinceid = _this.userAddress.provinceid;
+				fromData.cityid = _this.userAddress.cityid;
+				fromData.countyid = _this.userAddress.countyid;
+				App._post_form(
+					'&p=citycard&do=createCityCardApi',
+					fromData,
+					res => {
+						if (res.errno === 0) {
+							let cityCardData = res.data;
+							if (cityCardData.paystatus === 1) {
+								App.navigationTo({
+									url: `pages/mainPages/payment/payment?orderid=${cityCardData.orderid}&plugin=citycard`
+								});
+							} else {
+								App.navigationTo({
+									url: `pages/subPages/businesscard/carddetail/renewcarddetail`,
+									navType: 'rediRect'
+								});
+							}
+						}
+					},
+					false,
+					() => {
+						uni.hideLoading();
+					}
+				);
+			} else {
+				uni.showToast({
+					title: graceChecker.error,
+					icon: 'none'
+				});
+			}
+		},
+		openAgreement() {
+			this.showRule = !this.showRule;
+		},
+		// 行业分类确定按钮
+		checkType(e) {
+			let _this = this,
+				catesList = _this.catesList;
+			if (!!catesList[0][e.target.value[0]]) {
+				_this.onelevelName = catesList[0][e.target.value[0]].name;
+				_this.onelevel = catesList[0][e.target.value[0]].id;
+			}
+			if (!!catesList[1][e.target.value[1]]) {
+				_this.twolevelName = catesList[1][e.target.value[1]].name;
+				_this.twolevel = catesList[1][e.target.value[1]].id;
+			}
+		},
+		// 行业分类二级联动
+		changeKey(e) {
+			let _this = this,
+				listRight = [];
+			for (let i = 0; i < _this.catesList.length; i++) {
+				for (let j = 0; j < _this.catesList[i]['length']; j++) {
+					if (e.target.value == j && e.target.column == 0 && !!_this.catesList[i][j]['childrens']) {
+						for (let a = 0; a < _this.catesList[i][j]['childrens']['length']; a++) {
+							listRight.push(_this.catesList[i][j]['childrens'][a]);
+						}
+						_this.catesList.splice(1, 2, listRight);
+					}
+				}
+			}
+		},
+		uploadImageFiles(requestData) {
+			let _this = this;
+			App._post_form(
+				'&do=uploadFiles',
+				requestData,
+				res => {
+					if (res.errno === 0) {
+						_this.setData({
+							avatarLogo: res.data.img
+						});
+					}
+				},
+				false,
+				() => {
+					uni.hideLoading();
+				}
+			);
+		},
+		// 上传图片
+		async upImages() {
+			let _this = this;
+			_this.upImg = true;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+			     let res = await App.browser_upload(1);
+			     uni.showLoading();
+			     let imageUrl = res.tempFilePaths[0],
+			     	rnImageData = App._upLoad(imageUrl);
+			     rnImageData.then(options => {
+			     	console.log(options, 'options');
+			     	let file = options.data.img;
+			     	_this.setData({
+			     		avatarLogo: file
+			     	});
+			     	uni.hideLoading();
+			     });
+			     return
+			    }
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						_this.uploadImageFiles(requestData);
+					} else {
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album'], //从相册选择
+				success: function(res) {
+					uni.showLoading();
+					let imageUrl = res.tempFilePaths[0],
+						rnImageData = App._upLoad(imageUrl);
+					rnImageData.then(options => {
+						console.log(options, 'options');
+						let file = options.data.img;
+						_this.setData({
+							avatarLogo: file
+						});
+						uni.hideLoading();
+					});
+				},
+				fail: function() {
+					App.showError('上传失败');
+				}
+			});
+			// #endif
+		}
+	},
+	computed: {
+		userInfo() {
+			return uni.getStorageSync('userinfo');
+		},
+		avatar() {
+			return !!this.avatarLogo ? this.avatarLogo : this.imageRoot + 'creatCardAvatar.png';
+		}
+	},
+	components: {
+		PopManager,
+		Loadlogo,
+		jyfParser,
+		checkCity,
+		wPickerb
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.latlngs = uni.getStorageSync('curLoction');
+		_this.owenscitylist = uni.getStorageSync('cityList');
+		
+		//#ifdef H5
+		_this.locationListener();
+		//#endif
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f8f8f8;
+}
+
+.header-Icon {
+	position: absolute;
+	left: 80upx;
+	top: 0;
+	font-size: 26upx;
+}
+
+.header-title {
+	width: 505upx;
+	text-align: center;
+	margin: 30upx auto 100upx;
+}
+
+.formData-box {
+	padding: 0 30upx;
+}
+
+.userData-box {
+	.user-avatar {
+		position: relative;
+		width: 140upx;
+		height: 140upx;
+		background-size: 140upx 140upx;
+		background-repeat: no-repeat;
+		border-radius: 50%;
+		left: 50%;
+		transform: translateX(-50%);
+		top: -60upx;
+	}
+}
+
+.user-name-inputBox {
+	padding-bottom: 40upx;
+	margin: 0 30upx;
+	border-bottom: 1px solid #eeeeee;
+
+	.user-name-input {
+		margin: 0 auto;
+		width: 200upx;
+		text-align: center;
+	}
+}
+
+.user-contact-inputBox {
+	padding: 30upx 0;
+
+	.user-contact-input {
+		margin: 0 auto;
+		width: 180upx;
+		text-align: center;
+	}
+}
+
+.enterData-content {
+	margin: 0 30upx;
+
+	.enterData-input-box {
+		padding: 30upx 0;
+	}
+}
+
+.enterData-textarea textarea {
+	height: 220upx;
+}
+
+.location {
+	position: absolute;
+	right: 0;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.locationIconClass {
+	font-size: 32upx;
+}
+
+.rightIconClass {
+	font-size: 24upx;
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+	right: 0;
+}
+
+.iframe-wid-hgt {
+	width: 100vw;
+}
+
+.agreement {
+	margin-top: 30upx;
+
+	.agreementIcon {
+		font-size: 24upx;
+	}
+
+	.agreementIconText {
+		> text {
+			color: #4f6d8c;
+		}
+	}
+}
+
+.wxParse-box {
+	border-radius: 20upx;
+	width: 500upx;
+	height: 75vh;
+	padding: 20upx 50upx;
+}
+
+.scrollView-parse {
+	height: 65vh;
+}
+
+.m-right40{
+	margin-right: 40upx;
+}
+
+.titile{
+		// width: 80upx;
+		min-width: 80upx;
+	}
+.closeRule {
+	width: 460upx;
+	height: 80upx;
+	line-height: 80upx;
+	background-color: #ff4444;
+	border-radius: 40upx;
+	margin: 30upx auto 0;
+}
+
+/* #ifndef H5 */
+/*swtich样式-start*/
+/*swtich整体大小*/
+.wx-switch-input {
+	width: 82upx !important;
+	height: 40upx !important;
+}
+
+/*白色样式（false的样式）*/
+.wx-switch-input::before {
+	width: 80upx !important;
+	height: 36upx !important;
+}
+
+/*绿色样式（true的样式）*/
+.wx-switch-input::after {
+	width: 40upx !important;
+	height: 36upx !important;
+}
+
+/* #endif */
+/* #ifdef H5 */
+.switchStyle {
+	height: 60upx;
+}
+
+.switchStyle /deep/ .uni-switch-input {
+	width: 82upx !important;
+	height: 40upx !important;
+}
+
+.switchStyle /deep/ .uni-switch-input::before {
+	width: 80upx !important;
+	height: 36upx !important;
+}
+
+.switchStyle /deep/ .uni-switch-input::after {
+	width: 40upx !important;
+	height: 36upx !important;
+}
+
+/* #endif */
+.labeStyle:last-child .labeStyle-btm {
+	margin-bottom: 0;
+}
+
+.submit-btn {
+	background-color: #ff4444;
+	margin: 40upx 0;
+	border-radius: 10upx;
+	height: 80upx;
+	line-height: 80upx;
+}
+</style>
diff --git a/pages/subPages/businesscard/mycard/mycard.vue b/pages/subPages/businesscard/mycard/mycard.vue
new file mode 100644
index 0000000..30b37cf
--- /dev/null
+++ b/pages/subPages/businesscard/mycard/mycard.vue
@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="cardlist-content">
+			<block v-if="!!cardList && cardList.length>0">
+				<business-card :businCard_list="cardList" @chrbusinCard="chrbusinCard" :is_have="is_have"></business-card>
+				<load-more :isMore="loadingMore"></load-more>
+			</block>
+			<block v-else>
+				<none-mores></none-mores>
+			</block>
+		</view>
+		<TabBars :tabBarAct="0" pageType="13"></TabBars>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import businessCard from "@/components/page/pageComponents/businessCard.vue"
+	import noneMores from '@/components/template/nonemores.vue'
+	import Loadlogo from '@/components/template/loadlogo'
+	import loadMore from '@/components/template/loadmore.vue'
+	import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				cardList: [],
+				loadingMore: true,
+				current_page: 1,
+				total: null,
+				is_have: null,
+			}
+		},
+		methods: {
+			chrbusinCard(Newdata) {
+				this.setData({
+					cardList: Newdata
+				})
+			},
+			getCardList(page = 1, isPage = false) {
+				let _this = this,
+					agencyData = _this.agencyData,
+					requestData = {
+						page,
+						lat: agencyData.lat,
+						lng: agencyData.lng,
+						city_id: agencyData.areaid,
+						is_collect: '1'
+					};
+				App._post_form('&p=citycard&do=homeList', requestData, res => {
+
+					let cardList = res.data.list;
+					_this.is_have = res.data.is_have;
+					if (isPage) {
+						if (cardList.length > 0) {
+							_this["cardList"].push(...cardList);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData({
+
+							cardList,
+							loadingMore: cardList.length === 0 || _this.current_page === res.data.total,
+							total: res.data.total
+						})
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			}
+		},
+		computed: {
+			agencyData() {
+				return uni.getStorageSync('agencyData')
+			}
+		},
+		components: {
+			businessCard,
+			noneMores,
+			Loadlogo,
+			loadMore,
+			TabBars
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.getCardList()
+		},
+		onReachBottom() {
+			console.log('Bottom')
+			let _this = this,
+				{
+					current_page,
+					total
+				} = _this;
+			if (current_page >= total) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getCardList(++_this.current_page, true)
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.cardlist-content {
+		margin-bottom: 140upx;
+	}
+</style>
diff --git a/pages/subPages/buyOrder/index.vue b/pages/subPages/buyOrder/index.vue
new file mode 100644
index 0000000..51480cd
--- /dev/null
+++ b/pages/subPages/buyOrder/index.vue
@@ -0,0 +1,311 @@
+<template>
+	<view class="buyOrder">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" scroll-y :scroll-x="false">
+			<view class="buyOrder_package">
+				<view class="buyOrder_main" :style="{ 'margin-bottom': '10px' }">
+					<view class="buyOrder_main_title ">
+						<view class="buyOrder_main_title_package dis-flex">
+						<view>
+							<view class="font30 color333333">付款给{{ masterInfo.nickname }}</view>
+							<view>
+								<text class="font24 color999999">司机</text>
+								<text class="font24 color999999" :style="{'margin-left':'15upx'}">{{ masterInfo.name }}({{ masterInfo.plate1 }}{{ masterInfo.plate2 }} {{ masterInfo.plate_number }})</text>
+							</view>
+						</view>
+						<view class="buyOrder_main_title_image"><image class="buyOrder_main_title_image" :src="masterInfo.avatar"></image></view>
+						</view>
+					</view>
+					<view class="buyOrder_main_body">
+						<view class="buyOrder_main_title_package">
+							<view class="buyOrder_main_body_tips">金额</view>
+							<view class="buyOrder_main_input_view diy-nav-list border-line border-bottom">
+								<view class="buyOrder_main_input_tips font33" style="font-size:65rpx;">￥</view>
+								<view class="buyOrder_main_input_input"><input class="buyOrder_main_input_input" type="digit" placeholder="消费总金额" v-model="money" @blur="handleMoney" /></view>
+							</view>
+							<view class="buyOrder_button" @click="pay_order"><text>付款</text></view>
+							<view class="buyOrder_main_tips">
+								<view class="i icon iconfont icon-tishi1 iconInfo"></view>
+								<text class="buyOrder_main_tips_text">买单前请与司机确认金额后提交！</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <view class="buyOrder_main">
+					<view class="buyOrder_main_package">
+						<view class="buyOrder_main_input_view">
+							<view class="pdL30"><input class="buyOrder_main_input_input" type="digit" placeholder="消费总金额" v-model="money" @blur="handleMoney" /></view>
+						</view>
+						<view class="buyOrder_main_tips diy-nav-list border-line border-bottom">
+							<view class="i icon iconfont icon-info iconInfo"></view>
+							<text class="buyOrder_main_tips_text">买单前请与司机确认金额后提交！</text>
+						</view>
+						<view class="buyOrder_main_money">
+							<text class="font24 color999999">实付金额</text>
+							<text class="font24 colorFF4444">{{ moneyText }}元</text>
+						</view>
+						<view class="buyOrder_main_money">
+							<text class="font24 color999999">司机</text>
+							<text class="font24 color333333">{{ masterInfo.name }}({{ masterInfo.plate1 }}{{ masterInfo.plate2 }} {{ masterInfo.plate_number }})</text>
+						</view>
+					</view>
+				</view> -->
+				<view class="bottomNav">
+					<view class="urlMb" v-for="(item,index) in urlsArrary" :class="(index+1)==urlsArrary.length?'':'haveLine'" @click="go(item.url)">
+						<text class="textName">{{item.name}}</text>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {
+			urlsArrary:[],
+			circular: true,
+			interval: 2000,
+			autoplay: true,
+			indicatorActiveColor: 'white',
+			indicatorDots: true,
+			money: '',
+			moneyText: '0.00',
+			masterInfo: {},
+			phoneHight: null,
+			masid: null,
+			masterAdvs: [],
+			e:null
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.e=e
+	},
+	onShow(){
+		let _this=this
+		_this.masid = _this.e.masid || '';
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		_this.init(_this.e.masid);
+	},
+	methods: {
+		go(link) {
+			let _this = this;
+			App.navigationTo({
+				url: link
+			});
+		},
+		// 出租车买单创建订单接口
+		pay_order() {
+			let _this = this;
+			let data = {
+				masid: _this.masid||'',
+				money: _this.money
+			};
+			if (_this.money == '') {
+				uni.showToast({
+					icon: 'none',
+					title: '金额不能为空',
+					duration: 2000
+				});
+				return;
+			}
+			App._post_form('&p=taxipay&do=pay_order', data, res => {
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + res.data + '&plugin=taxipay'
+				});
+			});
+		},
+		handleMoney(e) {
+			let _this = this;
+			if (_this.money != '') {
+				_this.money = _this.money.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+				_this.moneyText = _this.money.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+			} else if (_this.money == '') {
+				_this.moneyText = '0.00';
+			}
+		},
+		init(masid) {
+			let _this = this;
+			_this.pay_bill(masid);
+		},
+		// 出租车买单页面
+		pay_bill(masid) {
+			let _this = this;
+			let data = {
+				masid: masid||''
+			};
+			App._post_form('&p=taxipay&do=pay_bill', data, res => {
+				_this.setData({
+					masterInfo:res.data.master,
+					urlsArrary:res.data.urls
+				})
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less">
+	.font33{
+		font-size: 33upx;
+	}
+	.haveLine{
+		border-right: 1upx solid rgba(153, 153, 153, 1);
+	}
+	.bottomNav{
+		position: absolute;
+		bottom: 120upx;
+		text-align: center;
+		width: 690upx;
+	}
+	.urlMb{
+		text-align: center;
+		width: 33%;
+		display: inline-block;
+	}
+	.buyOrder_main_input_tips{
+		vertical-align: top;
+		line-height: 100upx;
+		display: inline-block;
+		color: rgba(51, 51, 51, 1);
+	}
+	.buyOrder_main_body_tips{
+		font-size: 30upx;
+		color: rgba(51, 51, 51, 1);
+	}
+	
+.buyOrder_main_body{
+	background:rgba(255, 255, 255, 1) ;
+}	
+.buyOrder_main_title{
+	background:rgba(255, 255, 255, 0.6) ;
+}	
+.buyOrder_main_title_package{
+	width: 630upx;
+	padding: 30upx;
+}	
+.buyOrder_main_title_image {
+	width: 80upx;
+	height: 80upx;
+	background: gray;
+	border-radius: 10upx;
+	overflow: hidden;
+}
+.dis-flex {
+	display: flex;
+	justify-content: space-between;
+}
+.buyOrder_button_swiper {
+	width: 690upx;
+	height: 250upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	margin: 160upx 0 229upx 0;
+}
+.swiperImg {
+	width: 690upx;
+	height: 250upx;
+}
+.buyOrder_button {
+	margin-top: 40upx;
+	width: 630upx;
+	height: 88upx;
+	background-color: #49BA64;
+	border-radius: 10upx;
+	text-align: center;
+	> text {
+		line-height: 88upx;
+		font-size: 28upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.color333333 {
+	color: #333333;
+}
+.colorFF4444 {
+	color: #ff4444;
+}
+.color999999 {
+	color: #999999;
+}
+.buyOrder_main_money {
+	margin-top: 40upx;
+	display: flex;
+	justify-content: space-between;
+}
+.font24 {
+	font-size: 24upx;
+}
+.font30{
+	font-size: 30upx;
+}
+.buyOrder_main_tips {
+	text-align: center;
+	width: 650upx;
+	height: 104upx;
+}
+.buyOrder_main_tips_text {
+	line-height: 104upx;
+	padding-left: 14upx;
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+}
+.textName{
+	font-size: 28upx;
+	color: rgba(153, 153, 153, 1);
+}
+.iconInfo {
+	line-height: 104upx;
+	display: inline-block;
+	font-size: 24upx;
+	color: #999999;
+}
+.buyOrder_main_input_input {
+	vertical-align: top;
+	display: inline-block;
+	font-size: 65upx;
+	color: rgba(51, 51, 51, 1);
+	height: 110upx;
+	width: 560upx;
+}
+.buyOrder_main_input_text {
+	vertical-align: middle;
+	display: inline-block;
+	width: 140upx;
+	line-height: 110upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+}
+.pdL30 {
+	padding: 0 30upx;
+}
+.buyOrder {
+	background: #f8f8f8;
+	font-size: 0;
+}
+.buyOrder_package {
+	padding: 20upx 30upx;
+}
+.buyOrder_main {
+	width: 690upx;
+	// height: 398upx;
+	// background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	overflow: hidden;
+}
+.buyOrder_main_package {
+	padding: 20upx;
+}
+.buyOrder_main_input_view {
+	overflow: hidden;
+	height: 110upx;
+	border-radius: 6upx;
+}
+</style>
diff --git a/pages/subPages/callpge/index.vue b/pages/subPages/callpge/index.vue
new file mode 100644
index 0000000..2f8c107
--- /dev/null
+++ b/pages/subPages/callpge/index.vue
@@ -0,0 +1,443 @@
+<template>
+	<!-- 调用首页 -->
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		
+		<view class="page-index" :style="'background-color: '+datas.page.background" v-if="loadlogo">
+			<Advert class="advert" :advertData="datas.adv" v-if="!!datas.adv" />
+			<diypages :diypagesData="diypagesData" :pageData="datas.page" :btngroupData="btngroup" />
+			<view class="page-footer">
+				<TabBars :tabBarAct="0" :TabBarsData="datas.page.menu" :TabBarsType="datas.page.type" />
+			</view>
+			<far-bottom></far-bottom>
+		</view>
+	</view>
+</template>
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from 'vuex'
+	import {
+		RUZHU,
+		KEFU
+	} from '@/store/mutation-types'
+	
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import diypages from '@/components/template/diypages.vue'
+	import Advert from '@/components/template/advert.vue'
+	import TabBars from '@/components/template/tabBar.vue'
+
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				swiperI: 1,
+				loading: false,
+				loadAgain: false,
+				datas: {
+					basic: [],
+					adv: '',
+					page: {}
+				},
+				diypagesData: [],
+				richtext: {
+					imageProp: {
+						mode: 'widthFix'
+					}
+				},
+				btngroup: {
+					backgroundColor: '#ffffff',
+					btnBordeRadius: '',
+					displayMode: '',
+					eachLineNum: '',
+					eachPageNum: '',
+					list: [],
+					indicatorDots: true,
+					duration: 300,
+					btngroupHandleData: [],
+					swiperHeight: ''
+				}
+			}
+		},
+		components: {
+			/*
+			Foooter, Ruzhu, Kefu, Haodiantoutiao, Jinriremai, Xinpintuijian, Jingxuanpaihangbang, Qiangoulist, Loooading, Loadlogo
+			*/
+			Loadlogo,
+			diypages,
+			Advert,
+			TabBars,
+
+		},
+		computed: {
+			...mapState([
+				'ruzhushow', 'kefushow'
+			])
+		},
+		onShow() {
+			// let that = this
+			// if (!that.loadlogo && that.loadAgain) {
+			// 	setTimeout(() => {
+			// 		that.getPagesData()
+			// 	}, 500)
+			// }
+			/*动态隐藏TabBar
+			wx.hideTabBar({})
+			*/
+		},
+		mounted() {
+				let that = this;
+				that.getPagesData()
+		},
+		methods: {
+			...mapMutations([
+				RUZHU, KEFU
+			]),
+			ruzhuToggle() {
+				this[RUZHU](true)
+			},
+			kefuToggle() {
+				this[KEFU](true)
+			},
+			getPagesData() {
+				let _this = this;
+				App._post_form('&do=HomePage', {}, res => {
+					console.log(res,'6666')
+					if (res.errno === 0) {
+						_this.datas.adv = res.data.adv || "";
+						_this.datas.page = res.data.page || "";
+						//修改页面标题
+						uni.setNavigationBarTitle({
+							title: _this.datas.page.title == null ? '暂无标题' : _this.datas.page.title
+						})
+
+						let diypagesData = res.data.item,
+							diypagesDataArray = [];
+
+						for (let i in diypagesData) {
+							diypagesDataArray.push(diypagesData[i])
+						}
+						console.log(diypagesDataArray)
+						_this.diypagesData = diypagesDataArray;
+						//处理数据
+						for (let i in _this.diypagesData) {
+							/*
+							if(that.diypagesData[i].id == 'public_goods2'){ //查询
+								console.log(that.diypagesData[i])
+							}
+							*/
+
+							//处理按钮组数据
+							if (_this.diypagesData[i].id == 'menu') {
+								//初始化
+								_this.diypagesData[i].btngroupData = {}
+								let btngroupData = {}
+								btngroupData.list = []
+								btngroupData.indicatorDots = true
+								btngroupData.duration = 300
+								btngroupData.btngroupHandleData = []
+								btngroupData.swiperHeight = ''
+
+								btngroupData.backgroundColor = _this.diypagesData[i].style.background
+								btngroupData.btnBordeRadius = _this.diypagesData[i].style.navstyle
+								btngroupData.displayMode = _this.diypagesData[i].style.showtype
+								btngroupData.eachLineNum = _this.diypagesData[i].style.rownum
+								btngroupData.eachPageNum = _this.diypagesData[i].style.pagenum
+								for (let n in _this.diypagesData[i].data) {
+									btngroupData.list.push(_this.diypagesData[i].data[n])
+								}
+								if (_this.diypagesData[i].style.showdot == 0) {
+									btngroupData.indicatorDots = false
+								} else {
+									btngroupData.indicatorDots = true
+								}
+								let eachPageFactNum = '' //每页实际显示的数量
+								if (btngroupData.list.length > btngroupData.eachPageNum) {
+									eachPageFactNum = btngroupData.eachPageNum
+								} else {
+									eachPageFactNum = btngroupData.list.length
+								}
+								btngroupData.swiperHeight = Math.ceil(eachPageFactNum / btngroupData.eachLineNum) * 87 + 15
+								if (btngroupData.list && btngroupData.list.length > 0) {
+									let listsLength = Math.ceil(btngroupData.list.length / btngroupData.eachPageNum)
+									for (let j = 0; j < listsLength; j++) {
+										let arr = []
+										let arrIndex = j * btngroupData.eachPageNum
+										for (let m = arrIndex; m < btngroupData.eachPageNum * (j + 1) && m < btngroupData.list.length; m++) {
+											arr.push(btngroupData.list[m])
+										}
+										btngroupData.btngroupHandleData.push(arr)
+									}
+								}
+								_this.diypagesData[i].btngroupData = btngroupData
+							}
+							//处理图片橱窗风格4
+							if (_this.diypagesData[i].id == 'picturew4') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片橱窗风格5
+							if (_this.diypagesData[i].id == 'picturew5') {
+								let picturewArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturewArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturewArr
+							}
+							//处理图片展播
+							if (_this.diypagesData[i].id == 'pictures') {
+								let picturesArr = []
+								for (let p in _this.diypagesData[i].data) {
+									picturesArr.push(_this.diypagesData[i].data[p])
+								}
+								_this.diypagesData[i].data = picturesArr
+							}
+							//处理商家信息
+							if (_this.diypagesData[i].id == 'shop') {
+								let shopArr = []
+								for (let s in _this.diypagesData[i].data) {
+									let goodsArr = []
+									for (let g in _this.diypagesData[i].data[s].goods) {
+										if (_this.diypagesData[i].data[s].goods[g] !== '') {
+											if (g == 'active') {
+												_this.diypagesData[i].data[s].goods[g].css = 'qiang'
+												_this.diypagesData[i].data[s].goods[g].tag = '抢'
+											} else if (g == 'coupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'hui'
+												_this.diypagesData[i].data[s].goods[g].tag = '券'
+											} else if (g == 'fightgroup') {
+												_this.diypagesData[i].data[s].goods[g].css = 'pin'
+												_this.diypagesData[i].data[s].goods[g].tag = '拼'
+											} else if (g == 'groupon') {
+												_this.diypagesData[i].data[s].goods[g].css = 'tuan'
+												_this.diypagesData[i].data[s].goods[g].tag = '团'
+											} else if (g == 'halfcard') {
+												_this.diypagesData[i].data[s].goods[g].css = 'ka'
+												_this.diypagesData[i].data[s].goods[g].tag = '卡'
+											} else if (g == 'packages') {
+												_this.diypagesData[i].data[s].goods[g].css = 'li'
+												_this.diypagesData[i].data[s].goods[g].tag = '礼'
+											}
+											goodsArr.push(_this.diypagesData[i].data[s].goods[g])
+										}
+									}
+									_this.diypagesData[i].data[s].goods = goodsArr
+									shopArr.push(_this.diypagesData[i].data[s])
+								}
+								_this.diypagesData[i].shopArr = shopArr
+							}
+						}
+						_this.datas.basic = _this.diypagesData;
+					}
+				}, false, () => {
+					_this.loadAgain = true
+					_this.loadlogo = true;
+				})
+			}
+		},
+		onPullDownRefresh() {
+			//下拉刷新
+			//console.log('')
+
+			//停止下拉刷新
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			//上拉刷新加载
+			let that = this
+			that.loading = true
+			setTimeout(function() {
+				that.loading = false
+			}, 4000)
+		}
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #FFD93F;
+	}
+
+	.page-index {
+		width: 100vw;
+		overflow: hidden;
+		background-color: #fff;
+		position: relative;
+	}
+
+	.index-right-bar {
+		width: 80px;
+		height: 80px;
+		padding: 16px;
+		position: fixed;
+		right: 30px;
+		bottom: 60px;
+		z-index: 99;
+	}
+
+	.right-bar-i {
+		width: 100%;
+		height: 100%;
+		padding: 6px;
+	}
+
+	.right-bar-i-t {
+		height: 40px;
+		text-align: center;
+		margin-top: 0;
+		padding-top: 6px;
+	}
+
+	.right-bar-i-t .i {
+		width: 44px;
+		height: 44px;
+		display: inline-block;
+	}
+
+	.right-bar-i-t .i .image {
+		width: 100%;
+		height: 100%;
+		display: block;
+	}
+
+	.right-bar-i-c {
+		height: 32px;
+		line-height: 32px;
+		font-size: 20px;
+		margin-top: 0;
+	}
+
+	.index-h {
+		height: 80px;
+		line-height: 80px;
+		padding: 10px 30px 20px 30px;
+		display: flex;
+		justify-content: space-between;
+		background-color: #FFD93F;
+		position: relative;
+	}
+
+	.index-h-l {
+		color: #000;
+		font-size: 36px;
+		font-style: italic;
+		
+	}
+
+	.index-h-r-d {
+		width: 180px;
+		height: 56px;
+		line-height: 56px;
+		color: #808080;
+		font-size: 28px;
+		text-align: center;
+		margin-top: 12px;
+		background-color: #FFF0B2;
+		border-radius: 40px;
+	}
+
+	.index-h-r-d .i {
+		color: #333;
+		font-size: 32px;
+		margin-right: 10px;
+		vertical-align: -2px;
+	}
+
+	@keyframes move_wave {
+		0% {
+			transform: translateX(0) translateZ(0) scaleY(1);
+		}
+
+		100% {
+			transform: translateX(-66.66666%) translateZ(0) scaleY(1);
+		}
+	}
+
+	.index-wave {
+		width: 100%;
+		height: 60px;
+		position: absolute;
+		top: -72px;
+		left: 0;
+		overflow: hidden;
+	}
+
+	.index-wave-d {
+		width: 300%;
+		height: 100%;
+		animation: move_wave 4s linear infinite;
+		animation-delay: 0s;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.index-wave-i {
+		width: 100%;
+		height: 100%;
+		position: relative;
+	}
+
+	.index-wave-i .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.index-t1 {
+		margin-top: 40px;
+		padding: 0 30px;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+		position: relative;
+		z-index: 1;
+	}
+
+	.index-t1-l {
+		padding-right: 30px;
+		flex: 1;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-around;
+	}
+
+	.index-t1-l-i {
+		width: 140px;
+	}
+
+	.index-t1-l-i-t {
+		width: 100px;
+		height: 100px;
+		padding: 0 20px;
+	}
+
+	.index-t1-l-i-t .image {
+		width: 100px;
+		height: 100px;
+	}
+
+	.index-t1-l-i-b {
+		height: 42px;
+		line-height: 42px;
+		text-align: center;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.index-t1-r {
+		width: 140px;
+		border-left: 1.2px solid #f6f6f6;
+	}
+
+	.index-t1-r .image {
+		width: 110px;
+		height: 110px;
+		margin: 10px 0 0 30px;
+	}
+</style>
diff --git a/pages/subPages/city/city.vue b/pages/subPages/city/city.vue
new file mode 100644
index 0000000..3516c27
--- /dev/null
+++ b/pages/subPages/city/city.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="content">
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="history-main dis-flex flex-y-center">
+				<view class="history-input dis-flex flex-y-center p-left-right-30 p-r">
+					<view class="history-icon iconfont icon-search"></view>
+					<input @focus='inputFocus' @blur="inputBlur" type="text" value="" placeholder="输入城市名或拼音查询" class="f-24 historyInput-box"
+					 v-model="searchText" adjust-position='false' />
+					<view class="history-icon-close iconfont icon-roundclose" v-if="!!searchText" @click="closeSearch"></view>
+				</view>
+				<view class="history-btn col-3 f-30" @click="search">搜索</view>
+			</view>
+			<uni-select ref="uniSelect" :iphoneModel="iphoneModel" :isSearch="isSearch" :isFixed='isFixed' :navAttr="navAttr"
+			 :listAttr="listAttr" :quickPanelData="hotcity" :listData="citylist" :currentCity="addressData" :searchCitylist="searchCitylist"
+			 :recenCity="recenCity" :locationType="location" @chooseItem="chooseItem"></uni-select>
+		</block>
+	</view>
+</template>
+
+<script>
+	import uniSelect from '@/components/template/lee-select.vue'
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import wxApi from "@/common/js/wxApi.js"
+	export default {
+		components: {
+			uniSelect,
+			Loadlogo
+		},
+		data() {
+			return {
+				citylist: null,
+				hotcity: null,
+				addressData: null,
+				searchText: "",
+				isSearch: false,
+				isFixed: true,
+				searchCitylist: null,
+				location: null,
+				listAttr: {
+					listBackgroundColor: 'none',
+					titleFontSize: 24,
+					titleColor: '#999999',
+					titleHeight: 40,
+					titleBackground: '#F6F6F6',
+					titlePadding: 28,
+					itemHeight: 80,
+					itemFontSize: 24,
+					itemBorderBottom: '1px solid rgba(0, 0, 0, 0.1)',
+					itemColor: '#333333'
+				},
+				navAttr: {
+					enable: true,
+					backgroundColor: '#fffff',
+					color: '#333',
+					activeColor: '#333333',
+					fontSize: 24,
+					itemPadding: '6 0',
+					borderRadius: 100,
+					padding: '20 0'
+				},
+				recenCity: null,
+				iphoneModel: null,
+				loadlogo: true
+			}
+		},
+		methods: {
+			inputFocus() {
+				this.isFixed = false;
+			},
+			inputBlur() {
+				this.isFixed = true;
+			},
+			chooseItem(item) {
+				// console.log(item)
+			},
+			search() {
+				let _this = this;
+				uni.showLoading({})
+				App._post_form('&do=cityList', {
+					keyword: _this.searchText
+				}, res => {
+					let citylist = res.data.citylist,
+						citylistArray = [],
+						citylistData = {};
+					for (let i in citylist) {
+						citylistData = {
+							initial: i,
+							list: citylist[i]
+						}
+						citylistArray.push(citylistData)
+					}
+					_this.setData({
+						searchCitylist: citylistArray,
+						isSearch: true
+					})
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			getCurrentcity(lat = "", lng = "") {
+				let _this = this,
+					requestData = {
+						lat,
+						lng
+					};
+				App._post_form('&do=cityLocation', requestData, res => {
+					_this.setData({
+						addressData: res.data
+					})
+					_this.getCityList();
+				})
+			},
+			getCityList() {
+				let _this = this;
+				App._post_form('&do=cityList', {}, res => {
+					let citylist = res.data.citylist,
+						citylistArray = [],
+						citylistData = {};
+					console.log(citylist)
+					for (let i in citylist) {
+						citylistData = {
+							initial: i,
+							list: citylist[i]
+						}
+						citylistArray.push(citylistData)
+					}
+					_this.setData({
+						citylist: citylistArray,
+						hotcity: res.data.hotcity,
+						location: res.data.location
+					})
+				}, false, () => {
+					_this.loadlogo = true
+				})
+			},
+			closeSearch() {
+				this.setData({
+					searchText: "",
+					isSearch: false,
+				})
+				this.$refs.uniSelect.scrollTop = 0;
+			},
+			wxApiCallback() {
+				let _this = this;
+				wxApi.wxRegister(() => {
+					jWeixin.ready(() => {
+						jWeixin.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								_this.getCurrentcity(res.latitude, res.longitude)
+							},
+							fail: function() {
+								_this.getCurrentcity()
+							},
+							cancel: function() {
+								_this.getCurrentcity()
+							}
+						});
+					});
+					
+				});
+			}
+		},
+		onLoad() {
+			uni.getSystemInfo({
+			        success: (res)=> {
+			            this.windowHeight = res.windowHeight;
+			        }
+			    });    
+			    uni.onWindowResize((res) => {
+			        if(res.size.windowHeight < this.windowHeight){
+			            this.isFixed = false
+			        }else{
+			            this.isFixed = true
+			        }
+			    })
+		},
+		mounted() {
+			let _this = this,
+				ClientType = App.getClientType();
+			uni.getSystemInfo({
+				success(res) {
+					let model = res.model,
+						iphoneModel = model.indexOf("iPhone") !== -1;
+					_this.iphoneModel = iphoneModel;
+				}
+			});
+			// #ifndef H5
+			App.getLocation().then(res => {
+				_this.getCurrentcity(res.latitude, res.longitude)
+			});
+			// #endif
+			// #ifdef H5
+			if (ClientType === "1") {
+				_this.wxApiCallback()
+			} else {
+				_this.getCurrentcity()
+			}
+			// #endif
+			_this.recenCity = uni.getStorageSync(`locationArray${App.siteInfo.uniacid}`) || [];
+		},
+		watch: {
+			searchText(newValue, oldValue) {
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		height: 100vh;
+
+		.history-main {
+			height: 120upx;
+			padding: 0 30upx 0 18upx;
+
+			.history-input {
+				flex: 1;
+				background: #F6F6F6;
+				border-radius: 38upx;
+				margin-right: 30upx;
+				height: 80upx;
+
+				.historyInput-box {
+					width: 400upx;
+				}
+
+				.history-icon {
+					font-size: 30upx;
+					margin-right: 20upx;
+					color: #959595;
+				}
+
+				.history-icon-close {
+					position: absolute;
+					right: 40upx;
+					top: 47%;
+					transform: translateY(-50%);
+					font-size: 32upx;
+					color: #959595;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/city/selectAddress.vue b/pages/subPages/city/selectAddress.vue
new file mode 100644
index 0000000..a6c4b4c
--- /dev/null
+++ b/pages/subPages/city/selectAddress.vue
@@ -0,0 +1,338 @@
+<template>
+	<view class="content" v-if="isPage">
+		<far-bottom></far-bottom>
+		<view class="history-main dis-flex flex-y-center p-left-right-30">
+			<view class="city onelist-hidden dis-flex flex-y-center" @click="navBack">
+				<view class="location-icon iconfont icon-locationfill"></view>
+				<view class="history-btn col-3 f-28" v-if="!!addressData">{{ addressData['ad_info']['city'] }}</view>
+				<view class="select-up-icon iconfont icon-unfold"></view>
+			</view>
+			<view class="history-input dis-flex flex-y-center p-left-right-30 p-r">
+				<view class="history-icon iconfont icon-search"></view>
+				<input type="text" value="" placeholder="请输入当前位置" class="f-24" v-model="searchText" />
+			</view>
+		</view>
+		<view class="current-address-main dis-flex flex-x-between">
+			<view class="current-address f-28 col-3" v-if="!!addressData">{{ addressData['formatted_addresses']['recommend'] }}</view>
+			<view class="again-lot dis-flex">
+				<view class="again-icon iconfont icon-focus"></view>
+				<view class="again-lot-title f-28" @click="againCurrentlat">重新定位</view>
+			</view>
+		</view>
+		<view class="nearby-main">
+			<view class="nearby-address dis-flex flex-y-center m-left-right-30">
+				<view class="nearby-icon iconfont icon-dibiao"></view>
+				<view class="f-28 col-9">附近地址</view>
+			</view>
+			<view class="address-list">
+				<view class="list-item" v-if="!!addressData && addressData['pois']['length'] > 0" v-for="(item, index) in addressData['pois']"
+				 :key="index" @click="navGate(item)">
+					<view class="list-title col-3 f-30 m-btm20">{{ item.title }}</view>
+					<view class="list-title col-9 f-24">{{ item.address }}</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		components: {},
+		data() {
+			return {
+				city_name: '', //城市名,
+				city_id: '', //城市ID,
+				city_lat: '', //{城市经纬度}
+				city_lng: '',
+				isCurentAdres: '', //是否当前城市 1:是 0:不是
+				//addressData: null, //城市数据
+				skip_addressData: null, //跳转城市数据
+				LocaTion_addressData: null, //定位城市数据
+				isPage: false, //页面加载完成
+				searchText: '', //搜索内容
+				navgateTourl: '', //跳转地址,
+				agencyData: ""
+			};
+		},
+		computed: {
+			addressData() {
+				if (!!this.LocaTion_addressData || !!this.skip_addressData) {
+					if (!!this.LocaTion_addressData) {
+						if (this.LocaTion_addressData['ad_info']['city_code'] === this.skip_addressData['ad_info']['city_code']) {
+							return this.LocaTion_addressData;
+						} else {
+							return this.skip_addressData;
+						}
+					} else {
+						return this.skip_addressData;
+					}
+				}
+			}
+		},
+		onLoad(options) {
+			uni.showLoading({
+				title: '定位中...'
+			});
+			let _this = this,
+				{
+					lat,
+					lng,
+					city,
+					id,
+					isCurrentAddress,
+					url,
+					loca
+				} = options,
+				city_lat = lat ? lat : '',
+				city_lng = lng ? lng : '',
+				city_name = city ? city : options.name,
+				city_id = id ? id : '',
+				isCurentAdres = isCurrentAddress ? isCurrentAddress : '0',
+				agencyData = uni.getStorageSync('agencyData'),
+				navgateTourl = url ? url : '';
+			_this.setData({
+				city_lat,
+				city_lng,
+				city_name,
+				city_id,
+				isCurentAdres,
+				navgateTourl,
+				agencyData
+			});
+			if (loca === 'now') {
+				// #ifdef H5
+				wxApi.wxRegister(_this.againCurrentlat);
+				// #endif
+				// #ifdef MP
+				App.getLocation().then(res => {
+					_this.getCurrentcity(res.latitude, res.longitude, 'again');
+				});
+				// #endif
+			} else {
+				//选择城市
+				_this.getCurrentlat(city_lat, city_lng, city_id);
+			}
+		},
+		methods: {
+			//城市
+			getCurrentlat(city_lat="", city_lng="", city_id) {
+				let _this = this,
+					requestData = {};
+				if (!!city_lat && !!city_lng) {
+					requestData = {
+						lat: city_lat,
+						lng: city_lng,
+						area_code: '1'
+					};
+				} else {
+					requestData = {
+						citycode: city_id,
+						area_code: '1'
+					};
+				}
+				App._post_form(
+					'&do=cityLocation',
+					requestData,
+					res => {
+						_this.setData({
+							skip_addressData: res.data,
+							isPage: true
+						});
+					},
+					false,
+					() => {
+						uni.hideLoading();
+					}
+				);
+			},
+			wxApiCallback() {
+				let _this = this;
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							_this.getCurrentcity(res.latitude, res.longitude);
+						}
+					});
+				});
+			},
+			againCurrentlat() {
+				let _this = this;
+				uni.showLoading({
+					title: '定位中...'
+				});
+				// #ifdef H5
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success(res) {
+							_this.getCurrentcity(res.latitude, res.longitude);
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				App.getLocation().then(res => {
+					_this.getCurrentcity(res.latitude, res.longitude);
+				});
+				// #endif
+			},
+			getCurrentcity(lat="", lng="", type = '') {
+				let _this = this,
+					requestData = {
+						lat,
+						lng,
+						area_code: '1'
+					};
+				App._post_form(
+					'&do=cityLocation',
+					requestData,
+					res => {
+						let addressData = res.data;
+						_this.setData({
+							LocaTion_addressData: addressData
+						});
+					},
+					false,
+					() => {
+						uni.hideLoading();
+					}
+				);
+			},
+			citySearch(searchText) {
+				let _this = this;
+				if (searchText === '') return;
+				App._post_form(
+					'&do=citySearch', {
+						city_name: _this.addressData['ad_info']['city'],
+						keyword: searchText
+					},
+					res => {
+						_this.addressData['pois'] = res.data;
+					},
+					false,
+					() => {}
+				);
+			},
+			navBack() {
+				uni.navigateBack();
+			},
+			cityTaptime(curCityInfo) {
+				let _this = this,
+					currentCity = _this.currentCity,
+					agencyData = _this.agencyData,
+					timestamp = new Date().getTime();
+				if (agencyData.areaid !== curCityInfo.ad_info.adcode) {
+					uni.setStorageSync('cityTimestamp', timestamp);
+				}
+			},
+			navGate(locationInfo) {
+				let pages = getCurrentPages(),
+					locationArray = uni.getStorageSync('locationArray'),
+					navType = pages.length > 1 ? 'reLaunch' : 'rediRect',
+					_this = this,
+					newLocationArray = [];
+					console.log(locationInfo);
+				 App.getAreaId(locationInfo.location,locationInfo.title,"", (options) => {
+					console.log(options,'2')
+					_this.cityTaptime(locationInfo);
+					App.navigationTo({
+						url: 'pages/mainPages/index/index',
+						navType: navType
+					});
+					uni.setStorageSync('agencyData', options.data);
+				});
+				if (locationArray) {
+					let haveArray = locationArray.filter(item => (item.ad_info ? item.ad_info.city : item.name) === locationInfo.ad_info
+						.city).length !== 0;
+					if (haveArray) {
+						return;
+					} else {
+						newLocationArray.push(locationInfo, ...locationArray);
+						uni.setStorageSync(`locationArray${App.siteInfo.uniacid}`, newLocationArray);
+					}
+				} else {
+					newLocationArray.push(locationInfo);
+					uni.setStorageSync(`locationArray${App.siteInfo.uniacid}`, newLocationArray);
+				}
+			}
+		},
+		watch: {
+			searchText(newValue, oldValue) {
+				this.citySearch(newValue);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	.history-main {
+		height: 120upx;
+
+		.city {
+			width: 170upx;
+			margin-right: 26upx;
+		}
+
+		.history-input {
+			flex: 1;
+			background: #f6f6f6;
+			border-radius: 38upx;
+			height: 80upx;
+
+			.history-icon {
+				font-size: 30upx;
+				margin-right: 20upx;
+				color: #959595;
+			}
+		}
+
+		.history-btn {
+			margin: 0 12upx;
+		}
+
+		.select-up-icon {
+			font-size: 24upx;
+		}
+	}
+
+	.current-address-main {
+		border-bottom: 1px solid #f0f0f0;
+		padding: 40upx 30upx;
+
+		.again-lot {
+			.again-icon {
+				margin-right: 8upx;
+				color: #fe504f;
+				font-size: 28upx;
+			}
+
+			.again-lot-title {
+				color: #fe504f;
+			}
+		}
+	}
+
+	.nearby-address {
+		padding: 40upx 0;
+		border-bottom: 1px solid #f0f0f0;
+
+		.nearby-icon {
+			color: #333333;
+			font-size: 28upx;
+			margin-right: 14upx;
+		}
+	}
+
+	.address-list {
+		.list-item {
+			padding: 40upx 0;
+			margin: 0 68upx;
+			border-bottom: 1px solid #f0f0f0;
+		}
+	}
+</style>
diff --git a/pages/subPages/commentList/commentList.vue b/pages/subPages/commentList/commentList.vue
new file mode 100644
index 0000000..4366099
--- /dev/null
+++ b/pages/subPages/commentList/commentList.vue
@@ -0,0 +1,145 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<block v-for="(item, index) in dataInfo" :key="index">
+			<view class="evaluation-item border-line border-bottom">
+				<view class="evaluation-hd dis-flex flex-dir-row flex-y-center flex-x-between">
+					<view class="evaluation-user dis-flex flex-dir-row flex-y-center">
+						<image :src="item['headimg']" mode=""></image>
+						<view class="evaluation-user-name">
+							<view class="user-name f-24">{{ item['nickname'] }}</view>
+							<view class="evaluation-time f-24 col-9">{{ item['createtime'] }}</view>
+						</view>
+					</view>
+					<view class="evaluation-grade dis-flex flex-dir-row flex-y-center">
+						<view class="iconfont icon-shoucangxiao select" v-for="(score, scoreIndex) in item['star']" :key="scoreIndex"></view>
+						<view class="iconfont icon-shoucangxiao" v-for="(score, scoreIndex) in 5 - item['star']" :key="scoreIndex"></view>
+					</view>
+				</view>
+				<view class="evaluation-bd">
+					<view class="evaluation-content f-26 col-9">{{ item['text'] }}</view>
+					<view class="picImage_view">
+						<image :src="picItem" v-for="(picItem,picIndex) in item['pic']" class="picImage"></image>
+					</view>
+					<block v-if="!!item['replypicone'] && item['replypicone']['length'] > 0">
+						<view class="evaluation-imgs dis-flex flex-warp">
+							<block v-for="(comment_image_item, index) in item['replypicone']" :key="index">
+								<image :src="comment_image_item" mode=""></image>
+							</block>
+						</view>
+					</block>
+				</view>
+				<block v-if="!!item['replytextone']">
+					<view class="store-reply">
+						<view class="reply-content">
+							<view class="reply-content-item f-24 col-9">
+								<text class="reply-content-itemfont f-24 col-9 iconfont icon-pinglun"></text>
+								商家回复:
+								<text class="col-3">{{ item['replytextone'] }}</text>
+							</view>
+						</view>
+					</view>
+				</block>
+			</view>
+		</block>
+	</view>
+</template>
+
+
+<script>
+	import App from '@/common/js/app.js';
+	import wxApi from "@/common/js/wxApi.js"
+	export default {
+		data() {
+			return {
+				dataInfo: [{
+					createtime: "1587968963",
+					headimg: "https://thirdwx.qlogo.cn/mmopen/9gPRRGAVQLgdEdmNGzZau9NfIek8ouvYvl3fYdnicd4lgIRjZhqYQpP5Wq8ic3ZibN3PvWXqiaqDTjRu6H1oyrMlOfDA3ibE5qZibV/132",
+					nickname: "天之涯",
+					pic: [],
+					replypicone: [],
+					replytextone: "",
+					star: 4,
+					text: "857857",
+				}]
+			};
+		},
+		onLoad(e) {
+			console.log(e, '00000')
+			// this.getGoodsDetail(e.goods_id, e.goodsType)
+		},
+		onShow() {
+
+		},
+		methods: {
+
+
+		}
+	};
+</script>
+
+<style scoped>
+	/* 商品评价 */
+	.evaluation-item {
+		padding: 30upx;
+	}
+
+	.evaluation-item:first-child {
+		border-top: 0;
+	}
+
+	.evaluation-all {
+		width: 270upx;
+		height: 70upx;
+		border: 1px solid rgba(238, 238, 238, 1);
+		border-radius: 38upx;
+		margin: 30upx auto 0;
+		padding-left: 20upx;
+	}
+
+	.evaluation-all-iconfont {
+		color: #333333;
+		font-size: 36upx;
+	}
+
+	.evaluation-user image {
+		width: 60upx;
+		height: 60upx;
+		display: block;
+		border-radius: 50%;
+		margin-right: 10upx;
+	}
+
+	.evaluation-grade .iconfont {
+		width: 36upx;
+		height: 36upx;
+		line-height: 36upx;
+		font-size: 28upx;
+		display: block;
+		color: #CCCCCC;
+	}
+
+	.evaluation-grade .iconfont.select {
+		color: #FF4444
+	}
+
+	.evaluation-bd {
+		margin-top: 20upx;
+	}
+
+	.evaluation-imgs {
+		margin-top: 12upx;
+	}
+
+	.evaluation-imgs image {
+		width: 220upx;
+		margin: 0 10upx 20upx 0;
+		height: 220upx;
+		border-radius: 6upx;
+	}
+
+	.reply-content-item .reply-content-itemfont {
+		vertical-align: middle;
+		margin-right: 14upx;
+	}
+</style>
diff --git a/pages/subPages/consumptionRecords/consumptionRecords.vue b/pages/subPages/consumptionRecords/consumptionRecords.vue
new file mode 100644
index 0000000..1aa443f
--- /dev/null
+++ b/pages/subPages/consumptionRecords/consumptionRecords.vue
@@ -0,0 +1,165 @@
+<template>
+	<!-- 消费记录 -->
+	<loadlogo v-if="loading==true"></loadlogo>
+	<view v-else>
+		<far-bottom></far-bottom>
+		<scroll-view class="scollList" :style="{ height: scrollHeight }" :scroll-y="true" :lower-threshold="1" @scrolltolower="pageLoad">
+			<view class="recordsBlock" v-for="(item,index) in list" :key="index">
+				<view class="dis-flex flex-x-between" @click="goDetails(item.id)">
+					<view class="disinline">
+					<view class="recoredsImg"> 
+						<image :src="item.logo"></image>
+					</view>
+					<view class="recoresContent"> 
+						<view class="recoresStorename">{{item.name}}</view>
+						<view class="recoresDatetime">{{item.createtime}}</view>
+					</view>
+					</view>
+					<view class="recoresPrice">{{item.pay_price=='0.00'?'免费':'¥'+item.pay_price}}</view>
+				</view>
+			</view>
+			<!-- 提示模板 -->
+			<view class="tips">
+				<loadmore :isMore="isMore"></loadmore>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import loadmore from '@/components/template/loadmore';
+	import loadlogo from '@/components/template/loadlogo';
+	export default {
+		components:{
+			loadmore,
+			loadlogo
+		},
+		data() {
+			return {
+				list:[],
+				scrollHeight: null,
+				phoneHight: null,
+				text: '',
+				page: 1,
+				isMore:true,
+				loading:true
+			}
+		},
+		onLoad() {
+			this.init();
+		},
+		methods: {
+			init(){
+				let _this = this;
+				_this.getConsumptionRecords();
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight + 'px';
+					}
+				});
+			},
+			// 获取用户消费记录列表
+			getConsumptionRecords() {
+				let _this = this;
+				_this.isMore = false;
+				let data = {
+					page: _this.page
+				};
+				App._post_form('&p=halfcard&do=usageRecord', data, res => {
+					console.log(res.data);
+					_this.list = [..._this.list, ...res.data.list];
+					_this.pageTotal = res.data.total;
+					_this.isMore = true;
+					_this.loading=false
+				});
+			},
+			//分页加载
+			pageLoad() {
+				let _this = this;
+				if (_this.page == _this.pageTotal) {
+					_this.isMore = true;
+				} else {
+					_this.page++;
+					_this.getConsumptionRecords();
+				}
+			},
+			goDetails(id){
+				App.navigationTo({
+					url:'pages/subPages/consumptionRecords/details?id='+id
+				})
+			}
+			
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.disinline{
+		display: inline-block;
+	}
+	.recordsBlock{
+		height: 110upx;
+		border-bottom: 2upx solid #F6F6F6;
+		margin: 30upx 32upx 30upx 32upx;
+		> view{
+			display: inline-block;
+		}
+	}
+	.recoredsImg{
+		width: 100upx;
+		height: 100upx;
+		line-height: 100upx;
+		margin-right: 20upx;
+		text-align: center;
+		float: left;
+		> image {
+			width: 80upx;
+			height: 80upx;
+			border-radius: 50%;
+			margin-top: 10upx;
+		}
+	}
+	.recoresContent{
+		height: 100upx;
+		line-height: 50upx;
+		float: left;
+		width: 300upx;
+	}
+	.recoresStorename{
+		font-size: 30upx;
+		width: 400upx;
+		display: inline-block;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: rgba(51, 51, 51, 1);
+	}
+	.recoresDatetime{
+		font-size: 24upx;
+		color: rgba(153, 153, 153, 1);
+	}
+	.recoresPrice{
+		font-size: 30upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+		float: right;
+	    line-height: 100upx;
+	}
+	.tips {
+		height: 80upx;
+		text-align: center;
+		> text {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+</style>
diff --git a/pages/subPages/consumptionRecords/details.vue b/pages/subPages/consumptionRecords/details.vue
new file mode 100644
index 0000000..50b628e
--- /dev/null
+++ b/pages/subPages/consumptionRecords/details.vue
@@ -0,0 +1,181 @@
+<template>
+	<loadlogo v-if="loading==true"></loadlogo>
+	<view v-else>
+		<far-bottom></far-bottom>
+		<view class="recordMainContent">
+			<view class="recordTops">
+				<view class="recordRecoredsImg">
+					<image :src="info.logo"></image>
+				</view>
+				<view>{{info.storename}}</view>
+				<view>¥{{info.ordermoney}}</view>
+			</view>
+			<view class="recordDetails">
+				<view class="dis-flex flex-x-between flex-y-center">
+					<view class="f-28 col-3">{{info.type=='2'?'特权礼包':'特权折扣'}}</view>
+					<view class="dis-flex flex-x-between flex-y-center">{{info.storename}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center" v-if="info.type!=='2'">
+					<view class="f-28 col-3">买单折扣</view>
+					<view class="dis-flex flex-x-between flex-y-center ">{{info.discount<9.9 ? info.discount + '折':'无折扣'}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center">
+					<view class="f-28 col-3">实际支付</view>
+					<view class="dis-flex flex-x-between flex-y-center colorR">¥{{info.realmoney}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center" v-if="Number(info.cerditmoney) > 0">
+					<view class="f-28 col-3">积分抵扣</view>
+					<view class="dis-flex flex-x-between flex-y-center ">-¥{{info.cerditmoney}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center" v-if="Number(info.fullreducemoney) > 0">
+					<view class="f-28 col-3">满减活动</view>
+					<view class="dis-flex flex-x-between flex-y-center ">-¥{{info.fullreducemoney}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center" v-if="Number(info.redpackmoney) > 0">
+					<view class="f-28 col-3">红包抵扣</view>
+					<view class="dis-flex flex-x-between flex-y-center ">-¥{{info.redpackmoney}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center">
+					<view class="f-28 col-3">持卡人</view>
+					<view class="dis-flex flex-x-between flex-y-center">{{info.username}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center">
+					<view class="f-28 col-3">核销员</view>
+					<view class="dis-flex flex-x-between flex-y-center">{{info.vername}}</view>
+				</view>
+				<view class="dis-flex flex-x-between flex-y-center">
+					<view class="f-28 col-3">消费时间</view>
+					<view class="dis-flex flex-x-between flex-y-center">{{info.createtime}}</view>
+				</view>
+			</view>
+		</view>
+		<view v-if="info.commentflag !== '1'" class="recordComments dis-flex flex-x-between flex-y-center" @click="goComment()">
+			<view class="f-28 col-3">评价</view>
+			<view class="dis-flex flex-x-between flex-y-center">
+				<view class="f-26 col-9">未评价</view>
+				<view class="iconfont icon-right"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import loadlogo from '@/components/template/loadlogo';
+	export default {
+		components:{
+			loadlogo
+		},
+		data() {
+			return {
+				info:[],
+				id:'',
+				loading:true
+			}
+		},
+		onLoad(option) {
+			let _this = this;
+			_this.id = option.id;
+			_this.init();
+		},
+		methods: {
+			init(){
+				this.getDetails();
+			},
+			getDetails(){
+				let _this = this;
+				let data = {
+					id: _this.id
+				};
+				App._post_form('&p=halfcard&do=getRecordDetails', data, res => {
+					_this.info = res.data;
+					_this.loading=false
+				});
+			},
+			goComment(){
+				let _this = this;
+				App.navigationTo({
+					url:'pages/mainPages/comment/comment?a=""&plugin=9&order_id='+_this.id+'&goods_id='+_this.info.merchantid
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.colorR{
+		color: red !important;
+	}
+	page{
+		background-color: #F6F6F6;
+	}
+	.recordMainContent{
+		padding: 0upx 32upx;
+		background-color: #FFFFFF;
+		> view{
+			display: inline-block;
+			width: 100%;
+			background-color: #FFFFFF;
+		}
+	}
+	.recordTops{
+		border-bottom: 2upx solid #EEEEEE;
+		height: 320upx;
+		>view{
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			
+			font-weight: 600;
+			color: #333333;
+		}
+	}
+	.recordRecoredsImg{
+		height: 162upx!important;
+		> image{
+			width: 100upx;
+			height: 100upx;
+			border-radius: 50%;
+			margin-top: 35upx;
+		}
+	}
+	.recordDetails{
+		display: inline-block;
+		width: 100%;
+		
+		font-size: 24upx;
+		
+		> view{
+			display: flow-root;
+			height: 60upx;
+			line-height: 60upx;
+			> view:nth-child(1) {
+				color: #999999;
+			}
+			> view:nth-child(2) {
+				color: #333333;
+			}
+		}
+	}
+	.recordComments{
+		margin-top: 20upx;
+		padding: 0upx 32upx;
+		background-color: #FFFFFF;
+		display: flow-root;
+		height: 102upx;
+		line-height: 102upx;
+		
+		font-size: 24upx;
+		
+		> view:nth-child(1) {
+			color: #333333;
+		}
+		> view:nth-child(2) {
+			color: #999999;
+		}
+	}
+</style>
diff --git a/pages/subPages/coupon/coupon.vue b/pages/subPages/coupon/coupon.vue
new file mode 100644
index 0000000..fb39c37
--- /dev/null
+++ b/pages/subPages/coupon/coupon.vue
@@ -0,0 +1,928 @@
+<template>
+	<view class="coupon">
+		<far-bottom></far-bottom>
+		<!-- 头部导航栏 -->
+		<view class="topNav">
+			<view @click="checkStatus(1)">
+				<view :class="status == 1 ? 'check' : ''"><span>{{languageStatus!=1?'未使用':'미사용'}}({{wsyallnum}})</span></view>
+			</view>
+			<view @click="checkStatus(2)">
+				<view :class="status == 2 ? 'check' : ''"><span>{{languageStatus!=1?'已使用':'이미사용'}}({{ysyallnum}})</span></view>
+			</view>
+			<view @click="checkStatus(3)">
+				<view :class="status == 3 ? 'check' : ''"><span>{{languageStatus!=1?'已过期':'기한만료'}}({{ygqallnum}})</span></view>
+			</view>
+			<view @click="checkStatus(4)" v-if="transfer == 1">
+				<view :class="status == 4 ? 'check' : ''"><span>已赠送({{yzsallnum}})</span></view>
+			</view>
+		</view>
+		<!-- 头部导航栏 -->
+
+		<scroll-view v-if="status == 1" class="scollList" :style="{ height: scrollHeight }" :scroll-y="true" :lower-threshold="1" @scrolltolower="wsyLoad">
+			<!-- 优惠卷循环模板 -->
+			<nonemores v-if="wsyPagetotal==0"></nonemores>
+			<view v-for="(item, index) in wsyList" v-if="wsyPagetotal!=0">
+				<view class="yhjMb" >
+					<view class="yhjMbTitle" @click="goStore(item.storeid)">
+						<view class="yhjMbTitlePackage">
+							<view><image :src="item.storelogo" /></view>
+							<span>{{item.storename}}</span>
+							<image :src="imgfixUrls + 'merchant/right.svg'" />
+						</view>
+					</view>
+					<view class="yhjMbBody" @click="goCouponDetails(item.id,item.orderid)">
+						<view class="yhjMbBodyPackage">
+							<view class="yhjMbLeft">
+								<view><span>{{item.title}}</span></view>
+								<view><span>使用条件：{{item.sub_title}}</span></view>
+								<view><span>有效期：{{item.starttime}}-{{item.endtime}}</span></view>
+								<view><span>订单编号：{{item.orderno}}</span></view>
+							</view>
+							<view class="yhjMbRight"><span>立即使用</span>
+							<view style="background-color: #58BDFD;margin-top: 20upx;"v-if="item.transferstatus ==1"  @click.stop="makered(item)" class="yhjMbRight"><span>转赠</span></view>
+							</view>
+							
+						</view>
+					</view>
+					<view class="unused-list-rad" v-if="item.status =='6'">
+						<view class="flex-box">
+							<view class="t-r" style="line-height: 368upx;color: #ffffff;">
+								转赠中(不可使用)
+							</view>
+						</view>
+						<view class="flex-box " style="padding-top: 150upx;">
+							<view class="closeBtn" @click="closeCard(item)">
+								取消转赠
+							</view>
+						</view>
+					</view>
+					
+				</view>
+				<view style="margin: 10upx 30upx 30upx;padding: 10upx;background-color: #ffffff;border-radius: 10upx;" v-if="item.transferflag == 1">
+					<view class="cardlink">
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								赠送人
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldnickname}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0;">
+							<view class="t-l flex-box">
+								手机号
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldmobile}}
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								领取时间
+							</view>
+							<view class="t-r flex-box">
+								{{item.gettime}}
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+				
+			
+			<!-- 优惠卷循环模板 -->
+			<view class="tips" v-if="wsyPagetotal!=0">
+				<loadmore :isMore="wsyisMore"></loadmore>
+			</view>
+		</scroll-view>
+
+		<scroll-view v-if="status == 2 || status == 4" class="scollList" :style="{ height: scrollHeight }" :scroll-y="true" :lower-threshold="1" @scrolltolower="ysyLoad">
+			<!-- 优惠卷循环模板 -->
+			
+			<view class="search dis-flex" v-if="status == 4">
+				<view class="iconfont icon-search t-c"
+				style="width: 80upx;height: 80upx;line-height: 80upx;">
+					
+				</view>
+				<input class="searchInput" v-model="mobile" type="text" @confirm="confirm" maxlength="11" placeholder="请输入手机号" value=""  />
+			</view>
+			
+			<view  v-if="status == 2">
+				<nonemores v-if="ysyPagetotal==0"></nonemores>
+				<view v-for="(item, index) in ysyList" v-if="ysyPagetotal!=0">
+				<view class="yhjMb" >
+					<view class="yhjMbTitle" @click="goStore(item.storeid)">
+						<view class="yhjMbTitlePackage">
+							<view><image :src="item.storelogo" /></view>
+							<span>{{item.storename}}</span>
+							<image :src="imgfixUrls + 'merchant/right.svg'" />
+						</view>
+					</view>
+					<view class="yhjMbBody">
+						<view class="yhjMbBodyPackage">
+							<view class="yhjMbLeft">
+								<view><span>{{item.title}}</span></view>
+								<view><span>使用条件：{{item.sub_title}}</span></view>
+								<view><span>有效期：{{item.starttime}}-{{item.endtime}}</span></view>
+								<view><span>订单编号：{{item.orderno}}</span></view>
+							</view>
+							<view class="yhjMbRight1" v-if="status == 2"><image :src="imgfixUrls + 'merchant/ysy.png'" /></view>
+						</view>
+					</view>
+				</view>
+				<view style="margin: 10upx 30upx 30upx;padding: 10upx;background-color: #ffffff;border-radius: 10upx;" v-if="item.transferflag == 1">
+					<view class="cardlink">
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								赠送人
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldnickname}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0;">
+							<view class="t-l flex-box">
+								手机号
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldmobile}}
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								领取时间
+							</view>
+							<view class="t-r flex-box">
+								{{item.gettime}}
+							</view>
+						</view>
+					</view>
+				</view>
+				</view>
+			</view>
+			<view class="dd" v-if="status == 4">
+				<nonemores v-if="linklist.length ==0"></nonemores>
+				<view v-for="(item, index) in linklist" v-if="linklist.length > 0">
+				<view class="yhjMb" >
+					<view class="yhjMbTitle" @click="goStore(item.storeid)">
+						<view class="yhjMbTitlePackage">
+							<view><image :src="item.storelogo" /></view>
+							<span>{{item.storename}}</span>
+							<image :src="imgfixUrls + 'merchant/right.svg'" />
+						</view>
+					</view>
+					<view class="yhjMbBody">
+						<view class="yhjMbBodyPackage">
+							<view class="yhjMbLeft">
+								<view><span>{{item.title}}</span></view>
+								<view><span>使用条件：{{item.sub_title}}</span></view>
+								<view><span>有效期：{{item.starttime}}-{{item.endtime}}</span></view>
+								<view><span>订单编号：{{item.orderno}}</span></view>
+							</view>
+							<view class="yhjMbRight1" v-if="status == 4"><image :src="imgfixUrls + 'redpacket/haveGive.png'" /></view>
+						</view>
+					</view>
+				</view>
+				<view style="margin: 10upx 30upx 30upx;padding: 10upx;background-color: #ffffff;border-radius: 10upx;" v-if="status == 4">
+					<view class="cardlink">
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								{{item.transfermode == 1?'赠送人':'领取人'}}
+							</view>
+							<view class="t-r flex-box">
+								{{item.getname}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0;">
+							<view class="t-l flex-box">
+								手机号
+							</view>
+							<view class="t-r flex-box">
+								{{item.mobile}}
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								领取时间
+							</view>
+							<view class="t-r flex-box">
+								{{item.transfertime}}
+							</view>
+						</view>
+					</view>
+				</view>
+				</view>
+			</view>
+			<!-- 优惠卷循环模板 -->
+			<!-- <view class="tips" v-if="ysyPagetotal!=0">
+				<loadmore :isMore="ysyisMore"></loadmore>
+			</view> -->
+		</scroll-view>
+
+		<scroll-view v-if="status == 3" class="scollList" :style="{ height: scrollHeight }" :scroll-y="true" :lower-threshold="1" @scrolltolower="ygqLoad">
+			<!-- 优惠卷循环模板 -->
+			<nonemores v-if="ygqPagetotal==0"></nonemores>
+			<view v-for="(item, index) in ygqList" v-if="ygqPagetotal!=0">
+				<view class="yhjMb" >
+					<view class="yhjMbTitle" @click="goStore(item.storeid)">
+						<view class="yhjMbTitlePackage">
+							<view><image :src="item.storelogo" /></view>
+							<span>{{item.storename}}</span>
+							<image :src="imgfixUrls + 'merchant/right.svg'" />
+						</view>
+					</view>
+					<view class="yhjMbBody">
+						<view class="yhjMbBodyPackage">
+							<view class="yhjMbLeft">
+								<view><span>{{item.title}}</span></view>
+								<view><span>使用条件：{{item.sub_title}}</span></view>
+								<view><span>有效期：{{item.starttime}}-{{item.endtime}}</span></view>
+							</view>
+							<view class="yhjMbRight1"><image :src="imgfixUrls + 'merchant/ygq.png'" /></view>
+						</view>
+					</view>
+				</view>
+				<view style="margin: 10upx 30upx 30upx;padding: 10upx;background-color: #ffffff;border-radius: 10upx;" v-if="item.transferflag == 1">
+					<view class="cardlink">
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								赠送人
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldnickname}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0;">
+							<view class="t-l flex-box">
+								手机号
+							</view>
+							<view class="t-r flex-box">
+								{{item.oldmobile}}
+							</view>
+						</view>
+						<view class="dis-flex">
+							<view class="t-l flex-box">
+								领取时间
+							</view>
+							<view class="t-r flex-box">
+								{{item.gettime}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 优惠卷循环模板 -->
+			<view class="tips" v-if="ygqPagetotal!=0">
+				<loadmore :isMore="ygqisMore"></loadmore>
+			</view>
+		</scroll-view>
+		<PopManager :show="showlink" type="bottom" @clickmask="showlink = false">
+			<view class="shareBox dis-flex" v-if="showlink">
+				<button class="flex-box sharebtn t-c" @click="sharelinkman">
+					<image :src="imgfixUrls+ 'wxhaoyou.png'"  mode=""></image>
+					<view class="sharetext">
+						联系人
+					</view>
+				</button>
+				<!-- #ifdef H5 || APP-PLUS -->
+				<button class="flex-box sharebtn t-c" @click="shareover">
+					<image :src="imgfixUrls+ 'checkout/weixin.png'" mode=""></image>
+					<view class="sharetext">
+						微信好友
+					</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef MP-WEIXIN -->
+				<button class="flex-box sharebtn t-c" open-type="share" >
+					<image :src="imgfixUrls+ 'checkout/weixin.png'" mode=""></image>
+					<view class="sharetext">
+						微信好友
+					</view>
+				</button>
+				<!-- #endif -->
+				<button class="flex-box sharebtn t-c" @click="sharelint">
+					<image :src="imgfixUrls+ 'pengyouquan.png'"  mode=""></image>
+					<view class="sharetext">
+						微信朋友圈
+					</view>
+				</button>
+			</view>
+			<view class="b-f close" @click="showlink = false">
+				关闭
+			</view>
+		</PopManager>
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image v-if="shareShow" :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import nonemores from '@/components/template/nonemores.vue';
+import loadmore from '@/components/template/loadmore.vue';
+import PopManager from '@/components/template/PopManager.vue';
+
+export default {
+	components:{
+		nonemores,
+		loadmore,
+		PopManager
+	},
+	data() {
+		return {
+			ygqisMore:true,
+			ysyisMore:true,
+			wsyisMore:true,
+			status: 1,
+			scrollHeight: null,
+			phoneHight: null,
+			wsyText: '',
+			wsyPage: 1,
+			wsyList: [],
+			ysyText: '',
+			ysyPage: 1,
+			ysyList: [],
+			ygqText: '',
+			ygqPage: 1,
+			ygqList: [],
+			wsyPagetotal:null,
+			ygqPagetotal:null,
+			id:null,
+			redItem:{},
+			showlink:false,
+			shareShow:false,
+			mobile:'',
+			linklist:[],
+			transfer:0,
+			isShare:false,
+			ygqallnum:0,
+			wsyallnum:0,
+			ysyallnum:0,
+			yzsallnum:0
+		};
+	},
+	onLoad: function(e) {
+		// this.init();
+		this.$nextTick(function(){
+			setTimeout(()=>{
+				uni.setNavigationBarTitle({
+				　　title:e.title
+				})
+			},500)
+		})
+		uni.$once('couponShare',function(data){
+			this.shareover()
+		})
+	},
+	onShow() {
+		this.wsyList = [];
+		this.ysyList = [];
+		this.ygqList = [];
+		this.linklist = [];
+		this.init();
+	},
+	methods: {
+		confirm(e){
+			console.log(e);
+			this.ysyPage = 1;
+			let _this = this;
+			_this.ysyisMore = false;
+			let data = {
+				type:1,
+				mobile:_this.mobile || '',
+				page: _this.ysyPage
+			};
+
+			App._post_form('&p=Order&do=alreadyTransferList', data, res => {
+				_this.linklist = res.data.list;
+				_this.ysyPagetotal = res.data.pagetotal;
+				_this.ysyText = '';
+				_this.yzsallnum = res.data.totalnum;
+				_this.ysyisMore = true;
+			});
+		},
+		closeCard(item){
+			App.showError(
+				`确定取消转赠?`,
+				data => {
+					if (data.confirm) {
+						App._post_form('&p=Order&do=cancelTransfer', {
+							objid:item.id,
+							type:1
+						}, res => {
+							uni.showToast({
+								title:'操作成功'
+							});
+							this.wsyList.map((items,index)=>{
+								if(items.id == item.id){
+									items.status = 1;
+								}
+							})
+						})
+					}
+				},
+				true
+			);
+		},
+		makered(item) {
+			let _this = this;
+			this.redItem = item;
+			_this.showlink = true;
+		},
+		redShare(id,type){
+			return new Promise((resolve, reject) => {
+				App._post_form('&p=Order&do=planTransfer', {
+					id,
+					type
+				}, res => {
+					resolve(res.data);
+				})
+			})
+		},
+		async shareover(){
+			let _this = this;
+			// #ifdef H5
+				_this.shareShow = true;
+				_this.id = await _this.redShare(_this.redItem.id,1);
+				let shareLinkurl = uni.getStorageSync('shareLinkurl');
+				shareLinkurl = shareLinkurl.replace('pages/subPages/coupon/coupon','pages/mainPages/index/index');
+				let shareData =  uni.getStorageSync('shareObj');
+				jWeixin.ready(() => {
+					wxApi.wxShare({
+						title: _this.id?_this.id.title:shareData.title, // 分享标题
+						desc:_this.id?_this.id.desc:shareData.desc, // 分享标题
+						link:  _this.id?shareLinkurl + '&isred=' + _this.id.recordid:shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+						imgUrl: _this.id?_this.id.shareimg:shareData.imageUrl, // 分享图标
+						success: function(res) {
+							
+						}
+					})
+				})
+			// #endif
+		},
+		async sharelint(){
+			let _this = this;
+			
+			_this.id = await _this.redShare(_this.redItem.id,1);
+			uni.setStorageSync('redItem',_this.id);
+			//#ifdef MP-WEIXIN
+			App.showError(
+				`即将前往“首页”,稍后按照“界面提示”进行点击右上角“···”选择“分享到朋友圈”即可`,
+				data => {
+					if (data.confirm) {
+					App.navigationTo({
+						url: 'pages/mainPages/index/index?isRedShare=1&isRedId=' + this.redItem.id
+					})
+						}
+				},
+				true
+			);
+			//#endif
+			// #ifdef H5
+				_this.shareShow = true;
+				let shareLinkurl = uni.getStorageSync('shareLinkurl');
+				shareLinkurl = shareLinkurl.replace('pages/subPages/coupon/coupon','pages/mainPages/index/index');
+				let shareData =  uni.getStorageSync('shareObj');
+				jWeixin.ready(() => {
+					wxApi.wxShare({
+						title: _this.id?_this.id.title:shareData.title, // 分享标题
+						desc:_this.id?_this.id.desc:shareData.desc, // 分享标题
+						link:  _this.id?shareLinkurl + '&isred=' + _this.id.recordid:shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+						imgUrl: _this.id?_this.id.shareimg:shareData.imageUrl, // 分享图标
+						success: function(res) {
+							
+						}
+					})
+				})
+			// #endif
+		},
+		sharelinkman(){
+			App.navigationTo({
+				url: 'pages/subPages2/redClothes/redClothes?type=1&id=' + this.redItem.id
+			})
+		},
+		init() {
+			let _this = this;
+			_this.wsyCoupon();
+			_this.ysyCoupon();
+			_this.ygqCoupon();
+			_this.linkCoupon();
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight;
+					console.info(_this.phoneHight);
+					_this.scrollHeight = _this.phoneHight - 45 + 'px';
+					console.info(_this.scrollHeight);
+				}
+			});
+		},
+		goStore(sid){
+			App.navigationTo({
+				url:'pages/mainPages/store/index?sid='+sid
+			})
+		},
+		goCouponDetails(id,orderid){
+			App.navigationTo({
+				url:'pages/subPages/coupon/couponDetails/couponDetails?id='+id+'&order_id='+orderid
+			})
+		},
+		checkStatus(status) {
+			let _this = this;
+			_this.status = status;
+		},
+		// 未使用卡券列表
+		wsyCoupon() {
+			let _this = this;
+			_this.wsyisMore = false;
+			let data = {
+				status: 1,
+				page: _this.wsyPage
+			};
+			App._post_form('&p=member&do=memberCoupon', data, res => {
+				_this.wsyList = [..._this.wsyList, ...res.data.list];
+				_this.wsyPagetotal = res.data.pagetotal;
+				_this.wsyText = '';
+				_this.wsyallnum = res.data.allnum;
+				_this.wsyisMore = true;
+				_this.transfer = res.data.transfer;
+			});
+		},
+		// 未使用加载
+		wsyLoad() {
+			let _this = this;
+			if (_this.wsyPage == _this.wsyPagetotal) {
+				_this.wsyisMore = true;
+			} else {
+				_this.wsyPage++;
+				_this.wsyCoupon();
+			}
+		},
+		// 已使用卡券列表
+		ysyCoupon() {
+			let _this = this;
+			_this.ysyisMore = false;
+			let data = {
+				status: 2,
+				page: _this.ysyPage
+			};
+			App._post_form('&p=member&do=memberCoupon', data, res => {
+				_this.ysyList = [..._this.ysyList, ...res.data.list];
+				_this.ysyPagetotal = res.data.pagetotal;
+				_this.ysyText = '';
+				_this.ysyallnum = res.data.allnum;
+				_this.ysyisMore = true;
+			});
+		},
+		linkCoupon(flag = false) {
+			let _this = this;
+			_this.ysyisMore = false;
+			let data = {
+				type:1,
+				mobile:_this.mobile || '',
+				page: _this.ysyPage
+			};
+			App._post_form('&p=Order&do=alreadyTransferList', data, res => {
+				_this.linklist = [..._this.linklist, ...res.data.list];
+				_this.ysyPagetotal = res.data.pagetotal;
+				_this.ysyText = '';
+				_this.yzsallnum = res.data.totalnum;
+				_this.ysyisMore = true;
+			});
+		},
+		// 已使用加载
+		ysyLoad() {
+			let _this = this;
+			if (_this.ysyPage == _this.ysyPagetotal) {
+				_this.ysyisMore = true;
+			} else {
+				_this.ysyPage++;
+				_this.ysyCoupon();
+			}
+		},
+		// 已过期卡券列表
+		ygqCoupon() {
+			let _this = this;
+			_this.ygqisMore = false;
+			let data = {
+				status: 3,
+				page: _this.ygqPage
+			};
+			App._post_form('&p=member&do=memberCoupon', data, res => {
+				_this.ygqList = [..._this.ygqList, ...res.data.list];
+				_this.ygqPagetotal = res.data.pagetotal;
+				_this.ygqText = '';
+				_this.ygqallnum = res.data.allnum;
+				_this.ygqisMore = true;
+			});
+		},
+		// 已使用加载
+		ygqLoad() {
+			let _this = this;
+			if (_this.ygqPage == _this.ygqPagetotal) {
+				_this.ygqisMore = true;
+			} else {
+				_this.ygqPage++;
+				_this.ygqCoupon();
+			}
+		},
+	},
+	async onShareAppMessage() {
+		let _this = this;
+		if(_this.redItem.id){
+			_this.id = await _this.redShare(_this.redItem.id,1);
+		}else{
+			_this.id = null;
+		}
+		let getUserinfo = uni.getStorageSync('userinfo'),
+			ShareData =  uni.getStorageSync('shareDataInfo'),
+			agencyData = uni.getStorageSync('agencyData'),
+			aid = agencyData.aid;
+		return {
+			title: _this.id?_this.id.title:ShareData.title, // 分享标题
+			desc: _this.id?_this.id.desc:ShareData.title, // 分享描述
+			imageUrl:_this.id?_this.id.shareimg:ShareData.img,
+			path: _this.id?'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid + '&isred=' + _this.id.recordid:'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid
+		};
+	},
+	// async onShareTimeline() {
+	// 	let _this = this;
+	// 	if(_this.redItem.id){
+	// 		_this.id = await _this.redShare(_this.redItem.id,2);
+	// 	}else{
+	// 		_this.id = null;
+	// 	}
+	// 	let getUserinfo = uni.getStorageSync('userinfo'),
+	// 		ShareData =  uni.getStorageSync('shareDataInfo'),
+	// 		agencyData = uni.getStorageSync('agencyData'),
+	// 		aid = agencyData.aid;
+	// 	return {
+	// 		title: _this.id?_this.id.title:ShareData.title, // 分享标题
+	// 		desc: _this.id?_this.id.desc:ShareData.title, // 分享描述
+	// 		imageUrl:_this.id?_this.id.shareimg:ShareData.img,
+	// 		path: _this.id?'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid + '&isred=' + _this.id.recordid:'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid
+	// 	};
+	// }
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background: #f8f8f8;
+}
+.coverImg {
+		/* #ifdef H5 */
+		width: 750upx;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		width: 540upx;
+		/* #endif */
+	}
+.coupon {
+	font-size: 0;
+	background: #f8f8f8;
+}
+.check {
+	border-bottom: 4upx solid rgba(255, 68, 68, 1);
+	> span {
+		color: rgba(255, 68, 68, 1) !important;
+	}
+}
+.tips {
+	height: 80upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		
+		
+		color: black;
+	}
+}
+.topNav {
+	z-index: 999;
+	display: flex;
+	position: fixed;
+	top: 0upx;
+	width: 750upx;
+	height: 90upx;
+	background: rgba(255, 255, 255, 1);
+	display: flex;
+	justify-content: space-between;
+	overflow: hidden;
+	> view {
+		// display: inline-block;
+		text-align: center;
+		flex: 1;
+		// width: 33%;
+		> view {
+			height: 86upx;
+			// margin: 0 auto;
+			text-align: center;
+			text-align: center;
+			// width: 90upx;
+			> span {
+				line-height: 90upx;
+				font-size: 28upx;
+				
+				
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+}
+.cardlink{
+		padding: 30upx;
+		color: #666666;
+		background-color: #f8f8f8;
+		font-size: 24upx;
+		border-radius: 10upx;
+}
+.search{
+	margin: 30upx;
+	border-radius: 20upx;
+	background-color: #ffffff;
+	/deep/.searchInput{
+		height: 80upx;
+		line-height: 80upx;
+		font-size: 28upx;
+		width: 100%;
+	}
+}
+.yhjMb {
+	margin: 20upx auto 0 auto;
+	width: 688upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	position: relative;
+	
+	.unused-list-rad{
+		display: flex;
+		width: 688upx;
+		height: 100%;
+		position: absolute;
+		left: 0;
+		top: 0;
+		background-color: rgba(0,0,0,0.6);
+		z-index: 1;
+		font-size: 28upx;
+		border-radius: 10upx;
+		// padding-top: 40upx;
+		.closeBtn{
+			width: 150upx;
+			height: 70upx;
+			line-height: 70upx;
+			background-color: #FFFFFF;
+			font-size: 28upx;
+			border-radius: 10upx;
+			float: right;
+			text-align: center;
+			margin-right: 60upx;
+		}
+	}
+}
+.topFull {
+	width: 750upx;
+	height: 90upx;
+}
+.yhjMbTitle {
+	width: 688upx;
+	border-bottom: 1px dashed rgba(238, 238, 238, 1);
+}
+.yhjMbTitlePackage {
+	padding: 30upx;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 48upx;
+		height: 48upx;
+		border-radius: 50%;
+		overflow: hidden;
+		> image {
+			width: 48upx;
+			height: 48upx;
+		}
+	}
+	> span {
+		margin-left: 20upx;
+		vertical-align: middle;
+		font-size: 24upx;
+		
+		
+		color: rgba(153, 153, 153, 1);
+	}
+	> image {
+		margin-left: 20upx;
+		vertical-align: middle;
+		width: 15upx;
+		height: 23upx;
+	}
+}
+.yhjMbBodyPackage {
+	padding: 30upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+.yhjMbLeft {
+	width: 620upx;
+	> view:nth-child(1) {
+		> span {
+			font-size: 30upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+	> view:nth-child(3) {
+		margin-top: 10upx;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+	> view:nth-child(4) {
+		margin-top: 10upx;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.yhjMbRight {
+	margin-top: 44upx;
+	width: 136upx;
+	height: 52upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 26upx;
+	text-align: center;
+	> span {
+		line-height: 52upx;
+		font-size: 24upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.yhjMbRight1 {
+	width: 112upx;
+	height: 112upx;
+	border-radius: 50%;
+	overflow: hidden;
+	> image {
+		width: 112upx;
+		height: 112upx;
+	}
+}
+.scollList {
+	overflow: hidden;
+	padding-top: 90upx;
+}
+.shareBox{
+			padding: 50upx 30upx;
+			width: 92vw;
+			background-color: #FFFFFF;
+			border-radius:  30upx 30upx 0 0;
+			image{
+				width: 100upx;
+				height: 100upx;
+			}
+			.sharetext{
+				font-size: 28upx;
+				color: #666666;
+			}
+			/deep/.sharebtn{
+				background-color: #FFFFFF;
+			}
+		}
+		.close{
+			text-align: center;
+			padding: 20upx;
+			border-top: 1upx solid #EEEEEE;
+			font-size: 36upx;
+			color: #666666;
+		}
+</style>
diff --git a/pages/subPages/coupon/couponDetails/couponDetails.vue b/pages/subPages/coupon/couponDetails/couponDetails.vue
new file mode 100644
index 0000000..99ecc37
--- /dev/null
+++ b/pages/subPages/coupon/couponDetails/couponDetails.vue
@@ -0,0 +1,413 @@
+<template>
+	<view class="couponDetails" :style="{height:phoneHight}">
+		<far-bottom></far-bottom>
+		<view class="coupons">
+			<view class="couponsImg">
+				<image :src="detailInfo.logo" />
+			</view>
+			<view class="couponsTitle">
+				<view>
+					<span>{{ detailInfo.storename }}</span>
+				</view>
+				<view>
+					<span>{{ detailInfo.title }}</span>
+				</view>
+				<view>
+					<span>有效期至{{ detailInfo.endtime }}</span>
+				</view>
+				<view>
+					<span>{{ detailInfo.sub_title }}</span>
+				</view>
+			</view>
+			<view class="couponsFloat">
+				<view></view>
+				<view></view>
+			</view>
+			<view class="couponsBody">
+				<view class="qrcodeImg">
+					<image :src="detailInfo.url" />
+				</view>
+				<view class="qrCodes" v-if="detailInfo.code_list.length !== 0">
+					<view class="qrCodesPackage">
+						<view v-for="(item, index) in detailInfo.code_list">
+							<span>
+								消费码{{ index + 1 }}：
+								<span>{{ item }}</span>
+							</span>
+						</view>
+					</view>
+				</view>
+				<view class="navButton" v-if="detailInfo.is_pwd == 1" @click="goOrderWrite">
+					<span>密码核销</span>
+					<image :src="imgfixUrls + 'merchant/right.svg'" />
+				</view>
+				<view class="navButton1" v-if="detailInfo.is_pwd == 1" @click="descriptionShow = true">
+					<span>使用说明</span>
+					<image :src="imgfixUrls + 'merchant/right.svg'" />
+				</view>
+				<view class="navButton" v-if="detailInfo.is_pwd == 0" @click="descriptionShow = true">
+					<span>使用说明</span>
+					<image :src="imgfixUrls + 'merchant/right.svg'" />
+				</view>
+			</view>
+		</view>
+
+		<!-- 填充层 -->
+		<view class="full"></view>
+		<!-- 填充层 -->
+
+		<PopManager :show="descriptionShow" @clickmask="closeDescription">
+			<view class="descriptionView">
+				<view class="descriptionPackage">
+					<view class="descriptionTitle"><span>使用说明</span></view>
+					<scroll-view class="descriptionBody" scroll-y>
+						<rich-text :nodes="detailInfo.description" class="desText"></rich-text>
+					</scroll-view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import PopManager from '@/components/template/PopManager';
+
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components: {
+			PopManager
+		},
+		data() {
+			return {
+				phoneHight: null,
+				id: null,
+				detailInfo: {},
+				descriptionShow: false,
+				codeShow: false,
+				verkey: '',
+				order_id: null,
+			};
+		},
+		onLoad: function(option) {
+			let _this = this;
+			_this.id = option.id;
+			_this.order_id = option.order_id;
+
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			_this.init();
+		},
+		methods: {
+			init() {
+				let _this = this;
+				_this.getDetailInfo();
+			},
+			goOrderWrite() {
+				let _this = this
+				App.navigationTo({
+					url: 'pages/mainPages/orderWrite/orderWrite?plugin=coupon&id=' + _this.order_id
+				})
+			},
+			closeCode() {
+				let _this = this;
+				_this.codeShow = false;
+			},
+			// 获取优惠卷详细信息
+			getDetailInfo() {
+				let _this = this;
+				let data = {
+					id: _this.id,
+					order_id: _this.order_id
+				};
+				App._post_form('&p=wlcoupon&do=detail', data, res => {
+					_this.detailInfo = res.data;
+				});
+			},
+			closeDescription() {
+				let _this = this;
+				_this.descriptionShow = false;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.codeView {
+		width: 600upx;
+		background: #ffffff;
+	}
+
+	.codeViewPackage {
+		padding: 30upx;
+	}
+
+	.codeInput {
+		padding: 30upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+
+		>input {
+			font-size: 24upx;
+			lor: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.codeButton {
+		height: 80upx;
+		width: 400upx;
+		margin: 20upx auto 0 auto;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 45upx 45upx 45upx 45upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			font-weight: 400;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.desText {
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.descriptionBody {
+		margin-top: 20upx;
+		height: 400upx;
+	}
+
+	.descriptionTitle {
+		text-align: center;
+
+		>span {
+			font-size: 30upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.descriptionView {
+		width: 600upx;
+		background: #ffffff;
+	}
+
+	.descriptionPackage {
+		padding: 30upx;
+	}
+
+	page {
+		background: rgba(66, 71, 74, 1);
+		overflow-x: hidden;
+	}
+
+	.couponDetails {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		font-size: 0;
+		background: rgba(66, 71, 74, 1);
+	}
+
+	.coupons {
+		margin: 70upx auto 0 auto;
+		width: 656upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.couponsImg {
+		margin: auto;
+		width: 80upx;
+		height: 80upx;
+		border: 4upx solid rgba(255, 255, 255, 1);
+		overflow: hidden;
+		border-radius: 50%;
+		position: relative;
+		bottom: 40upx;
+
+		>image {
+			width: 80upx;
+			height: 80upx;
+		}
+	}
+
+	.couponsTitle {
+		padding-bottom: 45upx;
+		border-bottom: 1upx dashed rgba(238, 238, 238, 1);
+
+		>view:nth-child(1) {
+			>span {
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 30upx;
+
+			>span {
+				font-size: 56upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(3) {
+			margin-top: 30upx;
+
+			>span {
+				font-size: 24upx;
+
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		>view:nth-child(4) {
+			margin-top: 30upx;
+
+			>span {
+				font-size: 35upx;
+
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		>view {
+			text-align: center;
+		}
+	}
+
+	.couponsFloat {
+		position: relative;
+		bottom: 15upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view:nth-child(1) {
+			margin-left: -15upx;
+		}
+
+		>view:nth-child(2) {
+			margin-right: -15upx;
+		}
+
+		>view {
+			width: 30upx;
+			height: 30upx;
+			background: #42474a;
+			border-radius: 50%;
+		}
+	}
+
+	.qrcodeImg {
+		margin: 20upx auto 0 auto;
+		width: 342upx;
+		height: 342upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 342upx;
+			height: 342upx;
+		}
+	}
+
+	.qrCodes {
+		margin: 10upx auto 0 auto;
+		width: 330upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+	}
+
+	.qrCodesPackage {
+		padding: 30upx 40upx;
+
+		>view:nth-child(1) {
+			margin-top: 0;
+		}
+
+		>view {
+			margin-top: 25upx;
+
+			>span {
+				font-size: 24upx;
+
+
+				color: rgba(151, 149, 159, 1);
+
+				>span {
+					color: #333333;
+				}
+			}
+		}
+	}
+
+	.navButton1 {
+		border-top: 1upx solid rgba(238, 238, 238, 1);
+		height: 95upx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 30upx;
+
+		>span {
+			line-height: 95upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-top: 30upx;
+			vertical-align: middle;
+			width: 10px;
+			height: 18px;
+		}
+	}
+
+	.navButton {
+		margin-top: 40upx;
+		border-top: 1upx solid rgba(238, 238, 238, 1);
+		height: 95upx;
+		display: flex;
+		justify-content: space-between;
+		padding: 0 30upx;
+
+		>span {
+			line-height: 95upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-top: 30upx;
+			vertical-align: middle;
+			width: 10px;
+			height: 18px;
+		}
+	}
+
+	.full {
+		width: 750upx;
+		height: 75upx;
+	}
+</style>
diff --git a/pages/subPages/createCommodity/index.less b/pages/subPages/createCommodity/index.less
new file mode 100644
index 0000000..ff3fd66
--- /dev/null
+++ b/pages/subPages/createCommodity/index.less
@@ -0,0 +1,350 @@
+
+.optionsMbPackage {
+	padding: 20upx;
+}
+.optionsMb {
+	margin: 0 auto 20upx auto;
+	width: 730upx;
+	border-radius: 10upx;
+	background: #ffffff;
+}
+.specScoll {
+	max-height: 800upx;
+}
+.addBranchMbPackage {
+	padding: 0 0 0 20upx;
+	height: 80upx;
+}
+.addBranchPackage {
+	padding: 0 20upx;
+	height: 80upx;
+	> text {
+		line-height: 80upx;
+		font-size: 26upx;
+		color: #ff4444;
+	}
+}
+.addBranchButton {
+}
+.specsMb {
+	margin: 0 0 20upx 0;
+}
+.textRight {
+	text-align: right;
+}
+.specsMbTitle {
+	height: 80upx;
+}
+.specImg {
+	width: 30upx;
+	height: 30upx;
+}
+.specsMbPackage {
+	padding: 0 20upx;
+	background: #ffffff;
+}
+.specsAddButton {
+	width: 750upx;
+	height: 80upx;
+	background: rgba(255, 255, 255, 1);
+	text-align: center;
+	> text {
+		line-height: 80upx;
+		font-size: 30upx;
+		color: #ff4444;
+	}
+}
+.mbView {
+	height: 600upx;
+}
+.addRuleButton {
+	width: 200upx;
+	height: 70upx;
+	text-align: center;
+	margin-top: 20upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 10upx;
+	> text {
+		font-size: 24upx;
+		color: rgba(255, 255, 255, 1);
+		line-height: 70upx;
+	}
+}
+.ruleTitle {
+	width: 200upx;
+}
+.ruleMbPackage {
+	padding: 20upx;
+}
+.verMid {
+	vertical-align: middle;
+}
+.ruleInput {
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+	width: 400upx;
+}
+.ruleMb {
+	margin-bottom: 10upx;
+	background: #f8f8f8;
+	border-radius: 10upx;
+}
+.disInline {
+	display: inline-block;
+}
+.colorRed {
+	color: #ff4444;
+}
+.rulePackage {
+	padding: 30upx;
+}
+.tipsPackage {
+	padding: 30upx;
+}
+.full {
+	height: 20upx;
+}
+.marT20Auto {
+	margin: 20upx auto 0 auto;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 40upx;
+	text-align: center;
+	> text {
+		line-height: 80upx;
+		font-size: 28upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.presettagsMb {
+	margin: 0 20upx 20upx 0;
+	display: inline-block;
+	height: 40upx;
+	padding: 0 10upx;
+	text-align: center;
+	border-radius: 25upx;
+	border: 1upx solid #666666;
+	> text {
+		line-height: 40upx;
+		font-size: 24upx;
+		color: #666666;
+	}
+}
+.presettagsCMb {
+	margin: 0 20upx 20upx 0;
+	display: inline-block;
+	height: 40upx;
+	padding: 0 10upx;
+	text-align: center;
+	border-radius: 25upx;
+	background: #ff4444;
+	border: 1upx solid rgba(0, 0, 0, 0);
+	> text {
+		line-height: 40upx;
+		font-size: 24upx;
+		color: #ffffff;
+	}
+}
+.presettagsView_body {
+	padding: 30upx;
+}
+.presettagsView_title {
+	padding: 30upx;
+}
+.closePresettags {
+	width: 40upx;
+	height: 40upx;
+	overflow: hidden;
+	> image {
+		width: 40upx;
+		height: 40upx;
+	}
+}
+.dis-flex {
+	display: flex;
+	justify-content: space-between;
+}
+.ruleView {
+	width: 750upx;
+	background: #ffffff;
+}
+.submitSpecs {
+	position: absolute;
+	bottom: 20upx;
+	left: 30upx;
+	width: 690upx;
+	height: 80upx;
+	text-align: center;
+	background: #ff4444;
+	border-radius: 40upx;
+	> text {
+		font-size: 26upx;
+		line-height: 80upx;
+		color: #ffffff;
+	}
+}
+.submitSpec{
+	background-color: #FFFFFF;
+	height: 80upx;
+	line-height: 80upx;
+	color: #FF4444;
+	text-align: center;
+	position: fixed;
+	bottom: 15%;
+	width: 100%;
+}
+.specsView {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	z-index: 9999;
+	width: 750upx;
+	background-color: #f8f8f8;
+}
+
+.presettagsView {
+	width: 750upx;
+	background: #ffffff;
+}
+.imgPreview {
+	overflow: hidden;
+	width: 157upx;
+	height: 157upx;
+	background: gray;
+	margin-right: 37upx;
+	margin-bottom: 10upx;
+	border-radius: 10upx;
+	> image {
+		width: 157upx;
+		height: 157upx;
+	}
+}
+.pickerPackage {
+	display: inline-block;
+}
+.userImgUpdata {
+	width: 157upx;
+	height: 157upx;
+	background: rgba(246, 246, 246, 1);
+	border: 1upx solid rgba(204, 204, 204, 1);
+	border-radius: 10upx;
+	text-align: center;
+	> image {
+		margin-top: 53upx;
+		width: 53upx;
+		height: 53upx;
+	}
+}
+.dataPicker1 {
+	width: 70upx;
+	height: 82upx;
+	display: inline-block;
+}
+.timePickerView {
+	vertical-align: middle;
+	display: inline-block;
+	margin-left: 49upx;
+	width: 350upx;
+	height: 80upx;
+	> span {
+		line-height: 80upx;
+		vertical-align: top;
+		margin: 0 10upx;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.createCommodity {
+	font-size: 0;
+	background: #f6f6f6;
+	overflow-x: hidden !important;
+}
+.main {
+	background: #ffffff;
+}
+.mianPackage {
+	padding: 0;
+	margin: 0 30upx;
+}
+.inputView {
+	height: 80upx;
+}
+.uploadView {
+	> view {
+		display: inline-block;
+	}
+}
+.dis-flex {
+	display: flex;
+	justify-content: space-between;
+}
+.specInput {
+	height: 80upx;
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+}
+.marL10 {
+	margin-left: 10upx;
+}
+.titleTetx {
+	font-size: 28upx;
+	line-height: 80upx;
+	color: rgba(153, 153, 153, 1);
+}
+.uploadTetx {
+	display: inline-block;
+	width: 220upx;
+	font-size: 28upx;
+	line-height: 80upx;
+	color: rgba(153, 153, 153, 1);
+}
+.verMid {
+	vertical-align: middle;
+}
+.rightImg {
+	width: 20upx;
+	height: 20upx;
+}
+.contentTetx {
+	text-align: right;
+	max-width: 500upx;
+	display: inline-block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	margin-right: 10upx;
+	font-size: 28upx;
+	line-height: 80upx;
+	color: #333333;
+}
+.timeTetx {
+	text-align: right;
+	max-width: 230upx;
+	display: inline-block;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	margin-right: 10upx;
+	font-size: 28upx;
+	line-height: 80upx;
+	color: #333333;
+}
+.uploadButton {
+	margin: 20upx 0upx 20upx 20upx;
+}
+.marT20 {
+	margin-top: 20upx;
+}
+.inputMain {
+	text-align: right;
+	width: 400upx;
+	height: 80upx;
+	font-size: 28upx;
+	line-height: 80upx;
+	color: #333333;
+}
\ No newline at end of file
diff --git a/pages/subPages/createCommodity/index.vue b/pages/subPages/createCommodity/index.vue
new file mode 100644
index 0000000..5ff08d4
--- /dev/null
+++ b/pages/subPages/createCommodity/index.vue
@@ -0,0 +1,2161 @@
+<template>
+	<scroll-view class="createCommodity" :style="{ height: phoneHight }" :scroll-y="true" :scroll-x="false">
+		<far-bottom></far-bottom>
+		<!-- 商品信息区域 -->
+		<view class="main">
+			<view class="mianPackage">
+				<picker mode="selector" :value="newTypeIndex" :range="newTypeList" range-key="name" @change="changeNewType" :disabled="slectDis">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">商品类型</text></view>
+						<view v-if="!!newTypeList[newTypeIndex] && !!newTypeList[newTypeIndex].name">
+							<text class="contentTetx verMid">{{ newTypeList[newTypeIndex].name }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+						<!-- <view v-if="!!typeList[type] && !!typeList[type].name">
+							<text class="contentTetx verMid">{{ typeList[type].name }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view> -->
+					</view>
+				</picker>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="showInput('请点击输入商品名称')">
+					<view>
+						<text class="titleTetx">
+							商品名称
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view>
+						<text class="contentTetx verMid">{{ goodsNameText }}</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<!-- <view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view><text class="titleTetx">商品单位</text></view>
+					<view><input placeholder="请输入商品单位" class="inputMain" v-model="goodsInfo.goods.unit" /></view>
+				</view> -->
+				<picker mode="selector" :value="newCateIndex" :range="newCateList" range-key="name" @change="changeNewCate">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">商品分类</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ newCateText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<!-- 				<picker mode="multiSelector" :value="cateTwo" :range="cateLists" range-key="name" @change="changeCateTwo" v-if="!!typeList[type]&&typeList[type].value == 'groupon'"
+				 @columnchange="watchCateTwo">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">商品分类</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ cateText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker> -->
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view><text class="titleTetx">活动开始时间</text></view>
+					<view>
+						<view class="pickerPackage" @tap="dataTimeShow1">
+							<text class="contentTetx verMid">{{ starttimeText }}</text>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view><text class="titleTetx">活动结束时间</text></view>
+					<view>
+						<view class="pickerPackage" @tap="dataTimeShow2">
+							<text class="contentTetx verMid">{{ endtimeText }}</text>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="uploadView diy-nav-list border-line border-bottom">
+					<view><text class="uploadTetx verMid">缩略图</text></view>
+					<view class="verMid uploadButton">
+						<!-- 图片预览循环模板 -->
+						<view class="imgPreview" v-if="thumb != ''">
+							<image :src="thumb" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeImg(1)" />
+							
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="updataImg(1, 1)" v-else>
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+						</view>
+						<view class="f-20 col-9" v-if="thumb == ''">建议尺寸:640X640</view>
+					</view>
+				</view>
+				<view class="uploadView">
+					<view><text class="uploadTetx verMid">轮播图</text></view>
+					<view class="verMid uploadButton">
+						<!-- 图片预览循环模板 -->
+						<block v-for="(item, index) in thumbs" class="verMid">
+							<view class="imgPreview verMid" v-if="thumbs.length != '0'">
+								<image :src="item" />
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeImg(2, index)" />
+							</view>
+						</block>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata verMid" @click="updataImg(2, 6)" v-if="thumbs.length < 7">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+						</view>
+						<view class="f-20 col-9" v-if="thumbs.length == 0">建议尺寸:750X560</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品信息区域 -->
+
+		<!-- 商品规格区域 -->
+		<view class="main marT20" v-if="!isSpecBox">
+			<view class="mianPackage">
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="specsPopShow" v-if="!!typeList[type]&&typeList[type].value != 'bargain'">
+					<view><text class="titleTetx">商品规格</text></view>
+					<view>
+						<text class="contentTetx verMid">{{ specsText }}</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<picker mode="selector" :value="is_describe_tip" :range="noticeList"  @change="changenotice">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">是否开启购买须知提醒</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ noticeList[is_describe_tip] }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<picker mode="selector" :value="isladderVel" :range="isladder" range-key="name" @change="changeladder" v-if="goodsInfo.type == 'rush'">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">是否启用阶梯价</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ isladder[isladderVel].name }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="ladderPopShow" v-if="goodsInfo.type == 'rush' && isladderVel == 1">
+					<view><text class="titleTetx">商品阶梯价</text></view>
+					<view>
+						<text class="contentTetx verMid">阶梯价设置</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="optionsPopShow" v-if="goodsInfo.goods.optionstatus != '0' && (!!typeList[type]&&typeList[type].value != 'bargain')">
+					<view><text class="titleTetx">子规格详情</text></view>
+					<view>
+						<text class="contentTetx verMid">价格，库存</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="showPresettagsPop">
+					<view><text class="titleTetx">商品标签</text></view>
+					<view>
+						<text class="contentTetx verMid">{{ presettagsText }}</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="showRichtext">
+					<view><text class="titleTetx">商品详情</text></view>
+					<view>
+						<text class="contentTetx verMid">商品详情富文本</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" @click="shownoticetext" v-if="goodsInfo['goods'].is_describe_tip == 1">
+					<view><text class="titleTetx">购买须知</text></view>
+					<view>
+						<text class="contentTetx verMid">购买须知富文本</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'bargain'"
+				 @click="rulePopShow">
+					<view><text class="titleTetx">砍价规则</text></view>
+					<view>
+						<text class="contentTetx verMid">请添加砍价规则</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<picker mode="selector" :value="goodsInfo.goods.usestatus" :range="usestatusList" range-key="name" @change="changeUsestatus">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">消费方式</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ usestatusText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<picker mode="selector" :value="express" :range="expressList" range-key="name" @change="changeExpress" v-if="goodsInfo.goods.usestatus == '1' || goodsInfo.goods.usestatus == '2'">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">快递模板</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ expresseText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<picker mode="selector" :value="cutoffstatus" :range="cutoffstatusList" range-key="name" @change="changeCutoffstatus"
+				 v-if="goodsInfo.goods.usestatus == '0' || goodsInfo.goods.usestatus == '2'">
+					<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+						<view><text class="titleTetx">截止时间类型</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ cutoffstatusText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="goodsInfo.goods.cutoffstatus == '1' && (goodsInfo.goods.usestatus == '0' || goodsInfo.goods.usestatus == '2')">
+					<view><text class="titleTetx">购买后有效天数</text></view>
+					<view><input  placeholder="请输入购买后有效天数(天)" class="inputMain" type="number" v-model="goodsInfo.goods.cutoffday" /></view>
+				</view>
+				<view class="dis-flex inputView" v-if="goodsInfo.goods.cutoffstatus == '0' && (goodsInfo.goods.usestatus == '0' || goodsInfo.goods.usestatus == '2')"
+				 @tap="dataTimeShow3">
+					<view><text class="titleTetx">消费截止时间</text></view>
+					<view>
+						<text class="contentTetx verMid">{{ closetimeText }}</text>
+						<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+					</view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view>
+						<text class="titleTetx">
+							{{ priceText }}
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入价格(元)" class="inputMain" type="digit" v-model="goodsInfo.goods.price"
+						 @blur="handleprice" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'fightgroup'">
+					<view>
+						<text class="titleTetx">
+							单购价
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入价格(元)" class="inputMain" type="digit" v-model="goodsInfo.goods.aloneprice"
+						 @blur="handlealoneprice" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view>
+						<text class="titleTetx">
+							商品市场价
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input placeholder="请输入商品市场价(元)"  class="inputMain" type="digit" v-model="goodsInfo.goods.oldprice"
+						 @blur="handleoldprice" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&(typeList[type].value != 'bargain' && typeList[type].value != 'fightgroup')">
+					<view>
+						<text class="titleTetx">
+							核销尾款
+						</text>
+					</view>
+					<view><input  placeholder="请输入核销尾款(元)" class="inputMain" type="digit" v-model="goodsInfo.goods.retainage"
+						 @blur="handleretainage" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view>
+						<text class="titleTetx">
+							预约时间
+						</text>
+					</view>
+					<view><input  placeholder="请输入预约时间(时)" class="inputMain" type="number" v-model="goodsInfo.goods.appointment" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value != 'bargain'">
+					<view>
+						<text class="titleTetx">
+							单人限购
+						</text>
+					</view>
+					<view><input  placeholder="请输入单人限购(次)" class="inputMain" type="number" v-model="goodsInfo.goods.op_one_limit" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+					<view>
+						<text class="titleTetx">
+							商品库存
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入商品库存" class="inputMain" type="number" v-model="goodsInfo.goods.num" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'fightgroup'">
+					<view>
+						<text class="titleTetx">
+							组团人数
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入组团人数(人)" class="inputMain" type="number" v-model="goodsInfo.goods.peoplenum"
+						 @blur="handlepeoplenum" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'fightgroup'">
+					<view>
+						<text class="titleTetx">
+							组团时间
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入组团时间(小时)" class="inputMain" type="number" v-model="goodsInfo.goods.grouptime" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'bargain'">
+					<view>
+						<text class="titleTetx">
+							好友帮砍限制数量
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入好友帮砍限制数量(人)" class="inputMain" type="number" v-model="goodsInfo.goods.helplimit" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'bargain'">
+					<view>
+						<text class="titleTetx">
+							每天帮砍人数限制
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入每天帮砍好友人数限制(人)" class="inputMain" type="number" v-model="goodsInfo.goods.dayhelpcount" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'bargain'">
+					<view>
+						<text class="titleTetx">
+							每人可砍价次数
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入每人可砍价次数(次)" class="inputMain" type="number" v-model="goodsInfo.goods.onlytimes" /></view>
+				</view>
+				<view class="dis-flex inputView diy-nav-list border-line border-bottom" v-if="!!typeList[type]&&typeList[type].value == 'bargain'">
+					<view>
+						<text class="titleTetx">
+							允许参与人数
+							<text class="colorRed">*</text>
+						</text>
+					</view>
+					<view><input  placeholder="请输入允许参与人数(人)" class="inputMain" type="number" v-model="goodsInfo.goods.joinlimit" /></view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品规格区域 -->
+
+		<view class="main marT20">
+			<view class="mianPackage">
+				<picker mode="selector" :value="status" :range="statusList" range-key="name" @change="changeStatus">
+					<view class="dis-flex inputView">
+						<view><text class="titleTetx">商品状态</text></view>
+						<view>
+							<text class="contentTetx verMid">{{ statusText }}</text>
+							<image :src="imgfixUrls + 'merchant/right.svg'" class="rightImg verMid"></image>
+						</view>
+					</view>
+				</picker>
+			</view>
+		</view>
+
+		<view class="submitButton marT20Auto" v-if="bengF == 0 && !specsShow" @click.stop.prevent="saveGoods" :class="submitType == 1 ? 'pointerNone;' : ''"><text>提交</text></view>
+		<view class="submitButton marT20Auto" v-if="bengF == 1" :class="submitType == 1 ? 'pointerNone;' : ''"><text>提交</text></view>
+
+		<view class="full"></view>
+
+		<inputPop :inputShow="inputShow" @closeInputPop="closeInputPop" :titleText="showTitleText" @returnText="returnText"
+		 :texts="goodsInfo.goods.name"></inputPop>
+		<!-- 标签弹框 -->
+		<PopManager :show="presettagsShow" :type="presettagsType">
+			<view class="presettagsView" :style="{ height: phoneHight }">
+				<view class="presettagsView_body">
+					<view v-for="(item, index) in presettagsList" @click="checkPresettags(item)" :class="goodsInfo.goods.tag.indexOf(item.id) != -1 ? 'presettagsCMb' : 'presettagsMb'">
+						<text>{{ item.title }}</text>
+					</view>
+				</view>
+				<view class="submitSpecs iy-nav-list border-line border-top" @click.stop.prevent="closePresettags"><text>确定</text></view>
+			</view>
+		</PopManager>
+		<!-- 标签弹框 -->
+
+		<!-- 商品详情富文本弹窗 -->
+		<PopManager :show="richText" type="center" @clickmask="richText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="goodsInfo.goods.detail || goodsInfo.goods.detail == ''">
+				<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#" :html="goodsInfo.goods.detail"></jinEdit>
+			</view>
+		</PopManager>
+		<!-- 富文本弹窗 -->
+		<!-- 购买须知富文本弹窗 -->
+		<PopManager :show="noticeText" type="center" @clickmask="noticeText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="goodsInfo.goods.describe || goodsInfo.goods.describe == ''">
+				<jinEdit placeholder="请输入内容" @editOk="noticeOk" uploadFileUrl="/#" :html="goodsInfo.goods.describe"></jinEdit>
+			</view>
+		</PopManager>
+		<!-- 富文本弹窗 -->
+
+		<!-- 砍价规则 -->
+		<PopManager :show="ruleShow" :type="presettagsType">
+			<view class="ruleView" :style="{ height: phoneHight }">
+				<view class="presettagsView_title dis-flex">
+					<view>
+						<view @click="pushRule" class="addRuleButton"><text>添加一条规则 +</text></view>
+					</view>
+					<view class="closePresettags" @click="closeRule">
+						<image :src="imgfixUrls + 'merchant/close.png'"></image>
+					</view>
+				</view>
+				<view class="presettagsView_Tips">
+					<view class="tipsPackage">
+						<view><text>规则说明:</text></view>
+						<view>
+							<text class="ruleTitle">
+								1.价格大于栏请
+								<text class="colorRed">从大到小</text>
+								设置
+							</text>
+						</view>
+						<view>
+							<text class="ruleTitle">
+								2.砍价范围请按照
+								<text class="colorRed">第一个空小于第二个空</text>
+								设置
+							</text>
+						</view>
+						<view>
+							<text class="ruleTitle">
+								例：设置的两条规则为：100,5,10和50,2,3。当商品当前金额大于100元时，每个好友砍价金额为5-10的随机数；当商品金额被砍到100元以下50元以上时，每个好友砍价金额为2-3的随机数；当商品金额被砍到50元以下时，未找到匹配的规则项，每个好友砍价金额为会按照默认的0.5-1元取随机数。
+							</text>
+						</view>
+					</view>
+				</view>
+				<view class="ruleView_body">
+					<view class="rulePackage">
+						<!-- 规则循环模板 -->
+						<scroll-view scroll-y :scroll-x="false" class="mbView">
+							<view class="ruleMb" v-for="(item, index) in goodsInfo.goods.rules">
+								<view class="ruleMbPackage">
+									<view>
+										<view class="disInline verMid ruleTitle"><text>当前价格大于</text></view>
+										<input  placeholder="请输入" type="digit" class="disInline ruleInput verMid" v-model="item.rule_pice" />
+									</view>
+									<view>
+										<view class="disInline verMid ruleTitle"><text>砍价范围从</text></view>
+										<input  placeholder="请输入" type="digit" class="disInline ruleInput verMid" v-model="item.rule_start" />
+									</view>
+									<view>
+										<view class="disInline verMid ruleTitle"><text>到</text></view>
+										<input  placeholder="请输入" type="digit" class="disInline ruleInput verMid" v-model="item.rule_end" />
+									</view>
+								</view>
+								<!-- 规则循环模板 -->
+							</view>
+						</scroll-view>
+
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 砍价规则 -->
+
+		<!-- 规格弹窗 -->
+		<!-- <PopManager :show="specsShow" :type="presettagsType"> -->
+		<view class="specsView" :style="{ height: phoneHight }" v-if="specsShow">
+			<view class="presettagsView_title dis-flex">
+				<view class="c-ff4444 f-20">
+					温馨提示:多规格与阶梯价不能同时设置！
+				</view>
+				<view class="closePresettags" @click="closeSpecs">
+					<image :src="imgfixUrls + 'merchant/close.png'"></image>
+				</view>
+			</view>
+			<!-- 规格循环模板 -->
+			<scroll-view style="height: 70vh;" :scroll-y="true">
+				<view class="specsMb" v-for="(item, index) in specList">
+					<view class="specsMbPackage">
+						<view class="specsMbTitle dis-flex iy-nav-list border-line border-bottom">
+							<view>
+								<image :src="imgfixUrls + 'centerMerchant/clerkjian.png'" class="verMid specImg" @click="cleanSpecs(index, undefined)"></image>
+								<text class="titleTetx verMid marL10">规格名称</text>
+							</view>
+							<view><input  placeholder="请输入规格名称" class="specInput textRight" v-model="item.title" /></view>
+						</view>
+						<view class="addBranchMb" v-for="(itemss, indexss) in item.items">
+							<view class="addBranchMbPackage dis-flex iy-nav-list border-line border-bottom">
+								<view>
+									<image :src="imgfixUrls + 'centerMerchant/clerkjian.png'" class="verMid specImg" @click="cleanSpecs(index, indexss,itemss,item)"></image>
+									<text class="titleTetx verMid marL10">规格名称</text>
+								</view>
+								<view><input  placeholder="请输入规格名称" class="specInput textRight" v-model="itemss.title" /></view>
+							</view>
+						</view>
+						<view class="addBranchButton" @click="addBranchSpecs(index)">
+							<view class="addBranchPackage"><text>+ 添加子规格</text></view>
+						</view>
+					</view>
+				</view>
+				<!-- 规格循环模板 -->
+			</scroll-view>
+			<view class="specsAddButton marT20" @click="addSpecs" v-if="specList.length < 6"><text>+ 添加规格</text></view>
+			<view class="submitSpecs iy-nav-list border-line border-top" @click.stop.prevent="submitSpecs"><text>确定</text></view>
+		</view>
+		<!-- </PopManager> -->
+		<!-- 规格弹窗 -->
+
+		<!-- 子规格详情 -->
+		<!-- <PopManager :show="optionsShow" :type="presettagsType"> -->
+		<view class="specsView" :style="{ height: phoneHight,overflow: 'hidden' }" v-if="optionsShow">
+			<view class="presettagsView_title dis-flex">
+				<view></view>
+				<view class="closePresettags" @click="closeOptions">
+					<image :src="imgfixUrls + 'merchant/close.png'"></image>
+				</view>
+			</view>
+			<scroll-view style="height: 80vh;" :scroll-y="true">
+				<!-- 子规格模板 -->
+				<view class="optionsMb" v-for="(item, index) in goodsInfo.goods.options">
+					<view class="optionsMbPackage">
+						<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+							<view><text class="titleTetx">规格</text></view>
+							<view>
+								<text class="contentTetx verMid">{{ item.title }}</text>
+							</view>
+						</view>
+						<view class="dis-flex inputView diy-nav-list border-line border-bottom">
+							<view><text class="titleTetx">价格</text></view>
+							<view><input  placeholder="请输入" class="inputMain" type="digit" v-model="item.price" /></view>
+						</view>
+						<view class="dis-flex inputView ">
+							<view><text class="titleTetx">库存</text></view>
+							<view><input  placeholder="请输入" class="inputMain" type="number" v-model="item.stock" /></view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="submitSpecs iy-nav-list border-line border-top" @click="closeOptions"><text>确定</text></view>
+		</view>
+		<!-- 子规格模板 -->
+
+		<!-- 阶梯价设置 -->
+		<view class="specsView" :style="{ height: phoneHight,overflow: 'hidden',position:'fixed',zIndex:'999' }" v-if="ladderShow">
+			<view class="presettagsView_title dis-flex">
+				<view class="c-ff4444 f-20">
+					温馨提示:多规格与阶梯价不能同时设置！
+				</view>
+				<view class="closePresettags" @click="closelist">
+					<image :src="imgfixUrls + 'merchant/close.png'"></image>
+				</view>
+			</view>
+			<view  style="overflow: auto;height: 920upx;">
+				<view class="b-f" style="padding: 0 20upx;margin-bottom: 30upx;" v-for="(item,index) in goodsInfo.goods.lp_set">
+					<view class="dis-flex">
+						<view class="dis-flex" style="flex: 0.3;padding: 22upx 0;">
+							<image :src="imgfixUrls + 'centerMerchant/clerkjian.png'" style="width: 30upx;height: 30upx;flex: 0.15;margin-top: 3upx;"
+							 class="verMid specImg" @click="cleanladder(index)"></image>
+							<view class="f-26 t-l col-9" style="flex: 0.8;">
+								价格
+							</view>
+						</view>
+						<view  style="flex: 0.7;">
+							<input  v-if="ladderShow" placeholder="请输入阶梯价格" class="inputMain" style="width: 500upx;"
+							 type="digit" v-model="item.price" />
+						</view>
+					</view>
+					<view class="dis-flex">
+						<view class="dis-flex" style="flex: 0.3;padding: 22upx 0;">
+							<view class="f-26 t-l col-9" style="flex: 0.8;padding-left: 40upx;">
+								会员价
+							</view>
+						</view>
+						<view  style="flex: 0.7;">
+							<input  v-if="ladderShow" placeholder="请输入会员阶梯价" class="inputMain" style="width: 500upx;"
+							 type="digit" v-model="item.vip_price" />
+						</view>
+					</view>
+					<view class="dis-flex">
+						<view class="dis-flex" style="flex: 0.3;padding: 22upx 0;">
+							<view class="f-26 t-l col-9" style="flex: 0.8;padding-left: 40upx;">
+								最大销售量
+							</view>
+						</view>
+						<view  style="flex: 0.7;">
+							<input  v-if="ladderShow" placeholder="请输入最大销售量" class="inputMain" style="width: 500upx;"
+							 type="number" v-model="item.max" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="f-26 submitSpec" @click="addladder"><text>+ 添加阶梯价</text></view>
+			<view class="submitSpecs iy-nav-list border-line border-top" @click="closeladder"><text>确定</text></view>
+		</view>
+		<!-- </PopManager> -->
+		<!-- 子规格详情 -->
+		<w-picker :visible.sync="visible1" mode="date" startYear="2017" endYear="2029" :value="starttimeText" :current="starttimeText !== '请选择开始时间'?false:true"
+		 fields="second" @confirm="checkStar($event,'date')" @cancel="onCancel" ref="dateTime"></w-picker>
+		<w-picker :visible.sync="visible3" mode="date" startYear="2017" endYear="2029" :value="endtimeText" :current="endtimeText !== '请选择结束时间'?false:true"
+		 fields="second" @confirm="checkEnd($event,'date')" ref="dateTime1"></w-picker>
+		<w-picker :visible.sync="visible2" mode="date" startYear="2017" endYear="2029" :value="closetimeText" :current="closetimeText !== '请选择截止时间'?false:true"
+		 fields="second" @confirm="checkClose($event,'date')" ref="dateTime2"></w-picker>
+		<!-- <w-picker mode="dateTime" :visible.sync="visible1" startYear="2019" endYear="2030" step="1" :current="true" @confirm="checkStar" ref="dateTime"></w-picker> -->
+		<!-- 		<w-picker mode="dateTime" :visible.sync="visible3" startYear="2019" endYear="2030" step="1" :current="true" @confirm="checkEnd" ref="dateTime1"></w-picker>
+		<w-picker mode="dateTime" :visible.sync="visible2" startYear="2019" endYear="2030" step="1" :current="true" @confirm="checkClose" ref="dateTime2"></w-picker> -->
+	</scroll-view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import inputPop from '@/components/template/inputPop';
+	import PopManager from '@/components/template/PopManager';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	import jinEdit from '@/components/jin-edit/jin-edit.vue';
+	export default {
+		components: {
+			inputPop,
+			PopManager,
+			wPicker,
+			jinEdit
+		},
+		data() {
+			return {
+				priceText: '抢购价',
+				closetimeText: '',
+				submitType: 0,
+				bengF: '0',
+				adopt: true,
+				publicList: ['name', 'price', 'oldprice', 'num'],
+				rushList: ['retainage', 'op_one_limit'],
+				fightgroupList: ['peoplenum', 'grouptime', 'op_one_limit', 'aloneprice'],
+				bargainList: ['helplimit', 'dayhelpcount', 'onlytimes', 'joinlimit'],
+				slectDis: null,
+				statusText: '',
+				startValue: [],
+				endValue: [],
+				endtimeText: '请选择结束时间',
+				starttimeText: '请选择开始时间',
+				optionsShow: false,
+				specList: [],
+				specsText: '单规格',
+				specsShow: false,
+				ruleShow: false,
+
+				cateLists: [],
+				status: 0,
+				statusList: [{
+						id: 0,
+						name: '下架'
+					},
+					{
+						id: 1,
+						name: '上架'
+					}
+				],
+				cutoffstatusText: '请选择截止时间类型',
+				cutoffstatus: 0,
+				cutoffstatusList: [{
+						id: 0,
+						name: '固定时间'
+					},
+					{
+						id: 1,
+						name: '购买后有效期'
+					}
+				],
+				expresseText: '请选择快递模板',
+				express: 0,
+				expressList: [],
+				usestatusText: '请选择消费方式',
+				usestatusList: [{
+						id: 0,
+						name: '到店消费'
+					},
+					{
+						id: 1,
+						name: '快递上门'
+					},
+					{
+						id: 2,
+						name: '同时支持快递与核销'
+					}
+				],
+				presettagsText: '',
+				presettagsArrary: [],
+				presettagsList: [],
+				presettagsType: 'bottom',
+				presettagsShow: false,
+				thumb: '',
+				thumbs: [],
+				cateText: '请选择商品分类',
+				cateList: [],
+				goodsNameText: '请输入商品名称',
+				returnTexts: '',
+				showTitleText: '',
+				inputShow: false,
+				inputShowType: 'center',
+				typeList: [],
+				type: 0,
+				newTypeList: [
+					{name: "技能培训", cc_id: 1, value: "技能培训"},
+					{name: "资格考试", cc_id: 2, value: "资格考试"},
+					{name: "学历提升", cc_id: 3, value: "学历提升"},
+					{name: "岗前培训", cc_id: 4, value: "岗前培训"}
+				],
+				newTypeIndex: 0,
+				cate: [0],
+				isladderVel: [0],
+				isladder: ['关闭', '打开'],
+				isnotice:0,
+				noticeList:['关闭', '打开'],
+				cateTwo: [0, 0],
+				goodsInfo: {
+					type: '',
+					storeid: '',
+					id: '',
+					goods: {
+						lp_status: 0,
+						lp_set: [{
+							max: "",
+							price: "",
+							vip_price: ""
+						}]
+					}
+				},
+				phoneHight: null,
+				scrollHeight: null,
+				typeText: '抢购',
+				id: '',
+				startTime: '',
+				endTime: '',
+				graceEditorMenuShow1: false,
+				graceEditorTitle1: '',
+				graceEditorItems1: [],
+				graceEditorFoucsIndex1: 0,
+				graceEditorMenuShow: false,
+				graceEditorTitle: '',
+				graceEditorItems: [],
+				graceEditorFoucsIndex: 0,
+				isSpecBox: false,
+				placeholder: '开始输入...',
+				// editorCtx:''
+				richText: false,
+				noticeText: false,
+				richTextVter: '',
+				visible1: false,
+				visible2: false,
+				visible3: false,
+				flag: false,
+				ladderShow: false,
+				is_describe_tip:0,
+				newCateList: [],
+				newCateIndex: 0,
+				newCateText: '请选择商品分类'
+			};
+		},
+		onLoad(e) {
+			let _this = this;
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+			if (uni.getSystemInfoSync().system.indexOf('Android') === -1) {
+				_this.flag = true;
+			} else {
+				_this.flag = false;
+			}
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+					_this.scrollHeight = res.windowHeight - 30 + 'px';
+					_this.secollSpecHeight = res.windowHeight - 180 + 'px';
+				}
+			});
+			// if (!!e.type) {//商品类型是否可以重新选择
+			// 	_this.slectDis = true;
+			// } else {
+			// 	_this.slectDis = false;
+			// }
+			(_this.goodsInfo.type = e.type), (_this.goodsInfo.storeid = uni.getStorageSync('checkStoreid'));
+			(_this.goodsInfo.id = e.id), _this.init(_this.goodsInfo.type, uni.getStorageSync('checkStoreid'), _this.goodsInfo.id);
+			
+			if (!!e.cc_id) {
+				console.log(e.cc_id, '21324253463645')
+				_this.newTypeIndex = e.cc_id-1;
+				_this.goodsInfo.goods.cc_id = e.cc_id;
+			}
+		},
+		computed: {},
+		methods: {
+			changenotice(e) {
+				
+				this.goodsInfo['goods'].is_describe_tip = e.detail.value;
+				this.is_describe_tip = Number(e.detail.value);
+				console.log(e,this.goodsInfo['goods'].is_describe_tip);
+				this.flag= !this.flag;
+				this.flag= !this.flag;
+			},
+			changeladder(e) {
+				console.log(e);
+				this.isladderVel = e.detail.value;
+			},
+			cleanladder(index) {
+				this.goodsInfo.goods.lp_set.splice(index, 1)
+			},
+			addladder() {
+				let ladder = {
+					max: '',
+					price: '',
+					vip_price: ''
+				};
+				if (this.goodsInfo.goods.lp_set.length == 5) {
+					uni.showToast({
+						icon: 'none',
+						title: '最多设置5个阶梯价'
+					});
+					return
+				}
+				this.goodsInfo.goods.lp_set.push(ladder);
+			},
+			closelist(){
+				this.goodsInfo.goods.lp_set = [];
+				this.ladderShow = false;
+			},
+			closeladder() {
+				console.log(this.goodsInfo.goods.lp_set)
+				for (let i = 0; i < this.goodsInfo.goods.lp_set.length; i++) {
+					for (let key in this.goodsInfo.goods.lp_set[i]) {
+						if (!this.goodsInfo.goods.lp_set[i][key]) {
+							uni.showToast({
+								icon: 'none',
+								title: '请完善阶梯信息'
+							});
+							return
+						}
+					}
+					if (i > 0) {
+						console.log(this.goodsInfo.goods.lp_set[i].max, '111111111111111111', this.goodsInfo.goods.lp_set[i - 1].max)
+						if (Number(this.goodsInfo.goods.lp_set[i].max) < Number(this.goodsInfo.goods.lp_set[i - 1].max) || this.goodsInfo.goods.lp_set[i].max == this.goodsInfo.goods.lp_set[i - 1].max) {
+							App.showError("每一个阶梯销售量需大于上一个阶梯销售量");
+							return
+						}
+						console.log(this.goodsInfo.goods.lp_set[i].vip_price, '111111111111111111', this.goodsInfo.goods.lp_set[i - 1].vip_price)
+						if (Number(this.goodsInfo.goods.lp_set[i].vip_price) < Number(this.goodsInfo.goods.lp_set[i - 1].vip_price) || this.goodsInfo.goods.lp_set[i].vip_price == this.goodsInfo.goods.lp_set[i - 1].vip_price ) {
+							App.showError("每一个阶会员价需大于上一个会员价");
+							return
+						}
+						console.log(this.goodsInfo.goods.lp_set[i].price,'<<<<<',this.goodsInfo.goods.lp_set[i - 1].price)
+						if (Number(this.goodsInfo.goods.lp_set[i].price) < Number(this.goodsInfo.goods.lp_set[i - 1].price)) {
+							App.showError("每一个价格需大于或等于上一个价格");
+							return
+						}
+					}
+
+				};
+				this.ladderShow = false;
+			},
+			ladderPopShow() {
+				this.ladderShow = true;
+			},
+			onCancel() {},
+			noticeOk(res) {
+				console.log('shabi', res.html);
+				this.goodsInfo.goods.describe = res.html;
+				this.noticeText = false;
+			},
+			editOk(res) {
+				console.log('shabi', res.html);
+				this.richTextVter = res.html;
+				this.richText = false;
+			},
+			handlepeoplenum(e) {
+				let _this = this
+				console.info('peoplenum', Number(_this.goodsInfo.goods.peoplenum))
+				if (Number(_this.goodsInfo.goods.peoplenum) < 2) {
+					uni.showToast({
+						icon: "none",
+						title: '拼团人数最小为2',
+						duration: 2000
+					});
+					_this.goodsInfo.goods.peoplenum = 2
+				}
+			},
+			handleprice(e) {
+				let _this = this
+				_this.goodsInfo.goods.price = _this.goodsInfo.goods.price.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+			},
+			handlealoneprice(e) {
+				let _this = this
+				_this.goodsInfo.goods.aloneprice = _this.goodsInfo.goods.aloneprice.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+			},
+			handleoldprice(e) {
+				let _this = this
+				_this.goodsInfo.goods.oldprice = _this.goodsInfo.goods.oldprice.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+			},
+			handleretainage(e) {
+				let _this = this
+				_this.goodsInfo.goods.retainage = _this.goodsInfo.goods.retainage.match(/^\d*(\.?\d{0,2})/g)[0] || null;
+			},
+			dataTimeShow1() {
+				let _this = this;
+				// _this.$refs.dateTime.show();
+				_this.visible1 = !_this.visible1;
+			},
+			dataTimeShow2() {
+				let _this = this;
+				_this.visible3 = !_this.visible3;
+			},
+			dataTimeShow3() {
+				let _this = this;
+				// _this.$refs.dateTime2.show();
+				_this.visible2 = !_this.visible2;
+			},
+			checkStar(e) {
+				console.log(e);
+				// uni.showToast({
+				// 	title:e.result
+				// })
+				// alert(e.result);
+				let _this = this;
+				_this.starttimeText = e.result;
+				let time = _this.getDataTime(e.result);
+				_this.$set(_this.goodsInfo.goods, 'starttime', _this.getDataTime(e.result));
+				// _this.goodsInfo.goods.starttime = _this.getDataTime(e.result);
+			},
+			checkEnd(e) {
+				let _this = this;
+				_this.endtimeText = e.result;
+				_this.$set(_this.goodsInfo.goods, 'endtime', _this.getDataTime(e.result))
+				// _this.goodsInfo.goods.endtime = _this.getDataTime(e.result);
+			},
+			checkClose(e) {
+				let _this = this;
+				_this.closetimeText = e.result;
+				_this.$set(_this.goodsInfo.goods, 'cutofftime', _this.getDataTime(e.result))
+				// _this.goodsInfo.goods.cutofftime = _this.getDataTime(e.result);
+			},
+			// 时间转时间戳
+			getDataTime(timeValue) {
+				let ontime;
+				if (this.flag) {
+					ontime = timeValue.replace(/-/g, '/');
+				} else {
+					ontime = timeValue;
+				}
+				let date = new Date(ontime);
+				let time = date.getTime();
+				return time;
+			},
+			// 时间戳转时间
+			getTimeData(dataValue) {
+				let date = new Date(dataValue);
+				let Y = date.getFullYear().toString() + '-';
+				let M = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1).toString() + '-';
+				let D = (date.getDate() + 1 < 10 ? '0' + date.getDate() : date.getDate()).toString() + ' ';
+				let h = (date.getHours() + 1 < 10 ? '0' + date.getHours() : date.getHours()).toString() + ':';
+				let m = (date.getMinutes() + 1 < 10 ? '0' + date.getMinutes() : date.getMinutes()).toString() + ':';
+				let s = (date.getSeconds() + 1 < 10 ? '0' + date.getSeconds() : date.getSeconds()).toString();
+				let year = date.getFullYear().toString();
+				let month = (date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1).toString();
+				let day = (date.getDate() + 1 < 10 ? '0' + date.getDate() : date.getDate()).toString();
+				let hour = (date.getHours() + 1 < 10 ? '0' + date.getHours() : date.getHours()).toString();
+				let min = (date.getMinutes() + 1 < 10 ? '0' + date.getMinutes() : date.getMinutes()).toString();
+				let second = (date.getSeconds() + 1 < 10 ? '0' + date.getSeconds() : date.getSeconds()).toString();
+				let valueArry = [];
+				valueArry.push(year);
+				valueArry.push(month);
+				valueArry.push(day);
+				valueArry.push(hour);
+				valueArry.push(min);
+				valueArry.push(second);
+				return {
+					label: Y + M + D + h + m + s,
+					value: valueArry
+				};
+			},
+			closeOptions() {
+				let _this = this;
+				_this.optionsShow = false;
+				_this.isSpecBox = false;
+			},
+			optionsPopShow() {
+				let _this = this;
+				_this.optionsShow = true;
+				_this.isSpecBox = true;
+			},
+			// 提交规格
+			submitSpecs() {
+				let _this = this;
+				let ok = false;
+				let ok2 = false;
+				console.log(_this.specList);
+				for (let i = 0; i < _this.specList.length; i++) {
+					if (_this.specList[i].title == '' || _this.specList[i].items.length == 0) {
+						ok = false;
+						uni.showToast({
+							icon: 'none',
+							title: '请填写规格名称'
+						});
+						return;
+					} else if (_this.specList[i].title != '' || _this.specList[i].items.length != 0) {
+						for (let a = 0; a < _this.specList[i].items.length; a++) {
+							if (_this.specList[i].items[a].title != '') {
+								ok2 = true;
+							} else if (_this.specList[i].items[a].title == '') {
+								ok2 = false;
+								uni.showToast({
+									icon: 'none',
+									title: '请填写规格名称'
+								});
+								return;
+							}
+						}
+					}
+				}
+
+				function encode(str) {
+					// 对字符串进行编码
+					var arry = JSON.stringify(str);
+					let base = new _this.$util.Base64();
+					let encode = base.encode(arry);
+					return encode;
+				}
+				let spec = encode(_this.specList);
+				let options = [];
+				if (!!_this.goodsInfo.goods.options && _this.goodsInfo.goods.options.length != 0) {
+					options = encode(_this.goodsInfo.goods.options);
+				} else {
+					options = [];
+				}
+
+				let data = {
+					spec: spec,
+					options: options
+				};
+				App._post_form('&p=Store&do=specToOption', data, res => {
+					_this.goodsInfo.goods.options = res.data;
+					_this.goodsInfo.goods.spec = JSON.parse(JSON.stringify(_this.specList));
+					if (_this.goodsInfo.goods.spec.length != 0) {
+						_this.goodsInfo.goods.optionstatus = 1;
+						_this.specsText = '多规格';
+					} else if (_this.goodsInfo.goods.spec.length == 0) {
+						_this.goodsInfo.goods.optionstatus = 0;
+						_this.specsText = '单规格';
+					}
+
+					setTimeout(() => {
+						_this.specsShow = false;
+						_this.isSpecBox = false;
+					});
+					console.log()
+				});
+
+			},
+			// 添加子规格
+			addBranchSpecs(indexs) {
+				let _this = this;
+				console.info('specList', _this.specList);
+				let aa = {
+					id: 0,
+					title: ''
+				};
+				_this.specList[indexs].items.push(aa);
+			},
+			// 添加规格
+			addSpecs() {
+				let _this = this;
+				let aa = {
+					id: 0,
+					title: '',
+					items: []
+				};
+				_this.specList.push(aa);
+			},
+			closeSpecs() {
+				let _this = this;
+				_this.specList = JSON.parse(JSON.stringify(_this.goodsInfo.goods.spec));
+				_this.specsShow = false;
+				_this.isSpecBox = false;
+			},
+			specsPopShow() {
+				let _this = this;
+				_this.specsShow = true;
+				_this.isSpecBox = true;
+			},
+			// 添加规则
+			pushRule() {
+				let _this = this;
+				let obj = {
+					rule_pice: '',
+					rule_start: '',
+					rule_end: ''
+				};
+				_this.goodsInfo.goods.rules.push(obj);
+			},
+			// 关闭砍价弹框接口
+			closeRule() {
+				let _this = this;
+				_this.ruleShow = false;
+			},
+			// 打开砍价规则弹框
+			rulePopShow() {
+				let _this = this;
+				_this.ruleShow = true;
+			},
+
+			// 表单验证
+			submitTest(strings) {
+				let _this = this;
+				console.log(strings, 'shabiacao');
+				let adopt = true;
+				if (strings == '' || strings == 'null') {
+					adopt = false;
+					uni.showToast({
+						icon: 'none',
+						title: '请完善商品信息',
+						duration: 2000
+					});
+				}
+				return adopt;
+			},
+
+			// 提交
+			saveGoods() {
+				if ((this.goodsInfo.goods.grouptime == 0 || this.goodsInfo.goods.grouptime == '0:00') && this.goodsInfo.type ==
+					'fightgroup') {
+					uni.showToast({
+						title: '组团时间不能小于0',
+						icon: 'none'
+					});
+					return
+				};
+				// if(this.goodsInfo.goods.lp_status == 1 && )
+				let _this = this;
+				_this.bengF = 1;
+				setTimeout(() => {
+					_this.submitType = 0;
+				}, 3000)
+
+				if (_this.submitType === 1) return
+
+				function encode(str) {
+					// 对字符串进行编码
+					var arry = JSON.stringify(str);
+					let base = new _this.$util.Base64();
+					let encode = base.encode(arry);
+					return encode;
+				}
+				let data = {
+					aloneprice: _this.goodsInfo.goods.aloneprice,
+					type: _this.goodsInfo.type,
+					cc_id: _this.goodsInfo.goods.cc_id,
+					storeid: _this.goodsInfo.storeid,
+					id: _this.goodsInfo.id || '',
+					name: _this.goodsInfo.goods.name,
+					unit: _this.goodsInfo.goods.unit,
+					cateid: _this.goodsInfo.goods.cateid,// 旧商品分类
+					cc_child_id: _this.goodsInfo.goods.cc_child_id,// 新商品分类
+					starttime: _this.goodsInfo.goods.starttime,
+					endtime: _this.goodsInfo.goods.endtime,
+					thumb: _this.goodsInfo.goods.thumb,
+					thumbs: _this.goodsInfo.goods.thumbs,
+					optionstatus: _this.goodsInfo.goods.optionstatus,
+					price: _this.goodsInfo.goods.price,
+					oldprice: _this.goodsInfo.goods.oldprice,
+					retainage: _this.goodsInfo.goods.retainage,
+					appointment: _this.goodsInfo.goods.appointment,
+					tag: _this.goodsInfo.goods.tag,
+					op_one_limit: _this.goodsInfo.goods.op_one_limit,
+					num: _this.goodsInfo.goods.num,
+					usestatus: _this.goodsInfo.goods.usestatus,
+					expressid: _this.goodsInfo.goods.expressid,
+					cutoffstatus: _this.goodsInfo.goods.cutoffstatus,
+					cutofftime: _this.goodsInfo.goods.cutofftime,
+					cutoffday: _this.goodsInfo.goods.cutoffday,
+					describe: _this.goodsInfo.goods.describe,
+					detail: _this.goodsInfo.goods.detail,
+					status: _this.goodsInfo.goods.status,
+					spec: _this.goodsInfo.goods.spec,
+					options: _this.goodsInfo.goods.options,
+					rules: _this.goodsInfo.goods.rules,
+					helplimit: _this.goodsInfo.goods.helplimit,
+					dayhelpcount: _this.goodsInfo.goods.dayhelpcount,
+					joinlimit: _this.goodsInfo.goods.joinlimit,
+					onlytimes: _this.goodsInfo.goods.onlytimes,
+					grouptime: _this.goodsInfo.goods.grouptime,
+					peoplenum: _this.goodsInfo.goods.peoplenum,
+					detail: _this.richTextVter,
+					describe: _this.goodsInfo.goods.describe,
+					lp_status: _this.isladderVel,
+					is_describe_tip:_this.goodsInfo['goods'].is_describe_tip 
+				};
+				if (data.optionstatus == '0') {} else if (data.optionstatus == '1') {
+					data.spec = encode(data.spec);
+					data.options = encode(data.options);
+				}
+				if (data.type == 'bargain' && data.rules.length != 0) {
+					data.rules = encode(data.rules);
+				}
+				if (_this.isladderVel == 1 && _this.goodsInfo.type == 'rush') {
+					// _this.goodsInfo.goods.lp_set
+					for (let i = 0; i < _this.goodsInfo.goods.lp_set.length; i++) {
+						for (let k in _this.goodsInfo.goods.lp_set[i]) {
+							if (!_this.goodsInfo.goods.lp_set[i][k]) {
+								uni.showToast({
+									icon: 'none',
+									title: '请完善阶梯价信息'
+								});
+								return
+							}
+						}
+					};
+					data.lp_set = JSON.stringify(_this.goodsInfo.goods.lp_set);
+				}
+				console.log(_this.publicList);
+				// 公用验证
+				for (let i = 0; i < _this.publicList.length; i++) {
+					_this.adopt = _this.submitTest(data[_this.publicList[i]]);
+					if (_this.adopt == false) {
+						console.info('请求终止');
+						_this.bengF = 0;
+						return;
+					}
+				}
+				// if (data.type == 'rush' || data.type == 'groupon') {
+				// 	for (let i = 0; i < _this.rushList.length; i++) {
+				// 		_this.adopt = _this.submitTest(data[_this.rushList[i]]);
+				// 		if (_this.adopt == false) {
+				// 			console.info('请求终止');
+				// 			return;
+				// 		}
+				// 	}
+				// }
+				// if (data.type == 'fightgroup') {
+				// 	for (let i = 0; i < _this.fightgroupList.length; i++) {
+				// 		_this.adopt = _this.submitTest(data[_this.fightgroupList[i]]);
+				// 		if (_this.adopt == false) {
+				// 			console.info('请求终止');
+				// 			return;
+				// 		}
+				// 	}
+				// }
+				// if (data.type == 'bargain') {
+				// 	for (let i = 0; i < _this.bargainList.length; i++) {
+				// 		_this.adopt = _this.submitTest(data[_this.bargainList[i]]);
+				// 		if (_this.adopt == false) {
+				// 			console.info('请求终止');
+				// 			return;
+				// 		}
+				// 	}
+				// }
+				_this.submitType = 1;
+				App._post_form('&p=Store&do=saveGoods', data, res => {
+					if (res.errno === 0) {
+						App.showSuccess('保存成功', () => {
+							_this.submitType = 0;
+							// App.navigationTo({
+							// 	url: 'pages/subPages/merchant/merchantOrder/merchantOrder'
+							// });
+							uni.navigateBack({
+								delta: 1
+							})
+						})
+					}
+				});
+				setTimeout(() => {
+					_this.bengF = 0;
+				}, 1500)
+			},
+			// 选择二级分类
+			changeCateTwo(e) {
+				let _this = this;
+				console.info('value', e.detail.value);
+				_this.goodsInfo.goods.cateid = _this.cateList[e.detail.value[0]].id;
+				let twoList = _this.cateLists[1];
+				_this.goodsInfo.goods.cateid = twoList[e.detail.value[1]].id;
+				if (twoList[e.detail.value[1]].name == '暂无分类') {
+					_this.cateText = _this.cateList[e.detail.value[0]].name;
+				} else {
+					_this.cateText = _this.cateList[e.detail.value[0]].name + '|' + twoList[e.detail.value[1]].name;
+				}
+			},
+			// 删除规格
+			cleanSpecs(index, indexss, items, item) {
+				let _this = this;
+				if (indexss != undefined) {
+					_this.specList.map(itemss => {
+						if (itemss.title == item.title) {
+							itemss.items.map((nums, i) => {
+								if (nums.title == items.title) {
+									itemss.items.splice(i, 1);
+								}
+							})
+						}
+					})
+				} else {
+					console.info(2);
+					for (let i = 0; i < _this.specList.length; i++) {
+						if (i == index) {
+							_this.specList.splice(i, 1);
+
+						}
+					}
+				}
+			},
+			// 二级分类联动
+			// watchCateTwo(e) {
+			// 	let _this = this;
+			// 	let bArr = [];
+			// 	if (e.detail.column == 0) {
+			// 		for (let i = 0; i < _this.cateList.length; i++) {
+			// 			if (e.detail.value == i) {
+			// 				if (_this.cateList[i].twolevel.length != 0) {
+			// 					for (let a = 0; a < _this.cateList[i].twolevel.length; a++) {
+			// 						let bObj = {
+			// 							name: '',
+			// 							id: ''
+			// 						};
+			// 						bObj.name = _this.cateList[i].twolevel[a].name;
+			// 						bObj.id = _this.cateList[i].twolevel[a].id;
+			// 						bArr.push(bObj);
+			// 					}
+			// 				} else {
+			// 					let bObj = {};
+			// 					bObj = {
+			// 						name: '暂无分类',
+			// 						id: ''
+			// 					};
+			// 					bArr.push(bObj);
+			// 				}
+			// 				_this.cateLists.splice(1, 1, bArr);
+			// 				console.info(_this.cateLists);
+			// 			}
+			// 		}
+			// 	}
+			// },
+			changeStatus(e) {
+				let _this = this;
+				_this.status = e.detail.value;
+				_this.statusText = _this.statusList[e.detail.value].name;
+				_this.goodsInfo.goods.status = _this.statusList[e.detail.value].id;
+				console.info(_this.status);
+				console.info(_this.statusText);
+				console.info(_this.goodsInfo.goods.status);
+			},
+			changeCutoffstatus(e) {
+				let _this = this;
+				_this.cutoffstatus = e.detail.value;
+				_this.cutoffstatusText = _this.cutoffstatusList[e.detail.value].name;
+				_this.goodsInfo.goods.cutoffstatus = _this.cutoffstatusList[e.detail.value].id;
+			},
+			// 选择快递模板
+			changeExpress(e) {
+				let _this = this;
+				_this.expresse = e.detail.value;
+				_this.expresseText = _this.expressList[e.detail.value].name;
+				_this.goodsInfo.goods.expressid = _this.expressList[e.detail.value].id;
+			},
+			// 选择消费方式
+			changeUsestatus(e) {
+				let _this = this;
+				_this.goodsInfo.goods.usestatus = _this.usestatusList[e.detail.value].id;
+				_this.usestatusText = _this.usestatusList[e.detail.value].name;
+			},
+			// 选择标签
+			checkPresettags(item) {
+				let _this = this;
+				_this.presettagsText = '';
+				if (_this.goodsInfo.goods.tag.indexOf(item.id) != -1) {
+					for (let i = 0; i < _this.goodsInfo.goods.tag.length; i++) {
+						if (_this.goodsInfo.goods.tag[i] == item.id) {
+							_this.goodsInfo.goods.tag.splice(i, 1);
+							_this.presettagsArrary.splice(i, 1);
+						}
+					}
+				} else {
+					_this.goodsInfo.goods.tag.push(item.id);
+					_this.presettagsArrary.push(item.title);
+				}
+				if (_this.presettagsArrary.length == 0) {
+					_this.presettagsText = '请选择标签';
+				} else if (_this.presettagsArrary.length != 0) {
+					for (let i = 0; i < _this.presettagsArrary.length; i++) {
+						if (i != _this.presettagsArrary.length - 1) {
+							_this.presettagsText += _this.presettagsArrary[i] + '|';
+						} else if (i == _this.presettagsArrary.length - 1) {
+							_this.presettagsText += _this.presettagsArrary[i];
+						}
+					}
+				}
+			},
+			// 关闭标签弹窗
+			closePresettags() {
+				let _this = this;
+				_this.presettagsShow = false;
+			},
+			// 打开标签弹窗
+			showPresettagsPop() {
+				let _this = this;
+				_this.presettagsShow = true;
+			},
+			shownoticetext() {
+				this.noticeText = true;
+			},
+			showRichtext() {
+				this.richText = true;
+			},
+			closeImg(type, index) {
+				let _this = this;
+				if (type == 1) {
+					_this.thumb = '';
+					_this.goodsInfo.goods.thumb = '';
+				} else if (type == 2) {
+					for (let i = 0; i < _this.thumbs.length; i++) {
+						if (i == index) {
+							_this.thumbs.splice(i, 1);
+							_this.goodsInfo.goods.thumbs.splice(i, 1);
+						}
+					}
+				}
+			},
+			async updataImg(type, num) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+				     let res = await App.browser_upload(6);
+				     for (let i = 0; i < res.tempFilePaths.length; i++) {
+				     	let aa = await App._upLoad(res.tempFilePaths[i]);
+				     	if (type == 1) {
+				     		_this.thumb = aa.data.img;
+				     		_this.goodsInfo.goods.thumb = aa.data.img;
+				     	}
+				     	if (type == 2) {
+				     		_this.thumbs.push(aa.data.img);
+							_this.goodsInfo.goods.thumbs.push(aa.data.img);
+						}
+					}
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										if (type == 1) {
+											_this.thumb = res.data.img;
+											_this.goodsInfo.goods.thumb = res.data.img;
+										}
+										if (type == 2) {
+											_this.thumbs.push(res.data.img);
+											_this.goodsInfo.goods.thumbs.push(res.data.img);
+										}
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: num,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						console.info(res);
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.thumb = aa.data.img;
+								_this.goodsInfo.goods.thumb = aa.data.img;
+							}
+							if (type == 2) {
+								_this.thumbs.push(aa.data.img);
+								_this.goodsInfo.goods.thumbs.push(aa.data.img);
+							}
+						}
+					}
+				});
+				// #endif
+			},
+			changeCutofftime(e) {
+				let _this = this;
+				_this.goodsInfo.goods.cutofftime = e.detail.value;
+			},
+			// 更改商品分类
+			changeCate(e) {
+				let _this = this;
+				_this.cate = e.detail.value;
+				_this.goodsInfo.goods.cateid = _this.cateList[e.detail.value].id;
+				_this.cateText = _this.cateList[e.detail.value].name;
+			},
+			// 获取输入弹框返回值
+			returnText(e) {
+				let _this = this;
+				_this.goodsInfo.goods.name = e;
+				if (e != '') {
+					_this.goodsNameText = e;
+				} else if (e == '') {
+					_this.goodsNameText = '请输入商品名称';
+				}
+				_this.inputShow = false;
+			},
+			// 打开输入弹框
+			showInput(titleText) {
+				let _this = this;
+				_this.showTitleText = titleText;
+				_this.inputShow = true;
+			},
+			// 关闭输入弹框
+			closeInputPop() {
+				let _this = this;
+				_this.inputShow = false;
+			},
+			// 更改商品类型
+			changeType(e) {
+				let _this = this;
+				_this.cateLists = [];
+				_this.presettagsArrary = [];
+				_this.goodsInfo.cateid = '';
+				_this.type = e.detail.value;
+				_this.goodsInfo.type = _this.typeList[e.detail.value].value;
+				_this.cate = 0;
+				_this.cateTwo = [0, 0];
+				_this.cateText = '请选择商品分类';
+				_this.startValue = [];
+				_this.endValue = [];
+				_this.createGoods(_this.goodsInfo.type || '', _this.goodsInfo.storeid || '', _this.goodsInfo.id || '');
+			},
+			init(type, storeid, id) {
+				let _this = this;
+				_this.createGoods(type, storeid, id);
+			},
+			// 获取商品以及设置信息
+			createGoods(type, storeid, id) {
+				let _this = this;
+				console.info('type', type);
+				let data = {
+					type: _this.goodsInfo.type || type || '',
+					storeid: _this.goodsInfo.storeid || storeid || '',
+					id: _this.goodsInfo.id || id || ''
+				};
+				App._post_form('&p=Store&do=createGoods', data, res => {
+					// res.data.cultivate_class;
+					_this.goodsInfo['goods'] = res.data.goods;
+					
+					if(!_this.goodsInfo.goods.is_describe_tip){
+						_this.goodsInfo.goods.is_describe_tip = 0;
+					}else{
+						 _this.is_describe_tip = Number(_this.goodsInfo.goods.is_describe_tip);
+					}
+					// debugger
+					_this.isladderVel = res.data.goods.lp_status;
+					if (!_this.goodsInfo.goods.lp_status) {
+						_this.isladderVel = 0;
+					}
+					_this.richTextVter = res.data.goods.detail;
+					// _this.$set(_this.goodsInfo.goods,'detail',res.data.goods.detail);
+					if (res.data.goods.name) {
+						res.data.cate.map(item => {
+							if (item.id == res.data.goods.cateid) {
+								console.log(item.name);
+								_this.cateText = item.name;
+							}
+						})
+					}
+					// 处理类型列表
+					if (_this.typeList.length == 0) {
+						for (let i = 0; i < res.data.type.length; i++) {
+							let name = '';
+							if (res.data.type[i] == 'rush') {
+								name = '抢购';
+							} else if (res.data.type[i] == 'groupon') {
+								name = '团购';
+							} else if (res.data.type[i] == 'fightgroup') {
+								name = '拼团';
+							} else if (res.data.type[i] == 'bargain') {
+								name = '砍价';
+							}
+							let aa = {
+								name: name,
+								value: res.data.type[i]
+							};
+							_this.typeList.push(aa);
+						}
+					}
+					// 初始化商品类型
+					if (!!type) {
+						for (let i = 0; i < _this.typeList.length; i++) {
+							if (type == _this.typeList[i].value) {
+								_this.type = i;
+								_this.goodsInfo.type = _this.typeList[i].value;
+							}
+						}
+					} else if (type == undefined) {
+						console.info('type');
+						_this.type = 0;
+						console.info('typeList', _this.typeList);
+						_this.goodsInfo.type = _this.typeList[0].value;
+						_this.createGoods(_this.typeList[0].value, _this.storeid, _this.id)
+						return;
+					}
+					// 初始化新商品分类
+					if(_this.goodsInfo.goods.cc_id){
+						_this.newTypeList.map((item, index)=>{
+							if(_this.goodsInfo.goods.cc_id == item.cc_id){
+								_this.newTypeIndex = index;
+								_this.getNewCateList(index, '回填');// 初始化新商品二级分类
+							}
+						})
+					}else{
+						// _this.goodsInfo.goods.cc_id = _this.newTypeList[0].cc_id;
+					}
+					
+					// 处理时间
+					_this.goodsInfo.goods.starttime = res.data.goods.starttime * 1000;
+					_this.goodsInfo.goods.endtime = res.data.goods.endtime * 1000;
+					_this.goodsInfo.goods.cutofftime = res.data.goods.cutofftime * 1000;
+					// 处理商品图片
+					_this.thumb = res.data.goods.thumb;
+					_this.thumbs = JSON.parse(JSON.stringify(res.data.goods.thumbs));
+					// 处理规格
+					let specArry = JSON.stringify(res.data.goods.spec);
+					_this.specList = JSON.parse(specArry);
+					//处理分类列表
+					_this.cateList = res.data.cate;
+					_this.isladder = [{
+							name: '关闭'
+						},
+						{
+							name: '打开'
+						}
+					]
+					// 处理商品标签列表
+					_this.presettagsList = res.data.presettags;
+					// 处理快递模板列表
+					_this.expressList = res.data.express;
+
+
+					// 初始化商品名称
+					if (res.data.goods.name == '') {
+						_this.goodsNameText = '请输入商品名称';
+					} else if (res.data.goods.name != '') {
+						_this.goodsNameText = res.data.goods.name;
+					}
+
+					// 初始化商品分类
+					if (!res.data.goods.name) {
+						if (res.data.cate.length > 0) {
+							_this.cate = 0;
+							_this.goodsInfo.goods.cateid = res.data.cate[0].id;
+							_this.cateText = res.data.cate[0].name;
+						}
+					}
+
+					// 初始化活动开始结束时间
+					if (res.data.goods.starttime == '') {
+						_this.goodsInfo.goods.starttime = '';
+						_this.starttimeText = '请选择开始时间';
+						_this.startValue = [];
+					} else if (res.data.goods.starttime != '') {
+						_this.starttimeText = _this.getTimeData(res.data.goods.starttime).label;
+						let aa = _this.getTimeData(res.data.goods.starttime).value;
+						for (let i = 0; i < aa.length; i++) {
+							_this.startValue.push(aa[i]);
+						}
+						console.info('startValue', _this.startValue);
+					}
+					if (res.data.goods.endtime == '') {
+						_this.goodsInfo.goods.endtime = '';
+						_this.endtimeText = '请选择结束时间';
+						_this.endValue = [];
+					} else if (res.data.goods.endtime != '') {
+						_this.endtimeText = _this.getTimeData(res.data.goods.endtime).label;
+						let aa = _this.getTimeData(res.data.goods.endtime).value;
+						for (let i = 0; i < aa.length; i++) {
+							_this.endValue.push(aa[i]);
+						}
+					}
+
+					// 初始化截止时间
+					if (res.data.goods.cutofftime == '') {
+						_this.goodsInfo.goods.cutofftime = '';
+						_this.closetimeText = '请选择截止时间';
+						_this.endValue = [];
+					} else if (res.data.goods.endtime != '') {
+						_this.closetimeText = _this.getTimeData(res.data.goods.cutofftime).label;
+					}
+
+					//初始化商品规格
+					if (res.data.goods.optionstatus != '0') {
+						_this.specsText = '多规格';
+					} else if (res.data.goods.optionstatus == '0') {
+						_this.specsText = '单规格';
+					}
+
+					// 初始化商品标签
+					if (_this.goodsInfo.goods.tag.length == 0) {
+						_this.presettagsText = '请选择标签';
+					} else if (_this.goodsInfo.goods.tag.length != 0) {
+						for (let i = 0; i < res.data.goods.tag.length; i++) {
+							for (let a = 0; a < _this.presettagsList.length; a++) {
+								if (res.data.goods.tag[i] == _this.presettagsList[a].id) {
+									_this.presettagsArrary.push(_this.presettagsList[a].title);
+								}
+							}
+						}
+						for (let a = 0; a < _this.presettagsArrary.length; a++) {
+							if (a != _this.presettagsArrary.length - 1) {
+								_this.presettagsText += _this.presettagsArrary[a] + '|';
+							} else if (a == _this.presettagsArrary.length - 1) {
+								_this.presettagsText += _this.presettagsArrary[a];
+							}
+						}
+					}
+
+					// 初始化消费方式
+					if (res.data.goods.usestatus == '') {
+						_this.goodsInfo.goods.usestatus = _this.usestatusList[0].id;
+						_this.usestatusText = _this.usestatusList[0].name;
+						console.info('usestatus', _this.goodsInfo.goods.usestatus);
+						console.info('usestatusText', _this.usestatusText);
+					} else if (res.data.goods.usestatus != '') {
+						_this.goodsInfo.goods.usestatus = res.data.goods.usestatus;
+						_this.usestatusText = _this.usestatusList[res.data.goods.usestatus].name;
+					}
+
+					// 初始化截止时间类型
+					if (res.data.goods.cutoffstatus == 0) {
+						_this.goodsInfo.goods.cutoffstatus = 0;
+						_this.cutoffstatus = 0;
+						_this.cutoffstatusText = _this.cutoffstatusList[_this.cutoffstatus].name;
+					} else if (res.data.goods.cutoffstatus == 1) {
+						_this.goodsInfo.goods.cutoffstatus = 1;
+						_this.cutoffstatus = 1;
+						_this.cutoffstatusText = _this.cutoffstatusList[_this.cutoffstatus].name;
+					}
+
+					// 初始化快递模板
+					// expressid
+					if (res.data.goods.expressid == '') {
+						_this.express = 0;
+						_this.goodsInfo.goods.expressid = _this.expressList[0].id;
+						_this.expresseText = _this.expressList[0].name;
+					} else if (res.data.goods.expressid != '' && res.data.goods.expressid.length !== 0) {
+						for (let i = 0; i < _this.expressList.length; i++) {
+							if (res.data.goods.expressid == _this.expressList[i].id) {
+								_this.express = i;
+								_this.goodsInfo.goods.expressid = _this.expressList[i].id;
+								_this.expresseText = _this.expressList[i].name;
+							}
+						}
+					}
+					console.info('statusList', _this.statusList)
+					// 初始化商品状态
+					if (res.data.goods.status == '') {
+						_this.goodsInfo.goods.status = _this.statusList[0].id;
+						_this.statusText = _this.statusList[0].name;
+						_this.status = 0;
+					} else if (res.data.goods.status != '') {
+						let aa = Number(res.data.goods.status);
+						_this.goodsInfo.goods.status = _this.statusList[aa].id;
+						_this.statusText = _this.statusList[aa].name;
+						_this.status = aa;
+					}
+					
+					if (res.data.goods.type == 'rush' || _this.goodsInfo.type == 'rush') {
+						_this.priceText = '抢购价';
+					}
+					if (res.data.goods.type == 'groupon' || _this.goodsInfo.type == 'groupon') {
+						_this.priceText = '团购价';
+					}
+					if (res.data.goods.type == 'fightgroup' || _this.goodsInfo.type == 'fightgroup') {
+						_this.priceText = '组团价';
+					}
+					if (res.data.goods.type == 'bargain' || _this.goodsInfo.type == 'bargain') {
+						_this.priceText = '底价';
+					}
+					if (!_this.goodsInfo.goods.lp_set) {
+						_this.goodsInfo.goods.lp_set = [{
+							max: '',
+							price: '',
+							vip_price: ''
+						}];
+					}
+					
+				});
+			},
+			// 购买须知
+			showGraceEditorMenu1: function() {
+				this.graceEditorMenuShow1 = true;
+			},
+			graceEditorAddItem1: function(e) {
+				var _self = this;
+				this.graceEditorMenuShow1 = false;
+				var type = e.currentTarget.dataset.type;
+
+				if (type == 'img') {
+					uni.chooseImage({
+						success: function(e) {
+							var imgs = e.tempFilePaths;
+							for (let i = 0; i < imgs.length; i++) {
+								_self.graceEditorItems1.push({
+									type: type,
+									content: imgs[i],
+									status: 'needUpload'
+								});
+							}
+						}
+					});
+				} else if (type == 'link') {
+					this.graceEditorItems1.push({
+						type: type,
+						content: 'http://'
+					});
+				} else {
+					this.graceEditorItems1.push({
+						type: type,
+						content: ''
+					});
+				}
+			},
+			graceEditorInput1: function(e) {
+				var index = e.currentTarget.dataset.index;
+				var val = e.detail.value;
+				if (val == '') {
+					this.graceEditorItems1.splice(index, 1);
+					return;
+				} else {
+					this.graceEditorItems1[index].content = val;
+				}
+			},
+			deleteItem1: function(e) {
+				var _self = this;
+				var index = e.currentTarget.dataset.index;
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除项目吗?',
+					success: function(e) {
+						if (e.confirm) {
+							_self.graceEditorItems1.splice(index, 1);
+						}
+					}
+				});
+			},
+			// 收集数据并提交 包含图片上传
+			submit: function() {
+				// 分析临时图片然后上传
+				var tmpImgs = [];
+				for (let i = 0; i < this.graceEditorItems1.length; i++) {
+					if (this.graceEditorItems1[i].type == 'img' && this.graceEditorItems1[i].status == 'needUpload') {
+						tmpImgs.push(i);
+					}
+				}
+				if (tmpImgs.length > 0) {
+					this.upLoadImg1(0, tmpImgs);
+				}
+				// 没有图片项目直接提交
+				else {
+					this.getDataAndSubmit1();
+				}
+			},
+			// 收集数据提交
+			getDataAndSubmit1: function() {
+				if (this.graceEditorTitle1 == '') {
+					uni.showToast({
+						title: '请填写标题',
+						icon: 'none'
+					});
+					return;
+				}
+				if (this.graceEditorItems1.length < 1) {
+					uni.showToast({
+						title: '请填写内容',
+						icon: 'none'
+					});
+					return;
+				}
+				// 标题数据保存在 graceEditorTitle1 内
+				console.log('标题 : ' + this.graceEditorTitle1);
+				// 内容数据保存在 graceEditorItems1 内，可以将其序列化后发送给后端api
+				console.log('内容 : ' + this.graceEditorItems1);
+				//
+				console.log('内容 : ' + JSON.stringify(this.graceEditorItems1));
+			},
+			// 上传图片
+			upLoadImg1: function(step, tmpImgs) {
+				var _self = this;
+				uni.showLoading({
+					title: '图片上传中'
+				});
+				var uploadTask = uni.uploadFile({
+					url: 'https://unidemo.dcloud.net.cn/upload',
+					filePath: _self.graceEditorItems1[tmpImgs[step]].content,
+					fileType: 'image',
+					name: 'data',
+					success: function(uploadFileRes) {
+						console.log(uploadFileRes);
+						uploadFileRes = JSON.parse(uploadFileRes.data);
+						//图片上传成功后返回服务器端路径，记录这个路径
+						_self.graceEditorItems1[tmpImgs[step]].content = '上传成功服务器返回的图片地址,根据api情况自己写';
+						step++;
+						// 继续上传
+						if (step < tmpImgs.length) {
+							_self.upLoadImg1(step, tmpImgs);
+						}
+						// 图片上传成功，收集数据提交给 api后端
+						else {
+							_self.getDataAndSubmit1();
+						}
+					},
+					complete: function() {
+						uni.hideLoading();
+					}
+				});
+			},
+			gotoInfo: function() {
+				uni.navigateTo({
+					url: './editerInfo'
+				});
+			},
+			// 商品详情
+			showGraceEditorMenu: function() {
+				this.graceEditorMenuShow = true;
+			},
+			graceEditorAddItem: function(e) {
+				var _self = this;
+				this.graceEditorMenuShow = false;
+				var type = e.currentTarget.dataset.type;
+
+				if (type == 'img') {
+					uni.chooseImage({
+						success: function(e) {
+							var imgs = e.tempFilePaths;
+							for (let i = 0; i < imgs.length; i++) {
+								_self.graceEditorItems.push({
+									type: type,
+									content: imgs[i],
+									status: 'needUpload'
+								});
+							}
+						}
+					});
+				} else if (type == 'link') {
+					this.graceEditorItems.push({
+						type: type,
+						content: 'http://'
+					});
+				} else {
+					this.graceEditorItems.push({
+						type: type,
+						content: ''
+					});
+				}
+			},
+			graceEditorInput: function(e) {
+				var index = e.currentTarget.dataset.index;
+				var val = e.detail.value;
+				if (val == '') {
+					this.graceEditorItems.splice(index, 1);
+					return;
+				} else {
+					this.graceEditorItems[index].content = val;
+				}
+			},
+			deleteItem: function(e) {
+				var _self = this;
+				var index = e.currentTarget.dataset.index;
+				uni.showModal({
+					title: '提示',
+					content: '确定要删除项目吗?',
+					success: function(e) {
+						if (e.confirm) {
+							_self.graceEditorItems.splice(index, 1);
+						}
+					}
+				});
+			},
+			// 收集数据并提交 包含图片上传
+			submit: function() {
+				// 分析临时图片然后上传
+				var tmpImgs = [];
+				for (let i = 0; i < this.graceEditorItems.length; i++) {
+					if (this.graceEditorItems[i].type == 'img' && this.graceEditorItems[i].status == 'needUpload') {
+						tmpImgs.push(i);
+					}
+				}
+				if (tmpImgs.length > 0) {
+					this.upLoadImg(0, tmpImgs);
+				}
+				// 没有图片项目直接提交
+				else {
+					this.getDataAndSubmit();
+				}
+			},
+			// 收集数据提交
+			getDataAndSubmit: function() {
+				if (this.graceEditorTitle == '') {
+					uni.showToast({
+						title: '请填写标题',
+						icon: 'none'
+					});
+					return;
+				}
+				if (this.graceEditorItems.length < 1) {
+					uni.showToast({
+						title: '请填写内容',
+						icon: 'none'
+					});
+					return;
+				}
+				// 标题数据保存在 graceEditorTitle1 内
+				console.log('标题 : ' + this.graceEditorTitle);
+				// 内容数据保存在 graceEditorItems1 内，可以将其序列化后发送给后端api
+				console.log('内容 : ' + this.graceEditorItems);
+				//
+				console.log('内容 : ' + JSON.stringify(this.graceEditorItems));
+			},
+			// 上传图片
+			upLoadImg: function(step, tmpImgs) {
+				var _self = this;
+				uni.showLoading({
+					title: '图片上传中'
+				});
+				var uploadTask = uni.uploadFile({
+					url: 'https://unidemo.dcloud.net.cn/upload',
+					filePath: _self.graceEditorItems[tmpImgs[step]].content,
+					fileType: 'image',
+					name: 'data',
+					success: function(uploadFileRes) {
+						console.log(uploadFileRes);
+						uploadFileRes = JSON.parse(uploadFileRes.data);
+						//图片上传成功后返回服务器端路径，记录这个路径
+						_self.graceEditorItems[tmpImgs[step]].content = '上传成功服务器返回的图片地址,根据api情况自己写';
+						step++;
+						// 继续上传
+						if (step < tmpImgs.length) {
+							_self.upLoadImg(step, tmpImgs);
+						}
+						// 图片上传成功，收集数据提交给 api后端
+						else {
+							_self.getDataAndSubmit();
+						}
+					},
+					complete: function() {
+						uni.hideLoading();
+					}
+				});
+			},
+			gotoInfo: function() {
+				uni.navigateTo({
+					url: './editerInfo'
+				});
+			},
+			changeNewType(e){
+				let _this = this;
+				// _this.cateLists = [];
+				// _this.presettagsArrary = [];
+				// _this.goodsInfo.cateid = '';
+				_this.newTypeIndex = e.detail.value;
+				// _this.goodsInfo.type = _this.newTypeList[e.detail.value].value;
+				_this.goodsInfo.type = 'rush';
+				_this.goodsInfo.goods.cc_id = _this.newTypeList[e.detail.value].cc_id;
+				// _this.cate = 0;
+				// _this.cateTwo = [0, 0];
+				// _this.cateText = '请选择商品分类';
+				_this.startValue = [];
+				_this.endValue = [];
+				// _this.createGoods(_this.goodsInfo.type || '', _this.goodsInfo.storeid || '', _this.goodsInfo.id || '');
+				_this.getNewCateList(e.detail.value);
+			},
+			getNewCateList(index, type){
+				App._post_form(
+					`&p=cultivateClass&do=getCultivateClassChildList`,
+					{cc_id: this.newTypeList[index].cc_id},
+					res => {
+						if(res.data.length>0){
+							this.newCateList = res.data;
+							
+							if(this.goodsInfo.goods.cc_child_id && type == '回填'){
+								setTimeout(()=>{
+									this.newCateList.map((item, index)=>{
+										if(this.goodsInfo.goods.cc_child_id == item.id){
+											this.newCateIndex = index;
+											this.newCateText = this.newCateList[index].name;
+										}
+									})
+								}, 500)
+							}else{
+								this.newCateIndex = 0;
+								this.goodsInfo.goods.cc_child_id = '';
+								this.newCateText = '请选择商品分类';
+							}
+						}
+					},
+					false,
+					() => {}
+				);
+			},
+			changeNewCate(e){
+				this.newCateIndex = e.detail.value;
+				this.goodsInfo.goods.cc_child_id = this.newCateList[e.detail.value].id;
+				this.newCateText = this.newCateList[e.detail.value].name;
+			},
+		}
+	};
+</script>
+
+<style lang="less">
+	@import 'index.less';
+
+	.ruleTitle {
+		font-size: 28rpx;
+	}
+
+	.imgPreview {
+		display: inline-block;
+		overflow: hidden;
+		width: 157upx;
+		height: 157upx;
+		background: gray;
+		margin-right: 37upx;
+		margin-bottom: 10upx;
+		border-radius: 10upx;
+
+		>image {
+			width: 157upx;
+			height: 157upx;
+		}
+	}
+
+	.close {
+		width: 32upx !important;
+		height: 32upx !important;
+		position: relative;
+		bottom: 150upx;
+		left: 120upx;
+		z-index: 30;
+	}
+
+	.uploadButton {
+		width: 400upx;
+	}
+
+	.userImgUpdata {
+		display: inline-block;
+	}
+
+	.pointerNone {
+		pointer-events: none !important;
+	}
+</style>
diff --git a/pages/subPages/customer/customer.vue b/pages/subPages/customer/customer.vue
new file mode 100644
index 0000000..b59260b
--- /dev/null
+++ b/pages/subPages/customer/customer.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="customer">
+		<scroll-view :scroll-y="true" :style="{ height: phoneHeight }">
+			<view class="mainView marT30Auto textC">
+				<view class="title textC marT80Auto backImg" :style="{ background: 'url(' + backImg + ')' }"><text class="font30">在线咨询</text></view>
+				<view class="body marT50Auto" @click="checkImg">
+					<view class="p20">
+					<image :src="kfInfo.qrcode" class="qrCode"></image>
+					</view>
+				</view>
+				<view class=" textC marT50 marT50Auto">
+					<text class="font30 color333333">{{kfInfo.tel}}</text>
+				</view>
+				<view class="phoneButton textC marT19Auto" @click="kfPhone">
+					<text class="font22 lineHeight40 color333333">点击拨打电话</text>
+				</view>
+				<view class="marT30">
+					<text class="font24 color666666">长按保存二维码或者点击拔打电话</text>
+				</view>
+				<view>
+					<text class="font24 color666666">添加客服微信</text>
+				</view>
+				<view>
+					<text class="font24 color666666">我们会尽快回复您</text>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+export default {
+	data() {
+		return {
+			phoneHeight: null,
+			kfInfo:{}
+		};
+	},
+	computed: {
+		backImg() {
+			return this.imageRoot + 'zxzx.png';
+		}
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHeight = res.windowHeight + 'px';
+			}
+		});
+		_this.init();
+	},
+	methods:{
+		checkImg(){
+			let _this=this
+			let a=[]
+			a.push(_this.kfInfo.qrcode)
+			uni.previewImage({
+				urls:a
+			})
+		},
+		kfPhone(){
+			let _this=this
+			uni.makePhoneCall({
+			    phoneNumber: _this.kfInfo.tel //仅为示例
+			});
+		},
+		init(){
+			let _this=this
+			_this.CustomerService()
+		},
+		// 获取平台客户设置信息
+		CustomerService(){
+			let _this=this
+			let data={}
+			App._post_form('&do=CustomerService',data,res=>{
+				_this.kfInfo=res.data
+			})
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.customer {
+	font-size: 0;
+}
+.customer {
+	background: #eeeeee;
+}
+.mainView {
+	border: 1upx solid rgba(0, 0, 0, 0);
+	width: 690upx;
+	height: 840upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.marT30Auto {
+	margin: 30upx auto 0 auto;
+}
+.textC {
+	text-align: center;
+}
+.title {
+	width: 271upx;
+	height: 41upx;
+}
+.font30 {
+	font-size: 30upx;
+}
+.marT80Auto {
+	margin: 80upx auto 0 auto;
+}
+.backImg {
+	background-size: 100% !important;
+}
+.body {
+	width: 340upx;
+	height: 340upx;
+	border: 2upx solid rgba(255, 68, 68, 1);
+	border-radius: 10upx;
+}
+.marT50Auto {
+	margin: 50upx auto 0 auto;
+}
+.qrCode {
+	width: 300upx;
+	height: 300upx;
+}
+.phoneButton{
+	width:164upx;
+	height:40upx;
+	background:rgba(245,245,245,1);
+	border:1upx solid rgba(204,204,204,1);
+	border-radius:4upx;
+}
+.font30{
+	font-size: 30upx;
+}
+.lineHeight40{
+	line-height: 40upx;
+}
+.color333333{
+	color:rgba(51,51,51,1);
+}
+.font22{
+	font-size: 22upx;
+}
+.marT19Auto{
+	margin: 19upx auto 0 auto;
+}
+.font24{
+	font-size: 24upx;
+}
+.marT30{
+	margin: 30upx 0 0 0 ;
+}
+.color666666{
+	color:rgba(102,102,102,1);
+}
+.p20{
+	padding: 20upx;
+}
+</style>
diff --git a/pages/subPages/dealer/apply/apply.vue b/pages/subPages/dealer/apply/apply.vue
new file mode 100644
index 0000000..1f2aaf4
--- /dev/null
+++ b/pages/subPages/dealer/apply/apply.vue
@@ -0,0 +1,567 @@
+<template>
+	<view class="page" :style="{backgroundColor: bg_color}">
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header-bg" :style="{ 'background-image': ' url(' + imageRoot + 'hezuo.jpg)' }" v-if="adv.length == 0"></view>
+			<view class="header-bg" v-else>
+				<swiper class="swiper" :indicator-dots="true" indicator-active-color="#ffffff" :autoplay="true" :interval="2000" :duration="500">					<swiper-item v-for="(item, index) in adv" :key="index" >						<image :src="item" mode="aspectFill" style="width: 100%; height: 100%;"></image>					</swiper-item>				</swiper>
+			</view>
+			
+			<view class="apply-content">
+				<view class="rich-part m-btm40" v-if="choselead == '1'">
+					<view class="parse-richs">
+						<view class="title-content dis-flex flex-y-center flex-x-center">
+							<view class="t-c" style="flex: 0.2;padding-top: 10upx;">
+								<image :src="leaduser.avatar" style="width: 90upx;height: 90upx;border-radius: 50%;" mode=""></image>
+							</view>
+							<view  style="flex: 0.6;">
+								<view class="f-30" style="color: #333333;">
+									{{Array.isArray(leaduser)?'':leaduser.nickname}}
+								</view>
+								<view class="f-22" style="color: #999999;padding-top: 10upx;">
+									{{Array.isArray(leaduser)?'暂无上级':'当前上级'}}
+								</view>
+							</view>
+							<view  style="flex: 0.2;padding-right: 30upx;">
+								<view class="f-22" style="border-radius: 60upx;border: 1upx solid #CCCCCC;padding: 8upx 15upx;" @click="qieck">
+									切换<text class="iconfont icon-wangfandijia f-w" style="font-size: 28upx;padding: 0 10upx;color: #000000;"></text>
+								</view>
+							</view>
+						</view>
+						<!-- <view class="p-left-right-30"><wx-parse :content="appdetail"></wx-parse></view> -->
+					</view>
+					<!-- <view class="box-btm-shade"></view> -->
+				</view>
+				<view class="rich-part m-btm40">
+					<view class="parse-rich">
+						<view class="title-content dis-flex flex-y-center flex-x-center m-btm40">
+							<view class="title-iconLeft title-iconStyle" :style="{ 'background-image': ' url(' + imageRoot + 'titleRight.png)' }"></view>
+							<view class="f-30 col-3 m-left-right-20">申请{{ dealer_Info.fxstext }}说明</view>
+							<view class="title-iconRight title-iconStyle" :style="{ 'background-image': ' url(' + imageRoot + 'titleLeft.png)' }"></view>
+						</view>
+						<view class="p-left-right-30">
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+							show-with-animation use-anchor  :html="appdetail" ></jyf-parser>
+							<!-- <wx-parse :content="appdetail"></wx-parse> -->
+							</view>
+					</view>
+					<view class="box-btm-shade"></view>
+				</view>
+				<view class="withdraw-msg" v-if="rollstatus !== '3' && (!!list && list.length > 0)">
+					<view class="withdrawTop-style p-r"><view class="withdrawTop-style-with"></view></view>
+					<view class="withdraw-part">
+						<view class="withdraw-content">
+							<view class="title-content dis-flex flex-y-center flex-x-center m-btm50">
+								<view class="title-iconLeft title-iconStyle" :style="{ 'background-image': ' url(' + imageRoot + 'titleRight.png)' }"></view>
+								<view class="f-30 col-3 m-left-right-20">最近提现</view>
+								<view class="title-iconRight title-iconStyle" :style="{ 'background-image': ' url(' + imageRoot + 'titleLeft.png)' }"></view>
+							</view>
+							<view class="scroll">
+								<!-- <scroll-view :scroll-y="true" class="scroll-view">
+									<view class="withdraw-list">
+										<view class="withdraw-item dis-flex flex-y-center flex-x-between border-line border-bottom" v-for="(item,index) in list"
+										 :key="index">
+											<view class="withdrawerName col-3 f-24">{{item['nickname']}}</view>
+											<view class="withdrawerPrice col-9 f-24">申请提现￥{{item['applymoney']}}</view>
+										</view>
+									</view>
+								</scroll-view> -->
+								<swiper class="scroll-view" :interval="interval"  :vertical="true" :autoplay="true" :display-multiple-items="7">
+									<swiper-item v-for="(item, index) in list" :key="index" class="sizeSwiper">
+										<view class="swiper-item uni-bg-red">
+											<view class="withdraw-item dis-flex flex-y-center flex-x-between border-line border-bottom">
+												<view class="withdrawerName col-3 f-24">{{ item['nickname'] }}</view>
+												<view class="withdrawerPrice col-9 f-24">申请提现￥{{ item['applymoney'] }}</view>
+											</view>
+										</view>
+									</swiper-item>
+								</swiper>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<form @submit="applydealer" report-submit="true">
+				<view  style="position: fixed;bottom: 0rpx;width: 86%;margin-left: 7%;border-radius: 8rpx;z-index: 99;height: 120rpx;">
+					<view class="confirmApply">
+						<view class="Apply-button f-28 col-3 t-c f-w" :class="{ 'isapply-style': is_apply === 1 }">
+							{{ is_apply === 0 ? `申请${dealer_Info.fxstext}` : '已申请，请等待审核' }}
+							<button formType="submit"></button>
+						</view>
+						<view class="Apply-buttom-shade" v-if="is_apply === 0"></view>
+					</view>
+				</view>
+			</form>
+		</view>
+		<follow
+			:followShow="followShow"
+			:followType="followType"
+			:followTitleShow="followTitleShow"
+			@clickmask="openQrShow"
+			@closeFollowPop="closeFollowPop"
+			@closeFollowTitle="closeFollowTitle"
+		></follow>
+		<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		<PopManager :show="richText" type="center" @clickmask="richText = false">
+			<view class="cklius b-f" :style="{height: (slijuslist.length == 0)?'auto':'65vh'}" >
+				<view class="t-c f-30" style="padding: 10upx 0;">
+					切换上级
+				</view>
+				<view class="dis-flex" style="padding-top: 20upx;">
+					<view class="dis-flex" style="padding: 20upx;background-color: #F6F6F6;border-radius: 60upx;width: 80%;">
+						<text class="iconfont icon-search" style="padding-right: 10upx;color: #999999;line-height: 30upx;"></text><input type="text" v-if="richText" value="" placeholder="请输入上级昵称或MID搜索" placeholder-style="color:#999999;" style="width: 100%;" class="f-24" v-model="searchText" />
+					</view>
+					<view class="f-26 t-r" style="width: 15%;line-height: 72upx;" @click="search">
+						搜索
+					</view>
+				</view>
+				<view  style="padding: 30upx 0;overflow: auto;height: 35vh;" v-if="slijuslist.length > 0">
+					 <radio-group @change="radioChange">
+					<view class="dis-flex sahco" :style="{backgroundColor: (letradio == item.id)?'#f8f8f8':(leaduser.id == item.id)?'#f8f8f8':'#ffffff'}" v-for="(item,index) in slijuslist" :key="index">
+						<view  style="padding-left: 10upx;padding-top: 10upx;">
+							<image :src="item.avatar" style="width: 80upx;height: 80upx;border-radius: 50%;" mode="aspectFill"></image>
+						</view>
+						<view class="f-30" style="line-height: 100upx;padding-left: 20upx;width: 70%;">
+							{{item.nickname}}<text style="padding-left: 20upx;">MID:{{item.id}}</text>
+						</view>
+						<view  style="line-height: 100upx;">
+							<radio :value="item.id" :checked="(leaduser.id == item.id)" />
+						</view>
+					</view>
+					</radio-group>
+				</view>
+				<view  style="width: 100%;" v-if="slijuslist.length > 0">
+					<view class="t-c f-34" @click="syiuer" style="width: 100%; height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;line-height: 80upx;">
+						确认
+					</view>
+					 <view class="t-c f-34" @click="close" style="width: 100%; height: 80upx;background-color: #ffffff;color: #999999;border-radius: 60upx;line-height: 80upx;">
+					 	取消
+					 </view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import Loadlogo from '@/components/template/loadlogo';
+import follow from '@/components/template/follow.vue';
+import PhoneMask from '@/components/template/PhoneMask';
+import PopManager from '@/components/template/PopManager';
+import getvxphone from '@/components/template/getVXphone.vue'
+
+export default {
+	data() {
+		return {
+				show1: false,
+			followTitleShow: true,
+			followShow: false,
+			followType: '9',
+			appdetail: null, //富文本
+			loadlogo: false, //加载
+			list: null, //提现列表
+			rollstatus: null, // 1=真实数据；2=虚拟数据；3=关闭(为3时不显示提现记录)
+			is_apply: null, //申请状态
+			user_link: null, // 个人中心链接
+			interval: 400,
+			drshareInfo: {},
+			vxshow:false,
+			choselead:'0',
+			richText:false,
+			stopfoles:false,
+			searchText:'',
+			slijuslist:[],
+			leaduser:{},
+			current:null,
+			letradio:'',
+			dealer_Info:{},
+			bg_color:'',
+			adv:[]
+		};
+	},
+	onLoad(e) {},
+	components: {
+		jyfParser,
+		Loadlogo,
+		follow,
+		PhoneMask,
+		getvxphone,
+		PopManager
+	},
+	onShow() {
+		let pages = getCurrentPages();
+		console.log(pages);
+		if(pages.length == 1){
+			setTimeout(()=>{
+				this.getApplydetail();
+			},3000)
+		}else{
+			this.getApplydetail();
+		}
+		if (!!uni.getStorageSync('TextSubstitution')) {
+			this.dealer_Info = uni.getStorageSync('TextSubstitution');
+		}
+		
+	},
+	mounted() {
+		
+		// this.dealershareFc();
+	},
+	methods: {
+		syiuer(){
+			console.log(this.slijuslist,this.letradio)
+			this.slijuslist.map((item,index)=>{
+				if(item.id == this.letradio){
+					this.leaduser = item;
+					
+					this.richText = false;
+				}
+			})
+		},
+		close(){
+			this.richText = false;
+			this.letradio = '';
+		},
+		radioChange(evt){
+			this.letradio = evt.detail.value;
+        },
+		search(){
+			let _this = this;
+		App._post_form(
+			`&p=distribution&do=choselead&keyword=${_this.searchText}`,
+			{},
+			res => {
+				this.slijuslist = res.data;
+				if(this.slijuslist.length == 0){
+					uni.showToast({
+						title:'未查询到相关上级,请重新输入',
+						icon:'none'
+					})
+				}
+			},
+			false,
+			() => {
+				
+			}
+		);	
+		},
+		qieck(){
+			let _this = this;
+			this.richText = true;
+		},
+		showFalse(){
+			console.log('进了showfalse')
+			this.vxshow = false;
+		},
+		closePop1() {
+			let _this = this;
+			_this.show1 = false;
+		},
+		closeFollowTitle() {
+			let _this = this;
+			_this.followTitleShow = false;
+		},
+		closeFollowPop() {
+			let _this = this;
+			_this.followShow = false;
+		},
+		openQrShow() {
+			let _this = this;
+			_this.followShow = true;
+		},
+		dealershareFc() {
+			let getUserinfo = uni.getStorageSync('userinfo');
+			let agencyData = uni.getStorageSync('agencyData');
+			App.dealershareInfo(res => {
+				let shareInfo = {
+					title: res.data.title,
+					desc: res.data.desc,
+					imageUrl: res.data.img,
+					path: 'pages/subPages/dealer/index/index?head_id=' + getUserinfo.mid + '&aid=' + agencyData.aid
+				};
+				this.drshareInfo = shareInfo;
+			});
+		},
+		getApplydetail() {
+			let _this = this;
+			App._post_form(
+				'&p=distribution&do=applyCondition',
+				{},
+				res => {
+					if (!!uni.getStorageSync('TextSubstitution')) {
+						_this.dealer_Info = uni.getStorageSync('TextSubstitution');
+					}
+					if (res.errno === 0) {
+						if (res.data.is_dis === 1) {
+							App.navigationTo({
+								url: 'pages/subPages/dealer/index/index',
+								navType: 'rediRect'
+							});
+						}
+						if (!!res.data.status && res.data.status === '2') {
+							App.showError(`申请驳回原因:${res.data.reason}`);
+						}
+						_this.setData(res.data);
+						_this.letradio = res.data.leaduser.id;
+					}
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		applydealer(e) {
+			let _this = this;
+			let data = {
+				type: _this.followType
+			};
+			App._post_form('&do=Follow', data, res => {
+				if (res.data.status == '0') {
+					uni.showLoading({});
+					App.saveFormId(e.detail.formId);
+					App._post_form('&p=distribution&do=disApply',
+						{
+							head_id: uni.getStorageSync('head_id') || '',
+							choseleadid:_this.letradio || this.leaduser.id || ''
+						},
+						res => {
+							console.log(res);
+							if (res.data.state === 1) {
+								App.navigationTo({
+									url: 'pages/subPages/dealer/index/index',
+									navType: 'rediRect'
+								});
+							} else {
+								if (res.data.state === 2) {
+									App.navigationTo({
+										url: res.data.url
+									});
+								}
+								if (res.data.state === 3) {
+									App.showSuccess('申请成功,请等待审核', () => {
+										_this.is_apply = 1;
+									});
+								}
+							}
+						},
+						fail => {
+							console.info('fail',fail.data)
+							if (fail.data.data.mustmobile == 1) {
+								let _this = this;
+								//#ifdef H5
+								_this.show1 = true;
+								//#endif
+								//#ifndef H5
+								_this.vxshow = true;
+								//#endif
+								
+								// _this.show1 = true;
+							}else if(fail.data.data.state == 4){
+								App.navigationTo({
+									url: 'pages/mainPages/memberCard/getMembership/getMembership?card=nhave'
+								});
+							}else{
+								App.navigationTo({
+									url: 'pages/mainPages/index/index'
+								});
+							}
+						},
+						() => {
+							uni.hideLoading();
+						}
+					);
+				} else {
+					_this.followShow = true;
+				}
+			});
+		},
+		onShareAppMessage(e) {
+			return this.drshareInfo;
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+// .sizeSwiper{
+// 	height: 70upx !important;
+// }
+// .page {
+// 	background-color: #ff4444;
+// }
+.page /deep/ {
+	.uni-input-placeholder{
+		width: 500upx!important;
+	}
+	.uni-radio-input-checked{
+		background-color: #FF4444!important;
+		border-color: #FF4444!important;
+		height: 35upx;
+		width: 35upx;
+	}
+	.uni-input-wrapper{
+		width: 400upx!important;
+	}
+	uni-button{
+		line-height: 2;
+	}
+}
+
+.sahco{
+	padding: 10upx;
+	border-radius: 15upx;
+}
+
+.cklius{
+		padding: 30upx;
+		width: 75vw;
+		border-radius: 15upx;
+		position: relative;
+}
+	
+.container {
+	//头部背景图
+	.header-bg {
+		width: 100%;
+		height: 360upx;
+		background-size: 100% 360upx;
+		background-repeat: no-repeat;
+	}
+
+	//富文本内容样式
+	.rich-part {
+		padding: 0 44upx;
+
+		.parse-rich {
+			position: relative;
+			padding: 48upx 0;
+			background-color: #ffffff;
+			border-radius: 20upx;
+			z-index: 2;
+		}
+		
+		.parse-richs {
+			position: relative;
+			padding: 10upx 0;
+			background-color: #ffffff;
+			border-radius: 20upx;
+			z-index: 2;
+		}
+		.box-btm-shade {
+			position: relative;
+			border-radius: 20upx;
+			background-color: #d10000;
+			height: 40upx;
+			margin-top: -30upx;
+			z-index: 1;
+		}
+	}
+
+	//最近提现样式
+	.withdraw-msg {
+		//提现头部样式
+		.withdrawTop-style {
+			height: 30upx;
+			background-color: #d10000;
+			margin: 0 30upx;
+			border-radius: 16upx;
+			position: relative;
+			padding: 0 10upx;
+
+			.withdrawTop-style-with {
+				position: absolute;
+				background-color: #ab0000;
+				width: 96%;
+				height: 10upx;
+				border-radius: 6upx;
+				left: 50%;
+				top: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
+
+		//提现内容样式
+		.withdraw-part {
+			padding: 0 50rpx 200rpx 50rpx;
+
+
+			.withdraw-content {
+				padding: 50upx 30upx 30upx;
+				position: relative;
+				background-color: #ffffff;
+				margin-top: -12upx;
+				border-radius: 0 0 10upx 10upx;
+
+				//scroll滑动view
+				.scroll-view {
+					padding: 20upx;
+					height: 400upx;
+					background-color: #f6f6f6;
+					border-radius: 10upx;
+
+					.withdraw-list {
+						margin: 0 30upx;
+
+						.withdraw-item {
+							padding: 26upx 0;
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//标题图标左右样式
+	.title-content {
+		.title-iconStyle {
+			width: 64upx;
+			height: 44upx;
+			background-size: 64upx 44upx;
+			background-repeat: no-repeat;
+		}
+	}
+	
+	
+	
+	//确认按钮
+	.confirmApply {
+		// padding: 20upx 50upx 30upx;
+		.isapply-style {
+			color: #999999 !important;
+			background-color: #f6f6f6 !important;
+		}
+
+		.Apply-button {
+			position: relative;
+			background-color: #ffd74b;
+			padding: 25upx 0;
+			border-radius: 60upx;
+			z-index: 2;
+			// border: 2upx solid white;
+
+			button {
+				position: absolute;
+				left: 0;
+				right: 0;
+				top: 0;
+				bottom: 0;
+				opacity: 0;
+			}
+		}
+
+		.Apply-buttom-shade {
+			position: relative;
+			z-index: 1;
+			// top: 6upx;
+			height: 80upx;
+			background-color: #ffae00;
+			border-radius: 44upx;
+			margin-top: -70upx;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/dealer/client/client.vue b/pages/subPages/dealer/client/client.vue
new file mode 100644
index 0000000..9f4fe90
--- /dev/null
+++ b/pages/subPages/dealer/client/client.vue
@@ -0,0 +1,371 @@
+<template>
+	<!-- 客户 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header">
+				<view class="tabBar b-f dis-flex">
+					<view class="tabBar-item p-r f-24 col-9 t-c" :class="{'tabBar-active-text':currentTab === item.typeTab}" v-for="(item,index) in tabBar"
+					 @click="curtabBar(item.typeTab)">{{item.title}}
+						<view :class="{'active':currentTab === item.typeTab}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="content">
+				<view class="search-main m-top-btm40">
+					<view class="client-total dis-flex flex-y-center m-btm30">
+						<view class="f-24 col-9 m-right20">今日新增客户:{{day_number}}人</view>
+						<view class="f-24 col-9">合计:{{total_number}}人</view>
+					</view>
+					<view class="search-box dis-flex flex-y-center">
+						<view class="search-input p-left-right-30 ">
+							<input type="text" value="" placeholder="输入客户昵称查询" placeholder-style="color:#999999;" class="f-24" v-model="searchText" />
+						</view>
+						<view class="search-btn col-f f-24 t-c" @click="search">搜索</view>
+					</view>
+				</view>
+				<view class="invite-client b-f bor-radius-10upx">
+					<view class="client-list-box p-r" v-if="currentType!=='0'|| (!!list&&list.length>0)">
+						<view class="invite-title dis-flex flex-y-center flex-x-between padding-box-all border-line border-bottom">
+							<view class="f-28 col-3">累计邀请</view>
+							<view class="f-24 col-9" @click="typeMask = !typeMask">{{currentTypeT}}<text class="iconfont icon-unfold title-icon m-left10"></text></view>
+						</view>
+						<view class="formType" v-if="typeMask">
+							<view class="TypeItem f-24 t-c col-f" @click="selectUp(item)" v-for="(item,index) in paramType" :key="index">{{item.title}}</view>
+						</view>
+						<block v-if="!!list&&list.length>0">
+						<!-- #ifdef H5 -->
+						<view  class="scroll-viewH5"  >
+						<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view  class="scroll-view"  >
+							<!-- #endif -->
+								<view class="client-list">
+									<view class="client-item p-top-bom-30 m-left-right-30 dis-flex flex-y-center border-line border-bottom" v-for="(item,index) in list">
+										<view class="user-avatar m-right30" :style="{'background-image':'url('+item.avatar+')'}"></view>
+										<view class="user-detail">
+											<view class="dis-flex flex-y-center flex-x-between">
+												<view class="user-nickname f-28 col-3">{{item.nickname}}</view>
+												<view class="dealer-class f-24 dealer-class_3">{{item.lv_name}}</view>
+											</view>
+											<view class="binding-time f-24 col-9 m-top-btm10">推荐绑定时间：{{item.createtime}}</view>
+											<view class="client-price dis-flex flex-y-center flex-x-between">
+												<view class="f-24 col-9">累计赏金：￥{{!!item.commission?item.commission:'0.00'}}</view>
+												<view class="f-24 col-9">已购买{{item.order_number}}单</view>
+											</view>
+										</view>
+									</view>
+								</view>
+								<Loading v-if="!loading" />
+							</view>
+						</block>
+						<block v-else>
+							<view class="no-shop-image">
+								<view class="not-image"></view>
+								<view class="t-c f-28 m-top30 col-9">亲! 暂无相关人员哦~</view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import Loading from '@/components/template/loading'
+	export default {
+		data() {
+			return {
+				TextSubstitution:null,
+				currentTab: '0',
+				day_number: null, //今日用户数量
+				total_number: null, //总的用户数量
+				loadlogo: false, //页面是否加载完成,
+				loading: false, //列表加载更多
+				current_page: 1, //当前页数
+				searchText: '', //客户姓名
+				list: [], //我的客户列表
+				page_total: null, //总共页数
+				slide_Top: 0, // 滚动距离
+				tabBar: [{
+						title: '全部',
+						typeTab: '0',
+					},
+					{
+						title: '已下单',
+						typeTab: '1',
+					}, {
+						title: '未下单',
+						typeTab: '2',
+					},
+				],
+				paramType: [{
+						title: '全部类型',
+						paramtype: '0'
+					},
+					{
+						title: '普通下级',
+						paramtype: '1'
+					},
+					{
+						title: '下级分销商',
+						paramtype: '2'
+					}
+				],
+				currentTypeT: '全部类型',
+				currentType: "0",
+				typeMask: false
+			}
+		},
+		components: {
+			Loading,
+			Loadlogo
+		},
+		computed: {
+
+		},
+		onShow() {
+			
+		},
+		mounted() {
+			this.getClientList()
+		},
+		onLoad(){
+			let _this=this
+			_this.TextSubstitution=uni.getStorageSync('TextSubstitution');
+			_this.paramType[2].title='下级'+_this.TextSubstitution.fxstext
+		},
+		methods: {
+			//获取客户列表
+			getClientList(state = 0, page = 1, type = 0, isPage = false) {
+				let _this = this,
+					requestData = {
+						name: _this.searchText,
+						page,
+						state,
+						type
+					};
+				App._post_form('&p=distribution&do=myTeam', requestData, res => {
+					let ShopData = res.data;
+					console.log(ShopData)
+					if (isPage) {
+						if (ShopData.list.length > 0) {
+							_this["list"].push(...ShopData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData(ShopData);
+						_this.loading = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading();
+					_this.loadlogo = true;
+				})
+			},
+			//选项
+			curtabBar(current) {
+				let _this = this;
+				uni.showLoading({})
+				_this.slide_Top = 0;
+				_this.current_page = 1;
+				_this.currentTab = current;
+				_this.searchText = '';
+				_this.getClientList(current);
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				
+			},
+			// 搜索
+			search() {
+				uni.showLoading({})
+				this.current_page = 1;
+				this.currentTab = '0';
+				this.getClientList(this.currentTab);
+			},
+			selectUp(item) {
+				uni.showLoading({})
+				this.setData({
+					current_page: 1,
+					currentTypeT: item.title,
+					currentType: item.paramtype,
+					typeMask: false
+				})
+				this.getClientList(this.currentTab, 1, this.currentType);
+			}
+		},
+		onReachBottom() {
+			let _this = this;
+			if (_this.current_page >= _this.page_total) {
+				_this.loading = true;
+				return false;
+			}
+			_this.getClientList(_this.currentTab, ++_this.current_page, _this.currentType, true);
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #f7f7f7;
+	}
+
+	//头部
+	.header {
+
+		// 导航
+		.tabBar {
+			width: 100%;
+
+			.tabBar-active-text {
+				font-size: 30upx;
+				color: #333333;
+			}
+
+			.tabBar-item {
+				width: 33.33%;
+				height: 96upx;
+				line-height: 96upx;
+
+				.active {
+					position: absolute;
+					bottom: 0;
+					left: 50%;
+					transform: translateX(-50%);
+					background-color: #FF4444;
+					width: 50upx;
+					height: 8upx;
+					border-radius: 20upx;
+				}
+			}
+
+		}
+	}
+
+	//内容
+	.content {
+		padding: 0 30upx;
+
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					margin-right: 40upx;
+					background-color: #EEEEEE;
+					height: 60upx;
+					border-radius: 30upx;
+					flex: 1;
+
+					input {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.search-btn {
+					width: 90upx;
+					line-height: 60upx;
+					height: 60upx;
+					background: #FF4444;
+					border-radius: 30upx;
+				}
+			}
+		}
+
+		// 邀请列表
+		.invite-client {
+			.scroll-viewH5 {
+				height: 70vh;
+			}
+			.scroll-view {
+				height: 65vh;
+			}
+			.client-list-box {
+
+				//累计内容标题
+				.invite-title {
+					.title-icon {
+						font-size: 24upx;
+						color: #333333;
+					}
+				}
+
+				//累计用户列表
+				.client-list {
+					.client-item {
+						.user-avatar {
+							width: 90upx;
+							height: 90upx;
+							border-radius: 50%;
+							background-size: 90upx 90upx;
+							background-repeat: no-repeat;
+							flex-shrink: 0;
+						}
+
+						.user-detail {
+							flex: 1;
+
+							.dealer-class {
+								width: 150upx;
+								height: 40upx;
+								line-height: 40upx;
+								text-align: center;
+								border-radius: 18upx;
+							}
+
+							.dealer-class_1 {
+								color: #999999;
+								background-color: #EEEEEE;
+							}
+
+							.dealer-class_2 {
+								color: #FF4444;
+								background-color: #FFD3D3;
+							}
+
+							.dealer-class_3 {
+								color: #FF730D;
+								background-color: #FFDFC5;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//提示图
+
+	.no-shop-image {
+		.not-image {
+			margin: 20% auto 0;
+			width: 400upx;
+			height: 200upx;
+			background-image: url('https://s10.mogucdn.com/p2/161213/upload_27e7gegi3f9acl5e05f3951if5855_514x260.png');
+			background-size: 400upx 200upx;
+			background-repeat: no-repeat;
+		}
+	}
+
+	.formType {
+		position: absolute;
+		right: 4%;
+		top: 9%;
+		background-color: #c9c9c9;
+		z-index: 10;
+
+		.TypeItem {
+			padding: 16upx 10upx;
+		}
+	}
+</style>
diff --git a/pages/subPages/dealer/contactway/contactway.vue b/pages/subPages/dealer/contactway/contactway.vue
new file mode 100644
index 0000000..d3901c5
--- /dev/null
+++ b/pages/subPages/dealer/contactway/contactway.vue
@@ -0,0 +1,642 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<!-- 	<view class="boxTitle">
+			<view v-if="type == 1" class="check">
+				指导老师
+			</view>
+			<view v-else class="noCheck"  @click="checked(1)">
+				指导老师
+			</view>
+			<view v-if="type == 2" class="check">
+				我的微信
+			</view>
+			<view v-else class="noCheck" @click="checked(2)">
+				我的微信
+			</view>
+		</view> -->
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header-tabBar dis-flex border-line border-bottom p-r">
+				<view
+					class="tabBar-item p-top-bom-30 t-c p-r f-24 col-9"
+					:class="{ 'tabBar-activeText-size': item.tabType === current, 'tabBar-itemCenter': tabBar.length < 2 }"
+					v-for="(item, index) in tabBar"
+					:key="index"
+					@click="currentTabBar(item.tabType)"
+				>
+					{{ item.title }}
+					<view v-if="item.tabType === current" class="tabBar-active"></view>
+				</view>
+				<view class="cut-off"></view>
+			</view>
+			<view class="content" :style="{ 'background-image': 'url(' + imageRoot + 'contactway.png)' }">
+				<view class="content-top p-r" style="background-color: #FFFAEA;">
+					<block v-if="current === '1'">
+						<view class="content-avatar-box p-r">
+							<view class="user-avatar">
+								<image style="width: 100%;height: 100%;border-radius: 50%;" :src="head_info.avatar" v-if="!head_info.hidehead" mode=""></image>
+							</view>
+							<view class="avatar-title t-c f-24 p-r">{{ !head_info.hidehead ? `我的${ContactData.text_set.dstext}` : '社群信息' }}</view>
+							<view class="user-nickname f-28 col-3 t-c">{{ !head_info.hidehead ? head_info.nickname : head_info.title }}</view>
+						</view>
+					</block>
+					<block v-else-if="current === '3'">
+						<view class="content-avatar-box p-r">
+							<view class="user-avatar">
+								<!-- <image style="width: 100%;height: 100%;border-radius: 50%;" :src="comm_info.images" v-if="!head_info.hidehead" mode=""></image> -->
+							</view>
+							<view class="avatar-title t-c f-24 p-r">{{  '社群信息' }}</view>
+							<view class="user-nickname f-28 col-3 t-c">{{ comm_info.title }}</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="content-Wxavatar-box p-r t-c"><image :src="imgfixUrls + 'dealer_tool/wxcontact.png'" mode="" class="Wxavatar"></image></view>
+					</block>
+					<view class="content-title t-c f-24" :style="{ 'margin-top': current === '1' ? '-20px' : '' }">
+						{{ current === '1' ? ContactData.text_set.dsinfotext : ContactData.text_set.grinfotext }}
+					</view>
+				</view>
+				<view class="content-bottom" :style="head_info.type === 2 ? 'margin-top:80px' : 'margin-top:50px'">
+					<view class="content-input">
+						<block v-if="current === '1' && !head_info.hidehead">
+							<view class="content-input-style-1 p-top-bom-30 dis-flex flex-y-center">
+								<view class="f-24 col-9 m-right20">手机号</view>
+								<view class="f-24 col-3">{{ head_info.mobile }}</view>
+							</view>
+							<view class=" p-top-bom-30 dis-flex flex-y-center flex-x-between">
+								<view class="dis-flex flex-y-center">
+									<view class="f-24 col-9 m-right20">微信号</view>
+									<view class="f-24 col-3">{{ head_info.wechat_number }}</view>
+								</view>
+								<view class="copy f-24 t-c" @click="copy(head_info.wechat_number)">复制</view>
+							</view>
+						</block>
+						<block v-if="current === '2'">
+							<view class="content-input-style p-top-bom-30 dis-flex flex-y-center flex-x-between">
+								<view class="dis-flex flex-y-center">
+									<view class="f-24 col-9 flex-shrink m-right20">微信号</view>
+									<input type="text" :disabled="true" class="f-24 col-3 input-flex" :focus="isWxdisabled" v-model="user_info.wechat_number" />
+								</view>
+								<view class="copy f-24 t-c" @click="modif">{{ !!user_info.wechat_number ? '修改' : '设置' }}</view>
+							</view>
+							<view class="content-input-style p-top-bom-30 dis-flex flex-y-center flex-x-between">
+								<view class="f-24 col-9 m-right20">微信二维码</view>
+								<view class="copy f-24 t-c" @click="upImages">添加</view>
+							</view>
+						</block>
+						<!-- <block v-if="current === '3' && !comm_info.hidecomm">
+							<view class="content-input-style-1 p-top-bom-30 dis-flex flex-y-center">
+								<view class="f-24 col-9 m-right20">手机号</view>
+								<view class="f-24 col-3">{{ comm_info.mobile }}</view>
+							</view>
+							<view class=" p-top-bom-30 dis-flex flex-y-center flex-x-between">
+								<view class="dis-flex flex-y-center">
+									<view class="f-24 col-9 m-right20">微信号</view>
+									<view class="f-24 col-3">{{ comm_info.wechat_number }}</view>
+								</view>
+								<view class="copy f-24 t-c" @click="copy(comm_info.wechat_number)">复制</view>
+							</view>
+						</block> -->
+					</view>
+					<view class="wx-code-box p-r" @click="prevImages(comm_info.qrcode || comm_info.wechat_qrcode)">
+						<view
+							class="wx-code"
+							:style="{ 'background-image': 'url(' + head_info['wechat_qrcode'] + ')' }"
+							v-if="current === '1'"
+						></view>
+						<view class="wx-code" v-else-if="current === '2'" :style="{ 'background-image': 'url(' + user_info['wechat_qrcode'] + ')' }"></view>
+						<view class="wx-code" v-else-if="current === '3'" :style="{ 'background-image': 'url(' + comm_info['qrcode'] + ')' }"></view>
+					</view>
+					<view v-if="current === '3'" class="code-hint f-24 t-c">预览识别微信二维码</view>
+				</view>
+			</view>
+		</view>
+		<PopManager :show="Wxdisabled" type="center" @clickmask="Wxdisabled = false">
+			<view class="managerBox">
+				<input type="text" v-if="Wxdisabled" class="manage-input" v-model="manageInput" value="" placeholder="请输入微信号" />
+				<view class="btn-box">
+					<view class="btn-1" @click="close">取消</view>
+					<view class="btn" @click="amend">确定</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import h5Copy from '@/components/junyi-h5-copy/junyi-h5-copy.js';
+import PopManager from '@/components/template/PopManager';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	data() {
+		return {
+			type: '1',
+			current: '2',
+			tabBar: [],
+			Wxdisabled: false,
+			isWxdisabled: false,
+			loadlogo: false,
+			head_info: {}, //社群或分销商信息
+			user_info: {}, //个人信息
+			comm_info:{},//社群
+			manageInput: '',
+			ContactData: {}
+		};
+	},
+	components: {
+		Loadlogo,
+		PopManager
+	},
+	computed: {},
+	onShow() {},
+	mounted() {
+		uni.setNavigationBarColor({
+			frontColor: '#000000',
+			backgroundColor: '#FFFFFF'
+		});
+		this.getContactInfo();
+	},
+	methods: {
+		amend() {
+			let _this = this,
+				requestData = {
+					wechat_number: _this.manageInput
+				};
+
+			App._post_form(
+				'&p=distribution&do=setContactInformation',
+				requestData,
+				res => {
+					uni.showToast({
+						title: '修改成功'
+					});
+					this.getContactInfo();
+					this.Wxdisabled = !this.Wxdisabled;
+
+					console.log('success');
+				},
+				false,
+				() => {}
+			);
+		},
+		close() {
+			this.Wxdisabled = !this.Wxdisabled;
+			this.manageInput = '';
+		},
+		copy(item) {
+			// #ifdef H5
+			const result = h5Copy(item);
+			if (result === false) {
+				uni.showToast({
+					title: '不支持'
+				});
+			} else {
+				uni.showToast({
+					title: '复制成功',
+					icon: 'none'
+				});
+			}
+			// #endif
+
+			// #ifndef H5
+			uni.setClipboardData({
+				data: item
+			});
+			// #endif
+		},
+		// 导航切换
+		checked(type) {
+			let _this = this;
+			_this.type = type;
+		},
+		// 获取联系方式信息
+		getContactInfo() {
+			let _this = this;
+			App._post_form(
+				'&p=distribution&do=getContactInformation',
+				{},
+				res => {
+					if (res.errno === 0) {
+						// debugger
+						let ContactData = res.data;
+						// if(!ContactData.head_info){
+						// 	ContactData.head_info = {};
+						// }
+						let tabBar = [];
+						if (!ContactData.head_info.hidehead) {
+							tabBar.push({
+								title: `我的${ContactData.text_set.dstext}`,
+								tabType: '1'
+							});
+							_this.current = '1';
+						}
+						tabBar.push({
+							title: '我的微信',
+							tabType: '2'
+						});
+						if (!ContactData.comm_info.hidecomm) {
+							tabBar.push({
+								title: '我的社群',
+								tabType: '3'
+							});
+						};
+							_this.setData({
+								tabBar: tabBar
+							})
+						// if (ContactData.head_info) {
+						// 	let tabBar = [
+
+						// 		{
+						// 			title: '我的微信',
+						// 			tabType: '2'
+						// 		},
+						// 		{
+						// 			title: '我的社群',
+						// 			tabType: '3'
+						// 		}
+						// 	]
+						// 	_this.setData({
+						// 		tabBar: tabBar
+						// 	})
+						// } else {
+						// 	if (ContactData.head_info && ContactData.head_info.type == 3) {
+						// 		let tabBar = [{
+						// 			title: '我的微信',
+						// 			tabType: '2'
+						// 		}];
+						// 		_this.setData({
+						// 			tabBar: tabBar,
+						// 			current: "2"
+						// 		})
+						// 	}
+						// }
+						// #ifdef H5
+						wxApi.wxRegister();
+						// #endif
+						_this.setData(ContactData);
+						_this.ContactData = ContactData;
+					}
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		// 选项卡
+		currentTabBar(tabType) {
+			let _this = this;
+			_this.current = tabType;
+		},
+		// 输入框修改
+		modif() {
+			let _this = this;
+			_this.manageInput = _this.user_info.wechat_number;
+			_this.Wxdisabled = !_this.Wxdisabled;
+			_this.isWxdisabled = !_this.isWxdisabled;
+		},
+		// 预览图片
+		prevImages(ImageCode) {
+			uni.previewImage({
+				current: ImageCode,
+				urls: [ImageCode],
+				success: function() {
+					console.log('success');
+				}
+			});
+		},
+		uploadImageFiles(requestData) {
+			App._post_form(
+				'&do=uploadFiles',
+				requestData,
+				res => {
+					if (res.errno === 0) {
+						this.user_info['wechat_qrcode'] = res.data.img;
+						App._post_form(
+							'&p=distribution&do=setContactInformation',
+							{
+								wechat_qrcode: res.data.image
+							},
+							result => {
+								console.log('success');
+							}
+						);
+					}
+				},
+				false,
+				() => {
+					uni.hideLoading();
+				}
+			);
+		},
+		// 上传图片
+		async upImages() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+			     let res = await App.browser_upload(1);
+			    uni.showLoading();
+			    let imageUrl = res.tempFilePaths[0],
+			    	rnImageData = App._upLoad(imageUrl);
+			    rnImageData.then(options => {
+			    	let file = options.data,
+			    		requestData = {
+			    			wechat_qrcode: file.img
+			    		};
+			    	App._post_form(
+			    		'&p=distribution&do=setContactInformation',
+			    		requestData,
+			    		result => {
+			    			console.log('success');
+			    		},
+			    		false,
+			    		() => {
+			    			uni.hideLoading();
+			    		}
+			    	);
+			    	_this.user_info['wechat_qrcode'] = file.img;
+			    });
+				return
+			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						_this.uploadImageFiles(requestData);
+					} else {
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			uni.chooseImage({
+				count: 1, //默认9
+				sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: ['album'], //从相册选择
+				success: function(res) {
+					uni.showLoading();
+					let imageUrl = res.tempFilePaths[0],
+						rnImageData = App._upLoad(imageUrl);
+					rnImageData.then(options => {
+						let file = options.data,
+							requestData = {
+								wechat_qrcode: file.img
+							};
+						App._post_form(
+							'&p=distribution&do=setContactInformation',
+							requestData,
+							result => {
+								console.log('success');
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+						_this.user_info['wechat_qrcode'] = file.img;
+					});
+				},
+				fail: function() {
+					App.showError('上传失败');
+				}
+			});
+			// #endif
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+page {
+	background-color: #ffffff;
+}
+
+// .boxTitle {
+// 	display: flex;
+// 	justify-content: space-around;
+
+// 	.noCheck {
+// 		width: 160upx;
+// 		height: 80upx;
+// 		text-align: center;
+// 		line-height: 80upx;
+// 		box-sizing: border-box;
+// 	}
+
+// 	.check {
+// 		width: 160upx;
+// 		height: 80upx;
+// 		text-align: center;
+// 		line-height: 80upx;
+// 		border-bottom: 6upx solid #E6BA55;
+// 		box-sizing: border-box;
+// 	}
+// }
+
+.container {
+	.header-tabBar {
+		width: 100%;
+
+		.tabBar-activeText-size {
+			font-size: 30upx !important;
+			color: #333333 !important;
+		}
+
+		.tabBar-itemCenter {
+			margin: 0 auto;
+		}
+
+		.tabBar-item {
+			width: 50%;
+
+			.tabBar-active {
+				position: absolute;
+				left: 50%;
+				bottom: -2upx;
+				transform: translateX(-50%);
+				width: 30upx;
+				height: 6upx;
+				background-color: #ff4444;
+				border-radius: 6upx;
+				z-index: 3;
+			}
+		}
+
+		.cut-off {
+			position: absolute;
+			left: 50%;
+			top: 30%;
+			// transform: translate(-50%,-50%);
+			transform: scaleX(0.5);
+			transform-origin: 0 0;
+			width: 1px;
+			height: 40upx;
+			background-color: #eeeeee;
+		}
+	}
+
+	.content {
+		width: 550upx;
+		height: 970upx;
+		background-size: 550upx 970upx;
+		background-repeat: no-repeat;
+		margin: 100upx auto 0;
+
+		// 内容上面部分
+		.content-top {
+			padding: 0 70upx;
+
+			// 选项1
+			.content-avatar-box {
+				top: -60upx;
+
+				.user-avatar {
+					width: 120upx;
+					height: 120upx;
+					// border-radius: 50%;
+					background-size: 120upx 120upx;
+					background-repeat: no-repeat;
+					margin: 0 auto;
+				}
+
+				.avatar-title {
+					width: 120upx;
+					height: 40upx;
+					line-height: 40upx;
+					color: #fff6dd;
+					background-color: #e6ba55;
+					border-radius: 20upx;
+					top: -20upx;
+					margin: 0 auto;
+				}
+			}
+
+			// 选项2
+			.content-Wxavatar-box {
+				top: -60upx;
+
+				.Wxavatar {
+					width: 120upx;
+					height: 120upx;
+					border-radius: 50%;
+				}
+			}
+
+			// 内容标题
+			.content-title {
+				color: #d4a12a;
+			}
+		}
+
+		//内容下面部分
+		.content-bottom {
+			// margin-top: 100upx;
+
+			.code-hint {
+				color: #e6bb57;
+			}
+
+			// 输入框部分
+			.content-input {
+				margin: 0 50upx;
+
+				.content-input-style-1 {
+					border-bottom: 1px solid #ebc773;
+				}
+
+				.content-input-style {
+					border-bottom: 1px dashed #ebc773;
+
+					.input-flex {
+						// width: 50%;
+					}
+				}
+
+				.copy {
+					width: 60upx;
+					height: 30upx;
+					line-height: 30upx;
+					border: 1px solid #ebc877;
+					border-radius: 4upx;
+					color: #ebc773;
+					flex-shrink: 0;
+				}
+			}
+
+			// 二维码
+			.wx-code-box {
+				width: 300upx;
+				height: 300upx;
+				border: 4upx solid rgba(230, 186, 85, 1);
+				border-radius: 10upx;
+				margin: 50upx auto 30upx;
+
+				.wx-code {
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%, -50%);
+					width: 260upx;
+					height: 260upx;
+					background-repeat: no-repeat;
+					background-size: 260upx 260upx;
+				}
+			}
+		}
+	}
+}
+.managerBox {
+	width: 60vw;
+	padding: 30upx 60upx;
+	border-radius: 20upx;
+	background-color: #ffffff;
+	.manage-input {
+		font-size: 26upx;
+		border: 1upx solid #eeeeee;
+		padding: 15upx 30upx;
+		border-radius: 10upx;
+	}
+	.btn-box {
+		height: 100upx;
+		position: relative;
+		.btn {
+			width: 128upx;
+			height: 50upx;
+			line-height: 50upx;
+			font-size: 26upx;
+			text-align: center;
+			color: #ffffff;
+			background-color: #ff4444;
+			border-radius: 10upx;
+			position: absolute;
+			right: 0upx;
+			top: 70%;
+			transform: translateY(-50%);
+		}
+		.btn-1 {
+			width: 128upx;
+			height: 50upx;
+			line-height: 50upx;
+			font-size: 26upx;
+			text-align: center;
+			color: #ff4444;
+			background-color: #ffffff;
+			border: 1upx solid #ff4444;
+			border-radius: 10upx;
+			position: absolute;
+			left: 0upx;
+			top: 70%;
+			transform: translateY(-50%);
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/dealer/earnings/earnings.vue b/pages/subPages/dealer/earnings/earnings.vue
new file mode 100644
index 0000000..c61f8d2
--- /dev/null
+++ b/pages/subPages/dealer/earnings/earnings.vue
@@ -0,0 +1,278 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header" :style="{'background-image':'url('+imageRoot+'earnings.jpg)'}">
+				<view class="total-price-box">
+					<view class="total-title f-24 m-btm20">累计收益（元）</view>
+					<view class="total-price col-f f-48">{{dismoney}}</view>
+				</view>
+				<view class="dayMonth-total dis-flex flex-y-center flex-x-between m-btm50">
+					<view class="day-total">
+						<view class="total-title f-24 m-btm20">本日{{TextSubstitution.yjtext}}（元）</view>
+						<view class="total-price col-f f-36">{{day_money}}</view>
+					</view>
+					<view class="month-total">
+						<view class="total-title f-24 m-btm20">本月收益（元）</view>
+						<view class="total-price col-f f-36">{{month_money}}</view>
+					</view>
+				</view>
+				<view class="remark p-r t-c">
+					<view class="remark-title f-24">注：退款不结算{{TextSubstitution.yjtext}}</view>
+				</view>
+			</view>
+			<view class="content p-r">
+				<view class="commsion-list-box b-f">
+					<view class="commsion-list-title col-9 f-24 m-btm10">{{TextSubstitution.yjtext}}明细</view>
+					<block v-if="!!detail_list && detail_list.length>0">
+						<scroll-view scroll-y @scrolltolower="ReachBottom" @scroll="scrolly" :scroll-top="slide_Top" class="scroll-view">
+							<view class="commsion-list m-left-right-30">
+								<view class="list-item border-line border-bottom dis-flex flex-y-center flex-x-between dis-flex" v-for="(item,index) in detail_list"
+								 :key="index" @click="navgateTo(item)">
+								 <view  style="flex: 0.25;">
+								 	<image :src="item.avatar" mode="aspectFill" style="width: 125upx;height: 125upx;border-radius: 10upx;"></image>
+								 </view>
+									<view class="commsion-message t-l"  style="flex: 0.6;">
+										<view class="col-3 f-30 m-btm10">{{item.name}}</view>
+										<view class="col-9 f-24 m-btm10">{{item.reason}}</view>
+										<view class="col-9 f-24">{{item.createtime}}</view>
+									</view>
+									<view class="commsion-price f-32 col-3" style="flex: 0.15;" :class="{'AreWithdraw':item.type==='1'}">{{item.type==='1'?'+':'-'}}{{item.price}}</view>
+								</view>
+							</view>
+							<Loading v-if="!loading" />
+						</scroll-view>
+					</block>
+					<block v-else>
+						<view class="no-shop-image">
+							<view class="not-image"></view>
+							<view class="t-c f-28 m-top30 col-9">亲! 暂无相关数据哦~</view>
+						</view>
+					</block>
+				</view>
+				<block v-if="!!detail_list && detail_list.length>0">
+					<view class="remark-more p-r t-c" v-if="loading">
+						<view class="remark-title f-24 col-9">没有更多了</view>
+					</view>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from "@/common/js/app.js";
+	import Loadlogo from '@/components/template/loadlogo'
+	import Loading from '@/components/template/loading'
+	export default {
+		data() {
+			return {
+				loadlogo: false, //页面是否加载完成,
+				slide_Top: 0, // 滚动距离
+				current_page: 1, //当前页数
+				detail_list: [], //列表
+				loading: false, //列表加载更多
+				day_money: null, //日收益
+				month_money: null, //月收益
+				dismoney: null, //累计收益
+				type: null ,// 收益状态
+				TextSubstitution:{}
+			}
+		},
+		components: {
+			Loadlogo,
+			Loading
+		},
+		computed: {
+
+		},
+		onLoad() {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution')
+		},
+		onShow() {
+
+		},
+		mounted() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#FF5757'
+			})
+			this.getEarningInfo()
+		},
+		methods: {
+			//获取收益详情
+			getEarningInfo(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						page
+					};
+				App._post_form('&p=distribution&do=detailedCommission', requestData, (res) => {
+					let detailData = res.data;
+					if (isPage) {
+						if (detailData.detail_list.length > 0) {
+							_this["detail_list"].push(...detailData.detail_list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData(detailData)
+						_this.loading = detailData.detail_list.length === 0 || _this.current_page === detailData.page_total;
+						_this.page_total = detailData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading();
+					_this.loadlogo = true;
+				})
+			},
+			// 跳转
+			navgateTo(orderData) {
+				console.log(orderData)
+				if (Number(orderData.is_cash_withdrawal) > -1 && Number(orderData.disorderid) > -1) {
+					App.navigationTo({
+						url: `pages/subPages/dealer/withdraw/withdrawrecord?draw_id=${orderData.disorderid}`
+					})
+				} else if (!!orderData.orderno) {
+					App.navigationTo({
+						url: `pages/subPages/dealer/gener/gener?order_no=${orderData.orderno}`
+					})
+				}
+
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				let _this = this;
+				if (_this.current_page >= _this.page_total) {
+					_this.loading = true;
+					return false;
+				}
+				_this.getEarningInfo(++_this.current_page, true);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.container {
+
+		// 头部
+		.header {
+			height: 560upx;
+			background-size: 100% 560upx;
+			background-repeat: no-repeat;
+			padding: 0 50upx;
+
+			// 累计标题颜色
+			.total-title {
+				color: #FFC0C0;
+			}
+
+			// 累计金额
+			.total-price-box {
+				padding: 70upx 0;
+			}
+
+			// 备注
+			.remark {
+				color: #FFB5B5;
+
+				.remark-title::before {
+					content: " ";
+					position: absolute;
+					left: 7%;
+					top: 50%;
+					width: 140upx;
+					height: 2upx;
+					transform-origin: 0 0;
+					background: linear-gradient(90deg, rgba(255, 89, 89, 1) 0%, rgba(255, 164, 164, 1) 99%);
+				}
+
+				.remark-title::after {
+					content: " ";
+					position: absolute;
+					right: 7%;
+					top: 50%;
+					width: 140upx;
+					height: 2upx;
+					transform-origin: 0 0;
+					background: linear-gradient(-90deg, rgba(255, 89, 89, 1) 0%, rgba(255, 164, 164, 1) 99%);
+				}
+			}
+		}
+
+		// 列表内容
+		.content {
+			margin-top: -80upx;
+
+			// 没有更多备注
+			.remark-more {
+
+				.remark-title::before {
+					content: " ";
+					position: absolute;
+					left: 20%;
+					top: 50%;
+					width: 140upx;
+					height: 2upx;
+					transform-origin: 0 0;
+					background: linear-gradient(-90deg, rgba(153, 153, 153, 1) 0%, rgba(255, 255, 255, 0) 100%);
+				}
+
+				.remark-title::after {
+					content: " ";
+					position: absolute;
+					right: 20%;
+					top: 50%;
+					width: 140upx;
+					height: 2upx;
+					transform-origin: 0 0;
+					background: linear-gradient(90deg, rgba(153, 153, 153, 1) 0%, rgba(255, 255, 255, 0) 100%);
+				}
+			}
+
+			.commsion-list-box {
+				border-radius: 30upx 30upx 0 0;
+				padding: 50upx 0;
+
+				.commsion-list-title {
+					padding: 0 30upx;
+				}
+
+				//提示图
+
+				.no-shop-image {
+					.not-image {
+						margin: 20% auto 0;
+						width: 400upx;
+						height: 200upx;
+						background-image: url('https://s10.mogucdn.com/p2/161213/upload_27e7gegi3f9acl5e05f3951if5855_514x260.png');
+						background-size: 400upx 200upx;
+						background-repeat: no-repeat;
+					}
+				}
+
+				.scroll-view {
+					height: 560upx;
+					white-space: nowrap;
+
+					.commsion-list {
+						.list-item {
+							padding: 30upx 0;
+
+							.commsion-price.AreWithdraw {
+								color: #FF4444 !important;
+							}
+						}
+					}
+				}
+			}
+		}
+
+
+	}
+</style>
diff --git a/pages/subPages/dealer/gener/gener.vue b/pages/subPages/dealer/gener/gener.vue
new file mode 100644
index 0000000..4cdea19
--- /dev/null
+++ b/pages/subPages/dealer/gener/gener.vue
@@ -0,0 +1,383 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header">
+				<view class="tabBar b-f dis-flex">
+					<view class="tabBar-item p-r f-24 col-9 t-c" :class="{'tabBar-active-text':currentTab === item.typeTab}" v-for="(item,index) in tabBar"
+					 @click="curtabBar(item.typeTab)">{{item.title}}
+						<view :class="{'active':currentTab === item.typeTab}"></view>
+					</view>
+				</view>
+			</view>
+			<view class="content">
+				<view class="search-main m-top-btm40">
+					<view class="client-total m-btm30">
+						<view class="f-24 col-9 m-right20">退款 {{refunded_order}} 已结算 {{settled_order}} 未结算 {{unsettled_order}}</view>
+					</view>
+					<view class="search-box dis-flex flex-y-center">
+						<view class="search-input p-left-right-30 ">
+							<input type="number" value="" placeholder="输入订单号查询" placeholder-style="color:#999999;" class="f-24" v-model="searchText" />
+						</view>
+						<view class="search-btn col-f f-24 t-c" @click="search">搜索</view>
+					</view>
+				</view>
+				<block v-if="!!list && list.length>0">
+					<view class="order-list-box">
+						<view class="scroll-view" >
+							<view class="order-list">
+								<view class="order-item b-f bor-radius-10upx padding-box-all m-btm30" v-for="(item,index) in list">
+									<view class="user-detail p-r dis-flex flex-y-center">
+										<view class="user-avatar m-right30" :style="{'background-image':'url('+item.avatar+')'}"></view>
+										<view class="user-nickname">
+											<view class="f-24 col-9 scale-us m-btm10">下单用户</view>
+											<view class="f-24 col-3">{{item.nickname}}</view>
+											<view class="order-status f-24">{{item.status==='0'?orderStatus[3]['title']:(item.status==='1'? orderStatus[0]['title']:(item.status==='2'? orderStatus[1]['title']:orderStatus[2]['title']))}}</view>
+										</view>
+									</view>
+									<view class="order-goods dis-flex border-line border-bottom">
+										<view class="goods-image bor-radius-10upx m-right30" :style="{'background-image':'url('+item.goods_logo+')'}"></view>
+										<view class="goods-detail">
+											<view class="goods-title twolist-hidden col-3 f-24">{{item.goods_name}}</view>
+											<view class="f-24 col-9 goods-now-price">实付金额 ￥{{item.orderprice}}</view>
+											<view class="f-28 commission-price">{{dealer_Info.yjtext}} ￥{{item.commission}}</view>
+										</view>
+									</view>
+									<view class="order-detail">
+										<view class="order-number dis-flex flex-y-center flex-x-between">
+											<view class="col-9 f-24">订单号：{{item.orderno}}</view>
+											<view class="copy-btn t-c col-9 f-24" @click="copy_orderno(item.orderno)">复制</view>
+										</view>
+										<view class="f-24 col-9 m-top-btm20">支付时间：{{item.paytime}}</view>
+										<view class="f-24 col-9" v-if="!!item.use_time&&item.use_time.length>0">{{item.consumption_type===1?'收货时间':(item.consumption_type===2?'核销时间':'使用时间')}}：{{item.use_time[0]}}</view>
+									</view>
+								</view>
+							</view>
+							<load-more :isMore="loadingMore"></load-more>
+						</view>
+					</view>
+				</block>
+				<block v-else>
+					<noneMores></noneMores>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import loadMore from '@/components/template/loadmore.vue'
+	import noneMores from '@/components/template/nonemores.vue';
+	export default {
+		data() {
+			return {
+				currentTab: '0',
+				loadlogo: false, //页面是否加载完成,
+				loadingMore: false, //列表加载更多
+				current_page: 1, //当前页数
+				searchText: '', //搜索订单号
+				list: [], //我的推广商品列表
+				page_total: null, //总共页数
+				unsettled_order: null, //	未结算数量
+				settled_order: null, //	已结算数量
+				refunded_order: null, //退款数量
+				slide_Top: 0, // 滚动距离
+				tabBar: [{
+						title: '全部',
+						typeTab: '0',
+					},
+					{
+						title: '未结算',
+						typeTab: '1',
+					},
+					{
+						title: '已结算',
+						typeTab: '2',
+					},
+					{
+						title: '已退款',
+						typeTab: '3',
+					},
+				],
+				orderStatus: [{
+						title: '未结算',
+						Status: 'not'
+					},
+					{
+						title: '已结算',
+						Status: 'alerea'
+					},
+					{
+						title: '已退款',
+						Status: 'refund'
+					},
+					{
+						title: '暂未结算',
+						Status: 'settle'
+					}
+				]
+			}
+		},
+		onLoad(options) {
+			this.searchText = options.order_no;
+		},
+		components: {
+			loadMore,
+			Loadlogo,
+			noneMores
+		},
+		computed: {
+			dealer_Info() {
+				if (!!uni.getStorageSync('TextSubstitution')) {
+					return uni.getStorageSync('TextSubstitution')
+				}
+			}
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.getGenerList();
+		},
+		methods: {
+			//推广订单列表
+			getGenerList(state = 0, page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						order_no: _this.searchText || '',
+						page,
+						state,
+					};
+				App._post_form('&p=distribution&do=disOrder', requestData, res => {
+					let ShopData = res.data;
+					if (isPage) {
+						if (ShopData.list.length > 0) {
+							_this["list"].push(...ShopData.list);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData(ShopData)
+						_this.loadingMore = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading();
+					_this.loadlogo = true;
+				})
+			},
+			//选项
+			curtabBar(current) {
+				let _this = this;
+				uni.showLoading({})
+				_this.slide_Top = 0;
+				_this.current_page = 1;
+				_this.currentTab = current;
+				_this.searchText = '';
+				_this.getGenerList(current);
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+			},
+			//加载更多
+			ReachBottom() {
+				
+			},
+			// 搜索
+			search() {
+				uni.showLoading({})
+				this.current_page = 1;
+				this.currentTab = '0';
+				this.getGenerList(this.currentTab);
+			},
+			// 剪切板
+			copy_orderno(copyText) {
+				//#ifdef H5
+					App.clipboard(copyText);
+				//#endif
+				uni.setClipboardData({
+					data: copyText,
+					success: function(data) {
+						App.showSuccess('复制成功')
+					}
+				})
+			}
+		},
+		onReachBottom() {
+			debugger
+			let _this = this;
+			if (_this.current_page >= _this.page_total) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getGenerList(_this.currentTab, ++_this.current_page, true);
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #f7f7f7;
+	}
+
+	//头部
+	.header {
+
+		// 导航
+		.tabBar {
+			width: 100%;
+
+			.tabBar-active-text {
+				font-size: 30upx;
+				color: #333333;
+			}
+
+			.tabBar-item {
+				width: 25%;
+				height: 96upx;
+				line-height: 96upx;
+
+				.active {
+					position: absolute;
+					bottom: 0;
+					left: 50%;
+					transform: translateX(-50%);
+					background-color: #FF4444;
+					width: 50upx;
+					height: 8upx;
+					border-radius: 20upx;
+				}
+			}
+
+		}
+	}
+
+	//内容
+	.content {
+		padding: 0 30upx;
+
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					margin-right: 40upx;
+					background-color: #EEEEEE;
+					height: 60upx;
+					border-radius: 30upx;
+					flex: 1;
+
+					input {
+						width: 100%;
+						height: 100%;
+					}
+				}
+
+				.search-btn {
+					width: 90upx;
+					line-height: 60upx;
+					height: 60upx;
+					background: #FF4444;
+					border-radius: 30upx;
+				}
+			}
+		}
+
+		//订单列表内容
+		.order-list-box {
+			.scroll-view {
+				height: 70vh;
+
+				.order-list {
+					.order-item {
+
+						// 用户信息 订单状态
+						.user-detail {
+							.user-avatar {
+								width: 80upx;
+								height: 80upx;
+								background-repeat: no-repeat;
+								background-size: 80upx 80upx;
+								border-radius: 50%;
+								flex-shrink: 0;
+							}
+
+							.user-nickname {
+								.scale-us {
+									transform: scale(.95);
+								}
+
+								.order-status {
+									position: absolute;
+									right: 0;
+									top: 50%;
+									transform: translateY(-50%);
+									color: #FE504F;
+								}
+							}
+						}
+
+						// 订单商品
+						.order-goods {
+							padding: 30upx 0;
+
+							.goods-image {
+								width: 150upx;
+								height: 150upx;
+								background-repeat: no-repeat;
+								background-size: 150upx 150upx;
+								flex-shrink: 0;
+							}
+
+							.goods-detail {
+								.goods-title {
+									height: 2.6em;
+								}
+
+								.goods-now-price {
+									margin: 11upx 0 8upx;
+								}
+
+								.commission-price {
+									color: #FF4444
+								}
+							}
+						}
+
+						// 订单详情
+						.order-detail {
+							padding-top: 40upx;
+
+							.order-number {
+								.copy-btn {
+									width: 80upx;
+									height: 40upx;
+									line-height: 40upx;
+									border: 1px solid #BFBFBF;
+									border-radius: 8upx;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+
+
+	//提示图
+
+	.no-shop-image {
+		.not-image {
+			margin: 20% auto 0;
+			width: 400upx;
+			height: 200upx;
+			background-image: url('https://s10.mogucdn.com/p2/161213/upload_27e7gegi3f9acl5e05f3951if5855_514x260.png');
+			background-size: 400upx 200upx;
+			background-repeat: no-repeat;
+		}
+	}
+</style>
diff --git a/pages/subPages/dealer/index/index.vue b/pages/subPages/dealer/index/index.vue
new file mode 100644
index 0000000..8b53be4
--- /dev/null
+++ b/pages/subPages/dealer/index/index.vue
@@ -0,0 +1,981 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="pages-header p-r" :style="{'background-image':'url('+imageRoot+'delaer_bg.png)'}">
+				<view class="person-content dis-flex flex-y-center">
+					<view class="user-avatar m-right30" :style="{'background-image':'url('+detalsData.avatar+')'}"></view>
+					<view class="user-referrer-name">
+						<view class="dis-flex flex-y-center">
+							<view class="user-name col-f f-36 m-right20 nickname_text">{{detalsData.nickname}}
+							</view>
+							<view class="level-label f-24 col-3" v-if="detalsData.show_lv==='1'">{{detalsData.level_name}}</view>
+						</view>
+						<view  style=" font-size: 24upx; color: #FFFFFF;padding: 10upx 0;">
+							MID:{{userinfo.mid}}
+						</view>
+						<view class="referrer-name col-9 f-24"> <text>{{detalsData.mobile}}</text> </view>
+					</view>
+				</view>
+				<view class="distr-grade dis-flex flex-y-center" @click="navgateTo($event,'contactway')">
+					<image :src="imgfixUrls + 'dealer_tool/tutor.png'" mode="" class="tutor m-right10"></image>
+					<view class="f-24 col-3">我的{{detalsData.dstext}}<text class="iconfont icon-right"></text></view>
+				</view>
+			</view>
+			<view class="dealer-content p-r p-left-right-30">
+				<view class="withdraw-details">
+					<view class="may-withdraw-price m-btm30">
+						<view class="dis-flex flex-y-center flex-x-between">
+							<view class="price-port">
+								<view class="withdraw-title col-f f-24 m-btm10">可提现金额(元)</view>
+								<view class="col-f f-48">{{detalsData.nowmoney}}</view>
+							</view>
+							<view class="withdraw-btn t-c f-28 col-f" @click="navgateTo($event,'withdraw')">提现</view>
+						</view>
+					</view>
+					<view class="earnings-tab dis-flex p-r m-btm30">
+						<view class="earnings-tab-style t-c earnings-day">
+							<view class="earnings-price col-f f-24">{{detalsData.day_money}}</view>
+							<view class="col-f f-24">本日收益(元)</view>
+						</view>
+						<view class="earnings-tab-style t-c earnings-month">
+							<view class="earnings-price col-f f-24">{{detalsData.month_money}}</view>
+							<view class="col-f f-24">本月收益(元)</view>
+						</view>
+						<view class="earnings-tab-style t-c earnings-total">
+							<view class="earnings-price col-f f-24">{{detalsData.dismoney}}</view>
+							<view class="col-f f-24">累计收益(元)</view>
+						</view>
+					</view>
+					<view class="remark p-r t-c">
+						<view class="remark-title f-24">注：退款不结算{{dealer_Info.yjtext}}</view>
+					</view>
+					<view class="earnings-tab dis-flex p-r p-top-20" v-if="taxiType===1">
+						<view class="earnings-tab-style t-c earnings-day">
+							<view class="earnings-price col-f f-24">{{taxipay.today_money}}</view>
+							<view class="col-f f-24">今日收款({{taxipay.today_num}}笔)</view>
+						</view>
+						<view class="earnings-tab-style t-c earnings-month">
+							<view class="earnings-price col-f f-24">{{taxipay.month_money}}</view>
+							<view class="col-f f-24">本月收款({{taxipay.month_num}}笔)</view>
+						</view>
+						<view class="earnings-tab-style t-c earnings-total">
+							<view class="earnings-price col-f f-24">{{taxipay.all_money}}</view>
+							<view class="col-f f-24">累计收款({{taxipay.all_num}}笔)</view>
+						</view>
+					</view>
+				</view>
+				<view class="team-tab dis-flex b-f p-top-bom-30 p-r m-btm30">
+					<view class="team-item t-c flex-box team-item-ab" @click="navgateTo($event,'client')">
+						<view class="col-3 f-30">{{detalsData.team_total}}</view>
+						<view class="col-9 f-24">我的{{dealer_Info.xxtext}}</view>
+					</view>
+					<view class="team-item t-c flex-box" @click="goStore" v-if="shopShow">
+						<view class="col-3 f-30">{{detalsData.shop_total}}</view>
+						<view class="col-9 f-24">我的商户</view>
+					</view>
+					<view class="team-item t-c flex-box" @click="navgateTo($event,'gener')">
+						<view class="col-3 f-30">{{detalsData.order_total}}</view>
+						<view class="col-9 f-24">推广订单</view>
+					</view>
+				</view>
+				<view class="dealer-menu m-btm30" v-if="!detalsData.overtimeflag">
+					<view class="menu-style promote" @click="navgateTo($event,'setshop')" v-if="!detalsData.hidegoods" :data-url="detalsData.invitation_posters_link">
+						<view class="menu-style-bg" :style="{'background-image':'url('+imageRoot+'setshop.png)'}"></view>
+						<view class="f-30 col-3 m-btm20">推广商品</view>
+						<view class="f-24 col-9">推广商品赚赏金</view>
+					</view>
+					<view class="menu-style poster m-top-btm30" @click="navgateTo($event,'poster')" :data-url="detalsData.invitation_posters_link">
+						<view class="menu-style-bg" :style="{'background-image':' url('+imageRoot+'poster2.png)'}"></view>
+						<view class="f-30 col-3 m-btm20">{{dealer_Info.myposter}}</view>
+						<view class="f-24 col-9">分享海报邀请好友</view>
+					</view>
+					<view class="menu-style setShop" v-if="detalsData.salemerchant == 1" @click="setShopCli">
+						<view class="menu-style-bg" :style="{'background-image':' url('+imageRoot+'promote.png)'}"></view>
+						<view class="f-30 col-3 m-btm20">邀请开店</view>
+						<view class="f-24 col-9">邀请开店赚赏金</view>
+					</view>
+					<view class="menu-style promote m-top-btm30" v-if="detalsData.applytaxi == 1" @click="setCarCli">
+						<view class="menu-style-bg" :style="{'background-image':' url('+imageRoot+'myCar.png)'}"></view>
+						<view class="f-30 col-3 m-btm20">成为司机</view>
+						<view class="f-24 col-9">点击成为司机</view>
+					</view>
+				</view>
+				<view class="tool-tab bor-radius-10upx b-f">
+					<view class="tool-tab-title col-3 f-30 m-btm40">我的工具</view>
+					<view class="tool-list dis-flex">
+						<block v-for="(tool_item,index) in tool_list" :key="index">
+							<view class="tool-item flex-box t-c" @click="navgateTo($event,tool_item.item_navType)" v-if="tool_item.show">
+								<image class="tool-item-icon" :src="imgfixUrls + tool_item.item_icon" mode=""></image>
+								<view class="f-24 col-3">{{tool_item.item_name}}</view>
+							</view>
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" />
+		<!-- 邀请开店模态框 -->
+		<block v-if="setShopShow == true">
+			<view class="setShopMo" @click="cliShopFal">
+			</view>
+			<view class="centerMo" :style="{height:centerMoH.height}">
+				<view class="shopTitle" v-if="seeYou == 1">推广二维码</view>
+				<view class="tabTitle" v-if="seeYou == 2">
+					<view class="gongZ" :style="{color:setBackG.color,background:setBackG.background}" @click="wxCli">
+						小程序
+					</view>
+					<view class="wX" :style="{color:setBackW.color,background:setBackW.background}" @click="gongZcli">
+						公众号
+					</view>
+				</view>
+				<view class="shopImage" v-if="seeYou == 2">
+					<image :src="shopImage" style="width: 470upx;height: 650upx;"></image>
+				</view>
+				<view class="shopImage" v-if="seeYou == 1">
+					<image :src="shopImage" :style="{width: widthImg.height,height: widthImg.height}"></image>
+				</view>
+			</view>
+		</block>
+		<!-- 注册网约车模态框 -->
+		<block v-if="setCarShow == true">
+			<view class="setShopMo" @click="cliCarFal">
+			</view>
+			<view class="centerMo1" style="opacity: 1;">
+				<view class="shopTitle">成为网约车司机</view>
+				<view class="nameTit">
+					<view >姓名</view>
+					<input style="margin-left: 50upx;" type="text" value="" v-model="wyName" placeholder="请输入您的姓名" />
+				</view>
+				<view class="phoneTit">
+					<view >手机号</view>
+					<input style="margin-left: 20upx;" type="text" value="" v-model="wyPhone" placeholder="请输入您的手机号" />
+				</view>
+				<view class="carTit">
+					<view >车牌号</view>
+					<picker @change="bindPickerChange" :range="array" style="width: 100rpx;">
+						<label >{{array[index]}}</label>
+						<text class="iconfont icon-unfold"></text>
+					</picker>
+					<picker @change="bindPickerChange1" :range="array1" style="width: 100rpx;">
+						<label >{{array1[index1]}}</label>
+						<text class="iconfont icon-unfold"></text>
+					</picker>
+					<input type="text" value="" v-model="wyCar" placeholder="请输入车牌号码" />
+				</view>
+				<view class="phoneTit">
+					<view >所在公司</view>
+					<picker @change="bindPickerChange2" :range="array2" style="width: 400rpx;">
+						<label >{{array2[index2]}}</label>
+						<text class="iconfont icon-unfold"></text>
+					</picker>
+				</view>
+				<view class="submit" @click="submitForm">
+					提交
+				</view>
+			</view>
+		</block>
+		<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false">
+			<view  style="width: 80vw;height: 30vh;background-color: #FFFFFF;border-radius: 20upx;">
+				<view class="t-c f-36" style="color: #FF4444;padding: 20upx 0;">
+					温馨提示
+				</view>
+				<view class="f-32 t-c">
+					您的会员已过期,是否前往续费?<p/>
+					否则无法获取分销商{{TextSubstitution.yjtext}}
+				</view>
+				<view class="dis-flex" style="margin-top: 120upx;">
+					<view class="flex-box">
+						<view class="t-c f-30" @click="close" style="background-color: #CCCCCC;width: 200upx;margin: auto;border-radius: 60upx;height: 60upx;line-height: 60upx;">
+							取消
+						</view>
+					</view>
+					<view class="flex-box">
+						<view class="t-c f-30 col-f" @click="govip" style="background-color: #FF4444;width: 200upx;margin: auto;border-radius: 60upx;height: 60upx;line-height: 60upx;">
+							续费
+						</view>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+<script>
+	let times;
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	import PopManager from '@/components/template/PopManager'
+	let innerAudioContext = uni.createInnerAudioContext();
+	export default {
+		data() {
+			return {
+				wyPhone: '',
+				wyName: '',
+				wyCar: '',
+				array: ['京', '沪', '津', '渝', '黑', '吉', '辽', '蒙', '冀', '新', '沪', '甘', '青', '陕', '宁', '豫', '鲁', '晋', '皖', '鄂', '湘',
+					'苏', '川', '黔', '滇', '桂', '藏', '浙', '赣', '粤', '闽', '台', '琼', '港', '澳'
+				],
+				index: 0,
+				array1: ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
+					'V', 'W', 'X', 'Y', 'Z'
+				],
+				index1: 0,
+				array2: [],
+				newArry: [],
+				index2: 0,
+				carId: '',
+				seeYou: '',
+				province: '京',
+				letter: 'A',
+				setBackG: {
+					background: 'red',
+					color: 'white'
+				},
+				widthImg: {
+					height: '600rpx'
+				},
+				centerMoH: {
+					height: '600rpx'
+				},
+				setBackW: {
+					background: 'white',
+					color: 'black'
+				},
+				shopImage: '',
+				setShopShow: false,
+				setCarShow: false,
+				TextSubstitution: null,
+				taxiType: null,
+				taxipay: null,
+				detalsData: null,
+				loadlogo: false,
+				showCommunity:false,
+				shopShow: false,
+				tool_list: [{
+						item_type: 'total',
+						item_name: '收益明细',
+						item_icon: 'dealer_tool/total.png',
+						item_navType: 'earnings',
+						show: true
+					},
+					{
+						item_type: 'rank',
+						item_name: '排行榜',
+						item_icon: 'dealer_tool/rank.png',
+						item_navType: 'rank',
+						show: false
+					},
+					{
+						item_type: 'help',
+						item_name: '帮助说明',
+						item_icon: 'dealer_tool/help.png',
+						item_navType: 'help',
+						show: true
+					},
+					{
+						item_type: 'dealer',
+						item_name: '等级',
+						item_icon: 'dealer_tool/dealer.png',
+						item_navType: 'level',
+						show: false
+					},
+					{
+						item_type: 'erwei',
+						item_name: '收款二维码',
+						item_icon: 'dealer_tool/erweima.png',
+						item_navType: 'erwei',
+						show: false
+					},
+				],
+				drshareInfo: {},
+				imgs: '',
+				timeout: null,
+				userinfo: {},
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars,
+			PopManager
+		},
+		computed: {
+			dealer_Info() {
+				if (!!uni.getStorageSync('TextSubstitution')) {
+					return uni.getStorageSync('TextSubstitution')
+				}
+			}
+		},
+		onShow() {
+			this.getDealerInfo();
+		},
+		onHide() {
+			console.log('qqqqqqqqqqqq')
+			this.getVoice('time');
+		},
+		onUnload() {
+			console.log('1111111111')
+			this.getVoice('time');
+		},
+		onLoad() {
+			console.log('mounted')
+			this.imgs = this.imgfixUrl;
+			let pages = getCurrentPages();
+			this.userinfo = uni.getStorageSync('userinfo');
+			
+			console.log(this.userinfo, 'userinfo');
+			this.imgs = this.imgfixUrl;
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.tool_list[3].item_name = this.TextSubstitution.fxstext + '等级'
+		},
+		methods: {
+			govip(){
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/memberCard'
+				})
+			},
+			close(){
+				this.showCommunity = false;	
+			},
+			getVoice(od) {
+				if (this.taxiType !== 1) {
+					return
+				}
+				if (od == 'time') {
+					clearInterval(times);
+					return
+				}
+				times = setInterval(() => {
+					App._post_form('&p=taxipay&do=taxiNotice', {}, res => {
+						console.log(res);
+						if (res.data.status == 0) {
+							return
+						}
+						innerAudioContext.src = res.data.videourl;
+						//#ifdef H5
+						jWeixin.ready(() => {
+							jWeixin.getLocation({
+								type: 'gcj02',
+								success: function(res) {
+									innerAudioContext.play();
+								}
+							});
+						});
+						//#endif
+						//#ifndef H5
+						innerAudioContext.play()
+						//#endif
+						innerAudioContext.onPlay(() => {
+							console.log('开始播放');
+						});
+						setTimeout(() => {
+							innerAudioContext.onError((res) => {
+								console.log(res.errMsg);
+								console.log(res.errCode);
+							});
+						}, 1000)
+
+					})
+
+				}, 2000)
+			},
+			cliShopFal() {
+				this.setShopShow = false;
+			},
+			cliCarFal() {
+				this.setCarShow = false;
+			},
+			//提交,
+			submitForm() {
+				let _this = this;
+				if (_this.wyName == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确姓名',
+						duration: 1000
+					})
+					return false;
+				}
+				var myreg = /^[1][3,4,5,7,8][0-9]{9}$/;
+				if (!myreg.test(_this.wyPhone)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确手机号码',
+						duration: 1000
+					})
+					return false;
+				}
+
+				var myregH = /^[0-9a-zA-Z]+$/;
+				if (!myregH.test(_this.wyCar)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确车牌号',
+						duration: 1000
+					})
+					return false;
+				}
+				let requestBady = {
+					drivername: _this.wyName,
+					mobile: _this.wyPhone,
+					plate1: _this.province,
+					plate2: _this.letter,
+					plate_number: _this.wyCar,
+					cid: _this.carId || _this.newArry[0]
+				}
+				App._post_form('&p=taxipay&do=applyDriver', requestBady, res => {
+					if (res.errno == 0) {
+						_this.setCarShow = false;
+						uni.showToast({
+							title: '申请成功'
+						})
+						this.getDealerInfo();
+					}
+				})
+			},
+			bindPickerChange: function(e) { //改变的事件名
+
+				this.index = e.target.value
+				this.province = this.array[this.index];
+			},
+			bindPickerChange1: function(e) {
+				this.index1 = e.target.value
+				this.letter = this.array1[this.index1];
+			},
+			bindPickerChange2: function(e) {
+				this.index2 = e.target.value
+				this.carId = this.newArry[this.index2]
+			},
+			//开启网约模态
+			setCarCli() {
+				let _this = this;
+				_this.setCarShow = true;
+				_this.seeYou = 2;
+			},
+			gongZcli() {
+				let _this = this;
+				uni.showLoading({})
+				_this.setBackG.background = 'white';
+				_this.setBackG.color = 'black';
+				_this.widthImg.height = '700rpx';
+				_this.setBackW.background = 'red'
+				_this.setBackW.color = 'white'
+				_this.centerMoH.height = '900rpx'
+
+				App._post_form('&p=taxipay&do=driverQr', {}, res => {
+					_this.shopImage = res.data.h5qr;
+					uni.hideLoading();
+				})
+			},
+			wxCli() {
+				let _this = this;
+				_this.setBackG.background = 'red';
+				_this.widthImg.height = '700rpx';
+				_this.setBackG.color = 'white';
+				_this.setBackW.background = 'white'
+				_this.setBackW.color = 'black'
+				_this.centerMoH.height = '900rpx'
+				uni.showLoading({
+
+				})
+				App._post_form('&p=taxipay&do=driverQr', {}, res => {
+
+					_this.shopImage = res.data.wxappqr;
+					uni.hideLoading();
+				})
+			},
+			//邀请开店
+			setShopCli() {
+				let _this = this;
+				_this.setShopShow = true;
+				_this.seeYou = 1;
+				_this.widthImg.height = '350rpx'
+				_this.centerMoH.height = '600rpx'
+
+				uni.showLoading({
+
+				})
+				App._post_form('&p=salesman&do=getSaleQr', {}, res => {
+					_this.shopImage = res.data.imgurl;
+					uni.hideLoading();
+				})
+			},
+			// 跳转商家
+			goStore() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/myStore/myStore'
+				})
+			},
+			dealershareFc() {
+				let getUserinfo = uni.getStorageSync('userinfo');
+				let agencyData = uni.getStorageSync('agencyData');
+				App.dealershareInfo((res) => {
+					let shareInfo = {
+						title: res.data.title,
+						desc: res.data.desc,
+						imageUrl: res.data.img,
+						path: "pages/subPages/dealer/index/index?head_id=" + getUserinfo.mid + '&aid=' + agencyData.aid
+					}
+					this.drshareInfo = shareInfo;
+				})
+			},
+			getDealerInfo() {
+				let _this = this;
+				App._post_form('&p=distribution&do=distributorInfo', {}, res => {
+					if (res.errno === 0) {
+						if (!!res.data.type && res.data.type === 1) {
+							App.navigationTo({
+								url: 'pages/subPages/dealer/apply/apply',
+								navType: "rediRect"
+							})
+						} else {
+							if (this.userinfo.halfcardflag == 0 && res.data.overtimeflag == 1) {
+								this.showCommunity = true;
+							}
+							let newArry1 = [];
+							let newArry2 = [];
+							if (res.data.taxicom) {
+								res.data.taxicom.forEach((item) => {
+									newArry1.push(item.name);
+									newArry2.push(item.id)
+								})
+							}
+							_this.setData({
+								newArry: newArry2,
+								array2: newArry1,
+								detalsData: res.data,
+								shopShow: ((!!res.data.shop_switch && res.data.shop_switch === 1) && (!!res.data.shop_total && res.data.shop_total >
+									0)),
+								loadlogo: true,
+							})
+							if (_this.detalsData.taxiqr == 1) {
+								_this.tool_list[4].show = true;
+							}
+							if (!!res.data.taxipay) {
+								_this.setData({
+									taxipay: res.data.taxipay,
+									taxiType: 1
+								});
+								this.getVoice();
+							} else {
+								_this.setData({
+									taxiType: 0
+								})
+							}
+
+							if (res.data.show_lv == 0) {
+								_this.tool_list[3].show = false
+							} else {
+								_this.tool_list[3].show = true
+							}
+							if (res.data.rankshow == 0) {
+								_this.tool_list[1].show = false
+							} else {
+								_this.tool_list[1].show = true
+							}
+							_this.dealershareFc()
+						}
+					}
+				}, false, () => {})
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'contactway':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/contactway/contactway'
+						});
+						break;
+					case 'withdraw':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/withdraw/withdraw'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'earnings':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/earnings/earnings'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'erwei':
+						_this.wxCli();
+						_this.setShopShow = true;
+						_this.seeYou = 2;
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						App.navigationTo({
+							url: e.currentTarget.dataset.url
+						})
+						break;
+					case 'shops':
+						App.navigationTo({
+							url: e.currentTarget.dataset.url
+						})
+						break;
+				}
+			}
+		},
+		onShareAppMessage(e) {
+			return this.drshareInfo
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.submit {
+		width: 500upx;
+		height: 80upx;
+		background: rgb(255, 68, 68);
+		color: white;
+		text-align: center;
+		line-height: 80upx;
+		margin: 100upx 50upx 0 50upx;
+		border-radius: 10rpx;
+	}
+
+	.nameTit,
+	.phoneTit,
+	.carTit {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		margin-left: 16upx;
+		margin-top: 40upx;
+		font-size: 28rpx;
+
+		input {
+			width: 260upx;
+			color: black;
+			text-align: left;
+		}
+
+		view {
+			font-weight: 500;
+			color: rgba(51, 51, 51, 1)
+		}
+	}
+
+	.shopTitle {
+		margin-top: 50upx;
+		font-size: 32rpx;
+		font-weight: 500;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.centerMo1 {
+		width: 600upx;
+		height: 650upx;
+		position: fixed;
+		left: 50%;
+		top: 50%;
+
+		margin-top: -325upx;
+		margin-left: -300upx;
+		background: white;
+		text-align: center;
+		border-radius: 10rpx;
+	}
+
+	.setShopMo {
+		width: 100%;
+		height: 100%;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background: black;
+		opacity: .5;
+	}
+
+	.centerMo {
+		width: 548upx;
+		height: 700upx;
+		position: fixed;
+		left: 50%;
+		top: 50%;
+		transform: translateY(-10%);
+		margin-top: -350upx;
+		margin-left: -274upx;
+		background: white;
+		text-align: center;
+		border-radius: 15upx;
+
+		.tabTitle {
+			margin-top: 50upx;
+			width: 100%;
+			height: 50upx;
+			display: flex;
+			flex-wrap: wrap;
+			align-items: center;
+			margin-left: 120upx;
+
+			.gongZ,
+			.wX {
+				width: 156upx;
+				height: 64upx;
+				line-height: 64upx;
+
+			}
+
+			.gongZ {
+				border-radius: 32upx 0 0 32upx;
+			}
+
+			.wX {
+				border-radius: 0 32upx 32upx 0;
+			}
+		}
+
+		.shopImage image {
+			margin: 25upx;
+		}
+	}
+
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.nickname_text {
+		display: inline-block !important;
+		max-width: 250upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	.container {
+		background-color: #F7F7F7;
+		padding-bottom: 50upx;
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+
+			//个人-邀请人信息
+			.person-content {
+				padding: 94upx 40upx 0;
+
+				.user-avatar {
+					width: 100upx;
+					height: 100upx;
+					border-radius: 50%;
+					background-repeat: no-repeat;
+					background-size: 100upx 100upx;
+				}
+
+				.user-referrer-name {
+					.level-label {
+						background-color: #E7D4AA;
+						border-radius: 18upx;
+						padding: 0 16upx;
+					}
+				}
+			}
+
+			//分销等级
+			.distr-grade {
+				position: absolute;
+				right: 0;
+				top: 35%;
+				transform: translateY(-50%);
+				padding: 14upx 8upx 14upx 24upx;
+				background-color: #AEAEAE;
+				border-radius: 30upx 0 0 30upx;
+
+				text {
+					font-size: 24upx;
+				}
+
+				.tutor {
+					display: block;
+					width: 32upx;
+					height: 28upx;
+				}
+			}
+		}
+
+		// 详情内容
+		.dealer-content {
+			margin-top: -160upx;
+			padding-bottom: 120upx;
+
+			// 工具导航
+			.tool-tab {
+				padding: 50upx 0;
+
+				.tool-tab-title {
+					padding: 0 30upx;
+				}
+
+				.tool-item {
+					.tool-item-icon {
+						margin: 0 auto 20upx;
+						display: block;
+						width: 74upx;
+						height: 74upx;
+					}
+				}
+			}
+
+			// 菜单样式
+			.menu-style {
+				background-color: #ffffff;
+				position: relative;
+				padding: 40upx 30upx;
+				border-radius: 10upx;
+
+				.menu-style-bg {
+					width: 340upx;
+					height: 160upx;
+					background-repeat: no-repeat;
+					background-size: 340upx 160upx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					border-radius: 10upx;
+				}
+			}
+
+			// 团队tab
+			.team-tab {
+				width: 100%;
+				border-radius: 0 10upx 10upx 0;
+
+				.team-item-ab::before {
+					content: " ";
+					width: 2upx;
+					height: 38upx;
+					background-color: #EEEEEE;
+					position: absolute;
+					left: 50%;
+					top: 40%;
+					transform-origin: 0 0;
+					transform: scaleX(0.5);
+				}
+
+				// .team-item-ab::after {
+				// 	content: " ";
+				// 	width: 2upx;
+				// 	height: 38upx;
+				// 	background-color: #EEEEEE;
+				// 	position: absolute;
+				// 	right: 33.33%;
+				// 	top: 40%;
+				// 	transform-origin: 0 0;
+				// 	transform: scaleX(0.5);
+				// }
+			}
+
+			.withdraw-details {
+				background: linear-gradient(-70deg, rgba(255, 68, 68, 1), rgba(255, 94, 94, 1));
+				border-radius: 10upx 10upx 0 0;
+				padding: 40upx 0;
+
+				//收益
+				.earnings-tab {
+					.earnings-tab-style {
+						width: 33.33%;
+					}
+
+					.earnings-month::before {
+						content: " ";
+						width: 2upx;
+						height: 32upx;
+						background-color: #ffffff;
+						position: absolute;
+						left: 33.33%;
+						top: 25%;
+						transform-origin: 0 0;
+						transform: scaleX(0.5);
+						opacity: .5;
+					}
+
+					.earnings-month::after {
+						content: " ";
+						width: 2upx;
+						height: 32upx;
+						background-color: #ffffff;
+						position: absolute;
+						right: 33.33%;
+						top: 25%;
+						transform-origin: 0 0;
+						transform: scaleX(0.5);
+						opacity: .5;
+					}
+				}
+
+				.remark {
+					color: #FFB5B5;
+
+					.remark-title::before {
+						content: " ";
+						position: absolute;
+						left: 11%;
+						top: 50%;
+						width: 140upx;
+						height: 2upx;
+						transform-origin: 0 0;
+						background: linear-gradient(90deg, rgba(255, 89, 89, 1) 0%, rgba(255, 164, 164, 1) 99%);
+					}
+
+					.remark-title::after {
+						content: " ";
+						position: absolute;
+						right: 11%;
+						top: 50%;
+						width: 140upx;
+						height: 2upx;
+						transform-origin: 0 0;
+						background: linear-gradient(-90deg, rgba(255, 89, 89, 1) 0%, rgba(255, 164, 164, 1) 99%);
+					}
+				}
+
+				.may-withdraw-price {
+					padding: 0 30upx;
+
+					// 提现按钮
+					.withdraw-btn {
+						width: 120upx;
+						height: 60upx;
+						line-height: 60upx;
+						background-color: #FF6666;
+						border: 1px solid #ffffff;
+						border-radius: 30upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/dealer/level/level.vue b/pages/subPages/dealer/level/level.vue
new file mode 100644
index 0000000..6747eef
--- /dev/null
+++ b/pages/subPages/dealer/level/level.vue
@@ -0,0 +1,404 @@
+<template>
+	<!-- 等级说明 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="current-level">
+				<view class="user-level dis-flex flex-x-between flex-y-center">
+					<view class="user-info dis-flex flex-y-center">
+						<image :src="userinfo.avatar" class="user-avatar"></image>
+						<view class="user-name f-26 col-f">{{userinfo.nickname}}</view>
+					</view>
+					<view class="level-info dis-flex flex-y-center">
+						<image :src="imgfixUrls + 'level.png'" class="level-icon"></image>
+						<view class="level f-26 col-level">{{userlevel.name}}</view>
+					</view>
+				</view>
+				<view class="level-list" :style="{'transform': 'translateX('+(50 + 50*current)+'%)'}">
+					<view class="level-item" v-for="(item,index) in levelList" :key="index" @click="levelChange(index,item.id)">
+						<view class="dis-flex flex-dir-column flex-x-center flex-y-center">
+							<view class="level-dot"></view>
+							<image :src="imgfixUrls + 'vip.png'" class="level-vip" v-if="self_leave === item.id"></image>
+							<view class="level-text f-26" :class="[self_leave === item.id?'f-30 f-w':'f-26']">{{item.name}}</view>
+						</view>
+						<view class="item-line" v-if="index !== levelList.length - 1"></view>
+					</view>
+				</view>
+			</view>
+			<view class="upgrade-info b-f">
+				<part-loading ref="partLoading"></part-loading>
+				<view class="up-item" v-if="levelDetail">
+					<view class="up-title">{{TextSubstitution.yjtext}}比例</view>
+					<view class="up-content">	
+						<view class="commission-item dis-flex flex-y-center flex-x-between">
+							<view class="commission-left dis-flex flex-y-center">
+								<image :src="imgfixUrls + 'yongjin.png'" class="commission-icon"></image>
+								<view class="commission-text f-26">一级{{TextSubstitution.yjtext}}</view>
+							</view>
+							<view class="commission-right f-30 f-w">{{levelDetail.onecommission}}%</view>
+						</view>
+						<view class="commission-item dis-flex flex-y-center flex-x-between" v-if="levelDetail.hierarchy=='2'">
+							<view class="commission-left dis-flex flex-y-center">
+								<image :src="imgfixUrls + 'yongjin.png'" class="commission-icon"></image>
+								<view class="commission-text f-26">二级{{TextSubstitution.yjtext}}</view>
+							</view>
+							<view class="commission-right f-30 f-w">{{levelDetail.twocommission}}%</view>
+						</view>
+						<!-- 					<view class="commission-item dis-flex flex-y-center flex-x-between">
+						<view class="commission-left dis-flex flex-y-center">
+							<image :src="imgfixUrls + 'yongjin.png" class="commission-icon"></image>
+							<view class="commission-text f-26">三级佣金</view>
+						</view>
+						<view class="commission-right f-30 f-w">{{levelDetail.threecommission}}</view>
+					</view> -->
+					</view>
+				</view>
+				<view class="up-item" v-if="levelDetail.flag || levelDetail.flag1 || levelDetail.flag2 || levelDetail.flag3 || levelDetail.flag4 || levelDetail.flag5">
+					<view class="up-title dis-flex flex-x-between flex-y-end">
+						<view >升级条件</view>
+						<view class="col-9 f-24">满足以下条件</view>
+					</view>
+					<view class="up-content">
+						<!-- <view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">{{levelDetail.levelupstatus==0?`已结算总${TextSubstitution.yjtext}`:levelDetail.levelupstatus==1?'下级总人数':levelDetail.levelupstatus==2?'一级下级人数':levelDetail.levelupstatus==3?'下级'+TextSubstitution.fxstext+'总人数':levelDetail.levelupstatus==5?'自购订单金额':'一级'+TextSubstitution.fxstext+'人数'}}<text class="upstand-text">{{levelDetail.upstandard}}{{levelDetail.levelupstatus==0 || levelDetail.levelupstatus==5?'元':'人'}}</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance===0?'0':levelDetail.distance}}{{levelDetail.levelupstatus==0  || levelDetail.levelupstatus==5?'元':'人'}}</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance===0}">{{levelDetail.distance===0?"已完成":"未完成"}}</view>
+						</view> -->
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">{{`已结算总${TextSubstitution.yjtext}`}}<text class="upstand-text">{{levelDetail.upstandard}}元</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance}}元</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance==0}">{{levelDetail.distance==0?"已完成":"未完成"}}</view>
+						</view>
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag1==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">下级总人数<text class="upstand-text">{{levelDetail.upstandard1}}人</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance1}}人</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance1==0}">{{levelDetail.distance1==0?"已完成":"未完成"}}</view>
+						</view>
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag2==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">一级下级人数<text class="upstand-text">{{levelDetail.upstandard2}}人</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance2}}人</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance2==0}">{{levelDetail.distance2==0?"已完成":"未完成"}}</view>
+						</view>
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag3==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">{{'下级'+TextSubstitution.fxstext+'总人数'}}<text class="upstand-text">{{levelDetail.upstandard3}}人</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance3}}人</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance3==0}">{{levelDetail.distance3==0?"已完成":"未完成"}}</view>
+						</view>
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag4==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">{{'一级'+TextSubstitution.fxstext+'人数'}}<text class="upstand-text">{{levelDetail.upstandard4}}人</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance4}}人</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance4==0}">{{levelDetail.distance4==0?"已完成":"未完成"}}</view>
+						</view>
+						
+						<view class="condition-item border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="levelDetail.flag5==1">
+							<view class="condition-detail">
+								<view class="f-28 col-3 m-btm10">自购订单金额<text class="upstand-text">{{levelDetail.upstandard5}}元</text></view>
+								<view class="f-24 col-9">当前还差{{levelDetail.distance5}}元</view>
+							</view>
+							<view class="condition-status" :class="{'completed':levelDetail.distance5==0}">{{levelDetail.distance5==0?"已完成":"未完成"}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import PartLoading from "@/components/template/PartLoading.vue"
+	import Loadlogo from '@/components/template/loadlogo'
+	export default {
+		data() {
+			return {
+				userinfo: {}, //用户信息
+				current: -1,
+				self_leave: "1",
+				levelList: [], //分销商等级
+				levelDetail: {}, //当前分销等级详情
+				userlevel: {}, //用户分销等级
+				loadlogo: false,
+				TextSubstitution:null
+			};
+		},
+		components: {
+			PartLoading,
+			Loadlogo
+		},
+		computed: {
+
+		},
+		onLoad(options) {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#FF5454'
+			})
+			this.getLevelDetail()
+			this.TextSubstitution=uni.getStorageSync('TextSubstitution');
+		},
+		methods: {
+			getLevelDetail() {
+				let _this = this;
+				App._post_form('&p=distribution&do=disLvInfo', {}, res => {
+					let levelList = res.data.lv_list,
+						levelIndex = levelList.findIndex(item => item.id == res.data.dislevel),
+						userInfo = {
+							avatar: res.data.avatar,
+							nickname: res.data.nickname
+						},
+						levelDetail = res.data,
+						itemlevelData = null;
+					_this.levelList.splice(0, levelList.length, ...levelList);
+					levelIndex = levelIndex > 0 ? levelIndex : 0;
+					itemlevelData = levelList[levelIndex];
+					_this.setData({
+						self_leave: itemlevelData.id,
+						current: 0 - levelIndex,
+						userlevel: itemlevelData,
+						userinfo: userInfo,
+						levelDetail: levelDetail,
+						loadlogo: true
+					});
+
+					_this.$nextTick(function() {
+						_this.$refs.partLoading.showChange();
+					})
+				})
+			},
+			getLeaveData(leave_id) {
+				let _this = this;
+				App._post_form("&p=distribution&do=disLvInfo", {
+					id: leave_id
+				}, (res) => {
+					let levelDetail = res.data;
+					_this.levelDetail = levelDetail;
+					_this.$nextTick(function() {
+						_this.$refs.partLoading.showChange();
+					})
+				})
+			},
+			levelChange(index, leave_id = 0) {
+				this.$refs.partLoading.showChange();
+				this.current = 0 - index;
+				this.getLeaveData(leave_id);
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.col-level {
+		color: #BA721B;
+	}
+
+	.current-level {
+		overflow-x: hidden;
+		height: 370upx;
+		background: linear-gradient(-29deg, rgba(255, 68, 68, 1), rgba(255, 91, 91, 1));
+	}
+
+	.upgrade-info {
+		position: relative;
+		min-height: calc(100vh - 370upx + 60upx);
+		/* #ifdef H5 */
+		min-height: calc(100vh - 370upx + 60upx - 44px);
+		/* #endif */
+		border-radius: 30upx 30upx 0 0;
+		margin-top: -60upx;
+		padding: 40upx 30upx 0;
+		box-sizing: border-box;
+	}
+
+	.upgrade-info::after {
+		content: " ";
+		position: absolute;
+		top: -20px;
+		left: 50%;
+		transform: translateX(-50%);
+		border-width: 10px;
+		border-style: solid;
+		border-color: transparent transparent #FFFFFF transparent;
+	}
+
+	.upgrade-info>>>.part-loading {
+		top: 40upx;
+	}
+
+	.user-level {
+		padding-top: 40upx;
+	}
+
+	.user-info {
+		margin-left: 30upx;
+	}
+
+	.user-info .user-avatar {
+		width: 54upx;
+		height: 54upx;
+		display: block;
+		margin-right: 10upx;
+		border-radius: 50%;
+	}
+
+	.level-info {
+		height: 54upx;
+		background: #F6C115;
+		border-radius: 50px 0 0 50px;
+		padding: 0 24upx;
+	}
+
+	.level-info .level-icon {
+		width: 26upx;
+		height: 26upx;
+		display: block;
+		vertical-align: bottom;
+		margin-right: 10upx;
+	}
+
+	.level-list {
+		margin: 65upx 100upx 0;
+		white-space: nowrap;
+		transition: transform 400ms;
+	}
+
+	.level-item {
+		position: relative;
+		display: inline-block;
+		width: 50%;
+		transform: translateX(-50%);
+	}
+
+	.level-dot {
+		width: 20upx;
+		height: 20upx;
+		border-radius: 50%;
+		background: #FFF589;
+		margin-right: 0 auto;
+		border: 8upx solid #FF7755;
+		margin-bottom: 12upx;
+		position: relative;
+		z-index: 2;
+	}
+
+	.level-vip {
+		width: 59upx;
+		height: 65upx;
+		display: block;
+		margin-top: -60upx;
+		position: relative;
+		z-index: 3;
+	}
+
+	.level-text {
+		color: #FFC0C0;
+		margin-top: 10upx;
+	}
+
+	.level-text.active {}
+
+	.item-line {
+		position: absolute;
+		top: 12upx;
+		left: 0;
+		right: 0;
+		height: 10upx;
+		transform: translateX(50%);
+		background: #FF7755;
+	}
+
+	.up-title {
+		color: #333333;
+		font-size: 30upx;
+		font-weight: bold;
+		margin-bottom: 40upx;
+	}
+
+	.up-title.dis-flex {
+		margin-bottom: 0;
+	}
+
+	.up-content {
+		padding-bottom: 40upx;
+	}
+
+	.up-title .col-9 {
+		font-weight: normal;
+	}
+
+	.commission-item {
+		height: 80upx;
+		background: rgba(255,166,166,0.2);
+		padding: 0 25upx;
+		border-radius: 20upx;
+		margin-bottom: 20upx;
+	}
+
+	.commission-left .commission-icon {
+		width: 36upx;
+		height: 36upx;
+		display: block;
+		margin-right: 20upx;
+	}
+
+	.commission-text {
+		color: #FF4444;
+	}
+
+	.commission-right {
+		color: #EB0000;
+	}
+
+	.condition-item {
+		min-height: 160upx;
+	}
+
+	.upstand-text {
+		color: rgb(255, 82, 82);
+	}
+
+	.condition-status {
+		width: 123upx;
+		height: 58upx;
+		line-height: 58upx;
+		background: rgba(246, 246, 246, 1);
+		border-radius: 29upx;
+		color: #999999;
+		font-size: 26upx;
+		text-align: center;
+	}
+
+	.condition-status.completed {
+		color: #BA721B;
+		background: #FFF4BB;
+	}
+
+	.goods-item {
+		padding: 12upx 0;
+	}
+
+	.goods-item .goods-thumb {
+		width: 110upx;
+		height: 110upx;
+		border-radius: 8upx;
+		display: block;
+		margin-right: 12upx;
+	}
+</style>
diff --git a/pages/subPages/dealer/myStore/myStore.vue b/pages/subPages/dealer/myStore/myStore.vue
new file mode 100644
index 0000000..5c5f78c
--- /dev/null
+++ b/pages/subPages/dealer/myStore/myStore.vue
@@ -0,0 +1,346 @@
+<template>
+	<view class="myStore">
+		<far-bottom></far-bottom>
+		<!-- 累计交易额 -->
+		<view class="transactionNumber">
+			<view><span>累计交易额</span></view>
+			<view>
+				<span>{{ userInfo.allmoney }}</span>
+			</view>
+			<view class="myProfit">
+				<view class="myProfitPackage">
+					<view>
+						<view>
+							<span>{{ userInfo.estimatemoney }}</span>
+						</view>
+						<view>
+							<span>本{{ data }}预估收益</span>
+						</view>
+					</view>
+					<view class="line"></view>
+					<view>
+						<view>
+							<span>{{ userInfo.lastmoney }}</span>
+						</view>
+						<view>
+							<span>昨{{ data }}收益</span>
+						</view>
+					</view>
+					<view class="line"></view>
+					<view>
+						<view>
+							<span>{{ userInfo.profitmoney }}</span>
+						</view>
+						<view><span>累计收益</span></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 累计交易额 -->
+
+		<!-- 商家列表 -->
+		<view class="storeList">
+			<view class="storeListPackage">
+				<view class="storeListTitle">
+					<view class="storeListLine"></view>
+					<span>商家列表</span>
+				</view>
+				<view class="storeListBody">
+					<!-- 商家循环模板 -->
+					<view class="storeMb" @click="goStoreDetails(item.id)" v-for="(item, index) in userInfo.stores">
+						<view class="storeImg">
+							<image :src="item.logo" />
+							<view class="floatCommission">
+								<span>{{ item.scale }}%</span>
+							</view>
+						</view>
+						<view class="storeInfo">
+							<view class="storeInfoTitle">
+								<span>{{ item.storename }}</span>
+								<span>{{ item.endtime }}</span>
+							</view>
+							<view class="storeInfoBody">
+								<span>{{ item.realname }}</span>
+								<span>{{ item.tel }}</span>
+							</view>
+							<view class="storeInfoFoot">
+								<span>
+									交易额：
+									<span>{{ item.ordermoney }}</span>
+								</span>
+								<span>
+									订单数：
+									<span>{{ item.ordernum }}</span>
+								</span>
+							</view>
+						</view>
+					</view>
+					<!-- 商家循环模板 -->
+				</view>
+			</view>
+		</view>
+		<load-more :isMore="isMore"></load-more>
+		<!-- 商家列表 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import loadMore from '@/components/template/loadmore.vue'
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	components:{
+		loadMore
+	},
+	data() {
+		return {
+			page: 1,
+			initflag: 1,
+			userInfo: {},
+			data: '',
+			isMore:false
+		};
+	},
+	onLoad() {
+		this.init();
+	},
+	onReachBottom(){
+		console.log('xialakakak');
+		if(this.isMore == true){
+			return
+		}
+		this.isMore = false;
+		this.page++;
+		this.getMyStoreList(true)
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.getMyStoreList();
+		},
+		goStoreDetails(id) {
+			App.navigationTo({
+				url: 'pages/subPages/dealer/myStoreDetails/myStoreDetails?id=' + id
+			});
+		},
+		// 我的商家列表
+		getMyStoreList(flag = false) {
+			let _this = this;
+			let data = {
+				page: _this.page,
+				initflag: _this.initflag
+			};
+			App._post_form('&p=salesman&do=myStore', data, res => {
+				if(flag){
+					// _this.userInfo.push.apply(_this.userInfo, res.data);
+						_this.userInfo.stores.push(...res.data.stores);
+				}else{
+					_this.userInfo = { ..._this.userInfo, ...res.data };
+				}
+				if (res.data.settle == 0) {
+					_this.data = '日';
+				}
+				if (res.data.settle == 1) {
+					_this.data = '周';
+				}
+				if (res.data.settle == 2) {
+					_this.data = '月';
+				}
+				if(res.data.stores.length < 10){
+					_this.isMore = true;
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background: #f8f8f8;
+	overflow-x: hidden;
+}
+.myStore {
+	font-size: 0;
+}
+.line {
+	margin-top: 15upx;
+	width: 2upx;
+	height: 37upx;
+	background: rgba(255, 255, 255, 0.5);
+}
+.transactionNumber {
+	border:1upx solid rgba(0,0,0,0);
+	background: #f55347;
+	background-repeat: cover;
+	height: 407upx;
+	width: 750upx;
+	text-align: center;
+	> view:nth-child(1) {
+		margin-top: 55upx;
+		font-size: 24upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		font-size: 24upx;
+		
+		font-weight: bold;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.myProfit {
+	> view {
+		> view {
+			display: inline-block;
+			vertical-align: middle;
+			> view {
+				> span:nth-child(1) {
+					font-size: 24upx;
+					
+					font-weight: bold;
+					color: rgba(255, 255, 255, 1);
+				}
+				> span:nth-child(2) {
+					margin-top: 14upx;
+					font-size: 24upx;
+					
+					
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+		}
+	}
+}
+.myProfitPackage {
+	padding: 80upx 30upx 0 30upx;
+	display: flex;
+	justify-content: space-between;
+}
+.storeList {
+	margin: -80upx auto 0 auto;
+	width: 690upx;
+	min-height: 859upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.storeListTitle {
+	> span {
+		vertical-align: middle;
+		margin-left: 10upx;
+		font-size: 30upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.storeListPackage {
+	padding: 30upx;
+}
+.storeListLine {
+	display: inline-block;
+	vertical-align: middle;
+	width: 6upx;
+	height: 28upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 3upx;
+}
+.storeListBody {
+	margin-top: 20upx;
+}
+.storeMb {
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+	margin-top: 30upx;
+	padding-bottom: 30upx;
+	border-bottom: 1px solid rgba(238, 238, 238, 1);
+}
+.storeImg {
+	width: 128upx;
+	height: 128upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 128upx;
+		height: 128upx;
+	}
+}
+.storeInfo {
+	width: 470upx;
+	margin-left: 30upx;
+}
+.storeInfoTitle {
+	display: flex;
+	justify-content: space-between;
+	> span:nth-child(1) {
+		font-size: 30upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> span:nth-child(2) {
+		font-size: 24upx;
+		
+		
+		color: rgba(153, 153, 153, 1);
+	}
+	> span {
+		vertical-align: bottom;
+	}
+}
+.storeInfoBody {
+	margin-top: 10upx;
+	> span:nth-child(1) {
+		font-size: 24upx;
+		
+		
+		color: rgba(153, 153, 153, 1);
+	}
+	> span:nth-child(2) {
+		margin-left: 20upx;
+		font-size: 24upx;
+		
+		
+		color: #5585ff;
+	}
+}
+.storeInfoFoot {
+	margin-top: 10upx;
+	> span:nth-child(2) {
+		margin-left: 20upx;
+	}
+	> span {
+		font-size: 24upx;
+		
+		
+		color: rgba(153, 153, 153, 1);
+		> span {
+			color: #ff4444;
+		}
+	}
+}
+.floatCommission {
+	position: relative;
+	bottom: 130upx;
+	width: 87upx;
+	height: 30upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 0upx 0upx 6upx 0upx;
+	text-align: center;
+	overflow: hidden;
+	> span {
+		font-size: 20upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+</style>
diff --git a/pages/subPages/dealer/myStoreDetails/myStoreDetails.vue b/pages/subPages/dealer/myStoreDetails/myStoreDetails.vue
new file mode 100644
index 0000000..80f6be0
--- /dev/null
+++ b/pages/subPages/dealer/myStoreDetails/myStoreDetails.vue
@@ -0,0 +1,492 @@
+<template>
+	<view id="myStoreDetails">
+		<far-bottom></far-bottom>
+		<!-- 用户交易信息 -->
+		<view class="myStoreDetailsTitle">
+			<view class="myStoreUserHead">
+				<view class="headImg"><image :src="storeDetail.logo" /></view>
+			</view>
+			<view class="myStoreUserInfo">
+				<view>
+					<span>{{ storeDetail.storename }}</span>
+				</view>
+				<view>
+					<span>到期时间：{{ storeDetail.endtime }}</span>
+				</view>
+			</view>
+			<view class="myTransaction">
+				<view>
+					<view>
+						<span>{{ storeDetail.turnover }}</span>
+					</view>
+					<view><span>交易额</span></view>
+				</view>
+				<view class="line"></view>
+				<view>
+					<view>
+						<span>{{ storeDetail.ordernum }}</span>
+					</view>
+					<view><span>订单数</span></view>
+				</view>
+				<view class="line"></view>
+				<view>
+					<view>
+						<span>{{ storeDetail.scale }}%</span>
+					</view>
+					<view><span>提成</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 用户交易信息 -->
+
+		<!-- 切换按钮 -->
+		<view class="checkButton t-c">
+			<view class="checkButtonRight">
+				<view><span>{{TextSubstitution.yjtext}}明细</span></view>
+			</view>
+		</view>
+		<!-- 切换按钮 -->
+
+		<!-- 数据区域 -->
+		<view class="myStoreDetailsMain">
+			<view class="myStoreDetailsMainPackage">
+
+				<!-- 结算记录 -->
+				<scroll-view class="settleRecord" scroll-y="true" lower-threshold="0" @scrolltolower="settleScoll" show-scrollbar="true">
+					<!-- 结算记录循环模板 -->
+					<view class="settleRecordMb" v-for="(item, index) in settleList">
+						<view class="settleRecordInfo">
+							<view>
+								<span>{{ item.pluginname }}的{{TextSubstitution.yjtext}}</span>
+							</view>
+							<view>
+								<span>{{ item.createtime }}</span>
+							</view>
+						</view>
+						<view class="settleRecordMoney">
+							<span>{{ item.price }}</span>
+						</view>
+					</view>
+					<!-- 结算记录循环模板 -->
+					<view class="loading">
+						<span>{{settleLoadText}}</span>
+						</view>
+				</scroll-view>
+				<!-- 结算记录 -->
+			</view>
+		</view>
+		<!-- 数据区域 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import Util from '@/common/js/util.js';
+
+export default {
+	data() {
+		return {
+			page: 2,
+			id: '',
+			storeDetail: {},
+			reportPage: 1,
+			reportList: [],
+			settlePage: 1,
+			settleList: [],
+			settleLoadText:'',
+			settleloading:true,
+			reportLoadText:'',
+			reportloading:true,
+			TextSubstitution:{}
+		};
+	},
+	onLoad: function(option) {
+		this.id = option.id;
+		this.TextSubstitution = uni.getStorageSync('TextSubstitution')
+		console.info(option.id);
+		this.init();
+	},
+	methods: {
+		reportScoll(){
+			let _this = this;
+			if(_this.reportloading==true){
+				_this.reportPage++;
+				_this.getStoreReport();
+				_this.reportLoadText='... ...加载中'
+			}
+			else{
+				_this.reportLoadText='已无更多数据'
+			}
+		},
+		settleScoll() {
+			let _this = this;
+			if(_this.settleloading==true){
+				_this.settlePage++;
+				_this.getStoreSettle();
+				_this.settleLoadText='... ...加载中'
+			}
+			else{
+				_this.settleLoadText='已无更多数据'
+			}
+			
+		},
+		init() {
+			let _this = this;
+			_this.getStoreDetail();
+			_this.getStoreSettle();
+		},
+		changPage(page) {
+			let _this = this;
+			_this.page = page;
+			if (page == 2&&_this.settleList.length==0) {
+				_this.getStoreSettle();
+			}
+		},
+		// 商家详情
+		getStoreDetail() {
+			let _this = this;
+			console.info(_this.id);
+			let data = {
+				id: _this.id
+			};
+			App._post_form('&p=salesman&do=storeDetail', data, res => {
+				_this.storeDetail = res.data;
+			});
+		},
+		// 商家每日报表
+		getStoreReport() {
+			let _this = this;
+			let data = {
+				id: _this.id,
+				page: _this.reportPage
+			};
+			App._post_form('&p=salesman&do=storeReport', data, res => {
+				_this.reportLoadText=''
+				for (let i = 0; i < res.data.reportlist.length; i++) {
+					res.data.reportlist[i].createtime = Util.formatTime(res.data.reportlist[i].createtime, 'date', '-');
+				}
+				_this.reportList =[..._this.reportList,...res.data.reportlist] ;
+				if(_this.reportPage==res.data.pagetotal){
+					_this.reportloading=false
+					_this.reportLoadText='已无更多数据'
+				}
+				if(res.data.pagetotal==0){
+					_this.reportloading=false
+					_this.reportLoadText='已无更多数据'
+				}
+			});
+		},
+		// 商家结算记录
+		getStoreSettle() {
+			let _this = this;
+			let data = {
+				id: _this.id,
+				page: _this.settlePage
+			};
+			App._post_form('&p=salesman&do=storeSettle', data, res => {
+				_this.settleLoadText=''
+				for (let i = 0; i < res.data.length; i++) {
+					res.data.dislist[i].detatime = Util.formatTime(res.data[i].detatime, 'date', '-');
+					res.data.dislist[i].createtime = Util.formatTime(res.data[i].createtime, 'rule', '-');
+				}
+				_this.settleList = [..._this.settleList, ...res.data.dislist];
+				if(_this.settlePage==res.data.pagetotal){
+					_this.settleloading=false
+					_this.settleLoadText='已无更多数据'
+				}
+				if(res.data.pagetotal==0){
+					_this.settleloading=false
+					_this.settleLoadText='已无更多数据'
+				}
+			},res=>{
+				_this.settleLoadText='加载失败'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background: #ffffff;
+	overflow-x: hidden;
+}
+.myStoreDetails {
+	font-size: 0;
+}
+.myStoreDetailsTitle {
+	border: 1upx solid rgba(0,0,0,0);
+	width: 750upx;
+	height: 405upx;
+	background: #ff4444;
+}
+.myStoreUserHead {
+	margin-top: 20upx;
+}
+.headImg {
+	margin: auto;
+	width: 130upx;
+	height: 130upx;
+	overflow: hidden;
+	border-radius: 50%;
+	> image {
+		width: 130upx;
+		height: 130upx;
+	}
+}
+.myStoreUserInfo {
+	text-align: center;
+	margin-top: 26upx;
+	> view:nth-child(1) {
+		font-size: 30upx;
+		
+		font-weight: bold;
+		color: rgba(255, 255, 255, 1);
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		font-size: 24upx;
+		
+		
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.myTransaction {
+	margin: 40upx auto 0 auto;
+	width: 590upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		> view {
+			text-align: center;
+			> span {
+				font-size: 30upx;
+				
+				
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+}
+.line {
+	margin-top: 26upx;
+	width: 2upx;
+	height: 25upx;
+	background: rgba(255, 255, 255, 1);
+}
+.checkButton {
+	overflow: hidden;
+	border-bottom: 1px solid rgba(238, 238, 238, 1);
+	width: 750upx;
+	height: 90upx;
+	background: rgba(255, 255, 255, 1);
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+.checkButtonLine {
+	margin-top: 27upx;
+	width: 2upx;
+	height: 36upx;
+	background: rgba(238, 238, 238, 1);
+	display: flex;
+	justify-content: space-between;
+}
+.checkButtonLeftCheck {
+	width: 49%;
+	> view {
+		margin: auto;
+		width: 120upx;
+		height: 86upx;
+		border-bottom: 4px solid rgba(255, 68, 68, 1);
+		> span {
+			line-height: 86upx;
+			font-size: 28upx;
+			
+			font-weight: bold;
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+}
+.checkButtonLeft {
+	width: 49%;
+	> view {
+		margin: auto;
+		width: 120upx;
+		height: 86upx;
+		> span {
+			line-height: 86upx;
+			font-size: 28upx;
+			
+			font-weight: bold;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.checkButtonRight {
+	width: 49%;
+	> view {
+		margin: auto;
+		width: 120upx;
+		height: 86upx;
+		> span {
+			line-height: 86upx;
+			font-size: 28upx;
+			
+			font-weight: bold;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.checkButtonRightCheck {
+	width: 49%;
+	> view {
+		margin: auto;
+		width: 120upx;
+		height: 86upx;
+		border-bottom: 4px solid rgba(255, 68, 68, 1);
+		> span {
+			line-height: 86upx;
+			font-size: 28upx;
+			
+			font-weight: bold;
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+}
+.myStoreDetailsMain {
+	margin-top: 20upx;
+}
+.myStoreDetailsMainPackage {
+	padding: 0 30upx 0upx 30upx;
+}
+.reportMb {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 30upx;
+	padding-bottom: 30upx;
+	border-bottom: 1px solid rgba(238, 238, 238, 1);
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.ySettlement {
+	vertical-align: top;
+	font-size: 24upx;
+	
+	
+	color: rgba(255, 68, 68, 1);
+}
+.nSettlement {
+	vertical-align: top;
+	font-size: 24upx;
+	
+	
+	color: rgba(153, 153, 153, 1);
+}
+.reportMbLeft {
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+.dot {
+	margin-top: 10upx;
+	width: 16upx;
+	height: 16upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 50%;
+}
+.reportInfo {
+	margin-left: 20upx;
+	>view{
+		vertical-align: top;
+	}
+	> view:nth-child(1) {
+		span {
+			vertical-align: top;
+			font-size: 28upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 30upx;
+		> span:nth-child(2) {
+			margin-left: 40upx;
+		}
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+			> span {
+				color: #ff4444;
+			}
+		}
+	}
+}
+.settleRecord {
+	height: 720upx;
+}
+.settleRecordMb {
+	margin-top: 30upx;
+	padding-bottom: 30upx;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.settleRecordInfo {
+	> view:nth-child(1) {
+		> span {
+			font-size: 28upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		> span {
+			font-size: 24upx;
+			
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.settleRecordMoney {
+	> span {
+		line-height: 80upx;
+		font-size: 30upx;
+		
+		
+		color: rgba(255, 68, 68, 1);
+	}
+}
+.loading {
+	overflow: hidden;
+	height: 50upx;
+	text-align: center;
+	> span {
+		line-height: 50upx;
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+</style>
diff --git a/pages/subPages/dealer/rank/rank.vue b/pages/subPages/dealer/rank/rank.vue
new file mode 100644
index 0000000..49e1db2
--- /dev/null
+++ b/pages/subPages/dealer/rank/rank.vue
@@ -0,0 +1,257 @@
+<template>
+	<!-- 排行榜 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="header" :style="{'background-image':'url('+imageRoot+'rank_bg.jpg)'}">
+				<view class="rank_first-box dis-flex flex-y-center flex-x-end" v-if="!!list && list.length>0">
+					<view class="first-avatar m-right10" :style="{'background-image':'url('+list[0]['avatar']+')'}"></view>
+					<view class="first-detail">
+						<view class='first-nickname f-32'>{{list[0]['nickname']}}</view>
+						<view class="first-earning-price f-24">{{!!list[0]['total_price']?list[0]['total_price']:'0.00'}}元收益</view>
+					</view>
+				</view>
+			</view>
+			<view class="tabBar dis-flex">
+				<view class="tabBar-item t-c f-24" :class="{'tabBar_active':currentTab===tabItem.Tabtype}" v-for="(tabItem,index) in RankTab"
+				 :key="index" @click="select_current(tabItem.Tabtype)">{{tabItem['title']}}
+				 <view class="iconfont icon-triangleupfill active-upfill" v-if="currentTab===tabItem.Tabtype"></view>
+				 </view>
+			</view>
+			<view class="user-detail dis-flex flex-x-between flex-y-center padding-box-all b-f m-btm20">
+				<view class="user-avatar-nickname dis-flex flex-y-center">
+					<view class="user-avatar m-right20" :style="{'background-image':'url('+user.avatar+')'}"></view>
+					<view class="user-nickname-rank">
+						<view class="user-nickname f-28">{{user.nickname}}</view>
+						<view class="user-rank  col-9 f-26">{{user['sort']==-1?'未能进入排行榜':`位于排行榜第${user['sort']+1}名`}}</view>
+					</view>
+				</view>
+				<view class="withdraw-price f-26" v-if="user['sort']!=-1">{{user['sort']+1}}</view>
+			</view>
+			<block v-if="!!list&&list.length>0">
+				<view class="rank-list b-f">
+					<view class="rank-item border-line border-bottom dis-flex flex-y-center flex-x-between" v-for="(rankItem,index) in list"
+					 :key="index">
+						<view class="dis-flex flex-y-center">
+							<block v-if="index<3">
+								<block v-if="index===0">
+									<image :src="imgfixUrls+ rankIcon[0]['icon_url']" class="item-icon m-right20"></image>
+								</block>
+								<block v-if="index===1">
+									<image :src="imgfixUrls+ rankIcon[1]['icon_url']" class="item-icon m-right20"></image>
+								</block>
+								<block v-if="index===2">
+									<image :src="imgfixUrls+ rankIcon[2]['icon_url']" class="item-icon m-right20"></image>
+								</block>
+							</block>
+							<block v-else>
+								<view class="m-right20 f-28 rank-num">{{index+1}}</view>
+							</block>
+							<view class="rank-avatar-nickname dis-flex flex-y-center">
+								<view class="rank-avatar m-right10" :style="{'background-image':'url('+rankItem.avatar+')'}"></view>
+								<view class="rank-nickname f-28">{{rankItem.nickname}}</view>
+							</view>
+						</view>
+						<view class="rank-withdraw-price f-24">{{rankItem.total_price}}元</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<view class="no-shop-image">
+					<view class="not-image"></view>
+					<view class="t-c f-28 m-top30 col-9">亲! 暂无相关数据哦~</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	export default {
+		data() {
+			return {
+				currentTab: '1',
+				RankTab: [{
+						title: '周排行榜',
+						Tabtype: '1'
+					},
+					{
+						title: '月排行榜',
+						Tabtype: '2'
+					},
+					{
+						title: '总排行榜',
+						Tabtype: '3'
+					}
+				],
+				rankIcon: [{
+						icon_url: 'dealer_tool/one.png'
+					},
+					{
+						icon_url: 'dealer_tool/two.png'
+					},
+					{
+						icon_url: 'dealer_tool/three.png'
+					}
+				],
+				loadlogo: false, //页面是否加载完成,
+				list: [], //排行榜
+				user: {} ,//个人信息
+				img:''
+			}
+		},
+		components: {
+			Loadlogo
+		},
+		computed: {
+
+		},
+		onShow() {
+
+		},
+		onLoad() {
+			this.img= this.imgfixUrl;
+		},
+		mounted() {
+			this.img= this.imgfixUrl;
+			this.getRankDetail()
+		},
+		methods: {
+			getRankDetail(state = "1") {
+				let _this = this,
+					requestData = {
+						state
+					};
+				App._post_form('&p=distribution&do=commissionRanking', requestData, res => {
+					_this.setData(res.data)
+				}, false, () => {
+					uni.hideLoading();
+					_this.loadlogo = true;
+				})
+			},
+			select_current(current) {
+				uni.showLoading({})
+				let _this = this;
+				_this.currentTab = current;
+				_this.getRankDetail(current)
+
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.container {
+
+		// 头部
+		.header {
+			width: 100%;
+			height: 200upx;
+			background-repeat: no-repeat;
+			background-size: 100% 200upx;
+
+			.rank_first-box {
+				height: 100%;
+				margin: auto 0;
+				padding-right: 100upx;
+
+				.first-avatar {
+					width: 100upx;
+					height: 100upx;
+					border-radius: 50%;
+					background-size: 100upx 100upx;
+					background-repeat: no-repeat;
+				}
+			}
+		}
+
+		//选项
+		.tabBar {
+			width: 100%;
+			height: 100upx;
+			line-height: 100upx;
+			background-color: rgb(251, 232, 104);
+
+			.tabBar-item {
+				position: relative;
+				flex: 1;
+				.active-upfill{
+					position: absolute;
+					color: #ffffff;
+					left: 50%;
+					bottom: -44%;
+					transform: translateX(-50%);
+					font-size: 40upx;
+					
+				}
+			}
+
+			.tabBar_active {
+				font-weight: 600;
+				font-size: 28upx;
+			}
+		}
+
+		//个人信息
+		.user-detail {
+			.user-avatar-nickname {
+				.user-avatar {
+					width: 80upx;
+					height: 80upx;
+					border-radius: 50%;
+					background-size: 80upx 80upx;
+					background-repeat: no-repeat;
+				}
+				
+			}
+		}
+
+		.rank-list {
+			.rank-item {
+				padding: 20upx 30upx;
+
+				.rank-num {
+					text-align: center;
+					width: 40upx;
+				}
+
+				// 排行图标
+				.item-icon {
+					display: block;
+					width: 40upx;
+					height: 50upx;
+				}
+
+				.rank-avatar-nickname {
+					.rank-avatar {
+						width: 60upx;
+						height: 60upx;
+						border-radius: 50%;
+						background-image: url('http://img3.imgtn.bdimg.com/it/u=400062461,2874561526&fm=26&gp=0.jpg');
+						background-size: 60upx 60upx;
+						background-repeat: no-repeat;
+					}
+				}
+			}
+		}
+
+		//提示图
+
+		.no-shop-image {
+			.not-image {
+				margin: 20% auto 0;
+				width: 400upx;
+				height: 200upx;
+				background-image: url('https://s10.mogucdn.com/p2/161213/upload_27e7gegi3f9acl5e05f3951if5855_514x260.png');
+				background-size: 400upx 200upx;
+				background-repeat: no-repeat;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/dealer/richtext/setrich.vue b/pages/subPages/dealer/richtext/setrich.vue
new file mode 100644
index 0000000..caf7470
--- /dev/null
+++ b/pages/subPages/dealer/richtext/setrich.vue
@@ -0,0 +1,65 @@
+<template>
+	<!-- 帮助说明 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="rich-content b-f" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+			show-with-animation use-anchor  :html="content" ></jyf-parser>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import Loadlogo from '@/components/template/loadlogo'
+	export default {
+		data() {
+			return {
+				content: "",
+				loadlogo: false
+			}
+		},
+		components: {
+			jyfParser,
+			Loadlogo
+		},
+		computed: {
+
+		},
+		beforeCreate() {
+
+		},
+		onLoad(options) {
+
+		},
+		onUnload() {
+
+		},
+		mounted() {
+			uni.setNavigationBarColor({
+				frontColor: '#000000',
+				backgroundColor: '#FFFFFF'
+			})
+			this.getRich();
+		},
+		methods: {
+			getRich() {
+				let _this = this;
+				App._post_form("&p=distribution&do=getHelpNote", {}, res => {
+					_this.content = res.data;
+					// App.wxParseLazyLoad(0, res.data, "content");
+				}, false, () => {
+					_this.loadlogo = true;
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.rich-content {
+		padding: 20upx 30upx;
+	}
+</style>
diff --git a/pages/subPages/dealer/setshop/setshop.vue b/pages/subPages/dealer/setshop/setshop.vue
new file mode 100644
index 0000000..50e0748
--- /dev/null
+++ b/pages/subPages/dealer/setshop/setshop.vue
@@ -0,0 +1,326 @@
+<template>
+	<!-- 推广商品 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header">
+				<view class="setshop-mark m-btm40">
+					<view class="setshop-title col-f f-36 m-btm10">必推热门爆款</view>
+					<view class="setshop-subhead f-24">分享超值好物，锁定长期收益</view>
+				</view>
+				<view class="tab-menu-search dis-flex flex-y-center flex-x-between">
+					<view class="tab-menu dis-flex flex-x-between">
+						<view class="menu-item item-icon p-r" :class="{'menu-item-active-two':tabOrders===2 || tabOrders===3}" @click="selectTab(2)">{{TextSubstitution.yjtext}}
+							<view class="iconfont icon-triangleupfill fill-icon fill-icon-top upfill" :class="{'menu-item-active-two':tabOrders===2}"></view>
+							<view class="iconfont icon-triangledownfill fill-icon fill-icon-bottom downfill" :class="{'menu-item-active-two':tabOrders===3}"></view>
+						</view>
+						<view class="menu-item item-icon p-r" :class="{'menu-item-active-two':tabOrders===4 || tabOrders===5}" @click="selectTab(4)">销量
+							<view class="iconfont icon-triangleupfill fill-icon fill-icon-top upfill" :class="{'menu-item-active-two':tabOrders===4}"></view>
+							<view class="iconfont icon-triangledownfill fill-icon fill-icon-bottom downfill" :class="{'menu-item-active-two':tabOrders===5}"></view>
+						</view>
+						<view class="menu-item" :class="{'menu-item-active':tabOrders===1}" @click="selectTab(1)">最新</view>
+						<view class="menu-item" :class="{'menu-item-active':tabOrders===0}" @click="selectTab(0)">默认</view>
+					</view>
+					<view class='search dis-flex flex-y-center'>
+						<view class="search-icon iconfont icon-search"></view>
+						<input type="text" value="" placeholder="搜索好物" class="search-input f-24" placeholder-style="color:#666666;"
+						 v-model="searchText" @confirm="search" />
+					</view>
+				</view>
+			</view>
+			<block v-if="!!list && list.length>0">
+				<view class="content p-r">
+					<view class="scroll-view">
+						<view class="goods-list b-f bor-radius-10upx">
+							<view class="goods-item dis-flex border-line border-bottom" v-for="(item,index) in list" :key="index">
+								<view class="goods-image bor-radius-10upx m-right30" :style="{'background-image':'url('+item.thumb+')'}"></view>
+								<view class="goods-detail">
+									<view class="goods-title twolist-hidden f-30 f-w col-0">{{item.name}}</view>
+									<view class="goods-price dis-flex flex-y-center">
+										<view class="goods-now-price f-30 m-right20"><text class="f-24">¥</text>{{item.price}}</view>
+										<view class="goods-old-price f-24 col-9" style="text-decoration:line-through;">¥{{item.oldprice}}</view>
+									</view>
+									<view class="goods-btn dis-flex flex-y-center flex-x-end">
+										<view class="make-moneyBtn f-24 col-f m-right30">赚￥{{item.commission}}</view>
+										<view class="setShop-btn col-3 f-24" @click="navGoodsInfo(item.link_url)">推广商品</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<loadmore :isMore="loading"></loadmore>
+					</view>
+						<!-- <Loading v-if="!loading" /> -->
+				</view>
+			</block>
+			<block v-else>
+				<view class="no-shop-image">
+					<view class="not-image"></view>
+					<view class="t-c f-28 m-top30 col-9">亲! 暂无相关商品哦~</view>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import loadmore from '@/components/template/loadmore';
+	export default {
+		data() {
+			return {
+				loadlogo: false, //页面是否加载完成,
+				loading: false, //列表加载更多
+				current_page: 1, //当前页数
+				tabOrders: 0, //当前选项
+				list: [], //商品列表
+				page_total: null, //总共页数
+				slide_Top: 0, // 滚动距离
+				searchText: '' ,//搜索内容
+				TextSubstitution:{}
+			}
+		},
+		components: {
+			loadmore,
+			Loadlogo
+		},
+		computed: {
+
+		},
+		onLoad() {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		},
+		onShow() {
+
+		},
+		mounted() {
+			this.getShopInfo()
+		},
+		methods: {
+			//详情
+			getShopInfo(orders = 0, page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						name: _this.searchText,
+						page,
+						orders
+					};
+				App._post_form('&p=distribution&do=distributionGoods', requestData, res => {
+					let ShopData = res.data;
+					if (isPage) {
+						if (ShopData.list.length > 0) {
+							_this["list"].push(...ShopData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this["list"] = ShopData.list;
+						_this.loading = ShopData.list.length === 0 || _this.current_page === ShopData.page_total;
+						_this.page_total = ShopData.page_total;
+					}
+				}, false, () => {
+					uni.hideLoading();
+					_this.loadlogo = true;
+				})
+			},
+			//导航栏选项
+			selectTab(Tabtype) {
+				let _this = this;
+				uni.showLoading({})
+				if (Tabtype === 2) {
+					Tabtype = _this.tabOrders === 2 ? 3 : 2
+				}
+				if (Tabtype === 4) {
+					Tabtype = _this.tabOrders === 4 ? 5 : 4
+				}
+				_this.current_page = 1;
+				_this.tabOrders = Tabtype;
+				_this.getShopInfo(Tabtype);
+			},
+			// 搜索
+			search() {
+				uni.showLoading({})
+				this.current_page = 1;
+				this.getShopInfo();
+			},
+
+			//商品跳转
+			navGoodsInfo(url) {
+				console.log(url)
+				App.navigationTo({
+					url
+				})
+			}
+		},
+		onReachBottom() {
+             let _this = this;
+				if (_this.current_page >= _this.page_total) {
+					_this.loading = true;
+					return false;
+				}
+				 _this.getShopInfo(_this.tabOrders, ++_this.current_page, true);
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background: #F7F7F7;
+	}
+
+	.container {
+
+		// 头部
+		.header {
+			height: 420upx;
+			background-color: #FF4444;
+			padding: 50upx 30upx 0;
+
+			// 头部标题
+			.setshop-mark {
+				.setshop-title {}
+
+				.setshop-subhead {
+					color: #FFAAAA
+				}
+			}
+
+			//头部菜单.搜索输入框
+			.tab-menu-search {
+				.tab-menu {
+					margin-right: 60upx;
+					flex: 1;
+
+					.menu-item-active {
+						background-color: #333333;
+						border-radius: 20upx;
+						padding: 4upx 20upx;
+					}
+
+					.menu-item-active-two {
+						color: #333333 !important;
+					}
+
+					.menu-item {
+						color: #FFFFFF;
+						font-size: 24upx;
+						padding: 4upx 20upx;
+
+						.fill-icon {
+							position: absolute;
+							color: #FFFFFF;
+							font-size: 24upx;
+						}
+
+						.fill-icon-top {
+							right: -7%;
+							top: -2%;
+							transform: scale(0.5, 0.5)
+						}
+
+						.fill-icon-bottom {
+							right: -7%;
+							bottom: -2%;
+							transform: scale(0.5, 0.5)
+						}
+					}
+				}
+
+				.search {
+					width: 200upx;
+					height: 60upx;
+					line-height: 60upx;
+					background-color: #FFCECE;
+					border-radius: 30upx;
+					padding: 0 20upx;
+
+					.search-icon {
+						color: #666666;
+						margin-right: 10upx;
+					}
+
+					.search-input {
+						width: 100%
+					}
+				}
+			}
+		}
+
+		// 内容
+		.content {
+			margin-top: -180upx;
+			padding: 0 30upx;
+
+			.scroll-view {
+				height: 70vh;
+
+				.goods-list {
+
+					// 商品图片
+					.goods-item {
+						padding: 30upx 0;
+						margin: 0 30upx;
+
+						.goods-image {
+							width: 200upx;
+							height: 200upx;
+							background-repeat: no-repeat;
+							background-size: 200upx 200upx;
+							background-position: center;
+							flex-shrink: 0;
+						}
+
+						.goods-detail {
+							flex: 1;
+
+							.goods-title {
+								height: 2.6em;
+							}
+
+							.goods-price {
+								line-height: 54upx;
+
+								.goods-now-price {
+									color: #FE504F
+								}
+
+								.goods-old-price {
+									text-decoration: line-through;
+								}
+							}
+
+							.goods-btn {
+								justify-content: flex-end;
+
+								.make-moneyBtn {
+									border-radius: 26upx;
+									padding: 12upx 30upx;
+									background-color: #FF4444;
+								}
+
+								.setShop-btn {
+									border: 1px solid #333333;
+									border-radius: 30upx;
+									padding: 12upx 30upx;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		//提示图
+
+		.no-shop-image {
+			.not-image {
+				margin: 20% auto 0;
+				width: 400upx;
+				height: 200upx;
+				background-image: url('https://s10.mogucdn.com/p2/161213/upload_27e7gegi3f9acl5e05f3951if5855_514x260.png');
+				background-size: 400upx 200upx;
+				background-repeat: no-repeat;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/dealer/template/template.vue b/pages/subPages/dealer/template/template.vue
new file mode 100644
index 0000000..c01189e
--- /dev/null
+++ b/pages/subPages/dealer/template/template.vue
@@ -0,0 +1,33 @@
+<template>
+	<view class="container">
+	
+	</view>
+</template>
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		components: {
+			
+		},
+		computed: {
+
+		},
+		onShow() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/subPages/dealer/withdraw/withdraw.vue b/pages/subPages/dealer/withdraw/withdraw.vue
new file mode 100644
index 0000000..6a30e87
--- /dev/null
+++ b/pages/subPages/dealer/withdraw/withdraw.vue
@@ -0,0 +1,543 @@
+<template>
+	<!-- 提现 -->
+	<view class="page">
+		<far-bottom></far-bottom>
+		<block v-if="isPageShow">
+			<view class="header-content b-f m-btm20">
+				<view >
+					
+				</view>
+				<view class="tx-title f-28 col-3">提现金额</view>
+				<view class="money-input dis-flex flex-y-center">
+					<view class="money-icon">¥</view>
+					<input type="digit" class="input" value="" placeholder="请输入提现金额" placeholder-class="placeinput" v-model="tx_money" />
+				</view>
+				<view class="tx-moneyShow dis-flex flex-x-between flex-y-center">
+					<view class="f-24 col-9" style="line-height: 0upx;height: 60upx;">可提现(元):{{drawPrice}}</view>
+					<view class="all-txBtn f-28 col-f t-c" @click="alltx(0)">全部提现</view>
+				</view>
+				<view style="color: #FF4444;font-size: 22upx;margin-top: 10upx;">提现金额{{min_money}}元起,<text v-if="max_money !== 999999999">单次最高提现金额{{max_money}}元</text>提现手续费{{withdrawcharge}}%</view>
+				<view>
+				</view>
+
+				
+			</view>
+			<form @submit="formSubmit">
+				<view class="with-opContent b-f m-btm20">
+					<view class="tx-title f-28 col-3">提现到</view>
+					<view class="op-content">
+						<view class="op-list">
+							<radio-group @change="precedenceChange" name="payment_type">
+								<label v-for="(item, index) in txlist" :key="index" class="label-classtyle dis-flex flex-x-between" style="flex-wrap: wrap;">
+									<view class="dis-flex flex-y-center" style="flex: 0.5;">
+										<view class="op-imag">
+											<image :src="imgfixUrls +  item.imag" mode=""></image>
+										</view>
+										<view class="f-28 col-3">{{(item.title == '账户')?item.title + TextSubstitution.moneytext:item.title}}</view>
+									</view>
+									<view style="flex: 0.5;">
+										<radio :value="item.pay_type" :checked="index === prececurrent" />
+									</view>
+									<view class="userMsg-content" style="flex: 1;min-width: 80%;">
+										<!-- 渠道2 -->
+										<view class="yhk-msg-list" v-if="atpresent==='3' && item.pay_type ==='3'">
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">开户姓名</view>
+												<input class="f-24" type="text" v-model="user_info.bank_username"  name="bank_username" placeholder="请输入姓名" placeholder-class="placemsg-items" />
+											</view>
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3 onelist-hidden">开户{{examineing==0?'银行':'渠道2'}}</view>
+												<!-- <picker name="bank_name" style="width: 72%;" :value="bankNameIndex" :range="bankNameList" range-key="name"> -->
+												<!-- {{bankNameList[bankNameIndex]['name']}} -->
+												<!-- <view class="f-24" style="height: 52.5upx;line-height: 52.5upx;">123456</view> -->
+												<!-- </picker> -->
+												<input class="f-24" type="text"  v-model="user_info.bank_name" name="bank_name" :placeholder="examineing==0?'请输入开户银行':'请输入开户渠道2'" placeholder-class="placemsg-items" />
+											</view>
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">{{examineing==0?'银行卡':'渠道2'}}号</view>
+												<input class="f-24" type="text"  v-model="user_info.card_number" name="card_number" :placeholder="examineing==0?'请输入银行卡号':'请输入渠道2号'" placeholder-class="placemsg-items" />
+											</view>
+										</view>
+										<view class="yhk-msg-list" v-if="atpresent==='1' && item.pay_type ==='1'">
+											<!-- 							<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">真实姓名</view>
+												<input class="f-24" type="text" value="" name="alipay_name" placeholder="请输入姓名" placeholder-class="placemsg-items" />
+											</view> -->
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">真实姓名</view>
+												<input class="f-24" type="text"  v-model="user_info.realname" name="alipay" placeholder="请填写真实姓名" placeholder-class="placemsg-items" />
+											</view>
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">{{examineing==0?'支付宝帐':'渠道2'}}号</view>
+												<input class="f-24" type="text"  v-model="user_info.alipay" name="alipay" :placeholder="examineing==0?'请输入支付宝账号':'请输入渠道1账号'" placeholder-class="placemsg-items" />
+											</view>
+										</view>
+										<view class="last-hint f-24 col-9" v-if=" item.pay_type ==='1' && atpresent==='1' || item.pay_type ==='3' && atpresent==='3'">请务必填写真实信息
+											<text>*</text>
+										</view>
+									</view>
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					
+				</view>
+				<view class="sub-btn">
+					<!-- {{appDiyFont.to_examine}} -->
+					<button class="f-28 col-f" formType="submit">提现审核</button>
+				</view>
+			</form>
+		</block>
+		<!-- <page-loading ref="loading"></page-loading> -->
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	export default {
+		data() {
+			return {
+				bankNameList: [],
+				bankNameIndex: 0,
+				atpresent: '',
+				prececurrent: 0,
+				txlist: [{
+						id: 'we_chat',
+						title: '微信零钱',
+						imag: 'checkout/weixin.png',
+						pay_type: "2"
+					},
+					{
+						id: 'alipay',
+						title: '渠道1',
+						imag: 'checkout/zhifubao.png',
+						pay_type: "1"
+
+					},
+					{
+						id: 'bank_card',
+						title: '渠道2账户',
+						imag: 'checkout/card.png',
+						pay_type: "3"
+					},
+					{
+						id: 'balance',
+						title: '账户',
+						imag: 'checkout/yue.png',
+						pay_type: "4"
+					}
+				],
+				isPageShow: true,
+				tx_money: null, //输入提现金额,
+				drawPrice: null, //可提现金额,
+				user_info: {}, // 个人信息设置
+				withdrawcharge: null, //提现手续费
+				min_money: "1", //最小提现申请金额（默认最小为1元）；单位：元
+				max_money:'9999999',
+				TextSubstitution:{},
+				examineing:1
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			// appDiyFont() {
+			// 	let appSetting = this.$store.state.appSetting;
+			// 	if (appSetting) {
+			// 		return appSetting.diy_font
+			// 	}
+			// }
+		},
+		beforeCreate() {
+
+		},
+		onLoad(options) {
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.examineing = this.TextSubstitution.examineing || 0;
+			if(this.examineing == 0){
+				this.txlist[1].title = '支付宝';
+				this.txlist[2].title = '银行卡账户';
+			}
+		},
+
+		onShow() {
+
+		},
+		mounted() {
+			this.withdrawDetail()
+		},
+		methods: {
+			navgateTo() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/withdraw/withdrawrecord'
+				})
+			},
+			/**
+			 * 获取提现详情
+			 */
+			withdrawDetail() {
+				let _this = this;
+				App._post_form('&p=distribution&do=getCashWithdrawalSet', {}, res => {
+					_this.setData(res.data);
+					// _this.max_money = 1;
+					if(_this.max_money == 0){
+						_this.max_money = 999999999;
+					}
+					_this.user_info = res.data.user_info;
+					let payment_set = res.data.payment_set,
+						{
+							txlist
+						} = _this,
+						txlist_toStr = txlist.toString(),
+						newtxlist = [];
+					if (payment_set !== 0) {
+						for (let i = 0; i < txlist.length; i++) {
+							if (txlist_toStr.indexOf(txlist[i].toString()) > -1) {
+								for (let key in payment_set) {
+									if (txlist[i].id === key) {
+										if (payment_set[key] === "1") {
+											newtxlist.push(txlist[i]);
+											_this.atpresent = newtxlist[0].pay_type
+											break;
+										}
+									}
+								}
+							}
+							_this.setData({
+								txlist: newtxlist
+							})
+						}
+					}
+				}, false, () => {})
+			},
+			/**
+			 * 提现类型选择
+			 */
+			precedenceChange(evt) {
+				for (let i = 0; i < this.txlist.length; i++) {
+					if (this.txlist[i].pay_type === evt.target.value) {
+						this.prececurrent = i;
+						break;
+					}
+				}
+				this.atpresent = evt.target.value;
+			},
+			/**
+			 * 全部金额提现按钮
+			 */
+			alltx(num = '0') {
+				let _this = this,
+					drawPrice = _this.drawPrice;
+					if(num !== 0){
+						if(num == 1){
+							_this.tx_money = Number(drawPrice);
+						}else{
+							_this.tx_money = Number(_this.max_money);
+						}
+					}else{
+						if (!!drawPrice && Number(drawPrice) > 0 && Number(_this.max_money) >= Number(drawPrice)) {
+							
+							_this.tx_money = Number(drawPrice);
+						} else if(Number(_this.max_money) < Number(drawPrice) && Number(drawPrice) > 0){
+							uni.showToast({
+								icon:'none',
+								title:`单次最大可提现金额为${_this.max_money}`,
+								duration:2000
+							})
+							// App.showError(``);
+							_this.tx_money = Number(_this.max_money);
+						}else{
+							uni.showToast({
+								icon:'none',
+								title:`没有可提现金额`,
+								duration:2000
+							})
+							
+						}
+					}
+				
+			},
+			/**
+			 * 申请提现
+			 */
+			withdraw(fromData) {
+				uni.showLoading({})
+				let that = this;
+				App._post_form('&p=distribution&do=cashWithdrawalApply', {
+					...fromData
+				}, (result) => {
+					console.log(result, '申请提现')
+					if (result.errno === 0) {
+						console.log(result)
+						App.showSuccess('申请提现成功', () => {
+							App.navigationTo({
+								url: `pages/subPages/dealer/withdraw/withdrawrecord?draw_id=${result.data.id}`,
+								navType: "rediRect"
+							});
+						})
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			/**
+			 * 表单
+			 */
+			formSubmit(e) {
+				let _this = this,
+					fromData = {},
+					{
+						min_money,
+						tx_money,
+						drawPrice,
+						withdrawcharge,
+					} = _this;
+				fromData = e.detail.value;
+				fromData.sapplymoney = tx_money;
+				fromData.realname = _this.user_info.realname;
+				console.log(fromData)
+				if (!_this.tx_money) {
+					App.showError('请输入提现金额')
+					return;
+				}
+				// if (Math.round(tx_money * 100) / 100 < Number(min_money) ||
+				// 	(Math.round(tx_money * 100) / 100 > Number(drawPrice))) {
+				// 	App.showError(`请检查输入金额是否小于最少提现金额${min_money}元或输入金额大于可提现金额`)
+				// 	return;
+				// }
+				if (_this.atpresent === "30") {
+					if (!fromData.bank_username) {
+						App.showError('请输入开户姓名')
+						return;
+					}
+					if (!fromData.bank_name) {
+						App.showError(this.examineing==0?'请输入正确开户银行':'请输入正确开户渠道2')
+						return;
+					}
+					if (fromData.card_number.length < 13 || fromData.card_number.length > 25) {
+						App.showError(this.examineing==0?'请输入银行卡号':'请输入渠道2号')
+						return;
+					}
+				}
+				if (_this.atpresent === "20") {
+					// if (!fromData.alipay_name) {
+					// 	App.showError('请输入真实姓名')
+					// 	return false
+					// }
+					if (!fromData.alipay) {
+						App.showError(this.examineing==0?'请输入支付宝账号':'请输入渠道1账号')
+						return;
+					}
+					if (!fromData.realname) {
+						App.showError('请输入真实姓名')
+						return;
+					}
+				}
+				if (withdrawcharge == '' || withdrawcharge == '0') {
+					withdrawcharge = 0
+				}
+				// if(Number(_this.tx_money)>Number(_this.max_money) || Number(_this.tx_money)>Number(_this.drawPrice)){
+				// 	if(Number(_this.max_money)>Number(_this.drawPrice)){
+				// 		uni.showToast({
+				// 			icon:'none',
+				// 			title:`本次最大可提现金额为${_this.drawPrice}`,
+				// 			duration:2000
+				// 		});
+				// 		_this.alltx(1)
+				// 	}else{
+				// 		uni.showToast({
+				// 			icon:'none',
+				// 			title:`单次最大可提现金额为${_this.max_money}`,
+				// 			duration:2000
+				// 		});
+				// 		_this.alltx(2)
+				// 	}
+				// 	// App.showError(``);
+					
+					
+				// 	return;
+				// }
+				// let reali_price = (Math.round(tx_money * 100) / 100) * ((100 - Number(withdrawcharge)) / 100);
+				// let realTimePrice = Math.round((reali_price - (Number(withdrawcharge) / 100 * reali_price)) * 100) / 100;//四舍五入
+				let calculate = {
+					money: tx_money,
+					percent: Number(withdrawcharge)
+				}
+				App._post_form('&p=pay&do=calculationCash', calculate, res => {
+					if (res.errno === 0) {
+						let conpmoney = res.data.realmoney;
+						console.log(conpmoney);
+						if(Number(conpmoney) < 1){
+							uni.showToast({
+								title:'最低实得金额不能小于1元,当前实得金额' + conpmoney + '元',
+								icon:'none'
+							})
+							return
+						}
+						App.showError(
+							`确认提现${tx_money}元,实得${conpmoney}元`, (data) => {
+								if (data.confirm) {
+									!!data && _this.withdraw(fromData)
+								}
+							}, true)
+					}
+				})
+				// App.showError(
+				// 	`确认提现${tx_money}元,实得${realTimePrice}元`, (data) => {
+				// 		if (data.confirm) {
+				// 			!!fromData && _this.withdraw(fromData)
+				// 		}
+				// 	}, true)
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	page {
+		background: #F7F7F7;
+	}
+
+	.page {
+		padding: 30upx 30upx;
+	}
+
+	.header-content {
+		padding: 40upx 36upx 30upx 36upx;
+		border-radius: 10upx;
+	}
+
+	.tx-title {
+		margin-bottom: 40upx;
+	}
+
+	.placeinput {
+		font-size: 30upx;
+		height: 52upx;
+		line-height: 52upx;
+	}
+
+	.money-icon {
+		/* margin-right: 20upx; */
+		font-size: 28upx;
+		padding-top: 8upx;
+		margin-right: 10upx;
+		/* 	height: 1em;
+		line-height: 1em; */
+	}
+
+	.money-input {
+		padding-bottom: 20upx;
+		border-bottom: 1px solid #EEEEEE;
+		/* align-items: baseline; */
+	}
+
+	.money-input .input {
+		width: 100%;
+		font-size: 36upx;
+		/* 		height: 1.1em;
+		line-height: 1.1em; */
+	}
+
+	.tx-moneyShow {
+		padding-top: 34upx;
+	}
+
+	.tx-moneyShow .all-txBtn {
+		background-color: #F44F44;
+		width: 184upx;
+		height: 70upx;
+		line-height: 70upx;
+		background: rgba(244, 79, 68, 1);
+		border-radius: 35upx;
+	}
+
+	.with-opContent {
+		border-radius: 10upx;
+		padding: 36upx 36upx 0 36upx;
+	}
+
+	.op-imag {
+		margin-right: 15upx;
+	}
+
+	.op-imag image {
+		width: 50upx;
+		height: 50upx;
+		vertical-align: middle;
+	}
+
+	.label-classtyle {
+		padding: 20upx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.label-classtyle:last-child {
+		border: none;
+	}
+
+	.userMsg-content {
+		padding: 0 58upx;
+	}
+
+	.msg-title {
+		width: 30%;
+		margin-right: 30upx;
+	}
+
+	.msg-items {
+		border-bottom: 1px solid #EEEEEE;
+		padding: 26upx 0;
+	}
+
+	.placemsg-items {
+		color: #999999;
+	}
+
+	.last-hint {
+		position: relative;
+		text-align: left;
+		padding: 30upx 14upx 30upx 180upx;
+	}
+
+	.last-hint text {
+		/* display: block; */
+		/* position: absolute; */
+		color: red;
+		font-size: 22upx;
+		padding-left: 10upx;
+	}
+
+	.sub-btn button {
+		background: #F44F44;
+		height: 84upx;
+		line-height: 84upx;
+		text-align: center;
+		border-radius: 42upx;
+	}
+
+	.input-hidden {
+		width: 0;
+		height: 0;
+		opacity: 0;
+	}
+
+	/* #ifdef H5*/
+	radio>>>.uni-radio-input {
+		/* 自定义样式.... */
+		height: 36upx;
+		width: 36upx;
+		margin-top: -4upx;
+		border-radius: 50%;
+		border: 2upx solid #999;
+		background: transparent;
+	}
+
+	radio>>>.uni-radio-input.uni-radio-input-checked {
+		background-color: #F44F44 !important;
+		border-color: #F44F44 !important;
+	}
+
+	/* #endif */
+</style>
diff --git a/pages/subPages/dealer/withdraw/withdrawrecord.vue b/pages/subPages/dealer/withdraw/withdrawrecord.vue
new file mode 100644
index 0000000..9a0665c
--- /dev/null
+++ b/pages/subPages/dealer/withdraw/withdrawrecord.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="container">
+		<far-bottom></far-bottom>
+		<view class="container-box b-f p-r">
+			<view class="header-withdraw-detail p-r">
+				<view class="withdraw-title f-28 col-9 m-btm20 t-c">提现金额</view>
+				<view class="col-3 f-48 t-c"><text class="f-36">￥</text>{{data.sapplymoney}}</view>
+				<view class="cut-split-bf"></view>
+				<view class="cut-split-af"></view>
+			</view>
+			<view class="content-course-box dis-flex flex-x-around">
+				<view class="course-progress flex-box p-r">
+					<view class="col-6 f-28">当前状态</view>
+					<view class="course-progress-box">
+						<view class="cut-dot p-r">
+							<view class="cut-dot-circle cut-dot-circle-1"></view>
+							<view class="cut-dot-circle cut-dot-circle-2"></view>
+							<view class="iconfont" :class="data.status_title==='待审核'||'待打款'?'cut-dot-3 icon-jingshi':(data.status_title==='已完成'?'cut-dot-3 cut-dot-3-success icon-chenggong':'cut-dot-3 icon-shibai')"></view>
+						</view>
+					</view>
+				</view>
+				<view class="content-course-main flex-box">
+					<view class="course-label-1">
+						<view class="label-title col-9 f-28 m-btm10">开始提现</view>
+						<view class="label-title col-9 f-24">{{data.applytime}}</view>
+					</view>
+					<view class="course-label-2">
+						<view class="label-title col-9 f-28">系统审核中</view>
+					</view>
+					<view class="course-label-3">
+						<view class="label-title col-9 f-28 m-btm10">{{data.status_title}}<text class="jinshi-icon iconfont icon-info"></text></view>
+						<!-- <view class="label-title col-9 f-24">配置了留存额度，且留存额度大于等于基本户余额</view> -->
+					</view>
+				</view>
+			</view>
+			<view class="content-detals">
+				<view class="dis-flex flex-y-center m-btm36">
+					<view class="col-9 f-28 m-right50">提现时间</view>
+					<view class="col-3 f-24">{{data.applytime}}</view>
+				</view>
+				<view class="dis-flex flex-y-center m-btm36">
+					<view class="col-9 f-28 m-right50">到账类型</view>
+					<view class="col-3 f-24">{{data.payment_type==="1"?(examineing==0?'支付宝':'渠道1'):(data.payment_type==="2"?'微信零钱':(data.payment_type==="3"?(examineing==0?'银行卡':'渠道2'):'余额'))}}</view>
+				</view>
+				<view class="dis-flex flex-y-center details-3">
+					<view class="col-9 f-28 m-right50">手续费</view>
+					<view class="col-3 f-24">￥{{data.spercentmoney}}</view>
+				</view>
+				<view class="dis-flex flex-y-center">
+					<view class="col-9 f-28 m-right50">到账金额</view>
+					<view class="col-3 f-24">￥{{data.sgetmoney}}</view>
+				</view>
+			</view>
+			<view class="record_btmbg" :style="{'background-image':'url('+imageRoot+'record_btmbg.png)'}"></view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				data: {},
+				examineing:1
+			}
+		},
+		onLoad(option) {
+			let TextSubstitution = uni.getStorageSync('TextSubstitution');
		this.examineing = TextSubstitution.examineing || 0;
+			this.getDrawInfo(option.draw_id)
+		},
+		components: {
+
+		},
+		computed: {
+
+		},
+		onShow() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			getDrawInfo(detail_id = 163) {
+				let _this = this,
+					requestData = {
+						detail_id
+					};
+				App._post_form('&p=distribution&do=detailsOfWithdrawal', requestData, res => {
+					_this.setData(res)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.container-box {
+		margin: 0 30upx;
+		padding: 30upx 0;
+		border-radius: 10upx 10upx 0 0;
+		box-shadow: 0 0 12upx 0 rgba(121, 121, 121, 0.1);
+
+		//头部
+		.header-withdraw-detail {
+			margin: 0 30upx;
+			padding: 50upx 0 80upx;
+			border-bottom: 1px dotted #EEEEEE;
+
+			.cut-split-bf {
+				position: absolute;
+				left: -7%;
+				bottom: -15upx;
+				width: 30upx;
+				height: 30upx;
+				border-radius: 50%;
+				background-color: #F7F7F7;
+			}
+
+			.cut-split-af {
+				position: absolute;
+				right: -7%;
+				bottom: -15upx;
+				width: 30upx;
+				height: 30upx;
+				border-radius: 50%;
+				background-color: #F7F7F7;
+			}
+		}
+
+		//过程
+		.content-course-box {
+			padding: 50upx 0;
+			margin: 0 30upx;
+			border-bottom: 1px solid #EEEEEE;
+
+			.course-progress {
+				.course-progress-box {
+					position: absolute;
+					right: 20%;
+					top: 2%;
+
+					.cut-dot {
+						width: 1px;
+						height: 354upx;
+						background-color: #FFC24B;
+
+						.cut-dot-circle {
+							position: absolute;
+							left: -10upx;
+							width: 20upx;
+							height: 20upx;
+							background-color: #FFC24B;
+							border-radius: 50%
+						}
+
+						.cut-dot-circle-1 {
+							top: 0;
+						}
+
+						.cut-dot-circle-2 {
+							top: 52%;
+						}
+
+						.cut-dot-3 {
+							position: absolute;
+							font-size: 44upx;
+							left: -22upx;
+							color: #FF5E5E;
+							bottom: 0;
+						}
+						.cut-dot-3-success{
+							color: rgb(0, 212, 44)
+						}
+					}
+				}
+			}
+
+			.content-course-main {
+				.course-label-2 {
+					margin: 100upx 0;
+				}
+
+				.course-label-3 {
+					.jinshi-icon {
+						font-size: 24upx;
+						margin-left: 20upx;
+					}
+				}
+			}
+		}
+
+		// 详情
+		.content-detals {
+			padding: 50upx 30upx;
+
+			.details-3 {
+				margin: 0 0 36upx 28upx;
+			}
+		}
+
+		//底部背景
+		.record_btmbg {
+			width: 100%;
+			height: 30upx;
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: -16upx;
+			background-size: 100% 30upx;
+			background-repeat: no-repeat;
+		}
+	}
+</style>
diff --git a/pages/subPages/forgetPassword/forgetPassword.vue b/pages/subPages/forgetPassword/forgetPassword.vue
new file mode 100644
index 0000000..395b66c
--- /dev/null
+++ b/pages/subPages/forgetPassword/forgetPassword.vue
@@ -0,0 +1,378 @@
+<template>
+	<view class="forgetPassword">
+		<view class="forgetPasswordPageOne" v-if="page == 1">
+			<view class="forgetPasswordPackage">
+				<view class="forgetPasswordTitle">忘记密码</view>
+				<!-- <view class="forgetPasswordAgreement" >
+					<image :src="imgfixUrls + 'merchant/checked.svg'" style="width: 25upx;height: 25upx;margin-bottom: -2upx;" @click="storeChecked = false" v-if="storeChecked" />
+					<view  v-else  @click="storeChecked = true" style="height: 20upx;width: 20upx;border: 1px solid #FF4444;border-radius: 50%;display: inline-block;margin-bottom: -2upx">
+					</view>
+					<span style="padding-left: 10upx;">
+						登录注册表示同意
+						<span @click="toLoginAgreement">用户协议</span>
+					</span>
+				</view> -->
+				<!-- 用户输入区域 -->
+				<view class="forgetPasswordInput">
+					<view>
+						<input placeholder="请输入手机号" type="number" v-model="phone" />
+						<span></span>
+					</view>
+					<view v-if="userSet.img_switch == 1">
+						<input placeholder="请输入图形验证码" v-model="imgCode" />
+						<image :src="getImgUrl" @click="GVC" />
+					</view>
+					<view>
+						<input placeholder="请输入短信验证码" type="number" v-model="smsCode" />
+						<span @click="PIN" v-if="timeCount == 0">获取验证码</span>
+						<span v-else>{{ timeEnd }}</span>
+					</view>
+				</view>
+				<!-- 用户输入区域 -->
+				<!-- 提交按钮 -->
+				<view class="forgetPasswordSubmit" @click="goSetPassword"><span>下一步</span></view>
+				<!-- 提交按钮 -->
+			</view>
+		</view>
+		<view class="forgetPasswordPageTwo" v-if="page == 2">
+			<view class="forgetPasswordPackage">
+				<view class="forgetPasswordTitle">输入新密码</view>
+				<!-- <view class="forgetPasswordAgreement" >
+					<image :src="imgfixUrls + 'merchant/checked.svg'" style="width: 25upx;height: 25upx;margin-bottom: -2upx;" @click="storeChecked = false" v-if="storeChecked" />
+					<view  v-else  @click="storeChecked = true" style="height: 20upx;width: 20upx;border: 1px solid #FF4444;border-radius: 50%;display: inline-block;margin-bottom: -2upx">
+					</view>
+					<span style="padding-left: 10upx;">
+						登录注册表示同意
+						<span @click="toLoginAgreement">用户协议</span>
+					</span>
+				</view> -->
+				<!-- 用户输入区域 -->
+				<view class="forgetPasswordInput">
+					<view>
+						<input placeholder="请输入新密码" v-model="password" type="password" v-if="passwordSee == false" />
+						<input placeholder="请输入新密码" v-model="password" v-if="passwordSee == true" />
+						<image :src="imgfixUrls+ 'merchant/show.png'" class="show" @click="checkPasswordSee(true)" v-if="passwordSee == false" />
+						<image :src="imgfixUrls+ 'merchant/cshow.png'" class="show" @click="checkPasswordSee(false)" v-if="passwordSee == true" />
+					</view>
+					<view>
+						<input placeholder="请再次输入密码" v-model="passwordAgin" type="password" v-if="passwordAginSee == false" />
+						<input placeholder="请再次输入密码" v-model="passwordAgin" v-if="passwordAginSee == true" />
+						<image :src="imgfixUrls+ 'merchant/show.png'" class="show" v-if="passwordAginSee == false" @click="checkAginSee(true)" />
+						<image :src="imgfixUrls+ 'merchant/cshow.png'" class="show" v-if="passwordAginSee == true" @click="checkAginSee(false)" />
+					</view>
+				</view>
+				<!-- 用户输入区域 -->
+				<!-- 提交按钮 -->
+				<view class="forgetPasswordSubmit" @click="resetPassword"><span>确认</span></view>
+				<!-- 提交按钮 -->
+			</view>
+		</view>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				phone: '',
+				page: 1,
+				passwordSee: false,
+				password: '',
+				passwordAginSee: false,
+				passwordAgin: '',
+				getImgUrl: '',
+				getImgCode: '',
+				getSmsCode: '',
+				smsCode: '',
+				timeCount: 0,
+				imgCode: '',
+				timeEnd: '重新获取短信验证码',
+				userSet: {
+					img_switch: '',
+					sms_switch: ''
+				},
+				type: null,
+				img:'',
+				codeTimes:'',
+				storeChecked:true
+			};
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.storeChecked = false;
+			// _this.img = _this.imgfixUrl;
+			_this.init();
+			_this.type = e.type || 0
+		},
+		methods: {
+			init() {
+				let _this = this;
+				_this.getRegisterSet();
+			},
+			toLoginAgreement() {
+				App.navigationTo({
+					url: 'pages/mainPages/agreement/agreement?agremType=user'
+				});
+			},
+			// 获取用户注册设置信息
+			getRegisterSet() {
+				let _this = this;
+				let data = {};
+				App._post_form('&p=member&do=getRegisterSet', data, res => {
+					_this.userSet = res.data;
+					if (res.data.img_switch == 1) {
+						_this.GVC();
+					}
+				});
+			},
+			// 获取图形验证码信息
+			GVC() {
+				let _this = this;
+				let data = {};
+				App._post_form('&do=GVC', data, res => {
+					_this.getImgUrl = res.data.image_data;
+					_this.codeTimes = res.data.time;
+				});
+			},
+			// 发送短信验证码
+			PIN() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号',
+						duration: 2000
+					});
+					return;
+				}
+				let data = {
+					phone: _this.phone,
+					type: 2,
+					time:_this.codeTimes,
+					code:_this.imgCode
+				};
+				App._post_form('&do=PIN', data, res => {
+					_this.getSmsCode = res.data.code;
+					// 倒计时
+					let timer_num = 60;
+					let timeClock = setInterval(function() {
+						timer_num--;
+						_this.timeEnd = timer_num + 's后重新获取';
+						_this.timeCount = timer_num;
+						if (timer_num == 0) {
+							clearInterval(timeClock);
+						}
+					}, 1000);
+				});
+			},
+			// 重置登录密码
+			resetPassword() {
+				let _this = this;
+				if (_this.password == '' || _this.passwordAgin == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '密码不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.password !== _this.passwordAgin) {
+					uni.showToast({
+						icon: 'none',
+						title: '两次输入的密码不一致',
+						duration: 2000
+					});
+					return;
+				}
+				let data = {
+					phone: _this.phone,
+					password: _this.password
+				};
+				App._post_form(
+					'&p=member&do=resetPassword',
+					data,
+					res => {
+						uni.showModal({
+							title: '提示',
+							content: '重置密码成功',
+							success: function(res) {
+								if (res.confirm) {
+									if (_this.type == 1) {
+										uni.navigateBack({
+											delta: 1
+										});
+									} else {
+										App.navigationTo({
+											url: 'pages/mainPages/login/login'
+										});
+									}
+
+								} else if (res.cancel) {
+
+								}
+							}
+						});
+					},
+					res => {
+						uni.showToast({
+							icon: 'none',
+							title: '密码重置失败',
+							duration: 2000
+						});
+					}
+				);
+			},
+			goSetPassword() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号',
+						duration: 2000
+					});
+					return;
+				}
+				if (!_this.imgCode && _this.userSet.img_switch == 1) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的图形验证码',
+						duration: 2000
+					});
+					_this.GVC();
+					_this.imgCode = '';
+					return;
+				}
+				// if(!_this.storeChecked){
+				// 	uni.showToast({
+				// 		icon: 'none',
+				// 		title: '请先阅读用户协议并勾选',
+				// 		duration: 2000
+				// 	});
+				// 	return
+				// }
+				App._post_form('&p=member&do=checkCode', {
+					phone: _this.phone,
+					code: _this.smsCode
+				}, res => {
+					if (res.errno === 0) {
+						_this.page = 2;
+					}
+				})
+			},
+			checkPasswordSee(see) {
+				let _this = this;
+				_this.passwordSee = see;
+			},
+			checkAginSee(see) {
+				let _this = this;
+				_this.passwordAginSee = see;
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	page {
+		background: rgba(255, 255, 255, 1);
+	}
+
+	.forgetPassword {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		font-size: 0;
+	}
+
+	.forgetPasswordPackage {
+		padding: 64upx;
+	}
+
+	.forgetPasswordTitle {
+		margin-top: 26upx;
+		font-size: 48upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.forgetPasswordAgreement {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: #999999;
+
+			>span {
+				color: #2e6b9e;
+			}
+		}
+	}
+
+	.forgetPasswordInput {
+		margin-top: 115upx;
+
+		>view {
+			display: flex;
+			justify-content: space-between;
+			margin-top: 25upx;
+			height: 81upx;
+			width: 622upx;
+			border-bottom: 1px solid #eeeeee;
+
+			>input {
+				width: 400upx;
+				margin-top: 10upx;
+				vertical-align: top;
+				font-size: 28upx;
+
+
+				color: #333333;
+			}
+
+			>image {
+				vertical-align: top;
+				width: 128upx;
+				height: 57upx;
+			}
+
+			>span {
+				line-height: 60upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+
+				color: rgba(46, 107, 158, 1);
+			}
+
+			>.show {
+				width: 48upx;
+				height: 48upx;
+			}
+		}
+	}
+
+	.forgetPasswordSubmit {
+		margin: 70upx auto 0 auto;
+		width: 622upx;
+		height: 88upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 44upx;
+		text-align: center;
+
+		>span {
+			line-height: 88upx;
+			font-size: 30upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+</style>
diff --git a/pages/subPages/goods/index.css b/pages/subPages/goods/index.css
new file mode 100644
index 0000000..87b0087
--- /dev/null
+++ b/pages/subPages/goods/index.css
@@ -0,0 +1,1219 @@
+.container {
+	background-color: #F7F7F7;
+}
+
+.wfView {}
+
+.getTip {
+	width: 750upx;
+	height: 623upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx 20upx 0upx 0upx;
+}
+
+.LeBeans{
+	background: linear-gradient(to right,#F22C24,#FA6331);
+	padding: 20upx;
+	margin-bottom: 50upx;
+	border-radius: 15upx;
+	position: relative;
+}
+
+.conversion{
+	padding:8upx 15upx  20upx;
+	background-color: rgba(255,255,255,0.3);
+	position: absolute;
+	right: 0;
+	width: 105upx;
+	height: 25upx;
+	vertical-align: top;
+	top: 50%;
+	transform: translateY(-50%);
+	border-radius: 60upx 0upx 0upx 60upx;
+}
+
+.popFull {
+	height: 100upx;
+	width: 750upx;
+}
+
+.getTip_package {
+	padding: 30upx;
+}
+
+.getTip_main {
+	margin-top: 55upx;
+	height: 443upx;
+}
+
+.getTip_text {
+	font-size: 24upx;
+}
+
+.getTip_title {
+	text-align: center;
+	font-size: 30upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.wfViewMain {
+	width: 630upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.wfTitle {
+	width: 630upx;
+	height: 200upx;
+
+}
+
+.wfTitleImage {
+	width: 630upx;
+	height: 200upx;
+}
+
+.wfBodyPackage {
+	padding: 20upx 30upx;
+}
+
+.textarea{
+	font-size: 28upx;
+}
+
+.wfBodyText {
+	font-size: 26upx;
+	color: rgba(51, 51, 51, 1);
+}
+
+.wfViewClose {
+	margin: 80upx auto 0 auto;
+	width: 48upx;
+	height: 48upx;
+}
+
+.closeImg {
+	width: 48upx;
+	height: 48upx;
+}
+
+/* 商品头部 */
+.goods-header {
+	position: relative;
+	z-index: 1;
+}
+
+.goods-viewed {
+	position: absolute;
+	bottom: 5%;
+	right: 0;
+	font-size: 24upx;
+	padding: 6upx 12upx;
+	border-radius: 50upx 0 0 50upx;
+	background: rgba(0, 0, 0, .4);
+	color: #FFFFFF;
+	z-index: 5;
+}
+
+.lxPack {
+	display: flex;
+	justify-content: space-between;
+	line-height: 44upx;
+}
+
+.lx {
+	text-align: center;
+	width: 44upx;
+	height: 44upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 50%;
+	overflow: hidden;
+}
+
+.advfei{
+	background: -webkit-linear-gradient(90deg, #ff4444 ,#FF8032 ); /* Safari 5.1 - 6.0 */
+	background: -o-linear-gradient(90deg,  #ff4444, #FF8032); /* Opera 11.1 - 12.0 */
+	background: -moz-linear-gradient(90deg, #ff4444 , #FF8032); /* Firefox 3.6 - 15 */
+	background: linear-gradient(90deg, #ff4444 , #FF8032); /* 标准的语法（必须放在最后） */
+	position: absolute;
+	font-size: 28upx;
+	bottom: 150upx;
+	left: 20upx;
+	width: 90vw;
+	padding: 20upx 20upx;
+	/* background-color: #FFF0B2; */
+	display: flex;
+	border-radius: 10upx;
+}
+
+.lxImg {
+	width: 30upx;
+	height: 30upx;
+	margin-top: 8upx;
+}
+
+.goods-swiper {
+	width: 100vw;
+	/* height: 50vh; */
+	position: relative;
+	z-index: 1;
+}
+
+.swiper-item {
+	height: 100vw;
+}
+
+.goods-header .coupon-Image {
+	width: 100vw;
+	height: 100vw;
+	display: block;
+}
+
+.goods-swiper .swiper-item image {
+	width: 100%;
+	height: 100%;
+	display: block;
+}
+
+/* 弹幕购买提示 */
+.success-tips {
+	position: fixed;
+	bottom: 83%;
+	left: 30upx;
+	height: 54upx;
+	line-height: 54upx;
+	background: rgba(0, 0, 0, .5);
+	border-radius: 50px;
+	z-index: 50;
+	padding: 0 12upx 0 6upx;
+	opacity: 0;
+	transition: opacity .4s;
+}
+
+.success-tips.show {
+	opacity: 1;
+}
+
+/*  */
+.success-tips .success-avatar {
+	width: 40upx;
+	height: 40upx;
+	display: block;
+	border-radius: 50%;
+}
+
+.success-tips .success-goods {
+	max-width: 450upx;
+}
+
+/* 商品详情 */
+.goods-content {
+	box-sizing: border-box;
+}
+
+.goods-price-box {
+	padding-bottom: 12upx;
+}
+
+.goods-content .goods-price .goods-price-now {
+	color: rgba(254, 80, 79, 1);
+}
+
+.goods-content .goods-price .goods-price-now image {
+	width: 56upx;
+	height: 56upx;
+}
+
+.goods-content .goods-price .goods-price-now .credit {
+	color: rgba(254, 80, 79, 1);
+}
+
+.money-label {
+	display: inline-block;
+	margin-right: 6upx;
+}
+
+.goods-content .goods-price .goods-price-old {
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+	line-height: 52upx;
+	margin-left: 16upx;
+	text-decoration: line-through;
+}
+
+.goods-content .goods-browse {
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+	line-height: 60upx;
+}
+
+.goods-title-mian {
+	letter-spacing: 2upx;
+	line-height: 1.3em;
+}
+
+.activity-item image {
+	width: 26upx;
+	height: 26upx;
+	display: block;
+	margin-right: 12upx;
+}
+
+/* 会员卡 */
+.member-box {
+	background: linear-gradient(0deg, rgba(235, 194, 135, 1) 0%, rgba(237, 214, 170, 1) 100%);
+	border-radius: 10upx;
+}
+
+.member-title {
+	width: 360upx;
+}
+
+.member-left image {
+	width: 60upx;
+	height: 60upx;
+	display: block;
+}
+
+.member-fontColor {
+	color: #8C5200;
+}
+
+.member-fontColor-cut {
+	width: 2upx;
+	height: 26upx;
+	background: #8C5200;
+	opacity: .5;
+	margin: 0 20upx;
+}
+
+.member-right {
+	flex: 1;
+	background: linear-gradient(105deg, transparent 10.5%, #333333 12.5%, #333333 50.5%, #333333 50.5%);
+	color: #EED196;
+	height: 60upx;
+	line-height: 60upx;
+	padding-left: 20upx;
+	border-radius: 10upx 10upx 10upx 0;
+}
+
+.member-right text {
+	font-size: 24upx;
+	margin-left: 10upx;
+}
+
+/* 邀请 */
+.already-box-padding {
+	padding: 30upx 30upx 0;
+}
+
+.goods-already-box {
+	box-shadow: 0 2upx 12upx 0 rgba(221, 221, 221, 0.34);
+	border-radius: 10upx;
+}
+
+.goods-already-box .goods-already {
+	padding: 0 0 30upx 0;
+}
+
+.goods-already-box .goods-already .goods-already-num {
+	color: #333333;
+	line-height: 1.2em;
+}
+
+.goods-already-box .goods-already .goods-already-user {
+	margin-top: 15upx;
+	height: 68upx;
+}
+
+.goods-already-box .goods-already .goods-already-user .user-avatar {
+	width: 55upx;
+	height: 55upx;
+	border-radius: 55upx;
+	display: inline-block;
+	margin-right: -12upx;
+	position: relative;
+	vertical-align: top;
+}
+
+.goods-already-box .goods-already .goods-already-user .user-avatar.user-more {
+	background: #F2F2F2;
+	color: #BBBBBB;
+	text-align: center;
+	line-height: 50upx;
+	z-index: 1;
+}
+
+.goods-already-box .goods-already .goods-invite {
+	color: #333333;
+	width: 230upx;
+	height: 60upx;
+	line-height: 60upx;
+	font-size: 22upx;
+	text-align: center;
+	border-radius: 50upx;
+	position: relative;
+	margin-bottom: 1%;
+	z-index: 1;
+	background: linear-gradient(0deg, rgba(245, 182, 32, 1) 0%, rgba(246, 210, 70, 1) 100%);
+}
+
+.goods-already-box .goods-already .goods-invite button {
+	position: absolute;
+	width: 100%;
+	height: 100%;
+	opacity: 0;
+}
+
+.goods-already-box .goods-already .goods-invite-reward {
+	position: absolute;
+	right: 3%;
+	top: -15%;
+	z-index: 2;
+	height: 50upx;
+	color: #FFFFFF;
+	line-height: 50upx;
+	background: linear-gradient(90deg, rgba(254, 80, 79, 1), rgba(254, 133, 79, 1));
+	box-shadow: 0 2upx 10upx 0 rgba(254, 80, 79, 0.54);
+	border-radius: 8upx;
+	text-align: center;
+	font-size: 20upx;
+	padding: 0 20upx;
+}
+
+.goods-already-box .goods-already .goods-invite-reward::after {
+	content: " ";
+	position: absolute;
+	left: 50%;
+	bottom: -28upx;
+	transform: translateX(-50%);
+	border-width: 15upx;
+	border-style: solid;
+	border-color: #FE6C4F transparent transparent transparent;
+}
+
+/* 标题花边样式 */
+.lace-style .lace-1 {
+	position: absolute;
+	/* 	left: 35%; */
+	top: 14upx;
+	width: 14upx;
+	height: 14upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 50%;
+}
+
+.lace-style .lace-2 {
+	position: absolute;
+	/* 	left: 34%; */
+	top: 18upx;
+	width: 14upx;
+	height: 14upx;
+	background: rgba(255, 68, 68, 1);
+	opacity: 0.2;
+	border-radius: 50%;
+}
+
+.containar-title-left .lace-1 {
+	left: 35%;
+}
+
+.containar-title-right .lace-1 {
+	right: 35%;
+}
+
+.containar-title-left .lace-2 {
+	left: -8upx;
+}
+
+.containar-title-right .lace-2 {
+	right: -8upx;
+}
+
+/* 搭配商品样式 */
+.match-goods {
+	background: rgba(255, 255, 255, 1);
+	box-shadow: 0 4upx 12upx 0 rgba(221, 221, 221, 0.34);
+	border-radius: 10upx;
+}
+
+.match-goods-info .goods-info-left {
+	width: 160upx;
+	height: 160upx;
+	background-size: 160upx 160upx;
+	background-repeat: no-repeat;
+	background-image: url('https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1726110657,2456852062&fm=26&gp=0.jpg');
+	flex-shrink: 0;
+}
+
+.match-goods-info .goods-info-right .goods-info-right-title {
+	height: 2, 6em;
+	line-height: 1, 3em;
+}
+
+.match-goods-price .match-buy-btn {
+	background-color: #ff4444;
+	width: 146upx;
+	height: 54upx;
+	line-height: 54upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 30upx;
+}
+
+/* 使用流程 */
+.use-flow-item {
+	width: 24%;
+}
+
+.use-flow-item .use-order {
+	width: 34upx;
+	height: 34upx;
+	line-height: 34upx;
+	background: rgba(255, 68, 68, 1);
+	box-shadow: 0 2upx 6upx 0 rgba(205, 2, 2, 0.35);
+	border-radius: 50%;
+	margin: 0 auto 30upx;
+}
+
+.use-cut {
+	position: absolute;
+	top: 11%;
+	width: 194upx;
+	border-top: 1px solid #EEEEEE;
+	transform-origin: 0 0;
+	transform: scaleY(0.5);
+	z-index: 2;
+}
+
+.use-cut-left {
+	left: 19%;
+}
+
+.use-cut-right {
+	right: 19%;
+}
+
+.store-addressInfo-icon {
+	width: 44upx;
+	height: 44upx;
+	line-height: 44upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 50%;
+	font-size: 24upx;
+	flex-shrink: 0;
+}
+
+/* 详情tabBar */
+/* 商品详情 */
+.goods-detail-nav {}
+
+.goods-detail-nav .goods-detail-nav-item {
+	color: #999999;
+	font-size: 30upx;
+	text-align: center;
+	height: 86upx;
+	line-height: 86upx;
+	position: relative;
+}
+
+.goods-detail-nav .goods-detail-nav-item.active {
+	color: #333333;
+	font-weight: bold;
+}
+
+.select-nav-items {
+	position: absolute;
+	left: 50%;
+	top: 30upx;
+	width: 56upx;
+	height: 10upx;
+	transform: translateX(-50%);
+}
+/*  #ifndef H5 */
+    /* 仅在app平台显示 */
+    .select-nav-items {
+    	position: absolute;
+    	left: 50%;
+    	top: 75upx;
+    	width: 56upx;
+    	height: 10upx;
+    	transform: translateX(-50%);
+    }
+/*  #endif  */
+
+/*  #ifdef H5 */
+    /* 仅在app平台显示 */
+    .select-nav-items {
+    	position: absolute;
+    	left: 50%;
+    	top: 30upx;
+    	width: 56upx;
+    	height: 10upx;
+    	transform: translateX(-50%);
+    }
+/*  #endif  */
+.select-nav-items image {
+	width: 100%;
+	height: 100%;
+}
+
+/* 商品评价 */
+.evaluation-item {
+	padding: 30upx 0;
+}
+
+.evaluation-item:first-child {
+	border-top: 0;
+}
+
+.evaluation-all {
+	width: 270upx;
+	height: 70upx;
+	border: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 38upx;
+	margin: 30upx auto 0;
+	padding-left: 20upx;
+}
+
+.evaluation-all-iconfont {
+	color: #333333;
+	font-size: 36upx;
+}
+
+.evaluation-user image {
+	width: 60upx;
+	height: 60upx;
+	display: block;
+	border-radius: 50%;
+	margin-right: 10upx;
+}
+
+.evaluation-grade .iconfont {
+	width: 36upx;
+	height: 36upx;
+	line-height: 36upx;
+	font-size: 28upx;
+	display: block;
+	color: #CCCCCC;
+}
+
+.evaluation-grade .iconfont.select {
+	color: #FF4444
+}
+
+.evaluation-bd {
+	margin-top: 20upx;
+}
+
+.evaluation-imgs {
+	margin-top: 12upx;
+}
+
+.evaluation-imgs image {
+	width: 220upx;
+	margin: 0 10upx 20upx 0;
+	height: 220upx;
+	border-radius: 6upx;
+}
+
+.reply-content-item .reply-content-itemfont {
+	vertical-align: middle;
+	margin-right: 14upx;
+}
+
+/* 底部菜单 */
+.goods-footer {
+
+	background: #FFFFFF;
+	text-align: center;
+	height: 100upx;
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+}
+
+.goods-footer-crted {
+	text-align: center;
+	height: 100upx;
+	line-height: 80upx;
+	position: fixed;
+	left: 0%;
+	right: 0;
+	bottom: 0;
+	z-index: 30;
+}
+
+.goods-footer-item {
+	flex: 1;
+	box-sizing: border-box;
+	height: 100upx;
+	align-items: center;
+	position: relative;
+}
+
+.goods-footer-item>button {
+	position: absolute;
+	top: 0;
+	right: 0;
+	left: 0;
+	bottom: 0;
+	opacity: 0;
+	z-index: 8;
+}
+
+.goods-footer-item image {
+	width: 30upx;
+	height: 30upx;
+	display: inline-block;
+	margin: 0 20upx;
+}
+
+.goods-footer-item .goods-footer-item-text {
+	font-size: 24upx;
+	line-height: 1.5em;
+	color: #333333;
+	text-align: center;
+}
+
+.goods-footer .goods-footer-btn {
+	width: 352upx;
+	height: 72upx;
+	line-height: 72upx;
+	text-align: center;
+	border-radius: 50upx;
+	color: #FFFFFF;
+	background: #FE504F;
+	font-size: 28upx;
+	font-weight: bold;
+	margin: 17upx 30upx 0 0;
+	overflow: hidden;
+}
+
+.goods-footer.footer-padding {
+	padding-bottom: 20px
+}
+
+.goods-footer .footer-btn {
+	width: 100%;
+	text-align: center;
+}
+
+.goods-footer .goods-spread-btn {
+	background: #FFD940;
+}
+
+.go-buy {
+	margin-right: 30upx;
+	height: 80upx;
+	border-radius: 40upx;
+}
+
+.alrea-remind-go-buy {
+	background-color: rgb(172, 177, 172);
+}
+
+.remind-go-buy {
+	background-color: #2AC418;
+}
+
+.star-go-buy {
+	background-color: #FF4444;
+}
+
+.end-go-buy {
+	background-color: #C0C0C0;
+}
+
+.go-buy-crted {
+	background-color: #FF4444;
+	margin: 0 30upx;
+	height: 80upx;
+	border-radius: 40upx;
+}
+
+.unqualified-gobuy {
+	background-color: #C0C0C0;
+	margin-right: 30upx;
+	height: 80upx;
+	border-radius: 40upx;
+	color: #FFFFFF;
+}
+
+.out_buy-left {
+	width: 100%;
+	height: 100%;
+	background-color: #FF4444;
+	border-radius: 40upx 0 0 40upx;
+}
+
+.out_buy-leftTop {
+	margin-top: 6upx;
+}
+
+.out_buy-right {
+	width: 100%;
+	height: 100%;
+	/* border-radius: 0 40upx 40upx 0; */
+}
+
+/* 活动未开始或者已结束状态 */
+.havebtn {
+	background-color: #EEEEEE;
+	line-height: 80upx;
+}
+
+/* 活动开始状态 */
+.starbtn {
+	background-color: #FFD200;
+}
+
+/* 拼团按钮 */
+.group-go-buy {
+	width: 50%;
+	margin-right: 30upx;
+	height: 80upx;
+	border-radius: 40upx;
+}
+
+/* 砍价 */
+
+.bargainbtn {
+	line-height: 70upx;
+}
+
+.bargain-buy-box {
+	background: rgba(255, 248, 245, 1);
+	border-radius: 10upx;
+}
+
+.bargain-buy-top-title {
+	color: #FF4444;
+}
+
+.icon-right-buybarainIcon {
+	font-size: 24upx;
+}
+
+.bargain-countdown {
+	height: 110upx;
+	background-size: 100% 110upx;
+	background-repeat: no-repeat;
+	padding: 0 30upx 0;
+}
+
+.bargain-label-box {
+	border-radius: 4upx;
+	padding: 4upx 8upx;
+}
+
+.bargain-label-box>image {
+	width: 34upx;
+	height: 34upx;
+	display: block;
+}
+
+.bargain-label-box>view {
+	color: #F02E24;
+}
+
+.bargain-label-icon-rush {
+	color: #333333 !important;
+	left: -6%;
+	top: 20%;
+}
+
+.bargain-label-icon-bargin {
+	color: #FFFFFF !important;
+	left: -12%;
+	top: 20%;
+}
+
+.bargain-label-icon {
+	position: absolute;
+	/* transform: translateY(-50%); */
+	font-size: 24upx;
+	transform: rotate(90deg);
+}
+
+.bargain-countdown-oldPrice {
+	transform: scale(.95, .95);
+	text-decoration: line-through;
+}
+
+.bargain-countdown-oldPrice text {
+	margin-left: 10upx;
+}
+
+.countdownTime-style text {
+	height: 38upx;
+	line-height: 38upx;
+	border-radius: 4upx;
+	padding: 4upx 6upx;
+}
+
+.countdownTime-style-color1 text {
+	background: #F02E24;
+	color: #FFFFFF;
+}
+
+.countdownTime-style-color2 text {
+	background: rgba(255, 255, 255, 1);
+	color: #F02E24;
+}
+
+/* 抢购倒计时 */
+.rush_logo {
+	width: 70upx;
+	height: 70upx;
+	display: block;
+}
+
+.rush-label-box {
+	background-color: #333333;
+	color: #EED196;
+	border-radius: 4upx;
+	padding: 4upx 8upx;
+}
+
+/* 拼团倒计时 */
+.group-countdown {
+	height: 110upx;
+	background-size: 100% 110upx;
+	background-repeat: no-repeat;
+	padding: 0 30upx 0;
+}
+
+.group-countdown-oldPrice {
+	transform: scale(.95, .95);
+}
+
+.group-countdown-num {
+	height: 34upx;
+	border: 1px solid rgba(255, 255, 255, 1);
+	border-radius: 4upx;
+}
+
+.group-countdown-numGroup {
+	padding: 0 0 0 10upx;
+}
+
+.group-countdown-num-logo {
+	padding: 0 8upx;
+	width: 28upx;
+	height: 100%;
+	line-height: 34upx;
+}
+
+.group-countdown-num-logo>image {
+	width: 30upx;
+	height: 26upx;
+}
+
+.group-countdown-title {
+	transform: scale(.9, .9);
+}
+
+.groupcountdownTime-style text {
+	height: 38upx;
+	line-height: 38upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 4upx;
+	color: #F02E24;
+	padding: 2upx 6upx;
+}
+
+.group-countdown-nowPrice>text {
+	vertical-align: bottom;
+}
+
+/* 拼团列表 */
+.group-list-content .group-list-title>text {
+	color: #FF4444;
+}
+
+.group-list-moreicon {
+	font-size: 24upx;
+	color: #999999;
+}
+
+.group-detail .group-item-logo {
+	width: 60upx;
+	height: 60upx;
+	background-repeat: no-repeat;
+	background-size: 60upx 60upx;
+	border-radius: 50%;
+}
+
+.clustering-num {
+	color: #FF4444;
+}
+
+.group-list-item-btn {
+	width: 126upx;
+	height: 52upx;
+	line-height: 52upx;
+	border-radius: 26upx;
+}
+
+.group-list-item-btn-isEndTimefalse {
+	background: rgba(255, 68, 68, 1);
+}
+
+.group-list-item-btn-isEndTimeTrue {
+	background: #CCCCCC
+}
+
+/* 社群 */
+.goods-community {
+	padding-top: 20upx;
+}
+
+.community-user .community-user-img {
+	width: 68upx;
+	height: 68upx;
+	display: block;
+	margin-right: 20upx;
+	border-radius: 50%;
+}
+
+.community-add {
+	/* width: 110upx; */
+	padding: 0 20upx;
+	height: 54upx;
+	line-height: 54upx;
+	border-radius: 10upx;
+	font-size: 24upx;
+}
+
+.community-add-bgcolor {
+	background-color: #2AC418;
+}
+
+.community-detail {
+	border-radius: 20upx;
+	overflow: hidden;
+}
+
+.community-detail .community-header {
+	width: 70vw;
+	height: 120upx;
+	line-height: 120upx;
+	overflow: hidden !important;
+}
+
+.community-detail .community-header .community-header-text {
+	z-index: 2;
+}
+
+.community-detail .community-header::after {
+	content: " ";
+	position: absolute;
+	top: -160upx;
+	left: -25%;
+	width: 150%;
+	height: 280upx;
+	border-radius: 60%;
+	background: linear-gradient(0deg, rgba(228, 63, 53, 1), rgba(253, 92, 79, 1));
+	z-index: 1;
+}
+
+.community-detail .community-body {
+	padding: 50upx;
+}
+
+.community-detail .community-phone {
+	height: 80upx;
+	line-height: 80upx;
+	margin: 0 30upx 30upx;
+	padding: 0 20upx 0 8upx;
+	border-radius: 10upx;
+	background: #F6F6F6;
+}
+
+.community-detail .community-number .community-number-icon {
+	width: 60upx;
+	height: 60upx;
+	display: block;
+	/* margin-right: 15upx; */
+}
+
+.community-detail .community-bdial {
+	width: 96upx;
+	height: 52upx;
+	line-height: 52upx;
+	background-color: #FF4444;
+	border-radius: 10upx;
+	color: #FFFFFF;
+}
+
+.community-detail .community-reply {
+	width: 200upx;
+	height: 70upx;
+	line-height: 70upx;
+	background: linear-gradient(0deg, rgba(255, 115, 115, 1) 0%, rgba(255, 68, 68, 1) 100%);
+	border-radius: 35upx;
+	margin: 0 auto 30upx;
+}
+
+.community-detail .community-qrcodeimg {
+	width: 366upx;
+	height: 366upx;
+	display: block;
+	margin: 0 auto 30upx;
+}
+
+.bargain-countdown-right-loading {
+	width: 100upx;
+	height: 80upx;
+}
+
+.partLoaing {
+	position: absolute;
+	right: 20%;
+	top: 0;
+}
+
+.store-addressInfo-onelist {
+	width: 87%;
+}
+
+.masking {
+	position: fixed;
+	/* 		width: 100%;
+		height: 100%; */
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 100;
+	background: rgba(0, 0, 0, .5);
+	/* display: none */
+}
+
+.to-share {
+	position: fixed !important;
+	z-index: 1009;
+	right: 10upx;
+	top: 0;
+	overflow: auto;
+	width: 500upx;
+	height: 380upx;
+}
+
+.limit-rushBox {
+	box-shadow: 0 2rpx 12rpx 0 rgba(221, 221, 221, 0.34);
+	border-radius: 10rpx;
+}
+
+.progress-box {
+	width: 280upx;
+	height: 24upx;
+	border-radius: 12upx;
+	background-color: #FEB2B2;
+}
+
+.progress-bar {
+	background-image: linear-gradient(60deg, #FF4444 0, #FF4444 9%, #ff6c6c 0, #ff6c6c 12%, #FF4444 0, #FF4444 18%, #ff6c6c 0, #ff6c6c 21%, #FF4444 0, #FF4444 27%, #ff6c6c 0, #ff6c6c 30%, #FF4444 0, #FF4444 37%, #ff6c6c 0, #ff6c6c 40%, #FF4444 0, #FF4444 47%, #ff6c6c 0, #ff6c6c 50%, #FF4444 0, #FF4444 57%, #ff6c6c 0, #ff6c6c 60%, #FF4444 0, #FF4444 67%, #ff6c6c 0, #ff6c6c 70%, #FF4444 0, #FF4444 77%, #ff6c6c 0, #ff6c6c 80%, #FF4444 0, #FF4444 87%, #ff6c6c 0, #ff6c6c 90%, #FF4444 0, #FF4444 100%);
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	height: 100%;
+	border-radius: 12upx;
+	z-index: 2;
+	max-width: 100%;
+}
+
+.switchShow{
+	position: absolute;
+	bottom: 80upx;
+	width: 220upx;
+	left: 50%;
+	z-index: 99;
+	transform: translateX(-50%);
+}
+.switchImg{
+	width: 80upx;
+	height: 40upx;
+	color: #333333;
+	border: 1upx solid #FFFFFF;
+	border-radius: 60upx;
+	line-height: 40upx;
+	font-size: 24upx;
+	background-color: rgba(255,255,255,0.3);
+	text-align: center;
+}
+.switchVideo{
+	width: 80upx;
+	height: 40upx;
+	color: #FFFFFF;
+	border: 1upx solid #FF4444;
+	border-radius: 60upx;
+	line-height: 40upx;
+	font-size: 24upx;
+	background-color: #FF4444;
+	text-align: center;
+}
+.switchImg-icon{
+	font-size: 24upx;
+}
+
+.default-progress-bar {
+	position: absolute;
+	width: 280upx;
+	height: 24upx;
+	left: 0;
+	top: 50%;
+	transform: translateY(-50%);
+	z-index: 3;
+}
+
+.default-progress-bar .shrink {
+	transform: scale(0.85);
+}
+
+.audio-main {
+	position: fixed;
+	right: 50upx;
+	top: 10%;
+	z-index: 10;
+}
+
+.audio-bg {
+	position: relative;
+}
+
+.audio-bg .audio-gif {
+	width: 100upx;
+	height: 100upx;
+	background-size: 100upx 100upx;
+	background-repeat: no-repeat;
+}
+
+.audio-bg .audio-gif .audio-png {
+	position: absolute;
+	background-size: 80upx 80upx;
+	animation: rotate2d 1.2s linear infinite;
+	z-index: -1;
+	width: 80upx;
+	height: 80upx;
+}
+
+.audio-bg.stop-audio .audio-gif {
+	background: none !important;
+}
+
+.audio-bg.stop-audio .audio-png {
+	animation: none;
+}
+
+@keyframes rotate2d {
+	from {
+		transform: rotate(0)
+	}
+
+	to {
+		transform: rotate(360deg)
+	}
+}
diff --git a/pages/subPages/goods/index.vue b/pages/subPages/goods/index.vue
new file mode 100644
index 0000000..0163c6e
--- /dev/null
+++ b/pages/subPages/goods/index.vue
@@ -0,0 +1,2493 @@
+<template>
+	<view>
+		<!-- #ifdef H5 -->
+		<loading v-if="loadlogo"></loading>
+		<view class="container" :style="{height: wfShow?'90vh':'auto'}" v-if="!loadlogo">
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<loading v-if="loadlogo"></loading>
+			<view class="container" :style="{height: wfShow?'90vh':'auto',display:loadlogo?'none':'block'}">
+				<!-- #endif -->
+				<block v-if="goodsType !== 'integral'">
+					<!-- 购买弹幕 -->
+					<block v-if="barrageList.length > 0">
+						<view class="success-tips dis-flex flex-y-center" :class="{ show: showTips }">
+							<image class="success-avatar" :src="barrageList[tipsIndex] ? barrageList[tipsIndex]['avatar'] : ''"></image>
+							<view class="onelist-hidden success-goods f-24 col-f m-left12">{{ barrageList[tipsIndex] ? barrageList[tipsIndex]['nickname'] : '' }}
+								刚刚{{goodsType === '7' ? '为本商品砍价' + barrageList[tipsIndex]['bargainprice'] + '元'
+									: goodsType === '5'
+									? dataInfo.is_charge === '1'
+										? '购买了此卡券'
+										: '领取了此卡券'
+									: '购买了此商品'}}
+							</view>
+						</view>
+					</block>
+					<!-- 商品详情头部 -->
+					<view class="goods-header" v-if="(goodsType === '5' && !!dataInfo.logo) || (goodsType !== '5' && dataInfo['thumbs'].length != 0) || (goodsType !== '5' && !!dataInfo['videourl'])" >
+						
+						<block v-if="(dataInfo.thumbs.length > 0 && ifimg) || (dataInfo.logo && ifimg)">
+							<swiper @change="bindchange" v-if="dataInfo['thumbs'].length > 0" :autoplay="true" :interval="3000" :circular="true" class="goods-swiper" :style="{ height: (dataInfo['imgstyle'].height * ratio) + 'px',width: (dataInfo['imgstyle'].width * ratio) + 'px' }">
+								<swiper-item class="swiper-item" v-for="(banner_item, index) in dataInfo['thumbs']" :key="index">
+									<image :src="banner_item" :data-id="index"></image>
+								</swiper-item>
+							</swiper>
+							<block v-if="dataInfo['thumbs'].length == 0 && dataInfo.logo">
+								<image :src="dataInfo.logo" :style="{ height: (dataInfo['imgstyle'].height * ratio) + 'px',width: (dataInfo['imgstyle'].width * ratio) + 'px' }" class="coupon-Image"></image>
+							</block>
+							<view class="switchShow dis-flex" v-if="dataInfo.videourl && (dataInfo.thumbs.length > 0 || dataInfo.logo)">
+								<view class="flex-box">
+									<view class="switchImg" @click="changeIfimg(false)">
+										<text class="iconfont icon-playfill switchImg-icon"></text>
+										视频
+									</view>
+								</view>
+								<view class="flex-box" @click="changeIfimg(true)">
+									<view class=" switchVideo">
+										图片
+									</view>
+								</view>
+								
+								
+							</view>
+						</block>
+						<block v-else-if="dataInfo.videourl && !ifimg">
+							<!-- <swiper @change="bindchange" :autoplay="true" :interval="3000" :circular="true" class="goods-swiper" > -->
+								<view class="swiper-item" :style="{ height: (dataInfo['imgstyle'].height * ratio) + 'px',width: (dataInfo['imgstyle'].width * ratio) + 'px' }">
+									<video id="shopVideo" :loop="true" t7-video-player-type="inline" webkit-playsinline="true"  playsinline="true"  x-webkit-airplay="true" x5-playsinline="showLine" vslide-gesture :show-mute-btn="true" style="width: 100%;height: 100%;" objectFit="contain" :src="dataInfo.videourl" controls></video>
+								</view>
+							<!-- </swiper> -->
+							<view class="switchShow dis-flex" v-if="dataInfo.videourl && (dataInfo.thumbs.length > 0 || dataInfo.logo)">
+								<view class="flex-box" @click="changeIfimg(false)">
+									<view class=" switchVideo">
+										<text class="iconfont icon-playfill switchImg-icon"></text>
+										视频
+									</view>
+								</view>
+								<view class="flex-box">
+									<view class="switchImg  " @click="changeIfimg(true)">
+										图片
+									</view>
+								</view>
+								
+							</view>
+						</block>
+						
+						<view class="goods-viewed">{{ dataInfo['pv'] }}人喜欢</view>
+					</view>
+					<!-- 砍价倒计时背景 -->
+					<block v-if="goodsType === '7'">
+						<view class="bargain-countdown dis-flex flex-y-center" :style="{ 'background-image': ' url(' + imageRoot + 'bargain_bg.png)' }">
+							<view class="bargain-countdown-content dis-flex flex-x-between flex-y-center flex-box">
+								<view class="bargain-countdown-content-left">
+									<view class="bargain-label dis-flex flex-y-center">
+										<view class="bargain-countdown-nowPrice f-44 col-f m-right30">
+											<text class="col-f f-24">¥</text>
+											{{ dataInfo.is_vip > 0 && dataInfo['vipstatus'] === '1' ? dataInfo['vipprice'] : dataInfo['price'] }}
+											<text class="f-24 m-left10" v-if="optionstatus == '1'">起</text>
+										</view>
+										<view class="bargain-label-box dis-flex b-f p-r">
+											<image :src="imgfixUrls + 'goods/bargin_count_bg.png'" mode=""></image>
+											<view class="f-24 ">砍价享</view>
+											<view class="bargain-label-icon bargain-label-icon-bargin iconfont icon-triangledownfill"></view>
+										</view>
+									</view>
+									<view class="bargain-countdown-oldPrice f-24 col-f">
+										市场价
+										<text style="text-decoration:line-through;">¥{{ dataInfo['oldprice'] }}</text>
+									</view>
+								</view>
+								<view class="bargain-countdown-content-right">
+									<block v-if="!!countDown['timeobj']">
+										<view class="col-f f-24 t-c">距离{{ dataInfo['stateTime'] === 1 ? '结束' : '开始' }}还剩:</view>
+										<view class="countdownTime-box dis-flex flex-x-center">
+											<view class="countdownTime-style countdownTime-style-color2 countdownTime-hh  col-f" v-if="countDown.timeobj.tt !== '00'">
+												<text class="f-24">{{ countDown['timeobj']['tt'] }}</text>
+												<span style="font-size: 24upx;">天</span>
+											</view>
+											<view class="countdownTime-style countdownTime-style-color2 countdownTime-hh col-f">
+												<text class="f-24">{{ countDown['timeobj']['hh'] }}</text>
+												:
+											</view>
+											<view class="countdownTime-style countdownTime-style-color2 countdownTime-ss col-f">
+												<text class="f-24">{{ countDown['timeobj']['mm'] }}</text>
+												:
+											</view>
+											<view class="countdownTime-style countdownTime-style-color2 countdownTime-mm col-f">
+												<text class="f-24">{{ countDown['timeobj']['ss'] }}</text>
+											</view>
+										</view>
+									</block>
+									<block v-if="dataInfo['isTimeOver']">
+										<view class="f-28 col-6">活动{{ dataInfo['stateTime'] === 1 ? '已结束' : '未开始' }}</view>
+									</block>
+									<block v-else-if="!(!!countDown['timeobj'])">
+										<view class="bargain-countdown-right-loading p-r">
+											<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+										</view>
+									</block>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 抢购倒计时背景 -->
+					<block v-if="goodsType === '1'">
+						<view class="group-countdown dis-flex flex-y-center" :style="{ 'background-image': ' url(' + imageRoot + 'rush_bg.png)' }">
+							<view class="bargain-countdown-content dis-flex flex-x-between flex-box">
+								<view class="bargain-countdown-content-left">
+									<view class="dis-flex flex-y-center dis-flex flex-y-center">
+										<!-- <image :src="imgfixUrls + 'goods/rush_logo.png'" class="rush_logo m-right30" mode=""></image> -->
+										<view>
+											<view class="bargain-label dis-flex flex-y-center">
+												<view class="bargain-countdown-nowPrice f-44 col-f m-right30">
+													<span class="col-f f-24">¥</span>
+													{{ dataInfo['price'] }}
+													<span class="f-24 m-left10" v-if="optionstatus == '1'">起</span>
+												</view>
+												<block v-if="dataInfo['vipstatus'] === '1'">
+													<view class="rush-label-box p-r f-24">
+														{{dataInfo.levelarmy == 1?'拥军价格':dataInfo.levelname}}立减{{ dataInfo['discount_price'] }}元
+														<view class="bargain-label-icon bargain-label-icon-rush iconfont icon-triangledownfill"></view>
+													</view>
+												</block>
+												
+											</view>
+											<view class="dis-flex">
+												<view class="bargain-countdown-oldPrice f-24 col-f" :style="{textDecoration:goodsType === '1'?'line-through':'none'}">
+													{{goodsType === '1'?'市场价':'单买价'}}
+													<text :style="{textDecoration:goodsType === '1'?'line-through':'none'}">¥{{ goodsType === '1'?dataInfo['oldprice']:dataInfo['aloneprice'] }}</text>
+												</view>
+												<!-- <view class="group-countdown-num dis-flex flex-y-center" style="margin-left: 30upx;">
+													<view class="group-countdown-num-logo b-f">
+														<image :src="imgfixUrls + 'goods/groupnum.png'" mode=""></image>
+													</view>
+													<view class="group-countdown-numGroup f-24 col-f" style="padding-right: 10upx;">{{ dataInfo['peoplenum'] }}人团</view>
+												</view> -->
+											</view>
+											
+										</view>
+									</view>
+								</view>
+								<block v-if="!!countDown['timeobj']">
+									<view class="bargain-countdown-content-right">
+										<view class="color-f02 f-24 t-c">距离{{ dataInfo['stateTime'] === 1 ? '结束' : '开始' }}还剩:</view>
+										<view class="countdownTime-box dis-flex flex-x-center flex-y-center">
+											<view class="countdownTime-style countdownTime-style-color1 countdownTime-hh color-f02" v-if="countDown.timeobj.tt !== '00'">
+												<text class="f-24">{{ countDown['timeobj']['tt'] }}</text>
+												<span style="font-size: 24upx;">天</span>
+											</view>
+											<view class="countdownTime-style countdownTime-style-color1 countdownTime-hh color-f02">
+												<text class="f-24">{{ countDown['timeobj']['hh'] }}</text>
+												:
+											</view>
+											<view class="countdownTime-style countdownTime-style-color1 countdownTime-ss color-f02">
+												<text class="f-24">{{ countDown['timeobj']['mm'] }}</text>
+												:
+											</view>
+											<view class="countdownTime-style countdownTime-style-color1 countdownTime-mm color-f02">
+												<text class="f-24">{{ countDown['timeobj']['ss'] }}</text>
+											</view>
+										</view>
+									</view>
+								</block>
+								<block v-if="dataInfo['isTimeOver']">
+									<view class="f-28 col-9 dis-flex flex-y-center">活动{{ dataInfo['stateTime'] === 1 ? '已结束' : '未开始' }}</view>
+								</block>
+								<block v-else-if="!(!!countDown['timeobj'])">
+									<view class="bargain-countdown-right-loading p-r">
+										<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+									</view>
+								</block>
+							</view>
+						</view>
+					</block>
+					<!-- 拼团倒计时背景 -->
+					<block v-if="goodsType === '3'">
+						<view class="group-countdown dis-flex flex-y-center" :style="{ 'background-image': dataInfo['isTimeOver'] ? ' url(' + imageRoot + 'group_bg2.png)' : 'url(' + imageRoot + 'group_bg.png)' }">
+							<view class="group-countdown-content dis-flex flex-x-between flex-y-center flex-box">
+								<view class="group-countdown-content-left">
+									<view class="dis-flex flex-y-center">
+										<view class="group-countdown-nowPrice col-f f-58 m-right30">
+											<text class="f-30 m-right10">¥</text>
+											{{ dataInfo['price'] }}
+											<text class="f-24 m-left10" v-if="optionstatus == '1'">起</text>
+										</view>
+
+										<view class="group-countdown-num_oldPrice">
+											<view class="group-countdown-num dis-flex flex-y-center">
+												<view class="group-countdown-num-logo b-f">
+													<image :src="imgfixUrls + 'goods/groupnum.png'" mode=""></image>
+												</view>
+												<view class="group-countdown-numGroup f-24 col-f">{{ dataInfo['peoplenum'] }}人团</view>
+											</view>
+											<view class="group-countdown-oldPrice f-24 col-f">单价买 ¥{{ dataInfo['aloneprice'] }}</view>
+										</view>
+									</view>
+								</view>
+								<view class="bargain-countdown-content-right">
+									<block v-if="!!countDown['timeobj']">
+										<view class="col-f f-24 group-countdown-title t-c">距离{{ dataInfo['stateTime'] === 1 ? '结束' : '开始' }}还剩:</view>
+										<view class="countdownTime-box dis-flex flex-x-center flex-y-center">
+											<view class="groupcountdownTime-style countdownTime-hh col-f" v-if="countDown.timeobj.tt !== '00'">
+												<text class="f-24">{{ countDown['timeobj']['tt'] }}</text>
+												<span style="font-size: 24upx;">天</span>
+											</view>
+											<view class="groupcountdownTime-style countdownTime-hh col-f">
+												<text class="f-24">{{ countDown['timeobj']['hh'] }}</text>
+												:
+											</view>
+											<view class="groupcountdownTime-style countdownTime-ss col-f">
+												<text class="f-24">{{ countDown['timeobj']['mm'] }}</text>
+												:
+											</view>
+											<view class="groupcountdownTime-style countdownTime-mm col-f">
+												<text class="f-24">{{ countDown['timeobj']['ss'] }}</text>
+											</view>
+										</view>
+									</block>
+									<block v-if="dataInfo['isTimeOver']">
+										<view class="f-28 col-9">活动已结束</view>
+									</block>
+									<block v-else-if="!(!!countDown['timeobj'])">
+										<view class="bargain-countdown-right-loading p-r">
+											<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+										</view>
+									</block>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 商品信息 -->
+					<view class="goods-info m-btm20">
+						<!-- 商品内容 -->
+						<view class="goods-content module-content">
+							<!-- 商品价格 -->
+							<block v-if="goodsType !== '1' && goodsType !== '7' && goodsType !== '3'">
+								<view class="goods-price-box dis-flex flex-dir-row flex-y-end flex-x-between">
+									<!-- 普通商品-->
+									<view class="goods-price dis-flex flex-dir-row flex-y-end">
+										<block v-if="goodsType === '5'">
+											<view class="goods-price-now price-font-family">
+												<text class="f-32">{{ !!dataInfo.is_charge && dataInfo.is_charge === '1' ? dataInfo['price'] : '免费' }}</text>
+												<text class="f-24 m-left10" v-if="optionstatus == '1'">起</text>
+											</view>
+										</block>
+										<block v-else>
+											<view class="goods-price-now price-font-family">
+												<view class="money-label f-24">¥</view>
+												<text class="f-58">{{ dataInfo['price'] }}</text>
+												<text class="f-24 m-left10" v-if="optionstatus == '1'">起</text>
+											</view>
+											
+										</block>
+										<view  :style="{'position': 'relative','top': Number(dataInfo.discount_price) != 0?'12rpx':'0rpx'}">
+											<block v-if="dataInfo['vipstatus'] === '1' && Number(dataInfo.discount_price) != 0">
+													<view class="rush-label-box p-r f-24" style="bottom: -10upx;left: 20upx;">
+														{{dataInfo.levelarmy == 1?'拥军价格':dataInfo.levelname}}立减{{ dataInfo['discount_price'] }}元
+														<view class="bargain-label-icon bargain-label-icon-rush iconfont icon-triangledownfill"></view>
+													</view>
+											</block>
+											<view class="goods-price-old f-24 col-9" style="text-decoration:line-through;"  v-if="!!dataInfo['oldprice']">
+												
+												<text class="money-label">¥</text>{{ dataInfo['oldprice'] }}
+											</view>
+										</view>
+										
+										
+									</view>
+									
+									<!-- 商品销量/库存 -->
+									<!-- <view class="goods-browse">
+										已{{ goodsType === '5' && dataInfo['is_charge'] === '0' ? '领' : '售' }}{{ dataInfo['buy_num'] }}/仅剩{{ dataInfo['stk'] }}
+									</view> -->
+								</view>
+							</block>
+							<!-- 商品标题 -->
+							<view class="goods-title">
+								<!-- 商品名称 -->
+								<view class="goods-title-mian f-36 col-3 m-btm15" @click="copy(dataInfo['goods_name'])">{{ dataInfo['goods_name'] }}</view>
+								<!-- 商品活动 -->
+								<view class="dis-flex">
+									<view class="goods-activity dis-flex flex-y-center flex-warp m-btm20" style="flex: 0.95;" @click="looktag">
+										<view class="activity-item dis-flex flex-y-center m-right30" v-for="(tagItem, index) in dataInfo['tag_list']" :key="index">
+											<image :src="imgfixUrls + 'goods/activityImage.png'" style="width: 25upx;height: 25upx;" mode=""></image>
+											<view class="f-24 col-9" style="max-width: 600upx;" >{{ tagItem }}</view>
+										</view>
+									</view>
+									<view class="f-20 m-btm20" style="flex: 0.05;color: #999999;" v-if="dataInfo['tag_list']" @click="looktag">
+										<!-- 查看详情 -->
+										<text :class="!istag? 'iconfont icon-unfold':'iconfont icon-fold'" style="color: #6f6f6f;font-size: 26upx;line-height: 60upx;padding-left: 10upx;display: inline-block;box-sizing: border-box;"></text>
+									</view>
+								</view>
+								<!-- 砍价购介绍 -->
+								<block v-if="goodsType === '7'">
+									<view class="bargain-buy-box padding-box-all">
+										<view class="bargain-buy-top dis-flex flex-y-center flex-x-between" @click="wfShow = true">
+											<view class="bargain-buy-top-title f-24 m-btm15">[{{!!dataInfo.barset && dataInfo.barset.playdesc?dataInfo.barset.playtitle:'砍价购'}}]</view>
+											<view class="f-24 col-9">
+												玩法详情
+												<text class="iconfont icon-right icon-right-buybarainIcon"></text>
+											</view>
+										</view>
+										<view class="bargain-buy-top f-24 col-9">{{!!dataInfo.barset && dataInfo.barset.playdesc?dataInfo.barset.playdesc:'邀请好友砍价，超低价购买心仪商品！'}}</view>
+									</view>
+								</block>
+								<!-- 核销尾款 -->
+								<view class="f-28 col-9" v-if="dataInfo['retainage'] && dataInfo['retainage'] !== '0.00'">商品核销尾款:{{ dataInfo['retainage'] }}元</view>
+							</view>
+
+							<!-- 乐豆 -->
+							<view class="dis-flex col-f LeBeans" v-if="dataInfo.diy_userInfo">
+								<view >
+
+									<view class="f-28 f-w" style="padding-bottom: 15upx;" v-if="dataInfo.diy_userInfo.credit">
+										<text class="f-w">您的兑换券金额</text>
+										<text style="padding: 0 0upx;vertical-align: top;">:</text>
+										<text>{{dataInfo.diy_userInfo.credit}}</text>
+
+										<view class="f-28 f-w" style="padding-top: 15upx;">(此商品至少需要<text style="padding: 0 0upx;">{{dataInfo.price}}</text>元兑换券)</view>
+									</view>
+
+
+									<view class="f-28" style="padding-bottom: 15upx;" v-else>
+										未登录
+									</view>
+									<!-- #ifdef H5 -->
+									<view class="f-20 f-w" style="fontSize: 20upx;width: 88%;">
+										<view class="dis-il-block" style="padding: 4upx 8upx;background-color: rgba(0,0,0,0.3);border-radius: 5upx;margin-right: 10upx;">
+											{{dataInfo.diy_userInfo.dhtip1}}
+										</view>
+										<text>{{dataInfo.diy_userInfo.dhtip2}}</text>
+									</view>
+									<!-- #endif -->
+									<!-- #ifndef H5 -->
+									<view class="f-20 f-w" style="fontSize: 20upx;width: 92%;">
+										<view class="dis-il-block" style="padding: 4upx 8upx;background-color: rgba(0,0,0,0.3);border-radius: 5upx;margin-right: 10upx;">
+											{{dataInfo.diy_userInfo.dhtip1}}
+										</view>
+										<text>{{dataInfo.diy_userInfo.dhtip2}}</text>
+									</view>
+									<!-- #endif -->
+								</view>
+								<view class="f-26" style="">
+									<view class="conversion" @click="goladur(dataInfo.diy_userInfo.dhurl)">
+										去兑换
+										<text class="iconfont icon-right" style="font-size: 26upx;"></text>
+									</view>
+								</view>
+
+							</view>
+							<!-- 乐豆 -->
+
+							<!-- 会员卡 -->
+							<view class="member-box dis-flex flex-y-center flex-x-between m-btm40" v-if="dataInfo.is_open_vip === 1">
+								<view class="member-left dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'goods/member.png'" mode=""></image>
+									<view class="f-24 member-fontColor">{{ TextSubstitution['halfcardtext'] }}</view>
+									<view class="member-fontColor-cut"></view>
+									<view class="member-title f-24 member-fontColor onelist-hidden">
+										{{ dataInfo.is_vip > 0 ? '续费' + TextSubstitution['halfcardtext'] + ',继续立享优惠折扣' : '开通' + TextSubstitution['halfcardtext'] + ',立享优惠折扣' }}
+									</view>
+								</view>
+								<view class="member-right t-c f-24" @click="member()">
+									{{ dataInfo.is_vip > 0 ? '去续费' : '去开通' }}
+									<text class="iconfont icon-right"></text>
+								</view>
+							</view>
+
+							<!-- 邀请 -->
+							<view class="goods-already-box m-btm20" :class="!!dataInfo['community'] ? 'padding-box-all' : 'already-box-padding'">
+								<!-- 浏览人数 -->
+								<view  :class="{ 'border-bottom border-line': (goodsType === '1' || goodsType === '2') && !!dataInfo['community'] }">
+									<view class="goods-already dis-flex flex-dir-row flex-y-end flex-x-between p-r" style="height: 116upx;" >
+										<view class="goods-already-buy">
+											<block v-if="goodsType !== '1' && goodsType !== '7' && goodsType !== '3'">
+												<view class="goods-already-num f-24 m-btm20">TA们都在逛</view>
+											</block>
+											<block v-else>
+												
+											</block>
+											<view class="goods-already-user">
+												<image class="user-avatar" :src="userItem" v-for="(userItem, index) in dataInfo['user_list']" :key="index"
+												 :style="{ 'z-index': dataInfo['user_list']['length'] * 2 - index }"></image>
+												<view class="user-avatar user-more f-24">···</view>
+											</view>
+										</view>
+										<view class="goods-invite-reward" v-if="dataInfo['dis_assistant']['is_show'] === 1">
+											最高赚¥{{
+											dataInfo['dis_assistant']['max_commission']
+										}}
+										</view>
+										<view class="goods-invite" @click="posterShare(dataInfo)">邀请好友</view>
+										
+										
+									</view>
+									<view class="dis-flex">
+										<view class="goods-already-num f-24 m-btm20" style="flex: 0.5;">
+											<text v-if="Number(dataInfo.alldaylimit ) > 0">总计:</text>已售{{ dataInfo['buy_num'] }}/仅剩{{ dataInfo['stk'] }}
+										</view>
+										<view class="goods-already-num f-24 m-btm20 t-r" style="flex: 0.5;" v-if="Number(dataInfo.alldaylimit ) > 0">
+											今日:已{{ goodsType === '5' && dataInfo['is_charge'] === '0' ? '领' : '售' }}{{ dataInfo['todayselenum'] }}/{{ dataInfo['alldaylimit'] }}
+										</view>
+									</view>
+								</view>
+								
+								<!-- 社群 -->
+								<block v-if="!!dataInfo['community']">
+									<view class="goods-community dis-flex flex-x-between flex-y-center m-top20">
+										<view class="community-user dis-flex flex-y-center flex-box ">
+											<image :src="dataInfo['community']['imgUrl']" class="community-user-img"></image>
+											<view class="community-user-info flex-box">
+												<view class="community-user-name col-0 f-28">{{ dataInfo['community']['name'] }}</view>
+												<view class="community-user-des f-24 col-9 onelist-hidden">{{ dataInfo['community']['introduce'] }}</view>
+											</view>
+										</view>
+										<view class="community-btn"><button class="community-add community-add-bgcolor f-24 col-f" @click="showCommunity = true"
+											 v-if="!!dataInfo['community']">添加</button></view>
+									</view>
+								</block>
+								<!-- 社群弹窗 -->
+								<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false" v-if="!!dataInfo['community']">
+									<view class="community-detail b-f t-c">
+										<view class="community-header f-w f-36 p-r col-f"><text class="community-header-text p-r">{{dataInfo['community']['name']}}</text></view>
+										<!-- #ifdef H5 -->
+										<view class="community-body">
+											<image :src="!!dataInfo['community'] ? dataInfo['community']['qrcodeUrl'] : ''" class="community-qrcodeimg"></image>
+											<view class="community-toreply f-26 col-3">长按识别二维码</view>
+										</view>
+										<!-- #endif -->
+										<!-- #ifndef H5 -->
+										<view class="community-body f-26 col-3">
+											有任何疑问，点击“
+											<text class="col-m">去回复</text>
+											”发送“
+											<text class="col-m">{{ dataInfo['community']['community_id'] }}</text>
+											”,即可添加{{dataInfo['community']['name']}}
+										</view>
+										<!-- #endif -->
+										<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!dataInfo['community'] && !!dataInfo['community']['phone']">
+											<view class="community-number dis-flex flex-y-center">
+												<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon"></image>
+												<view class="f-24 col-3">{{ dataInfo['community']['phone'] }}</view>
+											</view>
+											<view class="community-bdial f-24" @click="callPhone(dataInfo.community.phone)">拨号</view>
+										</view>
+										<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType === '3'">去回复</button>
+									</view>
+								</PopManager>
+								
+							</view>
+							<!-- 限数抢购 -->
+							<view class="limit-rushBox p-left-right-30" v-if="dataInfo.lp_status != '0' && dataInfo.type === '1'">
+								<view class="limit-rushList m-left-right-30">
+									<view class="limit-item border-line border-bottom dis-flex flex-y-center flex-x-between p-top-bom-30" v-for="(limitItem, index) in dataInfo.lp_set" :key="index">
+										<view class="limit-left">
+											<view class="limitPrice-goodNum dis-flex flex-y-center m-btm20">
+												<view class="col-f4 f-30 m-right30">
+													<text class="f-24">¥</text>
+													{{ limitItem.price }}
+												</view>
+												<view class="f-24 col-3">(第{{ limitItem.min }}~{{ limitItem.max }}件)</view>
+											</view>
+											<view class="progress-box p-r">
+												<view class="progress-bar" :style="{ width: limitItem.proportion + '%' }"></view>
+												<view class="default-progress-bar dis-flex flex-y-center">
+													<view class="col-f f-22 shrink">已卖{{ limitItem.buy_num }}件</view>
+												</view>
+											</view>
+										</view>
+										<block v-if="limitItem.proportion < 100">
+											<view class="limit-right f-24 col-3">仅剩{{ limitItem.surplus }}件</view>
+										</block>
+										<block v-else>
+											<view class="f-24 col-f4">已卖清</view>
+										</block>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<!-- 拼团列表 -->
+					<block v-if="goodsType === '3' && dataInfo['is_pool'] !== '1' && dataInfo['group_list'].length > 0">
+						<view class="group-list p-top-bom-40 b-f m-btm20">
+							<view class="group-list-content m-left-right-30">
+								<view class="dis-flex flex-y-center flex-x-between">
+									<view class="group-list-title f-30 col-3">参与拼团，享受优惠</view>
+								</view>
+								<view class="group-list-item p-top-bom-30 border-line border-bottom" v-for="(groupItem, index) in dataInfo['group_list']" :key="index">
+									<view class="dis-flex flex-x-between flex-y-center">
+										<view class="group-detail dis-flex flex-y-center">
+											<view class="group-item-logo m-right10" :style="{ 'background-image': ' url(' + groupItem['avatar'] + ')' }"></view>
+											<view class="group-item-name f-28 col-3">{{ groupItem['nickname'] }}</view>
+										</view>
+										<view class="dis-flex flex-y-center">
+											<view class="clustering-dateTime-num m-right30">
+												<view class="clustering-num f-24">
+													还差
+													<text>{{ groupItem['lacknum'] }}人</text>
+													成团
+												</view>
+												<view class="f-24 col-9">
+													剩余 {{ !!groupItem['groupTime'] ? groupItem['groupTime']['hh'] : '00' }}:
+													{{ !!groupItem['groupTime'] ? groupItem['groupTime']['mm'] : '00' }}:
+													{{ !!groupItem['groupTime'] ? groupItem['groupTime']['ss'] : '00' }}
+												</view>
+											</view>
+											<view class="group-list-item-btn t-c f-24 col-f" :class="groupItem['isTimeOver'] ? 'group-list-item-btn-isEndTimeTrue' : 'group-list-item-btn-isEndTimefalse'"
+											 @click="navbargin(groupItem)">
+												去参团
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<!-- 使用须知 -->
+					<view class="b-f padding-box-all m-btm20">
+						<!-- 配置标题 -->
+						<goodsHeaderTitle :titleName="TextSubstitution.shiylctext"></goodsHeaderTitle>
+						<!-- 使用流程 -->
+						<view v-if="strings.strings">
+							<jyf-parser  domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable showWithAnimation show-with-animation use-anchor :html="strings.strings" @imgtap="imgtap"></jyf-parser>
+						</view>
+
+						<view v-else class="use-flow dis-flex flex-x-between p-r">
+							<view class="use-flow-item t-c">
+								<view class="use-order t-c col-f f-24">1</view>
+								<view class="use-detail">
+									<view class="f-24 col-3">选择商品</view>
+									<view class="f-24 col-9">点击立即购买</view>
+								</view>
+							</view>
+							<view class="use-flow-item t-c">
+								<view class="use-order t-c col-f f-24">2</view>
+								<view class="use-detail">
+									<view class="f-24 col-3">购买完成</view>
+									<view class="f-24 col-9">在订单页使用</view>
+								</view>
+							</view> 
+							<view class="use-flow-item t-c">
+								<view class="use-order t-c col-f f-24">3</view>
+								<view class="use-detail">
+									<view class="f-24 col-3">获取核销码</view>
+									<view class="f-24 col-9">等待商家发货</view>
+								</view>
+							</view>
+							<view class="use-cut use-cut-left"></view>
+							<view class="use-cut use-cut-right"></view>
+						</view>
+					</view>
+					<!-- 商家信息 -->
+					<view class="store padding-box-all b-f m-btm20" v-if="!!dataInfo['shop']">
+						<!-- 配置标题 -->
+						<goodsHeaderTitle :titleName="'商家信息'"></goodsHeaderTitle>
+						<view class="store-detail" @click="naviStore(dataInfo['shop'])">
+							<view class="m-btm20 col-3 f-28">{{ dataInfo['shop']['storename'] }} <text class="dis-il-block f-w" style="float: right;color: #FF4444;">点击进入<text
+									 class="f-24 iconfont icon-right f-w" style="color: #FF4444;font-size: 28upx;"></text></text></view>
+							<view class="f-24 col-9  m-btm30 lxPack">
+								<text>营业时间：{{ dataInfo['shop']['storehours'] }}</text>
+								<view class="lx" @click.stop="goLt"><img :src="imgfixUrls + 'merchant/spLt.png'" class="lxImg" /></view>
+							</view>
+							<view class="dis-flex flex-x-between m-btm20">
+								<view class="store-addressInfo f-24 col-9">商家电话：{{ dataInfo['shop']['mobile'] }}</view>
+								<view class="store-addressInfo-icon t-c col-f iconfont icon-dianhua" @click.stop="supple(dataInfo['shop'], 'mobile')"></view>
+							</view>
+							<view class="dis-flex flex-x-between">
+								<view class="store-addressInfo store-addressInfo-onelist onelist-hidden f-24 col-9">{{ dataInfo['shop']['address'] }}</view>
+								<view class="store-addressInfo-icon t-c col-f iconfont icon-daohang" @click.stop="supple(dataInfo['shop'], 'address')"></view>
+							</view>
+						</view>
+					</view>
+					<!-- 须知详情评论tabBar -->
+					<view class="goods-contentInfo b-f padding-box-all m-btm20">
+						<view class="goods-detail-nav dis-flex flex-dir-row flex-y-center flex-x-between m-btm30">
+							<view class="goods-detail-nav-item" v-for="(item, index) in InfoTabBar" :class="{ active: detailType === item.tabBarType }" :key="index"
+							 @click="detailTypeChange(item.tabBarType)">
+								{{ item.title }}
+								<view class="select-nav-items" v-if="detailType === item.tabBarType">
+									<image :src="imgfixUrls + 'goods/br.png'" mode=""></image>
+								</view>
+							</view>
+						</view>
+						<!-- 商品评价 -->
+						<view class="goods-detail-evaluation b-f" v-show="detailType === 'comment'">
+							<block v-if="!!dataInfo['comment'] && dataInfo['comment']['length'] > 0">
+								<view class="evaluation-item border-line border-bottom" v-for="(commentItem, index) in dataInfo['comment']" :key="index">
+									<view class="evaluation-hd dis-flex flex-dir-row flex-y-center flex-x-between">
+										<view class="evaluation-user dis-flex flex-dir-row flex-y-center">
+											<image :src="commentItem['headimg']" mode=""></image>
+											<view class="evaluation-user-name">
+												<view class="user-name f-24">{{ commentItem['nickname'] }}</view>
+												<view class="evaluation-time f-24 col-9">{{ commentItem['createtime'] }}</view>
+											</view>
+										</view>
+										<view class="evaluation-grade dis-flex flex-dir-row flex-y-center">
+											<view class="iconfont icon-shoucangxiao select" v-for="(score, scoreIndex) in commentItem['star']" :key="scoreIndex"></view>
+											<view class="iconfont icon-shoucangxiao" v-for="(score, scoreIndex) in 5 - commentItem['star']" :key="scoreIndex"></view>
+										</view>
+									</view>
+									<view class="evaluation-bd">
+										<view class="evaluation-content f-26 col-9">{{ commentItem['text'] }}</view>
+										<view class="picImage_view">
+											<image :src="picItem" v-for="(picItem,picIndex) in commentItem['pic']" class="picImage" :key="picIndex" @click="lookimg(commentItem.pic,picIndex)"></image>
+										</view>
+										<block v-if="!!commentItem['replypicone'] && commentItem['replypicone']['length'] > 0">
+											<view class="evaluation-imgs dis-flex flex-warp">
+												<block v-for="(comment_image_item, index) in commentItem['replypicone']" :key="index">
+													<image :src="comment_image_item" mode=""></image>
+												</block>
+											</view>
+										</block>
+									</view>
+									<block v-if="!!commentItem['replytextone']">
+										<view class="store-reply">
+											<view class="reply-content">
+												<view class="reply-content-item f-24 col-9">
+													<text class="reply-content-itemfont f-24 col-9 iconfont icon-pinglun"></text>
+													商家回复:
+													<text class="col-3">{{ commentItem['replytextone'] }}</text>
+												</view>
+											</view>
+										</view>
+									</block>
+								</view>
+								<!-- <view @click="commentList()" style="text-align: center;font-size: 25rpx;margin-top: 10rpx;" v-if="!!dataInfo['comment'] && dataInfo['comment']['length'] == 5">
+								查看更多
+							</view> -->
+							</block>
+							<block v-else>
+								<view class="evaluation-all dis-flex flex-dir-row flex-y-center flex-x-center"><text class="f-28">暂无评价</text></view>
+							</block>
+						</view>
+
+						<!-- 购买须知/商品详情 -->
+						<view class="b-f" v-if="detailType === 'detail'">
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable @load="parseLoad" @ready="parseImgload" show-with-animation use-anchor :html="detailType === 'detail' ? dataInfo['detail'] : dataInfo['describe']"
+							 autoscroll :tagStyle="tagStyle"></jyf-parser>
+						</view>
+						<view class="b-f" v-else-if="detailType === 'notice'">
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable @load="parseLoad" @ready="parseImgload" show-with-animation use-anchor :html="detailType === 'detail' ? dataInfo['detail'] : dataInfo['describe']"
+							 autoscroll :tagStyle="tagStyle"></jyf-parser>
+						</view>
+					</view>
+					<!-- 价格说明 -->
+					<view class="b-f padding-box-all m-btm20" v-if="TextSubstitution.jiagsmext">
+						<!-- 配置标题 -->
+						<goodsHeaderTitle :titleName="TextSubstitution.jiagsmext"></goodsHeaderTitle>
+						<!-- 说明富文本 -->
+						<view v-if="nodes">
+							<!-- <u-parse :content="nodes" /> -->
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable show-with-animation use-anchor :html="nodes"></jyf-parser>
+						</view>
+						<view v-else>
+							<view class="f-24 col-6 m-btm20">
+								<text style="color: #CCBF66;">·划线价格：</text>
+								划线的价格可能是商品的专柜价、吊牌价、正品零售价、指导价、曾经展示过的销售价等，并非市场价，仅供您参考。
+							</view>
+							<view class="f-24 col-6 m-btm20">
+								<text style="color: #CCBF66;">·未划线价格：</text>
+								未划线的价格是商品的销售标价，不因表述差异改变性质具体的成交价格可能因会员使用优惠券、积分等发生变化，最终以订单结算价格为准。
+							</view>
+							<view class="f-24" style="color: #CCBF66;">·若商家针对划线价格进行说明，以商家的表述为准。</view>
+						</view>
+
+					</view>
+					<!-- 推荐商品 -->
+					<view class="b-f padding-box-all m-btm40" v-if="recommendGoodlength > 0 && dataInfo.type && dataInfo.id">
+						<!-- 配置标题 -->
+						<goodsHeaderTitle :titleName="'推荐商品'"></goodsHeaderTitle>
+						<!-- 推荐商品 -->
+						<recommendGoods :goods_type="dataInfo.type" :goods_id="dataInfo.id" @recommendGoodNoOff="recommendGoodNoOff"></recommendGoods>
+					</view>
+					<view  style="padding: 60upx 0;" v-else>
+
+					</view>
+					<!-- 底部菜单 -->
+					<view class="goods-footer dis-flex flex-dir-row flex-y-center border-line border-top" :style="{ 'padding-bottom': isPadding ? '20px' : '','z-index':getTipShow || istag?'9998':'999' }">
+						<view class="dis-flex flex-y-center" style="width: 50%;">
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('home')">
+								<button class="btn-normal report-btn" form-type="submit" style="overflow: hidden;"></button>
+								<image :src="imgfixUrls + 'goods/home.png'"></image>
+								<view class="goods-footer-item-text">首页</view>
+							</view>
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('order')">
+								<button class="btn-normal report-btn" form-type="submit"></button>
+								<image :src="imgfixUrls + 'goods/flow.png'"></image>
+								<view class="goods-footer-item-text">订单</view>
+							</view>
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center" @click="footerNav('user')">
+								<button class="btn-normal report-btn" form-type="submit"></button>
+								<image :src="imgfixUrls + 'goods/my.png'"></image>
+								<view class="goods-footer-item-text">我的</view>
+							</view>
+
+							<view class="advfei" v-if="dataInfo.dis_assistant.tipflag == 1 && tipflag == true && TextSubstitution.fxstext">
+								<view class="iconfont icon-roundclose" style="font-size: 40upx;color: #FFFFFF;font-weight: 700;flex: 0.1;line-height: 70upx;margin: auto;"
+								 @click="closeadv">
+
+								</view>
+								<view class="col-f t-l" style="flex: 0.7;padding-left: 10upx;">
+									<text class="f-22">{{dataInfo.dis_assistant.korea == 1?`대리상 가입으로 쉽게하는 돈벌이!`:`加入${TextSubstitution.fxstext},一起赚更多`}} </text><br />
+									<text class="f-22">{{dataInfo.dis_assistant.korea == 1?`좋은상품 추천 할겸, 혜택도 보는 생활 재태크`:`此商品,分享赚¥${dataInfo.dis_assistant.max_commission}`}} </text>
+								</view>
+								<view  
+								style="background-color: #FFC3C2;
+								color: #B90C1F;
+								height: 70upx;
+								line-height: 70upx;
+								font-size: 28upx;
+								border-radius: 10upx;
+								flex: 0.2;
+								padding: 0 10upx;
+								margin: auto;"
+								 @click="gohomefxs">
+									{{dataInfo.dis_assistant.korea == 1?'바로가입':'立即加入'}}
+								</view>
+							</view>
+
+						</view>
+						<block v-if="goodsType === '1' || goodsType === '2'">
+							<view class="go-buy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box" :class="
+									dataInfo['sales_status'] !== 2? 
+									goodsType === '1' && dataInfo.status === '1'? 
+									dataInfo.is_follow === 0
+									? 'remind-go-buy' : 'alrea-remind-go-buy'
+									: 'end-go-buy'
+									: (dataInfo.stk===0 || dataInfo.status === '4' ?'alrea-remind-go-buy':'star-go-buy')"
+							 @click="onToggleTrade(dataInfo['sales_status'], dataInfo)">
+								<block v-if="goodsType === '1' && dataInfo.status === '1'">
+									<text class="f-28 col-f">{{ dataInfo.is_follow === 0 ? '提醒我' : '已关注' }}</text>
+								</block>
+								<block v-else-if="goodsType !== '1' && dataInfo.status === '1'">
+									<text class="f-28 col-f">未开始</text>
+								</block>
+								<block v-else-if="dataInfo.status === '2' || dataInfo.status === '7'">
+									<text class="f-28 col-f">{{getTipShow==false?(dataInfo.stk===0?'已售罄': dataInfo.sales_status === 1?'未开始':dataInfo.sales_status === 3?'已结束':dataInfo.sales_status === 4?'今日已售罄':'立即抢购'):'同意并且购买'}}</text>
+								</block>
+								<block v-else style="background-color: #C0C0C0;"><text class="f-28 col-f">已下架</text></block>
+								<button class="btn-normal report-btn" form-type="submit"></button>
+							</view>
+						</block>
+						<!-- 卡券 -->
+						<block v-if="goodsType === '5'">
+							<block v-if="dataInfo['is_charge'] === '1' && (dataInfo.sales_status === 2 )">
+								<view class="go-buy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box star-go-buy" @click="onToggleTrade(dataInfo['sales_status'], dataInfo)">
+									<text class="f-28 col-f">{{getTipShow==false?'立即购买':'同意并且购买'}}</text>
+									<button class="btn-normal report-btn" form-type="submit"></button>
+								</view>
+							</block>
+							<block v-else>
+								<block v-if="(dataInfo.buy_limit >= 0 || _this.dataInfouser_limit_num > 0) && dataInfo.sales_status === 2">
+									<view class="go-buy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box star-go-buy" @click="getCouponDicont(dataInfo['sales_status'], dataInfo)">
+										<text class="f-28 col-f">立即领取</text>
+									</view>
+								</block>
+								<block v-else>
+									<view class="unqualified-gobuy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box">
+										<text class="f-28 col-f" v-if="dataInfo.sales_status === 1">活动未开始</text>
+										<text class="f-28 col-f" v-if="dataInfo.sales_status === 3">活动已结束</text>
+										<text class="f-28 col-f" v-if="dataInfo.sales_status === 4">已售罄</text>
+									</view>
+								</block>
+							</block>
+						</block>
+						<!-- 拼团 -->
+						<block v-if="goodsType === '3'">
+							<view class="group-go-buy dis-flex flex-box flex-y-center" v-if="!getTipShow">
+								<view class="out_buy-left p-r dis-flex flex-dir-column flex-x-center" v-if="dataInfo.aloneprice_switch == 0 || dataInfo.aloneprice_switch == '0'" @click="isGroupToggleTrade('1', dataInfo)">
+									<view class="out_buy-leftTop f-24 col-f">¥{{ dataInfo['aloneprice'] }}</view>
+									<view class="out_buy-leftbom f-24 col-f">直接购买</view>
+									<button class="btn-normal report-btn" form-type="submit"></button>
+								</view>
+								<block v-if="!!countDown['timeobj'] && dataInfo['sales_status'] === 2">
+									<view class="out_buy-right starbtn dis-flex flex-dir-column flex-x-center" :style="{borderRadius: (dataInfo.aloneprice_switch == 0 || dataInfo.aloneprice_switch == '0')?'0 40rpx 40rpx 0':'40rpx'}"  @click="isGroupToggleTrade('2', dataInfo)">
+										<view class="out_buy-leftTop f-24" style="color:black">¥{{dataInfo['price'] }}</view>
+										<view class="out_buy-leftbom f-24" style="color:black">{{dataInfo['peoplenum'] }}人团</view>
+									</view>
+								</block>
+								<block v-else>
+									<view class="out_buy-right havebtn" :style="{borderRadius: (dataInfo.aloneprice_switch == 0 || dataInfo.aloneprice_switch == '0')?'0 40rpx 40rpx 0':'40rpx'}">
+										<view class="havenot-btn f-24 col-9">{{ dataInfo['isTimeOver'] ? '已结束' : dataInfo['stateTime'] === 1 ? '已售罄' : '未开始' }}</view>
+									</view>
+								</block>
+							</view>
+							<view class="group-go-buy dis-flex flex-box flex-y-center" v-else>
+								<view class="out_buy-left p-r dis-flex flex-dir-column flex-x-center" style="border-radius: 60upx;" @click="isGroupToggleTrade(0, dataInfo)">
+									<!-- <view class="out_buy-leftTop f-24 col-f">¥{{ dataInfo['aloneprice'] }}</view> -->
+									<view class="out_buy-leftbom f-24 col-f">{{group_buy_type == '1'?'同意并直接购买':'同意拼团'}}</view>
+									<button class="btn-normal report-btn" form-type="submit"></button>
+								</view>
+
+							</view>
+						</block>
+						<!-- 砍价 -->
+						<block v-if="goodsType === '7'">
+							<block v-if="dataInfo['sales_status'] === 2">
+								<view class="group-go-buy dis-flex" @click="sorbargin(dataInfo['is_participate'],dataInfo['stk'])">
+									<view class="go-buy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box " :style="{'background-color': dataInfo['stk'] == 0 ? '#999999': '#ff4444'}">
+										<text class="f-28 col-f">{{ !!dataInfo['is_participate'] && dataInfo['is_participate'] > 0  ? '查看砍价' : (dataInfo['stk'] == 0) ? '已售罄' : '发起砍价' }}</text>
+										<button class="btn-normal report-btn" form-type="submit" :disabled="dataInfo['stk'] == 0"></button>
+									</view>
+								</view>
+							</block>
+							<block v-else>
+								<view class="group-go-buy dis-flex">
+									<view class="go-buy dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box end-go-buy">
+										<text class="f-28 col-f">{{dataInfo['stk'] == 0 ?'已售罄':'发起砍价'}}</text>
+										<button class="btn-normal report-btn" form-type="submit" :disabled="dataInfo['stk'] == 0"></button>
+									</view>
+								</view>
+							</block>
+						</block>
+
+					</view>
+				</block>
+				<block v-else>
+					<block v-if="barrageList.length > 0">
+						<view class="success-tips dis-flex flex-y-center" :class="{ show: showTips }">
+							<image class="success-avatar" :src="barrageList[tipsIndex] ? barrageList[tipsIndex]['avatar'] : ''"></image>
+							<view class="onelist-hidden success-goods f-24 col-f m-left12">{{ barrageList[tipsIndex] ? barrageList[tipsIndex]['nickname'] : '' }}刚刚兑换的此商品</view>
+						</view>
+					</block>
+					<view class="goods-header" v-if="dataInfo['advs']">
+						<swiper @change="bindchange" :autoplay="true" :interval="3000" :circular="true" class="goods-swiper" :style="{ height: imgstyle.height + 'px',width: imgstyle.width + 'px'}">
+							<swiper-item class="swiper-item" v-for="(banner_item, index) in dataInfo['advs']" :key="index">
+								<image :src="banner_item" :data-id="index"></image>
+							</swiper-item>
+						</swiper>
+						<view class="goods-viewed">{{ dataInfo['pv'] }}人喜欢</view>
+					</view>
+					<view class="goods-info m-btm20">
+						<!-- 商品内容 -->
+						<view class="goods-content module-content">
+							<!-- 商品价格 -->
+							<view class="goods-price-box dis-flex flex-dir-row flex-y-end flex-x-between">
+								<!-- 普通商品-->
+								<view class="goods-price dis-flex flex-dir-row flex-y-end">
+									<view class="goods-price-now price-font-family dis-flex flex-y-center">
+										<image :src="imgfixUrls + 'integral/integral_logo.png'" class="m-right10" mode=""></image>
+										<view class="credit f-36">{{dataInfo['price']>0?dataInfo['use_credit1'] + TextSubstitution.credittext+'+'+ dataInfo['price']+'元' : dataInfo['use_credit1']+TextSubstitution.credittext}}</view>
+									</view>
+									<view class="goods-price-old" v-if="!!dataInfo['old_price']">
+										<text class="money-label">¥</text>
+										{{ dataInfo['old_price'] }}
+										<text class="f-24 m-left10" v-if="optionstatus == '1'">起</text>
+									</view>
+								</view>
+							</view>
+							<!-- 商品标题 -->
+							<view class="goods-title m-btm30">
+								<!-- 商品名称 -->
+								<view class="goods-title-mian f-36 col-3 m-btm40">{{ dataInfo['title'] }}</view>
+								<view class="member-box dis-flex flex-y-center flex-x-between m-btm40" v-if="dataInfo['is_open_vip'] === 1">
+									<view class="member-left dis-flex flex-y-center">
+										<image :src="imgfixUrls + 'goods/member.png'" mode=""></image>
+										<view class="f-24 member-fontColor">{{ dataInfo['halfcard_text'] }}</view>
+										<view class="member-fontColor-cut"></view>
+										<view class="member-title f-24 member-fontColor onelist-hidden">
+											{{ dataInfo.is_vip > 0 ? '续费' + dataInfo['halfcard_text'] + ',继续立享优惠折扣' : '开通' + dataInfo['halfcard_text'] + ',立享优惠折扣' }}
+										</view>
+									</view>
+									<view class="member-right t-c f-24" @click="member()">
+										{{ dataInfo.is_vip > 0 ? '去续费' : '去开通' }}
+										<text class="iconfont icon-right"></text>
+									</view>
+								</view>
+								<view class="goods-already-box padding-box-all">
+									<!-- 浏览人数 -->
+									<view class="goods-already dis-flex flex-dir-row flex-y-end flex-x-between p-r border-bottom border-line">
+										<view class="goods-already-buy">
+											<view class="goods-already-num f-24 m-btm20">TA们都在逛</view>
+											<view class="goods-already-user">
+												<image class="user-avatar" :src="userItem" v-for="(userItem, index) in dataInfo['avatar_list']" :key="index"
+												 :style="{ 'z-index': dataInfo['avatar_list']['length'] * 2 - index }"></image>
+												<view class="user-avatar user-more f-24">···</view>
+											</view>
+										</view>
+										<view class="goods-invite-reward" v-if="dataInfo['dis_assistant']['is_show'] === 1">
+											最高赚:¥{{ dataInfo['dis_assistant']['max_commission'] }}
+										</view>
+										<view class="goods-invite" @click="posterShare(dataInfo)">邀请好友一起抢</view>
+									</view>
+									<!-- 社群 -->
+									<block v-if="!!dataInfo['community']">
+										<view class="goods-community dis-flex flex-x-between flex-y-center m-top20">
+											<view class="community-user dis-flex flex-y-center flex-box ">
+												<image :src="dataInfo['community']['imgUrl']" class="community-user-img"></image>
+												<view class="community-user-info flex-box">
+													<view class="community-user-name col-0 f-28">{{ dataInfo['community']['name'] }}</view>
+													<view class="community-user-des f-24 col-9 onelist-hidden">{{ dataInfo['community']['introduce'] }}</view>
+												</view>
+											</view>
+											<view class="community-btn"><button class="community-add community-add-bgcolor f-24 col-f" @click="showCommunity = true">添加</button></view>
+										</view>
+									</block>
+									<!-- 社群弹窗 -->
+									<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false" v-if="!!dataInfo['community']">
+										<view class="community-detail b-f t-c">
+											<view class="community-header f-w f-36 p-r col-f"><text class="community-header-text p-r">{{dataInfo['community']['name']}}</text></view>
+											<!-- #ifdef H5 -->
+											<view class="community-body">
+												<image :src="!!dataInfo['community'] ? dataInfo['community']['qrcodeUrl'] : ''" class="community-qrcodeimg"></image>
+												<view class="community-toreply f-26 col-3">长按识别二维码</view>
+											</view>
+											<!-- #endif -->
+											<!-- #ifndef H5 -->
+											<view class="community-body f-26 col-3">
+												有任何疑问，点击“
+												<text class="col-m">去回复</text>
+												”发送“
+												<text class="col-m">{{ dataInfo['community']['community_id'] }}</text>
+												”,即可添加{{dataInfo['community']['name']}}
+											</view>
+											<!-- #endif -->
+											<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!dataInfo['community'] && !!dataInfo['community']['phone']">
+												<view class="community-number dis-flex flex-y-center">
+													<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon"></image>
+													<view class="f-24 col-3">{{ dataInfo['community']['phone'] }}</view>
+												</view>
+												<view class="community-bdial f-24 col-3" @click="callPhone(dataInfo.community.phone)">拨号</view>
+											</view>
+											<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType === '3'">去回复</button>
+										</view>
+									</PopManager>
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="goods-detail-evaluation b-f padding-box-all m-btm20 ">
+						<!-- 购买须知/商品详情 -->
+						<goodsHeaderTitle :titleName="'商品详情'"></goodsHeaderTitle>
+						<view class="b-f">
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable show-with-animation use-anchor :html="dataInfo.description"></jyf-parser>
+						</view>
+					</view>
+					<view class="b-f padding-box-all m-btm80">
+						<!-- 配置标题 -->
+						<goodsHeaderTitle :titleName="'价格说明'"></goodsHeaderTitle>
+						<!-- 说明富文本 -->
+						<view class="f-24 col-6 m-btm20">
+							<text style="color: #CCBF66;">·划线价格：</text>
+							划线的价格可能是商品的专柜价、吊牌价、正品零售价、指导价、曾经展示过的销售价等，并非市场价，仅供您参考。
+						</view>
+						<view class="f-24 col-6 m-btm20">
+							<text style="color: #CCBF66;">·未划线价格：</text>
+							未划线的价格是商品的销售标价，不因表述差异改变性质具体的成交价格可能因会员使用优惠券、积分等发生变化，最终以订单结算价格为准。
+						</view>
+						<view class="f-24" style="color: #CCBF66;">·若商家针对划线价格进行说明，以商家的表述为准。</view>
+					</view>
+					<!-- <view class="goods-footer-crted">
+						<view class="go-buy-crted" @click="converlink()">
+							<text class="f-28 col-f">立即兑换</text>
+							<button class="btn-normal report-btn" form-type="submit"></button>
+						</view>
+					</view> -->
+					<!-- 底部菜单 -->
+					<view class="goods-footer dis-flex flex-dir-row flex-y-center border-line border-top" :style="{ 'padding-bottom': isPadding ? '20px' : '','z-index':getTipShow || istag?'9998':'999' }">
+						<view class="dis-flex flex-y-center" style="width: 50%;">
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('home')">
+								<button class="btn-normal report-btn" form-type="submit" style="overflow: hidden;"></button>
+								<image :src="imgfixUrls + 'goods/home.png'"></image>
+								<view class="goods-footer-item-text">首页</view>
+							</view>
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center p-r" @click="footerNav('order')">
+								<button class="btn-normal report-btn" form-type="submit"></button>
+								<image :src="imgfixUrls + 'goods/flow.png'"></image>
+								<view class="goods-footer-item-text">订单</view>
+							</view>
+							<view class="goods-footer-item dis-flex flex-dir-column flex-x-center" @click="footerNav('user')">
+								<button class="btn-normal report-btn" form-type="submit"></button>
+								<image :src="imgfixUrls + 'goods/my.png'"></image>
+								<view class="goods-footer-item-text">我的</view>
+							</view>
+					
+							<!-- <view class="advfei" v-if="dataInfo.dis_assistant.tipflag == 1 && tipflag == true && TextSubstitution.fxstext">
+								<view class="iconfont icon-roundclose" style="font-size: 40upx;color: #FFFFFF;font-weight: 700;flex: 0.1;line-height: 70upx;"
+								 @click="closeadv">
+					
+								</view>
+								<view class="col-f t-l" style="flex: 0.6;padding-left: 10upx;">
+									<text class="f-28">加入{{TextSubstitution.fxstext}},一起赚更多</text><br />
+									<text class="f-24">此商品,分享赚¥{{dataInfo.dis_assistant.max_commission}}</text>
+								</view>
+								<view  style="background-color: #FFC3C2;color: #B90C1F;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;"
+								 @click="gohomefxs">
+									立即加入
+								</view>
+							</view> -->
+					
+						</view>
+						<block >
+							<block>
+								<view class="group-go-buy dis-flex"  @click="onToggleTrade(dataInfo['sales_status'], dataInfo)">
+									<view style="border-radius: 60upx;" class=" dis-flex flex-dir-column flex-y-center flex-x-center p-r flex-box star-go-buy">
+										<text class="f-28 col-f">立即兑换</text>
+										<button class="btn-normal report-btn" form-type="submit"></button>
+									</view>
+								</view>
+							</block>
+						</block>
+					
+					</view>
+				</block>
+			</view>
+			<!-- 音乐 -->
+			<view class="audio-main" @click="playAudio" v-if="!!dataInfo.bgmusic">
+				<view class="audio-bg" :class="{'stop-audio':!play_Audio}">
+					<view class="audio-gif" :style="{'background-image':'url('+imageRoot+'musicgif.gif)'}">
+						<view class="audio-png" :style="{'background-image':'url('+imageRoot+'music.png)'}"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 分享 -->
+			<!-- #ifdef H5 -->
+			<view class="masking" v-if="isShare" @click="isOpenShare">
+				<image :src="imageRoot + 'share.png'" class="to-share" mode="widthFix"></image>
+			</view>
+			<!-- #endif -->
+			<!-- 购买菜单 -->
+			<block v-if="goodsType !== '1integral'">
+				<GoodsBuyMenu ref="goodsBuyMenu" @submit="goodsSubmit" :goods-detail="dataInfo" :goods-spec="specData"
+				 :group-buy-type="group_buy_type"></GoodsBuyMenu>
+			</block>
+
+			<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+			 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle" :shareId="shareId"></follow>
+			<share-bottom :shareBottomShow="popOpenShare" :postType="dataInfo.postertype" :postId="dataInfo.id" @shareImgShow="shareImgShow"
+			 @clickmask="clearPopShare" :shareShow="popShareImage" @closeShareShow="onImgShow"></share-bottom>
+
+			<PopManager :show="wfShow">
+				<view class="wfView">
+					<view class="wfViewMain">
+						<view class="wfTitle" style="position: relative;">
+							<image :src="wfBack" class="wfTitleImage"></image>
+							<view class="wfViewClose" style="position: absolute;right: 20upx;top: -60upx;" @click="wfShow = false">
+								<image :src="imgfixUrls + 'merchant/close.png'" class="closeImg"></image>
+							</view>
+						</view>
+						<view class="wfBody">
+							<view class="wfBodyPackage" v-if="!!dataInfo.barset && !dataInfo.barset.playdetail">
+								<text class="wfBodyText">
+									1、活动期间消费者可邀请好友帮忙砍价，好友砍到底价{{
+									dataInfo.vipstatus == '1' && dataInfo.is_vip != '0' ? '￥' + dataInfo.vipprice : '￥' + dataInfo.price
+								}}后，即可按{{ dataInfo.vipstatus == '1' && dataInfo.is_vip != '0' ? '￥' + dataInfo.vipprice : '￥' + dataInfo.price }}购买商品；
+								</text><br />
+								<text class="wfBodyText">
+									2、好友帮忙砍到底价{{
+									dataInfo.vipstatus == '1' && dataInfo.is_vip != '0' ? '￥' + dataInfo.vipprice : '￥' + dataInfo.price
+								}}后，消费者需要在有效期内购买砍价商品，逾期商品将恢复市场价；
+								</text><br />
+								<text class="wfBodyText">3、同一商品，同一用户仅可享受一次优惠价格；</text><br />
+								<text class="wfBodyText">4、同一商品，同一用户仅能帮好友砍价一次；</text><br />
+								<text class="wfBodyText">5、砍价商品数量有限，商品售罄后，商品将无法购买，即使你已经成功发起砍价；</text><br />
+								<text class="wfBodyText">6、本活动解释权在法律范围内归{{ TextSubstitution.sysname }}所有。</text><br />
+							</view>
+							<view class="wfBodyPackage" v-else>
+								<textarea value="" disabled :auto-height="true" class="textarea" v-model="!!dataInfo.barset && dataInfo.barset.playdetail" />
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</PopManager>
+			<PopManager :show="getTipShow" :type="getTipType" @clickmask='closegetTip'>
+				<view class="getTip">
+					<view class="getTip_package">
+						<view class="getTip_title">购买须知
+						<text class="iconfont icon-roundclose" style="float: right;font-size: 40upx;color: #999999;" @click="closegetTip"></text>
+						</view>
+						<scroll-view class="getTip_main" :scroll-x="false" scroll-y>
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+							 selectable show-with-animation use-anchor :html="dataInfo.describe"></jyf-parser>
+						</scroll-view>
+					</view>
+				</view>
+				<view class="popFull"></view>
+			</PopManager>
+			<!-- 查看tag详情 -->
+			<PopManager :show="istag" :type="'bottom'" @clickmask="changeIstag">
+				<view class="b-f" style="width: 92vw;border-radius: 30upx 30upx 0upx 0upx;padding: 30upx;padding-bottom: 100upx;">
+					<view class="f-30 f-w">
+						商品标签
+						<text class="iconfont icon-roundclose" style="float: right;color: #999999;font-size: 40upx;" @click="changeIstag"></text>
+					</view>
+					<view  style="padding: 30upx 0;height: 650upx;overflow: auto;">
+						<view  style="padding-bottom: 20upx;" v-for="(tag,index) in dataInfo.tagslist" :key="index">
+							<view  style="flex: 0.2;">
+								<view class="t-c f-26 dis-il-block" style="padding: 5upx 20upx;color: #FF4444;border: 1upx solid pink;border-radius: 8upx;">
+									{{tag.title}}
+								</view>
+							</view>
+							<view  v-if="tag.content" style="flex: 0.8;">
+								<view class="t-l f-26 dis-il-block" style="padding: 0upx 0upx;color: #6f6f6f;border: 1upx solid #FFFFFF;line-height: 38upx;height: 38upx;border-radius: 5upx;">
+									{{tag.content}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</PopManager>
+			<far-bottom></far-bottom>
+			<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+			<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	import recommendGoods from '@/components/page/pageComponents/Recommend_goods.vue';
+	import goodsHeaderTitle from '@/components/template/goodsHeaderTitle.vue';
+	import loading from '@/components/template/loadlogo';
+	import GoodsBuyMenu from '@/components/template/GoodsBuyMenu.vue';
+	import PartLoading from '@/components/template/PartLoading.vue';
+	import follow from '@/components/template/follow.vue';
+	import shareBottom from '@/components/template/shareBottom.vue';
+	import PopManager from '@/components/template/PopManager';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+
+	// #endif
+	let setEndTime = null,
+		successTimer = null,
+		indexTimer = null,
+		setTimer = null,
+		videoContext = null,
+		groupTimer = null,
+		innerAudioContext = uni.createInnerAudioContext();
+	export default {
+		components: {
+			PopManager,
+			follow,
+			goodsHeaderTitle,
+			recommendGoods,
+			loading,
+			GoodsBuyMenu,
+			PartLoading,
+			shareBottom,
+			PhoneMask,
+			jyfParser,
+			getvxphone
+		},
+		data() {
+			return {
+				show1: false,
+				optionstatus:null,
+				shareId: null,
+				getTipType: 'bottom',
+				getTipShow: false,
+				TextSubstitution: null,
+				followTitleShow: true,
+				strings: {
+					strings:''
+				},
+				nodes: '',
+				followShow: false,
+				followType: '0',
+				wfShow: false,
+				goods_id: null, //商品id
+				goodsType: null, //商品类型
+				goods_num: 1, // 商品数量
+				goods_sku_id: "", // 规格id
+				dataInfo: {}, //商品详情信息
+				specData: [], //规格
+				group_buy_type: null, //是否购买拼团商品
+				showCommunity: false, //社群显示开关
+				detailType: 'detail',
+				buystatus: null, // 判断拼团 单独购买或参团 
+				InfoTabBar: [{
+						title: '购买须知',
+						tabBarType: 'notice'
+					},
+					{
+						title: '商品详情',
+						tabBarType: 'detail'
+					},
+					{
+						title: '客户评价',
+						tabBarType: 'comment'
+					}
+				],
+				barrageList: [], //弹幕数据
+				showTips: false, //显示弹幕
+				tipsIndex: 0,
+				loadlogo: true, //加载动画
+				isShare: false, //分享遮罩
+				halfcardtext: null,
+				tipflag:true,
+				countDown: {},
+				duurUrl:'',
+				bannerHeightList: [],
+				currentBannerHeight: 0,
+				isPadding: null,
+				popOpenShare: false,
+				popShareImage: false,
+				play_Audio: false,
+				num:0,
+				vxshow:false,
+				recommendGoodlength:1,
+				ratio:0,
+				getnum:1,
+				istag:false,
+				freeofcharge:true,
+				imgstyle:{},
+				tagStyle:{
+				      table: 'border-collapse:collapse;border-top:1px solid gray;border-left:1px solid gray;',
+				      th: 'border-right:1px solid gray;border-bottom:1px solid gray;background-color: #ffffff;font-size: 10px;',
+				      td: 'border-right:1px solid gray;border-bottom:1px solid gray;background-color: #f8f8f8;font-size: 10px;'
+				    },
+				onTogglenum:1,
+				ifimg:true
+			}
+		},
+		onLoad(e) {
+			console.log(e,'无敌');
+			innerAudioContext.src = '';
+			videoContext = uni.createVideoContext('shopVideo', this);
+			let _this = this,
+				goods_id = e.goods_id || e.id || '23',
+				goodsType = e.goodsType || e.type ||'3',
+				shareId = e.id || e.goods_id,
+				followType = e.goodsType=='integral'?'13':e.goodsType?e.goodsType:e.type?e.type:'3';
+			_this.setData({
+				goods_id,
+				goodsType,
+				shareId,
+				followType
+			});
+			_this.imgstyle = uni.getStorageSync('imgstyle');
+			_this.getText();
+			// if()
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+			// _this.requestShareInfo(goods_id, goodsType)
+			if (goodsType === 'integral') {
+				// _this.getinteGoodsDetail(goods_id);
+				// this.getGoodsDetail(goods_id, goodsType);
+			}
+			
+			_this.tabisPadbtm();
+			_this.bannerHeightList[0] = 0;
+			// this.getGoodsDetail(goods_id, goodsType);
+			// #ifdef H5
+			// this.requestShareInfo()
+			// #endif
+			
+		},
+		computed: {
+			clienType() {
+				return App.getClientType()
+			},
+			imgfixUrls() {
+				return uni.getStorageSync('imgPrefix');
+			},
+			wfBack() {
+				return this.imageRoot + 'wfBack.png';
+			}
+		},
+		watch:{
+			ifimg(val){
+				if(!val){
+					setTimeout(()=>{
+						videoContext.play();
+					})
+					
+				}
+			}
+		},
+		onShow() {
+			this.getGoodsDetail(this.goods_id, this.goodsType);
+		},
+		methods: {
+			getText(){
+				let _this = this;
+				uni.getStorage({
+					key: 'TextSubstitution',
+					success: function(res) {
+						_this.TextSubstitution = res.data
+						_this.halfcardtext = res.datahalfcardtext
+					}
+				});
+				if(!_this.TextSubstitution){
+					setTimeout(()=>{
+						_this.getText()
+					},500)
+				}
+			},
+			imgtap(e){
+				
+				return
+			},
+			copy(value){
+				//#ifdef H5
+					App.clipboard(value);
+				//#endif
+				uni.setClipboardData({
+						data: value
+				});
+				uni.showToast({
+					title:'商品名已复制到粘贴板',
+					icon:'none'
+				})
+			},
+			looktag(){
+				this.istag = true;
+			},
+			changeIstag(){
+				this.istag = false;
+			},
+			goladur(url){
+				// this.duurUrl = url;
+				// url = encodeURIComponent(url);
+				// App.navigationTo({
+				// 	url: `pages/subPages/webview/webview?urlsrc=${url}`
+				// })
+				// #ifdef H5
+				let locations = window.location.href;
+				let urls = url + '&backurl=' + encodeURIComponent(locations);
+				console.log(urls);
+				location.href = urls;
+				//#endif
+				//#ifndef H5
+				let pages = getCurrentPages();
+				let pageObj = pages[pages.length - 1];
+				let wxurl = pageObj.route + '?aid=' + pageObj.options.aid + '&i=' + pageObj.options.i + '&id=' + pageObj.options.id + '&type=' + pageObj.options.type;
+				let urls = url + '&backurl=' + wxurl;
+				console.log(pageObj.options);
+				uni.navigateTo({
+					url: `/pages/subPages/webview/webview?urlsrc=${encodeURIComponent(urls)}`
+				})
+				//#endif
+				
+				// uni.redirectTo({
+				// 	url: `/pages/subPages/webview/webview?urlsrc=${url}`
+				// });
+			},
+			gohomefxs(){
+				App.navigationTo({
+					url: "pages/subPages/dealer/index/index"
+				})
+			},
+			closeadv(){
+				this.tipflag = false;
+			},
+			parseImgload(e){
+				// console.log('parseImgload')
+				
+				
+				// this.loadlogo = false;
+				
+			},
+			parseLoad(e){
+				console.log('parseLoad');
+				// uni.showToast({
+				// 	title:'富文本加载完成'
+				// })
+			},
+			lookimg(imgList,index){
+				console.log(imgList,index);
+				uni.previewImage({
+					current: index,
+					urls: imgList
+				})
+			},
+			recommendGoodNoOff(res){
+				console.log(res.length);
+				this.recommendGoodlength = res.length;
+			},
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+			},
+			closegetTip() {
+				let _this = this
+				_this.getTipShow = false
+			},
+			// 联系商家
+			goLt() {
+				let _this = this
+				// App.navigationTo({
+				// 	url: "pages/subPages/homepage/chat/chat?other_party_id=" + _this.dataInfo.sid + '&other_party_type=2' +
+				// 		'&type=1'
+				// })
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + _this.dataInfo.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.dataInfo.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+					})
+				}
+			},
+			// 获取积分详情数据
+			getinteGoodsDetail(goods_id) {
+				let _this = this;
+				App._post_form('&p=consumption&do=detail', {
+					id: goods_id,
+				}, res => {
+					_this.setData({
+						dataInfo: res.data,
+					});
+					successTimer = setTimeout(() => {
+						_this.setSuccessBarrage(goods_id, 8);
+					}, 5000);
+					if(_this.dataInfo.videourl){
+						_this.ifimg = false;
+						return
+					}else if(_this.dataInfo.logo || _this.dataInfo.thumbs.length > 0){
+						_this.ifimg = true;
+						
+					}
+				}, false, () => {
+					_this.loadlogo = false;
+				})
+			},
+			//跳转商品评论页面
+			// commentList(){
+			// 	uni.navigateTo({
+			// 		url:'/pages/subPages/commentList/commentList?goods_id=' + this.goods_id + '&goodsType=' + this.goodsType
+			// 	})
+			// },
+			// 获取商品详情数据
+			getGoodsDetail(goods_id, goodsType) {
+				let _this = this,
+					getUserInfo = uni.getStorageSync('userinfo'),
+					requestData = {
+						id: goods_id,
+						type: (goodsType == 'integral')?'8':goodsType,
+						head_id: App.siteInfo.head_id || getUserInfo.mid || ""
+					};
+					
+					
+				App._post_form('&p=goods&do=getGoodsDetail', requestData, (result) => {
+					_this.optionstatus = result.data.optionstatus;
+					if(!!result.data.info_set){
+						_this.$set(_this.strings,'strings',result.data.info_set.use_info);
+					}
+					// _this.strings = result.data.info_set.use_info;
+					// if(_this.num == 0){
+					// 	_this.num++;
+					// }else{
+					// 	_this.num++;
+					// 	// uni.hideLoading();
+					// 	_this.loadlogo = false;
+					// 	// console.log('进来了,按道理要false');
+					// };
+					let dataobj = result.data;
+					// _this.setData({
+					// 	specData: result.data.spec.list
+					// });
+					// console.log(_this.specData);
+					if (!!dataobj['comment'] && !!dataobj['comment']['length'] > 0) {
+						dataobj.comment.forEach((val) => {
+							val.createtime = _this.$util.formatTime(val.createtime, 'rule', '-');
+							val.star = Number(val.star);
+							return val
+						})
+					};
+					dataobj.is_vip = Number(dataobj.is_vip);
+					let data = dataobj;
+					let specData = !!data.spec ? data.spec.list : null;
+						
+					if (!!data.bgmusic) {
+						
+						innerAudioContext.src = encodeURI(data.bgmusic);
+						setTimeout(() => {
+							
+							//#ifndef H5
+							innerAudioContext.loop = true;
+							innerAudioContext.play();
+							this.playAudio();
+							//#endif
+							//#ifdef H5
+							jWeixin.ready(() => {
+								innerAudioContext.loop = true;
+								innerAudioContext.play();
+								this.playAudio();
+							});
+							//#endif
+							
+							
+							// _this.playAudio();
+						},1000);
+					}
+					// uni.$emit('getspecData',specData);
+						_this.setData({
+							dataInfo: data
+						});
+						if(_this.dataInfo.logo || _this.dataInfo.thumbs.length > 0){
+							_this.ifimg = true;
+						}else if(_this.dataInfo.videourl){
+							_this.ifimg = false;
+						}
+						// 
+						_this.getnum++;
+						// this.$set(this.specData,specData);
+						// console.log(_this.$refs.goodsBuyMenu);
+						// setTimeout(()=>{
+						// 	_this.$refs.goodsBuyMenu.goodsSpec = specData;
+						// },1000)
+					
+					
+					if(!_this.dataInfo.detail){
+						_this.dataInfo.detail = '<span style="color:#999999;font-size: 13px;">暂无内容</span>';
+					}
+					if(!_this.dataInfo.describe){
+						_this.dataInfo.describe = '<span style="color:#999999;font-size: 13px;>暂无内容</span>';
+					}
+					uni.getSystemInfo({
+					    success: function (res) {
+					        console.log(res.windowWidth);
+							_this.ratio = res.windowWidth / _this.dataInfo.imgstyle.width;
+					    }
+					});
+					_this.goodsEndTime(goodsType);
+					if (goodsType === '3') {
+						_this.groupListTime(data)
+					}
+					successTimer = setTimeout(() => {
+						_this.setSuccessBarrage(goods_id, goodsType);
+					}, 1000);
+					// 
+					if(result.data.spec){
+						_this.specData = result.data.spec.list;
+						_this.onTogglenum = 1;
+					};
+					if(!!result.data.info_set ){
+						setTimeout(()=>{
+							_this.nodes = result.data.info_set.price_info;
+							
+						});
+					}
+					if(_this.dataInfo.videourl){
+						_this.ifimg = false;
+					}
+					// return
+				}, false, () => {
+					_this.loadlogo = false;
+					_this.freeofcharge = true;
+					//#ifndef H5
+					// setTimeout(()=>{
+					// 	_this.loadlogo = false;
+					// },4000)
+					if(_this.num == 1){
+						// uni.showLoading({
+						// 	title:'加载中...',
+						// 	mask:true
+						// });
+					}
+					//#endif
+					// uni.hideLoading();
+				})
+			},
+			// 初始化商品数据
+			initGoodsDetailData(data) {
+				let _this = this;
+				if (!!data['comment'] && !!data['comment']['length'] > 0) {
+					data.comment.forEach((val) => {
+						val.createtime = _this.$util.formatTime(val.createtime, 'rule', '-');
+						val.star = Number(val.star);
+						return val
+					})
+				};
+				data.is_vip = Number(data.is_vip);
+				return data
+			},
+			/**
+			 * 音乐
+			 */
+			playAudio() {
+				let _this = this,
+					play_Audio = _this.play_Audio ? false : true,
+					pageAudio = _this.dataInfo.music;
+				if (play_Audio) {
+					//#ifdef H5
+					         jWeixin.ready(() => {
+					          jWeixin.getLocation({
+					           type: 'gcj02',
+					           success: function(res) {
+					            innerAudioContext.play();
+					           }
+					          });
+					         });
+					         //#endif
+					//#ifndef H5
+					innerAudioContext.play()
+					//#endif
+					innerAudioContext.onPlay(() => {
+						console.log('开始播放');
+					});
+				}
+				if (!play_Audio) {
+					innerAudioContext.pause()
+					innerAudioContext.onPause(() => {
+						console.log('暂停播放');
+					});
+				}
+				_this.play_Audio = play_Audio
+			},
+			/**
+			 * 领取优惠券
+			 */
+			getCouponDicont(goodsStatus,dataInfo) {
+				let _this = this,
+					data = {
+						type: _this.goodsType,
+						id: _this.shareId
+					};
+					if(!_this.freeofcharge)return;
+					_this.freeofcharge = false;
+					console.log(dataInfo);
+					if (!!dataInfo && dataInfo.type === "1" && dataInfo.is_follow === 0 && dataInfo.status === "1") {
+						App._post_form('&p=rush&do=follow', {
+							id: dataInfo.id
+						}, res => {
+							if (res.errno === 0) {
+								console.log('1');
+								App.showSuccess(res.message, () => {
+									_this.$set(dataInfo, 'is_follow', 1);
+									_this.getover();
+								})
+							}
+							_this.freeofcharge = true;
+						})
+						return
+					} else {
+						App._post_form('&do=Follow', data, res => {
+							if (res.data.status == '1') {
+								_this.followShow = true;
+								console.log('2');
+								if (goodsType !== 'integral') {
+									this.getGoodsDetail(_this.goods_id, _this.goodsType); 
+								}
+								// _this.getover();
+							} else {
+								if (dataInfo.is_describe_tip == '1' && _this.getTipShow == false) {
+									_this.getTipShow = true;
+									console.log('3');
+									_this.getover();
+					
+								} else {
+									_this.getTipShow = false;
+									if (goodsStatus !== 2) return
+									console.info('goodsStatus', goodsStatus)
+									//关闭后重置规格数据
+									// this.groupsBuyMeuns(!this.showBuyMenu);
+									// this.showBuyMenu = !this.showBuyMenu;
+									// this.$refs.goodsBuyMenu.onToggleTrade();
+									_this.getover();
+									console.log('4');
+								};
+								
+							}
+						});
+					}
+				
+			},
+			getover(){
+				let _this = this,
+					requestData = {
+						id: _this.goods_id,
+						num: 1,
+						usestatus: 0,
+						plugin: "coupon"
+					};
+					uni.showLoading({});
+					uni.hideLoading();
+					App._post_form('&p=pay&do=createOrder', requestData, res => {
+							if (res.data.status === 0) {
+								let naviData = {
+									order_id: res.data.orderid,
+									plugin: "coupon",
+									id: res.data.recordid
+								};
+								_this.freeofcharge = true;
+								App.showSuccess('领取成功', () => {
+									App.navigationTo({
+										url: 'pages/subPages/coupon/couponDetails/couponDetails?' + App.urlEncode(naviData)
+									}, false, () => {})
+								})
+							}
+						},
+						fail => {
+							_this.freeofcharge = true;
+							if (fail.data.message == '未绑定手机号') {
+								//#ifdef H5
+								_this.show1 = true;
+								//#endif
+								//#ifndef H5
+								_this.vxshow = true;
+								//#endif
+							}
+						})
+			},
+			/**
+			 *  跳转店铺详情
+			 */
+			naviStore(shopData) {
+				let _this = this,
+					urlData = {
+						sid: shopData.sid
+					};
+				App.navigationTo({
+					url: 'pages/mainPages/store/index?' + App.urlEncode(urlData)
+				})
+			},
+			/**
+			 * 社群显示
+			 */
+			communityShow() {
+				this.showCommunity = !this.showCommunity;
+			},
+			// 拨号跟地址
+			supple(storeInfo, supType) {
+				let _this = this;
+				if (supType === "mobile") {
+					uni.makePhoneCall({
+						phoneNumber: storeInfo['mobile']
+					});
+				}
+				if (supType === "address") {
+					// #ifdef H5
+					console.log(storeInfo);
+					wxApi.WxopenLocation(
+						storeInfo['location']['lat'],
+						storeInfo['location']['lng'],
+						storeInfo['storename'],
+						storeInfo['address']
+					)
+					// #endif
+					// #ifdef MP-WEIXIN
+					App.openLocation(storeInfo)
+					// #endif
+					//#ifdef APP-PLUS
+					Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['storename'],'gcj02')
+					//#endif
+				}
+			},
+			/**
+			 * 商品确认购买
+			 * @param {Object} buyData 用户选择商品信息
+			 */
+			goodsSubmit(buyData) {
+				
+				console.log("buyData", buyData);
+				if(buyData.status == '7'){
+					App.showError("商品已下架");
+					return
+				}
+				let {
+					btnType,
+					goods_num,
+					goods_sku_id,
+					buystatus
+				} = buyData;
+				this.goods_num = goods_num;
+				this.goods_sku_id = goods_sku_id;
+				this.buystatus = buystatus;
+				if (btnType === "confirm" && this.goodsType != 'integral') {
+					this.submit();
+				}else if(btnType === "confirm" && this.goodsType == 'integral'){
+					this.converlink()
+				}
+			},
+			/**
+			 * 加入购物车and立即购买
+			 */
+			submit() {
+				let _this = this,
+					dataInfo = _this.dataInfo,
+					buy_limit = Number(dataInfo.buy_limit) || "",
+					user_limit_num = dataInfo.user_limit_num || "";
+				// group_buy_type = _this.group_buy_type;
+				// 
+				if (buy_limit > 0 && user_limit_num <= 0) {
+					App.showError("购买数量已达上限");
+					return;
+				}
+				// 立即购买
+				App.navigationTo({
+					url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode({
+						goods_id: _this.goods_id,
+						goods_num: _this.goods_num,
+						specid: _this.goods_sku_id || "",
+						plugin: dataInfo.type,
+						buystatus: _this.buystatus || ""
+					}),
+					success() {
+						// 关闭弹窗
+						_this.onToggleTrade();
+					}
+				});
+				_this.onToggleTrade();
+			},
+		
+			posterShare() {
+				let _this = this;
+				_this.popOpenShare = true;
+			},
+			clearPopShare() {
+				let _this = this;
+				_this.popOpenShare = false;
+			},
+			shareImgShow(data) {
+				let _this = this;
+				//#ifdef H5
+				_this.popOpenShare = false;
+				_this.popShareImage = true;
+				//#endif
+				//#ifdef APP-PLUS
+				uni.share({
+				    provider: "weixin",
+				    scene: "WXSceneSession",
+				    type: 0,
+				    href: 'https://image.baidu.com/search/index?tn=baiduimage&ipn=r&ct=201326592&cl=2&lm=-1&st=-1&fm=result&fr=&sf=1&fmq=1624417903682_R&pv=&ic=&nc=1&z=&hd=&latest=&copyright=&se=1&showtab=0&fb=0&width=&height=&face=0&istype=2&ie=utf-8&sid=&word=%E7%BE%8E%E5%A5%B3',
+				    title: '测试分享',
+				    summary: '测试分享测试分享测试分享测试分享测试分享测试分享测试分享测试分享',
+				    imageUrl: 'https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fpic.jj20.com%2Fup%2Fallimg%2F1114%2F0H120155P2%2F200H1155P2-8-1200.jpg&refer=http%3A%2F%2Fpic.jj20.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1627009532&t=5a1cd2d5f04d46cc9f2c6a713cb3790a',
+				    success: function (res) {
+				        console.log(JSON.stringify(res));
+				        uni.showToast({
+				            title: '已分享',
+				            duration: 2000
+				        });
+				    },
+				    
+				    fail: function (err) {
+				    
+				        var errrr = JSON.stringify(err);
+				        if(errrr){
+				            uni.showModal({
+				            title: '表单不能留空',
+				            content: '请完善所有信息再发起分享',
+				            success: function (res) {
+				if (res.confirm) {
+				        console.log('用户点击确定');
+				    } else if (res.cancel) {
+				        console.log('用户点击取消');
+				    }
+				}
+				            });
+				        }
+				    }
+				});
+				//#endif
+			},
+			onImgShow() {
+				this.popShareImage = false;
+			},
+			/**
+			 * 底部菜单按钮跳转
+			 */
+			footerNav(type) {
+				let url = "";
+				if (type === "home") {
+					url = "pages/mainPages/index/index";
+					App.navigationTo({
+						url: url,
+						navType: 'reLaunch'
+					});
+					return;
+				} else if (type === "order") {
+					url = "pages/subPages/orderList/orderList";
+					App.navigationTo({
+						url: url
+					});
+					return;
+				} else if (type === "user") {
+					url = "pages/mainPages/userCenter/userCenter";
+					App.navigationTo({
+						url: url,
+						navType: 'reLaunch'
+					});
+					return;
+				}
+			},
+			/**
+			 * 跳转会员卡
+			 */
+			member() {
+				let url = 'pages/mainPages/memberCard/getMembership/getMembership';
+				App.navigationTo({
+					url: url
+				});
+			},
+			/**
+			 * 商品详情显示切换
+			 */
+			detailTypeChange(type) {
+				this.detailType = type;
+				console.log(type);
+			},
+			/**
+			 * 商品倒计时
+			 */
+			goodsEndTime(goodsType) {
+				let _this = this,
+					dataInfo = _this.dataInfo,
+					// 开始时间
+					startTime = Number(dataInfo.starttime * 1000),
+					// 截止时间
+					endTime = Number(dataInfo.endtime) * 1000;
+				// 抢购\拼团\砍价倒计时
+				if (goodsType === '1' || goodsType === '3' || goodsType === '7') {
+					clearInterval(setEndTime);
+					setEndTime = setInterval(() => {
+						let nowTime = new Date().getTime(),
+							// 	距离结束时间
+							leftTime = parseInt((endTime - nowTime) / 1000),
+							// 距离开始时间
+							rightTime = parseInt((startTime - nowTime) / 1000),
+							// 每个商品活动时间
+							timeobj = {},
+							callback = function(dataTime) {
+								let oo = parseInt(dataTime / 60 / 60 / 24 * 24),
+									tt = parseInt(oo / 24),
+									hh = oo - tt*24,
+									mm = parseInt(dataTime / 60 % 60),
+									ss = parseInt(dataTime % 60),
+									timeobj = {
+										tt: tt < 10 ? `0${tt}` : tt,
+										hh: hh < 10 ? `0${hh}` : hh,
+										mm: mm < 10 ? `0${mm}` : mm,
+										ss: ss < 10 ? `0${ss}` : ss
+									};
+								_this.$set(_this.countDown, 'timeobj', timeobj)
+								// _this.dataInfo.stateTime = timeType === 'left' ? 1 : 2;
+							};
+						if (leftTime > 0 && rightTime <= 0) {
+							if (nowTime > startTime && nowTime < endTime) {
+								callback(leftTime, 'left')
+								// let hh = parseInt(leftTime / 60 / 60 / 24 * 24),
+								// 	mm = parseInt(leftTime / 60 % 60),
+								// 	ss = parseInt(leftTime % 60),
+									let timeType = 'left';
+								// 	timeobj = {
+								// 		hh: hh < 10 ? `0${hh}` : hh,
+								// 		mm: mm < 10 ? `0${mm}` : mm,
+								// 		ss: ss < 10 ? `0${ss}` : ss
+								// 	};
+									let oo = parseInt(leftTime / 60 / 60 / 24 * 24),
+										tt = parseInt(oo / 24),
+										hh = oo - tt*24,
+										mm = parseInt(leftTime / 60 % 60),
+										ss = parseInt(leftTime % 60),
+										timeobj = {
+											tt: tt < 10 ? `0${tt}` : tt,
+											hh: hh < 10 ? `0${hh}` : hh,
+											mm: mm < 10 ? `0${mm}` : mm,
+											ss: ss < 10 ? `0${ss}` : ss
+										};
+								_this.$set(_this.countDown, 'timeobj', timeobj)
+								_this.dataInfo.stateTime = timeType === 'left' ? 1 : 2;
+							}
+						} else if (rightTime > 0 && leftTime > 0) {
+							if (startTime > nowTime && nowTime < endTime) {
+								// callback(rightTime, 'right')
+								// let hh = parseInt(rightTime / 60 / 60 / 24 * 24),
+								// 	mm = parseInt(rightTime / 60 % 60),
+								// 	ss = parseInt(rightTime % 60),
+									let timeType = 'right';
+								// 	timeobj = {
+								// 		hh: hh < 10 ? `0${hh}` : hh,
+								// 		mm: mm < 10 ? `0${mm}` : mm,
+								// 		ss: ss < 10 ? `0${ss}` : ss
+								// 	};
+									let oo = parseInt(rightTime / 60 / 60 / 24 * 24),
+										tt = parseInt(oo / 24),
+										hh = oo - tt*24,
+										mm = parseInt(rightTime / 60 % 60),
+										ss = parseInt(rightTime % 60),
+										timeobj = {
+											tt: tt < 10 ? `0${tt}` : tt,
+											hh: hh < 10 ? `0${hh}` : hh,
+											mm: mm < 10 ? `0${mm}` : mm,
+											ss: ss < 10 ? `0${ss}` : ss
+										};
+								_this.$set(_this.countDown, 'timeobj', timeobj)
+								_this.dataInfo.stateTime = timeType === 'left' ? 1 : 2;
+							}
+						} else {
+							_this.dataInfo.isTimeOver = true;
+							_this.dataInfo.stateTime = 1;
+							clearInterval(setEndTime);
+							return false
+						}
+					}, 1000);
+				}
+			},
+			/**
+			 * 发起砍价
+			 */
+			sorbargin(barginStatus,statics) {
+				let _this = this;
+				if(statics == 0){
+					return
+				}
+				if (!!barginStatus && Number(barginStatus) > 0) {
+					console.log(Number(_this.dataInfo['imgstyle'].width) * _this.ratio + 'px','宽高')
+					App.navigationTo({
+						url: 'pages/subPages/bargin/barginDetail/barginDetail?bargin_id=' + barginStatus + '&width=' + (Number(_this.dataInfo['imgstyle'].width) * _this.ratio + 'px') + '&height=' + (Number(_this.dataInfo['imgstyle'].height) * _this.ratio + 'px')
+					})
+				} else {
+					let data = {
+						type: _this.goodsType,
+						id: _this.shareId
+					};
+					App._post_form('&do=Follow', data, res => {
+						if (res.data.status == '1') {
+							_this.followShow = true
+						} else {
+							if (_this.dataInfo.is_describe_tip == '1' && _this.getTipShow == false) {
+								_this.getTipShow = true
+							} else {
+								_this.getTipShow = false;
+								uni.showModal({
+									title: '砍价活动',
+									content: '是否参与该商品砍价',
+									success: function(res) {
+										if (res.confirm) {
+											uni.showLoading({})
+											uni.hideLoading()
+											App._post_form('&p=bargain&do=launchBargain', {
+													id: _this.goods_id
+												}, res => {
+													if (!!res.data) {
+														App.navigationTo({
+															url: 'pages/subPages/bargin/barginDetail/barginDetail?bargin_id=' + res.data.id + '&width=' + (Number(_this.dataInfo['imgstyle'].width) * _this.ratio + 'px') + '&height=' + (Number(_this.dataInfo['imgstyle'].height) * _this.ratio + 'px')
+														})
+													}
+												},
+												fail => {
+		
+													if (fail.data.message == '未绑定手机号') {
+														_this.show1 = true;
+		
+													}
+												})
+										}
+									}
+								})
+							}
+						}
+					});
+				}
+			},
+			/**
+			 * 拼团列表倒计时 
+			 */
+			groupListTime(dataInfo) {
+				let _this = this,
+					groupList = dataInfo.group_list;
+				groupList.map((val, index) => {
+					val.isEndTime = false;
+					val.failtime = Number(val.failtime * 1000);
+					groupTimer = setInterval(() => {
+						let nowTime = new Date().getTime(),
+							// 	距离结束时间
+							leftTime = parseInt((val.failtime - nowTime) / 1000),
+							// 每个商品活动时间
+							timeobj = {};
+						if (leftTime > 0 && nowTime < val.failtime) {
+							// let hh = parseInt(leftTime / 60 / 60 / 24 * 24),
+							// 	mm = parseInt(leftTime / 60 % 60),
+							// 	ss = parseInt(leftTime % 60),
+							// 	timeobj = {
+							// 		hh: hh < 10 ? `0${hh}` : hh,
+							// 		mm: mm < 10 ? `0${mm}` : mm,
+							// 		ss: ss < 10 ? `0${ss}` : ss
+							// 	};
+								let oo = parseInt(leftTime / 60 / 60 / 24 * 24),
+									tt = parseInt(oo / 24),
+									hh = oo - tt*24,
+									mm = parseInt(leftTime / 60 % 60),
+									ss = parseInt(leftTime % 60),
+									timeobj = {
+										tt: tt < 10 ? `0${tt}` : tt,
+										hh: hh < 10 ? `0${hh}` : hh,
+										mm: mm < 10 ? `0${mm}` : mm,
+										ss: ss < 10 ? `0${ss}` : ss
+									};
+							_this.$set(val, 'groupTime', timeobj);
+						} else {
+							timeobj = {
+								hh: '00',
+								mm: '00',
+								ss: '00'
+							};
+							_this.$set(val, 'groupTime', timeobj);
+							_this.$set(val, 'isEndTime', true);
+						}
+					}, 1000)
+					return val
+				});
+			},
+			//拼团列表参团
+			navbargin(groupItem) {
+				console.log(groupItem)
+				if (groupItem['isEndTime']) return;
+				App.navigationTo({
+					url: 'pages/subPages/group/assemble/assemble?' + App.urlEncode({
+						id: this.goods_id,
+						group_id: groupItem.id
+					})
+				});
+			},
+			// 分享
+			isOpenShare() {
+				this.isShare = !this.isShare
+			},
+			/**
+			 * 获取弹幕数据
+			 */
+			getBarrageData(goods_id, goodsType) {
+				return new Promise((reslove, reject) => {
+					App._post_form("&do=payBarrageList", {
+						id: goods_id,
+						type: goodsType
+					}, (res) => {
+						reslove(res.data);
+					});
+				})
+			},
+			/**
+			 * 判断是购买拼团商品
+			 */
+			isGroupToggleTrade(group_buy_type, dataInfo) {
+				if(group_buy_type !== 0){
+					this.group_buy_type = group_buy_type;
+				}
+				this.onToggleTrade(this.dataInfo.sales_status, dataInfo);
+			},
+			/**
+			 * 设置购买弹幕
+			 */
+			setSuccessBarrage(goods_id, goodsType) {
+				let _this = this,
+					tipsIndex = _this.tipsIndex,
+					barrageList = _this.barrageList;
+				if (tipsIndex == 0 && barrageList.length == 0) {
+					_this.getBarrageData(goods_id, goodsType).then(res => {
+						_this.tipsIndex = 0;
+						_this.barrageList = res;
+						res.length > 0 && _this.setSuccessBarrage(goods_id, goodsType);
+					})
+				} else {
+					// console.log(_this.tipsIndex,barrageList.length);
+					_this.showTips = true;
+					successTimer = setTimeout(() => {
+						_this.showTips = false;
+						setTimer = setTimeout(() => {
+							_this.tipsIndex++
+							if(_this.tipsIndex > barrageList.length){
+								_this.tipsIndex = 0;
+							}
+						}, 500);
+						indexTimer = setTimeout(() => {
+							_this.setSuccessBarrage(goods_id, goodsType);
+						}, 3000);
+					}, 5000);
+				}
+			},
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			/**
+			 * 购买菜单显示隐藏
+			 */
+			onToggleTrade(goodsStatus, dataInfo) {
+				let _this = this
+				let data = {
+					type: _this.goodsType=='integral'?'13': _this.goodsType,
+					id: _this.shareId || _this.goods_id
+				};
+				App._post_form('&p=member&do=userData', {}, res => {
+					console.log(res);
+				
+				_this.istag = false;
+				console.log(dataInfo,_this.$refs.goodsBuyMenu);
+				if(dataInfo.status == '7' || dataInfo.status == '4'){
+					uni.showToast({
+						title:'当前商品已下架',
+						icon:'none'
+					});
+					return
+				};
+				_this.$refs.goodsBuyMenu.initBuyMeunData(dataInfo,_this.onTogglenum);
+				_this.onTogglenum++;
+				console.log(dataInfo);
+				
+				if (!!dataInfo && dataInfo.type === "1" && dataInfo.is_follow === 0 && dataInfo.status === "1") {
+					
+					App._post_form('&p=rush&do=follow', {
+						id: dataInfo.id
+					}, res => {
+						if (res.errno === 0) {
+							App.showSuccess(res.message, () => {
+								_this.$set(dataInfo, 'is_follow', 1)
+							})
+						}
+					})
+					
+					// App.showSuccess(res.message, () => {
+					// 	_this.$set(dataInfo, 'is_follow', 1)
+					// })
+					
+					return
+				}else{
+					if(!!dataInfo && dataInfo.type === "1" && dataInfo.is_follow === 1 && dataInfo.status === "1"){
+						App._post_form('&p=rush&do=follow', {
+							id: dataInfo.id
+						}, res => {
+							if (res.errno === 0) {
+								App.showSuccess(res.message, () => {
+									_this.$set(dataInfo, 'is_follow', 0)
+								})
+							}
+						})
+					}
+					//#ifdef H5
+					App._post_form('&do=Follow', data, res => {
+						if (res.data.status == '1') {
+							_this.followShow = true
+						} else {
+							if (dataInfo.is_describe_tip == '1' && _this.getTipShow == false) {
+								_this.getTipShow = true
+					
+							} else {
+								_this.getTipShow = false;
+								console.info('goodsStatus', goodsStatus)
+								if (goodsStatus !== 2 && _this.goodsType !== 'integral') return
+								
+								//关闭后重置规格数据
+								// this.groupsBuyMeuns(!this.showBuyMenu);
+								// this.showBuyMenu = !this.showBuyMenu;
+								
+								this.$refs.goodsBuyMenu.onToggleTrade();
+							}
+						}
+					});
+					//#endif
+					//#ifndef H5
+					
+					// App._post_form('&do=Follow', data, res => {
+						// if (res.data.status == '1') {
+						// 	_this.followShow = true
+						// } else {
+							if (dataInfo.is_describe_tip == '1' && _this.getTipShow == false) {
+								_this.getTipShow = true
+					
+							} else {
+								console.info('goodsStatus', goodsStatus)
+								// debugger
+								_this.getTipShow = false;
+								if (goodsStatus !== 2 && _this.goodsType !== 'integral') return
+								
+								//关闭后重置规格数据
+								// this.groupsBuyMeuns(!this.showBuyMenu);
+								// this.showBuyMenu = !this.showBuyMenu;
+								this.$refs.goodsBuyMenu.onToggleTrade();
+							}
+						// }
+					// });
+					//#endif
+				}
+				})
+			},
+		
+			converlink(goodsData) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode({
+						goods_id: _this.goods_id,
+						goods_num: _this.goods_num,
+						specid: "",
+						plugin: "8",
+						buystatus: ""
+					})
+				});
+			},
+			saveCode(codeImage) {
+				let _this = this;
+				uni.getImageInfo({
+					src: codeImage,
+					success: function(res) {
+						if (res.errMsg === "getImageInfo:ok") {
+							uni.showLoading({})
+							uni.saveImageToPhotosAlbum({
+								filePath: res.path,
+								success: function() {
+									App.showSuccess('保存成功');
+								},
+								complete() {
+									uni.hideLoading()
+								}
+							});
+						}
+					}
+				})
+			},
+			// imageLoad(e) {
+			// 	//当图片载入完毕时
+			// 	let imgwidth = e.detail.width,
+			// 		imgheight = e.detail.height,
+			// 		//宽高比  
+			// 		ratio = imgwidth / imgheight;
+			// 	// 计算的高度值
+			// 	let viewHeight = 750 / ratio,
+			// 		imgheightList = viewHeight,
+			// 		bannerHeightList = this.bannerHeightList;
+			// 	//把每一张图片的对应的高度记录到数组里  
+			// 	bannerHeightList[e.target.dataset.id] = imgheightList;
+			// 	console.info('bannerHeightList', e.target.dataset.id)
+			// 	this.setData({
+			// 		bannerHeightList
+			// 	})
+			// },
+			bindchange(e) {
+				this.setData({
+					currentBannerHeight: e.detail.current
+				})
+			},
+			callPhone(phoneNumber) {
+				uni.makePhoneCall({
+					phoneNumber: phoneNumber
+				})
+			},
+			tabisPadbtm() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						let model = res.model,
+							iphoneModel = ["iPhone10,3", "iPhone10,6", "iPhone11,8", "iPhone11,2", "iPhone11,6"];
+						_this.isPadding = iphoneModel.includes(model) || model.indexOf("iPhone X") !== -1 || model.indexOf("iPhone12") !==
+							-1;
+					}
+				});
+			},
+			changeIfimg(boolean){
+				if(this.ifimg == boolean) return;
+				this.ifimg = boolean;
+			}
+		},
+		onHide() {
+			let _this = this;
+			_this.onToggleTrade();
+				// pageAudio = _this.dataInfo.music;
+				innerAudioContext.pause()
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			_this.play_Audio = false;
+			clearTimeout(successTimer);
+			clearTimeout(setTimer);
+			clearTimeout(indexTimer);
+			this.showTips = false;
+			this.play_Audio = false;
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+			console.log("onUnload");
+		},
+		destroyed() {
+			innerAudioContext.stop();
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			});
+			clearTimeout(successTimer);
+			clearTimeout(setTimer);
+			clearTimeout(indexTimer);
+		},
+		onUnload() {
+			let _this = this;
+				// pageAudio = _this.dataInfo.music;
+				innerAudioContext.pause()
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			_this.play_Audio = false;
+			clearTimeout(successTimer);
+			clearTimeout(setTimer);
+			clearTimeout(indexTimer);
+			this.showTips = false;
+			this.play_Audio = false;
+			innerAudioContext.stop()
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			})
+			console.log("onUnload");
+		},
+	};
+</script>
+
+<style scoped>
+	@import '../goods/index.css';
+
+	page {
+		background: #f2f2f2;
+	}
+
+	.goodSwiper {
+		/* height: 30vh; */
+	}
+
+	.container {
+		overflow: hidden !important;
+		padding-bottom: 20px;
+	}
+
+	.swiper-item-img {
+		width: 100%;
+		height: 100%;
+		background-size: 100% 100%;
+	}
+
+	.picImage {
+		display: inline-block;
+		width: 120upx;
+		height: 120upx;
+		border-radius: 10upx;
+		margin: 10upx 10upx 0 0;
+	}
+
+	.picImage_view {
+		width: 400upx;
+	}
+	//
+	.status_bar {
+		width: 100%;
+		height: var(--status-bar-height);
+		padding-bottom: 15px;
+		background-color: #fff;
+		position: fixed;
+		top: 0px;
+		z-index: 99;
+	}
+</style>
diff --git a/pages/subPages/goods/methods.js b/pages/subPages/goods/methods.js
new file mode 100644
index 0000000..5dc9702
--- /dev/null
+++ b/pages/subPages/goods/methods.js
@@ -0,0 +1,9 @@
+
+import wxApi from "@/common/js/wxApi.js"
+
+	page = {
+		
+	};
+export default {
+	...page
+}
diff --git a/pages/subPages/group/assemble/assemble.vue b/pages/subPages/group/assemble/assemble.vue
new file mode 100644
index 0000000..d913684
--- /dev/null
+++ b/pages/subPages/group/assemble/assemble.vue
@@ -0,0 +1,804 @@
+<template>
+	<view class="assemble">
+		<far-bottom></far-bottom>
+		<view class="assembleImg" :style="{'background-image':'url('+ imageSrc+')',height:phoneHight}">
+			<view class="assemblePackage">
+				<!-- 组团状态 -->
+				<view class="assembleStatus" v-if="groupDetail.status !== 1">
+					<view v-if="groupDetail.status == 2">
+						<image :src="imgfixUrls + 'merchant/zty.png'" />
+						<span>拼团成功</span>
+					</view>
+					<view v-if="groupDetail.status == 3">
+						<image :src="imgfixUrls + 'merchant/ztn.png'" />
+						<span>拼团失败</span>
+					</view>
+				</view>
+				<!-- 组团状态 -->
+
+				<!-- 商品信息 -->
+				<view class="storeInfo" @click="goGoods">
+					<view class="storeInfoPackage">
+						<view class="storeInfoImg">
+							<image :src="groupDetail.goods.logo" />
+						</view>
+						<view class="ptStoreInfo">
+							<view class="ptStoreInfoTitle">
+								<view>
+									<view>
+										<image :src="imgfixUrls + 'merchant/ptt.png'" />
+									</view>
+									<view>
+										<span>{{ groupDetail.goods.peoplenum }}人团</span>
+									</view>
+								</view>
+								<span>{{ groupDetail.goods.name }}</span>
+							</view>
+							<view class="ptStoreInfoBody">
+								<span>¥{{ groupDetail.goods.price }}</span>
+							</view>
+							<view class="ptStoreInfoFoot">
+								<span>¥{{ groupDetail.goods.aloneprice }}</span>
+								<span>已拼{{ groupDetail.goods.realsalenum }}件</span>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 商品信息 -->
+
+				<!-- 拼团成员 -->
+				<view class="members">
+					<view class="membersPackage">
+						<view class="membersTitle">
+							<!-- 成员头像循环模板 -->
+							<view class="membersImgMb" v-for="(item,index) in groupDetail.user">
+								<view>
+									<image :src="item.avatar" />
+									<image class="huangguan" v-if="item.kingimg == 1" style="height: 40upx;width: 40upx;" :src="imgfixUrls + 'huangguan.png'" mode=""></image>
+								</view>
+							</view>
+							<view class="membersImgMb1" v-if="groupDetail.status!=2">
+								<view>
+									<image :src="imgfixUrls + 'merchant/wh.png'" />
+								</view>
+							</view>
+							<!-- 成员头像循环模板 -->
+						</view>
+
+						<view class="membersBody" v-if="groupDetail.status == 1">
+							<span>
+								<span>{{ groupDetail.neednum }}</span>
+								人成团，还差
+								<span>{{ groupDetail.lacknum }}</span>
+								人！
+							</span>
+							<view>
+								<view class="line"></view>
+								<span>剩余：{{ days }} 天 {{ hours }} 时 {{ minutes }} 分 {{ seconds }} 秒</span>
+								<view class="line"></view>
+							</view>
+						</view>
+
+						<!-- 参团按钮 -->
+						<view class="joinSubmit" @click="showImg" v-if="groupDetail.is_participate==1 && groupDetail.status == 1"><span>邀请好友拼团</span></view>
+						<view class="joinSubmit" @click="onToggleTrade" v-if="groupDetail.is_participate==0 && groupDetail.status == 1"><span>我要参团</span></view>
+						<view class="joinSubmit" @click="goOrder" v-if="(groupDetail.status == 3 || groupDetail.status == 2) && groupDetail.is_participate==1"><span>查看我的订单</span></view>
+						<!-- 参团按钮 -->
+
+						<view class="membersFoot">
+							<span :class="[groupDetail.status <= 3 ? 'successStatus' : '']">下单开团/参团</span>
+							<span :class="[groupDetail.status <= 3 ? 'successStatus' : '']">></span>
+							<span :class="[groupDetail.status <= 3 ? 'successStatus' : '']">邀请好友参加</span>
+							<span :class="[groupDetail.status <= 3 ? 'successStatus' : '']">></span>
+							<span :class="[groupDetail.status == 2 ? 'successStatus' : '']">人满拼团成功</span>
+						</view>
+					</view>
+				</view>
+				<!-- 拼团成员 -->
+
+				<!-- 拼团记录 -->
+				<view class="joinRecord">
+					<view class="joinRecordPackage">
+						<view class="joinRecordTitle">
+							<view>
+								<view class="smallLine"></view>
+								<view class="bigLine"></view>
+							</view>
+							<span>拼团记录</span>
+							<view>
+								<view class="smallLine"></view>
+								<view class="bigLine"></view>
+							</view>
+						</view>
+						<view class="joinRecordBody">
+							<!-- 参团记录循环模板 -->
+							<view class="jlMb" v-for="(item, index) in groupDetail.user">
+								<view class="jlMbLeft">
+									<view>
+										<image :src="item.avatar" />
+										<image v-if="item.kingimg == 1" class="huangguan" style="height: 30upx;width: 30upx;right: 40upx;top: -20upx;" :src="imgfixUrls + 'huangguan.png'" mode=""></image>
+									</view>
+									<span>{{ item.nickname }}</span>
+								</view>
+								<view class="jlMbRight">
+									<span>{{ item.createtime }}</span>
+								</view>
+							</view>
+							<!-- 参团记录循环模板 -->
+						</view>
+					</view>
+				</view>
+				<!-- 拼团记录 -->
+
+				<!-- 填充层 -->
+				<view class="full"></view>
+				<!-- 填充层 -->
+
+				<!-- 分享弹窗 -->
+				<view @click='show=false'>
+					<PopManager :show="show" :type="top">
+						<!-- #ifdef H5 -->
+						<image :src="imageRoot+'share.png'" class="H5popImg" />
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image :src="imageRoot+'share.png'" class="popImg" />
+						<!-- #endif -->
+					</PopManager>
+				</view>
+				<!-- 分享弹窗 -->
+
+				<!-- 参团弹窗 -->
+				<GoodsBuyMenu ref="goodsBuyMenu" @submit="goodsSubmit" :goodsDetail="dataInfo" :goodsSpec="specData" :groupBuyType="group_buy_type"></GoodsBuyMenu>
+				<!-- 参团弹窗 -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import PopManager from '@/components/template/PopManager';
+	import GoodsBuyMenu from '@/components/template/GoodsBuyMenu';
+
+	export default {
+		components: {
+			PopManager,
+			GoodsBuyMenu,
+		},
+		computed: {
+			imageSrc() {
+				return this.imageRoot + 'assemBack.png'
+			}
+		},
+		data() {
+			return {
+				phoneHight: null,
+				group_id: '',
+				id: null,
+				orderid: null,
+				groupDetail: {},
+				days: 0,
+				hours: 0,
+				minutes: 0,
+				seconds: 0,
+				show: false,
+				top: 'top',
+				bottom: 'bottom',
+				show1: false,
+				goodsDetail: {},
+				goods_id: null, //商品id
+				goodsType: null, //商品类型
+				goods_num: 1, // 商品数量
+				goods_sku_id: "", // 规格id
+				dataInfo: {}, //商品详情信息
+				specData: [], //规格
+				group_buy_type: null, //是否购买拼团商品
+			};
+		},
+		onLoad: function(option) {
+			this.id = option.id
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			if (option.orderid !== undefined) {
+				this.orderid = option.orderid
+			}
+			if (option.orderid == undefined) {
+				this.orderid = ''
+			}
+			if (option.group_id !== undefined) {
+				this.group_id = option.group_id
+			}
+			if (option.group_id == undefined) {
+				this.group_id = ''
+			}
+		},
+		onShow() {
+			this.init();
+		},
+		methods: {
+			goGoods() {
+				let _this = this
+				App.navigationTo({
+					url: 'pages/subPages/goods/index?type=3&id=' + _this.id
+				})
+			},
+			init() {
+				let _this = this;
+				_this.getGroupDetail1();
+				_this.getGoodsDetail();
+			},
+			/**
+			 * 商品确认购买
+			 * @param {Object} buyData 用户选择商品信息
+			 */
+			goodsSubmit(buyData) {
+				let _this = this
+				let {
+					btnType,
+					goods_num,
+					goods_sku_id
+				} = buyData;
+				_this.goods_num = goods_num;
+				_this.goods_sku_id = goods_sku_id;
+				if (btnType === "confirm") {
+					_this.submit();
+				}
+			},
+			// 初始化商品数据
+			initGoodsDetailData(data) {
+				let _this = this;
+				if (!!data['comment'] && !!data['comment']['length'] > 0) {
+					data.comment.map((val) => {
+						val.createtime = _this.$util.formatTime(val.createtime, 'rule', '-');
+						val.star = Number(val.star);
+						return val
+					})
+				};
+				data.is_vip = Number(data.is_vip);
+				return data
+			},
+			onToggleTrade() {
+				//关闭后重置规格数据
+				// this.groupsBuyMeuns(!this.showBuyMenu);
+				// this.showBuyMenu = !this.showBuyMenu;
+				this.$refs.goodsBuyMenu.onToggleTrade();
+			},
+			showM() {
+				let _this = this
+				_this.getGoodsDetail();
+				_this.show1 = true
+			},
+			// 分享弹框
+			showImg() {
+				let _this = this;
+				_this.show = true;
+			},
+			// 商品详情信息获取
+			getGoodsDetail(goods_id, goodsType) {
+				let _this = this,
+					requestData = {
+						id: _this.id,
+						type: 3
+					};
+				App._post_form('&p=goods&do=getGoodsDetail', requestData, (result) => {
+					let data = _this.initGoodsDetailData(result.data),
+
+						specData = !!data.spec ? data.spec.list : null;
+
+					_this.setData({
+						dataInfo: data,
+						specData: specData
+					});
+					console.info(_this.dataInfo)
+					console.info(_this.specData)
+				}, false, () => {
+					_this.loadlogo = false;
+				})
+			},
+			/**
+			 * 加入购物车and立即购买
+			 */
+			submit() {
+				console.info(333333333)
+				let _this = this,
+					dataInfo = _this.dataInfo,
+					buy_limit = Number(dataInfo.buy_limit) || "",
+					user_limit_num = dataInfo.user_limit_num || "";
+				// group_buy_type = _this.group_buy_type;
+
+				if (buy_limit > 0 && user_limit_num <= 0) {
+					console.info(555555555)
+					App.showError("购买数量已达上限");
+					return;
+				}
+				// 
+				// 				if (!_this.isSpecSignid) {
+				// 					App.showError("请选择有效的规格选项后提交订单");
+				// 					return;
+				// 				}
+				// 
+				// 				if (detail.effect === 10 && detail.validity === 30) {
+				// 					let nowTime = new Date().getTime();
+				// 					if (nowTime > Number(detail.validity_starttime[1])) {
+				// 						App.showError("当前商品已过期");
+				// 						return;
+				// 					}
+				// 				}
+				// 
+				// 立即购买
+				console.info(_this.dataInfo)
+				console.info(_this.goods_id)
+				console.info(_this.goods_num)
+				console.info(_this.goods_sku_id)
+				App.navigationTo({
+					url: 'pages/subPages/submitOrder/submitOrder?goods_id=' + _this.dataInfo.id + '&goods_num=' + _this.goods_num +
+						'&specid=' + (_this.goods_sku_id || "") + '&plugin=' + _this.dataInfo.type + '&buystatus=1&group_id=' + _this.group_id,
+					success() {
+						// 关闭弹窗
+						_this.onToggleTrade();
+					}
+				});
+			},
+			// 获取组团详细信息
+			getGroupDetail1() {
+				let _this = this;
+				let data = {
+					order_id: _this.orderid,
+					group_id: _this.group_id
+				};
+				App._post_form('&p=wlfightgroup&do=groupDetail', data, res => {
+					if (res.data.goods.name.length > 22) {
+						res.data.goods.name = res.data.goods.name.slice(0, 22) + '...'
+					}
+					_this.groupDetail = res.data;
+					_this.group_id = res.data.group_id
+					let nowTime = new Date().getTime(),
+						endTime = Number(res.data.failtime) * 1000,
+						leftTime = parseInt((endTime - nowTime) / 1000);
+					let timeClock = setInterval(function() {
+						leftTime--;
+						_this.days = parseInt(leftTime / (60 * 60 * 24));
+						_this.hours = parseInt((leftTime % (60 * 60 * 24)) / (60 * 60));
+						_this.minutes = parseInt((leftTime % (60 * 60)) / (60));
+						_this.seconds = parseInt((leftTime % (60)));
+						if (leftTime == 0 || leftTime < 0) {
+							clearInterval(timeClock);
+							_this.days = '00'
+							_this.hours = '00'
+							_this.minutes = '00'
+							_this.seconds = '00'
+						}
+					}, 1000);
+				});
+			},
+			goOrder() {
+				App.navigationTo({
+					url: 'pages/subPages/orderList/orderList'
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.successStatus {
+		color: rgba(250, 63, 43, 1) !important;
+	}
+
+	.assemble {
+		overflow-y: scroll;
+		overflow-x: hidden;
+	}
+
+	page {
+		background: #f8f8f8;
+	}
+
+	.assembleImg {
+		background-color: #f8f8f8;
+		width: 750upx;
+		background-size: 750upx auto;
+		background-repeat: no-repeat;
+	}
+
+	.storeInfo {
+		z-index: 2;
+		margin: 45upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.assemblePackage {
+		width: 750upx;
+		border: 1px solid rgba(0, 0, 0, 0);
+	}
+
+	.storeInfoPackage {
+		padding: 30upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.storeInfoImg {
+		width: 170upx;
+		height: 170upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 170upx;
+			height: 170upx;
+		}
+	}
+
+	.ptStoreInfo {
+		margin-left: 30upx;
+		width: 425upx;
+	}
+
+	.ptStoreInfoTitle {
+		height: 76upx;
+
+		>span {
+			vertical-align: middle;
+			font-size: 28upx;
+			color: rgba(0, 0, 0, 1);
+		}
+
+		>view {
+			font-size: 0;
+			display: inline-block;
+			vertical-align: middle;
+			width: 122upx;
+			height: 30upx;
+			border: 1upx solid rgba(255, 68, 68, 1);
+			border-radius: 4upx;
+			overflow: hidden;
+
+			>view:nth-child(1) {
+				width: 30upx;
+				height: 30upx;
+				background: rgba(255, 68, 68, 1);
+
+				>image {
+					width: 30upx;
+					height: 30upx;
+				}
+			}
+
+			>view:nth-child(2) {
+				width: 82upx;
+				height: 30upx;
+				text-align: center;
+
+				>span {
+					line-height: 30upx;
+					font-size: 18upx;
+					color: rgba(255, 68, 68, 1);
+				}
+			}
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+			}
+		}
+	}
+
+	.ptStoreInfoBody {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 24upx;
+
+			font-weight: bold;
+			color: rgba(254, 80, 79, 1);
+		}
+	}
+
+	.ptStoreInfoFoot {
+		margin-top: 10upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			font-size: 24upx;
+
+			font-weight: bold;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.members {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.membersImgMb {
+		display: inline-block;
+		margin-top: 20upx;
+		width: 20%;
+		text-align: center;
+		position: relative;
+
+		>view {
+			margin: auto;
+			width: 77upx;
+			height: 77upx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			>image {
+				width: 77upx;
+				height: 77upx;
+			}
+		}
+	}
+	
+	.huangguan{
+		width: 40upx;
+		height: 40upx;
+		position: absolute;
+		top: -24upx;
+		right: 20upx;
+		
+	}
+	
+	.membersImgMb1 {
+		display: inline-block;
+		margin-top: 20upx;
+		width: 20%;
+		text-align: center;
+
+		>view {
+			border: 1upx dashed rgba(204, 204, 204, 1);
+			margin: auto;
+			width: 77upx;
+			height: 77upx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			>image {
+				width: 77upx;
+				height: 77upx;
+			}
+		}
+	}
+
+	.membersTitle {
+		padding: 0 30upx;
+		margin-top: 30upx;
+		flex-wrap: wrap;
+	}
+
+	.membersPackage {
+		border: 1px solid rgba(0, 0, 0, 0);
+	}
+
+	.membersBody {
+		margin-top: 50upx;
+		text-align: center;
+
+		>span {
+			font-size: 28upx;
+
+			font-weight: 800;
+			color: #333333;
+
+			>span {
+				font-size: 36upx;
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+
+		>view {
+			margin-top: 50upx;
+			margin: 50upx 0 0 0;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				vertical-align: top;
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.line {
+		margin-top: 17upx;
+		vertical-align: top;
+		width: 153upx;
+		height: 1upx;
+		background: rgba(238, 238, 238, 1);
+	}
+
+	.joinSubmit {
+		margin: 50upx auto 0 auto;
+		width: 630upx;
+		height: 80upx;
+		background: rgba(250, 63, 43, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.membersFoot {
+		display: flex;
+		justify-content: space-between;
+		padding: 40upx 50upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.joinRecord {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.joinRecordPackage {
+		padding: 20upx 30upx;
+	}
+
+	.joinRecordTitle {
+		text-align: center;
+
+		>span {
+			vertical-align: middle;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(250, 63, 43, 1);
+		}
+
+		>view {
+			margin: 0 20upx;
+			display: inline-block;
+			vertical-align: middle;
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+			}
+		}
+	}
+
+	.smallLine {
+		margin-right: 5upx;
+		width: 5upx;
+		height: 11upx;
+		background: rgba(250, 63, 43, 0.5);
+		border-radius: 2upx;
+		transform: rotate(30deg);
+	}
+
+	.bigLine {
+		margin-top: 3upx;
+		width: 7upx;
+		height: 16upx;
+		background: rgba(250, 63, 43, 1);
+		border-radius: 2upx;
+		transform: rotate(30deg);
+	}
+
+	.joinRecordBody {
+		margin-top: 40upx;
+	}
+
+	.jlMb {
+		margin-top: 30upx;
+		padding: 0 30upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+
+	.jlMbLeft {
+		vertical-align: middle;
+		position: relative;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+			width: 60upx;
+			height: 60upx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			>image {
+				width: 60upx;
+				height: 60upx;
+			}
+		}
+
+		>span {
+			vertical-align: middle;
+			margin-left: 15upx;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.jlMbRight {
+		vertical-align: middle;
+
+		>span {
+			line-height: 60upx;
+			font-size: 24upx;
+
+			font-weight: bold;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.assembleStatus {
+		z-index: 2;
+		margin-top: 115upx;
+		text-align: center;
+
+		>view {
+			>image {
+				vertical-align: middle;
+				width: 45upx;
+				height: 45upx;
+			}
+
+			>span {
+				font-size: 36upx;
+				vertical-align: middle;
+				font-weight: bold;
+				color: white;
+			}
+		}
+	}
+
+	.full {
+		width: 750upx;
+		height: 80upx;
+	}
+
+	.popImg {
+		width: 675upx;
+		margin-right: 120upx;
+	}
+	.H5popImg {
+		width: 760upx;
+		// margin-right: 120upx;
+	}
+</style>
diff --git a/pages/subPages/helpCenter/helpCenter.vue b/pages/subPages/helpCenter/helpCenter.vue
new file mode 100644
index 0000000..d1bbd65
--- /dev/null
+++ b/pages/subPages/helpCenter/helpCenter.vue
@@ -0,0 +1,264 @@
+<template>
+	<view class="helpCenter">
+		<far-bottom></far-bottom>
+		<scroll-view class="scrollView" :style="{ height: phoneHight }" :scroll-y="true" :lower-threshold="0" @scrolltolower="load">
+		<!-- 头部搜索框 -->
+		<view class="search">
+			<image :src="imgfixUrls + 'merchant/serach.png'" />
+			<input placeholder="请输入关键字进行搜索" @blur="getSearch" v-model="search"/>
+		</view>
+		<!-- 头部搜索框 -->
+
+		<!-- 背景图 -->
+		<swiper class="helpCenterImg" :indicator-dots="indicatorDots" :indicator-active-color="indicatorActiveColor" :autoplay="autoplay" :interval="interval" :circular="circular" v-if="helpInfo.adv.length!=0">
+			<swiper-item v-for="(item,index) in helpInfo.adv" :key="index" @click="go(item.url)"><image :src="item.img" class="Imgs"/></swiper-item>
+		</swiper>
+		<!-- 背景图 -->
+
+		<!-- 按钮 -->
+		<view class="buttonView">
+			<view v-for="(item,index) in helpInfo.class" @click="goList(item.name,item.id)">
+				<view><image :src="item.img" /></view>
+				<span>{{item.name}}</span>
+			</view>
+		</view>
+		<!-- 按钮 -->
+		
+		<!-- 帮助提示 -->
+		<view class="helpTips">
+			<view class="helpTipsPackage" >
+				<span>常见问题</span>
+			</view>
+		</view>
+		<!-- 帮助提示 -->
+		
+		<!-- 帮助列表 -->
+		
+			<view class="scrollPackage">
+				<view class="bzMb" v-for="(item,index) in problemList" @click="goHelpInfo(item.id)">
+					<span>{{item.title}}</span>
+					<image :src="imgfixUrls + 'merchant/right.svg'"/>
+				</view>
+			</view>
+			
+		</scroll-view>
+		<!-- 帮助列表 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+	
+export default {
+	data() {
+		return {
+			helpInfo:{},
+			page:1,
+			problemList:[],
+			indicatorDots: true,
+			indicatorActiveColor: 'white',
+			vertical: true,
+			autoplay: true,
+			interval: 2000,
+			circular: true,
+			phoneHight:0,
+			total:null,
+			search:''
+		};
+	},
+	onLoad(e){
+		this.init()
+	},
+	mounted(){
+		let _this=this
+		
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight+'px';
+			}
+		});
+	},
+	methods:{
+		init(){
+			let _this=this
+			_this.getHelpInfo()
+			_this.getProblemList()
+		},
+		// 搜索
+		getSearch(){
+			let _this=this
+			_this.page=1
+			_this.problemList=[]
+			let data={
+				is_recommend:0,
+				type_id:0,
+				page:_this.page,
+				page_index:10,
+				search:_this.search
+			}
+			App._post_form('&p=helper&do=problemList',data,res=>{
+				_this.problemList=[..._this.problemList,...res.data.list]
+			})
+		},
+		// 跳转问题列表
+		goList(title,id){
+			App.navigationTo({
+				url:'pages/subPages/helpCenter/problemList/problemList?title='+title+'&id='+id
+			})
+		},
+		// 跳转详情
+		goHelpInfo(id){
+			App.navigationTo({
+				url:'pages/subPages/helpCenter/helpDetails/helpDetails?id='+id
+			})
+		},
+		load(){
+			let _this=this
+			if(_this.page==_this.total){
+				
+			}else{
+				_this.page++
+				_this.getProblemList()
+			}
+		},
+		// 跳转
+		go(url){
+			App.navigationTo({
+				url:url
+			})
+		},
+		// 帮助中心信息获取
+		getHelpInfo(){
+			let _this=this
+			let data={}
+			App._post_form('&p=helper&do=helpInfo',data,res=>{
+				_this.helpInfo=res.data
+			})
+		},
+		// 获取问题列表
+		getProblemList(){
+			let _this=this
+			let data={
+				is_recommend:1,
+				type_id:0,
+				page:_this.page,
+				page_index:10
+			}
+			App._post_form('&p=helper&do=problemList',data,res=>{
+				_this.problemList=[..._this.problemList,...res.data.list]
+				_this.total=res.data.total
+				console.info(_this.problemList)
+			})
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.scrollPackage{
+	padding:0 30upx;
+}	
+.bzMb{
+	border-bottom: 1upx solid rgba(238,238,238,1);
+	height: 105upx;
+	display: flex;
+	justify-content: space-between;
+	>span{
+		vertical-align: middle;
+		line-height: 105upx;
+		font-size:28upx;
+		lor:rgba(51,51,51,1);
+	}
+	>image{
+		margin: 45upx 0 0 0;
+		vertical-align: middle;
+		height:20upx;
+		width: 20upx;
+	}
+}	
+.Imgs{
+	width: 750upx;
+	height: 560upx;
+}	
+.helpTips{
+	background: #F8F8F8;
+}	
+.helpTipsPackage{
+	padding: 30upx;
+	>span{
+		font-size:24upx;
+		lor:rgba(153,153,153,1);
+	}
+}	
+.buttonView {
+	margin:20upx 0 0 0;
+	padding-bottom:30upx;
+	> view {
+		text-align: center;
+		display: inline-block;
+		width: 25%;
+		vertical-align: middle;
+		> view {
+			margin:20upx auto 0 auto;
+			width: 50upx;
+			> image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+		> span {
+			margin: 20upx 0 0 0;
+			font-size: 24upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.helpCenter {
+	font-size: 0;
+}
+page {
+	background: #ffffff;
+	overflow-x: hidden;
+}
+.search {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	height: 76upx;
+	background: rgba(246, 246, 246, 1);
+	border-radius: 38upx;
+	> image {
+		margin-left: 30upx;
+		vertical-align: middle;
+		width: 28upx;
+		height: 28upx;
+	}
+	> input {
+		padding-left: 30upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 400upx;
+		height: 100%;
+		font-size: 24upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.helpCenterImg {
+	margin: 20upx auto 0 auto;
+	overflow: hidden;
+	border-radius: 10upx;
+	width: 750upx;
+	height: 560upx;
+	> image {
+		width: 750upx;
+		height: 560upx;
+	}
+}
+</style>
diff --git a/pages/subPages/helpCenter/helpDetails/helpDetails.vue b/pages/subPages/helpCenter/helpDetails/helpDetails.vue
new file mode 100644
index 0000000..0196252
--- /dev/null
+++ b/pages/subPages/helpCenter/helpDetails/helpDetails.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="helpDetails">
+		<far-bottom></far-bottom>
+		<!-- 标题 -->
+		<view class="detailsTitle">
+			<view class="detailsTitlePackage">
+				<span>{{ detailInfo.title }}</span>
+			</view>
+		</view>
+		<!-- 标题 -->
+
+		<!-- 内容区域 -->
+		<scroll-view class="scollView" :scroll-x="true" :scroll-y="true" :style="{ height: phoneHight }">
+			<view class="detailsMain"><view class="detailsMainPackage" >
+			<jyf-parser :html="detailInfo.content"></jyf-parser>
+			</view></view>
+		</scroll-view>
+		<!-- 内容区域 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			detailInfo: {},
+			phoneHight: 0,
+			titleHeight: 0
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.id = e.id;
+		_this.init();
+	},
+	mounted() {
+		let _this = this;
+		uni.createSelectorQuery()
+			.select('.detailsTitle')
+			.boundingClientRect(data => {
+				_this.titleHeight = data.height;
+			})
+			.exec();
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight - _this.titleHeight + 'px';
+			}
+		});
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.getDetailInfo();
+		},
+		// 获取问题的详细信息
+		getDetailInfo() {
+			let _this = this;
+			let data = {
+				id: _this.id
+			};
+			App._post_form('&p=helper&do=detail', data, res => {
+				_this.detailInfo = res.data;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+/deep/.uni-scroll-view::-webkit-scrollbar {
+	width: 0;
+	height: 0;
+}
+.scollView {
+	padding: 0 30upx;
+	width: 690upx;
+}
+.helpDetails {
+	font-size: 0;
+	overflow-x: scroll;
+}
+page {
+	background: #FFFFFF;
+}
+.detailsMainPackage {
+	padding: 30upx 0;
+	font-size: 24upx;
+	
+	
+	color: rgba(153, 153, 153, 1);
+}
+.detailsTitlePackage {
+	margin: 0 30upx;
+	border-bottom: 1upx solid rgba(239, 240, 254, 1);
+	> span {
+		line-height: 105upx;
+		font-size: 30upx;
+		
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.detailsTitle {
+	height: 105upx;
+}
+</style>
diff --git a/pages/subPages/helpCenter/problemList/problemList.vue b/pages/subPages/helpCenter/problemList/problemList.vue
new file mode 100644
index 0000000..1390de0
--- /dev/null
+++ b/pages/subPages/helpCenter/problemList/problemList.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="problemList">
+		<far-bottom></far-bottom>
+		<scroll-view class="scrollView" :style="{ height: phoneHight }" :scroll-y="true" :lower-threshold="0" @scrolltolower='load'>
+			<view class="problemMb" v-for="(item,index) in problemList" @click="goHelpInfo(item.id)">
+				<span>{{item.title}}</span>
+				<image :src="imgfixUrls + 'merchant/right.svg'"/>
+			</view>
+			<view class="tips">
+				<span>{{text}}</span>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif	
+	
+	export default {
+		data() {
+			return {
+				id:null,
+				page:1,
+				phoneHight:0,
+				problemList:{},
+				text:''
+			};
+		},
+		onLoad(e){
+			uni.setNavigationBarTitle({
+			    title: e.title
+			});
+			this.id=e.id
+			this.init()
+		},
+		methods:{
+			init(){
+				let _this=this
+				_this.getProblemList();
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+			},
+			// 跳转详情
+			goHelpInfo(id){
+				App.navigationTo({
+					url:'pages/subPages/helpCenter/helpDetails/helpDetails?id='+id
+				})
+			},
+			// 获取问题列表
+			getProblemList(){
+				let _this=this
+				_this.text="... ...加载中"
+				let data={
+					is_recommend:0,
+					type_id:_this.id,
+					page:_this.page,
+					page_index:20
+				}
+				App._post_form('&p=helper&do=problemList',data,res=>{
+					_this.total=res.data.total
+					_this.problemList={..._this.problemList,...res.data.list}
+					_this.text=""
+					if(_this.total==_this.page||_this.total==0){
+						_this.text="已无更多数据"
+					}
+				})
+			},
+			// 加载
+			load(){
+				let _this=this
+				if(_this.total==_this.page){
+					_this.text="已无更多数据"
+				}else{
+					_this.page++
+					_this.getProblemList();
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+.tips{
+	height: 80upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		
+		
+		color: black;
+	}	
+}	
+.scrollView{
+	width: 690upx;
+	padding: 0 30upx;
+}
+.problemMb{
+	height: 105upx;
+	display: flex;
+	justify-content: space-between;
+	border-bottom:1upx solid rgba(238,238,238,1);
+	>span{
+		vertical-align: top;
+		line-height: 105upx;
+		font-size:28upx;
+		lor:rgba(51,51,51,1);
+	}
+	>image{
+		margin: 45upx 0 0 0;
+		vertical-align: top;
+		height: 30upx;
+		width: 20upx;
+	}
+}
+</style>
diff --git a/pages/subPages/homepage/chat/chat.vue b/pages/subPages/homepage/chat/chat.vue
new file mode 100644
index 0000000..a7a2ac3
--- /dev/null
+++ b/pages/subPages/homepage/chat/chat.vue
@@ -0,0 +1,329 @@
+<template>
+	<view class="chat" :style="{ height: phoneHight }">
+		<far-bottom></far-bottom>
+		<view class="container">
+			<scroll-view scroll-y="true" class="scrollView" @scrolltoupper="reachToupper" :scroll-top="scrollTop" :style="{ height: scrollHeight }">
+				<view class="content p-top-bom-50">
+					<block v-for="(chatItem, index) in chatList" :key="index">
+						<view class="chat-left-item dis-flex flex-y-center m-btm80" v-if="chatItem.is_my === '1'">
+							<view class="chat-avatar m-right30" :style="{ 'background-image': 'url(' + chatItem.avatar + ')' }"></view>
+							<view class="chat-message f-28 col-3 b-f p-r">
+								<rich-text :nodes="chatItem.content"></rich-text>
+								<view class="message-time message-time_1 f-24 col-9">{{ chatItem.date_time }}</view>
+							</view>
+						</view>
+						<view class="chat-right-item dis-flex flex-y-center flex-x-end m-btm80" v-if="chatItem.is_my === '0'">
+							<view class="chat-message f-28 chat-message_2 col-f p-r">
+								<rich-text :nodes="chatItem.content"></rich-text>
+								<view class="message-time message-time_2 f-24 col-9">{{ chatItem.date_time }}</view>
+							</view>
+							<view class="chat-avatar m-left30" :style="{ 'background-image': 'url(' + chatItem.avatar + ')' }"></view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+			<view class="sendbox dis-flex flex-y-center flex-x-between padding-box-all b-f">
+				<textarea
+					type="text"
+					value=""
+					class="f-24"
+					placeholder="请输入内容"
+					maxlength="-1"
+					:auto-height="chatcontent.length > 150 ? false : true"
+					v-model="chatcontent"
+					@blur="lose"
+					fixed="true"
+					:show-confirm-bar="false"
+					cursor-spacing="20"
+				/>
+				<view class="send-box-btn t-c col-f f-24" @click="messageSend">发送</view>
+			</view>
+		</view>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import PhoneMask from '@/components/template/PhoneMask';
+import getvxphone from '@/components/template/getVXphone.vue';
+let setTimer = null,
+	msgsetTimer = null;
+export default {
+	data() {
+		return {
+			canSend: 1,
+			phoneHight: null,
+			scrollHeight: null,
+			current_page: 1,
+			chatList: [],
+			total: null,
+			scrollTop: 0,
+			chatcontent: '',
+			other_id: null,
+			receive_type: null,
+			send_type: null,
+			sendmsgnum: 0,
+			id: '',
+			popShow: false,
+			vxshow: false
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.other_party_type = e.other_party_type;
+		_this.type = e.type;
+		_this.other_party_id = e.other_party_id;
+		if (!!e.id) {
+			_this.id = e.id;
+		} else {
+			_this.id = '';
+		}
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+				_this.phoneHight1 = res.windowHeight;
+				_this.scrollHeight = _this.phoneHight1 - uni.upx2px(120) + 'px';
+			}
+		});
+		this.setData(e);
+	},
+
+	components: {
+		PhoneMask,
+		getvxphone
+	},
+	computed: {},
+
+	mounted() {
+		this.chatDetailData();
+	},
+	methods: {
+		showFalse() {
+			console.log('进了showfalse');
+			this.vxshow = false;
+		},
+		closePop() {
+			let _this = this;
+			_this.popShow = false;
+		},
+		chatDetailData(page = 1, isPage = false) {
+			let _this = this;
+			App._post_form(
+				'&p=im&do=get',
+				{
+					id: _this.id,
+					other_party_id: _this.other_party_id,
+					page,
+					other_party_type: _this.other_party_type,
+					type: _this.type
+				},
+				res => {
+					if (res.errno === 0) {
+						let chatListData = res.data,
+							oldchatList = _this.chatList;
+						setTimeout(() => {
+							uni.setNavigationBarTitle({
+								title: res.data.receive_name
+							});
+						});
+						if (isPage) {
+							_this.chatList = chatListData.list.concat(...oldchatList);
+						} else {
+							if (oldchatList.length > 0) {
+								let newArray = oldchatList.concat(...chatListData.list),
+									temp = {},
+									result = [];
+								newArray.map((item, index) => {
+									if (!temp[item.id]) {
+										result.push(item);
+										temp[item.id] = true;
+									}
+								});
+								_this.$nextTick(function() {
+									_this.chatList = result;
+								});
+								clearTimeout(setTimer);
+								setTimer = setTimeout(() => {
+									_this.chatDetailData();
+								}, 5000);
+							} else {
+								_this.setData({
+									chatList: res.data.list,
+									total: res.data.total
+								});
+								_this.$nextTick(function() {
+									_this.scrollTop = 9999;
+								});
+								clearTimeout(setTimer);
+								setTimer = setTimeout(() => {
+									_this.chatDetailData();
+								}, 5000);
+							}
+						}
+					}
+				},
+				err => {
+					if (err.data.errno === 1) {
+						App.navigationTo({
+							url: err.data.data.url
+						});
+					}
+				},
+				() => {}
+			);
+		},
+		reachToupper() {
+			let _this = this;
+			if (_this.current_page >= _this.total) {
+				return false;
+			}
+			_this.chatDetailData(++_this.current_page, true);
+		},
+		messageSend() {
+			console.info(111111111);
+			let _this = this,
+				requestData = {
+					send_id: _this.id,
+					send_type: _this.type,
+					receive_type: _this.other_party_type,
+					type: 0,
+					receive_id: _this.other_party_id,
+					content: _this.chatcontent
+				};
+
+			if (_this.chatcontent === '') return;
+			if (_this.canSend == 1) {
+				_this.canSend = 0;
+				App._post_form(
+					'&p=im&do=send',
+					requestData,
+					res => {
+						_this.canSend = 1;
+						if (res.errno === 0) {
+							_this.setData({
+								chatcontent: ''
+							});
+							clearTimeout(msgsetTimer);
+							msgsetTimer = setTimeout(() => {
+								_this.scrollTop = _this.scrollTop + 1;
+							}, 500);
+							_this.chatDetailData();
+						}
+					},
+					fail => {
+						_this.canSend = 1;
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+						}
+					}
+				);
+			}
+		},
+		lose() {
+			// #ifdef H5
+			document.body.scrollTop = document.documentElement.scrollTop = 0;
+			// #endif
+		}
+	},
+	onHide() {
+		clearTimeout(setTimer);
+		clearTimeout(msgsetTimer);
+		console.log('onHide');
+	},
+	onUnload() {
+		clearTimeout(setTimer);
+		clearTimeout(msgsetTimer);
+		console.log('onUnload');
+	},
+	destroyed() {
+		clearTimeout(setTimer);
+		clearTimeout(msgsetTimer);
+		console.log('destroyed');
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.cantSend {
+	pointer-events: none;
+}
+.chat {
+	background: #f8f8f8;
+}
+page {
+	background-color: #f8f8f8;
+}
+
+.scrollView {
+	height: 84vh;
+}
+
+.chat-left-item,
+.chat-right-item {
+	padding: 0 30upx;
+
+	.chat-avatar {
+		width: 70upx;
+		height: 70upx;
+		border-radius: 50%;
+		background-size: 70upx 70upx;
+		background-repeat: no-repeat;
+		flex-shrink: 0;
+	}
+
+	.chat-message {
+		padding: 26upx 30upx;
+		border-radius: 10upx 10upx 10upx 0;
+		max-height: 400upx;
+		word-break: break-all;
+		word-wrap: break-word;
+	}
+
+	.chat-message_2 {
+		border-radius: 10px 10px 0px 10px !important;
+		background-color: #ff4444;
+		max-height: 400upx;
+		word-break: break-all;
+		word-wrap: break-word;
+	}
+}
+
+.sendbox {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	border-top: 1px solid rgba(238, 238, 238, 1);
+	border-radius: 6upx 6upx 0 0;
+	& > textarea {
+		width: 500upx;
+	}
+	.send-box-btn {
+		width: 98upx;
+		height: 60upx;
+		line-height: 60upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 10upx;
+	}
+}
+.message-time {
+	position: absolute;
+	top: -50upx;
+	width: 300upx;
+}
+
+.message-time_1 {
+	left: 0;
+}
+
+.message-time_2 {
+	right: 0;
+}
+</style>
diff --git a/pages/subPages/homepage/homepage/homepage.vue b/pages/subPages/homepage/homepage/homepage.vue
new file mode 100644
index 0000000..478996c
--- /dev/null
+++ b/pages/subPages/homepage/homepage/homepage.vue
@@ -0,0 +1,1119 @@
+<template>
+	<!-- 个人主页 -->
+	<view class="homepage">
+		<view class="status_bar" :class="isBlack?'bg1':'bg2'"><!-- 这里是状态栏 --></view>
+		<view class="dis-flex flex-y-center top-nav" :class="isBlack?'bg1':'bg2'">
+			<view class="back" @click="back"></view>
+			<view class="title">个人中心</view>
+			<view style="width: 40px;"></view>
+		</view>
+		<far-bottom></far-bottom>
+		<scroll-view class="container" @scrolltolower="ReachBottom" @scroll="scrolly" :style="{height:phoneHight}" :scroll-x="false" scroll-y>
+			<view class="header textC" @click="uploadFiles" >
+				<image :src="userInfo.thumb" class="header_image" mode="aspectFill"></image>
+				<view class="hearder_tips">
+					<span class="color888888 font30 lineHeight520 " v-if="userInfo.useself=='1'&&userInfo.isdefault=='1'"><!-- 点击更换背景图 --></span>
+				</view>
+			</view>
+			<!-- 隔离区 -->
+			<view class="content p-r">
+				<view class="user-info p-r padding-box-all b-f border-line border-bottom">
+					<view class="user-info-top dis-flex flex-x-between m-btm40">
+						<view class="user-info-top-left p-r b-f">
+							<image :src="userInfo.avatar" mode="aspectFill" @click="preImg"></image>
+						</view>
+						<view class="user-info-top-right dis-flex flex-x-around flex-box" v-if="0">
+							<view class="info-detail-item">
+								<view class="f-28 col-3 t-c">{{userInfo.main_browse}}</view>
+								<view class="f-24 col-9 t-c">浏览</view>
+							</view>
+							<view class="info-detail-item">
+								<view class="f-28 col-3 t-c">{{userInfo.visitor}}</view>
+								<view class="f-24 col-9 t-c">访客</view>
+							</view>
+							<view class="info-detail-item" v-if="tabbar[0]['isOpen']">
+								<view class="f-28 col-3 t-c">{{userInfo.release}}</view>
+								<view class="f-24 col-9 t-c">发布</view>
+							</view>
+						</view>
+						<view class="user-info-top-right flex-box">
+							<view class="dis-flex">
+								<view class="f-26 col-3 m-right10">{{userInfo.nickname}}</view>
+							</view>
+							<view class="">
+								<view class="f-26 col-9 m-right10">ID：{{mid}}</view>
+								<view class="info-logo dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'homePage/home_logo1.png'" class="home_logo1" mode="" v-if="userInfo.attestation.attestation==2"></image>
+									<image :src="imgfixUrls + 'homePage/home_logo3.png'" class="home_logo3" mode="" v-if="userInfo.attestation.bondflag==1"></image>
+								</view>
+							</view>
+						</view>
+						<view class="user-info-top-right dis-flex" style="align-items: center;">
+							<view class="btn-send" v-if="!isMe && userInfo.is_interest" @click="goChat">发消息</view>
+							<view class="btn-interest" v-if="!isMe && userInfo.is_interest" @click="interestCancel">取消关注</view>
+							<view class="btn-interest" v-if="!isMe && mid!=='0' && !userInfo.is_interest" @click="interest">关注</view>
+						</view>
+					</view>
+					<view class="user-info-btm" v-if="userInfo.identity=='学生'">
+						<view class="info-name dis-flex flex-y-center">
+							<view class="f-26 col-9 m-right10">学号：{{userInfo.school_code}}</view>
+							<!-- <view class="f-26 col-9 m-right10">生日：{{userInfo.nickname}}</view> -->
+						</view>
+						<view class="m-top-btm30 dis-flex flex_bettwen" >
+							<text class="f-26 col-9 ver_mid lineH_50">院校信息：{{userInfo.school_name}}&nbsp;{{userInfo.school_department_name}}</text>
+							<!-- <view class="zxlbutton ver_mid" v-if="userInfo.useself!='1'" @click="goChat">
+								<text class="iconfont icon-pinglun zxltext_left ver_mid lineH_50"></text><text class="zxltext_right ver_mid lineH_50">在线聊</text>
+							</view> -->
+						</view>
+					</view>
+					<view class="dis-flex flex-x-around" style="text-align: center;">
+						<navigator hover-class="none" :url="'/pagesA/follow_fans/fans?id='+mid"
+						 style="box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, .15);width: 45%;padding: 5px 0px;">
+							<view style="font-weight: bold;">{{userInfo.fans_user_count}}</view>
+							<view class="f-24 col-9">{{isMe?'我的粉丝':'粉丝'}}</view>
+						</navigator>
+						<navigator hover-class="none" :url="'/pagesA/follow_fans/follow?id='+mid"
+						 style="box-shadow: 0px 0px 3px 0px rgba(0, 0, 0, .15);width: 45%;padding: 5px 0px;">
+							<view style="font-weight: bold;">{{userInfo.interest_user_count}}</view>
+							<view class="f-24 col-9">{{isMe?'我的关注':'关注'}}</view>
+						</navigator>
+					</view>
+				</view>
+				<view class="user-info-tabbar b-f dis-flex flex-y-center" v-if="isMe">
+					<view class="user-info-tabbar-item t-c f-28 col-3 p-r" v-if="tabItem.isOpen" :class="{'selectTabCor':tabItem.type===currentType}"
+					 v-for="(tabItem,index) in tabbar" @click="selectTabbar(tabItem.type)"
+					 :key="index" >{{tabItem.title}}
+						<view class="selectTabbar" v-if="tabItem.type===currentType"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 隔离区 -->
+			<block v-if="!selectTabbarLoading">
+				<!-- 发布 -->
+				<view class="issue-content" v-if="currentType==='issue'">
+					<view v-if="isMe" class="status-tab-nav dis-flex flex-x-around flex-y-center" style="padding: 0px 5px;">
+						<view class="status-tab-item" :class="statusTab==-1?'active':''" @click="changeStatusTab(mid, 1, -1)">全部</view>
+						<view class="status-tab-item" :class="statusTab==0?'active':''" @click="changeStatusTab(mid, 1, 0)">已发布</view>
+						<view class="status-tab-item" :class="statusTab==1?'active':''" @click="changeStatusTab(mid, 1, 1)">审核中</view>
+						<view class="status-tab-item" :class="statusTab==2?'active':''" @click="changeStatusTab(mid, 1, 2)">未通过</view>
+						<!-- <view class="status-tab-item">收藏</view> -->
+					</view>
+					<!-- <view class="post-list-scrollView" v-if="invitationListData.length > 0"> -->
+					<view class="post-list-scrollView">
+						<nonemores v-if="postTotal==0"></nonemores>
+						<block v-if="postTotal!=0">
+							<view class="dis-flex flex-warp flex-x-between issueWrapper" style="padding: 10px;">
+								<view class="issueItem" v-for="(issueItem,index) in invitationListData" :key="index">
+									<!-- <post-list :itemInfo="issueItem" :indexNumber="index" :indexShow='indexShow' @operationShow="operationShow"></post-list> -->
+									<post-list-two :itemInfo="issueItem" :indexNumber="index" :indexShow='indexShow' @operationShow="operationShow" @delet="deletPost" :isMe="isMe"></post-list-two>
+								</view>
+							</view>
+						</block>
+						<loadmore :isMore="postMore" v-if="postTotal!=0" />
+					</view>
+				</view>
+				<!-- 店铺 -->
+				<view class="shop-content " v-if="currentType==='shop'">
+					<view class="post-list-scrollView1">
+						<nonemores v-if="shopTotal==0"></nonemores>
+						<view class="shop-list b-f" v-else>
+							<block>
+								<view class="shop b-color-f8">
+									<view class="shangjia">
+										<view class="shangjia-i" :class="{shangjiaISty: item2.goods.length == 0}" v-for="(item2, key2) in shopData"
+										 :key="key2">
+											<view class="a shangjia-i-t" @click="navgateTo(item2.id)">
+												<view class="shangjia-i-l">
+													<image class="image" :src="item2.logo" mode="aspectFill"></image>
+												</view>
+												<view class="shangjia-i-r">
+													<view class="shangjia-i-r-d">
+														<view class="dis-flex flex-y-center flex-x-between">
+															<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+															<view class="store-containerIcon dis-flex flex-y-center">
+																<image :src="imgfixUrls + 'diypage/720icon.png'" mode="" class="m-right10" v-if="item2.panorama===1"></image>
+																<image :src="imgfixUrls + 'diypage/videoicon.png'" mode="" v-if="item2.videourl===1"></image>
+															</view>
+														</view>
+														<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+															<view class="dis-flex flex-y-center">
+																<view class="shangjia-i-r-t2-icon">
+																	<view class="star star-dark">
+																		<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+																	</view>
+																	<view class="star star-light">
+																		<view class="star-width" :style="'width:'+(item2.score / 5) * 100+'%;'">
+																			<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+																		</view>
+																	</view>
+																</view>
+																<view class="f-28 col-6 star-grade">{{item2.score}}分</view>
+															</view>
+															<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{item2.distance}}</view>
+														</view>
+														<view class="shangjia-i-r-t3 over-omit">
+															<view class="p" v-html="item2.storehours"></view>
+														</view>
+														<view class="shangjia-i-r-t4 over-omit">
+															<view v-for="(item3,index3) in item2.tags" class="tags_view" :key="index3">{{item3}}</view>
+														</view>
+													</view>
+												</view>
+											</view>
+											<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || (shopFoldIndex !== key2)) && item2.goods.length > 0">
+												<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+													<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+														<view class="em" :class="tag.css">{{ tag.tag }}</view>
+														<view class="span">{{ tag.name }}</view>
+													</view>
+												</view>
+												<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+													<view class="i icon iconfont icon-unfold"></view>
+													<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+														<view class="em" :class="tag.css">{{ tag.tag }}</view>
+														<view class="span">{{ tag.name }}</view>
+													</view>
+												</view>
+												<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+													<view class="em" :class="tag.css">{{ tag.tag }}</view>
+													<view class="span">{{ tag.name }}</view>
+												</view>
+												<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+													<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+												</view>
+											</view>
+											<view class="shangjia-i-b" v-if="!shopFold && shopFoldIndex == key2 &&  item2.goods.length > 2">
+												<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+													<view class="i icon iconfont icon-fold"></view>
+													<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+														<view class="em" :class="tag.css">{{ tag.tag }}</view>
+														<view class="span">{{ tag.name }}</view>
+													</view>
+												</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</block>
+						</view>
+					</view>
+				</view>
+				<!-- 访客 -->
+				<view class="shop-content" v-if="currentType==='visitor'">
+					<view>
+						<nonemores v-if="visitorTotal=='0'"></nonemores>
+						<view class="shop-list b-f" v-if="visitorTotal!='0'">
+							<view class="shop-item dis-flex border-line border-bottom flex-y-center flex-x-between" v-for="(visitorItem,index) in visitorListData" :key="index">
+								<view class="visitor-left dis-flex flex-y-center" @click="goHomePage(visitorItem.mid)">
+									<view class="visitor-avatar m-right20" :style="{'background-image':'url('+visitorItem.avatar+')'}"></view>
+									<view class="visitor-nickname f-28 col-3">{{visitorItem.nickname}}</view>
+								</view>
+								<view class="visitor-left col-9 f-24">{{visitorItem.update_time}}</view>
+							</view>
+						</view>
+						<loadmore :isMore="postMore" v-if="visitorTotal!='0'" />
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+			</block>
+		</scroll-view>
+		<tab-bars :tabBarAct="0"></tab-bars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import postList from '@/components/template/postList.vue'
+	import postListTwo from '@/components/template/postListTwo.vue'
+	import PartLoading from "@/components/template/PartLoading.vue"
+	// import Loadlogo from '@/components/template/loadlogo'
+	import Loading from '@/components/template/loading'
+	import tabBars from '@/components/template/tabBar.vue'
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+	export default {
+		data() {
+			return {
+				mid: null,
+				latitude: null,
+				longitude: null,
+				currentType: 'issue',
+				userInfo: {},
+				loadlogo: false, //页面是否加载完成,
+				loading: false, //列表加载更多
+				current_page: 1, //当前页数
+				total: null, // 总页数
+				invitationListData: [], //帖子列表
+				shopData: [], //店铺列表
+				visitorListData: [], //访客列表
+				tabbar: [
+					{
+						title: '访客',
+						type: 'visitor',
+						isOpen: true
+					}
+				],
+				indexShow: -1,
+				slide_Top: 0, // 滚动距离
+				selectTabbarLoading: false,
+				postTotal: 0,
+				shopTotal: 0,
+				visitorTotal: 0,
+				postMore: true,
+				shopFold: true,
+				shopFoldIndex: -1,
+				phoneHight: null,
+				statusTab: 0,
+				isBlack: false,
+				lock1: false,
+				lock2: false,
+				isMe: false
+			}
+		},
+
+		components: {
+			postList,
+			postListTwo,
+			PartLoading,
+			// Loadlogo,
+			Loading,
+			tabBars,
+			nonemores,
+			loadmore
+		},
+		computed: {
+
+		},
+		onLoad(e) {
+			let _this = this,
+				getBrowser = App.getBrowser(),
+				{
+					mid,
+					checkType
+				} = e;
+			uni.getStorage({
+				key: 'userinfo',
+				success: async function(res) {
+					if(e.mid!==res.data.mid){
+						_this.isMe = false;
+					}else{
+						_this.isMe = true;
+					}
+				}
+			});
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = (res.windowHeight - uni.upx2px(100))+ 'px';
+					console.info('windowHeight',res.windowHeight)
+					console.info('upx2px',uni.upx2px(100))
+				}
+			});
+			if (getBrowser === "chrome53.0") {
+				uni.showModal({
+					content: '微信浏览器版本过低,请使用系统浏览器',
+					showCancel: false
+				})
+				return false
+			}
+			_this.getmainPageInfo(mid, checkType);
+		},
+		methods: {
+			// 在綫聊
+			goChat(){
+				let _this=this;
+				var dd=0;
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){//有简历
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + _this.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+					})
+				}
+			},
+			getmainPageInfo(mid = 982, checkType) {
+				let _this = this,
+					location = uni.getStorageSync('agencyData'),
+					client = App.getClientType();
+				App._post_form('&p=member&do=mainPageInfo', {
+					mid
+				}, res => {
+					if (res.errno === 0) {
+						_this.loadlogo = true;
+						
+						// _this.getuserList(mid, 1, -1);// 先不管is_pocket是什么了，现在需要展示发布的帖子
+						// _this.tabbar.unshift({
+						// 	title: '发布',
+						// 	type: 'issue',
+						// 	isOpen: true
+						// })
+						
+						if(res.data.is_store == 1){
+							_this.tabbar.unshift({
+								title: '店铺',
+								type: 'shop',
+								isOpen: true
+							})
+						}
+						// if(res.data.is_pocket == 1){
+							_this.tabbar.unshift({
+								title: '发布',
+								type: 'issue',
+								isOpen: true
+							})
+						// }
+						
+						if (res.data.is_pocket === 1 && checkType === "1") {
+							_this.getuserList(mid);
+						} else {
+							if(_this.isMe){
+								_this.getuserShopList(mid, location.lat, location.lng)
+							}
+						}
+						// console.log(_this.tabbar.length, _this.tabbar[0].isOpen, 11111111)
+						// _this.tabbar[0].isOpen = res.data.is_pocket === 1;
+						// console.log(_this.tabbar, 22222222)
+						_this.setData({
+							mid,
+							userInfo: res.data,
+							currentType: checkType === "1" && res.data.is_pocket === 1 ? 'issue' : 'shop',
+							latitude: location.lat,
+							longitude: location.lng
+						})
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			wxApiCallback() {
+				let _this = this;
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							_this.setData({
+								latitude: res.latitude,
+								longitude: res.longitude
+							})
+						}
+					});
+				});
+			},
+			// 获取访客信息
+			getvisitorList(mid = "", page = 1, isPage = false) {
+				let _this = this;
+				App._post_form('&p=member&do=visitorList', {
+					mid,
+					page
+				}, res => {
+					if (res.errno === 0) {
+						let visitorData = res.data;
+						_this.visitorTotal = res.data.total
+						if (isPage) {
+							if (visitorData.list.length > 0) {
+								_this["visitorListData"].push(...visitorData.list);
+							} else {
+								_this.postMore = true;
+							}
+						} else {
+							_this.setData({
+								visitorListData: visitorData.list,
+								total: res.data.total,
+								loading: visitorData.list.length === 0 || _this.current_page === res.data.total
+							})
+						}
+					}
+				}, false, () => {
+					_this.selectTabbarLoading = false;
+				})
+			},
+			// 获取店铺信息列表
+			getuserShopList(mid = "", lat = "", lng = "") {
+				let _this = this;
+				App._post_form('&p=store&do=userShopList', {
+					mid,
+					lat,
+					lng
+				}, res => {
+					if (res.errno === 0) {
+						console.info('length', res.data.length)
+						if (res.data.length == 0) {
+							_this.shopTotal = 0
+						} else {
+							for (let i = 0; i < res.data.length; i++) {
+								let goodsList = [];
+								for (let j in res.data[i].goods) {
+									let goodsData = res.data[i].goods[j];
+									if (goodsData !== '') {
+										if (j == 'active') {
+											goodsData.css = 'qiang'
+											goodsData.tag = '抢'
+										} else if (j == 'coupon') {
+											goodsData.css = 'hui'
+											goodsData.tag = '券'
+										} else if (j == 'fightgroup') {
+											goodsData.css = 'pin'
+											goodsData.tag = '拼'
+										} else if (j == 'groupon') {
+											goodsData.css = 'tuan'
+											goodsData.tag = '团'
+										} else if (j == 'halfcard') {
+											goodsData.css = 'ka'
+											goodsData.tag = '卡'
+										} else if (j == 'packages') {
+											goodsData.css = 'li'
+											goodsData.tag = '礼'
+										}
+										goodsList.push(goodsData);
+									}
+								}
+								res.data[i].goods = goodsList;
+							}
+							_this.shopTotal = res.data.length;
+							let shopData = res.data;
+							_this.setData({
+								shopData: shopData
+							})
+						}
+
+					}
+				}, false, () => {
+					_this.selectTabbarLoading = false;
+				})
+			},
+			// 获取发布帖子信息
+			getuserList(mid = "", page = 1, status = 0, isPage = false) {
+				let _this = this;
+				App._post_form('&p=pocket&do=userList', {
+					mid,
+					page,
+					status//0显示中-1全部1审核中
+				}, res => {
+					if (res.errno === 0) {
+						let invitationData = res.data;
+						if (invitationData.list.length > 0) {
+							invitationData.list.map(item=>{
+								item.content = item.content.replace(/\<br\/\>/g,"\n");
+								return item;
+							})
+						}
+						if (isPage) {
+							if (invitationData.list.length > 0) {
+								_this["invitationListData"].push(...invitationData.list);
+							} else {
+								_this.postMore = true;
+							}
+						} else {
+							_this.setData({
+								invitationListData: invitationData.list,
+								total: invitationData.total,
+								postTotal:invitationData.total,
+								loading: invitationData.list.length === 0 || _this.current_page === invitationData.total
+							})
+						}
+					}
+				}, false, () => {
+					_this.selectTabbarLoading = false;
+				})
+			},
+			/**
+			 * 滑动高度 
+			 */
+			scrolly(e) {
+				this.slide_Top = e.detail.scrollTop;
+				// console.log(this.slide_Top);
+				if(this.slide_Top>175 || this.slide_Top==175){
+					if(!this.lock1){
+						this.lock1 = true;
+						this.isBlack = true;
+						this.lock1 = false;
+						this.lock2 = true;
+					}
+				}else{
+					if(!this.lock1 && this.lock2){
+						this.lock1 = true;
+						this.isBlack = false;
+						this.lock1 = false;
+						this.lock2 = false;
+					}
+				}
+			},
+			//加载更多
+			ReachBottom(e) {
+				console.log(111111);
+				console.log(this.currentType, "issue?");
+				let _this = this,
+					currentType = _this.currentType;
+				if (_this.current_page >= _this.total) {
+					_this.postMore = true;
+					return false;
+				}
+				if (currentType === "issue") {
+					_this.getuserList(_this.mid, ++_this.current_page, _this.statusTab, true);
+				} else if (currentType === "visitor") {
+					_this.getvisitorList(_this.mid, ++_this.current_page, 0, true)
+				}
+			},
+			navgateTo(sid) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/store/index?sid=' + sid
+				})
+			},
+			selectTabbar(currentType) {
+				let _this = this;
+				_this.setData({
+					currentType,
+					selectTabbarLoading: true,
+					current_page: 1
+				})
+				if (currentType === "issue") {
+					_this.statusTab = 0;
+					_this.getuserList(_this.mid);
+				}
+				if (currentType === "shop") {
+					_this.getuserShopList(_this.mid, _this.latitude, _this.longitude)
+				}
+				if (currentType === "visitor") {
+					_this.getvisitorList(_this.mid)
+				}
+				if (currentType === "serve") {
+					_this.getvisitorList(_this.mid)
+				}
+			},
+			getserveList(){
+				
+			},
+			operationShow(e) {
+				let _this = this;
+				_this.indexShow = e;
+			},
+			navigateTo(url) {
+				let isHttpUrl = url.indexOf('https') !== -1;
+				if (isHttpUrl) {
+					location.href = url;
+				} else {
+					App.navigationTo({
+						url: url
+					})
+				}
+			},
+			shangjiaFold(key2) {
+				this.shopFold = false
+				this.shopFoldIndex = key2
+			},
+			shangjiaUpFold(key2) {
+				this.shopFold = true
+				this.shopFoldIndex = key2
+			},
+			// 文件上传接口
+			async uploadFiles() {
+				let _this = this;
+				if (_this.userInfo.useself == '1') {
+					// #ifdef H5
+					if(App.getClientType() == 2){
+						let res = await App.browser_upload(1);
+					    console.info('tempFilePaths', res.tempFilePaths)
+					    let aa = await App._upLoad(res.tempFilePaths[0])
+					    console.info('tempFilePaths1', res.tempFilePaths)
+					    _this.userInfo.thumb = aa.data.img
+					    let data = {
+					    	img: aa.data.img
+					    }
+					    App._post_form('&p=member&do=setMainBgImg', data, res => {
+					    	console.info('tempFilePaths2', res)
+					    	_this.userInfo.isdefault = 0
+					    	uni.showToast({
+					    		icon: "none",
+					    		title: '更改成功',
+					    		duration: 2000
+					    	});
+					    })
+						return
+					}
+					wxApi.choseImage(res => {
+						wxApi.uoloadIg(res.localIds[0], data => {
+							if (data.errMsg === 'uploadImage:ok') {
+								uni.showLoading({});
+								let requestData = {
+									upload_type: 2,
+									id: data.serverId
+								};
+								App._post_form(
+									'&do=uploadFiles',
+									requestData,
+									res => {
+										if (res.errno === 0) {
+											_this.userInfo.thumb = res.data.img
+											let data = {
+												img: res.data.image
+											}
+											App._post_form('&p=member&do=setMainBgImg', data, res => {
+												_this.userInfo.isdefault = 0
+												uni.showToast({
+													icon: "none",
+													title: '更改成功',
+													duration: 2000
+												});
+											})
+										}
+									},
+									false,
+									() => {
+										uni.hideLoading();
+									}
+								);
+							} else {
+								uni.hideLoading();
+								App.showError('上传失败');
+							}
+						});
+					});
+					// #endif
+					// #ifndef H5
+					wx.chooseImage({
+						count: 1,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							console.info('tempFilePaths', res.tempFilePaths)
+							let aa = await App._upLoad(res.tempFilePaths[0])
+							console.info('tempFilePaths1', res.tempFilePaths)
+							_this.userInfo.thumb = aa.data.img
+							let data = {
+								img: aa.data.img
+							}
+							App._post_form('&p=member&do=setMainBgImg', data, res => {
+								console.info('tempFilePaths2', res)
+								_this.userInfo.isdefault = 0
+								uni.showToast({
+									icon: "none",
+									title: '更改成功',
+									duration: 2000
+								});
+							})
+						}
+					})
+					// #endif
+				} else {
+
+				}
+
+			},
+			back(){
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			changeStatusTab(mid, page, status){
+				this.statusTab = status;
+				this.current_page = 1;
+				this.getuserList(mid, page, status);
+			},
+			preImg(){
+				let _this = this;
+				uni.previewImage({
+					current: _this.userInfo.avatar,
+					urls: [_this.userInfo.avatar],
+					fail(err) {
+						console.log(111, err)
+					}
+				});
+			},
+			goHomePage(id){
+				if (id > 0) {
+					App.navigationTo({
+						url: 'pages/subPages/homepage/homepage/homepage?mid=' + id + '&checkType=' + 1
+					});
+				}
+			},
+			deletPost(id){
+				for (let i = 0; i < this.invitationListData.length; i++) {
+					if (this.invitationListData[i].id == id) {
+						this.invitationListData.splice(i, 1);
+					}
+				};
+			},
+			interest(){
+				let data = {
+					interest_mid: this.mid
+				};
+				App._post_form('&p=member&do=addInterestMember', data, res => {
+					uni.showToast({
+						title: res.message
+					})
+					this.userInfo.is_interest = true;
+				})
+			},
+			interestCancel(){
+				let data = {
+					interest_mid: this.mid
+				};
+				App._post_form('&p=member&do=cancelInterestMember', data, res => {
+					uni.showToast({
+						title: res.message
+					})
+					this.userInfo.is_interest = false;
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	@import "../../../../common/css/old_diyPages";
+	.hearder_tips{
+		z-index: 636;
+		top: 0;
+		position: absolute;
+		width: 750upx;
+	}
+	.header_image{
+		width: 750upx;
+		height: 100%;
+	}
+	.zxlbutton{
+		font-size: 0;
+		width:140upx;
+		height:50upx;
+		background:rgba(23,209,23,1);
+		border-radius:6upx;
+		text-align: center;
+	}
+	.flex_bettwen{
+		justify-content: space-between;
+	}
+	.zxltext_left{
+		font-size:24upx;
+		color:rgba(255,255,255,1);
+		padding-right: 11upx;
+	}
+	.ver_mid{
+		vertical-align: middle;
+	}
+	.lineH_50{
+		line-height: 50upx;
+	}
+	.zxltext_right{
+		font-size:24upx;
+		color:rgba(255,255,255,1);
+	}
+	.container {
+		
+	}
+
+	page {
+		background-color: rgb(246, 246, 246);
+	}
+
+	.homepage {
+		background-color: rgb(246, 246, 246);
+		padding-bottom: 100px;
+	}
+
+	.header {
+		position: relative;
+		width: 100%;
+		height: 520upx;
+		background-repeat: no-repeat;
+		background-size: 100% 520upx;
+	}
+
+	.content {
+		margin-top: -20upx;
+
+		.user-info {
+			border-radius: 20upx 20upx 0 0;
+
+			.user-info-top-left {
+				width: 136upx;
+				height: 136upx;
+				border-radius: 50%;
+				margin-top: -45upx;
+				overflow: hidden;
+
+				&>image {
+					display: block;
+					width: 136upx;
+					height: 136upx;
+					border-radius: 50%;
+					position: absolute;
+					left: 50%;
+					top: 50%;
+					transform: translate(-50%, -50%);
+					border: 2px solid #FFF;
+					box-sizing: border-box;
+				}
+			}
+		}
+		.padding-box-all{
+			padding: 10rpx 30rpx 30rpx;
+		}
+
+		.user-info-tabbar {
+			height: 100upx;
+			line-height: 100upx;
+
+			.user-info-tabbar-item {
+				flex: 1;
+
+				.selectTabbar {
+					width: 48upx;
+					height: 8upx;
+					background-color: #FF4444;
+					border-radius: 8upx 8upx 0 0;
+					position: absolute;
+					left: 50%;
+					bottom: 0;
+					transform: translateX(-50%);
+				}
+			}
+
+			.selectTabCor {
+				color: #FF4444;
+			}
+		}
+
+		.info-logo {
+			margin-top: 6upx;
+
+			.home_logo1 {
+				display: block;
+				width: 40upx;
+				height: 40upx;
+			}
+
+			.home_logo2 {
+				display: block;
+				width: 40upx;
+				height: 40upx;
+				vertical-align: bottom;
+				margin: 0 10upx;
+			}
+
+			.home_logo3 {
+				display: block;
+				width: 40upx;
+				height: 40upx;
+			}
+		}
+
+		.icon-set {
+			vertical-align: top;
+			color: #333333;
+			font-size: 28upx;
+		}
+
+	}
+
+	.shop-content {
+
+		.shop-list {
+			border-radius: 10upx 10upx 0 0;
+
+			.shop-item {
+				margin: 0 30upx;
+				padding: 30upx 0;
+
+				.visitor-left {
+					.visitor-avatar {
+						width: 60upx;
+						height: 60upx;
+						border-radius: 50%;
+						background-size: 60upx 60upx;
+						background-repeat: no-repeat;
+					}
+				}
+
+				.shop-left {
+					width: 160upx;
+					height: 160upx;
+					background-size: 160upx 160upx;
+					background-repeat: no-repeat;
+					flex-shrink: 0;
+					border-radius: 10upx;
+				}
+
+				.shop-right {
+					flex: 1;
+
+					.collectBtn {
+						width: 126upx;
+						height: 48upx;
+						line-height: 48upx;
+						border: 1px solid rgba(255, 68, 68, 1);
+						border-radius: 8upx;
+						color: #FF4444;
+					}
+				}
+			}
+		}
+	}
+
+	.grade-distance .favor-item.select {
+		color: #F5D145;
+	}
+
+	.grade-distance .favor-item.not-select {
+		color: #CCCCCC;
+	}
+
+	.post-list-scrollView {
+		height: 60vh;
+	}
+
+	.post-list-scrollView1 {
+
+	}
+
+	.textC {
+		text-align: center;
+	}
+
+	.color888888 {
+		color: #888888;
+	}
+
+	.font30 {
+		font-size: 30upx;
+	}
+
+	.lineHeight520 {
+		line-height: 520upx;
+	}
+	//
+	.user-info-top-right{
+		margin-left: 20px;
+	}
+	.status_bar {
+		width: 100%;
+		height: var(--status-bar-height);
+		padding-bottom: 15px;
+		// background-color: transparent;
+		position: fixed;
+		top: 0px;
+		z-index: 99;
+	}
+	.top-nav{
+		width: 100vw;
+		position: fixed;
+		top: 40px;
+		// background-color: transparent;
+		z-index: 999;
+		.back{
+			width: 40px;
+			height: 40px;
+			position: relative;
+		}
+		.back::before{
+			content: '';
+			position: absolute;
+			top: 24rpx;
+			left: 45rpx;
+			width: 10px;
+			height: 10px;
+			border-top: 2px solid transparent;
+			// border-left: 2px solid #FFF;
+			border-right: 2px solid transparent;
+			// border-bottom: 2px solid #FFF;
+			transform: rotate(45deg);
+		}
+		.title{
+			// color: #FFF;
+			text-align: center;
+			flex: 1;
+		}
+	}
+	.bg1{
+		background-color: #FFF;
+		.title{
+			color: #333;
+		}
+		.back::before{
+			border-left: 2px solid #333;
+			border-bottom: 2px solid #333;
+		}
+		&.top-nav{
+			border-bottom: 1px solid #efefef;
+		}
+	}
+	.bg2{
+		background-color: transparent;
+		.title{
+			color: #FFF;
+		}
+		.back::before{
+			border-left: 2px solid #FFF;
+			border-bottom: 2px solid #FFF;
+		}
+		&.top-nav{
+			border-bottom: none;
+		}
+	}
+	.status-tab-nav{
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		height: 60px;
+		padding: 0px 5px;
+		
+		.status-tab-item{
+			font-size: 12px;
+			color: #999;
+			border: 1px solid #e0e0e0;
+			padding: 5px 12px;
+			border-radius: 50px;
+			
+			&.active{
+				color: #f00;
+				border: 1px solid #f00;
+			}
+		}
+	}
+	// .issueWrapper{
+	// 	flex-flow: column wrap;
+	// }
+	// .issueWrapper::before,
+	// .issueWrapper::after {
+	//   content: "";
+	//   flex-basis: 100%;
+	//   width: 0;
+	//   order: 1;
+	// }
+	.issueItem{
+		width: 48%;
+		margin-bottom: 10px;
+	}
+	/* 重新定义内容块排序优先级，让其横向排序 */
+	// .issueItem:nth-child(2n+1) { order: 1; }
+	// .issueItem:nth-child(2n+2) { order: 2; }
+	.btn-send{
+		color: #a0a0a0;
+		padding: 0 10px;
+		height: 26px;
+		line-height: 24px;
+		font-size: 12px;
+		border-radius: 15px;
+		box-sizing: border-box;
+		border: 1px solid #dedede;
+		margin-right: 10px;
+	}
+	.btn-interest{
+		color: #d60000;
+		padding: 0 10px;
+		height: 26px;
+		line-height: 24px;
+		font-size: 12px;
+		border-radius: 15px;
+		box-sizing: border-box;
+		border: 1px solid #d60000;
+	}
+</style>
diff --git a/pages/subPages/homepage/private/private.vue b/pages/subPages/homepage/private/private.vue
new file mode 100644
index 0000000..95d7fc5
--- /dev/null
+++ b/pages/subPages/homepage/private/private.vue
@@ -0,0 +1,188 @@
+<template>
+	<!-- 我的私信 -->
+	<view class="private">
+		<loadlogo v-if="!loadlogo" />
+		<view class="content" v-if="loadlogo" :style="{ height: phoneHight }">
+			<far-bottom></far-bottom>
+			<view class="private-list">
+				<noneMores v-if="total == 0"></noneMores>
+				<block v-if="total != 0">
+					<view class="private-item dis-flex flex-x-between flex-y-center border-line border-bottom" v-for="(privateItem, index) in list" @click="skipChat(privateItem)">
+						<view class="private-item-left dis-flex flex-y-center">
+							<view class="private-avatar p-r m-right20" :style="{ 'background-image': 'url(' + privateItem.avatar + ')' }">
+								<view class="private-init f-24 col-f t-c" v-if="privateItem.total !== '0'">
+									<text>{{ privateItem.total }}</text>
+								</view>
+							</view>
+							<view class="private-info">
+								<view class="private-nickname f-30 col-3">{{ privateItem.nickname }}</view>
+								<view class="f-24 col-9" v-if="privateItem.type == '0'"> <rich-text :nodes="privateItem.content"></rich-text> </view>
+								<view class="f-24 col-9" v-if="privateItem.type == '1'"> [图片] </view>
+								<view class="f-24 col-9" v-if="privateItem.type == '2'"> [视频] </view>
+								<view class="f-24 col-9" v-if="privateItem.type == '3'"> [名片] </view>
+								<view class="f-24 col-9" v-if="privateItem.type == '4'"> [简历] </view>
+								<view class="f-24 col-9" v-if="privateItem.type == '5'"> [其他消息] </view>
+							</view>
+						</view>
+						<view class="private-item-right f-24 col-9">{{ privateItem.date_time }}</view>
+					</view>
+				</block>
+				<loadmore :isMore="isMore" v-if="total != 0"></loadmore>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" :pageType="''" />
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import Loading from '@/components/template/loading';
+import noneMores from '@/components/template/nonemores.vue';
+import loadmore from '@/components/template/loadmore';
+import TabBars from '@/components/template/tabBar';
+export default {
+	data() {
+		return {
+			phoneHight: null,
+			isMore: true,
+			list: [],
+			total: null,
+			current_page: 1,
+			loadlogo: false, //页面是否加载完成,
+			loading: false //列表加载更多
+		};
+	},
+	onLoad() {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+				_this.phoneHight1 = res.windowHeight;
+
+				_this.scrollHeight = _this.phoneHight1 - uni.upx2px(120) + 'px';
+			}
+		});
+	},
+	components: {
+		Loadlogo,
+		Loading,
+		noneMores,
+		loadmore,
+		TabBars
+	},
+	computed: {},
+	mounted() {
+		this.getMessageList();
+	},
+	methods: {
+		getMessageList(page = 1, isPage = false) {
+			let _this = this;
+			_this.isMore = false;
+			App._post_form(
+				'&p=im&do=infoList',
+				{
+					page
+				},
+				res => {
+					if (res.errno === 0) {
+						let messageData = res.data;
+						_this.isMore = true;
+						if (isPage) {
+							if (messageData.list.length > 0) {
+								_this['list'].push(...messageData.list);
+							} else {
+								_this.loading = true;
+							}
+						} else {
+							_this.setData(messageData);
+							_this.loading = messageData.list.length === 0 || _this.current_page === messageData.total;
+						}
+					}
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		skipChat(item) {
+			let _this = this;
+			_this.list.map((items,index)=>{
+				if(items.id == item.id){
+					_this.list[index].total = '0';
+				};
+			});
+			// App.navigationTo({
+			// 	url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type + '&type=1' + '&id='
+			// });
+			// App.navigationTo({
+			// 	url: 'pagesA/instantMessenger/instantMessenger?mid=' + item.other_party_id + '&other_party_type=' + item.other_party_type + '&type=1' + '&id='
+			// });
+			let getSetInfo = uni.getStorageSync('getSetInfo');
+			if(getSetInfo.type == 1){
+				App.navigationTo({
+					url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id='
+				})
+			}else{
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=1' + '&id='
+				})
+			}
+			console.log(item);
+		}
+	},
+	onReachBottom() {
+		let _this = this;
+		if (_this.current_page >= _this.total) {
+			_this.isMore = true;
+			return false;
+		}
+		_this.getMessageList(++_this.current_page, true);
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.content {
+	background: #f8f8f8;
+}
+.private {
+	background: #f8f8f8;
+	padding-bottom: 400upx;
+}
+.private-list {
+	margin: 0 30upx;
+
+	.private-item {
+		padding: 30upx 0;
+
+		.private-item-left {
+			.private-avatar {
+				width: 80upx;
+				// flex: 1;
+				height: 80upx;
+				border-radius: 50%;
+				background-size: 80upx 80upx;
+				background-repeat: no-repeat;
+
+				.private-init {
+					width: 40upx;
+					height: 40upx;
+					flex: 1;
+					line-height: 40upx;
+					background: rgba(255, 68, 68, 1);
+					border-radius: 50%;
+					position: absolute;
+					right: -10upx;
+					top: -10upx;
+					transform: scale(0.75);
+				}
+			}
+			.private-info{
+				width: 440upx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/integral/integralShop/integralShop.vue b/pages/subPages/integral/integralShop/integralShop.vue
new file mode 100644
index 0000000..55ceb7f
--- /dev/null
+++ b/pages/subPages/integral/integralShop/integralShop.vue
@@ -0,0 +1,396 @@
+<template>
+	<!-- 积分商城 -->
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			
+			<view class="header b-f" :style="{'background-image':'url('+imageRoot+'inte_bg_1.png)'}">
+				<view class="seach">
+					<input type="text" v-model="searchInput" @confirm="openSearch" class="input" value="" placeholder="请输入商品名称" />
+				</view>
+				<view class="header-title dis-flex flex-y-center flex-x-between">
+					<view class="header-title-left" style="padding: 20upx 0;">
+						<view class="dis-flex flex-y-center">
+							<view class="col-f f-24">我的{{textList.credittext}}</view>
+							<view class="dis-flex flex-y-center">
+								<image class="inte-logo" :src="imgfixUrls + 'integral/integral_logo.png'" mode=""></image>
+								<view class="f-50 col-f">{{homeInfoData.integral}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<swiper :autoplay="true" :interval="3000" :duration="1000" class="swiperView">
+					<swiper-item class="swiperItem" v-for="(item,index) in homeInfoData.adv" :key="index" @click="navgateTolink(item.link)">
+						<view class="inte-bg" :style="{'background-image':'url('+item.thumb+')'}"></view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<!-- 社群 -->
+			<view v-if="!!homeInfoData.community" class="padding-box-all b-f">
+				<view class="diyPages-community dis-flex flex-x-between flex-y-center">
+					<view class="community-user dis-flex flex-y-center flex-box ">
+						<image :src="homeInfoData.community.imgUrl" class="community-user-img"></image>
+						<view class="community-user-info flex-box">
+							<view class="community-user-name col-0 f-28">{{ homeInfoData.community.name }}</view>
+							<view class="community-user-des f-24 col-9 onelist-hidden">{{homeInfoData.community.introduce}}</view>
+						</view>
+					</view>
+					<view class="community-btn" v-if="!!homeInfoData.community">
+						<button class="community-add community-add-bgcolor f-24 col-f" @click="showCommunity = true" v-if="!!homeInfoData.community">添加</button>
+					</view>
+				</view>
+				<!-- 社群弹窗 -->
+				<pop-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+					<view class="community-detail b-f t-c">
+						<view class="community-header f-w f-36 p-r col-f"><text class="community-header-text p-r">{{homeInfoData.community.name}}</text></view>
+						<!-- #ifdef H5 -->
+						<view class="community-body">
+							<image :src="homeInfoData.community.qrcodeUrl" class="community-qrcodeimg"></image>
+							<view class="community-toreply f-26 col-3">长按识别二维码</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<view class="community-body f-26 col-3">
+							有任何疑问，点击“<text class="col-m">去回复</text>”发送“<text class="col-m">{{homeInfoData.community.community_id}}</text>”,即可添加{{homeInfoData.community.name}}
+						</view>
+						<!-- #endif -->
+						<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!homeInfoData.community.phone">
+							<view class="community-number dis-flex flex-y-center">
+								<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon"></image>
+								<view class="f-24 col-3">{{homeInfoData.community.phone}}</view>
+							</view>
+							<view class="community-bdial f-24" @click="callPhone(item.params.phone)">拨号</view>
+						</view>
+						<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType==='3'">去回复</button>
+					</view>
+				</pop-view>
+			</view>
+			<filtertab :requestType="'3'" @pageScrollHeight="pageScrollHeight" :isPageScroll="'1'" @getOrderId="homelistInit"
+			 @selectClassid="getClassid" @selectOrders="getOrders"></filtertab>
+			<block v-if="!!goodsListData && goodsListData.length>0">
+				<view class="goods-list dis-flex flex-x-between flex-warp">
+					<view class="goods-item b-f bor-radius-10upx" v-for="(goodsItem,index) in goodsListData" @click="skipGoods(goodsItem.id,'integral')">
+						<view class="goods-image" :style="{'background-image':'url('+goodsItem.thumb+')'}"></view>
+						<view class="goods-title onelist-hidden f-28 col-3">{{goodsItem.title}}</view>
+						<view class="goods-exchange dis-flex flex-y-center">
+							<view class="goods-inte dis-flex flex-y-center">
+								<image class="inte-price-logo" :src="imgfixUrls + 'integral/integral_logo.png'" mode=""></image>
+								<view class="inteStyle">{{goodsItem.use_credit1}} <text class="f-24">{{subText.credittext}}</text> <text class="plus"  v-if="goodsItem.use_credit2>0">+</text> <text class="goods-price"  v-if="goodsItem.use_credit2>0" c>{{goodsItem.use_credit2}}</text><text class="f-24" v-if="goodsItem.use_credit2>0">元</text></view>
+							</view>
+							<!-- <block v-if="goodsItem.use_credit2>0">
+								<view class="plus">+</view>
+								<view class="goods-price">{{goodsItem.use_credit2}}<text>元</text></view>
+							</block> -->
+						</view>
+						<view class="oldPirce dis-flex flex-x-between flex-y-center">
+							<view class="goods-oldPrice col-9 f-24" style="text-decoration:line-through;">市场价<text>¥{{goodsItem.old_price}}</text></view>
+							<view class="goods-inteBtn t-c f-24">兑换</view>
+						</view>
+					</view>
+				</view>
+				<load-more :isMore="loadingMore"></load-more>
+			</block>
+			<block v-else>
+				<none-mores></none-mores>
+			</block>
+			<view class="page-footer">
+				<TabBars :tabBarAct="0" :pageType="'10'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import popView from '@/components/template/PopManager.vue'
+	import Loadlogo from '@/components/template/loadlogo'
+	import loadMore from '@/components/template/loadmore.vue'
+	import TabBars from '@/components/template/tabBar.vue'
+	import filtertab from "@/components/template/filtertab.vue"
+	import noneMores from '@/components/template/nonemores.vue'
+	export default {
+		data() {
+			return {
+				showTabbar: false,
+				homeInfoData: {},
+				goodsListData: [],
+				total: null,
+				loadlogo: false, //页面是否加载完成,
+				loadingMore: true, //列表加载更多
+				current_page: 1,
+				textList: '',
+				sort_id: null,
+				class_id: null,
+				showCommunity: false,
+				searchInput:''
+			}
+		},
+		onLoad() {
+			this.textList = uni.getStorageSync('TextSubstitution')	
+		},
+		onShow() {
+			uni.setNavigationBarTitle({
+			　　title:this.textList.credittext
+			})
+		},
+		components: {
+			popView,
+			Loadlogo,
+			loadMore,
+			TabBars,
+			filtertab,
+			noneMores
+		},
+		computed: {
+			clienType() {
+				return App.getClientType()
+			},
+			subText() {
+				return uni.getStorageSync('TextSubstitution');
+			}
+		},
+		methods: {
+			openSearch(){
+				// rh
+				this.homelist("", "", 1);
+			},
+			homelistInit(sort) {
+				let _this = this;
+				_this.setData({
+					sort_id: sort
+				});
+				_this.homelist("", sort, 1);
+			},
+			homeInfo() {
+				let _this = this;
+				App._post_form('&p=consumption&do=homeInfo', {}, res => {
+					if (res.errno === 0) {
+						_this.setData({
+							homeInfoData: res.data
+						})
+						_this.homelistInit()
+					}
+				}, (err) => {
+					if (err.data.errno === 1) {
+						App.navigationTo({
+							url: err.data.data.url,
+							navType: 'rediRect'
+						})
+					}
+				}, () => {
+					_this.loadlogo = true;
+				})
+			},
+			homelist(cate_id = "", sort = "", page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						page,
+						sort,
+						cate_id,
+						search:_this.searchInput
+					};
+				App._post_form('&p=consumption&do=homeList', requestData, res => {
+					if (res.errno === 0) {
+						let goodsData = res.data;
+						if (isPage) {
+							if (goodsData.list.length > 0) {
+								_this["goodsListData"].push(...goodsData.list);
+							} else {
+								_this.loadingMore = true;
+							}
+						} else {
+							_this.setData({
+								goodsListData: goodsData.list,
+								total: res.data.total,
+								loadingMore: goodsData.list.length === 0 || _this.current_page === res.data.total
+							})
+						}
+					}
+				}, false, () => {})
+			},
+			/**
+			 * 社群显示
+			 */
+			communityShow() {
+				this.showCommunity = !this.showCommunity;
+			},
+			getClassid(classItem) {
+				let _this = this,
+					{
+						sort_id
+					} = _this;
+				_this.setData({
+					current_page: 1,
+					class_id: classItem.id
+				})
+				_this.homelist(classItem.id, sort_id, 1)
+			},
+			getOrders(sortItem) {
+				let _this = this,
+					{
+						class_id
+					} = _this;
+				_this.setData({
+					current_page: 1,
+					sort_id: sortItem.val
+				})
+				_this.homelist(class_id, sortItem.val, 1)
+			},
+			pageScrollHeight(isshowTabbar) {
+				if (isshowTabbar === '1') {
+					uni.pageScrollTo({
+						scrollTop: 190
+					})
+				} else {
+					uni.pageScrollTo({
+						scrollTop: 0
+					})
+				}
+			},
+			skipGoods(goods_id, goods_type) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/goods/index?goods_id=' + goods_id + '&goodsType=' + goods_type
+				})
+			},
+			navgateTolink(url) {
+				App.navigationTo({
+					url
+				})
+			},
+			//加载更多
+			ReachBottom(e) {
+				let _this = this,
+					currentType = _this.currentType;
+				if (_this.current_page >= _this.total) {
+					_this.loadingMore = true;
+					return false;
+				}
+				_this.homelist(_this.class_id, _this.sort_id, ++_this.current_page, true)
+			}
+		},
+		mounted() {
+			this.homeInfo()
+		},
+		onReachBottom() {
+			this.ReachBottom()
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "../../../../pages/subPages/goods/index.css";
+
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.header {
+		height: 440upx;
+		background-size: 100% 314upx;
+		background-repeat: no-repeat;
+		padding: 30upx;
+
+		.header-title {
+			padding: 0 6upx;
+		}
+
+		.inte-logo {
+			width: 50upx;
+			height: 50upx;
+			margin: 0 16upx;
+		}
+
+		.inte-bg {
+			height: 280upx;
+			background-size: 100% 280upx;
+			background-repeat: no-repeat;
+			border-radius: 10upx;
+		}
+	}
+
+	.container {
+		.seach{
+			padding: 0upx 30upx;
+			background-color: #FFFFFF;
+			border-radius: 60upx;
+			.input{
+				height: 70upx;
+				line-height: 70upx;
+				border-radius: 60upx;
+				background-color: #FFFFFF;
+				padding: 0 30upx;
+				font-size: 28upx;
+			}
+		}
+		.goods-list {
+			padding: 24upx 30upx;
+
+			.goods-item {
+				width: 290upx;
+				padding: 20upx;
+				margin-bottom: 20upx;
+
+				.goods-image {
+					width: 100%;
+					height: 290upx;
+					background-repeat: no-repeat;
+					background-position: center;
+					background-size: 100% 290upx;
+				}
+
+				.goods-exchange {
+					.goods-inte {
+						.inteStyle {
+							color: #FF4444;
+							font-size: 32upx;
+						}
+
+						.inte-price-logo {
+							display: block;
+							width: 30upx;
+							height: 30upx;
+							margin-right: 10upx;
+							flex-shrink: 0;
+						}
+					}
+
+					.plus {
+						color: #FF4444;
+					}
+
+					.goods-price {
+						color: #FF4444;
+						font-size: 32upx;
+
+						&>text {
+							font-size: 24upx;
+						}
+					}
+				}
+
+				.oldPirce {
+					.goods-oldPrice {
+						&>text {
+							text-decoration: line-through;
+						}
+					}
+
+					.goods-inteBtn {
+						width: 87upx;
+						height: 40upx;
+						line-height: 40upx;
+						border: 1px solid rgba(255, 68, 68, 1);
+						border-radius: 20upx;
+						color: #FF4444;
+					}
+				}
+			}
+		}
+	}
+
+	.page-footer {
+		padding: 70upx 0;
+	}
+</style>
diff --git a/pages/subPages/live/index.vue b/pages/subPages/live/index.vue
new file mode 100644
index 0000000..be9000e
--- /dev/null
+++ b/pages/subPages/live/index.vue
@@ -0,0 +1,113 @@
+<template>
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<!-- #ifdef H5 -->
+			<view class="qurl">
+				<view class="f-30" style="padding: 30upx 0 ;">
+					应官方要求,直播功能目前只支持小程序平台,长按识别二维码前往小程序端观看直播。
+				</view>
+				<view   style="box-shadow: 0upx 0upx 35upx #333333;width: 600upx;height: 600upx;">
+					<image :src="live.qrimg" mode="" style="width: 600upx;height: 600upx;border-radius: 10upx;"></image>
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<block v-if="!!liveList && liveList.length>0">
+							<live-componets :liveList="liveList"></live-componets>
+							<view style="padding-bottom: 10px; background-color: #F8F8F8;">
+								<load-more :isMore="loadingMore"></load-more>
+							</view>
+						</block>
+						<block v-else>
+							<nonemores v-if="loadingMore"></nonemores>
+						</block>
+			<!-- #endif -->
+		</block>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import liveComponets from "@/components/template/live.vue"
+	import loadMore from '@/components/template/loadmore.vue'
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import nonemores from '@/components/template/nonemores';
+	export default {
+		data() {
+			return {
+				curpage: 1,
+				liveList: [],
+				loadingMore: false,
+				loadlogo: false,
+				live:{},
+				count:0
+			}
+		},
+		props: {
+
+		},
+		components: {
+			liveComponets,
+			loadMore,
+			Loadlogo,
+			nonemores
+		},
+		computed: {
+
+		},
+		methods: {
+			gonewpage(){
+				uni.navigateTo({
+					url:'/pages/subPages/live/newLive'
+				})
+			},
+			getLivelist(page = 1, isload = false) {
+				let _this = this,
+					requestData = {
+						page
+					};
+				App._post_form('&p=wxapp&do=liveList', requestData, res => {
+					let wxliveList = res.data.list;
+					_this.live = res.data;
+					if (isload) {
+						if (wxliveList.length > 0) {
+							_this["liveList"].push(...wxliveList);
+						} else {
+							_this.loadingMore = res.data.total_page;
+						}
+					} else {
+						_this["liveList"] = wxliveList;
+						_this.count = res.data.total_page;
+						_this.loadingMore = false;
+						_this.loadlogo = true;
+					};
+					_this.loadingMore = true;
+					_this.loadlogo = true;
+				})
+			}
+		},
+		onLoad() {
+			this.getLivelist()
+		},
+		onReachBottom() {
+			let _this = this;
+			if(_this.count == _this.curpage) return;
+			_this.getLivelist(++_this.curpage, true);
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F8F8;
+	}
+	.qurl{
+		position: absolute;
+		left: 50%;
+		top: 20%;
+		transform: translate(-50%);
+		
+	}
+</style>
diff --git a/pages/subPages/live/newLive.vue b/pages/subPages/live/newLive.vue
new file mode 100644
index 0000000..91c7b1a
--- /dev/null
+++ b/pages/subPages/live/newLive.vue
@@ -0,0 +1,420 @@
+<template>
+	<view :class="(listlength < 3)?'newLive':'oldlive'" :style="{backgroundColor: bgc,paddingBottom:'10px'}">
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<!-- #ifndef H5 -->
+			<swiper class="swiper" :indicator-dots="true" :autoplay="true" :interval="interval" :duration="duration" style="margin: 0upx 10upx 10upx 10upx;">
+				<swiper-item
+					v-for="(item, index) in swiperList"
+					:key="index"
+					style="border-radius: 15upx;border: 5upx solid #FFFFFF;box-sizing: border-box;"
+					@click.stop="goimgUrl(item)"
+				>
+					<image :src="item.thumb" mode="aspectFill" style="width: 100%; height: 100%;"></image>
+				</swiper-item>
+			</swiper>
+			<view  style="margin: 10upx 30upx 30upx 30upx;">
+				<view class="dis-flex b-f" style="height: 300upx;margin-bottom: 20upx;border-radius: 10upx;" v-for="(items, indexs) in liveList" :key="indexs" @click.stop="golive(items)">
+					<view  style="flex: 0.45;position: relative;">
+						<!-- <view class="titleImg" :style="{background: 'url('+ items.cover_img +') no-repeat'}">
+							
+						</view> -->
+						<image :src="items.cover_img" style="width: 100%;height: 100%;border-radius: 10upx 0 0 10upx;" mode="aspectFill"></image>
+						<view class="advance dis-flex" v-if="item.is_playback == 1">
+							<view class="f-22 bgcr" style="border-radius: 60upx;padding: 5upx 10upx;">
+								直播回看
+								<text class="iconfont icon-playfill" style="font-size: 22upx;"></text></view>
+						</view>
+						<view class="advance dis-flex" v-else-if="items.live_status == 103  || items.live_status == 102">
+							<view class="f-22" style="border-radius: 60upx;background-color: #2889FC;padding: 5upx 10upx;" v-if="items.newtime !== '已结束'">预告</view>
+							<view class="f-20" style="padding: 5upx 10upx;">{{ items.newtime }}</view>
+						</view>
+						<view class="advance dis-flex" v-else-if="items.live_status == 101">
+							<view class="f-22" style="border-radius: 60upx;background-color: #7ACF38;padding: 5upx 10upx;">正在直播</view>
+						</view>
+						
+						<view class="advance dis-flex" v-else-if="items.live_status == 104 || items.live_status == 105 || items.live_status == 106 || items.live_status == 107">
+							<view class="f-22 bgcr" style="border-radius: 60upx;padding: 5upx 10upx;">
+								{{(items.live_status == 104)?'禁播':(items.live_status == 105)?'暂停':(items.live_status == 106)?'异常':(items.live_status == 107)?'已过期':''}}</view>
+						</view>
+					</view>
+					<view  style="flex: 0.55;padding: 20upx; position: relative;">
+						<view class="f-30" style="padding-bottom: 20upx;">{{ items.name }}</view>
+						<view class="dis-flex">
+							<image :src="items.share_img" mode="aspectFill" style="width: 40upx;height: 40upx;border-radius: 50%;"></image>
+							<view class="f-24" style="color: #999999;line-height: 40upx;height: 40upx;padding-left: 20upx;">{{ items.anchor_name }}</view>
+						</view>
+						<view class="dis-flex" style="position: absolute;bottom: 10upx;left: 10upx;">
+							<view
+								
+								style="border-radius: 10upx;padding-left: 10upx;position: relative;"
+								v-for="(item, index) in items.goods"
+								:key="index"
+								@click.stop="goodsUrl(item)"
+								v-if="index < 3"
+							>
+								<image :src="item.cover_img" mode="aspectFill" style="width: 100upx;height: 100upx;border-radius: 7upx;"></image>
+								<view class="UpshowNums f-w" v-if="(index !== 2 && items.goods.length > 3) || (items.goods.length <= 3) ">¥{{ item.price }}</view>
+								<view class="UpshowNum" v-if="index == 2 && items.goods.length > 3" @click.stop="numgolive(items)">{{ items.goodsnum - 3 }}件</view>
+							</view>
+						</view>
+					</view>
+					
+				</view>
+				<load-more :isMore="loadingMore" v-if="!loadingMore"></load-more>
+			</view>
+			<!-- 视频 -->
+			<PopManager :show="videoshow" @clickmask="videoshow = false" type="center">
+				<view  v-if="videoshow" style="width: 100vw;height: 100vh;position: relative;">
+					<video id="myvideo" :src="videolint[videoindex].media_url" @fullscreenchange="videoControl"  style="width: 100%;height: 100%;"
+					  @click.stop="" :show-fullscreen-btn="false" autoplay ></video>
+					 <view  style="position: absolute;left: 30upx;top: 30upx;color: #ffffff;padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(255,255,255,0.3);" @click="cloce">
+					 	<text class="iconfont icon-roundleftfill" style="font-size: 36upx;"></text>
+						<text class="f-36">返回</text>
+					 </view>
+					 <view class="dis-flex" style="width: 100%;position: absolute;top: 50%;transform: translateY(-50%);">
+						 <view class="flex-box ">
+							 <view  v-if="videoindex == 0 && videopage == 1">
+							 	
+							 </view>
+						 	<view class="dis-il-block t-c col-f f-40" style="border-radius: 0 60upx 60upx 0;padding: 20upx;" 
+							v-else
+							@click="topvideo">
+						 		<text class="iconfont icon-back"></text>
+						 	</view>
+						 </view>
+					 	<view class="flex-box">
+							<view  v-if="videoindex == (videolint.length - 1) && videopage == videototal">
+								
+							</view>
+					 		<view class="dis-il-block t-c col-f f-40" style="border-radius: 60upx 0 0 60upx;float: right;padding: 20upx;" 
+							v-else
+							@click="downvideo">
+					 			<text class="iconfont icon-right"></text>
+					 		</view>
+					 	</view>
+						
+					 </view>
+				</view>
+			</PopManager>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view class="qurl">
+				<view class="f-30" style="padding: 30upx 0 ;">
+					应官方要求,直播功能目前只支持小程序平台,长按识别二维码前往小程序端观看直播。
+				</view>
+				<view   style="box-shadow: 0upx 0upx 35upx #333333;width: 600upx;height: 600upx;">
+					<image :src="qrimg" mode="" style="width: 600upx;height: 600upx;border-radius: 10upx;"></image>
+				</view>
+			</view>
+			<!-- #endif -->
+		</block>
+		
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import PopManager from '@/components/template/PopManager';
+export default {
+	components: {
+		loadMore,
+		Loadlogo,
+		PopManager
+	},
+	data() {
+		return {
+			loadingMore: false,
+			loadlogo: false,
+			// 轮播图
+			swiperList: [
+				{
+					thumb: ''
+				}
+			],
+			duration: 500, //滑动时间
+			interval: 2000, //间隔时间
+			page: 1,
+			liveList: [],
+			bgc: '',
+			count: 100,
+			outtime:null,
+			oneTime:true,
+			qrimg:'',
+			listlength:0,
+			videoshow:false,
+			videoContext:null,
+			videolint:[],
+			videoindex:0,
+			videopage:1,
+			videototal:0,
+			roomid:0
+		};
+	},
+	onLoad() {
+		console.log('onLoad');
+		// this.getliveList();
+	},
+	onReady(){
+		// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+		this.videoContext = uni.createVideoContext('myvideo');
+		this.videoContext.requestFullScreen();
+	},
+	onShow() {
+		console.log('onShow');
+		if(this.oneTime){
+			this.getliveList();
+			this.oneTime = false;
+			return
+		}else if(this.page == 1){
+			this.getliveList();
+		}
+		this.timesout();
+	},
+	methods: {
+		cloce(){
+			this.videoshow = false;
+			this.videopage = 1;
+			this.videoindex = 0;
+		},
+		downvideo(){
+			if(this.videoindex == this.videolint.length - 1){
+				if(this.videototal == this.videopage) return;
+				this.videopage++;
+				this.videoindex = 0;
+				this.getpagelive()
+			}else{
+				this.videoindex++;
+			}
+		},
+		topvideo(){
+			if(this.videoindex == 0){
+				// if(this.videopage == 1) return;
+				this.videopage--;
+				this.videoindex = 0;
+				this.getpagelive();
+			}else{
+				this.videoindex--;
+			}
+			
+		},
+		getpagelive(){
+			let _this = this,
+				requestData = {
+					page:this.videopage,
+					room_id:this.roomid
+				};
+			App._post_form('&p=wxapp&do=playBack', requestData, res => {
+				this.videolint  = res.data.live_replay;
+			}) 
+		},
+		videoControl(e){
+			console.log(e)
+			if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+				this.videoContext.play();
+			}else{
+				//停止播放
+				this.videoContext.pause();
+			}
+		},
+		numgolive(item){
+			App.navigationTo({
+				url: `pages/subPages/livePlayer/livePlayer?id=${item.roomid}`
+			})
+		},
+		golive(item){
+			if(item.live_status == 103){
+				let _this = this,
+					requestData = {
+						page:this.videopage,
+						room_id:item.roomid
+					};
+					this.roomid = item.roomid;
+				App._post_form('&p=wxapp&do=playBack', requestData, res => {
+					this.videototal = res.data.total_page;
+					this.videolint  = res.data.live_replay;
+				}) 
+				this.videoshow = true;
+				
+				    // 获取当前视频id
+				    // let currentId = e.currentTarget.dataset.id
+				    // uni.createVideoContext获取视频上下文对象
+					this.videoContext.requestFullScreen({
+						direction:0
+					})
+				   
+			}else{
+				App.navigationTo({
+					url: `pages/subPages/livePlayer/livePlayer?id=${item.roomid}`
+				})
+			}
+				
+		},
+		//商品图片的跳转
+		goodsUrl(item) {
+			console.log(item.url)
+			clearInterval(this.outtime);
+			App.navigationTo({
+				url: item.url
+			});
+		},
+		// 轮播图路由跳转
+		goimgUrl(item) {
+			clearInterval(this.outtime);
+			
+				App.navigationTo({
+								url: item.link
+							});
+			
+			
+		},
+		timesout(){
+			this.outtime =  setInterval(() => {
+				let agoTimer = new Date().getTime();
+				this.liveList.map((item, index) => {
+					let newTimer = item.starttime;
+					//获取之间的时间戳差值
+					let useDay =  newTimer - (agoTimer/1000);
+					//对差值进行换算，得到相应的单位
+					let day = Math.floor(useDay / 86400);
+					let hour = Math.floor((useDay % 86400) / 3600);
+					let minute = Math.floor(((useDay % 86400) % 3600) / 60);
+					let second = Math.floor(((useDay % 86400) % 3600) % 60);
+					this.$set(item,'newtime', (day>0?day + '天':'') + hour + '时' + minute + '分' + second + '秒');
+					if(useDay < 0){
+						this.$set(item,'newtime','已结束');
+						// clearInterval(this.outtime);
+					}
+					console.log(item.newtime);
+				});
+			}, 1000);
+		},
+		getliveList(flag = false) {
+			App._post_form(`&p=wxapp&do=newLiveList&page=${this.page}`, {}, res => {
+				console.log(res);
+				//#ifdef H5
+				this.qrimg = res.data.qrimg;
+				//#endif
+				//#ifndef H5
+				if (flag) {
+					this.liveList = this.liveList.concat(res.data.list);
+				} else {
+					this.swiperList = res.data.advs;
+					this.bgc = res.data.bgc;
+					this.liveList = res.data.list;
+					// this.liveList[0].goods.push(this.liveList[0].goods[0]);
+					console.log(this.liveList,this.liveList.length)
+					if (this.count == false) {
+						uni.showToast({
+							icon: 'none',
+							title: '刷新成功'
+						});
+					}
+					this.count = 100;
+				};
+				this.listlength = this.liveList.length;
+				if(res.data.list.length !== 0){
+					clearInterval(this.outtime);
+					this.timesout();
+				}
+				
+				//#endif
+				this.loadlogo = true;
+				this.loadingMore = true;
+			});
+		}
+	},
+	onHide() {
+		console.log('onHide');
+		clearInterval(this.outtime);
+	},
+	onUnload() {
+		console.log('onUnload');
+		clearInterval(this.outtime);
+	},
+	onPullDownRefresh: function() {
+		this.page = 1;
+		this.count = false;
+		this.getliveList();
+	},
+	// 页面上拉触底事件的处理函数
+	onReachBottom: function() {
+		console.log(this.page,this.count)
+		this.loadingMore = false;
+		
+		if (this.page == this.count) {
+			this.loadingMore = true;
+		} else {
+			this.page++;
+			this.getliveList(true);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bgcr{
+	background: -webkit-linear-gradient(right, #999999 , #999999); /* Safari 5.1 - 6.0 */
+	            background: -o-linear-gradient(right, #999999, #999999); /* Opera 11.1 - 12.0 */
+	            background: -moz-linear-gradient(right, #999999, #999999); /* Firefox 3.6 - 15 */
+	            background: linear-gradient(right, #999999 , #999999); /* 标准的语法（必须放在最后） */
+}
+.newLive{
+	height: 100vh;
+	overflow: auto;
+	padding-bottom: 20upx;
+}
+.qurl{
+		position: absolute;
+		left: 50%;
+		top: 20%;
+		transform: translate(-50%);
+		
+	}
+.UpshowNum {
+	height: 100upx;
+	font-size: 24upx;
+	text-align: center;
+	line-height: 100upx;
+	width: 100upx;
+	position: absolute;
+	left: 10upx;
+	border-radius: 7upx;
+	color: #ffffff;
+	top: 0;
+	z-index: 100;
+	background-color: rgba(0, 0, 0, 0.5);
+}
+.UpshowNums {
+	height: 100upx;
+	font-size: 18upx;
+	text-align: left;
+	line-height: 150upx;
+	width: 100upx;
+	position: absolute;
+	left: 20upx;
+	border-radius: 7upx;
+	color: rgba(0,0,0,0.5 );
+	top: 0;
+	z-index: 100;
+}
+.advance {
+	position: absolute;
+	font-size: 24upx;
+	color: #ffffff;
+	left: 20upx;
+	top: 20upx;
+	background-color: rgba(0, 0, 0, 0.5);
+	border-radius: 60upx;
+}
+.titleImg{
+	width: 100%;
+	// background: url(../../../static/chooseCade/BG.png) no-repeat;
+	height: 100%;
+	border-radius: 10upx 0 0 10upx;
+	background-size: 150upx 150upx;
+}
+</style>
diff --git a/pages/subPages/liveBack/liveBack.vue b/pages/subPages/liveBack/liveBack.vue
new file mode 100644
index 0000000..a831887
--- /dev/null
+++ b/pages/subPages/liveBack/liveBack.vue
@@ -0,0 +1,97 @@
+<template>
+	<!-- 回看 -->
+	<view class="content">
+		<far-bottom></far-bottom>
+		<video class="videoBack" :src="viedoBack" controls autoplay='true' page-gesture='true'></video>
+		<view class="on">
+			<view class="anchorName f-28">
+				{{anchor_name}}
+			</view>
+			<view class="name f-24">
+				{{name}}
+			</view>
+		</view>
+	    <view class="detail">
+	    	<view class="backDetail f-28">回看详情</view>
+			<view class="imgC" :style="{'background-image':'url('+coverImg+')'}" @click="lastSee">
+			</view>
+	    </view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	export default {
+		data() {
+			return {
+				viedoBack:'',
+				name:'',
+				anchor_name:"",
+				coverImg:'',
+				id:''
+			}
+		},
+		methods: {
+		   backSee(roomid){
+			  let _this = this,
+			  	requestData = {
+			  		page:1,
+			  		page_index:10,
+			  		room_id:roomid
+			  	};
+			  App._post_form('&p=wxapp&do=playBack', requestData, res => {
+				  console.log(res,'-----------------')
+			  	 this.viedoBack = res.data.live_replay[1].media_url;
+			  }) 
+		   },
+		   lastSee(){
+			   let id = this.id;
+			   this.backSee(id);
+		   }
+		},
+		onLoad(e) {
+	       this.backSee(e.id);
+		   this.id = e.id;
+		   this.name = e.name;
+		   this.anchor_name = e.anchor_name;
+		   this.coverImg = uni.getStorageSync('coverImg')
+		}
+	}
+
+</script>
+
+<style lang="less" scoped>
+	.content {
+		width: 100%;
+		height: 100%;
+		.videoBack {
+			width: 100%;
+			height: 350upx;
+		}
+		.detail {
+			margin-top:30upx;
+			margin-left:15upx;
+			.imgC {
+			margin-top:10upx;
+				width: 334upx;
+				height: 334upx;
+				border-radius: 10upx 10upx 0upx 10upx;
+				background-repeat: no-repeat;
+				background-size: cover;
+				background-position: center;
+			}
+		}
+		.on {
+			display: flex;
+			flex-wrap: wrap;
+			.anchorName {
+				margin-left: 10upx;
+			}
+			.name {
+				margin-left: 30upx;
+				margin-top: 5upx;
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/subPages/livePlayer/livePlayer.vue b/pages/subPages/livePlayer/livePlayer.vue
new file mode 100644
index 0000000..02d5e97
--- /dev/null
+++ b/pages/subPages/livePlayer/livePlayer.vue
@@ -0,0 +1,31 @@
+<template>
+	<view>
+		<subscribe :room-id="room_id"></subscribe>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				room_id: 0
+			}
+		},
+		onLoad: function(e) {
+			let _this = this;
+			_this.room_id = e.id
+			if (e.id != 0) {
+				uni.redirectTo({
+				    url: `plugin-private://wx2b03c6e691cd7370/pages/live-player-plugin?room_id=${e.id}`
+				});
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+page{width:100%; height:100vh; display:flex; flex-direction:column;}
+</style>
diff --git a/pages/subPages/merchant/bindingClerk/bindingClerk.vue b/pages/subPages/merchant/bindingClerk/bindingClerk.vue
new file mode 100644
index 0000000..13b0fd1
--- /dev/null
+++ b/pages/subPages/merchant/bindingClerk/bindingClerk.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="bindingClerk">
+		<loadlogo v-if="!loadlogo" />
+		<view class="binding-title">
+			<swiper
+				class="swiper"
+				indicator-color="rgba(255,255,255,.4)"
+				indicator-active-color="rgba(255,255,255,.85)"
+				:indicator-dots="true"
+				:autoplay="true"
+				:interval="2000"
+				:duration="500"
+			>
+				<swiper-item v-for="(item, index) in storeData.adv" :key="index" style="border-radius: 15upx;"><image :src="item"></image></swiper-item>
+			</swiper>
+		</view>
+		<view class="binding-content">
+			<view class="abbox">
+				<view class="storeName">
+					<view class="f-36 f-w col-3">{{storeData.storename}}</view>
+					<view class="f-24 col-9" style="padding-top: 20upx;">{{storeData.address}}</view>
+				</view>
+				<view class="user">
+					<view class="f-36 f-w col-3" style="padding-bottom: 30upx;">绑定信息</view>
+					<view class="dis-flex inputbox">
+						<view class="input-title t-r">姓名</view>
+						<view class="input-content"><input class="input" adjust-position="false" placeholder="请输入真实姓名" v-model="name" type="text" value="" /></view>
+					</view>
+					<view class="dis-flex inputbox" style="margin-top: 30upx;">
+						<view class="input-title t-r">手机号</view>
+						<view class="input-content"><input class="input" adjust-position="false" maxlength="11" placeholder="请输入手机联系方式" v-model="phone" type="number" value="" /></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="submit-btn" @click="submit">提交绑定信息</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+export default {
+	data() {
+		return {
+			sid: '',
+			storeData: {},
+			name:'',
+			phone:'',
+			loadlogo:false
+		};
+	},
+	components:{
+		Loadlogo
+	},
+	onLoad(e) {
+		this.sid = e.sid;
+		this.getPageContent();
+	},
+	methods: {
+		getPageContent() {
+			setTimeout(()=>{
+				this.loadlogo = true;
+			},2000)
+			App._post_form('&p=store&do=storeAdminApply', { sid: this.sid }, res => {
+				console.log(res);
+				this.storeData = res.data;
+				this.loadlogo = true;
+			});
+		},
+		submit(){
+			App._post_form('&p=store&do=adminApplyApi', 
+			{ sid: this.sid ,realname:this.name,mobile:this.phone},
+			res => {
+				console.log(res);
+				uni.showToast({
+					title:'操作成功'
+				});
+				App.navigationTo({
+					url: 'pages/mainPages/index/index'
+				});
+			});
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.bindingClerk {
+	height: 100vh;
+	.binding-title {
+		.swiper {
+			width: 750upx;
+			height: 422upx;
+			image {
+				width: 750upx;
+				height: 422upx;
+			}
+		}
+	}
+	.binding-content {
+		position: relative;
+		transform: translateY(-80upx);
+		.abbox {
+			.storeName {
+				padding: 30upx;
+				margin: 0 30upx 20upx;
+				background-color: #ffffff;
+				border-radius: 20upx;
+			}
+			.user {
+				padding: 30upx;
+				margin: 0 30upx;
+				background-color: #ffffff;
+				border-radius: 20upx;
+				.inputbox {
+					background-color: #f8f8f8;
+					border-radius: 10upx;
+					.input-title {
+						height: 100upx;
+						line-height: 100upx;
+						width: 110upx;
+						font-size: 28upx;
+						padding-right: 30upx;
+					}
+					.input-content {
+						.input {
+							height: 100upx;
+							line-height: 100upx;
+							font-size: 28upx;
+						}
+					}
+				}
+			}
+		}
+	}
+	.submit-btn {
+		width: 690upx;
+		height: 100upx;
+		border-radius: 20upx;
+		line-height: 100upx;
+		color: #ffffff;
+		text-align: center;
+		background-color: #3388ff;
+		font-size: 32upx;
+		margin: auto;
+		margin-top: 300upx;
+		// position: absolute;
+		// bottom: 30upx;
+		// left: 30upx;
+	}
+}
+</style>
diff --git a/pages/subPages/merchant/dynamicList/dynamicList.vue b/pages/subPages/merchant/dynamicList/dynamicList.vue
new file mode 100644
index 0000000..9287255
--- /dev/null
+++ b/pages/subPages/merchant/dynamicList/dynamicList.vue
@@ -0,0 +1,365 @@
+<template>
+	<view>
+		<view class="dynamicList">
+			<far-bottom></far-bottom>
+			<scroll-view :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="load" :lower-threshold="0">
+				<nonemores v-if="total == 0"></nonemores>
+				<view class="mbPackage" v-if="total != 0">
+					<!-- 循环模板 -->
+					<view class="listMb" v-for="(item, index) in dynamicList">
+						<view class="listMbPackage">
+							<view class="listMbTitle">
+								<view class="titleLeft">
+									<view>
+										<image :src="item.logo" />
+									</view>
+									<span>{{ item.storename }}</span>
+								</view>
+								<view class="titleRight">
+									<span>{{ statusList[item.status] }}</span>
+								</view>
+							</view>
+							<view :class="textList.indexOf(index) !== -1 ? 'fullText' : 'postListTextMain'">
+								<!-- <span>{{ item.content }}</span> -->
+								<view v-html="item.content"></view>
+							</view>
+							<view class="qw" @click.stop="fullText(index)" v-if="item.content.length > 50">
+								<span>{{ textList.indexOf(index) !== -1 ? '收起' : '全文' }}</span>
+							</view>
+							<view class="imgView">
+								<block v-for="(items, indexs) in item.imgs">
+									<image :src="items"></image>
+								</block>
+							</view>
+							<view class="listMbFoot">
+								<span>{{ item.datetime }}</span>
+								<view @click="deletMb(item)"><span>删除</span></view>
+							</view>
+						</view>
+					</view>
+					<!-- 循环模板 -->
+				</view>
+				<view class="tips" v-if="total != 0">
+					<loadmore :isMore="isMore"></loadmore>
+				</view>
+			</scroll-view>
+			<!--  #ifdef  MP-WEIXIN -->
+			<view class="addButtom" @click="goSend" v-if="hideadd == 0"><span>发布动态</span></view>
+			<!-- #endif -->
+			<!--  #ifdef H5 -->
+			<view class="addButtom" @click="goSend" v-if="hideadd === 0"><span>发布动态</span></view>
+			<!-- #endif -->
+			
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo';
+	import nonemores from '@/components/template/nonemores.vue';
+	import loadmore from '@/components/template/loadmore.vue';
+	// import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				textList: [],
+				statusList: ['待审核', '待推送', '已推送', '被驳回'],
+				scrollHeight: null,
+				storeid: null,
+				page: 1,
+				dynamicList: [],
+				total: null,
+				scdpText: '',
+				textTips: '全文',
+				isMore: true,
+				hideadd: ""
+			};
+		},
+		components: {
+			Loadlogo,
+			nonemores,
+			loadmore
+			// TabBars
+		},
+		computed: {},
+		onShow(e) {
+			let _this = this;
+			_this.init();
+		},
+		mounted() {},
+		methods: {
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight + 'px';
+					}
+				});
+				// _this.getStoreDynamic();
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getStoreDynamic(res.data);
+					}
+				});
+
+			},
+			// 展开全文
+			fullText(index) {
+				let _this = this;
+				if (_this.textList.indexOf(index) == -1) {
+					_this.textList.push(index);
+					_this.textTips = '收起';
+				} else {
+					_this.textTips = '展开全文';
+					for (let i = 0; i < _this.textList.length; i++) {
+						if (_this.textList[i] == index) {
+							_this.textList.splice(i, 1);
+						}
+					}
+				}
+			},
+			load() {
+				let _this = this;
+				if (_this.page == _this.total) {
+					_this.isMore = true;
+				} else {
+					_this.isMore = false;
+					_this.page++;
+					let data = {
+						storeid: _this.storeid,
+						page: _this.page
+					};
+					App._post_form('&p=store&do=dynamicList', data, res => {
+						_this.dynamicList = [..._this.dynamicList, ...res.data.list];
+						_this.total = res.data.total;
+						_this.isMore = true;
+					});
+				}
+			},
+			goSend() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/merchant/sendDynamic/sendDynamic'
+				});
+			},
+			getStoreDynamic(storeid = '') {
+				let _this = this;
+				_this.isMore = false;
+				_this.page = 1;
+				let data = {
+					storeid: _this.storeid || storeid,
+					page: _this.page
+				};
+				App._post_form('&p=store&do=dynamicList', data, res => {
+					_this.dynamicList = res.data.list;
+					_this.total = res.data.total;
+					_this.hideadd = res.data.hideadd;
+					_this.isMore = true;
+				});
+			},
+
+			deletMb(item) {
+				let _this = this;
+				uni.showModal({
+					title: '提示',
+					content: '确认删除，数据将无法恢复',
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								id: item.id
+							};
+							App._post_form('&p=store&do=deleteDynamic', data, res => {
+								for (let i = 0; i < _this.dynamicList.length; i++) {
+									if (item.id == _this.dynamicList[i].id) {
+										_this.dynamicList.splice(i, 1);
+									}
+								}
+								uni.showToast({
+									icon: 'none',
+									title: '删除成功',
+									duration: 2000
+								});
+							});
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.tips {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			color: black;
+		}
+	}
+
+	.addButtom {
+		left: 263upx;
+		position: fixed;
+		bottom: 20upx;
+		text-align: center;
+		width: 224upx;
+		height: 90upx;
+		background: rgba(51, 136, 255, 1);
+		box-shadow: 0px 2upx 10upx 0px rgba(51, 136, 255, 0.4);
+		border-radius: 45upx;
+
+		>span {
+			line-height: 90upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.listMbFoot {
+		margin-top: 20upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			line-height: 37upx;
+			font-size: 24upx;
+			color: rgba(153, 153, 153, 1);
+		}
+
+		>view {
+			display: inline-block;
+			width: 76upx;
+			height: 37upx;
+			background: rgba(51, 136, 255, 1);
+			border-radius: 4upx;
+			text-align: center;
+
+			>span {
+				line-height: 37upx;
+				font-size: 24upx;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	.imgView {
+		margin-top: 20upx;
+
+		>image {
+			margin: 0 10upx 10upx 0;
+			width: 202upx;
+			height: 202upx;
+		}
+	}
+
+	.qw {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 28upx;
+
+			color: rgba(51, 136, 255, 1);
+		}
+	}
+
+	.listMbText {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 26upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.titleLeft {
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+			width: 54upx;
+			height: 54upx;
+			border-radius: 50%;
+			overflow: hidden;
+
+			>image {
+				width: 54upx;
+				height: 54upx;
+			}
+		}
+
+		>span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.titleRight {
+		>span {
+			line-height: 54upx;
+			font-size: 24upx;
+
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+
+	.listMbTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+		}
+	}
+
+	page {
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	.mbPackage {
+		padding: 10upx 30upx 30upx 30upx;
+	}
+
+	.listMb {
+		margin-top: 20upx;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.listMbPackage {
+		padding: 30upx;
+	}
+
+	.fullText {
+		word-wrap: break-word;
+		font-size: 26upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.postListTextMain {
+		font-size: 26upx;
+
+		color: rgba(51, 51, 51, 1);
+		display: -webkit-box;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		word-wrap: break-word;
+		white-space: normal !important;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantCash/merchantCash.vue b/pages/subPages/merchant/merchantCash/merchantCash.vue
new file mode 100644
index 0000000..21aa460
--- /dev/null
+++ b/pages/subPages/merchant/merchantCash/merchantCash.vue
@@ -0,0 +1,575 @@
+<template>
+	<view class="cash">
+		<!-- 提现输入框 -->
+		<far-bottom></far-bottom>
+		<view class="cashInput">
+			<view class="cashInputPackage">
+				<view><span>提现金额</span></view>
+				<view>
+					<span>¥</span>
+					<input placeholder="请输入金额" v-model="settlementmoney.money" />
+				</view>
+				<view>
+					<block class="dis-flex">
+						<span style="line-height: 20upx;font-size: 23upx;">可提现(元)：{{ creditCashInfo.nowmoney}}</span>
+						<span style="line-height: 20upx;font-size: 23upx;">预留金额(元)：{{ creditCashInfo.reservemoney }}</span>
+					</block>
+
+					<view @click="allWithdrawal(0)"><span>全部提现</span></view>
+				</view>
+				<view style="color: #FF4444;font-size: 22upx;">提现金额{{ creditCashInfo.lowsetmoney }}元起, 
+				<text v-if="creditCashInfo.maxsetmoney !== 999999999">本次最高提现金额{{creditCashInfo.maxsetmoney}}元</text> 提现手续费{{ creditCashInfo.syssalepercent }}%</view>
+			</view>
+		</view>
+		<!-- 提现输入框 -->
+
+		<!-- 选择支付方式 -->
+		<view class="checkPayType">
+			<view class="checkPayTypePackage">
+				<view><span>提现到</span></view>
+				<!-- 微信 -->
+				<view class="type" v-if="creditCashInfo.wechatstatus == 1" @click="cashtype = 2">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/wechatPay.svg'" />
+							<span>微信零钱</span>
+						</view>
+						<view class="checked" v-if="cashtype == 2">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+				</view>
+				<!-- 微信 -->
+				<!-- 渠道1 -->
+				<view class="type" v-if="creditCashInfo.alipaystatus == 1" @click="cashtype = 1">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/payPal.svg'" />
+							<span>{{examineing==0?'支付宝':'渠道1'}}</span>
+						</view>
+						<view class="checked" v-if="cashtype == 1">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+					<view class="yhkInput" v-if="cashtype == 1">
+						<view>
+							<span>真实姓名</span>
+							<input placeholder="请填写真实姓名" v-model="creditCashInfo.realname" />
+						</view>
+						<view>
+							<span>{{examineing==0?'支付宝':'渠道1'}}</span>
+							<input :placeholder="examineing==0?'请输入支付宝账号':'请输入渠道1账号'" v-model="creditCashInfo.alipay" />
+						</view>
+					</view>
+				</view>
+				<!-- 渠道1 -->
+				<!-- 渠道2 -->
+				<view class="type" v-if="creditCashInfo.bankcardstatus == 1" @click="cashtype = 3">
+					<view class="typePackage">
+						<view>
+							<image :src="imgfixUrls + 'merchant/yhk.png'" />
+							<span>{{examineing==0?'银行':'渠道2'}}账户</span>
+						</view>
+						<view class="checked" v-if="cashtype == 3">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+						</view>
+						<view v-else></view>
+					</view>
+					<view class="yhkInput" v-if="cashtype == 3">
+						<view>
+							<span>真实姓名</span>
+							<input placeholder="请输入姓名" v-model="creditCashInfo.bank_username" />
+						</view>
+						<view>
+							<span>开户{{examineing==0?'银行':'渠道2'}}</span>
+							<input placeholder="请输入开户行名称/地址" v-model="creditCashInfo.bank_name" />
+						</view>
+						<view>
+							<span>{{examineing==0?'银行卡':'渠道2'}}号</span>
+							<input :placeholder="examineing==0?'请输入银行卡号':'请输入渠道2号'" type="number" v-model="creditCashInfo.card_number" />
+						</view>
+					</view>
+				</view>
+				<!-- 渠道2 -->
+				<view class="inputFoot">
+					<span></span>
+					<view>
+						<span>请务必填写真实信息</span>
+						<span>*</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 选择支付方式 -->
+
+		<!-- 提交按钮 -->
+		<view class="cashSubmit" @click="creditCashing"><span>提交审核</span></view>
+		<!-- 提交按钮 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				creditCashInfo: {},
+				settlementmoney: {
+					money: ''
+				},
+				cashtype: '',
+				setWith: '',
+				storeid: null,
+				examineing:1
+			};
+		},
+		onLoad: function() {
+			this.init();
+			let TextSubstitution = uni.getStorageSync('TextSubstitution');
		this.examineing = TextSubstitution.examineing || 0;
+		},
+		methods: {
+			allWithdrawal(index) {
+				let withMoney = Number(this.creditCashInfo.nowmoney);
+				console.log(withMoney, Number(this.creditCashInfo.maxsetmoney))
+				if (index !== 0) {
+					if(index == 1){
+						this.$set(this.settlementmoney, 'money', Number(this.creditCashInfo.maxsetmoney));
+						return
+					}else{
+						this.$set(this.settlementmoney, 'money', Number(this.creditCashInfo.nowmoney));
+						return
+					}
+				} else {
+					if (withMoney > Number(this.creditCashInfo.maxsetmoney)) {
+						uni.showToast({
+							title: `单次最大提现金额为${this.creditCashInfo.maxsetmoney}元`,
+							icon: 'none'
+						})
+						this.$set(this.settlementmoney, 'money', Number(this.creditCashInfo.maxsetmoney));
+						return
+					} else if ((withMoney == Number(this.creditCashInfo.maxsetmoney) || withMoney < Number(this.creditCashInfo.maxsetmoney)) &&
+						withMoney > 0) {
+						uni.showToast({
+							title: `本次最大提现金额为${withMoney}元`,
+							icon: 'none'
+						})
+						this.$set(this.settlementmoney, 'money', Number(this.creditCashInfo.nowmoney));
+						return
+					} else {
+						this.$set(this.settlementmoney, 'money', 0);
+						return
+					}
+				}
+
+			},
+			init() {
+				let _this = this;
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.creditCashPage(res.data);
+					}
+				});
+			},
+			// 商户提现页面
+			creditCashPage(storeid) {
+				let _this = this,
+					data = {
+						storeid: storeid
+					};
+				App._post_form(
+					'&p=store&do=cashPage',
+					data,
+					res => {
+						_this.creditCashInfo = res.data;
+						if(Number(_this.creditCashInfo.maxsetmoney) == 0){
+							_this.creditCashInfo.maxsetmoney = 999999999;
+						}
+						if (res.data.wechatstatus == 1) {
+							_this.cashtype = 2;
+						} else {
+							if (res.data.alipaystatus == 1) {
+								_this.cashtype = 1;
+							} else {
+								_this.cashtype = 3;
+							}
+						}
+					},
+					fail => {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				);
+			},
+			// 确认提现
+			withdraw(data) {
+				App._post_form('&p=store&do=cashApply', data, res => {
+					App.showSuccess('提现申请成功', () => {
+						uni.navigateBack();
+					});
+					return;
+				});
+			},
+			// 余额提现申请
+			creditCashing() {
+				let _this = this,
+					datas = {
+						storeid: _this.storeid,
+						settlementmoney: _this.settlementmoney.money,
+						cashtype: _this.cashtype,
+						alipay: _this.creditCashInfo.alipay,
+						realname: _this.creditCashInfo.realname || '',
+						bank_name: _this.creditCashInfo.bank_name,
+						card_number: _this.creditCashInfo.card_number,
+						bank_username: _this.creditCashInfo.bank_username
+					};
+				// console.log(_this.settlementmoney.money, '0000')
+				if (_this.settlementmoney.money === '') {
+					uni.showToast({
+						icon: 'none',
+						title: '提现金额不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.cashtype == 1) {
+					if (_this.creditCashInfo.alipay == '') {
+						uni.showToast({
+							icon: 'none',
+							title: _this.examineing?'支付宝账号不能为空':'渠道1账号不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (!_this.creditCashInfo.realname) {
+						uni.showToast({
+							icon: 'none',
+							title: '真实姓名不能为空',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				if (_this.cashtype == 3) {
+					if (_this.creditCashInfo.bank_username == '') {
+						uni.showToast({
+							icon: 'none',
+							title: '真实姓名不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (_this.creditCashInfo.bank_name == '') {
+						uni.showToast({
+							icon: 'none',
+							title: '开户行不能为空',
+							duration: 2000
+						});
+						return;
+					}
+					if (_this.creditCashInfo.card_number.length < 13 || _this.creditCashInfo.card_number.length > 25) {
+						uni.showToast({
+							icon: 'none',
+							title: _this.examineing?'银行卡号格式不正确':'渠道2格式不正确',
+							duration: 2000
+						});
+						return;
+					}
+				}
+				console.log(Number(_this.settlementmoney.money), Number(_this.creditCashInfo.nowmoney), 1111);
+				if (Number(_this.settlementmoney.money) > Number(_this.creditCashInfo.maxsetmoney) || Number(_this.settlementmoney.money) >
+					Number(_this.creditCashInfo.nowmoney)) {
+					if (Number(_this.settlementmoney.money) > Number(_this.creditCashInfo.maxsetmoney)) {
+						uni.showToast({
+							icon: 'none',
+							title: `单次余额提现最大为${_this.creditCashInfo.maxsetmoney}`,
+							duration: 2000
+						});
+						_this.allWithdrawal(1);
+					} else if (Number(_this.settlementmoney.money) > Number(_this.creditCashInfo.nowmoney)) {
+						uni.showToast({
+							icon: 'none',
+							title: `本次余额提现最大为${_this.creditCashInfo.nowmoney}`,
+							duration: 2000
+						});
+						_this.allWithdrawal(2);
+					}
+
+					return;
+				}
+
+				let currentPrice = _this.settlementmoney.money; //实际金额
+				let serviceCharge = _this.creditCashInfo.syssalepercent; //手续费
+				let calculate = {
+					money: currentPrice,
+					percent: serviceCharge
+				};
+				App._post_form('&p=pay&do=calculationCash', calculate, res => {
+					if (res.errno === 0) {
+						let conpmoney = res.data.realmoney;
+						if(Number(conpmoney) < 1){
+							uni.showToast({
+								title:`最低实得金额不能小于1元,当前实得金额为${conpmoney}元`,
+								icon:'none'
+							});
+							return
+						}
+						App.showError(
+							`确认提现${currentPrice}元,实得${conpmoney}元`,
+							data => {
+								if (data.confirm) {
+									!!data && _this.withdraw(datas);
+								}
+							},
+							true
+						);
+					}
+				});
+				// let realTimePrice = Math.round((currentPrice - (Number(serviceCharge) / 100 * currentPrice)) * 100) / 100;//四舍五入
+				// App.showError(
+				// 	`确认提现${currentPrice}元,实得${realTimePrice}元`,
+				// 	data => {
+				// 		if (data.confirm) {
+				// 			!!data && _this.withdraw(datas);
+				// 		}
+				// 	},
+				// 	true
+				// );
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.cash {
+		font-size: 0;
+		border: 1upx solid rgba(0, 0, 0, 0);
+		background: #f6f6f6;
+	}
+
+	page {
+		background: #f6f6f6;
+		overflow-x: hidden;
+	}
+
+	.cashInput {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.cashInputPackage {
+		padding: 30upx;
+
+		>view:nth-child(1) {
+			>span {
+				font-size: 28upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 48upx;
+			padding-bottom: 20upx;
+			border-bottom: 1upx solid rgba(246, 246, 246, 1);
+
+			>span {
+				vertical-align: bottom;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>input {
+				display: inline-block;
+				width: 500upx;
+				font-size: 36upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(3) {
+			margin: 20upx 0 0 0;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				line-height: 70upx;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>view {
+				display: inline-block;
+				width: 184upx;
+				height: 70upx;
+				background: rgba(244, 79, 68, 1);
+				border-radius: 35upx;
+				text-align: center;
+
+				>span {
+					line-height: 70upx;
+					font-size: 24upx;
+
+					color: rgba(255, 255, 255, 1);
+				}
+			}
+		}
+	}
+
+	.checkPayType {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.checkPayTypePackage {
+		padding: 30upx;
+
+		>view:nth-child(1) {
+			>span {
+				font-size: 30upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 10upx;
+		}
+	}
+
+	.typePackage {
+		padding: 20upx 0;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1upx solid rgba(246, 246, 246, 1);
+
+		>view:nth-child(1) {
+			vertical-align: middle;
+
+			>image {
+				vertical-align: middle;
+				width: 60upx;
+				height: 60upx;
+			}
+
+			>span {
+				margin-left: 15upx;
+				vertical-align: middle;
+				font-size: 28upx;
+
+				color: rgba(81, 81, 81, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 15upx;
+			vertical-align: middle;
+			width: 35upx;
+			height: 35upx;
+			border: 2upx solid rgba(238, 238, 238, 1);
+			border-radius: 50%;
+
+			>image {
+				width: 35upx;
+				height: 35upx;
+			}
+		}
+	}
+
+	.yhkInput {
+		padding: 20upx;
+
+		>view {
+			border-bottom: 1upx solid rgba(246, 246, 246, 1);
+			padding: 20upx 0;
+
+			>span {
+				vertical-align: middle;
+				display: inline-block;
+				width: 100upx;
+				font-size: 24upx;
+
+				color: rgba(81, 81, 81, 1);
+			}
+
+			>input {
+				padding-left: 30upx;
+				vertical-align: middle;
+				width: 400upx;
+				display: inline-block;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: rgba(81, 81, 81, 1);
+			}
+		}
+	}
+
+	.inputFoot {
+		margin-top: 20upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+
+			>span:nth-child(1) {
+				vertical-align: top;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>span:nth-child(2) {
+				vertical-align: top;
+				font-size: 24upx;
+
+				font-weight: 400;
+				color: #ef4949;
+			}
+		}
+	}
+
+	.cashSubmit {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		height: 84upx;
+		background: rgba(244, 79, 68, 1);
+		border-radius: 42upx;
+		text-align: center;
+
+		>span {
+			line-height: 84upx;
+			font-size: 28upx;
+
+			font-weight: 400;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.checked {
+		width: 35px;
+		height: 35px;
+		background: #f44f44;
+		border-radius: 50%;
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantChangeShop/merchantChangeShop.vue b/pages/subPages/merchant/merchantChangeShop/merchantChangeShop.vue
new file mode 100644
index 0000000..2ef637c
--- /dev/null
+++ b/pages/subPages/merchant/merchantChangeShop/merchantChangeShop.vue
@@ -0,0 +1,373 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="changeshop-content p-r p-left-right-30">
+				<!-- 我的店铺循环模板 -->
+				<view class="m-btm20" v-for="(item, index) in userStoreList" @click="go(item.storeid,item.status)">
+					<view class="menu-style   ">
+						<view class="menu-style dis-flex flex-x-between flex-y-center">
+							<view class="dis-flex flex-y-center">
+								<image class="menu-style-bg" :src="item.storelogo" />
+								<view class="dis-flex flex-dir-column">
+									<view class="f-32 over" style="padding-bottom: 12upx;">{{ item.storename }}</view>
+									<view class="f-24 dis-flex flex-y-center" style="padding-bottom: 20upx;" v-if="!!item.checkStore">
+										<view class="circle"></view>
+										当前店铺
+									</view>
+									<view v-if="item.status == '0' || item.status == '1' || item.status == '3' || item.status == '4'" class="stutsTips" :class="item.status == '0' ? 'status0' : item.status == '1' ? 'status3' : item.status == '3' ? 'status1' :item.status == '4' ? 'status4' :''">
+										<text class="stutsTipsText" :class="item.status == '0' ? 'text0' : item.status == '1' ? 'text1' : item.status == '3' ? 'text3' :item.status == '4' ? 'text4' :''">
+											{{ item.status == '0' ? '未支付' : item.status == '1' ? '待审核' : item.status == '3' ? '被驳回' :item.status == '4'? '未认证':'' }}
+										</text>
+										<br/>
+									</view>
+								</view>
+								
+							</view>
+							<view class="flex-shrink">
+								<view class="f-24 col-9 t-c">{{ item.ismain }}</view>
+								<view class="f-28 col-f4 t-c">{{item.agent_name}}</view>
+							</view>
+							
+						</view>
+						
+					</view>
+					
+					<view class="bottomStuatus" v-if="item.status == '0' || item.status == '3'|| item.status == '4'">
+						<view class="marL30 diy-nav-list border-line border-top bottomStuatus1">
+							<view>
+								<image :src="imgfixUrls + 'merchant/changeStore.png'" class="changeStoreImage"></image>
+								<text class="stuatusText">{{ item.reject }}</text>
+							</view>
+							<view class="buttonStuatus" @click.stop="goStatus(item.storeid, item.status, item.orderid)">
+								<text class="buttonStuatusText">{{ item.status == '0' ? '支付' : item.status == '4'?'认证':'修改' }}</text>
+							</view>
+						</view>
+					</view>
+					
+				</view>
+				<!-- 我的店铺循环模板 -->
+			</view>
+		</view>
+		<!-- <TabBars :tabBarAct="0" /> -->
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				userStoreList: {},
+				checkStoreid: null
+			};
+		},
+		components: {
+			Loadlogo,
+			TabBars
+		},
+		computed: {},
+		onShow(e) {
+			let _this = this;
+
+			if (!!uni.getStorageSync('checkStoreid')) {
+				_this.checkStoreid = uni.getStorageSync('checkStoreid');
+			}
+			_this.init();
+		},
+		mounted() {},
+		methods: {
+			goStatus(id, status, orderid) {
+				let _this = this;
+				if (status == '0') {
+					if (orderid == '0') {
+						console.info(1111111111)
+						App.navigationTo({
+							url: 'pages/mainPages/Settled/Settled?page=2&storeid=' + id
+						});
+					} else {
+						console.info(22222222)
+						App.navigationTo({
+							url: 'pages/mainPages/payment/payment?orderid=' + orderid + '&plugin=store'
+						});
+					}
+				} else if (status == '3') {
+					console.info(3333333333)
+					App.navigationTo({
+						url: 'pages/subPages/merchant/set/set?storeid=' + id
+					});
+				}else if(status == '4'){
+					console.log();
+					uni.setStorageSync('checkStoreid', id);
+					App.navigationTo({
+						url: 'pages/subPages/attestationCenter/index?rzType=2'
+					});
+				}
+			},
+			init() {
+				let _this = this;
+				_this.getUserStoreList();
+			},
+			go(storeid, status) {
+				if (status == '2') {
+					uni.setStorageSync('checkStoreid', storeid);
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantHome/merchantHome'
+					});
+				}
+
+			},
+			// 切换商户列表
+			getUserStoreList() {
+				let _this = this;
+				let data = {};
+				App._post_form(
+					'&p=store&do=userStoreList',
+					data,
+					res => {
+						uni.hideLoading();
+						_this.userStoreList = res.data;
+						for (let i = 0; i < res.data.length; i++) {
+							console.info();
+							console.info();
+							if (_this.checkStoreid == res.data[i].storeid) {
+								res.data[i]['checkStore'] = true;
+								console.info(res.data);
+							}
+						}
+					},
+					fail => {
+						App.navigationTo({
+							url: 'pages/mainPages/userCenter/userCenter'
+						});
+					}
+				);
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'contactway':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/contactway/contactway'
+						});
+						break;
+					case 'withdraw':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/withdraw/withdraw'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+					case 'shops':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.text0 {
+		color: #ffffff;
+	}
+
+	.text1 {
+		color: #3388ff;
+	}
+
+	.text3 {
+		color: #ff4444;
+	}
+	
+	.text4{
+		color: #333333;
+	}
+	.status3 {
+		background: rgba(243, 247, 253, 1);
+	}
+
+	.status1 {
+		background: #fef3f3;
+	}
+
+	.status0 {
+		background: #45e7ab;
+		
+	}
+	
+	.status4 {
+		background: #CCCCCC;
+		// width: 300upx!important;
+		// font-size: 10upx!important;
+	}
+
+	.stutsTips {
+		width: 90upx;
+		height: 38upx;
+		border-radius: 4upx;
+		font-size: 0;
+		text-align: center;
+	}
+
+	.stutsTipsText {
+		line-height: 38upx;
+		font-size: 24upx;
+	}
+
+	.changeStoreImage {
+		width: 50upx;
+		height: 50upx;
+		vertical-align: middle;
+	}
+
+	.buttonStuatusText {
+		line-height: 40upx;
+		vertical-align: middle;
+		font-size: 24upx;
+		color: rgba(51, 136, 255, 1);
+	}
+
+	.buttonStuatus {
+		margin-top: 20upx;
+		font-size: 0;
+		text-align: center;
+		width: 88upx;
+		height: 40upx;
+		border: 1upx solid rgba(51, 136, 255, 1);
+		border-radius: 4upx;
+	}
+
+	.stuatusText {
+		vertical-align: middle;
+		line-height: 86upx;
+		font-size: 24upx;
+		color: rgba(153, 153, 153, 1);
+	}
+
+	.marL30 {
+		margin: 0 30upx;
+	}
+
+	.bottomStuatus {
+		justify-content: space-between;
+		display: flex;
+		height: 86upx;
+		background: #ffffff;
+	}
+
+	.bottomStuatus1 {
+		justify-content: space-between;
+		display: flex;
+		height: 86upx;
+		width: 630upx;
+		background: #ffffff;
+	}
+
+	.over {
+		display: inline-block;
+		width: 300upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	page {
+		background-color: #f7f7f7;
+	}
+
+	.container {
+
+		//圆形
+		.circle {
+			width: 14upx;
+			height: 14upx;
+			background: rgb(69, 231, 171);
+			border-radius: 50%;
+			margin-right: 4px;
+		}
+
+
+		// 详情内容
+		.changeshop-content {
+			padding-bottom: 120upx;
+			margin-top: 37upx;
+
+			// 工具导航
+			.tool-tab {
+				padding: 30upx 0;
+
+				.tool-tab-title {
+					padding: 0 30upx;
+				}
+
+				.tool-item {
+					.tool-item-icon {
+						margin: 0 auto 20upx;
+						display: block;
+						width: 80upx;
+						height: 80upx;
+					}
+				}
+			}
+
+			// 菜单样式
+			.menu-style {
+				background-color: #ffffff;
+				position: relative;
+				padding: 30upx;
+				border-radius: 10upx;
+
+				.menu-style-bg {
+					width: 101upx;
+					height: 101upx;
+					margin-right: 32upx;
+					border-radius: 101upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantChat/merchantChat.vue b/pages/subPages/merchant/merchantChat/merchantChat.vue
new file mode 100644
index 0000000..4a7f5c3
--- /dev/null
+++ b/pages/subPages/merchant/merchantChat/merchantChat.vue
@@ -0,0 +1,610 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="pages-header p-r" :style="{ 'background-image': ' url(' + imageRoot + 'merchantBg1.png)' }"></view>
+			<view class="merchantchat p-r p-left-right-30">
+				<view class="search-box dis-flex flex-y-center">
+					<view class="search-input">
+						<view class="i icon iconfont icon-sousuo"></view>
+						<input
+							type="text"
+							placeholder="请输入客户姓名进行搜索"
+							placeholder-style="color:#999999;margin-left:10upx;"
+							class="f-24"
+							v-model="keyword"
+							@blur="getSearch"
+						/>
+					</view>
+				</view>
+				<view class="chat-btn f-28 dis-flex flex-x-center flex-y-center">
+					<view class="chat-btn-item dis-flex flex-dir-column flex-x-center flex-y-center">
+						<view class="f-40 dis-flex">
+							{{ storeFansListInfo.newfansnum }}
+							<view class="f-24 m2">人</view>
+						</view>
+						<view class="f-24 m-top4">今日新增客户</view>
+					</view>
+					<view class="chat-btn-line"></view>
+					<view class="chat-btn-item dis-flex flex-dir-column flex-x-center flex-y-center" @click="goRecord">
+						<view class="f-40 dis-flex">
+							{{ storeFansListInfo.allfansnum }}
+							<view class="f-24 m2">人</view>
+						</view>
+						<view class="f-24 m-top4">我的总客户</view>
+					</view>
+				</view>
+				<view class="tool-tab">
+					<scroll-view class="tool-list dis-flex flex-dir-column"  :scroll-y="true" :lower-threshold="0" >
+						<view >
+							<nonemores v-if="pagetotal == 0"></nonemores>
+							<view class="tool-item flex-box t-c dis-flex" v-for="(item, index) in storeFansList" :key="index" v-if="pagetotal != 0">
+								<image class="tool-item-icon" :src="item.avatar" mode=""></image>
+								<view class="dis-flex flex-x-between flex-y-center tool-item-right">
+									<view class="dis-flex flex-dir-column tool-username">
+										<view class="f-28 color-33 font-blod">{{ item.nickname }}</view>
+										<view class="f-24 dis-flex">
+											<view class="color-99">累计消费：</view>
+											<view class="color-33">{{ item.allordermoney }}</view>
+										</view>
+										<view class="f-24 dis-flex m-top10">
+											<view class="color-99">消费订单：</view>
+											<view class="color-33">{{ item.allordernum }}</view>
+										</view>
+									</view>
+									<view class="dis-flex flex-dir-column flex-y-end tool-r-btn">
+										<view class="color-99 f-22">{{ item.createtime }}</view>
+										<view class="badge dis-flex flex-x-around flex-y-center" @click="openPop(index)">
+											<view class="circle"></view>
+											<view class="circle"></view>
+											<view class="circle"></view>
+										</view>
+										<view class="operationShow dis-flex flex-x-around" v-if="index == indexs">
+											<view @click.stop="goLt(item)" class="dis-flex flex-y-center">
+												<image :src="imgfixUrls + 'merchant/pl.png'" />
+												<span>聊天</span>
+											</view>
+											<view @click.stop="goMerchantOrderList(item)" class="dis-flex flex-y-center">
+												<image :src="imgfixUrls + 'centerMerchant/dd.png'" />
+												<span>订单</span>
+											</view>
+											<view @click.stop="gobalance(item)" class="dis-flex flex-y-center" v-if="storeFansListInfo.paybak == '1'">
+												<span class="iconfont icon-moneybag" style="font-size: 30upx;"></span>
+												<span style="padding-left: 8upx;">余额</span>
+											</view>
+											<view class="operationView"></view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="tips" v-if="pagetotal != 0"><loadmore :isMore="isMore"></loadmore></view>
+						</view>
+						
+					</scroll-view>
+				</view>
+			</view>
+		</view>
+		<popup-view :show="showCommunity" type="center" @clickmask="close">
+			<view  style="width: 70vw;height: 540upx;background-color: #FFFFFF;font-size: 29upx;padding: 30upx;border-radius: 15upx;">
+				<view class="f-36 f-w" style="text-align: center;padding-bottom: 20upx;" v-if="showCommunity">余额调整</view>
+				<radio-group @change="radioChange">
+					<view class="dis-flex" style="padding: 20upx 0; border-bottom: 2upx solid #F1F1F1;" v-if="showCommunity">
+						<view  style="flex: 0.4;font-weight: 500;">调整方式</view>
+						<view class="t-r" style="flex: 0.6;">
+							<label class="radio" style="color: #999999;">
+								<radio value="1" checked="true" />
+								增加
+							</label>
+							<label class="radio" style="padding-left: 50upx;color: #999999;">
+								<radio value="0" />
+								减少
+							</label>
+						</view>
+					</view>
+				</radio-group>
+				<view class="dis-flex" style="border-bottom: 2upx solid #F1F1F1;padding: 30upx 0;">
+					<view style="flex: 0.4;font-weight: 500;">调整金额</view>
+					<view style="flex: 0.6;" class="dis-flex" v-if="showCommunity">
+						<input v-if="showCommunity" class="uni-input dis-il-block" placeholder="请输入调整金额" adjust-position="false" v-model="balance" placeholder-style="color: #999999;" type="digit" style="text-align: right;font-size: 26upx;" />
+						<view style="line-height: 36upx;padding-left: 20upx;">元</view>
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 30upx 0;border-bottom: 2upx solid #F1F1F1;">
+					<view style="flex: 0.4;font-weight: 500;">备注</view>
+					<view style="flex: 0.6;">
+						<input class="uni-input" v-if="showCommunity" v-model="remark" placeholder="请输入备注" adjust-position="false" placeholder-style="color: #999999;" type="text" style="text-align: right;font-size: 26upx;" />
+					</view>
+				</view>
+				<view class="dis-flex" style="padding-top: 30upx;">
+					<view class="flex-box" style="padding: 10upx 20upx;">
+						<button class="mini-btn" type="default" size="default" style="font-size: 26upx;line-height: 80upx;" @click="close">取消</button>
+					</view>
+					<view class="flex-box" style="padding: 10upx 20upx;">
+						<button class="mini-btn" type="warn" size="default" style="font-size: 26upx;line-height: 80upx;" @click="solr">确定</button>
+					</view>
+				</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import TabBars from '@/components/template/tabBar.vue';
+import nonemores from '@/components/template/nonemores.vue';
+import loadmore from '@/components/template/loadmore.vue';
+import PopupView from '@/components/template/PopManager.vue';
+export default {
+	data() {
+		return {
+			scdpText: '',
+			indexs: null,
+			storeid: null,
+			page: 1,
+			initialization: 1,
+			keyword: '',
+			storeFansList: [],
+			storeFansListInfo: {},
+			pagetotal: null,
+			monidata: 'ikik',
+			detalsData: null,
+			loadlogo: false,
+			shopShow: false,
+			isMore: true,
+			showCommunity: false,
+			tab_list: [
+				{
+					item_type: 'manager',
+					item_name: '店员管理',
+					item_icon: '4e81ea09056979072a00019a.jpg',
+					item_navType: 'manager'
+				},
+				{
+					item_type: 'myuser',
+					item_name: '我的客户',
+					item_icon: '4e81ea09056979072a00019a.jpg',
+					item_navType: 'myuser'
+				},
+				{
+					item_type: 'shopmain',
+					item_name: '店铺主页',
+					item_icon: '4e81ea09056979072a00019a.jpg',
+					item_navType: 'shopmain'
+				},
+				{
+					item_type: 'changeshop',
+					item_name: '切换店铺',
+					item_icon: '4e81ea09056979072a00019a.jpg',
+					item_navType: 'changeshop'
+				}
+			],
+			phoneHight: null,
+			fullHeight: null,
+			radio:'1',
+			balance:'',
+			remark:'',
+			solritem:{}
+		};
+	},
+	components: {
+		Loadlogo,
+		TabBars,
+		nonemores,
+		loadmore,
+		PopupView
+	},
+	mounted() {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight;
+			}
+		});
+		uni.createSelectorQuery()
+			.select('.pages-header')
+			.boundingClientRect(data => {
+				_this.fullHeight = _this.phoneHight - data.height + 'px';
+			})
+			.exec();
+	},
+	computed: {},
+	onShow() {},
+	onLoad(e) {
+		let _this = this;
+		_this.init();
+	},
+	onReachBottom() {
+		this.load();
+	},
+	methods: {
+		solr(){
+			if(this.balance == '' && this.balance == 0){
+				uni.showToast({
+					title:'请输入调整金额',
+					icon:'none'
+				})
+			}
+			App._post_form(`&p=store&do=changeUserCredit&mid=${this.solritem.mid}&sid=${this.storeid}&type=${this.radio}&price=${this.balance}&remark=${this.remark}`, {}, res => {
+				uni.showToast({
+					title:res.message
+				});
+				this.close()
+			});
+		},
+		close(){
+			this.showCommunity = false;
+			this.balance = '';
+			this.remark = '';
+			this.indexs = null;
+		},
+		radioChange(evt) {
+			this.radio = evt.detail.value;
+		},
+		// 余额增减弹窗
+		gobalance(item) {
+			console.log(item)
+			this.solritem = item;
+			this.showCommunity = true;
+		},
+		init() {
+			let _this = this;
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.getStoreFansList(res.data);
+				}
+			});
+		},
+		goMerchantOrderList(item) {
+			App.navigationTo({
+				url: 'pages/subPages/merchant/merchantOrderList/merchantOrderList?userid=' + item.mid
+			});
+		},
+		goLt(item) {
+			let _this = this;
+			// App.navigationTo({
+			// 	url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.mid + '&other_party_type=1&type=2&id=' + _this.storeid
+			// });
+			let getSetInfo = uni.getStorageSync('getSetInfo');
+			if(getSetInfo.type == 1){
+				App.navigationTo({
+					url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.mid + '&other_party_type=' + 1+ '&type=2' + '&id=' + _this.storeid
+				})
+			}else{
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.mid + '&other_party_type=' + 1+ '&type=2' + '&id=' +_this.storeid
+				})
+			}
+		},
+		getSearch() {
+			let _this = this;
+			_this.page = 1;
+			_this.isMore = false;
+			let data = {
+				storeid: _this.storeid,
+				page: _this.page,
+				initialization: _this.initialization,
+				keyword: _this.keyword
+			};
+			App._post_form('&p=store&do=storeFansList', data, res => {
+				_this.storeFansList = res.data.list;
+				_this.storeFansListInfo = res.data;
+				_this.pagetotal = res.data.pagetotal;
+				_this.isMore = true;
+			});
+		},
+		load() {
+			let _this = this;
+			if (_this.page == _this.pagetotal) {
+				_this.isMore = true;
+			} else {
+				_this.page++;
+				_this.getStoreFansList();
+			}
+		},
+		openPop(index) {
+			let _this = this;
+			if (_this.indexs !== index) {
+				_this.indexs = index;
+			} else {
+				_this.indexs = null;
+			}
+		},
+		// 店铺客户列表
+		getStoreFansList(storeid) {
+			let _this = this;
+			_this.isMore = false;
+			let data = {
+				storeid: storeid || _this.storeid,
+				page: _this.page,
+				initialization: _this.initialization,
+				keyword: _this.keyword
+			};
+			App._post_form('&p=store&do=storeFansList', data, res => {
+				_this.storeFansList = [..._this.storeFansList, ...res.data.list];
+				_this.storeFansListInfo = res.data;
+				_this.pagetotal = res.data.pagetotal;
+				_this.isMore = true;
+			});
+		},
+		// 跳转商家
+		goStore() {
+			App.navigationTo({
+				url: 'pages/subPages/dealer/myStore/myStore'
+			});
+		},
+		navgateTo(e, navType) {
+			let _this = this;
+			switch (navType) {
+				case 'contactway':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/contactway/contactway'
+					});
+					break;
+				case 'withdraw':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/withdraw/withdraw'
+					});
+					break;
+				case 'setshop':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/setshop/setshop'
+					});
+					break;
+				case 'order':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantchat/merchantchat'
+					});
+					break;
+				case 'rank':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/rank/rank'
+					});
+					break;
+				case 'level':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/level/level'
+					});
+					break;
+				case 'client':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/client/client'
+					});
+					break;
+				case 'help':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/richtext/setrich'
+					});
+					break;
+				case 'gener':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/gener/gener'
+					});
+					break;
+				case 'poster':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+				case 'shops':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.tips {
+	height: 80upx;
+	text-align: center;
+
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+
+		color: black;
+	}
+}
+page {
+	background-color: #f6f6f6;
+	font-size: 0;
+}
+
+.container {
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-99 {
+		color: #999999;
+	}
+
+	.color-f4 {
+		color: #ff4444;
+	}
+
+	.font-blod {
+		font-weight: bold;
+	}
+	.search-box {
+		.search-input {
+			position: relative;
+			padding: 0 60upx 0 80upx;
+			height: 76upx;
+			width: 100%;
+			border-radius: 38upx;
+			background: rgba(255, 255, 255, 1);
+			input {
+				width: 100%;
+				height: 100%;
+			}
+
+			.icon.icon-sousuo {
+				position: absolute;
+				color: #999999;
+				top: 50%;
+				transform: translateY(-50%);
+				left: 30upx;
+			}
+		}
+	}
+	.tool-r-btn {
+		position: relative;
+	}
+	.operationShow {
+		z-index: 3;
+		position: absolute;
+		right: 88upx;
+		bottom: -22upx;
+		width: 400upx;
+		height: 80upx;
+		background: rgba(51, 51, 51, 1);
+		border-radius: 10upx;
+		image {
+			width: 50upx;
+			height: 50upx;
+			margin-right: 4upx;
+		}
+		> view {
+			> span {
+				font-size: 24upx;
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+	.operationView {
+		transform: rotate(45deg);
+		display: inline-block;
+		position: absolute;
+		bottom: 20upx;
+		right: -6upx;
+		z-index: -1;
+		width: 38upx;
+		height: 38upx;
+		background: rgba(51, 51, 51, 1);
+		border: 1upx solid rgba(51, 51, 51, 1);
+	}
+	//扫码验证按钮
+	.chat-btn {
+		padding: 40upx 0;
+		color: #ffffff;
+		.chat-btn-item {
+			width: 50%;
+			line-height: 24px;
+			vertical-align: text-bottom;
+			.m2 {
+				margin-left: 2upx;
+			}
+			.icon {
+				margin-right: 20upx;
+			}
+		}
+
+		.chat-btn-line {
+			width: 1upx;
+			height: 40upx;
+			background: rgba(255, 255, 255, 1);
+			opacity: 0.3;
+		}
+	}
+	// 头部内容
+	.pages-header {
+		width: 100%;
+		height: 370upx;
+		background-repeat: no-repeat;
+		background-size: 100% 370upx;
+
+		//个人-邀请人信息
+		.person-content {
+			padding: 94upx 40upx 0;
+
+			.user-avatar {
+				width: 100upx;
+				height: 100upx;
+				border-radius: 50%;
+				background-repeat: no-repeat;
+				background-size: 100upx 100upx;
+			}
+
+			.user-referrer-name {
+				.level-label {
+					background-color: #e7d4aa;
+					border-radius: 18upx;
+					padding: 0 16upx;
+				}
+
+				.referrer-name {
+					color: #6b6e88;
+				}
+			}
+		}
+	}
+
+	// 详情内容
+	.merchantchat {
+		margin-top: -330upx;
+		// 工具导航
+		.tool-tab {
+			padding: 0 30upx;
+			border-radius: 10px;
+			background: #ffffff;
+
+			.tool-item-right {
+				width: 100%;
+			}
+			.tool-username {
+				align-items: start;
+				.font-blod {
+					margin-bottom: 16upx;
+				}
+			}
+			.tool-tab-title {
+				padding: 0 30upx;
+			}
+
+			.tool-item {
+				width: 100%;
+				flex-wrap: nowrap;
+				border-bottom: 1px solid #eeeeee;
+				padding: 40upx 0;
+				.badge {
+					width: 65upx;
+					height: 40upx;
+					background: #f1f7ff;
+					border-radius: 6upx;
+					color: rgba(255, 255, 255, 1);
+					margin-top: 18upx;
+					padding: 0 10upx;
+					margin-top: 48upx;
+					box-sizing: border-box;
+					.circle {
+						width: 4px;
+						height: 4px;
+						background: rgba(57, 140, 255, 1);
+						border-radius: 50%;
+					}
+				}
+
+				.tool-item-icon {
+					margin-right: 30upx;
+					width: 70upx;
+					height: 70upx;
+					flex-shrink: 0;
+					border-radius: 50%;
+				}
+			}
+
+			.tool-item:last-child {
+				border-bottom: none;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/merchant/merchantClerkEdit/merchantClerkEdit.vue b/pages/subPages/merchant/merchantClerkEdit/merchantClerkEdit.vue
new file mode 100644
index 0000000..66773cb
--- /dev/null
+++ b/pages/subPages/merchant/merchantClerkEdit/merchantClerkEdit.vue
@@ -0,0 +1,348 @@
+<template>
+	<view>
+		<!-- 个人中心 -->
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="merchantuserEdit p-r p-left-right-30 m-top20">
+				<view class="userEdit-box bor-radius-10upx b-f">
+					<view class="dis-flex flex-x-center">
+						<image class="tximg" :src="adminInfo.admin.avatar" />
+					</view>
+					<view class="f-24 color-99 m-btm10">店员信息</view>
+					<view class="dis-flex userEdit-form-item flex-y-center">
+						<view class="label">姓名</view>
+						<input placeholder="请填写店员姓名" class="f-24" type="text" v-model="adminInfo.admin.name"/>
+					</view>
+					<view class="dis-flex userEdit-form-item flex-y-center">
+						<view class="label">电话</view>
+						<input placeholder="请填写店员电话" class="f-24" type="text" v-model="adminInfo.admin.mobile"/>
+					</view>
+				</view>
+				<view class="userEdit-box bor-radius-10upx b-f m-top20">
+					<view class="dis-flex flex-x-between flex-y-center" @click="popShow=true">
+						<view class="dis-flex userEdit-form-item flex-y-center">
+							<view class="label">身份</view>
+							<view class="label">{{ismainList[adminInfo.admin.ismain-1]}}</view>
+						</view>
+						<view class="i icon iconfont icon-jinrujiantouxiao1"></view>
+					</view>
+				</view>
+				<view class="userEdit-box bor-radius-10upx b-f m-top20">
+					<view class="f-24 color-99 m-btm10 p-top-40">状态设置</view>
+					<!-- <view class="dis-flex userEdit-form-item flex-y-center flex-x-between">
+						<view class="label">订单核销</view>
+						<view :class="['switch', adminInfo.admin.orderwrite == 1?'':'close']">
+							<view class="switchOn" v-if="adminInfo.admin.orderwrite == 1" @click="adminInfo.admin.orderwrite=0">
+								<span></span>
+								<view></view>
+							</view>
+							<view class="switchClose" v-if="adminInfo.admin.orderwrite == 0" @click="adminInfo.admin.orderwrite=1">
+								<view></view>
+								<span></span>
+							</view>
+						</view>
+					</view>
+					<view class="dis-flex userEdit-form-item flex-y-center flex-x-between">
+						<view class="label">查看交易数据</view>
+						<view :class="['switch', adminInfo.admin.viewdata == 1?'':'close']">
+							<view class="switchOn" v-if="adminInfo.admin.viewdata == 1" @click="adminInfo.admin.viewdata=0">
+								<span></span>
+								<view></view>
+							</view>
+							<view class="switchClose" v-if="adminInfo.admin.viewdata == 0" @click="adminInfo.admin.viewdata=1">
+								<view></view>
+								<span></span>
+							</view>
+						</view>
+					</view> -->
+					<view class="dis-flex userEdit-form-item flex-y-center flex-x-between">
+						<view class="label">状态</view>
+						<view :class="['switch', adminInfo.admin.enabled == 1?'':'close']">
+							<view class="switchOn" v-if="adminInfo.admin.enabled == 1" @click="adminInfo.admin.enabled=0">
+								<span></span>
+								<view></view>
+							</view>
+							<view class="switchClose" v-if="adminInfo.admin.enabled == 0" @click="adminInfo.admin.enabled=1">
+								<view></view>
+								<span></span>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="save-btn" @click="createAdmin">保存</view>
+			</view>
+		</view>
+		
+		<!-- 选择身份弹框 -->
+		<PopManager :show="popShow" :type='popType' @clickmask="closePop">
+			<view class="popShowView">
+				<view class="popShowViewPackage">
+					<view class="popTitle">
+						<span>店员身份</span>
+					</view>
+					<view class="popBody" v-for="(item,index) in adminstatusList" @click="checkStatus(item.status)">
+						<span>{{item.name}}</span>
+						<view :class="adminInfo.admin.ismain==item.status?'reasonYCheck':'reasonNCheck'">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" v-if="adminInfo.admin.ismain==item.status"/>
+						</view>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 选择身份弹框 -->
+		<!-- <TabBars :tabBarAct="0" /> -->
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	import PopManager from '@/components/template/PopManager';
+	export default {
+		data() {
+			return {
+				popShow:false,
+				popType:'bottom',
+				detalsData: null,
+				loadlogo: false,
+				integralType: 0,
+				adminid:null,
+				newadminid:null,
+				storeid:null,
+				adminInfo:{},
+				ismainList:['店长','核销员','管理员','业务员'],
+				adminstatusList:[
+					{
+						name:'核销员',
+						status:2
+					},
+					{
+						name:'管理员',
+						status:3
+					}
+				]
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars,
+			PopManager
+		},
+		computed: {},
+		onShow(e) {
+			
+		},
+		mounted() {
+			
+		},
+		onLoad(e){
+			let _this=this
+			if(!!e.adminid){
+				_this.adminid=e.adminid
+			}
+			if(!!e.newadminid){
+				_this.newadminid=e.newadminid	
+			}
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.init(res.data,e.adminid,e.newadminid)
+				}
+			});
+			
+		},
+		methods: {
+			checkStatus(status){
+				let _this=this
+				_this.adminInfo.admin.ismain=status
+			},
+			init(id,adminid,newadminid){
+				let _this=this
+				_this.getAdminInfo(id,adminid,newadminid)
+			},
+			closePop(){
+				let _this=this
+				_this.popShow=false
+			},
+			// 保存店员信息
+			createAdmin(){
+				let _this=this
+				_this.adminInfo.admin.adminid=_this.adminid
+				_this.adminInfo.admin.mid=_this.newadminid
+				_this.adminInfo.admin.storeid=_this.storeid
+				let data=_this.adminInfo.admin
+				App._post_form('&p=store&do=createAdmin',data,res=>{
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantClerkList/merchantClerkList'
+					})
+				})
+			},
+			// 获取店员信息
+			getAdminInfo(id,adminid,newadminid){
+				let _this=this
+				let data={
+					storeid:_this.storeid||id,
+					adminid:_this.adminid||adminid,
+					newadminid:_this.newadminid||newadminid,
+				}
+				App._post_form('&p=store&do=adminInfo',data,res=>{
+					_this.adminInfo=res.data
+				})
+			},
+			// 跳转商家
+			goSuccess() {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantSuccess/merchantSuccess'
+				})
+			},
+			changIntegral(type) {
+				let _this = this;
+				_this.integralType = type;
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.reasonNCheck{
+		margin-top: 20upx;
+		width:32upx;
+		height:32upx;
+		border:1upx solid rgba(204,204,204,1);
+		border-radius:16upx;
+	}	
+	.reasonYCheck{
+		margin-top: 20upx;
+		width:32upx;
+		height:32upx;
+		border-radius:16upx;
+		background:#FF4444;
+		>image{
+			vertical-align: top;
+			width:32upx;
+			height:32upx;
+		}
+	}	
+	.popBody{
+		display: flex;
+		justify-content: space-between;
+		height: 70upx;
+		>span{
+			line-height: 70upx;
+			font-size:24upx;
+			color:rgba(51,51,51,1);
+		}
+	}
+	.popTitle{
+		height: 80upx;
+		text-align:center;
+		>span{
+			line-height: 80upx;
+			font-size:30upx;
+			color:rgba(51,51,51,1);
+		}
+	}
+	.popShowViewPackage{
+		padding: 30upx;
+	}
+	.popShowView{
+		width:750upx;
+		background:rgba(255,255,255,1);
+		border-radius:20upx 20upx 0px 0px;
+	}
+	page {
+		background-color: #F6F6F6;
+		
+	}
+
+	.container {
+
+		.color-33 {
+			color: #333333;
+		}
+
+		.color-99 {
+			color: #999999;
+		}
+
+		.color-f4 {
+			color: #FF4444;
+		}
+
+		.color-cc {
+			color: #CCCCCC;
+		}
+
+		.font-blod {
+			font-weight: bold;
+		}
+
+		// 详情内容
+		.merchantuserEdit {
+			padding-bottom: 120upx;
+			.switch {
+				width: 80upx;
+				height: 40upx;
+				background:rgba(51,136,255,1);
+				border-radius: 20upx;
+				> view {
+					padding: 6upx;
+					display: flex;
+					justify-content: space-between;
+					> view {
+						width: 28upx;
+						height: 28upx;
+						background:rgba(245,250,255,1);
+						border-radius: 50%;
+					}
+				}
+			}
+			.switch.close{
+				background:#EEEEEE;
+				> view {
+					> view {
+						background:rgba(255,255,255,1);
+					}
+				}
+			}
+			.save-btn{
+				width:690upx;
+				height:80upx;
+				line-height: 80upx;
+				text-align: center;
+				margin-top: 30upx;
+				background:rgba(51,136,255,1);
+				border-radius:10upx;
+				font-size:28upx;
+				color: #FFFFFF;
+			}
+			// 外盒子
+			.userEdit-box {
+				padding:0 30upx;
+				.tximg{
+					margin: 40upx 0;
+					width:159upx;
+					height:159upx;
+					border-radius:20upx;
+				}
+				.icon.icon-jinrujiantouxiao1{
+					color: #999999;
+					font-size: 24upx;
+				}
+			}
+			.userEdit-form-item{
+				padding: 40upx 0;
+				font-size: 28upx;
+				border-bottom:1upx solid rgba(238,238,238,1);
+				.label{
+					margin-right: 40upx;
+				}
+			}
+			.userEdit-form-item:last-child{
+				border-bottom:none;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantClerkList/merchantClerkList.vue b/pages/subPages/merchant/merchantClerkList/merchantClerkList.vue
new file mode 100644
index 0000000..15e1782
--- /dev/null
+++ b/pages/subPages/merchant/merchantClerkList/merchantClerkList.vue
@@ -0,0 +1,444 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="clerklist-content p-r p-left-right-30">
+				<!-- <view class="record-dialog dis-flex flex-x-center flex-y-center" v-if="addDialog">
+					<view class="record-dialog-main">
+						<view class="m-top40 f-28 color-33 m-btm50 t-c">用微信扫一扫，成为店员</view>
+						<view class="dis-flex flex-x-center"><img class="qrcode" s:rc="@imgfixUrls + '4e81ea09056979072a00019a.jpg" alt=""></view>
+						<view class="record-dialog-btns dis-flex flex-x-center"><view @click="addDialog=false" class="btn i icon iconfont icon-close_light"></view></view>
+					</view>
+				</view> -->
+				<view class="m-btm20" v-for="(item, index) in adminList">
+					<view class="menu-style dis-flex flex-x-between flex-y-center">
+						<view class="dis-flex flex-y-center">
+							<image class="menu-style-bg" :src="item.avatar" />
+							<view class="dis-flex flex-dir-column">
+								<view class="f-30 color-33 dis-flex flex-y-center" style="padding-bottom: 12upx;">
+									<view>{{ item.name }}</view>
+									<image class="iconbox" :src="imgfixUrls + 'centerMerchant/clerksuccess.png'" v-if="item.enabled == 1" />
+									<image class="iconbox" :src="imgfixUrls + 'centerMerchant/clerkjian.png'" v-if="item.enabled == 0" />
+								</view>
+								<view class="f-24 color-99">角色：{{ ismainList[item.ismain - 1] }}</view>
+							</view>
+						</view>
+						<view class="clerklist-btns dis-flex">
+							<view class="edit" @click="goEdit(item.id)" v-if="item.ismain!='1' && item.ismain!='4'">编辑店员</view>
+							<view :class="item.enabled == 0 ? 'switchOn' : 'switch'" @click="changeAdminEnabled(item.id)" v-if="item.ismain!='1' && item.ismain!='4'">{{ enabledList[Number(item.enabled)] }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="addbtn" @click="getAdminInfo" :class="openButton==1?'':'cantButton'">添加店员</view>
+			</view>
+		</view>
+	<!-- 	<TabBars :tabBarAct="0" /> -->
+		<!-- 添加店员弹框 -->
+		<PopManager :show="popShow" :type="popType">
+			<view class="popView">
+				<view class="popImg">
+					<span>用微信扫一扫，成为店员</span>
+					<view class="imgView"><image :src="src" /></view>
+				</view>
+			</view>
+			<view class="closeImg" @click="closePopShow"><image :src="imgfixUrls + 'merchant/close.png'" /></view>
+		</PopManager>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import TabBars from '@/components/template/tabBar.vue';
+import PopManager from '@/components/template/PopManager';
+export default {
+	data() {
+		return {
+			openButton:1,
+			qrcode: null,
+			src: null,
+			popShow: false,
+			popType: 'center',
+			loadlogo: false,
+			addDialog: true,
+			ismainList: ['店长', '核销员', '管理员', '业务员'],
+			adminList: {},
+			enabledList: ['开启', '停用']
+		};
+	},
+	components: {
+		Loadlogo,
+		TabBars,
+		PopManager
+	},
+	computed: {},
+	onShow() {},
+	mounted() {},
+	onLoad(e) {
+		let _this = this;
+		uni.getStorage({
+			key: 'checkStoreid',
+			success: function(res) {
+				_this.storeid = res.data;
+				_this.init(res.data);
+			}
+		});
+		
+	},
+	methods: {
+		closePopShow(){
+			let _this=this
+			_this.popShow = false
+			_this.openButton=1
+			clearInterval(_this.t1);
+		},
+		init(id) {
+			let _this = this;
+			_this.getAdminList(id);
+		},
+		// 验证店员是否扫码
+		adminAjax() {},
+		// 获取添加店员二维码
+		getAdminInfo() {
+			let _this = this;
+			_this.openButton=0
+			let data = {
+				storeid: _this.storeid
+			};
+			App._post_form('&p=store&do=adminInfo', data, res => {
+				_this.popShow = true;
+				_this.src = res.data.src;
+				_this.qrcode = res.data.qrcode;
+				if(_this.qrcode){
+					_this.t1=setInterval(adminAjax, 3000);
+				}
+				function adminAjax() {
+					let data = {
+						qrcode: _this.qrcode
+					};
+					App._post_form(
+						'&p=store&do=adminAjax',
+						data,
+						res => {
+							_this.userInfo = res.data;
+							if (!!res.data.id) {
+								clearInterval(_this.t1);
+								_this.popShow=false
+								App.navigationTo({
+									url: 'pages/subPages/merchant/merchantClerkEdit/merchantClerkEdit?newadminid=' + res.data.id
+								});
+							} else {
+							}
+						},
+						fail => {
+							console.info('过期结束')
+							clearInterval(_this.t1);
+						}
+					);
+				}
+			},fail=>{
+			});
+		},
+		getAdminList(id) {
+			let _this = this;
+			let data = {
+				storeid: _this.storeid||id
+			};
+			App._post_form('&p=store&do=adminList', data, res => {
+				_this.adminList = res.data;
+			});
+		},
+		// 跳转
+		goEdit(adminid) {
+			App.navigationTo({
+				url: 'pages/subPages/merchant/merchantClerkEdit/merchantClerkEdit?adminid=' + adminid
+			});
+		},
+		// 修改店员状态
+		changeAdminEnabled(userid) {
+			let _this = this;
+			let data = {
+				userid: userid
+			};
+			App._post_form('&p=store&do=changeAdminEnabled', data, res => {
+				uni.showToast({
+					icon: 'none',
+					title: '修改店员状态成功',
+					duration: 2000
+				});
+				for (let i = 0; i < _this.adminList.length; i++) {
+					if (userid == _this.adminList[i].id) {
+						if (_this.adminList[i].enabled == 0) {
+							_this.adminList[i].enabled = 1;
+						} else {
+							_this.adminList[i].enabled = 0;
+						}
+					}
+				}
+			});
+		},
+		navgateTo(e, navType) {
+			let _this = this;
+			switch (navType) {
+				case 'contactway':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/contactway/contactway'
+					});
+					break;
+				case 'withdraw':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/withdraw/withdraw'
+					});
+					break;
+				case 'setshop':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/setshop/setshop'
+					});
+					break;
+				case 'order':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+					});
+					break;
+				case 'rank':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/rank/rank'
+					});
+					break;
+				case 'level':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/level/level'
+					});
+					break;
+				case 'client':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/client/client'
+					});
+					break;
+				case 'help':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/richtext/setrich'
+					});
+					break;
+				case 'gener':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/gener/gener'
+					});
+					break;
+				case 'poster':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+				case 'shops':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.cantButton{
+	pointer-events: none;
+}	
+.closeImg {
+	margin: 40upx auto 0 auto;
+	width: 42upx;
+	height: 42upx;
+	> image {
+		width: 42upx;
+		height: 42upx;
+	}
+}
+.popView {
+	width: 512upx;
+	height: 537upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.popImg {
+	text-align: center;
+	padding: 30upx;
+	> span {
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.imgView {
+	margin: 20upx auto 0 auto;
+	width: 359upx;
+	height: 359upx;
+	> image {
+		width: 359upx;
+		height: 359upx;
+	}
+}
+page {
+	background-color: #f7f7f7;
+}
+
+.container {
+	
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-99 {
+		color: #999999;
+	}
+	.record-dialog {
+		z-index: 10;
+		position: fixed;
+		background: rgba(0, 0, 0, 0.7);
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+
+		.record-dialog-main {
+			border-radius: 10upx;
+			padding: 0 76upx 56upx 76upx;
+			z-index: 11;
+			background: #ffffff;
+			position: relative;
+			.qrcode {
+				width: 359upx;
+				height: 359upx;
+			}
+		}
+		.record-dialog-btns {
+			position: absolute;
+			bottom: -64upx;
+			left: 0;
+			right: 0;
+			.btn {
+				width: 42upx;
+				height: 42upx;
+				text-align: center;
+				line-height: 42upx;
+				border: 2upx solid rgba(255, 255, 255, 1);
+				border-radius: 50%;
+				color: #ffffff;
+			}
+		}
+		.record-picker-view {
+			margin: 40upx 30upx;
+			box-sizing: border-box;
+			width: 540upx;
+			height: 240upx;
+		}
+	}
+	//圆形
+	.circle {
+		width: 14upx;
+		height: 14upx;
+		background: rgb(69, 231, 171);
+		border-radius: 50%;
+		margin-right: 4px;
+	}
+	.addbtn {
+		position: fixed;
+		left: 30upx;
+		right: 30upx;
+		bottom: 130upx;
+		height: 90upx;
+		line-height: 90upx;
+		text-align: center;
+		border-radius: 45upx;
+		font-size: 28upx;
+		color: #ffffff;
+		background: rgba(51, 136, 255, 1);
+	}
+	// 详情内容
+	.clerklist-content {
+		padding-bottom: 120upx;
+		margin-top: 37upx;
+
+		// 工具导航
+		.tool-tab {
+			padding: 30upx 0;
+
+			.tool-tab-title {
+				padding: 0 30upx;
+			}
+
+			.tool-item {
+				.tool-item-icon {
+					margin: 0 auto 20upx;
+					display: block;
+					width: 80upx;
+					height: 80upx;
+				}
+			}
+		}
+
+		// 菜单样式
+		.menu-style {
+			background-color: #ffffff;
+			position: relative;
+			padding: 30upx;
+			border-radius: 10upx;
+
+			.iconbox {
+				width: 24upx;
+				height: 24upx;
+				margin-left: 16upx;
+				border-radius: 50%;
+			}
+			.clerklist-btns {
+				font-size: 24upx;
+				text-align: center;
+				.edit {
+					width: 124upx;
+					height: 44upx;
+					line-height: 44upx;
+					background: rgba(245, 250, 255, 1);
+					border-radius: 6px;
+					color: rgba(51, 136, 255, 1);
+					margin-right: 20upx;
+				}
+				.switch {
+					width: 76upx;
+					height: 44upx;
+					line-height: 44upx;
+					border: 1upx solid rgba(246, 45, 38, 1);
+					border-radius: 6upx;
+					color: rgba(255, 68, 68, 1);
+				}
+				.switchOn {
+					line-height: 44upx;
+					width: 76upx;
+					height: 44upx;
+					background: rgba(51, 136, 255, 1);
+					border-radius: 6upx;
+					color: rgba(255, 255, 255, 1);
+					font-size: 24upx;
+					
+					
+					border: 1upx solid rgba(0, 0, 0, 0);
+				}
+				.switch.on {
+					width: 76upx;
+					height: 44upx;
+					line-height: 44upx;
+					color: rgba(255, 255, 255, 1);
+					background: rgba(51, 136, 255, 1);
+					border: none;
+				}
+			}
+			.menu-style-bg {
+				width: 80upx;
+				height: 80upx;
+				margin-right: 20upx;
+				border-radius: 80upx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/merchant/merchantComment/merchantComment.vue b/pages/subPages/merchant/merchantComment/merchantComment.vue
new file mode 100644
index 0000000..1258fcf
--- /dev/null
+++ b/pages/subPages/merchant/merchantComment/merchantComment.vue
@@ -0,0 +1,530 @@
+<template>
+	<view class="merchantComment">
+		<far-bottom></far-bottom>
+		<view class="topNav">
+			<view @click="checkType('')">
+				<view :class="rank == '' ? 'check' : ''"><span>所有</span>
+					<view class="line"></view>
+				</view>
+			</view>
+			<view @click="checkType(1)">
+				<view :class="rank == 1 ? 'check' : ''"><span>好评</span>
+					<view class="line"></view>
+				</view>
+			</view>
+			<view @click="checkType(2)">
+				<view :class="rank == 2 ? 'check' : ''"><span>中评</span>
+					<view class="line"></view>
+				</view>
+			</view>
+			<view @click="checkType(3)">
+				<view :class="rank == 3 ? 'check' : ''"><span>差评</span>
+					<view class="line"></view>
+				</view>
+			</view>
+		</view>
+
+		<view class="topFull"></view>
+		
+		
+		<!-- 列表区域 -->
+		<scroll-view  class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="load" v-if="commentList.length > 0">
+			<!-- 收藏店铺循环模板 -->
+			<nonemores v-if="totalpage==0"></nonemores>
+			<view v-if="totalpage!=0">
+				<view class="scdpMbPackage" v-for="(item,index) in commentList" @click="gohf(item.id)">
+					<view class="comment-main dis-flex flex-y-center">
+						<view class="over-status">{{replyoneList[item.replyone-1]}}</view>
+						<view class="scdpMbImg"><image :src="item.goodsimg" /></view>
+						<view class="scdpMbInfo">
+							<view><span class="twolist-hidden">{{item.text}}</span></view>
+							<view>
+								<view class="stars dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.star>1||item.star==1" />
+									<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+									<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.star>2||item.star==2" />
+									<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+									<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.star>3||item.star==3" />
+									<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+									<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.star>4||item.star==4" />
+									<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+									<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.star>5||item.star==5" />
+									<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+									<span class="m-left12">{{starList[item.star-1]}}</span>
+								</view>
+							</view>
+							<view>
+								<view>
+									<view class="dis-flex"><img class="comment-img" :src="item.headimg" /><span>{{item.nickname}}</span></view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="dis-flex flex-x-end">
+						<view class="f-24 flex-box t-l" style="line-height: 70upx;" v-if="item.replytextone">
+							<text style="color: #72AAFD;font-weight: 700;">商家回复:</text>
+							<text style="color: #333333;">{{item.replytextone}}</text>
+						</view>
+						<view class="comment-btns "  @click.stop="hideCommnet(item.id)">{{item.status==0?'显示评论':'隐藏评论'}}</view>
+						<view class="comment-btns m-left12 blue" @click.stop="gohf(item.id)" >回复</view>
+					</view>
+				</view>
+			</view>
+			<!-- 收藏店铺循环模板 -->
+			<view class="tips" v-if="totalpage!=0">
+				<loadmore :isMore="isMore"></loadmore>
+			</view>
+		</scroll-view>
+		<view  v-else>			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		</view>
+		<view  v-if="types">
+			<TabBars :tabBarAct="0" pageType="18"></TabBars>
+		</view>
+		
+		<!-- 列表区域 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif	
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+
+	export default {
+		components:{
+			nonemores,
+			loadmore,
+			TabBars
+		},
+		data() {
+			return {
+				starList:['差评','中评','中评','好评','好评'],
+				replyoneList:['待回复','已回复'],
+				type: 1,
+				storeCollectList: [],
+				page: 1,
+				lat: null,
+				lng: null,
+				pagetotal: null,
+				list: [{
+					storename: '2',
+					score: '1'
+				}, {
+					storename: '2',
+					score: '1'
+				}],
+				scdpText: '',
+				storeid:null,
+				rank:'',
+				page:1,
+				commentList:[],
+				totalpage:0,
+				scrollHeight:null,
+				isMore:true,
+				types:''
+			};
+		},
+		onLoad: function(e) {
+			
+			let _this=this
+			
+			_this.types = e.type || '';
+			uni.getSystemInfo({
+				success(res) {
+					_this.scrollHeight = res.windowHeight-55 + 'px';
+				}
+			});
+			uni.getStorage({
+			    key: 'currentRegion',
+			    success: function (res) {
+			        _this.lat=res.data.location.lat
+			        _this.lng=res.data.location.lng
+			    }
+			});
+			if(e.id){
+				_this.storeid = e.id;
+			}
+			
+			
+			_this.init();
+			
+		},
+		onShow() {
+			let _this = this;
+			_this.page = 1;
+			_this.commentList = [];
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					if(!_this.storeid){
+						_this.storeid = res.data;
+						_this.getCommentList(_this.storeid);
+					}else{
+						_this.getCommentList(_this.storeid)
+					}
+				}
+			});
+		},
+		methods: {
+			// 隐藏显示评价接口
+			hideCommnet(id){
+				let _this=this
+				let data={
+					storeid:_this.storeid,
+					commentid:id
+				}
+				App._post_form('&p=store&do=hideCommnet',data,res=>{
+					let index=null
+						for(let i=0;i<_this.commentList.length;i++){
+							if(_this.commentList[i].id==id){
+								 index=i
+							}
+						}
+						if(_this.commentList[index].status=='1'){
+							_this.commentList[index].status='0'
+						}
+						else if(_this.commentList[index].status=='0'){
+							_this.commentList[index].status='1'
+						}
+						uni.showToast({
+							icon:'none',
+						    title: '操作成功',
+						    duration: 2000
+						});
+				})
+			},
+			gohf(commentid) {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantReply/merchantReply?commentid='+commentid +'&id=' + this.storeid
+				})
+			},
+			init() {
+				let _this = this;
+				
+				// _this.storeCollect();
+				
+			},
+			checkType(rank){
+				let _this=this
+				_this.rank=rank
+				_this.page=1
+				_this.commentList=[]
+				_this.getCommentList();
+			},
+			// 店铺评价列表
+			getCommentList(storeid){
+				let _this=this
+				let data={
+						storeid:_this.storeid||storeid,
+						rank:_this.rank,
+						page:_this.page,
+						personal:_this.types
+				}
+				_this.isMore = false;
+				App._post_form('&p=store&do=commentList',data,res=>{
+					_this.commentList=[..._this.commentList,...res.data.list]
+					_this.totalpage=res.data.totalpage
+					_this.isMore = true;
+				})
+			},
+			load(){
+				let _this=this
+				if(_this.totalpage==_this.page){
+						_this.isMore = true;
+				}
+				else{
+					_this.page++
+					_this.getCommentList();
+				}
+			},
+			// 收藏店铺列表
+			storeCollect() {
+				let _this = this
+				_this.scdpText = "... ...加载中"
+				let data = {
+					page: _this.page,
+					lat: _this.lat,
+					lng: _this.lng
+				}
+				App._post_form('&p=member&do=storeCollect', data, res => {
+					_this.storeCollectList = [..._this.storeCollectList, ...res.data.list]
+					for (let i = 0; i < _this.storeCollectList.length; i++) {
+						_this.list.push(_this.storeCollectList[i].store)
+					}
+					_this.pagetotal = res.data.pagetotal
+					_this.scdpText = ""
+				})
+			},
+			// 搜藏店铺加载
+			// scdpLoad(){
+			// 	let _this=this
+			// 	if(_this.page==_this.pagetotal){
+			// 		_this.scdpText="没有更多数据了"
+			// 	}else{
+			// 		_this.page++
+			// 		_this.storeCollect();
+			// 	}
+			// 	
+			// }
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.tips {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+
+	page {
+		overflow-x: hidden;
+		background: #f8f8f8;
+	}
+	.merchantComment{
+		background: #f8f8f8;
+		font-size: 0;
+	}
+
+	.topNav {
+		z-index: 2;
+		position: fixed;
+		top: 0upx;
+		width: 750upx;
+		height: 86upx;
+		background: rgba(255, 255, 255, 1);
+		display: flex;
+		justify-content: space-between;
+		.line {
+			position: absolute;
+			opacity: 0;
+			bottom: 0;
+			display: inline-block;
+			width: 48upx;
+			height: 7upx;
+			left: 50%;
+			transform: translateX(-50%);
+			background: #3388FF;
+			border-radius: 4px 4px 0px 0px;
+		}
+		>view {
+			text-align: center;
+			width: 25%;
+			display: inline-block;
+			>view {
+				height: 81upx;
+				width: 60upx;
+				margin: auto;
+				border-bottom: 4upx solid rgba(0, 0, 0, 0);
+				position: relative;
+
+				>span {
+					line-height: 85upx;
+					font-size: 24upx;
+					
+					
+					color: rgba(51, 51, 51, 1);
+				}
+			}
+		}
+	}
+
+	.check {
+		.line {
+			opacity: 1;
+		}
+		>span {
+			font-size: 28upx !important;
+			font-weight: 500 !important;
+			color: #3388FF !important;
+		}
+	}
+	.scrollList {
+		width: 690upx;
+		margin: 0upx 30upx 0upx 30upx;
+	}
+
+	.topFull {
+		width: 750upx;
+		height: 108upx;
+	}
+
+	.scdpMbPackage {
+		padding: 30upx;
+		margin-bottom: 10px;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.scdpMbImg {
+		width: 159upx;
+		height: 159upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 159upx;
+			height: 159upx;
+		}
+	}
+
+	.comment-main {
+		background: rgba(249, 249, 249, 1);
+		padding: 30upx;
+		position: relative;
+		overflow: hidden;
+	}
+	.over-status {
+	    display: inline-block;
+	    position: absolute;
+	    font-size: 24upx;
+	    white-space: nowrap;
+	    right: -66upx;
+	    bottom: 18upx;
+	    width: 226upx;
+	    text-align: center;
+	    line-height: 54upx;
+	    height: 54upx;
+	    background: #EEEEEE;
+	    color: #999999;
+	    transform: rotate(-45deg);
+	}
+	.comment-img {
+		width: 31upx;
+		height: 31upx;
+		margin-right: 9upx;
+		border-radius: 50%;
+	}
+	.red-btns{
+		margin-top: 20upx;
+		width: 149upx;
+		height: 53upx;
+		border: 1upx solid #3388FF;
+		border-radius: 27upx;
+		text-align: center;
+		line-height: 53upx;
+		font-size: 24upx;
+		
+		color: #FFFFFF;
+	}
+	.comment-btns {
+		margin-top: 20upx;
+		width: 149upx;
+		height: 53upx;
+		border: 1upx solid #3388FF;
+		border-radius: 27upx;
+		text-align: center;
+		line-height: 53upx;
+		font-size: 24upx;
+		
+		color: #3388FF;
+	}
+
+	.comment-btns.blue {
+		width:120upx;
+		background: #3388FF;
+		color: #FFFFFF;
+	}
+
+	.scdpMbInfo {
+		margin-left: 26upx;
+		width: 0;
+		flex-grow: 1;
+		>view:nth-child(1) {
+			//标题
+			>span {
+				font-size: 28upx;
+				font-weight: bold;
+				line-height: 34upx;
+				color: #333333;
+			}
+		}
+		>view:nth-child(2) {
+			margin-top: 16upx;
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				vertical-align: middle;
+
+				>image {
+					margin-right: 10upx;
+					vertical-align: middle;
+					width: 25upx;
+					height: 24upx;
+				}
+
+				>span {
+					vertical-align: middle;
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view:nth-child(2) {
+				vertical-align: middle;
+
+				>span {
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view {
+				display: inline-block;
+			}
+		}
+
+		>view:nth-child(3) {
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				margin-top: 16upx;
+				//用户名
+				>view:nth-child(1) {
+					>span {
+						font-size: 22upx;
+						color: #333333;
+						line-height: 31upx;
+					}
+				}
+
+				>view:nth-child(2) {
+					margin-top: 5upx;
+
+					>span {
+						font-size: 24upx;
+						
+						
+						color: rgba(153, 153, 153, 1);
+					}
+				}
+			}
+
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/component.vue b/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/component.vue
new file mode 100644
index 0000000..0d01ba0
--- /dev/null
+++ b/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/component.vue
@@ -0,0 +1,165 @@
+<template>
+	<canvas v-if="canvasId" :id="canvasId" :canvasId="canvasId" :style="{'width':cWidth*pixelRatio+'px','height':cHeight*pixelRatio+'px', 'transform': 'scale('+(1/pixelRatio)+')','margin-left':-cWidth*(pixelRatio-1)/2+'px','margin-top':-cHeight*(pixelRatio-1)/2+'px'}"
+	 @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" @error="error">
+	</canvas>
+</template>
+
+<script>
+	import uCharts from './u-charts.min.js';
+	var canvases = {};
+	
+	export default {
+		props: {
+			chartType: {
+				required: true,
+				type: String,
+				default: 'column'
+			},
+			opts: {
+				required: true,
+				type: Object,
+				default () {
+					return null;
+				},
+			},
+			canvasId: {
+				type: String,
+				default: 'u-canvas',
+			},
+			cWidth: {
+				default: 375,
+			},
+			cHeight: {
+				default: 250,
+			},
+			pixelRatio: {
+				type: Number,
+				default: 1,
+			},
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			init() {
+				switch (this.chartType) {
+					case 'column':
+						this.initColumnChart();
+						break;
+					case 'line':
+						this.initLineChart();
+						break;
+					default:
+						break;
+				}
+			},
+			initColumnChart() {
+				canvases[this.canvasId] = new uCharts({
+					$this: this,
+					canvasId: this.canvasId,
+					type: 'column',
+					legend: true,
+					fontSize: 11,
+					background: '#FFFFFF',
+					pixelRatio: this.pixelRatio,
+					animation: true,
+					categories: this.opts.categories,
+					series: this.opts.series,
+					enableScroll: true,
+					xAxis: {
+						disableGrid: true,
+						itemCount: 4,
+						scrollShow: true
+					},
+					yAxis: {
+						//disabled:true
+					},
+					dataLabel: true,
+					width: this.cWidth * this.pixelRatio,
+					height: this.cHeight * this.pixelRatio,
+					extra: {
+						column: {
+							type: 'group',
+						}
+					}
+				});
+			},
+			initLineChart() {
+				canvases[this.canvasId] = new uCharts({
+					$this: this,
+					canvasId: this.canvasId,
+					type: 'line',
+					fontSize: 11,
+					legend: true,
+					dataLabel: false,
+					dataPointShape: true,
+					background: '#FFFFFF',
+					pixelRatio: this.pixelRatio,
+					categories: this.opts.categories,
+					series: this.opts.series,
+					animation: true,
+					enableScroll: true,
+					xAxis: {
+						type: 'grid',
+						gridColor: '#CCCCCC',
+						gridType: 'dash',
+						dashLength: 8,
+						itemCount: 4,
+						scrollShow: true
+					},
+					yAxis: {
+						gridType: 'dash',
+						gridColor: '#CCCCCC',
+						dashLength: 8,
+						splitNumber: 5,
+						min: 10,
+						max: 180,
+						format: (val) => {
+							return val.toFixed(0) + '元'
+						}
+					},
+					width: this.cWidth * this.pixelRatio,
+					height: this.cHeight * this.pixelRatio,
+					extra: {
+						line: {
+							type: 'straight'
+						}
+					}
+				});
+			},
+			// 这里仅作为示例传入两个参数，cid为canvas-id,newdata为更新的数据，需要更多参数请自行修改
+			changeData(cid,newdata) {
+				canvases[cid].updateData({
+					series: newdata.series,
+					categories: newdata.categories
+				});
+			},
+			touchStart(e) {
+				canvases[this.canvasId].showToolTip(e, {
+					format: function(item, category) {
+						return category + ' ' + item.name + ':' + item.data
+					}
+				});
+				canvases[this.canvasId].scrollStart(e);
+			},
+			touchMove(e) {
+				canvases[this.canvasId].scroll(e);
+			},
+			touchEnd(e) {
+				canvases[this.canvasId].scrollEnd(e);
+			},
+			error(e) {
+				console.log(e)
+			}
+		},
+	};
+</script>
+
+<style scoped>
+	.charts {
+		width: 100%;
+		height: 100%;
+		flex: 1;
+		background-color: #FFFFFF;
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/u-charts.min.js b/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/u-charts.min.js
new file mode 100644
index 0000000..ba10de5
--- /dev/null
+++ b/pages/subPages/merchant/merchantHome/js_sdk/u-charts/u-charts/u-charts.min.js
@@ -0,0 +1 @@
+'use strict';var config={yAxisWidth:15,yAxisSplit:5,xAxisHeight:15,xAxisLineHeight:15,legendHeight:15,yAxisTitleWidth:15,padding:[10,10,10,10],pixelRatio:1,rotate:!1,columePadding:3,fontSize:13,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:.7,toolTipLineHeight:20,radarLabelTextMargin:15,gaugeLabelTextMargin:15};let assign=function(e,...t){function i(e,t){for(let a in t)e[a]=e[a]&&"[object Object]"===e[a].toString()?i(e[a],t[a]):e[a]=t[a];return e}if(null==e)throw new TypeError("Cannot convert undefined or null to object");return!t||0>=t.length?e:(t.forEach(t=>{e=i(e,t)}),e)};var util={toFixed:function(e,t){return t=t||2,this.isFloat(e)&&(e=e.toFixed(t)),e},isFloat:function(e){return 0!=e%1},approximatelyEqual:function(e,t){return 1e-10>Math.abs(e-t)},isSameSign:function(e,t){var i=Math.abs;return i(e)===e&&i(t)===t||i(e)!==e&&i(t)!==t},isSameXCoordinateArea:function(e,t){return this.isSameSign(e.x,t.x)},isCollision:function(e,t){e.end={},e.end.x=e.start.x+e.width,e.end.y=e.start.y-e.height,t.end={},t.end.x=t.start.x+t.width,t.end.y=t.start.y-t.height;var i=t.start.x>e.end.x||t.end.x<e.start.x||t.end.y>e.start.y||t.start.y<e.end.y;return!i}};function getH5Offset(t){return t.mp={changedTouches:[]},t.mp.changedTouches.push({x:t.offsetX,y:t.offsetY}),t}function hexToRgb(e,t){var i=/^#?([a-f\d])([a-f\d])([a-f\d])$/i,a=e.replace(i,function(e,t,i,a){return t+t+i+i+a+a}),o=/^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(a),n=parseInt(o[1],16),l=parseInt(o[2],16),r=parseInt(o[3],16);return"rgba("+n+","+l+","+r+","+t+")"}function findRange(e,t,i){if(isNaN(e))throw new Error("[uCharts] unvalid series data!");i=i||10,t=t?t:"upper";for(var a=1;1>i;)i*=10,a*=10;for(e="upper"===t?Math.ceil(e*a):Math.floor(e*a);0!=e%i;)"upper"===t?e++:e--;return e/a}function calCandleMA(e,t,i,a){let o=[];for(let n,l=0;l<e.length;l++){n={data:[],name:t[l],color:i[l]};for(let t=0,i=a.length;t<i;t++){if(t<e[l]){n.data.push(null);continue}let i=0;for(let o=0;o<e[l];o++)i+=a[t-o][1];n.data.push(+(i/e[l]).toFixed(3))}o.push(n)}return o}function calValidDistance(e,t,i,a,o){var n=o.width-o.area[1]-o.area[3],l=i.eachSpacing*(o.chartData.xAxisData.xAxisPoints.length-1),r=t;return 0<=t?(r=0,e.event.trigger("scrollLeft")):Math.abs(t)>=l-n&&(r=n-l,e.event.trigger("scrollRight")),r}function isInAngleRange(e,t,i){function a(e){for(;0>e;)e+=2*o;for(;e>2*o;)e-=2*o;return e}var o=Math.PI;return e=a(e),t=a(t),i=a(i),t>i&&(i+=2*o,e<t&&(e+=2*o)),e>=t&&e<=i}function calRotateTranslate(e,t,i){var a=e,o=i-t,n=a+(i-o-a)/1.4142135623730951;n*=-1;return{transX:n,transY:(i-o)*(1.4142135623730951-1)-(i-o-a)/1.4142135623730951}}function createCurveControlPoints(e,t){function i(e,t){return!!(e[t-1]&&e[t+1])&&(e[t].y>=n(e[t-1].y,e[t+1].y)||e[t].y<=o(e[t-1].y,e[t+1].y))}var o=Math.min,n=Math.max,l=.2,a=.2,r=null,s=null,d=null,h=null;if(1>t?(r=e[0].x+(e[1].x-e[0].x)*l,s=e[0].y+(e[1].y-e[0].y)*l):(r=e[t].x+(e[t+1].x-e[t-1].x)*l,s=e[t].y+(e[t+1].y-e[t-1].y)*l),t>e.length-3){var x=e.length-1;d=e[x].x-(e[x].x-e[x-1].x)*a,h=e[x].y-(e[x].y-e[x-1].y)*a}else d=e[t+1].x-(e[t+2].x-e[t].x)*a,h=e[t+1].y-(e[t+2].y-e[t].y)*a;return i(e,t+1)&&(h=e[t+1].y),i(e,t)&&(s=e[t].y),(s>=n(e[t].y,e[t+1].y)||s<=o(e[t].y,e[t+1].y))&&(s=e[t].y),(h>=n(e[t].y,e[t+1].y)||h<=o(e[t].y,e[t+1].y))&&(h=e[t+1].y),{ctrA:{x:r,y:s},ctrB:{x:d,y:h}}}function convertCoordinateOrigin(e,t,i){return{x:i.x+e,y:i.y-t}}function avoidCollision(e,t){if(t)for(;util.isCollision(e,t);)0<e.start.x?e.start.y--:0>e.start.x?e.start.y++:0<e.start.y?e.start.y++:e.start.y--;return e}function fillSeries(e,t,i){var a=0;return e.map(function(e){if(e.color||(e.color=i.colors[a],a=(a+1)%i.colors.length),e.index||(e.index=0),e.type||(e.type=t.type),"undefined"==typeof e.show&&(e.show=!0),e.type||(e.type=t.type),e.pointShape||(e.pointShape="circle"),!e.legendShape)switch(e.type){case"line":e.legendShape="line";break;case"column":e.legendShape="rect";break;case"area":e.legendShape="triangle";break;default:e.legendShape="circle";}return e})}function getDataRange(e,t){var i=0,a=t-e;return i=1e4<=a?1e3:1e3<=a?100:100<=a?10:10<=a?5:1<=a?1:.1<=a?.1:.01<=a?.01:.001<=a?.001:1e-4<=a?1e-4:1e-5<=a?1e-5:1e-6,{minRange:findRange(e,"lower",i),maxRange:findRange(t,"upper",i)}}function measureText(e){var t=1<arguments.length&&arguments[1]!==void 0?arguments[1]:config.fontSize;e=e+"";var e=e.split(""),a=0;for(let t,o=0;o<e.length;o++)t=e[o],a+=/[a-zA-Z]/.test(t)?7:/[0-9]/.test(t)?5.5:/\./.test(t)?2.7:/-/.test(t)?3.25:/[\u4e00-\u9fa5]/.test(t)?10:/\(|\)/.test(t)?3.73:/\s/.test(t)?2.5:/%/.test(t)?8:10;return a*t/10}function dataCombine(e){return e.reduce(function(e,t){return(e.data?e.data:e).concat(t.data)},[])}function dataCombineStack(e,t){for(var o=Array(t),a=0;a<o.length;a++)o[a]=0;for(var n=0;n<e.length;n++)for(var a=0;a<o.length;a++)o[a]+=e[n].data[a];return e.reduce(function(e,t){return(e.data?e.data:e).concat(t.data).concat(o)},[])}function getTouches(t,i,a){let e,o;return t.clientX?i.rotate?(o=i.height-t.clientX*i.pixelRatio,e=(t.pageY-a.currentTarget.offsetTop-i.height/i.pixelRatio/2*(i.pixelRatio-1))*i.pixelRatio):(e=t.clientX*i.pixelRatio,o=(t.pageY-a.currentTarget.offsetTop-i.height/i.pixelRatio/2*(i.pixelRatio-1))*i.pixelRatio):i.rotate?(o=i.height-t.x*i.pixelRatio,e=t.y*i.pixelRatio):(e=t.x*i.pixelRatio,o=t.y*i.pixelRatio),{x:e,y:o}}function getSeriesDataItem(e,t){var i=[];for(let a,o=0;o<e.length;o++)if(a=e[o],null!==a.data[t]&&"undefined"!=typeof a.data[t]&&a.show){let e={};e.color=a.color,e.type=a.type,e.style=a.style,e.pointShape=a.pointShape,e.disableLegend=a.disableLegend,e.name=a.name,e.show=a.show,e.data=a.format?a.format(a.data[t]):a.data[t],i.push(e)}return i}function getMaxTextListLength(e){var t=e.map(function(e){return measureText(e)});return Math.max.apply(null,t)}function getRadarCoordinateSeries(e){for(var t=Math.PI,a=[],o=0;o<e;o++)a.push(2*t/e*o);return a.map(function(e){return-1*e+t/2})}function getToolTipData(e,t,a,i){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:{},n=e.map(function(e){let t=[];return t=i?i:e.data,{text:o.format?o.format(e,t[a]):e.name+": "+e.data,color:e.color}}),l=[],r={x:0,y:0};for(let o,n=0;n<t.length;n++)o=t[n],"undefined"!=typeof o[a]&&null!==o[a]&&l.push(o[a]);for(let o,n=0;n<l.length;n++)o=l[n],r.x=Math.round(o.x),r.y+=o.y;return r.y/=l.length,{textList:n,offset:r}}function getMixToolTipData(e,t,a,i){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:{},n=e.map(function(e){return{text:o.format?o.format(e,i[a]):e.name+": "+e.data,color:e.color,disableLegend:!!e.disableLegend}});n=n.filter(function(e){if(!0!==e.disableLegend)return e});var l=[],r={x:0,y:0};for(let o,n=0;n<t.length;n++)o=t[n],"undefined"!=typeof o[a]&&null!==o[a]&&l.push(o[a]);for(let o,n=0;n<l.length;n++)o=l[n],r.x=Math.round(o.x),r.y+=o.y;return r.y/=l.length,{textList:n,offset:r}}function getCandleToolTipData(e,t,a,o,i,n){6<arguments.length&&void 0!==arguments[6]?arguments[6]:{};let l=n.color.upFill,r=n.color.downFill,s=[l,l,r,l];var d=[];let h={text:i[o],color:null};d.push(h),t.map(function(t){0==o&&0>t.data[1]-t.data[0]?s[1]=r:(t.data[0]<e[o-1][1]&&(s[0]=r),t.data[1]<t.data[0]&&(s[1]=r),t.data[2]>e[o-1][1]&&(s[2]=l),t.data[3]<e[o-1][1]&&(s[3]=r));let i={text:"\u5F00\u76D8\uFF1A"+t.data[0],color:s[0]},a={text:"\u6536\u76D8\uFF1A"+t.data[1],color:s[1]},n={text:"\u6700\u4F4E\uFF1A"+t.data[2],color:s[2]},h={text:"\u6700\u9AD8\uFF1A"+t.data[3],color:s[3]};d.push(i,a,n,h)});var x=[],c={x:0,y:0};for(let l,r=0;r<a.length;r++)l=a[r],"undefined"!=typeof l[o]&&null!==l[o]&&x.push(l[o]);return c.x=Math.round(x[0][0].x),{textList:d,offset:c}}function filterSeries(e){let t=[];for(let a=0;a<e.length;a++)!0==e[a].show&&t.push(e[a]);return t}function findCurrentIndex(e,t,i,a){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:0,n=-1,l=0;let r=[];for(let o=0;o<t[0].length;o++)r.push(t[0][o].x);return("line"==i.type||"area"==i.type)&&"justify"==i.xAxis.boundaryGap&&(l=i.chartData.eachSpacing/2),i.categories||(l=0),isInExactChartArea(e,i,a)&&r.forEach(function(t,i){e.x+o+l>t&&(n=i)}),n}function findLegendIndex(e,t){let i=-1;if(isInExactLegendArea(e,t.area)){let a=t.points,o=-1;for(let t,n=0,l=a.length;n<l;n++){t=a[n];for(let a=0;a<t.length;a++){o+=1;let n=t[a].area;if(e.x>n[0]&&e.x<n[2]&&e.y>n[1]&&e.y<n[3]){i=o;break}}}return i}return i}function isInExactLegendArea(e,t){return e.x>t.start.x&&e.x<t.end.x&&e.y>t.start.y&&e.y<t.end.y}function isInExactChartArea(e,t){return e.x<=t.width-t.area[1]+10&&e.x>=t.area[3]-10&&e.y>=t.area[0]&&e.y<=t.height-t.area[2]}function findRadarChartCurrentIndex(e,t,i){var a=Math.PI,o=2*a/i,n=-1;if(isInExactPieChartArea(e,t.center,t.radius)){var l=function(e){return 0>e&&(e+=2*a),e>2*a&&(e-=2*a),e},r=Math.atan2(t.center.y-e.y,e.x-t.center.x);r=-1*r,0>r&&(r+=2*a);var s=t.angleList.map(function(e){return e=l(-1*e),e});s.forEach(function(e,t){var i=l(e-o/2),s=l(e+o/2);s<i&&(s+=2*a),(r>=i&&r<=s||r+2*a>=i&&r+2*a<=s)&&(n=t)})}return n}function findFunnelChartCurrentIndex(e,t){for(var a,o=-1,n=0,l=t.series.length;n<l;n++)if(a=t.series[n],e.x>a.funnelArea[0]&&e.x<a.funnelArea[2]&&e.y>a.funnelArea[1]&&e.y<a.funnelArea[3]){o=n;break}return o}function findWordChartCurrentIndex(e,t){for(var a,o=-1,n=0,l=t.length;n<l;n++)if(a=t[n],e.x>a.area[0]&&e.x<a.area[2]&&e.y>a.area[1]&&e.y<a.area[3]){o=n;break}return o}function findMapChartCurrentIndex(e,t){for(var a,o=-1,n=t.chartData.mapData,l=t.series,r=pointToCoordinate(e.y,e.x,n.bounds,n.scale,n.xoffset,n.yoffset),s=[r.x,r.y],d=0,h=l.length;d<h;d++)if(a=l[d].geometry.coordinates,isPoiWithinPoly(s,a)){o=d;break}return o}function findPieChartCurrentIndex(e,t){var a=-1;if(isInExactPieChartArea(e,t.center,t.radius)){var o=Math.atan2(t.center.y-e.y,e.x-t.center.x);o=-o;for(var n,l=0,r=t.series.length;l<r;l++)if(n=t.series[l],isInAngleRange(o,n._start_,n._start_+2*n._proportion_*Math.PI)){a=l;break}}return a}function isInExactPieChartArea(e,t,i){var a=Math.pow;return a(e.x-t.x,2)+a(e.y-t.y,2)<=a(i,2)}function splitPoints(e){var t=[],i=[];return e.forEach(function(e){null===e?(i.length&&t.push(i),i=[]):i.push(e)}),i.length&&t.push(i),t}function calLegendData(e,t,i,a){var o=Math.max,n=Math.floor;let l={area:{start:{x:0,y:0},end:{x:0,y:0},width:0,height:0,wholeWidth:0,wholeHeight:0},points:[],widthArr:[],heightArr:[]};if(!1===t.legend.show)return a.legendData=l,l;let r=t.legend.padding,s=t.legend.margin,d=t.legend.fontSize,h=15*t.pixelRatio,x=5*t.pixelRatio,c=o(t.legend.lineHeight*t.pixelRatio,d);if("top"==t.legend.position||"bottom"==t.legend.position){let a=[],n=0,p=[],g=[];for(let o=0;o<e.length;o++){let i=e[o],l=h+x+measureText(i.name||"undefined",d)+t.legend.itemGap;n+l>t.width-t.padding[1]-t.padding[3]?(a.push(g),p.push(n-t.legend.itemGap),n=l,g=[i]):(n+=l,g.push(i))}if(g.length){a.push(g),p.push(n-t.legend.itemGap),l.widthArr=p;let e=o.apply(null,p);switch(t.legend.float){case"left":l.area.start.x=t.padding[3],l.area.end.x=t.padding[3]+2*r;break;case"right":l.area.start.x=t.width-t.padding[1]-e-2*r,l.area.end.x=t.width-t.padding[1];break;default:l.area.start.x=(t.width-e)/2-r,l.area.end.x=(t.width+e)/2+r;}l.area.width=e+2*r,l.area.wholeWidth=e+2*r,l.area.height=a.length*c+2*r,l.area.wholeHeight=a.length*c+2*r+2*s,l.points=a}}else{let i=e.length,a=t.height-t.padding[0]-t.padding[2]-2*s-2*r,o=Math.min(n(a/c),i);switch(l.area.height=o*c+2*r,l.area.wholeHeight=o*c+2*r,t.legend.float){case"top":l.area.start.y=t.padding[0]+s,l.area.end.y=t.padding[0]+s+l.area.height;break;case"bottom":l.area.start.y=t.height-t.padding[2]-s-l.area.height,l.area.end.y=t.height-t.padding[2]-s;break;default:l.area.start.y=(t.height-l.area.height)/2,l.area.end.y=(t.height+l.area.height)/2;}let p=0==i%o?i/o:n(i/o+1),g=[];for(let t,a=0;a<p;a++)t=e.slice(a*o,a*o+o),g.push(t);if(l.points=g,g.length){for(let e=0;e<g.length;e++){let i=g[e],a=0;for(let e,o=0;o<i.length;o++)e=h+x+measureText(i[o].name||"undefined",d)+t.legend.itemGap,e>a&&(a=e);l.widthArr.push(a),l.heightArr.push(i.length*c+2*r)}let e=0;for(let t=0;t<l.widthArr.length;t++)e+=l.widthArr[t];l.area.width=e-t.legend.itemGap+2*r,l.area.wholeWidth=l.area.width+r}}switch(t.legend.position){case"top":l.area.start.y=t.padding[0]+s,l.area.end.y=t.padding[0]+s+l.area.height;break;case"bottom":l.area.start.y=t.height-t.padding[2]-l.area.height-s,l.area.end.y=t.height-t.padding[2]-s;break;case"left":l.area.start.x=t.padding[3],l.area.end.x=t.padding[3]+l.area.width;break;case"right":l.area.start.x=t.width-t.padding[1]-l.area.width,l.area.end.x=t.width-t.padding[1];}return a.legendData=l,l}function calCategoriesData(e,t,i,a){var o={angle:0,xAxisHeight:i.xAxisHeight},n=e.map(function(e){return measureText(e,t.xAxis.fontSize||i.fontSize)}),l=Math.max.apply(this,n);return!0==t.xAxis.rotateLabel&&l+2*i.xAxisTextPadding>a&&(o.angle=45*Math.PI/180,o.xAxisHeight=2*i.xAxisTextPadding+l*Math.sin(o.angle)),o}function getXAxisTextList(e,t){var a=Math.min,o=Math.max,n=4<arguments.length&&void 0!==arguments[4]?arguments[4]:-1,l=dataCombine(e),r=[];l=l.filter(function(e){return"object"==typeof e&&null!==e?e.constructor==Array?null!==e:null!==e.value:null!==e}),l.map(function(e){"object"==typeof e?e.constructor==Array?"candle"==t.type?e.map(function(e){r.push(e)}):r.push(e[0]):r.push(e.value):r.push(e)});var s=0,d=0;if(0<r.length&&(s=a.apply(this,r),d=o.apply(this,r)),-1<n?("number"==typeof t.xAxis.data[n].min&&(s=a(t.xAxis.data[n].min,s)),"number"==typeof t.xAxis.data[n].max&&(d=o(t.xAxis.data[n].max,d))):("number"==typeof t.xAxis.min&&(s=a(t.xAxis.min,s)),"number"==typeof t.xAxis.max&&(d=o(t.xAxis.max,d))),s===d){var h=d||10;d+=h}for(var x=getDataRange(s,d),c=x.minRange,p=x.maxRange,g=[],y=(p-c)/t.xAxis.splitNumber,f=0;f<=t.xAxis.splitNumber;f++)g.push(c+y*f);return g}function calXAxisData(e,t,i){var a={angle:0,xAxisHeight:i.xAxisHeight};a.ranges=getXAxisTextList(e,t,i),a.rangesFormat=a.ranges.map(function(e){return e=t.xAxis.format?t.xAxis.format(e):util.toFixed(e,2),e});var o=a.ranges.map(function(e){return e=util.toFixed(e,2),e=t.xAxis.format?t.xAxis.format(+e):e,e});a=Object.assign(a,getXAxisPoints(o,t,i));var n=a.eachSpacing,l=o.map(function(e){return measureText(e)}),r=Math.max.apply(this,l);return r+2*i.xAxisTextPadding>n&&(a.angle=45*Math.PI/180,a.xAxisHeight=2*i.xAxisTextPadding+r*Math.sin(a.angle)),!0===t.xAxis.disabled&&(a.xAxisHeight=0),a}function getRadarDataPoints(e,t,i,a,o){var n=Math.max,l=5<arguments.length&&void 0!==arguments[5]?arguments[5]:1,r=o.extra.radar||{};r.max=r.max||0;var s=n(r.max,n.apply(null,dataCombine(a))),d=[];for(let n=0;n<a.length;n++){let o=a[n],r={};r.color=o.color,r.legendShape=o.legendShape,r.pointShape=o.pointShape,r.data=[],o.data.forEach(function(a,o){let n={};n.angle=e[o],n.proportion=a/s,n.position=convertCoordinateOrigin(i*n.proportion*l*Math.cos(n.angle),i*n.proportion*l*Math.sin(n.angle),t),r.data.push(n)}),d.push(r)}return d}function getPieDataPoints(e,t){var a=2<arguments.length&&arguments[2]!==void 0?arguments[2]:1,o=0,n=0;for(let a,n=0;n<e.length;n++)a=e[n],a.data=null===a.data?0:a.data,o+=a.data;for(let n,l=0;l<e.length;l++)n=e[l],n.data=null===n.data?0:n.data,n._proportion_=0===o?1/e.length*a:n.data/o*a,n._radius_=t;for(let a,o=0;o<e.length;o++)a=e[o],a._start_=n,n+=2*a._proportion_*Math.PI;return e}function getFunnelDataPoints(e,t){var a=2<arguments.length&&arguments[2]!==void 0?arguments[2]:1;e=e.sort(function(e,t){return parseInt(t.data)-parseInt(e.data)});for(let o=0;o<e.length;o++)e[o].radius=e[o].data/e[0].data*t*a,e[o]._proportion_=e[o].data/e[0].data;return e.reverse()}function getRoseDataPoints(e,t,a,o){var n=4<arguments.length&&arguments[4]!==void 0?arguments[4]:1,l=0,r=0,s=[];for(let n,r=0;r<e.length;r++)n=e[r],n.data=null===n.data?0:n.data,l+=n.data,s.push(n.data);var d=Math.min.apply(null,s),h=Math.max.apply(null,s);for(let r,s=0;s<e.length;s++)r=e[s],r.data=null===r.data?0:r.data,0===l||"area"==t?(r._proportion_=r.data/l*n,r._rose_proportion_=1/e.length*n):(r._proportion_=r.data/l*n,r._rose_proportion_=r.data/l*n),r._radius_=a+(o-a)*((r.data-d)/(h-d));for(let n,l=0;l<e.length;l++)n=e[l],n._start_=r,r+=2*n._rose_proportion_*Math.PI;return e}function getArcbarDataPoints(e,t){var a=2<arguments.length&&arguments[2]!==void 0?arguments[2]:1;1==a&&(a=.999999);for(let o,n=0;n<e.length;n++){o=e[n],o.data=null===o.data?0:o.data;let i;i="circle"==t.type?2:t.endAngle<t.startAngle?2+t.endAngle-t.startAngle:t.startAngle-t.endAngle,o._proportion_=i*o.data*a+t.startAngle,2<=o._proportion_&&(o._proportion_%=2)}return e}function getGaugeAxisPoints(e,t,a){let o=t;for(let n=0;n<e.length;n++)e[n].value=null===e[n].value?0:e[n].value,e[n]._startAngle_=o,e[n]._endAngle_=(t-a+1)*e[n].value+t,2<=e[n]._endAngle_&&(e[n]._endAngle_%=2),o=e[n]._endAngle_;return e}function getGaugeDataPoints(e,t,a){let o=3<arguments.length&&arguments[3]!==void 0?arguments[3]:1;for(let n,l=0;l<e.length;l++){if(n=e[l],n.data=null===n.data?0:n.data,"auto"==a.pointer.color){for(let e=0;e<t.length;e++)if(n.data<=t[e].value){n.color=t[e].color;break}}else n.color=a.pointer.color;let i=a.startAngle-a.endAngle+1;n._endAngle_=i*n.data+a.startAngle,n._oldAngle_=a.oldAngle,a.oldAngle<a.endAngle&&(n._oldAngle_+=2),n._proportion_=n.data>=a.oldData?(n._endAngle_-n._oldAngle_)*o+a.oldAngle:n._oldAngle_-(n._oldAngle_-n._endAngle_)*o,2<=n._proportion_&&(n._proportion_%=2)}return e}function getPieTextMaxLength(e){e=getPieDataPoints(e);let t=0;for(let a=0;a<e.length;a++){let i=e[a],o=i.format?i.format(+i._proportion_.toFixed(2)):util.toFixed(100*i._proportion_)+"%";t=Math.max(t,measureText(o))}return t}function fixColumeData(e,t,i,a,o,n){return e.map(function(e){return null===e?null:(e.width=Math.ceil((t-2*o.columePadding)/i),n.extra.column&&n.extra.column.width&&0<+n.extra.column.width&&(e.width=Math.min(e.width,+n.extra.column.width)),0>=e.width&&(e.width=1),e.x+=(a+.5-i/2)*e.width,e)})}function fixColumeMeterData(e,t,i,a,o,n,l){return e.map(function(e){return null===e?null:(e.width=Math.ceil((t-2*o.columePadding)/2),n.extra.column&&n.extra.column.width&&0<+n.extra.column.width&&(e.width=Math.min(e.width,+n.extra.column.width)),0<a&&(e.width-=2*l),e)})}function fixColumeStackData(e,t,i,a,o,n){return e.map(function(e){return null===e?null:(e.width=Math.ceil((t-2*o.columePadding)/2),n.extra.column&&n.extra.column.width&&0<+n.extra.column.width&&(e.width=Math.min(e.width,+n.extra.column.width)),e)})}function getXAxisPoints(e,t){var i=t.width-t.area[1]-t.area[3],a=t.enableScroll?Math.min(t.xAxis.itemCount,e.length):e.length;("line"==t.type||"area"==t.type)&&1<a&&"justify"==t.xAxis.boundaryGap&&(a-=1);var o=i/a,n=[],l=t.area[3],r=t.width-t.area[1];return e.forEach(function(e,t){n.push(l+t*o)}),"justify"!==t.xAxis.boundaryGap&&(!0===t.enableScroll?n.push(l+e.length*o):n.push(r)),{xAxisPoints:n,startX:l,endX:r,eachSpacing:o}}function getCandleDataPoints(e,t,i,a,o,n){var l=Math.round,r=7<arguments.length&&void 0!==arguments[7]?arguments[7]:1,s=[],d=n.height-n.area[0]-n.area[2];return e.forEach(function(e,h){if(null===e)s.push(null);else{var x=[];e.forEach(function(e){var s={x:a[h]+l(o/2)},c=e.value||e,p=d*(c-t)/(i-t);p*=r,s.y=n.height-l(p)-n.area[2],x.push(s)}),s.push(x)}}),s}function getDataPoints(e,t,i,a,o,n){var l=Math.round,r=7<arguments.length&&void 0!==arguments[7]?arguments[7]:1,s="center";("line"==n.type||"area"==n.type)&&(s=n.xAxis.boundaryGap);var d=[],h=n.height-n.area[0]-n.area[2],x=n.width-n.area[1]-n.area[3];return e.forEach(function(e,c){if(null===e)d.push(null);else{var p={color:e.color,x:a[c]},g=e;if("object"==typeof e&&null!==e)if(e.constructor==Array){let t,i,a;t=[].concat(n.chartData.xAxisData.ranges),i=t.shift(),a=t.pop(),g=e[1],p.x=n.area[3]+x*(e[0]-i)/(a-i)}else g=e.value;"center"==s&&(p.x+=l(o/2));var y=h*(g-t)/(i-t);y*=r,p.y=n.height-l(y)-n.area[2],d.push(p)}}),d}function getStackDataPoints(e,t,i,a,o,n,l,r,s){var d=Math.round,h=9<arguments.length&&void 0!==arguments[9]?arguments[9]:1,x=[],c=n.height-n.area[0]-n.area[2];return e.forEach(function(e,l){if(null===e)x.push(null);else{var p={color:e.color,x:a[l]+d(o/2)};if(0<r){var g=0;for(let e=0;e<=r;e++)g+=s[e].data[l];var y=g-e,f=c*(g-t)/(i-t),u=c*(y-t)/(i-t)}else var g=e,f=c*(g-t)/(i-t),u=0;var m=u;f*=h,m*=h,p.y=n.height-d(f)-n.area[2],p.y0=n.height-d(m)-n.area[2],x.push(p)}}),x}function getYAxisTextList(e,t,a,o){var n,l=Math.min,r=Math.max,s=4<arguments.length&&void 0!==arguments[4]?arguments[4]:-1;n="stack"==o?dataCombineStack(e,t.categories.length):dataCombine(e);var d=[];n=n.filter(function(e){return"object"==typeof e&&null!==e?e.constructor==Array?null!==e:null!==e.value:null!==e}),n.map(function(e){"object"==typeof e?e.constructor==Array?"candle"==t.type?e.map(function(e){d.push(e)}):d.push(e[1]):d.push(e.value):d.push(e)});var h=0,x=0;if(0<d.length&&(h=l.apply(this,d),x=r.apply(this,d)),-1<s?("number"==typeof t.yAxis.data[s].min&&(h=l(t.yAxis.data[s].min,h)),"number"==typeof t.yAxis.data[s].max&&(x=r(t.yAxis.data[s].max,x))):("number"==typeof t.yAxis.min&&(h=l(t.yAxis.min,h)),"number"==typeof t.yAxis.max&&(x=r(t.yAxis.max,x))),h===x){var c=x||10;x+=c}for(var p=getDataRange(h,x),g=p.minRange,y=p.maxRange,f=[],u=(y-g)/t.yAxis.splitNumber,m=0;m<=t.yAxis.splitNumber;m++)f.push(g+u*m);return f.reverse()}function calYAxisData(e,t,a){var o=Math.max,n=assign({},{type:""},t.extra.column),l=t.yAxis.data.length,r=Array(l);if(0<l){for(let t=0;t<l;t++){r[t]=[];for(let i=0;i<e.length;i++)e[i].index==t&&r[t].push(e[i])}var s=Array(l),d=Array(l),h=Array(l);for(let e,x=0;x<l;x++){e=t.yAxis.data[x],!0==t.yAxis.disabled&&(e.disabled=!0),s[x]=getYAxisTextList(r[x],t,a,n.type,x);let i=e.fontSize||a.fontSize;h[x]={position:e.position?e.position:"left",width:0},d[x]=s[x].map(function(t){return t=util.toFixed(t,6),t=e.format?e.format(+t):t,h[x].width=o(h[x].width,measureText(t,i)+5),t});let l=e.calibration?4*t.pixelRatio:0;h[x].width+=l+3*t.pixelRatio,!0===e.disabled&&(h[x].width=0)}}else{var s=[,],d=[,],h=[,];s[0]=getYAxisTextList(e,t,a,n.type),h[0]={position:"left",width:0};var i=t.yAxis.fontSize||a.fontSize;d[0]=s[0].map(function(e){return e=util.toFixed(e,6),e=t.yAxis.format?t.yAxis.format(+e):e,h[0].width=o(h[0].width,measureText(e,i)+5),e}),h[0].width+=3*t.pixelRatio,!0===t.yAxis.disabled?(h[0]={position:"left",width:0},t.yAxis.data[0]={disabled:!0}):t.yAxis.data[0]={disabled:!1,position:"left",max:t.yAxis.max,min:t.yAxis.min,format:t.yAxis.format}}return{rangesFormat:d,ranges:s,yAxisWidth:h}}function calTooltipYAxisData(e,t,a){let o=[].concat(a.chartData.yAxisData.ranges),n=a.height-a.area[0]-a.area[2],l=a.area[0],r=[];for(let s=0;s<o.length;s++){let t=o[s].shift(),i=o[s].pop(),d=t-(t-i)*(e-l)/n;d=a.yAxis.data[s].format?a.yAxis.data[s].format(+d):d.toFixed(0),r.push(d+"")}return r}function calMarkLineData(e,t){let a,o,n=t.height-t.area[0]-t.area[2];for(let l=0;l<e.length;l++){e[l].yAxisIndex=e[l].yAxisIndex?e[l].yAxisIndex:0;let i=[].concat(t.chartData.yAxisData.ranges[e[l].yAxisIndex]);a=i.pop(),o=i.shift();let r=n*(e[l].value-a)/(o-a);e[l].y=t.height-Math.round(r)-t.area[2]}return e}function contextRotate(e,t){var i=Math.PI;!0===t.rotateLock?!0!==t._rotate_&&(e.translate(t.height,0),e.rotate(90*i/180),t._rotate_=!0):(e.translate(t.height,0),e.rotate(90*i/180))}function drawPointShape(e,t,i,a,o){a.beginPath(),"hollow"==o.dataPointShapeType?(a.setStrokeStyle(t),a.setFillStyle(o.background),a.setLineWidth(2*o.pixelRatio)):(a.setStrokeStyle("#ffffff"),a.setFillStyle(t),a.setLineWidth(1*o.pixelRatio)),"diamond"===i?e.forEach(function(e){null!==e&&(a.moveTo(e.x,e.y-4.5),a.lineTo(e.x-4.5,e.y),a.lineTo(e.x,e.y+4.5),a.lineTo(e.x+4.5,e.y),a.lineTo(e.x,e.y-4.5))}):"circle"===i?e.forEach(function(e){null!==e&&(a.moveTo(e.x+2.5*o.pixelRatio,e.y),a.arc(e.x,e.y,3*o.pixelRatio,0,2*Math.PI,!1))}):"rect"===i?e.forEach(function(e){null!==e&&(a.moveTo(e.x-3.5,e.y-3.5),a.rect(e.x-3.5,e.y-3.5,7,7))}):"triangle"==i&&e.forEach(function(e){null!==e&&(a.moveTo(e.x,e.y-4.5),a.lineTo(e.x-4.5,e.y+4.5),a.lineTo(e.x+4.5,e.y+4.5),a.lineTo(e.x,e.y-4.5))}),a.closePath(),a.fill(),a.stroke()}function drawRingTitle(e,t,i,a){var o=e.title.fontSize||t.titleFontSize,n=e.subtitle.fontSize||t.subtitleFontSize,l=e.title.name||"",r=e.subtitle.name||"",s=e.title.color||t.titleColor,d=e.subtitle.color||t.subtitleColor,h=l?o:0,x=r?n:0,c=5;if(r){var p=measureText(r,n),g=a.x-p/2+(e.subtitle.offsetX||0),y=a.y+n/2+(e.subtitle.offsetY||0);l&&(y+=(h+c)/2),i.beginPath(),i.setFontSize(n),i.setFillStyle(d),i.fillText(r,g,y),i.closePath(),i.stroke()}if(l){var f=measureText(l,o),u=a.x-f/2+(e.title.offsetX||0),m=a.y+o/2+(e.title.offsetY||0);r&&(m-=(x+c)/2),i.beginPath(),i.setFontSize(o),i.setFillStyle(s),i.fillText(l,u,m),i.closePath(),i.stroke()}}function drawPointText(e,t,i,a){var o=t.data;e.forEach(function(e,n){if(null!==e){a.beginPath(),a.setFontSize(t.textSize||i.fontSize),a.setFillStyle(t.textColor||"#666666");var l=o[n];"object"==typeof o[n]&&null!==o[n]&&(o[n].constructor==Array?l=o[n][1]:l=o[n].value);var r=t.format?t.format(l):l;a.fillText(r+"",e.x-measureText(r,t.textSize||i.fontSize)/2,e.y-4),a.closePath(),a.stroke()}})}function drawGaugeLabel(e,t,i,a,o,n){var l=Math.PI;t-=e.width/2+o.gaugeLabelTextMargin;let r=e.startAngle-e.endAngle+1,s=r/e.splitLine.splitNumber,d=e.endNumber-e.startNumber,h=d/e.splitLine.splitNumber,x=e.startAngle,c=e.startNumber;for(let r=0;r<e.splitLine.splitNumber+1;r++){var p={x:t*Math.cos(x*l),y:t*Math.sin(x*l)},g=e.labelFormat?e.labelFormat(c):c;p.x+=i.x-measureText(g)/2,p.y+=i.y;var y=p.x,f=p.y;n.beginPath(),n.setFontSize(o.fontSize),n.setFillStyle(e.labelColor||"#666666"),n.fillText(g,y,f+o.fontSize/2),n.closePath(),n.stroke(),x+=s,2<=x&&(x%=2),c+=h}}function drawRadarLabel(e,t,i,a,o,n){var l=a.extra.radar||{};t+=o.radarLabelTextMargin,e.forEach(function(e,r){var s={x:t*Math.cos(e),y:t*Math.sin(e)},d=convertCoordinateOrigin(s.x,s.y,i),h=d.x,x=d.y;util.approximatelyEqual(s.x,0)?h-=measureText(a.categories[r]||"")/2:0>s.x&&(h-=measureText(a.categories[r]||"")),n.beginPath(),n.setFontSize(o.fontSize),n.setFillStyle(l.labelColor||"#666666"),n.fillText(a.categories[r]||"",h,x+o.fontSize/2),n.closePath(),n.stroke()})}function drawPieText(e,t,a,o,i,n){var l=Math.cos,r=Math.sin,s=Math.min,d=Math.max,h=Math.PI,x=a.pieChartLinePadding,c=[],p=null,g=e.map(function(e){var t=e.format?e.format(+e._proportion_.toFixed(2)):util.toFixed(100*e._proportion_.toFixed(4))+"%";e._rose_proportion_&&(e._proportion_=e._rose_proportion_);var i=2*h-(e._start_+2*h*e._proportion_/2),a=e.color,o=e._radius_;return{arc:i,text:t,color:a,radius:o,textColor:e.textColor,textSize:e.textSize}});for(let h=0;h<g.length;h++){let e=g[h],t=l(e.arc)*(e.radius+x),i=r(e.arc)*(e.radius+x),o=l(e.arc)*e.radius,n=r(e.arc)*e.radius,y=0<=t?t+a.pieChartTextPadding:t-a.pieChartTextPadding,f=i,u=measureText(e.text,e.textSize||a.fontSize),m=f;p&&util.isSameXCoordinateArea(p.start,{x:y})&&(0<y?m=s(f,p.start.y):0>t?m=d(f,p.start.y):0<f?m=d(f,p.start.y):m=s(f,p.start.y)),0>y&&(y-=u);let S={lineStart:{x:o,y:n},lineEnd:{x:t,y:i},start:{x:y,y:m},width:u,height:a.fontSize,text:e.text,color:e.color,textColor:e.textColor,textSize:e.textSize};p=avoidCollision(S,p),c.push(p)}for(let l=0;l<c.length;l++){let e=c[l],i=convertCoordinateOrigin(e.lineStart.x,e.lineStart.y,n),r=convertCoordinateOrigin(e.lineEnd.x,e.lineEnd.y,n),s=convertCoordinateOrigin(e.start.x,e.start.y,n);o.setLineWidth(1*t.pixelRatio),o.setFontSize(a.fontSize),o.beginPath(),o.setStrokeStyle(e.color),o.setFillStyle(e.color),o.moveTo(i.x,i.y);let d=0>e.start.x?s.x+e.width:s.x,x=0>e.start.x?s.x-5:s.x+5;o.quadraticCurveTo(r.x,r.y,d,s.y),o.moveTo(i.x,i.y),o.stroke(),o.closePath(),o.beginPath(),o.moveTo(s.x+e.width,s.y),o.arc(d,s.y,2,0,2*h),o.closePath(),o.fill(),o.beginPath(),o.setFontSize(e.textSize||a.fontSize),o.setFillStyle(e.textColor||"#666666"),o.fillText(e.text,x,s.y+3),o.closePath(),o.stroke(),o.closePath()}}function drawToolTipSplitLine(e,t,i,a){var o=t.extra.tooltip||{};o.gridType=null==o.gridType?"solid":o.gridType,o.dashLength=null==o.dashLength?4:o.dashLength;var n=t.area[0],l=t.height-t.area[2];if("dash"==o.gridType&&a.setLineDash([o.dashLength,o.dashLength]),a.setStrokeStyle(o.gridColor||"#cccccc"),a.setLineWidth(1*t.pixelRatio),a.beginPath(),a.moveTo(e,n),a.lineTo(e,l),a.stroke(),a.setLineDash([]),o.xAxisLabel){let n=t.categories[t.tooltip.index];a.setFontSize(i.fontSize);let r=measureText(n,i.fontSize),s=e-.5*r,d=l;a.beginPath(),a.setFillStyle(hexToRgb(o.labelBgColor||i.toolTipBackground,o.labelBgOpacity||i.toolTipOpacity)),a.setStrokeStyle(o.labelBgColor||i.toolTipBackground),a.setLineWidth(1*t.pixelRatio),a.rect(s-i.toolTipPadding,d,r+2*i.toolTipPadding,i.fontSize+2*i.toolTipPadding),a.closePath(),a.stroke(),a.fill(),a.beginPath(),a.setFontSize(i.fontSize),a.setFillStyle(o.labelFontColor||i.fontColor),a.fillText(n+"",s,d+i.toolTipPadding+i.fontSize),a.closePath(),a.stroke()}}function drawMarkLine(e,t,a){let o=assign({},{type:"solid",dashLength:4,data:[]},e.extra.markLine),n=e.area[3],l=e.width-e.area[1],r=calMarkLineData(o.data,e);for(let s,d=0;d<r.length;d++)if(s=assign({},{lineColor:"#DE4A42",showLabel:!1,labelFontColor:"#666666",labelBgColor:"#DFE8FF",labelBgOpacity:.8,yAxisIndex:0},r[d]),"dash"==o.type&&a.setLineDash([o.dashLength,o.dashLength]),a.setStrokeStyle(s.lineColor),a.setLineWidth(1*e.pixelRatio),a.beginPath(),a.moveTo(n,s.y),a.lineTo(l,s.y),a.stroke(),a.setLineDash([]),s.showLabel){let i=e.yAxis.format?e.yAxis.format(+s.value):s.value;a.setFontSize(t.fontSize);let o=measureText(i,t.fontSize),n=e.padding[3]+t.yAxisTitleWidth-t.toolTipPadding,l=Math.max(e.area[3],o+2*t.toolTipPadding),r=l-n,d=s.y;a.setFillStyle(hexToRgb(s.labelBgColor,s.labelBgOpacity)),a.setStrokeStyle(s.labelBgColor),a.setLineWidth(1*e.pixelRatio),a.beginPath(),a.rect(n,d-.5*t.fontSize-t.toolTipPadding,r,t.fontSize+2*t.toolTipPadding),a.closePath(),a.stroke(),a.fill(),a.beginPath(),a.setFontSize(t.fontSize),a.setFillStyle(s.labelFontColor),a.fillText(i+"",n+(r-o)/2,d+.5*t.fontSize),a.stroke()}}function drawToolTipHorizentalLine(e,t,a,i){var o=Math.max,n=assign({},{gridType:"solid",dashLength:4},e.extra.tooltip),l=e.area[3],r=e.width-e.area[1];if("dash"==n.gridType&&a.setLineDash([n.dashLength,n.dashLength]),a.setStrokeStyle(n.gridColor||"#cccccc"),a.setLineWidth(1*e.pixelRatio),a.beginPath(),a.moveTo(l,e.tooltip.offset.y),a.lineTo(r,e.tooltip.offset.y),a.stroke(),a.setLineDash([]),n.yAxisLabel){let l=calTooltipYAxisData(e.tooltip.offset.y,e.series,e,t,i),r=e.chartData.yAxisData.yAxisWidth,s=e.area[3],d=e.width-e.area[1];for(let h=0;h<l.length;h++){a.setFontSize(t.fontSize);let i,x,c,p=measureText(l[h],t.fontSize);"left"==r[h].position?(i=s-r[h].width,x=o(i,i+p+2*t.toolTipPadding)):(i=d,x=o(i+r[h].width,i+p+2*t.toolTipPadding)),c=x-i;let g=i+(c-p)/2,y=e.tooltip.offset.y;a.beginPath(),a.setFillStyle(hexToRgb(n.labelBgColor||t.toolTipBackground,n.labelBgOpacity||t.toolTipOpacity)),a.setStrokeStyle(n.labelBgColor||t.toolTipBackground),a.setLineWidth(1*e.pixelRatio),a.rect(i,y-.5*t.fontSize-t.toolTipPadding,c,t.fontSize+2*t.toolTipPadding),a.closePath(),a.stroke(),a.fill(),a.beginPath(),a.setFontSize(t.fontSize),a.setFillStyle(n.labelFontColor||t.fontColor),a.fillText(l[h],g,y+.5*t.fontSize),a.closePath(),a.stroke(),"left"==r[h].position?s-=r[h].width+e.yAxis.padding:d+=r[h].width+e.yAxis.padding}}}function drawToolTipSplitArea(e,t,i,a,o){var n=assign({},{activeBgColor:"#000000",activeBgOpacity:.08},t.extra.tooltip),l=t.area[0],r=t.height-t.area[2];a.beginPath(),a.setFillStyle(hexToRgb(n.activeBgColor,n.activeBgOpacity)),a.rect(e-o/2,l,o,r-l),a.closePath(),a.fill()}function drawToolTip(e,t,i,a,o){var n=Math.round,l=assign({},{showBox:!0,bgColor:"#000000",bgOpacity:.7,fontColor:"#FFFFFF"},i.extra.tooltip),r=4*i.pixelRatio,s=5*i.pixelRatio,d=8*i.pixelRatio,h=!1;("line"==i.type||"area"==i.type||"candle"==i.type||"mix"==i.type)&&drawToolTipSplitLine(i.tooltip.offset.x,i,a,o),t=assign({x:0,y:0},t),t.y-=8*i.pixelRatio;var x=e.map(function(e){return measureText(e.text,a.fontSize)}),c=r+s+4*a.toolTipPadding+Math.max.apply(null,x),p=2*a.toolTipPadding+e.length*a.toolTipLineHeight;!1==l.showBox||(t.x-Math.abs(i._scrollDistance_)+d+c>i.width&&(h=!0),p+t.y>i.height&&(t.y=i.height-p),o.beginPath(),o.setFillStyle(hexToRgb(l.bgColor||a.toolTipBackground,l.bgOpacity||a.toolTipOpacity)),h?(o.moveTo(t.x,t.y+10*i.pixelRatio),o.lineTo(t.x-d,t.y+10*i.pixelRatio-5*i.pixelRatio),o.lineTo(t.x-d,t.y),o.lineTo(t.x-d-n(c),t.y),o.lineTo(t.x-d-n(c),t.y+p),o.lineTo(t.x-d,t.y+p),o.lineTo(t.x-d,t.y+10*i.pixelRatio+5*i.pixelRatio),o.lineTo(t.x,t.y+10*i.pixelRatio)):(o.moveTo(t.x,t.y+10*i.pixelRatio),o.lineTo(t.x+d,t.y+10*i.pixelRatio-5*i.pixelRatio),o.lineTo(t.x+d,t.y),o.lineTo(t.x+d+n(c),t.y),o.lineTo(t.x+d+n(c),t.y+p),o.lineTo(t.x+d,t.y+p),o.lineTo(t.x+d,t.y+10*i.pixelRatio+5*i.pixelRatio),o.lineTo(t.x,t.y+10*i.pixelRatio)),o.closePath(),o.fill(),e.forEach(function(e,i){if(null!==e.color){o.beginPath(),o.setFillStyle(e.color);var n=t.x+d+2*a.toolTipPadding,l=t.y+(a.toolTipLineHeight-a.fontSize)/2+a.toolTipLineHeight*i+a.toolTipPadding+1;h&&(n=t.x-c-d+2*a.toolTipPadding),o.fillRect(n,l,r,a.fontSize),o.closePath()}}),e.forEach(function(e,i){var n=t.x+d+2*a.toolTipPadding+r+s;h&&(n=t.x-c-d+2*a.toolTipPadding+ +r+s);var x=t.y+(a.toolTipLineHeight-a.fontSize)/2+a.toolTipLineHeight*i+a.toolTipPadding;o.beginPath(),o.setFontSize(a.fontSize),o.setFillStyle(l.fontColor),o.fillText(e.text,n,x+a.fontSize),o.closePath(),o.stroke()}))}function drawYAxisTitle(e,t,i,a){var o=i.xAxisHeight+(t.height-i.xAxisHeight-measureText(e))/2;a.save(),a.beginPath(),a.setFontSize(i.fontSize),a.setFillStyle(t.yAxis.titleFontColor||"#333333"),a.translate(0,t.height),a.rotate(-90*Math.PI/180),a.fillText(e,o,t.padding[3]+.5*i.fontSize),a.closePath(),a.stroke(),a.restore()}function drawColumnDataPoints(e,t,i,a){let o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,n=t.chartData.xAxisData,l=n.xAxisPoints,r=n.eachSpacing,s=assign({},{type:"group",width:r/2,meter:{border:4,fillColor:"#FFFFFF"}},t.extra.column),d=[];a.save();let h=-2,x=l.length+2;return t._scrollDistance_&&0!==t._scrollDistance_&&!0===t.enableScroll&&(a.translate(t._scrollDistance_,0),h=Math.floor(-t._scrollDistance_/r)-2,x=h+t.xAxis.itemCount+4),t.tooltip&&t.tooltip.textList&&t.tooltip.textList.length&&1===o&&drawToolTipSplitArea(t.tooltip.offset.x,t,i,a,r),e.forEach(function(n,c){let p,g,y;p=[].concat(t.chartData.yAxisData.ranges[n.index]),g=p.pop(),y=p.shift();var f=n.data;switch(s.type){case"group":var u=getDataPoints(f,g,y,l,r,t,i,o),m=getStackDataPoints(f,g,y,l,r,t,i,c,e,o);d.push(m),u=fixColumeData(u,r,e.length,c,i,t);for(let e,o=0;o<u.length;o++)if(e=u[o],null!==e&&o>h&&o<x){a.beginPath(),a.setStrokeStyle(e.color||n.color),a.setLineWidth(1),a.setFillStyle(e.color||n.color);var S=e.x-e.width/2,T=t.height-e.y-t.area[2];a.moveTo(S-1,e.y),a.lineTo(S+e.width-2,e.y),a.lineTo(S+e.width-2,t.height-t.area[2]),a.lineTo(S,t.height-t.area[2]),a.lineTo(S,e.y),a.closePath(),a.stroke(),a.fill()};break;case"stack":var u=getStackDataPoints(f,g,y,l,r,t,i,c,e,o);d.push(u),u=fixColumeStackData(u,r,e.length,c,i,t,e);for(let e,o=0;o<u.length;o++)if(e=u[o],null!==e&&o>h&&o<x){a.beginPath(),a.setFillStyle(e.color||n.color);var S=e.x-e.width/2+1,T=t.height-e.y-t.area[2],A=t.height-e.y0-t.area[2];0<c&&(T-=A),a.moveTo(S,e.y),a.fillRect(S,e.y,e.width-2,T),a.closePath(),a.fill()};break;case"meter":var u=getDataPoints(f,g,y,l,r,t,i,o);if(d.push(u),u=fixColumeMeterData(u,r,e.length,c,i,t,s.meter.border),0==c){for(let e,o=0;o<u.length;o++)if(e=u[o],null!==e&&o>h&&o<x){a.beginPath(),a.setFillStyle(s.meter.fillColor);var S=e.x-e.width/2,T=t.height-e.y-t.area[2];a.moveTo(S,e.y),a.fillRect(S,e.y,e.width,T),a.closePath(),a.fill(),0<s.meter.border&&(a.beginPath(),a.setStrokeStyle(n.color),a.setLineWidth(s.meter.border*t.pixelRatio),a.moveTo(S+.5*s.meter.border,e.y+T),a.lineTo(S+.5*s.meter.border,e.y+.5*s.meter.border),a.lineTo(S+e.width-.5*s.meter.border,e.y+.5*s.meter.border),a.lineTo(S+e.width-.5*s.meter.border,e.y+T),a.stroke())}}else for(let e,o=0;o<u.length;o++)if(e=u[o],null!==e&&o>h&&o<x){a.beginPath(),a.setFillStyle(e.color||n.color);var S=e.x-e.width/2,T=t.height-e.y-t.area[2];a.moveTo(S,e.y),a.fillRect(S,e.y,e.width,T),a.closePath(),a.fill()}}}),!1!==t.dataLabel&&1===o&&e.forEach(function(n,d){let h,x,c;h=[].concat(t.chartData.yAxisData.ranges[n.index]),x=h.pop(),c=h.shift();var p=n.data;switch(s.type){case"group":var g=getDataPoints(p,x,c,l,r,t,i,o);g=fixColumeData(g,r,e.length,d,i,t),drawPointText(g,n,i,a);break;case"stack":var g=getStackDataPoints(p,x,c,l,r,t,i,d,e,o);drawPointText(g,n,i,a);break;case"meter":var g=getDataPoints(p,x,c,l,r,t,i,o);drawPointText(g,n,i,a);}}),a.restore(),{xAxisPoints:l,calPoints:d,eachSpacing:r}}function drawCandleDataPoints(e,t,a,i,o){var n=5<arguments.length&&void 0!==arguments[5]?arguments[5]:1,l=assign({},{color:{},average:{}},a.extra.candle);l.color=assign({},{upLine:"#f04864",upFill:"#f04864",downLine:"#2fc25b",downFill:"#2fc25b"},l.color),l.average=assign({},{show:!1,name:[],day:[],color:i.colors},l.average),a.extra.candle=l;let r=a.chartData.xAxisData,s=r.xAxisPoints,d=r.eachSpacing,h=[];o.save();let x=-2,c=s.length+2,p=0,g=a.width+d;return a._scrollDistance_&&0!==a._scrollDistance_&&!0===a.enableScroll&&(o.translate(a._scrollDistance_,0),x=Math.floor(-a._scrollDistance_/d)-2,c=x+a.xAxis.itemCount+4,p=-a._scrollDistance_-d+a.area[3],g=p+(a.xAxis.itemCount+4)*d),l.average.show&&t.forEach(function(e){let t,l,r;t=[].concat(a.chartData.yAxisData.ranges[e.index]),l=t.pop(),r=t.shift();var h=e.data,x=getDataPoints(h,l,r,s,d,a,i,n),c=splitPoints(x);for(let t,a=0;a<c.length;a++){if(t=c[a],o.beginPath(),o.setStrokeStyle(e.color),o.setLineWidth(1),1===t.length)o.moveTo(t[0].x,t[0].y),o.arc(t[0].x,t[0].y,1,0,2*Math.PI);else{o.moveTo(t[0].x,t[0].y);let e=0;for(let i,a=0;a<t.length;a++)if(i=t[a],0==e&&i.x>p&&(o.moveTo(i.x,i.y),e=1),0<a&&i.x>p&&i.x<g){var y=createCurveControlPoints(t,a-1);o.bezierCurveTo(y.ctrA.x,y.ctrA.y,y.ctrB.x,y.ctrB.y,i.x,i.y)}o.moveTo(t[0].x,t[0].y)}o.closePath(),o.stroke()}}),e.forEach(function(e){let t,r,p;t=[].concat(a.chartData.yAxisData.ranges[e.index]),r=t.pop(),p=t.shift();var g=e.data,y=getCandleDataPoints(g,r,p,s,d,a,i,n);h.push(y);var f=splitPoints(y);for(let t=0;t<f[0].length;t++)if(t>x&&t<c){let e=f[0][t];o.beginPath(),0<g[t][1]-g[t][0]?(o.setStrokeStyle(l.color.upLine),o.setFillStyle(l.color.upFill),o.setLineWidth(1*a.pixelRatio),o.moveTo(e[3].x,e[3].y),o.lineTo(e[1].x,e[1].y),o.lineTo(e[1].x-d/4,e[1].y),o.lineTo(e[0].x-d/4,e[0].y),o.lineTo(e[0].x,e[0].y),o.lineTo(e[2].x,e[2].y),o.lineTo(e[0].x,e[0].y),o.lineTo(e[0].x+d/4,e[0].y),o.lineTo(e[1].x+d/4,e[1].y),o.lineTo(e[1].x,e[1].y),o.moveTo(e[3].x,e[3].y)):(o.setStrokeStyle(l.color.downLine),o.setFillStyle(l.color.downFill),o.setLineWidth(1*a.pixelRatio),o.moveTo(e[3].x,e[3].y),o.lineTo(e[0].x,e[0].y),o.lineTo(e[0].x-d/4,e[0].y),o.lineTo(e[1].x-d/4,e[1].y),o.lineTo(e[1].x,e[1].y),o.lineTo(e[2].x,e[2].y),o.lineTo(e[1].x,e[1].y),o.lineTo(e[1].x+d/4,e[1].y),o.lineTo(e[0].x+d/4,e[0].y),o.lineTo(e[0].x,e[0].y),o.moveTo(e[3].x,e[3].y)),o.closePath(),o.fill(),o.stroke()}}),o.restore(),{xAxisPoints:s,calPoints:h,eachSpacing:d}}function drawAreaDataPoints(e,t,i,a){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,n=assign({},{type:"straight",opacity:.2,addLine:!1,width:2,gradient:!1},t.extra.area);let l=t.chartData.xAxisData,r=l.xAxisPoints,s=l.eachSpacing,d=t.height-t.area[2],h=[];a.save();let x=0,c=t.width+s;return t._scrollDistance_&&0!==t._scrollDistance_&&!0===t.enableScroll&&(a.translate(t._scrollDistance_,0),x=-t._scrollDistance_-s+t.area[3],c=x+(t.xAxis.itemCount+4)*s),e.forEach(function(e){let l,p,g;l=[].concat(t.chartData.yAxisData.ranges[e.index]),p=l.pop(),g=l.shift();let y=e.data,f=getDataPoints(y,p,g,r,s,t,i,o);h.push(f);let u=splitPoints(f);for(let o,l=0;l<u.length;l++){if(o=u[l],a.beginPath(),a.setStrokeStyle(hexToRgb(e.color,n.opacity)),n.gradient){let i=a.createLinearGradient(0,t.area[0],0,t.height-t.area[2]);i.addColorStop("0",hexToRgb(e.color,n.opacity)),i.addColorStop("1.0",hexToRgb("#FFFFFF",.1)),a.setFillStyle(i)}else a.setFillStyle(hexToRgb(e.color,n.opacity));if(a.setLineWidth(n.width*t.pixelRatio),1<o.length){let e=o[0],t=o[o.length-1];a.moveTo(e.x,e.y);let i=0;if("curve"===n.type){for(let e,t=0;t<o.length;t++)if(e=o[t],0==i&&e.x>x&&(a.moveTo(e.x,e.y),i=1),0<t&&e.x>x&&e.x<c){let i=createCurveControlPoints(o,t-1);a.bezierCurveTo(i.ctrA.x,i.ctrA.y,i.ctrB.x,i.ctrB.y,e.x,e.y)}}else for(let e,t=0;t<o.length;t++)e=o[t],0==i&&e.x>x&&(a.moveTo(e.x,e.y),i=1),0<t&&e.x>x&&e.x<c&&a.lineTo(e.x,e.y);a.lineTo(t.x,d),a.lineTo(e.x,d),a.lineTo(e.x,e.y)}else{let e=o[0];a.moveTo(e.x-s/2,e.y),a.lineTo(e.x+s/2,e.y),a.lineTo(e.x+s/2,d),a.lineTo(e.x-s/2,d),a.moveTo(e.x-s/2,e.y)}if(a.closePath(),a.fill(),n.addLine){if("dash"==e.lineType){let i=e.dashLength?e.dashLength:8;i*=t.pixelRatio,a.setLineDash([i,i])}if(a.beginPath(),a.setStrokeStyle(e.color),a.setLineWidth(n.width*t.pixelRatio),1===o.length)a.moveTo(o[0].x,o[0].y),a.arc(o[0].x,o[0].y,1,0,2*Math.PI);else{a.moveTo(o[0].x,o[0].y);let e=0;if("curve"===n.type){for(let t,i=0;i<o.length;i++)if(t=o[i],0==e&&t.x>x&&(a.moveTo(t.x,t.y),e=1),0<i&&t.x>x&&t.x<c){let e=createCurveControlPoints(o,i-1);a.bezierCurveTo(e.ctrA.x,e.ctrA.y,e.ctrB.x,e.ctrB.y,t.x,t.y)}}else for(let t,i=0;i<o.length;i++)t=o[i],0==e&&t.x>x&&(a.moveTo(t.x,t.y),e=1),0<i&&t.x>x&&t.x<c&&a.lineTo(t.x,t.y);a.moveTo(o[0].x,o[0].y)}a.stroke(),a.setLineDash([])}}!1!==t.dataPointShape&&drawPointShape(f,e.color,e.pointShape,a,t)}),!1!==t.dataLabel&&1===o&&e.forEach(function(e){let n,l,d;n=[].concat(t.chartData.yAxisData.ranges[e.index]),l=n.pop(),d=n.shift();var h=e.data,x=getDataPoints(h,l,d,r,s,t,i,o);drawPointText(x,e,i,a)}),a.restore(),{xAxisPoints:r,calPoints:h,eachSpacing:s}}function drawLineDataPoints(e,t,i,a){var o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,n=assign({},{type:"straight",width:2},t.extra.line);n.width*=t.pixelRatio;let l=t.chartData.xAxisData,r=l.xAxisPoints,s=l.eachSpacing;var d=[];a.save();let h=0,x=t.width+s;return t._scrollDistance_&&0!==t._scrollDistance_&&!0===t.enableScroll&&(a.translate(t._scrollDistance_,0),h=-t._scrollDistance_-s+t.area[3],x=h+(t.xAxis.itemCount+4)*s),e.forEach(function(e){let l,c,p;l=[].concat(t.chartData.yAxisData.ranges[e.index]),c=l.pop(),p=l.shift();var g=e.data,y=getDataPoints(g,c,p,r,s,t,i,o);d.push(y);var f=splitPoints(y);if("dash"==e.lineType){let i=e.dashLength?e.dashLength:8;i*=t.pixelRatio,a.setLineDash([i,i])}a.beginPath(),a.setStrokeStyle(e.color),a.setLineWidth(n.width),f.forEach(function(e){if(1===e.length)a.moveTo(e[0].x,e[0].y),a.arc(e[0].x,e[0].y,1,0,2*Math.PI);else{a.moveTo(e[0].x,e[0].y);let i=0;if("curve"===n.type){for(let o,n=0;n<e.length;n++)if(o=e[n],0==i&&o.x>h&&(a.moveTo(o.x,o.y),i=1),0<n&&o.x>h&&o.x<x){var t=createCurveControlPoints(e,n-1);a.bezierCurveTo(t.ctrA.x,t.ctrA.y,t.ctrB.x,t.ctrB.y,o.x,o.y)}}else for(let t,o=0;o<e.length;o++)t=e[o],0==i&&t.x>h&&(a.moveTo(t.x,t.y),i=1),0<o&&t.x>h&&t.x<x&&a.lineTo(t.x,t.y);a.moveTo(e[0].x,e[0].y)}}),a.stroke(),a.setLineDash([]),!1!==t.dataPointShape&&drawPointShape(y,e.color,e.pointShape,a,t)}),!1!==t.dataLabel&&1===o&&e.forEach(function(e){let n,l,d;n=[].concat(t.chartData.yAxisData.ranges[e.index]),l=n.pop(),d=n.shift();var h=e.data,x=getDataPoints(h,l,d,r,s,t,i,o);drawPointText(x,e,i,a)}),a.restore(),{xAxisPoints:r,calPoints:d,eachSpacing:s}}function drawMixDataPoints(e,t,i,a){let o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,n=t.chartData.xAxisData,l=n.xAxisPoints,r=n.eachSpacing,s=t.height-t.area[2],d=[];var h=0,x=0;e.forEach(function(e){"column"==e.type&&(x+=1)}),a.save();let c=-2,p=l.length+2,g=0,y=t.width+r;if(t._scrollDistance_&&0!==t._scrollDistance_&&!0===t.enableScroll&&(a.translate(t._scrollDistance_,0),c=Math.floor(-t._scrollDistance_/r)-2,p=c+t.xAxis.itemCount+4,g=-t._scrollDistance_-r+t.area[3],y=g+(t.xAxis.itemCount+4)*r),e.forEach(function(e){let n,f,u;n=[].concat(t.chartData.yAxisData.ranges[e.index]),f=n.pop(),u=n.shift();var m=e.data,S=getDataPoints(m,f,u,l,r,t,i,o);if(d.push(S),"column"==e.type){S=fixColumeData(S,r,x,h,i,t);for(let o,n=0;n<S.length;n++)if(o=S[n],null!==o&&n>c&&n<p){a.beginPath(),a.setStrokeStyle(o.color||e.color),a.setLineWidth(1),a.setFillStyle(o.color||e.color);var T=o.x-o.width/2,A=t.height-o.y-t.area[2];a.moveTo(T,o.y),a.moveTo(T-1,o.y),a.lineTo(T+o.width-2,o.y),a.lineTo(T+o.width-2,t.height-t.area[2]),a.lineTo(T,t.height-t.area[2]),a.lineTo(T,o.y),a.closePath(),a.stroke(),a.fill(),a.closePath(),a.fill()}h+=1}if("area"==e.type){let o=splitPoints(S);for(let n,l=0;l<o.length;l++){if(n=o[l],a.beginPath(),a.setStrokeStyle(e.color),a.setFillStyle(hexToRgb(e.color,.2)),a.setLineWidth(2*t.pixelRatio),1<n.length){var b=n[0];let t=n[n.length-1];a.moveTo(b.x,b.y);let i=0;if("curve"===e.style){for(let e,t=0;t<n.length;t++)if(e=n[t],0==i&&e.x>g&&(a.moveTo(e.x,e.y),i=1),0<t&&e.x>g&&e.x<y){var P=createCurveControlPoints(n,t-1);a.bezierCurveTo(P.ctrA.x,P.ctrA.y,P.ctrB.x,P.ctrB.y,e.x,e.y)}}else for(let e,t=0;t<n.length;t++)e=n[t],0==i&&e.x>g&&(a.moveTo(e.x,e.y),i=1),0<t&&e.x>g&&e.x<y&&a.lineTo(e.x,e.y);a.lineTo(t.x,s),a.lineTo(b.x,s),a.lineTo(b.x,b.y)}else{let e=n[0];a.moveTo(e.x-r/2,e.y),a.lineTo(e.x+r/2,e.y),a.lineTo(e.x+r/2,s),a.lineTo(e.x-r/2,s),a.moveTo(e.x-r/2,e.y)}a.closePath(),a.fill()}}if("line"==e.type){var _=splitPoints(S);_.forEach(function(i){if("dash"==e.lineType){let i=e.dashLength?e.dashLength:8;i*=t.pixelRatio,a.setLineDash([i,i])}if(a.beginPath(),a.setStrokeStyle(e.color),a.setLineWidth(2*t.pixelRatio),1===i.length)a.moveTo(i[0].x,i[0].y),a.arc(i[0].x,i[0].y,1,0,2*Math.PI);else{a.moveTo(i[0].x,i[0].y);let t=0;if("curve"==e.style){for(let e,n=0;n<i.length;n++)if(e=i[n],0==t&&e.x>g&&(a.moveTo(e.x,e.y),t=1),0<n&&e.x>g&&e.x<y){var o=createCurveControlPoints(i,n-1);a.bezierCurveTo(o.ctrA.x,o.ctrA.y,o.ctrB.x,o.ctrB.y,e.x,e.y)}}else for(let e,o=0;o<i.length;o++)e=i[o],0==t&&e.x>g&&(a.moveTo(e.x,e.y),t=1),0<o&&e.x>g&&e.x<y&&a.lineTo(e.x,e.y);a.moveTo(i[0].x,i[0].y)}a.stroke(),a.setLineDash([])})}"point"==e.type&&(e.addPoint=!0),!0==e.addPoint&&"column"!==e.type&&drawPointShape(S,e.color,e.pointShape,a,t)}),!1!==t.dataLabel&&1===o){var h=0;e.forEach(function(e){let n,s,d;n=[].concat(t.chartData.yAxisData.ranges[e.index]),s=n.pop(),d=n.shift();var c=e.data,p=getDataPoints(c,s,d,l,r,t,i,o);"column"===e.type?(p=fixColumeData(p,r,x,h,i,t),drawPointText(p,e,i,a),h+=1):drawPointText(p,e,i,a)})}return a.restore(),{xAxisPoints:l,calPoints:d,eachSpacing:r}}function drawToolTipBridge(e,t,i,a,o,n){var l=e.extra.tooltip||{};l.horizentalLine&&e.tooltip&&1===a&&("line"==e.type||"area"==e.type||"column"==e.type||"candle"==e.type||"mix"==e.type)&&drawToolTipHorizentalLine(e,t,i,o,n),i.save(),e._scrollDistance_&&0!==e._scrollDistance_&&!0===e.enableScroll&&i.translate(e._scrollDistance_,0),e.tooltip&&e.tooltip.textList&&e.tooltip.textList.length&&1===a&&drawToolTip(e.tooltip.textList,e.tooltip.offset,e,t,i,o,n),i.restore()}function drawXAxis(e,t,i,a){var o=Math.ceil;let n=t.chartData.xAxisData,l=n.xAxisPoints,r=n.startX,s=n.endX,d=n.eachSpacing;var h="center";("line"==t.type||"area"==t.type)&&(h=t.xAxis.boundaryGap);var x=t.height-t.area[2],c=t.area[0];if(t.enableScroll&&t.xAxis.scrollShow){var p=t.height-t.area[2]+i.xAxisHeight,g=s-r,y=d*(l.length-1),f=0;t._scrollDistance_&&(f=-t._scrollDistance_*g/y),a.beginPath(),a.setLineCap("round"),a.setLineWidth(6*t.pixelRatio),a.setStrokeStyle(t.xAxis.scrollBackgroundColor||"#EFEBEF"),a.moveTo(r,p),a.lineTo(s,p),a.stroke(),a.closePath(),a.beginPath(),a.setLineCap("round"),a.setLineWidth(6*t.pixelRatio),a.setStrokeStyle(t.xAxis.scrollColor||"#A6A6A6"),a.moveTo(r+f,p),a.lineTo(r+f+g*g/y,p),a.stroke(),a.closePath(),a.setLineCap("butt")}if(a.save(),t._scrollDistance_&&0!==t._scrollDistance_&&a.translate(t._scrollDistance_,0),!0===t.xAxis.calibration&&(a.setStrokeStyle(t.xAxis.gridColor||"#cccccc"),a.setLineCap("butt"),a.setLineWidth(1*t.pixelRatio),l.forEach(function(e,i){0<i&&(a.beginPath(),a.moveTo(e-d/2,x),a.lineTo(e-d/2,x+3*t.pixelRatio),a.closePath(),a.stroke())})),!0!==t.xAxis.disableGrid&&(a.setStrokeStyle(t.xAxis.gridColor||"#cccccc"),a.setLineCap("butt"),a.setLineWidth(1*t.pixelRatio),"dash"==t.xAxis.gridType&&a.setLineDash([t.xAxis.dashLength,t.xAxis.dashLength]),t.xAxis.gridEval=t.xAxis.gridEval||1,l.forEach(function(e,i){0==i%t.xAxis.gridEval&&(a.beginPath(),a.moveTo(e,x),a.lineTo(e,c),a.stroke())}),a.setLineDash([])),!0!==t.xAxis.disabled){let n=e.length;t.xAxis.labelCount&&(n=t.xAxis.itemCount?o(e.length/t.xAxis.itemCount*t.xAxis.labelCount):t.xAxis.labelCount,n-=1);let r=o(e.length/n),s=[],c=e.length;for(let t=0;t<c;t++)0==t%r?s.push(e[t]):s.push("");s[c-1]=e[c-1];var u=t.xAxis.fontSize||i.fontSize;0===i._xAxisTextAngle_?s.forEach(function(e,o){var n=-measureText(e+"",u)/2;"center"==h&&(n+=d/2);var r=0;t.xAxis.scrollShow&&(r=6*t.pixelRatio),a.beginPath(),a.setFontSize(u),a.setFillStyle(t.xAxis.fontColor||"#666666"),a.fillText(e+"",l[o]+n,x+u+(i.xAxisHeight-r-u)/2),a.closePath(),a.stroke()}):s.forEach(function(e,o){a.save(),a.beginPath(),a.setFontSize(u),a.setFillStyle(t.xAxis.fontColor||"#666666");var n=measureText(e+"",u),r=-n;"center"==h&&(r+=d/2);var s=calRotateTranslate(l[o]+d/2,x+u/2+5,t.height),c=s.transX,p=s.transY;a.rotate(-1*i._xAxisTextAngle_),a.translate(c,p),a.fillText(e+"",l[o]+r,x+u+5),a.closePath(),a.stroke(),a.restore()})}a.restore(),t.xAxis.axisLine&&(a.beginPath(),a.setStrokeStyle(t.xAxis.axisLineColor),a.setLineWidth(1*t.pixelRatio),a.moveTo(r,t.height-t.area[2]),a.lineTo(s,t.height-t.area[2]),a.stroke())}function drawYAxisGrid(e,t,i,a){if(!0===t.yAxis.disableGrid)return;let o=t.height-t.area[0]-t.area[2],n=o/t.yAxis.splitNumber,l=t.area[3],r=t.chartData.xAxisData.xAxisPoints,s=t.chartData.xAxisData.eachSpacing,d=s*(r.length-1),h=[];for(let o=0;o<t.yAxis.splitNumber+1;o++)h.push(t.height-t.area[2]-n*o);a.save(),t._scrollDistance_&&0!==t._scrollDistance_&&a.translate(t._scrollDistance_,0),"dash"==t.yAxis.gridType&&a.setLineDash([t.yAxis.dashLength,t.yAxis.dashLength]),a.setStrokeStyle(t.yAxis.gridColor),a.setLineWidth(1*t.pixelRatio),h.forEach(function(e){a.beginPath(),a.moveTo(l,e),a.lineTo(l+d,e),a.stroke()}),a.setLineDash([]),a.restore()}function drawYAxis(e,t,a,o){if(!0===t.yAxis.disabled)return;var i=t.height-t.area[0]-t.area[2],n=i/t.yAxis.splitNumber,l=t.area[3],r=t.width-t.area[1],s=t.height-t.area[2],d=s+a.xAxisHeight;t.xAxis.scrollShow&&(d-=3*t.pixelRatio),t.xAxis.rotateLabel&&(d=t.height-t.area[2]+3),o.beginPath(),o.setFillStyle(t.background||"#ffffff"),0>t._scrollDistance_&&o.fillRect(0,0,l,d),!0==t.enableScroll&&o.fillRect(r,0,t.width,d),o.closePath(),o.stroke();var h=[];for(let l=0;l<=t.yAxis.splitNumber;l++)h.push(t.area[0]+n*l);let x=t.area[3],c=t.width-t.area[1];for(let n,l=0;l<t.yAxis.data.length;l++)if(n=t.yAxis.data[l],!0!==n.disabled){let e=t.chartData.yAxisData.rangesFormat[l],i=n.fontSize||a.fontSize,r=t.chartData.yAxisData.yAxisWidth[l];if(e.forEach(function(e,a){var l=h[a]?h[a]:s;o.beginPath(),o.setFontSize(i),o.setLineWidth(1*t.pixelRatio),o.setStrokeStyle(n.axisLineColor||"#cccccc"),o.setFillStyle(n.fontColor||"#666666"),"left"==r.position?(o.fillText(e+"",x-r.width,l+i/2),!0==n.calibration&&(o.moveTo(x,l),o.lineTo(x-3*t.pixelRatio,l))):(o.fillText(e+"",c+4*t.pixelRatio,l+i/2),!0==n.calibration&&(o.moveTo(c,l),o.lineTo(c+3*t.pixelRatio,l))),o.closePath(),o.stroke()}),!1!==n.axisLine&&(o.beginPath(),o.setStrokeStyle(n.axisLineColor||"#cccccc"),o.setLineWidth(1*t.pixelRatio),"left"==r.position?(o.moveTo(x,t.height-t.area[2]),o.lineTo(x,t.area[0])):(o.moveTo(c,t.height-t.area[2]),o.lineTo(c,t.area[0])),o.stroke()),t.yAxis.showTitle){let e=n.titleFontSize||a.fontSize,i=n.title;o.beginPath(),o.setFontSize(e),o.setFillStyle(n.titleFontColor||"#666666"),"left"==r.position?o.fillText(i,x-measureText(i,e)/2,t.area[0]-10*t.pixelRatio):o.fillText(i,c-measureText(i,e)/2,t.area[0]-10*t.pixelRatio),o.closePath(),o.stroke()}"left"==r.position?x-=r.width+t.yAxis.padding:c+=r.width+t.yAxis.padding}}function drawLegend(e,t,i,a,o){if(!1===t.legend.show)return;let n=o.legendData,l=n.points,r=n.area,s=t.legend.padding,d=t.legend.fontSize,h=15*t.pixelRatio,x=5*t.pixelRatio,c=t.legend.itemGap,p=Math.max(t.legend.lineHeight*t.pixelRatio,d);a.beginPath(),a.setLineWidth(t.legend.borderWidth),a.setStrokeStyle(t.legend.borderColor),a.setFillStyle(t.legend.backgroundColor),a.moveTo(r.start.x,r.start.y),a.rect(r.start.x,r.start.y,r.width,r.height),a.closePath(),a.fill(),a.stroke(),l.forEach(function(e,o){let l=0,g=0;l=n.widthArr[o],g=n.heightArr[o];let y=0,f=0;"top"==t.legend.position||"bottom"==t.legend.position?(y=r.start.x+(r.width-l)/2,f=r.start.y+s+o*p):(l=0==o?0:n.widthArr[o-1],y=r.start.x+s+l,f=r.start.y+s+(r.height-g)/2),a.setFontSize(i.fontSize);for(let n,l=0;l<e.length;l++){switch(n=e[l],n.area=[0,0,0,0],n.area[0]=y,n.area[1]=f,n.area[3]=f+p,a.beginPath(),a.setLineWidth(1*t.pixelRatio),a.setStrokeStyle(n.show?n.color:t.legend.hiddenColor),a.setFillStyle(n.show?n.color:t.legend.hiddenColor),n.legendShape){case"line":a.moveTo(y,f+.5*p-2*t.pixelRatio),a.fillRect(y,f+.5*p-2*t.pixelRatio,15*t.pixelRatio,4*t.pixelRatio);break;case"triangle":a.moveTo(y+7.5*t.pixelRatio,f+.5*p-5*t.pixelRatio),a.lineTo(y+2.5*t.pixelRatio,f+.5*p+5*t.pixelRatio),a.lineTo(y+12.5*t.pixelRatio,f+.5*p+5*t.pixelRatio),a.lineTo(y+7.5*t.pixelRatio,f+.5*p-5*t.pixelRatio);break;case"diamond":a.moveTo(y+7.5*t.pixelRatio,f+.5*p-5*t.pixelRatio),a.lineTo(y+2.5*t.pixelRatio,f+.5*p),a.lineTo(y+7.5*t.pixelRatio,f+.5*p+5*t.pixelRatio),a.lineTo(y+12.5*t.pixelRatio,f+.5*p),a.lineTo(y+7.5*t.pixelRatio,f+.5*p-5*t.pixelRatio);break;case"circle":a.moveTo(y+7.5*t.pixelRatio,f+.5*p),a.arc(y+7.5*t.pixelRatio,f+.5*p,5*t.pixelRatio,0,2*Math.PI);break;case"rect":a.moveTo(y,f+.5*p-5*t.pixelRatio),a.fillRect(y,f+.5*p-5*t.pixelRatio,15*t.pixelRatio,10*t.pixelRatio);break;default:a.moveTo(y,f+.5*p-5*t.pixelRatio),a.fillRect(y,f+.5*p-5*t.pixelRatio,15*t.pixelRatio,10*t.pixelRatio);}a.closePath(),a.fill(),a.stroke(),y+=h+x;a.beginPath(),a.setFontSize(d),a.setFillStyle(n.show?t.legend.fontColor:t.legend.hiddenColor),a.fillText(n.name,y,f+(.5*p+.5*d-2)),a.closePath(),a.stroke(),"top"==t.legend.position||"bottom"==t.legend.position?(y+=measureText(n.name,d)+c,n.area[2]=y):(n.area[2]=y+measureText(n.name,d)+c,y-=h+x,f+=p)}})}function drawPieDataPoints(e,t,a,o){var n=Math.PI,l=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,r=assign({},{activeOpacity:.5,activeRadius:10*t.pixelRatio,offsetAngle:0,labelWidth:15*t.pixelRatio,ringWidth:0,border:!1,borderWidth:2,borderColor:"#FFFFFF"},t.extra.pie),s={x:t.area[3]+(t.width-t.area[1]-t.area[3])/2,y:t.area[0]+(t.height-t.area[0]-t.area[2])/2};0==a.pieChartLinePadding&&(a.pieChartLinePadding=r.activeRadius);var d=Math.min((t.width-t.area[1]-t.area[3])/2-a.pieChartLinePadding-a.pieChartTextPadding-a._pieTextMaxLength_,(t.height-t.area[0]-t.area[2])/2-a.pieChartLinePadding-a.pieChartTextPadding);e=getPieDataPoints(e,d,l);var h=r.activeRadius;if(e=e.map(function(e){return e._start_+=r.offsetAngle*n/180,e}),e.forEach(function(e,i){t.tooltip&&t.tooltip.index==i&&(o.beginPath(),o.setFillStyle(hexToRgb(e.color,t.extra.pie.activeOpacity||.5)),o.moveTo(s.x,s.y),o.arc(s.x,s.y,e._radius_+h,e._start_,e._start_+2*e._proportion_*n),o.closePath(),o.fill()),o.beginPath(),o.setLineWidth(r.borderWidth*t.pixelRatio),o.lineJoin="round",o.setStrokeStyle(r.borderColor),o.setFillStyle(e.color),o.moveTo(s.x,s.y),o.arc(s.x,s.y,e._radius_,e._start_,e._start_+2*e._proportion_*n),o.closePath(),o.fill(),!0==r.border&&o.stroke()}),"ring"===t.type){var x=.6*d;"number"==typeof t.extra.pie.ringWidth&&0<t.extra.pie.ringWidth&&(x=Math.max(0,d-t.extra.pie.ringWidth)),o.beginPath(),o.setFillStyle(t.background||"#ffffff"),o.moveTo(s.x,s.y),o.arc(s.x,s.y,x,0,2*n),o.closePath(),o.fill()}if(!1!==t.dataLabel&&1===l){for(var c=!1,p=0,g=e.length;p<g;p++)if(0<e[p].data){c=!0;break}c&&drawPieText(e,t,a,o,d,s)}return 1===l&&"ring"===t.type&&drawRingTitle(t,a,o,s),{center:s,radius:d,series:e}}function drawRoseDataPoints(e,t,a,o){var n=Math.PI,l=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,r=assign({},{type:"area",activeOpacity:.5,activeRadius:10*t.pixelRatio,offsetAngle:0,labelWidth:15*t.pixelRatio,border:!1,borderWidth:2,borderColor:"#FFFFFF"},t.extra.rose);0==a.pieChartLinePadding&&(a.pieChartLinePadding=r.activeRadius);var s={x:t.area[3]+(t.width-t.area[1]-t.area[3])/2,y:t.area[0]+(t.height-t.area[0]-t.area[2])/2},d=Math.min((t.width-t.area[1]-t.area[3])/2-a.pieChartLinePadding-a.pieChartTextPadding-a._pieTextMaxLength_,(t.height-t.area[0]-t.area[2])/2-a.pieChartLinePadding-a.pieChartTextPadding),h=r.minRadius||.5*d;e=getRoseDataPoints(e,r.type,h,d,l);var x=r.activeRadius;if(e=e.map(function(e){return e._start_+=(r.offsetAngle||0)*n/180,e}),e.forEach(function(e,i){t.tooltip&&t.tooltip.index==i&&(o.beginPath(),o.setFillStyle(hexToRgb(e.color,r.activeOpacity||.5)),o.moveTo(s.x,s.y),o.arc(s.x,s.y,x+e._radius_,e._start_,e._start_+2*e._rose_proportion_*n),o.closePath(),o.fill()),o.beginPath(),o.setLineWidth(r.borderWidth*t.pixelRatio),o.lineJoin="round",o.setStrokeStyle(r.borderColor),o.setFillStyle(e.color),o.moveTo(s.x,s.y),o.arc(s.x,s.y,e._radius_,e._start_,e._start_+2*e._rose_proportion_*n),o.closePath(),o.fill(),!0==r.border&&o.stroke()}),!1!==t.dataLabel&&1===l){for(var c=!1,p=0,g=e.length;p<g;p++)if(0<e[p].data){c=!0;break}c&&drawPieText(e,t,a,o,d,s)}return{center:s,radius:d,series:e}}function drawArcbarDataPoints(e,t,i,a){var o=Math.PI,n=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,l=assign({},{startAngle:.75,endAngle:.25,type:"default",width:12*t.pixelRatio,gap:2*t.pixelRatio},t.extra.arcbar);e=getArcbarDataPoints(e,l,n);var r=l.center?l.center:{x:t.width/2,y:t.height/2};var s;l.radius?s=l.radius:(s=Math.min(r.x,r.y),s-=5*t.pixelRatio,s-=l.width/2);for(let n,d=0;d<e.length;d++)n=e[d],a.setLineWidth(l.width),a.setStrokeStyle(l.backgroundColor||"#E9E9E9"),a.setLineCap("round"),a.beginPath(),"default"==l.type?a.arc(r.x,r.y,s-(l.width+l.gap)*d,l.startAngle*o,l.endAngle*o,!1):a.arc(r.x,r.y,s-(l.width+l.gap)*d,0,2*o,!1),a.stroke(),a.setLineWidth(l.width),a.setStrokeStyle(n.color),a.setLineCap("round"),a.beginPath(),a.arc(r.x,r.y,s-(l.width+l.gap)*d,l.startAngle*o,n._proportion_*o,!1),a.stroke();return drawRingTitle(t,i,a,r),{center:r,radius:s,series:e}}function drawGaugeDataPoints(e,t,a,i,o){var n=Math.PI,l=5<arguments.length&&void 0!==arguments[5]?arguments[5]:1,r=assign({},{type:"default",startAngle:.75,endAngle:.25,width:15,splitLine:{fixRadius:0,splitNumber:10,width:15,color:"#FFFFFF",childNumber:5,childWidth:5},pointer:{width:15,color:"auto"}},a.extra.gauge);null==r.oldAngle&&(r.oldAngle=r.startAngle),null==r.oldData&&(r.oldData=0),e=getGaugeAxisPoints(e,r.startAngle,r.endAngle);var s={x:a.width/2,y:a.height/2},d=Math.min(s.x,s.y);d-=5*a.pixelRatio,d-=r.width/2;var h=d-r.width,x=0;if("progress"==r.type){var c=d-3*r.width;o.beginPath();let e=o.createLinearGradient(s.x,s.y-c,s.x,s.y+c);e.addColorStop("0",hexToRgb(t[0].color,.3)),e.addColorStop("1.0",hexToRgb("#FFFFFF",.1)),o.setFillStyle(e),o.arc(s.x,s.y,c,0,2*n,!1),o.fill(),o.setLineWidth(r.width),o.setStrokeStyle(hexToRgb(t[0].color,.3)),o.setLineCap("round"),o.beginPath(),o.arc(s.x,s.y,h,r.startAngle*n,r.endAngle*n,!1),o.stroke(),x=r.startAngle-r.endAngle+1;let i=x/r.splitLine.splitNumber,p=x/r.splitLine.splitNumber/r.splitLine.childNumber,g=-d-.5*r.width-r.splitLine.fixRadius,y=-d-r.width-r.splitLine.fixRadius+r.splitLine.width;o.save(),o.translate(s.x,s.y),o.rotate((r.startAngle-1)*n);let f=r.splitLine.splitNumber*r.splitLine.childNumber+1,u=t[0].data*l;for(let e=0;e<f;e++)o.beginPath(),u>e/f?o.setStrokeStyle(hexToRgb(t[0].color,1)):o.setStrokeStyle(hexToRgb(t[0].color,.3)),o.setLineWidth(3*a.pixelRatio),o.moveTo(g,0),o.lineTo(y,0),o.stroke(),o.rotate(p*n);o.restore(),t=getArcbarDataPoints(t,r,l),o.setLineWidth(r.width),o.setStrokeStyle(t[0].color),o.setLineCap("round"),o.beginPath(),o.arc(s.x,s.y,h,r.startAngle*n,t[0]._proportion_*n,!1),o.stroke();let m=d-2.5*r.width;o.save(),o.translate(s.x,s.y),o.rotate((t[0]._proportion_-1)*n),o.beginPath(),o.setLineWidth(r.width/3);let S=o.createLinearGradient(0,.6*-m,0,.6*m);S.addColorStop("0",hexToRgb("#FFFFFF",0)),S.addColorStop("0.5",hexToRgb(t[0].color,1)),S.addColorStop("1.0",hexToRgb("#FFFFFF",0)),o.setStrokeStyle(S),o.arc(0,0,m,.85*n,1.15*n,!1),o.stroke(),o.beginPath(),o.setLineWidth(1),o.setStrokeStyle(t[0].color),o.setFillStyle(t[0].color),o.moveTo(-m-r.width/3/2,-4),o.lineTo(-m-r.width/3/2-4,0),o.lineTo(-m-r.width/3/2,4),o.lineTo(-m-r.width/3/2,-4),o.stroke(),o.fill(),o.restore()}else{o.setLineWidth(r.width),o.setLineCap("butt");for(let t,a=0;a<e.length;a++)t=e[a],o.beginPath(),o.setStrokeStyle(t.color),o.arc(s.x,s.y,d,t._startAngle_*n,t._endAngle_*n,!1),o.stroke();o.save(),x=r.startAngle-r.endAngle+1;let c=x/r.splitLine.splitNumber,p=x/r.splitLine.splitNumber/r.splitLine.childNumber,g=-d-.5*r.width-r.splitLine.fixRadius,y=-d-.5*r.width-r.splitLine.fixRadius+r.splitLine.width,f=-d-.5*r.width-r.splitLine.fixRadius+r.splitLine.childWidth;o.translate(s.x,s.y),o.rotate((r.startAngle-1)*n);for(let e=0;e<r.splitLine.splitNumber+1;e++)o.beginPath(),o.setStrokeStyle(r.splitLine.color),o.setLineWidth(2*a.pixelRatio),o.moveTo(g,0),o.lineTo(y,0),o.stroke(),o.rotate(c*n);o.restore(),o.save(),o.translate(s.x,s.y),o.rotate((r.startAngle-1)*n);for(let e=0;e<r.splitLine.splitNumber*r.splitLine.childNumber+1;e++)o.beginPath(),o.setStrokeStyle(r.splitLine.color),o.setLineWidth(1*a.pixelRatio),o.moveTo(g,0),o.lineTo(f,0),o.stroke(),o.rotate(p*n);o.restore(),t=getGaugeDataPoints(t,e,r,l);for(let e,a=0;a<t.length;a++)e=t[a],o.save(),o.translate(s.x,s.y),o.rotate((e._proportion_-1)*n),o.beginPath(),o.setFillStyle(e.color),o.moveTo(r.pointer.width,0),o.lineTo(0,-r.pointer.width/2),o.lineTo(-h,0),o.lineTo(0,r.pointer.width/2),o.lineTo(r.pointer.width,0),o.closePath(),o.fill(),o.beginPath(),o.setFillStyle("#FFFFFF"),o.arc(0,0,r.pointer.width/6,0,2*n,!1),o.fill(),o.restore();!1!==a.dataLabel&&drawGaugeLabel(r,d,s,a,i,o)}return drawRingTitle(a,i,o,s),1===l&&"gauge"===a.type&&(a.extra.gauge.oldAngle=t[0]._proportion_,a.extra.gauge.oldData=t[0].data),{center:s,radius:d,innerRadius:h,categories:e,totalAngle:x}}function drawRadarDataPoints(e,t,a,o){var n=Math.cos,l=Math.sin,r=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,s=assign({},{gridColor:"#cccccc",labelColor:"#666666",opacity:.2,gridCount:3},t.extra.radar),d=getRadarCoordinateSeries(t.categories.length),h={x:t.area[3]+(t.width-t.area[1]-t.area[3])/2,y:t.area[0]+(t.height-t.area[0]-t.area[2])/2},x=Math.min(h.x-(getMaxTextListLength(t.categories)+a.radarLabelTextMargin),h.y-a.radarLabelTextMargin);x-=t.padding[1],o.beginPath(),o.setLineWidth(1*t.pixelRatio),o.setStrokeStyle(s.gridColor),d.forEach(function(e){var t=convertCoordinateOrigin(x*n(e),x*l(e),h);o.moveTo(h.x,h.y),o.lineTo(t.x,t.y)}),o.stroke(),o.closePath();for(var c=function(e){var i={};o.beginPath(),o.setLineWidth(1*t.pixelRatio),o.setStrokeStyle(s.gridColor),d.forEach(function(t,a){var r=convertCoordinateOrigin(x/s.gridCount*e*n(t),x/s.gridCount*e*l(t),h);0===a?(i=r,o.moveTo(r.x,r.y)):o.lineTo(r.x,r.y)}),o.lineTo(i.x,i.y),o.stroke(),o.closePath()},p=1;p<=s.gridCount;p++)c(p);var g=getRadarDataPoints(d,h,x,e,t,r);return g.forEach(function(e){if(o.beginPath(),o.setFillStyle(hexToRgb(e.color,s.opacity)),e.data.forEach(function(e,t){0===t?o.moveTo(e.position.x,e.position.y):o.lineTo(e.position.x,e.position.y)}),o.closePath(),o.fill(),!1!==t.dataPointShape){var i=e.data.map(function(e){return e.position});drawPointShape(i,e.color,e.pointShape,o,t)}}),drawRadarLabel(d,x,h,t,a,o),{center:h,radius:x,angleList:d}}function normalInt(e,t,a){a=0==a?1:a;for(var o=[],n=0;n<a;n++)o[n]=Math.random();return Math.floor(o.reduce(function(e,t){return e+t})/a*(t-e))+e}function collisionNew(e,t,a,o){var n=!1;for(let l=0;l<t.length;l++)if(t[l].area)if(!(e[3]<t[l].area[1]||e[0]>t[l].area[2]||e[1]>t[l].area[3]||e[2]<t[l].area[0])){n=!0;break}else if(0>e[0]||0>e[1]||e[2]>a||e[3]>o){n=!0;break}else n=!1;return n}function getBoundingBox(e){var t,a={};a.xMin=180,a.xMax=0,a.yMin=90,a.yMax=0;for(var o,n=0;n<e.length;n++){o=e[n].geometry.coordinates;for(var l=0;l<o.length;l++){t=o[l],1==t.length&&(t=t[0]);for(var r=0;r<t.length;r++){var s=t[r][0],d=t[r][1],h={x:s,y:d};a.xMin=a.xMin<h.x?a.xMin:h.x,a.xMax=a.xMax>h.x?a.xMax:h.x,a.yMin=a.yMin<h.y?a.yMin:h.y,a.yMax=a.yMax>h.y?a.yMax:h.y}}}return a}function coordinateToPoint(e,t,i,a,o,n){return{x:(t-i.xMin)*a+o,y:(i.yMax-e)*a+n}}function pointToCoordinate(e,t,i,a,o,n){return{x:(t-o)/a+i.xMin,y:i.yMax-(e-n)/a}}function isRayIntersectsSegment(e,t,i){if(t[1]==i[1])return!1;if(t[1]>e[1]&&i[1]>e[1])return!1;if(t[1]<e[1]&&i[1]<e[1])return!1;if(t[1]==e[1]&&i[1]>e[1])return!1;if(i[1]==e[1]&&t[1]>e[1])return!1;if(t[0]<e[0]&&i[1]<e[1])return!1;let a=i[0]-(i[0]-t[0])*(i[1]-e[1])/(i[1]-t[1]);return!(a<e[0])}function isPoiWithinPoly(e,t){let i=0;for(let a,o=0;o<t.length;o++){a=t[o][0],1==t.length&&(a=t[o][0]);for(let t=0;t<a.length-1;t++){let o=a[t],n=a[t+1];isRayIntersectsSegment(e,o,n)&&(i+=1)}}return!(1!=i%2)}function drawMapDataPoints(e,t,a,o){var n,l,r=Math.abs,s=assign({},{border:!0,borderWidth:1,borderColor:"#666666",fillOpacity:.6,activeBorderColor:"#f04864",activeFillColor:"#facc14",activeFillOpacity:1},t.extra.map),d=e,h=getBoundingBox(d),x=t.width/r(h.xMax-h.xMin),c=t.height/r(h.yMax-h.yMin),p=x<c?x:c,g=t.width/2-r(h.xMax-h.xMin)/2*p,y=t.height/2-r(h.yMax-h.yMin)/2*p;o.beginPath(),o.clearRect(0,0,t.width,t.height),o.setFillStyle(t.background||"#FFFFFF"),o.rect(0,0,t.width,t.height),o.fill();for(var f=0;f<d.length;f++){o.beginPath(),o.setLineWidth(s.borderWidth*t.pixelRatio),o.setStrokeStyle(s.borderColor),o.setFillStyle(hexToRgb(e[f].color,s.fillOpacity)),t.tooltip&&t.tooltip.index==f&&(o.setStrokeStyle(s.activeBorderColor),o.setFillStyle(hexToRgb(s.activeFillColor,s.activeFillOpacity)));for(var u=d[f].geometry.coordinates,m=0;m<u.length;m++){n=u[m],1==n.length&&(n=n[0]);for(var S=0;S<n.length;S++)l=coordinateToPoint(n[S][1],n[S][0],h,p,g,y),0==S?(o.beginPath(),o.moveTo(l.x,l.y)):o.lineTo(l.x,l.y);o.fill(),!0==s.border&&o.stroke()}if(!0==t.dataLabel){var T=d[f].properties.centroid;if(T){l=coordinateToPoint(T[1],T[0],h,p,g,y);let e=d[f].textSize||a.fontSize,t=d[f].properties.name;o.beginPath(),o.setFontSize(e),o.setFillStyle(d[f].textColor||"#666666"),o.fillText(t,l.x-measureText(t,e)/2,l.y+e/2),o.closePath(),o.stroke()}}}t.chartData.mapData={bounds:h,scale:p,xoffset:g,yoffset:y},drawToolTipBridge(t,a,o,1),o.draw()}function getWordCloudPoint(e,t){let a=e.series.sort(function(e,t){return parseInt(t.textSize)-parseInt(e.textSize)});switch(t){case"normal":for(let t=0;t<a.length;t++){let i,o,n,l=a[t].name,r=a[t].textSize,s=measureText(l,r),d=0;for(;;){d++,i=normalInt(-e.width/2,e.width/2,5)-s/2,o=normalInt(-e.height/2,e.height/2,5)+r/2,n=[i-5+e.width/2,o-5-r+e.height/2,i+s+5+e.width/2,o+5+e.height/2];let t=collisionNew(n,a,e.width,e.height);if(!t)break;if(1e3==d){n=[-100,-100,-100,-100];break}}a[t].area=n}break;case"vertical":function o(){return!!(.7<Math.random())};for(let t=0;t<a.length;t++){let i,n,l,r,s=a[t].name,d=a[t].textSize,h=measureText(s,d),x=o(),c=0;for(;;){c++;let t;if(x?(i=normalInt(-e.width/2,e.width/2,5)-h/2,n=normalInt(-e.height/2,e.height/2,5)+d/2,l=[n-5-h+e.width/2,-i-5+e.height/2,n+5+e.width/2,-i+d+5+e.height/2],r=[e.width-(e.width/2-e.height/2)-(-i+d+5+e.height/2)-5,e.height/2-e.width/2+(n-5-h+e.width/2)-5,e.width-(e.width/2-e.height/2)-(-i+d+5+e.height/2)+d,e.height/2-e.width/2+(n-5-h+e.width/2)+h+5],t=collisionNew(r,a,e.height,e.width)):(i=normalInt(-e.width/2,e.width/2,5)-h/2,n=normalInt(-e.height/2,e.height/2,5)+d/2,l=[i-5+e.width/2,n-5-d+e.height/2,i+h+5+e.width/2,n+5+e.height/2],t=collisionNew(l,a,e.width,e.height)),!t)break;if(1e3==c){l=[-1e3,-1e3,-1e3,-1e3];break}}x?(a[t].area=r,a[t].areav=l):a[t].area=l,a[t].rotate=x};}return a}function drawWordCloudDataPoints(e,t,i,a){let o=4<arguments.length&&arguments[4]!==void 0?arguments[4]:1,n=assign({},{type:"normal",autoColors:!0},t.extra.word);a.beginPath(),a.setFillStyle(t.background||"#FFFFFF"),a.rect(0,0,t.width,t.height),a.fill(),a.save();let l=t.chartData.wordCloudData;a.translate(t.width/2,t.height/2);for(let n=0;n<l.length;n++){a.save(),l[n].rotate&&a.rotate(90*Math.PI/180);let e=l[n].name,i=l[n].textSize,r=measureText(e,i);a.beginPath(),a.setStrokeStyle(l[n].color),a.setFillStyle(l[n].color),a.setFontSize(i),l[n].rotate?0<l[n].areav[0]&&(t.tooltip?t.tooltip.index==n?a.strokeText(e,(l[n].areav[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].areav[1]+5+i-t.height/2)*o):a.fillText(e,(l[n].areav[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].areav[1]+5+i-t.height/2)*o):a.fillText(e,(l[n].areav[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].areav[1]+5+i-t.height/2)*o)):0<l[n].area[0]&&(t.tooltip?t.tooltip.index==n?a.strokeText(e,(l[n].area[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].area[1]+5+i-t.height/2)*o):a.fillText(e,(l[n].area[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].area[1]+5+i-t.height/2)*o):a.fillText(e,(l[n].area[0]+5-t.width/2)*o-r*(1-o)/2,(l[n].area[1]+5+i-t.height/2)*o)),a.stroke(),a.restore()}a.restore()}function drawFunnelDataPoints(e,t,i,a){let o=4<arguments.length&&void 0!==arguments[4]?arguments[4]:1,n=assign({},{activeWidth:10,activeOpacity:.3,border:!1,borderWidth:2,borderColor:"#FFFFFF",fillOpacity:1,labelAlign:"right"},t.extra.funnel),l=(t.height-t.area[0]-t.area[2])/e.length,r={x:t.area[3]+(t.width-t.area[1]-t.area[3])/2,y:t.height-t.area[2]},s=n.activeWidth,d=Math.min((t.width-t.area[1]-t.area[3])/2-s,(t.height-t.area[0]-t.area[2])/2-s);e=getFunnelDataPoints(e,d,o),a.save(),a.translate(r.x,r.y);for(let o=0;o<e.length;o++)0==o?(t.tooltip&&t.tooltip.index==o&&(a.beginPath(),a.setFillStyle(hexToRgb(e[o].color,n.activeOpacity)),a.moveTo(-s,0),a.lineTo(-e[o].radius-s,-l),a.lineTo(e[o].radius+s,-l),a.lineTo(s,0),a.lineTo(-s,0),a.closePath(),a.fill()),e[o].funnelArea=[r.x-e[o].radius,r.y-l,r.x+e[o].radius,r.y],a.beginPath(),a.setLineWidth(n.borderWidth*t.pixelRatio),a.setStrokeStyle(n.borderColor),a.setFillStyle(hexToRgb(e[o].color,n.fillOpacity)),a.moveTo(0,0),a.lineTo(-e[o].radius,-l),a.lineTo(e[o].radius,-l),a.lineTo(0,0),a.closePath(),a.fill(),!0==n.border&&a.stroke()):(t.tooltip&&t.tooltip.index==o&&(a.beginPath(),a.setFillStyle(hexToRgb(e[o].color,n.activeOpacity)),a.moveTo(0,0),a.lineTo(-e[o-1].radius-s,0),a.lineTo(-e[o].radius-s,-l),a.lineTo(e[o].radius+s,-l),a.lineTo(e[o-1].radius+s,0),a.lineTo(0,0),a.closePath(),a.fill()),e[o].funnelArea=[r.x-e[o].radius,r.y-l*(o+1),r.x+e[o].radius,r.y-l*o],a.beginPath(),a.setLineWidth(n.borderWidth*t.pixelRatio),a.setStrokeStyle(n.borderColor),a.setFillStyle(hexToRgb(e[o].color,n.fillOpacity)),a.moveTo(0,0),a.lineTo(-e[o-1].radius,0),a.lineTo(-e[o].radius,-l),a.lineTo(e[o].radius,-l),a.lineTo(e[o-1].radius,0),a.lineTo(0,0),a.closePath(),a.fill(),!0==n.border&&a.stroke()),a.translate(0,-l);return a.restore(),!1!==t.dataLabel&&1===o&&drawFunnelText(e,t,a,l,n.labelAlign,s,r),{center:r,radius:d,series:e}}function drawFunnelText(e,t,a,o,n,l,r){var s=Math.PI;for(let d=0;d<e.length;d++){let i,h,x,c,p=e[d],g=p.format?p.format(+p._proportion_.toFixed(2)):util.toFixed(100*p._proportion_)+"%";"right"==n?(i=0==d?(p.funnelArea[2]+r.x)/2:(p.funnelArea[2]+e[d-1].funnelArea[2])/2,h=i+2*l,x=p.funnelArea[1]+o/2,c=p.textSize||t.fontSize,a.setLineWidth(1*t.pixelRatio),a.setStrokeStyle(p.color),a.setFillStyle(p.color),a.beginPath(),a.moveTo(i,x),a.lineTo(h,x),a.stroke(),a.closePath(),a.beginPath(),a.moveTo(h,x),a.arc(h,x,2,0,2*s),a.closePath(),a.fill(),a.beginPath(),a.setFontSize(c),a.setFillStyle(p.textColor||"#666666"),a.fillText(g,h+5,x+c/2-2),a.closePath(),a.stroke(),a.closePath()):(i=0==d?(p.funnelArea[0]+r.x)/2:(p.funnelArea[0]+e[d-1].funnelArea[0])/2,h=i-2*l,x=p.funnelArea[1]+o/2,c=p.textSize||t.fontSize,a.setLineWidth(1*t.pixelRatio),a.setStrokeStyle(p.color),a.setFillStyle(p.color),a.beginPath(),a.moveTo(i,x),a.lineTo(h,x),a.stroke(),a.closePath(),a.beginPath(),a.moveTo(h,x),a.arc(h,x,2,0,2*s),a.closePath(),a.fill(),a.beginPath(),a.setFontSize(c),a.setFillStyle(p.textColor||"#666666"),a.fillText(g,h-5-measureText(g),x+c/2-2),a.closePath(),a.stroke(),a.closePath())}}function drawCanvas(e,t){t.draw()}var Timing={easeIn:function(e){return Math.pow(e,3)},easeOut:function(e){return Math.pow(e-1,3)+1},easeInOut:function(e){var t=Math.pow;return 1>(e/=.5)?.5*t(e,3):.5*(t(e-2,3)+2)},linear:function(e){return e}};function Animation(e){this.isStop=!1,e.duration="undefined"==typeof e.duration?1e3:e.duration,e.timing=e.timing||"linear";var t=function(){return"undefined"==typeof setTimeout?"undefined"==typeof requestAnimationFrame?function(e){e(null)}:requestAnimationFrame:function(e,t){setTimeout(function(){var t=+new Date;e(t)},t)}}(),i=null,a=function(o){if(null===o||!0===this.isStop)return e.onProcess&&e.onProcess(1),void(e.onAnimationFinish&&e.onAnimationFinish());if(null===i&&(i=o),o-i<e.duration){var n=(o-i)/e.duration,l=Timing[e.timing];n=l(n),e.onProcess&&e.onProcess(n),t(a,17)}else e.onProcess&&e.onProcess(1),e.onAnimationFinish&&e.onAnimationFinish()};a=a.bind(this),t(a,17)}Animation.prototype.stop=function(){this.isStop=!0};function drawCharts(e,t,a,i){var o=this,n=t.series,l=t.categories;n=fillSeries(n,t,a);var r=t.animation?t.duration:0;o.animationInstance&&o.animationInstance.stop();var s=null;if("candle"==e){let e=assign({},t.extra.candle.average);e.show?(s=calCandleMA(e.day,e.name,e.color,n[0].data),s=fillSeries(s,t,a),t.seriesMA=s):t.seriesMA?s=t.seriesMA=fillSeries(t.seriesMA,t,a):s=n}else s=n;t._series_=n=filterSeries(n),t.area=[,,,,];for(let o=0;4>o;o++)t.area[o]=t.padding[o];var d=calLegendData(s,t,a,t.chartData),h=d.area.wholeHeight,x=d.area.wholeWidth;switch(t.legend.position){case"top":t.area[0]+=h;break;case"bottom":t.area[2]+=h;break;case"left":t.area[3]+=x;break;case"right":t.area[1]+=x;}let c={},p=0;if("line"===t.type||"column"===t.type||"area"===t.type||"mix"===t.type||"candle"===t.type){if(c=calYAxisData(n,t,a),p=c.yAxisWidth,t.yAxis.showTitle){let e=0;for(let o=0;o<t.yAxis.data.length;o++)e=Math.max(e,t.yAxis.data[o].titleFontSize?t.yAxis.data[o].titleFontSize:a.fontSize);t.area[0]+=(e+6)*t.pixelRatio}let e=0,o=0;for(let a=0;a<p.length;a++)"left"==p[a].position?(t.area[3]+=0<o?p[a].width+t.yAxis.padding:p[a].width,o+=1):(t.area[1]+=0<e?p[a].width+t.yAxis.padding:p[a].width,e+=1)}else a.yAxisWidth=p;if(t.chartData.yAxisData=c,t.categories&&t.categories.length){t.chartData.xAxisData=getXAxisPoints(t.categories,t,a);let e=calCategoriesData(t.categories,t,a,t.chartData.xAxisData.eachSpacing),i=e.xAxisHeight,o=e.angle;a.xAxisHeight=i,a._xAxisTextAngle_=o,t.area[2]+=i,t.chartData.categoriesData=e}else if("line"===t.type||"area"===t.type||"points"===t.type){t.chartData.xAxisData=calXAxisData(n,t,a),l=t.chartData.xAxisData.rangesFormat;let e=calCategoriesData(l,t,a,t.chartData.xAxisData.eachSpacing),i=e.xAxisHeight,o=e.angle;a.xAxisHeight=i,a._xAxisTextAngle_=o,t.area[2]+=i,t.chartData.categoriesData=e}else t.chartData.xAxisData={xAxisPoints:[]};if(t.enableScroll&&"right"==t.xAxis.scrollAlign&&void 0===t._scrollDistance_){let e=0,i=t.chartData.xAxisData.xAxisPoints,a=t.chartData.xAxisData.startX,n=t.chartData.xAxisData.endX,l=t.chartData.xAxisData.eachSpacing,r=l*(i.length-1);e=n-a-r,o.scrollOption={currentOffset:e,startTouchX:e,distance:0,lastMoveTime:0},t._scrollDistance_=e}switch(("pie"===e||"ring"===e||"rose"===e)&&(a._pieTextMaxLength_=!1===t.dataLabel?0:getPieTextMaxLength(s)),e){case"word":let d=assign({},{type:"normal",autoColors:!0},t.extra.word);(!0==t.updateData||null==t.updateData)&&(t.chartData.wordCloudData=getWordCloudPoint(t,d.type)),this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawWordCloudDataPoints(n,t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"map":i.clearRect(0,0,t.width,t.height),drawMapDataPoints(n,t,a,i);break;case"funnel":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.funnelData=drawFunnelDataPoints(n,t,a,i,e),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"line":this.animationInstance=new Animation({timing:"easeIn",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawYAxisGrid(l,t,a,i),drawXAxis(l,t,a,i);var o=drawLineDataPoints(n,t,a,i,e),r=o.xAxisPoints,s=o.calPoints,d=o.eachSpacing;t.chartData.xAxisPoints=r,t.chartData.calPoints=s,t.chartData.eachSpacing=d,drawYAxis(n,t,a,i),!1!==t.enableMarkLine&&1===e&&drawMarkLine(t,a,i),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e,d,r),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"mix":this.animationInstance=new Animation({timing:"easeIn",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawYAxisGrid(l,t,a,i),drawXAxis(l,t,a,i);var o=drawMixDataPoints(n,t,a,i,e),r=o.xAxisPoints,s=o.calPoints,d=o.eachSpacing;t.chartData.xAxisPoints=r,t.chartData.calPoints=s,t.chartData.eachSpacing=d,drawYAxis(n,t,a,i),!1!==t.enableMarkLine&&1===e&&drawMarkLine(t,a,i),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e,d,r),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"column":this.animationInstance=new Animation({timing:"easeIn",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawYAxisGrid(l,t,a,i),drawXAxis(l,t,a,i);var o=drawColumnDataPoints(n,t,a,i,e),r=o.xAxisPoints,s=o.calPoints,d=o.eachSpacing;t.chartData.xAxisPoints=r,t.chartData.calPoints=s,t.chartData.eachSpacing=d,drawYAxis(n,t,a,i),!1!==t.enableMarkLine&&1===e&&drawMarkLine(t,a,i),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e,d,r),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"area":this.animationInstance=new Animation({timing:"easeIn",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawYAxisGrid(l,t,a,i),drawXAxis(l,t,a,i);var o=drawAreaDataPoints(n,t,a,i,e),r=o.xAxisPoints,s=o.calPoints,d=o.eachSpacing;t.chartData.xAxisPoints=r,t.chartData.calPoints=s,t.chartData.eachSpacing=d,drawYAxis(n,t,a,i),!1!==t.enableMarkLine&&1===e&&drawMarkLine(t,a,i),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e,d,r),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"ring":case"pie":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.pieData=drawPieDataPoints(n,t,a,i,e),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"rose":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.pieData=drawRoseDataPoints(n,t,a,i,e),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"radar":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.radarData=drawRadarDataPoints(n,t,a,i,e),drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"arcbar":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.arcbarData=drawArcbarDataPoints(n,t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"gauge":this.animationInstance=new Animation({timing:"easeInOut",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),t.chartData.gaugeData=drawGaugeDataPoints(l,n,t,a,i,e),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});break;case"candle":this.animationInstance=new Animation({timing:"easeIn",duration:r,onProcess:function(e){i.clearRect(0,0,t.width,t.height),t.rotate&&contextRotate(i,t),drawYAxisGrid(l,t,a,i),drawXAxis(l,t,a,i);var o=drawCandleDataPoints(n,s,t,a,i,e),r=o.xAxisPoints,d=o.calPoints,h=o.eachSpacing;t.chartData.xAxisPoints=r,t.chartData.calPoints=d,t.chartData.eachSpacing=h,drawYAxis(n,t,a,i),!1!==t.enableMarkLine&&1===e&&drawMarkLine(t,a,i),s?drawLegend(s,t,a,i,t.chartData):drawLegend(t.series,t,a,i,t.chartData),drawToolTipBridge(t,a,i,e,h,r),drawCanvas(t,i)},onAnimationFinish:function(){o.event.trigger("renderComplete")}});}}function Event(){this.events={}}Event.prototype.addEventListener=function(e,t){this.events[e]=this.events[e]||[],this.events[e].push(t)},Event.prototype.trigger=function(){for(var e=arguments.length,t=Array(e),i=0;i<e;i++)t[i]=arguments[i];var a=t[0],o=t.slice(1);!this.events[a]||this.events[a].forEach(function(e){try{e.apply(null,o)}catch(t){console.error(t)}})};var Charts=function(e){e.pixelRatio=e.pixelRatio?e.pixelRatio:1,e.fontSize=e.fontSize?e.fontSize*e.pixelRatio:13*e.pixelRatio,e.title=assign({},e.title),e.subtitle=assign({},e.subtitle),e.duration=e.duration?e.duration:1e3,e.yAxis=assign({},{data:[],showTitle:!1,disabled:!1,disableGrid:!1,splitNumber:5,gridType:"solid",dashLength:4*e.pixelRatio,gridColor:"#cccccc",padding:10,fontColor:"#666666"},e.yAxis),e.yAxis.dashLength*=e.pixelRatio,e.yAxis.padding*=e.pixelRatio,e.xAxis=assign({},{rotateLabel:!1,type:"calibration",gridType:"solid",dashLength:4,scrollAlign:"left",boundaryGap:"center",axisLine:!0,axisLineColor:"#cccccc"},e.xAxis),e.xAxis.dashLength*=e.pixelRatio,e.legend=assign({},{show:!0,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:e.fontSize,lineHeight:e.fontSize,fontColor:"#333333",format:{},hiddenColor:"#CECECE"},e.legend),e.legend.borderWidth*=e.pixelRatio,e.legend.itemGap*=e.pixelRatio,e.legend.padding*=e.pixelRatio,e.legend.margin*=e.pixelRatio,e.extra=assign({},e.extra),e.rotate=!!e.rotate,e.animation=!!e.animation,e.rotate=!!e.rotate;let t=JSON.parse(JSON.stringify(config));if(t.colors=e.colors?e.colors:t.colors,t.yAxisTitleWidth=!0!==e.yAxis.disabled&&e.yAxis.title?t.yAxisTitleWidth:0,("pie"==e.type||"ring"==e.type)&&(t.pieChartLinePadding=!1===e.dataLabel?0:e.extra.pie.labelWidth*e.pixelRatio||t.pieChartLinePadding*e.pixelRatio),"rose"==e.type&&(t.pieChartLinePadding=!1===e.dataLabel?0:e.extra.rose.labelWidth*e.pixelRatio||t.pieChartLinePadding*e.pixelRatio),t.pieChartTextPadding=!1===e.dataLabel?0:t.pieChartTextPadding*e.pixelRatio,t.yAxisSplit=e.yAxis.splitNumber?e.yAxis.splitNumber:config.yAxisSplit,t.rotate=e.rotate,e.rotate){let t=e.width,i=e.height;e.width=i,e.height=t}e.padding=e.padding?e.padding:t.padding;for(let t=0;4>t;t++)e.padding[t]*=e.pixelRatio;t.yAxisWidth=config.yAxisWidth*e.pixelRatio,t.xAxisHeight=config.xAxisHeight*e.pixelRatio,e.enableScroll&&e.xAxis.scrollShow&&(t.xAxisHeight+=6*e.pixelRatio),t.xAxisLineHeight=config.xAxisLineHeight*e.pixelRatio,t.fontSize=e.fontSize,t.titleFontSize=config.titleFontSize*e.pixelRatio,t.subtitleFontSize=config.subtitleFontSize*e.pixelRatio,t.toolTipPadding=config.toolTipPadding*e.pixelRatio,t.toolTipLineHeight=config.toolTipLineHeight*e.pixelRatio,t.columePadding=config.columePadding*e.pixelRatio,e.$this=e.$this?e.$this:this,this.context=uni.createCanvasContext(e.canvasId,e.$this),e.chartData={},this.event=new Event,this.scrollOption={currentOffset:0,startTouchX:0,distance:0,lastMoveTime:0},this.opts=e,this.config=t,drawCharts.call(this,e.type,e,t,this.context)};Charts.prototype.updateData=function(){let e=0<arguments.length&&arguments[0]!==void 0?arguments[0]:{};this.opts=assign({},this.opts,e),this.opts.updateData=!0;let t=e.scrollPosition||"current";switch(t){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 e=calYAxisData(this.opts.series,this.opts,this.config),i=e.yAxisWidth;this.config.yAxisWidth=i;let a=0,o=getXAxisPoints(this.opts.categories,this.opts,this.config),n=o.xAxisPoints,l=o.startX,r=o.endX,s=o.eachSpacing,d=s*(n.length-1);a=r-l-d,this.scrollOption={currentOffset:a,startTouchX:a,distance:0,lastMoveTime:0},this.opts._scrollDistance_=a;}drawCharts.call(this,this.opts.type,this.opts,this.config,this.context)},Charts.prototype.zoom=function(){var e=Math.round,t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:this.opts.xAxis.itemCount;if(!0!==this.opts.enableScroll)return void console.log("\u8BF7\u542F\u7528\u6EDA\u52A8\u6761\u540E\u4F7F\u7528\uFF01");let i=e(Math.abs(this.scrollOption.currentOffset)/this.opts.chartData.eachSpacing)+e(this.opts.xAxis.itemCount/2);this.opts.animation=!1,this.opts.xAxis.itemCount=t.itemCount;let a=calYAxisData(this.opts.series,this.opts,this.config),o=a.yAxisWidth;this.config.yAxisWidth=o;let n=0,l=getXAxisPoints(this.opts.categories,this.opts,this.config),r=l.xAxisPoints,s=l.startX,d=l.endX,h=l.eachSpacing,x=d-s,c=x-h*(r.length-1);n=x/2-h*i,0<n&&(n=0),n<c&&(n=c),this.scrollOption={currentOffset:n,startTouchX:n,distance:0,lastMoveTime:0},this.opts._scrollDistance_=n,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(e,t){this.event.addEventListener(e,t)},Charts.prototype.getCurrentDataIndex=function(t){var e=null;if(e=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0],e){let i=getTouches(e,this.opts,t);return"pie"===this.opts.type||"ring"===this.opts.type||"rose"===this.opts.type?findPieChartCurrentIndex({x:i.x,y:i.y},this.opts.chartData.pieData):"radar"===this.opts.type?findRadarChartCurrentIndex({x:i.x,y:i.y},this.opts.chartData.radarData,this.opts.categories.length):"funnel"===this.opts.type?findFunnelChartCurrentIndex({x:i.x,y:i.y},this.opts.chartData.funnelData):"map"===this.opts.type?findMapChartCurrentIndex({x:i.x,y:i.y},this.opts):"word"===this.opts.type?findWordChartCurrentIndex({x:i.x,y:i.y},this.opts.chartData.wordCloudData):findCurrentIndex({x:i.x,y:i.y},this.opts.chartData.calPoints,this.opts,this.config,Math.abs(this.scrollOption.currentOffset))}return-1},Charts.prototype.getLegendDataIndex=function(t){var e=null;if(e=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0],e){let i=getTouches(e,this.opts,t);return findLegendIndex({x:i.x,y:i.y},this.opts.chartData.legendData)}return-1},Charts.prototype.touchLegend=function(t){var e=1<arguments.length&&void 0!==arguments[1]?arguments[1]:{},i=null;if(i=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0],i){var a=getTouches(i,this.opts,t),o=this.getLegendDataIndex(t);0<=o&&(this.opts.series[o].show=!this.opts.series[o].show,this.opts.animation=!!e.animation,this.opts._scrollDistance_=this.scrollOption.currentOffset,drawCharts.call(this,this.opts.type,this.opts,this.config,this.context))}},Charts.prototype.showToolTip=function(t){var e=1<arguments.length&&arguments[1]!==void 0?arguments[1]:{},i=null;i=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0],i||console.log("touchError");var a=getTouches(i,this.opts,t),o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1});if("line"===this.opts.type||"area"===this.opts.type||"column"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var r=getSeriesDataItem(this.opts.series,l);if(0!==r.length){var s=getToolTipData(r,this.opts.chartData.calPoints,l,this.opts.categories,e),d=s.textList,h=s.offset;h.y=a.y,n.tooltip={textList:d,offset:h,option:e,index:l}}}drawCharts.call(this,n.type,n,this.config,this.context)}if("mix"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1}),r=getSeriesDataItem(this.opts.series,l);if(0!==r.length){var x=getMixToolTipData(r,this.opts.chartData.calPoints,l,this.opts.categories,e),d=x.textList,h=x.offset;h.y=a.y,n.tooltip={textList:d,offset:h,option:e,index:l}}}drawCharts.call(this,n.type,n,this.config,this.context)}if("candle"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1}),r=getSeriesDataItem(this.opts.series,l);if(0!==r.length){var s=getCandleToolTipData(this.opts.series[0].data,r,this.opts.chartData.calPoints,l,this.opts.categories,this.opts.extra.candle,e),d=s.textList,h=s.offset;h.y=a.y,n.tooltip={textList:d,offset:h,option:e,index:l}}}drawCharts.call(this,n.type,n,this.config,this.context)}if("pie"===this.opts.type||"ring"===this.opts.type||"rose"===this.opts.type||"funnel"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1}),r=this.opts._series_[l],d=[{text:e.format?e.format(r):r.name+": "+r.data,color:r.color}],h={x:a.x,y:a.y};n.tooltip={textList:d,offset:h,option:e,index:l}}drawCharts.call(this,n.type,n,this.config,this.context)}if("map"===this.opts.type||"word"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1}),r=this.opts._series_[l],d=[{text:e.format?e.format(r):r.properties.name,color:r.color}],h={x:a.x,y:a.y};n.tooltip={textList:d,offset:h,option:e,index:l}}n.updateData=!1,drawCharts.call(this,n.type,n,this.config,this.context)}if("radar"===this.opts.type){var l=this.getCurrentDataIndex(t);if(-1<l){var o=this.scrollOption.currentOffset,n=assign({},this.opts,{_scrollDistance_:o,animation:!1}),r=getSeriesDataItem(this.opts.series,l);if(0!==r.length){var d=r.map(function(t){return{text:e.format?e.format(t):t.name+": "+t.data,color:t.color}}),h={x:a.x,y:a.y};n.tooltip={textList:d,offset:h,option:e,index:l}}}drawCharts.call(this,n.type,n,this.config,this.context)}},Charts.prototype.translate=function(e){this.scrollOption={currentOffset:e,startTouchX:e,distance:0,lastMoveTime:0};let t=assign({},this.opts,{_scrollDistance_:e,animation:!1});drawCharts.call(this,this.opts.type,t,this.config,this.context)},Charts.prototype.scrollStart=function(t){var e=null;e=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0];var i=getTouches(e,this.opts,t);e&&!0===this.opts.enableScroll&&(this.scrollOption.startTouchX=i.x)},Charts.prototype.scroll=function(t){0===this.scrollOption.lastMoveTime&&(this.scrollOption.lastMoveTime=Date.now());let e=this.opts.extra.touchMoveLimit||20,i=Date.now(),a=i-this.scrollOption.lastMoveTime;if(!(a<Math.floor(1e3/e))){this.scrollOption.lastMoveTime=i;var o=null;if(o=t.changedTouches?t.changedTouches[0]:t.mp.changedTouches[0],o&&!0===this.opts.enableScroll){var n,l=getTouches(o,this.opts,t);n=l.x-this.scrollOption.startTouchX;var r=this.scrollOption.currentOffset,s=calValidDistance(this,r+n,this.opts.chartData,this.config,this.opts);this.scrollOption.distance=n=s-r;var d=assign({},this.opts,{_scrollDistance_:r+n,animation:!1});return drawCharts.call(this,d.type,d,this.config,this.context),r+n}}},Charts.prototype.scrollEnd=function(){if(!0===this.opts.enableScroll){var e=this.scrollOption,t=e.currentOffset,i=e.distance;this.scrollOption.currentOffset=t+i,this.scrollOption.distance=0}},"object"==typeof module&&"object"==typeof module.exports&&(module.exports=Charts);
\ No newline at end of file
diff --git a/pages/subPages/merchant/merchantHome/merchantHome.vue b/pages/subPages/merchant/merchantHome/merchantHome.vue
new file mode 100644
index 0000000..0246f26
--- /dev/null
+++ b/pages/subPages/merchant/merchantHome/merchantHome.vue
@@ -0,0 +1,899 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="record-dialog dis-flex flex-x-center flex-y-center" v-if="filterDialog">
+				<view class="record-dialog-main">
+					<view class="m-top40 f-30 color-33 m-btm40 t-c">筛选时间</view>
+					<view class="color-33 f-24 m-left30">起始时间</view>
+					<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="starChange">
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+						</picker-view-column>
+					</picker-view>
+					<view class="color-33 f-24 m-left30">结束时间</view>
+					<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="endChange">
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+						</picker-view-column>
+						<picker-view-column>
+							<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+						</picker-view-column>
+					</picker-view>
+					<view class="record-dialog-btns dis-flex flex-y-center">
+						<view class="btn cancel" @click="filterDialog = false">取消</view>
+						<view class="line"></view>
+						<view class="btn confirm" @click="checkBind">确认</view>
+					</view>
+				</view>
+			</view>
+			<view class="pages-header p-r" :style="{ 'background-image': 'url(' + imageRoot + 'delaer_bg.png)' }">
+				<view class="person-content dis-flex flex-y-center flex-x-around">
+					<!-- <view class="user-avatar m-right30" :style="{'background-image':'url('+detalsData.avatar+')'}"></view> -->
+					<view class="user-referrer-name flex-x-center">
+						<view class="dis-flex flex-dir-column flex-y-center">
+							<view class="user-name col-f f-50 f-w">{{ storeInfo.todaymoney }}</view>
+						</view>
+						<view class="referrer-name col-9 f-24 m-top10">今日交易额(元)</view>
+					</view>
+					<view class="user-referrer-name flex-x-center">
+						<view class="dis-flex flex-dir-column flex-y-center">
+							<view class="user-name col-f f-50 f-w">{{ storeInfo.todayordernum }}</view>
+						</view>
+						<view class="referrer-name col-9 f-24 m-top10">今日订单数(单)</view>
+					</view>
+				</view>
+			</view>
+			<view class="dealer-content p-r p-left-right-30">
+				<view class="tool-tab bor-radius-10upx b-f">
+					<view class="tool-list dis-flex">
+						<view class="tool-item flex-box t-c" v-for="(tool_item, index) in tab_list" :key="index" @click="navgateTo($event, tool_item.item_navType)">
+							<image class="tool-item-icon" :src="tool_item.item_icon" mode=""></image>
+							<view class="f-24 col-3">{{ tool_item.item_name }}</view>
+						</view>
+					</view>
+				</view>
+				<view class="dealer-menu m-top-btm30" v-if="!!typeList[index1] && !!goodsTypeList[index2]">
+					<view class="menu-style">
+						<view class="select-box dis-flex flex-x-between f-24">
+							<picker @change="changeType" :value="index1" :range="typeList" range-key="label">
+								<view class="dis-flex">
+									{{typeList[index1].label}}
+									<view class="i icon iconfont icon-unfold"></view>
+								</view>
+							</picker>
+							<picker @change="changeGoodsType" :value="index2" :range="goodsTypeList" range-key="label">
+								<view class="dis-flex">
+									{{goodsTypeList[index2].label}}
+									<view class="i icon iconfont icon-unfold"></view>
+								</view>
+							</picker>
+						</view>
+						<view class="merchant-radio-group dis-flex">
+							<view class="merchant-radio" :class="{ check: tabCheck === 1 }" @click="tabClick(1)">今日</view>
+							<view class="merchant-radio" :class="{ check: tabCheck === 2 }" @click="tabClick(2)">昨日</view>
+							<view class="merchant-radio" :class="{ check: tabCheck === 3 }" @click="tabClick(3)">7日</view>
+							<view class="merchant-radio" :class="{ check: tabCheck === 4 }" @click="tabClick(4)">30日</view>
+							<view class="merchant-radio" :class="{ check: tabCheck === 5 }" @click="tabClick(5)">自定义</view>
+						</view>
+					</view>
+					<canvas canvas-id="canvasLineA" id="canvasLineA" class="charts" @touchstart="touchLineA" @touchmove="moveLineA"
+					 @touchend="touchEndLineA" v-show="filterDialog==false"></canvas>
+				</view>
+			</view>
+
+			<pop-view :show="showTabbar" type="top" @clickmask="showTabbar = false">
+				<view class="tabbar-main b-f">
+					<view class="tabBar-list dis-flex border-line border-bottom">
+						<view class="tabBar-item dis-flex flex-x-center flex-y-center f-28 col-3" @click="swichClass('classfly')">
+							<view>{{ class_one }}</view>
+							<view class="iconfont" :class="classType === 'classfly' ? 'icon-unfold' : 'icon-fold'"></view>
+						</view>
+						<view class="tabBar-item dis-flex flex-x-center flex-y-center f-28 col-3" @click="swichClass('sort')">
+							<view>{{ class_two }}</view>
+							<view class="iconfont" :class="classType === 'sort' ? 'icon-unfold' : 'icon-fold'"></view>
+						</view>
+					</view>
+					<block v-if="classType === 'classfly'">
+						<view class="control-list padding-box-all" >
+							<view class="f-28 col-3 m-btm40" v-for="(tabItem, index) in Control_sort" :key="tabItem.type" @click="swichClassType('classfly', tabItem)"
+							 :class="{ selectTabbar: tabItem.name === class_one }">
+								{{ tabItem.name }}
+							</view>
+						</view>
+					</block>
+					<block v-else>
+						<view class="control-list padding-box-all">
+							<view class="f-28 col-3 m-btm40" @click="swichClassType('classfly', 'all')" :class="{ selectTabbar: '全部' === class_one }">全部</view>
+							<view class="f-28 col-3 m-btm40" v-for="(tabItem, index) in qmj" :key="tabItem.type" @click="swichClassType('sort', tabItem)"
+							 :class="{ selectTabbar: tabItem.name === class_two }">
+								{{ tabItem.name }}
+							</view>
+						</view>
+					</block>
+				</view>
+			</pop-view>
+		</view>
+		<navBar :tabBarAct="0" />
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo';
+	import navBar from '@/components/template/navBar.vue';
+	import popView from '@/components/template/PopManager.vue';
+	import uCharts from './js_sdk/u-charts/u-charts/u-charts.min.js';
+	var _self;
+	var canvaLineA = null;
+	export default {
+		data() {
+			const date = new Date();
+			const years = [];
+			const year = date.getFullYear();
+			const months = [];
+			const month = date.getMonth() + 1;
+			const days = [];
+			const day = date.getDate();
+			for (let i = 1990; i <= date.getFullYear(); i++) {
+				years.push(i);
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(i);
+			}
+			for (let i = 1; i <= 31; i++) {
+				days.push(i);
+			}
+			return {
+				filterDialog: false,
+				plugin: 'rush',
+				index2: 0,
+				imgUrl:'',
+				pluginList: [],
+				goodsTypeList: [
+					{value: 1,label:'技能培训'},
+					{value: 2,label:'资格考试'},
+					{value: 3,label:'学历提升'},
+					{value: 4,label:'岗前培训'}
+				],
+				goodsType: 1,
+				name: '支付金额',
+				index1: 0,
+				type: 1,
+				Control_sort:[],
+				typeList: [{
+						label: '支付金额',
+						value: 1
+					},
+					{
+						label: '订单数量',
+						value: 2
+					}
+				],
+				timetype: 1,
+				maxY: null,
+				minY: null,
+				categories: [
+
+				],
+				series: [],
+				pixelRatio: 1,
+				cWidth: '',
+				cHeight: '',
+				storeid: null,
+				storeInfo: {},
+				monidata: 'ikik',
+				detalsData: null,
+				showTabbar: false,
+				class_one: '支付金额',
+				class_two: null,
+				classType: 'classfly',
+				class_one_id: 1,
+				class_two_id: null,
+				current_page: 1,
+				tabCheck: 1,
+				qmj: [{
+						id: '1',
+						name: '111',
+						thumb: 'http://weilamdemo.oss-cn-qingdao.aliyuncs.com/images/26/2018/10/JiO2I8742gkJK2k872g5G7Z7ITk48K.png'
+					},
+					{
+						id: '2',
+						name: '222',
+						thumb: 'http://weilamdemo.oss-cn-qingdao.aliyuncs.com/images/26/2018/10/uwnIFbcR3N03Rqrr3r46r0Fuffrc33.png'
+					},
+					{
+						id: '3',
+						name: '333',
+						thumb: 'http://weilamdemo.oss-cn-qingdao.aliyuncs.com/images/26/2018/10/sVdd5gVBbgxh83LKLJH6HLKjBXX33G.png'
+					}
+				],
+				loadlogo: false,
+				shopShow: false,
+				tab_list: [{
+						item_type: 'order',
+						item_name: '订单核销',
+						item_icon: 'centerMerchant/order.png',
+						item_navType: 'order'
+					},
+					{
+						item_type: 'evaluation',
+						item_name: '用户评论',
+						item_icon: 'centerMerchant/evaluation.png',
+						item_navType: 'evaluation'
+					},
+					{
+						item_type: 'release',
+						item_name: '我的动态',
+						item_icon: 'centerMerchant/release.png',
+						item_navType: 'release'
+					},
+					{
+						item_type: 'finance',
+						item_name: '财务对账',
+						item_icon: 'centerMerchant/finance.png',
+						item_navType: 'finance'
+					}
+				],
+				years,
+				year,
+				months,
+				month,
+				days,
+				day,
+				value: [9999, month - 1, day - 1],
+				visible: true,
+				time: '',
+				indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`
+			};
+		},
+		components: {
+			Loadlogo,
+			navBar,
+			popView
+		},
+		computed: {},
+		onShow() {},
+		mounted() {},
+		onLoad(e) {
+			this.imgUrl = uni.getStorageSync('imgPrefix');
+			this.tab_list.map(item=>{
+				item.item_icon = this.imgUrl + item.item_icon;
+			})
+			let _this = this;
+			_self = this;
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.init(res.data);
+				}
+			});
+			this.cWidth = uni.upx2px(690);
+			this.cHeight = uni.upx2px(452);
+		},
+		methods: {
+			checkBind() {
+				let _this = this
+				_this.starTime = _this.starYear + '-' + _this.starMonth + '-' + _this.starDay
+				_this.endTime = _this.endYear + '-' + _this.endMonth + '-' + _this.endDay
+				let starData = new Date(_this.starTime)
+				let endData = new Date(_this.endTime)
+				_this.starTime = starData.getTime() / 1000
+				_this.endTime = endData.getTime() / 1000
+				console.info(_this.starTime)
+				console.info(_this.endTime)
+				_this.time = _this.starTime + ',' + _this.endTime
+				console.info(_this.time)
+				_this.filterDialog = false
+				_this.getStoreInfo(_this.storeid, _this.time)
+			},
+			starChange: function(e) {
+				const val = e.detail.value;
+				this.starYear = this.years[val[0]];
+				this.starMonth = this.months[val[1]];
+				this.starDay = this.days[val[2]];
+			},
+			endChange: function(e) {
+				const val = e.detail.value;
+				this.endYear = this.years[val[0]];
+				this.endMonth = this.months[val[1]];
+				this.endDay = this.days[val[2]];
+			},
+			bindChange: function(e) {
+				const val = e.detail.value;
+				this.year = this.years[val[0]];
+				this.month = this.months[val[1]];
+				this.day = this.days[val[2]];
+			},
+			showLineA(canvasId, chartData) {
+				canvaLineA = new uCharts({
+					$this: _self,
+					canvasId: 'canvasLineA',
+					type: 'line',
+					fontSize: 11,
+					legend: {
+						show: true
+					},
+					dataLabel: true,
+					dataPointShape: true,
+					background: '#FFFFFF',
+					pixelRatio: _self.pixelRatio,
+					categories: _self.categories,
+					series: _self.series,
+					animation: true,
+					enableScroll: true,
+					xAxis: {
+						disableGrid: false,
+						itemCount: 5, //x轴单屏显示数据的数量，默认为5个
+						scrollShow: true, //新增是否显示滚动条，默认false
+						scrollAlign: 'left', //滚动条初始位置
+						// type: 'grid',
+						gridColor: '#CCCCCC',
+						gridType: 'dash',
+						dashLength: 5
+					},
+					yAxis: {
+						gridType: 'dash',
+						gridColor: '#CCCCCC',
+						dashLength: 8,
+						splitNumber: 5,
+						min: Number(_self.minY),
+						max: Number(_self.maxY),
+						format: val => {
+							return val;
+						}
+					},
+					width: _self.cWidth * _self.pixelRatio,
+					height: _self.cHeight * _self.pixelRatio,
+					extra: {
+						line: {
+							type: 'straight'
+						}
+					}
+				});
+			},
+			changeType(e) {
+				let _this = this
+				_this.index1 = e.detail.value
+				_this.categories = []
+				_this.series = []
+				_this.type = _this.typeList[e.detail.value].value
+				_this.name = _this.typeList[e.detail.value].label
+				_this.getStoreInfo()
+			},
+			changePlugin(e) {
+				let _this = this;
+				_this.index2 = e.detail.value;
+				_this.categories = [];
+				_this.series = [];
+				_this.plugin = _this.pluginList[e.detail.value].value;
+				_this.getStoreInfo();
+			},
+			changeGoodsType(e){
+				let _this = this;
+				_this.index2 = e.detail.value;
+				_this.categories = [];
+				_this.series = [];
+				_this.goodsType = _this.goodsTypeList[e.detail.value].value;
+				_this.getStoreInfo();
+			},
+			touchLineA(e) {
+				canvaLineA.scrollStart(e);
+			},
+			moveLineA(e) {
+				canvaLineA.scroll(e);
+			},
+			touchEndLineA(e) {
+				canvaLineA.scrollEnd(e);
+				//下面是toolTip事件，如果滚动后不需要显示，可不填写
+
+			},
+			init(mid) {
+				let _this = this;
+				_this.getStoreInfo(mid);
+			},
+			// 商户中心信息
+			getStoreInfo(mid, time) {
+				let _this = this;
+				let data = {
+					storeid: mid || _this.storeid,
+					timetype: _this.timetype,
+					time: time,
+					type: _this.type,
+					plugin: _this.plugin,
+					cc_id: _this.goodsType
+				};
+				App._post_form('&p=store&do=storeInfo', data, res => {
+					let obj = {
+						item_type: 'takeout',
+						item_name: res.data.deliveryName,
+						item_icon: this.imgfixUrls + 'citydeliveryicon.png',
+						item_navType: 'takeout'
+					}
+					// debugger
+					if(res.data.showDelivery == 1 && _this.tab_list.length !== 5){
+						_this.tab_list.push(obj);
+					}
+					_this.storeInfo = res.data
+					_this.maxY = res.data.maxY
+					_this.minY = res.data.minY
+					for (let i = 0; i < res.data.chart.xaxis.length; i++) {
+						_this.categories.push(res.data.chart.xaxis[i])
+					}
+					let bb = []
+					for (let i = 0; i < res.data.chart.yaxis.length; i++) {
+						let aa = Number(res.data.chart.yaxis[i])
+						bb.push(aa)
+					}
+					let aa = {
+						name: _this.name,
+						data: bb
+					}
+					_this.series.push(aa)
+					let pluginListData = [];
+					for (let key in res.data.typelist) {
+						let aa = {
+							label: res.data.typelist[key],
+							value: key
+						}
+						pluginListData.push(aa)
+					}
+					_this.pluginList = pluginListData;
+					_this.showLineA();
+				});
+			},
+			// 跳转商家
+			goStore() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/myStore/myStore'
+				});
+			},
+			tabClick(index) {
+				let _this = this
+				this.tabCheck = index;
+				_this.timetype = index
+				_this.categories = []
+				_this.series = []
+				if (index == 5) {
+					_this.filterDialog = true
+				} else {
+					_this.getStoreInfo(_this.storeid);
+				}
+			},
+			swichClass(type) {
+				let _this = this;
+				_this.classType = type === 'classfly' ? 'classfly' : 'sort';
+			},
+			swichClassType(className, tabItem) {
+				let _this = this;
+				// if (className === 'classfly') {
+				if (tabItem === 'all') {
+					_this.setData({
+						class_one: '全部',
+						current_page: 1,
+						class_one_id: ''
+					});
+				} else {
+					_this.setData({
+						class_one: tabItem.name,
+						current_page: 1,
+						class_one_id: tabItem.id
+					});
+				}
+				// }
+				// else {
+				// 	_this.setData({
+				// 		class_two: tabItem.title,
+				// 		current_page: 1,
+				// 		class_two_id: tabItem.typeData
+				// 	})
+				// }
+			},
+			new_navgateto() {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantPayDetails/merchantPayDetails'
+				});
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'evaluation':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantComment/merchantComment'
+						});
+						break;
+					case 'finance':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantPayDetails/merchantPayDetails'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantVerification/merchantVerification?storeid=' + _this.storeid
+						});
+						break;
+					case 'merchantRecord':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantRecord/merchantRecord'
+						});
+						break;
+					case 'merchantComment':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantComment/merchantComment'
+						});
+						break;
+					case 'merchantUerCenter':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUerCenter/merchantUerCenter'
+						});
+						break;
+					case 'merchantMsg':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantMsg/merchantMsg'
+						});
+						break;
+					case 'integralShop':
+						App.navigationTo({
+							url: 'pages/subPages/integral/integralShop/integralShop'
+						});
+						break;
+					case 'release':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/dynamicList/dynamicList'
+						});
+						break;
+					case 'takeout':
+						App.navigationTo({
+							url: 'pages/subPages2/management/management'
+						});
+						break;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.qiun-charts {
+		width: 690upx;
+		height: 426upx;
+		background-color: #ffffff;
+	}
+
+	.charts {
+		width: 690upx;
+		height: 426upx;
+		background-color: #ffffff;
+	}
+
+	page {
+		font-size: 0;
+		background-color: #f7f7f7;
+	}
+
+	.container {
+		.select-box {
+			color: #999999;
+
+			.iconfont {
+				font-size: 24upx;
+				margin-left: 6upx;
+			}
+		}
+
+		.tabbar-main {
+			width: 101vw;
+			padding-top: 90upx;
+			padding-bottom: 0 !important;
+		}
+
+		.tabBar-list {
+			height: 100upx;
+			line-height: 100upx;
+			width: 100%;
+
+			.tabBar-item {
+				width: 50%;
+			}
+		}
+
+		.selectTabbar {
+			color: #ff4444;
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+
+			//个人-邀请人信息
+			.person-content {
+				padding: 94upx 40upx 0;
+
+				.user-avatar {
+					width: 100upx;
+					height: 100upx;
+					border-radius: 50%;
+					background-repeat: no-repeat;
+					background-size: 100upx 100upx;
+				}
+
+				.user-referrer-name {
+					.level-label {
+						background-color: #e7d4aa;
+						border-radius: 18upx;
+						padding: 0 16upx;
+					}
+
+					.referrer-name {
+						color: #6b6e88;
+					}
+				}
+			}
+		}
+
+		.merchant-radio-group {
+			border-radius: 30upx;
+			border: 1px solid rgba(44, 111, 255, 1);
+			overflow: hidden;
+			font-size: 24upx;
+			margin-top: 42upx;
+			white-space: nowrap;
+
+			.merchant-radio {
+				color: #333333;
+				padding: 18upx 0;
+				width: 20%;
+				text-align: center;
+			}
+
+			.merchant-radio.check {
+				background: #3388ff;
+				color: #ffffff;
+			}
+		}
+
+		// 详情内容
+		.dealer-content {
+			margin-top: -160upx;
+			padding-bottom: 120upx;
+
+			// 工具导航
+			.tool-tab {
+				padding: 30upx 0;
+
+				.tool-tab-title {
+					padding: 0 30upx;
+				}
+
+				.tool-item {
+					.tool-item-icon {
+						margin: 0 auto 20upx;
+						display: block;
+						width: 80upx;
+						height: 80upx;
+					}
+				}
+			}
+
+			// 菜单样式
+			.menu-style {
+				background-color: #ffffff;
+				position: relative;
+				padding: 40upx 30upx;
+				border-radius: 10upx;
+
+				.menu-style-bg {
+					width: 340upx;
+					height: 160upx;
+					background-repeat: no-repeat;
+					background-size: 340upx 160upx;
+					position: absolute;
+					right: 0;
+					top: 0;
+					border-radius: 10upx;
+				}
+			}
+		}
+	}
+
+	.item {
+		font-size: 20upx;
+
+	}
+
+	.container {
+		.record-dialog {
+			z-index: 10;
+			position: fixed;
+			background: rgba(0, 0, 0, 0.7);
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+
+			.record-dialog-main {
+				width: 600upx;
+				border-radius: 10upx;
+				z-index: 11;
+				background: #ffffff;
+				position: relative;
+			}
+
+			.record-dialog-btns {
+				border-top: 1upx solid rgba(238, 238, 238, 1);
+				color: rgba(51, 51, 51, 1);
+				position: relative;
+				bottom: 0;
+				left: 0;
+				right: 0;
+
+				.btn {
+					width: 50%;
+					height: 86upx;
+					font-size: 28upx;
+					line-height: 86upx;
+					text-align: center;
+				}
+
+				.btn.confirm {
+					color: rgba(51, 136, 255, 1);
+				}
+
+				.line {
+					width: 1px;
+					height: 36upx;
+					background: rgba(238, 238, 238, 1);
+				}
+			}
+
+			.record-picker-view {
+				margin: 0upx 30upx;
+				box-sizing: border-box;
+				width: 540upx;
+				height: 240upx;
+			}
+		}
+
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					position: relative;
+					padding: 0 60upx 0 80upx;
+					margin-right: 40upx;
+					background: rgba(246, 246, 246, 1);
+					height: 76upx;
+					border-radius: 38upx;
+					flex: 1;
+
+					input {
+						width: 100%;
+						height: 100%;
+					}
+
+					.icon.icon-sousuo {
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 30upx;
+					}
+				}
+
+				.search-select {
+					width: 100upx;
+					white-space: nowrap;
+					color: #333333;
+
+					.icon {
+						margin-left: 10upx;
+					}
+				}
+			}
+		}
+
+		/deep/.uni-picker-view-indicator {
+			height: 70upx !important;
+		}
+
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+
+		// 详情内容
+		.record {
+			background-color: #ffffff;
+
+			.record-search {
+				padding: 30upx;
+			}
+
+			.record-body {
+				padding: 30upx;
+				background-color: #f6f6f6;
+
+				.color-red {
+					color: #ff4444;
+				}
+
+				.record-list-item {
+					padding: 30upx;
+					border-radius: 10upx;
+					background: #ffffff;
+
+					.record-list-item-header {
+						border-bottom: 1px solid rgb(238, 238, 238);
+						padding-bottom: 28upx;
+
+						.tag {
+							padding: 6upx 10upx;
+							background: rgba(51, 136, 255, 1);
+							border-radius: 4upx;
+							text-align: center;
+							color: #ffffff;
+						}
+					}
+
+					.record-list-item-content {
+						padding: 30upx 0;
+						border-bottom: 1px solid rgb(238, 238, 238);
+
+						.record-img {
+							width: 114upx;
+							height: 114upx;
+							border-radius: 4upx;
+							margin-right: 20upx;
+							flex-shrink: 0;
+						}
+
+						.goods-name {
+							color: #000000;
+							line-height: 36upx;
+						}
+
+						.goods-sku {
+							color: #999999;
+						}
+					}
+
+					.record-list-item-footer {
+						.footer-item {
+							padding-top: 30upx;
+
+							.footer-item-left {
+								color: #999999;
+							}
+
+							.footer-item-right {
+								color: #333333;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantMsg/merchantMsg.vue b/pages/subPages/merchant/merchantMsg/merchantMsg.vue
new file mode 100644
index 0000000..75df36b
--- /dev/null
+++ b/pages/subPages/merchant/merchantMsg/merchantMsg.vue
@@ -0,0 +1,513 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="pages-header p-r" :style="{'background-image':' url('+imageRoot+'merchantBg1.png)'}"></view>
+			<view class="merchantuserCenter p-r p-left-right-30">
+				<view class="userCenter-header bor-radius-10upx b-f">
+					<view class="msg-tab bor-radius-10upx b-f">
+						<view class="msg-list dis-flex">
+							<view class="msg-item flex-box t-c" v-for="(item,index) in msg_list" :key="index" @click="navgateTo($event,item.item_navType)">
+								<image class="msg-item-icon" :src="imgfixUrls + item.item_icon" mode=""></image>
+								<view class="f-24 col-3">{{item.item_name}}</view>
+								<view class="min-badge dis-flex flex-x-center flex-y-center" v-if="item.item_type=='myuser'&&newInfo.newnoticenum!=='0'">
+									<view class="span">{{newInfo.newnoticenum}}</view>
+								</view>
+								<view class="min-badge dis-flex flex-x-center flex-y-center" v-if="item.item_type=='msguser'&&newInfo.newusernum!=='0'">
+									<view class="span">{{newInfo.newusernum}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<scroll-view :scroll-y="true" :lower-threshold="0" @scrolltolower="load">
+					<nonemores v-if="totalpage==0"> </nonemores>
+					<!-- 		<view class="tool-tab m-top30" v-if="totalpage!=0">
+					<view class="tool-list dis-flex flex-dir-column">
+						<view class="tool-item flex-box t-c dis-flex flex-y-center" v-for="(item,index) in newList" :key="index" @click="goChat(item)">
+							<image class="tool-item-icon" :src="item.avatar" mode=""></image>
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right">
+								<view class="dis-flex flex-dir-column tool-username">
+									<view class="f-28 color-33 font-blod">{{item.nickname}}</view>
+									<view class="color-99 f-24">{{item.content}}</view>
+								</view>
+								<view class="dis-flex flex-dir-column flex-y-end">
+									<view class="color-99 f-22">{{item.date_time}}</view>
+									<view class="badge" v-if="item.total!=0">{{item.total}}</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> -->
+					<view class="toolBox">
+						<block v-for="(item,index) in newList" :key="index">
+							<view class="toolContent" @click="goChat(item)">
+								<image class="toolImage" :src="item.avatar" mode=""></image>
+								<view class="toolName">
+									<view class="f-28 color-33 font-blod">
+										{{item.nickname}}
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 0">
+										<rich-text :nodes="item.content"></rich-text>
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 1">
+										[图片]
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 2">
+										[视频]
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 3">
+										[名片]
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 4">
+										[简历]
+									</view>
+									<view class="tool-content color-99 f-24" v-if="item.type == 5">
+										[其他消息]
+									</view>
+								</view>
+								<view class="toolDate">
+									<view class="color-99 f-22">
+										{{item.date_time}}
+									</view>
+									<view class="toolNum" v-if="item.total!=0">
+										{{item.total}}
+									</view>
+								</view>
+							</view>
+						</block>
+					</view>
+					<view class="tips" v-if="totalpage!=0">
+						<loadmore :isMore="isMore"></loadmore>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<navBar :tabBarAct="2" />
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import navBar from '@/components/template/navBar.vue';
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				isMore: true,
+				newInfo: {},
+				page: 1,
+				storeid: null,
+				monidata: 'ikik',
+				detalsData: null,
+				loadlogo: false,
+				shopShow: false,
+				newList: [],
+				totalpage: null,
+				msg_list: [{
+						item_type: 'msguser',
+						item_name: '我的客户',
+						item_icon: 'centerMerchant/msguser.png',
+						item_navType: 'msguser'
+					},
+					{
+						item_type: 'myuser',
+						item_name: '系统通知',
+						item_icon: 'centerMerchant/msgnotice.png',
+						item_navType: 'myuser'
+					},
+					{
+						item_type: 'tips',
+						item_name: '系统公告',
+						item_icon: 'centerMerchant/msgmsg.png',
+						item_navType: 'tips'
+					}
+				],
+				tab_list: [{
+						item_type: 'manager',
+						item_name: '店员管理',
+						item_icon: '4e81ea09056979072a00019a.jpg',
+						item_navType: 'manager'
+					},
+					{
+						item_type: 'myuser',
+						item_name: '我的客户',
+						item_icon: '4e81ea09056979072a00019a.jpg',
+						item_navType: 'myuser'
+					},
+					{
+						item_type: 'shopmain',
+						item_name: '店铺主页',
+						item_icon: '4e81ea09056979072a00019a.jpg',
+						item_navType: 'shopmain'
+					},
+					{
+						item_type: 'changeshop',
+						item_name: '切换店铺',
+						item_icon: '4e81ea09056979072a00019a.jpg',
+						item_navType: 'changeshop'
+					}
+				]
+			}
+		},
+		components: {
+			Loadlogo,
+			navBar,
+			nonemores,
+			loadmore
+		},
+		computed: {},
+		onShow() {
+			let _this = this
+			_this.init();
+			console.info('show')
+		},
+		mounted() {},
+		onLoad(e) {
+			let _this = this
+
+			console.info('load')
+		},
+		methods: {
+			init() {
+				let _this = this
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getStoreNewList(res.data);
+					}
+				});
+
+			},
+			goChat(item) {
+				let _this = this
+				// App.navigationTo({
+				// 	url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type +
+				// 		'&type=2' + '&id=' + _this.storeid
+				// })
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=2' + '&id=' + _this.storeid
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + item.other_party_id + '&other_party_type=' + item.other_party_type+ '&type=2' + '&id=' +_this.storeid
+					})
+				}
+			},
+			load() {
+				let _this = this
+				if (_this.totalpage == _this.page) {
+					_this.isMore = true
+				} else {
+					_this.page++
+					_this.getStoreNewList()
+				}
+			},
+			// 店铺消息列表
+			getStoreNewList(storeid) {
+				let _this = this
+				let data = {
+					storeid: storeid || _this.storeid,
+					page: _this.page
+				}
+				_this.isMore = false
+				App._post_form('&p=store&do=storeNewList', data, res => {
+					_this.newList = res.data.list
+					_this.newInfo = res.data
+					_this.totalpage = res.data.total
+					_this.isMore = true
+				})
+			},
+			// 跳转商家
+			goStore() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/myStore/myStore'
+				})
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'myuser':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantNotice/merchantNotice'
+						});
+						break;
+					case 'msguser':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantChat/merchantChat'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+					case 'tips':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantTips/merchantTips'
+						});
+						break;
+					case 'shops':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.toolBox {
+		opacity: 0.97;
+		border-radius: 20upx;
+		background: #FFFFFF;
+        margin-top: 20upx;
+		.toolContent {
+			padding: 20upx;
+			border-bottom: 2upx solid #EEEEEE;
+			display: flex;
+			justify-content: space-around;
+
+			.toolImage {
+				width: 117upx;
+				height: 80upx;
+				border-radius: 50%;
+			}
+
+			.toolName {
+				margin-left: 20upx;
+				width: 550upx;
+
+				.tool-content {
+					margin-top: 10upx;
+				}
+			}
+
+			.toolDate {
+				margin-left: 25rpx;
+				.toolNum {
+					width: 56upx;
+					height: 32upx;
+					line-height: 32upx;
+					background: rgba(255, 68, 68, 1);
+					opacity: 0.93;
+					border-radius: 18upx;
+					text-align: center;
+					font-size: 22upx;
+					color: rgba(255, 255, 255, 1);
+					margin: 30upx;
+				}
+			}
+		}
+	}
+
+	.tips {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: black;
+		}
+	}
+
+	page {
+		font-size: 0;
+		background-color: #F6F6F6;
+	}
+
+	.container {
+		.color-33 {
+			color: #333333;
+		}
+
+		.color-99 {
+			color: #999999;
+		}
+
+		.color-f4 {
+			color: #FF4444;
+		}
+
+		.font-blod {
+			font-weight: bold;
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 184upx;
+			background-repeat: no-repeat;
+			background-size: 100% 184upx;
+
+			//个人-邀请人信息
+			.person-content {
+				padding: 94upx 40upx 0;
+
+				.user-avatar {
+					width: 100upx;
+					height: 100upx;
+					border-radius: 50%;
+					background-repeat: no-repeat;
+					background-size: 100upx 100upx;
+				}
+
+				.user-referrer-name {
+					.level-label {
+						background-color: #E7D4AA;
+						border-radius: 18upx;
+						padding: 0 16upx;
+					}
+
+					.referrer-name {
+						color: #6B6E88;
+					}
+				}
+			}
+		}
+
+		// 详情内容
+		.merchantuserCenter {
+			margin-top: -154upx;
+			//319-262=57
+			padding-bottom: 120upx;
+
+			// 导航
+			.userCenter-header {
+				padding: 30upx 0;
+			}
+
+			// 工具导航
+			.msg-tab {
+				.msg-item {
+					position: relative;
+
+					.msg-item-icon {
+						margin: 0 auto 20upx;
+						display: block;
+						width: 80upx;
+						height: 80upx;
+					}
+
+					.min-badge {
+						top: 0;
+						left: 126upx;
+						position: absolute;
+						width: 50upx;
+						height: 28upx;
+						background: rgba(255, 68, 68, 1);
+						border: 1upx solid rgba(255, 255, 255, 1);
+						border-radius: 13px;
+						font-size: 18upx;
+						color: rgba(255, 255, 255, 1);
+
+						.span {
+							transform: scale(0.8)
+						}
+					}
+				}
+			}
+
+			// 工具导航
+			.tool-tab {
+				padding: 0 30upx;
+				opacity: 0.97;
+				border-radius: 10px;
+				background: #FFFFFF;
+
+				.tool-item-right {
+					width: 100%;
+				}
+
+				.tool-username {
+					align-items: start;
+
+					.font-blod {
+						margin-bottom: 16upx;
+					}
+				}
+
+				.tool-tab-title {
+					padding: 0 30upx;
+				}
+
+				.tool-item {
+					width: 100%;
+					flex-wrap: nowrap;
+					border-bottom: 1px solid #EEEEEE;
+					padding: 40upx 0;
+
+					.badge {
+						width: 56upx;
+						height: 32upx;
+						line-height: 32upx;
+						background: rgba(255, 68, 68, 1);
+						opacity: 0.93;
+						border-radius: 18upx;
+						text-align: center;
+						font-size: 22upx;
+						color: rgba(255, 255, 255, 1);
+						margin-top: 18upx;
+					}
+
+					.tool-item-icon {
+						margin-right: 30upx;
+						width: 80upx;
+						height: 80upx;
+						flex-shrink: 0;
+						border-radius: 50%;
+					}
+				}
+
+				.tool-item:last-child {
+					border-bottom: none;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantNotice/merchantNotice.vue b/pages/subPages/merchant/merchantNotice/merchantNotice.vue
new file mode 100644
index 0000000..3dc52cc
--- /dev/null
+++ b/pages/subPages/merchant/merchantNotice/merchantNotice.vue
@@ -0,0 +1,324 @@
+<template>
+	<view class="merchantNotice">
+		<far-bottom></far-bottom>
+		<!-- 列表区域 -->
+		<scroll-view  class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="scdpLoad">
+			<!-- 收藏店铺循环模板 -->
+			<nonemores v-if="pagetotal==0"></nonemores>
+			<view v-if="pagetotal!=0">
+				<view class="scdpMbPackage" v-for="(item,index) in noticeList">
+					<view class="notice-order-icon dis-flex flex-x-between flex-y-center">
+						<view class="dis-flex"><image :src="imgfixUrls + 'centerMerchant/order.png'" alt="" />
+							<view class="f-28 color-33">{{item.head}}</view>
+						</view>
+						<!-- <view class="color-99 f-24">{{item.head}}秒前</view> -->
+					</view>
+					<view class="notice-main dis-flex flex-y-center">
+						<view class="scdpMbImg"><image :src="item.thumb" /></view>
+						<view style="height: 100%;" class="dis-flex">
+						<view class="scdpMbInfo dis-flex flex-dir-column flex-x-between">
+							<view><span class="twolist-hidden">{{item.title}}</span></view>
+							<view>
+								<view>
+									<view class="dis-flex">
+										<image class="notice-img" :src="item.subthumb"/>
+										<span class="color-99 f-24">{{item.subtitle}}</span>
+									</view>
+								</view>
+							</view>
+						</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="tips" v-if="pagetotal!=0">
+				<loadmore :isMore="isMore"></loadmore>
+			</view>
+		</scroll-view>
+		<!-- 列表区域 -->
+
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif	
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		components:{
+			nonemores,
+			loadmore
+		},
+		data() {
+			return {
+				isMore:true,
+				scdpText:'',
+				scrollHeight:null,
+				noticeList:[],
+				pagetotal:null,
+				storeid:null,
+				type: 1,
+				storeCollectList: [],
+				page: 1,
+				lat: null,
+				lng: null,
+				pagetotal: null,
+				list: [{
+					storename: '2',
+					score: '1'
+				}, {
+					storename: '2',
+					score: '1'
+				}],
+				scdpText: '',
+			};
+		},
+		onLoad: function() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let _this=this
+				uni.getStorage({
+				    key: 'currentRegion',
+				    success: function (res) {
+				        _this.lat=res.data.location.lat
+				        _this.lng=res.data.location.lng
+				    }
+				});
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getSysNoticeList(res.data);
+					}
+				});
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight + 'px';
+					}
+				});
+				
+			},
+			// 商家系统通知列表
+			getSysNoticeList(storeid){
+				let _this=this
+				_this.isMore=true
+				let data={
+					storeid:storeid||_this.storeid,
+					page:_this.page
+				}
+				App._post_form('&p=store&do=sysNoticeList',data,res=>{
+					_this.noticeList=[..._this.noticeList,...res.data.list]
+					_this.pagetotal=res.data.pagetotal
+					_this.isMore=false
+					
+				})
+			},
+			scdpLoad(){
+				let _this=this
+				if(_this.page==_this.pagetotal){
+					_this.isMore=true
+				}else{
+					_this.page++
+					_this.getSysNoticeList();
+				}
+			},
+			// 搜藏店铺加载
+			// scdpLoad(){
+			// 	let _this=this
+			// 	if(_this.page==_this.pagetotal){
+			// 		_this.scdpText="没有更多数据了"
+			// 	}else{
+			// 		_this.page++
+			// 		_this.storeCollect();
+			// 	}
+			// 	
+			// }
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.tips {
+		height: 80upx;
+		text-align: center;
+		> span {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+	page {
+		font-size: 0;
+		overflow-x: hidden;
+		background: #f8f8f8;
+		
+	}
+	.merchantNotice{
+		background: #f8f8f8;
+	}
+
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-99 {
+		color: #999999;
+	}
+
+	.scrollList {
+		width: 690upx;
+		padding: 0 30upx 0 30upx;
+	}
+
+	.topFull {
+		width: 750upx;
+		height: 108upx;
+	}
+
+	.scdpMbPackage {
+		padding: 22upx 30upx 30upx 30upx;
+		margin-bottom: 10px;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.scdpMbImg {
+		width: 170upx;
+		height: 170upx;
+		border-radius: 10upx;
+		overflow: hidden;
+		flex-shrink: 0;
+
+		>image {
+			width: 170upx;
+			height: 170upx;
+		}
+	}
+
+	.notice-order-icon {
+		padding-bottom: 23upx;
+
+		image {
+			width: 40upx;
+			height: 40upx;
+			margin-right: 18upx;
+		}
+	}
+
+	.notice-main {
+		background:rgba(248,248,248,1);
+		border-radius:6px;
+		padding-right: 36upx;
+		height: 170upx;
+	}
+
+	.notice-img {
+		width: 31upx;
+		height: 31upx;
+		margin-right: 9upx;
+		border-radius: 50%;
+	}
+
+	.scdpMbInfo {
+		margin-left: 30upx;
+		padding: 18upx 0;
+
+		>view:nth-child(1) {
+			//标题
+			>span {
+				font-size: 26upx;
+				line-height: 38upx;
+				color: #333333;
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 16upx;
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				vertical-align: middle;
+
+				>image {
+					margin-right: 10upx;
+					vertical-align: middle;
+					width: 25upx;
+					height: 24upx;
+				}
+
+				>span {
+					vertical-align: middle;
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view:nth-child(2) {
+				vertical-align: middle;
+
+				>span {
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view {
+				display: inline-block;
+			}
+		}
+
+		>view:nth-child(3) {
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				margin-top: 16upx;
+
+				//用户名
+				>view:nth-child(1) {
+					>span {
+						font-size: 22upx;
+						color: #333333;
+						line-height: 31upx;
+					}
+				}
+
+				>view:nth-child(2) {
+					margin-top: 5upx;
+
+					>span {
+						font-size: 24upx;
+						
+						
+						color: rgba(153, 153, 153, 1);
+					}
+				}
+			}
+
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantOrder/merchantOrder.vue b/pages/subPages/merchant/merchantOrder/merchantOrder.vue
new file mode 100644
index 0000000..6407bdd
--- /dev/null
+++ b/pages/subPages/merchant/merchantOrder/merchantOrder.vue
@@ -0,0 +1,935 @@
+<template>
+	<view>
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="orderList">
+				<view class="dis-flex flex-dir-column orderList-header">
+					<view class="orderList-search">
+						<view class="search-main">
+							<view class="search-box dis-flex flex-y-center">
+								<view class="search-input">
+									<view class="i icon iconfont icon-sousuo"></view>
+									<input type="text" value="" placeholder="请输入关键字进行搜索" placeholder-style="color:#999999;margin-left:10upx;"
+									 class="f-24" v-model="keyword" @blur="doSearch" />
+								</view>
+								<view class="search-swert" v-if="!!categories && categories.length > 0">
+									<!-- <picker mode="selector" :value="isladderVel" :range="isladder" range-key="name" @change="changeladder">
+											<view class="f-26 c-ff4444" style="height: 76upx;line-height: 76upx;">
+												{{ isladder[isladderVel].name }}
+												<text class="iconfont icon-unfold c-ff4444 f-w" style="font-size: 26upx;"></text>
+											</view>
+									</picker> -->
+									<picker mode="selector" :value="category" :range="categories" range-key="name" @change="changeCategory">
+											<view class="f-26 c-ff4444" style="height: 76upx;line-height: 76upx;">
+												{{ categories[category].name }}
+												<text class="iconfont icon-unfold c-ff4444 f-w" style="font-size: 26upx;"></text>
+											</view>
+									</picker>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="topNav">
+						<view @click="changeStatus(2)">
+							<view :class="status == 2 ? 'check' : ''">
+								<span>出售中</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(1)">
+							<view :class="status == 1 ? 'check' : ''">
+								<span>未开始</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(4)">
+							<view :class="status == 4 ? 'check' : ''">
+								<span>已下架</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(8)">
+							<view :class="status == 8 ? 'check' : ''">
+								<span>回收站</span>
+								<view class="line"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="full"></view>
+
+				<!-- 列表区域 -->
+				<!-- #ifdef H5 -->
+				<scroll-view class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="load"
+				 :lower-threshold="0">
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<scroll-view class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" :lower-threshold="0">
+						<!-- #endif -->
+
+						<!-- 循环模板 -->
+						<nonemores v-if="total==0"></nonemores>
+						<view class="orderMb" v-for="(item,index) in goodsList" v-if="total!=0">
+							<view class="orderMbPackage">
+								<view class="mbLeft">
+									<image :src="item.logo" />
+								</view>
+								<view class="mbRight">
+									<view>
+										<view class="mbRightTitle ">
+											<view><span>{{newTypeList[item.cc_id-1]}}</span></view>
+											<span class="dis-il-block" style="width: 330upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{item.goods_name}}</span>
+										</view>
+										<view class="mbRightBody">
+											<view>
+												<span>库存:{{item.stk}}</span>
+												<span>销量:{{item.buy_num}}</span>
+											</view>
+											<view>
+												<text>{{item.status=='1'?'未开始':item.status=='5'?'待审核':item.status=='6'?'被驳回':''}}</text>
+											</view>
+										</view>
+										<view class="mbRightFoot">
+											<span><span></span>{{(item.maxprice && item.minprice)?item.minprice+ '~' + item.maxprice:item.price }}</span>
+											<view @click="popT(index)" v-if="item.hidegoods===0">
+												<view></view>
+												<view></view>
+												<view></view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="popView" v-if="indexs==index" @click="indexs=null">
+								<view @click="changeGoodsStatus(item,1)" v-if="item.status=='3'||item.status=='4'||item.status=='8'">
+									<view>
+										<image :src="imgfixUrls + 'merchant/sj.png'" />
+									</view>
+									<span>上架</span>
+								</view>
+								<view @click="changeGoodsStatus(item,2)" v-if="item.status=='2'||item.status=='1'">
+									<view>
+										<image :src="imgfixUrls + 'merchant/xj.png'" />
+									</view>
+									<span>下架</span>
+								</view>
+								<view @click="changeGoodsStatus(item,3)" v-if="item.status!=='8'">
+									<view>
+										<image :src="imgfixUrls + 'merchant/sc.png'" />
+									</view>
+									<span>删除</span>
+								</view>
+								<view @click="changeGoodsStatus(item,4)" v-if="item.status=='8'">
+									<view>
+										<image :src="imgfixUrls + 'merchant/sc.png'" />
+									</view>
+									<span>删除</span>
+								</view>
+								<view v-if="((item.type-1)=='0'||(item.type-1)=='1'||(item.type-1)=='2'||(item.type-1)=='6') || (item.type-1) == '8'&&(item.hidegoods===0)"
+								 @click="goBj(item)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/bianj.png'" />
+									</view>
+									<span>编辑</span>
+								</view>
+								<view v-if="item.status=='2'||item.status=='1'" @click="goPost(item)">
+									<view>
+										<image :src="imgfixUrls + 'merchant/tg.png'" />
+									</view>
+									<span>推广</span>
+								</view>
+							</view>
+						</view>
+						<!-- 循环模板 -->
+						<view class="tips" v-if="total!=0">
+							<loadmore :isMore="isMore"></loadmore>
+						</view>
+					</scroll-view>
+			</view>
+			<navBar :tabBarAct="1" />
+		</view>
+
+		<view class="addOrderButton f-50" @click="openAdd" v-if="hidegoods===0 && activityflag ==1">
+			+
+		</view>
+		<view class="addOrderButton f-30" style="width: 200upx;" @click="addActivity" v-if="hidegoods===1 && activityflag ==1">
+			同城活动
+		</view>
+		<view class="addOrderButton f-30" style="width: 200upx;" @click="goAddGoods" v-if="hidegoods===0 && activityflag ==0">
+			添加商品
+		</view>
+		<popup-view :show="show" type="bottom" @clickmask="show = false" :bottom="'0%'">
+			<view class="b-f popup">
+				<view class="dis-flex" style="padding: 50upx 0;">
+					<view class="flex-box t-c" @click="goAddGoods">
+						<view class="iconfont icon-goodsfill" style="width: 100upx;height: 100upx;border-radius: 60upx;background-color: #FBC420;margin: 0 auto 30upx;line-height: 100upx;font-size: 40upx;color: #FFFFFF;"></view>
+						<view  style="font-size: 28upx;">营销商品</view>
+					</view>
+					<!-- <view class="flex-box t-c" @click="addActivity">
+						<view class="iconfont icon-huodongxiangqu" style="width: 100upx;height: 100upx;border-radius: 60upx;background-color: #4693FF;margin: 0 auto 30upx;line-height: 100upx;font-size: 40upx;color: #FFFFFF;"></view>
+						<view  style="font-size: 28upx;">同城活动</view>
+					</view> -->
+				</view>
+				<view class="t-c" style="font-size: 28upx;padding: 20upx 0;border-top: 1px solid #f8f8f8;" @click="show = false">关闭</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo';
+	import navBar from '@/components/template/navBar.vue';
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue';
+	import PopupView from '@/components/template/PopManager.vue';
+	// import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			const date = new Date();
+			const years = [];
+			const year = date.getFullYear();
+			const months = [];
+			const month = date.getMonth() + 1;
+			const days = [];
+			const day = date.getDate();
+			for (let i = 1990; i <= date.getFullYear(); i++) {
+				years.push(i);
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(i);
+			}
+			for (let i = 1; i <= 31; i++) {
+				days.push(i);
+			}
+			return {
+				hidegoods: 1,
+				isMore: true,
+				indexs: null,
+				// typeList: ['抢购', '团购', '拼团', '', '优惠卷', '', '砍价商品','','活动'],
+				newTypeList: ['技能培训', '资格考试', '学历提升', '岗前培训'],
+				total: null,
+				goodsList: [],
+				typeShow: 'bottom',
+				keyword: '',
+				popShow: false,
+				scdpText: '',
+				orderlist: [],
+				show: false,
+				orderInfo: {},
+				storeid: null,
+				pagetotal: null,
+				type: '',
+				status: 2,
+				sort: '',
+				time: '',
+				page: 1,
+				checkStoreid: null,
+				loadlogo: false,
+				shopShow: '',
+				filterDialog: true,
+				title: 'picker-view',
+				isladderVel:0,
+				isladder:[],
+				plugin:'rush',
+				years,
+				year,
+				months,
+				month,
+				days,
+				day,
+				value: [9999, month - 1, day - 1],
+				activityflag:0,
+				visible: true,
+				indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`,
+				categories: [
+					{cc_id: "", name: '全部'},
+					{cc_id: "1", name: '技能培训'},
+					{cc_id: "2", name: '资格考试'},
+					{cc_id: "3", name: '学历提升'},
+					{cc_id: "4", name: '岗前培训'}
+				],
+				category: 0,
+			};
+		},
+		components: {
+			Loadlogo,
+			navBar,
+			nonemores,
+			loadmore,
+			PopupView
+		},
+		computed: {},
+		mounted() {},
+		onLoad(e) {
+			let _this = this
+			_this.checkStoreid = uni.getStorageSync('checkStoreid');
+		},
+		onShow(){
+			this.goodsList = [];
+			this.init();
+		},
+		onReachBottom: function() {
+			console.log('shabi')
+			let _this = this
+			if (_this.total == _this.page) {
+				_this.isMore = true
+			} else {
+				_this.page++
+				_this.getStoreGoods();
+			}
+		},
+		methods: {
+			changeladder(e){
+				let _this = this;
+				_this.isladderVel = e.detail.value;
+				_this.plugin = _this.isladder[_this.isladderVel].plugin;
+				_this.doSearch(true);
+				console.log(e);
+			},
+			changeCategory(e){
+				let _this = this;
+				_this.category = e.detail.value;
+				_this.cc_id = _this.categories[_this.category].cc_id;
+				_this.doSearch(true);
+			},
+			addActivity() {
+				App.navigationTo({
+					url: `pages/subPages2/coursegoods/establishDoods/establishDoods?id=${''}&sid=${this.checkStoreid}`
+				})
+			},
+			openAdd() {
+				this.show = true;
+			},
+			goBj(item) {
+				let _this = this
+				if (item.type == 9) {
+					App.navigationTo({
+						url: `pages/subPages2/coursegoods/establishDoods/establishDoods?id=${item.id}&sid=${this.checkStoreid}`
+					})
+				} else {
+					App.navigationTo({
+						url: 'pages/subPages/createCommodity/index?type=' + item.creategoodstype + '&id=' + item.id + '&cc_id=' + item.cc_id
+					})
+				}
+
+			},
+			goAddGoods() {
+				let _this = this
+				App.navigationTo({
+					url: 'pages/subPages/createCommodity/index'
+				})
+			},
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight - 125 + 'px';
+					}
+				});
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getStoreGoods(res.data);
+					}
+				});
+
+			},
+			goPost(item) {
+				let _this = this
+				let type = null
+				if (item.type == '1') {
+					type = 3
+				} else if (item.type == '2') {
+					type = 4
+				} else if (item.type == '3') {
+					type = 6
+				} else if (item.type == '5') {
+					type = 5
+				} else if(item.type == '9'){
+					type = 14
+				}else{
+					type = 7
+				}
+				console.info('type', item.type)
+				App.navigationTo({
+					url: 'pages/mainPages/poster/poster?type=' + type + '&id=' + item.id
+				})
+			},
+			// 上下架删除商品接口
+			changeGoodsStatus(item, type) {
+				let _this = this
+				let data = {
+					storeid: _this.storeid,
+					goodsid: item.id,
+					operation: type,
+					type: item.type,
+				}
+				App._post_form('&p=store&do=changeGoodsStatus', data, res => {
+					_this.doSearch();
+					uni.showToast({
+						icon: 'none',
+						title: '操作成功',
+						duration: 2000
+					});
+				})
+			},
+			popT(index) {
+				let _this = this
+				_this.popShow = true
+				_this.indexs = index
+			},
+			load() {
+				let _this = this
+				if (_this.total == _this.page) {
+					_this.isMore = true
+				} else {
+					_this.page++
+					_this.getStoreGoods();
+				}
+			},
+			doSearch(flag) {
+				let _this = this
+				_this.isMore = false
+				_this.page = 1
+				_this.indexs = null
+				let data = {
+					sid: _this.storeid,
+					page: _this.page,
+					page_index: 10,
+					storeflag: 1,
+					keyword: _this.keyword,
+					status: _this.status,
+					plugin:_this.plugin,
+					cc_id: _this.cc_id
+				};
+				
+				App._post_form('&p=store&do=getStoreGoods', data, res => {
+					_this.goodsList = res.data.list
+					_this.total = res.data.total;
+					_this.hidegoods = res.data.hidegoods;
+					// _this.isladder = res.data.pluginlist;// 废弃数据
+					if(res.data.activityflag){
+						_this.activityflag = res.data.activityflag;
+					}
+					// for(let i = 0; i<_this.goodsList.length;i++){
+					// 	if(_this.goodsList[i].hidegoods == 0 && _this.goodsList[i].creategoodstype != 'activity'){
+					// 		// debugger
+					// 		_this.hidegoods = 0;
+					// 	}
+					// }
+					_this.isMore = true
+					for (let i = 0; i < res.data.list.length; i++) {
+						if ((res.data.list[i].goods_name).length > 30) {
+							console.info('length', (res.data.list[i].goods_name).length)
+							res.data.list[i].goods_name = res.data.list[i].goods_name.slice(0, 30) + '...'
+						}
+					}
+				})
+			},
+			// 获取店铺商品信息
+			getStoreGoods(sid) {
+				let _this = this
+				_this.isMore = false
+				let data = {
+					sid: sid || _this.storeid,
+					page: _this.page,
+					page_index: 10,
+					storeflag: 1,
+					keyword: _this.keyword,
+					status: _this.status
+				}
+				App._post_form('&p=store&do=getStoreGoods', data, res => {
+					_this.goodsList = [..._this.goodsList, ...res.data.list]
+					_this.total = res.data.total
+					_this.hidegoods = res.data.hidegoods;
+					// _this.isladder = res.data.pluginlist;// 废弃数据
+					// for(let i = 0; i<_this.goodsList.length;i++){
+					// 	if(_this.goodsList[i].hidegoods == 0){
+					// 		_this.hidegoods = 0;
+					// 		// return
+					// 	}
+					// }
+					
+					if(res.data.activityflag){
+						_this.activityflag = res.data.activityflag;
+					}
+					for (let i = 0; i < res.data.list.length; i++) {
+						if ((res.data.list[i].goods_name).length > 30) {
+							console.info('length', (res.data.list[i].goods_name).length)
+							res.data.list[i].goods_name = res.data.list[i].goods_name.slice(0, 30) + '...'
+						}
+					}
+					_this.isMore = true
+				})
+			},
+			changeStatus(status) {
+				let _this = this;
+				_this.status = status;
+				_this.doSearch()
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.popup {
+		width: 100vw;
+	}
+
+	.dataPicker1 {
+		width: 70upx;
+		height: 82upx;
+		display: inline-block;
+	}
+
+	.addOrderButton {
+		width: 80upx;
+		height: 80upx;
+		position: fixed;
+		border-radius: 60upx;
+		bottom: 150upx;
+		left: 50%;
+		line-height: 80upx;
+		transform: translateX(-50%);
+		background: rgba(51, 136, 255, 1);
+		text-align: center;
+		color: #FFFFFF;
+	}
+
+	.tips {
+		height: 180upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: black;
+		}
+	}
+
+	.popView {
+		position: relative;
+		bottom: 220upx;
+		background: rgba(0, 0, 0, 0.5);
+		height: 220upx;
+		width: 100%;
+		display: flex;
+		justify-content: space-around;
+
+		>view {
+			margin-top: 60upx;
+			display: inline-block;
+			vertical-align: middle;
+			text-align: center;
+
+			>view {
+				overflow: hidden;
+				width: 66upx;
+				height: 66upx;
+				border-radius: 50%;
+
+				>image {
+					width: 66upx;
+					height: 66upx;
+				}
+			}
+
+			>span {
+				display: inline-block;
+				margin-top: 10upx;
+				;
+				font-size: 24upx;
+				color: rgba(221, 221, 221, 1);
+			}
+		}
+	}
+
+	.mbRightFoot {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			vertical-align: bottom;
+			font-size: 36upx;
+			color: rgba(255, 68, 68, 1);
+
+			>span {
+				font-size: 24upx;
+			}
+		}
+
+		>view {
+			width: 52upx;
+			height: 52upx;
+			border: 2upx solid rgba(204, 204, 204, 1);
+			border-radius: 50%;
+			display: flex;
+			justify-content: space-around;
+
+			>view {
+				margin-top: 25upx;
+				line-height: 52upx;
+				width: 7upx;
+				height: 7upx;
+				background: rgba(102, 102, 102, 1);
+				border-radius: 50%;
+			}
+		}
+
+	}
+
+	.mbRightBody {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 10upx;
+
+		>view {
+			>span {
+				font-size: 24upx;
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>span:nth-child(2) {
+				margin-left: 10upx;
+			}
+		}
+
+		>view {
+			>text {
+				font-size: 24upx;
+				color: #ff4444;
+			}
+		}
+	}
+
+	.mbRight {
+		height: 159upx;
+		margin-left: 20upx;
+		width: 450upx;
+
+		>view {
+			height: 159upx;
+			display: flex;
+			justify-content: space-between;
+			flex-direction: column;
+		}
+	}
+
+	.mbRightTitle {
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+			width: 100upx;
+			height: 30upx;
+			background: rgba(255, 68, 68, 1);
+			border-radius: 4upx;
+			text-align: center;
+
+			>span {
+				line-height: 30upx;
+				display: inline-block;
+				font-size: 20upx;
+
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+
+		>span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 26upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.mbLeft {
+		width: 159upx;
+		height: 159upx;
+
+		>image {
+			width: 159upx;
+			height: 159upx;
+		}
+	}
+
+	.orderMbPackage {
+		padding: 30upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.orderMb {
+		height: 220upx;
+		overflow: hidden;
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.full {
+		height: 220upx;
+		background: #f6f6f6;
+	}
+
+	.scrollList {
+		background: #f6f6f6;
+	}
+
+	.tips {
+		height: 180upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: black;
+		}
+	}
+
+	page {
+		font-size: 0;
+		background-color: #f6f6f6;
+	}
+
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-red {
+		color: #ff4444;
+	}
+
+	.container {
+		.orderList-header {
+			z-index: 2;
+			position: fixed;
+			top: 0upx;
+			left: 0;
+			right: 0;
+		}
+
+		.topNav {
+			// top: 88upx;
+			// width: 750upx;
+			// height: 86upx;
+			background: rgba(255, 255, 255, 1);
+			display: flex;
+			justify-content: space-between;
+
+			.line {
+				position: absolute;
+				opacity: 0;
+				bottom: 0;
+				display: inline-block;
+				width: 48upx;
+				height: 7upx;
+				left: 50%;
+				transform: translateX(-50%);
+				background: #3388ff;
+				border-radius: 4px 4px 0px 0px;
+			}
+
+			>view {
+				text-align: center;
+				width: 20%;
+				display: inline-block;
+
+				>view {
+					height: 81upx;
+					margin: auto;
+					border-bottom: 4upx solid rgba(0, 0, 0, 0);
+					position: relative;
+
+					>span {
+						line-height: 85upx;
+						font-size: 24upx;
+
+
+						color: rgba(51, 51, 51, 1);
+					}
+				}
+			}
+		}
+
+		.check {
+			.line {
+				opacity: 1;
+			}
+
+			>span {
+				font-size: 28upx !important;
+
+				font-weight: 500 !important;
+				color: #3388ff !important;
+			}
+		}
+
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				position: relative;
+				.search-input {
+					position: relative;
+					padding: 0 60upx 0 80upx;
+					margin-right: 150upx;
+					background: rgba(246, 246, 246, 1);
+					height: 76upx;
+					border-radius: 38upx;
+					flex: 1;
+
+					input {
+						width: 100%;
+						height: 100%;
+					}
+
+					.icon.icon-sousuo {
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 30upx;
+					}
+				}
+				.search-swert{
+					position: absolute;
+					right: 0;
+					top: 0;
+				}
+
+				.search-select {
+					width: 100upx;
+					white-space: nowrap;
+					color: #333333;
+
+					.icon {
+						margin-left: 10upx;
+						color: #999999;
+					}
+				}
+			}
+		}
+
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+
+		// 详情内容
+		.orderList {
+			background-color: #ffffff;
+
+			// padding-bottom: 100upx;
+			.orderList-search {
+				padding: 30upx;
+				background-color: #ffffff;
+			}
+
+			.orderList-body {
+				padding: 30upx;
+				margin-top: 206upx;
+				background-color: #f6f6f6;
+
+				.orderList-list-item {
+					padding: 30upx;
+					border-radius: 10upx;
+					background: #ffffff;
+
+					.user-msg {
+						padding: 25upx 30upx;
+						background: rgba(248, 248, 248, 1);
+						border-radius: 8upx;
+						color: #999999;
+
+						.blue {
+							color: #2196f3;
+						}
+
+						.img {
+							margin: 0 15upx 0 43upx;
+							height: 34upx;
+							width: 34upx;
+						}
+					}
+
+					.orderList-list-item-header {
+						padding-bottom: 28upx;
+
+						.color-status {
+							color: #3388ff;
+						}
+
+						.tag {
+							padding: 4upx;
+							border: 1px solid #ff4444;
+							border-radius: 4upx;
+							text-align: center;
+							font-size: 20upx;
+							margin-right: 20upx;
+							color: #ff4444;
+						}
+					}
+
+					.orderList-list-item-content {
+						padding: 30upx 0;
+						border-bottom: 1px solid rgb(238, 238, 238);
+
+						.orderList-img {
+							width: 130upx;
+							height: 130upx;
+							border-radius: 4upx;
+							margin-right: 30upx;
+							flex-shrink: 0;
+						}
+
+						.goods-name {
+							color: #000000;
+							line-height: 36upx;
+						}
+
+						.goods-sku {
+							color: #999999;
+						}
+					}
+
+					.orderList-list-item-footer {
+						.footer-item {
+							padding-top: 30upx;
+
+							.btn {
+								width: 109upx;
+								height: 50upx;
+								line-height: 50upx;
+								text-align: center;
+								background: #3388ff;
+								color: #ffffff;
+								font-size: 24upx;
+								border-radius: 25upx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantOrderList/merchantOrderList.vue b/pages/subPages/merchant/merchantOrderList/merchantOrderList.vue
new file mode 100644
index 0000000..0d7ef26
--- /dev/null
+++ b/pages/subPages/merchant/merchantOrderList/merchantOrderList.vue
@@ -0,0 +1,1479 @@
+<template>
+	<view v-if="loadlogo">
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="orderList">
+				<view class="dis-flex flex-dir-column orderList-header">
+					<view class="orderList-search">
+						<view class="search-main">
+							<view class="search-box dis-flex flex-y-center">
+								<view class="search-input">
+									<view class="i icon iconfont icon-sousuo"></view>
+									<input type="text" value="" placeholder="请输入订单号进行搜索" placeholder-style="color:#999999;margin-left:10upx;"
+									 class="f-24" v-model="keyword" @blur="doSearch" />
+								</view>
+								<!-- <picker @change="search" :value="indexs" :range="typeList" range-key="label">
+									<view class="dis-flex search-select f-28">
+										{{ typeList[indexs].label }}
+										<view class="i icon iconfont icon-unfold"></view>
+									</view>
+								</picker> -->
+							</view>
+						</view>
+					</view>
+					<view class="topNav">
+						<view @click="changeStatus(0)">
+							<view :class="status == 0 ? 'check' : ''">
+								<span>全部</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(1)">
+							<view :class="status == 1 ? 'check' : ''">
+								<span>待使用</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(8)">
+							<view :class="status == 8 ? 'check' : ''">
+								<span>待发货</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(3)">
+							<view :class="status == 3 ? 'check' : ''">
+								<span>已完成</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(9)">
+							<view :class="status == 9 ? 'check' : ''">
+								<span>已过期</span>
+								<view class="line"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<!-- <view class="topFull"></view> -->
+
+				<!-- 列表区域 -->
+				<scroll-view class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="load">
+					<nonemores v-if="pagetotal == 0"></nonemores>
+					<view class="orderList-body" v-if="pagetotal != 0">
+						<view  style="position: fixed;right: 280upx;top:320upx;z-index: 99999;" v-if="idos">
+							<view  style=" width: 0;height: 0;border-left: 20upx solid transparent;border-right: 20upx solid transparent;border-bottom: 20upx solid rgba(255,68,68,0.7);position: absolute;left: 50%;top: -20upx;transform: translateX(-50%);">
+								
+							</view>
+							<view class="f-20 dis-il-block col-f" style="padding: 0upx 20upx;border-radius: 15upx;background-color: rgba(255,68,68,0.7);font-weight: 400;height: 180upx;width: 300upx;">
+								<view class="f-20" style="padding: 30upx 10upx;">
+									亲~~点击订单号可以复制订单号到粘贴板哦~!
+								</view>
+								<view class="t-r" @click="ido">
+									我知道了
+								</view>
+							</view>
+							
+						</view>
+						<view class="orderList-list-item m-btm20" v-for="(item, index) in orderlist" :key="index">
+							<view class="dis-flex flex-x-between f-24 orderList-list-item-header">
+								<view class="dis-flex flex-y-center">
+									<view class="tag">{{ item.pluginname }}订单</view>
+									<view class="f-20" @click="copy(item.orderno)">{{ item.orderno }}</view>
+								</view>
+								<view class="color-status f-22 f-w" style="line-height: 44upx;">{{ item.statusname }}</view>
+							</view>
+							<view class="user-msg dis-flex f-24 flex-y-center">
+								<view class="m-right30 claMickname">{{ item.nickname }}</view>
+								<view>{{ item.mobile }}</view>
+								<image :src="imgfixUrls + 'centerMerchant/phone.png'" class="img" alt="" v-if="item.mobile" />
+								<view class="blue" @click="kfPhone(item)" v-if="item.mobile">联系客户</view>
+							</view>
+							<view class="orderList-list-item-content dis-flex">
+								<image class="orderList-img" :src="item.gimg" />
+								<view class="dis-flex flex-dir-column flex-x-between">
+									<view class="goods-name f-24">{{ item.gname || '' }}</view>
+									<view class="dis-flex flex-x-between m-top10" v-if="!item.goodsarray">
+										<view class="dis-flex goods-sku f-24">
+											{{ item.optiontitle }}
+											<view class="m-left10">×{{ item.num }}</view>
+										</view>
+										<view class="goods-price f-24">￥{{ item.price }}</view>
+									</view>
+									<view class="dis-flex flex-x-between" style="margin-bottom: 10upx;" v-if="item.goodsarray" v-for="(items,indexs) in item.goodsarray" :key="indexs">
+										<view class="dis-flex goods-sku f-24">
+											{{ items.name }}
+											<view class="m-left10">×{{ items.num }}</view>
+										</view>
+										<view class="goods-price f-24">￥{{ items.money }}</view>
+									</view>
+								</view>
+							</view>
+							<view class="orderList-list-item-footer f-24" style="position: relative;" >
+								<!-- <view class="footer-item dis-flex flex-x-between color-33" v-if="!!item.remark" >
+									<view>备注:</view>
+									<view>{{item.remark}}</view>
+								</view> -->
+								<view  v-if="item.express && item.plugin != 'housekeep'">
+									<view style="padding: 20upx 0 10upx 0upx;display: flex;" v-if="item.express.name">
+										<view style="width: 127upx;display: inline-block;text-align: left;color: #999999;"class="flex-box">
+											<text >收货人</text>
+										</view>
+										<view style="padding-left: 10upx;text-align: right;"class="flex-box">
+											<text @click="copy(item.express.name)">{{ item.express.name }}</text>
+										</view>
+									</view>
+									
+									<view style="padding-bottom: 10upx;display: flex;" v-if="item.express.tel">
+										<view style="width: 127upx;display: inline-block;text-align: left;color: #999999;"class="flex-box">
+											<text >收货人手机</text>
+										</view>
+										<view style="padding-left: 10upx;text-align: right;"class="flex-box">
+											<text  @click="copy(item.express.tel)">{{ item.express.tel }}</text>
+										</view>
+									</view>
+									
+									<view style="padding-bottom: 10upx;display: flex;" v-if="item.express.address">
+										<view style="width: 127upx;display: inline-block;text-align: left;color: #999999;"class="flex-box">
+											<text >收货人地址</text>
+										</view>
+										<view style="padding-left: 10upx;text-align: right;"class="flex-box">
+											<text @click="copy(item.express.address)">{{ item.express.address}}</text>
+										</view>
+									</view>
+									
+									
+								</view>
+								<view  v-if="item.express && item.plugin == 'housekeep'">
+									<view style="padding-top: 10upx;display: flex;" v-if="item.express.address">
+										<view style="width: 127upx;display: inline-block;text-align: left;color: #999999;"class="flex-box">
+											<text >上门地址</text>
+										</view>
+										<view style="padding-left: 10upx;text-align: right;"class="flex-box">
+											<text >{{ item.express.address}}</text>
+										</view>
+									</view>
+									
+									
+								</view>
+								
+								<view class="footer-item dis-flex flex-x-end color-33" style="position: relative;padding-top: 15upx;">
+									<view class="t-l " style="flex: 0.4;">
+										<view style="padding-bottom: 10upx;display: flex;" v-if="item.remark">
+											<view style="width: 127upx;display: inline-block;text-align: left;color: #999999;"class="flex-box">
+												<text >备注</text>
+											</view>
+											<view style="padding-left: 10upx;"class="flex-box">
+												<text >{{ item.remark }}</text>
+											</view>
+										</view>
+									</view>
+									<view class="t-r" style="flex: 0.6;">
+										<view>共{{item.num}}件商品，合计：<text class="color-red">¥{{ item.price }}</text></view>
+									</view>
+								</view>
+								<view  style="position: relative;left: 1%;top: 1%;" v-if="item.express || item.remark">
+								<!-- <view style="padding-bottom: 10upx;" v-if="item.express.tel">
+									<text style="width: 127upx;display: inline-block;text-align: right;color: #999999;">收货人手机</text><text style="padding-left: 10upx;">{{ item.express.tel }}</text>
+								</view>
+								<view style="padding-bottom: 10upx;" v-if="item.express.address">
+									<text style="width: 127upx;display: inline-block;text-align: right;color: #999999;">收货人地址</text><text style="padding-left: 10upx;">{{ item.express.address }}</text>
+								</view>
+								<view style="padding-bottom: 10upx;" v-if="item.remark">
+									<text style="width: 127upx;display: inline-block;text-align: right;color: #999999;">备注</text><text style="padding-left: 10upx;">{{ item.remark }}</text>
+								</view>	 -->
+								</view> 
+								<view class="dis-flex" style="justify-content: flex-end;">
+									<view class="footer-item lookform" @click="lookfrom(index)"  v-if="item.moinfoflag == 1">
+										查看表单
+									</view>
+									<view class="flex-box" v-if="item.moinfoflag == 1">
+										
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33" v-if="item.status == 1 && item.plugin !== 'citydelivery' && item.plugin !== 'housekeep'">
+										<view class="btn" @click="goHx" >去核销</view>
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33"  v-if="item.refundflag == 1">
+										<view class="btn" @click="tuiler(item)">退款</view>
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33"  v-if="item.status == 8 && item.plugin == 'citydelivery'">
+										<view class="btn" @click="orderReceiving(item)">接单</view>
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33"  v-if="((item.plugin == 'housekeep' && orderInfo.hkhidefish != 1) || item.plugin == 'citydelivery') && (item.status == 1 || item.status == 4) && item.statusname !== '退款审核' && item.statusname !== '退款申请中'">
+										<view class="btn" @click="accomplish(item)">完成</view>
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33" v-if="item.status == 8 && item.plugin !== 'citydelivery' && item.plugin !== 'housekeep'">
+										<view class="btn"  @click="showPop(item, 8)">去发货</view>
+									</view>
+									<view class="footer-item dis-flex flex-x-end color-33"  v-if="item.status == 4 && item.plugin !== 'citydelivery' && item.plugin !== 'housekeep'">
+										<view class="btn" @click="showPop(item, 4)">修改物流</view>
+									</view>
+								</view>
+								<view style="overflow: hidden;">
+									
+								
+								<view class="moinfoBox"  :class="{'checkisbox':item.check}">
+									<view class="moinfoItem" v-for="(items,indexs) in item.moinfo" :key="indexs">
+										<view class="dis-flex textItem" v-if="items.id == 'text' || items.id == 'select' || items.id == 'time' || items.id == 'textarea'">
+											<view class="f-24">
+												{{items.title}}
+											</view>
+											<view class="f-24 flex-box t-r">
+												{{items.data}}
+											</view>
+										</view>
+										<view class="dis-flex textItem" v-if="items.id == 'city' || items.id =='datetime'">
+											<view class="f-24">
+												{{items.title}}
+											</view>
+											<view class="flex-box t-r dis-flex flex-x-end">
+												<view class="f-24" v-for="(cityItem,i) in items.data" :key="i">
+													{{cityItem}}
+													<text v-if="(items.data.length-1 != i) && items.id == 'city'">-</text>
+														<text style="padding: 0 10upx;" v-if="(items.data.length-1 != i) && items.id != 'city'">至</text>
+												</view>
+											</view>
+											
+										</view>
+										<view class="textItem" v-if="items.id == 'img'">
+											<view class="f-24" style="padding-bottom: 20upx;">
+												{{items.title}}
+											</view>
+											<view class="imgItem t-r dis-flex">
+												<image :src="imgItem" v-for="(imgItem,imgindex) in items.data" :key="imgindex" @click="lookimg(items.data,imgindex)" mode=""></image>
+											</view>
+											
+										</view>
+									</view>
+								</view>
+								</view>
+							</view>
+						</view>
+						<view class="tips">
+							<loadmore :isMore="isMore"></loadmore>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<navBar :tabBarAct="3" v-if="0" />
+
+		<!-- 发货弹框 -->
+		<PopManager :show="popShow" :type="popType" @clickmask="closePop">
+			<view class="popView">
+				<view class="popViewPackage">
+					<view class="popTitle">
+						<view class="popTitlePackage"><span>填写发货信息</span></view>
+						<view class="popTitleBody dis-flex1">
+							<view class="titleBodyLeft1" v-if="!!items.express">
+								<view><text class="textf">姓名 {{items.express.name}}</text></view>
+								<view><text class="textf">电话 {{items.express.tel}}</text></view>
+								<view><text class="textf">地址 {{items.express.address}}</text></view>
+							</view>
+							<view class="titleBodyRight1" @click="fz"><text>复制发货信息</text></view>
+						</view>
+					</view>
+					<view class="popBody">
+						<view class="popInput"><input placeholder="请输入快递单号" v-model="expresssn" v-if="popShow" /></view>
+						<picker class="popPicker" @change="checkComparison" :value="index" :range="comparisonTable" range-key="name">
+							<view class="popInput">
+								<span>{{ comparisonTable[index].name }}</span>
+							</view>
+						</picker>
+						<view class="popButton" @click="sendGoods"><span>确认发货</span></view>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 发货弹框 -->
+		<!-- 上传图片弹窗 -->
+		<PopManager :show="uploadShow" :type="'center'" @clickmask="uploadPop">
+			<view class="uploadDiv">
+				<view class="imgPreview" v-if="thumb != ''">					<image :src="thumb" />					<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeImg(1)" />				</view>					<!-- 图片预览循环模板 -->				<view class="userImgUpdata" @click="updataImg(1)" v-else>						<image :src="imgfixUrls + 'merchant/addImg.svg'" />				</view>
+				<view class="dis-flex">
+					<view class="closeDiv" @click="uploadPop">
+						取消
+					</view>
+					<view class="flex-box">
+						
+					</view>
+					<view class="accomplish" @click="iFinished">
+						完成
+					</view>
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import Loadlogo from '@/components/template/loadlogo';
+	import navBar from '@/components/template/navBar.vue';
+	import PopManager from '@/components/template/PopManager';
+	import nonemores from '@/components/template/nonemores.vue';
+	import loadmore from '@/components/template/loadmore.vue';
+	export default {
+		data() {
+			const date = new Date();
+			const years = [];
+			const year = date.getFullYear();
+			const months = [];
+			const month = date.getMonth() + 1;
+			const days = [];
+			const day = date.getDate();
+			for (let i = 1990; i <= date.getFullYear(); i++) {
+				years.push(i);
+			}
+			for (let i = 1; i <= 12; i++) {
+				months.push(i);
+			}
+			for (let i = 1; i <= 31; i++) {
+				days.push(i);
+			}
+			return {
+				isMore: true,
+				indexs: 0,
+				typeList: [],
+				popIndex: null,
+				keyword: '',
+				orderid: null,
+				ordertype: null,
+				expressname: null,
+				expresssn: '',
+				alias: null,
+				edit_flag: null,
+				comparisonTable: [],
+				array: ['中国', '美国', '巴西', '日本'],
+				index: 0,
+				popType: 'center',
+				scrollHeight: null,
+				typeShow: 'bottom',
+				popShow: false,
+				scdpText: '',
+				orderlist: [],
+				orderInfo: {},
+				storeid: null,
+				pagetotal: null,
+				type: '',
+				status: 0,
+				sort: '',
+				time: '',
+				page: 1,
+				loadlogo: true,
+				shopShow: '',
+				filterDialog: true,
+				title: 'picker-view',
+				years,
+				year,
+				months,
+				month,
+				days,
+				day,
+				value: [9999, month - 1, day - 1],
+				visible: true,
+				indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`,
+				userid: null,
+				items: {},
+				itemis:{},
+				idos:true,
+				uploadShow:false,
+				thumb:'',
+				thumbeg:''
+			};
+		},
+		components: {
+			Loadlogo,
+			navBar,
+			PopManager,
+			nonemores,
+			loadmore
+		},
+		computed: {},
+		onShow() {},
+		onLoad(e) {
+			let _this = this;
+			if (!!e.userid) {
+				_this.userid = e.userid;
+			} else {
+				_this.userid = '';
+			}
+			if (!!e.storeid) {
+				_this.storeid = e.storeid;
+				uni.setStorageSync('checkStoreid', e.storeid);
+			} else {}
+			_this.init();
+		},
+		watch: {
+			popShow: {
+				handler() {
+					let _this = this;
+					if (_this.popShow == false) {
+						_this.index = 0;
+						_this.expressname = _this.comparisonTable[0].name;
+						_this.alias = _this.comparisonTable[0].alias;
+						_this.expresssn = '';
+					}
+				}
+			}
+		},
+		mounted() {},
+		methods: {
+			lookfrom(index){
+				let _this = this;
+				_this.orderlist.map((item,ins)=>{
+					if(ins == index && !item.check){
+						_this.$set(item,'check',true);
+					}else{
+						_this.$set(item,'check',false);
+					}
+				});
+				_this.loadlogo = !_this.loadlogo;
+				_this.loadlogo = !_this.loadlogo;
+				
+			},
+			lookimg(imgs,img){
+				uni.previewImage({					
+					current: imgs[img],					
+					urls: imgs,
+					});
+			},
+			closeImg(type){
+				this.thumb = '';
+				this.thumbeg = '';
+			},
+			async updataImg(type) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(1);
+				    console.info(res);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i]);
+				    	if (type == 1) {
+				    		_this.thumb = aa.data.img;
+				    		_this.thumbeg = aa.data.image;
+				    		// _this.goodsInfo.goods.thumb = aa.data.img;
+				    	}
+				    	if (type == 2) {
+				    		_this.thumbs.push(aa.data.img);
+				    		_this.goodsInfo.goods.thumbs.push(aa.data.img);
+				    	}
+				    }
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										if (type == 1) {
+											_this.thumb = res.data.img;
+											_this.thumbeg = res.data.image;
+											// _this.goodsInfo.goods.thumb = res.data.img;
+										}
+										if (type == 2) {
+											_this.thumbs.push(res.data.img);
+											_this.goodsInfo.goods.thumbs.push(res.data.img);
+										}
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 1,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						console.info(res);
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.thumb = aa.data.img;
+								_this.thumbeg = aa.data.image;
+								// _this.goodsInfo.goods.thumb = aa.data.img;
+							}
+							if (type == 2) {
+								_this.thumbs.push(aa.data.img);
+								_this.goodsInfo.goods.thumbs.push(aa.data.img);
+							}
+						}
+					}
+				});
+				// #endif
+			},
+			iFinished(){
+				let item = this.itemis;
+				App.showError(
+					`确认完成此订单？`,
+					data => {
+						if (data.confirm) {
+							if(item.plugin == 'housekeep'){
+								
+								let data = {
+									channel: 1,
+									id: item.i
+								};
+								App._post_form(
+									`&p=housekeep&do=finishOrder`,
+									data,
+									res => {
+										console.log(res);
+										uni.showToast({
+											title: res.message
+										});
+										this.uploadShow = false;
+										this.thumb = '';
+										this.thumbeg = '';
+										this.changeStatus();
+									},
+									false,
+									() => {}
+								);
+							}else{
+								this.allWithdrawal(item);
+								this.uploadShow = false;
+								this.thumb = '';
+								this.thumbeg = '';
+							}
+						}
+					},
+					true
+				);
+				console.log(item);
+			},
+			uploadPop(){
+				this.uploadShow = false;
+				this.thumb = '';
+				this.thumbeg = '';
+			},
+			copy(text){
+				//#ifdef H5
+					App.clipboard(text);
+				//#endif
+				//#ifndef H5
+					uni.setClipboardData({
+					    data: text,
+					    success: function () {
+					        uni.showToast({
+					        	title:`复制成功`,
+								icon:'none'
+					        })
+					    }
+					});
+				//#endif
+				
+			},
+			ido(){
+				this.idos = false;
+			},
+			allWithdrawal(item){
+				let data = {
+					id:item.id,
+					type:2,
+					fishimg:this.thumbeg
+				}
+				App._post_form(`&p=citydelivery&do=finishOrder`, data, res => {
+					console.log(res);
+					uni.showToast({
+						icon: "none",
+						title: res.message,
+						duration: 2000
+					});
+					this.changeStatus();
+				});
+			},
+			tuiler(item){
+				App.showError(
+					`确认发起退款？`,
+					data => {
+						if (data.confirm) {
+							!!data && this.tuilers(item);
+						}
+					},
+					true
+				);
+			},
+			tuilers(item){
+				App._post_form(`&p=store&do=storeRefund&id=${item.id}&plugin=${item.plugin}`, {}, res => {
+					console.log(res);
+					uni.showToast({
+						icon: "none",
+						title: res.message,
+						duration: 2000
+					});
+					this.changeStatus();
+				});
+			},
+			// 接单
+			orderReceiving(item){
+				App.showError(
+					`确认接单?`,
+					data => {
+						if (data.confirm) {
+								let data = {
+									orderid: item.id
+								};
+								App._post_form(
+									`&p=citydelivery&do=acceptOrderApi`,
+									data,
+									res => {
+										console.log(res);
+										uni.showToast({
+											title: res.message
+										});
+										this.changeStatus();
+									},
+									false,
+									() => {}
+								);
+						}
+					},
+					true
+				);
+			},
+			// 外卖订单完成
+			accomplish(item){
+				this.itemis = item;
+				if(this.orderInfo.fishimg == 1){
+					this.uploadShow = true;
+					return
+				}
+				App.showError(
+					`确认完成此订单？`,
+					data => {
+						if (data.confirm) {
+							if(item.plugin == 'housekeep'){
+								
+								let data = {
+									channel: 1,
+									id: item.i,
+									
+								};
+								App._post_form(
+									`&p=housekeep&do=finishOrder`,
+									data,
+									res => {
+										console.log(res);
+										uni.showToast({
+											title: res.message
+										});
+										this.changeStatus();
+									},
+									false,
+									() => {}
+								);
+							}else{
+								this.allWithdrawal(item);
+							}
+						}
+					},
+					true
+				);
+			},
+			fz() {
+				let _this = this
+				console.info(_this.items)
+				//#ifdef H5
+					App.clipboard('姓名:' + _this.items.express.name + ',电话:' + _this.items.express.tel + ',地址:' + _this.items.express.address);
+				//#endif
+				uni.setClipboardData({
+					data: '姓名:' + _this.items.express.name + ',电话:' + _this.items.express.tel + ',地址:' + _this.items.express.address,
+					success: function() {
+						uni.showToast({
+							icon: "none",
+							title: '复制成功',
+							duration: 2000
+						});
+					}
+				});
+			},
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight - 65 + 'px';
+					}
+				});
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getOrderList(res.data);
+					}
+				});
+
+				_this.getComparisonTable();
+			},
+			kfPhone(item) {
+				let _this = this;
+				uni.showModal({
+					title: '联系客户',
+					content: item.mobile,
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: item.mobile //仅为示例
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			closePop() {
+				let _this = this;
+				_this.popShow = false;
+			},
+			search(e) {
+				let _this = this;
+				_this.indexs = e.detail.value;
+				_this.type = _this.typeList[e.detail.value].value;
+				_this.doSearch();
+			},
+			doSearch() {
+				let _this = this;
+				_this.page = 1;
+				_this.isMore = false;
+				let data = {
+					storeid: _this.storeid,
+					type: _this.type,
+					status: _this.status,
+					sort: _this.sort,
+					time: _this.time,
+					page: _this.page,
+					keyword: _this.keyword,
+					getinfoflag: 1,
+					cc_id: ''
+				};
+				App._post_form('&p=store&do=orderList', data, res => {
+					_this.orderlist = res.data.orderlist;
+					_this.orderlist.map(item=>{
+						item.check = false;
+					})
+					_this.orderInfo = res.data;
+					_this.pagetotal = res.data.pagetotal;
+					_this.isMore = true;
+				});
+			},
+			// 手机端发货接口
+			sendGoods() {
+				let _this = this;
+				let data = {
+					orderid: _this.orderid,
+					ordertype: _this.ordertype,
+					expressname: _this.expressname,
+					expresssn: _this.expresssn,
+					alias: _this.alias,
+					edit_flag: _this.edit_flag
+				};
+				App._post_form('&p=pay&do=sendGoods', data, res => {
+					_this.doSearch();
+					_this.popShow = false;
+					uni.showToast({
+						icon: 'none',
+						title: '操作成功',
+						duration: 2000
+					});
+				});
+			},
+			load() {
+				let _this = this;
+				if (_this.pagetotal == _this.page) {
+					_this.isMore = true;
+				} else {
+					_this.page++;
+					_this.getOrderList();
+				}
+			},
+			changeStatus(status) {
+				let _this = this;
+				_this.status = status;
+				_this.page = 1;
+				_this.isMore = false;
+				let data = {
+					userid: _this.userid,
+					storeid: _this.storeid,
+					type: _this.type,
+					status: _this.status,
+					sort: _this.sort,
+					time: _this.time,
+					page: _this.page,
+					getinfoflag: 1
+				};
+				App._post_form('&p=store&do=orderList', data, res => {
+					_this.orderlist = res.data.orderlist;
+					_this.orderlist.map(item=>{
+						item.check = false;
+					})
+					_this.orderInfo = res.data;
+					_this.pagetotal = res.data.pagetotal;
+					_this.isMore = true;
+				});
+			},
+			showPop(item, index) {
+				let _this = this;
+				_this.popShow = true;
+				_this.popIndex = index;
+				_this.items = item;
+				console.info('items', item)
+				if (index == 8) {
+					_this.orderid = item.id;
+					_this.ordertype = item.a;
+					_this.edit_flag = 0;
+				} else {
+					_this.edit_flag = 1;
+					_this.orderid = item.id;
+					_this.ordertype = item.a;
+					_this.expresssn = item.express.expresssn;
+					for (let i = 0; i < _this.comparisonTable.length; i++) {
+						if (item.express.expressname == _this.comparisonTable[i].alias) {
+							_this.expressname = _this.comparisonTable[i].name;
+							_this.alias = _this.comparisonTable[i].alias;
+							_this.index = i;
+							console.info(_this.index);
+						}
+					}
+				}
+			},
+			// 获取快递公司列表
+			getComparisonTable() {
+				let _this = this;
+				let data = {};
+				App._post_form('&p=pay&do=getComparisonTable', data, res => {
+					_this.comparisonTable = res.data;
+					_this.expressname = _this.comparisonTable[0].name;
+					_this.alias = _this.comparisonTable[0].alias;
+				});
+			},
+			checkComparison(e) {
+				let _this = this;
+				if (_this.popIndex == 8) {
+					_this.index = e.detail.value;
+					_this.expressname = _this.comparisonTable[_this.index].name;
+					_this.alias = _this.comparisonTable[_this.index].alias;
+				} else {
+					_this.index = e.detail.value;
+					_this.expressname = _this.comparisonTable[_this.index].name;
+					_this.alias = _this.comparisonTable[_this.index].alias;
+				}
+			},
+			// 店铺订单列表
+			getOrderList(storeid) {
+				let _this = this;
+				_this.isMore = false;
+				let data = {
+					userid: _this.userid,
+					storeid: storeid || _this.storeid,
+					type: _this.type,
+					status: _this.status,
+					sort: _this.sort,
+					time: _this.time,
+					page: _this.page,
+					getinfoflag: 1
+				};
+				App._post_form('&p=store&do=orderList', data, res => {
+					_this.orderlist = [..._this.orderlist, ...res.data.orderlist];
+					_this.orderlist.map(item=>{
+						if(!item.check && item.check != false){
+							item.check = false;
+						}
+					})
+					_this.orderInfo = res.data;
+					_this.pagetotal = res.data.pagetotal;
+					_this.isMore = true;
+					for (let key in res.data.typelist) {
+						let obj = {
+							label: res.data.typelist[key],
+							value: key
+						};
+						_this.typeList.push(obj);
+					}
+					console.info(res.data.typelist);
+				});
+			},
+			bindChange: function(e) {
+				const val = e.detail.value;
+				this.year = this.years[val[0]];
+				this.month = this.months[val[1]];
+				this.day = this.days[val[2]];
+			},
+			// 跳转
+			goHx() {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantVerification/merchantVerification'
+				});
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'contactway':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/contactway/contactway'
+						});
+						break;
+					case 'withdraw':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/withdraw/withdraw'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+					case 'shops':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+				}
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.textf {
+		font-size: 24upx !important;
+		color: #FFFFFF !important;
+	}
+
+	.popTitleBody {
+		padding: 0 30upx;
+	}
+
+	.titleBodyRight1 {
+		display: inline-block;
+		vertical-align: top;
+		height: 42upx;
+		border: 1upx solid rgba(255, 255, 255, 1);
+		border-radius: 21upx;
+
+		>text {
+			padding: 10upx;
+			line-height: 42upx;
+			width: 118upx;
+			height: 20upx;
+			font-size: 20upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.dis-flex1 {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.titleBodyLeft1 {
+		width: 300upx;
+		display: inline-block;
+		vertical-align: top;
+	}
+
+	.popTitlePackage {
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			color: #ffffff;
+		}
+	}
+
+	.popButton {
+		margin: 20upx auto 0 auto;
+		width: 480upx;
+		height: 80upx;
+		background: rgba(51, 136, 255, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.popInput {
+		margin: 20upx auto 0 auto;
+		width: 480upx;
+		height: 80upx;
+		background: rgba(246, 246, 246, 1);
+		border-radius: 10upx;
+
+		padding-left: 20upx;
+
+		>input {
+			height: 100%;
+			width: 100%;
+			background: rgba(246, 246, 246, 1);
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>span {
+			text-align: center;
+			line-height: 80upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.popTitle {
+		width: 540upx;
+		height: 271upx;
+		background: linear-gradient(0deg, rgba(51, 136, 255, 1) 0%, rgba(80, 153, 255, 1) 100%);
+
+		>span {
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.uploadDiv{
+		// width: 70vw;
+		padding: 30upx;
+		border-radius: 20upx;
+		background-color: #FFFFFF;
+		.imgPreview {
+		display: inline-block;
+		overflow: hidden;
+		width: 60vw;
+		height: 60vw;
+		background: gray;
+		// margin-right: 37upx;
+		margin-bottom: 10upx;
+		border-radius: 10upx;
+		position: relative;
+
+		>image {
+			width: 60vw;
+			height: 60vw;
+		}
+		
+	}
+	
+	.closeDiv{
+		width: 200upx;
+		height: 60upx;
+		line-height: 60upx;
+		background-color: #999999;
+		border-radius: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: #FFFFFF;
+		// margin-left: 30upx;
+		margin-top: 30upx;
+	}
+	
+	.accomplish{
+		width: 200upx;
+		height: 60upx;
+		line-height: 60upx;
+		background-color: #FF4444;
+		border-radius: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: #FFFFFF;
+		// margin-right: 30upx;
+		margin-top: 30upx;
+	}
+	
+	.userImgUpdata {
+		width: 60vw;
+		height: 60vw;
+		background: rgba(246, 246, 246, 1);
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 10upx;
+		text-align: center;
+		> image {
+			margin-top: 170upx;
+			width: 100upx;
+			height: 100upx;
+		}
+	}
+	
+	.close {
+		width: 50rpx !important;
+		height: 50rpx !important;
+		position: absolute;
+		top: 10rpx;
+		right: 10rpx;
+		z-index: 30;
+	}
+	}
+	
+	.popViewPackage {}
+
+	.popView {
+		padding-bottom: 20upx;
+		overflow: hidden;
+		width: 540upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.tips {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			color: black;
+		}
+	}
+
+	page {
+		font-size: 0;
+		background-color: #f6f6f6;
+	}
+
+	.scrollList {
+		background-color: #f6f6f6;
+	}
+
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-red {
+		color: #ff4444;
+	}
+
+	.container {
+		.orderList-header {
+			z-index: 2;
+			position: fixed;
+			top: 0upx;
+			left: 0;
+			right: 0;
+		}
+
+		.topNav {
+			// top: 88upx;
+			// width: 750upx;
+			// height: 86upx;
+			background: rgba(255, 255, 255, 1);
+			display: flex;
+			justify-content: space-between;
+
+			.line {
+				position: absolute;
+				opacity: 0;
+				bottom: 0;
+				display: inline-block;
+				width: 48upx;
+				height: 7upx;
+				left: 50%;
+				transform: translateX(-50%);
+				background: #3388ff;
+				border-radius: 4px 4px 0px 0px;
+			}
+
+			>view {
+				text-align: center;
+				width: 20%;
+				display: inline-block;
+
+				>view {
+					height: 81upx;
+					margin: auto;
+					border-bottom: 4upx solid rgba(0, 0, 0, 0);
+					position: relative;
+
+					>span {
+						line-height: 85upx;
+						font-size: 24upx;
+
+						color: rgba(51, 51, 51, 1);
+					}
+				}
+			}
+		}
+
+		.check {
+			.line {
+				opacity: 1;
+			}
+
+			>span {
+				font-size: 28upx !important;
+
+				font-weight: 500 !important;
+				color: #3388ff !important;
+			}
+		}
+
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					position: relative;
+					padding: 0 60upx 0 80upx;
+					margin-right: 40upx;
+					background: rgba(246, 246, 246, 1);
+					height: 76upx;
+					border-radius: 38upx;
+					flex: 1;
+
+					input {
+						width: 100%;
+						height: 100%;
+					}
+
+					.icon.icon-sousuo {
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 30upx;
+					}
+				}
+
+				.search-select {
+					width: 100upx;
+					white-space: nowrap;
+					color: #333333;
+
+					.icon {
+						margin-left: 10upx;
+						color: #999999;
+					}
+				}
+			}
+		}
+
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+
+		// 详情内容
+		.orderList {
+			background-color: #ffffff;
+
+			// padding-bottom: 100upx;
+			.orderList-search {
+				padding: 30upx;
+				background-color: #ffffff;
+			}
+
+			.orderList-body {
+				padding: 30upx;
+				margin-top: 206upx;
+				background-color: #f6f6f6;
+
+				.orderList-list-item {
+					padding: 30upx;
+					border-radius: 10upx;
+					background: #ffffff;
+
+					.user-msg {
+						padding: 25upx 30upx;
+						background: rgba(248, 248, 248, 1);
+						border-radius: 8upx;
+						color: #999999;
+
+						.blue {
+							color: #2196f3;
+						}
+
+						.img {
+							margin: 0 15upx 0 43upx;
+							height: 34upx;
+							width: 34upx;
+						}
+						.claMickname{
+							width: 180upx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+					}
+
+					.orderList-list-item-header {
+						padding-bottom: 28upx;
+
+						.color-status {
+							color: #3388ff;
+						}
+
+						.tag {
+							padding: 4upx;
+							border: 1px solid #ff4444;
+							border-radius: 4upx;
+							text-align: center;
+							font-size: 17upx;
+							margin-right: 5upx;
+							color: #ff4444;
+						}
+					}
+
+					.orderList-list-item-content {
+						padding: 30upx 0;
+						border-bottom: 1px solid rgb(238, 238, 238);
+
+						.orderList-img {
+							width: 130upx;
+							height: 130upx;
+							border-radius: 4upx;
+							margin-right: 30upx;
+							flex-shrink: 0;
+						}
+
+						.goods-name {
+							color: #000000;
+							line-height: 36upx;
+						}
+
+						.goods-sku {
+							color: #999999;
+						}
+					}
+					
+					.checkisbox{
+						height: auto!important;
+						transform: translateY(0%)!important;
+						// animation: scale 1s 0s cubic-bezier(0.09, 0.57, 0.49, 0.9) infinite;
+						transition: all 0.3s ease-in-out;
+						opacity: 1!important;
+					}
+					
+					.moinfoBox{
+						overflow: hidden;
+						// transform: scale(0.1);
+						transform: translateY(-50%);
+						height: 0;
+						opacity: 0.1;
+						transition: all 0.3s ease-in-out;
+						.moinfoItem{
+							.textItem{
+								padding: 20upx 0;
+								.imgItem{
+									display: flex;
+									flex-wrap: wrap;
+									// justify-content: space-around;
+									justify-content: flex-start;
+									image{
+										flex: 0.30;
+										min-width: 30%;
+										height: 195upx;
+										margin-bottom: 20upx;
+										margin-right: 21upx;
+										border-radius: 10upx;
+									}
+								}
+								.imgItem:after {
+									content: "";
+									flex: 0.30;
+									min-width: 30%;
+									
+								}
+							}
+						}
+					}
+					
+					.orderList-list-item-footer {
+						.footer-item {
+							padding-top: 30upx;
+							padding-right: 20upx;
+
+							.btn {
+								width: 109upx;
+								height: 50upx;
+								line-height: 50upx;
+								text-align: center;
+								background: #3388ff;
+								color: #ffffff;
+								font-size: 24upx;
+								border-radius: 25upx;
+							}
+						}
+						.lookform{
+							border: 1upx solid #999999;
+							color: #999999;
+							border-radius: 10upx;
+							padding: 0;
+							margin: 30upx 20upx 0 0;
+							// width: 120upx;
+							padding: 0 20upx;
+							line-height: 50upx;
+						}
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantPayDetails/merchantPayDetails.vue b/pages/subPages/merchant/merchantPayDetails/merchantPayDetails.vue
new file mode 100644
index 0000000..5953b21
--- /dev/null
+++ b/pages/subPages/merchant/merchantPayDetails/merchantPayDetails.vue
@@ -0,0 +1,372 @@
+<template>
+	<view>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="pages-header p-r" :style="{'background-image':' url('+imageRoot+'merchantBg1.png)'}"></view>
+			<view class="merchantPayDetails p-r p-left-right-30">
+				<view class="payDetails-header bor-radius-10upx b-f">
+					<view class="dis-flex flex-y-center">
+						<view class="dis-flex flex-dir-column" style="width: 50%;">
+							<view class="f-50 color-33 font-blod">{{storeCurrent.nowmoney}}</view>
+							<view class="f-24 color-99 m-top4">店铺余额（元）</view>
+						</view>
+						<view class="payDetails-header-income">
+							<view class="f-28 payDetails-header-btn mar-left-150 dis-flex flex-x-center" @click="goCash">
+								<view style="margin-left: 8upx;">提现</view>
+								<view class="i icon iconfont icon-jinrujiantou"></view>
+							</view>
+						</view>
+					</view>
+					<view class="dis-flex" style="margin-top:52upx;">
+						<view class="dis-flex flex-dir-column payDetails-header-withdraw">
+							<view class="f-30 color-33 font-blod">{{storeCurrent.cashmoney}}</view>
+							<view class="f-24 color-99 m-top4">累计提现</view>
+						</view>
+						<view class="dis-flex flex-dir-column payDetails-header-income " style="width: 50%;">
+							<view class="f-30 color-33 font-blod mar-left-150">{{storeCurrent.allmoney}}</view>
+							<view class="f-24 color-99 mar-left-150 m-top4">累计收益</view>
+						</view>
+					</view>
+				</view>
+				<view class="tool-tab m-top30">
+					<view class="f-30 font-blod color-33">交易明细</view>
+					<nonemores v-if="totalpage==0"></nonemores>
+					<view class="tool-list dis-flex flex-dir-column" v-else>
+						<view class="tool-item flex-box dis-flex flex-x-between" v-for="(item,index) in storeCurrentList" :key="index">
+							<view class="dis-flex flex-y-center" style="flex: 0.8;">
+								<image class="tool-item-icon" src="" mode=""></image>
+								<view class="dis-flex flex-dir-column">
+									<view class="f-28 font-blod remark">{{item.remark}}</view>
+									<view class="f-24 color-cc m-top16" v-if="item.checkcode">验证码信息:{{item.checkcode}}</view>
+									<view class="f-24 color-cc m-top16">{{item.createtime}}</view>
+									
+								</view>
+							</view>
+							<view style="flex: 0.2;">
+								<view class="f-28 color-f4 font-blod t-l" v-if="item.fee>0">+{{item.fee}}</view>
+								<view class="f-28 color-33 font-blod t-l" v-if="item.fee<0">{{item.fee}}</view>
+								<view class="f-24 color-cc m-top16" v-if="item.spercentmoney">手续费:{{item.spercentmoney}}</view>
+
+							</view>
+							<view class="f-24 color-cc m-top16" style="padding-left: 82upx;" v-if="item.orderno">订单编号:{{item.orderno}}</view>
+
+						</view>
+					</view>
+					<view class="tips" v-if="totalpage!=0">
+						<loadmore :isMore="isMore"></loadmore>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <TabBars :tabBarAct="0" /> -->
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				storeCurrent: {},
+				storeCurrentList: [],
+				page: 1,
+				storeid: null,
+				monidata: 'ikik',
+				detalsData: null,
+				loadlogo: false,
+				shopShow: false,
+				phoneHight: 0,
+				totalpage: 0,
+				isMore: true
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars,
+			nonemores,
+			loadmore
+		},
+		computed: {
+			dealer_Info() {
+				if (this.$store.state.dealerInfo !== '') {
+					return this.$store.state.dealerInfo;
+				}
+			}
+		},
+		onShow() {
+
+		},
+		onLoad(e) {
+			let _this = this,
+				checkStoreid = uni.getStorageSync('checkStoreid');
+			_this.init(checkStoreid);
+			_this.setData({
+				storeid: checkStoreid
+			})
+		},
+		methods: {
+			init(storeid) {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				_this.getStoreCurrentList(storeid);
+			},
+			// 商户收支明细
+			getStoreCurrentList(storeid) {
+				let _this = this,
+					data = {
+						storeid: storeid || _this.storeid,
+						page: _this.page
+					};
+				_this.isMore = false;
+				App._post_form('&p=store&do=storeCurrent', data, res => {
+					_this.storeCurrent = res.data;
+					_this.storeCurrentList = [..._this.storeCurrentList, ...res.data.list];
+					_this.totalpage = res.data.totalpage;
+					_this.isMore = true;
+				})
+			},
+			load() {
+				let _this = this;
+				if (_this.page == _this.totalpage) {
+					_this.isMore = true;
+				} else {
+					_this.page++
+					_this.getStoreCurrentList();
+				}
+			},
+			// 跳转商家
+			goCash() {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantCash/merchantCash'
+				})
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'contactway':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/contactway/contactway'
+						});
+						break;
+					case 'withdraw':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/withdraw/withdraw'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+					case 'shops':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+				}
+			}
+		},
+		onReachBottom() {
+			this.load()
+		}
+	}
+</script>
+
+<style lang="scss">
+	.tips {
+		height: 80upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+			color: black;
+		}
+	}
+
+	.remark {
+		display: inline-block;
+		width: 450upx;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+
+	page {
+		background-color: #ffffff;
+
+	}
+
+	.container {
+		.color-33 {
+			color: #333333;
+		}
+
+		.color-99 {
+			color: #999999;
+		}
+
+		.color-f4 {
+			color: #FF4444;
+		}
+
+		.color-cc {
+			color: #CCCCCC;
+		}
+
+		.font-blod {
+			font-weight: bold;
+		}
+        .floatR {
+			text-align: right;
+		}
+		.select-box {
+			color: #999999;
+
+			.iconfont {
+				font-size: 24upx;
+				margin-left: 6upx;
+			}
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 262upx;
+			background-repeat: no-repeat;
+			background-size: 100% 262upx;
+
+			//个人-邀请人信息
+			.person-content {
+				padding: 94upx 40upx 0;
+
+				.user-avatar {
+					width: 100upx;
+					height: 100upx;
+					border-radius: 50%;
+					background-repeat: no-repeat;
+					background-size: 100upx 100upx;
+				}
+
+				.user-referrer-name {
+					.level-label {
+						background-color: #E7D4AA;
+						border-radius: 18upx;
+						padding: 0 16upx;
+					}
+
+					.referrer-name {
+						color: #6B6E88;
+					}
+				}
+			}
+		}
+
+		// 详情内容
+		.merchantPayDetails {
+			margin-top: -224upx;
+			padding-bottom: 120upx;
+
+			// 导航
+			.payDetails-header {
+				padding: 50upx 70upx 35upx 60upx;
+				box-shadow: 0px 6px 24px 0px rgba(221, 221, 221, 0.35);
+
+				.payDetails-header-btn {
+					width: 144upx;
+					height: 60upx;
+					color: #ffffff;
+					background: rgba(51, 136, 255, 1);
+					border-radius: 30upx;
+					text-align: center;
+					line-height: 60upx;
+
+					.icon {
+						font-size: 26upx;
+					}
+				}
+
+				.payDetails-header-withdraw {
+					border-right: 1px solid #EEEEEE;
+					flex-shrink: 0;
+					width: 50%;
+				}
+
+				.payDetails-header-income {
+					flex-shrink: 0;
+					width: 50%;
+				}
+
+				.mar-left-150 {
+					margin-left: 150upx;
+				}
+			}
+
+			// 工具导航
+			.tool-tab {
+				padding: 20upx 0;
+
+				.tool-tab-title {
+					padding: 0 30upx;
+				}
+
+				.tool-item {
+					width: 100%;
+					flex-wrap: wrap;
+					border-bottom: 1px solid #EEEEEE;
+					padding: 30upx 0;
+
+					.tool-item-icon {
+						margin-right: 28upx;
+						width: 54upx;
+						height: 54upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantRecord/merchantRecord.vue b/pages/subPages/merchant/merchantRecord/merchantRecord.vue
new file mode 100644
index 0000000..64c85c0
--- /dev/null
+++ b/pages/subPages/merchant/merchantRecord/merchantRecord.vue
@@ -0,0 +1,928 @@
+<template>
+	<view @click.stop="idos = false">
+		<far-bottom></far-bottom>
+		<scroll-view class="container">
+			<view class="record">
+				<view class="record-dialog dis-flex flex-x-center flex-y-center" v-if="filterDialog">
+					<view class="record-dialog-main">
+						<view class="m-top40 f-30 color-33 m-btm40 t-c">筛选时间</view>
+						<view class="color-33 f-24 m-left30">起始时间</view>
+						<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="starChange">
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+							</picker-view-column>
+						</picker-view>
+						<view class="color-33 f-24 m-left30">结束时间</view>
+						<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="endChange">
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+							</picker-view-column>
+							<picker-view-column>
+								<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+							</picker-view-column>
+						</picker-view>
+						<view class="record-dialog-btns dis-flex flex-y-center">
+							<view class="btn cancel" @click="closePopis">取消</view>
+							<view class="line"></view>
+							<view class="btn confirm" @click="checkBind">确认</view>
+						</view>
+					</view>
+				</view>
+				<PopManager :show="show" :type="'top'" @clickmask="closePop" class="pop_view">
+					<view class="popfull"></view>
+					<scroll-view class="pop_main" :scroll-x="false" scroll-y>
+						<view class="pop_main_package">
+							<block v-for="(item, index) in Verif.typelist" v-if="currentType === 1">
+								<view class="popMb dis-flex" @click="checkType(index)">
+									<view class="font_28" :class="index==typeIndex?'color_FF4444':'color_333333'">{{item.name}}</view>
+									<view class="iconfont icon-check font_28 color_FF4444" v-if="index==typeIndex"></view>
+								</view>
+							</block>
+							<block v-for="(item, index) in Verif.adminlist" v-if="currentType === 2">
+								<view class="popMb dis-flex" @click="checkStore(index)">
+									<view class="font_28" :class="index==storeIndex?'color_FF4444':'color_333333'">{{item.name}}</view>
+									<view class="iconfont icon-check font_28 color_FF4444" v-if="index==storeIndex"></view>
+								</view>
+							</block>
+						</view>
+					</scroll-view>
+				</PopManager>
+				<view  style="height: 100upx;">
+					<view class="b-f dis-flex diy-nav-list border-line border-bottom" style="z-index: 9999;position: fixed;top: 0;width: 100%;">
+						<view class="topNav_view" @click="openType(1)" :class="currentType === 1 && show == true ? 'color_FF4444' : 'color_333333'">
+							<view class="topNav_text topNav_text_width ver_mid">{{typeText}}</view>
+							<view class="topNav_text iconfont ver_mid" :class="currentType === 1 && show == true ? 'icon-fold' : 'icon-unfold'"></view>
+						</view>
+						<view class="topNav_view" @click="openType(2)" :class="currentType === 2 && show == true ? 'color_FF4444' : 'color_333333'">
+							<view class="topNav_text topNav_text_width ver_mid">{{storeText}}</view>
+							<view class="topNav_text iconfont ver_mid" :class="currentType === 2 && show == true ? 'icon-fold' : 'icon-unfold'"></view>
+						</view>
+						<view class="topNav_view" @click="openType(3)" :class="currentType === 3 && filterDialog == true ? 'color_FF4444' : 'color_333333'">
+							<view class="topNav_text ver_mid">筛选</view>
+							<view class="topNav_text iconfont icon-filter ver_mid"></view>
+						</view>
+					</view>
+				</view>
+				<view class="record-search">
+					<view class="search-main">
+						<view class="search-box dis-flex flex-y-center">
+							<view class="search-input">
+								<view class="i icon iconfont icon-sousuo"></view>
+								<input
+									type="text"
+									v-model="keyword"
+									placeholder="请输入订单号或者店员姓名"
+									placeholder-style="color:#999999;margin-left:10upx;"
+									class="f-24"
+									@blur="getSearch"
+								/>
+							</view>
+							<!-- <picker mode="selector" :range="Verif.adminlist" @change="changeAdmin" range-key="name">
+								<view class="dis-flex search-select f-28" @click="popShow = true">
+									{{ adminlist[admin]}}
+									<view class="i icon iconfont icon-unfold"></view>
+								</view>
+							</picker> -->
+						</view>
+					</view>
+					
+				</view>
+				
+				<view class="record-body">
+					<view class="f-24 m-btm30">
+						核销总计
+						<view class="color-red dis-il-block">{{ Verif.allnum }}</view>
+						次，共
+						<view class="color-red dis-il-block">{{ Verif.allfen }}</view>
+						件商品
+					</view>
+					<view  style="position: fixed;right: 280upx;top:320upx;z-index: 99999;" v-if="idos">
+						<view  style=" width: 0;height: 0;border-left: 20upx solid transparent;border-right: 20upx solid transparent;border-bottom: 20upx solid rgba(255,68,68,0.7);position: absolute;left: 50%;top: -20upx;transform: translateX(-50%);">
+							
+						</view>
+						<view class="f-20 dis-il-block col-f" style="padding: 0upx 20upx;border-radius: 15upx;background-color: rgba(255,68,68,0.7);font-weight: 400;height: 180upx;width: 300upx;">
+							<view class="f-20" style="padding: 30upx 10upx;">
+								亲~~点击订单号可以复制订单号到粘贴板哦~!
+							</view>
+							<view class="t-r" @click="ido">
+								我知道了
+							</view>
+						</view>
+						
+					</view>
+					<view class="record-list-item m-btm20" v-for="(item, index) in VerifList">
+						<view class="dis-flex flex-x-between f-24 record-list-item-header">
+							<view @click="copy(item.orderno)">订单号 {{ item.orderno }}</view>
+							<view class="tag" >{{ item.classname }}</view>
+						</view>
+						<view class="record-list-item-content dis-flex">
+							<image class="record-img" :src="item.goodimg" />
+							<view class="dis-flex flex-dir-column flex-x-between">
+								<view class="goods-name f-28">{{ item.remark }}</view>
+								<view class="dis-flex flex-x-between m-top10">
+									<view class="dis-flex goods-sku f-24">
+										<text v-if="item.optionname">{{ item.optionname }}</text>
+										<view class="color-red m-left10">×{{ item.num }}</view>
+									</view>
+									<view class="goods-price f-28 color-red">￥{{ item.orderprice }}</view>
+								</view>
+							</view>
+						</view>
+						<view class="record-list-item-footer f-24">
+							<view class="footer-item dis-flex flex-x-between">
+								<view class="footer-item-left">核销员：</view>
+								<view class="footer-item-right">{{ item.verifnickname }}</view>
+							</view>
+							<view class="footer-item dis-flex flex-x-between">
+								<view class="footer-item-left">核销时间：</view>
+								<view class="footer-item-right">{{ item.createtime }}</view>
+							</view>
+							<view class="footer-item dis-flex flex-x-between">
+								<view class="footer-item-left">核销方式：</view>
+								<view class="footer-item-right">{{ typeList[item.type - 1] }}</view>
+							</view>
+						</view>
+					</view>
+					<view class="tips">
+						<span>{{ scdpText }}</span>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+		<!-- 选择店员弹框 -->
+
+		<!-- 选择店员弹框 -->
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import TabBars from '@/components/template/tabBar.vue';
+import PopManager from '@/components/template/PopManager';
+export default {
+	data() {
+		const date = new Date();
+		const years = [];
+		const year = date.getFullYear();
+		const months = [];
+		const month = date.getMonth() + 1;
+		const days = [];
+		const day = date.getDate();
+		for (let i = 1990; i <= date.getFullYear(); i++) {
+			years.push(i);
+		}
+		for (let i = 1; i <= 12; i++) {
+			months.push(i);
+		}
+		for (let i = 1; i <= 31; i++) {
+			days.push(i);
+		}
+		return {
+			verifAdmin: '',
+			name: '',
+			popType: 'bottom',
+			popShow: false,
+			scdpText: '',
+			totalpage: null,
+			keyword: '',
+			typeList: ['输码核销', '扫码核销', '后台核销', '密码核销'],
+			VerifList: [],
+			adminlist:[],
+			admin:0,
+			currentType:0,
+			Verif: {},
+			page: 1,
+			loadlogo: false,
+			show:false,
+			shopShow: '',
+			storeText:'所有店员',
+			typeText:'所有类型',
+			storeIndex:null,
+			typeIndex:null,
+			type:'',
+			filterDialog: false,
+			title: 'picker-view',
+			verifmid: '',
+			starYear:null,
+			starMonth:null,
+			starDay:null,
+			endYear:null,
+			endMonth:null,
+			endDay:null,
+			starTime:null,
+			endTime:null,
+			time:[],
+			idos:true,
+			years,
+			year,
+			months,
+			month,
+			days,
+			day,
+			value: [9999, month - 1, day - 1],
+			visible: true,
+			platform:'android',
+			indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`,
+			cc_id: ''
+		};
+	},
+	components: {
+		Loadlogo,
+		TabBars,
+		PopManager
+	},
+	computed: {},
+	onShow() {},
+	mounted() {},
+	onLoad(e) {
+		let _this = this;
+		if(uni.getSystemInfoSync().system.indexOf('Android') === -1){
+			console.log('我是iOS')
+			this.platform ='ios';
+		}else{
+			console.log('我是安卓')
+			this.platform = 'android';
+		}
+		let date = new Date();
+		_this.starYear = date .getFullYear();
+		_this.starMonth = date .getMonth() +1;
+		_this.starDay = date .getDate();
+		_this.endYear = date .getFullYear();
+		_this.endMonth = date .getMonth() + 1;
+		_this.endDay = date .getDate();
+		_this.init();
+	},
+	watch: {
+		Verif: {
+			handler() {
+				let _this = this;
+				if(_this.Verif.adminlist[0].name!=='全部'){
+					_this.Verif.adminlist.splice(0, 0, {
+						mid: '',
+						mobile: '',
+						name: '全部'
+					});
+				}
+				for(let i=0;i<_this.Verif.adminlist.length;i++){
+					_this.adminlist.push(_this.Verif.adminlist[i].name) 
+				}
+			},
+			deep: true
+		}
+	},
+	onReachBottom() {
+		this.load();
+	},
+	methods: {
+		openType(currentType) {
+			let _this = this;
+			_this.currentType = currentType;
+			if(currentType===3){
+				_this.show = false;
+				_this.filterDialog=true;
+				
+			}else{
+				_this.show = true;
+				_this.filterDialog=false
+			}
+		},
+		checkType(index){
+			let _this = this;
+			_this.typeIndex = index;
+			_this.typeText=_this.Verif.typelist[index].name
+			_this.type=_this.Verif.typelist[index].type
+			_this.cc_id=_this.Verif.typelist[index].cc_id
+			_this.getVerifList(true);
+			_this.show=false
+		},
+		checkStore(index){
+			let _this = this;
+			_this.storeIndex = index;
+			_this.storeText = _this.Verif.adminlist[index].name
+			_this.verifmid=_this.Verif.adminlist[index].mid
+			_this.getVerifList(true);
+			_this.show=false
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		copy(text){
+			// debugger
+			//#ifdef H5
+				App.clipboard(text);
+			//#endif
+			uni.setClipboardData({
+				data: text
+			});
+			uni.showToast({
+				title:'已复制到粘贴板'
+			})
+		},
+		ido(){
+			this.idos = false;
+		},
+		// 搜索店员
+		changeAdmin: function(e) {
+			let _this = this;
+			console.info(e.target.value);
+			_this.verifmid=_this.Verif.adminlist[e.target.value].mid
+			_this.admin=e.target.value
+			_this.getSearch();
+		},
+		// closePop() {
+		// 	let _this = this;
+		// 	console.info(_this.popShow);
+		// 	_this.popShow = false;
+		// },
+		load() {
+			let _this = this;
+			if (_this.totalpage == _this.page) {
+				_this.scdpText = '已无更多数据';
+			} else {
+				_this.page++;
+				_this.getVerifList();
+			}
+		},
+		init() {
+			let _this = this;
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.getVerifList()
+				}
+			});
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight;
+					_this.scrollHeight = _this.phoneHight - 65 + 'px';
+				}
+			});
+			
+		},
+		// 搜索
+		getSearch() {
+			let _this = this;
+			_this.page = 1;
+			let data = {
+				page: _this.page,
+				getinfoflag: 1,
+				type: 'rush',
+				storeid: _this.storeid,
+				time: _this.time,
+				verifmid: _this.verifmid,
+				keyword: _this.keyword,
+				cc_id: _this.cc_id
+			};
+			_this.scdpText = '... ...加载中';
+			App._post_form('&p=store&do=verifList', data, res => {
+				_this.totalpage = res.data.totalpage;
+				_this.Verif = res.data;
+				_this.VerifList = res.data.list;
+				if (_this.totalpage == 0 || _this.totalpage == _this.page) {
+					_this.scdpText = '已无更多数据';
+				} else {
+					_this.scdpText = '';
+				}
+			});
+		},
+		// 验证记录列表
+		getVerifList(flag) {
+			let _this = this;
+			let data = {
+				page: _this.page,
+				getinfoflag: 1,
+				type: _this.type,
+				storeid: _this.storeid,
+				time: _this.time,
+				verifmid: _this.verifmid,
+				keyword: _this.keyword,
+				cc_id: _this.cc_id
+			};
+			_this.scdpText = '... ...加载中';
+			App._post_form('&p=store&do=verifList', data, res => {
+				_this.totalpage = res.data.totalpage;
+				_this.Verif = res.data;
+				if(flag){
+					_this.VerifList = res.data.list;
+				}else{
+					_this.VerifList = [..._this.VerifList, ...res.data.list];
+				}
+				
+				if (_this.totalpage == 0 || _this.totalpage == _this.page) {
+					_this.scdpText = '已无更多数据';
+				} else {
+					_this.scdpText = '';
+				};
+				_this.time = [];
+			});
+		},
+		starChange: function(e) {
+			let val = e.detail.value;
+			console.log(e)
+			this.starYear = this.years[val[0]];
+			this.starMonth = this.months[val[1]];
+			this.starDay = this.days[val[2]];
+		},
+		endChange:function(e){
+			// debugger
+			console.log(e)
+			let val = e.detail.value;
+			this.endYear = this.years[val[0]];
+			this.endMonth = this.months[val[1]];
+			this.endDay = this.days[val[2]];
+		},
+		closePopis(){
+			this.filterDialog = false;
+			// if(this.starYear == date .getFullYear() && this.endYear == date .getFullYear() && this.starMonth == date .getMonth() + 1 && this.endMonth == date .getMonth() + 1 &&this.starDay == date .getDate() && this.endDay == date .getDate()){
+			// 	this.starYear = null;
+			// 	this.starMonth = null;
+			// 	this.starDay = null;
+			// 	this.endYear = null;
+			// 	this.endMonth = null;
+			// 	this.endDay = null;
+			// }
+			
+		},
+		checkBind(){
+			let _this=this;
+			// debugger
+			console.log(_this.starYear,_this.starMonth,_this.starDay)
+			_this.starTime=_this.starYear+'-'+_this.starMonth+'-'+_this.starDay
+			_this.endTime=_this.endYear+'-'+_this.endMonth+'-'+_this.endDay
+			if(_this.platform == 'ios'){
+				_this.starTime = _this.starTime.replace(/-/g, "/");
+				_this.endTime = _this.endTime.replace(/-/g, "/");
+				console.log(_this.starTime)
+			}
+			let starData=new Date(_this.starTime)
+			let endData=new Date(_this.endTime)
+			_this.starTime=(starData.getTime()/1000)|| Date.parse(new Date())/1000			
+			_this.endTime=(endData.getTime()/1000)|| Date.parse(new Date())/1000
+			_this.time.push(_this.starTime)
+			_this.time.push(_this.endTime)
+			_this.Verif = {};
+			_this.VerifList = [];
+			_this.filterDialog=false
+			_this.getVerifList();
+		},
+		// 跳转商家
+		goStore() {
+			App.navigationTo({
+				url: 'pages/subPages/dealer/myStore/myStore'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.popMb{
+	margin-bottom: 59upx;
+}	
+.pop_main_package {
+	padding: 33upx 31upx 0 31upx;
+}
+.pop_view {
+	font-size: 0 !important;
+}
+.pop_main {
+	width: 750upx;
+	height: 462upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 0px 0px 20upx 20upx;
+}
+.flex_direction_row {
+	flex-direction: column;
+}
+.font_24 {
+	font-size: 24upx;
+}
+.font_28 {
+	font-size: 28upx;
+}
+.color_FF4444 {
+	color: #ff4444;
+}
+
+.color_999999 {
+	color: #999999;
+}
+.color_333333 {
+	color: #333333;
+}
+.mb_body_view_title {
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	white-space: normal !important;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.mb_body_package {
+	height: 114upx;
+	width: 490upx;
+	overflow: hidden;
+}
+.mb_body_view {
+	margin-left: 20upx;
+	height: 114upx;
+	width: 490upx;
+	overflow: hidden;
+}
+.mar_T30 {
+	margin-top: 30upx;
+}
+.mb_body_img {
+	width: 114upx;
+	height: 114upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	border: 1upx solid rgba(153, 153, 153, 0.1);
+	> image {
+		width: 114upx;
+		height: 114upx;
+	}
+}
+.mb_body {
+	height: 174upx;
+}
+.ver_top {
+	vertical-align: top;
+}
+.mb_right_text {
+	vertical-align: top;
+	line-height: 34upx;
+	font-size: 24upx;
+	color: rgba(255, 255, 255, 1);
+}
+.mb_title_right {
+	margin: 6upx 0 0 0;
+	text-align: center;
+	padding: 0 10upx;
+	height: 34upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.dis-inlneB {
+	display: inline-block;
+}
+.mb_title_text {
+	margin-left: 19upx;
+	line-height: 46upx;
+	font-size: 30upx;
+	color: rgba(51, 51, 51, 1);
+}
+.mb_title_img {
+	border: 1upx solid rgba(153, 153, 153, 0.1);
+	width: 46upx;
+	height: 46upx;
+	border-radius: 23upx;
+	overflow: hidden;
+	image {
+		width: 46upx;
+		height: 46upx;
+	}
+}
+.mb_title {
+	height: 76upx;
+}
+.mb_package {
+	padding: 30upx 0;
+	margin: 0 30upx;
+}
+.mb {
+	margin: 0 auto 20upx auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.tips_text {
+	color: #ff4444;
+}
+.tips {
+	line-height: 84upx;
+	height: 84upx;
+	width: 690upx;
+	margin: auto;
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+.dis-flex {
+	display: flex !important;
+	justify-content: space-between !important;
+}
+.ver_mid {
+	vertical-align: middle;
+}
+.writeRecord {
+	font-size: 0;
+	width: 750upx;
+	background: #f8f8f8;
+}
+.popfull {
+	width: 750upx;
+	height: 105upx;
+}
+.topNav {
+	z-index: 99999;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 750upx;
+	height: 105upx;
+	background: rgba(255, 255, 255, 1);
+}
+.topFull {
+	width: 750upx;
+	height: 105upx;
+	background: rgba(255, 255, 255, 1);
+}
+.topNav_view {
+	width: 33%;
+	display: inline-block;
+	text-align: center;
+}
+.topNav_text {
+	line-height: 105upx;
+	display: inline-block;
+	font-size: 28upx;
+}
+.topNav_text_width {
+	text-align: center;
+	display: inline-block;
+	width: 120upx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+// 时间选择
+.record-dialog {
+		z-index: 10;
+		position: fixed;
+		background: rgba(0, 0, 0, 0.7);
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		.record-dialog-main {
+			margin: auto;
+			width: 600upx;
+			border-radius: 10upx;
+			z-index: 11;
+			background: #ffffff;
+			position: relative;
+		}
+		.record-dialog-btns {
+			border-top: 1upx solid rgba(238, 238, 238, 1);
+			color: rgba(51, 51, 51, 1);
+			position: relative;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			.btn {
+				width: 50%;
+				height: 86upx;
+				font-size: 28upx;
+				line-height: 86upx;
+				text-align: center;
+			}
+			.btn.confirm {
+				color: rgba(51, 136, 255, 1);
+			}
+			.line {
+				width: 1px;
+				height: 36upx;
+				background: rgba(238, 238, 238, 1);
+			}
+		}
+		.record-picker-view {
+			margin: 0upx 30upx;
+			box-sizing: border-box;
+			width: 540upx;
+			height: 240upx;
+		}
+	}
+	.item{
+		font-size: 20upx;
+		
+	}
+	.checkCity {
+		vertical-align: middle;
+		height: 300upx;
+		margin-left: 60upx;
+		display: inline-block;
+		width: 300upx;
+		background: #ffffff;
+	}
+	.tips {
+		height: 80upx;
+		text-align: center;
+	
+		span {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+	page {
+		background-color: #f7f7f7;
+	}
+	
+	.color-33 {
+		color: #333333;
+	}
+	.item{
+		font-size: 20upx;
+	}
+	/deep/.uni-picker-view-indicator{
+			height: 70upx !important;
+		}
+		.record-dialog {
+			z-index: 10;
+			position: fixed;
+			background: rgba(0, 0, 0, 0.7);
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			.record-dialog-main {
+				width: 600upx;
+				border-radius: 10upx;
+				z-index: 11;
+				background: #ffffff;
+				position: relative;
+			}
+			.record-dialog-btns {
+				border-top: 1upx solid rgba(238, 238, 238, 1);
+				color: rgba(51, 51, 51, 1);
+				position: relative;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				.btn {
+					width: 50%;
+					height: 86upx;
+					font-size: 28upx;
+					line-height: 86upx;
+					text-align: center;
+				}
+				.btn.confirm {
+					color: rgba(51, 136, 255, 1);
+				}
+				.line {
+					width: 1px;
+					height: 36upx;
+					background: rgba(238, 238, 238, 1);
+				}
+			}
+			.record-picker-view {
+				margin: 40upx 30upx;
+				box-sizing: border-box;
+				width: 540upx;
+				height: 240upx;
+			}
+		}
+	
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					position: relative;
+					padding: 0 60upx 0 80upx;
+					margin-right: 40upx;
+					background: rgba(246, 246, 246, 1);
+					height: 76upx;
+					border-radius: 38upx;
+					flex: 1;
+	
+					input {
+						width: 100%;
+						height: 100%;
+					}
+	
+					.icon.icon-sousuo {
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 30upx;
+					}
+				}
+	
+				.search-select {
+					width: 100upx;
+					white-space: nowrap;
+					color: #333333;
+	
+					.icon {
+						margin-left: 10upx;
+					}
+				}
+			}
+		}
+	
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+	
+		// 详情内容
+		.record {
+			background-color: #ffffff;
+			.record-search {
+				padding: 30upx;
+			}
+	
+			.record-body {
+				padding: 30upx;
+				background-color: #f6f6f6;
+	
+				.color-red {
+					color: #ff4444;
+				}
+	
+				.record-list-item {
+					padding: 30upx;
+					border-radius: 10upx;
+					background: #ffffff;
+	
+					.record-list-item-header {
+						border-bottom: 1px solid rgb(238, 238, 238);
+						padding-bottom: 28upx;
+	
+						.tag {
+							padding: 6upx 10upx;
+							background: rgba(51, 136, 255, 1);
+							border-radius: 4upx;
+							text-align: center;
+							color: #ffffff;
+						}
+					}
+	
+					.record-list-item-content {
+						padding: 30upx 0;
+						border-bottom: 1px solid rgb(238, 238, 238);
+	
+						.record-img {
+							width: 114upx;
+							height: 114upx;
+							border-radius: 4upx;
+							margin-right: 20upx;
+							flex-shrink: 0;
+						}
+	
+						.goods-name {
+							color: #000000;
+							line-height: 36upx;
+						}
+	
+						.goods-sku {
+							color: #999999;
+						}
+					}
+	
+					.record-list-item-footer {
+						.footer-item {
+							padding-top: 30upx;
+	
+							.footer-item-left {
+								color: #999999;
+							}
+	
+							.footer-item-right {
+								color: #333333;
+							}
+						}
+					}
+				}
+			}
+		}
+	
+</style>
diff --git a/pages/subPages/merchant/merchantReply/merchantReply.vue b/pages/subPages/merchant/merchantReply/merchantReply.vue
new file mode 100644
index 0000000..a264d07
--- /dev/null
+++ b/pages/subPages/merchant/merchantReply/merchantReply.vue
@@ -0,0 +1,415 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<!-- 列表区域 -->
+		<view class="scrollList">
+			<view class="scdpMbPackage">
+				<view class="reply-header dis-flex flex-x-between">
+					<view class="dis-flex flex-y-center">
+						<image class="reply-img" :src="commnetInfo.avatar" />
+						<view class="dis-flex flex-dir-column">
+							<view class="f-28 color-33 reply-header-name">{{commnetInfo.nickname}}</view>
+							<view class="f-24 color-99">{{commnetInfo.createtime}}</view>
+						</view>
+					</view>
+					<view class="reply-score">
+						<view class="stars">
+							<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="commnetInfo.star > 1 || commnetInfo.star == 1" />
+							<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+							<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="commnetInfo.star > 2 || commnetInfo.star == 2" />
+							<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+							<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="commnetInfo.star > 3 || commnetInfo.star == 3" />
+							<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+							<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="commnetInfo.star > 4 || commnetInfo.star == 4" />
+							<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+							<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="commnetInfo.star > 5 || commnetInfo.star == 5" />
+							<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+							<span class="m-left12">{{commnetInfo.star=='1'?'差评':commnetInfo.star>3?'好评':'中评'}}</span>
+						</view>
+					</view>
+				</view>
+				<view class="color-33 f-24 m-btm50 f-Han-Sans-CN color-33">
+					{{commnetInfo.text}}
+				</view>
+				<view class="reply-imgs-box dis-flex flex-x-between"><image class="reply-imgs" v-for="(item, index) in commnetInfo.pic" :src="item" /></view>
+				<view class="reply-main dis-flex">
+					<view class="scdpMbImg"><image :src="commnetInfo.goodsimg" /></view>
+					<view class="scdpMbInfo">
+						<view><span class="twolist-hidden">{{commnetInfo.goodsname}}</span></view>
+						<view class="dis-flex">
+							<view class="new-price">¥ {{commnetInfo.goodsprcie}}</view>
+							<view class="old-price" style="text-decoration:line-through;">¥ {{commnetInfo.goodsoldprice}}</view>
+						</view>
+					</view>
+				</view>
+				<view  style="padding: 30upx;margin-bottom: 20upx;">
+					<view class="f-24" v-for="(item,index) in commnetInfo.replylist" :key="index">
+						<text class="f-w" style="color: #333333;">{{item.nickname}}:</text>
+						<text class="col-3" style="padding-left: 20upx;">{{item.content}}</text>
+						<image :src="imgfixUrls + 'homemakingImg/lajitong.png'" @click="lajitong(item)" style="width: 24upx;height: 24upx;margin-left: 20upx;vertical-align: bottom;padding-bottom: 4upx;" mode=""></image>
+					</view>
+				</view>
+			</view>
+			<view class="scdpMbPackage">
+				<view class="color-33 f-28 font-blod">商家回复</view>
+				<view class="reply-textarea"><textarea placeholder-style="color:#CCCCCC;" placeholder="请输入回复内容" v-model="replytext" /></view>
+			</view>
+			<view class="dis-flex" @click="commentReply"><view class="reply-btns">回复</view></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			type: 1,
+			storeCollectList: [],
+			page: 1,
+			lat: null,
+			lng: null,
+			pagetotal: null,
+			list: {
+				storename: '2',
+				score: '3'
+			},
+			scdpText: '',
+			commentid: null,
+			replytext: '',
+			commnetInfo:{},
+			storeid:null
+		};
+	},
+	onLoad(e) {
+		let _this=this
+		uni.getStorage({
+		    key: 'currentRegion',
+		    success: function (res) {
+		        _this.lat=res.data.location.lat
+		        _this.lng=res.data.location.lng
+		    }
+		});
+		uni.getStorage({
+			key: 'checkStoreid',
+			success: function(res) {
+				_this.storeid = res.data;
+				if(e.id){
+					_this.storeid = e.id;
+				}
+			}
+		});
+		_this.commentid = e.commentid;
+		this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight;
+					_this.scrollHeight = _this.phoneHight - 65 + 'px';
+				}
+			});
+			_this.commnetDetail();
+		},
+		// 请求回复详情
+		commnetDetail() {
+			let _this=this
+			let data={
+				commentid:_this.commentid
+			}
+			App._post_form('&p=store&do=commnetDetail',data,res=>{
+				_this.commnetInfo=res.data
+			})
+		},
+		lajitong(item){
+			let _this = this;
+			// debugger
+			let data = {
+				id: item.id,
+			};
+			App._post_form('&p=housekeep&do=deleteMessage', data, res => {
+				uni.showToast({
+					icon: 'none',
+					title: '删除成功',
+					duration: 2000
+				});
+				this.init();
+			});
+		},
+		// 回复评价
+		commentReply() {
+			let _this = this;
+			// debugger
+			let data = {
+				storeid:_this.storeid,
+				commentid: _this.commentid,
+				replytext: _this.replytext
+			};
+			App._post_form('&p=store&do=commentReply', data, res => {
+				uni.showToast({
+					icon: 'none',
+					title: '回复成功',
+					duration: 2000
+				});
+				uni.navigateBack({
+				    delta: 1
+				});
+			});
+		},
+		// 收藏店铺列表
+		storeCollect() {
+			let _this = this;
+			_this.scdpText = '... ...加载中';
+			let data = {
+				page: _this.page,
+				lat: _this.lat,
+				lng: _this.lng
+			};
+			App._post_form('&p=member&do=storeCollect', data, res => {
+				_this.storeCollectList = [..._this.storeCollectList, ...res.data.list];
+				for (let i = 0; i < _this.storeCollectList.length; i++) {
+					_this.list.push(_this.storeCollectList[i].store);
+				}
+				_this.pagetotal = res.data.pagetotal;
+				_this.scdpText = '';
+			});
+		}
+		// 搜藏店铺加载
+		// scdpLoad(){
+		// 	let _this=this
+		// 	if(_this.page==_this.pagetotal){
+		// 		_this.scdpText="没有更多数据了"
+		// 	}else{
+		// 		_this.page++
+		// 		_this.storeCollect();
+		// 	}
+		//
+		// }
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.tips {
+	height: 80upx;
+	text-align: center;
+
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		
+		
+		color: black;
+	}
+}
+
+page {
+	overflow-x: hidden;
+	background: #f8f8f8;
+	
+	line-height: 30upx;
+}
+
+.color-33 {
+	color: #333333;
+}
+
+.color-99 {
+	color: #999999;
+}
+.font-blod {
+	font-weight: bold;
+}
+
+.f-Han-Sans-CN {
+	
+}
+
+.check {
+	.line {
+		opacity: 1;
+	}
+
+	> span {
+		font-size: 28upx !important;
+		
+		font-weight: 500 !important;
+		color: #3388ff !important;
+	}
+}
+
+.scrollList {
+	width: 690upx;
+	margin: 20upx 30upx 30upx 30upx;
+}
+
+.topFull {
+	width: 750upx;
+	height: 108upx;
+}
+
+.scdpMbPackage {
+	padding: 30upx;
+	margin-bottom: 20upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10px;
+}
+
+.scdpMbImg {
+	width: 128upx;
+	height: 128upx;
+	border-radius: 6upx;
+	overflow: hidden;
+
+	> image {
+		width: 128upx;
+		height: 128upx;
+	}
+}
+
+.reply-main {
+	background: rgba(249, 249, 249, 1);
+	padding: 30upx;
+	position: relative;
+	overflow: hidden;
+}
+
+.reply-imgs-box {
+	margin-bottom: 30upx;
+
+	.reply-imgs {
+		width: 192upx;
+		height: 192upx;
+		border-radius: 10upx;
+	}
+}
+
+.reply-btns {
+	margin-top: 10upx;
+	height: 82upx;
+	border: 1upx solid #3388ff;
+	border-radius: 42upx;
+	text-align: center;
+	line-height: 82upx;
+	font-size: 28upx;
+	
+	width: 100%;
+	background: rgba(51, 136, 255, 1);
+	color: #ffffff;
+}
+.reply-textarea {
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10px;
+	// padding: 28upx 30upx;
+	> textarea {
+		height: 200upx;
+		width: auto;
+		padding: 30upx;
+		background: rgba(249, 249, 249, 1);
+		margin: 20upx 0 0 0;
+		font-size: 24upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.reply-main-text {
+	line-height: 36upx;
+}
+
+.reply-header {
+	margin-bottom: 36upx;
+	.reply-header-name {
+		font-weight: bold;
+		margin-bottom: 10upx;
+	}
+	.reply-img {
+		width: 59upx;
+		height: 59upx;
+		margin-right: 10upx;
+		border-radius: 50%;
+	}
+
+	.reply-score {
+		margin-top: 10upx;
+		display: flex;
+		justify-content: space-between;
+
+		> view:nth-child(1) {
+			vertical-align: middle;
+
+			> image {
+				margin-right: 10upx;
+				vertical-align: middle;
+				width: 25upx;
+				height: 24upx;
+			}
+
+			> span {
+				vertical-align: middle;
+				font-size: 24upx;
+				
+				
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		> view:nth-child(2) {
+			vertical-align: middle;
+
+			> span {
+				font-size: 24upx;
+				
+				
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		> view {
+			display: inline-block;
+		}
+	}
+}
+
+.scdpMbInfo {
+	margin-left: 26upx;
+	width: 0;
+	flex-grow: 1;
+
+	> view:nth-child(1) {
+		//标题
+		> span {
+			font-size: 28upx;
+			
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+			line-height: 36upx;
+			margin-bottom: 30upx;
+		}
+	}
+	.new-price {
+		font-size: 28upx;
+		
+		
+		color: rgba(51, 51, 51, 1);
+		line-height: 30upx;
+	}
+	.old-price {
+		margin-left: 8upx;
+		font-size: 20upx;
+		
+		
+		text-decoration: line-through;
+		color: rgba(153, 153, 153, 1);
+		line-height: 30upx;
+	}
+}
+</style>
diff --git a/pages/subPages/merchant/merchantSuccess/merchantSuccess.vue b/pages/subPages/merchant/merchantSuccess/merchantSuccess.vue
new file mode 100644
index 0000000..49ab191
--- /dev/null
+++ b/pages/subPages/merchant/merchantSuccess/merchantSuccess.vue
@@ -0,0 +1,145 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container" >
+			<view class="merchantSuccess-content p-r" v-if="page==1">
+				<view class="dis-flex flex-y-center flex-dir-column">
+					<image class="img" :src="imgfixUrls + 'centerMerchant/addsuccess.png'" />
+					<view class="f-36 color-33" style="text-align: center;">确认成为{{storename}}的店员?</view>
+					<view class="checkButton" @click="adminSureAPI">确认成为店员</view>
+					<view class="checkNButton" @click="goHome">取消</view>
+				</view>
+			</view>
+			<view class="merchantSuccess-content p-r" v-if="page==2">
+				<view class="dis-flex flex-y-center flex-dir-column">
+					<image class="img" :src="imgfixUrls + 'centerMerchant/addsuccess.png'" />
+					<view class="f-36 color-33">操作成功</view>
+					<view class="f-24 color-99 m-top20">等待管理员进行后续操作</view>
+					<view class="gohomeButton" @click="goHome">进入首页</view>
+				</view>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" />
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				page:1,
+				loadlogo: false,
+				codes:null,
+				storeid:null,
+				storename:null
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars
+		},
+		computed: {
+		},
+		onShow() {
+
+		},
+		mounted() {
+		},
+		onLoad(e){
+			let _this=this
+			_this.codes=e.codes
+			_this.storeid=e.storeid
+			_this.adminSurePage();
+		},
+		methods: {
+			init(){
+				let _this=this
+				_this.adminSurePage();
+			},
+			// 确认成为店员接口
+			adminSureAPI(){
+				let _this=this
+				let data={
+					codes:_this.codes
+				}
+				App._post_form('&p=store&do=adminSureAPI',data,res=>{
+					_this.page=2
+				})
+			},
+			// 店员扫码后页面
+			adminSurePage(){
+				let _this=this
+				let data={
+					codes:_this.codes,
+					storeid:_this.storeid
+				}
+				App._post_form('&p=store&do=adminSurePage',data,res=>{
+					_this.storename=res.data.storename
+				})
+			},
+			goHome(){
+				App.navigationTo({
+					url:'pages/mainPages/index/index'
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #FFFFFF;
+	}
+
+	.container {
+		.color-33 {
+			color: #333333;
+		}
+		.color-99 {
+			color: #999999;
+		}
+		.checkButton{
+			margin: 30upx 0 0 0;
+			text-align: center;
+			width:600upx;
+			height:80upx;
+			background:rgba(51,136,255,1);
+			border-radius:10upx;
+			line-height: 80upx;;
+			color: #FFFFFF;
+		}
+		.checkNButton{
+			margin: 30upx 0 0 0;
+			text-align: center;
+			width:600upx;
+			height:80upx;
+			background:#EEEEEE;
+			border-radius:10upx;
+			line-height: 80upx;;
+			color: black;
+		}
+		// 详情内容
+		.merchantSuccess-content {
+			padding:0 65upx;
+			.img{
+				width:105upx;
+				height:105upx;
+				border-radius:50%;
+				margin: 110upx 0 43upx;
+			}
+			.gohomeButton{
+				width:100%;
+				height:80upx;
+				line-height: 80upx;
+				text-align: center;
+				color: #FFFFFF;
+				margin-top: 74upx;
+				background:rgba(51,136,255,1);
+				border-radius:40upx;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantTips/merchantTips.vue b/pages/subPages/merchant/merchantTips/merchantTips.vue
new file mode 100644
index 0000000..743cb6e
--- /dev/null
+++ b/pages/subPages/merchant/merchantTips/merchantTips.vue
@@ -0,0 +1,332 @@
+<template>
+	<view class="merchantTips">
+		<far-bottom></far-bottom>
+		<!-- 列表区域 -->
+		<scroll-view  class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="scdpLoad">
+			<!-- 收藏店铺循环模板 -->
+			<nonemores v-if="pagetotal==0"></nonemores>
+			<view v-if="pagetotal!=0">
+				<view class="scdpMbPackage" v-for="(item,index) in noticeList" @click="go(item)"> 
+					<view class="notice-order-icon dis-flex flex-x-between flex-y-center">
+							<!-- <view class="f-28 color-33">{{item.head}}</view>
+						</view> --> 
+						<!-- <view class="color-99 f-24">{{item.head}}秒前</view> -->
+					</view>
+					<view class="notice-main dis-flex flex-y-center">
+						<!-- <view class="scdpMbImg"><img :src="item.thumb" /></view> -->
+						<view style="height: 100%;" class="dis-flex">
+						<view class="scdpMbInfo dis-flex flex-dir-column flex-x-between">
+							<view><span class="twolist-hidden">{{item.title}}</span></view>
+							<!-- <view>
+								<view>
+									<view class="dis-flex">
+										<img class="notice-img" :src="item.subthumb"/>
+										<span class="color-99 f-24">{{item.subtitle}}</span>
+									</view>
+								</view>
+							</view> -->
+						</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="tips" v-if="pagetotal!=0">
+				<loadmore :isMore="isMore"></loadmore>
+			</view>
+		</scroll-view>
+		<!-- 列表区域 -->
+
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif	
+	import nonemores from '@/components/template/nonemores.vue'
+	import loadmore from '@/components/template/loadmore.vue'
+
+	export default {
+		components:{
+			nonemores,
+			loadmore
+		},
+		data() {
+			return {
+				isMore:true,
+				scdpText:'',
+				scrollHeight:null,
+				noticeList:[],
+				pagetotal:null,
+				storeid:null,
+				type: 1,
+				storeCollectList: [],
+				page: 1,
+				lat: null,
+				lng: null,
+				pagetotal: null,
+				list: [{
+					storename: '2',
+					score: '1'
+				}, {
+					storename: '2',
+					score: '1'
+				}],
+				scdpText: '',
+			};
+		},
+		onLoad: function() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let _this=this
+				uni.getStorage({
+				    key: 'currentRegion',
+				    success: function (res) {
+				        _this.lat=res.data.location.lat
+				        _this.lng=res.data.location.lng
+				    }
+				});
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						_this.getSysNoticeList(res.data);
+					}
+				});
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight + 'px';
+					}
+				});
+				
+			},
+			// 商家系统通知列表
+			getSysNoticeList(){
+				let _this=this
+				_this.isMore=false
+				let data={
+					page:_this.page
+				}
+				App._post_form('&p=store&do=agentNoticeList',data,res=>{
+					_this.noticeList=[..._this.noticeList,...res.data.list]
+					_this.pagetotal=res.data.pagetotal
+					_this.isMore=true
+				})
+			},
+			go(item){
+				let _this=this
+				if(item.link==''){
+					App.navigationTo({
+						url:'pages/mainPages/noticeDetail/noticeDetail?id='+item.id
+					})
+				}else{
+						App.navigationTo({
+							url:item.link
+						})
+				}
+				
+			},
+			scdpLoad(){
+				let _this=this
+				if(_this.page==_this.pagetotal){
+					_this.isMore=true
+				}else{
+					_this.page++
+					_this.getSysNoticeList();
+				}
+			},
+			// 搜藏店铺加载
+			// scdpLoad(){
+			// 	let _this=this
+			// 	if(_this.page==_this.pagetotal){
+			// 		_this.scdpText="没有更多数据了"
+			// 	}else{
+			// 		_this.page++
+			// 		_this.storeCollect();
+			// 	}
+			// 	
+			// }
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.tips {
+		height: 80upx;
+		text-align: center;
+		> span {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+	.merchantTips{
+		background: #f8f8f8;
+	}
+	page {
+		font-size: 0;
+		overflow-x: hidden;
+		background: #f8f8f8;
+		
+	}
+
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-99 {
+		color: #999999;
+	}
+
+	.scrollList {
+		width: 690upx;
+		padding: 0 30upx 0 30upx;
+	}
+
+	.topFull {
+		width: 750upx;
+		height: 108upx;
+	}
+
+	.scdpMbPackage {
+		padding: 22upx 30upx 30upx 30upx;
+		margin-bottom: 10px;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.scdpMbImg {
+		width: 170upx;
+		height: 170upx;
+		border-radius: 10upx;
+		overflow: hidden;
+		flex-shrink: 0;
+
+		>image {
+			width: 170upx;
+			height: 170upx;
+		}
+	}
+
+	.notice-order-icon {
+		image {
+			width: 40upx;
+			height: 40upx;
+			margin-right: 18upx;
+		}
+	}
+
+	.notice-main {
+		background:rgba(248,248,248,1);
+		border-radius:6px;
+		padding-right: 36upx;
+	}
+
+	.notice-img {
+		width: 31upx;
+		height: 31upx;
+		margin-right: 9upx;
+		border-radius: 50%;
+	}
+
+	.scdpMbInfo {
+		margin-left: 30upx;
+		padding: 18upx 0;
+
+		>view:nth-child(1) {
+			//标题
+			>span {
+				font-size: 26upx;
+				line-height: 38upx;
+				color: #333333;
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 16upx;
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				vertical-align: middle;
+
+				>image {
+					margin-right: 10upx;
+					vertical-align: middle;
+					width: 25upx;
+					height: 24upx;
+				}
+
+				>span {
+					vertical-align: middle;
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view:nth-child(2) {
+				vertical-align: middle;
+
+				>span {
+					font-size: 24upx;
+					
+					
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>view {
+				display: inline-block;
+			}
+		}
+
+		>view:nth-child(3) {
+			display: flex;
+			justify-content: space-between;
+
+			>view:nth-child(1) {
+				margin-top: 16upx;
+
+				//用户名
+				>view:nth-child(1) {
+					>span {
+						font-size: 22upx;
+						color: #333333;
+						line-height: 31upx;
+					}
+				}
+
+				>view:nth-child(2) {
+					margin-top: 5upx;
+
+					>span {
+						font-size: 24upx;
+						
+						
+						color: rgba(153, 153, 153, 1);
+					}
+				}
+			}
+
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/merchantUerCenter/merchantUerCenter.vue b/pages/subPages/merchant/merchantUerCenter/merchantUerCenter.vue
new file mode 100644
index 0000000..041006f
--- /dev/null
+++ b/pages/subPages/merchant/merchantUerCenter/merchantUerCenter.vue
@@ -0,0 +1,656 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<!-- 个人中心 -->
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container">
+			<view class="pages-header p-r" :style="{ 'background-image': ' url(' + imageRoot + 'merchantBg1.png)' }"></view>
+			<view class="merchantuserCenter p-r p-left-right-30">
+				<view class="usercenter-start dis-flex flex-x-between flex-y-center">
+					<view class="dis-flex">
+						<image class="usercenter-img" style="margin-top: 4%;" :src="userInfo.storelogo" />
+						<view class="dis-flex flex-dir-column f-24">
+							<view class="f-30 m-btm10 font-blod">{{ userInfo.storename }} </view>
+							<view class="f-30 m-btm10 font-blod">
+								<text style="color: #ffffff;">SID:{{storeid}}</text>
+							</view>
+							<view class="dis-flex">
+								<view>{{ userInfo.endtime }}到期</view>
+								<view class="dis-flex usercenter-xf flex-y-center">
+									<view @click="go('pages/mainPages/Settled/Settled?page=2')">续费</view>
+									<view class="i icon iconfont icon-jinrujiantou"></view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view>
+						<view class="f-24 dis-flex flex-y-center" @click="goSet">
+							<view>编辑店铺</view>
+							<view class="i icon iconfont icon-jinrujiantou usercenter-edit-icon"></view>
+						</view>
+					<!-- 	<view class="f-24 dis-flex flex-y-center" @click="gorest">
+							<view class="closeTheTtore">{{userInfo.temclose == 1?'开始营业':'打烊休息'}}</view>
+						</view> -->
+					</view>
+					
+					
+				</view>
+				<view class="userCenter-rest">
+					<text class="iconfont icon-time" style="font-size: 28upx;"></text>
+					<text style="padding: 0 15upx;" >{{'营业状态'}}</text>
+					<view class="businessing" v-if="userInfo.temclose != 1">
+						营业中
+					</view>
+					<view class="nobusinessing" v-else>
+						休息中
+					</view>
+					<view class="isrest" @click="gorest" v-if="userInfo.temclose != 1">
+						休息
+					</view>
+					<view class="isrest" @click="gorest" v-else>
+						营业
+					</view>
+				</view>
+				<view class="userCenter-header bor-radius-10upx b-f">
+					
+					<view class="dis-flex flex-y-center">
+						<view class="dis-flex flex-dir-column" style="width: 50%;">
+							<view class="f-24 color-99 m-top4">店铺余额（元）</view>
+							<view class="f-50 font-blod price">{{ userInfo.nowmoney }}</view>
+						</view>
+						<view class="userCenter-header-income">
+							<view class="f-24 userCenter-header-btn dis-flex flex-x-center">
+								<view class="text" @click="goCash">提现</view>
+								<view class="i icon iconfont icon-jinrujiantou"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="tool-tab m-top20">
+					<view class="tool-list dis-flex flex-dir-column">
+						<view class="tool-item flex-box t-c dis-flex" v-for="(tool_item, index) in tab_list" :key="index" @click="navgateTo($event, tool_item.item_navType)">
+							<image class="tool-item-icon" :src="imgfixUrls + tool_item.item_icon" mode=""></image>
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right">
+								<view class="f-28 color-33">{{ tool_item.item_name }}</view>
+								<view class="dis-flex flex-y-center flex-x-end">
+									<!-- <view class="badge">99+</view> -->
+									<view class="i icon iconfont icon-jinrujiantouxiao1"></view>
+								</view>
+							</view>
+						</view>
+						<view class="tool-item flex-box t-c dis-flex" @click="go('pages/subPages/attestationCenter/index?rzType=2')" v-if="userInfo.switch == 1">
+							<image class="tool-item-icon" :src="imgfixUrls + 'merchant/qyrk.png'" mode=""></image>
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right">
+								<view class="f-28 color-33">企业认证</view>
+								<view class="dis-flex flex-y-center flex-x-end">
+									<view class="rztext">
+										{{
+											userInfo.attestation.attestation == 0
+												? '未认证'
+												: userInfo.attestation.attestation == 1
+												? '待审核'
+												: userInfo.attestation.attestation == 2
+												? '已审核'
+												: '被驳回'
+										}}
+									</view>
+									<view class="i icon iconfont icon-jinrujiantouxiao1"></view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="tool-tab m-top20">
+					<view class="tool-list dis-flex flex-dir-column">
+						<!-- <view class="tool-item flex-box t-c dis-flex" v-if="userInfo.oofflag" @click="navgateTo($event, 'yellow')">
+							<image class="tool-item-icon" :src="imgfixUrls + 'centerMerchant/shopmain.png'" alt="" />
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right">
+								<view class="f-28 color-33">{{userInfo.oofflag == 1?'入驻黄页':userInfo.oofflag == 2?'查看黄页':'前往黄页'}}</view>
+								<view class="dis-flex flex-y-center flex-x-end"><view class="i icon iconfont icon-jinrujiantouxiao1"></view></view>
+							</view>
+						</view> -->
+						<view class="tool-item flex-box t-c dis-flex" style="padding-left: 8upx;"  @click="navgateTo($event, 'store')">
+							<image class="tool-item-icon" style="width: 40upx;height: 40upx;margin-right: 30upx;margin-top: 10upx;" :src=" imgfixUrls + 'yhxy.png'" alt="" />
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right" >
+								<view class="f-28 color-33">查看协议</view>
+								<view class="dis-flex flex-y-center flex-x-end"><view class="i icon iconfont icon-jinrujiantouxiao1"></view></view>
+							</view>
+						</view>
+						<view class="tool-item flex-box t-c dis-flex"  @click="navgateTo($event,tool_item.item_navType)">
+							<image class="tool-item-icon" :src="imgfixUrls + 'centerMerchant/back.png'" alt="" />
+							<view class="dis-flex flex-x-between flex-y-center tool-item-right" @click="go('pages/mainPages/index/index')">
+								<view class="f-28 color-33">返回首页</view>
+								<view class="dis-flex flex-y-center flex-x-end"><view class="i icon iconfont icon-jinrujiantouxiao1"></view></view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<navBar :tabBarAct="4" />
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import navBar from '@/components/template/navBar.vue';
+
+export default {
+	data() {
+		return {
+			userInfo: {},
+			storeid: null,
+			monidata: 'ikik',
+			detalsData: null,
+			loadlogo: false,
+			shopShow: false,
+			tab_list: [
+				{
+					item_type: 'manager',
+					item_name: '店员管理',
+					item_icon: 'centerMerchant/manager.png',
+					item_navType: 'manager'
+				},
+				{
+					item_type: 'myuser',
+					item_name: '我的客户',
+					item_icon: 'centerMerchant/myuser.png',
+					item_navType: 'myuser'
+				},
+				{
+					item_type: 'invite',
+					item_name: '我的招聘',
+					item_icon: 'centerMerchant/wdzp.png',
+					item_navType: 'invite'
+				},
+				{
+					item_type: 'reserve',
+					item_name: '预约列表',
+					item_icon: 'centerMerchant/yuyue.png',
+					item_navType: 'reserve'
+				},
+				{
+					item_type: 'shopmain',
+					item_name: '店铺主页',
+					item_icon: 'centerMerchant/shopmain.png',
+					item_navType: 'shopmain'
+				},
+				{
+					item_type: 'changeshop',
+					item_name: '切换店铺',
+					item_icon: 'centerMerchant/changeshop.png',
+					item_navType: 'changeshop'
+				},
+				{
+					item_type: 'housekeepList',
+					item_name: '家政服务',
+					item_icon: 'centerMerchant/msguser.png',
+					item_navType: 'housekeepList'
+				}
+			]
+		};
+	},
+	components: {
+		Loadlogo,
+		navBar
+	},
+	onShow() {
+		let _this = this;
+		uni.getStorage({
+			key: 'checkStoreid',
+			success: function(res) {
+				_this.storeid = res.data;
+				_this.init(res.data);
+			}
+		});
+	},
+	computed: {},
+	mounted() {},
+	onLoad(e) {
+		let _this = this;
+		uni.getStorage({
+			key: 'checkStoreid',
+			success: function(res) {
+				_this.storeid = res.data;
+				_this.init(res.data);
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+
+			_this.getStoreMember(mid);
+		},
+		goCash() {
+			App.navigationTo({
+				url: 'pages/subPages/merchant/merchantCash/merchantCash'
+			});
+		},
+		go(url) {
+			App.navigationTo({
+				url: url
+			});
+		},
+		gorest(){
+			let _this = this;
+			let data = {
+				sid: _this.storeid
+			};
+			App._post_form('&p=store&do=temCloseApi', data, res => {
+					// 
+						
+					if(res.message == '营业成功'){
+						_this.userInfo.temclose = 0;
+					}else{
+						_this.userInfo.temclose = 1;
+					}
+					uni.showToast({
+						title:res.message
+					});
+			});
+		},
+		goSet() {
+			App.navigationTo({
+				url: 'pages/subPages/merchant/set/set'
+			});
+		},
+		getStoreMember(mid) {
+			let _this = this;
+			let data = {
+				storeid: mid
+			};
+			App._post_form('&p=store&do=storeMember', data, res => {
+				_this.userInfo = res.data;
+				_this.tab_list.map((item,index)=>{
+					if(item.item_navType == 'invite' && _this.userInfo.recruit_switch == 0){
+						_this.tab_list.splice(index,1);
+					}
+					if(item.item_navType == 'housekeepList' && _this.userInfo.housekeepstatus != 1){
+						_this.tab_list.splice(index,1);
+					}
+				})
+			});
+		},
+		// 跳转商家
+		goStore() {
+			App.navigationTo({
+				url: 'pages/subPages/dealer/myStore/myStore'
+			});
+		},
+		navgateTo(e, navType) {
+			let _this = this;
+			switch (navType) {
+				case 'changeshop':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
+					});
+					break;
+				case 'withdraw':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/withdraw/withdraw'
+					});
+					break;
+				case 'setshop':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/setshop/setshop'
+					});
+					break;
+				case 'order':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+					});
+					break;
+				case 'manager':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantClerkList/merchantClerkList'
+					});
+					break;
+				case 'level':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/level/level'
+					});
+					break;
+				case 'client':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/client/client'
+					});
+					break;
+				case 'help':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/richtext/setrich'
+					});
+					break;
+				case 'myuser':
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantChat/merchantChat'
+					});
+					break;
+				case 'gener':
+					App.navigationTo({
+						url: 'pages/subPages/dealer/gener/gener'
+					});
+					break;
+				case 'shopmain':
+					App.navigationTo({
+						url: 'pages/mainPages/store/index?sid=' + _this.storeid
+					});
+					break;
+				case 'yellow':
+					if(_this.userInfo.oofflag == 2){
+						App.navigationTo({
+							url: 'pages/subPages2/phoneBook/logistics/logistics?sid=' + _this.storeid
+						});
+					}else{
+						App.navigationTo({
+							url: 'pages/subPages2/phoneBook/enterForm/enterForm?sid=' + _this.storeid
+						});
+					}
+					
+					break;
+
+				case 'poster':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+				case 'shops':
+					// #ifdef H5
+					location.href = e.currentTarget.dataset.url;
+					// #endif
+					break;
+				case 'store':
+					App.navigationTo({
						url: 'pages/mainPages/agreement/agreement?agremType=store'
					});
+					break;
+				case 'invite':
+					App.navigationTo({
+						url: 'pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter?sid=' + _this.storeid
+					});
+					break;
+				case 'reserve':
+					App.navigationTo({
+						url: 'pages/subPages2/booked/reservationList/reservationList?sid=' + _this.storeid
+					});
+					break;
+				case 'housekeepList':
+					App.navigationTo({
+						url: `pages/subPages2/homemaking/myServiceList/myServiceList?type=1&sid=${_this.storeid}`
+					});
+					break;
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.rztext {
+	font-size: 24upx;
+	color: rgba(153, 153, 153, 1);
+}
+.qiun-charts {
+	width: 750upx;
+	height: 500upx;
+	background-color: #ffffff;
+}
+
+.closeTheTtore{
+	width: 120upx;
+	height: 50upx;
+	line-height: 50upx;
+	border-radius: 60upx;
+	text-align: center;
+	color: #FFFFFF;
+	background-color: #FF4444;
+	margin-top: 20upx;
+}
+
+.charts {
+	width: 750upx;
+	height: 500upx;
+	background-color: #ffffff;
+}
+page {
+	background-color: #f6f6f6;
+	font-size: 0;
+}
+
+.container {
+	.usercenter-start {
+		color: #ffffff;
+		background-color: transparent;
+		margin-bottom: 40upx;
+
+		.usercenter-img {
+			width: 90upx;
+			height: 90upx;
+			border-radius: 50%;
+			margin-right: 20upx;
+		}
+
+		.iconfont.icon-right {
+			margin-left: 14upx;
+		}
+
+		.usercenter-edit-icon {
+			font-size: 24upx;
+		}
+
+		.usercenter-xf {
+			color: rgba(254, 198, 33, 1);
+			margin-left: 21upx;
+
+			.icon {
+				margin-left: 4upx;
+				font-size: 24upx;
+			}
+		}
+	}
+
+	.color-33 {
+		color: #333333;
+	}
+
+	.color-99 {
+		color: #999999;
+	}
+
+	.color-f4 {
+		color: #ff4444;
+	}
+
+	.color-cc {
+		color: #cccccc;
+	}
+
+	.font-blod {
+		font-weight: bold;
+	}
+
+	.select-box {
+		color: #999999;
+
+		.iconfont {
+			font-size: 24upx;
+			margin-left: 6upx;
+		}
+	}
+
+	// 头部内容
+	.pages-header {
+		width: 100%;
+		height: 319upx;
+		background-repeat: no-repeat;
+		background-size: 100% 319upx;
+
+		//个人-邀请人信息
+		.person-content {
+			padding: 94upx 40upx 0;
+
+			.user-avatar {
+				width: 100upx;
+				height: 100upx;
+				border-radius: 50%;
+				background-repeat: no-repeat;
+				background-size: 100upx 100upx;
+			}
+			.user-referrer-name {
+				.level-label {
+					background-color: #e7d4aa;
+					border-radius: 18upx;
+					padding: 0 16upx;
+				}
+
+				.referrer-name {
+					color: #6b6e88;
+				}
+			}
+		}
+	}
+
+	// 详情内容
+	.merchantuserCenter {
+		margin-top: -258upx;
+		padding-bottom: 120upx;
+		
+		.userCenter-rest{
+			display: flex;
+			width: 570upx;
+			height: 80upx;
+			background-color: rgba(105,168,255,1);
+			// color: #69A8FF;
+			color: #FFFFFF;
+			line-height: 80upx;
+			padding: 0 30upx;
+			font-size: 28upx;
+			border-radius: 10upx 10upx 0upx 0upx;
+			margin: auto;
+			.businessing{
+				// width: 70upx;
+				padding: 0 10upx;
+				height: 30upx;
+				font-size: 20upx;
+				background-color: #80be0c;
+				border-radius: 6upx;
+				line-height: 30upx;
+				text-align: center;
+				margin-top: 26upx;
+				// display: inline-block;
+			}
+			.nobusinessing{
+				// width: 70upx;
+				padding: 0 10upx;
+				height: 30upx;
+				font-size: 20upx;
+				background-color: #FEC621;
+				border-radius: 6upx;
+				line-height: 30upx;
+				text-align: center;
+				margin-top: 26upx;
+				// display: inline-block;
+			}
+			.isrest{
+				// padding: 8upx 15upx;
+				border:  1upx solid #FFFFFF;
+				height: 40upx;
+				width: 90upx;
+				border-radius: 60upx;
+				text-align: center;
+				line-height: 40upx;
+				margin-left: auto;
+				margin-top: 20upx;
+			}
+		}
+		
+		// 导航
+		.userCenter-header {
+			padding: 42upx 40upx 40upx 40upx;
+			position: relative;
+
+			.price {
+				margin-top: 26upx;
+				color: #003333;
+			}
+			
+			
+			
+			.userCenter-header-btn {
+				position: absolute;
+				right: 40upx;
+				bottom: 30upx;
+				width: 122upx;
+				height: 58upx;
+				color: #ffffff;
+				background: #3388ff;
+				border-radius: 30upx;
+				text-align: center;
+				line-height: 58upx;
+
+				.text {
+					margin-left: 10upx;
+				}
+
+				.icon {
+					font-size: 24upx;
+				}
+			}
+
+			.userCenter-header-income {
+				flex-shrink: 0;
+				width: 50%;
+			}
+		}
+
+		// 工具导航
+		.tool-tab {
+			padding: 0 30upx;
+			opacity: 0.97;
+			border-radius: 10px;
+			background: #ffffff;
+
+			.tool-item-right {
+				width: 100%;
+				padding: 30upx 0;
+				border-bottom: 1px solid #eeeeee;
+			}
+
+			.icon-jinrujiantouxiao1 {
+				color: #999999;
+				font-size: 24upx;
+			}
+			.tool-tab-title {
+				padding: 0 30upx;
+			}
+
+			.tool-item {
+				width: 100%;
+				flex-wrap: nowrap;
+				.badge {
+					width: 60upx;
+					height: 36upx;
+					line-height: 36upx;
+					background: rgba(255, 68, 68, 1);
+					opacity: 0.93;
+					border-radius: 18upx;
+					text-align: center;
+					font-size: 24upx;
+					color: rgba(255, 255, 255, 1);
+					margin-right: 16upx;
+				}
+
+				.tool-item-icon {
+					margin-right: 20upx;
+					padding: 20upx 0;
+					width: 54upx;
+					height: 54upx;
+					flex-shrink: 0;
+				}
+			}
+
+			.tool-item:last-child .tool-item-right {
+				border-bottom: none;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/merchant/merchantVerification/merchantVerification.vue b/pages/subPages/merchant/merchantVerification/merchantVerification.vue
new file mode 100644
index 0000000..353ddea
--- /dev/null
+++ b/pages/subPages/merchant/merchantVerification/merchantVerification.vue
@@ -0,0 +1,446 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<!-- <loadlogo v-if="!loadlogo" /> -->
+		<view class="container" :style="{height:phoneHight}">
+			<!-- <view class="verification"> -->
+				<!-- <view class="verification-main-package">
+					<view class="verification-main p-r p-left-right-30">
+						<view class="verification-header">
+							<view class="dis-flex f-24 flex-x-center flex-y-center">
+								<! <view class="i icon iconfont icon-info"></view>您输入的核销码无效，重新输入！ -->
+							<!-- </view>
+							<view class="verification-input dis-flex flex-x-center flex-y-center">
+								<view class="verification-input-number dis-flex">
+									<view class="verification-input-number-item">{{taiyang[0]}}</view>
+									<view class="verification-input-number-item">{{taiyang[1]}}</view>
+									<view class="verification-input-number-item">{{taiyang[2]}}</view>
+								</view>
+								<image class="verification-input-delete" @click="deleNum" :src="imgfixUrls + 'centerMerchant/delete.png'" />
+							</view>
+							<view class="verification-btn f-28 dis-flex flex-x-center flex-y-center">
+								<view class="verification-btn-item dis-flex flex-x-center flex-y-center" @click="getQrcodeInfo">
+									<view class="i icon iconfont icon-scan"></view>
+									<view >扫码验证</view>
+								</view>	
+								<view class="verification-btn-line"></view>
+								<view class="verification-btn-item dis-flex flex-x-center flex-y-center" @click="goRecord">
+									<view class="i icon iconfont icon-time"></view>
+									<view>验证记录</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view> --> 
+				<!-- <view class="verification-body dis-flex">
+					<view v-for="(item,index) in 9" :key="index" class="verification-num-item dis-flex flex-x-center flex-y-center"
+					 @click="clickNum(index+1)">{{index+1}}</view>
+					<view class="verification-num-item dis-flex flex-x-center flex-y-center" @click="clickNum(0)">0</view>
+					<view class="verification-num-yz dis-flex flex-x-center flex-y-center" @click="checkcodeCash">验证</view>
+				</view> -->
+			<!-- </view> -->
+			<view class="verification">
+				<view class="bgbox">
+					<image :src="imgfixUrls + 'verificationBg.png'" mode=""></image>
+				</view>
+				<view class="record" @click="goRecord">
+					核销记录
+				</view>
+				<view class="verificationBtnbox">
+					<view class="inputbox">
+						<input type="text" v-model="verifcode" class="input" placeholder="请输入核销码" value="" />
+						<view class="verificaBtn" @click="checkcodeCash">
+							核销
+						</view>
+					</view>
+					<view class="sanCode" @click="getQrcodeInfo">
+						<view class="iconfont icon-scan icons">
+							
+						</view>
+						<view class="t-c f-28 col-f">
+							扫码验证
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js'
+	import Loadlogo from '@/components/template/loadlogo'
+	import TabBars from '@/components/template/tabBar.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				shopShow: false,
+				taiyang: ['', '', ''],
+				phoneHight: null,
+				verifcode:''
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars
+		},
+		computed: {},
+		onShow() {},
+		onLoad(e) {
+			let _this = this
+			_this.init()
+		},
+		mounted() {},
+		methods: {
+			init() {
+				let _this = this
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+					}
+				});
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+			},
+			getQrcodeInfo() {
+				// #ifdef H5
+				wxApi.scanQRCode(res => {
+					console.info(res)
+				})
+				// #endif
+				// #ifndef H5
+				uni.scanCode({
+					scanType: 'qrCode',
+					success: function(res) {
+					console.log(res);
+						App.navigationTo({
+							url:res.path
+						})
+					}
+				});
+				// #endif
+			},
+			// 跳转商家
+			goRecord() {
+				App.navigationTo({
+					url: 'pages/subPages/merchant/merchantRecord/merchantRecord'
+				})
+			},
+			// 输码核销接口
+			checkcodeCash() {
+				let _this = this
+				// _this.verifcode = _this.taiyang[0] + _this.taiyang[1] + _this.taiyang[2]
+				let data = {
+					storeid: _this.storeid,
+					verifcode: _this.verifcode
+				}
+				if (_this.verifcode.length < 8) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确格式的核销码',
+						duration: 2000
+					});
+					return;
+				}
+				App._post_form('&p=store&do=checkcodeCash', data, res => {
+					uni.showToast({
+						icon: 'none',
+						title: '核销成功',
+						duration: 2000
+					});
+					return;
+				})
+			},
+			clickNum(num) {
+				if (this.taiyang[0]['length'] < 3) {
+					this.taiyang.splice(0, 1, `${this.taiyang[0]}${num}`)
+				} else if (this.taiyang[1]['length'] < 3) {
+					this.taiyang.splice(1, 1, `${this.taiyang[1]}${num}`)
+				} else if (this.taiyang[2]['length'] < 2) {
+					this.taiyang.splice(2, 1, `${this.taiyang[2]}${num}`)
+				}
+			},
+			deleNum() {
+				if (this.taiyang[2]['length'] > 0) {
+					this.taiyang.splice(2, 1, this.taiyang[2]['slice'](0, -1))
+				} else if (this.taiyang[1]['length'] > 0) {
+					this.taiyang.splice(1, 1, this.taiyang[1]['slice'](0, -1))
+				} else if (this.taiyang[0]['length'] > 0) {
+					this.taiyang.splice(0, 1, this.taiyang[0]['slice'](0, -1))
+				}
+			},
+			navgateTo(e, navType) {
+				let _this = this;
+				switch (navType) {
+					case 'contactway':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/contactway/contactway'
+						});
+						break;
+					case 'withdraw':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/withdraw/withdraw'
+						});
+						break;
+					case 'setshop':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/setshop/setshop'
+						});
+						break;
+					case 'order':
+						App.navigationTo({
+							url: 'pages/subPages/merchant/merchantUserCenter/merchantUserCenter'
+						});
+						break;
+					case 'rank':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/rank/rank'
+						});
+						break;
+					case 'level':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/level/level'
+						});
+						break;
+					case 'client':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/client/client'
+						});
+						break;
+					case 'help':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/richtext/setrich'
+						});
+						break;
+					case 'gener':
+						App.navigationTo({
+							url: 'pages/subPages/dealer/gener/gener'
+						});
+						break;
+					case 'poster':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+					case 'shops':
+						// #ifdef H5
+						location.href = e.currentTarget.dataset.url;
+						// #endif
+						break;
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F7F7F7;
+	}
+
+	.container {
+		
+		.verification {
+			height: 100%;
+			overflow: hidden;
+			.bgbox{
+				width: 65%;
+				height: 45%;
+				margin: auto;
+				margin-top: 72upx;
+				image{
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.record{
+				width: 160upx;
+				height: 70upx;
+				border-radius: 39upx 0upx 0upx 39upx;
+				background-color: #398CFF;
+				color: #ffffff;
+				font-size: 28upx;
+				line-height: 70upx;
+				text-align: center;
+				position: absolute;
+				right: 0;
+				top: 30upx;
+			}
+			.verificationBtnbox{
+				padding: 30upx;
+				background-color: #ffffff;
+				border-radius: 50upx 50upx 0 0;
+				height: 100%;
+			}
+			.inputbox{
+				width: 100%;
+				background-color: #f8f8f8;
+				border-radius: 20upx;
+				height: 100upx;
+				position: relative;
+				.input{
+					text-align: center;
+					height: 100upx;
+					line-height: 100upx;
+					font-weight: 600;
+					width: 80%;
+				}
+				.verificaBtn{
+					width: 110upx;
+					height: 70upx;
+					border-radius: 10upx;
+					background-color: #398CFF;
+					color: #ffffff;
+					text-align: center;
+					line-height: 70upx;
+					font-size: 28upx;
+					position: absolute;
+					top: 15upx;
+					right: 30upx;
+				}
+			}
+			.sanCode{
+				width: 224upx;
+				height: 224upx;
+				border-radius: 50%;
+				background-color: #398CFF;
+				margin: 100upx auto;
+				.icons{
+					font-size: 80upx;
+					color: #ffffff;
+					text-align: center;
+					// margin-top: 30upx;
+					height: 130upx;
+					line-height: 130upx;
+				}
+			}
+		}
+
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+
+		// 内容
+		.verification-main-package {
+			height: 35%;
+			width: 100%;
+			overflow: hidden;
+			background: linear-gradient(-55deg, rgba(51, 136, 255, 1) 0%, rgba(80, 153, 255, 1) 100%);
+
+			.verification-main {
+
+				color: #ffffff;
+
+				.verification-header {
+					.icon-info {
+						margin-right: 10upx;
+					}
+
+					//输入框
+					.verification-input {
+						width: 647upx;
+						position: relative;
+						margin-top: 150upx;
+						margin: 70upx auto 0 auto;
+						height: 135upx;
+						background: rgba(255, 255, 255, 1);
+						border-radius: 10upx;
+
+						.verification-input-number {
+							font-size: 60upx;
+							color: #3388FF;
+							line-height: 40upx;
+
+							.verification-input-number-item {
+								margin-right: 14upx;
+							}
+
+							.verification-input-number-item:last-child {
+								margin-right: 0;
+							}
+						}
+
+						.verification-input-delete {
+							color: #3388FF;
+							height: 50rpx;
+							width: 50rpx;
+							position: absolute;
+							top: 50%;
+							transform: translateY(-50%);
+							right: 30upx;
+						}
+					}
+
+					//扫码验证按钮
+					.verification-btn {
+						padding-top: 100upx;
+
+						.verification-btn-item {
+							width: 50%;
+
+							.icon {
+								margin-right: 20upx;
+							}
+						}
+
+						.verification-btn-line {
+							height: 30upx;
+							width: 1upx;
+							background: rgba(238, 238, 238, 1);
+						}
+					}
+				}
+			}
+		}
+
+		//数字按钮
+		.verification-body {
+			width: 100%;
+			flex-wrap: wrap;
+			height: 65%;
+
+			.verification-num-item {
+				width: 33.33%;
+				height: 25%;
+				font-size: 50upx;
+				box-sizing: border-box;
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+				background-color: #ffffff;
+				border: 1upx solid rgba(238, 238, 238, 1);
+			}
+
+			.verification-num-yz {
+				width: 66.66%;
+				font-size: 32upx;
+				box-sizing: border-box;
+				font-weight: bold;
+				color: #FFFFFF;
+				background: linear-gradient(90deg, rgba(51, 136, 255, 1) 0%, rgba(80, 153, 255, 1) 100%);
+				height: 25%;
+				// border: 1upx solid rgba(238, 238, 238, 1);
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/sendDynamic/sendDynamic.vue b/pages/subPages/merchant/sendDynamic/sendDynamic.vue
new file mode 100644
index 0000000..cf7afec
--- /dev/null
+++ b/pages/subPages/merchant/sendDynamic/sendDynamic.vue
@@ -0,0 +1,295 @@
+<template>
+	<view>
+		<loadlogo v-if="!isWxaudit" />
+		<far-bottom></far-bottom>
+		<view class="sendDynamic">
+			<view class="sendDynamicPackage">
+				<view class="sendInput">
+					<view class="sendInputPackage">
+						<view class="sendInputTitle"><span>动态内容</span></view>
+						<view>
+							<textarea class="inputView" placeholder="内容描述，请尽量避免使用特殊符号，字体表情，颜文字等特殊文本，防止无法储存造成内容空白。" v-model="content"></textarea>
+						</view>
+					</view>
+				</view>
+				<view class="tips">
+					<span>
+						有图有真相
+						<span>(最多上传6张图片)</span>
+					</span>
+				</view>
+
+				<view class="imgView">
+					<!-- 图片预览循环模板 -->
+					<view class="imgPreview" v-for="(item, index) in picArr" :key="index">
+						<image :src="item" />
+						<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="close(item,index)" />
+					</view>
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdata" @click="uploadFiles(picArr.length)" v-if="picArr.length<6">
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+					</view>
+				</view>
+			</view>
+			<view class="subnitBitton" @click="addDynamic"><span>确认发布</span></view>
+		</view>
+	</view>
+</template>
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo';
+	// import TabBars from '@/components/template/tabBar.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				storeid: null,
+				content: '',
+				pic: [],
+				picArr: [],
+			};
+		},
+		components: {
+			Loadlogo
+			// TabBars
+		},
+		computed: {
+			isWxaudit() {
+				return this.$store.state.isWxAudit
+			}
+		},
+		onLoad() {
+			let _this = this;
+			_this.init();
+		},
+		onShow(e) {},
+		mounted() {},
+		methods: {
+			close(item,index){
+				this.picArr.map((items,indexs)=>{
+					if(items == item){
+						this.picArr.splice(indexs,1)
+					}
+				})
+			},
+			init() {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight;
+						_this.scrollHeight = _this.phoneHight - 125 + 'px';
+					}
+				});
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeid = res.data;
+						App._post_form('&p=store&do=addDynamicPage', {
+							storeid: res.data
+						}, res => {
+							if (res.data.status === 1) {
+								uni.navigateBack({
+									delta: 1
+								})
+							}
+						});
+					}
+				});
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+			},
+
+			// 商家发布动态
+			addDynamic() {
+				let _this = this;
+				let data = {
+					storeid: _this.storeid,
+					content: _this.content,
+					pic: _this.pic
+				};
+				data.content = _this.content.replace(/\n/g,"\<br\/\>").replace(/\r/g,"\<br\/\>")
+				App._post_form('&p=store&do=addDynamic', data, res => {
+					uni.navigateBack({
+						delta: 1
+					});
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(num) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(6);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i])
+				    	_this.pic.push(aa.data.image);
+				    	_this.picArr.push(aa.data.img);
+				    }
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										_this.picArr.push(res.data.img);
+										_this.pic.push(res.data.image);
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 6-num,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i])
+							_this.pic.push(aa.data.image);
+							_this.picArr.push(aa.data.img);
+						}
+					}
+				})
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.subnitBitton {
+		bottom: 0;
+		position: fixed;
+		text-align: center;
+		width: 750upx;
+		height: 98upx;
+		background: rgba(51, 136, 255, 1);
+
+		>span {
+			line-height: 98upx;
+			font-size: 28upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.userImgUpdata {
+		width: 157upx;
+		height: 157upx;
+		background: rgba(246, 246, 246, 1);
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 10upx;
+		text-align: center;
+
+		>image {
+			margin-top: 53upx;
+			width: 53upx;
+			height: 53upx;
+		}
+	}
+
+	.imgPreview {
+		display: inline-block;
+		overflow: hidden;
+		width: 157upx;
+		height: 157upx;
+		background: gray;
+		margin-right: 37upx;
+		margin-bottom: 10upx;
+		border-radius: 10upx;
+
+		>image {
+			width: 157upx;
+			height: 157upx;
+		}
+	}
+
+	.close {
+		width: 32upx !important;
+		height: 32upx !important;
+		position: relative;
+		bottom: 150upx;
+		left: 120upx;
+		z-index: 30;
+	}
+
+	.tips {
+		margin-top: 30upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+
+			>span {
+				color: #999999;
+			}
+		}
+	}
+
+	.sendInputTitle {
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.sendInputPackage {
+		padding: 30upx;
+		background: rgba(248, 248, 248, 1);
+	}
+
+	.sendDynamic {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	page {
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	.sendDynamicPackage {
+		padding: 30upx;
+	}
+
+	.inputView {
+		margin-top: 30upx;
+		height: 160upx !important;
+		font-size: 24upx;
+
+
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.imgView {
+		margin-top: 30upx;
+	}
+</style>
diff --git a/pages/subPages/merchant/set/set.vue b/pages/subPages/merchant/set/set.vue
new file mode 100644
index 0000000..a9ee288
--- /dev/null
+++ b/pages/subPages/merchant/set/set.vue
@@ -0,0 +1,1860 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<view class="setPackage">
+			<view class="userInfo">
+				<view class="firstTitle">
+					<view class="line"></view>
+					<span>请填写店铺信息</span>
+				</view>
+				<view class="inputPackage">
+					<view class="setInput">
+						<span>店铺名称</span>
+						<input placeholder="请输入店铺名称" :disabled="richText" v-model="userInfo.storename" />
+					</view>
+					<view class="setInput">
+						<span>姓名</span>
+						<input placeholder="请输入姓名" :disabled="richText" v-model="userInfo.name" />
+					</view>
+					<view class="setInput">
+						<span>电话</span>
+						<input placeholder="请输入联系电话" :disabled="richText" v-model="userInfo.mobile" type="number" />
+					</view>
+					<view class="userInfoInputMain">
+						<span>所在地区</span>
+						
+						<view class="timePickerView">
+						<view class="uni-input" style="font-size: 24upx;display: inline-block;" @tap="visble">{{provinceidName + areaidName + distidName}}</view>
+						<w-pickerb
+							:visible.sync="visiblec"
+							mode="region"
+							:value="[provinceidName,areaidName,distidName]"
+							default-type="label"
+							:hide-area="false"
+							@confirm="onConfirm($event,'region')"
+							@cancel="onCancel"
+							ref="region" 
+						></w-pickerb>
+						</view>
+						
+						
+						
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+					<view class="userInfoInputMain">
+						<span>店铺详情</span>
+						<view class="timePickerView" @click="openRich">
+							<view class="uni-input">富文本编辑</view>
+							<span></span>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+					<view class="userInfoInputMain">
+						<span>详细地址</span>
+						<input  :disabled="!userInfo.lat" placeholder="点击定位详细地址" v-model="userInfo.address" />
+						<view @click="getLocation">
+							<image :src="imgfixUrls + 'merchant/where.svg'" />
+							<span>定位</span>
+						</view>
+					</view>
+					<view class="userInfoInputMain">
+						<span>营业时间</span>
+						<view class="timePickerView">
+							<w-pickerb :visible.sync="visibletimeone" mode="time" :value="storehours[0].startTime + ':00'" :current="false"
+							 :second="false" @confirm="bindTimeChangeStar($event)" @cancel="onCancel" ref="time"></w-pickerb>
+							<span @tap="showPicker('time')">{{ storehours[0].startTime }}</span>
+							<span>-</span>
+							->
+							<span @tap="showPicker('timeend')">{{ storehours[0].endTime }}</span>
+							<w-pickerb :visible.sync="visibletimeend" mode="time" :value="storehours[0].endTime + ':00'" :current="false"
+							 :second="false" @confirm="bindTimeChangeEnd($event)" @cancel="onCancelEnd" ref="timeend"></w-pickerb>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+					
+					<view class="userInfoInputMain">
+						<span>分段营业</span>
+						<view class="timePickerView">
+							<picker @change="multistageChange" class="dataPicker" :value="multistageIndex" range-key="title" :range="multistageList">
+							    <view class="uni-input">{{multistageList[multistageIndex].title}}
+								</view>
+							</picker>
+							<span></span>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+					<view class="userInfoInputMain" v-if="multistageIndex == 1">
+						<span>分段时间</span>
+						<view class="timePickerView">
+							<w-pickerb :visible.sync="visibletimeoneT" mode="time" :value="storehours[1].startTime + ':00'" :current="false"
+							 :second="false" @confirm="bindTimeChangeStarT($event)" @cancel="onCancel" ref="timeT"></w-pickerb>
+							<span @tap="showPicker('timeT')">{{ storehours[1].startTime }}</span>
+							<span>-</span>->
+							<span @tap="showPicker('timeendT')">{{ storehours[1].endTime }}</span>
+							<w-pickerb :visible.sync="visibletimeendT" mode="time" :value="storehours[1].endTime + ':00'" :current="false"
+							 :second="false" @confirm="bindTimeChangeEndT($event)" @cancel="onCancelEnd" ref="timeendT"></w-pickerb>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+					<view class="setInput">
+						<span>核销密码</span>
+						<input placeholder="请输入核销密码"  :disabled="richText"  @input="wordInput" maxlength="9" type="text" v-model="userInfo.verkey" />
+					</view>
+				</view>
+			</view>
+			
+			<view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_recruit == 1">
+				<view class="firstTitle">
+					<view class="line"></view>
+					<span>企业招聘信息</span>
+				</view>
+				<view class="inputPackage">
+					<view class="userInfoInputMain">
+						<span>招聘状态</span>
+						<view class="timePickerView">
+							<picker @change="switchChange" class="dataPicker" :value="switchIndex" range-key="title" :range="switchList">
+							    <view class="uni-input">{{switchList[switchIndex].title}}
+								</view>
+							</picker>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+				</view>
+				<view class="inputPackage" v-if="switchIndex == 1">
+					<view class="userInfoInputMain">
+						<span>企业性质</span>
+						<view class="timePickerView">
+						<picker @change="natureChange" class="dataPicker" :value="natureIndex" range-key="title" :range="userInfoWork.nature">
+						    <view class="uni-input">{{userInfoWork.nature[natureIndex].title}}
+							</view>
+						</picker>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+				</view>
+				<view class="inputPackage" v-if="switchIndex == 1">
+					<view class="userInfoInputMain">
+						<span>企业规模</span>
+						<view class="timePickerView">
+						<picker @change="scaleChange" class="dataPicker" :value="scaleIndex" range-key="title" :range="userInfoWork.scale">
+						    <view class="uni-input">{{userInfoWork.scale[scaleIndex].title}}
+							</view>
+						</picker>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+				</view>
+				<view class="inputPackage" v-if="switchIndex == 1">
+					<view class="userInfoInputMain">
+						<span>企业规模</span>
+						<view class="timePickerView">
+						<picker @change="industryChange" class="dataPicker" :value="industryIndex" range-key="title" :range="userInfoWork.industry">
+						    <view class="uni-input">{{userInfoWork.industry[industryIndex].title}}
+							</view>
+						</picker>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+				</view>
+				<view class="inputPackage" v-if="switchIndex == 1">
+					<view class="userInfoInputMain">
+						<span>企业亮点</span>
+						<input placeholder="请输入企业亮点" :disabled="richText" v-model="userInfo.recruit_brighten" />
+					</view>
+				</view>
+				<view class="twiceTitle" v-if="switchIndex == 1">
+					<span>企业幻灯片(750X560)</span>
+					<view>
+						<!-- 图片预览循环模板 -->
+						<view class="imgPreview" v-for="(item,index) in type4Url">
+							<image :src="item" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(4, item)" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="uploadFiles(4,6)">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+						</view>
+					</view>
+				</view>
+				<view class="twiceTitle" v-if="switchIndex == 1">
+					<span>企业长图</span>
+					<view>
+						<!-- 图片预览循环模板 -->
+						<view class="imgPreview" v-for="(item,index) in userInfo.recruit_long_img" :key="index">
+							<image :src="item" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close"
+							 @click="closePreview(6, item)" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="uploadFiles(6, 6)">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			<!-- 同城配送 -->
+			<view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_delivery == 1">
+				<view class="firstTitle">
+					<view class="line"></view>
+					<span>同城配送信息</span>
+				</view>
+				<view class="inputPackage">
+					<view class="userInfoInputMain">
+						<span>配送状态</span>
+						<view class="timePickerView">
+							<picker @change="deliveryChange" class="dataPicker" :value="userInfo.deliverystatus" range-key="title" :range="deliveryList">
+							    <view class="uni-input">{{deliveryList[userInfo.deliverystatus].title}}
+								</view>
+							</picker>
+						</view>
+						<image :src="imgfixUrls + 'merchant/right.svg'" />
+					</view>
+				</view>
+				<view v-if="userInfo.deliverystatus == 1">
+					<view class="setInput dis-flex" style="height: auto;">
+						<span style="line-height: 80upx;padding-right: 40upx;">接单方式</span>
+						<radio-group @change="radioChange" class="dis-flex">
+						    <label  v-for="(item, index) in orderItems" :key="item.value" class="dis-flex" style="line-height: 80upx;margin-right: 30upx;">
+						        <view>
+									<radio :value="item.value" :checked="index == userInfo.acceptstatus" />
+						        </view>
+						        <view class="f-24">{{item.name}}</view>
+						    </label>
+						</radio-group>
+					</view>
+					<view class="setInput dis-flex" style="height: auto;">
+						<span style="line-height: 80upx;padding-right: 40upx;">配送方式</span>
+						<checkbox-group @change="checkboxChange" style="display: inline-block;">
+								<label  v-for="(item, index) in deliveryItems" :key="item.value" class="dis-flex" style="line-height: 80upx;">
+								<view>
+									<checkbox :value="item.value" :checked="item.checked" />
+								</view>
+								<view class="f-24">{{item.name}}</view>
+							</label>
+						</checkbox-group>
+					</view>
+					<view class="setInput" v-if="storeDelivery">
+						<span>配送距离</span>
+						<input placeholder="请输入配送距离" type="number" v-model="userInfo.deliverydistance" />
+						<span style="width: 40upx;">km</span>
+					</view>
+					<view class="setInput" v-if="storeDelivery">
+						<span>配送费</span>
+						<input placeholder="请输入配送费" type="number" v-model="userInfo.deliverymoney" />
+						<span style="width: 40upx;text-align: left;">元</span>
+					</view>
+					<view class="setInput" v-if="storeDelivery">
+						<span>起送价格</span>
+						<input placeholder="请输入起送价格" type="number" v-model="userInfo.lowdeliverymoney" />
+						<span style="width: 40upx;text-align: left;">元</span>
+					</view>
+				</view>
+				
+			</view>
+			<!-- 同城配送 -->
+			
+			<!-- 家政信息区域 -->
+			<view class="userInfo" style="margin-top: 30upx;" v-if="userInfoWork.is_housekeep == 1">
+				<view class="userInfoPackage">
+					<view class="firstTitle">
+						<view class="line"></view>
+						<span>家政服务信息</span>
+					</view>
+					<view class="userInfoInput" >
+						<view class="userInfoInputPackage">
+							<view class="userInfoInputMain">
+								<span>家政状态</span>
+								<view class="timePickerView">
+									<picker @change="homemaChange" class="dataPicker" :value="homemaIndex" range-key="title" :range="homemaking">
+									    <view class="uni-input">{{homemaking[homemaIndex].title}}
+										</view>
+									</picker>
+									<span></span>
+								</view>
+								<image :src="imgfixUrls + 'merchant/right.svg'" />
+							</view>
+							<view class="userInfoInputMain" v-if="homemaIndex == 1">
+								<span>家政类目</span>
+								<view class="timePickerView" @click="showoccupation = true" style="height: auto;">
+									<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+									 range-key="name" :value="typeIndex"> -->
+			
+									<view v-if="userInfoWork.store_housekeep_cate.length == 0" class="uni-input homema" style="height: 60upx;">请选择家政类目</view>
+									<view v-else class="uni-input homema" style="margin-top: 20upx;">
+										<view class="check-item" v-for="(item, index) in userInfoWork.store_housekeep_cate" :key="index">
+											{{ item.title }}
+											<image :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode="" @click.stop="deletcheck(item.id)"></image>
+										</view>
+									</view>
+									<!-- 			</picker> -->
+									<!-- <span></span> -->
+								</view>
+								<image :src="imgfixUrls + 'merchant/right.svg'" />
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+			<!-- 家政信息区域 -->
+			
+			<view class="userImg">
+				<view class="firstTitle">
+					<view class="line"></view>
+					<span>店铺图片</span>
+				</view>
+				<view class="inputPackage">
+					<view class="twiceTitle1">
+						<span>店铺LOGO(200X200)</span>
+						<view>
+							<!-- 图片预览循环模板 -->
+							<view class="imgPreview" v-if="type1Url !== ''">
+								<image :src="type1Url" />
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo" />
+							</view>
+							<!-- 图片预览循环模板 -->
+							<view class="userImgUpdata" @click="uploadFiles(1,1)" v-if="type1Url == ''">
+								<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+							</view>
+						</view>
+					</view>
+					<view class="twiceTitle">
+						<span>店铺幻灯片(750X560)</span>
+						<view>
+							<!-- 图片预览循环模板 -->
+							<view class="imgPreview" v-for="( item, index ) in type2Url">
+								<image :src="item" />
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(2, item)" />
+							</view>
+							<!-- 图片预览循环模板 -->
+							<view class="userImgUpdata" @click="uploadFiles(2,6)">
+								<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+							</view>
+						</view>
+					</view>
+					<view class="twiceTitle">
+						<span>店铺相册(320X320)</span>
+						<view>
+							<!-- 图片预览循环模板 -->
+							<view class="imgPreview" v-for="(item, index) in type3Url">
+								<image :src="item" />
+								<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(3, item)" />
+							</view>
+							<!-- 图片预览循环模板 -->
+							<view class="userImgUpdata" @click="uploadFiles(3,6)">
+								<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+							</view>
+						</view>
+					</view>
+					<!-- <view class="twiceTitle">
+					<span>店铺资质(320X320)</span>
+					<view>
+						
+						<view class="imgPreview" v-for="(item, index) in type4Url">
+							<image :src="item" />
+							<image :src="imgfixUrls + 'merchant/close.png" class="close" @click="closePreview(4, item)" />
+						</view>
+						
+						<view class="userImgUpdata" @click="uploadFiles(4)"><image :src="imgfixUrls + 'merchant/addImg.svg" /></view>
+					</view>
+				</view> -->
+				</view>
+			</view>
+
+			<view class="submitButtom" @click="saveUserInfo"><span>提交</span></view>
+		</view>
+		<!-- 富文本弹窗 -->
+		<PopManager :show="richText" type="center" @clickmask="richText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="userInfo.introduction">
+				<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#" :html="userInfo.introduction"></jinEdit> 
+			</view>
+		</PopManager>
+		
+		<PopManager :show="showoccupation" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="showoccupation = false">
+			<view class="cicupation">
+				<view class="cicupation-left">
+					<view :class="item.checked ? 'left-item' : 'left-nocheck'" v-for="(item, index) in cate" :key="index" @click="checkLeft(item.id)">{{ item.title }}</view>
+				</view>
+				<view class="cicupation-right">
+					<view :class="item.checked ? 'right-item' : 'right-nocheck'" v-for="(item, index) in rightList" :key="index" @click="checkRight(item.id)">
+						{{ item.title }}
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 富文本弹窗 -->
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${userInfo.lat},${userInfo.lng}`"></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import uniSelect from '@/components/template/lee-select.vue';
+	import TabBars from '@/components/template/tabBar';
+	import PopManager from '@/components/template/PopManager';
+	import wPickerb from '@/components/w-picker/w-picker.vue'
+	import jinEdit from '@/components/jin-edit/jin-edit.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		data() {
+			return {
+				type: null,
+				visiblec:false,
+				showoccupation:false,
+				typeLists: [],
+				typeIndex: [0, 0],
+				cityIndex: [0, 0, 0],
+				cate:[],
+				rightList:[],
+				title: 'hello',
+				show: true,
+				page: 1,
+				date: '',
+				time: '00:00',
+				time1: '00:00',
+				jobType: '美食餐饮 甜点饮品',
+				typelist: [],
+				typeList: [],
+				citylist: [],
+				cityList: [],
+				chargeList: [],
+				id: '',
+				typeid: '',
+				current: 0,
+				onelevelName: '请选择行业分类',
+				twolevelName: '',
+				provinceidName: '请选择省市区',
+				areaidName: '',
+				distidName: '',
+				imgPath: '',
+				type1Url: '',
+				type2Url: [],
+				type3Url: [],
+				type4Url: [],
+				type5Url: [],
+				userInfo: {
+					storename: '',
+					name: '',
+					mobile: '',
+					lat: '',
+					lng: '',
+					startTime: '00:00',
+					endTime: '00:00',
+					address: '',
+					onelevel: '',
+					twolevel: '',
+					provinceid: '',
+					areaid: '',
+					distid: '',
+					introduction: '',
+					logo: '',
+					adv: [],
+					album: [],
+					examine: [],
+					thumbimages: [],
+					deliverytype: [],
+					recruit_brighten: '',
+					recruit_long_img: []
+				},
+				storeid: null,
+				phoneHeight: null,
+				isOpenLaction: false,
+				owenscitylist:[],
+				ono:0,
+				visiblestarttime:false,
+				visibleendtime:false,
+				visibletimeoneT: false,
+				visibletimeendT: false,
+				visibletimeone: false,
+				visibletimeend: false,
+				richText:false,
+				industryIndex:0,
+				homemaIndex:0,
+				homemaking:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				deliveryList:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				switchList:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				multistageList:[
+					{title:'关闭',id:0},
+					{title:'打开',id:1},
+				],
+				multistageIndex:0,
+				switchIndex:0,
+				natureIndex:0,
+				scaleIndex:0,
+				userInfoWork:{},
+				storehours:[{
+					endTime:'00:00',
+					startTime:'00:00'
+				}],
+				lblis:{},
+				orderItems:[
+					{
+						value:'0',
+						name:'自动接单'
+					},
+					{
+						value:'1',
+						name:'手动接单'
+					}
+				],
+				deliveryItems:[
+					{
+						value:'store',
+						name:'商户配送',
+						checked:false
+					},
+					{
+						value:'make',
+						name:'平台配送',
+						checked:false
+					},
+					{
+						value:'own',
+						name:'到店自提',
+						checked:false
+					},
+				],
+				storeDelivery:false
+			}
+		},
+		components: {
+			PopManager,
+			wPickerb,
+			jinEdit
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.owenscitylist = uni.getStorageSync('cityList');
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					let lblis;
+					if(_this.ono == 1){
+						return
+					}
+					if (loc && loc.module == 'locationPicker') {
+						lblis = {
+							lat:loc.latlng.lat,
+							lng:loc.latlng.lng,
+							detailed_address:loc.poiaddress
+						}
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						_this.userInfo.address = loc.poiaddress;
+						_this.userInfo.lat = loc.latlng.lat;
+						_this.userInfo.lng = loc.latlng.lng;
+						_this.isOpenLaction = false;
+						_this.getloctions(lblis);
+					}
+					_this.ono = 1;
+					setTimeout(()=>{
+						_this.ono = 0;
+					},1000)
+				},
+				false
+			);
+			// #endif
+			if (!!e.storeid) {
+				_this.storeid = e.storeid;
+				_this.init(e.storeid);
+			} else {
+				_this.init();
+			}
+		},
+		methods: {
+			radioChange: function(evt) {
+			            for (let i = 0; i < this.orderItems.length; i++) {
+			                if (this.orderItems[i].value === evt.detail.value) {
+			                    this.userInfo.acceptstatus = i;
+			                    break;
+						}
+				}
+			},
+			checkboxChange(e){
+				console.log(e);
+				this.userInfo.deliverytype = e.detail.value;
+				this.storeDelivery = false;
+				this.userInfo.deliverytype.map(item=>{
+					if(item == 'store'){
+						this.storeDelivery = true;
+					}
+				})
+			},
+			wordInput(e){
+				// let password = new RegExp()
+				// this.userInfo.verkey = ''
+				let text = /[^\w\.\/]/ig;
+				if(text.test(e.detail.value)){
+					setTimeout(()=>{
+						this.userInfo.verkey=e.detail.value.replace(/[^\w\.\/]/ig,'');
+					})
+
+				}
+			},
+			checkRight(id) {
+				let _this = this;
+				_this.rightList.map((item, index) => {
+					// item.checked = false;
+					if (item.id == id) {
+						item.checked = !item.checked;
+			
+						if (item.checked) {
+							_this.userInfoWork.store_housekeep_cate.push(item);
+						} else {
+							_this.userInfoWork.store_housekeep_cate.map((items, indexs) => {
+								if (items.id == item.id) {
+									_this.userInfoWork.store_housekeep_cate.splice(indexs, 1);
+								}
+							});
+						}
+					}
+				});
+				_this.loadlogo = !_this.loadlogo;
+				_this.loadlogo = !_this.loadlogo;
+			},
+			checkLeft(id) {
+				let _this = this;
+				_this.cate.map((item, index) => {
+					item.checked = false;
+					if (item.id == id) {
+						item.checked = true;
+						_this.rightList = item.list;
+					}
+				});
+				_this.loadlogo = !_this.loadlogo;
+				_this.loadlogo = !_this.loadlogo;
+			},
+			deletcheck(id) {
+				let _this = this;
+				_this.cate.map((item, index) => {
+					item.list.map((items, indexs) => {
+						if (items.id == id) {
+							items.checked = false;
+						}
+					});
+				});
+				_this.userInfoWork.store_housekeep_cate.map((items, indexs) => {
+					if (items.id == id) {
+						_this.userInfoWork.store_housekeep_cate.splice(indexs, 1);
+					}
+				});
+				_this.rightList.map((items, indexs) => {
+					if (items.id == id) {
+						items.checked = false;
+					}
+				});
+			},
+			homemaChange(e){
+				this.homemaIndex = e.detail.value;
+			},
+			scaleChange(e){
+				this.scaleIndex = e.detail.value;
+			},
+			natureChange(e){
+				this.natureIndex = e.detail.value;
+			},
+			deliveryChange(e){
+				this.userInfo.deliverystatus = e.detail.value;
+			},
+			switchChange(e){ //招聘开关
+				this.switchIndex = e.detail.value;
+			},
+			multistageChange(e){
+				this.multistageIndex = e.detail.value;
+				if(e.detail.value == 1){
+					this.storehours.push({
+						endTime:'00:00',
+						startTime:'00:00'
+					});
+				}else{
+					this.storehours.splice(1,1);
+				}
+				console.log(this.multistageIndex,this.multistageList[this.multistageIndex].title);
+			},
+			industryChange(e){
+				this.industryIndex = e.detail.value;
+			},
+			openRich(){
+				if(this.userInfo.introduction == ''){
+					this.userInfo.introduction = '请输入内容'
+				}
+				this.richText = true;
+				console.log('shabi',this.userInfo.introduction);
+			},
+			editOk(res) {
+				// debugger
+			    console.log('shabi',res.html);
+							 this.userInfo.introduction = res.html;
+							 this.richText = false;
+			},
+			getloctions(lblis){
+				console.log(lblis,'666666');
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+			
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == res.data.provinceid){
+							// _this.citytext  = item.name;
+							// _this.userAddress.provinceidName = item.name;
+							_this.provinceidName = item.name;
+							this.userInfo.provinceid = item.id;
+							
+							item.area.map(items=>{
+								if(items.id == res.data.cityid){
+									_this.areaidName = items.name;
+									this.userInfo.areaid = items.id;
+									items.dist.map(itemss=>{
+										if(itemss.id == res.data.countyid){
+											this.distidName = itemss.name;
+											this.userInfo.distid = itemss.id;
+										}
+									})
+								}
+							})
+						}
+					})
+				});
+			},
+			visble(){
+				this.visiblec = true;
+			},
+			onConfirm(e){
+				console.log(e);
+				this.provinceidName  = e.obj.province.label;
+				this.areaidName  = e.obj.city.label;
+				this.distidName  = e.obj.area.label;
+				this.userInfo.provinceid = e.obj.province.value;
+				this.userInfo.areaid = e.obj.city.value;
+				this.userInfo.distid = e.obj.area.value;
+				// this.$set(userInfo,'provinceid')
+				console.log(this.userInfo.provinceid,this.userInfo.areaid,this.userInfo.distid)
+				// this.citytext = e.result;
+			},
+			showPicker(type) {
+				this.$refs[type].show();
+				console.log(this.$refs[type]);
+			},
+			init(storeid) {
+				let _this = this;
+				if (!!storeid) {
+					_this.getUserInfo(storeid);
+					_this.type = 2;
+				} else {
+					uni.getStorage({
+						key: 'checkStoreid',
+						success: function(res) {
+							_this.storeid = res.data;
+							_this.getUserInfo(res.data);
+							_this.type = 1;
+						}
+					});
+				}
+				//#ifdef H5
+				wxApi.wxRegister();
+				//#endif
+				
+			},
+			uoloadIgs(length, ids = 0, resImg, type) {
+				let _this = this
+				wxApi.uoloadIg(resImg.localIds[ids], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									if (type == 1) {
+										_this.type1Url = res.data.img;
+										_this.userInfo.logo = res.data.image;
+									}
+									if (type == 2) {
+										_this.type2Url.push(res.data.img);
+										_this.userInfo.adv.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500)
+										}
+									}
+									if (type == 3) {
+										_this.type3Url.push(res.data.img);
+										_this.userInfo.album.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500)
+										}
+									}
+									if (type == 4) {
+										_this.type4Url.push(res.data.img);
+										_this.userInfo.recruit_adv.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500)
+										}
+									}
+									if (type == 5) {
+										_this.type5Url.push(res.data.img);
+										_this.userInfo.thumbimages.push(res.data.image);
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500)
+										}
+									}
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(type, num) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(num);
+				    console.info(res);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i]);
+				    	console.info(aa);
+				    	if (type == 1) {
+				    		_this.type1Url = aa.data.img;
+				    		_this.userInfo.logo = aa.data.image;
+				    	}
+				    	if (type == 2) {
+				    		_this.type2Url.push(aa.data.img);
+				    		_this.userInfo.adv.push(aa.data.img);
+				    	}
+				    	if (type == 3) {
+				    		_this.type3Url.push(aa.data.img);
+				    		_this.userInfo.album.push(aa.data.img);
+				    	}
+				    	if (type == 4) {
+				    		_this.type4Url.push(aa.data.img);
+				    		_this.userInfo.recruit_adv.push(aa.data.img);
+				    		console.info(_this.userInfo.recruit_adv);
+				    	}
+				    	if (type == 5) {
+				    		_this.type5Url.push(aa.data.img);
+				    		_this.userInfo.thumbimages.push(aa.data.img);
+				    	}
+				     	if (type == 6) {
+				     		// _this.type5Url.push(aa.data.img);
+				     		_this.userInfo.recruit_long_img.push(aa.data.img);
+				     	}
+				    }
+					return
+				}
+				wxApi.choseImage(res => {
+					let i = res.localIds.length
+					_this.uoloadIgs(i, 0, res, type)
+				}, num);
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: num,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						console.info(res);
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							console.info(aa);
+							if (type == 1) {
+								_this.type1Url = aa.data.img;
+								_this.userInfo.logo = aa.data.image;
+							}
+							if (type == 2) {
+								_this.type2Url.push(aa.data.img);
+								_this.userInfo.adv.push(aa.data.img);
+							}
+							if (type == 3) {
+								_this.type3Url.push(aa.data.img);
+								_this.userInfo.album.push(aa.data.img);
+							}
+							if (type == 4) {
+								_this.type4Url.push(aa.data.img);
+								_this.userInfo.recruit_adv.push(aa.data.img);
+								console.info(_this.userInfo.recruit_adv);
+							}
+							if (type == 5) {
+								_this.type5Url.push(aa.data.img);
+								_this.userInfo.thumbimages.push(aa.data.img);
+							}
+				     	if (type == 6) {
+				     		// _this.type5Url.push(aa.data.img);
+				     		_this.userInfo.recruit_long_img.push(aa.data.img);
+				     	}
+						}
+					}
+				});
+				// #endif
+			},
+			// 提交商户信息
+			saveUserInfo() {
+				let _this = this;
+				// 判断
+				if (_this.userInfo.storename == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '店铺名称不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.name == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '姓名不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.mobile == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '联系电话不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.provinceid == '' || _this.userInfo.areaid == '' || _this.userInfo.distid == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择所在地区',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userInfo.address == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '详细地址不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if(!_this.userInfo.verkey){
+					uni.showToast({
+						icon: 'none',
+						title: '核销密码不能为空',
+						duration: 2000
+					});
+					return;
+				}if (_this.switchIndex ==1 && _this.userInfo.recruit_brighten == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '企业亮点不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if(_this.switchIndex == 1){
+					_this.userInfo.recruit_switch = _this.switchIndex;
+					_this.userInfo.recruit_nature_id = _this.userInfoWork.nature[_this.natureIndex].id;
+					_this.userInfo.recruit_scale_id = _this.userInfoWork.scale[_this.scaleIndex].id;
+					_this.userInfo.recruit_industry_id = _this.userInfoWork.industry[_this.industryIndex].id;
+				}else{
+					_this.userInfo.recruit_switch = 0;
+					_this.userInfo.recruit_nature_id = '';
+					_this.userInfo.recruit_scale_id = '';
+					_this.userInfo.recruit_industry_id = '';
+					_this.userInfo.recruit_adv = [];
+				}
+				// 判断
+				// let jsonString = JSON.stringify(this.userInfo.cateidArray);
+				// debugger
+				let store_housekeep = [];
+				if(_this.userInfoWork.is_housekeep == 1){
+				if (_this.homemaIndex != 0) {
+					// debugger
+					
+					if (_this.userInfoWork.store_housekeep_cate.length == 0) {
+						uni.showToast({
+							icon: 'none',
+							title: '请至少选择一个家政类目',
+							duration: 2000
+						});
+						return
+					}
+					this.userInfo.housekeepstatus = this.homemaking[this.homemaIndex].id;
+					// debugger
+					this.userInfoWork.store_housekeep_cate.map((item,index)=>{
+						store_housekeep.push(item.id)
+					})
+				}
+				}
+				if(_this.userInfoWork.is_delivery == 1){
+					if (_this.userInfo.deliverystatus == 1) {
+					// debugger
+					
+					if (_this.userInfo.deliverytype.length == 0) {
+						uni.showToast({
+							icon: 'none',
+							title: '请至少选择一个配送方式',
+							duration: 2000
+						});
+						return
+					}
+					// if (_this.userInfo.deliverydistance) {
+					// 	uni.showToast({
+					// 		icon: 'none',
+					// 		title: '请填写起送距离',
+					// 		duration: 2000
+					// 	});
+					// 	return
+					// }
+				}
+				}
+				console.log(this.userInfo)
+				
+				
+				// 判断
+				let housekeep_cate = JSON.stringify(store_housekeep);
+				let storehours = JSON.stringify(this.storehours);
+				let base64 = new this.$util.Base64();
+				storehours = base64.encode(storehours);
+				// this.userInfo.cateidArray = base64.encode(jsonString);
+				// _this.userinfo.storehours = storehours;
+				let data = _this.userInfo;
+				data.storehours = storehours
+				data.store_housekeep_cate = base64.encode(housekeep_cate);
+				data['storeid'] = _this.storeid;
+				if(_this.userInfo.introduction == '请输入内容'){
+					_this.userInfo.introduction = '';
+				}
+				data['detail'] = _this.userInfo.introduction;
+				console.info(_this.userInfo);
+				// uni.showModal({
+				// 	content:JSON.stringify(_this.userInfo)
+				// })
+				App._post_form('&p=store&do=createStore', data, res => {
+					uni.setStorageSync('userId', res.data);
+					uni.showToast({
+						icon: 'none',
+						title: '修改成功',
+						duration: 2000
+					});
+					setTimeout(()=>{
+						if (_this.type == '1') {
+							// 不要前进，后退即可
+							uni.navigateBack({
+								delta: 1
+							})
+							// App.navigationTo({
+							// 	url: 'pages/subPages/merchant/merchantUerCenter/merchantUerCenter'
+							// });
+						} else if (_this.type == '2') {
+							App.navigationTo({
+								url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
+							});
+						}
+					}, 2000)
+				});
+			},
+
+			closePreview(type, url) {
+				let _this = this;
+				if (type == 2) {
+					for (let i = 0; i < _this.type2Url.length; i++) {
+						if (url == _this.type2Url[i]) {
+							_this.type2Url.splice(i, 1);
+							_this.userInfo.adv.splice(i, 1);
+						}
+					}
+				}
+				if (type == 3) {
+					for (let i = 0; i < _this.type3Url.length; i++) {
+						if (url == _this.type3Url[i]) {
+							_this.type3Url.splice(i, 1);
+							_this.userInfo.album.splice(i, 1);
+						}
+					}
+				}
+				if (type == 4) {
+					for (let i = 0; i < _this.type4Url.length; i++) {
+						if (url == _this.type4Url[i]) {
+							_this.type4Url.splice(i, 1);
+							_this.userInfo.recruit_adv.splice(i, 1);
+						}
+					}
+				}
+				if (type == 5) {
+					for (let i = 0; i < _this.type5Url.length; i++) {
+						if (url == _this.type5Url[i]) {
+							_this.type5Url.splice(i, 1);
+							_this.userInfo.thumbimages.splice(i, 1);
+						}
+					}
+				}
+				if (type == 6) {
+					for (let i = 0; i < _this.userInfo.recruit_long_img.length; i++) {
+						if (url == _this.userInfo.recruit_long_img[i]) {
+							_this.userInfo.recruit_long_img.splice(i, 1);
+							// _this.userInfo.thumbimages.splice(i, 1);
+						}
+					}
+				}
+			},
+			closeLogo() {
+				let _this = this;
+				_this.type1Url = '';
+				_this.userInfo.logo = '';
+			},
+			getUserInfo(storeid) {
+				let _this = this;
+				let data = {
+					id: storeid
+				};
+				let listLeft = [];
+				let listRight = [];
+				let cityListLeft = [];
+				let cityListCenter = [];
+				let cityListRight = [];
+				App._post_form('&p=store&do=storeSettled', data, res => {
+					
+					_this.userInfo = res.data.store;
+					_this.userInfo.recruit_long_img = res.data.store.recruit_long_img_src;
+					_this.storehours = _this.userInfo.storehours;
+					if(_this.storehours.length == 2){
+						_this.multistageIndex = 1;
+					}
+					_this.userInfoWork = res.data;
+					_this.type1Url = res.data.store.logo;
+					_this.homemaIndex = _this.userInfo.housekeepstatus;
+					_this.type1Url = res.data.store.logo;
+					if(Array.isArray(_this.userInfo.deliverytype)){
+						_this.userInfo.deliverytype.map(item=>{
+							_this.deliveryItems.map(items=>{
+								if(item == items.value){
+									items.checked = true;
+								}
+								if(item == 'store'){
+									this.storeDelivery = true;
+								}
+							})
+						})
+					}
+					
+					if (res.data.store.adv.length !== 0) {
+						for (let i = 0; i < res.data.store.adv.length; i++) {
+							_this.type2Url.push(res.data.store.adv[i]);
+						}
+					}
+					if (res.data.store.album.length !== 0) {
+						for (let i = 0; i < res.data.store.album.length; i++) {
+							_this.type3Url.push(res.data.store.album[i]);
+						}
+					}
+					if (!!res.data.store.examineimg) {
+						for (let i = 0; i < res.data.store.examineimg.length; i++) {
+							_this.type4Url.push(res.data.store.examineimg[i]);
+						}
+					}
+					if(!!res.data.all_housekeep_cate){
+						_this.cate = res.data.all_housekeep_cate;
+						_this.cate.map((item,index)=>{
+							item.list.map((items,indexs)=>{
+								_this.userInfoWork.store_housekeep_cate.map((itemss,indexss)=>{
+									if(items.id == itemss.id){
+										items.checked = true;
+									}
+								})
+							})
+							
+						})
+					}
+					uni.setStorageSync('agreement', res.data.registerdetail);
+					_this.typelist = [];
+					let data = {
+						provinceid: res.data.store.provinceid,
+						areaid: res.data.store.areaid,
+						distid: res.data.store.distid
+					};
+					_this.switchIndex = _this.userInfo.recruit_switch;
+					_this.type4Url =JSON.parse(JSON.stringify(_this.userInfo.recruit_adv));
+					if(_this.userInfoWork.is_recruit == 1){
+						_this.userInfoWork.nature.map((item,index)=>{
+							if(item.id == _this.userInfo.recruit_nature_id){
+								_this.natureIndex = index;
+							}
+						});
+						_this.userInfoWork.industry.map((item,index)=>{
+							if(item.id == _this.userInfo.recruit_industry_id){
+								_this.industryIndex = index;
+							}
+						});
+						_this.userInfoWork.scale.map((item,index)=>{
+							if(item.id == _this.userInfo.recruit_scale_id){
+								_this.scaleIndex = index;
+							}
+						})
+					}
+					
+					App._post_form('&p=store&do=area2type', data, res => {
+						if (res.data.length == 0) {
+							_this.typelist.push([{
+								name: '该地区暂无分类',
+								id: ''
+							}]);
+						} else {
+							for (let i = 0; i < res.data.length; i++) {
+								listLeft.push(res.data[i]);
+								for (let a = 0; a < res.data[0].length; a++) {
+									listRight.push(res.data[0].twotype[a]);
+								}
+							}
+							_this.typeLists = res.data;
+							_this.typelist.push(listLeft);
+							_this.typelist.push(listRight);
+							// 获取分类列表数据
+							for (let i = 0; i < _this.typeLists.length; i++) {
+								console.info(_this.typeLists[i]);
+								if (_this.typeLists[i].id == _this.userInfo.onelevel) {
+									_this.typeIndex[0] = i;
+									_this.onelevelName = _this.typeLists[i].name;
+									// 循环二级
+									for (let a = 0; a < _this.typeLists[i].twotype.length; a++) {
+										if (_this.typeLists[i].twotype[a].id == _this.userInfo.twolevel) {
+											_this.typeIndex[1] = a;
+											_this.twolevelName = _this.typeLists[i].twotype[a].name;
+										}
+									}
+								}
+							}
+							// 获取分类列表数据
+						}
+					});
+					
+
+					// 获取城市列表数据
+					_this.cityList = res.data.citylist;
+					for (let i = 0; i < res.data.citylist.length; i++) {
+						cityListLeft.push(res.data.citylist[i]);
+						if (res.data.store.provinceid == res.data.citylist[i].id) {
+							_this.provinceidName = res.data.citylist[i].name;
+							_this.cityIndex[0] = i;
+							// 循环市
+							for (let a = 0; a < res.data.citylist[i].area.length; a++) {
+								cityListCenter.push(res.data.citylist[i].area[a]);
+								if (res.data.store.areaid == res.data.citylist[i].area[a].id) {
+									_this.areaidName = res.data.citylist[i].area[a].name;
+									_this.cityIndex[1] = a;
+									// 三级循环
+									for (let c = 0; c < res.data.citylist[i].area[a].dist.length; c++) {
+										cityListRight.push(res.data.citylist[i].area[a].dist[c]);
+										if (res.data.store.distid == res.data.citylist[i].area[a].dist[c].id) {
+											_this.distidName = res.data.citylist[i].area[a].dist[c].name;
+											_this.cityIndex[2] = c;
+										}
+									}
+								}
+							}
+						}
+					}
+
+					_this.citylist.push(cityListLeft);
+					_this.citylist.push(cityListCenter);
+					_this.citylist.push(cityListRight);
+					// 获取城市列表数据
+					_this.userInfo.introduction = res.data.store.introduction;
+					// debugger
+				});
+			},
+			// 行业分类确定按钮
+			checkType: function(e) {
+				let _this = this;
+				_this.onelevelName = '';
+				_this.twolevelName = '';
+				_this.userInfo.onelevel = '';
+				_this.userInfo.twolevel = '';
+				if (_this.typelist[0][e.target.value[0]] !== undefined) {
+					_this.onelevelName = _this.typelist[0][e.target.value[0]].name;
+					_this.userInfo.onelevel = _this.typelist[0][e.target.value[0]].id;
+				}
+				if (!!_this.typelist[1][e.target.value[1]]) {
+					_this.twolevelName = _this.typelist[1][e.target.value[1]].name;
+					_this.userInfo.twolevel = _this.typelist[1][e.target.value[1]].id;
+				}
+			},
+			// 行业分类二级联动
+			changeKey: function(e) {
+				let _this = this;
+				let listRight = [];
+				for (let i = 0; i < _this.typeLists.length; i++) {
+					if (e.target.value == i && e.target.column == 0) {
+						for (let a = 0; a < _this.typeLists[i].twotype.length; a++) {
+							listRight.push(_this.typeLists[i].twotype[a]);
+						}
+						_this.typelist.splice(1, 2, listRight);
+						console.info(listRight);
+					}
+				}
+			},
+			// 城市列表确定按钮
+			checkCity: function(e) {
+				let _this = this;
+				_this.provinceidName = _this.citylist[0][e.target.value[0]].name;
+				_this.areaidName = _this.citylist[1][e.target.value[1]].name;
+				_this.distidName = _this.citylist[2][e.target.value[2]].name;
+				_this.userInfo.provinceid = _this.citylist[0][e.target.value[0]].id;
+				_this.userInfo.areaid = _this.citylist[1][e.target.value[1]].id;
+				_this.userInfo.distid = _this.citylist[2][e.target.value[2]].id;
+				_this.userInfo.onelevel = '';
+				_this.userInfo.twolevel = '';
+				_this.onelevelName = '请选择行业分类';
+				_this.twolevelName = '';
+				_this.getAreaTypeList();
+			},
+			// 通过地区id获取商户分类
+			getAreaTypeList() {
+				let _this = this;
+				_this.typelist = [];
+				let listLeft = [];
+				let listRight = [];
+				let data = {
+					provinceid: _this.userInfo.provinceid,
+					areaid: _this.userInfo.areaid,
+					distid: _this.userInfo.distid
+				};
+				App._post_form('&p=store&do=area2type', data, res => {
+					if (res.data.length == 0) {
+						_this.typelist.push([{
+							name: '该地区暂无分类',
+							id: ''
+						}]);
+					} else {
+						for (let i = 0; i < res.data.length; i++) {
+							listLeft.push(res.data[i]);
+							for (let a = 0; a < res.data[0].length; a++) {
+								listRight.push(res.data[0].twotype[a]);
+							}
+						}
+						_this.typeLists = res.data;
+						_this.typelist.push(listLeft);
+						_this.typelist.push(listRight);
+					}
+				});
+			},
+			// 城市列表三级联动
+			changeCity: function(e) {
+				let _this = this;
+				let cityListCenter = [];
+				let cityListRight = [];
+				if (e.target.column == 0) {
+					for (let i = 0; i < _this.cityList.length; i++) {
+						if (e.target.value == i) {
+							for (let a = 0; a < _this.cityList[i].area.length; a++) {
+								cityListCenter.push(_this.cityList[i].area[a]);
+							}
+						}
+					}
+					_this.citylist.splice(1, 2, cityListCenter);
+					_this.citylist.splice(2, 3, cityListCenter[0].dist);
+				}
+				if (e.target.column == 1) {
+					for (let a = 0; a < _this.citylist[1].length; a++) {
+						if (e.target.value == a) {
+							for (let c = 0; c < _this.citylist[1][a].dist.length; c++) {
+								cityListRight.push(_this.citylist[1][a].dist[c]);
+							}
+						}
+					}
+					_this.citylist.splice(2, 3, cityListRight);
+				}
+			},
+			// 获取定位
+			getLocation() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					latitude: _this.userInfo.lat,
+					longitude: _this.userInfo.lng,
+					success: function(res) {
+						_this.userInfo.address = res.address;
+						_this.userInfo.lat = res.latitude;
+						_this.userInfo.lng = res.longitude;
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: `pages/subPages2/map/index?lat=${_this.userInfo.lat}&lng=${_this.userInfo.lng}`
+				      });
+				//#endif
+			},
+			// 选择开始营业时间
+			bindTimeChangeStarT: function(e) {
+				let _this = this;
+				console.log(e);
+				_this.storehours[1].startTime = e.result;
+			},
+			// 选择开始营业时间
+			bindTimeChangeStar: function(e) {
+				let _this = this;
+				console.log(e);
+				_this.storehours[0].startTime = e.result;
+			},
+			onCancel(e) {
+				console.log(e);
+			},
+			onCancelEnd(e) {
+				console.log(e);
+			},
+			// 选择结束营业时间
+			bindTimeChangeEnd: function(e) {
+				let _this = this;
+				console.log(e);
+				_this.storehours[0].endTime = e.result;
+			},
+			// 选择结束营业时间
+			bindTimeChangeEndT: function(e) {
+				let _this = this;
+				console.log(e,this.storehours);
+				_this.storehours[1].endTime = e.result;
+			},
+			getDate(type) {
+				const date = new Date();
+				let year = date.getFullYear();
+				let month = date.getMonth() + 1;
+				let day = date.getDate();
+				if (type === 'start') {
+					year = year - 60;
+				} else if (type === 'end') {
+					year = year + 2;
+				}
+				month = month > 9 ? month : '0' + month;
+				day = day > 9 ? day : '0' + day;
+				return `${year}-${month}-${day}`;
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.imgPreview {
+		overflow: hidden;
+		width: 157upx;
+		height: 157upx;
+		background: gray;
+		margin-right: 37upx;
+		margin-bottom: 10upx;
+		border-radius: 10upx;
+	
+		>image {
+			width: 157upx;
+			height: 157upx;
+		}
+	}
+	
+	.close {
+		width: 32upx !important;
+		height: 32upx !important;
+		position: relative;
+		bottom: 150upx;
+		left: 120upx;
+		z-index: 30;
+	}
+	.userImg {
+		margin-top: 26upx;
+		display: inline-block;
+		width: 628upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10px;
+		padding: 30upx;
+	}
+
+	.userInfo {
+		width: 628upx;
+		background: white;
+		border-radius: 10upx;
+		background: rgba(255, 255, 255, 1);
+		padding: 30upx;
+	}
+
+	.submitButtom {
+		margin: 100upx auto 0 auto;
+		width: 690upx;
+		height: 83upx;
+		background: rgba(51, 136, 255, 1);
+		border-radius: 42upx;
+		text-align: center;
+
+		>span {
+			line-height: 83upx;
+			font-size: 28upx;
+			font-weight: 400;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.twiceTitle {
+		margin-top: 62upx;
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			vertical-align: middle;
+			overflow: visible !important;
+			margin-top: 43upx;
+
+			>view {
+				vertical-align: middle;
+				display: inline-block;
+			}
+		}
+	}
+
+	.userImgUpdata {
+		width: 157upx;
+		height: 157upx;
+		background: rgba(246, 246, 246, 1);
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 10upx;
+		text-align: center;
+
+		>image {
+			margin-top: 53upx;
+			width: 53upx;
+			height: 53upx;
+		}
+	}
+
+	
+
+	.twiceTitle2 {
+		margin-left: 36upx;
+	}
+
+	.twiceTitle1 {
+		margin-top: 40upx;
+
+		>span {
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			margin-top: 43upx;
+
+			>view {
+				vertical-align: middle;
+				display: inline-block;
+			}
+		}
+	}
+
+	.uni-input {
+		margin-top: 27upx;
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	page {
+		font-size: 0;
+	}
+
+	.setPackage {
+		background: #f8f8f8;
+		padding: 30upx;
+	}
+
+	.firstTitle {
+		margin-top: 20upx;
+
+		>span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 28upx;
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.line {
+		display: inline-block;
+		vertical-align: middle;
+		width: 8upx;
+		height: 27upx;
+		background: rgba(51, 136, 255, 1);
+		border-radius: 4upx;
+	}
+	
+	.setInput /deep/ .uni-radio-input{
+		width: 30upx;
+		height: 30upx;
+	}
+	
+	.setInput {
+		margin-top: 15upx;
+		height: 83upx;
+		background: rgba(250, 250, 250, 1);
+		border-radius: 10upx;
+
+		>span {
+			text-align: right;
+			display: inline-block;
+			width: 120upx;
+			vertical-align: middle;
+			// padding-left: 30upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+			padding-left: 40upx;
+			vertical-align: middle;
+			display: inline-block;
+			height: 100%;
+			width: 400upx;
+		}
+	}
+
+	.inputPackage {
+		margin-top: 15upx;
+	}
+
+	.userInfoInputMain {
+		background: rgba(250, 250, 250, 1);
+		margin-top: 18upx;
+		padding: 0 22upx;
+
+		>span {
+			text-align: right;
+			vertical-align: middle;
+			display: inline-block;
+			width: 96upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			border: none;
+			outline: none;
+			vertical-align: middle;
+			display: inline-block;
+			width: 350upx;
+			margin-left: 49upx;
+			height: 83upx;
+			background: rgba(250, 250, 250, 1);
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-left: 50upx;
+			vertical-align: middle;
+			width: 20upx;
+			height: 28upx;
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>image {
+				vertical-align: middle;
+				width: 21upx;
+				height: 24upx;
+				margin-right: 9upx;
+			}
+
+			>span {
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+
+		/deep/.uni-input {
+			margin-top: 27upx;
+		}
+
+		.timePickerView {
+			vertical-align: middle;
+			display: inline-block;
+			margin-left: 49upx;
+			width: 350upx;
+			height: 83upx;
+
+			>span {
+				line-height: 83upx;
+				vertical-align: top;
+				margin: 0 10upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	/deep/.uni-input {
+		margin-top: 27upx;
+	}
+
+	.timePickerView {
+		vertical-align: middle;
+		display: inline-block;
+		margin-left: 30upx;
+		width: 350upx;
+		height: 83upx;
+
+		>span {
+			line-height: 83upx;
+			vertical-align: top;
+			margin: 0 10upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.dataPicker {
+		width: 350upx;
+		height: 82upx;
+		display: inline-block;
+	}
+
+	.dataPicker1 {
+		width: 70upx;
+		height: 82upx;
+		display: inline-block;
+	}
+
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+	.homema{
+		.check-item {
+			padding: 0 10upx;
+			border-radius: 10upx;
+			background-color: #ff4444;
+			color: #ffffff;
+			height: 40upx;
+			line-height: 40upx;
+			text-align: center;
+			display: inline-block;
+			margin-right: 10upx;
+			margin-bottom: 10upx;
+			position: relative;
+			>image {
+				width: 30upx;
+				height: 30upx;
+				margin-top: 5upx;
+				vertical-align: top;
+				margin-left: 10upx;
+			}
+		}
+	}
+	.cicupation {
+		width: 750upx;
+		height: 550upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		border-radius: 30upx 30upx 0 0;
+		display: flex;
+		.cicupation-left {
+			padding-right: 10upx;
+			height: 450upx;
+			flex: 1;
+			overflow: auto;
+			.left-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				color: #ffffff;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				font-weight: bold;
+			}
+			.left-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+		.cicupation-right {
+			flex: 1;
+			padding-left: 10upx;
+			height: 450upx;
+			overflow: auto;
+			.right-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				color: #ffffff;
+			}
+			.right-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/merchant/storePcLogin/storePcLogin.vue b/pages/subPages/merchant/storePcLogin/storePcLogin.vue
new file mode 100644
index 0000000..6b199f3
--- /dev/null
+++ b/pages/subPages/merchant/storePcLogin/storePcLogin.vue
@@ -0,0 +1,93 @@
+<template>
+	<view>
+		<far-bottom></far-bottom>
+		<!-- 询问用户是否登录 -->
+		<view class="asking_login">
+			<view class="ask_header t-c">
+				<image :src="appInfo.logo"></image>
+				<view class="app-name f-30 col-3">{{appInfo.name}}商户号登录确认</view>
+				<view class="app-name f-26 col-c">为保证账号安全，请确认是本人进行登录</view>
+			</view>
+			<view class="ask_button t-c">
+				<view class="yes_login f-38 col-f" @click="loginStatusChange(2)">确认登录</view>
+				<view class="f-34 col-c" @click="loginStatusChange(-2)">取消</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				only_key: '',//唯一key
+				status: 1,//-1=初始化;-2=取消登录;-3=二维码失效;1=扫描成功;2=确认登录
+			}
+		},
+		onLoad(e) {
+			this.only_key = e.only_key;
+			this.loginStatusChange(this.status);
+		},
+		computed: {
+			appInfo(){
+				return this.$store.state.appInfo;
+			}
+		},
+		methods: {
+			//商户登录状态改变  
+			loginStatusChange(status){
+				let _this = this,
+				data = {
+					'status': status,
+					'only_key': _this.only_key
+				};
+				App._post_form('&p=store&do=storeLoginStatusChange', data, res => {
+					if(res.data.status == -2 || res.data.status == 2){
+						//确认登录 || 取消登录
+						_this.goHome();
+					}
+				}, false, (error) => {
+					if(error.data.errno == 1){
+						App.showError(error.data.message, (result) => {
+							//报错，跳转至首页
+							_this.goHome();
+						}, false)
+					}
+				})
+			},
+			goHome(){
+				App.navigationTo({
+					url:'pages/mainPages/index/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.ask_header{
+		margin-top: 15vh;
+		width: 100%;
+		 > image{
+			width: 280upx;
+			height: 280upx;
+			border-radius: 50%;
+		}
+	}
+	.ask_button{
+		position: fixed;
+	    bottom: 5vh;
+	    padding: 32upx;
+	    width: calc(100% - 64upx);
+		> view{
+			padding: 20upx;
+		}
+		> .yes_login{
+			background-color: #ef573c;
+		}
+	}
+</style>
diff --git a/pages/subPages/mineCollection/mineCollection.vue b/pages/subPages/mineCollection/mineCollection.vue
new file mode 100644
index 0000000..6a44d1b
--- /dev/null
+++ b/pages/subPages/mineCollection/mineCollection.vue
@@ -0,0 +1,549 @@
+<template>
+	<view class="mineCollection">
+		<far-bottom></far-bottom>
+		<view class="topNav">
+			<view @click="type = 1" :style="{width: platformInfor.citycardflag == 1?'49%':'98%'}">
+				<view :class="type == 1 ? 'check' : ''"><span>店铺</span></view>
+			</view>
+			<view class="line" ></view>
+			<view @click="type = 2" >
+				<view :class="type == 2 ? 'check' : ''"><span>帖子</span></view>
+			</view>
+			<view class="line" ></view>
+			<view @click="type = 3" v-if="platformInfor.citycardflag == 1 ">
+				<view :class="type == 3 ? 'check' : ''"><span>名片</span></view>
+			</view>
+		</view>
+
+		<view class="topFull"></view>
+
+		<!-- 列表区域 -->
+		<scroll-view v-if="type == 1" class="scrollList" :style="{ height: scollHeight }" :scroll-y="true" @scrolltolower="scdpLoad">
+			<!-- 收藏店铺循环模板 -->
+			<view class="scdpMb">
+				<view class="scdpMbPackage" v-for="(item, index) in storeCollectList" @click="goStoreIndex(item.store.id)">
+					<view class="scdpMbImg"><image :src="item.store.logo" />
+						<view class="sellOut" v-if="item.store.hourstatus == 0">
+							休息中
+						</view>
+					</view>
+					<view class="scdpMbInfo">
+						<view class="dis-flex">
+							<span>{{ item.store.storename }}</span>
+							<view>
+								<image :src="imgfixUrls + 'homePage/home_logo2.png'" class="image30" v-if="item.store['attestation']['attestation'] == 2" />
+								<!-- <img s:rc="@imgfixUrls + 'merchant/qyrz.png"' /> -->
+								<image :src="imgfixUrls + 'homePage/home_logo3.png'" class="image30" v-if="item.store['attestation']['bondflag'] == 1" />
+							</view>
+						</view>
+						<view>
+							<view class="stars">
+								<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.store.score > 1 || item.store.score == 1" />
+								<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+								<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.store.score > 2 || item.store.score == 2" />
+								<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+								<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.store.score > 3 || item.store.score == 3" />
+								<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+								<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.store.score > 4 || item.store.score == 4" />
+								<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+								<image :src="imgfixUrls + 'merchant/yStar.png'" v-if="item.store.score > 5 || item.store.score == 5" />
+								<image :src="imgfixUrls + 'merchant/nStar.png'" v-else />
+								<span>{{ item.store.score }}分</span>
+							</view>
+							<view>
+								<span>{{ item.store.distance }}</span>
+							</view>
+						</view>
+						<view>
+							<view>
+								<view>
+									<span>{{ item.store.storehours }}</span>
+								</view>
+							</view>
+							<view @click.stop="collection(item.store.id)"><span>取消收藏</span></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 收藏店铺循环模板 -->
+			<view class="tips">
+				<span>{{ scdpText }}</span>
+			</view>
+		</scroll-view>
+		<!-- 列表区域 -->
+		
+		<TabBars :tabBarAct="0" :pageType="''" />
+		
+		<!-- 列表	 -->
+		<view  v-if="type == 3">
+			<business-card  :is_Add="false" ref="businesscard" :businCard_list="cardlist" @chrbusinCard="chrbusinCard"  :is_have="is_have"></business-card>
+			<view  v-if="loadingMore">
+				<load-more :isMore="loadingMore"></load-more>
+			</view>
+		
+		</view>
+		
+		
+		<!-- 列表区域 -->
+		<postManage :postList="postList" :scollHeight="scollHeight" @loadTips="loadTips" :postLoadText="postLoadText" :source="source" v-if="type == 2"></postManage>
+		<!-- 列表区域 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import TabBars from '@/components/template/tabBar';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import postManage from '@/components/template/postManage';
+import loadMore from '@/components/template/loadmore.vue'
+import businessCard from "@/components/page/pageComponents/businessCard.vue"
+
+export default {
+	components: {
+		postManage,
+		TabBars,
+		businessCard,
+		loadMore
+	},
+	data() {
+		return {
+			source: 2,
+			type: 1,
+			storeCollectList: [],
+			page: 1,
+			lat: null,
+			lng: null,
+			loadingMore:false,
+			cardPage:1,
+			pagetotal: null,
+			list: [],
+			scdpText: '',
+			scollHeight: 0,
+			postList: [],
+			postPage: 1,
+			postTotal: null,
+			postLoadText: '',
+			cardlist:null,
+			agencyData:{},
+			is_have:1,
+			cradTotal:1,
+			citycardflag:0,
+			platformInfor:{}
+		};
+	},
+	onLoad: function() {
+		let _this = this;
+		let client = App.getClientType();
+		_this.curLoction = uni.getStorageSync('curLoction');
+		_this.agencyData = uni.getStorageSync('agencyData');
+		_this.platformInfor = uni.getStorageSync('platformInfor')
+		_this.storeCollect(_this.curLoction.latitude, _this.curLoction.longitude);
+		_this.init()
+		// if (client === '1' || client === '3') {
+			
+		// 	// // #ifdef H5
+		// 	// wxApi.wxRegister(() => {
+		// 	// 	jWeixin.ready(() => {
+		// 	// 		jWeixin.getLocation({
+		// 	// 			type: 'gcj02',
+		// 	// 			success: function(res) {
+							
+		// 	// 			}
+		// 	// 		});
+		// 	// 	});
+		// 	// });
+		// 	// // #endif
+		// 	// // #ifndef H5
+		// 	// wx.getLocation({
+		// 	// 	type: 'gcj02',
+		// 	// 	success(res) {
+		// 	// 		_this.storeCollect(res.latitude, res.longitude);
+		// 	// 	},
+		// 	// 	fail(res) {}
+		// 	// });
+		// 	// // #endif
+		// } else {
+		// 	uni.showLoading({
+		// 		title:'正在获取定位信息'
+		// 	})
+		// 	uni.getLocation({
+		// 		type: 'wgs84',
+		// 		success: function(res) {
+		// 			uni.hideLoading()
+		// 			_this.storeCollect(res.latitude, res.longitude);
+		// 		},
+		// 		fail: function(res) {
+		// 			_this.storeCollect();
+		// 			uni.hideLoading()
+		// 			uni.showToast({
+		// 				icon: 'none',
+		// 				title: '定位失败',
+		// 				duration: 2000
+		// 			});
+		// 		}
+		// 	});
+		// }
+		
+	},
+	onReachBottom() {
+		if(this.cardPage == this.cradTotal) return
+		this.getCardList(this.cardPage++,true);
+	},
+	watch:{
+		type(news,old){
+			if(news == 3){
+				this.getCardList();
+			}
+		}
+	},
+	mounted() {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight;
+			}
+		});
+		uni.createSelectorQuery()
+			.select('.topFull')
+			.boundingClientRect(data => {
+				_this.scollHeight = _this.phoneHight - data.height - 4 + 'px';
+			})
+			.exec();
+	},
+	methods: {
+		chrbusinCard(Newdata) {
+			this.setData({
+				cardList: Newdata
+			})
+		},
+		getCardList(page = 1, isPage = false) {
+			let _this = this,
+				agencyData = _this.agencyData,
+				requestData = {
+					page,
+					lat: agencyData.lat,
+					lng: agencyData.lng,
+					city_id: agencyData.areaid,
+					is_collect: '1'
+				};
+			App._post_form('&p=citycard&do=homeList', requestData, res => {
+		
+				let cardList = res.data.list;
+				_this.is_have = res.data.is_have;
+				if (isPage) {
+					_this["cardList"].push(...cardList);
+				} else {
+					_this.cardList = cardList;
+					setTimeout(()=>{
+						_this.$refs.businesscard.businCard_list = cardList;
+					})
+					// debugger
+					_this.cradTotal = res.data.total;
+					// console.log(this.$refs.businesscard.businCard_list,111111111111111111);
+					// debugger
+					
+				}
+				if(_this.cardList.length == 0){
+					_this.loadingMore = true;
+				}
+			}, false, () => {
+				_this.loadlogo = true;
+			})
+		},
+		init() {
+			let _this = this;
+			_this.getCollectionList();
+			
+		},
+		goStoreIndex(sid) {
+			App.navigationTo({
+				url: 'pages/mainPages/store/index?sid=' + sid
+			});
+		},
+		// 收藏店铺
+		loadTips() {
+			let _this = this;
+			if (_this.postPage == _this.postTotal) {
+				_this.postLoadText = '已无更多数据';
+			} else {
+				_this.postPage++;
+				_this.getCollectionList();
+			}
+		},
+		// 获取当前用户收藏的帖子的列表
+		getCollectionList() {
+			let _this = this;
+			_this.postLoadText = '加载中';
+			let data = {
+				page: _this.postPage,
+				page_index: 5
+			};
+			App._post_form('&p=pocket&do=getCollectionList', data, res => {
+				_this.postTotal = res.data.total;
+				_this.postList = [..._this.postList, ...res.data.list];
+				if (res.data.total == 0) {
+					_this.postLoadText = '已无更多数据';
+				} else {
+					_this.postLoadText = '';
+				}
+			});
+		},
+		// 收藏商户
+		collection(sid) {
+			let _this = this;
+			let data = {
+				sid: sid
+			};
+			App._post_form('&p=store&do=collection', data, res => {
+				for (let i = 0; i < _this.storeCollectList.length; i++) {
+					if (_this.storeCollectList[i].store.id == sid) {
+						_this.storeCollectList.splice(i, 1);
+					}
+				}
+				uni.showToast({
+					icon: 'none',
+					title: '取消收藏成功',
+					duration: 2000
+				});
+			});
+		},
+		// 收藏店铺列表
+		storeCollect(lat = '', lng = '') {
+			let _this = this;
+			_this.scdpText = '... ...加载中';
+			let data = {
+				page: _this.page,
+				lat: lat,
+				lng: lng
+			};
+			App._post_form('&p=member&do=storeCollect', data, res => {
+				_this.storeCollectList = [..._this.storeCollectList, ...res.data.list];
+				for (let i = 0; i < _this.storeCollectList.length; i++) {
+					_this.list.push(_this.storeCollectList[i].store);
+				}
+				_this.pagetotal = res.data.pagetotal;
+				_this.scdpText = '';
+				_this.citycardflag = res.data.citycardflag;
+				// if(res.data.pocketflag == 1){
+				// 	this.init();
+				// }
+			});
+		},
+		// 搜藏店铺加载
+		scdpLoad() {
+			let _this = this;
+			if (_this.page == _this.pagetotal) {
+				_this.scdpText = '没有更多数据了';
+			} else {
+				_this.page++;
+				_this.storeCollect();
+			}
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.dis-flex {
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+	}
+}
+.image30 {
+	width: 40upx;
+	height: 40upx;
+}
+.tips {
+	height: 80upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+
+		color: black;
+	}
+}
+page {
+	overflow-x: hidden;
+	background-color: #F8F8F8;
+}
+.mineCollection {
+	overflow-x: hidden;
+	background: #f8f8f8;
+	font-size: 0;
+	border: 1upx solid rgba(0, 0, 0, 0);
+}
+.topNav {
+	z-index: 2;
+	position: fixed;
+	top: 0upx;
+	width: 750upx;
+	height: 85upx;
+	background: rgba(255, 255, 255, 1);
+	display: flex;
+	justify-content: space-between;
+	> view {
+		text-align: center;
+		width: 49%;
+		display: inline-block;
+		> view {
+			height: 81upx;
+			width: 60upx;
+			margin: auto;
+			border-bottom: 4upx solid rgba(0, 0, 0, 0);
+			> span {
+				line-height: 85upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+	> .line {
+		margin-top: 30upx;
+		display: inline-block;
+		width: 1upx;
+		height: 26upx;
+		background: rgba(238, 238, 238, 1);
+	}
+}
+
+.check {
+	border-bottom: 4upx solid #ff4444 !important;
+	> span {
+		font-size: 28upx !important;
+
+		font-weight: 500 !important;
+		color: rgba(255, 68, 68, 1) !important;
+	}
+}
+.scrollList {
+	width: 690upx;
+	margin: auto;
+	border-radius: 10px;
+}
+.topFull {
+	width: 750upx;
+	height: 108upx;
+}
+.scdpMb {
+	background: rgba(255, 255, 255, 1);
+}
+.scdpMbPackage {
+	padding: 30upx;
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.scdpMbImg {
+	width: 159upx;
+	height: 159upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	position: relative;
+	> image {
+		width: 159upx;
+		height: 159upx;
+	}
+	.sellOut{
+		width: 159upx;
+		height: 40upx;
+		line-height: 40upx;
+		background-color: rgba(0,0,0,0.3);
+		color: #FFFFFF;
+		font-weight: 700;
+		font-size: 28upx;
+		text-align: center;
+		position: absolute;
+		bottom: 0;
+		left: 0;
+	}
+}
+.scdpMbInfo {
+	margin-left: 20upx;
+	width: 440upx;
+	> view:nth-child(1) {
+		> span {
+			font-size: 30upx;
+			color: rgba(0, 0, 0, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 10upx;
+		display: flex;
+		justify-content: space-between;
+		> view:nth-child(1) {
+			vertical-align: middle;
+			> image {
+				margin-right: 10upx;
+				vertical-align: middle;
+				width: 25upx;
+				height: 24upx;
+			}
+			> span {
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+		> view:nth-child(2) {
+			vertical-align: middle;
+			> span {
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+		> view {
+			display: inline-block;
+		}
+	}
+	> view:nth-child(3) {
+		display: flex;
+		justify-content: space-between;
+		> view:nth-child(1) {
+			margin-top: 10upx;
+			> view:nth-child(1) {
+				> span {
+					font-size: 24upx;
+
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+			> view:nth-child(2) {
+				margin-top: 5upx;
+				> span {
+					font-size: 24upx;
+
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+		}
+		> view:nth-child(2) {
+			margin-top: 25upx;
+			width: 126upx;
+			height: 48upx;
+			border: 1upx solid rgba(255, 68, 68, 1);
+			border-radius: 8upx;
+			text-align: center;
+			> span {
+				line-height: 48upx;
+				font-size: 24upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+		> view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/myPost/myPost.vue b/pages/subPages/myPost/myPost.vue
new file mode 100644
index 0000000..5db449c
--- /dev/null
+++ b/pages/subPages/myPost/myPost.vue
@@ -0,0 +1,305 @@
+<template>
+	<view class="myPost" v-if="load" style="padding-top: 90px;background-color: #FFFFFF;">
+		<view class="status_bar">
+			<!-- 这里是状态栏 -->
+		</view>
+		<navigationBar custom="true">
+			<view :style="{width: '100vw',height: '50px'}" style="background-color: #FFFFFF;position: fixed;z-index: 999;top:40px;">
+				<view :style="{padding: '10px', paddingLeft: '20px'}">
+					<image :style="{verticalAlign: 'middle', width: 94 + 'px',height: 30 + 'px'}" src="../../../static/logo.png" mode=""></image>
+				</view>
+			</view>
+		</navigationBar>
+		<far-bottom></far-bottom>
+		<!-- 顶部导航栏 -->
+		<view class="topNav">
+			<view @click="changeType(-1)">
+				<view :class="type == -1 ? 'check' : ''"><span>{{languageStatus!=1?'全部':'전체'}}</span></view>
+			</view>
+			<view @click="changeType(0)">
+				<view :class="type == 0 ? 'check' : ''"><span>{{languageStatus!=1?'显示中':'표시중'}}</span></view>
+			</view>
+			<view @click="changeType(1)">
+				<view :class="type == 1 ? 'check' : ''"><span>{{languageStatus!=1?'审核中':'심사중'}}</span></view>
+			</view>
+			<view @click="changeType(2)">
+				<view :class="type == 2 ? 'check' : ''"><span>{{languageStatus!=1?'未通过':'미통과'}}</span></view>
+			</view>
+		</view>
+		<!-- 顶部导航栏 -->
+
+		<!-- 填充层 -->
+		<view class="full"></view>
+		<!-- 填充层 -->
+
+		<noneMores v-if="total == 0"></noneMores>
+		<!-- 列表区域 -->
+		<postManage :postList.sync="postList" :scollHeight="scollHeight" @loadTips="loadTips" :isMore="isMore" :source="source"
+		 @shareInfo="setshare" @check="check" @delet="delet" @refresh="refresh" v-else ref="postmanage"></postManage>
+		<!-- 列表区域 -->
+		<view class="full"></view>
+
+		<TabBars :tabBarAct="0" :pageType="'9'" />
+	</view>
+</template>
+
+<script>
+	import postManage from '@/components/template/postManage';
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import noneMores from '@/components/template/nonemores.vue';
+
+	export default {
+		components: {
+			postManage,
+			TabBars,
+			noneMores
+		},
+		data() {
+			return {
+				type: -1,
+				postList: [],
+				scollHeight: null,
+				scdpText: '',
+				loadTip: null,
+				page: 1,
+				total: null,
+				isMore: false,
+				source: 1,
+				phoneHight: null,
+				fullHeight: null,
+				load:true,
+				height: 40
+			};
+		},
+		onLoad(e) {
+			// #ifdef MP-WEIXIN
+			wx.hideShareMenu();
+			// #endif
+			if(e.type){
+				// debugger
+				this.type = e.type;
+			}
+			this.init();
+		},
+		onShow() {
+			this.init();
+		},
+		mounted() {
+			let _this = this;
+			uni.createSelectorQuery()
+				.select('.full')
+				.boundingClientRect(data => {
+					_this.fullHeight = data.height;
+				})
+				.exec();
+			uni.getSystemInfo({
+				success(res) {
+					_this.scollHeight = res.windowHeight - _this.fullHeight * 2 + 'px';
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+		},
+		watch: {
+			loadTip: {
+				handler() {
+					let _this = this;
+					if (_this.page >= _this.total) {
+						_this.isMore = true;
+						return false;
+					}
+					_this.getUserPostList(++_this.current_page, true)
+				}
+			}
+		},
+		methods: {
+			refresh(id){
+				let _this = this;
+				let obj = {};
+				this.postList.map((item,index)=>{
+					if(item.id == id){
+						obj = item;
+						this.postList.splice(index,1);
+						this.postList.unshift(obj);
+					}
+				});
+				uni.showToast({
+					icon: 'none',
+					title: '刷新成功',
+					duration: 2000
+				});
+				this.load = !this.load;
+				this.load = !this.load;
+			},
+			delet(id){
+				let _this = this;
+				// console.log(this.$refs.postmanage.postList);
+				this.postList.map((item,index)=>{
+					if(item.id == id){
+						
+						this.postList.splice(index,1);
+						// debugger
+						// item.check  = true;
+						// _this.$set(item,'check',true);
+						// console.log(item.check)
+					}
+				});
+				this.load = !this.load;
+				this.load = !this.load;
+			},
+			check(items){
+				let _this = this;
+				// console.log(this.$refs.postmanage.postList);
+				this.postList.map((item,index)=>{
+					if(item.id == items){
+						item.check  = true;
+						_this.$set(item,'check',true);
+						console.log(item.check)
+					}
+				});
+				this.load = !this.load;
+				this.load = !this.load;
+			},
+			init() {
+				let _this = this;
+				_this.getUserPostList();
+			},
+			// 切换类型
+			changeType(type) {
+				let _this = this;
+				_this.postList = [];
+				_this.type = type;
+				_this.page = 1;
+				_this.getUserPostList();
+			},
+			// 获取我的帖子列表
+			getUserPostList(page = 1, isPage = false) {
+				let _this = this,
+					data = {
+						page,
+						status: _this.type
+					};
+				App._post_form('&p=pocket&do=userList', data, res => {
+					if (isPage) {
+						if (res.data.list.length > 0) {
+							_this["postList"].push(...res.data.list);
+							console.log(_this.postList);
+						} else {
+							_this.isMore = true;
+						}
+					} else {
+						_this.setData({
+							current_page: 1,
+							postList: res.data.list,
+							total: res.data.total,
+							isMore: res.data.list.length === 0 || _this.page === res.data.total
+						})
+					};
+					_this.postList.forEach(item=>{
+						item.check = false;
+					})
+				});
+			},
+			loadTips(e) {
+				let _this = this;
+				_this.loadTip = e;
+				console.log(e)
+			}
+
+			
+		},
+		onShareAppMessage(e) {
+			let _this = this;
+			_this.$refs.postmanage.show = false;
+			let agencyData = uni.getStorageSync('agencyData');
+			console.log(_this.$refs.postmanage.items.id);
+			if (e.from === 'button') {
+				// 来自页面内分享按钮
+				let data = {
+					id: _this.$refs.postmanage.items.id
+				};
+				App._post_form('&p=pocket&do=shareNum', data, res => {
+					_this.$refs.postmanage.items.share++;
+					console.log('shareNum2222')
+					uni.showToast({
+						icon: 'none',
+						title: '分享成功',
+						duration: 2000
+					});
+				});
+			}
+
+			return {
+				title: _this.$refs.postmanage.items.share_title,
+				path: 'pages/subPages/postDetails/postDetails?id=' + _this.$refs.postmanage.items.id + '&aid=' + agencyData.aid,
+				desc: _this.$refs.postmanage.items.content,
+				imageUrl: _this.$refs.postmanage.items.shareimg
+			};
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.full {
+		height: 100upx;
+	}
+
+	.check {
+		border-bottom: 7upx solid rgba(255, 68, 68, 1) !important;
+
+		>span {
+			color: rgba(255, 68, 68, 1) !important;
+		}
+	}
+
+	.topNav {
+		z-index: 2;
+		position: fixed;
+		top: 180upx;
+		width: 750upx;
+		height: 99upx;
+		background: rgba(255, 255, 255, 1);
+
+		>view {
+			text-align: center;
+			display: inline-block;
+			width: 25%;
+			vertical-align: middle;
+
+			>view {
+				height: 92upx;
+				margin: auto;
+				width: 90upx;
+				border-bottom: 7upx solid rgba(0, 0, 0, 0);
+
+				>span {
+					line-height: 99upx;
+					font-size: 28upx;
+
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+		}
+	}
+
+	.myPost {
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	page {}
+	//
+	.status_bar {
+		height: var(--status-bar-height);
+		width: 100%;
+		background-color: #fff;
+		position: fixed;
+		padding-bottom: 15px;
+		z-index: 99;
+		top: 0px;
+	}
+</style>
diff --git a/pages/subPages/orderList/afterSale/afterSale.vue b/pages/subPages/orderList/afterSale/afterSale.vue
new file mode 100644
index 0000000..fa11160
--- /dev/null
+++ b/pages/subPages/orderList/afterSale/afterSale.vue
@@ -0,0 +1,943 @@
+<template>
+	<view class="afterSale">
+		<far-bottom></far-bottom>
+		<!-- 商品信息 -->
+		<view class="orderInfo">
+			<view class="orderInfoPackage">
+				<view class="orderInfoImg">
+					<image :src="AfterSaleInfo.goodLogo" />
+				</view>
+				<view class="orderInfos">
+					<view>
+						<span>{{ AfterSaleInfo.goodName }}</span>
+					</view>
+					<view>
+						<span>{{ AfterSaleInfo.optionName }}</span>
+						<span v-if="AfterSaleInfo.num > 0">x{{ AfterSaleInfo.num }}</span>
+					</view>
+					<view>
+						<span>¥{{ AfterSaleInfo.allprice }}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品信息 -->
+
+		<!-- 服务类型 -->
+		<view class="afterSaleType">
+			<view class="afterSaleTypePackage">
+				<view class="afterSaleTypeTitle">
+					<view class="line"></view>
+					<span>服务类型</span>
+				</view>
+				<view class="afterSaleTypeBody">
+					<view :class="[type == 3 ? 'check' : '']" @click="checkType(3)" v-if="AfterSaleInfo.type.indexOf(3) !== -1"><span>退货退款</span></view>
+					<view :class="[type == 2 ? 'check' : '']" @click="checkType(2)" v-if="AfterSaleInfo.type.indexOf(2) !== -1"><span>换货</span></view>
+					<view :class="[(type == 1 || plugin == 'citydelivery') ? 'check' : '']" @click="checkType(1)" v-if="(AfterSaleInfo.type.indexOf(1) !== -1) || plugin == 'citydelivery'"><span>退款</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 服务类型 -->
+
+		<!-- 选择核销码 -->
+		<view class="checkCode" v-if="AfterSaleInfo.usestatus=='1'">
+			<view class="checkCodeTitle dis-flex f-24">
+				<view style="flex: 0.8;">
+					核销码(可多选)
+				</view>
+				<view  style="flex: 0.2;">
+					<view class="dis-il-block allcheck"  @click="checkall">
+						全选
+					</view>
+				</view>
+				
+			</view>
+			<view class="checkCodeBody">
+				<!-- 核销码循环模板 -->
+				<view v-for="(item, index) in AfterSaleInfo.checkcodes">
+					<span>
+						核销码{{ index + 1 }}
+						<span>{{ item.checkcode }}</span>
+					</span>
+					<view :class="codes.indexOf(item.checkcode) == -1 ? '' : 'checkedCode'" @click="checkedCodes(item.checkcode, item.orderprice)">
+						<image :src="imgfixUrls + 'merchant/payCheck.svg'" v-if="codes.indexOf(item.checkcode) !== -1" />
+					</view>
+				</view>
+				<!-- 核销码循环模板 -->
+			</view>
+		</view>
+		<!-- 选择核销码 -->
+		
+		<!-- 退票数量 -->
+		<view class="checkReason" v-if="AfterSaleInfo.usestatus == 3">
+			<view class="checkReasonPackage">
+				<span>申请数量</span>
+				<view>
+					<tui-numberbox  :value="numbers" id="goshop" @change="change($event,'goshop')" :width="60" :min="0" style="float: right;"></tui-numberbox>
+				</view>
+			</view>
+		</view>
+		<!-- 退票数量 -->
+		
+		<!-- 选择申请原因 -->
+		<view class="checkReason" @click="con">
+			<view class="checkReasonPackage">
+				<span>申请原因</span>
+				<view>
+					<span>{{ reasonText }}</span>
+					<image :src="imgfixUrls + 'merchant/right.svg'" />
+				</view>
+			</view>
+		</view>
+		<!-- 选择申请原因 -->
+
+		<!-- 问题描述 -->
+		<view class="describeQa">
+			<view class="describeQaPackage">
+				<view class="afterSaleTypeTitle">
+					<view class="line"></view>
+					<span>问题描述</span>
+				</view>
+				<textarea placeholder="请详细填写申请原因，注意保持商品完好，建议您先与卖家沟通" v-model="detail" v-if="reasonPop==false"></textarea>
+			</view>
+		</view>
+		<!-- 问题描述 -->
+
+		<!-- 上传凭证 -->
+		<view class="voucherUp">
+			<view class="voucherUpPackage">
+				<view class="afterSaleTypeTitle">
+					<view class="line"></view>
+					<span>上传凭证(最多6张)</span>
+				</view>
+
+				<view class="voucherUpBody">
+					<!-- 预览模板 -->
+					<view class="xlMb" v-for="(item, index) in imagse">
+						<image :src="item" />
+						<image @click="closePic(item)" :src="imgfixUrls + 'merchant/close.png'" class="closeButton" />
+					</view>
+					<!-- 预览模板 -->
+					<view class="upLoad" @click="uploadFiles" v-if="imagse.length < 6">
+						<image :src="imgfixUrls + 'merchant/cream.png'" />
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 上传凭证 -->
+
+		<view class="full"></view>
+
+		<!-- 底部导航栏 -->
+		<view class="navBottom">
+			<view>
+				<span>
+					退款金额：
+					<span>¥{{ allprice }}</span>
+				</span>
+			</view>
+			<view @click="afterSaleApply"><span>提交申请</span></view>
+		</view>
+		<!-- 底部导航栏 -->
+
+		<!-- 退款原因 -->
+		<PopManager :show="reasonPop" :type="reasonType" @clickmask="closeReasonPop">
+			<view class="reasonPopView">
+				<view class="reasonPopViewPackage">
+					<view class="reasonTitle">
+						<span>退款申请</span>
+						<image :src="imgfixUrls + 'merchant/close.png'" @click="closeReasonPop" />
+					</view>
+					<view class="reasonButton" v-for="(items, indexs) in reasonList" @click="checkReason(indexs)">
+						<span>{{ items }}</span>
+						<view :class="reason == indexs ? 'reasonYCheck' : 'reasonNCheck'">
+							<image :src="imgfixUrls + 'merchant/payCheck.svg'" v-if="reason == indexs" />
+						</view>
+					</view>
+					<view class="reasonSubmitButton" @click="closeReasonPop"><span>确认</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 退款原因 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import util from '@/common/js/util.js';
+	import PopManager from '@/components/template/PopManager';
+	import tuiNumberbox from '@/components/template/numberbox.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components: {
+			PopManager,
+			tuiNumberbox
+		},
+		data() {
+			return {
+				reasonType: 'bottom',
+				reasonPop: false,
+				type: '',
+				codes: [],
+				AfterSaleInfo: {},
+				id: null,
+				plugin: null,
+				detail: '',
+				thumbs: [],
+				allprice: 0,
+				numbers:1,
+				imagse: [],
+				reasonList: [
+					'预约不上',
+					'商家营业但不接待',
+					'商家建议其他平台/直接购买',
+					'店里活动更优惠',
+					'商家/停业/装修/转让',
+					'朋友/网上评论不好',
+					'买多了/买错了',
+					'计划有变，没时间消费'
+				],
+				reason: 0,
+				reasonText: ''
+			};
+		},
+		onLoad: function(option) {
+			let _this = this;
+			this.id = option.id;
+			this.plugin = option.plugin;
+			_this.afterid = option.afterid || '';
+			this.init();
+			_this.reasonText = _this.reasonList[0];
+		},
+		methods: {
+			change(e){
+				console.log(e);
+				if(e.value > this.AfterSaleInfo.surplusnum || e.value == 0) return
+				this.numbers = e.value;
+			},
+			checkall(){
+				let _this = this;
+				if(_this.codes.length == _this.AfterSaleInfo.checkcodes.length){
+					_this.AfterSaleInfo.checkcodes.map((item,index)=>{
+					 _this.checkedCodes(item.checkcode, item.orderprice,false);
+					})
+				}else{
+					_this.codes = [];
+					_this.AfterSaleInfo.checkcodes.map((item,index)=>{
+						_this.checkedCodes(item.checkcode, item.orderprice,true);
+					})
+				}
+				
+
+			},
+			con() {
+				let _this = this
+				console.info(_this.reasonList)
+				_this.reasonPop = true
+			},
+			init() {
+				let _this = this;
+				_this.getAfterSaleInfo();
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+			},
+			// 关闭弹窗
+			closeReasonPop() {
+				let _this = this;
+				_this.reasonPop = false;
+			},
+			// 售后服务
+			getAfterSaleInfo() {
+				let _this = this;
+				let data = {
+					id: _this.id,
+					plugin: _this.plugin,
+					afterid: _this.afterid
+				};
+				App._post_form('&p=pay&do=afterSale', data, res => {
+					_this.AfterSaleInfo = res.data;
+					if(!_this.AfterSaleInfo.type){
+						_this.AfterSaleInfo.type = [];
+					}
+					if(_this.AfterSaleInfo.type.length == 1){
+						_this.checkType(_this.AfterSaleInfo.type);
+					}
+					if(_this.plugin == 'citydelivery'){
+						_this.AfterSaleInfo.type = [1];
+						_this.type = 1;
+					}
+					if (res.data.usestatus == '2') {
+						_this.allprice = res.data.allprice
+					}
+				});
+			},
+			// 选择服务类型
+			checkType(id) {
+				let _this = this;
+				_this.type = id;
+			},
+			checkReason(index) {
+				let _this = this;
+				_this.reason = index;
+				_this.reasonText = _this.reasonList[index];
+			},
+			// 选择核销码
+			checkedCodes(code, orderprice,flag) {
+				let _this = this;
+				orderprice = Number(orderprice);
+				if (_this.codes.indexOf(code) !== -1 && !flag) {
+					for (let i = 0; i < _this.codes.length; i++) {
+						if (_this.codes[i] == code) {
+							_this.codes.splice(i, 1);
+						}
+					}
+					_this.allprice = util.subtractionFloat(_this.allprice, orderprice, 100);
+					if (_this.allprice > _this.AfterSaleInfo.allprice) {
+						_this.allprice = _this.AfterSaleInfo.allprice;
+					}
+				} else if(_this.codes.indexOf(code) == -1 && !flag){
+					_this.codes.push(code);
+					_this.allprice = util.additionFloat(_this.allprice, orderprice, 100);
+					if (_this.allprice > _this.AfterSaleInfo.allprice) {
+						_this.allprice = _this.AfterSaleInfo.allprice;
+					}
+				}else{
+					_this.codes.push(code);
+					_this.allprice = util.additionFloat(_this.allprice, orderprice, 100);
+					if (_this.allprice > _this.AfterSaleInfo.allprice) {
+						_this.allprice = _this.AfterSaleInfo.allprice;
+					}
+				}
+				console.info(_this.codes);
+			},
+			// 删除图片
+			closePic(item) {
+				let _this = this;
+				for (let i = 0; i < _this.imagse.length; i++) {
+					if (item == _this.imagse[i]) {
+						_this.imagse.splice(i, 1);
+						_this.thumbs.splice(i, 1);
+					}
+				}
+			},
+			// 提交售后申请
+			afterSaleApply() {
+				let _this = this;
+				let data = {
+					id: _this.id,
+					plugin: _this.plugin,
+					type: _this.type,
+					checkcodes: _this.codes,
+					reason: _this.reasonText,
+					detail: _this.detail,
+					thumbs: _this.thumbs,
+					afterid: _this.afterid,
+					usestatus: _this.AfterSaleInfo.usestatus,
+					num:_this.AfterSaleInfo.usestatus == 3?_this.numbers:''
+				};
+				if (_this.type == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择服务类型',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.codes.length < 1 && _this.AfterSaleInfo.usestatus != '2' && _this.AfterSaleInfo.usestatus != '3') {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择核销码',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.detail == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入问题描述',
+						duration: 2000
+					});
+					return;
+				}
+				if(_this.AfterSaleInfo.tiptext){
+					uni.showModal({
+						title:'温馨提示',
+						content:_this.AfterSaleInfo.tiptext,
+						success(res) {
+							if(res.confirm){
+								_this.saveForm('1')
+								App._post_form('&p=pay&do=afterSaleApply', data, res => {
+									uni.showToast({
+										icon: 'none',
+										title: '申请退款成功',
+										duration: 2000,
+										success: function() {
+											setTimeout(function() {
+												uni.navigateBack({
+													delta: 1
+												});
+											}, 2000);
+										}
+									});
+								});
+							}
+						}
+					})
+				}else{
+					_this.saveForm('1')
+					App._post_form('&p=pay&do=afterSaleApply', data, res => {
+						uni.showToast({
+							icon: 'none',
+							title: '申请退款成功',
+							duration: 2000,
+							success: function() {
+								setTimeout(function() {
+									uni.navigateBack({
+										delta: 1
+									});
+								}, 2000);
+							}
+						});
+					});
+				}
+				
+				
+			},
+			// 文件上传接口
+			async uploadFiles(type) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(6);
+				    console.info(res);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i]);
+				    	_this.thumbs.push(aa.data.image);
+				    	_this.imagse.push(aa.data.img);
+				    }
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading();
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										_this.thumbs.push(res.data.image);
+										_this.imagse.push(res.data.img);
+									}
+									uni.hideLoading();
+								},
+								fail => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						console.info(res);
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							_this.thumbs.push(aa.data.image);
+							_this.imagse.push(aa.data.img);
+						}
+					}
+				});
+				// #endif
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.reasonNCheck {
+		margin-top: 20upx;
+		width: 32upx;
+		height: 32upx;
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 16upx;
+	}
+
+	.reasonSubmitButton {
+		margin: 24upx auto 0 auto;
+		width: 688upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.reasonYCheck {
+		margin-top: 20upx;
+		line-height: 70upx;
+		width: 32upx;
+		height: 32upx;
+		border-radius: 16upx;
+		background: #ff4444;
+
+		>image {
+			width: 32upx;
+			height: 32upx;
+		}
+	}
+
+	.reasonButton {
+		display: flex;
+		justify-content: space-between;
+		height: 70upx;
+
+		>span {
+			line-height: 70upx;
+			font-size: 24upx;
+			lor: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.reasonTitle {
+		height: 50upx;
+		text-align: center;
+
+		>span {
+			vertical-align: middle;
+			line-height: 50upx;
+			font-size: 30upx;
+			lor: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-top: 15upx;
+			vertical-align: middle;
+			float: right;
+			width: 28upx;
+			height: 28upx;
+		}
+	}
+
+	.reasonPopViewPackage {
+		padding: 30upx;
+
+		>.reasonButton:nth-child(2) {
+			margin-top: 40upx !important;
+		}
+	}
+
+	.reasonPopView {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20upx 20upx 0px 0px;
+	}
+
+	.closeButton {
+		width: 34upx !important;
+		height: 34upx !important;
+		position: relative;
+		bottom: 130upx;
+		left: 95upx;
+	}
+
+	.xlMb {
+		width: 133upx;
+		height: 134upx;
+		border-radius: 6upx;
+		overflow: hidden;
+
+		>image:nth-child(1) {
+			width: 133upx;
+			height: 134upx;
+		}
+
+		>image:nth-child(2) {
+			left: 100upx;
+			position: relative;
+			bottom: 134upx;
+			width: 30upx;
+			height: 30upx;
+		}
+	}
+
+	.voucherUpBody {
+		flex-wrap: wrap;
+		margin-top: 20upx;
+
+		>view:nth-child(1) {
+			margin-left: 0;
+		}
+
+		>view {
+			margin-top: 20upx;
+			vertical-align: middle;
+			display: inline-block;
+			margin-right: 25upx;
+		}
+	}
+
+	.upLoad {
+		width: 133upx;
+		height: 132upx;
+		border: 1upx dashed rgba(204, 204, 204, 1);
+		border-radius: 6upx;
+		text-align: center;
+
+		>image {
+			margin: 33upx 0 0 0;
+			width: 66upx;
+			height: 66upx;
+		}
+	}
+
+	.navBottom {
+		display: flex;
+		justify-content: space-between;
+		position: fixed;
+		bottom: 0;
+		width: 750upx;
+		height: 97upx;
+		background: rgba(255, 255, 255, 1);
+		border: 1upx solid rgba(238, 238, 238, 0.67);
+
+		>view:nth-child(1) {
+			padding: 35upx 30upx;
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+
+				>span {
+					color: #fe504f;
+				}
+			}
+		}
+
+		>view:nth-child(2) {
+			width: 302upx;
+			height: 97upx;
+			background: rgba(255, 68, 68, 1);
+			text-align: center;
+
+			>span {
+				line-height: 97upx;
+				font-size: 28upx;
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	.full {
+		width: 750upx;
+		height: 135upx;
+	}
+
+	.voucherUpPackage {
+		padding: 30upx;
+	}
+
+	.voucherUp {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.describeQaPackage {
+		padding: 30upx;
+
+		>textarea {
+			height: 238upx;
+			width: 570upx;
+			padding: 30upx;
+			background: rgba(249, 249, 249, 1);
+			margin: 20upx 0 0 0;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.describeQa {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.checkReasonPackage {
+		padding: 30upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>span {
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>image {
+				vertical-align: middle;
+				width: 10px;
+				height: 15px;
+			}
+		}
+	}
+
+	.checkReason {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.checkedCode {
+		background: rgba(255, 68, 68, 1);
+
+		>image {
+			width: 32upx;
+			height: 32upx;
+		}
+	}
+
+	.checkCodeBody {
+		padding: 30upx;
+
+		>view {
+			margin-top: 30upx;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+
+				>span {
+					color: #999999;
+					margin-left: 35upx;
+				}
+			}
+
+			>view {
+				vertical-align: middle;
+				width: 32upx;
+				height: 32upx;
+				border: 1upx solid rgba(204, 204, 204, 1);
+				border-radius: 6upx;
+			}
+		}
+
+		>view:nth-child(1) {
+			margin-top: 0;
+		}
+	}
+
+	.checkCodeTitle {
+		padding: 30upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+
+		>span {
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+
+			>span {
+				font-size: 24upx;
+				color: #999999;
+			}
+		}
+	}
+
+	.checkCodeTitlePackage {
+		padding: 30upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	}
+
+	.checkCode {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.check {
+		background: rgba(255, 68, 68, 1) !important;
+		border: 1upx solid rgba(0, 0, 0, 0) !important;
+
+		>span {
+			color: rgba(255, 255, 255, 1) !important;
+		}
+	}
+
+	.afterSaleTypeBody {
+		margin-top: 40upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			width: 160upx;
+			height: 57upx;
+			border: 1upx solid rgba(204, 204, 204, 1);
+			border-radius: 10upx;
+			display: inline-block;
+			vertical-align: middle;
+			text-align: center;
+
+			>span {
+				line-height: 57upx;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+
+	.line {
+		vertical-align: middle;
+		display: inline-block;
+		width: 8upx;
+		height: 26upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+	}
+
+	.afterSaleTypeTitle {
+		>span {
+			margin-left: 15upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	page {
+		overflow-x: hidden;
+	}
+
+	.afterSale {
+		background: #f8f8f8;
+		font-size: 0;
+	}
+
+	.orderInfo {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+	}
+
+	.orderInfoPackage {
+		padding: 30upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.orderInfoImg {
+		width: 170upx;
+		height: 170upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 170upx;
+			height: 170upx;
+		}
+	}
+
+	.orderInfos {
+		width: 483upx;
+		margin-left: 20upx;
+
+		>view:nth-child(1) {
+			height: 70upx;
+			overflow: hidden;
+
+			>span {
+				font-size: 28upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin: 15upx 0 0 0;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		>view:nth-child(3) {
+			margin: 20upx 0 0 0;
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(254, 80, 79, 1);
+			}
+		}
+	}
+
+	.afterSaleType {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.afterSaleTypePackage {
+		padding: 30upx;
+	}
+	.allcheck{
+		padding: 3upx 20upx;
+		border-radius: 8upx;
+		border: 1upx solid #FF4444;
+		color: #FF4444;
+		float: right;
+		height: 35upx;
+		line-height: 35upx;
+	}
+</style>
diff --git a/pages/subPages/orderList/orderDetails/orderDetails.vue b/pages/subPages/orderList/orderDetails/orderDetails.vue
new file mode 100644
index 0000000..e35b4f0
--- /dev/null
+++ b/pages/subPages/orderList/orderDetails/orderDetails.vue
@@ -0,0 +1,1611 @@
+<template>
+	<loadlogo v-if="loading == true"></loadlogo>
+	
+	<view class="orderDetails" v-else :style="{ height: orderDetailList.moinfo?'auto':phoneHeight }">
+		<far-bottom></far-bottom>
+		<!-- 标题区域 -->
+		<view :class="['orderDetailsTitle', orderDetailList.status == 998 || orderDetailList.status == 998 ? 'merchant-bg' : '']">
+			<view v-if="orderDetailList.status == 2">
+				<image :src="imgfixUrls + 'merchant/pj.png'" />
+				<span>待评价</span>
+			</view>
+			<view v-if="orderDetailList.status == 4">
+				<image :src="imgfixUrls + 'merchant/sh.png'" />
+				<span>待收货</span>
+			</view>
+			<view v-if="orderDetailList.status == 5">
+				<image :src="imgfixUrls + 'merchant/qx.png'" />
+				<span>已取消</span>
+			</view>
+			<view v-if="orderDetailList.status == 8">
+				<image :src="imgfixUrls + 'merchant/sh.png'" />
+				<span>待发货</span>
+			</view>
+			<view v-if="orderDetailList.status == 0">
+				<image :src="imgfixUrls + 'merchant/fk.png'" />
+				<span>待付款</span>
+			</view>
+			<view v-if="orderDetailList.status == 3">
+				<image :src="imgfixUrls + 'merchant/wc.png'" />
+				<span>已完成</span>
+			</view>
+			<view v-if="orderDetailList.status == 7">
+				<image :src="imgfixUrls + 'merchant/tk.png'" />
+				<span>已退款</span>
+			</view>
+			<view v-if="orderDetailList.status == 1">
+				<image :src="imgfixUrls + 'merchant/sy.png'" />
+				<span>待使用</span>
+			</view>
+			<view v-if="orderDetailList.status == 9">
+				<image :src="imgfixUrls + 'merchant/qx.png'" />
+				<span>已过期</span>
+			</view>
+			<view v-if="orderDetailList.status == 10">
+				<image :src="imgfixUrls + 'merchant/sy.png'" />
+				<span>退款中</span>
+			</view>
+			<!-- 智慧城市商家订单详情 -->
+			<view v-if="orderDetailList.status == 998">
+				<image :src="imgfixUrls + 'centerMerchant/yfh.png'" />
+				<span>卖家已发货</span>
+			</view>
+			<!-- 智慧城市商家订单详情 -->
+			<!-- 智慧城市商家订单详情待使用 -->
+			<view v-if="orderDetailList.status == 997">
+				<image :src="imgfixUrls + 'centerMerchant/yfh.png'" />
+				<span>待使用</span>
+			</view>
+			<!-- 智慧城市商家订单详情待使用 -->
+			<span v-if="orderDetailList.status == '4' && orderDetailList.expresssn !== null">您的快件正在路上，请耐心等待~</span>
+			<span v-if="orderDetailList.status == '8'">请耐心等待商家发货</span>
+			<span v-if="orderDetailList.tiptext" style="margin-top: 32upx;">{{orderDetailList.tiptext}}</span>
+			<span v-if="orderDetailList.status == '0' && !!countDown['timeobj'] && !orderDetailList.isTimeOver">
+				剩余{{ countDown['timeobj']['hh'] }}:{{ countDown['timeobj']['mm'] }}:{{ countDown['timeobj']['ss'] }}自动取消
+			</span>
+		</view>
+		<!-- 标题区域 -->
+
+		<!-- 收货信息 -->
+		<view class="receiptDetails" v-if="orderDetailList.usestatus == 2 && orderDetailList.sid !== '0'">
+			<view class="receiptDetailsPackage">
+				<!-- 快递信息 -->
+				<view class="expressDetails" v-if="orderDetailList.status == 4 || orderDetailList.status == 2 || orderDetailList.status == 3"
+				 @click="logistics(orderDetailList.id, orderDetailList.a)">
+					<view class="receiptDetailsLogo">
+						<image :src="imgfixUrls + 'merchant/kd.png'" />
+					</view>
+					<view class="expressDetailsInfo">
+						<view class="expressDetailsInfoTitle">
+							<span>{{ orderDetailList.expressname }}</span>
+							<span>{{ orderDetailList.expresssn }}</span>
+						</view>
+						<view class="expressDetailsInfoBody">
+							<span>{{ expressList.AcceptStation }}</span>
+						</view>
+						<view class="expressDetailsInfoFoot">
+							<span>{{ expressList.AcceptTime }}</span>
+						</view>
+					</view>
+					<image :src="imgfixUrls + 'merchant/right.svg'" class="right" />
+				</view>
+				<!-- 快递信息 -->
+
+				<!-- 收货地址 -->
+				<view class="addressDetails">
+					<view class="addressDetailsLogo">
+						<image :src="imgfixUrls + 'merchant/where.png'" />
+					</view>
+					<view class="addressDetailsInfo">
+						<view class="expressDetailsInfoTitle">
+							<span>{{ orderDetailList.expName }}</span>
+							<span>{{ orderDetailList.expTel }}</span>
+						</view>
+						<view class="expressDetailsInfoBody">
+							<span>{{ orderDetailList.expAddress }}</span>
+						</view>
+					</view>
+				</view>
+				<!-- 收货地址 -->
+			</view>
+
+			<!-- 彩条 -->
+			<view class="receiptDetailsFoot"></view>
+			<!-- 彩条 -->
+		</view>
+		<!-- 收货信息 -->
+
+		<!-- 购买信息 -->
+		<view :class="['purchaseDetails', orderDetailList.status == 998 || orderDetailList.status == 998 ? 'merchant-bg' : '']"
+		 v-if="orderDetailList.usestatus == 1 || orderDetailList.usestatus == 3" >
+			<view class="purchaseDetailsPackage" v-if="orderDetailList.sid !== '0'">
+				<view class="purchaseDetailsTitle" v-if="orderDetailList.status == 1 && orderDetailList.usestatus == 1">
+					<view class="purchaseTitlePackage">
+						<span>{{ orderDetailList.codeNum }}张可用 | {{ orderDetailList.estimatetime }}到期</span>
+						<view v-if="orderDetailList.verkeystatus == 1 && orderDetailList.codeNum != '0'" @click="goHx"><span>密码核销</span></view>
+					</view>
+				</view>
+				<view class="purchaseDetailsBody" v-if="orderDetailList.usestatus == 3 && orderDetailList.checkcodes.length !== 0">
+					<view class="f-24 col-3">卡密: <text class="col-f4 f-20">(点击核销码复制到粘贴板)</text> </view>
+					<scroll-view :scroll-y="true" class="scrollView" :style="{height: orderDetailList.checkcodes.length > 4?'230upx':'100upx'}">
+						<span v-for="(items, index) in orderDetailList.checkcodes"  class="scrollSpan" @click="copy(items.checkcode)">{{ items.checkcode }}</span>
+					</scroll-view>
+					<!-- <view><img s:rc="@imgfixUrls + 'centerMerchant/'qrcode.png" /></view> -->
+				</view>
+				<view class="purchaseDetailsBody" v-if="orderDetailList.status == 1 && orderDetailList.usestatus == 1 && orderDetailList.checkcodes.length !== 0">
+					<view class="f-24 col-3">核销码: <text class="col-f4 f-20">(点击核销码复制到粘贴板)</text> </view>
+					<scroll-view :scroll-y="true" class="scrollView" :style="{height: orderDetailList.checkcodes.length > 4?'230upx':'100upx'}">
+						<span v-for="(items, index) in orderDetailList.checkcodes" v-if="items.status == 1" @click="copy(items.checkcode)" class="scrollSpan">{{ items.checkcode }}{{orderDetailList.appointstatus == 1?'('+( items.appointstatus == 1?'未预约':items.appointstatus == 2?'预约中':'已预约') +')':''}}</span>
+					</scroll-view>
+					<!-- <view><img s:rc="@imgfixUrls + 'centerMerchant/'qrcode.png" /></view> -->
+				</view>
+				<view class="purchaseDetailsFoot">
+					<view class="purchaseDetailsFootLeft" @click="goDw(false)">
+						<view>
+							<image :src="imgfixUrls + 'merchant/store.png'" />
+							<span>{{ orderDetailList.storename }}</span>
+						</view>
+						<view>
+							<span>{{ orderDetailList.address }} >{{ orderDetailList.distance }}</span>
+						</view>
+					</view>
+					<view class="line"></view>
+					<view class="purchaseDetailsFootRight">
+						<image :src="imgfixUrls + 'merchant/call.png'" @click="kfPhone" />
+					</view>
+				</view>
+				<!--智慧城市商家订单详情待使用  -->
+				<view class="centerMerchant-dsy dis-flex flex-x-between" v-if="orderDetailList.status == 997">
+					<view class="dis-flex flex-y-center">
+						<image class="m-right30" :src="imgfixUrls + 'centerMerchant/dsymsg.png'" />
+						<view class="f-28 m-right20 name">安宁</view>
+						<view class="f-24">138****888</view>
+					</view>
+					<image :src="imgfixUrls + 'centerMerchant/phone2.png'" />
+				</view>
+			</view>
+			<!-- 彩条 -->
+			<view class="receiptDetailsFoot" v-if="orderDetailList.sid !== '0'"></view>
+			<!-- 彩条 -->
+
+			<!-- 智慧城市商家订单详情两个按钮 -->
+			<view class="colorbar-btns dis-flex f-24" v-if="orderDetailList.status == 998">
+				<view>联系收货人</view>
+				<view>复制地址</view>
+			</view>
+		</view>
+		<!-- 购买信息 -->
+
+		<!-- 商品信息 -->
+		<view class="goodsDetails" @click="goGoodDetail">
+			<view class="goodsDetailsPackage">
+				<view class="goodsDetailsImg">
+					<image :src="orderDetailList.goodLogo" />
+				</view>
+				<view class="goodsDetailsInfo">
+					<view class="goodsDetailsInfoTitle twolist-hidden">
+						<span>{{ orderDetailList.goodName }}</span>
+					</view>
+					<view class="goodsDetailsInfoBody">
+						<span>{{ orderDetailList.optionName }}</span>
+						<span>X{{ orderDetailList.num }}</span>
+					</view>
+					<view class="goodsDetailsInfoFoot">
+						<span>￥{{ orderDetailList.unitPrice }}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 商品信息 -->
+		
+		<!-- 票务信息 -->
+		<view class="codedelit" v-if="orderDetailList.pftflag == 1">
+			<view class="codeImg">
+				<image :src="orderDetailList.pftinfo.UUqrcodeIMG" mode="" v-if="!Array.isArray(orderDetailList.pftinfo.UUqrcodeIMG)"></image>
+				<image style="width: 440upx;" :src="imageRoot + 'noneMores.png'" mode="" v-else></image>
+				
+				<view class="codeNumber" :style="{marginLeft:Array.isArray(orderDetailList.pftinfo.UUcode)?'70rpx':'0rpx'}">
+					<text class="col-9">消费码 : </text>
+					<text class="col-3" style="padding-left: 10upx;"> {{ Array.isArray(orderDetailList.pftinfo.UUcode)?'订单加载中':orderDetailList.pftinfo.UUcode}}</text>
+				</view>
+			</view>
+			
+		</view>
+		<!-- 票务信息 -->
+		
+		<!-- 订单详情 -->
+		<view class="detailsOrder">
+			<view class="detailsOrderPackage">
+				<view class="orderNumber">
+					<view class="orderNumberTitle" v-if="plugin == 'activity'" style="margin-bottom: 20upx;"  @click="goDw(Number( orderDetailList.addresstype) == 0?false:true)">
+						<span>活动地址</span>
+						<span>{{ Number( orderDetailList.addresstype) == 0?orderDetailList.address: orderDetailList.activityAddress}}</span>
+						<view class="f-20 dis-il-block iconfont icon-locationfill" style="font-size: 26upx;color: #FF4444;padding-left: 10upx;">
+							
+						</view>
+					</view>
+					<view class="orderNumberTitle">
+						<span>订单编号</span>
+						<span>{{ orderDetailList.orderno }}</span>
+						<span style="color: #FF4444;float: right;font-size: 24upx;" @click="copy(orderDetailList.orderno)">点击复制</span>
+					</view>
+					<view class="orderNumberFoot">
+						<span>下单时间</span>
+						<span>{{ orderDetailList.createtime }}</span>
+					</view>
+					
+				</view>
+				<view class="orderNumber" style="padding-top: 15upx;" v-if="orderDetailList.moinfo">
+					
+					<view class="orderNumberFoot dis-flex" v-for="(item,key,index) in orderDetailList.moinfo" :key="key">
+						<span style="min-width: 100upx;">{{item.title}}</span>
+						<span v-if="item.id != 'img'">{{ item.data }}</span>
+						<view class="dis-il-block dis-flex orderNumberImg" v-if="item.id == 'img'">
+							<view  v-for="(itemImg,indexs) in item.data" :key="indexs">
+								<!-- <text class="f-20">{{itemImg}}</text> -->
+								<image class="item-img" :src="itemImg" mode="" @click="lookimg(item.data,indexs)"></image>
+							
+							</view>
+								<!-- <image class="item-img" :src="item.data[0]" mode=""></image> -->
+						</view>
+					</view>
+					
+				</view>
+				<view class="payType" v-if="orderDetailList.status != 5 && orderDetailList.status != 0">
+					<view>
+						<span>支付方式</span>
+						<span>{{ orderDetailList.paytype }}</span>
+						<span style="font-size: 24upx;padding-left: 20upx;color: #999999;" v-if="orderDetailList.blendcredit || orderDetailList.blendwx">
+							(<span style="font-size: 24upx;" v-if="orderDetailList.blendcredit">{{TextSubstitution.moneytext}}:{{orderDetailList.blendcredit}}</span>
+							<span style="font-size: 24upx;padding-left: 10upx;" v-if="orderDetailList.blendwx">微信:{{orderDetailList.blendwx}}</span>)
+						</span>
+						
+					</view>
+					<view>
+						<span>支付时间</span>
+						<span>{{ orderDetailList.paytime }}</span>
+					</view>
+					<view v-if="orderDetailList.status == 7">
+						<span>退款时间</span>
+						<span>{{ orderDetailList.refundtime }}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 订单详情 -->
+
+		<!-- 支付详情 -->
+		<view class="paymentDetails">
+			<view class="paymentDetailsPackage">
+				<view class="paymentInfo">
+					<view>
+						<span>商品金额</span>
+						<span>￥{{ orderDetailList.goodsprice }}</span>
+					</view>
+					<view>
+						<span>运费</span>
+						<span>￥{{ orderDetailList.expressprice }}</span>
+					</view>
+					<view v-if="!!orderDetailList.cardprice">
+						<span>开通会员</span>
+						<span>￥{{ orderDetailList.cardprice }}</span>
+					</view>
+					<view v-if="orderDetailList.com_dis_price != '0'">
+						<span>团长优惠</span>
+						<span>-￥{{ orderDetailList.com_dis_price }}</span>
+					</view>
+					<view v-if="orderDetailList.vipdiscount != 0">
+						<span>会员优惠</span>
+						<span>-￥{{ orderDetailList.vipdiscount }}</span>
+					</view>
+					<view v-if="orderDetailList.redpackcount">
+						<span>红包抵扣</span>
+						<span>-￥{{ orderDetailList.redpackcount }}</span>
+					</view>
+					<view v-if="orderDetailList.creditmoney && orderDetailList.creditmoney > 0">
+						<span>积分抵扣</span>
+						<span>-￥{{ orderDetailList.creditmoney }}</span>
+					</view>
+					<view v-if="orderDetailList.fullreducemoney && orderDetailList.fullreducemoney > 0">
+						<span>满减优惠</span>
+						<span>-￥{{ orderDetailList.fullreducemoney }}</span>
+					</view>
+					<view v-if="orderDetailList.usecredit && Number(orderDetailList.usecredit)> 0">
+						<span>花费积分</span>
+						<span>{{ orderDetailList.usecredit }}</span>
+					</view>
+				</view>
+				<view class="paymentInfoFoot">
+					<span></span>
+					<view>
+						<span>共{{ orderDetailList.num }}件商品</span>
+						<span>实付款:</span>
+						<span>￥{{ orderDetailList.actualprice }}</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 支付详情 -->
+		<!-- 智慧城市商家订单详情 -->
+		<view class="paymentDetails" v-if="orderDetailList.status == 998">
+			<view class="paymentDetailsPackage">
+				<view class="paymentInfo" style="border-bottom:none;padding-bottom: 0;">
+					<view>
+						<span>下单时间</span>
+						<span>2019-09-23 15:30:20</span>
+					</view>
+					<view>
+						<span>订单号</span>
+						<span>201909239985945848465</span>
+					</view>
+					<view>
+						<span>支付方式</span>
+						<span>余额支付</span>
+					</view>
+					<view>
+						<span>收货方式</span>
+						<span>快递配送</span>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 支付详情 -->
+
+		<!-- 填充层 -->
+		<view class="full"></view>
+		<!-- 填充层 -->
+
+		<!-- 底部菜单 -->
+		<!-- 评价 -->
+		<view class="navBottom" v-if="orderDetailList.status == 2">
+			<view>
+				<span></span>
+				<view>
+					<view class="evaluateButton" @click="goPl"><span>去评价</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 		<view class="cancelOrder"><span>取消订单</span></view>
+		<view class="evaluateButton" @click="goPay"><span>去评价</span></view> -->
+		<!-- 评价 -->
+		<!-- 收货 -->
+		<view class="navBottom" v-if="orderDetailList.status == 4">
+			<view>
+				<span></span>
+				<view>
+					<view class="cancelOrder" @click="logistics(orderDetailList.id, orderDetailList.a)"><span>查看物流</span></view>
+					<view class="evaluateButton" @click="sureReceive"><span>确认收货</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 收货 -->
+		<!-- 智慧城市商家订单详情 -->
+		<view class="navBottom" v-if="orderDetailList.status == 998">
+			<view>
+				<span></span>
+				<view>
+					<view class="centerMerchantBtn">修改物流信息</view>
+				</view>
+			</view>
+		</view>
+		<!-- 智慧城市商家订单详情 -->
+		<!-- 智慧城市商家订单详情待使用  -->
+		<view class="navBottom" v-if="orderDetailList.status == 997 && orderDetailList.usestatus == 1">
+			<view>
+				<span></span>
+				<view>
+					<view class="centerMerchantBtn dsy">扫码核销</view>
+				</view>
+			</view>
+		</view>
+		<!-- 智慧城市商家订单详情 -->
+		<!-- 代发货 -->
+		<view class="navBottom" v-if="orderDetailList.status == 8">
+			<view>
+				<span></span>
+				<view>
+					<view class="cancelOrder" @click="goAfterSale" style="margin: 0 10px 0 0 ;" v-if="orderDetailList.surerefund == '1'"><span>申请退款</span></view>
+					<view class="cancelOrder" @click="remindSend" v-if="!orderDetailList.isRemind"><span>提醒发货</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 代发货 -->
+		<!-- 待付款 -->
+		<view class="navBottom" v-if="orderDetailList.status == 0">
+			<view>
+				<span></span>
+				<view>
+					<view class="cancelOrder" @click="cancelOrder"><span>取消订单</span></view>
+					<view class="evaluateButton" @click="goPay"><span>去支付</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 待付款 -->
+
+		<!-- 带使用 -->
+		<view class="navBottom" v-if="orderDetailList.status == 1 && orderDetailList.usestatus != 3">
+			<view>
+				<span></span>
+				<view>
+					<view class="cancelOrder" style="background-color: #F8F8F8;margin-right: 20upx;border: none;" @click="goSubscribeList" v-if="orderDetailList.alAppointFlag && orderDetailList.alAppointFlag != '0'">
+						<span>预约详情</span>
+						</view>
+					<view class="cancelOrder" style="background-color: #008CFF;margin-right: 20upx;border: none;" @click="goSubscribe" v-if="Number(orderDetailList.appointNum) > 0">
+						<span style="color: #FFFFFF;">预约</span>
+						</view>
+					<view class="cancelOrder" @click="goAfterSale" v-if="orderDetailList.surerefund == '1'"><span>申请退款</span></view>
+					<view class="evaluateButton" @click="show = true" v-if="orderDetailList.codeNum != '0'  && orderDetailList.pftflag != 1"><span>扫码核销</span></view>
+				</view>
+			</view>
+		</view>
+		<!-- 带使用 -->
+		<!-- 底部菜单 -->
+
+		<!-- 扫码核销 -->
+		<PopManager :show="show">
+			<view class="qrShow">
+				<view class="qrImg">
+					<span>商家扫码即可消费</span>
+					<image :src="orderDetailList.qrcode" />
+				</view>
+				<view class="closeImg" @click="show = false">
+					<image :src="imgfixUrls + 'merchant/close.png'" />
+				</view>
+			</view>
+		</PopManager>
+		<!-- 扫码核销 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	import util from '@/common/js/util.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	import PopManager from '@/components/template/PopManager';
+	import loadlogo from '@/components/template/loadlogo';
+	let setEndTime = null;
+	export default {
+		components: {
+			PopManager,
+			loadlogo
+		},
+		data() {
+			return {
+				e: {},
+				currentLoction: null,
+				title: '待评价',
+				orderid: 0,
+				plugin: '',
+				time: '',
+				orderDetailList: {},
+				show: false,
+				expressList: {},
+				lat: null,
+				lng: null,
+				loading: true,
+				phoneHeight: null,
+				countDown: {},
+				TextSubstitution:{}
+			};
+		},
+		logistics(order_id, table_id) {
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/mainPages/express/express?order_id=' + order_id + '&table_id=' + table_id
+			});
+		},
+		onLoad: function(option) {
+			let _this = this;
+			_this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			_this.e = option
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = uni.upx2px(1590) + 'px';
+				}
+			});
+			_this.orderid = option.orderid;
+			_this.plugin = option.plugin;
+		},
+		onShow() {
+			let _this = this;
+			_this.init(_this.e.orderid, _this.e.plugin);
+		},
+		methods: {
+			goSubscribeList(){
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages2/booked/bookedInformation/bookedInformation?id=' + _this.orderDetailList.goodsid + '&type=' + _this.orderDetailList.pluginno + '&orderid=' + _this.orderid 
+				});
+			},
+			goSubscribe(){
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages2/booked/bookedTime/bookedTime?id=' + _this.orderDetailList.goodsid + '&type=' + _this.orderDetailList.pluginno + '&orderid=' + _this.orderid + '&num=' + _this.orderDetailList.appointNum
+				});
+			},
+			lookimg(imgs,img){
+				uni.previewImage({					
+					current: imgs[img],					
+					urls: imgs,
+					});
+			},
+			copy(text){
+				//#ifdef H5
+					App.clipboard(text);
+				//#endif
+				//#ifndef H5
+					uni.setClipboardData({
+						data: text
+					});
+					uni.showToast({
+						title:'已复制到粘贴板'
+					})
+				//#endif
+				
+			},
+			goGoodDetail() {
+				let _this = this;
+				if(_this.plugin == 'recruit') return
+				if(_this.orderDetailList.goodsurl){
+					App.navigationTo({
+						url: _this.orderDetailList.goodsurl
+					});
+				}else if(_this.orderDetailList.pluginno == 'activity'){
+					App.navigationTo({
+						url: 'pages/subPages2/coursegoods/coursegoods?id=' + _this.orderDetailList.goodsid + '&type=' + _this.orderDetailList.pluginno
+					});
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/goods/index?id=' + _this.orderDetailList.goodsid + '&type=' + _this.orderDetailList.pluginno
+					});
+				}
+			},
+			goDw(flag) {
+				let _this = this;
+				debugger
+				if(flag){
+					let location = {
+						lng: _this.orderDetailList.activityLng,
+						lat: _this.orderDetailList.activityLat
+					}
+					let storeInfo = {
+						location: location,
+						storename: _this.orderDetailList.storename,
+						address: _this.orderDetailList.activityAddress
+					};
+					// #ifdef H5
+					wxApi.WxopenLocation(storeInfo['location']['lat'], storeInfo['location']['lng'], storeInfo['storename'], storeInfo[
+						'address']);
+					// #endif
+					// #ifdef MP-WEIXIN
+					App.openLocation(storeInfo);
+					// #endif
+					//#ifdef APP-PLUS
+					    Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['storename'],'gcj02')
+					//#endif
+				}else{
+					let storeInfo = {
+						location: _this.orderDetailList.location,
+						storename: _this.orderDetailList.storename,
+						address: _this.orderDetailList.address
+					};
+					// #ifdef H5
+					wxApi.WxopenLocation(storeInfo['location']['lat'], storeInfo['location']['lng'], storeInfo['storename'], storeInfo[
+						'address']);
+					// #endif
+					// #ifdef MP-WEIXIN
+					App.openLocation(storeInfo);
+					// #endif
+					//#ifdef APP-PLUS
+					    Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['storename'],'gcj02')
+					//#endif
+				}
+				
+			},
+			// 买家提醒商家发货
+			remindSend() {
+				let _this = this,
+					data = {
+						orderid: _this.orderid,
+						plugin: _this.plugin,
+						goodsname: _this.orderDetailList.goodName
+					};
+					_this.$set(_this.orderDetailList, 'isRemind', true)
+				App.showSuccess('已提醒发货', () => {
+					
+				})
+				setTimeout(() => {
+					App._post_form('&p=member&do=remindSend', data, res => {
+
+					});
+				}, 500)
+
+			},
+			goPl() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/comment/comment?goods_id=' +
+						_this.orderDetailList.goodsid +
+						'&order_id=' +
+						_this.orderDetailList.id +
+						'&plugin=' +
+						_this.orderDetailList.pluginno +
+						'&a=' +
+						_this.orderDetailList.a
+				});
+			},
+			//导入定位
+			wxApiCallback(orderid, plugin) {
+				let _this = this;
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							App.getAreaId(res, '', '', options => {
+								_this.$nextTick(function() {
+									_this.getOrderDetail(orderid, plugin, res);
+								});
+							});
+							_this.setData({
+								currentLoction: res
+							});
+							uni.setStorageSync('curLoction', res);
+						},
+						fail: function() {
+							App.getAreaId('', '', '', options => {
+								_this.$nextTick(function() {
+									_this.getOrderDetail(orderid, plugin, '');
+								});
+							});
+						},
+						cancel: function() {
+							App.getAreaId('', '', '', options => {
+								_this.$nextTick(function() {
+									_this.getOrderDetail(orderid, plugin, '');
+								});
+							});
+						}
+					});
+				});
+			},
+			init(orderid, plugin) {
+				let _this = this;
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+				let client = App.getClientType();
+				_this.curLoction = uni.getStorageSync('curLoction')
+				let curLoction = uni.getStorageSync('curLoction')
+				// 手动选择位置信息
+				let agencyData = uni.getStorageSync('agencyData');
+				if (client === '1' || client === '3') {
+					if (!!curLoction) {
+						if (!!agencyData) {
+							_this.getOrderDetail(orderid, plugin, curLoction);
+						} else {
+							App.getAreaId(curLoction, '', '', options => {
+								_this.getOrderDetail(orderid, plugin, curLoction);
+							});
+						}
+					} else {
+						if (!!agencyData) {
+							_this.getOrderDetail(orderid, plugin, _this.currentLoction);
+							console.log(_this.currentLoction, '_this.currentLoction');
+						} else {
+							// #ifdef H5
+							_this.wxApiCallback(orderid, plugin);
+							// #endif
+							// #ifndef H5
+							App.getLocation().then(res => {
+								App.getAreaId(res, '', '', options => {
+									_this.$nextTick(function() {
+										_this.getOrderDetail(orderid, plugin, res);
+									});
+								});
+								_this.setData({
+									currentLoction: res
+								});
+								uni.setStorageSync('curLoction', res);
+							});
+							// #endif
+						}
+					}
+				} else {
+					_this.getOrderDetail(orderid, plugin);
+				}
+
+			},
+			// 跳转售后
+			goAfterSale() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/orderList/afterSale/afterSale?id=' + _this.orderid + '&plugin=' + _this.plugin
+				});
+			},
+			// 跳转核销
+			goHx() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/orderWrite/orderWrite?id=' + _this.orderid + '&plugin=' + _this.plugin
+				});
+			},
+			// 取消订单
+			cancelOrder() {
+				let _this = this,
+					data = {
+						id: _this.orderid,
+						plugin: _this.plugin
+					};
+				uni.showModal({
+					title: '提示',
+					content: '是否取消订单？',
+					success: function(res) {
+						if (res.confirm) {
+							App._post_form('&p=pay&do=cancelOrder', data, res => {
+								_this.getOrderDetail(_this.orderid, _this.plugin, _this.curLoction);
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			// 订单详情页面
+			getOrderDetail(orderid = '', plugin = '', curLoction = '') {
+				let _this = this;
+				let data = {
+					lat: !!curLoction ? curLoction.latitude : '',
+					lng: !!curLoction ? curLoction.longitude : '',
+					orderid: orderid,
+					plugin: plugin
+				};
+				App._post_form('&p=pay&do=orderDetail', data, res => {
+					_this.loading = false;
+					_this.orderDetailList = res.data;
+					// for(let j in _this.orderDetailList.moinfo){
+					// 	if(_this.orderDetailList.moinfo[j].id == 'img'){
+					// 		_this.orderDetailList.moinfo[j].data.map(item=>{
+					// 			console.log(item);
+					// 			debugger
+					// 		})
+					// 	}
+					// }
+					
+					for(let k in _this.orderDetailList.moinfo){
+						if(_this.orderDetailList.moinfo[k].id !== 'img'){
+							if(_this.orderDetailList.moinfo[k].data instanceof Array){
+								_this.orderDetailList.moinfo[k].data = _this.orderDetailList.moinfo[k].data.join(" - ")
+							}
+						}
+					}
+					_this.orderDetailList.isTimeOver = false;
+					let sytime = res.data.sytime;
+					_this.orderPayTime(sytime);
+					if (!!_this.orderDetailList.expresssn) {
+						let data1 = {
+							id: _this.orderDetailList.id,
+							table: _this.orderDetailList.a
+						};
+						App._post_form('&p=Pay&do=getLogisticsInfo', data1, res => {
+							if (!!res.data.list) {
+								_this.expressList = res.data.list[0];
+							} else {
+								_this.expressList = {
+									AcceptStation: '暂无物流信息',
+									AcceptTime: ''
+								};
+							}
+						});
+					}
+				});
+			},
+			// 确认收货
+			sureReceive() {
+				let _this = this,
+					data = {
+						id: _this.orderid,
+						plugin: _this.plugin
+					};
+				console.log(_this.orderid, _this.plugin)
+				App.showError(
+					'请确认收货',
+					result => {
+						if (result.confirm) {
+							uni.showLoading({});
+							App._post_form(
+								'&p=pay&do=sureReceive',
+								data,
+								res => {
+									if (res.errno === 0) {
+										_this.init(_this.orderid, _this.plugin);
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						}
+					},
+					true
+				);
+			},
+			/**
+			 *
+			 */
+			orderPayTime(orderEndtime) {
+				let _this = this;
+				// 付款剩余时间
+				clearInterval(setEndTime);
+				setEndTime = setInterval(() => {
+					// 当前时间
+					let nowTime = new Date().getTime(),
+						// 结束时间
+						endTime = Number(orderEndtime) * 1000,
+						// 剩余时间
+						leftTime = parseInt((endTime - nowTime) / 1000),
+						timeobj = {};
+					let callback = function(dataTime) {
+						let hh = parseInt((dataTime / 60 / 60 / 24) * 24),
+							mm = parseInt((dataTime / 60) % 60),
+							ss = parseInt(dataTime % 60),
+							timeobj = {
+								hh: hh < 10 ? `0${hh}` : hh,
+								mm: mm < 10 ? `0${mm}` : mm,
+								ss: ss < 10 ? `0${ss}` : ss
+							};
+						_this.$set(_this.countDown, 'timeobj', timeobj);
+					};
+					if (leftTime > 0) {
+						callback(leftTime);
+					} else {
+						_this.$set(_this.countDown, 'timeobj', null);
+						clearInterval(setEndTime);
+						return false;
+					}
+				}, 1000);
+			},
+			goPay() {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + _this.orderid + '&plugin=' + _this.plugin
+				});
+			},
+			logistics(order_id, table_id) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/express/express?order_id=' + order_id + '&table_id=' + table_id
+				});
+			},
+			// 联系客服
+			kfPhone() {
+				let _this = this;
+				uni.showModal({
+					title: '联系商家',
+					content: _this.orderDetailList.mobile,
+					success: function(res) {
+						if (res.confirm) {
+							uni.makePhoneCall({
+								phoneNumber: _this.orderDetailList.mobile //仅为示例
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	page {}
+
+	.orderDetails {
+		background: #f5f5f5;
+		font-size: 0;
+	}
+
+	.orderDetailsTitle.merchant-bg {
+		background-color: transparent;
+		background-repeat: no-repeat;
+		background-size: 100% 300upx;
+		height: 300upx;
+		// background-image: u:rl('@imgfixUrls + 'merchant/mercha'ntBg.png');
+	}
+
+	.purchaseDetails.merchant-bg {
+		margin-top: -196upx;
+	}
+
+	.orderDetailsTitle {
+		width: 750upx;
+		height: 200upx;
+		background-color: rgba(255, 68, 68, 1);
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>image {
+				margin: 28upx 0 0 30upx;
+				vertical-align: middle;
+				width: 40upx;
+				height: 40upx;
+			}
+
+			>span {
+				margin: 28upx 0 0 21upx;
+				display: inline-block;
+				line-height: 28upx;
+				vertical-align: middle;
+				font-size: 30upx;
+
+				font-weight: bold;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+
+		>span {
+			margin: 28upx 30upx 0 0;
+			vertical-align: middle;
+			font-size: 20upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.receiptDetails {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		margin: -96upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.expressDetails {
+		width: 630upx;
+		border-bottom: 1px solid rgba(238, 238, 238, 1);
+		margin-bottom: 30upx;
+	}
+
+	.receiptDetailsPackage {
+		overflow: hidden;
+		width: 630upx;
+		margin: 30upx auto 30upx auto;
+	}
+
+	.receiptDetailsLogo {
+		margin-top: 25upx;
+		vertical-align: top;
+		display: inline-block;
+		width: 50upx;
+		height: 50upx;
+		overflow: hidden;
+		border-radius: 50%;
+		background: linear-gradient(0deg, rgba(255, 68, 68, 1) 0%, rgba(255, 102, 102, 1) 100%);
+
+		>image {
+			margin: 5upx;
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+
+	.expressDetailsInfo {
+		width: 526upx;
+		vertical-align: top;
+		display: inline-block;
+		margin-left: 20upx;
+	}
+
+	.expressDetailsInfoTitle {
+		>span:nth-child(1) {
+			vertical-align: bottom;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>span:nth-child(2) {
+			margin-left: 30upx;
+			vertical-align: bottom;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.expressDetailsInfoBody {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.expressDetailsInfoFoot {
+		margin-top: 20upx;
+		padding-bottom: 30upx;
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.right {
+		margin-top: 30upx;
+		vertical-align: top;
+		width: 30upx;
+		height: 39upx;
+	}
+
+	.receiptDetailsFoot {
+		background: repeating-linear-gradient(-45deg, white, white 5%, #ff4444 5%, #ff4444 10%, white 10%, white 15%, #52a7f8 15%, #52a7f8 20%);
+		width: 690upx;
+		height: 6upx;
+		border-radius: 10upx;
+	}
+
+	.addressDetails {
+		>view {
+			display: inline-block;
+		}
+	}
+
+	.addressDetailsInfo {
+		width: 526upx;
+		vertical-align: top;
+		display: inline-block;
+		margin-left: 20upx;
+	}
+
+	.addressDetailsLogo {
+		margin-top: 25upx;
+		vertical-align: top;
+		display: inline-block;
+		overflow: hidden;
+		width: 50upx;
+		height: 50upx;
+		background: linear-gradient(180deg, rgba(255, 215, 75, 1) 0%, rgba(255, 185, 64, 1) 100%);
+		border-radius: 50%;
+		text-align: center;
+
+		>image {
+			margin-top: 8upx;
+			width: 35upx;
+			height: 35upx;
+		}
+	}
+
+	.goodsDetails {
+		margin: 30upx auto 0 auto;
+		width: 690upx;
+		height: 210upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.codedelit{
+		margin: 30upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+		position: relative;
+		height: 450upx;
+	}
+	
+	.codeImg{
+		padding: 30upx;
+		position: absolute;
+		left: 50%;
+		transform: translateX(-50%);
+		>image{
+			width: 300upx;
+			height: 300upx;
+		}
+	}
+	
+	.codeNumber{
+		width: 230upx;
+		border-radius: 10upx;
+		height: 80upx;
+		line-height: 80upx;
+		margin-top: 10upx;
+		padding: 0 30upx;
+		font-size: 24upx;
+		background-color: #f8f8f8;
+	}
+	
+	.goodsDetailsPackage {
+		padding: 30upx;
+
+		>view {
+			display: inline-block;
+		}
+	}
+
+	.goodsDetailsImg {
+		vertical-align: top;
+		width: 150upx;
+		height: 150upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 150upx;
+			height: 150upx;
+		}
+	}
+
+	.goodsDetailsInfo {
+		width: 450upx;
+		vertical-align: top;
+		margin-left: 30upx;
+	}
+
+	.goodsDetailsInfoTitle {
+		font-size: 25upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.goodsDetailsInfoBody {
+		margin-top: 10upx;
+		font-size: 21upx;
+
+		>span {
+			color: #999999;
+		}
+
+		>span:nth-child(2) {
+			margin-left: 20upx;
+		}
+	}
+
+	.goodsDetailsInfoFoot {
+		margin-top: 10upx;
+
+		>span {
+			font-size: 21upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.detailsOrder {
+		border: 1px solid rgba(0, 0, 0, 0);
+		margin: 30upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.navBottom {
+		overflow: hidden;
+		position: fixed;
+		bottom: 0;
+		width: 750upx;
+		height: 100upx;
+		background: rgba(255, 255, 255, 1);
+
+		>view {
+			overflow: hidden;
+			padding: 20upx;
+			display: flex;
+			justify-content: space-between;
+
+			>view {
+				overflow: hidden;
+				display: inline-block;
+			}
+		}
+	}
+
+	.full {
+		width: 750upx;
+		height: 155upx;
+	}
+
+	.detailsOrderPackage {
+		margin: 30upx auto;
+		width: 630upx;
+	}
+
+	.orderNumber {
+		border-bottom: 1px solid #eeeeee;
+
+		>.orderNumberTitle {
+			margin-top: 0px;
+		}
+
+		>view {
+			margin-top: 20upx;
+
+			>span:nth-child(1) {
+				display: inline-block;
+				width: 100upx;
+				height: 23upx;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>span:nth-child(2) {
+				margin-left: 20upx;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+
+	.orderNumberFoot {
+		padding-bottom: 30upx;
+	}
+	.orderNumberImg{
+		width: 500upx;
+		display: -webkit-flex;
+		justify-content: space-between;
+		flex-direction: row;
+		flex-wrap: wrap;
+	}
+	.item-img{
+		width: 130upx;
+		height: 130upx;
+		margin: 10upx;
+		border-radius: 10upx;
+		// border: 2upx solid #000000;
+	}
+	.orderNumberImg:after {
+    content: "";
+    flex: auto;
+	}
+	.payType {
+		>view {
+			margin-top: 20upx;
+
+			>span:nth-child(1) {
+				display: inline-block;
+				width: 100upx;
+				height: 23upx;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+				>span{
+					font-size: 24upx;
+					margin-left: 20upx;
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+
+			>span:nth-child(2) {
+				margin-left: 20upx;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+				>span{
+					font-size: 24upx;
+					margin-left: 20upx;
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+		}
+	}
+
+	.paymentDetails {
+		margin: 30upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.paymentDetailsPackage {
+		padding: 30upx;
+	}
+
+	.paymentInfo {
+		>view:nth-child(1) {
+			margin-top: 0;
+		}
+
+		>view {
+			margin-top: 20upx;
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		border-bottom: 1px solid #eeeeee;
+		padding-bottom: 30upx;
+	}
+
+	.centerMerchant-dsy {
+		padding-top: 30upx;
+
+		image {
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			color: #333333;
+		}
+
+		.name {
+			font-weight: bold;
+		}
+	}
+
+	.colorbar-btns {
+		padding: 35upx 0;
+		color: #333333;
+
+		>view {
+			width: 50%;
+			box-sizing: border-box;
+			text-align: center;
+		}
+
+		>view:nth-child(1) {
+			border-right: 1upx solid rgba(238, 238, 238, 1);
+		}
+	}
+
+	.paymentInfoFoot {
+		padding-top: 30upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+
+			>span:nth-child(1) {
+				margin-right: 10upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>span:nth-child(2) {
+				margin-right: 10upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>span:nth-child(3) {
+				vertical-align: middle;
+				font-size: 30upx;
+
+				font-weight: bold;
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+	}
+
+	.evaluateButton {
+		display: inline-block;
+		margin-left: 20upx;
+		width: 160upx;
+		height: 60upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+
+		>span {
+			line-height: 60upx;
+			font-size: 24upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.cancelOrder {
+		display: inline-block;
+		width: 160upx;
+		height: 60upx;
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 4upx;
+		text-align: center;
+
+		>span {
+			line-height: 60upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.centerMerchantBtn {
+		// padding: 20upx 30upx;
+		height: 62upx;
+		width: 205upx;
+		line-height: 62upx;
+		text-align: center;
+		font-size: 24upx;
+		color: rgba(51, 136, 255, 1);
+		border: 1px solid rgba(64, 158, 255, 1);
+		border-radius: 40upx;
+	}
+
+	.centerMerchantBtn.dsy {
+		background: rgba(51, 136, 255, 1);
+		color: #ffffff;
+		width: 152upx;
+	}
+
+	.purchaseDetails {
+		margin: -96upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.purchaseDetailsPackage {
+		padding: 30upx;
+	}
+
+	.purchaseDetailsTitle {}
+
+	.purchaseTitlePackage {
+		padding: 0 0 30upx 0;
+		display: flex;
+		justify-content: space-between;
+		border-bottom: 1px solid rgba(238, 238, 238, 1);
+
+		>span {
+			line-height: 40upx;
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+			text-align: center;
+			width: 130upx;
+			height: 40upx;
+			border: 1upx solid rgba(204, 204, 204, 1);
+			border-radius: 4upx;
+
+			>span {
+				line-height: 40upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.scrollView {
+		height: 100upx;
+	}
+
+	.scrollSpan {
+		margin-top: 20upx;
+		display: block;
+		font-size: 28upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.purchaseDetailsBody {
+		padding: 30upx 0;
+		border-bottom: 1px solid #eeeeee;
+	}
+
+	.purchaseDetailsFoot {
+		padding-top: 30upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+
+	.line {
+		width: 1upx;
+		height: 100upx;
+		background: rgba(238, 238, 238, 1);
+	}
+
+	.purchaseDetailsFootRight {
+		margin-left: 25upx;
+		width: 45upx;
+		height: 45upx;
+
+		>image {
+			width: 45upx;
+			height: 45upx;
+		}
+	}
+
+	.purchaseDetailsFootLeft {
+		width: 541upx;
+
+		>view:nth-child(1) {
+			>image {
+				vertical-align: middle;
+				width: 40upx;
+				height: 37upx;
+				margin-right: 20upx;
+			}
+
+			>span {
+				vertical-align: middle;
+				font-size: 28upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			margin-top: 10upx;
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.qrImg {
+		width: 512upx;
+		height: 537upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+		text-align: center;
+
+		>span {
+			display: inline-block;
+			margin-top: 40upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin-top: 50upx;
+			width: 359upx;
+			height: 359upx;
+		}
+	}
+
+	.closeImg {
+		margin: 40upx auto 0 auto;
+		width: 42upx;
+		height: 42upx;
+		border: 2upx solid rgba(255, 255, 255, 1);
+		border-radius: 50%;
+		overflow: hidden;
+
+		>image {
+			width: 42upx;
+			height: 42upx;
+		}
+	}
+</style>
diff --git a/pages/subPages/orderList/orderList.vue b/pages/subPages/orderList/orderList.vue
new file mode 100644
index 0000000..aa8f65d
--- /dev/null
+++ b/pages/subPages/orderList/orderList.vue
@@ -0,0 +1,890 @@
+<template>
+	<view >
+	<loadlogo v-if="loading"></loadlogo>
+	<view class="orderList" v-if="!loading">
+		<far-bottom></far-bottom>
+		<!-- 头部导航栏 -->
+		<view class="topNav">
+			<view class="check" v-if="type == 10">
+				<view><span>{{languageStatus!=1?'全部':'전체'}}</span></view>
+			</view>
+			<view class="all" v-else @click="changType(10)">
+				<view><span>{{languageStatus!=1?'全部':'전체'}}</span></view>
+			</view>
+			<view class="check" v-if="type == 0">
+				<view><span>{{languageStatus!=1?'待付款':'미지불'}}</span></view>
+			</view>
+			<view class="payment" v-else @click="changType(0)">
+				<view><span>{{languageStatus!=1?'待付款':'미지불'}}</span></view>
+			</view>
+			<view class="check" v-if="type == 1">
+				<view><span>{{languageStatus!=1?`待${changeflag===1?'发货':'使用'}`:'미사용'}}</span></view>
+			</view>
+			<view class="use" v-else @click="changType(1)">
+				<view><span>{{languageStatus!=1?`待${changeflag===1?'发货':'使用'}`:'미사용'}}</span></view>
+			</view>
+			<view class="check" v-if="type == 4">
+				<view><span>{{languageStatus!=1?'待收货':'미배송'}}</span></view>
+			</view>
+			<view class="receiving" v-else @click="changType(4)">
+				<view><span>{{languageStatus!=1?'待收货':'미배송'}}</span></view>
+			</view>
+			<view class="check" v-if="type == 2">
+				<view><span>{{languageStatus!=1?'待评价':'미평가'}}</span></view>
+			</view>
+
+			<view class="evaluate" v-else @click="changType(2)">
+				<view><span>{{languageStatus!=1?'待评价':'미평가'}}</span></view>
+			</view>
+		</view>
+		<!-- 头部导航栏 -->
+
+		<!-- 商品列表 -->
+		<scroll-view class="orderLists" scroll-y="true" lower-threshold="0" @scrolltolower="downLoading" show-scrollbar="true"
+		 :style="{ height: phoneHight }" style="padding-bottom: 160rpx;box-sizing: border-box;" :scroll-top="scrollTop" @scroll="scrollyTop">
+			<!-- 商品循环模板 -->
+			<block v-if="!!orderList && orderList.length>0">
+				<view class="orderListsMb" v-for="(item, index) in orderList" :key="index">
+					<view class="mbPackage">
+						<view class="orderListsMbTitle diy-nav-list border-line border-bottom" @click="goOrderDetails(item.id, item.plugin,item.status,item.activityid,item.fightstatus,item.groupstatus,item,item.recordid)">
+							<view>
+								<view v-if="!!item.shop_img">
+									<image :src="item.shop_img" />
+								</view>
+								<view v-else></view>
+								<span>{{ item.storename }}</span>
+							</view>
+							<span>{{item.statusName==undefined?item.status:item.statusName}}</span>
+						</view>
+						<view class="orderListsMbBody diy-nav-list border-line border-bottom" @click="goOrderDetails(item.id, item.plugin,item.status,item.activityid,item.fightstatus,item.groupstatus,item,item.recordid)">
+							<view class="orderListsImg">
+								<image :src="item.goodsimg" />
+							</view>
+							<view class="orderListsInfo">
+								<view>
+									<span>{{ item.goodsname }}</span>
+								</view>
+								<view>
+									<span>{{ item.optionname }}</span>
+								</view>
+								<view>
+									<span>￥{{ item.goodsprice }}</span>
+								</view>
+							</view>
+						</view>
+						<view class="orderListsMbFoot">
+							<!-- 商品价格 -->
+							<view class="orderListsPrice">
+								<view></view>
+								<view>
+									<span v-if="item.plugin == 'rush' || item.plugin == 'groupon' || item.plugin == 'coupon' || item.plugin == 'wlfightgroup' || item.plugin == 'bargain'">
+										{{languageStatus!=1?'共':'총'}}{{ item.num }}{{languageStatus!=1?'件商品':'건 상품'}}
+									</span>
+									<span>
+										{{languageStatus!=1?'合计':'합계'}}：
+										<span>￥{{ item.price }}</span>
+									</span>
+								</view>
+							</view>
+							<!-- 商品价格 -->
+
+							<!-- 商品按钮 -->
+							<view class="orderListsButton">
+								<view></view>
+								<view class="viewButon" v-if="item.status == '待付款'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonWhite" @click="cancelOrder(item.id, item.plugin)"><span>取消订单</span></view>
+
+									<view class="buttonRed" @click="goPayment(item.id,item.plugin)"><span>去付款</span></view>
+								</view>
+								<view class="viewButon" v-if="item.status == '待使用'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonWhite" @click="goZt(item.id,item.plugin,item.activityid)" v-if="item.fightstatus=='1'&& item.plugin != 'citydelivery'"><span>查看组团</span></view>
+									<view class="buttonWhite" @click="goAfterSale(item.id, item.plugin)" v-if="item.surerefund=='1'&& item.plugin != 'citydelivery'"><span>申请退款</span></view>
+									<view class="buttonWhite" @click="goAfterSale(item.id, item.plugin)" v-if="item.surerefund=='0'&& item.plugin == 'citydelivery'"><span>申请退款</span></view>
+									<view class="buttonRed" @click="goCouponDetails(item.id,item.recordid,item.plugin,item.status,item.fightstatus,item.groupstatus)"
+									 v-if="item.groupstatus!='1'&&item.groupstatus!='3' && item.plugin != 'citydelivery'"><span>电子凭证</span></view>
+									<view class="buttonRed" @click="accomplish(item)" v-if="item.plugin == 'citydelivery' && item.surerefund == 0"><span>完成</span></view>
+								</view>
+								<view class="viewButon" v-if="item.status == '待发货'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonRed" @click="goAfterSale(item.id, item.plugin)" v-if="item.surerefund=='1'"><span>申请退款</span></view>
+									<view class="buttonWhite" @click="goZt(item.id,item.plugin,item.activityid)" v-if="item.fightstatus=='1'"><span>查看组团</span></view>
+									<view class="buttonWhite" @click="remindSend(item,item.id,item.plugin,item.goodsname)" v-if="!item.isRemind && item.plugin != 'citydelivery'"><span>提醒发货</span></view>
+								</view>
+								<view class="viewButon" v-if="item.status == '待收货'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonWhite" @click="goAfterSale(item.id, item.plugin)" v-if="item.surerefund=='0'&& item.plugin == 'citydelivery'"><span>申请退款</span></view>
+									<view class="buttonWhite" @click="goZt(item.id,item.plugin,item.activityid)" v-if="item.fightstatus=='1' && item.plugin !== 'citydelivery'"><span>查看组团</span></view>
+									<view class="buttonWhite" @click="logistics(item.id,item.a)" v-if="item.plugin !== 'citydelivery'"><span>查看物流</span></view>
+									<view class="buttonRed" @click="accomplish(item)" v-if="item.plugin == 'citydelivery' && item.surerefund == 0"><span>完成</span></view>
+									<view class="buttonRed" @click="sureReceive(item.id,item.plugin)" v-if="item.plugin !== 'citydelivery'"><span>确认收货</span></view>
+								</view>
+								<view class="viewButon" v-if="item.status == '待评价'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonWhite" @click="goZt(item.id,item.plugin,item.activityid)" v-if="item.fightstatus=='1'"><span>查看组团</span></view>
+									<view class="buttonWhite" @click="goGoodDetails(item.plugin,item.typeid,item.activityid)" v-if="item.plugin=='rush'||item.plugin=='coupon'||item.plugin=='wlfightgroup'||item.plugin=='groupon'"><span>{{languageStatus!=1?'再来一单':'구매하기'}}</span></view>
+									<view class="buttonRed" @click="goPl(item.activityid,item.id,item.typeid,item.a,item)"><span>{{languageStatus!=1?'评价':'평가'}}</span></view>
+								</view>
+								<view class="viewButon" v-if="item.status == '已完成'">
+									<view class="buttonYello" v-if="item.paidprid > 0" @click="gopayover(item.tid,item.plugin)"><span>支付有礼</span></view>
+									<view class="buttonRed" v-if="item.typeid == 12" @click="telCar(item.mastermobile)"><span>联系车主</span></view>
+									<view class="buttonWhite" @click="goZt(item.id,item.plugin,item.activityid)" v-if="item.fightstatus=='1'"><span>查看组团</span></view>
+									<view class="buttonWhite" @click="goGoodDetails(item.plugin,item.typeid,item.activityid)" v-if="item.plugin=='rush'||item.plugin=='coupon'||item.plugin=='wlfightgroup'||item.plugin=='groupon'"><span>{{languageStatus!=1?'再来一单':'구매하기'}}</span></view>
+								</view>
+							</view>
+							<!-- 商品按钮 -->
+						</view>
+					</view>
+				</view>
+				<!-- 商品循环模板 -->
+				<!-- 填充层 -->
+				<view class="full">
+					<loadmore :isMore="isMore"></loadmore>
+				</view>
+			</block>
+			<block v-else>
+				<none-mores></none-mores>
+			</block>
+			<!-- 填充层 -->
+		</scroll-view>
+		<!-- 商品列表 -->
+
+		<!-- 头部填充 -->
+		<view class="topFull"></view>
+		<!-- 头部填充 -->
+		<!-- 底部栏菜单 -->
+		<view class="page-footer">
+			<TabBars :tabBarAct="0" />
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+	import PopManager from '@/components/template/PopManager';
+	import noneMores from '@/components/template/nonemores.vue';
+	import TabBars from '@/components/template/tabBar';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import loadlogo from '@/components/template/loadlogo';
+	import loadmore from '@/components/template/loadmore';
+	import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				type: 10,
+				page: 1,
+				status: 10,
+				orderList: null,
+				pagetotal: 0,
+				loadingText: '',
+				phoneHight: 0,
+				loading: true,
+				isMore: false,
+				option: {},
+				changeflag: "",
+				current_page: 1,
+				scrollTop: 0
+			}
+		},
+		components: {
+			loadlogo,
+			loadmore,
+			noneMores,
+			TabBars,
+			PopManager
+		},
+		onLoad: function(option) {
+			let _this = this
+			_this.option = option;
+			console.log(option.cc_id, 12132425346)
+		},
+		onShow() {
+			let _this = this
+			if (_this.option.type == undefined) {
+				_this.type = 10
+				_this.status = 10
+				_this.init();
+			} else {
+				this.type = _this.option.type;
+				this.status = _this.option.type;
+				_this.init();
+			}
+		},
+		methods: {
+			gopayover(itemid, itemplu) {
+				App.navigationTo({
+					url: `pages/subPages/paySuccess/paySuccess?tid=${itemid}&plugin=${itemplu}&state=2`
+				});
+			},
+			//联系车主
+			telCar(item) {
+				uni.makePhoneCall({
+					phoneNumber: item 
+				});
+			},
+			accomplish(item) {
+				App.showError(`确认已经收到商品？`, data => {
+					if (data.confirm) {
+						!!data && App._post_form(`&p=citydelivery&do=finishOrder&id=${item.id}&type=1`, {}, res => {
+							console.log(res);
+							uni.showToast({
+								icon: "none",
+								title: res.message,
+								duration: 2000
+							});
+							let _this = this
+							if (_this.option.type == undefined) {
+								_this.type = 10
+								_this.status = 10
+								_this.init();
+							} else {
+								this.type = _this.option.type;
+								this.status = _this.option.type;
+								_this.init();
+							}
+						});
+					}
+				}, true);
+
+			},
+			go() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/index/index'
+				});
+			},
+			goPl(goodsid, orderid, typeid, a, item) {
+				if (item.plugin == 'citydelivery') {
+					console.log(item)
+					App.navigationTo({
+						url: 'pages/mainPages/comment/comment?goods_id=' + item.sid + '&order_id=' + item.id + '&plugin=' + item.plugin +
+							'&a=' + item.a
+					});
+				} else {
+					App.navigationTo({
+						url: 'pages/mainPages/comment/comment?goods_id=' + goodsid + '&order_id=' + orderid + '&plugin=' + typeid +
+							'&a=' + a
+					});
+				}
+
+			},
+			logistics(order_id, table_id) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/express/express?order_id=' + order_id + '&table_id=' + table_id
+				});
+			},
+			init() {
+				let _this = this;
+				_this.getOrderList();
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight - 40 + 'px';
+					}
+				});
+			},
+			// 跳转售后
+			goAfterSale(orderid, plugin) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/subPages/orderList/afterSale/afterSale?id=' + orderid + '&plugin=' + plugin
+				});
+			},
+			goZt(orderid, plugin, activityid) {
+				App.navigationTo({
+					url: 'pages/subPages/group/assemble/assemble?orderid=' + orderid + '&plugin=' + plugin + '&id=' + activityid
+				});
+			},
+			// 跳转订单详情
+			goOrderDetails(orderid, plugin, status, id, fightstatus, groupstatus, item,recordid) {
+				console.log(item);
+				
+				let _this = this
+				if (plugin == 'rush' || plugin == 'groupon' || plugin == 'wlfightgroup' || plugin == 'bargain' || plugin ==
+					'consumption' ||  plugin == 'activity') {
+					if (plugin == 'wlfightgroup' && status == '待使用') {
+						console.info(111111111)
+						if (fightstatus == 2) {
+							App.navigationTo({
+								url: 'pages/subPages/orderList/orderDetails/orderDetails?orderid=' + orderid + '&plugin=' + plugin
+							});
+						} else {
+							if (groupstatus == '2') {
+								App.navigationTo({
+									url: 'pages/subPages/orderList/orderDetails/orderDetails?orderid=' + orderid + '&plugin=' + plugin
+								});
+							} else {
+								App.navigationTo({
+									url: 'pages/subPages/group/assemble/assemble?orderid=' + orderid + '&plugin=' + plugin + '&id=' + id
+								});
+							}
+
+						}
+					} else {
+						console.info(222222222)
+						App.navigationTo({
+							url: 'pages/subPages/orderList/orderDetails/orderDetails?orderid=' + orderid + '&plugin=' + plugin
+						});
+					}
+				} else if (plugin == 'citydelivery') {
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderTakeout/orderTakeout?orderid=' + orderid +
+							`&sid=${item.sid}&plugin=${plugin}&state=${2}`
+					});
+				} else if (plugin == 'coupon') {
+					if(status > 0){
+						App.navigationTo({
+							url: 'pages/subPages/coupon/couponDetails/couponDetails?order_id=' + orderid + '&id=' + recordid
+						})
+					}
+				}
+			},
+			goCouponDetails(order_id, id, plugin, status, fightstatus, groupstatus) {
+				let _this = this
+				if (plugin == 'coupon') {
+					App.navigationTo({
+						url: 'pages/subPages/coupon/couponDetails/couponDetails?order_id=' + order_id + '&id=' + id
+					})
+				} else {
+					_this.goOrderDetails(order_id, plugin, status, order_id, fightstatus, groupstatus)
+				}
+			},
+			changType(type) {
+				uni.showLoading({})
+				let _this = this;
+				_this.type = type;
+				_this.status = type;
+				_this.scrollTop = 0;
+				_this.current_page = 1;
+				_this.getOrderList();
+			},
+			// 取消订单
+			cancelOrder(id, plugin) {
+				let _this = this;
+				let data = {
+					id: id,
+					plugin: plugin
+				};
+				uni.showModal({
+					title: '提示',
+					content: '是否取消订单？',
+					success: function(res) {
+						if (res.confirm) {
+							App._post_form('&p=pay&do=cancelOrder', data, res => {
+								_this.getOrderList();
+								uni.showToast({
+									icon: 'none',
+									title: '取消成功',
+									duration: 2000
+								});
+							});
+						} else if (res.cancel) {}
+					}
+				});
+			},
+			// 确认收货
+			sureReceive(id, plugin) {
+				let _this = this
+				let data = {
+					id: id,
+					plugin: plugin
+				}
+				App._post_form('&p=pay&do=sureReceive', data, res => {
+					_this.getOrderList();
+					uni.showToast({
+						icon: 'none',
+						title: '已确认收货',
+						duration: 2000
+					});
+				})
+			},
+			downLoading() {
+				let _this = this;
+				if (_this.current_page >= _this.pagetotal) {
+					_this.isMore = true;
+					return false;
+				}
+				_this.getOrderList(++_this.current_page, true)
+			},
+			// 去支付
+			goPayment(orderid, plugin) {
+				App.navigationTo({
+					url: 'pages/mainPages/payment/payment?orderid=' + orderid + '&plugin=' + plugin
+				});
+			},
+			// 跳转商品详情
+			goGoodDetails(plugin, typeid, id) {
+				let _this = this,
+					goods_url = typeid === 8 ? 'pages/subPages/goods/index?id=' + id + '&goodsType=integral' :
+					'pages/subPages/goods/index?id=' + id + '&goodsType=' + typeid;
+				if (plugin !== 'member') {
+					App.navigationTo({
+						url: goods_url
+					})
+				} else {
+					App.navigationTo({
+						url: 'pages/subPages/balance/balance'
+					})
+				}
+			},
+			// 买家提醒商家发货
+			remindSend(itemList, orderid, plugin, goodsname) {
+				let _this = this,
+					data = {
+						orderid: orderid,
+						plugin: plugin,
+						goodsname: goodsname
+					};
+				_this.$set(itemList, 'isRemind', true)
+				App.showSuccess('已提醒发货', () => {
+
+				})
+				setTimeout(() => {
+					App._post_form('&p=member&do=remindSend', data, res => {
+
+					})
+				}, 500)
+
+			},
+			loadings(page = 1, isPage = false) {
+				console.log('orderList2')
+				let _this = this;
+				App._post_form('&p=member&do=orderList', {
+					page,
+					status: _this.status,
+					cc_id: _this.option.cc_id
+				}, res => {
+					for (let i = 0; i < res.data.myorder.length; i++) {
+						if (res.data.myorder[i].status == 0) {
+							res.data.myorder[i].status = '待付款';
+						}
+						if (res.data.myorder[i].status == 1) {
+							res.data.myorder[i].status = '待使用';
+						}
+						if (res.data.myorder[i].status == 2) {
+							res.data.myorder[i].status = '待评价';
+						}
+						if (res.data.myorder[i].status == 3) {
+							res.data.myorder[i].status = '已完成';
+						}
+						if (res.data.myorder[i].status == 4) {
+							res.data.myorder[i].status = '待收货';
+						}
+						if (res.data.myorder[i].status == 5) {
+							res.data.myorder[i].status = '已取消';
+						}
+						if (res.data.myorder[i].status == 6) {
+							res.data.myorder[i].status = '待退款';
+						}
+						if (res.data.myorder[i].status == 7) {
+							res.data.myorder[i].status = '已退款';
+						}
+						if (res.data.myorder[i].status == 8) {
+							res.data.myorder[i].status = '待发货';
+						}
+						if (res.data.myorder[i].status == 9) {
+							res.data.myorder[i].status = '已过期';
+						}
+						if (res.data.myorder[i].status == 10) {
+							res.data.myorder[i].status = '退款中';
+						}
+					}
+					if (isPage) {
+						if (res.data.myorder.length > 0) {
+							_this["orderList"].push(...res.data.myorder);
+						} else {
+							_this.isMore = true;
+						}
+					} else {
+						_this.setData({
+							current_page: 1,
+							orderList: res.data.myorder,
+							pagetotal: res.data.pagetotal,
+							isMore: res.data.myorder.length === 0 || _this.current_page === res.data.pagetotal,
+							loadingText: ""
+						})
+					}
+					
+				}, false, () => {
+					uni.hideLoading()
+				});
+			},
+			// 获取用户订单列表信息
+			getOrderList(page = 1, isPage = false) {
+				console.log('orderList1')
+				let _this = this;
+				App._post_form('&p=member&do=orderList', {
+					page,
+					status: _this.status,
+					cc_id: _this.option.cc_id
+				}, res => {
+					for (let i = 0; i < res.data.myorder.length; i++) {
+						if (res.data.myorder[i].status == 0) {
+							res.data.myorder[i].status = '待付款';
+						}
+						if (res.data.myorder[i].status == 1) {
+							res.data.myorder[i].status = '待使用';
+						}
+						if (res.data.myorder[i].status == 2) {
+							res.data.myorder[i].status = '待评价';
+						}
+						if (res.data.myorder[i].status == 3) {
+							res.data.myorder[i].status = '已完成';
+						}
+						if (res.data.myorder[i].status == 4) {
+							res.data.myorder[i].status = '待收货';
+						}
+						if (res.data.myorder[i].status == 5) {
+							res.data.myorder[i].status = '已取消';
+						}
+						if (res.data.myorder[i].status == 6) {
+							res.data.myorder[i].status = '待退款';
+						}
+						if (res.data.myorder[i].status == 7) {
+							res.data.myorder[i].status = '已退款';
+						}
+						if (res.data.myorder[i].status == 8) {
+							res.data.myorder[i].status = '待发货';
+						}
+						if (res.data.myorder[i].status == 9) {
+							res.data.myorder[i].status = '已过期';
+						}
+						if (res.data.myorder[i].status == 10) {
+							res.data.myorder[i].status = '退款中';
+						}
+					}
+					if (isPage) {
+						if (res.data.myorder.length > 0) {
+							_this["orderList"].push(...res.data.myorder);
+						} else {
+							_this.isMore = true;
+						}
+					} else {
+						console.log(res.data.myorder.length === 0 || _this.current_page === res.data.pagetotal)
+						_this.setData({
+							current_page: 1,
+							orderList: res.data.myorder,
+							pagetotal: res.data.pagetotal,
+							isMore: res.data.myorder.length === 0 || _this.current_page === res.data.pagetotal,
+							loadingText: "",
+							changeflag: res.data.changeflag
+						})
+					}
+				}, false, () => {
+					_this.loading = false;
+					uni.hideLoading()
+				});
+			},
+			scrollyTop(e) {
+				let _this = this;
+				_this.$util.debounce(200, () => {
+					_this.scrollTop = e.detail.scrollTop;
+				})
+			}
+		}
+	};
+</script>
+<style>
+	page {
+		background: #f5f5f5;
+		overflow: hidden;
+	}
+</style>
+<style lang="less" scoped>
+	.orderList {
+		background: #f5f5f5;
+		font-size: 0;
+		border: 1upx solid rgba(0, 0, 0, 0);
+	}
+
+	.topNav {
+		z-index: 999;
+		position: fixed;
+		width: 750upx;
+		height: 80upx;
+		background: rgba(255, 255, 255, 1);
+		overflow: hidden;
+
+		>view {
+			overflow: hidden;
+			display: inline-block;
+			vertical-align: top;
+			width: 20%;
+
+			>view {
+				overflow: hidden;
+				height: 76upx;
+				margin: auto;
+				width: 85upx;
+				text-align: center;
+
+				>span {
+					line-height: 80upx;
+					font-size: 24upx;
+
+
+					color: rgba(153, 153, 153, 1);
+				}
+			}
+		}
+	}
+
+	.check {
+		overflow: hidden;
+		display: inline-block;
+		vertical-align: top;
+		width: 20%;
+
+		>view {
+			border-bottom: 4px solid #ff4444;
+			overflow: hidden;
+			height: 76upx;
+			margin: auto;
+			width: 85upx;
+			text-align: center;
+
+			>span {
+				line-height: 80upx !important;
+				font-size: 28upx !important;
+
+				font-weight: bold !important;
+				color: rgba(51, 51, 51, 1) !important;
+			}
+		}
+	}
+
+	.orderListsMb {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.mbPackage {
+		padding: 30upx;
+	}
+
+	.orderListsMbTitle {
+		padding-bottom: 30upx;
+		// border-bottom: 1px solid rgba(238, 238, 238, 1);
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+
+			>view {
+				display: inline-block;
+				vertical-align: middle;
+				width: 40upx;
+				height: 40upx;
+				border-radius: 50%;
+				overflow: hidden;
+
+				>image {
+					width: 40upx;
+					height: 40upx;
+				}
+			}
+
+			>span {
+				margin-left: 10upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+
+	.orderListsMbBody {
+		padding: 30upx 0;
+		// border-bottom: 1px solid rgba(238, 238, 238, 1);
+
+		>view {
+			display: inline-block;
+			vertical-align: top;
+		}
+	}
+
+	.orderListsImg {
+		width: 150upx;
+		height: 150upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 150upx;
+			height: 150upx;
+		}
+	}
+
+	.orderListsInfo {
+		width: 441upx;
+		margin-left: 30upx;
+
+		>view:nth-child(1) {
+			min-height: 70upx;
+
+			>span {
+				font-size: 28upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			height: 35upx;
+			margin-top: 5upx;
+
+			>span {
+				font-size: 24upx;
+
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+
+		>view:nth-child(3) {
+			margin-top: 10upx;
+
+			>span {
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.orderListsMbFoot {
+		padding: 30upx 0 0 0;
+	}
+
+	.orderListsPrice {
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+
+			>span:nth-child(1) {
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+			}
+
+			>span:nth-child(2) {
+				margin-left: 20upx;
+				font-size: 24upx;
+
+
+				color: rgba(51, 51, 51, 1);
+
+				>span {
+					color: #ff4444;
+				}
+			}
+		}
+	}
+
+	.orderListsButton {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.viewButon {
+		margin-top: 20upx;
+
+		>view:nth-child(2) {}
+	}
+
+	.buttonRed {
+		margin-left: 20upx;
+		display: inline-block;
+		text-align: center;
+		width: 130upx;
+		height: 50upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 25upx;
+
+		>span {
+			line-height: 50upx;
+			font-size: 24upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.buttonYello {
+		margin-left: 20upx;
+		display: inline-block;
+		text-align: center;
+		width: 130upx;
+		height: 50upx;
+		background: #F8C31F;
+		border-radius: 25upx;
+
+		>span {
+			line-height: 50upx;
+			font-size: 24upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.buttonWhite {
+		margin-left: 20upx;
+		display: inline-block;
+		width: 130upx;
+		height: 50upx;
+		border: 1upx solid rgba(204, 204, 204, 1);
+		border-radius: 25upx;
+		text-align: center;
+
+		>span {
+			line-height: 50upx;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.full {
+		width: 750upx;
+		height: 115upx;
+		text-align: center;
+
+		>span {
+			line-height: 115upx;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.topFull {}
+
+	.orderLists {
+		margin: 80upx 0 170upx 0;
+		width: 750upx;
+	}
+</style>
diff --git a/pages/subPages/orderList/orderTakeout/orderTakeout.vue b/pages/subPages/orderList/orderTakeout/orderTakeout.vue
new file mode 100644
index 0000000..a5a3f32
--- /dev/null
+++ b/pages/subPages/orderList/orderTakeout/orderTakeout.vue
@@ -0,0 +1,381 @@
+<template>
+	<!-- 同城订单详情 -->
+	<view class="orderTakeout">
+		<!-- 红底白字系列 -->
+		<view style="height: 3vh;background-color: #FF4444;padding: 30upx;" v-if="false">
+			<view class="dis-flex" style="justify-content: space-between;">
+				<view class="flex-box f-w f-30" style="color: #FFFFFF;">
+					<text class="iconfont icon-qitadingdan" style="font-size: 30upx;"></text>
+					{{ oderData.storelist[0].status == 1 ? '待使用' : oderData.storelist[0].status == 0 ? '待支付' : '待收货' }}
+				</view>
+				<view class="flex-box t-r f-22 f-w" style="color: #FFFFFF;" v-show="false">剩余1:00自动取消</view>
+			</view>
+		</view>
+		<!-- 飞起来的模块 -->
+		<view  style="margin-top: 30upx;border-radius: 15upx;" v-for="(items, index) in oderData.storelist" :key="index">
+			<view  style="padding: 0 30upx;">
+				<view class="dis-flex b-f" style="border-radius: 15upx 15upx 0 0;">
+					<view  style="flex: 0.15;padding-top: 7%;">
+						<view
+							class="iconfont icon-dingweixiao"
+							style="margin: auto;background: linear-gradient(to top right,#FFBF42,#FFE186);border-radius: 50%;width: 60upx;height: 60upx;text-align: center;line-height: 60upx;font-size: 28upx;color: #FFFFFF;"
+						></view>
+					</view>
+					<view  style="flex: 0.65;">
+						<view class="f-28" style="padding: 30upx 0 20upx;">
+							<text class="f-w" style="padding-right: 20upx;">{{ items.storename }}</text>
+							<text class="f-24">{{ items.mobile }}</text>
+						</view>
+						<view class="f-24" style="padding-bottom: 30upx;">{{ items.address }}</view>
+					</view>
+					<view  style="flex: 0.2;">
+						<view class="iconfont icon-phone" style="font-size: 68upx;padding: 30upx 20upx 20upx;color: #FF4444;" @click="playCall(items.mobile)"></view>
+					</view>
+				</view>
+				<view class="receiptDetailsFoot"></view>
+			</view>
+			<!-- 各种详情 -->
+			<view  style="padding: 0 30upx;">
+				<view class="b-f" style="">
+					<view class="dis-flex" style="padding: 30upx;" v-for="(item, index) in items.goodlist">
+						<view  style="flex: 0.3;">
+							<image style="width: 150upx;height: 150upx;border-radius: 10upx;margin: 0 30upx 0 0;" :src="item.thumb" mode="aspectFill"></image>
+						</view>
+						<view  style="flex: 0.7;">
+							<view class="f-24 f-w" style="overflow: hidden;-webkit-line-clamp: 2; -webkit-box-orient: vertical;display: -webkit-box;width: 460upx;">
+								{{ item.name }}
+							</view>
+							<view class="f-20" style="padding: 16upx 0;color: #999999;">数量:X{{ item.num }} <text style="padding-left: 20upx;" v-if="item.specname">规格:{{item.specname}}</text></view>
+							<view class="f-20 f-w">¥{{ item.price }}</view>
+						</view>
+					</view>
+				</view>
+				<!-- 订单号和时间 -->
+				<view class="b-f" style="padding: 30upx;">
+					<view class="dis-flex" style="padding-bottom: 20upx;">
+						<view class="f-24 f-w" style="flex: 0.25;">订单编号</view>
+						<view class="f-22" style="flex: 0.75;color: #999999;">{{ items.orderno }}</view>
+						<view class="f-20 t-r" style="color: #FF4444;" @click="copy(items.orderno)">
+							点击复制
+						</view>
+					</view>
+					<view class="dis-flex" style="">
+						<view class="f-24 f-w" style="flex: 0.25;">下单时间</view>
+						<view class="f-22" style="flex: 0.75;color: #999999;">{{ items.createtime }}</view>
+					</view>
+				</view>
+				<!-- 金额模块 -->
+				<view class="b-f" style="padding: 30upx 30upx 0;">
+					<view class="dis-flex" style="padding-bottom: 20upx;" v-if="items.allexpressprcie !== '0.00'">
+						<view class="f-24 f-w t-l" style="flex: 1;">运费</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">¥{{ items.allexpressprcie }}</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;" v-if="items.packingmoney != '0.00'">
+						<view class="f-24 f-w t-l" style="flex: 1;">{{items.bzftext}}</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">¥{{ items.packingmoney }}</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;">
+						<view class="f-24 f-w t-l" style="flex: 1;">商品金额</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">¥{{ items.allgoodsmoney }}</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;" v-if="items.allfulldiscount !== '0.00'">
+						<view class="f-24 f-w t-l" style="flex: 1;">满减优惠</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">-¥{{ items.allfulldiscount}}</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;" v-if="items.allvipdiscount !== '0.00'">
+						<view class="f-24 f-w t-l" style="flex: 1;">会员优惠</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">-¥{{ items.allvipdiscount}}</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;">
+						<view class="f-24 f-w t-l" style="flex: 1;">实付款</view>
+						<view class="f-24 t-r f-w" style="flex: 1;">
+							<text>共{{ items.num }}件商品</text>
+							<text style="color: #FF4444;padding-left: 15upx;" class="f-w f-28">¥{{ items.allmoney }}</text>
+						</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 20upx;" v-if="items.buyremark">
+						<view class="f-24 f-w t-l" style="flex: 1;">买家备注</view>
+						<view class="f-24 t-r f-w" style="flex: 1;color: #999999;">{{ items.buyremark}}</view>
+					</view>
+					<!-- <view class="dis-flex" style="padding-top: 30upx;flex-direction: row-reveres;">
+						<view  style="flex: 0.35;"></view>
+						<view class="t-r dis-flex" style="flex: 0.65;">
+							<view class="f-24 f-w" style="padding-right: 10upx;flex: 0.5;"></view>
+							<view class="f-24 f-w t-c" style="padding-right: 10upx;flex: 0.25;">:</view>
+							<view class="f-32 f-w" style="color: #ff4444;flex: 0.35;line-height: 34upx;"></view>
+						</view>
+					</view> -->
+				</view>
+			</view>
+			<!-- 骑手动态 -->
+			<view class="b-f f-w" style="margin: 6upx 30upx;padding: 30upx;" v-if="items.allexpressprcie !== '0.00' && JSON.stringify(items.order_rider) != '[]'">
+				<view class="f-30 f-w" style="line-height: 60upx;">配送信息</view>
+				<view  v-if="items.order_rider.accept_time">
+					<view class="f-24 dis-flex" style="line-height: 60upx;">
+						<view class="flex-box">接单时间</view>
+						<view class="flex-box t-r">{{ items.order_rider.accept_time }}</view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.get_time">
+						<view class="flex-box">取货时间</view>
+						<view class="flex-box t-r">{{ items.order_rider.get_time }}</view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.goto_time">
+						<view class="flex-box">送达时间</view>
+						<view class="flex-box t-r">{{ items.order_rider.goto_time }}</view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.complete_time">
+						<view class="flex-box">完成时间</view>
+						<view class="flex-box t-r">{{ items.order_rider.complete_time }}</view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.pick_img">
+						<view class="flex-box" style="padding-top: 75upx;">取货照片</view>
+						<view class="flex-box t-r"><image :src="items.order_rider.pick_img" mode="" style="width: 150upx;height: 150upx;"></image></view>
+					</view>
+					
+					<view class="f-24 dis-flex" v-if="items.order_rider.end_img">
+						<view class="flex-box" style="padding-top: 75upx;">送达照片</view>
+						<view class="flex-box t-r"><image :src="items.order_rider.end_img" mode="" style="width: 150upx;height: 150upx;"></image></view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.real_name">
+						<view class="flex-box">骑手姓名</view>
+						<view class="flex-box t-r">{{ items.order_rider.real_name }}</view>
+					</view>
+					<view class="f-24 dis-flex" style="line-height: 60upx;" v-if="items.order_rider.mobile">
+						<view  style="flex: 0.4;">骑手电话</view>
+						<view class=" t-r" @click="playHorsemanCall(items.order_rider.mobile)" style="flex: 0.6;">
+							{{ items.order_rider.mobile }}
+							<text class="iconfont icon-shoujichongzhi" style="font-size: 28upx;color: #FF4444;padding-left: 20upx;"></text>
+							<text class="f-w f-28" style="color: #FF4444;">联系骑手</text>
+						</view>
+					</view>
+				</view>
+				<view class="f-w f-32" v-else style="line-height: 60upx;color: #FFCE44;" v-if="items.tiptext">
+					<text class="iconfont icon-chufang f-w" style="font-size: 36upx;"></text><text >{{items.tiptext}}</text>
+				</view>
+			</view>
+			
+			<!-- 商家图片展示 -->
+			<view class="b-f" style="padding: 20upx 30upx;margin: 10upx 30upx 10upx;" v-if="items.fishimg">
+				<view class="f-28 f-w" style="padding-bottom: 20upx;">商家完成展示</view>
+				<image :src="items.fishimg" style="width: 630upx;height: 630upx;border-radius: 20upx;" @click="lookImg(items.fishimg)" mode=""></image>
+			</view>
+			<!-- 飞行尾部 -->
+			<view class="b-f dis-flex" style="padding: 20upx 30upx;height: 60upx;margin: 10upx 30upx 50upx;border-radius: 0 0 15upx 15upx;">
+				<view class="flex-box f-w" style="color: #FF4444;" v-if="items.statustext || items.status == 5">
+					<text class="iconfont icon-qitadingdan" style="font-size: 30upx;"></text>
+					{{ items.status == 5?'已取消':items.statustext }}
+				</view>
+				<view class="flex-box dis-flex">
+					<button type="default" plain="true" v-if="items.status == 0" class="btn flex-box" style="margin-right: 20upx;" @click="closeOrder">取消订单</button>
+					<button type="default" plain="true" v-if="items.status == 1 || items.status == 4 || items.status == 8" class="btn flex-box" style="margin-right: 20upx;" @click="refund(items)">
+						申请退款
+					</button>
+					<button v-if="items.status == 0" type="warn" class="btn flex-box" @click="goPay">去支付</button>
+					<button v-else-if="items.status == 1 || items.status == 4" type="warn" class="btn flex-box" @click="goce(items.id)">完成</button>
+					<button v-else-if="items.status == 2" type="warn" class="btn flex-box" @click="goPj(items.id)">去评论</button>
+					<button
+						type="default"
+						plain="true"
+						v-if="items.status == 10"
+						class="btn flex-box"
+						style="margin-right: 20upx;border: 1px slid #999999;"
+						@click="gorefund(items)"
+					>
+						退款详情
+					</button>
+				</view>
+			</view>
+		</view>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {
+			oderData: null,
+			options: ''
+		};
+	},
+	onLoad(options) {
+		this.options = options;
+		this.getOrder(options);
+		console.log(options);
+	},
+	onShow() {
+		this.getOrder(this.options);
+	},
+	methods: {
+		lookImg(img){
+			let imgs = [img];
+			uni.previewImage({
+			    current:0, //预览图片的下标
+			    urls: imgs//预览图片的地址，必须要数组形式，如果不是数组形式就转换成数组形式就可以
+			})
+		},
+		copy(text){
+			//#ifdef H5
+				App.clipboard(text);
+			//#endif
+			uni.setClipboardData({
+				data: text
+			});
+			uni.showToast({
+				title:'已复制到粘贴板'
+			})
+		},
+		//查看退款
+		gorefund(item) {
+			console.log(item);
+			App.navigationTo({
+				url: 'pages/subPages/afterSale/afterDatli/afterDatli?id=' + item.afterid + '&plugin=citydelivery' + '&orderno=' + item.orderid
+			});
+		},
+		// 去退款
+		refund(item) {
+			console.log(item);
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/subPages/orderList/afterSale/afterSale?id=' + item.id + '&plugin=citydelivery'
+			});
+		},
+		// 去评价
+		goPj(id) {
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/mainPages/comment/comment?order_id=' + id + '&plugin=' + this.options.plugin + '&a=a'
+			});
+		},
+		// 打骑手电话
+		playHorsemanCall(itemMoblis) {
+			let _this = this;
+			uni.showModal({
+				title: '联系骑手',
+				content: itemMoblis,
+				success: function(res) {
+					if (res.confirm) {
+						uni.makePhoneCall({
+							phoneNumber: itemMoblis //仅为示例
+						});
+					} else if (res.cancel) {
+					}
+				}
+			});
+		},
+		// 打电话
+		playCall(molib) {
+			let _this = this;
+			uni.showModal({
+				title: '联系商家',
+				content: molib,
+				success: function(res) {
+					if (res.confirm) {
+						uni.makePhoneCall({
+							phoneNumber: molib //仅为示例
+						});
+					} else if (res.cancel) {
+					}
+				}
+			});
+		},
+		// 完成按钮
+		goce(id) {
+			App.showError(
+				`确认已经收到商品？`,
+				data => {
+					if (data.confirm) {
+						!!data &&
+							App._post_form(
+								`&p=citydelivery&do=finishOrder&id=${id}&type=1`,
+								{},
+								res => {
+									this.getOrder(this.options);
+								},
+								false,
+								() => {
+									// _this.loadlogo = true
+								}
+							);
+					}
+				},
+				true
+			);
+		},
+		// 申请退款--取消订单
+		closeOrder() {
+			let _this = this,
+				data = {
+					id: _this.options.orderid,
+					plugin: _this.options.plugin
+				};
+			uni.showModal({
+				title: '提示',
+				content: '是否取消订单？',
+				success: function(res) {
+					if (res.confirm) {
+						App._post_form('&p=pay&do=cancelOrder', data, res => {
+							_this.getOrder(_this.options);
+							uni.showToast({
+								title:'取消成功'
+							})
+							// uni.navigateBack({
+							//     delta: 1
+							// });
+						});
+					} else if (res.cancel) {}
+				}
+			});
+		},
+		// 去支付
+		goPay() {
+			console.log(this.sid);
+			App.navigationTo({
+				url: 'pages/mainPages/payment/payment?orderid=' + this.options.orderid + '&plugin=' + this.options.plugin
+			});
+		},
+		getOrder(options) {
+			let agencyData = uni.getStorageSync('agencyData');
+			App._post_form(
+				`&p=citydelivery&do=orderDetail&id=${options.orderid}&idstatus=${options.state}`,
+				{},
+				res => {
+					this.setData({
+						oderData: res.data
+					});
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.receiptDetailsFoot {
+	background: repeating-linear-gradient(-45deg, white, white 5%, #ff4444 5%, #ff4444 10%, white 10%, white 15%, #52a7f8 15%, #52a7f8 20%);
+	width: 690upx;
+	height: 6upx;
+	border-radius: 10upx;
+}
+.btn {
+	height: 100%;
+	line-height: 54rpx;
+	width: 20%;
+	font-size: 26rpx;
+	padding: 0rpx 15rpx;
+	border-radius: 0;
+}
+</style>
+<style>
+page {
+	background-color: #f7f7f7;
+}
+.uni-button {
+	border: 1px solid #999999;
+}
+</style>
diff --git a/pages/subPages/paySuccess/paySuccess.vue b/pages/subPages/paySuccess/paySuccess.vue
new file mode 100644
index 0000000..77fa83b
--- /dev/null
+++ b/pages/subPages/paySuccess/paySuccess.vue
@@ -0,0 +1,822 @@
+<template>
+	<view class="paySuccess">
+		<far-bottom></far-bottom>
+		<!-- 头部 -->
+		<view class="paySuccessTitle">
+			<view class="payTitleTips">
+				<image :src="imgfixUrls+ 'merchant/paySucImg.png'" />
+				<view>
+					<p>{{drawid?'领取成功':'支付成功'}}!</p>
+					<p v-if="!drawid">实付 {{ payInfo.price }}</p>
+				</view>
+			</view>
+			<view class="payTitleButton">
+				<view @click="goIndex('pages/mainPages/index/index')" v-if="payInfo.plugin != 'housekeep'"><span>返回首页</span></view>
+				<view @click="goIndex('pages/subPages2/homemaking/homeUser/homeUser')" v-if="plugin == 'housekeep'"><span>返回个人中心</span></view>
+				<view @click="goykt" v-if="payInfo.plugin=='halfcard'||payInfo.plugin=='member'||payInfo.plugin=='payonline'||payInfo.plugin=='charge'||payInfo.plugin=='pocket'||payInfo.plugin=='wlfightgroup'||payInfo.plugin=='distribution'||payInfo.plugin=='wlcoupon'||payInfo.plugin=='attestation'||payInfo.plugin=='taxipay'||payInfo.plugin=='citycard'"><span>返回{{payInfo.fightstatus == 1?'组团': plguinList[pluginIndex]}}</span></view>
+				<view  v-else-if="payInfo.plugin=='recruit'" @click="gowork">
+					<span>返回列表</span>
+				</view>
+				<view @click="goOrderDetails" v-else-if="payInfo.plugin !='vehicle' && payInfo.plugin !='housekeep' && payInfo.plugin !='dating'"><span>查看订单</span></view>
+				
+			</view>
+		</view>
+		<!-- 头部 -->
+
+		<!-- 支付详情 -->
+		<view class="paymentDetails">
+			<view class="paymentDetailsPackage">
+				<view>
+					<span>支付方式</span>
+					<span>{{ payInfo.paytype }}</span>
+				</view>
+				<view v-if="payInfo.integral !== undefined && payInfo.integral != 0">
+					<span>{{TextSubstitution.credittext}}奖励</span>
+					<span>获得{{ payInfo.integral }}{{TextSubstitution.credittext}}</span>
+				</view>
+				<view v-if="Number(payInfo.balance)">
+					<span>余额奖励</span>
+					<span>获得{{ payInfo.balance }}元</span>
+				</view>
+				<view v-if="!!payInfo.code&&payInfo.code!=''">
+					<span>激活码</span>
+					<span>{{ payInfo.code }}<span style="color: #FF4444;padding-left: 10upx;" @click="copy(payInfo.code)">前往激活</span></span>
+					
+				</view>
+			</view>
+			<view class="paymentDetailsPackage" style="border-top: 20upx solid #F8F8F8;" v-if="tops.length > 0 && payInfo.plugin=='recruit'">
+				<view style="margin-bottom: 30upx;">
+					<span>信息置顶,持续提高曝光度</span>
+				</view>
+				<view class="f-26 col-6" style="margin: 0;border-top: 1upx solid #EEEEEE;padding: 25upx 0;" v-for="(item,index) in tops" :key="index" @click="StickyChange(item)">
+					<text class="f-26 col-6">
+						{{item.title}}
+					</text>
+				</view>
+			</view>
+		</view>
+		<!-- 支付详情 -->
+
+		<!-- 卡劵 -->
+		<view class="coupon" v-if="!!payInfo.couponlist">
+			<view class="couponPackage">
+				<view class="couponLeft">
+					<view>
+						<image :src="imgfixUrls+ 'merchant/juan.png'" />
+'					</view>
+					<span>{{payInfo.couponlist[0]}}</span>
+				</view>
+				<view class="couponRight" v-if="payInfo.getcouflag == 0" @click="getCoupon"><span>领取</span></view>
+				<view class="couponRight" v-if="payInfo.getcouflag == 1"><span>已领取</span></view>
+			</view>
+		</view>
+		<!-- 卡劵 -->
+		
+		<!-- 红包 -->
+				<view class="coupon" v-for="(redPacketItem,index) in payInfo.redpacklist" :key="index" v-if="!!payInfo.redpacklist.length>0">
+					<view class="couponPackage">
+						<view class="couponLefts" style="width: 100%;">
+							<view class="usedpacket-list-item dis-flex m-btm20">
+								<view class="usedpacket-itemleft p-r dis-flex flex-dir-column flex-x-center">
+									<view class="usedpacket-priceStyle col-f f-50 t-c"><text class="f-30">¥</text>{{redPacketItem.cut_money}}</view>
+									<view class="f-24 col-f t-c">满{{redPacketItem.full_money}}可用</view>
+									<view class="itemleft_bgstyle"></view>
+									<view class="itemleft_bgstyle2"></view>
+								</view>
+								<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+									<view class="usedpacket_titleType dis-flex flex-y-center">
+										<!-- <view class="usedpacketType t-c m-right10 dis-flex flex-y-center"><text class="col-f f-24">{{redPacketItem.}}</text></view> -->
+										<view class="usedpacketTitle onelist-hidden f-28 col-3">{{redPacketItem.title}}</view>
+									</view>
+									<view class="col-9 f-24 m-top-btm10 usedpacket-time onelist-hidden">范围：{{redPacketItem.use_where}}</view>
+									<view class="col-9 f-24">{{redPacketItem.usetime_text}}</view>
+									<!-- <view class="getDraw t-c col-f f-24" @click="getDraw(redPacketItem.id)" v-if="!redPacketItem.is_over"></view>
+									<view class="getDraw t-c col-f f-24" style="background-color: #999999;" v-else>已领完</view> -->
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				
+				<!-- 红包 -->
+		
+		<!-- 广告 -->
+		<view class="buyOrder_button_swiper" v-if="plugin=='taxipay'">
+			<swiper :indicator-dots="indicatorDots" :indicator-active-color="indicatorActiveColor" :autoplay="autoplay"
+			 :interval="interval" :circular="circular">
+				<!-- 循环模板 -->
+				<swiper-item v-for="(item, index) in masterAdvs" :key="index" @click="go(item.link)">
+					<image :src="item.thumb" class="swiperImg" />
+				</swiper-item>
+				<!-- 循环模板 -->
+			</swiper>
+		</view>
+		<view class="advertisement" @click="goThumb" v-if="!!payInfo.thumb&&plugin!='taxipay'">
+			<image :src="payInfo.thumb" />
+		</view>
+		<!-- 广告 -->
+
+		<!-- 推荐商品 -->
+		<view class="tuiJian" v-if="recommendGoodlength > 0">
+			<view class="tuiJianTitle">
+				<view class="dot"></view>
+				<span v-if="pluginIndex == 11">{{names}}</span>
+				<span v-else>推荐商品</span>
+				<view class="dot"></view>
+			</view>
+			<view class="tuiJianBody" v-if="pluginIndex == 11">
+				<tab-contro :tabData="payInfos.tabinfo.data" :tabStyle="payInfos.tabinfo.style" :controType="payInfos.tabinfo.id"
+				 :tabParmsType="[payInfos.tabinfo.params]"></tab-contro>
+			</view>
+			<RecommendGoods @recommendGoodNoOff="recommendGoodNoOff" v-else></RecommendGoods>
+		</view>
+		<view  style="padding: 60upx 0;" v-else>
+			
+		</view>
+		<!-- 推荐商品 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	import RecommendGoods from '@/components/page/pageComponents/Recommend_goods';
+	import tabContro from '@/components/page/pageComponents/tabContro';
+	let innerAudioContext = uni.createInnerAudioContext();
+
+	export default {
+		components: {
+			RecommendGoods,
+			tabContro
+		},
+		data() {
+			return {
+				type: 'options',
+				circular: true,
+				interval: 2000,
+				autoplay: true,
+				indicatorActiveColor: 'white',
+				indicatorDots: true,
+				masterAdvs: [],
+				pluginIndex: null,
+				tid: null,
+				payInfo: {},
+				payInfos:{},
+				plugin: null,
+				plguinList: ['一卡通', '个人中心', '消费记录', '店铺列表', '帖子详情', '详情', '个人中心', '', '详情', '卡卷详情', '认证中心', '订单列表', '我的名片'],
+				temp_type: "",
+				img:'',
+				names:'',
+				recommendGoodlength:0,
+				state:1,
+				drawid:0,
+				tops:[],
+				TextSubstitution:{}
+			};
+		},
+		onLoad: function(option) {
+			// debugger
+			this.img= this.imgfixUrl;
+			this.tid = option.tid;
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			if(option.draw){
+				this.drawid = option.draw;
+			}
+			if(option.state){
+				this.state = option.state;
+			}
+			if (option.plugin == 'halfcard') {
+				this.plugin = option.plugin;
+			}
+			if (option.plugin == 'housekeep') {
+				this.plugin = option.plugin;
+			}
+			
+			this.init();
+			if(option.plugin == 'recruit'){
+				this.getTop();
+			}
+		},
+		onShow() {
+			innerAudioContext.play();
+		},
+		methods: {
+			getDraw(redPacket_id) {
+				let _this = this;
+				uni.showLoading()
+				App._post_form('&p=redpack&do=getRedPack', {
+					id: redPacket_id,
+					red_pack_source: '1'
+				}, res => {
+					if (res.errno === 0) {
+						App.showSuccess('领取成功');
+						_this.getRedPacket();
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			StickyChange(item){
+				let data = {
+					type:'post',
+					recruit_id:this.payInfo.recruit_id,
+					top_day:item.day, 
+					top_price:item.price
+				}
+				App._post_form(
+					`&p=recruit&do=recruitTop`,
+					data,
+					res => {
+						console.log(res);
+						App.navigationTo({
+							url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+`&plugin=${res.data.type}`
+						})
+					},
+					false,
+					() => {}
+				);
+			},
+			getTop(){
+				App._post_form('&p=recruit&do=recruitTop', {}, res => {
+					this.tops = res.data;
+					this.tops.map(item => {
+						item.title = `置顶${item.day}天仅需${item.price}元`;
+					});
+					console.info('masterAdvs', _this.tops)
+				});
+			},
+			copy(text){
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/getMembership/getMembership?card=nhave&code=' + text
+				});
+			},
+			recommendGoodNoOff(res){
+				console.log(res.length,'推荐奖长度');
+				this.recommendGoodlength = res.length;
+			},
+			go(link) {
+				let _this = this;
+				App.navigationTo({
+					url: link
+				});
+			},
+			init() {
+				let _this = this;
+				_this.payOver();
+
+			},
+			pay_bill(masid) {
+				let _this = this;
+				let data = {
+					masid: masid
+				};
+				App._post_form('&p=taxipay&do=pay_adv', data, res => {
+					_this.masterAdvs = res.data.adv;
+					console.info('masterAdvs', _this.masterAdvs)
+				});
+				App._post_form('&p=taxipay&do=tabInfo', data, res => {
+					console.log(res,'hudadssadsadad');
+					_this.payInfos = res.data;
+					this.names = res.data.tabtitle;
+					// console.info('masterAdvs', _this.masterAdvs)
+				});
+			},
+			// 跳转
+			goIndex(url) {
+				this.saveForm(this.temp_type);
+				if(this.plugin == 'dating'){ //相亲去相亲首页
+				let aid = uni.getStorageSync('agencyData').aid
+				let urls = `pages/mainPages/index/diypage?i=1&aid=${aid}&type=16`;
+					App.navigationTo({
+						url: urls
+					})
+				}else if(this.plugin == 'vehicle'){
+					App.navigationTo({
+						url: 'pages/subPages2/hitchRide/index/index'
+					})
+				}else{
+					App.navigationTo({
+						url: url
+					})
+				}
+			},
+			gowork(){
+				if(this.payInfo.release_sid == 0){
+					App.navigationTo({
+						url: 'pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter'
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter?sid=' + this.payInfo.release_sid 
+					})
+				}
+				
+			},
+			goykt() {
+				let _this = this
+				_this.saveForm(_this.temp_type);
+				if (_this.pluginIndex == 0) {
+					App.navigationTo({
+						url: 'pages/mainPages/memberCard/memberCard'
+					})
+				}
+				if (_this.pluginIndex == 1) {
+					App.navigationTo({
+						url: 'pages/mainPages/userCenter/userCenter'
+					})
+				}
+				if (_this.pluginIndex == 2) {
+					App.navigationTo({
+						url: 'pages/subPages/consumptionRecords/consumptionRecords'
+					})
+				}
+				if (_this.pluginIndex == 3) {
+					App.navigationTo({
+						url: 'pages/subPages/merchant/merchantChangeShop/merchantChangeShop'
+					})
+				}
+				if (_this.pluginIndex == 4) {
+					App.navigationTo({
+						url: 'pages/subPages/postDetails/postDetails?id=' + _this.payInfo.tieziid
+					})
+				}
+				if (_this.pluginIndex == 5) {
+					App.navigationTo({
+						url: 'pages/subPages/group/assemble/assemble?orderid=' + _this.payInfo.orderid + '&plugin=wlfightgroup' +
+							'&id=' + _this.payInfo.fightgoodsid
+					})
+				}
+				if (_this.pluginIndex == 6) {
+					App.navigationTo({
+						url: 'pages/mainPages/userCenter/userCenter'
+					})
+				}
+				if (_this.pluginIndex == 7) {
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderList'
+					})
+				}
+				if (_this.pluginIndex == 8) {
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderDetails/orderDetails?orderid=' + _this.payInfo.orderid +
+							'&plugin=wlfightgroup'
+					})
+				}
+				if (_this.pluginIndex == 9) {
+					App.navigationTo({
+						url: 'pages/subPages/coupon/couponDetails/couponDetails?order_id=' + _this.payInfo.orderid + '&id=' + _this.payInfo
+							.couponid
+					})
+				}
+				if (_this.pluginIndex == 10) {
+					App.navigationTo({
+						url: 'pages/subPages/attestationCenter/index?rzType=' + _this.payInfo.type
+					})
+				}
+				if (_this.pluginIndex == 11) {
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderList'
+					})
+				}
+				if (_this.pluginIndex == 12) {
+					App.navigationTo({
+						url: 'pages/subPages/businesscard/carddetail/renewcarddetail'
+					})
+				}
+			},
+			// 跳转详情
+			goOrderDetails() {
+				let _this = this;
+				
+				_this.saveForm(_this.temp_type)
+				if (_this.payInfo.plugin == 'citydelivery') {
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderTakeout/orderTakeout?orderid=' + _this.payInfo.orderid + '&plugin=' + _this
+							.payInfo
+							.plugin + '&state=' + _this.state
+					})
+				} else if(_this.payInfo.plugin == 'housekeep'){
+					App.navigationTo({
+						url: 'pages/subPages2/homemaking/myorderForm/myorderForm?type=1'
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/orderList/orderDetails/orderDetails?orderid=' + _this.payInfo.orderid + '&plugin=' + _this
+							.payInfo
+							.plugin
+					})
+				}
+
+			},
+			// 领取支付有礼卡券
+			getCoupon() {
+				let _this = this;
+				let data = {
+					id: _this.payInfo.paidprid
+				};
+				App._post_form('&p=pay&do=getCoupon', data, res => {
+					uni.showToast({
+						icon: 'none',
+						title: '领取成功',
+						duration: 2000
+					});
+				});
+			},
+			goThumb() {
+				let _this = this;
+				App.navigationTo({
+					url: _this.payInfo.thumburl
+				});
+			},
+			// 订单支付成功
+			payOver() {
+				let _this = this;
+				let data = {
+					tid: _this.tid,
+				};
+				App._post_form('&p=pay&do=payOver', data, res => {
+					_this.payInfo = res.data;
+					this.plugin = res.data.plugin;
+					
+					if (res.data.plugin == 'halfcard') {
+						_this.pluginIndex = 0
+					} else if (res.data.plugin == 'member') {
+						_this.pluginIndex = 1
+					} else if (res.data.plugin == 'payonline') {
+						_this.pluginIndex = 2
+					} else if (res.data.plugin == 'charge') {
+						_this.pluginIndex = 3
+					} else if (res.data.plugin == 'pocket') {
+						App.navigationTo({
+							url: `pages/mainPages/successRelease/successRelease?id=${res.data.tieziid}`,
+							navType: 'rediRect'
+						})
+					} else if (res.data.plugin == 'wlfightgroup') {
+						if (res.data.fightstatus == 2) {
+							_this.pluginIndex = 8
+						} else {
+							_this.pluginIndex = 5
+						}
+					} else if (res.data.plugin == 'distribution') {
+						_this.pluginIndex = 6
+					} else if (res.data.plugin == 'wlcoupon') {
+						_this.pluginIndex = 9
+					} else if (res.data.plugin == 'attestation') {
+						_this.pluginIndex = 10
+					} else if (res.data.plugin == 'taxipay') {
+						innerAudioContext.src = res.data.noticeurl;
+						//#ifdef H5
+						    jWeixin.ready(() => {
+						     jWeixin.getLocation({
+						      type: 'gcj02',
+						      success: function(res) {
+						       innerAudioContext.play();
+						      }
+						     });
+						    });
+						    //#endif
+							//#ifndef H5
+							innerAudioContext.play();
+							//#endif
+						innerAudioContext.onPlay(() => {
+						  console.log('开始播放');
+						});
+						_this.pluginIndex = 11
+						_this.pay_bill(res.data.masid);
+					} else if (res.data.plugin == 'citycard') {
+						_this.pluginIndex = 12
+					} else{
+						_this.pluginIndex = 7
+					}
+					// #ifndef H5
+					_this.temp_type = res.data.temp_type;
+					// #endif
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.buyOrder_button_swiper {
+		width: 690upx;
+		height: 250upx;
+		border-radius: 10upx;
+		overflow: hidden;
+		margin: 20upx auto 0 auto;
+	}
+
+	.swiperImg {
+		width: 690upx;
+		height: 250upx;
+	}
+
+	.dot {
+		width: 15upx;
+		height: 15upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 50%;
+	}
+
+	.tuiJian {
+		text-align: center;
+		margin: 40upx;
+	}
+
+	.tuiJianTitle {
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+
+		>span {
+			margin: 0 20upx;
+			vertical-align: middle;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	page {
+		overflow-x: hidden;
+		background: #f8f8f8;
+	}
+
+	.paySuccess {
+		width: 750upx;
+		overflow-x: hidden;
+		background: #f8f8f8;
+		font-size: 0;
+	}
+
+	.tuiJianTitle {
+		margin: 50upx 0;
+	}
+
+	.paySuccessTitle {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		width: 750upx;
+		height: 357upx;
+		background: rgba(255, 94, 70, 1);
+	}
+
+	.payTitleTips {
+		margin-top: 16upx;
+		text-align: center;
+
+		>image {
+			vertical-align: middle;
+			width: 150upx;
+			height: 150upx;
+		}
+
+		>view {
+			margin-left: 44upx;
+			vertical-align: middle;
+			display: inline-block;
+
+			>p:nth-child(1) {
+				margin-top: 1upx;
+			}
+
+			>p:nth-child(2) {
+				margin-top: 10upx;
+			}
+
+			>p {
+				text-align: left;
+				margin: 0;
+				padding: 0;
+				font-size: 28upx;
+
+				font-weight: bold;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	.payTitleButton {
+		text-align: center;
+		margin-top: 0upx;
+
+		>view {
+			margin: 0 20upx;
+			display: inline-block;
+			width: 180upx;
+			height: 62upx;
+			border: 1upx solid rgba(255, 255, 255, 1);
+			border-radius: 31upx;
+			text-align: center;
+
+			>span {
+				line-height: 62upx;
+				font-size: 28upx;
+
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+
+	.paymentDetails {
+		margin: -83upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.paymentDetailsPackage {
+		padding: 30upx;
+
+		>view:nth-child(2) {
+			margin-top: 40upx;
+		}
+
+		>view:nth-child(3) {
+			margin-top: 40upx;
+		}
+
+		>view {
+			display: flex;
+			justify-content: space-between;
+
+			>span {
+				font-size: 24upx;
+
+
+			}
+
+			>span:nth-child(1) {
+				color: rgba(153, 153, 153, 1);
+			}
+
+			>span:nth-child(2) {
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+
+	.coupon {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.couponPackage {
+		padding: 30upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			display: inline-block;
+		}
+	}
+	.couponLefts {
+		width: 100%;
+		.usedpacket-list-item {
+				height: 170upx;
+	
+				.usedpacket-itemleft {
+					width: 30%;
+					height: 100%;
+					background: linear-gradient(129deg, rgba(251, 131, 81, 1) 0%, rgba(255, 68, 68, 1) 100%);
+					padding: 0 20upx;
+					flex-shrink: 0;
+	
+					.usedpacket-priceStyle {
+						margin-right: 12upx;
+	
+						>text {
+							display: inline-block;
+							vertical-align: top;
+							margin-top: 4upx;
+						}
+					}
+	
+					.itemleft_bgstyle {
+						width: 30upx;
+						height: 30upx;
+						border-radius: 50%;
+						position: absolute;
+						left: -16upx;
+						top: 50%;
+						transform: translateY(-50%);
+						background-color: #F8F8F8;
+					}
+	
+					.itemleft_bgstyle2 {
+						position: absolute;
+						right: 0;
+						top: 0;
+						width: 1%;
+						height: 170upx;
+						padding-left: 4upx;
+						color: #fff;
+						box-sizing: border-box;
+						background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+						background-size: 16upx 16upx;
+						background-position: 16upx 0px;
+						background-color: #fff;
+					}
+				}
+	
+				.usedpacket-itemright {
+					height: 100%;
+	
+					.usedpacket_titleType {
+						.usedpacketType {
+							padding: 0 6upx;
+							height: 28upx;
+							background-color: #ff4444;
+							border-radius: 14upx;
+	
+							>text {
+								display: inline-block;
+								transform: scale(.85);
+							}
+						}
+	
+						.usedpacketTitle {
+							width: 240upx;
+						}
+					}
+	
+					.usedpacket-time {
+						width: 240upx;
+					}
+				}
+	
+				.getDraw {
+					position: absolute;
+					right: -10upx;
+					top: 56%;
+					transform: translateY(-50%);
+					width: 126upx;
+					height: 40upx;
+					line-height: 40upx;
+					background-color: #ff4444;
+					border-radius: 20upx;
+				}
+			}
+	}
+	.couponLeft {
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+			width: 50upx;
+			height: 50upx;
+			background: rgba(255, 68, 68, 1);
+			border-radius: 50%;
+
+			>image {
+				width: 50upx;
+				height: 50upx;
+			}
+		}
+
+		>span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.couponRight {
+		width: 121upx;
+		height: 50upx;
+		border: 1upx solid rgba(255, 68, 68, 1);
+		border-radius: 25upx;
+		text-align: center;
+
+		>span {
+			line-height: 50upx;
+			font-size: 24upx;
+
+
+			color: rgba(255, 68, 68, 1);
+		}
+	}
+
+	.advertisement {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		height: 200upx;
+		border-radius: 10upx;
+		overflow: hidden;
+
+		>image {
+			width: 690upx;
+			height: 200upx;
+		}
+	}
+</style>
diff --git a/pages/subPages/postDetails/postDetails.less b/pages/subPages/postDetails/postDetails.less
new file mode 100644
index 0000000..3e62558
--- /dev/null
+++ b/pages/subPages/postDetails/postDetails.less
@@ -0,0 +1,1246 @@
+/* css */
+.replyViewPackage {
+	padding: 30upx;
+}
+.full {
+	width: 750upx;
+	height: 98upx;
+}
+.marT10{
+	margin-top: 10upx;
+}
+.marT18{
+	margin-top: 18upx;
+}
+.qbBottomNavLeft {
+	display: flex !important;
+	justify-content: space-around !important;
+	vertical-align: top;
+	height: 98upx;
+	width: 100%;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		text-align: center;
+		> view {
+			width: 50upx;
+			margin: auto;
+			> image {
+				width: 40upx;
+				height: 40upx;
+			}
+		}
+		> span {
+			font-size: 20upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.qbBottomNavCenter {
+	display: inline-block;
+	vertical-align: top;
+	width: 180upx;
+	height: 60upx;
+	background: rgba(23, 209, 23, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		margin: 10upx auto 0 auto;
+		width: 40upx;
+		> image {
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+	> span {
+		line-height: 60upx;
+		vertical-align: middle;
+		font-size:24upx !important;
+		color:rgba(255,255,255,1) !important;
+	}
+}
+.qbBottomNavRight {
+	vertical-align: top;
+	width: 180upx;
+	height: 60upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 30upx;
+	text-align: center;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		margin: 10upx auto 0 auto;
+		width: 40upx;
+		> image {
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+	> span {
+		line-height: 60upx;
+		vertical-align: middle;
+		font-size:24upx !important;
+		color:rgba(255,255,255,1) !important;
+	}
+}
+.qbBottomNav {
+	left: 0;
+	width: 750upx;
+	height: 98upx;
+	background: #ffffff;
+	position: fixed;
+	z-index: 99;
+	bottom: 0;
+	> view {
+		display: inline-block;
+	}
+}
+
+.audit{
+	width: 92%;
+	padding: 20upx 30upx;
+	background-color: #ffffff;
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	z-index: 99;
+}
+
+.auditNotPass{
+	width: 335upx;
+	height: 60upx;
+	background-color: #ff4444;
+	border-radius: 60upx;
+	line-height: 60upx;
+	text-align: center;
+	color: #ffffff;
+	font-size: 24upx;
+	font-weight: 500;
+	float: left;
+}
+
+.auditPass{
+	width: 335upx;
+	height: 60upx;
+	background-color: #17D117;
+	border-radius: 60upx;
+	line-height: 60upx;
+	text-align: center;
+	color: #ffffff;
+	font-size: 24upx;
+	font-weight: 500;
+	float: right;
+}
+
+.refuseCause{
+	width: 608upx;
+	height: 588upx;
+	background-color: #ffffff;
+	border-radius: 20upx;
+	padding: 30upx 40upx 50upx 40upx;
+	box-sizing: border-box;
+}
+
+.refuseTitle{
+	padding-top: 20upx;
+	padding-bottom: 50upx;
+	text-align: center;
+	font-size: 30upx;
+	font-weight: 500;
+	position: relative;
+}
+
+.iconstyle{
+	position: absolute;
+	right: 0;
+	top: 0;
+	font-size: 40upx;
+	color: #959595;
+}
+
+.refuseText{
+	width: 528upx;
+	height: 280upx;
+	padding: 30upx;
+	box-sizing: border-box;
+	background-color: #f8f8f8;
+	font-size: 28upx;
+}
+
+.confirmRefuse{
+	width: 528upx;
+	height: 80upx;
+	line-height: 80upx;
+	background-color: #ff4444;
+	text-align: center;
+	font-size: 28upx;
+	border-radius: 60upx;
+	margin-top: 40upx;
+	color: #ffffff;
+}
+
+.pdShopMbDiscountLeft {
+	> view {
+		margin-top: 20upx;
+		> view {
+			vertical-align: middle;
+			width: 24upx;
+			height: 24upx;
+			border-radius: 2upx;
+			display: inline-block;
+			text-align: center;
+			> span {
+				line-height: 24upx;
+				font-size: 20upx;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+		> span {
+			vertical-align: middle;
+			margin-left: 10upx;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			white-space: nowrap;
+			width: 305upx;
+			font-size: 24upx;
+
+			color: rgba(102, 102, 102, 1);
+		}
+	}
+}
+.pdShopMbDiscount {
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.pdShopMbType {
+	> view {
+		margin-top: 10upx;
+		> span {
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+}
+.pdShopMbPf {
+	margin-top: 10upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+		> image {
+			vertical-align: middle;
+			margin-right: 10upx;
+			width: 25upx;
+			height: 25upx;
+		}
+		> span {
+			vertical-align: middle;
+			font-size: 24upx;
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 24upx;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.pdShopMbRight {
+	width: 510upx;
+	padding-left: 10upx;
+}
+.pdShopMbName {
+	display: flex;
+	justify-content: space-between;
+	> span {
+		font-size: 30upx;
+
+		font-weight: bold;
+		color: rgba(0, 0, 0, 1);
+	}
+	> view {
+		display: inline-block;
+		> image {
+			height: 0;
+			width: 28upx;
+			height: 28upx;
+		}
+	}
+}
+.pdShopMbLeft {
+	width: 159upx;
+	height: 159upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	> image {
+		width: 159upx;
+		height: 159upx;
+	}
+}
+.pdShopMb {
+	border-bottom: 1upx solid rgba(238, 238, 238, 1);
+	padding-bottom: 30upx;
+	margin: 40upx 0 0 0;
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.pdShopTitle {
+	display: flex;
+	justify-content: space-between;
+	> span:nth-child(1) {
+		vertical-align: middle;
+		font-size: 32upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> span:nth-child(2) {
+		line-height: 40upx;
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.pdShopPackage {
+	padding: 30upx;
+}
+.pdShop {
+	margin: 20upx 0 0 0;
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+}
+.moreComment {
+	margin: 20upx 0 0 0;
+	text-align: center;
+	> span {
+		font-size: 28upx;
+
+		color: rgba(153, 153, 153, 1);
+		vertical-align: middle;
+	}
+	> image {
+		height: 30upx;
+		margin-left: 10upx;
+		vertical-align: middle;
+		width: 30upx;
+	}
+}
+.qbReplyMb {
+	margin-top: 20upx;
+	> view {
+		margin-top: 20upx;
+	}
+}
+.replyName {
+	font-size: 24upx;
+
+	color: rgba(66, 128, 197, 1);
+}
+.mh {
+	font-size: 24upx;
+
+	color: rgba(66, 128, 197, 1);
+}
+.name {
+	margin-left: 10upx;
+	font-size: 24upx;
+
+	color: rgba(66, 128, 197, 1);
+}
+.hf {
+	font-size: 24upx;
+
+	color: #333333;
+}
+.text {
+	margin-left: 20upx;
+	font-size: 24upx;
+
+	color: #999999;
+}
+.pdCommentMbReplyPackage {
+	padding: 30upx;
+	> view {
+		margin: 20upx 0 0 0;
+	}
+	> view:nth-child(1) {
+		margin: 0;
+	}
+}
+.pdCommentMbReply {
+	margin: 20upx 0;
+	width: 626upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 4upx;
+}
+.pdCommentMbMain {
+	margin: 15upx 0 0 0;
+	> view:nth-child(1) {
+		> span {
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 20upx;
+		> span {
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(1) {
+		> text {
+			font-size: 28upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	> view:nth-child(2) {
+		margin-top: 20upx;
+		> text {
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.pdCommentMbRightPackage {
+	padding-left: 15upx;
+}
+.pdCommentMbRight {
+	width: 626upx;
+}
+.pdCommentMbRightTitle {
+	display: flex;
+	justify-content: space-between;
+	> span {
+		line-height: 48upx;
+		vertical-align: middle;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 112upx;
+		height: 50upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 4upx;
+		text-align: center;
+		line-height: 50upx;
+		> image {
+			vertical-align: middle;
+			width: 30upx;
+			height: 30upx;
+		}
+		> span {
+			margin-left: 10upx;
+			line-height: 50upx;
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.pdCommentMbLeft {
+	width: 48upx;
+	height: 48upx;
+	overflow: hidden;
+	border-radius: 50%;
+	> image {
+		width: 48upx;
+		height: 48upx;
+	}
+}
+.pdCommentMb {
+	margin: 40upx 0 0 0;
+	> view {
+		display: inline-block;
+		vertical-align: top;
+	}
+}
+.pdCommentTitle {
+	display: flex;
+	justify-content: space-between;
+	> span:nth-child(1) {
+		vertical-align: middle;
+		font-size: 32upx;
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+	> span:nth-child(2) {
+		vertical-align: middle;
+		font-size: 28upx;
+		color: rgba(66, 128, 197, 1);
+	}
+}
+.pdComment {
+	margin: 20upx 0 0 0;
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+}
+.pdCommentPackage {
+	padding: 30upx;
+}
+.pdHbFoot {
+	margin: 30upx 0 0 0;
+	text-align: center;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.pdHbMbRight {
+	> span {
+		line-height: 73upx;
+		font-size: 28upx;
+
+		color: rgba(209, 56, 59, 1);
+	}
+}
+.pdHbMbLeftInfo {
+	margin-left: 15upx;
+	> view:nth-child(1) {
+		> span {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			display: inline-block;
+			width: 209upx;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+			vertical-align: middle;
+		}
+		> view {
+			margin-left: 10upx;
+			display: inline-block;
+			vertical-align: middle;
+			width: 110upx;
+			height: 34upx;
+			background: rgba(255, 196, 31, 1);
+			border-radius: 4upx;
+			text-align: center;
+			> span {
+				line-height: 34upx;
+				font-size: 20upx;
+
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+	> view:nth-child(2) {
+		> span {
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.pdHbMbLeftImg {
+	width: 74upx;
+	height: 74upx;
+	border-radius: 50%;
+	background-size: 74upx 74upx;
+	background-repeat: no-repeat;
+}
+.pdHbMbLeft {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.pdHbMb {
+	margin-top: 40upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.pdHbMb1 {
+	margin-bottom: 15upx;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.pdHbBodyPackage {
+	padding: 40upx 30upx;
+	> view:nth-child(1) {
+		margin-top: 0;
+	}
+}
+.pdHbBody {
+	margin: 20upx 0 0 0;
+	width: 630upx;
+	background: rgba(255, 255, 255, 0.9);
+	border-radius: 20upx;
+}
+.pdHbTitle {
+	text-align: center;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.pdHbPackage {
+	padding: 30upx;
+}
+.pdHb {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(209, 56, 59, 1);
+	border-radius: 20upx;
+}
+.pdAuthorFootPackage {
+	padding: 30upx;
+	> view {
+		margin-right: 50upx;
+		display: inline-block;
+		vertical-align: middle;
+		> span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 24upx;
+		}
+		> image {
+			vertical-align: middle;
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+}
+.pdAuthorRight {
+	vertical-align: middle;
+	> image {
+		margin: 25upx 0 0 0;
+		width: 18upx;
+		height: 25upx;
+	}
+}
+.pdAuthorLeft {
+	vertical-align: middle;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+	> view:nth-child(1) {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50%;
+		overflow: hidden;
+		> image {
+			width: 80upx;
+			height: 80upx;
+		}
+	}
+	> view:nth-child(2) {
+		margin-left: 20upx;
+		> view:nth-child(1) {
+			> span {
+				font-size: 28upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+		> view:nth-child(2) {
+			> span {
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+}
+.pdAuthorTitlePackage {
+	padding: 30upx;
+	border-bottom: 1upx solid rgba(248, 248, 248, 1);
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+.pdAuthor {
+	margin: 20upx 0 0 0;
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+}
+.postDetails {
+	font-size: 0;
+	background: #f8f8f8;
+}
+page {
+	background: #f8f8f8;
+	overflow-x: hidden;
+}
+.postDetailsInfo {
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+}
+.postDetailsInfoPackage {
+	padding: 30upx;
+}
+.postDetailsInfoTitle {
+	display: flex;
+	justify-content: space-between;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.pdHead {
+	width: 54upx;
+	height: 54upx;
+	overflow: hidden;
+	border-radius: 50%;
+	> image {
+		width: 54upx;
+		height: 54upx;
+	}
+}
+.postTitleLeft {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.pdRZ {
+	margin-left: 20upx;
+	> view:nth-child(1) {
+		> span {
+			vertical-align: middle;
+			font-size: 28upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+		> image {
+			margin-left: 10upx;
+			vertical-align: middle;
+			width: 40upx;
+			height: 40upx;
+		}
+	}
+}
+.publishInfo {
+	margin-top: 15upx;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 102upx;
+		height: 34upx;
+		line-height: 30upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+		> span {
+			font-size: 20upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	> span {
+		margin-left: 15upx;
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.postTitleRight {
+	> image {
+		vertical-align: middle;
+		width: 69upx;
+		height: 70upx;
+	}
+	> span {
+		vertical-align: middle;
+		font-size: 26upx;
+
+		color: rgba(255, 68, 68, 1);
+	}
+}
+.topTips {
+	> image {
+		position: relative;
+		width: 58upx;
+		height: 58upx;
+		bottom: 118upx;
+		right: 35upx;
+	}
+}
+.pdTips {
+	margin-top: 14upx;
+	> view {
+		margin-right: 10upx;
+		display: inline-block;
+		vertical-align: middle;
+		border: 1upx solid rgba(33, 150, 243, 1);
+		border-radius: 4upx;
+		text-align: center;
+		> span {
+			padding: 5upx 10upx;
+			font-size: 20upx;
+		}
+	}
+}
+.pdMain {
+	margin-top: 20upx;
+	> text {
+		font-size: 28upx;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.pdImg {
+	margin: 10upx 0 0 0;
+	> view {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		> img {
+			width: 690upx;
+		}
+	}
+}
+.pdVideo {
+	margin: 10upx 0 0 0;
+	> view {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		> video {
+			width: 690upx;
+		}
+	}
+}
+.videoClo{
+	position: absolute;
+	left: 0upx;
+	top: 0;
+	height: 100%;
+	width: 690upx;
+	z-index: 999;
+	filter: blur(0rpx);
+}
+.videoCloBtn{
+	width: 150upx;
+	height: 50upx;
+	line-height: 50upx;
+	text-align: center;
+	background-color: #ff4444;
+	color: #ffffff;
+	font-size: 28upx;
+	position: absolute;
+	border-radius: 10upx;
+	left: 50%;
+	top: 40%;
+	transform: translate(-50%);
+	
+}
+.pdWhere {
+	margin: 30upx 0 0 0;
+	display: flex;
+	justify-content: space-between;
+	> view:nth-child(1) {
+		> image {
+			vertical-align: middle;
+			width: 25upx;
+			height: 25upx;
+		}
+		> span {
+			white-space: nowrap;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 400upx;
+			display: inline-block;
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(33, 150, 243, 1);
+		}
+	}
+	> view:nth-child(2) {
+		> span {
+			font-size: 24upx;
+
+			color: rgba(33, 150, 243, 1);
+		}
+	}
+	> view {
+		display: inline-block;
+	}
+}
+.pdFlow {
+	margin: 30upx 0 0 0;
+	display: flex;
+	justify-content: space-between;
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+	> view:nth-child(1) {
+		> span {
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(153, 153, 153, 1);
+		}
+		> span:nth-child(2) {
+			margin-left: 30upx;
+		}
+	}
+	> view:nth-child(2) {
+		> image {
+			vertical-align: middle;
+			width: 35upx;
+			height: 35upx;
+		}
+		> span {
+			vertical-align: middle;
+			margin-left: 10upx;
+			font-size: 24upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+.pdFabulous {
+	position: relative;
+	z-index: 5;
+	margin: 35upx auto 0 auto;
+	width: 690upx;
+	height: 87upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 4upx;
+	> image {
+		margin-left: 30upx;
+		vertical-align: middle;
+		width: 34upx;
+		height: 35upx;
+	}
+	> span {
+		margin-left: 15upx;
+		line-height: 87upx;
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+	> view {
+		margin-left: 10upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 38upx;
+		height: 39upx;
+		border-radius: 50%;
+		border: 1upx solid rgba(255, 255, 255, 1);
+		overflow: hidden;
+		> image {
+			width: 38upx;
+			height: 39upx;
+		}
+	}
+}
+
+.floatView {
+	display: inline-block !important;
+	z-index: 1;
+	position: absolute;
+	width: 45upx !important;
+	height: 45upx !important;
+	border-radius: 0 !important;
+	background: rgba(248, 248, 248, 1) !important;
+	transform: rotate(45deg) !important;
+	bottom: 60upx !important;
+	left: 20upx !important;
+	border: none !important;
+}
+.replyInput {
+	background: rgba(248, 248, 248, 1);
+	width: 500upx;
+	height: 200upx;
+	vertical-align: middle;
+	margin: 20upx auto 0 auto;
+	background: white;
+	font-size: 24upx;
+
+	color: rgba(51, 51, 51, 1);
+	> textarea {
+		background: rgba(248, 248, 248, 1);
+		width: 500upx !important;
+		height: 200upx !important;
+	}
+}
+.sendButton {
+	text-align: center;
+	margin: 20upx auto 0 auto;
+	width: 292upx;
+	height: 74upx;
+	background: #3388ff;
+	border-radius: 37upx;
+
+	> span {
+		line-height: 74upx;
+		font-size: 24upx;
+
+		color: #ffffff;
+	}
+}
+.replyView {
+	border: 1upx solid rgba(0, 0, 0, 0);
+	width: 600upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20upx;
+	background: #f8f8f8;
+}
+.getRed {
+	position: fixed;
+	bottom: 0;
+	left: 0;
+	width: 750upx;
+	height: 98upx;
+	background: rgba(255, 68, 68, 1);
+	text-align: center;
+	z-index: 99;
+	> span {
+		line-height: 98upx;
+		font-size: 28upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.getRedView {
+	width: 641upx;
+	height: 916upx;
+	border-radius: 50upx;
+	background-size: 100%;
+	position: relative;
+}
+.getRedViewTips {
+	position: relative;
+	bottom: 70upx;
+	margin: 0 auto 0 auto;
+	width: 460upx;
+	> image {
+		width: 460upx;
+		height: 130upx;
+	}
+}
+.redViewMoney {
+	text-align: center;
+	> span {
+		font-size: 36upx;
+
+		font-weight: bold;
+		color: rgba(205, 59, 60, 1);
+	}
+}
+.getRedButton {
+	margin: 50upx auto 0 auto;
+	width: 188upx;
+	height: 188upx;
+	background: rgba(236, 202, 154, 1);
+	border: 4upx solid rgba(222, 70, 57, 1);
+	box-shadow: 0px 4upx 24upx 0px rgba(209, 56, 59, 0.4);
+	border-radius: 50%;
+	text-align: center;
+	> span {
+		line-height: 188upx;
+		font-size: 95upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.sendRedUser {
+	width: 176upx;
+	margin: 70upx auto 0 auto;
+	text-align: center;
+	border-bottom: 1upx solid rgba(255, 255, 255, 1);
+	padding-bottom: 20upx;
+	> view {
+		margin: 15upx 0 0 0;
+		> span {
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+}
+.getRedBottom {
+	text-align: center;
+	width: 330upx;
+	margin: 183upx auto 0 auto;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(248, 199, 124, 1);
+	}
+}
+.getRedList {
+	width: 641upx;
+	height: 916upx;
+	background: rgba(209, 56, 59, 1);
+	border-radius: 50upx;
+	background-size: 100%;
+}
+.getRedListFull {
+	height: 75upx;
+}
+.sendRedImg {
+	margin: 0 auto 0 auto;
+	width: 146upx;
+	height: 146upx;
+	border-radius: 50%;
+	overflow: hidden;
+	> image {
+		width: 146upx;
+		height: 146upx;
+	}
+}
+.sendRedUesr {
+	text-align: center;
+	margin-top: 20upx;
+	> image {
+		width: 90upx;
+		height: 90upx;
+	}
+	> view {
+		display: inline-block;
+		> view {
+			> span {
+				font-size: 28upx;
+
+				font-weight: bold;
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	}
+}
+.redNumber1 {
+	margin-top: 45upx;
+	text-align: center;
+	> span {
+		font-size: 24upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.scrollRed {
+	overflow: hidden;
+	margin: 40upx auto 0 auto;
+	width: 590upx;
+	height: 388upx;
+	background: rgba(255, 255, 255, 0.9);
+	border-radius: 40upx;
+}
+.scrollRedPackage {
+	padding: 30upx;
+}
+.pdHbMbLeftImg {
+	width: 73upx;
+	height: 73upx;
+	border-radius: 50%;
+	overflow: hidden;
+	> image {
+		width: 73upx;
+		height: 73upx;
+	}
+}
+.getRedNumber {
+	margin: auto;
+	width: 590upx;
+	background: rgba(255, 242, 197, 1);
+	border-radius: 40upx;
+}
+.getRedNumberPackage {
+	padding: 40upx 50upx;
+}
+.getRedNumberTitle {
+	text-align: center;
+	> span {
+		margin-left: 15upx;
+		vertical-align: middle;
+		font-size: 24upx;
+		lor: rgba(209, 56, 59, 1);
+	}
+	> image {
+		vertical-align: middle;
+		width: 40upx;
+		height: 40upx;
+	}
+}
+.getRedNumberBody {
+	white-space: nowrap;
+	> view {
+		margin: 30upx 0 0 100upx;
+		> image {
+			position: relative;
+			right: 140upx;
+			vertical-align: middle;
+			width: 175upx;
+			height: 180upx;
+		}
+		background: #ffffff;
+		display: inline-block;
+		vertical-align: middle;
+		width: 354upx;
+		height: 186upx;
+		box-shadow: 0px 2upx 24upx 0px rgba(255, 138, 229, 0.35);
+		text-align: center;
+		> span {
+			position: relative;
+			right: 70upx;
+			vertical-align: middle;
+			line-height: 186upx;
+			font-size: 24upx;
+			color: rgba(199, 63, 75, 1);
+			> span {
+				font-size: 36upx;
+			}
+		}
+	}
+}
+.getRedNumberFoot {
+	margin: 20upx 0 0 0;
+	text-align: center;
+	> image {
+		vertical-align: middle;
+		width: 40upx;
+		height: 40upx;
+	}
+	> span {
+		vertical-align: middle;
+		margin-left: 15upx;
+		font-size: 24upx;
+		color: rgba(231, 194, 64, 1);
+	}
+}
+.shareBtn {
+	position: absolute;
+	left: 0;
+	right: 0;
+	top: 0;
+	bottom: 0;
+	z-index: 2;
+	opacity: 0;
+}
diff --git a/pages/subPages/postDetails/postDetails.vue b/pages/subPages/postDetails/postDetails.vue
new file mode 100644
index 0000000..4079689
--- /dev/null
+++ b/pages/subPages/postDetails/postDetails.vue
@@ -0,0 +1,1790 @@
+<template>
+	<view class="postDetails">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{paddingBottom: '200upx' }" >
+			<!-- 帖子信息 -->
+			<view class="postDetailsInfo">
+				<view class="postDetailsInfoPackage">
+					<!-- 头像区域 -->
+					<view class="postDetailsInfoTitle">
+						<view class="postTitleLeft">
+							<!-- 头像 -->
+							<view class="pdHead">
+								<image :src="detailinfo.avatar" />
+							</view>
+							<!-- 头像 -->
+							<!-- 认证信息 -->
+							<view class="pdRZ">
+								<view>
+									<span>{{ detailinfo.nickname }}</span>
+									<image :src="imgfixUrls+ 'homePage/home_logo1.png'" class="image30" v-if="!!detailinfo['attestation'] && detailinfo['attestation']['attestation'] == 2" />
+									<image :src="imgfixUrls+ 'homePage/home_logo3.png'" class="image30" v-if="!!detailinfo['attestation'] && detailinfo['attestation']['bondflag'] == 1" />
+								</view>
+								<!-- 发布信息 -->
+								<view class="publishInfo">
+									<view v-if="detailinfo.one_name !== ''">
+										<span>{{ detailinfo.two_name == '' ? detailinfo.one_name : detailinfo.two_name }}</span>
+									</view>
+									<span>{{ detailinfo.createtime }}发布</span>
+								</view>
+								<!-- 发布信息 -->
+							</view>
+							<!-- 认证信息 -->
+						</view>
+						<view class="postTitleRight" v-if="detailinfo.redpack > 0">
+							<image :src="imgfixUrls+ 'merchant/hb.png'" />
+							<span>{{ detailinfo.redpack }}元</span>
+						</view>
+					</view>
+					<!-- 头像区域 -->
+
+					<!-- 置顶样式 -->
+					<view class="topTips">
+						<image :src="imgfixUrls+ 'merchant/zd.png'" v-if="detailinfo.top != '0'" />
+					</view>
+					<!-- 置顶样式 -->
+
+					<!-- 标签 -->
+					<view class="pdTips">
+						<!-- 标签循环模板 -->
+						<view v-for="(item, indexs) in detailinfo.keyword" :style="{ color: textTip_color[indexs % textTip_color.length].color, border: textTip_color[indexs % textTip_color.length].border }">
+							<span>{{ item }}</span>
+						</view>
+						<!-- 标签循环模板 -->
+					</view>
+					<!-- 标签 -->
+
+					<!-- 内容区域 -->
+					<view class="pdMain">
+						<text>{{ detailinfo.content }}</text>
+					</view>
+					<!-- 内容区域 -->
+
+					<!-- 图片区域 -->
+					<view class="pdImg" >
+						<!-- 循环模板 -->
+						<view v-for="(item, index) in detailinfo.img" @click="yl(index, detailinfo.img)" style="width: 100%;">
+							<image :src="item" mode="widthFix" style="width: 100%;"/>
+						</view>
+						<!-- 循环模板 -->
+					</view>
+					<!-- 图片区域 -->
+
+					<view class="pdVideo" style="position: relative;" v-if="!!detailinfo.video_link && videoShow">
+						<!-- 循环模板 -->
+						<view :style="{'filter': detailinfo.hidevideo == 1?'blur(10rpx)':'blur(0rpx)'}">
+							<video :src="detailinfo.video_link" :poster="poster"
+							 @loadedmetadata="changeSize" :style="{width:videoWidth, height: videoHeight}" />
+						</view>
+						<view class="videoClo" @click.stop="" v-if="detailinfo.hidevideo == 1">
+							<view class="videoCloBtn" @click="openVideo">
+								付费解锁
+							</view>
+						</view>
+						<!-- 循环模板 -->
+					</view>
+
+					<!-- 定位信息 -->
+					<view class="pdWhere" v-if="detailinfo.address !== ''" @click="goStore">
+						<view>
+							<image :src="imageRoot + 'whereB.png'" />
+							<span>{{ detailinfo.address }}</span>
+						</view>
+						<view>
+							<span>距离您{{ detailinfo.distance }} ></span>
+						</view>
+					</view>
+					<!-- 定位信息 -->
+
+					<!-- 帖子流量 -->
+					<view class="pdFlow">
+						<view>
+							<span>阅读 {{ detailinfo.look }}</span>
+							<span>分享 {{ detailinfo.share }}</span>
+						</view>
+						<view @click="fabulous">
+							<image :src="imgfixUrls+ 'merchant/xin.png'" v-if="detailinfo.is_fabulous == '1'" />
+							<image :src="imgfixUrls+ 'merchant/nxin.png'" v-else />
+							<span>赞</span>
+						</view>
+					</view>
+					<!-- 帖子流量 -->
+
+					<!-- 点赞信息 -->
+					<view class="pdFabulous">
+						<image :src="imgfixUrls+ 'merchant/mz.png'" />
+						<span>{{ detailinfo.fabulous_num }}人</span>
+						<!-- 点赞头像循环模板 -->
+						<view v-for="(item, indx) in detailinfo.likeids">
+							<image :src="item" />
+						</view>
+						<!-- 点赞头像循环模板 -->
+						<!-- 悬浮样式 -->
+						<view class="floatView"></view>
+						<!-- 悬浮样式 -->
+					</view>
+					<!-- 点赞信息 -->
+					<view class="remarkView">
+						<text class="remark" :style="{ color: detailinfo.remarkcolor }">{{ detailinfo.remark }}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 帖子信息 -->
+			
+			<!-- <view class="advfei" v-if="detailinfo.tipsflag == 1 && tipflag">
+				<view class="iconfont icon-roundclose" style="font-size: 40upx;color: #FFFFFF;font-weight: 700;line-height: 70upx;position: absolute;right: 20upx;top: 20upx;"
+				 @click="closeadv">
+			
+				</view>
+				<view class="col-f t-l" style="flex: 0.6;padding-left: 10upx;">
+					<view class="f-28 t-c">开通会员</view>
+					<view class="f-24 t-c">与发帖人电话联系</view>
+				</view>
+				<view class="t-c f-28" style="background-color: #FFC3C2;color: #B90C1F;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;"
+				 @click="gohomefxs">
+					立即开通
+				</view>
+			</view> -->
+			
+			<!-- 发布者信息 -->
+			<view class="pdAuthor" v-if="detailinfo.mid > 0">
+				<view class="pdAuthorTitle" @click="goHomePage(1)">
+					<view class="pdAuthorTitlePackage">
+						<view class="pdAuthorLeft">
+							<view>
+								<image :src="detailinfo.avatar" />
+							</view>
+							<view>
+								<view>
+									<span>{{ detailinfo.nickname }}</span>
+								</view>
+								<view>
+									<span>已发布{{ detailinfo.info_total }}条</span>
+								</view>
+							</view>
+						</view>
+						<view class="pdAuthorRight">
+							<image :src="imgfixUrls+ 'merchant/right.svg'" />
+						</view>
+					</view>
+				</view>
+				<!-- <view class="pdAuthorFoot">
+					<view class="pdAuthorFootPackage">
+						<view>
+							<imgfixUrlss:rc="@imgfixUrls+ 'merchant/smrz.png" />
+							<span>个人认证</span>
+						</view>
+						<view>
+							<imgfixUrlss:rc="@imgfixUrls+ 'merchant/qyrz.png" />
+							<span>企业认证</span>
+						</view>
+						<view>
+							<imgfixUrlss:rc="@imgfixUrls+ 'merchant/gfrz.png" />
+							<span>已交保证金</span>
+						</view>
+					</view>
+				</view> -->
+			</view>
+			<!-- 发布者信息 -->
+
+			<!-- 红包区域 -->
+			<view class="pdHb" v-if="detailinfo.res_status !== 0 && detailinfo.res_status == 2">
+				<view class="pdHbPackage">
+					<view class="pdHbTitle">
+						<span>
+							——— 共{{ receivingRecords.info.package }}个红包，已被抢{{ receivingRecords.info.package - receivingRecords.info.surplus }}份，还剩{{
+								receivingRecords.info.surplus
+							}}份 ———
+						</span>
+					</view>
+					<view class="pdHbBody">
+						<view class="pdHbBodyPackage">
+							<!-- 红包记录循环模板 -->
+							<view class="pdHbMb" v-for="(item, index) in receivingRecords.list">
+								<view class="pdHbMbLeft">
+									<view class="pdHbMbLeftImg" :style="{'background-image':'url('+item.avatar+')'}"></view>
+									<view class="pdHbMbLeftInfo">
+										<view>
+											<span>{{ item.nickname }}</span>
+											<view v-if="item.is_optimum == 1 && receivingRecords.info.surplus ==0"><span>手气最佳</span></view>
+										</view>
+										<view>
+											<span>{{ item.gettime }}</span>
+										</view>
+									</view>
+								</view>
+								<view class="pdHbMbRight">
+									<span>{{ item.money }}元</span>
+								</view>
+							</view>
+							<!-- 红包记录循环模板 -->
+						</view>
+					</view>
+					<view class="pdHbFoot" @click.stop="redShow = true"><span>去看看大家的手气 ></span> <span style="float: right;color: #FFFFFF;" v-if="receivingRecords.cashflag == '1'" @click.stop="goTixian">提现</span></view>
+				</view>
+			</view>
+			<!-- 红包区域 -->
+
+			<!-- 评论区域 -->
+			<view class="pdComment">
+				<view class="pdCommentPackage">
+					<view class="pdCommentTitle">
+						<span>全部评论({{ detailinfo.comment_total }})</span>
+						<span @click="plShow = true">我要评论</span>
+					</view>
+					<!-- 评论循环模板 -->
+					<view class="pdCommentMb" v-for="(item, index) in commentList">
+						<view class="pdCommentMbLeft">
+							<image :src="item.avatar" />
+						</view>
+						<view class="pdCommentMbRight">
+							<view class="pdCommentMbRightPackage">
+								<view class="pdCommentMbRightTitle dis-flex">
+									<span style="flex: 1;">{{ item.nickname }}</span>
+									<view style="margin-right: 20upx;" v-if="myMid == item.mid">
+										<text class="iconfont icon-bianji" style="font-size: 20upx;padding-right: 8upx;"></text>
+										<text style="font-size: 20upx;" @click="xgPopShow(item,index)">修改</text>
+									</view>
+									<view style="margin-right: 20upx;" v-if="myMid == item.mid">
+										<text class="iconfont icon-delete" style="font-size: 20upx;padding-right: 8upx;"></text>
+										<text style="font-size: 20upx;" @click="deleteComt(item,index)">删除</text>
+									</view>
+									<view>
+										<image :src="imgfixUrls+ 'merchant/hf.png'" />
+										<span @click="hfPopShow(item.id, item.mid, item.list, item.nickname)">回复</span>
+									</view>
+									
+								</view>
+								<!-- 评论内容 -->
+								<view class="pdCommentMbMain">
+									<view>
+										<text>{{ item.content }}</text>
+									</view>
+									<view>
+										<span>{{ item.createtime }}·回复</span>
+									</view>
+								</view>
+								<!-- 评论内容 -->
+
+								<!-- 回复区域 -->
+								<view class="pdCommentMbReply" v-if="item.list.length !== 0">
+									<view class="pdCommentMbReplyPackage">
+										<!-- 评论循环模板 -->
+										<view class="qbReplyMb dis-flex" v-for="(items, indexs) in item.list" @click="hfPopShow(item.id, items.smid, item.list, items.reply_name)">
+											<view style="flex: 1;">
+												<span class="replyName">{{ items.reply_name }}</span>
+												<span class="hf">回复</span>
+												<span class="name">{{ items.name }}</span>
+												<span class="mh">:</span>
+												<span class="text">{{ items.content }}</span>
+											</view>
+											<view>
+												<text class="iconfont icon-bianji" v-if="myMid == items.smid" style="color: #80A9D6;font-size: 20upx;padding-right: 20upx;" @click.stop="xghuPopShow(items,index,indexs)"></text>
+												<text class="iconfont icon-delete" v-if="myMid == items.smid" style="color: #ff4444;font-size: 20upx;" @click.stop="deletehcomnt(items,index,indexs)"></text>
+											</view>
+										</view>
+										<!-- 评论循环模板 -->
+									</view>
+								</view>
+								<!-- 回复区域 -->
+							</view>
+						</view>
+					</view>
+					<!-- 评论循环模板 -->
+
+					<!-- 展开模板 -->
+					<view class="moreComment" @click="getMoreComment">
+						<span>{{ commentText }}</span>
+						<image :src="imgfixUrls+ 'merchant/bottom.png'" />
+					</view>
+					<!-- 展开模板 -->
+				</view>
+			</view>
+			<!-- 评论区域 -->
+
+			<!-- 他的店铺 -->
+			<view class="pdShop" v-if="userShopList.length > 0">
+				<view class="pdShopPackage">
+					<view class="pdShopTitle">
+						<span>{{detailinfo.mid > 0?'他的店铺':'关联店铺'}}</span>
+						<span @click="goHomePage(2)" v-if="detailinfo.mid > 0">更多 ></span>
+					</view>
+				</view>
+			</view>
+
+			<view class="colorF8F8F8 " >
+				<!-- 循环模板 -->
+				<view class="shop-content p30">
+					<scroll-view scroll-y class="post-list-scrollView1">
+						<view class="shangjia-i" :class="{ shangjiaISty: item2.goods.length == 0 }" v-for="(item2, key2) in userShopList"
+						 :key="key2">
+							<view class="a shangjia-i-t" @click="navgateTo(item2.id)">
+								<view class="shangjia-i-l">
+									<image class="image" :src="item2.logo" mode="aspectFill"></image>
+								</view>
+								<view class="shangjia-i-r">
+									<view class="shangjia-i-r-d">
+										<view class="dis-flex flex-y-center flex-x-between">
+											<view class="shop3-title-width shangjia-i-r-t1 over-omit onelist-hidden">{{ item2.storename }}</view>
+											<view class="store-containerIcon dis-flex flex-y-center flex-box">
+												<image :src="imgfixUrls+ 'homePage/home_logo2.png'" class="image30" @click.stop="tost(1)" v-if="item2['attestation']['attestation'] == 2" />
+												<!-- <imgfixUrlss:rc="@imgfixUrls+ 'merchant/qyrz.png" /> -->
+												<image :src="imgfixUrls+ 'homePage/home_logo3.png'" class="image30" @click.stop="tost(2)" v-if="item2['attestation']['bondflag'] == 1" />
+												<image :src="imgfixUrls+ 'diypage/720icon.png'" mode="" class="m-right10" @click.stop="tost(3)" v-if="item2.panorama === 1"></image>
+												<image :src="imgfixUrls+ 'diypage/videoicon.png'" mode="" @click.stop="tost(4)" v-if="item2.videourl === 1"></image>
+											
+											</view>
+										</view>
+										<view class="shangjia-i-r-t2 over-omit dis-flex flex-x-between flex-y-center">
+											<view class="dis-flex flex-y-center">
+												<view class="shangjia-i-r-t2-icon">
+													<view class="star star-dark">
+														<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+													</view>
+													<view class="star star-light">
+														<view class="star-width" :style="'width:' + (item2.score / 5) * 100 + '%;'">
+															<view class="i icon iconfont icon-shoucangxiao" v-for="(item3, key3) in 5" :key="key3"></view>
+														</view>
+													</view>
+												</view>
+												<view class="f-28 col-6 star-grade">{{ item2.score }}分</view>
+											</view>
+											<view class="shop3-distance f-24 col-6" v-if="!!item2.distance">{{ item2.distance }}</view>
+										</view>
+										<view class="shangjia-i-r-t3 over-omit">
+											<view class="p" v-html="item2.storehours"></view>
+										</view>
+										<view class="shangjia-i-r-t4 over-omit">
+											<view v-for="(item3,index3) in item2.tags" :key="index3" class="tags_view">{{item3}}</view>
+										</view>
+									</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="((shopFold && shopFoldIndex == key2) || shopFoldIndex !== key2) && item2.goods.length > 0">
+								<view class="shangjia-i-b-t1" v-if="item2.goods.length <= 2">
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-t1" @click="shangjiaFold(key2)" v-if="item2.goods.length > 2">
+									<view class="i icon iconfont icon-unfold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 == 0">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+								<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3" v-if="item2.goods.length == 2 && key3 == 1">
+									<view class="em" :class="tag.css">{{ tag.tag }}</view>
+									<view class="span">{{ tag.name }}</view>
+								</view>
+								<view class="shangjia-i-b-t2" v-if="item2.goods.length > 2">
+									<view class="em" :class="tag.css" v-for="(tag, key3) in item2.goods" :key="key3" v-if="key3 > 0">{{ tag.tag }}</view>
+								</view>
+							</view>
+							<view class="shangjia-i-b" v-if="!shopFold && shopFoldIndex == key2 && item2.goods.length > 2">
+								<view class="shangjia-i-b-t1" @click="shangjiaUpFold(key2)">
+									<view class="i icon iconfont icon-fold"></view>
+									<view class="shangjia-i-b-i" v-for="(tag, key3) in item2.goods" :key="key3">
+										<view class="em" :class="tag.css">{{ tag.tag }}</view>
+										<view class="span">{{ tag.name }}</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<!-- 他的店铺 -->
+			</view>
+			
+			<!-- 审核底部 -->
+			<view class="audit" v-if="examine != 0">
+				<view class="auditNotPass" @click="refuseShow = true">
+					审核未通过
+				</view>
+				<view class="auditPass" @click="approve">
+					审核通过
+				</view>
+			</view>
+			<!-- 审核底部 -->
+			
+			<!-- 底部红包栏 -->
+			<view v-else-if="detailinfo.res_status == 1 && detailinfo.res_status !== 0" class="getRed" @click="redShow = true"><span>点击抢红包</span></view>
+			<!-- 底部红包栏 -->
+
+			<!-- 底部导航栏 -->
+			<view class="qbBottomNav" v-else>
+				<view class="qbBottomNavLeft">
+					<view @click="goHome" class="marT10">
+						<view>
+							<image :src="imgfixUrls+ 'merchant/home.png'" />
+						</view>
+						<span>首页</span>
+					</view>
+					<view class="marT10">
+						<view v-if="detailinfo.is_collection > 0">
+							<image :src="imgfixUrls+ 'merchant/yStar.png'" @click="collection()" />
+						</view>
+						<view v-else>
+							<image :src="imgfixUrls+ 'merchant/nStar1.png'" @click="collection()" />
+						</view>
+						<span>收藏</span>
+					</view>
+					<!--  #ifdef  H5 -->
+					<view @click="shareShow = true" class="marT10">
+						<view>
+							<image :src="imgfixUrls+ 'merchant/share.png'" />
+						</view>
+						<span>分享</span>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view class="p-r marT10">
+						<view>
+							<image :src="imgfixUrls+ 'merchant/share.png'" />
+						</view>
+						<span>分享</span>
+						<button open-type="share" class="shareBtn"></button>
+					</view>
+					<!-- #endif -->
+					<view class="qbBottomNavCenter marT18" @click="goChat" v-if="detailinfo.mid != '0'">
+						<view>
+							<image :src="imgfixUrls+ 'merchant/messageW1.png'" />
+						</view>
+						<span>在线聊</span>
+					</view>
+					<view class="qbBottomNavRight marT18" v-if="detailinfo.phone" :style="{backgroundColor: detailinfo.tipsflag  != 1?'#FF4444':'#999999'}" :class="detailinfo.mid != '0' ? '' : 'allRight'" @click="kfPhone(detailinfo.phone)" >
+						<view>
+							<image :src="imgfixUrls+ 'merchant/phoneW1.png'" />
+						</view>
+						<span>打电话</span>
+					</view>
+				</view>
+				
+			</view>
+			<!-- 底部导航栏 -->
+
+			<!-- 填充层 -->
+			<view class="full"></view>
+			<!-- 填充层 -->
+		</scroll-view>
+
+		<!-- 回复弹窗 -->
+		<PopManager :show="hfShow" type="center" @clickmask="closeHfShow">
+			<view class="replyView" v-if="hfShow">
+				<view class="replyViewPackage" v-if="hfShow">
+					<view class="replyInput" style="position: relative;" v-if="hfShow"><textarea  style="position: relative;transform: translateZ(0);"  placeholder="回复:" v-model="hfText" v-if="hfShow"></textarea></view>
+					<view class="sendButton" @click="reply"><span>发送</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 回复弹窗 -->
+
+		<!-- 评论弹窗 -->
+		<PopManager :show="plShow" type="center" @clickmask="closePlShow">
+			<view class="replyView" v-if="plShow">
+				<view class="replyViewPackage" v-if="plShow">
+					<view class="replyInput" style="position: relative;" v-if="plShow"><textarea style="position: relative;transform: translateZ(0);" placeholder="评论:" fixed="true" v-model="PlText"  v-if="plShow"></textarea></view>
+					<view class="sendButton" @click="comment"  ><span>发送</span></view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- 评论弹窗 -->
+
+		<!-- 红包弹窗 -->
+		<PopManager :show="redShow" @clickmask="closeRed">
+			<!-- 红包领取列表 -->
+			<view class="getRedList" v-if="detailinfo.res_status !== 0 && detailinfo.res_status == 2" :style="{ 'background-image': ' url(' + imageRoot + 'getRedPack.png)' }">
+				<view class="getRedListFull"></view>
+				<view class="sendRedImg">
+					<image :src="detailinfo.avatar" />
+				</view>
+				<view class="sendRedUesr">
+					<image :src="imgfixUrls+ 'merchant/starLeft.png'" />
+					<view>
+						<view>
+							<span>{{ detailinfo.nickname }}</span>
+						</view>
+						<view><span>埋了一个红包</span></view>
+					</view>
+					<image :src="imgfixUrls+ 'merchant/starRight.png'" />
+				</view>
+				<view class="redNumber1">
+					<span>
+						——— 共{{ receivingRecords.info.package }}个红包，已被抢{{ receivingRecords.info.package - receivingRecords.info.surplus }}份，还剩{{
+							receivingRecords.info.surplus
+						}}份 ———
+					</span>
+				</view>
+				<scroll-view class="scrollRed" :scroll-y="true" :lower-threshold="0" @scrolltolower="loadRed">
+					<view class="scrollRedPackage">
+						<!-- 红包记录循环模板 -->
+						<view class="pdHbMb1" v-for="(item, index) in receivingRecords.list">
+							<view class="pdHbMbLeft">
+								<view class="pdHbMbLeftImg">
+									<image :src="item.avatar" />
+								</view>
+								<view class="pdHbMbLeftInfo">
+									<view>
+										<span>{{ item.nickname }}</span>
+										<view v-if="item.is_optimum == 1 && receivingRecords.info.surplus ==0"><span>手气最佳</span></view>
+									</view>
+									<view>
+										<span>{{ item.gettime }}</span>
+									</view>
+								</view>
+							</view>
+							<view class="pdHbMbRight">
+								<span>{{ item.money }}元</span>
+							</view>
+						</view>
+						<!-- 红包记录循环模板 -->
+					</view>
+				</scroll-view>
+			</view>
+			<!-- 红包领取列表 -->
+
+			<!-- 领取红包 -->
+			<view class="getRedView" v-if="detailinfo.res_status !== 0 && detailinfo.res_status == 1" :style="{ 'background-image': ' url(' + imageRoot + 'redPackage.png)' }">
+				<view class="getRedViewTips">
+					<image :src="imageRoot + 'redTips.png'" />
+				</view>
+				<view class="redViewMoney">
+					<span>总计{{ detailinfo.redpack }}元</span>
+				</view>
+				<view class="getRedButton" @click="getRedDetail" :class="RedStatus == 'Ycheck' ? 'redY' : 'redN'"><span>開</span></view>
+				<view class="sendRedUser">
+					<view>
+						<span>{{ detailinfo.nickname }}</span>
+					</view>
+					<view><span>埋了一个红包</span></view>
+				</view>
+				<view class="getRedBottom" style="position: absolute;bottom: 10%;left: 50%;transform: translate(-50%);"><span>领取的红包将存入您的{{TextSubstitution.sysname}}钱包</span></view>
+			</view>
+			<!-- 领取红包 -->
+		</PopManager>
+		<!-- 红包弹窗 -->
+
+		<!-- 拒绝弹窗 -->
+		<!-- <PopManager :show="refuseShow" :type="'center'" @clickmask="closeRefuseShow">
+			<view class="refuseCause">
+				<view class="refuseTitle">
+					<text>审核未通过</text>
+					<text class="iconfont icon-close iconstyle" @click="closeRefuseShow"></text>
+				</view>
+				<textarea class="refuseText" v-model="refuseReason" placeholder-class="f-28" placeholder="请填写审核未通过说明" />
+				<view class="confirmRefuse" @click="auditFailed">
+					确认
+				</view>
+			</view>
+		</PopManager> -->
+		<!-- 拒绝弹窗 -->
+		
+		<!-- 分享弹窗 -->
+		<!-- <PopManager :show="shareShow" :type="shareType" @clickmask="closeShareShow">
+			<cover-view>
+				<cover-image :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager> -->
+		<!-- 分享弹窗 -->
+		
+		<!-- 领取红包弹窗 -->
+		<PopManager :show="getRedShow" @clickmask="closeGetRed">
+			<view class="getRedList">
+				<view class="getRedListFull"></view>
+				<view class="sendRedImg">
+					<image :src="detailinfo.avatar" />
+				</view>
+				<view class="sendRedUesr">
+					<image :src="imgfixUrls+ 'merchant/starLeft.png'" />
+					<view>
+						<view>
+							<span>{{ detailinfo.nickname }}</span>
+						</view>
+						<view><span>埋了一个红包</span></view>
+					</view>
+					<image :src="imgfixUrls+ 'merchant/starRight.png'" />
+				</view>
+				<view class="getRedNumber">
+					<view class="getRedNumberPackage">
+						<view class="getRedNumberTitle">
+							<image :src="imgfixUrls+ 'merchant/getNumberTitle.png'" />
+							<span>恭喜您获得</span>
+						</view>
+						<view class="getRedNumberBody">
+							<view>
+								<image :src="imageRoot + 'getNumberBody.png'" />
+								<span>
+									¥
+									<span>{{ getRedMoney }}</span>
+								</span>
+							</view>
+						</view>
+						<view class="getRedNumberFoot">
+							<image :src="imgfixUrls+ 'merchant/getNumberFoot.png'" />
+							<span>红包已自动存入您的系统余额</span>
+						</view>
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="tipflag" type="center" @clickmask="tipflag = false">
+			<view class="advfei" v-if="detailinfo.tipsflag == 1 && tipflag">
+				<!-- <view class="iconfont icon-roundclose" style="font-size: 40upx;color: #FFFFFF;font-weight: 700;flex: 0.1;line-height: 70upx;position: absolute;right: 20upx;top: 0upx;"
+				 @click="closeadv">
+			
+				</view> -->
+				<view class="col-f t-l" style="flex: 0.6;padding: 30upx 0 40upx;">
+					<!-- <view class="f-28 t-c"></view> -->
+					<view class="f-28 t-c">开通会员与发布人电话联系</view>
+				</view>
+				<view class="dis-flex">
+					<view class="flex-box">
+						<view class="t-c f-28" style="background-color: #ffffff;color: #333333;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;margin: auto;"
+						  @click="closeadv">
+							取 消
+						</view>
+					</view>
+					<view class="flex-box">
+						<view class="t-c f-28" style="background-color: #FFC3C2;color: #B90C1F;width: 200upx;height: 70upx;line-height: 70upx;font-size: 28upx;border-radius: 10upx;flex: 0.3;margin: auto;"
+						 @click="gohomefxs">
+							立即开通
+						</view>
+					</view>
+					
+					
+				</view>
+				
+			</view>
+		</PopManager>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		<!-- 领取红包弹窗 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	import PopManager from '@/components/template/PopManager';
+	import AppFunction from '@/common/js/app.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	export default {
+		components: {
+			PopManager,
+			PhoneMask,
+			getvxphone
+		},
+		data() {
+			return {
+				imgList: [],
+				phoneHight: 0,
+				detailinfo: {},
+				commentPage: 1,
+				page_index: 10,
+				commentList: [],
+				commentText: '查看更多评论',
+				total: 0,
+				recordsPage: 1,
+				receivingRecords: {},
+				userShopList: [],
+				hfShow: false,
+				hfType: 'center',
+				hfText: '',
+				cid: null,
+				amid: null,
+				items: [],
+				name: '',
+				plShow: false,
+				PlText: '',
+				redShow: false,
+				shareShow: false,
+				shareType: 'top',
+				getRedShow: false,
+				getRedMoney: null,
+				shareinfo: {},
+				videoShow: true,
+				lat: null,
+				lng: null,
+				RedStatus: 'Ycheck',
+				shopFold: true,
+				shopFoldIndex: -1,
+				shopTotal: null,
+				isComment: false,
+				textTip_color: [{
+						color: '#2196F3',
+						border: '0.5px solid #2196F3'
+					},
+					{
+						color: '#25DC4C',
+						border: '0.5px solid #25DC4C'
+					},
+					{
+						color: '#F58F57',
+						border: '0.5px solid #F58F57'
+					},
+					{
+						color: '#A59DD1',
+						border: '0.5px solid #A59DD1'
+					},
+					{
+						color: '#DBB065',
+						border: '0.5px solid #DBB065'
+					}
+				],
+				img:'',
+				popShow: false,
+				vxshow:false,
+				tipflag:false,
+				commentItem:{},
+				myMid:0,
+				poster:'',
+				examine:0,
+				refuseShow:false,
+				refuseReason:'',
+				videoWidth: '0px',
+				videoHeight: '0px',
+				detailVideoHeight: '60vw',
+				query: ''
+			};
+		},
+		created() {
+			
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.poster = uni.getStorageSync('platformInfor').videoimg;
+			_this.myMid = uni.getStorageSync('userinfo').mid;
+			_this.examine = e.examine || 0;
+			// #ifdef H5
+			wxApi.wxRegister();
+			setTimeout(()=>{
+				_this.share();
+			},200);
+			
+			// console.log(_this.myMid,'-----------------------------------------------');
+			let shareLinkurl = location.href;
+			console.log(shareLinkurl.split('?')[0].split('/#/')[1],'pages/subPages/postDetails/postDetails')
+			uni.$on('shareNum',(usnerinfo)=>{ 
+				// console.log(111111,'触发shareNum');
+			        _this.getDetailinfo(); 
+			    }) 
+			// #endif
+			_this.img= _this.imgfixUrl;
+			uni.getStorage({
+				key: 'location',
+				success: function(res) {
+					_this.lat = res.data.latitude;
+					_this.lng = res.data.longitude;
+				}
+			});
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			_this.id = e.id;
+			uni.setStorageSync('DetailsId',_this.id);
+			
+		},
+		onShow() {
+			this.commentList = [];
+			this.init(this.id);
+		},
+		onReady() {
+			let _this = this;
+			// #ifdef H5
+			
+			// #endif
+		},
+		methods: {
+			approve(){//审核通过
+				App._post_form('&p=pocket&do=examinePocket', {
+					id:this.id,
+					status:1
+				}, res => {
+					uni.showToast({
+						title:'操作成功'
+					})
+					this.$router.go(0)
+				});
+			},
+			auditFailed(){ //确认驳回
+				if(!this.refuseReason){
+					uni.showToast({
+						icon:'none',
+						title:'请输入驳回理由'
+					});
+					return
+				}
+				App._post_form('&p=pocket&do=examinePocket', {
+					id:this.id,
+					status:2,
+					reason:this.refuseReason
+				}, res => {
+					uni.showToast({
+						title:'操作成功'
+					})
+					setTimeout(()=>{
+						App.navigationTo({
+							url: 'pages/mainPages/index/index'
+						});
+					},400)
+				},fail=>{
+					// _this.isComment = false;
+					// 	if (fail.data.message == '未绑定手机号') {
+					// 		//#ifdef H5
+					// 		_this.popShow = true;
+					// 		//#endif
+					// 		//#ifndef H5
+					// 		_this.vxshow = true;
+					// 		//#endif
+							
+					// 	}
+				});
+			},
+			closeRefuseShow(){ //关闭拒绝条件弹窗
+				this.refuseShow = false;
+				this.refuseReason = '';
+			},
+			deletehcomnt(item,index,indexs){
+				let _this = this;
+				let datas = {
+					id:item.id,
+					type:0
+				}
+				App.showError(
+					`确认删除此条评论?`,
+					data => {
+						if (data.confirm) {
+						App._post_form('&p=pocket&do=changeReply', datas, res => {
+							// _this.plShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.commentList.map((items,i)=>{
+									if(index == i){
+										items.list.map((itemss,indexss)=>{
+											if(indexss == indexs){
+												_this.commentList[i].list.splice(indexs,1);
+											}
+										})
+										
+									}
+								})
+							})
+						},fail=>{
+							_this.isComment = false;
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+							}
+					},
+					true
+				);
+			},
+			xghuPopShow(item,index,indexs){
+				let _this = this;
+				_this.commentItem = item;
+				_this.commentItem.index = index;
+				_this.commentItem.indexs = indexs;
+				_this.hfText = item.content;
+				_this.hfShow = true;
+			},
+			deleteComt(item,index){
+				let _this = this;
+				let datas = {
+					id:item.id,
+					type:0
+				}
+				App.showError(
+					`确认删除此条评论?`,
+					data => {
+						if (data.confirm) {
+						App._post_form('&p=pocket&do=changeComment', datas, res => {
+							// _this.plShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.commentList.map((items,indexs)=>{
+									if(index == indexs){
+										_this.commentList.splice(indexs,1);
+									}
+								})
+							})
+						},fail=>{
+							_this.isComment = false;
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+							}
+					},
+					true
+				);
+				
+			},
+			xgPopShow(item,index){
+				let _this = this;
+				_this.commentItem = item;
+				_this.commentItem.index = index;
+				_this.PlText = item.content;
+				_this.plShow = true;
+			},
+			tost(type){
+				uni.showToast({
+					icon:'none',
+					title:type == 1?'商户已认证':type == 2?'商户保证金已缴纳':type == 3?'已上传商户全景':'已上传商户视频'
+				})
+			},
+			openVideo(){
+				let _this = this;
+				uni.showModal({
+					title: '温馨提示',
+					content: `观看此视频需支付${_this.detailinfo.videoprice}元,是否继续?`,
+					success: function(res) {
+						if (res.confirm) {
+							let data = {
+								id: _this.id,
+								num: 1,
+								payfor: 5
+							};
+							App._post_form('&p=pocket&do=createOrder', data, reson => {
+								if (reson.errno == 0) {
+									App.navigationTo({
+										url: 'pages/mainPages/payment/payment?orderid=' + reson.data.orderid + '&plugin=pocket&types=' + 1 + '&page=postDetails'
+									});
+									
+								}
+							});
+						}
+					}
+				})
+			},
+			goTixian(){
+				App.navigationTo({
+					url: "pages/subPages/balance/cash/cash"
+				})
+			},
+			gohomefxs(){
+				App.navigationTo({
+					url: "pages/mainPages/memberCard/getMembership/getMembership?card=nhave"
+				})
+			},
+			closeadv(){
+				this.tipflag = false;
+			},
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			yl(index, imgArrary) {
+				uni.previewImage({
+					current: imgArrary[index],
+					urls: imgArrary
+				});
+			},
+			navgateTo(sid) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/store/index?sid=' + sid
+				});
+			},
+			loadRed() {
+				let _this = this;
+				if (_this.recordsPage == _this.redTotla) {} else {
+					_this.recordsPage++;
+					let data = {
+						id: _this.id,
+						page: _this.recordsPage,
+						page_index: 5
+					};
+					App._post_form('&p=pocket&do=receivingRecords', data, res => {
+						_this.receivingRecords.list = [..._this.receivingRecords.list, ...res.data.list];
+						_this.redTotla = res.data.total;
+					});
+				}
+			},
+			init(id) {
+				let _this = this,
+					client = App.getClientType();
+				_this.getShareInfo();
+				_this.getCommentList(id);
+				_this.getReceivingRecords(id);
+				let curLoction = uni.getStorageSync('curLoction'),
+					// 手动选择位置信息
+					agencyData = uni.getStorageSync('agencyData');
+				if (client === "1" || client === "3") {
+					if (!!curLoction) {
+						if (!!agencyData) {
+							_this.getDetailinfo(id, curLoction)
+						} else {
+							App.getAreaId(curLoction, "", "", (options) => {
+								console.log(options,'post1');
+								_this.getDetailinfo(id, curLoction)
+							})
+						}
+					} else {
+						if (!!agencyData) {
+							_this.getDetailinfo(id, _this.currentLoction)
+						} else {
+							// #ifdef H5
+							_this.wxApiCallback(id)
+							// #endif
+							// #ifndef H5
+							App.getLocation().then(res => {
+								App.getAreaId(res, "", "", (options) => {
+									_this.$nextTick(function() {
+										_this.getDetailinfo(id, res)
+									})
+								});
+								_this.setData({
+									currentLoction: res
+								});
+								uni.setStorageSync('curLoction', res);
+							})
+							// #endif
+						}
+					}
+				} else {
+					_this.getDetailinfo(id)
+				}
+			},
+			//导入定位
+			wxApiCallback(id) {
+				let _this = this;
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							App.getAreaId(res, "", "", (options) => {
+								_this.$nextTick(function() {
+									_this.getDetailinfo(id, res)
+								})
+							})
+							_this.setData({
+								currentLoction: res
+							})
+							uni.setStorageSync('curLoction', res);
+						},
+						fail: function() {
+							App.getAreaId("", "", "", (options) => {
+								_this.$nextTick(function() {
+									_this.getDetailinfo(id, '')
+								})
+							})
+						},
+						cancel: function() {
+							App.getAreaId("", "", "", (options) => {
+								_this.$nextTick(function() {
+									_this.getDetailinfo(id, '')
+								})
+							})
+						}
+					});
+				});
+			},
+			getShareInfo() {
+				let _this = this,
+					data = {
+						pageinfo: 'pages/subPages/postDetails/postDetails?id=' + _this.id
+					};
+				App._post_form('&do=Shareinfo', data, res => {
+					_this.shareinfo = res.data
+				})
+			},
+			// 发帖导航
+			goStore() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.getLocation({
+				    success(res) {
+				    console.log('定位1',res,Number(_this.detailinfo.location.lat),Number(_this.detailinfo.location.lng));
+					setTimeout(()=>{
+						uni.openLocation({
+						    latitude: Number(_this.detailinfo.location.lat),
+						    longitude: Number(_this.detailinfo.location.lng),
+							success: function () {
+								console.log('success');
+							},
+							fail: function () {
+								console.log('success');
+							},
+						})
+					})
+				        
+				    }
+				})
+				//#endif
+				//#ifdef MP-WEIXIN
+				wxApi.WxopenLocation(Number(_this.detailinfo.location.lat), Number(_this.detailinfo.location.lng), '', _this.detailinfo.address);
+				//#endif
+				//#ifdef APP-PLUS
+				    Map.openMap(Number(_this.detailinfo.location.lat), Number(_this.detailinfo.location.lng),_this.detailinfo.address,'gcj02')
+				//#endif
+			},
+			// 跳转店铺详情
+			goStoreIndex(sid) {
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/store/index?sid=' + sid
+				});
+			},
+			// 跳转个人主页
+			goHomePage(checkType) {
+				let _this = this;
+				if (_this.detailinfo.mid > 0) {
+					App.navigationTo({
+						url: 'pages/subPages/homepage/homepage/homepage?mid=' + _this.detailinfo.mid + '&checkType=' + checkType
+					});
+				} else {}
+			},
+			// 跳转聊天
+			goChat() {
+				let _this = this;
+				if (_this.detailinfo.mid > 0) {
+					// App.navigationTo({
+					// 	url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.detailinfo.mid + '&other_party_type=' + 1 +
+					// 		'&type=' + 1 + '&id=' + ''
+					// });
+					let getSetInfo = uni.getStorageSync('getSetInfo');
+					if(getSetInfo.type == 1){
+						App.navigationTo({
+							url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + _this.detailinfo.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}else{
+						App.navigationTo({
+							url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.detailinfo.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}
+				} else {}
+			},
+			share() {
+				let _this = this,
+					shareUrl = location.hash,
+					currentPages = shareUrl.split('?')[0],
+					linkurl = location.href,
+					getUserinfo = uni.getStorageSync('userinfo'),
+					agencyData = uni.getStorageSync('agencyData'),
+					shareLinkurl = linkurl.indexOf('?') === -1 ? linkurl + '?head_id=' + getUserinfo.mid + '&aid=' + agencyData.aid : linkurl + '&head_id=' +
+					getUserinfo.mid + '&aid=' + agencyData.aid;
+				console.info('share')
+				shareLinkurl = encodeURIComponent(shareLinkurl);
+				console.log(shareLinkurl,666666666);
+				console.log( `${AppFunction.siteInfo.siteroot}/app/index.php?i=${
+							AppFunction.siteInfo.uniacid
+						}&c=entry&m=${AppFunction.siteInfo.name}&do=returnRequest&link=${shareLinkurl}&head_id=${getUserinfo.mid}&aid=${agencyData.aid}`)
+				wxApi.wxRegister(() => {
+					wxApi.wxShare({
+						title: _this.shareinfo.title || '',
+						desc: _this.shareinfo.desc || "",
+						link: `${AppFunction.siteInfo.siteroot}/app/index.php?i=${
+							AppFunction.siteInfo.uniacid
+						}&c=entry&m=${AppFunction.siteInfo.name}&do=returnRequest&link=${shareLinkurl}&head_id=${getUserinfo.mid}&aid=${agencyData.aid}` ||
+							'',
+						imgUrl: _this.shareinfo.img || '',
+						success: function() {
+							console.info('share1')
+							
+						},
+						trigger: function(res) {
+							let data = {
+								id: _this.id
+							};
+							App._post_form('&p=pocket&do=shareNum', data, res => {
+								_this.getDetailinfo();
+								console.log('shareNum3333')
+								uni.showToast({
+									icon: 'none',
+									title: '分享成功',
+									duration: 2000
+								});
+							});
+						},
+						cancel: function() {}
+					});
+				});
+			},
+			shangjiaFold(key2) {
+				this.shopFold = false;
+				this.shopFoldIndex = key2;
+			},
+			shangjiaUpFold(key2) {
+				this.shopFold = true;
+				this.shopFoldIndex = key2;
+			},
+			// 用户收藏帖子
+			collection() {
+				let _this = this;
+				let data = {
+					id: _this.id
+				};
+				App._post_form('&p=pocket&do=collection', data, res => {
+					if (_this.detailinfo.is_collection > 0) {
+						_this.detailinfo.is_collection = 0;
+						uni.showToast({
+							icon: 'none',
+							title: '取消收藏成功',
+							duration: 2000
+						});
+					} else {
+						_this.detailinfo.is_collection = 1;
+						uni.showToast({
+							icon: 'none',
+							title: '收藏成功',
+							duration: 2000
+						});
+					}
+				});
+			},
+			// 关闭领取详情
+			closeGetRed() {
+				let _this = this;
+				_this.getRedShow = false;
+			},
+			// 返回首页
+			goHome() {
+				App.navigationTo({
+					url: 'pages/mainPages/pocketIInformant/pocketIInformant'
+				});
+			},
+			// 帖子点赞
+			fabulous() {
+				let _this = this;
+				let data = {
+					id: _this.id
+				};
+				App._post_form('&p=pocket&do=fabulous', data, res => {
+					console.info('detailinfo', _this.detailinfo);
+					if (_this.detailinfo.is_fabulous == '1') {
+						_this.detailinfo.is_fabulous = 0;
+						for (let i = 0; i < _this.detailinfo.likeids.length; i++) {
+							if (_this.detailinfo.likeids[i] == uni.getStorageSync('userinfo').avatar) {
+								_this.detailinfo.likeids.splice(i, 1);
+							}
+						}
+						_this.detailinfo.fabulous_num = Number(_this.detailinfo.fabulous_num) - 1;
+						uni.showToast({
+							icon: 'none',
+							title: '取消点赞',
+							duration: 2000
+						});
+					} else {
+						_this.detailinfo.is_fabulous = 1;
+						_this.detailinfo.likeids.push(uni.getStorageSync('userinfo').avatar);
+						_this.detailinfo.fabulous_num = Number(_this.detailinfo.fabulous_num) + 1;
+						uni.showToast({
+							icon: 'none',
+							title: '点赞成功',
+							duration: 2000
+						});
+					}
+				});
+			},
+			// 关闭分享弹框
+			closeShareShow() {
+				let _this = this;
+				_this.shareShow = false;
+			},
+			// 红包领取
+			getRedDetail() {
+				let _this = this;
+				_this.RedStatus = 'Ncheck';
+				let data = {
+					id: _this.id
+				};
+				App._post_form('&p=pocket&do=redDetail', data, res => {
+					_this.redShow = false;
+					_this.getReceivingRecords();
+					_this.getDetailinfo();
+					_this.getRedMoney = res.data.money;
+					_this.getRedShow = true;
+					_this.RedStatus = 'Ycheck';
+				});
+			},
+			// 关闭红包
+			closeRed() {
+				let _this = this;
+				_this.redShow = false;
+			},
+			// 关闭评论弹窗
+			closePlShow() {
+				let _this = this;
+				_this.plShow = false;
+				_this.commentItem = {};
+				_this.hfText = '';
+				_this.PlText = '';
+			},
+			// 拨打电话
+			kfPhone(phone) {
+				let _this = this;
+				if(phone && _this.detailinfo.tipsflag != 1){
+					uni.showModal({
+						title: '联系客户',
+						content: _this.detailinfo.phone,
+						success: function(res) {
+							if (res.confirm) {
+								uni.makePhoneCall({
+									phoneNumber: _this.detailinfo.phone //仅为示例
+								});
+							} else if (res.cancel) {}
+						}
+					});
+				}else{
+					_this.tipflag = true;
+				}
+				
+			},
+			// 帖子评论
+			comment() {
+				let _this = this,
+					data = {
+						id: _this.id,
+						text: _this.PlText
+					};
+				if (_this.isComment) return
+				_this.isComment = true;
+				setTimeout(()=>{
+					_this.isComment = false;
+				})
+				if(_this.commentItem.index >= 0){
+					if(_this.PlText == _this.commentItem.content){
+						uni.showToast({
+							icon:'none',
+							title:'请先进行修改'
+						});
+						return
+					}
+					let datas = {
+						id:_this.commentItem.id,
+						type:1,
+						text:_this.PlText
+					}
+					App._post_form('&p=pocket&do=changeComment', datas, res => {
+						_this.plShow = false;
+						App.showSuccess('修改成功', () => {
+							_this.isComment = false;
+						})
+						
+						_this.commentList.map((item,index)=>{
+							if(index == _this.commentItem.index){
+								item.content = _this.PlText
+							}
+						});
+						_this.PlText = '';
+						_this.commentItem = {};
+						// let data = {
+						// 	id: _this.id,
+						// 	page: _this.commentPage,
+						// 	page_index: _this.page_index,
+						// 	hfText: ''
+						// };
+						// App._post_form('&p=pocket&do=commentList', data, res => {
+						// 	_this.commentList = res.data.list;
+						// 	_this.total = res.data.total;
+						// 	if (_this.commentPage == res.data.total || res.data.list.length < 2) {
+						// 		_this.commentText = '已无更多数据';
+						// 	}
+						// });
+					},fail=>{
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+				}else{
+					App._post_form('&p=pocket&do=comment', data, res => {
+						_this.plShow = false;
+						App.showSuccess('评论成功', () => {
+							_this.isComment = false;
+						})
+						_this.commentPage = 1;
+						_this.PlText = '';
+						let data = {
+							id: _this.id,
+							page: _this.commentPage,
+							page_index: _this.page_index,
+							hfText: ''
+						};
+						App._post_form('&p=pocket&do=commentList', data, res => {
+							_this.commentList = res.data.list;
+							_this.total = res.data.total;
+							if (_this.commentPage == res.data.total || res.data.list.length < 2) {
+								_this.commentText = '已无更多数据';
+							}
+						});
+					},fail=>{
+								if (fail.data.message == '未绑定手机号') {
+									//#ifdef H5
+									_this.popShow = true;
+									//#endif
+									//#ifndef H5
+									_this.vxshow = true;
+									//#endif
+									
+								}
+						});
+				}
+				
+			},
+			// 获取帖子详细信息
+			getDetailinfo(id = "", location = "") {
+				let _this = this;
+				let data = {
+					id: _this.id || id,
+					lat: !!location ? location.latitude : "",
+					lng: !!location ? location.longitude : "",
+					examine: _this.examine
+				};
+				App._post_form(
+					'&p=pocket&do=detail',
+					data,
+					res => {
+						_this.detailinfo = res.data;
+						_this.getUserShopList(res.data.mid, location);
+					},
+					fail => {
+						if (fail.message == '掌上信息已关闭') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							});
+						}
+					}
+				);
+			},
+			// 获取某个用户下的所有店铺列表
+			getUserShopList(mid = '', location = '') {
+				let _this = this;
+				let data = {
+					mid: mid,
+					lat: !!location ? location.latitude : "",
+					lng: !!location ? location.longitude : "",
+				};
+				let url = _this.detailinfo.mid == '0'?'&p=pocket&do=getPocketStore':'&p=store&do=userShopList';
+				if(_this.detailinfo.mid == '0'){
+					data.pocketid = _this.id;
+				}
+				App._post_form(url, data, res => {
+					for (let i = 0; i < res.data.length; i++) {
+						let goodsList = [];
+						for (let j in res.data[i].goods) {
+							let goodsData = res.data[i].goods[j];
+							if (goodsData !== '') {
+								if (j == 'active') {
+									goodsData.css = 'qiang';
+									goodsData.tag = '抢';
+								} else if (j == 'coupon') {
+									goodsData.css = 'hui';
+									goodsData.tag = '券';
+								} else if (j == 'fightgroup') {
+									goodsData.css = 'pin';
+									goodsData.tag = '拼';
+								} else if (j == 'groupon') {
+									goodsData.css = 'tuan';
+									goodsData.tag = '团';
+								} else if (j == 'halfcard') {
+									goodsData.css = 'ka';
+									goodsData.tag = '卡';
+								} else if (j == 'packages') {
+									goodsData.css = 'li';
+									goodsData.tag = '礼';
+								}
+								goodsList.push(goodsData);
+							}
+						}
+						res.data[i].goods = goodsList;
+					}
+					_this.userShopList = res.data.slice(0, 2);
+					if(_this.detailinfo.mid == '0'){
+						_this.userShopList = res.data
+					}
+					
+				});
+			},
+			// 获取帖子的评论/回复信息
+			getCommentList(id, lng, lat) {
+				let _this = this;
+				let data = {
+					id: _this.id || id,
+					page: _this.commentPage,
+					page_index: _this.page_index
+				};
+				App._post_form('&p=pocket&do=commentList', data, res => {
+					_this.commentList = [..._this.commentList, ...res.data.list];
+					_this.total = res.data.total;
+					if (_this.commentPage == res.data.total || res.data.list.length < 2) {
+						_this.commentText = '已无更多数据';
+					}
+				});
+			},
+			// 获取更多评论
+			getMoreComment() {
+				let _this = this;
+				if (_this.commentPage == _this.total) {
+					_this.commentText = '已无更多数据';
+				} else {
+					if (_this.page_index == 2) {
+						_this.page_index = 10;
+						let data = {
+							id: _this.id,
+							page: _this.commentPage,
+							page_index: _this.page_index
+						};
+						App._post_form('&p=pocket&do=commentList', data, res => {
+							_this.commentList = res.data.list;
+							_this.total = res.data.total;
+							if (_this.commentPage == res.data.total) {
+								_this.commentText = '已无更多数据';
+							}
+						});
+					} else {
+						_this.commentPage++;
+						_this.page_index = 10;
+						_this.getCommentList();
+					}
+				}
+			},
+			// 红包领取信息列表
+			getReceivingRecords(id) {
+				let _this = this;
+				let data = {
+					id: _this.id || id,
+					page: _this.recordsPage,
+					page_index: 5
+				};
+				App._post_form('&p=pocket&do=receivingRecords', data, res => {
+					_this.receivingRecords = res.data;
+					_this.redTotla = res.data.total;
+				});
+			},
+			// 关闭回复弹窗
+			closeHfShow() {
+				let _this = this;
+				_this.hfShow = false;
+				_this.hfText = '';
+				_this.PlText = '';
+				_this.commentItem = {};
+			},
+			// 回复
+			reply() {
+				let _this = this;
+				let data = {
+					id: _this.id,
+					cid: _this.cid,
+					amid: _this.amid,
+					text: _this.hfText
+				};
+				if (_this.isComment) return
+				_this.isComment = true;
+				setTimeout(()=>{
+					_this.isComment = false;
+				},1000);
+				if(_this.commentItem.index >= 0 && _this.commentItem.indexs >= 0){
+					if(_this.hfText == _this.commentItem.content){
+						uni.showToast({
+							icon:'none',
+							title:'请先进行修改'
+						});
+						return
+					}
+					let datas = {
+						id:_this.commentItem.id,
+						type:1,
+						text:_this.hfText
+					}
+					App._post_form('&p=pocket&do=changeReply', datas, res => {
+						_this.hfShow = false;
+						_this.isComment = false;
+						uni.showToast({
+							title:'修改成功'
+						});
+						_this.commentList.map((item,index)=>{
+							if(index == _this.commentItem.index){
+								item.list.map((items,indexs)=>{
+									if(indexs == _this.commentItem.indexs){
+										items.content = _this.hfText;
+									}
+								})
+							}
+						})
+						_this.hfText = '';
+						_this.commentItem = {};
+					});
+				}else{
+					App._post_form('&p=pocket&do=reply', data, res => {
+						_this.hfShow = false;
+						_this.isComment = false;
+						let arr = {
+							content: _this.hfText,
+							reply_name: uni.getStorageSync('userinfo').nickname,
+							name: _this.name,
+							smid:_this.myMid,
+							id:res.data
+						};
+						console.info(_this.items);
+						_this.items.push(arr);
+						_this.hfText = '';
+					});
+				}
+				
+			},
+			// 打开回复弹窗
+			hfPopShow(cid, amid, items, name) {
+				let _this = this;
+				_this.hfShow = true;
+				_this.cid = cid;
+				_this.amid = amid;
+				_this.items = items;
+				_this.name = name;
+				console.info(_this.items);
+			},
+			changeSize(e){
+				console.log(e.detail.width, e.detail.height, e.detail.duration);
+				if(e.detail.width > e.detail.height){
+					this.videoWidth = '77vw';
+					this.videoHeight = e.detail.height/e.detail.width*77+'vw';
+				}else if(e.detail.width < e.detail.height){
+					this.videoHeight = this.detailVideoHeight;
+					this.videoWidth = e.detail.width/e.detail.height*60+'vw';
+				}
+			},
+		},
+		onShareAppMessage(e) {
+			let _this = this;
+			console.info('onShareAppMessage')
+			// 来自页面内分享按钮
+			console.info('detailinfo', _this.detailinfo)
+			let data = {
+				id: _this.id
+			};
+			let agencyData = uni.getStorageSync('agencyData');
+			App._post_form('&p=pocket&do=shareNum', data, res => {
+				_this.detailinfo.share++;
+				console.log('shareNum4444')
+				uni.showToast({
+					icon: 'none',
+					title: '分享成功',
+					duration: 2000
+				});
+				console.log(_this.shareinfo);
+			});
+			return {
+				title: _this.shareinfo.title || '',
+				path: 'pages/subPages/postDetails/postDetails?id=' + _this.id + '&aid=' + agencyData.aid,
+				desc: _this.shareinfo.desc || '',
+				imageUrl: _this.shareinfo.img || ''
+			};
+		},
+		onShareTimeline(e){
+			let _this = this;
+			console.info('onShareAppMessage')
+			// 来自页面内分享按钮
+			console.info('detailinfo', _this.detailinfo)
+			let data = {
+				id: _this.id
+			};
+			let agencyData = uni.getStorageSync('agencyData');
+			App._post_form('&p=pocket&do=shareNum', data, res => {
+				_this.detailinfo.share++;
+				console.log('shareNum5555')
+				uni.showToast({
+					icon: 'none',
+					title: '分享成功',
+					duration: 2000
+				});
+				console.log(_this.shareinfo);
+			});
+			let	query = 'id=' + _this.id + '&aid=' + agencyData.aid;
+			return {
+				title: _this.shareinfo.title || '',
+				imageUrl: _this.shareinfo.img || '',
+				query: query
+			};
+		},
+		computed: {
+			TextSubstitution() {
+				return uni.getStorageSync('TextSubstitution')
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	@import './postDetails.less';
+	@import '../../../common/css/old_diyPages';
+
+	.colorF8F8F8 {
+		background: #f8f8f8;
+	}
+
+	.p30 {
+		padding: 30upx;
+	}
+
+	.allRight {}
+
+	.coverImg {
+		width: 750upx;
+	}
+
+	.redY {
+		pointer-events: auto !important;
+	}
+
+	.redN {
+		pointer-events: none !important;
+	}
+
+	.image30 {
+		width: 40upx!important;
+		height: 40upx!important;
+	}
+
+	.remark {
+		font-size: 28upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.remarkView {
+		padding-top: 20upx;
+	}
+	.advfei{
+		background: -webkit-linear-gradient(90deg, #ff4444 ,#FF8032 ); /* Safari 5.1 - 6.0 */
+		background: -o-linear-gradient(90deg,  #ff4444, #FF8032); /* Opera 11.1 - 12.0 */
+		background: -moz-linear-gradient(90deg, #ff4444 , #FF8032); /* Firefox 3.6 - 15 */
+		background: linear-gradient(90deg, #ff4444 , #FF8032); /* 标准的语法（必须放在最后） */
+		position: relative;
+		font-size: 28upx;
+		// bottom: 120upx;
+		// left: 20upx;
+		width: 70vw;
+		padding: 20upx 20upx 40upx;
+		// background-color: #FFF0B2;
+		// display: flex;
+		border-radius: 10upx;
+		z-index: 99;
+	}
+</style>
diff --git a/pages/subPages/postRelease/postRelease.vue b/pages/subPages/postRelease/postRelease.vue
new file mode 100644
index 0000000..baf644a
--- /dev/null
+++ b/pages/subPages/postRelease/postRelease.vue
@@ -0,0 +1,1542 @@
+<template>
+	<!-- 发布帖子 -->
+	<loadlogo v-if="!isWxaudit" />
+	<block v-else>
+		<view class="postRelease">
+			<far-bottom></far-bottom>
+			<!-- 帖子信息输入 -->
+			<view class="postInfoInput">
+				<view class="postInfoInputPackage">
+					<view class="postMainInput">
+						<view class="postMainInputPackage">
+							<view class="postMainInputTitle">
+								<span>{{languageStatus!=1?'内容描述':'내용설명'}}</span>
+								<view @click="show = true" v-if="setInfo.set.hideaudio == 0">
+									<image :src="imgfixUrls + 'merchant/ys.png'" />
+									<span>{{languageStatus!=1?'语音':'음성'}}</span>
+								</view>
+								
+							</view>
+							<textarea placeholder="内容描述(可以文字和语音录入，语音请讲普通话)，请尽量避免使用特殊符号，字体表情，颜文字等特殊文本，防止无法储存造成内容空白。" :maxlength="1800"
+							 v-model="info.content" placeholder-class="main_input" @input="textEnter"></textarea>
+						</view>
+					</view>
+					<!-- 上传提示 -->
+					<view class="postImgTips" v-if="setInfo.set.hideimg != 1 || setInfo.set.hidevideo != 1">
+						<span>
+							{{languageStatus!=1?'有图有真相':'실물이미지'}}
+							<span>
+							{{setInfo.set.hideimg != 1 
+							&& setInfo.set.hidevideo != 1?(languageStatus!=1?'(最多上传9张图片、1个视频)':'(최대 9개 이미지,1개 동영상 가능)'):setInfo.set.hideimg == 1 
+							&& setInfo.set.hidevideo != 1?(languageStatus!=1?'(最多上传1个视频)':'1개 동영상 가능'):(languageStatus!=1?'(最多上传9张图片)':'최대 6개 이미지')}}</span>
+						</span>
+					</view>
+					<!-- 上传提示 -->
+
+					<!-- 上传按钮 -->
+					<view class="upLoadFile">
+						<!-- 图片阅览 -->
+						<view class="zsView" v-for="(item, index) in images" style="fontSize:24upx">
+							<image :src="item" mode="aspectFill" />
+							<image :src="imgfixUrls + 'merchant/close.png'" @click="deletImg(item, 'img')" />
+						</view>
+						<view class="zsView" style="fontSize:24upx" v-if="info.video_img_link !== '' && !!info.video_img_link">
+							<image :src="info.video_img_link" mode="aspectFill" />
+							<image :src="imgfixUrls + 'merchant/close.png'" @click="deletImg(info.video_img_link, 'video')" />
+						</view>
+						<!-- 图片阅览 -->
+						<view class="upLoadImg" @click="uploadFiles(uploadnums, 'img')" v-if="info.img.length < 9 && setInfo.set.hideimg != 1 && !info.video_link && !info.video_img_link">
+							<view>
+								<image :src="imgfixUrls + 'merchant/sctp.png'" />
+							</view>
+							<text class="upText">{{languageStatus!=1?'上传图片':'이미지 올리기'}}</text>
+						</view>
+						<view ref="input" class="input" style="display: none;"></view>
+						<!-- 视频封面图 -->
+						<view class="upLoadImg" @click="uploadFiles(1, 'video')" v-if="!info.video_img_link && setInfo.set.hidevideo != 1 && info.img.length==0">
+							<view>
+								<image :src="imgfixUrls + 'merchant/sctp.png'" />
+							</view>
+							<text class="upText">{{languageStatus!=1?'上传视频封面':'이미지 올리기'}}</text>
+						</view>
+						<!-- 视频封面图 -->
+						<view ref="input" class="input" style="display: none;"></view>
+						<block v-if="src == '' && setInfo.set.hidevideo != 1 && info.img.length==0">
+							<view class="upLoadVideo" @click="upButton">
+								<view>
+									<image :src="imgfixUrls + 'merchant/scsp.png'" />
+								</view>
+								<text class="upText">{{languageStatus!=1?'上传视频':'동영상 올리기'}}</text>
+							</view>
+						</block>
+					</view>
+					<!-- 上传按钮 -->
+
+					<!-- 上传视频展示 -->
+					<view class="Zsvideo-main" v-if="info.video_link !== '' && !!info.video_link">
+						<view class="t-r" v-if="isAndroid === '1' && isAdclose">
+							<image :src="imgfixUrls + 'merchant/close.png'" class="adcloseImg" @click="deletVideo"></image>
+						</view>
+						<video class="zsVideo" :src="src" v-if="info.video_link !== '' && !!info.video_link">
+							<block v-if="isAndroid === '2'">
+								<cover-image :src="imgfixUrls + 'merchant/close.png'" class="closeImg" @click="deletVideo"></cover-image>
+							</block>
+						</video>
+					</view>
+					<!-- 上传视频展示 -->
+
+					<!-- 标签选择 -->
+					<!-- <view class="checkTips" :style="{marginTop:marginT.marginTop}">
+						<view v-for="(item, index) in setInfo.label" @click="checkSecondsType(item)" :class="info.keyword.indexOf(item) !== -1 ? 'checked' : ''">
+							<span>{{ item }}</span>
+						</view>
+					</view> -->
+					<!-- 标签选择 -->
+				</view>
+			</view>
+			<!-- 帖子信息输入 -->
+
+			<!-- 用户信息输入 -->
+			<view class="userInfoInput" v-if="0">
+				<view class="userInfoInputPackage">
+					<view class="userInfoInputTitle"><span>{{languageStatus!=1?'填写信息':'정보 입력'}}</span></view>
+					<view class="userInput">
+						<view class="inputView">
+							<span>{{languageStatus!=1?'联系人':'연락인'}}</span>
+							<input placeholder="请输入真实姓名" v-model="info.nickname" />
+						</view>
+						<view class="inputView">
+							<span>{{languageStatus!=1?'联系电话':'연락전화'}}</span>
+							<input placeholder="请输入联系电话" v-model="info.phone" type="number" />
+						</view>
+						<view class="inputView">
+							<span>{{languageStatus!=1?'分享标题':'공유제목'}}</span>
+							<input placeholder="默认格式：XX发布的XX信息" v-model="info.share_title" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 用户信息输入 -->
+
+			<!-- 用户定位 -->
+			<view class="dwView" v-if="locaStaus !== 0" @click="locatShow = true">
+				<span>{{ dwText }}</span>
+				<image :src="imgfixUrls + 'merchant/right.svg'" />
+			</view>
+			<!-- 用户定位 -->
+			
+			<!-- #ifdef MP-WEIXIN -->
+			<view class="dvview dis-flex f-24" v-if="setInfo.set.wxapptip == '1'">
+				<text class="col-9 iconfont icon-info f-24" style="font-size: 24upx;padding-right: 10upx;line-height: 40upx;"></text>
+				<view class="col-9">
+					为了让您及时获取发布信息或其他用户回复信息提示，系统将订阅消息通知，您也可以前往个人中心-设置-订阅消息中主动订阅'业务处理结果通知。
+				</view>
+			</view>
+			<!-- #endif -->
+			
+			
+			<!-- 发布按钮 -->
+			<!-- <button class="fbButton col-f f-28" @click="release" :disabled="HideDisabled"> 确 认 发 布 </button> -->
+			<button type="warn" v-if="!id" :disabled="HideDisabled" @click="release" class="fbButton"> {{languageStatus!=1?'确 认 发 布':'올리기 확인'}} 	<text class="f-24" v-if="setInfo.price != '0.00'">({{setInfo.price}})元</text></button>
+			<button type="warn" v-else :disabled="HideDisabled" @click="release" class="fbButton"> {{languageStatus!=1?'确 认 修 改':'정보 수정'}}</button>
+			<!-- 发布按钮 -->
+
+			<view class="full"></view>
+
+			<!-- 语音弹窗 -->
+			<PopManager :show="show" @clickmask="closePop" :type="type">
+				<view class="yyView">
+					<view>
+						<span v-if="ysStatus == 0">开始录音</span>
+						<span v-else>{{ str }}</span>
+					</view>
+					<view class="yyButtonPackage">
+						<view class="yyButton" v-if="ysStatus == 0" @click="start"></view>
+						<view v-else class="yyStopButton" @click="yyStop"></view>
+					</view>
+				</view>
+			</PopManager>
+			<!-- 语音弹窗 -->
+
+			<!-- 地址 -->
+			<PopManager :show="locatShow" @clickmask="closeLocatShow" :type="type">
+				<view class="locatPop">
+					<view class="locatPopTitle"><span>所在位置</span></view>
+					<view class="button" @click="nochangeLocation" v-if="setInfo.set.locastatus != '2'">
+						<view class="buttonPackage">
+							<span>不显示位置</span>
+							<image :src="imgfixUrls + 'merchant/checked.svg'" v-if="info.locastatus == '0'" />
+						</view>
+					</view>
+					<view class="button" @click="changeLocation">
+						<view class="buttonPackage"><span>定位</span></view>
+					</view>
+					<view class="button" v-if="info.address_info !== ''" @click="changeLoca">
+						<view class="buttonPackage">
+							<span>{{ info.address_info }}</span>
+							<image :src="imgfixUrls + 'merchant/checked.svg'" v-if="info.locastatus == '1'" />
+						</view>
+					</view>
+					<view class="buttonFull"></view>
+					<view class="closeButton" @click="locatShow = false"><span>关闭</span></view>
+				</view>
+			</PopManager>
+			<!-- 地址 -->
+			<PhoneMask :show1="show1" @clickmask1="closePop1"></PhoneMask>
+			<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+			<!-- #ifdef H5 -->
+			<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="false" :showOverlay="false">
+				<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs.latitude">
+					<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+				</view>
+				<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-else>
+					<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+				</view>
+			</PopManager>
+			<!-- #endif -->
+			<view>
+				<follow
+					:followShow="followShow"
+					:followType="followType"
+					:followTitleShow="followTitleShow"
+					@clickmask="openQrShow"
+					@closeFollowPop="closeFollowPop"
+					@closeFollowTitle="closeFollowTitle"
+					:followData="followData"
+				></follow>
+			</view>
+		</view>
+	</block>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue';
+	import follow from '@/components/template/follow.vue';
+	// #ifdef MP-WEIXIN
+	let plugin = requirePlugin("WechatSI")  
+	let manager = plugin.getRecordRecognitionManager();
+	//#endif
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+
+	export default {
+		components: {
+			PopManager,
+			Loadlogo,
+			PhoneMask,
+			getvxphone,
+			follow
+		},
+		data() {
+			return {
+				show1: false,
+				HideDisabled: false, //控制帖子发布按钮的禁用状态
+				releaseType: 1,
+				phoneHeight: null,
+				isOpenLaction: false,
+				showmain: null,
+				marginT: {
+					marginTop: '20rpx'
+				},
+				latlngs:null,
+				info: {
+					content: '',
+					onetype: null,
+					// nickname: '',
+					// phone: '',
+					// share_title: '',
+					type: null,
+					keyword: [],
+					img: [],
+					locastatus: '',
+					address: '',
+					address_info: '',
+					lat: '',
+					lng: '',
+					video_img_link: '',
+					video_link: '',
+					id: ''
+				},
+				dwText: '不显示位置',
+				setInfo: {
+					set: {
+						locastatus: 0
+					}
+				},
+				locaStaus: null,
+				show: false,
+				type: 'bottom',
+				res: null,
+				text: null,
+				ysStatus: 0,
+				images: [],
+				src: '',
+				locatShow: false,
+				shi: '00',
+				fen: '00',
+				miao: 0,
+				h: 0,
+				m: 0,
+				s: 0,
+				ms: 0,
+				time: 0,
+				str: '00:00:00',
+				id: null,
+				isAndroid: '',
+				isAdclose: false,
+				vxshow:false,
+				followTitleShow: true,
+				followShow: false,
+				followType: '10',
+				followData:{
+				},
+				userInfo:{},
+				lblis:{}
+			};
+		},
+		computed: {
+			isWxaudit() {
+				return this.$store.state.isWxAudit
+			},
+			uploadnums(){
+				if(this.images.length<4){
+					return 6;
+				}else{
+					return (9 - this.images.length);
+				}
+			}
+		},
+		onShow() {
+			let _this = this;
+			//#ifdef APP-PLUS
+			if(_this.lblis.lat){
+				_this.info.address = _this.userInfo.address;
+				_this.info.address_info = _this.userInfo.address;
+				_this.info.locastatus = '1';
+				_this.info.lat = _this.userInfo.lat;
+				_this.info.lng = _this.userInfo.lng;
+				_this.dwText = _this.userInfo.address;
+			}
+			//#endif
+			// _this.init(_this.id);//选择定位会一直onshow
+			// let data = {
+			// 	id: _this.info.type
+			// };
+			// App._post_form('&p=pocket&do=preparation', data, res => {
+			// 	_this.setInfo = res.data;
+			// });
+			// _this.preparation();
+		},
+		onLoad(e) {
+			console.log(e, '2222')
+			let _this = this;
+			_this.dwText = _this.languageStatus !=1?'不显示位置':'위치 미공개';
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+					_this.isAndroid = res.platform === 'android' ? '1' : '2';
+				}
+			});
+			// #ifdef MP-WEIXIN
+			this.initRecord() //开启语音转文字插件
+			//#endif
+			// #ifdef H5
+			_this.latlngs = uni.getStorageSync('curLoction');
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						_this.info.address = loc.poiaddress;
+						_this.info.locastatus = '1';
+						_this.info.lat = loc.latlng.lat;
+						_this.info.lng = loc.latlng.lng;
+						_this.dwText = loc.poiaddress;
+						_this.isOpenLaction = false;
+						_this.locatShow = false;
+					}
+				},
+				false
+			);
+			// #endif
+			this.info.onetype = e.onetype;
+			this.info.type = e.type;
+			_this.id = e.id;
+			console.info(e.id);
+			
+			setTimeout(()=>{
+				// #ifdef H5
+				wxApi.wxRegister();
+				// #endif
+			},1000);
+			_this.init(_this.id);
+		},
+		mounted() {
+			// #ifdef H5
+			let _this = this;
+			let input = document.createElement('input');
+			console.info('input', input);
+			input.type = 'file';
+			input.id = 'fileInput';
+			// input.style.display = 'none'
+			_this.$refs.input.$el.appendChild(input);
+			input.onchange = event => {
+				let filesObj = event.target.files['0'];
+				var reader = new FileReader();
+				// 传入一个参数对象即可得到基于该参数对象的文本内容
+				reader.readAsDataURL(filesObj);
+				reader.onload = function(e) {
+					_this.uploadVideo(e.target.result);
+				};
+				//上传方法
+			};
+			// #endif
+		},
+		methods: {
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop1() {
+				let _this = this;
+				_this.show1 = false;
+			},
+			changeLoca() {
+				let _this = this;
+				_this.dwText = _this.info.address_info;
+				_this.info.locastatus = '1';
+				_this.locatShow = false;
+			},
+			nochangeLocation() {
+				let _this = this;
+				(_this.info.locastatus = '0'), (_this.locatShow = false);
+				_this.dwText = _this.languageStatus !=1?'不显示位置':'위치 미공개';
+			},
+			init(id) {
+				let _this = this;
+				
+				if (!!id) {
+					_this.getEditPocket(id);
+					_this.info.id = id;
+					console.info(_this.info.id);
+				} else {
+					_this.info.locastatus = 0;
+					_this.preparation();
+				}
+			},
+			// 打开地图弹窗
+			changeLocation() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					success: function(res) {
+						console.log(res, 11111)
+						_this.info.address = res.address;
+						_this.info.address_info = res.name;
+						_this.info.locastatus = '1';
+						_this.info.lat = res.latitude;
+						_this.info.lng = res.longitude;
+						_this.info.latitude = res.latitude;
+						_this.info.longitude = res.longitude;
+						// _this.dwText = res.address;
+						_this.dwText = res.name;
+						_this.locatShow = false;
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				      //#endif
+			},
+			// 关闭地址弹窗
+			closeLocatShow() {
+				let _this = this;
+				_this.locatShow = false;
+			},
+			// 获取帖子编辑信息
+			getEditPocket(id) {
+				let _this = this;
+				let data = {
+					id: id
+				};
+				App._post_form('&p=pocket&do=editPocket', data, res => {
+					_this.info = { ..._this.info,
+						...res.data
+					};
+					_this.src = res.data.video_url;
+					console.info(res.data.video_link);
+					_this.info.latitude = res.data.location.lat;//没有返回定位信息
+					_this.info.longitude = res.data.location.lng;
+					_this.info.lat = res.data.location.lat;
+					_this.info.lng = res.data.location.lng;
+					if(!_this.info.share_title || _this.info.share_title == 'null'){
+						// debugger
+						_this.info.share_title =  '';
+					}
+					
+					if (!!res.data.address && res.data.address != '') {
+						_this.dwText = res.data.address_info;
+						_this.info.address = res.data.address;
+					} else if (res.data.address == '') {
+						_this.dwText = _this.languageStatus !=1?'不显示位置':'위치 미공개';
+					}
+					if (!!res.data.img_url) {
+						let newInfoimage = [];
+						for (let i = 0; i < res.data.img_url.length; i++) {
+							_this.images.push(res.data.img_url[i]);
+							newInfoimage.push(res.data.img_url[i]);
+						}
+						_this.info.img = newInfoimage;
+						console.log(_this.info.img, '_this.info.img')
+					}
+					// _this.info.content = _this.info.content.replace(/\<br\/\>/g,"\n");
+					let data = {
+						id: _this.info.type
+					};
+					App._post_form('&p=pocket&do=preparation', data, res => {
+						_this.setInfo = res.data;
+					});
+				});
+			},
+			post(data){
+				console.log(data, '发布的内容');
+				let _this = this;
+				App._post_form(
+					'&p=pocket&do=release',
+					data,
+					res => {
+						if (res.data.status == 0) {
+							App.navigationTo({
+								url: 'pages/mainPages/successRelease/successRelease?id=' + res.data.id,
+								navType: 'rediRect'
+							});
+						} else {
+							
+							let _this = this;
+							let data = {
+								id: res.data.id,
+								num: '',
+								payfor: 1
+							};
+							App._post_form('&p=pocket&do=createOrder', data, reson => {
+								console.log(reson, '000000')
+								if (reson.errno == 0) {
+									App.navigationTo({
+										url: 'pages/mainPages/payment/payment?orderid=' + reson.data.orderid + '&plugin=pocket&types=' + 1
+									});
+									
+								}
+								_this.HideDisabled = false;
+							});
+						}
+				
+					},
+					fail => {
+						_this.HideDisabled = false;
+						if (fail.data.message == '未绑定手机号') {
+							let _this = this;
+							//#ifdef H5
+							_this.show1 = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							_this.releaseType = 1;
+						}
+					}
+				);
+			},
+			// 发布信息
+			release() {
+				if(this.info.video_img_link && !this.info.video_link){
+					uni.showToast({
+						title: '请上传视频',
+						icon: 'none'
+					})
+					return;
+				}
+				// if(!this.info.video_img_link && this.info.video_link){
+				// 	uni.showToast({
+				// 		title: '请上传视频封面图',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+				if(!this.info.video_link && this.info.img.length==0){
+					uni.showToast({
+						title: '请选择上传图片或者视频',
+						icon: 'none'
+					})
+					return;
+				}
+				if(this.info.locastatus=='0'){
+					this.info.address = '';
+					this.info.address_info = '';
+					this.info.lat = '';
+					this.info.lng = '';
+				}
+				let _this = this;
+				let data = _this.info;
+				// data.content = _this.info.content.replace(/\n/g,"\<br\/\>").replace(/\r/g,"\<br\/\>")
+				// console.log(data, data.content, 222222222)
+				_this.HideDisabled = true;
+				// _this.releaseType = 0;
+				let datas = {
+					type:'12'
+				};
+				App._post_form('&do=follow',
+					datas
+				, ress => {
+					if (ress.data.status == 0) {
+						if(_this.setInfo.set.wxapptip == '1'){
+							//#ifndef H5
+							if(_this.setInfo.set.tempId){
+								uni.requestSubscribeMessage({ //订阅消息
+									tmplIds: [_this.setInfo.set.tempId],
+									success(res) {
+										console.log(res)
+										if(res[_this.setInfo.set.tempId] == 'accept'){
+											_this.post(data)
+										}
+										_this.HideDisabled = false;
+										
+									},
+									fail(res){
+										_this.HideDisabled = false;
+										// debugger
+									}
+								})
+							}else{
+								_this.post(data)
+							}
+							
+							//#endif
+							//#ifdef H5
+								_this.post(data)
+							//#endif
+							
+						}else{
+							_this.post(data)
+						}
+						
+						
+					}else{
+						_this.followShow = true;
+						_this.HideDisabled = false;
+						_this.followData = ress.data;
+					}
+				})
+				
+
+			},
+			// 删除视频
+			deletVideo() {
+				let _this = this;
+				_this.src = '';
+				_this.info.video_link = '';
+				_this.info.video_img_link = '';
+				_this.isAdclose = false;
+				_this.marginT.marginTop = '20rpx'
+			},
+			uoloadIgs(length, ids = 0, resImg) {
+				let _this = this;
+				wxApi.uoloadIg(resImg.localIds[ids], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									_this.images.push(res.data.img);
+									_this.info.img.push(res.data.img);
+									if (ids < length - 1) {
+										ids++;
+										uni.setTimeout(_this.uoloadIgs(length, ids, resImg), 500);
+									}
+								}
+							},
+							false,
+							() => {}
+						);
+					} else {
+						App.showError('上传失败');
+					}
+				});
+			},
+			// 文件上传接口
+			async uploadFiles(len, uploadType) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(len);
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let imageData = await App._upLoad(res.tempFilePaths[i]);
+						_this.images.push(imageData.data.img);
+						_this.info.img.push(imageData.data.img);
+					}
+
+					return
+				}
+				// debugger
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							let length = res.localIds.length;
+							let ids = 0;
+							let resImg = res;
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+										if (res.errno === 0) {
+											_this.images.push(res.data.img);
+											_this.info.img.push(res.data.img);
+											if (ids < length - 1) {
+												ids++;
+												uni.setTimeout(_this.uoloadIgs(length, ids, resImg), 500);
+											}
+										}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				},9);
+				// wxApi.choseImage(res => {
+				// 	console.log(res)
+				// 	let i = res.localIds.length;
+				// 	_this.uoloadIgs(i, 0, res);
+				// }, 6);
+				// #endif
+				// #ifndef H5
+				wx.chooseMedia({//基础库 2.10.0 开始支持
+					count: len,
+					mediaType: ['image'],
+					sourceType: ['album', 'camera'],
+					sizeType: ['original', 'compressed'],
+					success: async function(res) {
+						console.log(res)
+						for (let i = 0; i < res.tempFiles.length; i++) {
+							let imageData = await App._upLoad(res.tempFiles[i].tempFilePath);
+							console.log(imageData, 111)
+							if(imageData.data.img){
+								if(uploadType=='img'){
+									_this.images.push(imageData.data.img);
+									_this.info.img.push(imageData.data.img);
+								}else if(uploadType=='video'){
+									_this.info.video_img_link = imageData.data.img;
+								}
+							}else{
+								uni.showToast({
+									title:"上传失败",
+									icon:'none'
+								})
+							}
+						}
+					}
+				});
+				// #endif
+			},
+			upButton() {
+				let _this = this;
+				// #ifdef H5
+				if (_this.isAndroid === '2') {
+					return document.getElementById('fileInput').click();
+				} else {
+					_this.ChooseVdo();
+				}
+				// #endif
+				// #ifndef H5
+				_this.ChooseVdo();
+				// #endif
+			},
+			ChooseVdo() {
+				let _this = this;
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						_this.info.video_link = res.tempFilePath;
+						console.info(res.tempFilePath);
+						let siteroot = null;
+						siteroot = App.siteInfo.siteroot + `${App.routers}`;
+						uni.showLoading();
+						uni.uploadFile({
+							url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+							filePath: res.tempFilePath,
+							name: 'file',
+							formData: {
+								upload_type: 1,
+								is_base: 1
+							},
+							success: res => {
+								let data = JSON.parse(res.data),
+									base64 = new _this.$util.Base64();
+								console.info('data', data);
+								_this.marginT.marginTop = '380rpx'
+								if (data.errno === 0) {
+									_this.src = base64.decode(data.data.img);
+									_this.info.video_link = base64.decode(data.data.image);
+									_this.isAdclose = true;
+								} else {
+									App.showError(data.message, () => {});
+								}
+								uni.hideLoading();
+							},
+							fail: res => {
+								console.info('resInfofail', res);
+								_this.showmain = JSON.stringify(res);
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			resultPath(e) {
+				uni.showModal({
+					content: JSON.stringify(e)
+				});
+			},
+			// 选择视频
+			uploadVideo(file) {
+				let _this = this;
+				uni.showLoading();
+				uni.uploadFile({
+					url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+					filePath: file,
+					name: 'file',
+					formData: {
+						upload_type: 1
+					},
+					success: res => {
+						let data = JSON.parse(res.data);
+						console.info('res', res);
+						_this.marginT.marginTop = '340rpx';
+						if (data.errno === 0) {
+							_this.src = data.data.img;
+							_this.info.video_link = data.data.image;
+						} else {
+							App.showError(data.message);
+						}
+						uni.hideLoading();
+					},
+					fail: res => {
+						uni.hideLoading();
+					}
+				});
+			},
+			// 开始录音
+			lyStar() {
+				let _this = this;
+				_this.s++;
+				if (_this.s >= 60) {
+					_this.s = 0;
+					_this.m = _this.m + 1; //分钟
+				}
+				if (_this.m >= 60) {
+					_this.m = 0;
+					_this.h = _this.h + 1; //小时
+				}
+				_this.str = _this.toDub(_this.h) + ':' + _this.toDub(_this.m) + ':' + _this.toDub(_this.s);
+			},
+			start() {
+				console.info('start');
+				let _this = this;
+				// #ifdef H5
+				wxApi.wxStartRecord();
+				// #endif
+				// #ifdef MP-WEIXIN
+					manager.start({  
+					    duration: 60000,  
+					    lang: "zh_CN"  
+					});  
+				// #endif
+				_this.ysStatus = 1;
+				//开始
+				_this.timer = setInterval(_this.lyStar, 1000);
+			},
+			initRecord: function() {
+				let _this = this;
+			    manager.onStart = function(res) {  
+			        // _this.info.content ="onStart:"+ res.msg+"正在录音"  
+			    };  
+			    //有新的识别内容返回，则会调用此事件  
+			    manager.onRecognize = (res) => {  
+					// debugger
+			        // _this.info.content = res.result;  
+			    }  
+			    // 识别结束事件  
+			    manager.onStop = (res) => {  
+					// debugger
+			        _this.info.content = res.result;  
+			    }  
+			    // 识别错误事件  
+			    manager.onError = (res) => {  
+					// debugger
+			        // _this.info.content = res.msg;  
+			    }  
+			},  
+			toDub(n) {
+				//补0操作
+				if (n < 10) {
+					return '0' + n;
+				} else {
+					return '' + n;
+				}
+			},
+			yyStop() {
+				console.info('Stop');
+				let _this = this;
+				_this.ysStatus = 0;
+				_this.h = 0;
+				_this.m = 0;
+				_this.s = 0;
+				_this.str = '00:00:00';
+				clearInterval(_this.timer);
+				// #ifdef H5
+				wxApi.wxStopRecord(res => {
+					console.info('wxStopRecord');
+					wxApi.wxTranslateVoice(res, res1 => {
+						console.info('wxTranslateVoice');
+						if (res1 == undefined) {
+							uni.showToast({
+								icon: 'none',
+								title: '识别失败',
+								duration: 2000
+							});
+						} else {
+							_this.show = false;
+							_this.info.content = res1;
+							console.info('content', content);
+						}
+					});
+				});
+				// #endif
+				// #ifdef MP-WEIXIN
+				manager.stop()
+				//#endif
+			},
+			// 发布准备信息获取
+			preparation() {
+				let _this = this;
+				let data = {
+					id: _this.info.type
+				};
+				let client = App.getClientType();
+				App._post_form('&p=pocket&do=preparation', data, res => {
+					_this.setInfo = res.data;
+					_this.info.nickname = res.data.user.nickname;
+					_this.info.phone = res.data.user.mobile;
+					_this.locaStaus = Number(res.data.set.locastatus);
+					if (res.data.set.locastatus == '2') {
+						_this.info.locastatus = 1;
+						if (client === '1') {
+							wxApi.getLocation({
+								type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+								success(res) {
+									(_this.info.lng = res.longitude), (_this.info.lat = res.latitude);
+									console.info('info', res.latitude, res.longitude);
+									let data1 = {
+										lat: res.latitude,
+										lng: res.longitude
+									};
+									App._post_form('&do=cityLocation', data1, res => {
+										console.info('cityLocation');
+										_this.info.address = res.data.address_component.city;
+										_this.dwText = res.data.address_component.city;
+									});
+								},
+								fail(res) {
+									uni.showToast({
+										icon: 'none',
+										title: '定位失败',
+										duration: 2000
+									});
+								},
+								complete(res) {
+									console.log(res);
+								}
+							});
+						} else if (client === '3') {
+							wx.getLocation({
+								type: 'gcj02',
+								success(res) {
+									(_this.info.lng = res.longitude), (_this.info.lat = res.latitude);
+									console.info('info', res.latitude, res.longitude);
+									let data1 = {
+										lat: res.latitude,
+										lng: res.longitude
+									};
+									App._post_form('&do=cityLocation', data1, res => {
+										console.info('cityLocation');
+										_this.info.address = res.data.address_component.city;
+										_this.dwText = res.data.address_component.city;
+									});
+								},
+								fail(res) {
+									uni.showToast({
+										icon: 'none',
+										title: '定位失败',
+										duration: 2000
+									});
+								}
+							});
+						} else {
+							uni.getLocation({
+								type: 'gcj02',
+								success: function(res) {
+									(_this.info.lng = res.longitude), (_this.info.lat = res.latitude);
+									let data1 = {
+										lat: res.latitude,
+										lng: res.longitude
+									};
+									App._post_form('&do=cityLocation', data1, res => {
+										console.info('cityLocation');
+										_this.info.address = res.data.address_component.city;
+										_this.dwText = res.data.address_component.city;
+									});
+								},
+								fail: function(res) {
+									uni.showToast({
+										icon: 'none',
+										title: '定位失败',
+										duration: 2000
+									});
+								}
+							});
+						}
+					}
+				});
+			},
+			// 选择标签
+			checkSecondsType(item) {
+				let _this = this;
+				if (_this.info.keyword.indexOf(item) == -1) {
+					_this.info.keyword.push(item);
+				} else {
+					for (let i = 0; i < _this.info.keyword.length; i++) {
+						if (_this.info.keyword[i] == item) {
+							_this.info.keyword.splice(i, 1);
+						}
+					}
+				}
+
+				console.info(_this.info.keyword);
+			},
+			// 关闭语音弹窗
+			closePop() {
+				let _this = this;
+				_this.show = false;
+			},
+			// 删除图片
+			deletImg(item, deleteType) {
+				let _this = this;
+				if(deleteType == 'img'){
+					for (let i = 0; i < _this.images.length; i++) {
+						if (_this.images[i] == item) {
+							_this.images.splice(i, 1);
+						}
+					}
+					for (let i = 0; i < _this.info.img.length; i++) {
+						if (_this.info.img[i] == item) {
+							_this.info.img.splice(i, 1);
+						}
+					}
+				}else if(deleteType == 'video'){
+					_this.info.video_img_link = '';
+				}
+				
+			},
+			textEnter(e){
+				console.log(e)
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	/* #ifdef H5 */
+	#fileInput {
+		width: 20upx !important;
+		height: 20upx !important;
+	}
+	/* #endif */
+	.upText {
+		font-size: 22upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.main_input {
+		font-size: 24upx;
+		color: rgba(204, 204, 204, 1);
+	}
+
+	.closeButton {
+		height: 85upx;
+		width: 750upx;
+		text-align: center;
+
+		>span {
+			line-height: 85upx;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	
+	.locatPopTitle {
+		height: 140upx;
+		text-align: center;
+
+		>span {
+			line-height: 140upx;
+			font-size: 30upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.buttonFull {
+		width: 750upx;
+		height: 20upx;
+		background: rgba(248, 248, 248, 1);
+	}
+
+	.buttonPackage {
+		display: flex;
+		justify-content: space-between;
+		padding: 40upx 30upx;
+		border-bottom: 1upx solid rgba(238, 238, 238, 1);
+
+		>span {
+			vertical-align: middle;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			vertical-align: middle;
+			width: 28upx;
+			height: 28upx;
+		}
+	}
+
+	.locatPop {
+		width: 750upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 20px 20px 0px 0px;
+	}
+
+	.closeImg {
+		width: 40upx;
+		height: 40upx;
+		float: right;
+		position: relative;
+		z-index: 999;
+	}
+
+	.adcloseImg {
+		width: 40upx;
+		height: 40upx;
+	}
+
+	.upLoadImg {
+		text-align: center;
+
+		>view {
+			>image {
+				width: 48upx;
+				height: 48upx;
+				margin: 30upx 0upx 0upx 0upx;
+			}
+		}
+	}
+
+	.upLoadVideo {
+		text-align: center;
+
+		>view {
+			>image {
+				width: 48upx;
+				height: 48upx;
+				margin: 30upx 0upx 0upx 0upx;
+			}
+		}
+	}
+
+	.zsView {
+		vertical-align: middle !important;
+		display: inline-block !important;
+		width: 134upx !important;
+		height: 133upx !important;
+		border-radius: 10upx !important;
+		overflow: hidden !important;
+		border: none !important;
+
+		>image:nth-child(1) {
+			width: 134upx !important;
+			height: 133upx !important;
+		}
+
+		>image:nth-child(2) {
+			left: 100upx;
+			position: relative;
+			bottom: 130upx;
+			width: 34upx;
+			height: 34upx;
+			border-radius: 50%;
+		}
+	}
+
+	.yyStopButton {
+		border-radius: 10upx;
+		margin: 35upx auto 0 auto;
+		width: 110upx;
+		height: 110upx;
+		background: rgba(20, 220, 213, 1);
+	}
+
+	.yyButton {
+		margin: 15upx auto 0 auto;
+		width: 150upx;
+		height: 150upx;
+		border-radius: 50%;
+		background: linear-gradient(0deg, rgba(255, 68, 68, 1) 0%, rgba(255, 133, 67, 1) 100%);
+	}
+
+	.yyButtonPackage {
+		margin: 30upx auto 0 auto;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 50%;
+		border: 1upx solid gray;
+	}
+
+	.yyView {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		width: 750upx;
+		height: 400upx;
+		background: #ffffff;
+
+		>view:nth-child(1) {
+			margin: 80upx 0 0 0;
+			text-align: center;
+
+			>span {
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+
+	.checked {
+		width: 130upx !important;
+		height: 54upx !important;
+		background: rgba(255, 68, 68, 1) !important;
+		border-radius: 27upx !important;
+		text-align: center !important;
+
+		>span {
+			font-size: 24upx !important;
+
+			font-weight: 500 !important;
+			color: rgba(255, 255, 255, 1) !important;
+		}
+	}
+
+	.full {
+		height: 30upx;
+	}
+
+	.fbButton {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		height: 83upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 42upx;
+		text-align: center;
+		padding: 0;
+		position: relative;
+		display: block;
+		box-sizing: border-box;
+		font-size: 35upx;
+		text-decoration: none;
+		line-height: 2.55555556;
+		-webkit-tap-highlight-color: transparent;
+		overflow: hidden;
+
+		>span {
+			line-height: 83upx;
+			font-size: 28upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	.dvview{
+		margin: 20upx auto 0 auto;
+		padding: 0 30upx;
+		// width: 630upx;
+		border-radius: 10upx;
+		// background-color: #ffffff;
+	}
+	
+	.dwView {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			margin: 30upx;
+			vertical-align: middle;
+			font-size: 28upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>image {
+			margin: 40upx 30upx 0 0;
+			vertical-align: middle;
+			height: 20upx;
+			width: 20upx;
+		}
+	}
+
+	.inputView {
+		margin: 20upx 0 0 0;
+		width: 630upx;
+		height: 80upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+
+		>span {
+			margin-left: 30upx;
+			vertical-align: middle;
+			text-align: right;
+			display: inline-block;
+			width: 96upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			padding-left: 30upx;
+			vertical-align: middle;
+			height: 80upx;
+			display: inline-block;
+			width: 400upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.userInput {
+		margin: 10upx 0 0 0;
+	}
+
+	.userInfoInputTitle {
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.userInfoInputPackage {
+		padding: 30upx;
+	}
+
+	.userInfoInput {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.checkTips {
+		margin-top: 10upx;
+
+		>view {
+			margin: 20upx 20upx 0 0;
+			display: inline-block;
+			width: 130upx;
+			height: 54upx;
+			border: 1upx solid rgba(238, 238, 238, 1);
+			border-radius: 27upx;
+			text-align: center;
+
+			>span {
+				line-height: 54upx;
+				font-size: 24upx;
+
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+	.Zsvideo-main{
+		// position: relative;
+	}
+	.zsVideo {
+		background: red;
+		margin-top: 20upx;
+		width: 630upx;
+		height: 355upx;
+		border-radius: 10upx;
+		// position: absolute;
+		z-index: 10;
+	}
+
+	.upLoadFile {
+		margin: 20upx 0 0 0;
+
+		>view {
+			margin-top: 10upx;
+			vertical-align: middle;
+			margin-right: 20upx;
+			display: inline-block;
+			width: 134upx;
+			height: 134upx;
+			background: rgba(251, 251, 251, 1);
+			border: 1upx dashed rgba(204, 204, 204, 1);
+			border-radius: 10upx;
+		}
+	}
+
+	.postImgTips {
+		margin: 40upx 0 0 0;
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+
+			>span {
+				color: #999999;
+			}
+		}
+	}
+
+	.postMainInputTitle {
+		display: flex;
+		justify-content: space-between;
+
+		>span {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>view {
+			display: inline-block;
+
+			>image {
+				vertical-align: middle;
+				height: 30upx;
+				width: 30upx;
+			}
+
+			>span {
+				margin-left: 5upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+	}
+
+	.postMainInputPackage {
+		padding: 30upx;
+		overflow: hidden;
+
+		>textarea {
+			width: 570upx !important;
+			height: 170upx !important;
+			margin-top: 35upx;
+			font-size: 24upx;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.postMainInput {
+		width: 630upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+	}
+
+	.postInfoInput {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.postInfoInputPackage {
+		padding: 30upx;
+	}
+
+	page {
+		background: #f8f8f8;
+		overflow-x: hidden;
+	}
+
+	.postRelease {
+		background: #f8f8f8;
+		font-size: 0;
+		border: 1upx solid rgba(0, 0, 0, 0);
+	}
+
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+</style>
diff --git a/pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress.vue b/pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress.vue
new file mode 100644
index 0000000..ccad2cf
--- /dev/null
+++ b/pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress.vue
@@ -0,0 +1,690 @@
+<template>
+	<!-- 收货地址 -->
+	<scroll-view class="addReceivingAddress" :style="{height:phoneHight}" :scroll-y="true" :scroll-x="false">
+		<far-bottom></far-bottom>
+		<view class="addInput">
+			<view class="addInputPackage">
+				<view class="inputDemo">
+					<span>{{languageStatus!=1?'收货人':'납품인'}}</span>
+					<input :placeholder="languageStatus!=1?'请输入姓名':'성함을 입력하세요'" v-model="userAddress.name" />
+				</view>
+				<view class="inputDemo">
+					<span>{{languageStatus!=1?'手机号码':'핸드폰번호'}}</span>
+					<input :placeholder="languageStatus!=1?'请输入手机号码':'핸드폰번호를 입력하세요'" v-model="userAddress.tel" />
+				</view>
+				<view class="inputDemo" style="position: relative;">
+					<span>{{languageStatus!=1?'地址选择':'주소 선택'}}</span>
+					
+					<input class="uni-input-view" :placeholder="languageStatus!=1?'请选择地址':'주소 선택하세요'" :disabled="inputDisabled" :style="{color: userAddress.detailed_address != '请选择地址'?'#333333':'#6f6f6f'}" v-model="userAddress.detailed_address" @tap="visble">
+					<w-pickerb
+						:visible.sync="visiblec"
+						mode="region"
+						:value="[userAddress.provinceid,userAddress.cityid,userAddress.countyid]"
+						default-type="value"
+						:hide-area="false"
+						@confirm="onConfirm($event,'region')"
+						@cancel="onCancel"
+						ref="region" 
+					></w-pickerb>
+					<view class="location" style="font-size: 26upx;color: #FF4444;" @click="goLocation">
+						<image :src="imgfixUrls + 'merchant/where.svg'" />
+							{{languageStatus!=1?'定位':'위치 설정'}}
+					</view>
+				</view>
+				<view class="inputDemo1">
+					<span>{{languageStatus!=1?'门牌号':'가게번호'}}</span>
+					<textarea placeholder="例:xx小区1栋1单元101" maxlength="50" v-model="userAddress.houseNumber"></textarea>
+				</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="latlngs.latitude">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="!latlngs.latitude">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<view class="setStatus" v-if="status == 1" @click="changeAddressStatus(0)">
+			<view class="checked">
+				<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+			</view>
+			<!-- <evan-radio-group @change="changeAddressStatus" v-model="status">
+			<evan-radio  label="0" clearable>基础用法1</evan-radio>
+			</evan-radio-group> -->
+			<span>{{languageStatus!=1?'设为默认地址':'디폴트옵션 주소'}}</span>
+		</view>
+		<view class="setStatus" v-else @click="changeAddressStatus(1)">
+
+			<view class="check"></view>
+			<!-- <evan-radio-group @change="changeAddressStatus" v-model="status">
+			<evan-radio  label="0" clearable>基础用法1</evan-radio>
+			</evan-radio-group> -->
+			<span>{{languageStatus!=1?'设为默认地址':'디폴트옵션 주소'}}</span>
+		</view>
+
+		<view class="getWechatAddressButton" @click="getWxAddress"><span>{{languageStatus!=1?'一键获得微信地址':'위챗 주소 받기'}}</span></view>
+
+		<view class="saveButton" @click="saveAddress"><span>{{languageStatus!=1?'保存':'저장'}}</span></view>
+	</scroll-view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import wPickerb from '@/components/w-picker/w-picker.vue'
+	import checkCity from '@/components/template/checkCity.vue';
+	// import EvanRadio from '@/components/template/evan-radio/evan-radio.vue'
+	// import EvanRadioGroup from '@/components/template/evan-radio/evan-radio-group.vue'
+	export default {
+		components: {
+			checkCity,
+			PopManager,
+			wPickerb
+		},
+		data() {
+			return {
+				resShow: {},
+				phoneHight: null,
+				phoneWidth:null,
+				isOpenLaction: false,
+				visiblec:false,
+				userAddress: {
+					id: '',
+					name: '',
+					tel: '',
+					detailed_address: '',
+					provinceidName: '',
+					areaidName: '',
+					distidName: '',
+					status: 0,
+					lat:'',
+					lng:''
+				},
+				status: 0,
+				rekuisObj:{},
+				latlngs:null,
+				counts:true,
+				userindex:[],
+				citytext:'',
+				owenscitylist:[],
+				disabled:true,
+				userInfo:{},
+				lblis:{},
+				inputDisabled:true
+			};
+		},
+		onShow() {
+			//#ifdef APP-PLUS
+			if(this.lblis.lat){
+				// this.getloctions(this.lblis);
+				// _this.disabled = false;
+				
+				this.userAddress.lat = this.userInfo.lat;
+				this.userAddress.lng = this.userInfo.lng;
+				this.userAddress.detailed_address = this.userInfo.address;
+				let bilis = {
+					detailed_address:this.userInfo.address,
+					lat:this.userInfo.lat,
+					lng:this.userInfo.lng
+				};
+				this.disabled = false;
+				this.getloctions(bilis);
+			}
+			//#endif
+			
+		},
+		onLoad: function(option) {
+			console.log(option);
+			let _this = this
+			// _this.citytext = _this.languageStatus!=1?'请选择地址':'주소 선택하세요'
+			// _this.userInfo.detailed_address = _this.languageStatus!=1?'请选择地址':'주소 선택하세요'
+			_this.owenscitylist = uni.getStorageSync('cityList');
+			// #ifdef H5
+			wxApi.wxRegister();
+			_this.toLocale();
+			_this.latlngs = uni.getStorageSync('curLoction');
+			// #endif
+			if (option.id !== undefined) {
+				this.userAddress.id = option.id;
+				this.init();
+			}
+			uni.getSystemInfo({
+				success(res) {
+					console.log(res);
+					_this.phoneHight = res.windowHeight + 'px';
+					_this.phoneWidth = res.windowWidth + 'px';
+				}
+			});
+		},
+		watch: {
+			status: {
+				handler(newVal) {
+					console.log(newVal);
+				}
+			}
+		},
+		methods: {
+			tabtextarea(){
+				if(!this.disabled && !userAddress.detailed_address) return;
+				uni.showToast({
+					icon:'none',
+					title:'请使用定位获取位置,再进行详细地址修改'
+				})
+			},
+			onCancel(e){
+				
+			},
+			onConfirm(e){
+				console.log(e);
+				this.userAddress.provinceid  = e.obj.province.value;
+				this.userAddress.cityid  = e.obj.city.value;
+				this.userAddress.countyid  = e.obj.area.value;
+				this.citytext = e.result;
+			},
+			visble(){
+				// if(this.disabled){
+				// 	this.goLocation();
+				// }else{
+				// 	this.visiblec = true;
+				// }
+				if(this.inputDisabled == false) return
+				uni.showToast({
+					icon:'none',
+					title:'请先选择定位'
+				})
+				// this.goLocation();
+			},
+			toLocale(){
+				let _this = this;
+				let lblis;
+				let count = 1;
+				// #ifdef H5
+				window.addEventListener(
+					'message',
+					function(event) {
+						// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+						let loc = event.data;
+						if(!_this.counts){
+							return
+						}
+						if(count > 1 || _this.counts){
+							if (loc && loc.module == 'locationPicker') {
+								console.log(count)
+								lblis = {
+									lat:loc.latlng.lat,
+									lng:loc.latlng.lng,
+									detailed_address:loc.poiaddress
+								}
+								_this.isOpenLaction = false;
+								_this.disabled = false;
+								_this.inputDisabled = false;
+								//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+								_this.getloctions(lblis);
+							}
+						}
+						count++;
+						_this.counts = false;
+						setTimeout(()=>{
+							_this.counts = true
+						},1000)
+					},
+					false
+				);
+				
+				// #endif
+			},
+			getloctions(lblis){
+				console.log(lblis,'666666666',this.userInfo);
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					_this.userAddress.detailed_address = lblis.detailed_address;
+					_this.userAddress.lat = lblis.lat;
+					_this.userAddress.lng = lblis.lng;
+					_this.userAddress.provinceid = res.data.provinceid;
+					_this.userAddress.countyid = res.data.countyid;
+					_this.userAddress.cityid = res.data.cityid;
+					_this.userAddress.provinceidName = '';
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userAddress.provinceid){
+							_this.citytext  = item.name;
+							_this.userAddress.provinceidName = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userAddress.cityid){
+									_this.citytext = `${_this.citytext}${items.name}`;
+									_this.userAddress.areaidName = items.name;
+									console.log(_this.citytext,items.name);
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userAddress.countyid){
+											_this.citytext = `${_this.citytext}${itemss.name}`;
+											_this.userAddress.distidName = itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+					console.log(_this.userAddress);
+				});
+			},
+			goLocation(){
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						let bilis = {
+							detailed_address:e.address,
+							lat:e.latitude,
+							lng:e.longitude
+						};
+						_this.disabled = false;
+						_this.inputDisabled = false;
+						_this.getloctions(bilis);
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				//#endif
+			},
+			returnData(e,index) {
+				let _this = this;
+				_this.userAddress = { ..._this.userAddress,
+					...e
+				};
+				console.log(_this.userAddress);
+				// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+			},
+			galadata(e) {
+				let _this = this;
+				_this.userAddress.areaidName = e.areaidName;
+				_this.userAddress.distidName = e.distidName;
+				_this.userAddress.provinceidName = e.provinceidName;
+				// _this.userAddress.distidName = !_this.userAddress.distidName?'':_this.userAddress.distidName;
+			},
+			init() {
+				let _this = this;
+				_this.addAddress();
+
+			},
+			// 保存地址数据
+			saveAddress() {
+				let _this = this;
+				console.log(_this.userAddress)
+				if (_this.userAddress.name == '' || _this.userAddress.name == undefined) {
+					uni.showToast({
+						icon: 'none',
+						title: '收货人不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userAddress.tel == '' || _this.userAddress.tel == undefined) {
+					uni.showToast({
+						icon: 'none',
+						title: '收货人电话不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userAddress.areaid == '' || _this.userAddress.areaidName == undefined) {
+					uni.showToast({
+						icon: 'none',
+						title: '请选择省市',
+						duration: 2000
+					});
+					return;
+				}
+				if (_this.userAddress.detailed_address == '' || _this.userAddress.detailed_address == undefined) {
+					uni.showToast({
+						icon: 'none',
+						title: '详细地址不能为空',
+						duration: 2000
+					});
+					return;
+				}
+				// _this.userAddress.detailed_address = _this.userAddress.detailed_address + _this.userAddress.houseNumber;
+				let data = _this.userAddress;
+				if(!_this.userAddress.lat){
+					let locationU = uni.getStorageSync('curLoction');
+					data.lat = locationU.latitude;
+					data.lng = locationU.longitude;
+				}
+				App._post_form('&p=member&do=saveAddress', data, res => {
+					uni.navigateBack();
+				});
+			},
+			getWxAddress() {	
+				let _this = this,
+					cityList = uni.getStorageSync('cityList');
+				// #ifdef H5
+				wxApi.wxOpenAddress(res => {
+					console.log(res);
+					_this.userAddress.name = res.userName
+					_this.userAddress.tel = res.telNumber
+					_this.userAddress.detailed_address = res.detailInfo
+					_this.userAddress.provinceidName = res.provinceName
+					_this.userAddress.areaidName = res.cityName
+					_this.userAddress.distidName = res.countryName
+					for (let i = 0; i < cityList.length; i++) {
+						if (_this.userAddress.provinceidName == cityList[i].name || _this.userAddress.provinceidName == cityList[i].name + '市') {
+							_this.userAddress.provinceid = cityList[i].id;
+							// _this.userAddress.provinceid = cityList[i].id;
+							for (let a = 0; a < cityList[i].area.length; a++) {
+								if (_this.userAddress.areaidName == cityList[i].area[a].name) {
+									_this.userAddress.cityid = cityList[i].area[a].id
+									for (let c = 0; c < cityList[i].area[a].dist.length; c++) {
+										if (_this.userAddress.distidName == cityList[i].area[a].dist[c].name) {
+											_this.userAddress.countyid = cityList[i].area[a].dist[c].id;
+											_this.citytext = res.provinceName + res.cityName +  res.countryName;
+										}
+									}
+								}
+							}
+						}
+					}
+					// _this.userAddress.provinceid
+					// _this.resShow=JSON.stringify(res)+_this.userAddress.provinceidName
+				});
+				// #endif
+
+				/**
+				 * 获取微信地址
+				 */
+				// #ifndef H5
+				uni.chooseAddress({
+					success: function(res) {
+						console.log(res)
+						let cityItem = {},
+							cityInfo = cityList.map((val => {
+								if (val.name === res.provinceName || val.name + '市' === res.provinceName) {
+									cityItem.provinceid = val.id;
+								}
+								val.area.map((areaVal) => {
+									if (areaVal.name === res.cityName) {
+										cityItem.cityid = areaVal.id;
+									}
+									areaVal.dist.map((distVal) => {
+										if (distVal.name === res.countyName) {
+											cityItem.countyid = distVal.id;
+										}
+									})
+								})
+							}));
+							console.log(cityItem);
+						_this.userAddress = Object.assign(cityItem, {
+							name: res.userName,
+							tel: res.telNumber,
+							detailed_address: res.detailInfo,
+							provinceidName: res.provinceName,
+							areaidName: res.cityName,
+							distidName: res.countyName
+						});
+						_this.citytext = _this.userAddress.provinceidName + _this.userAddress.areaidName +  _this.userAddress.distidName;
+						console.log(cityItem,_this.userAddress);
+					}
+				})
+				// #endif
+				// _this.userAddress.status = 0;
+			},
+			// 创建或编辑地址
+			addAddress() {
+				let _this = this;
+				let data = {
+					id: _this.userAddress.id
+				};
+				let getcitylist = uni.getStorageSync('cityList');
+				App._post_form('&p=member&do=addAddress', data, res => {
+					_this.userAddress = { ..._this.userAddress,
+						...res.data
+					};
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userAddress.provinceid){
+							_this.citytext  = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userAddress.cityid){
+									_this.citytext = `${_this.citytext}${items.name}`;
+									console.log(_this.citytext,items.name);
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userAddress.countyid){
+											_this.citytext = `${_this.citytext}${itemss.name}`;
+										}
+									})
+								}
+							})
+						}
+					})
+					getcitylist.map((item,index)=>{
+						if(item.id == res.data.provinceid){
+							_this.userindex[0] = index;
+							item.area.map((items,indexs)=>{
+								if(items.id == res.data.cityid){
+									setTimeout(()=>{
+										_this.userindex[1] = indexs;
+									},100)
+									items.dist.map((itemss,indexss)=>{
+										if(itemss.id == res.data.countyid){
+											setTimeout(()=>{
+												_this.userindex[2] = indexss;
+											},200)
+										}
+									})
+								}
+							})
+						}
+					});
+				});
+			},
+			// 修改默认地址
+			changeAddressStatus(type) {
+				let _this = this;
+				_this.status = type;
+				console.log(_this.status)
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.location{
+		position: absolute;
+		right: 0;
+		top: 23upx;
+		
+		>image{
+			padding-left: 10upx;
+			width: 22upx;
+			height: 22upx;
+		}
+	}
+	.show {
+		width: 750upx;
+		height: 400upx;
+		font-size: 28upx;
+	}
+
+	page {
+		background: #f0f0f0;
+	}
+
+	.addReceivingAddress {
+		font-size: 0;
+		background: #f0f0f0;
+	}
+
+	.addInput {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.addInputPackage {
+		padding: 0 40upx;
+	}
+
+	.inputDemo {
+		height: 80upx;
+		border-bottom: 1px solid #eeeeee;
+
+		>span {
+			display: inline-block;
+			line-height: 80upx;
+			vertical-align: middle;
+			width: 140upx;
+			font-size: 28upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>input {
+			font-size: 24upx;
+
+
+			color: #333333;
+			height: 80upx;
+			vertical-align: middle;
+			width: 300upx;
+			display: inline-block;
+			margin-left: 60upx;
+		}
+		.uni-input-view{
+			font-size: 24upx;
+			// padding-left: 58upx;
+			// line-height: 80upx;
+			display: inline-block;
+			// height: 80upx;
+			vertical-align: middle;
+			width: 270upx;
+		}
+	}
+
+	input::placeholder {
+		font-size: 24upx;
+
+
+		color: rgba(153, 153, 153, 1);
+	}
+
+	.inputDemo1 {
+		overflow: hidden;
+		height: 114upx;
+		position: relative;
+
+		>span {
+			vertical-align: top;
+			display: inline-block;
+			line-height: 80upx;
+			width: 140upx;
+			font-size: 28upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		>textarea {
+			margin-top: 23upx;
+			vertical-align: top;
+			font-size: 24upx;
+
+
+			color: #333333;
+			height: 70upx;
+			vertical-align: middle;
+			width: 350upx;
+			display: inline-block;
+			margin-left: 60upx;
+		}
+	}
+
+	.setStatus {
+		margin: 15upx auto 0 auto;
+		width: 688upx;
+		height: 83upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+
+		>span {
+			vertical-align: middle;
+			margin-left: 17upx;
+			line-height: 83upx;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.check {
+		margin-left: 45upx;
+		display: inline-block;
+		vertical-align: middle;
+		width: 31upx;
+		height: 31upx;
+		border: 2px solid rgba(204, 204, 204, 1);
+		border-radius: 50%;
+	}
+
+	.getWechatAddressButton {
+		margin: 35upx auto 0 auto;
+		width: 688upx;
+		height: 80upx;
+		background: rgba(0, 186, 25, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.saveButton {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		height: 80upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 40upx;
+		text-align: center;
+
+		>span {
+			line-height: 80upx;
+			font-size: 28upx;
+
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.checked {
+		margin-left: 45upx;
+		display: inline-block;
+		vertical-align: middle;
+		border: 4upx solid #ff4444;
+		width: 31upx;
+		height: 31upx;
+		background: #ff4444;
+		border-radius: 50%;
+
+		>image {
+			margin: 3upx 0 0 4upx;
+			width: 25upx;
+			height: 25upx;
+		}
+	}
+</style>
diff --git a/pages/subPages/receivingAddress/receivingAddress.vue b/pages/subPages/receivingAddress/receivingAddress.vue
new file mode 100644
index 0000000..8426b25
--- /dev/null
+++ b/pages/subPages/receivingAddress/receivingAddress.vue
@@ -0,0 +1,309 @@
+<template>
+	<!-- 收货地址 -->
+	<view class="receivingAddress-main">
+		<far-bottom></far-bottom>
+		<scroll-view class="receivingAddress" :style="{height:phoneHight}" :scroll-y="true">
+			<!-- 地址栏循环模板 -->
+			<noneMores v-if="total==0"></noneMores>
+			<view class="receivingAddressList" v-for="(item, index) in addressList" @click="changeAddressStatus(item)" v-else>
+				<view class="receivingAddressListPackage">
+					<view class="addressListTitle">
+						<span>{{ item.name }}</span>
+						<span class="titleRight">{{ item.tel }}</span>
+					</view>
+					<view class="addressListBody">
+						<span>{{ item.province }} {{ item.city }} {{ item.county }}</span>
+						<span class="bodyRight">{{ item.detailed_address }}</span>
+					</view>
+					<view class="addressListFoot">
+						<view class="footLeft" v-if="item.status == 0">
+							<view></view>
+							<span>设为默认</span>
+						</view>
+						<view class="footLeftCheck" v-if="item.status == 1">
+							<view>
+								<image :src="imgfixUrls + 'merchant/payCheck.svg'" />
+							</view>
+							<span>设为默认</span>
+						</view>
+						<view class="footRight">
+							<view class="footRightLeft" @click.stop="goAdd(item.id)">
+								<image :src="imgfixUrls + 'merchant/bj1.png'" />
+								<span>编辑</span>
+							</view>
+							<view @click.stop="deleteAddress(item.id)">
+								<image :src="imgfixUrls + 'merchant/sc1.png'" />
+								<span>删除</span>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 地址栏循环模板 -->
+
+		</scroll-view>
+		<!-- 添加新地址按钮 -->
+		<view class="addButton" @click="goAddNew"><span>添加新地址</span></view>
+		<!-- 添加新地址按钮 -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import noneMores from '@/components/template/nonemores.vue';
+
+	export default {
+		components: {
+			noneMores
+		},
+		data() {
+			return {
+				addressList: [],
+				type: null,
+				total: null,
+				phoneHight: null
+			};
+		},
+		onLoad(e) {
+			let _this = this
+			console.info(e.type)
+			if (e.type !== undefined) {
+				_this.type = e.type
+			}
+		},
+		onShow() {
+			this.init();
+		},
+		methods: {
+			init() {
+				let _this = this;
+				_this.getAddressList();
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+			},
+			// 用户地址列表
+			getAddressList() {
+				let _this = this;
+				let data = {};
+				App._post_form('&p=member&do=addressList', data, res => {
+					_this.addressList = res.data;
+					_this.total = res.data.length
+				});
+			},
+			// 修改默认地址
+			changeAddressStatus(item) {
+				let _this = this;
+				let id = item.id;
+				let data = {
+					id: id
+				};
+				App._post_form('&p=member&do=changeAddressStatus', data, res => {
+					_this.getAddressList();
+					console.info(_this.type)
+					if (_this.type == 1) {
+						let orderInfos = uni.getStorageSync('orderInfos');
+						if(orderInfos.type == 'foodorder'){
+							App.navigationTo({
+								url:'pages/subPages2/businessCenter/foodOrder/foodOrder?id=' + orderInfos.id + '&param=' + orderInfos.param,
+								navType: 'rediRect'
+							})
+						} else if(orderInfos.type == 'housekeep'){
+							App.navigationTo({
+								url:`pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${orderInfos.id}&deviceshow=${orderInfos.deviceshow}&num=${orderInfos.num}&address=${item.detailed_address}&expressid=${item.id}`,
+								navType: 'rediRect'
+							})
+						} else{
+							App.navigationTo({
+								url: 'pages/subPages/submitOrder/submitOrder?goods_id=' + orderInfos.goods_id + '&goods_num=' + orderInfos.goods_num +
+									'&specid=' + orderInfos.specid + '&plugin=' + orderInfos.plugin + '&buystatus=' + orderInfos.buystatus + '&drawid=' + orderInfos.drawid,
+								navType: 'rediRect'
+							});
+						}
+						
+					}
+				});
+			},
+			// 删除地址
+			deleteAddress(id) {
+				let _this = this
+				let data = {
+					id: id
+				}
+				App._post_form('&p=member&do=deleteAddress', data, res => {
+					_this.getAddressList();
+				})
+			},
+			// 跳转编辑
+			goAdd(id) {
+				App.navigationTo({
+					url: 'pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress?id=' + id
+				})
+			},
+			// 新增
+			goAddNew() {
+				App.navigationTo({
+					url: 'pages/subPages/receivingAddress/addReceivingAddress/addReceivingAddress'
+				})
+			}
+		}
+	};
+</script>
+
+<style lang="less" scoped>
+	.receivingAddress-main{
+		background-color: #f8f8f8;
+	}
+	.receivingAddress {
+		font-size: 0;
+		padding-bottom: 120upx;
+	}
+
+	.receivingAddressList {
+		margin: 20upx auto 0 auto;
+		width: 688upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.receivingAddressListPackage {
+		padding: 30upx 40upx;
+	}
+
+	.addressListTitle {
+		>span {
+			font-size: 32upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.titleRight {
+		margin-left: 18upx;
+	}
+
+	.addressListBody {
+		margin-top: 20upx;
+
+		>span {
+			font-size: 24upx;
+
+
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+
+	.bodyRight {
+		margin-left: 15upx;
+	}
+
+	.addressListFoot {
+		margin-top: 27upx;
+		display: flex;
+		justify-content: space-between;
+
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+
+	.footLeft {
+		>view {
+			vertical-align: top;
+			display: inline-block;
+			width: 31upx;
+			height: 31upx;
+			border: 2upx solid rgba(204, 204, 204, 1);
+			border-radius: 50%;
+		}
+
+		>span {
+			margin-left: 12upx;
+			vertical-align: top;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	.footRight {
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+
+			>image {
+				vertical-align: middle;
+				width: 25upx;
+				height: 25upx;
+			}
+
+			>span {
+				vertical-align: middle;
+				margin-left: 10upx;
+				font-size: 24upx;
+
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+
+	.footRightLeft {
+		margin-right: 55upx;
+	}
+
+	.addButton {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		width: 750upx;
+		height: 98upx;
+		text-align: center;
+		background: rgba(255, 68, 68, 1);
+
+		>span {
+			line-height: 98upx;
+			font-size: 28upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.footLeftCheck {
+		>view {
+			vertical-align: top;
+			display: inline-block;
+			border: 2upx solid #ff4444;
+			width: 31upx;
+			height: 31upx;
+			border-radius: 50%;
+			overflow: hidden;
+			background: #ff4444;
+			text-align: center;
+
+			>image {
+				margin: 3upx 0 0 4upx;
+				width: 25upx;
+				height: 25upx;
+			}
+		}
+
+		>span {
+			margin-left: 12upx;
+			vertical-align: top;
+			font-size: 24upx;
+
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+</style>
diff --git a/pages/subPages/redpacket/myredpacket.vue b/pages/subPages/redpacket/myredpacket.vue
new file mode 100644
index 0000000..4cde41a
--- /dev/null
+++ b/pages/subPages/redpacket/myredpacket.vue
@@ -0,0 +1,866 @@
+<template>
+	<view class="container">
+		<block v-if="!loading">
+			<load-ing></load-ing>
+		</block>
+		<block v-else>
+			<far-bottom></far-bottom>
+			<view class="tablist-main dis-flex flex-y-center b-f">
+				<view class="tab-item t-c flex-box p-r" :class="curActive===tabItem.type?'col-f4 f-30':'col-9 f-28'" v-for="(tabItem,index) in tablist"
+				 :key="index" @click="selectTab(tabItem.type)">{{tabItem.title}}({{tabItem.num}})
+					<view v-if="curActive===tabItem.type" class="active-tab"></view>
+				</view>
+			</view>
+			<view class="packet-main">
+				<view class="unpacket" v-if="curActive==='0' && selectStatus">
+					<view class="red-square-main dis-flex flex-x-between flex-y-center b-f m-btm30" @click="navgateto">
+						<view class="dis-flex flex-y-center">
+							<image :src="imgfixUrls + 'redpacket/redsquare.png'" class="redsquareImage"></image>
+							<view class="f-28 col-3">{{languageStatus!=1?'红包广场':'훙보센터'}}</view>
+						</view>
+						<view class="redsquare-right iconfont icon-right col-c"></view>
+					</view>
+					<view class="receive-redpacket col-9 f-24 t-c m-btm30" v-if="!!expireSoon && expireSoon>0">您有<text class="col-f4">{{expireSoon}}</text>个红包即将过期</view>
+					<view class="unused-packet-main" v-if="!!redPacketList && redPacketList.length>0">
+						<view class="unused-packet-list">
+							<view  v-for="(redPacketItem,index) in redPacketList" :key="index">
+								<view class="unused-list-item p-r m-btm20" :style="{'background-image':'url('+imageRoot+'redpacket_bg.png)'}" @click="goindex(redPacketItem.use_where,redPacketItem.link)"
+								>
+								 <view class="unused-list-rad" v-if="redPacketItem.status == 6">
+								 	<view class="flex-box">
+								 		<view class="t-r" style="line-height: 210upx;color: #ffffff;">
+								 			转赠中(不可使用)
+								 		</view>
+								 	</view>
+									<view class="flex-box " style="padding-top: 70upx;">
+										<view class="closeBtn" @click="closeRed(redPacketItem)">
+											取消转赠
+										</view>
+									</view>
+								 </view>
+									<view class="redPacket-type f-24 col-f">{{redPacketItem.title}}</view>
+									<view class="UnredPacket-detail dis-flex flex-dir-column flex-x-center">
+										<view class="UnredPacket-price dis-flex flex-y-center">
+											<view class="UnredPacket-priceStyle col-f f-50"><text class="f-30">¥</text>{{redPacketItem.cut_money}}</view>
+											<view class="f-26 col-f">满{{redPacketItem.full_money}}可用</view>
+										</view>
+										<view class="UnredPacket-date f-24 col-f">{{redPacketItem.time}}</view>
+										<view v-if="redPacketItem.usegoods_type != 0" class="UnredPacket-date f-24 col-f" @click="selectBox1(redPacketItem.id)">{{redPacketItem.use_where}}
+										<text
+											  v-if="redPacketItem.id != selectId" class="iconfont icon-right col-f"></text><text
+											 v-else-if="redPacketItem.id == selectId" class="iconfont icon-unfold col-f"></text>
+											</view>
+											<view v-else-if="redPacketItem.usegoods_type == 0" class="UnredPacket-date f-24 col-f">{{redPacketItem.use_where}}</view>
+										<view class="makeBtn" @click="makered(redPacketItem)" v-if="redPacketItem.transferstatus == '1'">
+											转赠
+										</view>
+									</view>
+									<view class="selectBox" v-if="redPacketItem.id == selectId">
+										<view class="select-con dis-flex" v-for="(item,index) in useWhereList" :key='index'>
+											<view class="f-24">
+												{{item.name}}
+											</view>
+											<view class="f-24 t-r gohomeBtn" @click="gohone(item.link)">
+												前往
+											</view>
+										</view>
+									</view>
+								</view>
+								<view class="linkUser" v-if="redPacketItem.transferflag == 1">
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											赠送人
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.oldnickname}}
+										</view>
+									</view>
+									<view class="dis-flex f-24" style="padding: 10upx 0;">
+										<view class="flex-box">
+											手机号
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.oldmobile}}
+										</view>
+									</view>
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											领取时间
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.gettime}}
+										</view>
+									</view>
+								</view>
+							</view>
+							
+						</view>
+					</view>
+
+				</view>
+				<view class="usedpacket" v-if="(curActive==='1' || curActive==='2'  || curActive==='3') && selectStatus">
+				<view class="search dis-flex" v-if="curActive == '3'">
+					<view class="iconfont icon-search t-c"
+					style="width: 80upx;height: 80upx;line-height: 80upx;">
+						
+					</view>
+					<input class="searchInput" @confirm="confirm" v-model="mobile" type="text" maxlength="11" placeholder="请输入手机号" value=""  />
+				</view>
+					<block v-if="!!redPacketList && redPacketList.length>0">
+						<view class="usedpacket-list">
+							<view  v-for="(redPacketItem,index) in redPacketList" :key="index">
+								<view class="usedpacket-list-item dis-flex m-btm20" >
+									<view class="usedpacket-itemleft p-r dis-flex flex-dir-column flex-x-center">
+										<view class="usedpacket-priceStyle col-f f-50 t-c"><text class="f-30">¥</text>{{redPacketItem.cut_money}}</view>
+										<view class="f-24 col-f t-c">满{{redPacketItem.full_money}}可用</view>
+										<view class="itemleft_bgstyle"></view>
+										<view class="itemleft_bgstyle2"></view>
+									</view>
+									<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+										<view class="usedpacket_titleType dis-flex flex-y-center">
+											<view class="usedpacketType t-c m-right10 dis-flex flex-y-center" v-if="!!redPacketItem.label"><text class="col-f f-24">{{redPacketItem.label}}</text></view>
+											<view class="usedpacketTitle onelist-hidden f-28 col-3">{{redPacketItem.title}}</view>
+										</view>
+										<view class="col-9 f-24 m-top-btm10">范围：{{redPacketItem.use_where}}</view>
+										<view class="col-9 f-24">{{redPacketItem.time}}</view>
+										<image :src="curActive==='1'? imgfixUrls + 'redpacket/usedpacket.png': imgfixUrls + 'redpacket/havepacket.png'"
+										 class="usedpacketImage" v-if="curActive != '3'"></image>
+										 <image :src="imgfixUrls + 'redpacket/haveGive.png'"
+										  class="usedpacketImage" v-if="curActive == '3'"></image>
+									</view>
+								</view>
+								<view class="linkUser" style="background-color: #cccccc;color: #999999;" v-if="redPacketItem.transferflag == 1">
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											赠送人
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.oldnickname}}
+										</view>
+									</view>
+									<view class="dis-flex f-24" style="padding: 10upx 0;">
+										<view class="flex-box">
+											手机号
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.oldmobile}}
+										</view>
+									</view>
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											领取时间
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.gettime}}
+										</view>
+									</view>
+								</view>
+								<view class="linkUser" style="background-color: #cccccc;color: #999999;" v-if="curActive == '3'">
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											{{redPacketItem.transfermode == 1?'赠送对象':'领取对象'}}
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.getname}}
+										</view>
+									</view>
+									<view class="dis-flex f-24" style="padding: 10upx 0;">
+										<view class="flex-box">
+											手机号
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.mobile}}
+										</view>
+									</view>
+									<view class="dis-flex f-24">
+										<view class="flex-box">
+											领取时间
+										</view>
+										<view class="flex-box t-r">
+											{{redPacketItem.transfertime}}
+										</view>
+									</view>
+								</view>
+							</view>
+							
+						</view>
+					</block>
+					<block v-else>
+						<nonemores :diyTitleType="'Data'" :diyImagesSrc="img"></nonemores>
+					</block>
+				</view>
+				<view style="background-color: #F8F8F8;" class="m-top20" v-if="!!redPacketList && redPacketList.length>0 && selectStatus">
+					<load-more :isMore="loadingMore"></load-more>
+				</view>
+			</view>
+		</block>
+		<PopManager :show="showlink" type="bottom" @clickmask="showlink = false">
+			<view class="shareBox dis-flex" v-if="showlink">
+				<button class="flex-box sharebtn t-c" @click="sharelinkman">
+					<image :src="imgfixUrls+ 'wxhaoyou.png'"  mode=""></image>
+					<view class="sharetext">
+						联系人
+					</view>
+				</button>
+				<!-- #ifdef H5 || APP-PLUS -->
+				<button class="flex-box sharebtn t-c" @click="shareover">
+					<image :src="imgfixUrls+ 'checkout/weixin.png'" mode=""></image>
+					<view class="sharetext">
+						微信好友
+					</view>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef MP-WEIXIN -->
+				<button class="flex-box sharebtn t-c" open-type="share" >
+					<image :src="imgfixUrls+ 'checkout/weixin.png'" mode=""></image>
+					<view class="sharetext">
+						微信好友
+					</view>
+				</button>
+				<!-- #endif -->
+				<button class="flex-box sharebtn t-c" @click="sharelint">
+					<image :src="imgfixUrls+ 'pengyouquan.png'"  mode=""></image>
+					<view class="sharetext">
+						微信朋友圈
+					</view>
+				</button>
+			</view>
+			<view class="b-f close" @click="showlink = false">
+				关闭
+			</view>
+		</PopManager>
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image v-if="shareShow" :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import nonemores from "@/components/template/nonemores.vue"
+	import wxApi from "@/common/js/wxApi.js"
+	import loadIng from '@/components/template/loadlogo'
+	import loadMore from '@/components/template/loadmore.vue'
+	import PopManager from '@/components/template/PopManager.vue';
+	export default {
+		data() {
+			return {
+				diyImagesSrc: 'redpacket/nonemore_packet.png',
+				curActive: '0',
+				tablist: [{
+						title: '未使用',
+						type: '0'
+					},
+					{
+						title: '已使用',
+						type: '1'
+					},
+					{
+						title: '已过期',
+						type: '2'
+					}
+				],
+				current_page: 1,
+				curRedpacketTotal: "",
+				loading: false,
+				expireSoon: "",
+				redPacketList: [],
+				loadingMore: false,
+				selectStatus: false,
+				isShareBotton: false,
+				useWhereList: [],
+				selectId: '',
+				img:'',
+				showlink:false,
+				redItem:{},
+				shareShow:false,
+				id:null,
+				mobile:''
+			}
+		},
+		onLoad(e) {
+			let _this = this;
+			this.img = this.imgfixUrl + this.diyImagesSrc;
+			
+			// #ifndef H5
+			uni.showShareMenu({
+			withShareTicket: true,
+			menus: ['shareAppMessage', 'shareTimeline']
+			})
+			uni.$once('myredpacketShare',function(data){
+				_this.shareover()
+			})
+			// #endif
+			this.$nextTick(function(){
+				setTimeout(()=>{
+					uni.setNavigationBarTitle({
+					　　title:e.title
+					})
+				},500)
+			})
+			
+			
+			
+		},
+		onShow() {
+			let _this = this;
+			// #ifndef H5
+			if (_this.isShareBotton){
+				_this.isShareBotton = false
+				return
+			}
+			// #endif
+			_this.getRedpacket_list(true, _this.curActive);
+		},
+		computed: {
+
+		},
+		methods: {
+			gohone(link){
+				App.navigationTo({
+					url: link
+				})
+			},
+			goindex(title,link){
+				if(title == '全平台可用'){
+					App.navigationTo({
+						url: link
+					})
+				}
+			},
+			confirm(e){
+				this.getRedpacket_list(false,3)
+			},
+			closeRed(item){
+				App.showError(
+					`确定取消转赠?`,
+					data => {
+						if (data.confirm) {
+							App._post_form('&p=Order&do=cancelTransfer', {
+								objid:item.id,
+								type:2
+							}, res => {
+								uni.showToast({
+									title:'操作成功'
+								});
+								this.redPacketList.map((items,index)=>{
+									if(items.id == item.id){
+										items.status = 1;
+									}
+								})
+							})
+						}
+					},
+					true
+				);
+				
+			},
+			async shareover(){
+				// #ifdef H5
+				let _this = this;
+					this.shareShow = true;
+					_this.id = await _this.redShare(_this.redItem.id,2);
+					console.log(_this.id)
+					let shareLinkurl = uni.getStorageSync('shareLinkurl');
+					shareLinkurl = shareLinkurl.replace('pages/subPages/redpacket/myredpacket','pages/mainPages/index/index');
+					let shareData =  uni.getStorageSync('shareObj');
+					jWeixin.ready(() => {
+						wxApi.wxShare({
+							title: _this.id?_this.id.title:shareData.title, // 分享标题
+							desc: _this.id?_this.id.desc:shareData.desc, // 分享描述
+							link:  _this.id?shareLinkurl + '&isred=' + _this.id.recordid:shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+							imgUrl:_this.id? _this.id.shareimg : shareData.imageUrl, // 分享图标
+							success: function(res) {
+								
+							}
+						})
+					})
+				// #endif
+			},
+			async sharelint(){
+				let _this = this;
+				
+				_this.id = await _this.redShare(_this.redItem.id,2);
+				uni.setStorageSync('redItem',_this.id);
+				//#ifdef MP-WEIXIN
+				App.showError(
+					`即将前往“首页”,稍后按照“界面提示”进行点击右上角“···”选择“分享到朋友圈”即可`,
+					data => {
+						if (data.confirm) {
+						App.navigationTo({
+							url: 'pages/mainPages/index/index?isRedShare=2&isRedId=' + this.redItem.id
+						})
+							}
+					},
+					true
+				);
+				//#endif
+				//#ifdef H5
+				this.shareShow = true;
+				let shareLinkurl = uni.getStorageSync('shareLinkurl');
+				shareLinkurl = shareLinkurl.replace('pages/subPages/redpacket/myredpacket','pages/mainPages/index/index');
+				let shareData =  uni.getStorageSync('shareObj');
+				jWeixin.ready(() => {
+					wxApi.wxShare({
+						title: _this.id?_this.id.title:shareData.title, // 分享标题
+						desc: _this.id?_this.id.desc:shareData.desc, // 分享描述
+						link:  _this.id?shareLinkurl + '&isred=' + _this.id.recordid:shareLinkurl, // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+						imgUrl:_this.id? _this.id.shareimg : shareData.imageUrl, // 分享图标
+						success: function(res) {
+							
+						}
+					})
+				})
+				//#endif
+			},
+			sharelinkman(){
+				App.navigationTo({
+					url: 'pages/subPages2/redClothes/redClothes?type=2&id=' + this.redItem.id
+				})
+			},
+			makered(item) {
+				let _this = this;
+				this.redItem = item;
+				_this.showlink = true;
+			},
+			redShare(id,type){
+				return new Promise((resolve, reject) => {
+					App._post_form('&p=Order&do=planTransfer', {
+						id,
+						type
+					}, res => {
+						resolve(res.data);
+					})
+				})
+			},
+			//列表
+			selectLi(id) {
+				App._post_form('&p=redpack&do=getRedPackUserWhere', {
+					id
+				}, res => {
+					if (res.errno == 0) {
+						this.useWhereList = res.data.use_where
+						this.selectId = res.data.id;
+					} else if (res.data.use_where.length == 0) {
+						uni.showToast({
+							icon: 'none',
+							title: '暂无数据'
+						})
+					}
+
+				})
+			},
+			selectBox1(id) {
+				if(this.selectId == id){
+					this.selectId = ''
+				}else{
+					this.selectLi(id);
+				}
+				
+		
+			},
+			selectBox2(id) {
+				this.selectId = ''
+			},
+			selectTab(type) {
+				let _this = this;
+				_this.selectStatus = false;
+				_this.curActive = type;
+				uni.showLoading()
+				_this.getRedpacket_list(false, type)
+			},
+			navgateto() {
+				App.navigationTo({
+					url: 'pages/subPages/redpacket/redsquare'
+				})
+			},
+			getRedpacket_list(init = false, status = '0', page = 1, isPage = false) {
+				let _this = this,
+					tablist = _this.tablist,
+					url = '&p=redpack&do=userRedPackList',
+					data = {
+						page,
+						status
+					};
+					if(status == 3){
+						url = '&p=Order&do=alreadyTransferList';
+						data = {
+							page,
+							mobile:_this.mobile || '',
+							type:2
+						}
+					}
+					
+				App._post_form(url,data, res => {
+					if (res.errno == 0) {
+						let redpacketData = res.data.redpacketData;
+						if (init) {
+							tablist[0]['num'] = redpacketData.not_used;
+							tablist[1]['num'] = redpacketData.used;
+							tablist[2]['num'] = redpacketData.expired;
+							_this.setData({
+								tablist
+							});
+							if(res.data.transfer == 1 && tablist.length == 3){
+							_this.tablist.push({
+								title: '已赠送',
+								type: '3'
+							});
+							_this.tablist[3]['num'] = redpacketData.alltr;
+							}
+						}
+						if(url == '&p=Order&do=alreadyTransferList'){
+							_this.tablist[3]['num'] = res.data.totalnum;
+						}
+						if(_this.languageStatus == 1){
+							_this.tablist[0].title = '미사용';
+							_this.tablist[1].title = '사용완료';
+							_this.tablist[2].title = '기한만료';
+						}
+						if (isPage) {
+							if (res.data.list.length > 0) {
+								_this["redPacketList"].push(...res.data.list);
+							} else {
+								_this.loadingMore = true;
+							}
+						} else {
+							_this.setData({
+								current_page: 1,
+								redPacketList: res.data.list,
+								curRedpacketTotal: redpacketData?redpacketData.total:res.data.pagetotal,
+								loadingMore: res.data.list.length === 0 || _this.current_page === (redpacketData?redpacketData.total:res.data.pagetotal),
+								expireSoon: redpacketData?redpacketData.expireSoon:''
+							})
+						}
+						
+					}
+					_this.selectStatus = true;
+					_this.loading = true;
+					uni.hideLoading()
+				})
+			}
+		},
+		onReachBottom() {
+			let _this = this,
+				curActive = _this.curActive;
+			if (_this.current_page >= _this.curRedpacketTotal) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getRedpacket_list(false, curActive, ++_this.current_page, true)
+		},
+		components: {
+			nonemores,
+			loadIng,
+			loadMore,
+			PopManager
+		},
+		async onShareAppMessage() {
+			let _this = this;
+			this.isShareBotton = true;
+			console.log(this.isShareBotton, '触发转发点击事件不重新渲染数据')
+			let getUserinfo = uni.getStorageSync('userinfo'),
+				ShareData =  uni.getStorageSync('shareDataInfo'),
+				agencyData = uni.getStorageSync('agencyData'),
+				aid = agencyData.aid;
+				if(_this.redItem.id){
+					_this.id = await _this.redShare(_this.redItem.id,2);
+				}else{
+					_this.id = null;
+				}
+			return {
+				title: _this.id?_this.id.title:ShareData.title, // 分享标题
+				desc: _this.id?_this.id.desc:ShareData.desc, // 分享描述
+				imageUrl:_this.id? _this.id.shareimg : ShareData.img, // 分享图标
+				path: _this.id?'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid + '&isred=' + _this.id.recordid:'pages/mainPages/index/index?head_id=' + getUserinfo.mid + '&aid=' + aid
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	
+	.coverImg {
+		/* #ifdef H5 */
+		width: 750upx;
+		/* #endif */
+		/* #ifdef MP-WEIXIN */
+		width: 540upx;
+		/* #endif */
+	}
+	.selectBox {
+		margin: 0rpx 35rpx 0 35rpx;
+		background: white;
+
+		.select-con {
+			padding: 20rpx;
+
+			view {
+				width: 500rpx;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				overflow: hidden;
+				word-break: break-all;
+				margin-left: 30rpx;
+				line-height: 50rpx;
+			}
+			.gohomeBtn{
+				width: 100upx;
+				height: 50upx;
+				line-height: 50upx;
+				text-align: center;
+				background-color: #FF4444;
+				color: #FFFFFF;
+				border-radius: 10upx;
+			}
+		}
+	}
+	
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.tablist-main {
+		width: 100%;
+		height: 84upx;
+		line-height: 84upx;
+
+		.tab-item {
+			.active-tab {
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 80upx;
+				height: 8upx;
+				background-color: #ff4444;
+				border-radius: 8upx 8upx 0 0;
+			}
+		}
+	}
+
+	.packet-main {
+		margin: 30upx;
+	}
+
+	.red-square-main {
+		padding: 24upx;
+
+		.redsquareImage {
+			display: block;
+			width: 40upx;
+			height: 40upx;
+			margin-right: 16upx;
+		}
+
+		.redsquare-right {
+			font-size: 24upx;
+		}
+	}
+
+	.unused-packet-main {
+		.unused-packet-list {
+			.unused-list-item {
+				width: 100%;
+				//height: 170upx;
+				background-size: 100% 210upx;
+				background-repeat: no-repeat;
+				padding: 20upx 0;
+				position: relative;
+				.unused-list-rad{
+					display: flex;
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					left: 0;
+					top: 0;
+					background-color: rgba(0,0,0,0.6);
+					z-index: 1;
+					border-radius: 20upx;
+					font-size: 28upx;
+					// padding-top: 40upx;
+					.closeBtn{
+						width: 150upx;
+						height: 70upx;
+						line-height: 70upx;
+						background-color: #FFFFFF;
+						font-size: 28upx;
+						border-radius: 10upx;
+						float: right;
+						text-align: center;
+						margin-right: 60upx;
+					}
+				}
+
+				.redPacket-type {
+					position: absolute;
+					right: 20upx;
+					top: 20upx;
+				}
+
+				.UnredPacket-detail {
+					height: 170rpx;
+					padding: 0 50upx;
+					position: relative;
+				}
+
+				.UnredPacket-priceStyle {
+					margin-right: 12upx;
+
+					>text {
+						display: inline-block;
+						vertical-align: top;
+					}
+				}
+				.makeBtn{
+					width: 120upx;
+					height: 60upx;
+					background-color: #ffffff;
+					color: #FF4444;
+					text-align: center;
+					line-height: 60upx;
+					border-radius: 10upx;
+					font-size: 28upx;
+					font-weight: 700;
+					position: absolute;
+					bottom: 10upx;
+					right: 30upx;
+				}
+			}
+		}
+	}
+
+	.usedpacket {
+		.usedpacket-list {
+			.usedpacket-list-item {
+				height: 170upx;
+
+				.usedpacket-itemleft {
+					width: 28%;
+					height: 100%;
+					background-color: #CCCCCC;
+					padding: 0 20upx;
+					flex-shrink: 0;
+
+					.usedpacket-priceStyle {
+						margin-right: 12upx;
+
+						>text {
+							display: inline-block;
+							vertical-align: top;
+							margin-top: 4upx;
+						}
+					}
+
+					.itemleft_bgstyle {
+						width: 30upx;
+						height: 30upx;
+						border-radius: 50%;
+						position: absolute;
+						left: -16upx;
+						top: 50%;
+						transform: translateY(-50%);
+						background-color: #F8F8F8;
+					}
+
+					.itemleft_bgstyle2 {
+						position: absolute;
+						right: 0;
+						top: 0;
+						width: 1%;
+						height: 170upx;
+						padding-left: 4upx;
+						color: #fff;
+						box-sizing: border-box;
+						background: radial-gradient(transparent 0, transparent 8upx, #CCCCCC 8upx);
+						background-size: 16upx 16upx;
+						background-position: 16upx 0px;
+						background-color: #fff;
+					}
+				}
+
+				.usedpacket-itemright {
+					height: 100%;
+
+					.usedpacket_titleType {
+						.usedpacketType {
+							padding: 0 6upx;
+							height: 28upx;
+							background-color: #ccc;
+							border-radius: 14upx;
+
+							>text {
+								display: inline-block;
+								transform: scale(.85);
+							}
+						}
+
+						.usedpacketTitle {
+							width: 240upx;
+						}
+					}
+
+					>image {
+						position: absolute;
+						display: block;
+						right: 24upx;
+						bottom: 0;
+						width: 114upx;
+						height: 114upx;
+					}
+				}
+			}
+			
+		}
+
+	}
+	.linkUser{
+		padding: 30upx;
+		background-color: #ff4444;
+		border-radius: 20upx;
+		font-size: 28upx;
+		// margin-bottom: 20upx;
+		position: relative;
+		top: -15upx;
+		margin-bottom: 10upx;
+		color: #ffffff;
+	}
+	.shareBox{
+			padding: 50upx 30upx;
+			width: 92vw;
+			background-color: #FFFFFF;
+			border-radius:  30upx 30upx 0 0;
+			image{
+				width: 100upx;
+				height: 100upx;
+			}
+			.sharetext{
+				font-size: 28upx;
+				color: #666666;
+			}
+			/deep/.sharebtn{
+				background-color: #FFFFFF;
+			}
+		}
+		.close{
+			text-align: center;
+			padding: 20upx;
+			border-top: 1upx solid #EEEEEE;
+			font-size: 36upx;
+			color: #666666;
+		}
+		.search{
+			// margin: 30upx;
+			margin-bottom: 30upx;
+			border-radius: 20upx;
+			background-color: #ffffff;
+			/deep/.searchInput{
+				height: 80upx;
+				line-height: 80upx;
+				font-size: 28upx;
+				width: 100%;
+			}
+		}
+</style>
diff --git a/pages/subPages/redpacket/redsquare.vue b/pages/subPages/redpacket/redsquare.vue
new file mode 100644
index 0000000..7d43f54
--- /dev/null
+++ b/pages/subPages/redpacket/redsquare.vue
@@ -0,0 +1,224 @@
+<template>
+	<!-- 红包广场 -->
+	<view class="container">
+		<load-ing v-if="!loading"></load-ing>
+		<view v-if="true">
+			<far-bottom></far-bottom>
+			<view class="packet-main" v-if="!!redPacketList && redPacketList.length>0">
+				<view class="usedpacket">
+					<view class="usedpacket-list">
+						<view class="f-30 b-f" style="padding: 20upx;margin-bottom: 20upx;border-radius: 15upx;" @click="gomyred">
+							<text class="iconfont icon-redpacket_fill" style="color: #FF4444;font-size: 36upx;padding-right: 20upx;"></text>
+							<text style="color: #333333;">我的红包</text>
+							<text style="color: #999999;float: right;font-size: 24upx;line-height: 44upx;" class="iconfont icon-jinrujiantouxiao1 f-w"></text>
+						</view>
+						<view class="usedpacket-list-item dis-flex m-btm20" v-for="(redPacketItem,index) in redPacketList" :key="index">
+							<view class="usedpacket-itemleft p-r dis-flex flex-dir-column flex-x-center">
+								<view class="usedpacket-priceStyle col-f f-50 t-c"><text class="f-30">¥</text>{{redPacketItem.cut_money}}</view>
+								<view class="f-24 col-f t-c">满{{redPacketItem.full_money}}可用</view>
+								<view class="itemleft_bgstyle"></view>
+								<view class="itemleft_bgstyle2"></view>
+							</view>
+							<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+								<view class="usedpacket_titleType dis-flex flex-y-center">
+									<!-- <view class="usedpacketType t-c m-right10 dis-flex flex-y-center"><text class="col-f f-24">{{redPacketItem.}}</text></view> -->
+									<view class="usedpacketTitle onelist-hidden f-28 col-3">{{redPacketItem.title}}</view>
+								</view>
+								<view class="col-9 f-24 m-top-btm10 usedpacket-time onelist-hidden">范围：{{redPacketItem.use_where}}</view>
+								<view class="col-9 f-24">{{redPacketItem.usetime_text}}</view>
+								<view class="getDraw t-c col-f f-24" @click="getDraw(redPacketItem.id)" v-if="!redPacketItem.is_over">立即领取</view>
+								<view class="getDraw t-c col-f f-24" style="background-color: #999999;" v-else>已领完</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="background-color: #F8F8F8;" class="m-top20">
+					<load-more :isMore="loadingMore"></load-more>
+				</view>
+			</view>
+			<block v-else>
+				<nonemores></nonemores>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import loadMore from "@/components/template/loadmore.vue"
+	import nonemores from "@/components/template/nonemores.vue"
+	import loadIng from '@/components/template/loadlogo'
+	export default {
+		data() {
+			return {
+				redPacketList: [],
+				current_page: 1,
+				loadingMore: false,
+				loading: false
+			}
+		},
+		onLoad(e) {
+			this.getRedPacket();
+		},
+		methods: {
+			gomyred(){
+				App.navigationTo({
+					url: 'pages/subPages/redpacket/myredpacket'
+				})
+			},
+			getDraw(redPacket_id) {
+				let _this = this;
+				uni.showLoading()
+				App._post_form('&p=redpack&do=getRedPack', {
+					id: redPacket_id,
+					red_pack_source: '1'
+				}, res => {
+					if (res.errno === 0) {
+						App.showSuccess('领取成功');
+						_this.getRedPacket();
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			getRedPacket(page = 1, isPage = false) {
+				let _this = this;
+				App._post_form('&p=redpack&do=redPackList', {
+					page
+				}, res => {
+					if (res.errno === 0) {
+						if (isPage) {
+							if (res.data.list.length > 0) {
+								_this["redPacketList"].push(...res.data.list);
+							} else {
+								_this.loadingMore = true;
+							}
+						} else {
+							console.log(res.data.list.length)
+							_this.setData({
+								current_page: 1,
+								redPacketList: res.data.list,
+								curRedpacketTotal: res.data.total,
+								loadingMore: res.data.list.length === 0 || _this.current_page === res.data.total
+							})
+						}
+					}
+					_this.loading = true;
+				})
+			}
+		},
+		onReachBottom() {
+			let _this = this;
+			if (_this.current_page >= _this.curRedpacketTotal) {
+				_this.loadingMore = true;
+				return false;
+			}
+			_this.getRedPacket(++_this.current_page, true)
+		},
+		components: {
+			loadMore,
+			nonemores,
+			loadIng
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.packet-main {
+		margin: 30upx;
+	}
+
+	.usedpacket {
+		.usedpacket-list {
+			.usedpacket-list-item {
+				height: 170upx;
+
+				.usedpacket-itemleft {
+					width: 30%;
+					height: 100%;
+					background: linear-gradient(129deg, rgba(251, 131, 81, 1) 0%, rgba(255, 68, 68, 1) 100%);
+					padding: 0 20upx;
+					flex-shrink: 0;
+
+					.usedpacket-priceStyle {
+						margin-right: 12upx;
+
+						>text {
+							display: inline-block;
+							vertical-align: top;
+							margin-top: 4upx;
+						}
+					}
+
+					.itemleft_bgstyle {
+						width: 30upx;
+						height: 30upx;
+						border-radius: 50%;
+						position: absolute;
+						left: -16upx;
+						top: 50%;
+						transform: translateY(-50%);
+						background-color: #F8F8F8;
+					}
+
+					.itemleft_bgstyle2 {
+						position: absolute;
+						right: 0;
+						top: 0;
+						width: 1%;
+						height: 170upx;
+						padding-left: 4upx;
+						color: #fff;
+						box-sizing: border-box;
+						background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+						background-size: 16upx 16upx;
+						background-position: 16upx 0px;
+						background-color: #fff;
+					}
+				}
+
+				.usedpacket-itemright {
+					height: 100%;
+
+					.usedpacket_titleType {
+						.usedpacketType {
+							padding: 0 6upx;
+							height: 28upx;
+							background-color: #ff4444;
+							border-radius: 14upx;
+
+							>text {
+								display: inline-block;
+								transform: scale(.85);
+							}
+						}
+
+						.usedpacketTitle {
+							width: 240upx;
+						}
+					}
+
+					.usedpacket-time {
+						width: 240upx;
+					}
+				}
+
+				.getDraw {
+					position: absolute;
+					right: 30upx;
+					top: 50%;
+					transform: translateY(-50%);
+					width: 126upx;
+					height: 40upx;
+					line-height: 40upx;
+					background-color: #ff4444;
+					border-radius: 20upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/register/register.vue b/pages/subPages/register/register.vue
new file mode 100644
index 0000000..a8b3dfe
--- /dev/null
+++ b/pages/subPages/register/register.vue
@@ -0,0 +1,517 @@
+<template>
+	<view class="register">
+		<!-- 输入手机号 -->
+		<far-bottom></far-bottom>
+		<view class="registerPageOne" v-if="page == 1">
+			<view class="registerPackage">
+				<view class="registerTitle">立即注册</view>
+				<view class="registerAgreement" >
+					<image :src="imgfixUrls + 'merchant/checked.svg'" style="width: 25upx;height: 25upx;margin-bottom: -2upx;" @click="storeChecked = false" v-if="storeChecked" />
+					<view  v-else  @click="storeChecked = true" style="height: 20upx;width: 20upx;border: 1px solid #FF4444;border-radius: 50%;display: inline-block;margin-bottom: -2upx">
+					</view>
+					<span style="padding-left: 10upx;">
+						登录注册表示同意
+						<span @click="toLoginAgreement">用户协议</span>
+					</span>
+				</view>
+				<!-- 用户输入区域 -->
+				<view class="loginInput">
+					<view>
+						<input placeholder="请输入手机号" type="number" v-model="userInfo.phone" />
+						<span></span>
+					</view>
+					<view v-if="userSet.img_switch == 1">
+						<input placeholder="请输入图形验证码" v-model="imgCode" />
+						<image :src="imgUrl" @click="GVC" />
+					</view>
+				</view>
+				<!-- 用户输入区域 -->
+				<!-- 提交按钮 -->
+				<view class="loginSubimt" @click="toPassword"><span>注册</span></view>
+				<!-- 提交按钮 -->
+			</view>
+		</view>
+		<!-- 输入手机号 -->
+		<!-- 输入密码 -->
+		<view v-else class="registerPageThree" v-if="page == 2">
+			<view class="registerPackage">
+				<view class="registerTitle">立即注册</view>
+				<view class="registerAgreement" @click="toLoginAgreement">
+					<span>
+						登录注册表示同意
+						<span>用户协议</span>
+					</span>
+				</view>
+				<view class="inputPassword">
+					<view>
+						<input placeholder="请输入密码" v-model="userInfo.password" type="password" v-if="passwordSee == false" />
+						<input placeholder="请输入密码" v-model="userInfo.password" v-if="passwordSee == true" />
+						<image :src="imgfixUrls + 'merchant/show.png'" class="show" @click="checkPasswordSee(true)" v-if="passwordSee == false" />
+						<image :src="imgfixUrls + 'merchant/cshow.png'" class="show" @click="checkPasswordSee(false)" v-if="passwordSee == true" />
+					</view>
+					<view>
+						<input placeholder="请再次输入密码" v-model="passwordAgin" type="password" v-if="passwordAginSee == false" />
+						<input placeholder="请再次输入密码" v-model="passwordAgin" v-if="passwordAginSee == true" />
+						<image :src="imgfixUrls + 'merchant/show.png'" class="show" v-if="passwordAginSee == false" @click="checkAginSee(true)" />
+						<image :src="imgfixUrls + 'merchant/cshow.png'" class="show" v-if="passwordAginSee == true" @click="checkAginSee(false)" />
+					</view>
+				</view>
+				<view class="smsCodeSubimt" @click="toSmsCode" v-if="userSet.sms_switch == 0"><span>下一步</span></view>
+				<view class="smsCodeSubimt" @click="register" v-else><span>提交</span></view>
+			</view>
+		</view>
+		<!-- 输入密码 -->
+		<!-- 输入验证码 -->
+		<view v-else class="registerPageTwo" v-if="page == 3">
+			<view class="registerPackage">
+				<view class="smsTitle"><span>我们将以短信形式将验证码发送至</span></view>
+				<view class="smsTitle1">
+					<span>{{ userInfo.phone }}</span>
+				</view>
+				<view class="smsCodeInput">
+					<view><input type="number" v-model="sms1" maxlength="1" id="text1" :focus="text1Focus" /></view>
+					<view><input type="number" v-model="sms2" maxlength="1" id="text2" :focus="text2Focus" /></view>
+					<view><input type="number" v-model="sms3" maxlength="1" id="text3" :focus="text3Focus" /></view>
+					<view><input type="number" v-model="sms4" maxlength="1" id="text4" :focus="text4Focus" /></view>
+				</view>
+				<view class="sendSmsCode" v-if="timeCount == 0" @click="toSmsCode"><span>重新发送验证码</span></view>
+				<view class="sendSmsCode" v-else>
+					<span>{{ timeEnd }}</span>
+				</view>
+				<view class="smsCodeSubimt" @click="register"><span>确认</span></view>
+			</view>
+		</view>
+		<!-- 输入验证码 -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import util from '@/common/js/util.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+export default {
+	data() {
+		return {
+			text1Focus: true,
+			text2Focus: false,
+			text3Focus: false,
+			text4Focus: false,
+			sms1: '',
+			sms2: '',
+			sms3: '',
+			sms4: '',
+			page: 1,
+			password: '',
+			passwordAgin: '',
+			passwordSee: false,
+			passwordAginSee: false,
+			imgUrl: '',
+			getImgCode: '',
+			imgCode: '',
+			getSmsCode: '',
+			smsCode: '',
+			timeCount: 0,
+			timeEnd: '重新获取短信验证码',
+			userSet: {
+				img_switch: '',
+				sms_switch: ''
+			},
+			userInfo: {
+				phone: '',
+				password: ''
+			},
+			codeTime:'',
+			storeChecked:true
+		};
+	},
+	onLoad() {
+		this.init();
+		this.storeChecked = false;
+	},
+	watch: {
+		// 切换输入框
+		sms1: {
+			handler() {
+				let _this = this;
+				if (_this.sms1.length == 1) {
+					_this.text2Focus = true;
+					_this.text1Focus = false;
+				}
+			}
+		},
+		sms2: {
+			handler() {
+				let _this = this;
+				if (_this.sms2.length == 1) {
+					_this.text3Focus = true;
+					_this.text2Focus = false;
+				}
+				if (_this.sms2.length == 0) {
+					_this.text1Focus = true;
+					_this.text2Focus = false;
+				}
+			}
+		},
+		sms3: {
+			handler() {
+				let _this = this;
+				if (_this.sms3.length == 1) {
+					_this.text4Focus = true;
+					_this.text3Focus = false;
+				}
+				if (_this.sms3.length == 0) {
+					_this.text2Focus = true;
+					_this.text3Focus = false;
+				}
+			}
+		},
+		sms4: {
+			handler() {
+				let _this = this;
+				if (_this.sms4.length == 0) {
+					console.info(_this.text3Focus);
+					_this.text3Focus = true;
+					_this.text4Focus = false;
+				}
+			}
+		}
+		// 切换输入框
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.GVC();
+			_this.getRegisterSet();
+		},
+		toLoginAgreement() {
+			App.navigationTo({
+				url: 'pages/mainPages/agreement/agreement?agremType=user'
+			});
+		},
+		// 获取用户注册设置信息
+		getRegisterSet() {
+			let _this = this;
+			let data = {};
+			App._post_form('&p=member&do=getRegisterSet', data, res => {
+				_this.userSet = res.data;
+			});
+		},
+		// 用户申请注册账号
+		register() {
+			let _this = this;
+			if (_this.userSet.sms_switch == 0) {
+				_this.smsCode = _this.sms1 + _this.sms2 + _this.sms3 + _this.sms4;
+				_this.getSmsCode = Number(_this.getSmsCode);
+				_this.smsCode = Number(_this.smsCode);
+				// if (_this.smsCode !== _this.getSmsCode) {
+				//
+				//
+				// }
+			}
+			let data = _this.userInfo;
+			data.code = _this.smsCode;
+			App._post_form('&p=member&do=register', data, res => {
+				if (res.errno !== 0) {
+					return;
+				} else {
+					App.navigationTo({
+						url: 'pages/mainPages/registerSuses/registerSuses'
+					});
+				}
+			});
+		},
+		// 获取图形验证码信息
+		GVC() {
+			let _this = this;
+			let data = {};
+			const Base64 = util.Base64;
+			App._post_form('&do=GVC', data, res => {
+				_this.imgUrl = res.data.image_data;
+				// _this.getImgCode = res.data.code;
+				_this.codeTime = res.data.time;
+				// console.info(_this.getImgCode);
+				console.info(res.data);
+			});
+		},
+		toPassword() {
+			let _this = this;
+			if (_this.userSet.img_switch == 1) {
+				if (_this.imgCode == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '图形验证码不能为空',
+						duration: 2000
+					});
+					_this.imgCode = '';
+					_this.GVC();
+					return;
+				}
+			}
+			if (_this.userInfo.phone == '' || _this.userInfo.phone.length !== 11) {
+				uni.showToast({
+					icon: 'none',
+					title: '请输入正确的手机号',
+					duration: 2000
+				});
+				_this.imgCode = '';
+				_this.GVC();
+				return;
+			}
+			if(!_this.storeChecked){
+				uni.showToast({
+					icon: 'none',
+					title: '请阅读用户协议并勾选',
+					duration: 2000
+				});
+				return
+			}
+			_this.page = 2;
+		},
+		toSmsCode() {
+			let _this = this;
+			if (_this.userInfo.password == '' || _this.userInfo.passwordAgin == '') {
+				uni.showToast({
+					icon: 'none',
+					title: '输入的密码不能为空',
+					duration: 2000
+				});
+				return;
+			}
+			if (_this.userInfo.password !== _this.passwordAgin) {
+				uni.showToast({
+					icon: 'none',
+					title: '两次输入的密码不一致',
+					duration: 2000
+				});
+				return;
+			}
+			let data = {
+				phone: _this.userInfo.phone,
+				type: 1,
+				code:_this.imgCode,
+				time:_this.codeTime
+			};
+			App._post_form(
+				'&do=PIN',
+				data,
+				res => {
+					_this.getSmsCode = res.data.code;
+					// 倒计时
+					let timer_num = 60;
+					let timeClock = setInterval(function() {
+						timer_num--;
+						_this.timeEnd = timer_num + 's后重新获取验证码';
+						_this.timeCount = timer_num;
+						if (timer_num == 0) {
+							clearInterval(timeClock);
+						}
+					}, 1000);
+				},
+				res => {
+					App.navigationTo({
+						url: 'pages/mainPages/login/login'
+					});
+				}
+			);
+			_this.page = 3;
+		},
+		checkPasswordSee(see) {
+			let _this = this;
+			_this.passwordSee = see;
+		},
+		checkAginSee(see) {
+			let _this = this;
+			_this.passwordAginSee = see;
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+page {
+	background: rgba(255, 255, 255, 1);
+}
+.register {
+	width: 750upx;
+	background: rgba(255, 255, 255, 1);
+	font-size: 0;
+}
+.registerPackage {
+	padding: 64upx;
+}
+.registerTitle {
+	margin-top: 26upx;
+	font-size: 48upx;
+
+	font-weight: bold;
+	color: rgba(51, 51, 51, 1);
+}
+.registerAgreement {
+	margin-top: 20upx;
+	> span {
+		font-size: 24upx;
+
+		color: #999999;
+		> span {
+			color: #2e6b9e;
+		}
+	}
+}
+.loginInput {
+	margin-top: 115upx;
+	> view {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 25upx;
+		height: 81upx;
+		width: 622upx;
+		border-bottom: 1px solid #eeeeee;
+		> input {
+			width: 400upx;
+			margin-top: 10upx;
+			vertical-align: top;
+			font-size: 28upx;
+
+			color: #333333;
+		}
+		> image {
+			vertical-align: top;
+			width: 128upx;
+			height: 57upx;
+		}
+		> view {
+			vertical-align: middle;
+			display: inline-block;
+			> image {
+				vertical-align: middle;
+				width: 48upx;
+				height: 48upx;
+				margin-right: 18upx;
+			}
+			> span {
+				line-height: 60upx;
+				vertical-align: middle;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+}
+input::placeholder {
+	font-size: 28upx;
+
+	color: rgba(153, 153, 153, 1);
+}
+.loginSubimt {
+	margin: 60upx auto 0 auto;
+	width: 622upx;
+	height: 88upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 44px;
+	text-align: center;
+	> span {
+		line-height: 88upx;
+		font-size: 30upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.smsTitle {
+	margin-top: 64upx;
+	text-align: center;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+.smsTitle1 {
+	margin-top: 19upx;
+	text-align: center;
+	> span {
+		font-size: 36upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.smsCodeInput {
+	margin: 104upx auto 0 auto;
+	display: flex;
+	justify-content: space-between;
+	width: 622upx;
+	> view {
+		text-align: center;
+		display: inline-block;
+		width: 120upx;
+		border-bottom: 1px solid #eeeeee;
+		> input {
+			font-size: 50upx;
+
+			color: #333333;
+		}
+	}
+}
+.smsCodeSubimt {
+	margin: 79upx auto 0 auto;
+	width: 622upx;
+	height: 88upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 44upx;
+	text-align: center;
+	> span {
+		line-height: 88upx;
+		font-size: 30upx;
+
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.sendSmsCode {
+	margin-top: 30upx;
+	width: 300upx;
+	> span {
+		font-size: 24upx;
+
+		color: rgba(255, 68, 68, 1);
+	}
+}
+.inputPassword {
+	margin-top: 115upx;
+	> view {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 25upx;
+		height: 81upx;
+		width: 622upx;
+		border-bottom: 1px solid #eeeeee;
+		> input {
+			width: 400upx;
+			margin-top: 10upx;
+			vertical-align: top;
+			font-size: 28upx;
+
+			color: #333333;
+		}
+		> image {
+			vertical-align: top;
+			width: 128upx;
+			height: 57upx;
+		}
+		> span {
+			line-height: 60upx;
+			vertical-align: middle;
+			font-size: 24upx;
+
+			color: rgba(46, 107, 158, 1);
+		}
+		> .show {
+			width: 48upx;
+			height: 48upx;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages/search/search.vue b/pages/subPages/search/search.vue
new file mode 100644
index 0000000..84f98d1
--- /dev/null
+++ b/pages/subPages/search/search.vue
@@ -0,0 +1,460 @@
+<template>
+	<view class="container">
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-search" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="search-h" :style="{backgroundColor: searchA.serbgw}">
+				<view class="search-h-t1">
+					<view class="search-h-t1-r f-30" style="color: #999999;" @click="cancelBtn">
+						<view class="search-h-t1-r-lk" style="padding-right: 20upx;height: 30px;line-height: 30px;margin-top: 4px;"><text class="iconfont icon-pullleft" style="font-size: 30upx;padding-right: 10upx;"></text>返回</view>
+					</view>
+					<view class="search-h-t1-l">
+						<view class="search-h-t1-l-lab" :style="{backgroundColor: searchA.serbgn}">
+							<view class="i icon iconfont icon-search"></view>
+							<input type="text" focus='ture' class="search-txt" v-model="keywords" @confirm="search()" placeholder="商品/头条/店铺">
+						</view>
+					</view>
+					<view class="search-h-t1-r f-34" @click="search()">
+						<view class="search-h-t1-r-lk weui-grid">确定</view>
+					</view>
+				</view>
+				<view class="search-h-t2" v-if="!ishotSearch">
+					<view class="i" :class="{active: listAct == 0}" @click="listActDo(0,'1')">商品</view>
+					<view class="i" :class="{active: listAct == 1}" @click="listActDo(1,'3')" v-if="is_headline===1">头条</view>
+					<view class="i" :class="{active: listAct == 2}" @click="listActDo(2,'2')">店铺</view>
+					<view class="i" :class="{active: listAct == 3}" @click="searchPost(3,'4')" v-if="is_pocket == 1">帖子</view>
+				</view>
+			</view>
+			<view class="search-t1" v-if="ishotSearch">
+				<view class="search-t1-t">热门搜索</view>
+				<view class="search-t1-b">
+					<view class="i f-24" v-for="(item,index) in hotSearchData" :key="index" @click="hotItemSearch(item)">{{item}}</view>
+				</view>
+			</view>
+			<block v-if="!!searchList &&searchList.length>0 || citywideList.length > 0">
+				<view class="search-content" style="padding: 20rpx 0;">
+					<view class="search-goods"  v-if="searchType ==='1'">
+						<block v-for="(listItem,index) in searchList" :key="index">
+							<goods-style :goodsStyleType="listItem.goods_type" :goodslistData="listItem.info" :issearch="'1'"></goods-style>
+							<!-- @remindSuccess="remindSuccess" -->
+						</block>
+					</view>
+					<view class="search-top padding-box" v-if="searchType ==='3'">
+						<toplist :topList="searchList" />
+					</view>
+					<view class="search-store padding-box" v-if="searchType ==='2'">
+						<storelist :search="true" :storeList="searchList" />
+					</view>
+					<view class="search-post padding-box" v-if="searchType ==='4'">
+						<view class="post-item" v-for="(item,index) in citywideList" :key="index">
+							<post-list  :itemInfo="item" :indexNumber="index" :indexShow='indexShow' @getover="getover" @operationShow="operationShow" ></post-list>
+						</view>
+						
+					</view>
+				</view>
+				<load-more :isMore="loadingMore"></load-more>
+			</block>
+			<block v-else>
+				<none-mores></none-mores>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	import Goodslist from '@/components/template/goodslist.vue'
+	import Toplist from '@/components/template/toplist.vue'
+	import Storelist from '@/components/template/storelist.vue'
+	import Loadlogo from '@/components/template/loadlogo'
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	import loadMore from '@/components/template/loadmore.vue'
+	import noneMores from '@/components/template/nonemores.vue'
+	import postList from '@/components/template/postList'
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				listAct: 0,
+				lng: null,
+				lat: null,
+				current_page: 1, //当前页数
+				keywords: '', //搜索内容
+				is_headline: null, //搜索内容详情
+				is_pocket:null,
+				searchList: [],
+				total: null,
+				searchType: '1', // 搜索内容类型
+				hotSearchData: null, //热门搜索
+				ishotSearch: true, //是否打开热门搜索
+				loadingMore: true,
+				searchA:{},
+				postPage:1,
+				citywideList:[],
+				postTotal:1,
+				indexShow: -1,
+			}
+		},
+		computed: {
+
+		},
+		components: {
+			Goodslist,
+			Toplist,
+			Storelist,
+			Loadlogo,
+			goodsStyle,
+			loadMore,
+			noneMores,
+			postList
+		},
+		mounted() {
+			this.hotSearch()
+			// #ifdef H5
+			wxApi.wxRegister(this.wxApiCallback);
+			// #endif
+
+			// #ifdef MP
+			App.getLocation().then(res => {
+				this.locationcb(res.latitude, res.longitude)
+			})
+			// #endif
+		},
+		onReachBottom() {
+			console.log('Bottom')
+			let _this = this,
+				{
+					current_page,
+					total,
+					searchType
+				} = _this;
+			if (current_page >= total) {
+				_this.loadingMore = true;
+				return false;
+			}
+			if(this.searchType != '4'){
+				_this.searchDataInfo(++_this.current_page, searchType, true);
+			}else{
+				if(this.postPage == this.postTotal){
+					_this.loadingMore = true;
+					return
+				}
+				this.postPage++;
+				this.searchPost(3,'4',true)
+			}
+			
+		},
+		methods: {
+			operationShow(e) {
+				let _this = this;
+				_this.indexShow = e;
+			},
+			getover(id,bor){
+				this.$emit('getaver',id,bor)
+			},
+			//热门搜索列表
+			hotSearch() {
+				let _this = this;
+				App._post_form('&do=GetPlatformInfor&type=2', {}, res => {
+					_this.setData({
+						hotSearchData: res.data.data,
+						searchA:res.data,
+						ishotSearch: !!res.data ? true : false
+					});
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+				// App._post_form('&do=GetPlatformInfor', {
+				// 	type: 2
+				// }, res => {
+					
+				// 	_this.setData({
+				// 		hotSearchData: res.data,
+				// 		ishotSearch: !!res.data ? true : false
+				// 	});
+				// 	console.log(_this.hotSearchData)
+				// }, false, () => {
+				// 	_this.loadlogo = true;
+				// })
+			},
+			// 热门搜索点击
+			hotItemSearch(searchItem) {
+				let _this = this;
+				_this.setData({
+					keywords: searchItem,
+					ishotSearch: false
+				})
+				_this.search()
+			},
+			//导入定位
+			wxApiCallback() {
+				let _this = this;
+				console.log(jWeixin);
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							_this.setData({
+								lng: res.longitude,
+								lat: res.latitude
+							})
+						}
+					});
+				});
+			},
+			locationcb(lat, lng) {
+				let _this = this;
+				_this.setData({
+					lng,
+					lat
+				})
+			},
+			cancelBtn() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			searchPost(index, type, isSearch = false){
+				this.listAct = index;
+				this.searchType = '4';
+				let _this = this,
+					requestData = {
+						page:this.postPage,
+						keyword: _this.keywords
+					};
+				App._post_form('&p=pocket&do=infoList', requestData, res => {
+					console.log(res);
+					if(isSearch){
+						_this.citywideList = _this.citywideList.concat(res.data.list);
+					}else{
+						_this.citywideList = res.data.list;
+						_this.postTotal = res.data.total;
+					}
+					_this.loadingMore = true;
+				}, false, () => {
+					uni.hideLoading()
+				});
+			},
+			//tabbar
+			listActDo(index, type, isSearch = false) {
+				uni.showLoading()
+				if (index > -1) {
+					this.listAct = index
+				};
+				this.initData()
+				this.searchDataInfo(1, type)
+				this.searchType = isSearch ? '1' : type;
+			},
+			// 数据初始化
+			initData() {
+				let _this = this;
+				//初始化数据
+				_this.current_page = 1;
+			},
+			//搜索
+			search() {
+				uni.showLoading({});
+				this.listActDo("", "1", true);
+			},
+			// 搜索详情数据
+			searchDataInfo(page = 1, type = '1', isPage = false) {
+				let _this = this,
+					requestData = {
+						page,
+						type,
+						search: _this.keywords,
+						lng: _this.lng,
+						lat: _this.lat
+					};
+				App._post_form('&do=Search', requestData, res => {
+					let searchData = res.data;
+					if (type === '1') {
+						searchData.list = searchData.list.map((val) => {
+							let listarr = [];
+							listarr.push(val.info)
+							val.info = listarr;
+							return val
+						})
+					};
+					if (isPage) {
+						if (searchData.list.length > 0) {
+							_this["searchList"].push(...searchData.list);
+						} else {
+							_this.loadingMore = true;
+						}
+					} else {
+						_this.setData({
+							searchList: searchData.list,
+							loadingMore: searchData.list.length === 0 || _this.current_page === res.data.total,
+							ishotSearch: false
+						})
+					}
+					_this.setData({
+						total: res.data.total,
+						is_headline: res.data.is_headline,
+						is_pocket:res.data.is_pocket
+					})
+				}, false, () => {
+					uni.hideLoading()
+				});
+			}
+		},
+
+		onPullDownRefresh() {
+
+		}
+		
+	}
+</script>
+
+<style scoped>
+	.container {
+		background-color: #fff;
+	}
+
+	.page-search {
+		background-color: #fff;
+	}
+
+	.search-h {
+		padding: 10upx 30upx 0 30upx;
+		background-color: #FFD93F;
+	}
+
+	.search-h-t1 {
+		height: 80upx;
+		line-height: 80upx;
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.search-h-t1-l {
+		-webkit-flex: 1;
+		flex: 1;
+		padding-right: 20upx;
+	}
+
+	.search-h-t1-l-lab {
+		height: 60upx;
+		line-height: 60upx;
+		border-radius: 60upx;
+		margin-top: 8upx;
+		padding-left: 80upx;
+		padding-right: 20upx;
+		background-color: #FFF4C4;
+		display: block;
+		position: relative;
+	}
+
+	.search-h-t1-l-lab .i {
+		width: 80upx;
+		height: 60upx;
+		line-height: 60upx;
+		font-size: 32upx;
+		text-align: center;
+		font-style: normal;
+		display: block;
+		position: absolute;
+		top: 0;
+		left: 0;
+	}
+
+	.search-txt {
+		height: 60upx;
+		font-size: 28upx;
+	}
+
+	.search-h-t1-r {
+		text-align: center;
+	}
+
+	.search-h-t1-r-lk {
+		height: 60upx;
+		line-height: 60upx;
+		margin-top: 8upx;
+		padding: 0 20upx;
+		border-radius: 100upx;
+	}
+
+	.search-h-t2 {
+		display: -webkit-flex;
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.search-h-t2 .i {
+		font-style: normal;
+		padding: 30upx 0;
+	}
+
+	.search-h-t2 .active {
+		border-bottom: 6upx solid #353535;
+	}
+
+	.search-t1 {
+		padding: 40upx 30upx;
+	}
+
+	.search-t1-t {
+		color: #808080;
+		font-size: 26upx;
+	}
+
+	.search-t1-b:after {
+		content: "";
+		display: block;
+		clear: both;
+	}
+
+	.search-t1-b .i {
+		height: 56upx;
+		line-height: 56upx;
+		font-size: 24upx;
+		font-style: normal;
+		margin: 20upx 20upx 0 0;
+		padding: 0 30upx;
+		background-color: #EDEDED;
+		border-radius: 60upx;
+		float: left;
+	}
+
+	.search-t2 {
+		padding: 40upx 30upx;
+	}
+
+	.search-nothing {
+		margin-top: 260upx;
+	}
+
+	.search-nothing .h1 {
+		width: 140upx;
+		height: 140upx;
+		margin: 0 auto;
+	}
+
+	.search-nothing .h1 .image {
+		width: 100%;
+		height: 100%;
+	}
+
+	.search-nothing .p {
+		color: #999;
+		font-size: 32upx;
+		text-align: center;
+		margin-top: 20upx;
+	}
+
+	.search-top {
+		padding: 30upx;
+	}
+	.search-post{
+		
+	}
+	.post-item{
+		box-shadow: 0px 8px 24px rgba(221, 221, 221, 0.5);
+	}
+</style>
diff --git a/pages/subPages/shareMaterials/index.vue b/pages/subPages/shareMaterials/index.vue
new file mode 100644
index 0000000..2ce0246
--- /dev/null
+++ b/pages/subPages/shareMaterials/index.vue
@@ -0,0 +1,416 @@
+<template>
+	<!-- 推广素材 -->
+	<scroll-view class="shareMaterials" :style="{ height: phoneHight }" scroll-y :scroll-x="false">
+		<far-bottom></far-bottom>
+		<view class="shareMaterials_package">
+			<view class="shareMaterials_title">
+				<view class="shareMaterials_title_package">
+					<view class="shareMaterials_level dis-flex">
+						<view class="shareMaterials_level_left">
+							<view class="line ver_mid"></view>
+							<text class="level_text ver_mid">推广文案</text>
+						</view>
+						<view class="level_button" @click="getExtension"><text>复制文案</text></view>
+					</view>
+					<scroll-view class="shareMaterials_title_main" :scroll-y="true" :scroll-x="false">
+						<text class="shareMaterials_title_main_tetx">{{ goodsExtensionInfo.extension_text }}</text>
+					</scroll-view>
+				</view>
+			</view>
+			<view class="shareMaterials_mian">
+				<view class="shareMaterials_mian_package">
+					<view class="shareMaterials_level dis-flex">
+						<view class="shareMaterials_level_left">
+							<view class="line ver_mid"></view>
+							<text class="level_text ver_mid">选择分享图</text>
+						</view>
+					</view>
+					<view class="shareMaterials_mian_body dis-flex-star">
+						<view class="imgMb" v-for="(imageUrl, indexs) in imgArrays">
+							<view class="imgMb_image" @click="addImage(client,imageUrl,indexs)">
+								<image :src="imageUrl" class="imgMb_image" mode="aspectFill"></image>
+								<view class="chackImg" :class="imgArray.indexOf(imageUrl) != -1 ? 'have' : 'none'" v-if="client === 3"><text
+									 class="iconfont icon-check"></text></view>
+							</view>
+						</view>
+					</view>
+					<view class="shareMaterials_mian_foot dis-flex" v-if="client === 3">
+						<view class="shareMaterials_mian_foot_left" @click="qx">
+							<view class="qx ver_mid" :class="imgArray.length == allImgLength ? 'have' : 'none'"><text class="iconfont icon-check"></text></view>
+							<text class="qx_text ver_mid">全选</text>
+						</view>
+						<view class="shareMaterials_mian_foot_button" @click="saveImg"><text>保存到相册</text></view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</scroll-view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default {
+		data() {
+			return {
+				phoneHight: null,
+				e: {},
+				goodsExtensionInfo: {},
+				posterList: {},
+				imgArray: [],
+				allImgLength: 0,
+				client: null,
+				imgArrays: []
+			};
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.e = e;
+			_this.client = Number(App.getClientType());
+			_this.init(e.id, e.type);
+			console.info('client', _this.client)
+		},
+		onShow() {
+
+		},
+		methods: {
+			init(id, type) {
+				let _this = this;
+				uni.getSystemInfo({
+					success(res) {
+						_this.phoneHight = res.windowHeight + 'px';
+					}
+				});
+				let type1 = 0;
+				if (type == '3') {
+					type1 = 1;
+				} else if (type == '4') {
+					type1 = 2;
+				} else if (type == '6') {
+					type1 = 3;
+				} else if (type == '7') {
+					type1 = 7;
+				}
+				_this.getGoodsExtensionInfo(id, type1);
+				_this.getPoster(id, type);
+			},
+			previewImage(index) {
+				let _this = this;
+
+			},
+			qx() {
+				let _this = this;
+				if (_this.imgArray.length == _this.allImgLength) {
+					_this.setData({
+						imgArray: []
+					})
+				} else if (_this.imgArray.length != _this.allImgLength) {
+					_this.setData({
+						imgArray: []
+					})
+					let copyArray = []
+					copyArray.push(_this.posterList.url);
+					for (let i = 0; i < _this.goodsExtensionInfo.extension_img.length; i++) {
+						copyArray.push(_this.goodsExtensionInfo.extension_img[i]);
+					}
+					_this.setData({
+						imgArray: copyArray
+					})
+				}
+			},
+			addImage(client, url, index) {
+				let _this = this;
+				if (client === 3) {
+					if (_this.imgArray.indexOf(url) == -1) {
+						_this.imgArray.push(url);
+					} else {
+						for (let i = 0; i < _this.imgArray.length; i++) {
+							if (_this.imgArray[i] == url) {
+								_this.imgArray.splice(i, 1);
+							}
+						}
+					}
+				} else {
+					uni.previewImage({
+						current: _this.imgArrays[index],
+						urls: _this.imgArrays
+					});
+				}
+			},
+			getExtension() {
+				let _this = this;
+				//#ifdef H5
+					App.clipboard(_this.goodsExtensionInfo.extension_text);
+				//#endif
+				uni.setClipboardData({
+					data: _this.goodsExtensionInfo.extension_text,
+					success: function() {
+						uni.showToast({
+							icon: 'none',
+							title: '复制成功',
+							duration: 2000
+						});
+					}
+				});
+			},
+			saveImg() {
+				let _this = this;
+				uni.showLoading({
+					title: '保存中'
+				})
+				_this.queue(_this.imgArray).then(res => {
+						uni.hideLoading()
+						App.showSuccess('保存成功');
+					})
+					.catch(err => {
+						wx.hideLoading()
+						console.log(err)
+					})
+			},
+			// 队列
+			queue(urls) {
+				let promise = Promise.resolve()
+				urls.forEach((url, index) => {
+					promise = promise.then(() => {
+						return this.downloadUrl(url)
+					})
+				})
+				return promise
+			},
+			downloadUrl(url) {
+				if(url.search("https") == -1){
+					url = url.replace('http','https')
+				}
+				return new Promise((resolve, reject) => {
+					uni.downloadFile({
+						url: url,
+						success: function(res) {
+							var temp = res.tempFilePath
+							uni.saveImageToPhotosAlbum({
+								filePath: temp,
+								success: function(res) {
+									resolve(res)
+								},
+								fail: function(err) {
+									reject(res)
+								}
+							})
+						},
+						fail: function(err) {
+							reject(err)
+						}
+					})
+				})
+			},
+			// 获取海报信息
+			getPoster(id, type) {
+				let _this = this;
+				let data = {
+					id,
+					type,
+					bg_img: ''
+				};
+				App._post_form('&do=Poster', data, res => {
+					_this.posterList = res.data;
+					_this.imgArrays.push(res.data.url);
+				});
+			},
+			// 获取商品推广图文设置信息
+			getGoodsExtensionInfo(id, type) {
+				let _this = this;
+				let data = {
+					id: id,
+					type: type
+				};
+				App._post_form('&p=goods&do=getGoodsExtensionInfo', data, res => {
+					_this.goodsExtensionInfo = res.data;
+					for (let i = 0; i < res.data.extension_img.length; i++) {
+						_this.imgArrays.push(res.data.extension_img[i]);
+					}
+					_this.allImgLength = 1 + res.data.extension_img.length;
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="less">
+	.none {
+		background: #ffffff;
+
+		>text {
+			color: #333333;
+		}
+	}
+
+	.have {
+		background: #ff4444;
+
+		>text {
+			color: #ffffff;
+		}
+	}
+
+	.chackImg {
+		position: absolute;
+		top: 10upx;
+		right: 10upx;
+		width: 30upx;
+		height: 30upx;
+		text-align: center;
+		border-radius: 50%;
+
+		>text {
+			line-height: 30upx;
+			font-size: 24upx;
+		}
+	}
+
+	.qx_text {
+		margin-left: 12upx;
+		line-height: 50upx;
+		font-size: 24upx;
+		color: rgba(51, 51, 51, 1);
+	}
+
+	.ver_mid {
+		vertical-align: middle;
+	}
+
+	.qx {
+		display: inline-block;
+		width: 30upx;
+		height: 30upx;
+		border-radius: 50%;
+		text-align: center;
+
+		>text {
+			font-size: 24upx;
+			line-height: 30upx;
+		}
+	}
+
+	.shareMaterials_mian_foot_button {
+		width: 170upx;
+		height: 50upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 25upx;
+		text-align: center;
+
+		>text {
+			font-size: 24upx;
+			color: rgba(255, 255, 255, 1);
+			line-height: 50upx;
+		}
+	}
+
+	.shareMaterials_mian_foot {
+		margin-top: 30upx;
+	}
+
+	.shareMaterials_mian_body {
+		flex-wrap: wrap;
+		margin-top: 24upx;
+	}
+
+	.imgMb_image {
+		position: relative;
+		width: 198upx;
+		height: 198upx;
+		display: inline-block;
+		margin: auto;
+		background: gray;
+	}
+
+	.imgMb {
+		margin-top: 17upx;
+		display: inline-block;
+		width: 33%;
+	}
+
+	.shareMaterials_mian_package {
+		padding: 40upx 30upx 30upx 30upx;
+	}
+
+	.shareMaterials_mian {
+		margin-top: 20upx;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+
+	.shareMaterials_title_main {
+		margin-top: 28upx;
+		width: 628upx;
+		height: 263upx;
+	}
+
+	.shareMaterials_title_main_tetx {
+		font-size: 24upx;
+		color: rgba(102, 102, 102, 1);
+	}
+
+	.level_button {
+		width: 140upx;
+		height: 50upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 25upx;
+		text-align: center;
+
+		>text {
+			font-size: 24upx;
+			color: rgba(255, 255, 255, 1);
+			line-height: 50upx;
+		}
+	}
+
+	.dis-flex {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.dis-flex-star {
+		display: flex;
+		justify-content: flex-start;
+	}
+
+	.ver_mid {
+		vertical-align: middle;
+	}
+
+	.level_text {
+		margin-left: 15upx;
+		font-size: 28upx;
+		color: rgba(17, 17, 17, 1);
+	}
+
+	.line {
+		display: inline-block;
+		width: 6upx;
+		height: 26upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 3upx;
+	}
+
+	.shareMaterials_title_package {
+		padding: 30upx 30upx 45upx 30upx;
+	}
+
+	.shareMaterials {
+		font-size: 0;
+		background: #f8f8f8;
+	}
+
+	.shareMaterials_package {
+		padding: 20upx 30upx 116upx 30upx;
+	}
+
+	.shareMaterials_title {
+		width: 690upx;
+		height: 416upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+</style>
diff --git a/pages/subPages/signdesk/index/index.vue b/pages/subPages/signdesk/index/index.vue
new file mode 100644
index 0000000..327f0e2
--- /dev/null
+++ b/pages/subPages/signdesk/index/index.vue
@@ -0,0 +1,500 @@
+<template>
+	<!-- 签到首页 -->
+	<view class="signdesk">
+		<far-bottom></far-bottom>
+		<view class="container">
+			<view class="header padding-box-all p-r" :style="{'background-image':'url('+imageRoot+'record_bg.jpg)'}">
+				<view class="dis-flex flex-y-center m-top20">
+					<view class="header-left p-r m-right20">
+						<view class="header-left-image" :style="{'background-image':'url('+member.avatar+')'}"></view>
+					</view>
+					<view class="header-right">
+						<view class="user-nickname f-32 col-f m-top20">{{member.nickname}}</view>
+						<view class="user-sign-number dis-flex flex-y-center m-top-btm10">
+							<view class="f-24 user-sign-number-label m-right10">您已签到共: <text class="col-f">{{member.totaltimes}}天</text></view>
+							<view class="f-24 user-sign-number-label">连续签到: <text class="col-f">{{member.times}}天</text></view>
+						</view>
+						<view class="signbtn dis-flex flex-y-center flex-x-center">
+							<view class="iconfont icon icon-rili col-f m-right20"></view>
+							<view class="f-28 col-f signbtn-title" :style="{'pointer-events':signOk==0?'auto':'none'}" @click="signBtn()">{{is_sign?'已签到':'签到'}}</view>
+						</view>
+					</view>
+					<view class="header-image-label f-24 col-f">{{textList.credittext}}:{{member.integral}}</view>
+				</view>
+				<view class="rule dis-flex flex-y-center flex-x-center" @click="isShowRule">
+					<view class="iconfont icon-questionfill m-right10 col-f"></view>
+					<view class="f-24 col-f">活动规则</view>
+				</view>
+			</view>
+			<view class="content-main p-r">
+				<view class="content-menu padding-box-all bor-radius-10upx p-r dis-flex b-f m-btm20">
+					<view class="menu-item t-c">
+						<view class="f-28 col-3 m-btm10">{{member.totaltimes}}天</view>
+						<view class="f-24 col-3">累计签到</view>
+					</view>
+					<view class="menu-item t-c">
+						<view class="f-28 col-3 m-btm10">{{today}}人</view>
+						<view class="f-24 col-3">今日签到</view>
+					</view>
+					<view class="menu-item t-c">
+						<view class="f-28 col-3 m-btm10">{{yesterday}}人</view>
+						<view class="f-24 col-3">昨日签到</view>
+					</view>
+				</view>
+				<view class="swiper-banner m-btm20">
+					<swiper :autoplay="true" :interval="3000" :duration="1000" class="swiperView">
+						<block v-for="(bannerItem,index) in adv_list" :key="index">
+							<swiper-item>
+								<view class="swiper-item" @click="navgateto(bannerItem.link)" :style="{'background-image':'url('+bannerItem.thumb+')'}"></view>
+							</swiper-item>
+						</block>
+					</swiper>
+				</view>
+				<view class="calendar-main b-f bor-radius-10upx">
+					<view class="present-month-title padding-box-all border-line border-bottom t-c f-32 col-3">{{yeahMonth}}</view>
+					<view class="week-list padding-box-all dis-flex flex-x-between f-30">
+						<view class="week-item" v-for="(weekItem,index) in week" :key="index">{{weekItem}}</view>
+					</view>
+					<view class="day-list dis-flex flex-warp p-b-20">
+						<view :style="'width:'+(100 / 7)+'%'" class="day-item f-28 t-c m-btm20 p-r" v-for="(dayItem,index) in sign_info"
+						 :key="index">
+							<view class="wardsign-style" :style="'background: url(' + 'https://citydev.weliam.com.cn/addons/'+ routers +'/h5/resource/image/gift-fill.png);'" v-if="!!dayItem.times || !!dayItem.reward" @click="festHint(index)"></view>
+							<text v-else :class="{'overSign-style':dayItem.is_sign===0,'sign-style':dayItem.is_sign===1}">{{dayItem.date}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<popup-view :show="showRule" type="center" @clickmask="showRule = false">
+				<view class="rule-box b-f">
+					<view class="rule-top p-r">
+						<view class="rule-title f-30 t-c">活动规则</view>
+					</view>
+					<view class="rule-bottom padding-box-all">
+						<scroll-view scroll-y class="scrollView">
+							<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+							show-with-animation use-anchor  :html="detail" ></jyf-parser>
+						</scroll-view>
+					</view>
+				</view>
+			</popup-view>
+			<popup-view :show="showis" type="center" @clickmask="showis = false">
+				<view  style="width: 100vw;height: 60vh;position: relative;">
+					<image style="width: 100vw;height: 60vh;" :src="'https://citydev.weliam.com.cn/addons/'+ routers +'/h5/resource/image/sign_success.png'" mode=""></image>
+					<view  style="position: absolute;left: 50%;bottom: 5%;transform: translateX(-50%);">
+						<view class="f-30 col-f t-c">
+							恭喜您获得+{{shownum}}{{textList.credittext}}
+						</view>
+						<view class="f-30 col-f t-c" style="margin: 30upx 0 50upx;">
+							您今天是第{{showpepo}}个签到的用户
+						</view>
+						<view >
+							<view class="f-28 col-f t-c" @click="colseshowis" style="width: 200upx;height: 60upx;line-height: 60upx;border: 1upx solid #FFFFFF;border-radius: 60upx;margin: auto;">
+								知道了
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</popup-view>
+			<view class="page-footer">
+				<TabBars :tabBarAct="0" :pageType="'11'" />
+			</view>
+		</view>
+		<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+		 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import PopupView from "@/components/template/PopManager.vue"
+	import TabBars from '@/components/template/tabBar.vue'
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+	import follow from '@/components/template/follow.vue';
+	export default {
+		data() {
+			return {
+				signOk: 0,
+				followTitleShow: true,
+				followShow: false,
+				followType: '0',
+				adv_list: [], //幻灯片
+				week: ['日', '一', '二', '三', '四', '五', '六'],
+				member: {}, //个人信息
+				detail: null, //富文本内容
+				today: 0, //今日签到总人数
+				yesterday: 0, // 昨日签到总人数
+				is_sign: null, // 是否签到
+				showRule: false,
+				showpepo:0,
+				showis:false,
+				shownum:0,
+				sign_info: [], // 签到列表
+				textList: null,
+				routers:''
+			}
+		},
+		onShow() {
+			this.getSignInfo();
+		},
+		onLoad() {
+			let _this = this
+			let routers = App.base;
+			routers = routers.split('addons/')[1];
+			_this.routers = routers.split('/h5')[0];
+			debugger
+			_this.textList = uni.getStorageSync('TextSubstitution')
+		},
+		// mounted() {
+		// 	this.getSignInfo()
+		// },
+		methods: {
+			colseshowis(){
+				this.showis = false;
+			},
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			getSignInfo() {
+				let _this = this;
+				App._post_form('&p=wlsign&do=getSignInfo', {}, res => {
+					if (res.data.is_auto === '1' && res.data.is_sign === 0) {
+						_this.signIn()
+					};
+					_this.setData(res.data)
+				}, err => {
+					let url = err.data.data.url;
+					if (!!url) {
+						App.navigationTo({
+							url,
+							navType: 'rediRect'
+						})
+					}
+				})
+			},
+			isShowRule() {
+				let _this = this;
+				_this.showRule = true;
+			},
+			signBtn() {
+				let _this = this;
+				if (_this.is_sign) return
+				_this.signIn()
+			},
+			signIn() {
+				let _this = this;
+				_this.signOk = 1
+				
+				
+				App._post_form('&p=wlsign&do=signIn', {}, res => {
+					if (res.errno === 0) {
+						_this.showis = true;
+						App.showSuccess('签到成功', () => {
+							_this.signOk = 0
+							_this.shownum = res.data.integral;
+							_this.showpepo = res.data.orders;
+							setTimeout(()=>{
+								_this.showis = false;
+							},3000)
+							_this.getSignInfo()
+						})
+					}
+				})
+			},
+			festHint(index) {
+				let _this = this,
+					sign_info = _this.sign_info;
+				console.log(sign_info[index], '====================')
+				if (!!sign_info[index].reward && !(!!sign_info[index].times)) {
+					uni.showToast({
+						title: sign_info[index].reward,
+						duration: 2000,
+						icon: 'none'
+					});
+				};
+				if (!!sign_info[index].times && !(!!sign_info[index].reward)) {
+					uni.showToast({
+						title: sign_info[index].times,
+						duration: 2000,
+						icon: 'none'
+					});
+				};
+				if (!!sign_info[index].reward && !!sign_info[index].times) {
+					uni.showToast({
+						title: sign_info[index].times + ',' + sign_info[index].reward,
+						duration: 2000,
+						icon: 'none'
+					});
+				}
+			},
+			navgateto(url) {
+				App.navigationTo({
+					url
+				})
+			}
+		},
+
+		computed: {
+			yeahMonth() {
+				let date = new Date(),
+					yeah = date.getFullYear(),
+					month = date.getMonth() + 1;
+				return yeah + '年' + month + '月'
+			},
+			// monthDayList() {
+			// 	let date = new Date(),
+			// 		year = date.getFullYear(),
+			// 		month = date.getMonth() + 1,
+			// 		d = new Date(year, month, 0),
+			// 		monthDay = d.getDate(),
+			// 		day = date.getDate(),
+			// 		datetimelist = [];
+			// 	for (let i = 1; i <= monthDay; i++) {
+			// 		let presentDay = {
+			// 			day: i,
+			// 			is_sign: false,
+			// 			signday: i < 10 ? ('0' + i) : JSON.stringify(i),
+			// 			yeahmonthDay: year + '-' + (month < 10 ? ('0' + month) : month) + '-' + (i < 10 ? ('0' + i) : JSON.stringify(i)),
+			// 			ward_sign: false
+			// 		};
+			// 		datetimelist.push(presentDay)
+			// 	}
+			// 	let overDay = datetimelist.filter((item) => item.day < day);
+			// 	overDay.map((val) => {
+			// 		val.isOverday = !val.is_sign;
+			// 	});
+			// 	let newMonthDayList = overDay.concat(datetimelist),
+			// 		hash = {};
+			// 	newMonthDayList = newMonthDayList.reduce((item, next) => {
+			// 		if (!hash[next.day]) {
+			// 			hash[next.day] = true
+			// 			item.push(next)
+			// 		}
+			// 		return item
+			// 	}, [])
+			// 	return newMonthDayList;
+			// }
+		},
+		components: {
+			PopupView,
+			TabBars,
+			follow,
+			jyfParser
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.signdesk {
+		background-color: #EEEEEE;
+	}
+
+	page {
+		background-color: #EEEEEE;
+	}
+
+	.header {
+		height: 320upx;
+		background-repeat: no-repeat;
+		background-size: 100% 320upx;
+
+		.header-left {
+			background-color: rgba(255, 255, 255, 0.36);
+			width: 140upx;
+			height: 140upx;
+			border-radius: 50%;
+
+			.header-left-image {
+				width: 130upx;
+				height: 130upx;
+				background-repeat: no-repeat;
+				background-size: 130upx 130upx;
+				border-radius: 50%;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				transform: translate(-50%, -50%);
+			}
+		}
+
+		.header-image-label {
+			text-align: center;
+			background-color: #FFB508;
+			padding: 4upx 10upx;
+			position: absolute;
+			left: 13.5%;
+			top: 53%;
+			transform: translateX(-50%);
+			border-radius: 6upx;
+		}
+
+		.header-right {
+			.user-sign-number {
+
+				// margin: 20upx 0 10upx;
+				.user-sign-number-label {
+					color: rgba(255, 255, 255, .8);
+				}
+			}
+
+			.signbtn {
+				background-color: rgba(255, 255, 255, .3);
+				padding: 0 0 6upx 0;
+				width: 280upx;
+				border-radius: 50upx;
+
+				.signbtn-title {
+					margin-top: 4upx;
+				}
+			}
+		}
+
+		.rule {
+			background-color: rgba(254, 137, 32, .7);
+			padding: 10upx 12upx;
+			border-radius: 30upx 0 0 30upx;
+			position: absolute;
+			top: 10%;
+			right: 0;
+
+			&>.iconfont {
+				font-size: 30upx;
+			}
+		}
+
+
+	}
+
+	.content-main {
+		margin: -60upx 30upx 0;
+
+		.content-menu {
+			width: 100%;
+
+			.menu-item {
+				width: 33.33%;
+			}
+		}
+
+		.content-menu::before {
+			content: "";
+			width: 2upx;
+			height: 50%;
+			background-color: #f3f3f3;
+			position: absolute;
+			top: 25%;
+			left: 35%;
+		}
+
+		.content-menu::after {
+			content: "";
+			width: 2upx;
+			height: 50%;
+			background-color: #f3f3f3;
+			position: absolute;
+			top: 25%;
+			right: 35%;
+		}
+	}
+
+	.swiper-banner {
+		.swiperView {
+			height: 200upx;
+
+			.swiper-item {
+				height: 200upx;
+				background-repeat: no-repeat;
+				background-size: 100% 200upx;
+				border-radius: 10upx;
+			}
+		}
+	}
+
+	.day-list {
+		.day-item {
+			height: 50upx;
+			line-height: 50upx;
+
+			.sign-style {
+				display: inline-block;
+				background-color: rgb(247, 127, 89) !important;
+				color: #FFFFFF;
+				width: 50upx;
+				height: 50upx;
+				line-height: 50upx;
+				border-radius: 50%;
+				z-index: 2;
+			}
+
+			.overSign-style {
+				display: inline-block;
+				background-color: #CCCCCC;
+				color: #FFFFFF;
+				width: 50upx;
+				height: 50upx;
+				line-height: 50upx;
+				border-radius: 50%;
+				z-index: 2;
+			}
+		}
+
+		.wardsign-style {
+			position: absolute;
+			left: 50%;
+			transform: translateX(-50%);
+			right: 0;
+			top: 0;
+			// background-image: url('');
+			width: 50upx;
+			height: 50upx;
+			background-size: 50upx 50upx !important;
+			background-repeat: no-repeat;
+			z-index: 10;
+		}
+	}
+
+	.rule-box {
+		width: 80vw;
+		padding: 40upx 30upx;
+		z-index: 101;
+		border-radius: 10upx;
+
+		.rule-top {
+			height: 30upx;
+
+			.rule-title {
+				width: 200upx;
+				position: absolute;
+				left: 50%;
+				bottom: -35%;
+				transform: translateX(-50%);
+				background-color: #FFFFFF;
+			}
+		}
+
+		.rule-bottom {
+			border: 1px solid #eee;
+
+			.rule-bottom-label {
+				color: rgb(192, 0, 0);
+			}
+
+			.scrollView {
+				height: 20vh;
+			}
+		}
+	}
+
+	.page-footer {
+		padding-top: 120upx;
+	}
+</style>
diff --git a/pages/subPages/signdesk/rank/rank.vue b/pages/subPages/signdesk/rank/rank.vue
new file mode 100644
index 0000000..fca81e6
--- /dev/null
+++ b/pages/subPages/signdesk/rank/rank.vue
@@ -0,0 +1,322 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header-tabbar dis-flex">
+				<view class="tabbar-item col-f t-c f-28 p-r" v-for="(tabItem,index) in tabbar" :key="index" @click="selectTabbar(tabItem['type'])">{{tabItem.title}}
+					<view class="select-tabbarIcon iconfont icon-triangleupfill" v-if="tabType===tabItem.type"></view>
+				</view>
+			</view>
+			<block v-if="!selectTabbarLoading">
+				<view class="header-userInfo padding-box-all dis-flex flex-x-between flex-y-center">
+					<view class="header-userInfo-left dis-flex">
+						<view class="header-avatar m-right20" :style="{'background-image':'url('+user.avatar+')'}"></view>
+						<view class="header-nickname-rank">
+							<view class="dis-flex">
+								<view class="header-nickname f-28 m-right10">{{user.nickname}}</view>
+								<view class='at-rank col-f f-24'>{{user.orders==="-1"?'未入榜':'排名:'+user.orders}}</view>
+							</view>
+							<view class="f-24 col-9">{{user.orders==="-1"?'未入榜':'第'+user.orders+'名'}}</view>
+						</view>
+					</view>
+					<view class="header-userInfo-right f-24 col-f">{{tabType==='1'?'连续签到:'+user.times+'天':tabType==='2'?'总签到次数:'+user.totaltimes+'次':TextSubstitution.credittext+':'+user.integral}}</view>
+				</view>
+				<view class="rank-content padding-box-all p-r">
+					<view class="content-title t-c">
+						<view class="content-title-letter f-48 col-f m-btm10">{{tabType==='1'?'连续签到':tabType==='2'?'总签到次数':TextSubstitution.credittext}}排行榜</view>
+						<view class="content-title-label f-24">注:该排行榜为实时更新</view>
+					</view>
+					<view class="rank-bg" :style="{'background-image':'url('+imageRoot+'signrank_bg.png)'}"></view>
+					<view class="rank-first rank-first_1 onelist-hidden" v-if="!!list && list.length>0">
+						<view class="userInfo-avatar-nickName_1">
+							<view class="first-avtar-bg p-r">
+								<view class="first-avtar rank-avatar" :style="{'background-image':'url('+list['0'].avatar+')'}"></view>
+							</view>
+							<view class="userInfo-nickName f-24 onelist-hidden t-c">{{list['0'].nickname}}</view>
+						</view>
+					</view>
+					<view class="rank-first rank-first_2 onelist-hidden" v-if="!!list['1']">
+						<view class="userInfo-avatar-nickName_2">
+							<view class="first-avtar-bg p-r">
+								<view class="first-avtar rank-avatar" :style="{'background-image':'url('+list['1'].avatar+')'}"></view>
+							</view>
+							<view class="userInfo-nickName f-24 onelist-hidden t-c">{{list['1'].nickname}}</view>
+						</view>
+					</view>
+					<view class="rank-first rank-first_3 onelist-hidden" v-if="!!list['2']">
+						<view class="userInfo-avatar-nickName_3">
+							<view class="first-avtar-bg p-r">
+								<view class="first-avtar rank-avatar" :style="{'background-image':'url('+list['2'].avatar+')'}"></view>
+							</view>
+							<view class="userInfo-nickName f-24 onelist-hidden t-c">{{list['2'].nickname}}</view>
+						</view>
+					</view>
+					<view class="first-avatar-crown first-avatar-crown_1 iconfont icon-crownfill" v-if="!!list['0']"></view>
+					<view class="first-avatar-crown first-avatar-crown_2 iconfont icon-crownfill" v-if="!!list['1']"></view>
+					<view class="first-avatar-crown first-avatar-crown_3 iconfont icon-crownfill" v-if="!!list['2']"></view>
+				</view>
+				<view class="rank-list">
+					<view class="rank-list-item padding-box-all border-line border-bottom dis-flex flex-x-between flex-y-center" v-if="index>2"
+					 v-for="(listItem,index) in list" :key="index">
+						<view class="rank-list-item-left dis-flex flex-y-center">
+							<view class="rank-index f-24 col-3">{{index+1}}</view>
+							<view class="rank-list-avatar m-left-right-20" :style="{'background-image':'url('+listItem.avatar+')'}"></view>
+							<view class="rank-list-nickname f-28 col-3">{{listItem.nickname}}</view>
+						</view>
+						<view class="header-userInfo-right f-24 col-f rank-list-item-right">{{tabType==='1'?'连续签到:'+listItem.times+'天':tabType==='2'?'总签到次数:'+listItem.totaltimes+'次':TextSubstitution.credittext+':'+listItem.integral}}</view>
+					</view>
+				</view>
+			</block>
+			<block v-else>
+				<part-loading ref="partLoading" :backgroundType="'goods'"></part-loading>
+			</block>
+		</view>
+		<view class="page-footer">
+			<TabBars :tabBarAct="0" :pageType="'11'" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import Loadlogo from '@/components/template/loadlogo'
+	import PartLoading from "@/components/template/PartLoading.vue"
+	import App from "@/common/js/app.js"
+	import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				selectTabbarLoading:false,
+				tabType: '1',
+				list: [],
+				user: {},
+				set:{},
+				tabbar: [{
+						title: '最执着',
+						type: '1'
+					},
+					{
+						title: '签到狂',
+						type: '2'
+					},
+					{
+						title: '最富有',
+						type: '3'
+					}
+				],
+				TextSubstitution:{}
+			}
+		},
+		components: {
+			Loadlogo,
+			PartLoading,
+			TabBars
+		},
+		mounted() {
+			this.getrankingList();
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		},
+		methods: {
+			getrankingList(type = '1') {
+				let _this = this;
+				App._post_form('&p=wlsign&do=rankingList', {
+					type
+				}, res => {
+					if (res.errno === 0) {
+						_this.setData(res.data)
+					}
+				}, false, () => {
+					_this.loadlogo = true;
+					_this.selectTabbarLoading = false;
+				})
+			},
+			selectTabbar(currentType) {
+				let _this = this;
+				_this.tabType = currentType;
+				_this.selectTabbarLoading = true;
+				_this.getrankingList(currentType);
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.header-tabbar {
+		background-color: #000000;
+		width: 100%;
+		height: 80upx;
+
+		.tabbar-item {
+			width: 33.33%;
+			line-height: 80upx;
+
+			.select-tabbarIcon {
+				position: absolute;
+				left: 50%;
+				bottom: -30upx;
+				transform: translateX(-50%);
+				color: #FFFFFF;
+			}
+		}
+	}
+
+	.header-userInfo {
+		.header-userInfo-left {
+			.header-avatar {
+				width: 80upx;
+				height: 80upx;
+				background-repeat: no-repeat;
+				background-size: 80upx 80upx;
+				border-radius: 50%;
+			}
+
+			.at-rank {
+				background-color: rgb(240, 129, 74);
+				border-radius: 20upx;
+				padding: 4upx 20upx;
+			}
+		}
+
+		.header-userInfo-right {
+			background-color: rgb(240, 129, 74);
+			border-radius: 20upx;
+			padding: 6upx 12upx;
+		}
+	}
+
+	.rank-list-item {
+		.rank-list-avatar {
+			width: 80upx;
+			height: 80upx;
+			background-repeat: no-repeat;
+			background-size: 80upx 80upx;
+			border-radius: 50%;
+		}
+	}
+
+	.rank-content {
+		background-color: rgb(225, 114, 58);
+		height: 460upx;
+
+		.content-title {
+			.content-title-letter {
+				letter-spacing: 4upx;
+			}
+
+			.content-title-label {
+				color: rgb(242, 240, 202);
+			}
+		}
+
+		.rank-bg {
+			width: 530upx;
+			height: 126upx;
+			background-size: 530upx 126upx;
+			background-repeat: no-repeat;
+			position: absolute;
+			left: 50%;
+			bottom: 0;
+			transform: translateX(-50%);
+		}
+	}
+
+	.rank-first {
+		position: absolute;
+	}
+
+	.rank-first_1 {
+		left: 50%;
+		top: 55%;
+		transform: translate(-50%, -50%);
+	}
+
+	.rank-first_2 {
+		left: 17%;
+		top: 50%;
+	}
+
+	.rank-first_3 {
+		left: 67%;
+		top: 55%;
+	}
+
+	.userInfo-avatar-nickName_1 {
+		.first-avtar-bg {
+			width: 92upx;
+			height: 92upx;
+			background-color: #FFCD38;
+			border-radius: 50%;
+			margin: 0 auto;
+		}
+	}
+
+	.userInfo-avatar-nickName_2 {
+		.first-avtar-bg {
+			width: 92upx;
+			height: 92upx;
+			background-color: #DBDBDB;
+			border-radius: 50%;
+			margin: 0 auto;
+		}
+	}
+
+	.userInfo-avatar-nickName_3 {
+		.first-avtar-bg {
+			width: 92upx;
+			height: 92upx;
+			background-color: #D9A269;
+			border-radius: 50%;
+			margin: 0 auto;
+		}
+	}
+
+	.rank-avatar {
+		width: 80upx;
+		height: 80upx;
+		border-radius: 50%;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		transform: translate(-50%, -50%);
+		background-repeat: no-repeat;
+		background-size: 80upx 80upx;
+	}
+
+	.userInfo-nickName {
+		width: 120upx;
+		color: rgb(242, 240, 202);
+	}
+
+	.rank-list-item-right {
+		background-color: rgb(240, 129, 74);
+		border-radius: 20upx;
+		padding: 6upx 12upx;
+	}
+
+	.first-avatar-crown {
+		position: absolute;
+	}
+
+	.first-avatar-crown_1 {
+		left: 50%;
+		top: 35%;
+		transform: translateX(-50%);
+		color: #FFCD38;
+	}
+
+	.first-avatar-crown_2 {
+		left: 23%;
+		top: 43%;
+		color: #DBDBDB;
+	}
+
+	.first-avatar-crown_3 {
+		color: #D9A269;
+		left: 72.5%;
+		top: 48.5%;
+	}
+	.rank-list{
+		padding-bottom: 120upx;
+	}
+</style>
diff --git a/pages/subPages/signdesk/record/record.vue b/pages/subPages/signdesk/record/record.vue
new file mode 100644
index 0000000..79d7600
--- /dev/null
+++ b/pages/subPages/signdesk/record/record.vue
@@ -0,0 +1,171 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="container" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header-bg" :style="{'background-image':'url('+imageRoot+'record_bg.jpg)'}">
+				<view class="header-bg-word">
+					<view class="title col-f f-48 m-btm20">签到记录</view>
+					<view class="word-label f-30">每日签到会有{{TextSubstitution.credittext}}奖励喔~</view>
+				</view>
+			</view>
+			<view class="content-title dis-flex p-r">
+				<view class="content-title-item total-sign-title col-f t-c f-28">累计签到:<text>{{info.total}}天</text></view>
+				<view class="content-title-item total-sign-title f-28 col-f t-c">签到{{TextSubstitution.credittext}}:<text>{{info.integral}}</text></view>
+			</view>
+			<scroll-view scroll-y class="scroll-view" @scrolltolower="ReachBottom">
+				<view class="sign-list b-f">
+					<view class="sign-list-item padding-box-all dis-flex flex-y-center flex-x-between border-line border-bottom" v-for="(listItem,index) in list" :key="index">
+						<view class="sign-list-item-left">
+							<view class="dis-flex flex-y-center m-btm10">
+								<view class="f-28 col-3">{{TextSubstitution.credittext}}签到+{{listItem.reward}}{{TextSubstitution.credittext}}</view>
+								<view class="sign-list-item-label f-24 col-f">{{listItem.sign_class}}</view>
+							</view>
+							<view class="f-24 col-9">{{listItem.createtime}}</view>
+						</view>
+						<view class="sign-list-item-right f-24">+{{listItem.reward}}</view>
+					</view>
+				</view>
+				<Loading v-if="!loading" />
+			</scroll-view>
+		</view>
+		<view class="page-footer">
+			<TabBars :tabBarAct="0" :pageType="'11'" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import Loadlogo from '@/components/template/loadlogo'
+	import Loading from '@/components/template/loading'
+	import App from "@/common/js/app.js"
+	import TabBars from '@/components/template/tabBar.vue'
+	export default {
+		data() {
+			return {
+				info: {},
+				list: [],
+				current_page: 1, //当前页数
+				total:null ,//总页数
+				loadlogo: false, //页面是否加载完成
+				loading:false //列表加载更多
+			}
+		},
+		mounted() {
+			this.getrecordList()
+		},
+		components:{
+			Loadlogo,
+			Loading,
+			TabBars
+		},
+		computed:{
+			TextSubstitution(){
+				return uni.getStorageSync('TextSubstitution');
+			}
+		},
+		methods: {
+			getrecordList(page = 1, isPage = false) {
+				let _this = this;
+				App._post_form('&p=wlsign&do=recordList', {
+					page
+				}, res => {
+					let recordData = res.data;
+					if (isPage) {
+						if (recordData.list.length > 0) {
+							_this["list"].push(...recordData.list);
+						} else {
+							_this.loading = true;
+						}
+					} else {
+						_this.setData(recordData)
+						_this.loading = recordData.list.length === 0 || _this.current_page === recordData.total;
+					}
+				}, false, () => {
+					_this.loadlogo = true
+				})
+			},
+			//加载更多
+			ReachBottom() {
+				let _this = this;
+				if (_this.current_page >= _this.page_total) {
+					_this.loading = true;
+					return false;
+				}
+				_this.getrecordList(++_this.current_page, true);
+			},
+		},
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: rgb(239, 238, 243);
+	}
+
+	.scroll-view {
+		height: 63vh;
+	}
+
+	.header-bg {
+		height: 320upx;
+		background-repeat: no-repeat;
+		background-size: 100% 320upx;
+
+		.header-bg-word {
+			padding: 100upx 50upx 00upx;
+
+			.word-label {
+				color: rgba(255, 255, 255, .8);
+			}
+		}
+	}
+
+	.content-title {
+		width: 100%;
+		background-color: #000000;
+		height: 80upx;
+
+		.content-title-item {
+			width: 50%;
+			line-height: 80upx;
+		}
+
+		.total-sign-title {
+			&>text {
+				color: #FF7F50;
+				margin-left: 10upx;
+			}
+		}
+	}
+
+	.content-title::after {
+		content: "";
+		width: 2upx;
+		height: 50%;
+		background-color: rgba(255, 255, 255, .6);
+		position: absolute;
+		top: 25%;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.sign-list {
+		padding-bottom: 120upx;
+		.sign-list-item {
+			.sign-list-item-left {
+				.sign-list-item-label {
+					background-color: rgb(111, 203, 64);
+					padding: 2upx 40upx;
+					border-radius: 40upx;
+					margin-left: 10upx;
+				}
+			}
+
+			.sign-list-item-right {
+				color: #FF7F50;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages/special/rushspeci/rushspeci.vue b/pages/subPages/special/rushspeci/rushspeci.vue
new file mode 100644
index 0000000..f8e4f63
--- /dev/null
+++ b/pages/subPages/special/rushspeci/rushspeci.vue
@@ -0,0 +1,157 @@
+<template>
+	<!-- 抢购专题 -->
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="speci-box" v-if="loadlogo">
+			<far-bottom></far-bottom>
+			<view class="header-image p-r" :style="{'background-image':'url('+speciInfo.thumb+')',height:imgstyle.height + 'px',width: imgstyle.width + 'px'}">
+				<view class="rule-box t-c col-f f-24" @click="openWxParse">规则</view>
+			</view>
+			<view class="speci-list padding-box-all" :style="'background-color:'+speciInfo.bgcolor">
+				<goods-style goodsStyleType="rush" :goodslistData="rushlist"></goods-style>
+			</view>
+			<popup-view :show="showRule" type="center" @clickmask="showRule = false">
+				<view class="wxParse-box b-f">
+					<scroll-view scroll-y="true" class="scrollView-parse">
+						<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+						show-with-animation use-anchor  :html="speciInfo.rule" ></jyf-parser>
+					</scroll-view>
+					<view class="closeRule col-f f-28 t-c" @click="openWxParse">知道了</view>
+				</view>
+			</popup-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo.vue'
+	import wxApi from "@/common/js/wxApi.js"
+	import PopupView from "@/components/template/PopManager.vue"
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+	export default {
+		data() {
+			return {
+				rushlist: [],
+				speciInfo: null,
+				loadlogo: false,
+				showRule: false,
+				imgstyle:{}
+			}
+		},
+		components: {
+			Loadlogo,
+			PopupView,
+			goodsStyle,
+			jyfParser
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.imgstyle = uni.getStorageSync('imgstyle');
+			let agencyData = uni.getStorageSync('agencyData');
+			let lnglat = {
+				latitude:agencyData.lat,
+				longitude:agencyData.lng
+			}
+			_this.specialInfo(lnglat, e.id);
+		},
+		methods: {
+			specialInfo(location, id = "3") {
+				let _this = this,
+					requestData = {
+						id,
+						lat: location.latitude || "",
+						lng: location.longitude || ""
+					};
+				App._post_form('&p=rush&do=specialInfo', requestData, res => {
+					let speciInfoData = res.data,
+						speciInfo = {};
+					speciInfo.thumb = speciInfoData.thumb;
+					speciInfo.title = speciInfoData.title;
+					speciInfo.share_title = speciInfoData.share_title;
+					speciInfo.share_desc = speciInfoData.share_desc;
+					speciInfo.rule = speciInfoData.rule;
+					speciInfo.bgcolor = speciInfoData.bgcolor;
+					_this.setData({
+						speciInfo,
+						rushlist: res.data.list
+					});
+					// if(res.errno == 0){
+					// 	_this.loadlogo = true;
+					// }
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			},
+			navigateTo(url) {
+				App.navigationTo({
+					url
+				})
+			},
+			openWxParse() {
+				let _this = this;
+				_this.showRule = !_this.showRule;
+			},
+			goodsremind(id, item) {
+				let _this = this;
+				App._post_form('&p=rush&do=follow', {
+					id
+				}, res => {
+					if (res.errno === 0) {
+						App.showSuccess(res.message, () => {
+							_this.$set(item, 'is_follow', 1)
+						})
+					}
+				})
+			}
+
+		},
+		computed: {
+
+		},
+		
+	}
+</script>
+
+<style lang="scss">
+	@import "../../../../common/css/old_diyPages";
+
+	.header-image {
+		width: 100%;
+		height: 300upx;
+		background-size: 100% 300upx;
+		background-repeat: no-repeat;
+	}
+
+	.rule-box {
+		position: absolute;
+		right: 0;
+		top: 15%;
+		width: 110upx;
+		height: 52upx;
+		line-height: 52upx;
+		background-color: #E63232;
+		border-radius: 26upx 0 0 26upx;
+	}
+
+	.wxParse-box {
+		border-radius: 20upx;
+		width: 500upx;
+		height: 75vh;
+		padding: 20upx 50upx;
+	}
+
+	.scrollView-parse {
+		height: 65vh;
+	}
+
+	.closeRule {
+		width: 460upx;
+		height: 80upx;
+		line-height: 80upx;
+		background-color: #FF4444;
+		border-radius: 40upx;
+		margin: 30upx auto 0;
+	}
+</style>
diff --git a/pages/subPages/submitOrder/submitOrder.vue b/pages/subPages/submitOrder/submitOrder.vue
new file mode 100644
index 0000000..b03f3e5
--- /dev/null
+++ b/pages/subPages/submitOrder/submitOrder.vue
@@ -0,0 +1,2139 @@
+<template>
+	<view class="page" v-if="logocome">
+		<view class="header_bg" :style="{ 'background-image': ' url(' + imageRoot + 'submit_bg.png)' }"></view>
+		<far-bottom></far-bottom>
+		<view class="submitOrder p-r">
+			<!-- 收货地址 -->
+			<view class="receivingAdress" v-if="orderSubmitInfo.usestatus == 1">
+				<view class="receivingAdressPackage" @click="goAddress(1)">
+					<block v-if="!!orderSubmitInfo.address">
+						<view class="receivingAdressLeft">
+							<view class="receivingAdressTitle">
+								<view v-if="orderSubmitInfo.address.status == 1"><span>默认</span></view>
+								<span>{{ orderSubmitInfo.address.province }} {{ orderSubmitInfo.address.city }} {{ orderSubmitInfo.address.county }}</span>
+							</view>
+							<view class="receivingAdressBody">
+								<span>{{ orderSubmitInfo.address.detailed_address }}</span>
+							</view>
+							<view class="receivingAdressFoot">
+								<span>{{ orderSubmitInfo.address.name }}</span>
+								<span>{{ orderSubmitInfo.address.tel }}</span>
+							</view>
+						</view>
+					</block>
+					<block v-else><view class="col-9 f-28">请选择地址</view></block>
+					<view class="receivingAdressRight iconfont icon-right col-9"></view>
+				</view>
+				<!-- 彩条 -->
+				<view class="receiptDetailsFoot"></view>
+				<!-- 彩条 -->
+			</view>
+			<!-- 收货地址 -->
+
+			<!-- 核销 快递切换 -->
+			<view class="checkOrderType" v-if="orderSubmitInfo.usestatus == 2">
+				<!-- 切换按钮 -->
+				<view class="checkOrderTypeButton">
+					<view :class="[usestatus == 1 ? 'check' : 'nCheck checkOne ncheck1']" @click="switchover(1)"><span>物流配送</span></view>
+					<view :class="[usestatus == 0 ? 'check check2' : 'nCheck']" @click="switchover(0)"><span>到店核销</span></view>
+					<view :class="[usestatus == 1 ? 'checkPs' : 'Ps']" @click="switchover(1)"></view>
+					<view :class="[usestatus == 0 ? 'checkHx' : 'Hx']" @click="switchover(0)"></view>
+					<view></view>
+					<!-- 彩条 -->
+					<view class="receiptDetailsFoot"></view>
+					<!-- 彩条 -->
+				</view>
+				<!-- 切换按钮 -->
+				<!-- 收货地址 -->
+				<view class="checkReceivingAdress" v-if="usestatus == 1" :class="{ 'check-right-radius': usestatus == 1 }">
+					<view class="receivingAdressPackage dis-flex flex-y-center flex-x-between" @click="goAddress(1)">
+						<block v-if="!!orderSubmitInfo.address">
+							<view class="receivingAdressLeft">
+								<view class="receivingAdressTitle">
+									<view v-if="orderSubmitInfo.address.status == 1"><span>默认</span></view>
+									<span>{{ orderSubmitInfo.address.province }} {{ orderSubmitInfo.address.city }} {{ orderSubmitInfo.address.county }}</span>
+								</view>
+								<view class="receivingAdressBody">
+									<span>{{ orderSubmitInfo.address.detailed_address }}</span>
+								</view>
+								<view class="receivingAdressFoot">
+									<span>{{ orderSubmitInfo.address.name }}</span>
+									<span>{{ orderSubmitInfo.address.tel }}</span>
+								</view>
+							</view>
+						</block>
+						<block v-else><view class="col-9 f-28">请选择地址</view></block>
+						<view class="receivingAdressRight iconfont icon-right col-9"></view>
+					</view>
+					<!-- 彩条 -->
+					<view class="receiptDetailsFoot"></view>
+					<!-- 彩条 -->
+				</view>
+				<!-- 收货地址 -->
+
+				<!-- 用户信息 -->
+				<view class="checkUserInfo" v-if="usestatus == 0" :class="{ 'check-left-radius': usestatus == 0 }">
+					<view class="userInfoPackage">
+						<view>
+							<span>姓名</span>
+							<input placeholder="请输入联系人姓名" v-model="createOrderInfo.thname" />
+						</view>
+						<view>
+							<span>联系电话</span>
+							<input placeholder="请输入联系人电话" type="number" v-model="createOrderInfo.thmobile" />
+						</view>
+						<view v-if="orderSubmitInfo.pftid && orderSubmitInfo.UUdelaytype == 1">
+							<span>使用时间</span>
+							<picker mode="date" class="inops" style="display: inline-block;font-size: 22upx;margin-left: 0upx;" :value="date" :start="orderSubmitInfo.UUorder_start" :end="orderSubmitInfo.UUorder_end" @change="onConfirm">
+								<input class="inops" disabled @click="visibledate=true" placeholder="请选择使用时间" type="text" v-model="createOrderInfo.time" />
+							</picker>
+						</view>
+					</view>
+				</view>
+				<!-- 用户信息 -->
+			</view>
+			<!-- 核销 快递切换 -->
+
+			<!-- 商品详情 -->
+			<view class="orderDetails">
+				<view class="orderDetailsPackage">
+					<view class="orderDetailsImg"><image :src="orderSubmitInfo.goodsimg" /></view>
+					<view class="orderDetailsInfo">
+						<view class="orderInfoTitle">
+							<span>{{ orderSubmitInfo.goodsname }}</span>
+						</view>
+						<view class="orderInfoBody" v-if="orderSubmitInfo.optionname != '' && orderSubmitInfo.optionname != null">
+							<span>规格：{{ orderSubmitInfo.optionname }}</span>
+						</view>
+						<view class="orderInfoFoot">
+							<span v-if="!createOrderInfo.drawid && !createOrderInfo.luckydrawid">¥{{ orderSubmitInfo.goodsprice }}</span>
+							<span>x{{ num }}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 会员卡 -->
+			<view
+				class="member b-f  bor-radius-10upx"
+				v-if="
+					orderSubmitInfo.is_openvip == 1 &&
+						orderSubmitInfo.carddisList &&
+						!orderSubmitInfo.halfcardflag &&
+						((flag && carddata.payclose == 0) || (!flag && carddata.payclose == 1) || (!flag && carddata.payclose == 0))
+				"
+			>
+				<view class="member-header dis-flex">
+					<view class="header-left dis-flex flex-y-center">
+						<view class="left-member-logo"></view>
+						<view class="left-member-title f-24 onelist-hidden">{{ !!TextSubstitution.halfcardtext ? TextSubstitution.halfcardtext : '会员卡' }}</view>
+					</view>
+					<view class="header-right f-24 t-c col-3">
+						现在勾选开卡，本单立减更多
+						<!-- <text>¥{{orderSubmitInfo.carddiscount * num}}</text> -->
+					</view>
+				</view>
+				<view class="member-list">
+					<scroll-view scroll-y="true">
+						<block v-for="(member_items, index) in cardList" :key="index" v-if="index <= member_number">
+							<view class="member-list-items border-line border-bottom" @click="select_card(member_items)">
+								<view class="member-name-nowprice dis-flex flex-x-between m-btm10">
+									<view class="col-3 f-28">{{ member_items.name }}</view>
+									<view class="member-nowprice f-28 f-w">¥{{ member_items.price }}</view>
+								</view>
+								<view class="member-date-oldprice dis-flex flex-x-between">
+									<view class="col-9 f-24">有效期：{{ member_items.days }}天</view>
+									<view class="col-9 f-24">立减¥{{ member_items.vip_price }}</view>
+								</view>
+								<view class="select-logo">
+									<image
+										:src="member_items.id === cardId ? imgfixUrls + 'checkout/selectmember.png' : imgfixUrls + 'checkout/not-selectmember.png'"
+										mode=""
+									></image>
+								</view>
+							</view>
+						</block>
+					</scroll-view>
+					<view v-if="cardList.length > 1" class="member-list-more t-c f-28 col-3 p-top-bom-10" @click="moreCardList">
+						{{ cardList.length === member_number ? '收起' : '全部' }}
+						<text class="iconfont more-icon" :class="cardList.length === member_number ? 'icon-fold' : 'icon-unfold'"></text>
+					</view>
+				</view>
+			</view>
+
+			<!-- 可用积分 -->
+			<view class="integralInfo" v-if="orderSubmitInfo.credit > 0 && createOrderInfo.plugin !== '8'">
+				<view class="integralInfoPackage">
+					<view>
+						<span>{{ TextSubstitution.credittext }} 共{{ orderSubmitInfo.allcredit }}分，可用{{ orderSubmitInfo.credit }}分</span>
+					</view>
+					<view class="switch" :style="integralType === 0 ? 'border:1px solid #dddddd' : 'border:1px solid #FF4444'">
+						<view class="switchOn" v-if="integralType == 1" @click="changIntegral(0)">
+							<span></span>
+							<view :class="{ isswitchOn: integralType === 1 }"></view>
+						</view>
+						<view class="switchClose" v-if="integralType == 0" @click="changIntegral(1)">
+							<view :class="{ isswitchClose: integralType === 0 }"></view>
+							<span></span>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 支付详情 -->
+			<view class="paymentInfo" v-if="orderSubmitInfo.expressprice || (!createOrderInfo.drawid && !createOrderInfo.luckydrawid)">
+				<view class="paymentInfoPackage">
+					<view class="dis-flex flex-y-center flex-x-between" v-if="!!redPackageNum">
+						<view class="col-3 f-24">红包优惠</view>
+						<view class="dis-flex flex-y-center f-w" @click="redPagShows">
+							<view class="col-f4 f-24">{{ redPackageNum }}</view>
+							<view class="redPacketIcon iconfont icon-right col-f4"></view>
+						</view>
+					</view>
+					<view v-if="!createOrderInfo.drawid && !createOrderInfo.luckydrawid">
+						<text>商品总金额</text>
+						<text>¥{{ (goodsprice * num).toFixed(2) }}</text>
+					</view>
+					<view v-if="orderSubmitInfo.usestatus == 1">
+						<text>运费</text>
+						<text>¥{{ orderSubmitInfo.expressprice }}</text>
+					</view>
+					<view v-if="orderSubmitInfo.usestatus == 2 && usestatus == 1">
+						<text>运费</text>
+						<text>¥{{ orderSubmitInfo.expressprice }}</text>
+					</view>
+					<view v-if="!!cardId && card_price > 0">
+						<text>会员卡金额</text>
+						<text>{{ card_price }}</text>
+					</view>
+					<view v-if="(orderSubmitInfo.halfcardflag && orderSubmitInfo.vipdiscount !== '' && orderSubmitInfo.vipdiscount !== 0) || !!cardId">
+						<text>会员优惠</text>
+						<text>-{{ !!cardId ? orderSubmitInfo.carddiscount * num : orderSubmitInfo.vipdiscount }}</text>
+					</view>
+					<view v-if="integralType == 1 && createOrderInfo.plugin !== '8'">
+						<text>{{ TextSubstitution.credittext }}抵扣</text>
+						<text>-{{ orderSubmitInfo.creditdiscount }}</text>
+					</view>
+					<view v-if="(group_id == '' || group_id == undefined) && (!!orderSubmitInfo.is_com_dis || orderSubmitInfo.is_com_dis == '1')">
+						<text>团长优惠</text>
+						<text>-{{ orderSubmitInfo.com_dis_price }}</text>
+					</view>
+					<view v-if="redPackageNumSubtract.num">
+						<text>红包减免</text>
+						<text>{{ redPackageNumSubtract.val }}</text>
+					</view>
+					<view
+						v-for="(itemr, indexr) in orderSubmitInfo.fullreducelist.list"
+						:key="indexr"
+						v-if="Number(ac_price) >= itemr.full_money && (indexr == 0 ? true : Number(ac_price) < orderSubmitInfo.fullreducelist.list[indexr - 1].full_money)"
+					>
+						<text>{{ orderSubmitInfo.fullreducelist.title }}</text>
+						<text>满{{ itemr.full_money + '减' + itemr.cut_money }}</text>
+					</view>
+					<view v-if="createOrderInfo.plugin == '8'">
+						<text>使用{{ TextSubstitution.credittext }}</text>
+						<text>{{ orderSubmitInfo.credit }}{{ TextSubstitution.credittext }}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 支付详情 -->
+
+			<!-- 优惠详情 -->
+			<!-- <discounts></discounts> -->
+			<!-- 优惠详情 -->
+
+			<!-- 用户信息 -->
+			<view class="userInfo" v-if="orderSubmitInfo.usestatus == 0 && !orderSubmitInfo.diyform">
+				<view class="userInfoPackage" style="">
+					<view>
+						<span>姓名</span>
+						<input placeholder="请输入联系人姓名" v-model="createOrderInfo.thname" />
+					</view>
+					<view>
+						<span>联系电话</span>
+						<input  placeholder="请输入联系人电话" type="number" v-model="createOrderInfo.thmobile" />
+					</view>
+					<view v-if="orderSubmitInfo.pftid && orderSubmitInfo.UUdelaytype == 1">
+						<span>使用时间</span>
+						<picker mode="date" class="inops" style="display: inline-block;font-size: 22upx;margin-left: 0upx;" :value="date" :start="orderSubmitInfo.UUorder_start" :end="orderSubmitInfo.UUorder_end" @change="onConfirm">
+							<input class="inops" disabled @click="visibledate=true" placeholder="请选择使用时间" type="text" v-model="createOrderInfo.time" />
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="userInfo" v-if="orderSubmitInfo.pftid && orderSubmitInfo.UUtourist_info != '0' && orderSubmitInfo.threestatus == 0" >
+				<view class="f-30 f-w" style="padding: 30upx;">
+					购票人信息
+				</view>
+				<view class="userInfoPackage" :style="{borderBottom: index != pfArr.length - 1?'4upx solid #EEEEEE':'none'}" v-for="(item,index) in pfArr" :key="index">
+					<view class="f-26 c-ff4444" style="padding: 20upx 0;" v-if="pfArr.length > 1">
+						购票人({{index+1}})
+					</view>
+					<view>
+						<span>购票人姓名</span>
+						<input placeholder="请输入购票人姓名" v-model="item.name" />
+					</view>
+					<view>
+						<span>购票人联系方式</span>
+						<input placeholder="请输入购票人联系方式" type="number" maxlength="11" v-model="item.phone" />
+					</view>
+					<view>
+						<span>购票人身份证</span>
+						<input placeholder="请输入购票人身份证号码" type="idcard" v-model="item.cradId" />
+					</view>
+				</view>
+			</view>
+			<view class="userInfo" v-if=" orderSubmitInfo.threestatus == 1" >
+				<view class="f-30 f-w" style="padding: 30upx;">
+					充值信息
+				</view>
+				<view class="userInfoPackage" v-for="item,index in orderSubmitInfo.template" :key="index">
+					<view v-if="item.type == 'input'">
+						<span>{{item.txt == '手机号'?'充值手机号':item.txt}}</span>
+						<input :placeholder="item.tips" v-model="item.value" />
+					</view>
+					<view class="dis-flex" v-if="item.type == 'select'">
+						<span>{{item.txt}}</span>
+						<picker @change="selectChange($event,index)" :value="selectIndex" :range="item.selectData" range-key="label">
+							<input class="userInput" disabled :placeholder="item.tips" v-model="item.label" />
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="userInfo" v-if="orderSubmitInfo.diyform">
+				<view class="userInfoPackage" style="padding-bottom: 30upx;">
+					<view>
+						<span>姓名</span>
+						<input placeholder="请输入联系人姓名" v-model="createOrderInfo.thname" />
+					</view>
+					<view>
+						<span>联系电话</span>
+						<input  placeholder="请输入联系人电话" type="number" v-model="createOrderInfo.thmobile" />
+					</view>
+
+					<form-item ref="formItem" @ononahow="ononahow" :gopay="gopay" :gopaytwo="gopaytwo" :orderSubmitInfo="orderSubmitInfoData"></form-item>
+				</view>
+				<!-- </view> -->
+				<!-- </view> -->
+			</view>
+			<!-- 用户信息 -->
+
+			<!-- 留言 -->
+			<view class="messageSave">
+				<view class="messageSavePackage"><input placeholder="请输入留言信息给商家" v-model="createOrderInfo.remark" /></view>
+			</view>
+			<!-- 留言 -->
+
+			<!-- 填充层 -->
+			<view class="full"></view>
+			<!-- 填充层 -->
+
+			<!-- 提交支付 -->
+			
+			<!-- 提交支付 -->
+		</view>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		<view  v-if="showrRedpack">
+			<redPagDown ref="redPagDown" @closePops="redPagClosePop(event)" :orderSubmitInfo="redPagList" @priceis="prices"></redPagDown>
+		</view>
+		<view class="navButtom">
+			<view class="navButtomLeft">
+				<view class="navButtomLeftPackage" v-if="!createOrderInfo.drawid && !createOrderInfo.luckydrawid">
+					<span>合计：</span>
+					<span>¥{{ actual_pay_price }}</span>
+				</view>
+			</view>
+			<form @click="createOrder" report-submit="true">
+				<view class="submitButton p-r">
+					<span>{{ createOrderInfo.drawid || createOrderInfo.luckydrawid ? '立即领取' : '提交订单' }}</span>
+					<button form-type="submit"></button>
+				</view>
+			</form>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import Util from '@/common/js/util.js';
+import PhoneMask from '@/components/template/PhoneMask';
+import redPagDown from '@/components/template/redPagDown.vue';
+import getvxphone from '@/components/template/getVXphone.vue';
+import LbPicker from '@/components/lb-picker';
+import wPicker from '@/components/w-picker/w-picker.vue';
+import ruiDatePicker from '@/components/rattenking-dtpicker/rattenking-dtpicker.vue';
+import formItem from '@/components/template/formItem.vue';
+export default {
+	components: {
+		PhoneMask,
+		redPagDown,
+		getvxphone,
+		LbPicker,
+		wPicker,
+		ruiDatePicker,
+		formItem
+	},
+	data() {
+		return {
+			redPackageNumSubtract: {
+				val: '',
+				num: 0
+			},
+			logocome: true,
+			redPags: false, //控制红包弹出
+			redPackageNum: null,
+			TextSubstitution: {},
+			orderSubmitInfo: {
+				goodsprice: 0
+			},
+			goodsprice: 0,
+			integralType: 0,
+			num: 1,
+			allMoney: 0,
+			addressid: '',
+			id: '',
+			usestatus: 1,
+			allUsestatus: 0,
+			buystatus: '',
+			createOrderInfo: {
+				id: null,
+				creditstatus: '',
+				num: null,
+				plugin: 1,
+				specid: 177,
+				thname: '',
+				thmobile: '',
+				addressid: '',
+				remark: '',
+				buystatus: null,
+				aa: 0,
+				time:''
+			},
+			popShow: false,
+			cardList: [],
+			cardId: null,
+			card_price: null, //会员卡价格
+			member_number: 0, //会员卡数量
+			cut_money: 0, //红包优惠价格
+			redPagList: [],
+			redPagId: 0,
+			vxshow: false,
+			flag: false,
+			carddata: {},
+			gopay: true,
+			type1Url: '',
+			type1Urlon: '',
+			type2Url: [],
+			type2Urlon: [],
+			localIds: '',
+			uploadlength: 0,
+			province: [],
+			city: [],
+			area: [],
+			provincecity: [],
+			cityarea: [],
+			provincecityarea: [],
+			ifonshow: false,
+			orderSubmitInfoData: {},
+			gopaytwo: true,
+			meetThePrice:0,
+			showrRedpack:false,
+			visibledate:false,
+			pfArr:[],
+			selectIndex:0,
+			selectobj:{
+				label:'',
+				value:0
+			}
+		};
+	},
+	onShow: function(e) {
+			if (this.ifonshow) {
+				this.init();
+			} else {
+				setTimeout(()=>{
+					this.ifonshow = true;
+				},1500)
+				
+				return
+			}
+	},
+	onLoad: function(option) {
+		if (!!option.group_id) {
+			this.group_id = option.group_id;
+		} else {
+			this.group_id = '';
+		}
+		if ((!!option.drawid && option.drawid != 'undefined')) {
+			this.createOrderInfo.drawid = option.drawid;
+			// debugger
+			uni.setNavigationBarTitle({
+				title: '奖品领取'
+			});
+		}
+		if ((!!option.luckydrawid && option.luckydrawid != 'undefined')) {
+			this.createOrderInfo.luckydrawid = option.luckydrawid;
+			// debugger
+			uni.setNavigationBarTitle({
+				title: '奖品领取'
+			});
+		}
+		uni.$on('update',function(data){
+		        this.ifonshow = false;
+		})
+		this.ifonshow = true;
+		if (uni.getSystemInfoSync().system.indexOf('Android') === -1) {
+			this.flag = true;
+			console.log(uni.getSystemInfoSync().system);
+		} else {
+			console.log(uni.getSystemInfoSync().system);
+			this.flag = false;
+		}
+		this.createOrderInfo.id = option.goods_id;
+		this.createOrderInfo.plugin = option.plugin;
+		this.createOrderInfo.specid = option.specid;
+		this.num = option.goods_num;
+		this.createOrderInfo.num = option.goods_num;
+		this.buystatus = option.buystatus;
+		this.createOrderInfo.buystatus = option.buystatus;
+		for(let i = 0;i < this.num;i++){
+			this.pfArr.push({
+				name:'',
+				phone:'',
+				cradId:''
+			})
+		}
+		
+		console.log(typeof option.plugin,this.pfArr);
+		this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		let orderInfos = {
+			goods_id: option.goods_id,
+			plugin: option.plugin,
+			specid: option.specid,
+			goods_num: option.goods_num,
+			buystatus: option.buystatus,
+			drawid:option.drawid,
+			luckydrawid:option.luckydrawid
+		};
+		uni.setStorageSync('orderInfos', orderInfos);
+	},
+	watch: {
+		usestatus: {
+			handler() {
+				let _this = this;
+				if (_this.orderSubmitInfo.usestatus == 2 && _this.usestatus == 1) {
+					_this.allMoney = Util.additionFloat(_this.allMoney, _this.orderSubmitInfo.expressprice, 100);
+				}
+				if (_this.orderSubmitInfo.usestatus == 2 && _this.usestatus == 0) {
+					_this.allMoney = Util.subtractionFloat(_this.allMoney, _this.orderSubmitInfo.expressprice, 100);
+				}
+			}
+		},
+		integralType: {
+			handler() {
+				let _this = this;
+				let creditdiscount = Number(_this.orderSubmitInfo.creditdiscount);
+				_this.createOrderInfo.creditstatus = _this.integralType;
+				if (_this.integralType == 0 && _this.orderSubmitInfo.creditdiscount !== '') {
+					_this.allMoney = Util.additionFloat(_this.allMoney, creditdiscount, 100);
+				}
+				if (_this.integralType == 1 && _this.orderSubmitInfo.creditdiscount !== '') {
+					_this.allMoney = Util.subtractionFloat(_this.allMoney, creditdiscount, 100);
+				}
+			}
+		}
+	},
+	computed: {
+		TextSubstitution() {
+			return uni.getStorageSync('TextSubstitution');
+		},
+		ac_price() {
+			let _this = this,
+				{ orderSubmitInfo, num, cardId, integralType, card_price, usestatus } = _this,
+				payPrice = 0,
+				expressPrice = (orderSubmitInfo.usestatus == 2 && usestatus == 1) || usestatus == 1 ? (!!orderSubmitInfo.expressprice ? orderSubmitInfo.expressprice : 0) : 0,
+				order_total_price = orderSubmitInfo.goodsprice * Number(num);
+			//没有会员卡下 点击开通会员卡优惠金额
+			if (orderSubmitInfo.is_openvip === 1 && (!!cardId && orderSubmitInfo.carddisList)) {
+				order_total_price = order_total_price - Number(orderSubmitInfo.carddiscount);
+			}
+			// 有会员卡下优惠金额
+			if (!!orderSubmitInfo.vipdiscount && orderSubmitInfo.vipdiscount > 0) {
+				order_total_price = order_total_price - orderSubmitInfo.vipdiscount;
+			}
+			// _this.meetThePrice = Number(order_total_price);
+			// debugger
+			//积分抵扣
+			// if (integralType === 1) {
+			// 	order_total_price = order_total_price - Number(orderSubmitInfo.creditdiscount);
+			// }
+
+			// if (_this.group_id == '' && (!!_this.orderSubmitInfo.is_com_dis || _this.orderSubmitInfo.is_com_dis == '1')) {
+			// 	order_total_price = order_total_price - Number(_this.orderSubmitInfo.com_dis_price);
+			// }
+
+			// //红包优惠
+			// order_total_price = order_total_price - _this.cut_money;
+
+			// _this.actual_pay_price = _this.actual_pay_price - e.cut_money
+
+			//邮费、会员卡费用单独计算且商品最低价为0
+			payPrice = (order_total_price > 0 ? order_total_price : 0) + (cardId ? Number(card_price) : 0);
+			return Number(payPrice) > 0 ? Number(payPrice).toFixed(2) : 0;
+		},
+		Fullreduction() {
+			let pic = 0;
+			if (this.orderSubmitInfo.fullreducelist) {
+				this.orderSubmitInfo.fullreducelist.list.map((item, index) => {
+					if (Number(this.ac_price) >= item.full_money && (index == 0 ? true : Number(this.ac_price) < this.orderSubmitInfo.fullreducelist.list[index - 1].full_money)) {
+						pic = item.cut_money;
+					}
+				});
+			}
+			return pic;
+		},
+		actual_pay_price() {
+			let _this = this,
+				{ orderSubmitInfo, num, cardId, integralType, card_price, usestatus } = _this,
+				payPrice = 0,
+				expressPrice = (orderSubmitInfo.usestatus == 2 && usestatus == 1) || usestatus == 1 ? (!!orderSubmitInfo.expressprice ? orderSubmitInfo.expressprice : 0) : 0,
+				order_total_price = orderSubmitInfo.goodsprice * Number(num);
+			//没有会员卡下 点击开通会员卡优惠金额
+			if (orderSubmitInfo.is_openvip === 1 && (!!cardId && orderSubmitInfo.carddisList) && !orderSubmitInfo.halfcardflag) {
+				order_total_price = order_total_price - Number(orderSubmitInfo.carddiscount) * Number(num);
+			}
+			// 有会员卡下优惠金额
+			if (!!orderSubmitInfo.vipdiscount && orderSubmitInfo.vipdiscount > 0 && orderSubmitInfo.halfcardflag) {
+				order_total_price = order_total_price - orderSubmitInfo.vipdiscount;
+			}
+			//积分抵扣
+			if (integralType === 1) {
+				order_total_price = order_total_price - Number(orderSubmitInfo.creditdiscount);
+			}
+
+			if (_this.group_id == '' && (!!_this.orderSubmitInfo.is_com_dis || _this.orderSubmitInfo.is_com_dis == '1')) {
+				order_total_price = order_total_price - Number(_this.orderSubmitInfo.com_dis_price);
+			}
+
+			//红包优惠
+			order_total_price = order_total_price - _this.cut_money;
+			// order_total_price = (order_total_price < 0)?0:order_total_price
+			// _this.actual_pay_price = _this.actual_pay_price - e.cut_money
+
+			//邮费、会员卡费用单独计算且商品最低价为0
+			payPrice = (order_total_price > 0 ? order_total_price : 0) + expressPrice + (cardId ? Number(card_price) : 0) - _this.Fullreduction;
+			return Number(payPrice) > 0 ? Number(payPrice).toFixed(2) : 0;
+		}
+	},
+	methods: {
+		selectChange(e,index){//监听区服选择
+			console.log(e,index);
+			this.selectIndex = e.detail.value;
+			this.orderSubmitInfo.template[index].value = this.orderSubmitInfo.template[index].selectData[this.selectIndex].value;
+			// this.orderSubmitInfo.template[index].label = this.orderSubmitInfo.template[index].selectData[this.selectIndex].label;
+			this.$set(this.orderSubmitInfo.template[index],'label',this.orderSubmitInfo.template[index].selectData[this.selectIndex].label)
+		},
+		onConfirm(e,name){
+			
+			this.createOrderInfo.time = e.detail.value;
+			console.log(e,name,this.createOrderInfo.time);
+		},
+		ononahow() {
+			this.ifonshow = false;
+			console.log(this.ifonshow,`当前值为${this.ifonshow}`);
+		},
+		bindChange(e, key, num) {
+			console.log(e, key);
+			if (num == 1) {
+				this.createOrderInfo[key].data = e;
+			} else if (num == 2) {
+				this.createOrderInfo[key].data[0] = e;
+			} else {
+				this.createOrderInfo[key].data[1] = e;
+			}
+		},
+		confirm(e, key) {
+			console.log(e, key);
+			this.$set(this.createOrderInfo, key, e.value);
+			this.logocome = !this.logocome;
+			this.logocome = !this.logocome;
+		},
+		openendtime(index) {
+			let _this = this;
+			// debugger
+			this.createOrderInfo['end' + index] = true;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		openstarttime(index) {
+			let _this = this;
+			// debugger
+			this.createOrderInfo['start' + index] = true;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		opentime(index) {
+			let _this = this;
+			// debugger
+			this.createOrderInfo['show' + index] = true;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		onCancelEnd(e, index) {
+			console.log(e);
+			let _this = this;
+			this.createOrderInfo['show' + index] = false;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		onCancelEndend(e, index) {
+			console.log(e);
+			let _this = this;
+			this.createOrderInfo['end' + index] = false;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		onCancelstart(e, index) {
+			console.log(e);
+			let _this = this;
+			this.createOrderInfo['start' + index] = false;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		checkstart(e, key, index) {
+			console.log(e);
+			let _this = this;
+			_this.createOrderInfo['start' + index] = false;
+			_this.createOrderInfo['p' + index].data[0] = e.value;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		checkend(e, key, index) {
+			console.log(e);
+			let _this = this;
+			_this.createOrderInfo['end' + index] = false;
+			_this.createOrderInfo['p' + index].data[1] = e.value;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		checkStar(e, key, index) {
+			console.log(e);
+			let _this = this;
+			this.createOrderInfo['show' + index] = false;
+			_this.createOrderInfo['p' + index].data = e.value;
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		dycheck(key, data, index, i, ck) {
+			// createOrderInfo['p' + index];
+			let _this = this;
+			console.log(_this.orderSubmitInfo.diyform.list);
+			if (!ck) {
+				_this.createOrderInfo[key + 'multiple'][index].check = true;
+				// debugger
+				let itemName = _this.orderSubmitInfo.diyform.list[key].data.options[index];
+				_this.createOrderInfo[key].data.push(itemName);
+			} else {
+				_this.createOrderInfo[key + 'multiple'][index].check = false;
+				_this.createOrderInfo[key].data.map((item, j) => {
+					if (item == _this.orderSubmitInfo.diyform.list[key].data.options[index]) {
+						_this.createOrderInfo[key].data.splice(j, 1);
+					}
+				});
+			}
+
+			// for(let keys  in _this.orderSubmitInfo.diyform.list){
+			//     if(key == keys){
+
+			// console.log(_this.orderSubmitInfo.diyform.list[key].data.option[index]);
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+			// 		return
+
+			// 	}
+			//   }
+		},
+		switchover(val) {
+			this.usestatus = val;
+		},
+		closePreview(item, key) {
+			let _this = this;
+			let userArray = ['a'];
+			if (_this.createOrderInfo['img' + key]) {
+				_this.createOrderInfo['img' + key].map((items, index) => {
+					if (items == item) {
+						console.log(_this.createOrderInfo['img' + key], 1111111111111);
+						_this.createOrderInfo['img' + key].splice(index, 1);
+						_this.logocome = !_this.logocome;
+						_this.logocome = !_this.logocome;
+					}
+				});
+			}
+			console.log(this.type2Url, _this.createOrderInfo['img' + key]);
+		},
+		uplodephone(length, localIds, key, numbers) {
+			let _this = this;
+			wxApi.uoloadIg(localIds[length], data => {
+				if (data.errMsg === 'uploadImage:ok') {
+					uni.showLoading({});
+					let requestData = {
+						upload_type: 2,
+						id: data.serverId
+					};
+					App._post_form(
+						'&do=uploadFiles',
+						requestData,
+						res => {
+							if (res.errno === 0) {
+								let num = length + 1;
+								if (_this.createOrderInfo['img' + key].length == numbers) {
+									uni.showToast({
+										title: `最多上传${numbers}张图片`,
+										icon: 'none'
+									});
+									return;
+								}
+								_this.createOrderInfo['img' + key].push(res.data.img);
+								if (num < _this.uploadlength) {
+									uni.setTimeout(_this.uplodephone(num, _this.localIds, key), 500);
+								}
+								_this.logocome = !_this.logocome;
+								_this.logocome = !_this.logocome;
+								// _this.userInfo.thumbs.push(res.data.image);
+							}
+						},
+						false,
+						() => {
+							uni.hideLoading();
+						}
+					);
+				} else {
+					uni.hideLoading();
+					App.showError('上传失败');
+				}
+			});
+		},
+		// 文件上传接口
+		async uploadFiles(type, key, numbers) {
+			let _this = this;
+			_this.ifonshow = false;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(numbers);
+			    console.info(res);
+			    if (type == 1) {
+			    	console.log(res);
+			    	let img = await App._upLoad(res.tempFilePaths[0]);
+			    	_this.type1Url = img.data.img;
+			    	_this.type1Urlon = img.data.image;
+			    	_this.createOrderInfo[key].data = _this.type1Url;
+			    } else if (type == 2) {
+			    	for (let i = 0; i < res.tempFilePaths.length; i++) {
+			    		let imgs = await App._upLoad(res.tempFilePaths[i]);
+			    		// _this.type2Url = _this.createOrderInfo['img' + key];
+			    		if (_this.createOrderInfo['img' + key].length == numbers) {
+			    			uni.showToast({
+			    				title: '最多上传九张图片',
+			    				icon: 'none'
+			    			});
+			    			return;
+			    		}
+			    		console.log(_this.type2Url, _this.createOrderInfo['img' + key]);
+			    		_this.createOrderInfo['img' + key].push(imgs.data.img);
+			    		_this.type2Urlon.push(imgs.data.image);
+			    		// _this.createOrderInfo['img' + key] = _this.type2Url;
+			    	}
+			    
+			    	// res.tempFilePaths.map(item=>{
+			    	// 	let imgs = await App._upLoad(item);
+			    	// })
+			    }
+				return
+			}
+			if (type == 2) {
+				wxApi.choseImage(res => {
+					// let length
+
+					_this.localIds = res.localIds;
+					_this.uploadlength = res.localIds.length;
+					_this.uplodephone(0, _this.localIds, key, numbers);
+				}, numbers);
+			} else {
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (type == 1) {
+										_this.type1Url = res.data.img;
+										_this.type1Urlon = res.data.image;
+										_this.createOrderInfo[key].data = _this.type1Url;
+									}
+									_this.logocome = !_this.logocome;
+									_this.logocome = !_this.logocome;
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+			}
+
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: numbers,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					if (type == 1) {
+						console.log(res);
+						let img = await App._upLoad(res.tempFilePaths[0]);
+						_this.type1Url = img.data.img;
+						_this.type1Urlon = img.data.image;
+						_this.createOrderInfo[key].data = _this.type1Url;
+					} else if (type == 2) {
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let imgs = await App._upLoad(res.tempFilePaths[i]);
+							// _this.type2Url = _this.createOrderInfo['img' + key];
+							if (_this.createOrderInfo['img' + key].length == numbers) {
+								uni.showToast({
+									title: '最多上传九张图片',
+									icon: 'none'
+								});
+								return;
+							}
+							console.log(_this.type2Url, _this.createOrderInfo['img' + key]);
+							_this.createOrderInfo['img' + key].push(imgs.data.img);
+							_this.type2Urlon.push(imgs.data.image);
+							// _this.createOrderInfo['img' + key] = _this.type2Url;
+						}
+
+						// res.tempFilePaths.map(item=>{
+						// 	let imgs = await App._upLoad(item);
+						// })
+					}
+				}
+			});
+			// #endif
+		},
+		closeLogo(key, item) {
+			let _this = this;
+			_this.type1Url = '';
+			_this.type1Urlon = '';
+			_this.createOrderInfo[key].data = '';
+			// _this.userInfo['m' + index] = '';
+			// _this.$set(_this.createOrderInfo, 'p' + index, '');
+			_this.logocome = !_this.logocome;
+			_this.logocome = !_this.logocome;
+		},
+		showFalse() {
+			console.log('进了showfalse');
+			this.vxshow = false;
+		},
+		prices(redPacketItem) {
+			//红包满减价格计算
+			let _this = this;
+			console.log(redPacketItem, 'redPacketItem');
+			if (redPacketItem.check) {
+				_this.redPagId = redPacketItem.id;
+				_this.cut_money = redPacketItem.cut_money;
+				_this.redPackageNum = '已选1张';
+				_this.redPackageNumSubtract.val = '-' + redPacketItem.cut_money;
+				_this.redPackageNumSubtract.num = redPacketItem.cut_money;
+			} else {
+				_this.redPagId = 0;
+				_this.cut_money = 0;
+				_this.redPackageNum = '可用' + _this.orderSubmitInfo.redpacklist.list.length + '张';
+				_this.redPackageNumSubtract.val = '';
+				_this.redPackageNumSubtract.num = 0;
+			}
+
+			// _this.redPackageNum = "-" + e.cut_money +"元"
+		},
+		redPagClosePop(e) {
+			let _this = this;
+			_this.showrRedpack = false;
+			setTimeout(()=>{
+				_this.$refs.redPagDown.redPagss = false;
+			})
+			
+			
+		},
+		redPagShows() {
+			let _this = this;
+			_this.showrRedpack = true;
+			setTimeout(()=>{
+				_this.$refs.redPagDown.redPagss = true;
+			})
+			// console.log(_this.$refs.redPagDown.)
+		},
+		closePop() {
+			let _this = this;
+			_this.popShow = false;
+		},
+		init() {
+			let _this = this;
+			_this.getOrderSubmitInfo();
+		},
+		getcardList() {
+			let _this = this;
+			App._post_form('&p=halfcard&do=cardList', {}, res => {
+				if (res.errno === 0) {
+					_this.setData({
+						cardList: res.data.list,
+						carddata: res.data
+					});
+					_this.cardList.map(item => {
+						for (let key in _this.orderSubmitInfo.carddisList) {
+							if (key == item.levelid) {
+								item.vip_price = _this.orderSubmitInfo.carddisList[key].vipprice;
+							}
+						}
+					});
+				}
+			});
+		},
+		select_card(memberCardInfo) {
+			let { cardId } = this;
+			let _this = this;
+			//取消选择
+			// debugger
+			if (memberCardInfo.id === cardId) {
+				this.setData({
+					cardId: null,
+					card_price: 0
+				});
+			} else {
+				this.setData({
+					cardId: memberCardInfo.id,
+					card_price: memberCardInfo.price
+				});
+				for (let key in _this.orderSubmitInfo.carddisList) {
+					if (key == memberCardInfo.levelid) {
+						_this.orderSubmitInfo.carddiscount = _this.orderSubmitInfo.carddisList[key].vipprice;
+					}
+				}
+			}
+		},
+		//身份证校验
+		cardids(id) {
+			// true "验证通过", false //校验不通过
+			let format = /^(([1][1-5])|([2][1-3])|([3][1-7])|([4][1-6])|([5][0-4])|([6][1-5])|([7][1])|([8][1-2]))\d{4}(([1][9]\d{2})|([2]\d{3}))(([0][1-9])|([1][0-2]))(([0][1-9])|([1-2][0-9])|([3][0-1]))\d{3}[0-9xX]$/;
+			//号码规则校验
+			if (!format.test(id)) {
+				return false;
+			}
+			//区位码校验
+			//出生年月日校验   前正则限制起始年份为1900;
+			let year = id.substr(6, 4), //身份证年
+				month = id.substr(10, 2), //身份证月
+				date = id.substr(12, 2), //身份证日
+				time = Date.parse(month + '-' + date + '-' + year), //身份证日期时间戳date
+				now_time = Date.parse(new Date()), //当前时间戳
+				dates = new Date(year, month, 0).getDate(); //身份证当月天数
+			if (time > now_time || date > dates) {
+				return false;
+			}
+			//校验码判断
+			let c = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2); //系数
+			let b = new Array('1', '0', 'X', '9', '8', '7', '6', '5', '4', '3', '2'); //校验码对照表
+			let id_array = id.split('');
+			let sum = 0;
+			for (let k = 0; k < 17; k++) {
+				sum += parseInt(id_array[k]) * parseInt(c[k]);
+			}
+			if (id_array[17].toUpperCase() != b[sum % 11].toUpperCase()) {
+				return false;
+			}
+			return true;
+		},
+		/**
+		 * 加载更多会员卡
+		 */
+		moreCardList() {
+			let _this = this,
+				member_number = _this.member_number,
+				cardlistnum = _this.cardList.length;
+			if (member_number === 0) {
+				_this.setData({
+					member_number: cardlistnum
+				});
+			} else if (member_number === cardlistnum) {
+				_this.setData({
+					member_number: 0
+				});
+			}
+		},
+		
+		lateorder(){
+			return new Promise((resolve, reject) => {
+				App.showError(
+					`此商品支付立即充值，充值后无法申请退款，请确认充值手机号无误!`,
+					data => {
+						resolve(data.confirm)
+					},
+					true
+				);
+			})
+			
+		},
+		
+		// 生成订单接口
+		async createOrder(e) {
+			let _this = this;
+			if (!_this.gopay) {
+				return;
+			}
+			_this.gopay = false;
+			setTimeout(() => {
+				_this.gopay = true;
+				uni.hideLoading();
+			}, 2000);
+			let accountInformation = '';//存储全部充值数据
+			let flags = false;//判断用户点击选择
+			if(_this.orderSubmitInfo.threestatus == 1){
+				let template = _this.orderSubmitInfo.template;
+				let flag = true;//判断是否有未填写选项
+				template.forEach((item,index)=>{
+					if(!item.value){
+						uni.showToast({
+							icon:'none',
+							title:item.tips
+						});
+						flag = false;
+						return
+					}else{
+						if(index == template.length -1){
+							accountInformation = accountInformation + `${item.value}`
+						}else{
+							accountInformation = accountInformation + `${item.value},`
+						}
+					}
+					})
+					console.log(accountInformation);
+					if(!flag){
+						return
+					}else{
+						flags = await _this.lateorder();
+					}
+				
+				if (!flags) return
+			}
+			uni.showLoading({
+				title: '正在提交订单...',
+				mask: true
+			});
+			if (_this.orderSubmitInfo.usestatus == 0) {
+				_this.allUsestatus = 0;
+			}
+			if (_this.orderSubmitInfo.usestatus == 1) {
+				_this.allUsestatus = 1;
+			}
+			if (_this.orderSubmitInfo.usestatus == 2 && _this.usestatus == 1) {
+				_this.allUsestatus = 1;
+			}
+			if (_this.orderSubmitInfo.usestatus == 2 && _this.usestatus == 0) {
+				_this.allUsestatus = 0;
+			}
+			if (_this.orderSubmitInfo.address == undefined) {
+				_this.orderSubmitInfo.address = {
+					id: ''
+				};
+			}
+			if ((_this.usestatus == 0 && _this.orderSubmitInfo.usestatus == 2) || (_this.usestatus == 1 && _this.orderSubmitInfo.usestatus == 0)) {
+				let reg = /^1[3|4|5|6|7|8|9][0-9]{9}$/;
+				if (!!!_this.createOrderInfo.thname) {
+					App.showError('请填写联系人姓名');
+					_this.gopay = true;
+					uni.hideLoading();
+					return false;
+				}
+				if (!reg.test(_this.createOrderInfo.thmobile)) {
+					App.showError('请填写正确的联系电话');
+					_this.gopay = true;
+					uni.hideLoading();
+					return false;
+				}
+				if(!_this.createOrderInfo.time && _this.orderSubmitInfo.pftid &&  _this.orderSubmitInfo.UUdelaytype == 1){
+					App.showError('请选择使用时间');
+					_this.gopay = true;
+					uni.hideLoading();
+					return false;
+				}
+				let flag = true;
+				if (!!_this.orderSubmitInfo.diyform) {
+					for (let i = 0; i < _this.orderSubmitInfo.diyform.length; i++) {
+						if (_this.orderSubmitInfo.diyform[i].type == 'idcard') {
+							console.log(_this.cardids(_this.createOrderInfo['p' + i]), '测试身份证身份证');
+							if (!_this.cardids(_this.createOrderInfo['p' + i])) {
+								App.showError('身份证输入有误');
+								flag = false;
+								uni.hideLoading();
+								return;
+							}
+						} else if (_this.orderSubmitInfo.diyform[i].type == 'tel') {
+							let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+							if (!myreg.test(_this.createOrderInfo['p' + i])) {
+								App.showError('手机号码格式不正确');
+								flag = false;
+								uni.hideLoading();
+								return;
+							}
+						} else {
+							if (!_this.createOrderInfo.hasOwnProperty('p' + i)) {
+								App.showError('请完善身份信息');
+								_this.gopay = true;
+								uni.hideLoading();
+								flag = false;
+								return false;
+							}
+						}
+					}
+				}
+				if(!!_this.orderSubmitInfo.pftid && _this.orderSubmitInfo.UUtourist_info != '0' && _this.orderSubmitInfo.threestatus == 0){
+					
+					let myreg = /^[1][3,4,5,7,8,9][0-9]{9}$/;
+					_this.pfArr.forEach((item,index)=>{
+						if(!item.name){
+							App.showError('购票人姓名不能为空');
+							flag = false;
+							uni.hideLoading();
+							return;
+						}
+						if(!myreg.test(item.phone)){
+							App.showError('手机号码格式不正确');
+							flag = false;
+							uni.hideLoading();
+							return;
+						}
+						if(!_this.cardids(item.cradId)){
+							App.showError('身份证输入有误');
+							flag = false;
+							uni.hideLoading();
+							return;
+						}
+					})
+				}
+				
+				if (!flag) return;
+			}
+			
+			let data = _this.createOrderInfo;
+			(data.groupid = _this.group_id),
+				(data.id = _this.createOrderInfo.id),
+				(data.num = _this.num),
+				(data.usestatus = _this.allUsestatus),
+				(data.plugin = _this.orderSubmitInfo.plugin),
+				(data.specid = _this.createOrderInfo.specid),
+				(data.creditstatus = _this.integralType),
+				(data.thname = _this.createOrderInfo.thname),
+				(data.thmobile = _this.createOrderInfo.thmobile),
+				(data.addressid = _this.orderSubmitInfo.address.id),
+				(data.remark = _this.createOrderInfo.remark),
+				(data.buystatus = _this.buystatus),
+				(data.vip_card_id = _this.cardId),
+				(data.redpackid = _this.redPagId),
+				(data.drawid = _this.createOrderInfo.drawid || ''),
+				(data.luckydrawid = _this.createOrderInfo.luckydrawid || ''),
+			data.diyformid = _this.orderSubmitInfo.diyformid || '';
+			data.template = accountInformation;
+
+			setTimeout(() => {
+				// console.log(_this.$refs.formItem.ifrequired, '他为什么是个flase呢');
+				if(_this.$refs.formItem){
+					if (_this.$refs.formItem.ifrequired == false) {
+						uni.showToast({
+							icon: 'none',
+							title: '请完善必填信息'
+						});
+						return;
+					}else{
+						let datas = _this.$refs.formItem.formList;
+						data.datas = JSON.stringify(datas);
+					}
+				}
+				// debugger
+				if(_this.orderSubmitInfo.pftid && _this.orderSubmitInfo.threestatus == 0){
+					let namelist = '';
+					let cardidlist = '';
+					let contactTEL = '';
+					_this.pfArr.forEach((item,index)=>{
+						namelist = namelist + (index==0?item.name:`,${item.name}`);
+						contactTEL = contactTEL + (index==0?item.phone:`,${item.phone}`);
+						cardidlist = cardidlist + (index==0?item.cradId:`,${item.cradId}`);
+					})
+					let tickData = {
+						pftid:_this.orderSubmitInfo.pftid,
+						pftuid:_this.orderSubmitInfo.pftuid,
+						playtime:_this.createOrderInfo.time,
+						num:_this.num,
+						tel:_this.createOrderInfo.thmobile,
+						namelist,
+						cardidlist,
+						contactTEL
+					};
+					_this.getTicketing(tickData).then(dataT =>{
+						data.pftid = _this.orderSubmitInfo.pftid;
+						let jsonString = JSON.stringify(dataT);
+						let base64 = new this.$util.Base64();
+						data.pftdatas = base64.encode(jsonString);
+						_this.PaymentRequests(data);
+					})
+					return
+				}else{
+					_this.PaymentRequests(data);
+				}
+				
+			});
+		},
+		PaymentRequests(data){
+			let _this = this;
+			App._post_form(
+				'&p=pay&do=createOrder',
+				data,
+				res => {
+					if (res.data.status == 1) {
+						_this.saveForm('0');
+						uni.redirectTo({
+							url: '/pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=' + _this.orderSubmitInfo.plugin
+						});
+					}
+					if (res.data.status == 0) {
+						console.info('plugin', res.data.plugin);
+						App.navigationTo({
+							url: 'pages/subPages/paySuccess/paySuccess?tid=' + res.data.tid + '&plugin=' + res.data.plugin + '&draw=' + _this.createOrderInfo.drawid
+						});
+					}
+					_this.gopay = true;
+					uni.hideLoading();
+				},
+				fail => {
+					_this.ifonshow = false;
+					if (fail.data.message == '未绑定手机号') {
+						//#ifdef H5
+						_this.popShow = true;
+						_this.gopay = true;
+						uni.hideLoading();
+						//#endif
+						//#ifndef H5
+						_this.vxshow = true;
+						_this.gopay = true;
+						uni.hideLoading();
+						//#endif
+					}
+				}
+			);
+		},
+		getTicketing(data){
+			let _this = this;
+			return new Promise((resolve, reject) => {
+				App._post_form(
+					'&p=pftapimod&do=pftOrderPreCheck',
+					data,
+					res => {
+						resolve(res.data)
+					}
+				);
+			})
+		},
+		
+		// 跳转地址
+		goAddress(type) {
+			App.navigationTo({
+				url: 'pages/subPages/receivingAddress/receivingAddress?type=' + type
+			});
+		},
+		changIntegral(type) {
+			let _this = this;
+			_this.integralType = type;
+		},
+		addtime(value) {
+			let time = value * 1000;
+			if (typeof time == 'undefined') {
+				return '';
+			} else {
+				let date = new Date(parseInt(time));
+				let y = date.getFullYear();
+				let MM = date.getMonth() + 1;
+				MM = MM < 10 ? '0' + MM : MM;
+				let d = date.getDate();
+				d = d < 10 ? '0' + d : d;
+				let h = date.getHours();
+				h = h < 10 ? '0' + h : h;
+				let m = date.getMinutes();
+				m = m < 10 ? '0' + m : m;
+				let s = date.getSeconds();
+				s = s < 10 ? '0' + s : s;
+				return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+			}
+		},
+		// 订单提交页面
+		getOrderSubmitInfo() {
+			let _this = this;
+			let data = _this.createOrderInfo;
+			App._post_form('&p=pay&do=orderSubmit', data, res => {
+				console.log(res, 1022);
+				if (res.data.redpacklist.list.length) {
+					_this.redPackageNum = '可用' + res.data.redpacklist.list.length + '张';
+				} else {
+					_this.redPackageNum = null;
+				}
+				res.data.goodsprice = Number(res.data.goodsprice);
+				res.data.expressprice = Number(res.data.expressprice);
+				res.data.vipdiscount = Number(res.data.vipdiscount);
+				_this.num = Number(_this.num);
+				_this.orderSubmitInfo = res.data;
+				_this.orderSubmitInfoData = res.data;
+				_this.gopaytwo = !_this.gopaytwo;
+				setTimeout(() => {
+					_this.gopaytwo = !_this.gopaytwo;
+				});
+				// _this.cardId = _this.orderSubmitInfo.halfcardflag;
+				_this.orderSubmitInfo.carddisList = res.data.carddiscount;
+				if (Array.isArray(_this.orderSubmitInfo.carddisList) && _this.orderSubmitInfo.carddisList.length == 0) {
+					console.log('dayu0');
+					_this.orderSubmitInfo.carddisList = false;
+				} else {
+					console.log('dayu1');
+				}
+				if(_this.orderSubmitInfo.UUtourist_info == '1'){
+					_this.pfArr = [
+						{
+							name:'',
+							phone:'',
+							cradId:''
+						}
+					]
+				};
+				if(_this.orderSubmitInfo.UUtourist_info == '0'){
+					_this.pfArr = [
+						
+					]
+				};
+				// debugger
+				// for(let key in _this.orderSubmitInfo.carddisList){
+				if (!_this.cardId) {
+					_this.orderSubmitInfo.carddiscount = _this.orderSubmitInfo.vipdiscount;
+				}
+
+				// }
+				// debugger
+				// console.log(_this.orderSubmitInfo.carddiscount,);
+				// _this.orderSubmitInfo.carddiscount = res.
+				if (!_this.orderSubmitInfo.fullreducelist) {
+					_this.orderSubmitInfo.fullreducelist = {
+						list: [],
+						title: ''
+					};
+				}
+				let count = 0;
+
+				let redPagList = _this.orderSubmitInfo.redpacklist.list;
+				redPagList.map(val => {
+					val.isCheked = false;
+				});
+				_this.setData({
+					redPagList
+				});
+				if (res.data.usestatus == 1) {
+					console.info('第一步');
+					_this.allMone = Util.additionFloat(Util.multiplicationFloat(res.data.goodsprice, _this.num, 100), res.data.expressprice, 100);
+					_this.createOrderInfo.addressid = res.data.address.id;
+					if (res.data.halfcardflag && res.data.vipdiscount !== '') {
+						_this.allMoney = Util.subtractionFloat(
+							Util.additionFloat(Util.multiplicationFloat(res.data.goodsprice, _this.num, 100), res.data.expressprice, 100),
+							res.data.vipdiscount,
+							100
+						);
+					}
+				}
+				if (res.data.usestatus == 2 && _this.usestatus == 1) {
+					console.info('第二步');
+					_this.allMone = Util.additionFloat(Util.multiplicationFloat(res.data.goodsprice, _this.num, 100), res.data.expressprice, 100);
+					if (res.data.halfcardflag && res.data.vipdiscount !== '') {
+						let one = Util.multiplicationFloat(res.data.goodsprice, _this.num, 100),
+							two = res.data.expressprice,
+							three = Util.additionFloat(one, two, 100);
+						_this.allMoney = Util.subtractionFloat(three, res.data.vipdiscount, 100);
+					}
+				}
+				if (res.data.usestatus == 0 || (res.data.usestatus == 2 && _this.usestatus == 0)) {
+					console.info('第三步');
+					_this.allMoney = Util.subtractionFloat(Util.multiplicationFloat(res.data.goodsprice, _this.num, 100), res.data.vipdiscount, 100);
+				}
+				console.log(_this.createOrderInfo);
+				// debugger
+				_this.createOrderInfo.thmobile = res.data.mobile;
+				_this.createOrderInfo.thname = res.data.realname;
+				_this.getcardList();
+				_this.goodsprice = res.data.goodsprice;
+				console.log(_this.orderSubmitInfo.goodsprice, '14452', _this.goodsprice, num);
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less">
+page {
+	height: 100%;
+	background-color: #f7f7f7 !important;
+}
+
+.header_bg {
+	width: 100%;
+	height: 320upx;
+	background-size: 100% 320upx;
+	background-repeat: no-repeat;
+}
+
+.checkHx {
+	z-index: 2;
+	position: relative;
+	bottom: 65upx;
+	left: 250upx;
+	width: 80upx;
+	height: 88upx;
+	transform: rotate(15deg);
+	background-color: #ffffff;
+	border-top-left-radius: 14upx;
+}
+
+.Ps {
+	z-index: 1;
+	position: relative;
+	bottom: 64upx;
+	left: 260upx;
+	width: 80upx;
+	height: 88upx;
+	background: #ffe8e8;
+}
+
+.Hx {
+	z-index: 1;
+	position: relative;
+	bottom: 64upx;
+	left: 260upx;
+	width: 80upx;
+	height: 88upx;
+	background: #ffe8e8;
+}
+
+.checkPs {
+	z-index: 2;
+	position: relative;
+	bottom: 65upx;
+	left: 276upx;
+	width: 80upx;
+	height: 88upx;
+	transform: rotate(-15deg);
+	background-color: #ffffff;
+	border-top-right-radius: 14upx;
+}
+
+.check-right-radius {
+	border-top-right-radius: 10upx;
+}
+
+.check-left-radius {
+	border-top-left-radius: 10upx;
+}
+
+.checkOrderTypeButton {
+	height: 71upx;
+	overflow: hidden;
+
+	> view:nth-child(1) {
+		margin-top: 10upx;
+		border-radius: 10upx 0 0 0;
+	}
+
+	> view:nth-child(2) {
+		border-radius: 0 10upx 0 0;
+		margin-left: 32upx;
+	}
+
+	> view {
+		display: inline-block;
+		vertical-align: bottom;
+	}
+}
+
+.nCheck {
+	vertical-align: bottom;
+	width: 316upx;
+	height: 64upx;
+	background: #ffe8e8;
+	text-align: center;
+
+	> span {
+		line-height: 64upx;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.ncheck1 {
+	margin-top: 10upx;
+}
+
+.checkOne {
+	margin-left: 8upx;
+}
+
+.check {
+	text-align: center;
+	vertical-align: bottom;
+	width: 334upx;
+	height: 71upx;
+	background: #ffffff;
+
+	> span {
+		line-height: 71upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.checkReceivingAdress {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+}
+
+.checkOrderType {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	border-radius: 10upx;
+}
+
+.full {
+	width: 750upx;
+	height: 118upx;
+}
+
+.submitOrder {
+	font-size: 0;
+	margin-top: -40%;
+}
+
+.orderDetails {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin: 20upx auto 0 auto;
+}
+
+.orderDetailsImg {
+	width: 130upx;
+	height: 130upx;
+
+	> image {
+		width: 130upx;
+		height: 130upx;
+	}
+}
+
+.orderDetailsPackage {
+	padding: 30upx;
+
+	> view {
+		vertical-align: top;
+		display: inline-block;
+	}
+}
+
+.orderDetailsInfo {
+	margin-left: 20upx;
+}
+
+.orderInfoTitle {
+	> span {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: inline-block;
+		width: 453upx;
+		font-size: 28upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.orderInfoBody {
+	margin-top: 10upx;
+
+	> span {
+		font-size: 24upx;
+		width: 453upx;
+		display: inline-block;
+		color: rgba(153, 153, 153, 1);
+	}
+}
+
+.orderInfoFoot {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 15upx;
+
+	> span:nth-child(1) {
+		display: inline-block;
+		vertical-align: bottom;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(255, 68, 68, 1);
+	}
+
+	> span:nth-child(2) {
+		display: inline-block;
+		vertical-align: bottom;
+		font-size: 24upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+}
+
+.paymentInfo {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.paymentInfoPackage {
+	padding: 30upx;
+
+	> view:nth-child(1) {
+		margin-top: 0;
+	}
+
+	> view {
+		margin-top: 30upx;
+		display: flex;
+		justify-content: space-between;
+
+		> text {
+			vertical-align: middle;
+		}
+
+		> text:nth-child(1) {
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+
+		> text:nth-child(2) {
+			font-size: 24upx;
+
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+}
+
+.checkUserInfo {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+}
+
+.userInfo {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.userInfoPackage {
+	padding: 0 30upx;
+
+	> view {
+		border-bottom: 1px solid #eeeeee;
+	}
+
+	> view:last-child {
+		border: none;
+	}
+
+	.inops{
+		margin-left: 40upx;
+		display: inline-block;
+		width: 350upx;
+		height: 82upx;
+		color: rgba(51, 51, 51, 1);
+		font-size: 24upx;
+		
+		vertical-align: middle;
+	}
+
+	> view {
+		> span {
+			display: inline-block;
+			vertical-align: middle;
+			width: 200upx;
+			font-size: 24upx;
+			line-height: 80upx;
+			color: rgba(51, 51, 51, 1);
+		}
+
+		> input  {
+			margin-left: 40upx;
+			display: inline-block;
+			width: 350upx;
+			height: 82upx;
+			color: rgba(51, 51, 51, 1);
+			font-size: 24upx;
+
+			vertical-align: middle;
+		}
+		.userInput{
+			margin-left: 40upx;
+			display: inline-block;
+			width: 350upx;
+			height: 82upx;
+			color: rgba(51, 51, 51, 1);
+			font-size: 24upx;
+			
+			vertical-align: middle;
+		}
+	}
+}
+
+input::placeholder {
+	color: rgba(153, 153, 153, 1);
+}
+
+.messageSave {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.messageSavePackage {
+	padding: 30upx;
+
+	> input {
+		padding-left: 30upx;
+		height: 77upx;
+		background: rgba(248, 248, 248, 1);
+		border-radius: 10upx;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.navButtom {
+	position: fixed;
+	bottom: 0;
+	width: 750upx;
+	height: 98upx;
+	background: rgba(255, 255, 255, 1);
+	border: 1upx solid rgba(238, 238, 238, 0.67);
+	z-index: 2;
+}
+
+.navButtomLeft {
+	display: inline-block;
+	width: 515upx;
+}
+
+.navButtomLeftPackage {
+	padding: 30upx;
+	height: 40upx;
+	line-height: 40upx;
+
+	> span:nth-child(2) {
+		color: #ff4444;
+	}
+
+	> span {
+		font-size: 24upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.submitButton {
+	display: inline-block;
+	width: 235upx;
+	height: 100upx;
+	background: rgba(255, 68, 68, 1);
+	text-align: center;
+	line-height: 100upx;
+
+	> span {
+		line-height: 98upx;
+		font-size: 28upx;
+
+		font-weight: bold;
+		color: rgba(255, 255, 255, 1);
+	}
+
+	> button {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+		opacity: 0;
+	}
+}
+
+.receivingAdress {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.receiptDetailsFoot {
+	background: repeating-linear-gradient(-45deg, white, white 5%, #ff4444 5%, #ff4444 10%, white 10%, white 15%, #52a7f8 15%, #52a7f8 20%);
+	width: 690upx;
+	height: 6upx;
+	border-radius: 10upx;
+}
+
+.receivingAdressPackage {
+	padding: 30upx;
+	display: flex;
+	justify-content: space-between;
+
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+
+.receivingAdressRight {
+	font-size: 28upx;
+}
+
+.receivingAdressTitle {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 62upx;
+		height: 35upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+
+		> span {
+			line-height: 35upx;
+			font-size: 14upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	> span {
+		margin-left: 10upx;
+		vertical-align: middle;
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.receivingAdressBody {
+	margin-top: 10upx;
+
+	> span {
+		font-size: 32upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.receivingAdressFoot {
+	margin-top: 10upx;
+
+	> span:nth-child(2) {
+		margin-left: 10upx;
+	}
+
+	> span {
+		font-size: 24upx;
+
+		color: rgba(51, 51, 51, 1);
+	}
+}
+
+.firstCanvas {
+	width: 345upx;
+	height: 71upx;
+	background: white;
+}
+
+.integralInfo {
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+
+.integralInfoPackage {
+	padding: 30upx;
+	display: flex;
+	justify-content: space-between;
+
+	> view:nth-child(1) {
+		> span {
+			line-height: 40upx;
+			font-size: 24upx;
+
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+	}
+}
+
+.switch {
+	width: 80upx;
+	height: 40upx;
+	border-radius: 20upx;
+
+	.isswitchClose {
+		background: #dddddd;
+	}
+
+	.isswitchOn {
+		background: rgba(255, 68, 68, 1);
+	}
+
+	> view {
+		padding: 6upx;
+		display: flex;
+		justify-content: space-between;
+
+		> view {
+			width: 28upx;
+			height: 28upx;
+			box-shadow: 0upx 2upx 6upx 0upx rgba(255, 68, 68, 0.35);
+			border-radius: 50%;
+		}
+	}
+}
+
+.member {
+	overflow: hidden;
+	margin: 20upx 30upx 0;
+}
+
+.member-header .header-left {
+	padding: 0 20upx;
+	height: 44upx;
+	background-size: 160upx, 44upx;
+	background-color: #36384d;
+	max-width: 40%;
+}
+
+.header-left .left-member-logo {
+	width: 30upx;
+	height: 30upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAllBMVEUAAAD93Dv+3Dz93Dz93Dz+3Tz93Dv/3Tn93Dv93Tr/3Tn93Dv83Dv93Dv93Tv83Dr82zr93Tz+3Dz+3Dz93Dz93Dv+3Dv93Dz93Dz83Dv72zr/3Dr93Tn93Tf83TX93Dv+3Dz92zv83Dr/3jz/6C7/0S7/3jj83Dz+3Tz93Dv93Dv93Dz92zz93Dz93Dv/2zr/2jz93DzCovTLAAAAMXRSTlMAfuOJ5/BkHPpWFum/pJ1bR+ba0crEuat7TUAvKiAQ9tZqYDULCwe0s5eSg3JubCMirPs29wAAANlJREFUKM/N0FduwzAQBNCRbDb1ZqtG7k4ve//LBQIhMZLAfAZ5P+QsCHAx+Dt3Fd9gtyfaweqLuKIONjdW7A49rGIiDivhHvP0YTVN9Nkf/U/hZp5OzfiuonIY3QvWAh3LrwC8kJzpR+nHwJNshnQ5BIDaymmLC9V7CiNSOtbDPUiogdbLEzijD0DjxE44kzdm9xkQNSaJADa+6TLAyqNp98XHShZh1L5i6Srf8YuWEhP4Zq6Doh/lMubOnOEwGEGJhbKAEWVYyEMYb5RuZ1JyYHiVs1AJ/HPfuCkPAKRs+tsAAAAASUVORK5CYII=);
+	background-size: 30upx 30upx;
+	background-repeat: no-repeat;
+	margin-right: 10upx;
+}
+
+.member-header .header-right {
+	width: 376upx;
+	height: 44upx;
+	line-height: 44upx;
+	background: linear-gradient(90deg, rgba(255, 223, 78, 1), rgba(252, 218, 49, 1));
+	border-radius: 0 0 20upx 0;
+}
+
+.header-left .left-member-title {
+	color: #fcda31;
+}
+
+.member-header .header-right text {
+	color: #f04c4c;
+}
+
+.member-nowprice {
+	color: #f04c4c;
+}
+
+.member-list .member-list-items {
+	position: relative;
+	padding: 20upx 110upx 20upx 30upx;
+	/* border-bottom: 1px solid #EEEEEE; */
+}
+
+.member-list .member-list-items .select-logo {
+	position: absolute;
+	right: 30upx;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.member-list .member-list-items .select-logo image {
+	width: 36upx;
+	height: 36upx;
+}
+
+.redPacketIcon {
+	font-size: 24upx;
+}
+.dynamiccheck {
+	// width: 100upx;
+	padding: 0 30upx;
+	font-size: 20upx;
+	border-radius: 10upx;
+	border: 1upx solid #ff4444;
+	color: #ffffff;
+	background-color: #ff4444;
+	height: 50upx;
+	line-height: 50upx;
+	margin-right: 10upx;
+	margin-bottom: 20upx;
+	// flex: 0.15;
+}
+.dynamicnocheck {
+	// width: 100upx;
+	padding: 0 30upx;
+	font-size: 20upx;
+	border-radius: 10upx;
+	border: 1upx solid #ff4444;
+	color: #ff4444;
+	// flex: 0.15;
+	height: 50upx;
+	line-height: 50upx;
+	margin-right: 10upx;
+	margin-bottom: 20upx;
+}
+</style>
+
+<style>
+	page{
+		height: 100vh;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages/webview/webview.vue b/pages/subPages/webview/webview.vue
new file mode 100644
index 0000000..bf9b8cf
--- /dev/null
+++ b/pages/subPages/webview/webview.vue
@@ -0,0 +1,21 @@
+<template>
+	<view v-if="urlsrc">
+		<web-view :src="urlsrc" style="height:75vh;position: fixed;"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				urlsrc: null
+			}
+		},
+		onLoad(e) {
+				this.urlsrc = decodeURIComponent(e.urlsrc);
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/subPages/writeRecord/index.vue b/pages/subPages/writeRecord/index.vue
new file mode 100644
index 0000000..7f8efaf
--- /dev/null
+++ b/pages/subPages/writeRecord/index.vue
@@ -0,0 +1,840 @@
+<template>
+	<scroll-view class="writeRecord" :style="{ height: phoneHight }" scroll-y :scroll-x="false" :lower-threshold="0" @scrolltolower="load">
+		<far-bottom></far-bottom>
+		<!-- 顶部导航栏 -->
+		<view class="topNav">
+			<!-- <view class="record">
+				<view class="record-search">
+					<view class="search-main">
+						<view class="search-box dis-flex flex-y-center">
+							<view class="search-input">
+								<view class="i icon iconfont icon-sousuo"></view>
+								<input
+									type="text"
+									v-model="keyword"
+									placeholder="请输入订单号或者店员姓名"
+									placeholder-style="color:#999999;margin-left:10upx;"
+									class="f-24"
+									@blur="getSearch"
+								/>
+							</view> -->
+							<!-- <picker mode="selector" :range="Verif.adminlist" @change="changeAdmin" range-key="name">
+								<view class="dis-flex search-select f-28" @click="popShow = true">
+									{{ adminlist[admin]}}
+									<view class="i icon iconfont icon-unfold"></view>
+								</view>
+							</picker> -->
+				<!-- 		</view>
+					</view>
+				</view>
+			</view> -->
+			<view class="b-f dis-flex diy-nav-list border-line border-bottom">
+				<view class="topNav_view" @click="openType(1)" :class="currentType === 1 && show == true ? 'color_FF4444' : 'color_333333'">
+					<view class="topNav_text topNav_text_width ver_mid">{{typeText}}</view>
+					<view class="topNav_text iconfont ver_mid" :class="currentType === 1 && show == true ? 'icon-fold' : 'icon-unfold'"></view>
+				</view>
+				<view class="topNav_view" @click="openType(2)" :class="currentType === 2 && show == true ? 'color_FF4444' : 'color_333333'">
+					<view class="topNav_text topNav_text_width ver_mid">{{storeText}}</view>
+					<view class="topNav_text iconfont ver_mid" :class="currentType === 2 && show == true ? 'icon-fold' : 'icon-unfold'"></view>
+				</view>
+				<view class="topNav_view" @click="openType(3)" :class="currentType === 3 && filterDialog == true ? 'color_FF4444' : 'color_333333'">
+					<view class="topNav_text ver_mid">筛选</view>
+					<view class="topNav_text iconfont icon-filter ver_mid"></view>
+				</view>
+			</view>
+			
+		</view>
+		
+		
+		
+		<!-- 顶部导航栏 -->
+		<!-- 顶部填充层 -->
+		<view class="topFull"></view>
+		<!-- 顶部填充层 -->
+
+		<view class="tips">
+			核销总数
+			<text class="tips_text">{{ memberVerifInfo.allnum }}</text>
+			次，共
+			<text class="tips_text">{{ memberVerifInfo.allfen }}</text>
+			件商品!
+		</view>
+
+		<!-- 记录循环模板 -->
+		<block v-for="(item, index) in memberVerifInfoList" :key="index">
+			<view class="mb">
+				<view class="mb_package">
+					<view class="mb_title diy-nav-list border-line border-bottom dis-flex">
+						<view class="mb_title_left">
+							<view class="mb_title_img ver_top dis-inlneB"><image :src="item.avatar"></image></view>
+							<text class="mb_title_text ver_top dis-inlneB">{{ item.nickname }}</text>
+						</view>
+						<view class="mb_title_right">
+							<!-- <text class="mb_right_text">{{ item.pluginname }}</text> -->
+							<text class="mb_right_text">{{ item.classname }}</text>
+						</view>
+					</view>
+					<view class="mb_body diy-nav-list border-line border-bottom">
+						<view class="mb_body_img mar_T30 dis-inlneB ver_top"><image :src="item.goodimg"></image></view>
+						<view class="mb_body_view mar_T30 dis-inlneB ver_top">
+							<view class="mb_body_package dis-flex flex_direction_row">
+								<view class="mb_body_view_title">
+									<text>{{ item.remark }}</text>
+								</view>
+								<view class="dis-flex">
+									<view>
+										<text class="font_24 color_999999" v-if="item.optionname != ''">{{ item.optionname }}套餐</text>
+										<text class="font_24 color_FF4444">x {{ item.num }}</text>
+									</view>
+									<view>
+										<text class="font_24 color_FF4444">¥</text>
+										<text class="font_24 color_FF4444">{{ item.orderprice }}</text>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mb_foot font_24">
+						<view class="dis-flex mar_T30">
+							<text class="color_999999">核销员：</text>
+							<text class="color_333333">{{ item.verifnickname }}</text>
+						</view>
+						<view class="dis-flex mar_T30">
+							<text class="color_999999">核销时间：</text>
+							<text class="color_333333">{{ item.createtime }}</text>
+						</view>
+						<view class="dis-flex mar_T30">
+							<text class="color_999999">核销方式：</text>
+							<text class="color_333333">{{ item.type == 1 ? '输码' : item.type == 2 ? '扫码' : item.type == 3 ? '后台' : '密码' }}核销</text>
+						</view>
+						<!-- 	<view class="dis-flex mar_T30">
+						<text class="color_999999">核销员：</text>
+						<text class="color_333333">某某某</text>
+					</view> -->
+						<view class="dis-flex mar_T30">
+							<text class="color_999999">商家：</text>
+							<text class="color_333333">{{ item.storename }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+		</block>
+		<nonemores v-if="memberVerifInfoList.length == 0"></nonemores>
+		<loadmore v-else :isMore="isMore"></loadmore>
+		<PopManager :show="show" :type="top" @clickmask="closePop" class="pop_view">
+			<view class="popfull"></view>
+			<scroll-view class="pop_main" :scroll-x="false" scroll-y>
+				<view class="pop_main_package">
+					<block v-for="(item, index) in memberVerifInfo.typelist" v-if="currentType === 1" :key="index">
+						<view class="popMb dis-flex" @click="checkType(index)">
+							<view class="font_28" :class="index==typeIndex?'color_FF4444':'color_333333'">{{item.name}}</view>
+							<view class="iconfont icon-check font_28 color_FF4444" v-if="index==typeIndex"></view>
+						</view>
+					</block>
+					<block v-for="(item, index) in memberVerifInfo.storelist" v-if="currentType === 2" :key="index">
+						<view class="popMb dis-flex" @click="checkStore(index)">
+							<view class="font_28" :class="index==storeIndex?'color_FF4444':'color_333333'">{{item.storename}}</view>
+							<view class="iconfont icon-check font_28 color_FF4444" v-if="index==storeIndex"></view>
+						</view>
+					</block>
+				</view>
+			</scroll-view>
+		</PopManager>
+		<view class="record-dialog dis-flex flex-x-center flex-y-center" v-if="filterDialog">
+			<view class="record-dialog-main">
+				<view class="m-top40 f-30 color-33 m-btm40 t-c">筛选时间</view>
+				<view class="color-33 f-24 m-left30">起始时间</view>
+				<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="starChange">
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+					</picker-view-column>
+				</picker-view>
+				<view class="color-33 f-24 m-left30">结束时间</view>
+				<picker-view class="record-picker-view" v-if="visible" :indicator-style="indicatorStyle" :value="value" @change="endChange">
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in years" :key="index">{{ item }}年</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in months" :key="index">{{ item }}月</view>
+					</picker-view-column>
+					<picker-view-column>
+						<view class="item" v-for="(item, index) in days" :key="index">{{ item }}日</view>
+					</picker-view-column>
+				</picker-view>
+				<view class="record-dialog-btns dis-flex flex-y-center">
+					<view class="btn cancel" @click="filterDialog = false">取消</view>
+					<view class="line"></view>
+					<view class="btn confirm" @click="checkBind">确认</view>
+				</view>
+			</view>
+		</view>
+		<!-- 记录循环模板 -->
+	</scroll-view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+
+import nonemores from '@/components/template/nonemores';
+import loadmore from '@/components/template/loadmore';
+import PopManager from '@/components/template/PopManager';
+export default {
+	components: {
+		nonemores,
+		loadmore,
+		PopManager
+	},
+	data() {
+		const date = new Date();
+		const years = [];
+		const year = date.getFullYear();
+		const months = [];
+		const month = date.getMonth() + 1;
+		const days = [];
+		const day = date.getDate();
+		for (let i = 1990; i <= date.getFullYear(); i++) {
+			years.push(i);
+		}
+		for (let i = 1; i <= 12; i++) {
+			months.push(i);
+		}
+		for (let i = 1; i <= 31; i++) {
+			days.push(i);
+		}
+		return {
+			years,
+			year,
+			months,
+			month,
+			days,
+			day,
+			value: [9999, month - 1, day - 1],
+			visible: true,
+			time:'',
+			indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`,
+			filterDialog:false,
+			storeText:'所有店铺',
+			typeText:'所有类型',
+			storeIndex:null,
+			typeIndex:null,
+			currentType: null,
+			top: 'top',
+			show: false,
+			isMore: true,
+			phoneHight: null,
+			currentType: 1,
+			page: 1,
+			type: 'rush',
+			storeid: '',
+			keyword:'',
+			time: '',
+			getlistflag: 1,
+			memberVerifInfoList: [],
+			memberVerifInfo: {},
+			totalpage: null,
+			starYear:'',
+			starMonth:'',
+			starDay:'',
+			endYear:'',
+			endMonth:'',
+			endDay:'',
+			// memberVerifInfo: {newTypeList: []},
+			cc_id: '',
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+	},
+	onShow() {
+		let _this = this;
+		_this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			_this.getMemberVerifList();
+		},
+		starChange: function(e) {
+			// debugger
+			const val = e.detail.value;
+			this.starYear = this.years[val[0]];
+			this.starMonth = this.months[val[1]];
+			this.starDay = this.days[val[2]];
+			
+		},
+		endChange:function(e){
+			const val = e.detail.value;
+			this.endYear = this.years[val[0]];
+			this.endMonth = this.months[val[1]];
+			this.endDay = this.days[val[2]];
+			// debugger
+		},
+		checkBind(){
+			let _this=this
+			// debugger
+			_this.starTime=_this.starYear+'-'+_this.starMonth+'-'+_this.starDay
+			_this.endTime=_this.endYear+'-'+_this.endMonth+'-'+_this.endDay
+			let starData=new Date(_this.starTime)
+			let endData=new Date(_this.endTime)
+			_this.starTime=(starData.getTime()/1000)|| Date.parse(new Date())/1000
+			_this.endTime=(endData.getTime()/1000)|| Date.parse(new Date())/1000
+			_this.time=_this.starTime  +','+_this.endTime
+			_this.getMemberVerifList();
+			_this.filterDialog=false
+		},
+		openType(currentType) {
+			let _this = this;
+			_this.currentType = currentType;
+			if(currentType===3){
+				_this.show = false;
+				_this.filterDialog=true
+			}else{
+				_this.show = true;
+				_this.filterDialog=false
+			}
+		},
+		checkType(index){
+			let _this = this;
+			_this.typeIndex = index;
+			_this.typeText=_this.memberVerifInfo.typelist[index].name
+			_this.type=_this.memberVerifInfo.typelist[index].type
+			_this.cc_id = _this.memberVerifInfo.typelist[index].cc_id;
+			_this.getMemberVerifList();
+			_this.show=false
+		},
+		// checkNewType(index){
+		// 	let _this = this;
+		// 	_this.typeIndex = index;
+		// 	_this.typeText=_this.memberVerifInfo.newTypelist[index].name
+		// 	_this.type=_this.memberVerifInfo.newTypelist[index].type
+		// 	_this.cc_id = _this.memberVerifInfo.newTypelist[index].cc_id;
+		// 	_this.getMemberVerifList();
+		// 	_this.show=false
+		// },
+		checkStore(index){
+			let _this = this;
+			_this.storeIndex = index;
+			_this.storeText = _this.memberVerifInfo.storelist[index].storename;
+			_this.storeid=_this.memberVerifInfo.storelist[index].storeid
+			_this.getMemberVerifList();
+			_this.show=false
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		load() {
+			let _this = this;
+			if (_this.totalpage == _this.page) {
+			} else {
+				_this.page++;
+				_this.isMore = false;
+				let data = {
+					page: _this.page,
+					type: 'rush',
+					storeid: _this.storeid,
+					time: _this.time,
+					getlistflag: 0,
+					cc_id: _this.cc_id
+				};
+				App._post_form('&p=member&do=memberVerifList', data, res => {
+					_this.memberVerifInfoList = [..._this.memberVerifInfoList, ...res.data.list];
+					// _this.memberVerifInfo.newTypeList = [
+					// 	{name:'技能培训',cc_id: '1'},
+					// 	{name:'资格考试',cc_id: '2'},
+					// 	{name:'学历提升',cc_id: '3'},
+					// 	{name:'岗前培训',cc_id: '4'}
+					// ]
+					// _this.memberVerifInfo.newTypeList = res.data.typelist;
+					_this.isMore = true;
+				});
+			}
+		},
+		getMemberVerifList() {
+			let _this = this;
+			_this.page=1
+			let data = {
+				page: _this.page,
+				type: 'rush',
+				storeid: _this.storeid,
+				time: _this.time,
+				getlistflag: _this.getlistflag,
+				cc_id: _this.cc_id
+			};
+			App._post_form('&p=member&do=memberVerifList', data, res => {
+				_this.memberVerifInfo = res.data;
+				_this.memberVerifInfoList = res.data.list;
+				// _this.memberVerifInfo.newTypeList = [
+				// 	{name:'技能培训',cc_id: '1'},
+				// 	{name:'资格考试',cc_id: '2'},
+				// 	{name:'学历提升',cc_id: '3'},
+				// 	{name:'岗前培训',cc_id: '4'}
+				// ]
+				// _this.memberVerifInfo.newTypeList = res.data.typelist;
+				_this.totalpage = res.data.totalpage;
+				_this.starYear = ''
+				_this.starMonth = ''
+				_this.starDay = ''
+				_this.endYear = ''
+				_this.endMonth = ''
+				_this.endDay = ''
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.popMb{
+	margin-bottom: 59upx;
+}	
+.pop_main_package {
+	padding: 33upx 31upx 0 31upx;
+}
+.pop_view {
+	font-size: 0 !important;
+}
+.pop_main {
+	width: 750upx;
+	height: 462upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 0px 0px 20upx 20upx;
+}
+.flex_direction_row {
+	flex-direction: column;
+}
+.font_24 {
+	font-size: 24upx;
+}
+.font_28 {
+	font-size: 28upx;
+}
+.color_FF4444 {
+	color: #ff4444;
+}
+
+.color_999999 {
+	color: #999999;
+}
+.color_333333 {
+	color: #333333;
+}
+.mb_body_view_title {
+	font-size: 28upx;
+	color: rgba(51, 51, 51, 1);
+	display: -webkit-box;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	word-wrap: break-word;
+	white-space: normal !important;
+	-webkit-line-clamp: 2;
+	-webkit-box-orient: vertical;
+}
+.mb_body_package {
+	height: 114upx;
+	width: 490upx;
+	overflow: hidden;
+}
+.mb_body_view {
+	margin-left: 20upx;
+	height: 114upx;
+	width: 490upx;
+	overflow: hidden;
+}
+.mar_T30 {
+	margin-top: 30upx;
+}
+.mb_body_img {
+	width: 114upx;
+	height: 114upx;
+	border-radius: 10upx;
+	overflow: hidden;
+	border: 1upx solid rgba(153, 153, 153, 0.1);
+	> image {
+		width: 114upx;
+		height: 114upx;
+	}
+}
+.mb_body {
+	height: 174upx;
+}
+.ver_top {
+	vertical-align: top;
+}
+.mb_right_text {
+	vertical-align: top;
+	line-height: 34upx;
+	font-size: 24upx;
+	color: rgba(255, 255, 255, 1);
+}
+.mb_title_right {
+	margin: 6upx 0 0 0;
+	text-align: center;
+	padding: 0 10upx;
+	height: 34upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.dis-inlneB {
+	display: inline-block;
+}
+.mb_title_text {
+	margin-left: 19upx;
+	line-height: 46upx;
+	font-size: 30upx;
+	color: rgba(51, 51, 51, 1);
+}
+.mb_title_img {
+	border: 1upx solid rgba(153, 153, 153, 0.1);
+	width: 46upx;
+	height: 46upx;
+	border-radius: 23upx;
+	overflow: hidden;
+	image {
+		width: 46upx;
+		height: 46upx;
+	}
+}
+.mb_title {
+	height: 76upx;
+}
+.mb_package {
+	padding: 30upx 0;
+	margin: 0 30upx;
+}
+.mb {
+	margin: 0 auto 20upx auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.tips_text {
+	color: #ff4444;
+}
+.tips {
+	line-height: 84upx;
+	height: 84upx;
+	width: 690upx;
+	margin: auto;
+	font-size: 24upx;
+	color: rgba(51, 51, 51, 1);
+}
+.dis-flex {
+	display: flex !important;
+	justify-content: space-between !important;
+}
+.ver_mid {
+	vertical-align: middle;
+}
+.writeRecord {
+	font-size: 0;
+	width: 750upx;
+	background: #f8f8f8;
+}
+.popfull {
+	width: 750upx;
+	height: 105upx;
+}
+.topNav {
+	z-index: 99999;
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 750upx;
+	height: 105upx;
+	background: rgba(255, 255, 255, 1);
+}
+.topFull {
+	width: 750upx;
+	height: 105upx;
+	background: rgba(255, 255, 255, 1);
+}
+.topNav_view {
+	width: 33%;
+	display: inline-block;
+	text-align: center;
+}
+.topNav_text {
+	line-height: 105upx;
+	display: inline-block;
+	font-size: 28upx;
+}
+.topNav_text_width {
+	text-align: center;
+	display: inline-block;
+	width: 120upx;
+	text-overflow: ellipsis;
+	overflow: hidden;
+	white-space: nowrap;
+}
+
+// 时间选择
+.record-dialog {
+		z-index: 10;
+		position: fixed;
+		background: rgba(0, 0, 0, 0.7);
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		.record-dialog-main {
+			margin: auto;
+			width: 600upx;
+			border-radius: 10upx;
+			z-index: 11;
+			background: #ffffff;
+			position: relative;
+		}
+		.record-dialog-btns {
+			border-top: 1upx solid rgba(238, 238, 238, 1);
+			color: rgba(51, 51, 51, 1);
+			position: relative;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			.btn {
+				width: 50%;
+				height: 86upx;
+				font-size: 28upx;
+				line-height: 86upx;
+				text-align: center;
+			}
+			.btn.confirm {
+				color: rgba(51, 136, 255, 1);
+			}
+			.line {
+				width: 1px;
+				height: 36upx;
+				background: rgba(238, 238, 238, 1);
+			}
+		}
+		.record-picker-view {
+			margin: 0upx 30upx;
+			box-sizing: border-box;
+			width: 540upx;
+			height: 240upx;
+		}
+	}
+	.item{
+		font-size: 20upx;
+		
+	}
+	.checkCity {
+		vertical-align: middle;
+		height: 300upx;
+		margin-left: 60upx;
+		display: inline-block;
+		width: 300upx;
+		background: #ffffff;
+	}
+	.tips {
+		height: 80upx;
+		text-align: center;
+	
+		span {
+			line-height: 80upx;
+			font-size: 28upx;
+			
+			
+			color: black;
+		}
+	}
+	page {
+		background-color: #f7f7f7;
+	}
+	
+	.color-33 {
+		color: #333333;
+	}
+	.item{
+		font-size: 20upx;
+	}
+	/deep/.uni-picker-view-indicator{
+			height: 70upx !important;
+		}
+		.record-dialog {
+			z-index: 10;
+			position: fixed;
+			background: rgba(0, 0, 0, 0.7);
+			top: 0;
+			right: 0;
+			bottom: 0;
+			left: 0;
+			.record-dialog-main {
+				width: 600upx;
+				border-radius: 10upx;
+				z-index: 11;
+				background: #ffffff;
+				position: relative;
+			}
+			.record-dialog-btns {
+				border-top: 1upx solid rgba(238, 238, 238, 1);
+				color: rgba(51, 51, 51, 1);
+				position: relative;
+				bottom: 0;
+				left: 0;
+				right: 0;
+				.btn {
+					width: 50%;
+					height: 86upx;
+					font-size: 28upx;
+					line-height: 86upx;
+					text-align: center;
+				}
+				.btn.confirm {
+					color: rgba(51, 136, 255, 1);
+				}
+				.line {
+					width: 1px;
+					height: 36upx;
+					background: rgba(238, 238, 238, 1);
+				}
+			}
+			.record-picker-view {
+				margin: 40upx 30upx;
+				box-sizing: border-box;
+				width: 540upx;
+				height: 240upx;
+			}
+		}
+	
+		// 搜索栏内容
+		.search-main {
+			.search-box {
+				.search-input {
+					position: relative;
+					padding: 0 60upx 0 80upx;
+					margin-right: 40upx;
+					background: rgba(246, 246, 246, 1);
+					height: 76upx;
+					border-radius: 38upx;
+					flex: 1;
+	
+					input {
+						width: 100%;
+						height: 100%;
+					}
+	
+					.icon.icon-sousuo {
+						position: absolute;
+						top: 50%;
+						transform: translateY(-50%);
+						left: 30upx;
+					}
+				}
+	
+				.search-select {
+					width: 100upx;
+					white-space: nowrap;
+					color: #333333;
+	
+					.icon {
+						margin-left: 10upx;
+					}
+				}
+			}
+		}
+	
+		//权限名字
+		.permission-name {
+			font-size: 28upx;
+			
+			color: rgba(153, 153, 153, 1);
+		}
+	
+		// 头部内容
+		.pages-header {
+			width: 100%;
+			height: 400upx;
+			background-repeat: no-repeat;
+			background-size: 100% 400upx;
+		}
+	
+		// 详情内容
+		.record {
+			background-color: #ffffff;
+			.record-search {
+				padding: 30upx;
+			}
+	
+			.record-body {
+				padding: 30upx;
+				background-color: #f6f6f6;
+	
+				.color-red {
+					color: #ff4444;
+				}
+	
+				.record-list-item {
+					padding: 30upx;
+					border-radius: 10upx;
+					background: #ffffff;
+	
+					.record-list-item-header {
+						border-bottom: 1px solid rgb(238, 238, 238);
+						padding-bottom: 28upx;
+	
+						.tag {
+							padding: 6upx 10upx;
+							background: rgba(51, 136, 255, 1);
+							border-radius: 4upx;
+							text-align: center;
+							color: #ffffff;
+						}
+					}
+	
+					.record-list-item-content {
+						padding: 30upx 0;
+						border-bottom: 1px solid rgb(238, 238, 238);
+	
+						.record-img {
+							width: 114upx;
+							height: 114upx;
+							border-radius: 4upx;
+							margin-right: 20upx;
+							flex-shrink: 0;
+						}
+	
+						.goods-name {
+							color: #000000;
+							line-height: 36upx;
+						}
+	
+						.goods-sku {
+							color: #999999;
+						}
+					}
+	
+					.record-list-item-footer {
+						.footer-item {
+							padding-top: 30upx;
+	
+							.footer-item-left {
+								color: #999999;
+							}
+	
+							.footer-item-right {
+								color: #333333;
+							}
+						}
+					}
+				}
+			}
+		}
+	
+</style>
diff --git a/pages/subPages2/blindDate/dynamics/detail.vue b/pages/subPages2/blindDate/dynamics/detail.vue
new file mode 100644
index 0000000..299c1eb
--- /dev/null
+++ b/pages/subPages2/blindDate/dynamics/detail.vue
@@ -0,0 +1,504 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="detailInfo.id">
+			<personnal-item :dynamicInfo="detailInfo" @comment="comment" :isDetail="true"></personnal-item>
+		</block>
+		<!-- 间隔 -->
+		<view class="interval"></view>
+		<!-- 评论内容 -->
+		<view class="content">
+			<view class="header">
+				<view class="left-info">
+					<view class="title">评论</view>
+					<view class="num">{{commentNum}}条</view>
+				</view>
+				<!-- <view class="right-info">
+					<view class="hot" :class="{'select' : contentType == 'hot'}" @click="contentType = 'hot'">热门</view>
+					<view>/</view>
+					<view class="new" :class="{'select' : contentType == 'new'}" @click="contentType = 'new'">最新</view>
+				</view> -->
+			</view>
+			<!-- 单条内容 -->
+			<view class="comment-item" v-for="(item,index) in commentList" :key="item.id">
+				<view class="user-info">
+					<view class="avatar">
+						<image :src="item.avatar" mode=""></image>
+						<view v-if="item.gneder == 2" class="sex woman">
+							<view class="iconfont icon-female"></view>
+						</view>
+						<view v-else class="sex man">
+							<view class="iconfont icon-male"></view>
+						</view>
+					</view>
+					<view class="else-info">
+						<view class="name">{{item.nickname}}</view>
+						<view class="date">{{item.create_time}}</view>
+					</view>
+				</view>
+				<view class="comment-detail">
+					<!-- 评论的内容 -->
+					<view class="text"><span v-if="item.reply_id > 0" style="color: #0084FF">@{{item.reply_name}}</span> {{item.content}}</view>
+					<view class="line"></view>
+					<!-- 评论的评论 -->
+					<block v-if="item.list.length">
+						<view class="comment-info">
+							<view class="info-item" v-for="comment in item.visibilityList" :key="comment.id">
+								<view class="name">{{comment.nickname}}：</view>
+								<view class="value">{{comment.content}}</view>
+							</view>
+						</view>
+					</block>
+					<!-- 点赞评论数量 -->
+					<view class="join-info">
+						<view class="praise-box">
+							<view @click="handleCommentFabulousClick(item.id,index)">
+								<image class="praise" v-if="!item.is_fabulous" :src="imgfixUrls + 'dating/bd_praise.svg'" mode=""></image>
+								<image class="praise" v-else :src="imgfixUrls + 'dating/bd_light_praise.svg'" mode=""></image>
+							</view>
+							<view class="num">{{item.fabulous}}</view>
+						</view>
+						<view class="comment-box" style="margin-left: 50rpx;" @click="reply(item)">
+							<image :src="imgfixUrls + 'dating/bd_message1.svg'" mode=""></image>
+							<view class="num">{{item.list.length}}</view>
+						</view>
+					</view>
+					<block v-if="item.is_show_btn">
+						<view v-if="!item.is_open" class="open-btn" @click="handleOpenClick(item,'open')">展开</view>
+						<view v-else class="open-btn" @click="handleOpenClick(item,'close')">收起</view>
+					</block>
+				</view>
+				<view class="interval" style="margin-top: 30rpx;"></view>
+			</view>
+		</view>
+		<!-- 评论 -->
+		<view class="footer">
+			<input type="text" :focus="is_focus" @blur="is_focus = false" v-model="commentContent" :placeholder="placeholder" placeholder-style="font-size: 28rpx" />
+			<view class="submit-btn" @click="submitComment">发布</view>
+		</view>
+		<!-- 返回按钮 -->
+		<view class="back-btn" @click="goindex">返回</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import personnalItem from '../template/personalItem.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				detailInfo: {},  //动态信息
+				lng: '',
+				lat: '',
+				dynamic_id: 0,  //动态id
+				reply_id: 0,  //回复动态的id
+				currentPage: 1, //当前页
+				totalPage: 1,  //总页数
+				commentContent: '',  //评论内容
+				commentList: [],  //评论列表
+				commentNum: 0,  //评论数量
+				is_focus: false,  //评论输入框是否聚焦
+				placeholder: '请输入评论...',  //评论输入框的placeholder
+				
+				
+			}
+		},
+		onLoad(e) {
+			let _this = this
+			_this.dynamic_id = e.id
+			uni.getLocation({
+			    type: 'wgs84',
+			    success(res) {
+					_this.lng = res.longitude
+					_this.lat = res.latitude
+			    }
+			})
+			_this.getDynamicDetailInfo(e.id)
+			_this.getDynamicComment()
+		},
+		components: {
+			personnalItem,
+			Loadlogo
+		},
+		methods: {
+			// 获取动态详情
+			getDynamicDetailInfo(id) {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=dynamicDesc`,
+					{
+						id: id,
+						lng: _this.lng,
+						lat: _this.lat,
+					},
+					res => {
+						_this.detailInfo = res.data || {}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+			// 获取动态评论
+			getDynamicComment() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=dynamicComment`,
+					{
+						dynamic_id: _this.dynamic_id,
+						page: _this.currentPage,
+						page_index: 10
+					},
+					res => {
+						let list = res.data.list.map(item => {
+							item.is_show_btn = item.list.length > 3  //是否显示展开按钮  评论大于三条显示
+							item.is_open = false  //是否展开
+							item.visibilityList = item.list.slice(0,3)  //默认未展开时显示前3条评论
+							return item
+						})
+						_this.commentList = [..._this.commentList,...list]
+						_this.totalPage = res.data.total
+						_this.commentNum = res.data.list.length
+						_this.currentPage ++
+						_this.loadlogo = true
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+			// 评论点赞
+			handleCommentFabulousClick(id,index) {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=commentFabulous`,
+					{
+						id: id
+					},
+					res => {
+						if(res.errno == 0) {
+							if(_this.commentList[index].is_fabulous) {
+								_this.commentList[index].fabulous --
+							}else {
+								_this.commentList[index].fabulous ++
+							}
+							_this.commentList[index].is_fabulous = !_this.commentList[index].is_fabulous
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+			// 回复评论
+			reply(item) {
+				this.placeholder = `回复${item.nickname}：`
+				this.is_focus = true
+				this.reply_id = item.id
+				console.log(this.reply_id,'reply_id')
+			},
+			
+			// 评论动态
+			comment() {
+				this.placeholder = '请输入评论...'
+				this.is_focus = true
+				this.reply_id = 0
+			},
+		
+			// 展开和收起评论
+			handleOpenClick(item,type) {
+				item.is_open = !item.is_open
+				item.visibilityList = type === 'open' ? item.list : item.list.slice(0,3)
+			},
+		
+			//发布评论内容
+			submitComment() {
+				let _this = this
+				console.log(_this.reply_id,'reply_id111')
+				// 评论动态
+				App._post_form(
+					`&p=dating&do=addComment`,
+					{
+						dynamic_id: _this.dynamic_id,
+						content: _this.commentContent,
+						reply_id: _this.reply_id
+					},
+					res => {
+						_this.currentPage = 1
+						_this.commentList = []
+						_this.getDynamicComment(_this.dynamic_id)
+						_this.commentContent = ''
+						if(res.errno == 0) {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+			goindex(){
+				let pages = getCurrentPages();
+				console.log(pages);
+				if(pages.length == 1){
+					App.navigationTo({
+						url: "pages/subPages2/blindDate/personal"
+					})
+				}else{
+					uni.navigateBack({
+						delta:1
+					})
+				}
+			},
+		
+		},
+		onReachBottom() {
+			if(this.currentPage <= this.totalPage) {
+				this.getDynamicComment()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.interval {
+		width: 690rpx;
+		height: 8rpx;
+		margin: auto;
+		background-color: #F8F8F8;
+	}
+
+	.content {
+		width: 690rpx;
+		margin: 30rpx auto 130rpx;
+		.header {
+			width: 100%;
+			height: 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left-info {
+				height: 100%;
+				display: flex;
+				align-items: flex-end;
+				.title {
+					height: 100%;
+					line-height: 50rpx;
+					font-size: 36rpx;
+					font-weight: bold;
+					color: #333;
+					margin-right: 10rpx;
+				}
+				.num {
+					height: 36rpx;
+					line-height: 36rpx;
+					color: #999;
+					font-size: 24rpx;
+				}
+			}
+			.right-info {
+				height: 40rpx;
+				color: #999;
+				font-size: 28rpx;
+				display: flex;
+				align-items: center;
+				.hot {
+					margin-right: 10rpx;
+				}
+				.new {
+					margin-left: 10rpx;
+				}
+				.select {
+					font-weight: bold;
+					color: #333;
+				}
+			}
+		}
+		.comment-item {
+			width: 690rpx;
+			height: auto;
+			margin: auto;
+			padding-top: 30rpx;
+			.user-info {
+				width: 100%;
+				height: 90rpx;
+				display: flex;
+				align-items: center;
+				.avatar {
+					width: 90rpx;
+					height: 90rpx;
+					border-radius: 45rpx;
+					position: relative;
+					image {
+						width: 90rpx;
+						height: 90rpx;
+						border-radius: 45rpx;
+					}
+					.sex {
+						width: 30rpx;
+						height: 30rpx;
+						border-radius: 15rpx;
+						position: absolute;
+						right: 0;
+						bottom: 0;
+						color: #fff;
+						line-height: 30rpx;
+						text-align: center;
+						.iconfont {
+							font-size: 24rpx;
+						}
+					}
+					.woman {
+						transform: rotate(45deg);
+						background-color: #FE83AF;
+					}
+					.man {
+						background-color: #0084FF;
+					}
+				}
+				.else-info {
+					height: 100%;
+					margin-left: 20rpx;
+					.name {
+						height: 40rpx;
+						line-height: 40rpx;
+						margin-top: 4rpx;
+						font-size: 28rpx;
+						font-weight: bold;
+						color: #333;
+					}
+					.date {
+						height: 32rpx;
+						line-height: 32rpx;
+						margin-top: 10rpx;
+						font-size: 24rpx;
+						color: #999;
+					}
+				}
+			}	
+			.comment-detail {
+				width: 580rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				height: auto;
+				margin: 0 0 0 110rpx;
+				.text {
+					width: 100%;
+					height: auto;
+					line-height: 40rpx;
+					font-size: 28rpx;
+					color: #333;
+					padding: 40rpx 0;
+				}
+				.join-info {
+					width: 100%;
+					height: 34rpx;
+					display: flex;
+					align-items: center;
+					margin-top: 30rpx;
+					.praise-box,.comment-box {
+						display: flex;
+						align-items: flex-end;
+						color: #333;
+						font-size: 28rpx;
+						image {
+							width: 34rpx;
+							height: 34rpx;
+						}
+						.num {
+							margin-left: 10rpx;
+						}
+					}
+				}
+				.line {
+					width: 100%;
+					height: 2rpx;
+					background-color: #EEEEEE;
+				}
+				.comment-info {
+					width: 100%;
+					// max-height: 170rpx;
+					height: auto;
+					padding-top: 10rpx;
+					overflow: hidden;
+					.info-item {
+						width: 100%;
+						height: auto;
+						line-height: 34rpx;
+						display: flex;
+						font-size: 24rpx;
+						color: #333;
+						margin-top: 10rpx;
+						.name {
+							font-weight: bold;
+						}
+					}
+				}
+				.open-btn {
+					font-size: 28rpx;
+					color: #333;
+					font-weight: bold;
+					margin-top: 20rpx;
+					display: flex;
+					justify-content: flex-end;
+				}
+			}
+		}
+	}
+
+	// 展开样式
+	.open {
+		max-height: 999999999rpx !important;
+	}
+	
+	.footer {
+		width: 690rpx;
+		height: 70rpx;
+		padding: 15rpx 30rpx;
+		background-color: #fff;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		border-top: 1rpx solid #EEEEEE;
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		font-size: 28rpx;
+		input {
+			width: 570rpx;
+			height: 40rpx;
+			padding: 15rpx 0 15rpx 30rpx;
+			border-radius: 35rpx;
+			background-color: #F8F8F8;
+		}
+		.submit-btn {
+			height: 40rpx;
+			color: #999;
+			font-weight: bold;
+		}
+	}
+
+	.back-btn {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 100rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		font-size: 28rpx;
+		color: #fff;
+		position: fixed;
+		right: 30rpx;
+		bottom: 250rpx;
+	}
+
+</style>
diff --git a/pages/subPages2/blindDate/dynamics/edit.vue b/pages/subPages2/blindDate/dynamics/edit.vue
new file mode 100644
index 0000000..ecee8f4
--- /dev/null
+++ b/pages/subPages2/blindDate/dynamics/edit.vue
@@ -0,0 +1,565 @@
+<template>
+	<view style="padding-bottom: 50rpx;">
+		<view class="desc">
+			<view class="h1-title">动态信息</view>
+			<textarea class="value" v-model="form.content" placeholder="请输入动态信息" placeholder-style="fontsize: 28rpx"/>
+		</view>
+		<view class="line"></view>
+		<!-- 上传图片 -->
+		<view class="avatar-info">
+			<view class="h1-title">上传图片</view>
+			<view class="up-box">
+				<view class="up-load" @click="upImages">
+					<view class="iconfont icon-tianjia"></view>
+				</view>
+				<view class="up-load" v-for="(item,index) in form.photo_show" :key="index" style="border: none">
+					<image :src="item" mode=""></image>
+					<view class="close" @click="deleteImage(index)">+</view>
+				</view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 上传视频 -->
+		<view class="video-box">
+			<view class="h1-title">上传视频</view>
+			<view v-if="form.video" class="video-up-load">
+				<video class="video" :src="form.video" controls></video>
+				<view class="close" @click.stop="deleteVideo">+</view>
+			</view>
+			<view v-else class="video-up-load" @click="upLoadVideo">
+				<view class="iconfont icon-tianjia"></view>
+			</view>
+		</view>
+		<!-- 选择地址 -->
+		<view class="location" @click="goLocation">
+			<view style="color: #333;">{{form.address}}</view>
+			<image :src="imgfixUrls + 'merchant/where.svg'" />
+			<view>定位</view>
+		</view>
+		<!-- 发布按钮 -->
+		<view class="footer-btn" @click="handlesubmitClick">发布</view>
+		<!-- h5选择地址 -->
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="latlngs.latitude">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="!latlngs.latitude">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import wxApi from '@/common/js/wxApi.js';
+	import PopManager from '@/components/template/PopManager';
+	export default {
+		data() {
+			return {
+				form: {
+					content: '',
+					photo: [],
+					photo_show: [],
+					video: '',
+					lng: '',
+					lat: '',
+					address: '点击定位地址',
+				},
+				dynamic_id: '',
+				isOpenLaction: false,
+				disabled: true,
+				userAddress: {},
+				owenscitylist:[],
+				phoneHight: '',
+				phoneWidth: '',
+				latlngs: null,
+				counts:true,
+				userInfo:{},
+				lblis:{}
+			}
+		},
+		components: {
+			PopManager
+		},
+		onLoad(e) {
+			let _this = this
+			if(e.id != 0) {
+				console.log('触发')
+				_this.dynamic_id = e.id
+			}
+			_this.owenscitylist = uni.getStorageSync('cityList');
+			
+			let locationInfo = uni.getStorageSync('curLoction') || {}
+			_this.form.lat = locationInfo.latitude || ''
+			_this.form.lng = locationInfo.longitude || ''
+			// 编辑动态时才请求
+			if(e.id != 0) {
+				_this.getMemberList()
+			}
+			// #ifdef H5
+			_this.latlngs = uni.getStorageSync('curLoction');
+			_this.toLocale();
+			// 获取手机尺寸
+			uni.getSystemInfo({
+				success(res) {;
+					_this.phoneHight = res.windowHeight + 'px';
+					_this.phoneWidth = res.windowWidth + 'px';
+				}
+			});
+			// #endif
+		},
+		onShow(){
+			//#ifdef APP-PLUS
+			if(this.lblis.lat){
+				let bilis = {
+					detailed_address:this.userInfo.address,
+					lat:this.lblis.lat,
+					lng:this.lblis.lng
+				};
+				this.getloctions(bilis);
+			}
+			//#endif
+			
+			
+		},
+		methods: {
+			// 获取动态信息
+			getMemberList() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=dynamicEdit&type=get`,
+					{
+						id: _this.dynamic_id
+					},
+					res => {
+						if(res.errno == 0) {
+							_this.form = res.data
+							_this.form.address = res.data.address ? res.data.address : '点击定位地址'
+							_this.form.photo_show = res.data.photo_show ? res.data.photo_show : []
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 发布编辑动态
+			handlesubmitClick() {
+				let _this = this,
+					datas = {}
+				if(_this.form.address === '点击定位地址') {
+					_this.form.address = ''
+					_this.form.lat = ''
+					_this.form.lng = ''
+				}
+				datas.data = JSON.stringify(_this.form)
+				App._post_form(
+					`&p=dating&do=dynamicEdit&id=${_this.dynamic_id}&type=post`,
+					datas,
+					res => {
+						if(res.errno == 0) {
+							uni.reLaunch({
+								url: '/pages/subPages2/blindDate/dynamics/myself'
+							})
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 定位
+			goLocation(){
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						let bilis = {
+							detailed_address:e.address,
+							lat:e.latitude,
+							lng:e.longitude
+						};
+						_this.disabled = false;
+						_this.getloctions(bilis);
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				//#endif
+			},
+			
+			getloctions(lblis){
+				console.log(lblis,'666666');
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					_this.userAddress.detailed_address = lblis.detailed_address;
+					_this.userAddress.lat = lblis.lat;
+					_this.userAddress.lng = lblis.lng;
+					_this.userAddress.provinceid = res.data.provinceid;
+					_this.userAddress.countyid = res.data.countyid;
+					_this.userAddress.cityid = res.data.cityid;
+					_this.userAddress.provinceidName = '';
+					_this.owenscitylist.forEach((item,index)=>{
+						if(item.id == _this.userAddress.provinceid){
+							_this.form.address  = item.name;
+							_this.userAddress.provinceidName = item.name;
+							item.area.forEach(items=>{
+								if(items.id == _this.userAddress.cityid){
+									_this.form.address = `${_this.form.address}${items.name}`;
+									_this.userAddress.areaidName = items.name;
+									console.log(_this.form.address,items.name);
+									items.dist.forEach(itemss=>{
+										if(itemss.id == _this.userAddress.countyid){
+											_this.form.address = `${_this.form.address}${itemss.name}`;
+											_this.userAddress.distidName = itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+					console.log(_this.userAddress);
+				});
+			},
+			
+			toLocale(){
+				let _this = this;
+				let lblis;
+				let count = 1;
+				window.addEventListener(
+					'message',
+					function(event) {
+						// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+						let loc = event.data;
+						if(!_this.counts){
+							return
+						}
+						if(count > 1 || _this.counts){
+							if (loc && loc.module == 'locationPicker') {
+								console.log(count)
+								lblis = {
+									lat:loc.latlng.lat,
+									lng:loc.latlng.lng,
+									detailed_address:loc.poiaddress
+								}
+								_this.isOpenLaction = false;
+								_this.disabled = false;
+								//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+								_this.getloctions(lblis);
+							}
+						}
+						count++;
+						_this.counts = false;
+						setTimeout(()=>{
+							_this.counts = true
+						},1000)
+					},
+					false
+				);
+			},
+			
+			
+			// h5上传
+			uoloadIgs(length, ids = 0, resImg) {
+				let _this = this;
+				wxApi.uoloadIg(resImg.localIds[ids], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									_this.form.photo.push(res.data.image)
+									_this.form.photo_show.push(res.data.img)
+									if (ids < length - 1) {
+										ids++;
+										uni.setTimeout(_this.uoloadIgs(length, ids, resImg), 500);
+									}
+									_this.$forceUpdate()
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			},
+			
+			// 上传图片
+			async upImages() {
+				let _this = this,
+					len = 6 - _this.form.photo_show.length || 0
+				if(len <= 0) {
+					App.showError('最多上传6涨图片')
+					return
+				}
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(len);
+				    uni.showLoading();
+				    res.tempFilePaths.forEach(item => {
+				    	App._upLoad(item).then(options => {
+				    		_this.form.photo.push(options.data.image)
+				    		_this.form.photo_show.push(options.data.img)
+				    		uni.hideLoading();
+				    	})
+				    })
+					return
+				}
+				wxApi.choseImage(res => {
+					let i = res.localIds.length;
+					_this.uoloadIgs(i, 0, res);
+				},len);
+				// #endif
+				// #ifndef H5
+				uni.chooseImage({
+					count: len, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						uni.showLoading();
+						res.tempFilePaths.forEach(item => {
+							App._upLoad(item).then(options => {
+								_this.form.photo.push(options.data.image)
+								_this.form.photo_show.push(options.data.img)
+								uni.hideLoading();
+							})
+						})
+					},
+					fail: function() {
+						App.showError('上传失败');
+					}
+				});
+				// #endif
+			},
+		
+			// 删除照片
+			deleteImage(index) {
+				this.form.photo_show.splice(index,1)
+				this.form.photo.splice(index,1)
+			},
+		
+			// 视频上传
+			upLoadVideo() {
+				let _this = this;
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						console.log(res,'视频上传的res')
+						uni.showLoading();
+						uni.uploadFile({
+							url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+							filePath: res.tempFilePath,
+							name: 'file',
+							formData: {
+								upload_type: 1,
+								is_base: 1
+							},
+							success: res => {
+								let data = JSON.parse(res.data),
+									base64 = new _this.$util.Base64();
+								console.log('data', data);
+								if (data.errno === 0) {
+									_this.form.video = base64.decode(data.data.img)
+								} else {	
+									App.showError(data.message, () => {});
+								}
+								uni.hideLoading();
+							},
+							fail: res => {
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+		
+			// 删除已上传视频
+			deleteVideo() {
+				this.form.video = ''
+				this.isShowVideoClose = false
+			},
+		},
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.desc {
+		width: 690rpx;
+		height: 260rpx;
+		margin: auto;
+		padding-top: 30rpx;
+		color: #333;
+		font-size: 28rpx;
+		.label {
+			height: 40rpx;
+		}
+		.value {
+			width: 100%;
+			height: 200rpx;
+			margin-top: 20rpx;
+			line-height: 40rpx;
+		}
+	}
+
+	.line {
+		width: 690rpx;
+		height: 8rpx;
+		background-color: #F8F8F8;
+		margin: auto;
+		border-radius: 4rpx;
+	}
+
+	.avatar-info {
+		width: 690rpx;
+		height: auto;
+		margin: auto;
+		padding: 40rpx 0;
+		.up-box {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+			.up-load {
+				width: 158rpx;
+				height: 158rpx;
+				line-height: 158rpx;
+				text-align: center;
+				border-radius: 20rpx;
+				margin: 30rpx 10rpx 0 0;
+				border: 1rpx dashed #ccc;
+				position: relative;
+				.iconfont {
+					font-size: 60rpx;
+					color: #333;
+					font-weight: bold;
+				}
+				image {
+					width: 158rpx;
+					height: 158rpx;
+					border-radius: 20rpx;
+				}
+				.close {
+					width: 30rpx;
+					height: 30rpx;
+					border-radius: 15rpx;
+					color: #fff;
+					background-color: rgba(0,0,0,.5);
+					position: absolute;
+					top: 10rpx;
+					right: 10rpx;
+					transform: rotate(45deg);
+					font-size: 32rpx;
+					line-height: 28rpx;
+					text-align: center;
+				}
+			}
+		}
+		.avatar {
+			border: none;
+		}
+		.qrcode {
+			border: none;
+		}
+	}
+	
+	.h1-title {
+		height: 45rpx;
+		line-height: 45rpx;
+		font-size: 32rpx;
+		color: #333;
+		font-weight: bold;
+	}
+	
+	.video-box {
+		width: 690rpx;
+		margin: 30rpx auto 0;
+		height: auto;
+		.video-up-load {
+			width: 100%;
+			height: 390rpx;
+			border-radius: 20rpx;
+			border: 1rpx dashed #CCCCCC;
+			line-height: 390rpx;
+			text-align: center;
+			margin: 30rpx auto 40rpx;
+			position: relative;
+			.iconfont {
+				font-size: 54rpx;
+				font-weight: bold;
+			}
+			.video {
+				width: 100%;
+				height: 100%;
+			}
+			.close {
+				width: 60rpx;
+				height: 60rpx;
+				border-radius: 30rpx;
+				color: #fff;
+				background-color: rgba(0,0,0,.5);
+				position: absolute;
+				top: 18rpx;
+				right: 18rpx;
+				transform: rotate(45deg);
+				font-size: 50rpx;
+				line-height: 60rpx;
+				text-align: center;
+			}
+		}
+	}
+
+	.footer-btn {
+		width: 690rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border-radius: 20rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		border-radius: 20rpx;
+		margin: auto;
+		color: #fff;
+		font-size: 32rpx;
+	}
+	
+	.location{
+		width: 690rpx;
+		height: auto;
+		padding: 20rpx 0;
+		font-size: 26rpx;
+		color: #FF4444;
+		margin: auto;
+		display: flex;
+		align-items: center;
+		justify-content: flex-end;
+		image{
+			padding-left: 10upx;
+			width: 22upx;
+			height: 22upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/blindDate/dynamics/index.vue b/pages/subPages2/blindDate/dynamics/index.vue
new file mode 100644
index 0000000..b71f916
--- /dev/null
+++ b/pages/subPages2/blindDate/dynamics/index.vue
@@ -0,0 +1,152 @@
+<template>
+	<view>
+		<movable-area class="movable-area">
+		    <movable-view :x="touchX" :y="touchY" direction="all" style="z-index: 10;">
+				<image @click="handleEditClick" class="edit-btn" :src="imgfixUrls + 'dating/bd_dynamics_edit.svg'" mode=""></image>
+			</movable-view>
+			
+			<loadlogo v-if="!loadlogo" />
+			
+			<navbar :navbarList="navbar" :isfix="true" :topHeight="0" :leftWidth="0" :isbgf="true" @navbarChange="handleNavbarItemClcik"></navbar>
+			<scroll-view scroll-y="true" class="content" @scrolltolower="scrolltolower">
+				<view>
+					<view class="item" v-for="item in dynamicList" :key="item.id">
+						<personnal-item :dynamicInfo="item" @toDetail="toDynamicDetail"></personnal-item>
+						<view class="interval"></view>
+					</view>
+				</view>
+			</scroll-view>
+		</movable-area>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import navbar from '../template/navbar.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import personnalItem from '../template/personalItem.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				navbar: ['最新','热门','附近','VIP专区'],
+				dynamicList: [],  //动态列表
+				currentPage: 1,
+				totalPage: 1,
+				navbarIndex: 0,
+				lng: '',
+				lat: '',
+				touchX: 300,
+				touchY: 400,
+				type: 1
+			}
+		},
+		onLoad() {
+			let _this = this
+			// 经纬度赋值
+			uni.getLocation({
+			    type: 'wgs84',
+			    success(res) {
+					_this.lng = res.longitude
+					_this.lat = res.latitude
+			    }
+			})
+			_this.getDynamicList()
+		},
+		components: {
+			navbar,
+			personnalItem,
+			Loadlogo
+		},
+		methods: {
+			// 获取动态列表
+			getDynamicList() {
+				let _this = this,
+					params = {
+						page: _this.currentPage,
+						sort: Number(_this.navbarIndex) + 1,
+						lng: _this.lng,
+						lat: _this.lat,
+						is_vip: _this.type
+					}
+				App._post_form(
+					`&p=dating&do=dynamicList`,
+					params,
+					res => {
+						_this.dynamicList = [..._this.dynamicList,...res.data.list]
+						_this.totalPage = res.data.total
+						_this.currentPage ++
+						_this.loadlogo = true
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 去动态详情
+			toDynamicDetail(id,type) {
+				if(!type) {
+					console.log(type,'触发type')
+					App.navigationTo({
+						url: `pages/subPages2/blindDate/dynamics/detail?id=${id}`
+					})
+				}
+			},
+			
+			// 导航栏点击
+			handleNavbarItemClcik(index) {
+				this.navbarIndex = index
+				//  是否获取vip信息
+				this.type = index == 3 ? 2 : 1
+				this.currentPage = 1
+				this.dynamicList = []
+				this.getDynamicList()
+			},
+			
+			// 去编辑动态
+			handleEditClick() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/dynamics/edit?id=0`
+				})
+			},
+			
+			// 触底加载更多
+			scrolltolower() {
+				if(this.currentPage <= this.totalPage) {
+					this.getDynamicList()
+				}
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.movable-area {
+		min-height: 100vh;
+		width: 100vw;
+	}
+	
+	.content {
+		padding-top: 90rpx;
+		height: calc(100vh - 90rpx);
+		background-color: #f8f8f8;
+	}
+	
+	.edit-btn {
+		width: 136rpx;
+		height: 136rpx;
+		// position: fixed;
+		// bottom: 200rpx;
+		// right: 10rpx;
+		z-index: 10;
+	}
+	
+	.interval {
+		width: 690rpx;
+		height: 8rpx;
+		margin: auto;
+		background-color: #eee;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/dynamics/myself.vue b/pages/subPages2/blindDate/dynamics/myself.vue
new file mode 100644
index 0000000..2f54aba
--- /dev/null
+++ b/pages/subPages2/blindDate/dynamics/myself.vue
@@ -0,0 +1,181 @@
+<template>
+	<view class="page">
+		<movable-area class="movable-area">
+			<!-- 编辑按钮 -->
+		    <movable-view :x="touchX" :y="touchY" direction="all" style="z-index: 10;width: 136rpx;height: 136rpx;position: fixed;">
+				<image @click="toEditPersonnal" class="edit-btn" :src="imgfixUrls + 'dating/bd_dynamics_edit.svg'" mode=""></image>
+			</movable-view>
+			
+			<loadlogo v-if="!loadlogo" />
+			<navbar :navbarList="navbar" :isfix="true" :topHeight="35" @navbarChange="handleNavbarItemClcik"></navbar>
+			<scroll-view scroll-y="true" class="content" @scrolltolower="scrolltolower">
+				<view v-for="item in dynamicList" :key="item.id">
+					<view class="line"></view>
+					<personnal-item 
+						:dynamicInfo="item" 
+						:isShowUserInfo="false" 
+						:isModular="true" 
+						:isShowFooterInfo="false" 
+						@delete="handleDeleteClick" 
+						@edit="handleEditClick"
+						@toDetail="toDynamicDetail"
+						>
+					</personnal-item>
+				</view>
+			</scroll-view>
+			<nonemores v-if="dynamicList.length == 0"></nonemores>
+		</movable-area>
+		<TabBars :tabBarAct="0" pageType="16"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import personnalItem from '../template/personalItem.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import navbar from '../template/navbar.vue';
+	import nonemores from '@/components/template/nonemores.vue';
+	// import personnalItem from '../template/personalItem.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				currentPage: 1,
+				totalPage: 1,
+				dynamicList: [],
+				navbar: ['全部','审核中','未通过','显示中'],
+				status: 0,
+				touchX: 300,
+				touchY: 400
+			}
+		},
+		components: {
+			Loadlogo,
+			personnalItem,
+			TabBars,
+			navbar,
+			nonemores
+		},
+		onLoad() {
+			this.getDynamicList()
+		},
+		methods: {
+			// 获取动态列表
+			getDynamicList() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=myDynamicList`,
+					{
+						page: _this.currentPage,
+						status: _this.status
+					},
+					res => {
+						_this.dynamicList = [..._this.dynamicList,...res.data.list]
+						_this.totalPage = res.data.total
+						_this.currentPage ++
+					},
+					false,
+					() => {
+						_this.loadlogo = true
+					}
+				);
+			},
+		
+			// 删除动态
+			handleDeleteClick(id) {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=delMyDynamic`,
+					{
+						id: id
+					},
+					res => {
+						if(res.errno == 0) {
+							uni.showToast({
+								title: '删除成功',
+								icon: 'none'
+							})
+							_this.currentPage = 1
+							_this.dynamicList = []
+							_this.getDynamicList()
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// navbar点击
+			handleNavbarItemClcik(index) {
+				this.status = index
+				this.currentPage = 1
+				this.dynamicList = []
+				this.getDynamicList()
+			},
+			
+			// 编辑动态
+			handleEditClick(id) {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/dynamics/edit?id=${id}`
+				})
+			},
+			
+			toEditPersonnal() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/dynamics/edit?id=0`
+				})
+			},
+			
+			// 去动态详情
+			toDynamicDetail(id,type) {
+				if(!type) {
+					App.navigationTo({
+						url: `pages/subPages2/blindDate/dynamics/detail?id=${id}`
+					})
+				}
+			},
+		
+			// 触底加载更多
+			scrolltolower() {
+				if(this.currentPage <= this.totalPage) {
+					this.getDynamicList()
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.movable-area {
+		min-height: 100vh;
+		width: 100vw;
+	}
+	
+	.page {
+		min-height: 100vh;
+		min-width: 100vw;
+		background-color: #F8F8F8;
+		padding-bottom: 120rpx;
+	}
+	
+	.content {
+		padding-top: 90rpx;
+		// height: calc(100vh - 90rpx);
+	}
+	
+	.line {
+		width: 690rpx;
+		height: 20rpx;
+		background-color: #F8F8F8;
+		margin: auto;
+		border-radius: 4rpx;
+	}
+	
+	.edit-btn {
+		width: 136rpx;
+		height: 136rpx;
+		z-index: 10;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/extension.vue b/pages/subPages2/blindDate/extension.vue
new file mode 100644
index 0000000..fc6786f
--- /dev/null
+++ b/pages/subPages2/blindDate/extension.vue
@@ -0,0 +1,353 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="card">
+			<view class="top-info">
+				<view class="title">您可提现(元)</view>
+				<view v-if="0" class="rule-box">
+					<view class="iconfont icon-gantanhaozhong"></view>
+					<view>推广规则</view>
+				</view>
+			</view>
+			<view class="price">{{matchmakerInfo.commission}}</view>
+			<view class="footer">
+				<view class="common-btn" @click="handlePostClick">生成海报</view>
+				<view class="common-btn right" @click="handleWithdrawalClick">立即提现</view>
+			</view>
+		</view>
+	
+		<view class="price-info">
+			<view class="common-box">
+				<view class="title">我的收益</view>
+				<view class="value">
+					<view class="unit">¥</view>
+					<view class="num">{{matchmakerInfo.total_commission}}</view>
+				</view>
+			</view>
+			<view class="common-box">
+				<view class="title">我的邀请</view>
+				<view class="value">
+					<view class="num">{{matchmakerInfo.customer}}</view>
+					<view class="unit">人</view>
+				</view>
+			</view>
+		</view>
+	
+		<view class="h1-title">会员列表</view>
+	
+		<view class="content" v-if="memberList.length > 0">
+			<view class="item" v-for="item in memberList" :key="item.id">
+				<user :memberInfo="item" :isShowViews="false" @extension="extension"></user>
+			</view>
+		</view>
+		<view  v-else>			
+			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>
+		</view>
+		
+		<!-- 推荐弹窗 -->
+		<PopManager :show="is_showpop" type="bottom" @clickmask="is_showpop = false">
+			<view class="pop">
+				<view class="btn-box">
+					<view class="common" @click="toExtensionPage(1)">
+						<view class="img-box">
+							<image :src="imgfixUrls + 'dating/bd_praise.svg'" mode=""></image>
+						</view>
+						<view class="text">未推荐</view>
+					</view>
+					<view class="common" @click="toExtensionPage(2)">
+						<view class="img-box">
+							<image :src="imgfixUrls + 'dating/bd_light_praise.svg'" mode=""></image>
+						</view>
+						<view class="text">已推荐</view>
+					</view>
+				</view>
+				<view class="line"></view>
+				<view class="foot" @click="is_showpop = false">取消</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import user from '@/components/template/user.vue'
+	// import user from './template/user.vue';
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import PopManager from '@/components/template/PopManager';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				matchmakerInfo: {},  //红娘信息
+				lng: '',
+				lat: '',
+				memberList: [],  //会员列表
+				member_id: 0,  //会员id
+				currentPage: 1,
+				is_showpop: false,  //推荐弹窗的显示
+				matchmaker_id: ''
+			}
+		},
+		watch: {
+			matchmaker_id() {
+				this.getMemberList()
+			}
+		},
+		components: {
+			user,
+			Loadlogo,
+			PopManager
+		},
+		onLoad(e) {
+			this.lng = e.lng
+			this.lat = e.lat
+		},
+		onShow() {
+			this.getMatchmakerInfo()
+		},
+		onReachBottom() {
+			this.currentPage++;
+			this.getMemberList(true);
+		},
+		methods: {
+			// 获取红娘信息
+			getMatchmakerInfo() {
+				let _this = this
+				App._post_form(
+					 `&p=dating&do=matchmakerCenter`,
+					{},
+					res => {
+						_this.loadlogo = true
+						_this.matchmakerInfo = res.data
+						_this.matchmaker_id = res.data.id
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 获取会员列表
+			getMemberList(flag) {
+				let _this = this,
+					apiUrl = `&p=dating&do=homeList&lng=${_this.lng}&lat=${_this.lat}`
+				App._post_form(
+					apiUrl,
+					{
+						page: _this.currentPage,
+						matchmaker_id: _this.matchmaker_id
+					},
+					res => {
+						if(flag){
+							_this.memberList = _this.memberList.concat(res.data);
+						}else{
+							_this.memberList = res.data || []
+						}
+						
+						// _this.memberList = []
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 点击提现
+			handleWithdrawalClick() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/withdraw?is_blindDate=true`
+				})
+			},
+			
+			
+			// 会员右上角推广按钮点击
+			extension(id) {
+				this.is_showpop = true
+				this.member_id = id
+			},
+			
+			// 去推荐会员页面
+			toExtensionPage(type) {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/member/recommend?matchmaker_id=${this.matchmakerInfo.id}&is_recommend=${type}&member_id=${this.member_id}&lng=${this.lng}&lat=${this.lat}`
+				})
+				this.is_showpop = false
+			},
+			
+			// 生成海报
+			handlePostClick() {
+				App.navigationTo({
+					url: `pages/mainPages/poster/poster?id=${this.matchmakerInfo.id}&type=15`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.card {
+		width: 610rpx;
+		height: 260rpx;
+		padding: 40rpx;
+		margin: 30rpx auto 0;
+		border-radius: 20rpx;
+		background: linear-gradient(135deg, #FDAE25 0%, #FF8E8A 100%);
+		color: #fff;
+		.top-info {
+			height: 32rpx;
+			width: 100%;
+			font-size: 24rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.rule-box {
+				display: flex;
+				.iconfont {
+					margin-right: 10rpx;
+					line-height: 32rpx;
+				}
+			}
+		}
+		.price {
+			height: 70rpx;
+			line-height: 70rpx;
+			margin-top: 20rpx;
+			font-size: 56rpx;
+			font-weight: bold;
+		}
+		.footer {
+			width: 100%;
+			height: 70rpx;
+			margin-top: 70rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.common-btn {
+				width: 295rpx;
+				height: 70rpx;
+				line-height: 70rpx;
+				text-align: center;
+				border-radius: 20rpx;
+				border: 1rpx solid #fff;
+				font-size: 28rpx;
+				font-weight: bold;
+			}
+			.right {
+				background-color: #fff;
+				color: #FDAC2C;
+			}
+		}
+	}
+
+	.price-info {
+		width: 690rpx;
+		height: 104rpx;
+		margin: 50rpx auto;
+		display: flex;
+		align-items: center;
+		font-size: 24rpx;
+		color: #333;
+		.common-box {
+			flex: 1;
+			height: 100%;
+			display: flex;
+			align-items: center;
+			flex-direction: column;
+			.title {
+				height: 34rpx;
+				line-height: 32rpx;
+				color: #999;
+			}
+			.value {
+				height: 60rpx;
+				margin-top: 10rpx;
+				display: flex;
+				font-weight: bold;
+				.unit {
+					margin-right: 10rpx;
+					line-height: 76rpx;
+				}
+				.num {
+					font-size: 48rpx;
+				}
+			}
+		}
+	}
+
+	.h1-title {
+		height: 50rpx;
+		line-height: 50rpx;
+		font-size: 36rpx;
+		color: #333;
+		font-weight: bold;
+		margin-left: 30rpx;
+	}
+
+	.content {
+		width: 690rpx;
+		height: auto;
+		margin: 30rpx auto;
+		display: flex;
+		flex-wrap: wrap;
+		.item {
+			&:nth-child(2n+1) {
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.pop {
+		width: 750rpx;
+		height: 430rpx;
+		background-color: #F3F3F5;
+		border-radius: 20rpx 20rpx 0 0;
+		overflow: hidden;
+		.btn-box {
+			width: 100%;
+			height: 160rpx;
+			margin-top: 80rpx;
+			font-size: 28rpx;
+			color: #333;
+			display: flex;
+			.common {
+				flex: 1;
+				height: 100%;
+				.img-box {
+					width: 100rpx;
+					height: 100rpx;
+					margin: auto;
+					border-radius: 50rpx;
+					background-color: #fff;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					image {
+						width: 40rpx;
+						height: 40rpx;
+					}
+				}
+				.text {
+					height: 40rpx;
+					line-height: 40rpx;
+					margin: 20rpx auto 0;
+					text-align: center;
+				}
+			}
+		}
+		.line {
+			width: 690rpx;
+			height: 8rpx;
+			border-radius: 4rpx;
+			background-color: #EEEEEE;
+			margin: 80rpx auto 0;
+		}
+		.foot {
+			width: 100%;
+			height: 100rpx;
+			line-height: 100rpx;
+			text-align: center;
+			font-size: 28rpx;
+			color: #999;
+		}
+	}
+</style>
diff --git a/pages/subPages2/blindDate/form/matchmakerApply.vue b/pages/subPages2/blindDate/form/matchmakerApply.vue
new file mode 100644
index 0000000..fda6f07
--- /dev/null
+++ b/pages/subPages2/blindDate/form/matchmakerApply.vue
@@ -0,0 +1,460 @@
+<template>
+	<view style="padding-bottom: 50rpx;">
+		<view class="basics-info">
+			<loadlogo v-if="!loadlogo" />
+			
+			<view class="h1-title">基础信息</view>
+			<view class="input">
+				<view class="label">姓名<text class="necessary">*</text></view>
+				<input class="value" type="text" v-model="form.nickname"  placeholder="请输入姓名" placeholder-style="fontsize: 28rpx"/>
+			</view>
+			<view class="input">
+				<view class="label">手机号<text class="necessary">*</text></view>
+				<input class="value" type="number" v-model="form.phone"  placeholder="请输入手机号码" placeholder-style="fontsize: 28rpx"/>
+			</view>
+			<view class="input">
+				<view class="label">微信</view>
+				<input class="value" type="text" v-model="form.wechat_number"  placeholder="请输入微信号" placeholder-style="fontsize: 28rpx"/>
+			</view>
+			<view class="input">
+				<view class="label">QQ号</view>
+				<input class="value" type="number" v-model="form.qq_unmber"  placeholder="请输入QQ号" placeholder-style="fontsize: 28rpx"/>
+			</view>
+			<view class="desc">
+				<view class="label">描述<text class="necessary">*</text></view>
+				<textarea class="value" v-model="form.describe" placeholder="请输入红娘描述" placeholder-style="fontsize: 28rpx"/>
+			</view>
+		</view>
+		<view class="line"></view>
+		<view class="avatar-info">
+			<view class="h1-title">红娘头像<text class="necessary">*</text></view>
+			<view class="tips">(上传您的红娘头像，250*250正方形头像)</view>
+			<view class="up-load" @click="UploadAvatar" :class="{'avatar':avatarUrl.length}">
+				<image v-if="avatarUrl.length > 0" :src="avatarUrl" mode=""></image>
+				<view v-else class="iconfont icon-tianjia"></view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<view class="avatar-info">
+			<view class="h1-title">红娘二维码<text class="necessary">*</text></view>
+			<view class="tips">(上传您的红娘二维码，250*250正方形二维码)</view>
+			<view class="up-load" @click="UploadQrcode" :class="{'qrcode':qrcodeUrl.length}">
+				<image v-if="qrcodeUrl.length > 0" :src="qrcodeUrl" mode=""></image>
+				<view v-else class="iconfont icon-tianjia" ></view>
+			</view>
+		</view>
+		<!-- 驳回理由 -->
+		<block v-if="form.status == 4">
+			<view class="reason">驳回原因：{{reason}}</view>
+		</block>
+		<view class="footer-btn" @click="handleApplyClick">{{applyBtnText}}</view>
+		<view class="pay-tips" v-if="showPayInfo">
+			<view class="iconfont icon-info"></view>
+			<view class="text">申请红娘需支付{{matchmakerInfo.money}}元</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import wxApi from '@/common/js/wxApi.js';
+	export default {
+		data() {
+			return {
+				matchmakerInfo: {},
+				form: {
+					nickname: '',
+					phone: '',
+					wechat_number: '',
+					qq_unmber: '',
+					describe: '',
+					avatar: '',
+					qrcode: '',
+				},
+				loadlogo: false,
+				avatarUrl: '',  //红娘头像
+				qrcodeUrl: '',  //红娘二维码
+				upLoadType: '',
+				applyBtnText: '',
+				orderid: 0,
+				// option: {},
+				reason: '',
+				lng: '',
+				lat: '',
+			}
+		},
+		components: {
+			Loadlogo
+		},
+		
+		onLoad(e) {
+			let _this = this
+			// 经纬度赋值
+			uni.getLocation({
+			    type: 'wgs84',
+			    success(res) {
+					_this.lng = res.longitude
+					_this.lat = res.latitude
+			    }
+			})
+			_this.getFormInfo()
+		},
+		watch: {
+			applyBtnText(val) {
+				if(val === '红娘推广中心') {
+					uni.redirectTo({
+						url: `/pages/subPages2/blindDate/extension?lng=${this.lng}&lat=${this.lat}`	
+					})
+				}
+			},
+		},
+		computed: {
+			showPayInfo() {
+				if(this.matchmakerInfo.pay_settle != 1) {
+					return false
+				}else {
+					return this.applyBtnText === '申请' || this.applyBtnText === '编辑'
+				}
+			}
+		},
+		methods: {
+			// 表单提交
+			handleApplyClick() {
+				let _this = this
+				delete _this.form.reason
+				console.log(_this.form)	
+				if(_this.applyBtnText === '待审核') {
+					return
+				}
+				if(_this.applyBtnText === '红娘推广中心') {
+					App.navigationTo({
+						url: `pages/subPages2/blindDate/extension?lng=${_this.lng}&lat=${_this.lat}`
+					})
+					return
+				}
+				
+				// 检查必填信息是否未填
+				if(!_this.form.nickname.length) {
+					App.showError('请输入姓名');
+					return 
+				}
+				if(!_this.form.describe.length) {
+					App.showError('请输入红娘描述');
+					return 
+				}
+				
+				let datas = {},
+					apiUrl = _this.form.id ? `&p=dating&do=applyMatchmaker&type=post&id=${_this.form.id}` : `&p=dating&do=applyMatchmaker&type=post`
+				datas.data = JSON.stringify(_this.form);
+				App._post_form(
+					apiUrl,
+					datas,
+					res => {
+						_this.orderid = res.data.orderid ?  res.data.orderid : _this.orderid
+						if(Array.isArray(res.data) && _this.orderid == 0) {
+							App.navigationTo({
+								url: 'pages/subPages2/blindDate/personal'
+							})
+						}else {
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + _this.orderid + '&plugin=dating'
+							});
+						}
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			
+			// 获取表单信息
+			getFormInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=applyMatchmaker&type=get`,
+					{},
+					res => {
+						_this.matchmakerInfo = res.data
+						_this.orderid = res.data.status == 1 ? res.data.order.orderid : 0
+						// 不是第一次进入时
+						if(res.data.id) {
+							_this.reason = res.data.reason ? res.data.reason : ''
+							_this.form = res.data
+							_this.avatarUrl = res.data.avatar_show
+							_this.qrcodeUrl = res.data.qrcode_show
+							switch(res.data.status) {
+								case '1': _this.applyBtnText = '待付款';break;
+								case '2': _this.applyBtnText = '待审核';break;
+								case '3': _this.applyBtnText = '红娘推广中心';break;
+								case '4': _this.applyBtnText = '编辑';break;
+							}
+						}else {
+							// 第一次进入时默认信息
+							_this.form.nickname = res.data.nickname
+							_this.form.phone = res.data.phone
+							_this.applyBtnText = '申请'
+						}
+					},
+					false,
+					() => {
+						if(_this.applyBtnText !== '红娘推广中心') {
+							_this.loadlogo = true
+						}
+					}
+				);
+			},
+			
+			// 点击上传头像
+			UploadAvatar() {
+				this.upLoadType = 'avatar'
+				this.upImages()
+			},
+			
+			// 点击上传二维码
+			UploadQrcode() {
+				this.upLoadType = 'qrcode'
+				this.upImages()
+			},
+			
+			// h5上传
+			uploadImageFiles(requestData) {
+				let _this = this;
+				App._post_form(
+					'&do=uploadFiles',
+					requestData,
+					res => {
+						console.log('触发h5上传1111')
+						if(res.errno === 0) {
+							console.log('触发h5上传2222')
+							if(_this.upLoadType === 'avatar') {
+								_this.form.avatar = res.data.image
+								_this.avatarUrl = res.data.img
+								// _this.setData({
+								// 	avatarUrl: res.data.img
+								// })
+							}else {
+								_this.form.qrcode = res.data.image
+								_this.qrcodeUrl = res.data.img
+								// _this.setData({
+								// 	qrcodeUrl: res.data.img
+								// })
+							}
+						}
+					},	
+					false,
+					() => {
+						_this.$forceUpdate();
+						uni.hideLoading();
+					}
+				);
+			},
+			
+			// 上传图片
+			async upImages() {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(1);
+				    uni.showLoading();
+				    let imageUrl = res.tempFilePaths[0],
+				    	rnImageData = App._upLoad(imageUrl);
+				    rnImageData.then(options => {
+				    	console.log(options, 'options');
+				    	if(_this.upLoadType == 'avatar') {
+				    		_this.form.avatar = options.data.image
+				    		_this.avatarUrl = options.data.img
+				    	}else if(_this.upLoadType == 'qrcode') {
+				    		_this.form.qrcode = options.data.image
+				    		_this.qrcodeUrl = options.data.img
+				    	};
+				    	uni.hideLoading();
+				    });
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						console.log(res,'res+++++++++')
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							_this.uploadImageFiles(requestData);
+						} else {
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				uni.chooseImage({
+					count: 1, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						uni.showLoading();
+						let imageUrl = res.tempFilePaths[0],
+							rnImageData = App._upLoad(imageUrl);
+						rnImageData.then(options => {
+							console.log(options, 'options');
+							if(_this.upLoadType == 'avatar') {
+								_this.form.avatar = options.data.image
+								_this.avatarUrl = options.data.img
+							}else if(_this.upLoadType == 'qrcode') {
+								_this.form.qrcode = options.data.image
+								_this.qrcodeUrl = options.data.img
+							};
+							uni.hideLoading();
+						});
+					},
+					fail: function() {
+						App.showError('上传失败');
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.basics-info {
+		width: 690rpx;
+		margin: auto;
+		padding-top: 30rpx;
+	}
+	.h1-title {
+		height: 45rpx;
+		line-height: 45rpx;
+		font-size: 32rpx;
+		color: #333;
+		font-weight: bold;
+	}
+	
+	.input {
+		width: 690rpx;
+		height: 100rpx;
+		margin: auto;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid #EEEEEE;
+		font-size: 28rpx;
+		color: #333;
+		.label {
+			flex: 1;
+			text-align: left;
+		}
+		.value {
+			flex: 3;
+			text-align: right;
+		}
+	}
+
+	.desc {
+		width: 690rpx;
+		height: 220rpx;
+		margin: auto;
+		padding-top: 30rpx;
+		color: #333;
+		font-size: 28rpx;
+		.label {
+			height: 40rpx;
+		}
+		.value {
+			width: 100%;
+			height: 160rpx;
+			margin-top: 20rpx;
+			line-height: 40rpx;
+		}
+	}
+	
+	.line {
+		width: 690rpx;
+		height: 8rpx;
+		background-color: #F8F8F8;
+		margin: auto;
+		border-radius: 4rpx;
+	}
+
+	.avatar-info {
+		width: 690rpx;
+		height: 366rpx;
+		margin: auto;
+		padding-top: 40rpx;
+		.tips {
+			height: 33rpx;
+			line-height: 33rpx;
+			color: #999;
+			font-size: 24rpx;
+			margin-top: 20rpx;
+		}
+		.up-load {
+			width: 158rpx;
+			height: 158rpx;
+			line-height: 158rpx;
+			text-align: center;
+			border-radius: 20rpx;
+			margin-top: 30rpx;
+			border: 1rpx dashed #ccc;
+			.iconfont {
+				font-size: 60rpx;
+				color: #333;
+				font-weight: bold;
+			}
+			image {
+				width: 158rpx;
+				height: 158rpx;
+				border-radius: 20rpx;
+			}
+		}
+		.avatar {
+			border: none;
+		}
+		.qrcode {
+			border: none;
+		}
+	}
+	
+	.reason {
+		width: 690rpx;
+		height: auto;
+		font-size: 28rpx;
+		color: #333;
+		margin: auto;
+	}
+
+	.footer-btn {
+		width: 690rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		border-radius: 20rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		border-radius: 20rpx;
+		margin: 50rpx auto 0;
+		color: #fff;
+		font-size: 32rpx;
+	}
+	
+	.pay-tips {
+		height: 34rpx;
+		padding: 20rpx 0 30rpx 0;
+		display: flex;
+		justify-content: center;
+		font-size: 24rpx;
+		color: #999;
+		.iconfont {
+			font-size: 24rpx;
+			line-height: 33rpx;
+			margin-right: 10rpx;
+		}
+	}
+	
+	.necessary {
+		color: #FF4444;
+		font-size: 28rpx;
+	} 
+</style>
diff --git a/pages/subPages2/blindDate/form/userInfo.vue b/pages/subPages2/blindDate/form/userInfo.vue
new file mode 100644
index 0000000..d753adc
--- /dev/null
+++ b/pages/subPages2/blindDate/form/userInfo.vue
@@ -0,0 +1,1459 @@
+<template>
+	<view style="padding-bottom: 130rpx;">
+		<loadlogo v-if="!loadlogo" />
+		<!-- 基础信息 -->
+		<view class="bascis-info" style="padding-top: 30rpx;">
+			<view class="h1-title">基础信息</view>
+			<view class="photo" style="margin-top: 20rpx;border-bottom: 1rpx solid #F8F8F8;">
+				<view class="h1-title" style="font-size: 28rpx;font-weight: normal;">上传封面图(335x445)<text class="necessary">*</text></view>
+				<view class="value-box" style="margin: 30rpx 0;">
+					<view v-if="form.show_cover.length" class="img-box" @click="upImages('cover')">
+						<image :src="form.show_cover" mode=""></image>
+						<view class="close" @click.stop="deleteImage('cover')">+</view>
+					</view>
+					<view v-else class="up-load" @click="upImages('cover')">
+						<view class="iconfont icon-tianjia"></view>
+					</view>
+					<image-cropper :crop-width="224" :crop-height="296" :crop-fixed="true" :src="tempFilePath" @confirm="cropperConfirm" @cancel="cropperCancel"></image-cropper>
+				</view>
+			</view>
+			<view class="input">
+				<view class="label">姓名<text class="necessary">*</text></view>
+				<input class="value" type="text" v-model="form.realname"  placeholder="请输入姓名" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="select-btn">
+				<view class="label">性别</view>
+				<view class="option">
+					<view class="value" :class="{'man':form.gneder == 1}" @click="form.gneder = 1">
+						<view class="iconfont icon-male"></view>
+						<view class="text">男</view>
+					</view>
+					<view class="value" :class="{'woman':form.gneder == 2}" @click="form.gneder = 2">
+						<view class="iconfont icon-female"></view>
+						<view class="text">女</view>
+					</view>
+				</view>
+			</view>
+			<view class="select">
+				<view class="label">出生日期<text class="necessary">*</text></view>
+				<view class="info" @click="isAgeshow = true">
+					<view class="value">{{birth}}</view>
+					<view class="iconfont icon-playfill"></view>
+				</view>
+			</view>
+			<view class="specil-input">
+				<view class="label">身高<text class="necessary">*</text></view>
+				<view class="info">
+					<input class="value" type="digit" v-model="form.height" />
+					<view class="unit">CM</view>
+				</view>
+			</view>
+			<view class="specil-input">
+				<view class="label">体重<text class="necessary">*</text></view>
+				<view class="info">
+					<input class="value" type="digit" v-model="form.weight" />
+					<view class="unit">KG</view>
+				</view>
+			</view>
+			<view class="specil-input">
+				<view class="label">民族<text class="necessary">*</text></view>	
+				<view class="info">
+					<input class="value" type="text" v-model="form.nation" />
+					<view class="unit">族</view>
+				</view>
+			</view>
+			<view class="select">
+				<view class="label">婚姻情况</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'marital_status')" :value="form.marital_status - 1" :range="maritalStatus">
+						<view class="uni-input">
+							<view class="value">{{maritalStatus[form.marital_status - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="input">
+				<view class="label">工作职务<text class="necessary">*</text></view>
+				<input class="value" type="text" v-model="form.work"  placeholder="请输入工作职务" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="select">
+				<view class="label">学历</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'education')" :value="form.education - 1" :range="educationList">
+						<view class="uni-input">
+							<view class="value">{{educationList[form.education - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="select">
+				<view class="label">目前所在<text class="necessary">*</text></view>
+				<view class="info" v-if="agencyData.length">
+					<w-picker
+						:visible.sync="isShowLivingNow"
+						mode="region"
+						:value="defaultValue"
+						default-type="value"
+						:hide-area="false"
+						:agency-info="agencyData"
+						@confirm="onConfirm($event, 'currentLiveing')"
+					></w-picker>
+					<view class="uni-input" @click="isShowLivingNow = true">
+						<view class="value">{{currentLiveing}}</view>
+						<view class="iconfont icon-playfill"></view>
+					</view>
+				</view>
+			</view>
+			<!-- 详细地址 -->
+			<view class="select">
+				<view class="label">详细地址<text class="necessary">*</text></view>
+				<view class="info">
+					<input style="width: 410rpx;text-align: right;font-size: 28rpx;" type="text" v-model="form.address" placeholder="请输入详细地址" placeholder-class="placeholder-class" />
+					<view @click="getLocation" class="necessary">
+						<image style="width: 20rpx;height: 20rpx;" :src="imgfixUrls + 'merchant/where.svg'" />
+						<span>定位</span>
+					</view>
+				</view>
+			</view>
+			<view class="select">
+				<view class="label">籍贯</view>
+				<view class="info">
+					<w-picker
+						:visible.sync="isShowNativePlace"
+						mode="region"
+						:value="defaultValue"
+						default-type="value"
+						:hide-area="false"
+						ref="aabbcc"
+						@confirm="onConfirm($event, 'hometown')"
+					></w-picker>
+					<view class="uni-input" @click="isShowNativePlace = true">
+						<view class="value">{{hometown}}</view>
+						<view class="iconfont icon-playfill"></view>
+					</view>
+				</view>
+			</view>
+			<view class="select no-border">
+				<view class="label">户籍类型</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'registered_residence_type')" :value="form.registered_residence_type - 1" :range="residence_type">
+						<view class="uni-input">
+							<view class="value">{{residence_type[form.registered_residence_type - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 经济基础 -->
+		<view class="economic-base">
+			<view class="h1-title">经济基础</view>
+			<view class="input">
+				<view class="label">月收入<text class="necessary">*</text></view>
+				<input class="value" type="text" v-model="form.income"  placeholder="请输入月收入" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="select">
+				<view class="label">居住情况</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'live')" :value="form.live - 1" :range="liveList">
+						<view class="uni-input">
+							<view class="value">{{liveList[form.live - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="select" :class="{'no-border' : form.travel == 1}">
+				<view class="label">购车情况</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'travel')" :value="form.travel - 1" :range="travelList">
+						<view class="uni-input">
+							<view class="value">{{travelList[form.travel - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view v-if="form.travel == 2" class="input no-border">
+				<view class="label">车型号<text class="necessary">*</text></view>
+				<input class="value" type="text" v-model="form.vehicle"  placeholder="请输入车型号" placeholder-class="placeholder-class"/>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 联系方式 -->
+		<view class="contact">
+			<view class="h1-title">联系方式</view>
+			<view class="input">
+				<view class="label">手机号</view>
+				<input class="value" type="text" v-model="form.phone"  placeholder="请输入手机号码" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="input">
+				<view class="label">微信</view>
+				<input class="value" type="text" v-model="form.wechat_number"  placeholder="请输入微信号" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="input no-border">
+				<view class="label">QQ</view>
+				<input class="value" type="text" v-model="form.qq_number"  placeholder="请输入QQ号" placeholder-class="placeholder-class"/>
+			</view>
+		</view>
+		<view class="line" style="margin-bottom: 0rpx;"></view>
+		<!-- 自我介绍 -->
+		<view class="introduce-info">
+			<view class="desc">
+				<view class="label">自我介绍</view>
+				<textarea class="value" v-model="form.introduce" placeholder="请介绍自我" placeholder-class="placeholder-class"/>
+			</view>
+			<view class="interest-info">
+				<view 
+				class="item" 
+				:class="{'choose' : item.isSelect}" 
+				v-for="(item,index) in label" 
+				:key="item.id" 
+				@click="handleLabelItemClick(item)"
+				>{{item.title}}</view>
+			</view>
+		</view>
+		<view class="line" style="margin-bottom: 30rpx;"></view>
+		<!-- 上传视频 -->
+		<view class="video">
+			<view class="h1-title">上传视频</view>
+			<view class="video-up-load" @click="upLoadVideo">
+				<video class="video" v-if="isShowVideoClose" :src="form.video" controls></video>
+				<view v-else class="iconfont icon-tianjia"></view>
+				<view v-if="isShowVideoClose" class="close" @click.stop="deleteVideo">+</view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 上传照片 -->
+		<view class="photo">
+			<view class="h1-title">上传照片</view>
+			<!-- <view class="tips">(上传封面图)</view> -->
+			<view class="value-box" style="margin-top: 30rpx;">
+				<view class="up-load" style="width: 220rpx;height: 220rpx;" @click="upImages('album')">
+					<view class="iconfont icon-tianjia"></view>
+				</view>
+				<view class="img-box" style="width: 220rpx;height: 220rpx;" v-for="(item,index) in photoList" :key="index">
+					<image :src="item" mode=""></image>
+					<view class="close" @click="deleteImage('album',index)">+</view>
+				</view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 择偶标准 -->
+		<view class="mate-standard">
+			<view class="h1-title">择偶标准</view>
+			<view class="double-input">
+				<view class="label">年龄</view>
+				<view class="info-box">
+					<input class="value" type="number" v-model="form.min_age" placeholder="输入年龄" placeholder-class="placeholder-class" />
+					<view class="interval">至</view>
+					<input class="value" type="number" v-model="form.max_age" placeholder="输入年龄" placeholder-class="placeholder-class" />
+					<view class="unit">岁</view>
+				</view>
+			</view>
+			<view class="double-input no-border">
+				<view class="label">身高</view>
+				<view class="info-box">
+					<input class="value" type="number" v-model="form.min_height" placeholder="输入身高" placeholder-class="placeholder-class" />
+					<view class="interval">至</view>
+					<input class="value" type="number" v-model="form.max_height" placeholder="输入身高" placeholder-class="placeholder-class" />
+					<view class="unit">CM</view>
+				</view>
+			</view>
+			<view class="line" style="margin-bottom: 0;"></view>
+			<view class="select">
+				<view class="label">婚姻情况</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'require_marital_status')" :value="form.require_marital_status - 1" :range="requireMaritalStatus">
+						<view class="uni-input">
+							<view class="value">{{requireMaritalStatus[form.require_marital_status - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="select">
+				<view class="label">学历</view>
+				<view class="info">
+					<picker class="picker" @change="change($event,'require_education')" :value="form.require_education - 1" :range="requireEducationList">
+						<view class="uni-input">
+							<view class="value">{{requireEducationList[form.require_education - 1]}}</view>
+							<view class="iconfont icon-playfill"></view>
+						</view>
+					</picker>
+				</view>
+			</view>
+			<view class="else-info">
+				<textarea class="value" v-model="form.require" placeholder="还有其他什么择偶标准，请输入要求~" placeholder-class="placeholder-class" />
+			</view>
+		</view>
+		<view class="line" v-if="isShow.hidePrivacy == 0 || isShow.hidePhone == 0 || isShow.hidePhoto == 0"></view>
+		<!-- 隐私设置 -->
+		<view class="privacy" v-if="isShow.hidePrivacy == 0 || isShow.hidePhone == 0 || isShow.hidePhoto == 0">
+			<view class="h1-title">隐私设置</view>
+			<view class="select-btn" v-if="isShow.hidePrivacy == 0">
+				<view class="label">公开个人资料</view>
+				<view class="option">
+					<view class="value" :class="{'selecter': form.is_open_base == 2}" @click="form.is_open_base = 2">
+						<view class="text">公开</view>
+					</view>
+					<view class="value" :class="{'selecter': form.is_open_base == 1}" @click="form.is_open_base = 1">
+						<view class="text">隐藏</view>
+					</view>
+				</view>
+			</view>
+			<view class="select-btn" v-if="isShow.hidePhone == 0">
+				<view class="label">公开联系方式</view>
+				<view class="option">
+					<view class="value" :class="{'selecter': form.is_open_contact == 2}" @click="form.is_open_contact = 2">
+						<view class="text">公开</view>
+					</view>
+					<view class="value" :class="{'selecter': form.is_open_contact == 1}" @click="form.is_open_contact = 1">
+						<view class="text">隐藏</view>
+					</view>
+				</view>
+			</view>
+			<view class="select-btn no-border" v-if="isShow.hidePhoto == 0">
+				<view class="label">游客查看照片</view>
+				<view class="option">
+					<view class="value" :class="{'selecter': form.is_open_photo == 2}" @click="form.is_open_photo = 2">
+						<view class="text">开启</view>
+					</view>
+					<view class="value" :class="{'selecter': form.is_open_photo == 1}" @click="form.is_open_photo = 1">
+						<view class="text">关闭</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<!-- 协议 -->
+		<block v-if="isShowAgreement">
+			<view class="agreement">
+				<view @click="isReadAgreement = !isReadAgreement">
+					<view v-if="isReadAgreement" class="iconfont icon-roundcheckfill"></view>
+					<view v-else class="iconfont icon-round"></view>
+				</view>
+				<view class="text">阅读并同意</view>
+				<view style="color: #0084FF;" @click="isShowAgreementPop = true">《用户注册协议》</view>
+			</view>
+		</block>
+		<!-- 提交按钮 -->
+		<view class="submit-btn" @click="submit">提交</view>
+		
+		<!-- 协议弹窗 -->
+		<popAgreement :show="isShowAgreementPop" @clickmask="isShowAgreementPop = false" :textInfo="agreement"></popAgreement>
+		
+		<!-- 出生年月日弹窗 -->
+		<w-picker
+			:visible.sync="isAgeshow"
+			mode="date"
+			:value="birth"
+			startYear="1900"
+			endYear="2100"
+			fields="day"
+			@confirm="onConfirmage($event, 'date')"
+			:disabled-after="true"
+			ref="dateb"
+		></w-picker>
+		
+		<!-- h5的定位弹窗 -->
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="option.lat">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${option.lat},${option.lng}`"></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-else>
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<!-- 绑定手机号 -->
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import wxApi from '@/common/js/wxApi.js';
+	import popAgreement from '@/components/template/popAgreement';
+	import PopManager from '@/components/template/PopManager';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import ImageCropper from "@/components/invinbg-image-cropper/invinbg-image-cropper.vue";
+	import util from "@/common/js/util.js"
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
	import getvxphone from '@/components/template/getVXphone.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				isShowLivingNow: false,  //显示现居住地弹窗
+				isShowNativePlace: false,  //籍贯
+				isAgeshow: false,  //出生年月日显示
+				defaultValue: '',
+				birth: '',
+				popShow: false,
+				vxshow:false,
+				form: {
+					cover: '',
+					show_cover: '',
+					realname: '',
+					gneder: 1,
+					birth: '',
+					height: '',
+					weight: '',
+					nation: '',
+					marital_status: 1,
+					work: '',
+					education: 1,
+					current_province: '',  //省
+					current_city: '',  //市
+					current_area: '',  //区
+					address: '',
+					hometown_province: '',
+					hometown_city: '',
+					hometown_area: '',
+					lng: '',
+					lat: '',
+					registered_residence_type: 1,
+					
+					income: '',
+					live: 1,
+					travel: 1,
+					vehicle: '',
+					
+					phone: '',
+					wechat_number: '',
+					qq_number: '',
+					
+					photo: [],
+					video: '',
+					
+					introduce: '',
+					label_id: [],
+					max_age: '',
+					min_age: '',
+					min_height: '',
+					max_height: '',
+					require_marital_status: 1,
+					require_education: 1,
+					require: '',
+					
+					is_open_base: 1,
+					is_open_contact: 1,
+					is_open_photo: 1,
+				},
+				photoList: [],
+				isShowVideoClose: false,
+				label: [],
+				agreement: '',  //协议内容
+				isReadAgreement: false,  //是否同意协议
+				isShowAgreement: false,  //是否显示协议
+				isShowAgreementPop: false,  //弹窗
+				
+				maritalStatus: ['未婚','离异(无子女)','离异(有抚养权)','离异(无抚养权)','丧偶(无子女)','丧偶(有子女)'],
+				
+				residence_type: ['农业户口','非农业户口'],
+				
+				educationList: ['小学','初中','高中/中专','专科','本科','硕士','博士'],
+				requireEducationList: ['不限','小学','初中','高中/中专','专科','本科','硕士','博士'],
+				
+				currentLiveing: '',  //现居住地
+				hometown: '',  //籍贯
+				
+				liveList: ['自购房(有贷款)','自购房(无贷款)','租房(合租)','租房(整租)','与父母同住','借住亲朋家','单位住房'],
+				
+				travelList: ['未购车','已购车'],
+				
+				requireMaritalStatus: ['不限','未婚','离异','丧偶'],
+				owenscitylist: [],
+				head_id: 0,
+				option: {},
+				isOpenLaction: false,  //h5定位弹窗显示
+				phoneHeight: '',
+				lblis: {},
+				klis: false,
+				thelat: '',
+				agencyData: [],
+				tempFilePath: '',
+				hidePrivacy:0,
+				userInfo:{},
+				lblis:{},
+				isShow:{}
+			}
+		},
+		components: {
+			Loadlogo,
+			popAgreement,
+			PopManager,
+			ImageCropper,
+			wPicker,
+			PhoneMask,
+			getvxphone
+		},
+		thelat() {
+			this.getloctions(this.lblis);
+		},
+		onLoad(option) {
+			let _this = this
+			_this.option = option
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			_this.head_id = uni.getStorageSync('head_id')
+			_this.owenscitylist = uni.getStorageSync('cityList')
+			_this.getMemberInfo()
+			_this.getNowCity()
+		},
+		onShow() {
+			let _this = this 
+			//#ifdef APP-PLUS
+			if(_this.userInfo.lat){
+				_this.form.address = _this.userInfo.address;
+				_this.form.lat = _this.userInfo.lat;
+				_this.form.lng = _this.userInfo.lng;
+				let lblis = {
+					lat: _this.userInfo.lat,
+					lng: _this.userInfo.lng
+				}
+				_this.getloctions(lblis)
+			}
+			
+			//#endif
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					if (_this.klis) {
+						return
+					}
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						_this.thelat = loc.latlng.lat;
+						_this.form.address = loc.poiaddress;
+						_this.form.lat = loc.latlng.lat;
+						_this.form.lng = loc.latlng.lng;
+						_this.isOpenLaction = false;
+						_this.lblis = {
+							lat: loc.latlng.lat,
+							lng: loc.latlng.lng,
+							detailed_address: loc.poiaddress
+						}
+			
+					}
+					_this.klis = true;
+					setTimeout(() => {
+						_this.klis = false;
+					}, 1000)
+				},
+				false
+			);
+			// #endif
+		},
+		computed: {
+			cLabelId() {
+				let res = []
+				this.label.forEach(item => {
+					if(item.isSelect) {
+						res.push(item.id)
+					}
+				})
+				return res
+			}
+		},
+		methods: {
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			getMemberInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=editMember&type=get`,
+					{},
+					res => {
+						_this.isShowAgreement = res.data.disclaimers.length > 0
+						_this.agreement = res.data.disclaimers
+						_this.hidePrivacy = res.data.hidePrivacy
+						_this.isShow = res.data
+						let label_id = res.data.info.label_id || []
+						_this.label = res.data.label.map(item => {
+							item.isSelect = false
+							label_id.forEach(id => {
+								if(item.id == id) {
+									item.isSelect = true
+								}
+							})
+							return item
+						})
+						if(!Array.isArray(res.data.info)) {
+							_this.form = res.data.info
+							// 回显现居住地址和籍贯
+							_this.getPlace()
+							// 出生日期回显
+							if(_this.form.birth != 0) {
+								_this.birth = _this.$util.formatTime(_this.form.birth,'date','-')
+							}
+							// 照片回显
+							_this.photoList = res.data.info.photo_show || []
+							// 视频
+							_this.isShowVideoClose = res.data.info.video.length != 0
+							// 择偶条件
+							_this.form.min_age = res.data.info.min_age == 0 ? '' : res.data.info.min_age
+							_this.form.max_age = res.data.info.max_age == 0 ? '' : res.data.info.max_age
+							_this.form.min_height = res.data.info.min_height == 0 ? '' : res.data.info.min_height
+							_this.form.max_height = res.data.info.max_height == 0 ? '' : res.data.info.max_height
+							// 协议
+							_this.isReadAgreement = true
+						}else {
+							
+						}
+						// 经纬度默认赋值
+						if(_this.form.lng.length == 0 || _this.form.lat.length == 0) {
+							_this.form.lng = _this.option.lng
+							_this.form.lat = _this.option.lat
+						}
+						console.log(_this.form,'表单数据')
+					},
+					false,
+					() => {
+						_this.loadlogo = true
+					}
+				);
+			},
+			
+			// 提交信息
+			submit() {
+				let _this = this;
+				this.form.label_id = this.cLabelId
+				
+				if(this.currentLiveing.length == 0) {
+					App.showError('请填写目前所在地址')
+					return
+				}
+				if(!this.form.realname){
+					App.showError('请输入姓名');
+					return
+				}
+				if(this.isShowAgreement && !this.isReadAgreement) {
+					App.showError('请阅读并同意协议')
+					return
+				}
+ 				let datas = {},
+					url = this.form.id ? `&p=dating&do=editMember&type=post&id=${this.form.id}&head_id=${this.head_id}` : `&p=dating&do=editMember&type=post&head_id=${this.head_id}`
+				datas.data = JSON.stringify(this.form);
+				App._post_form(
+					url,
+					datas,
+					res => {
+						console.log(res,'提交结果');
+						uni.showToast({
+							title:res.message
+						});
+						setTimeout(()=>{
+							// uni.navigateBack({
+							// 	delta: 1
+							// });
+							uni.reLaunch({
+								url: '/pages/subPages2/blindDate/personal'
+							})
+						},1000)
+					},fail=>{
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							
+						}
+				});
+			},
+			
+			// 获取当前代理可选的城市
+			getNowCity() {
+				let _this = this
+				App._post_form(
+					`&do=getNowCity`,
+					{},
+					res => {
+						_this.agencyData = res.data
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			
+			handlerChange(e) {
+				console.log(e)
+			},
+			
+			// 根据Id回显现居住地和籍贯
+			getPlace() {
+				this.owenscitylist.forEach(province => {
+					// 当前居住地
+					if(province.id == this.form.current_province) {
+						this.currentLiveing = province.name
+						province.area.forEach(city => {
+							if(city.id == this.form.current_city) {
+								this.currentLiveing = this.currentLiveing + ' ' + city.name
+								city.dist.forEach(area => {
+									if(area.id == this.form.current_area) {
+										this.currentLiveing = this.currentLiveing + ' ' + area.name
+									}
+								})
+							}
+						})
+					}
+					// 籍贯
+					if(province.id == this.form.hometown_province) {
+						this.hometown = province.name
+						province.area.forEach(city => {
+							if(city.id == this.form.hometown_city) {
+								this.hometown = this.hometown + ' ' + city.name
+								city.dist.forEach(area => {
+									if(area.id == this.form.hometown_area) {
+										this.hometown = this.hometown + ' ' + area.name
+									}
+								})
+							}
+						})
+					}
+				})
+			},
+			
+			// 生日弹窗确定
+			onConfirmage(e) {
+				this.birth = e.value
+				// 转时间戳
+				let ontime = e.value.replace(/-/g, '/'),
+					date = new Date(ontime),
+					time = date.getTime() / 1000;
+				this.form.birth = time
+			},
+			
+			change(e,type) {
+				let res = Number(e.detail.value) + 1
+				switch(type) {
+					case 'marital_status': this.form.marital_status = res; break;  //婚姻状况
+					case 'education': this.form.education = res; break;  //学历
+					case 'live': this.form.live = res; break;  //居住情况
+					case 'travel': this.form.travel = res; break;  //出行
+					case 'require_marital_status': this.form.require_marital_status = res; break;  //择偶婚姻要求
+					case 'require_education': this.form.require_education = res; break;  //择偶学历要求
+					case 'registered_residence_type': this.form.registered_residence_type = res; break;  //户籍类型
+				}
+			},
+			
+			// 地址弹窗确定
+			onConfirm(e,type) {
+				let _this = this,
+					is_have_area = Array.isArray(e.obj.area),  //判断有没有区
+					res = is_have_area ? e.obj.province.label + ' ' + e.obj.city.label : e.obj.province.label + ' ' + e.obj.city.label + ' ' + e.obj.area.label
+				// 显示地址赋值和参数赋值
+				if(type == 'hometown') {
+					_this.hometown = res
+					_this.form.hometown_province = e.value[0]
+					_this.form.hometown_city = e.value[1]
+					_this.form.hometown_area = e.value[2] || ''
+				}
+				if(type == 'currentLiveing') {
+					_this.currentLiveing = res
+					_this.form.current_province = e.value[0]
+					_this.form.current_city = e.value[1]
+					_this.form.current_area = e.value[2] || ''
+				}
+			},
+			
+			// 选择个性标签
+			handleLabelItemClick(item) {
+				item.isSelect = !item.isSelect
+				this.$forceUpdate()
+			},
+			
+			// 视频上传
+			upLoadVideo() {
+				let _this = this;
+				if(_this.isShowVideoClose) {
+					return
+				}
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						uni.showLoading();
+						uni.uploadFile({
+							url: App.api_root + '&do=uploadFiles',
+							filePath: res.tempFilePath,
+							name: 'file',
+							formData: {
+								upload_type: 1,
+								is_base: 1
+							},
+							success: res => {
+								let data = JSON.parse(res.data),
+									base64 = new _this.$util.Base64();
+								console.log('data', data);
+								if (data.errno === 0) {
+									_this.form.video = base64.decode(data.data.img)
+									_this.isShowVideoClose = true
+								} else {	
+									App.showError(data.message, () => {});
+								}
+								uni.hideLoading();
+							},
+							fail: (res) => {
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			
+			// 删除已上传视频
+			deleteVideo() {
+				console.log('触发删除')
+				this.form.video = ''
+				this.isShowVideoClose = false
+			},
+			
+			// h5上传
+			uoloadIgs(length, ids = 0, resImg, type) {
+				let _this = this;
+				wxApi.uoloadIg(resImg.localIds[ids], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									if (type === 'cover') {
+										_this.form.cover = res.data.image
+										_this.form.show_cover = res.data.img
+										_this.tempFilePath = res.data.img
+									}else {
+										_this.form.photo.push(res.data.image)
+										_this.photoList.push(res.data.img)
+										if (ids < length - 1) {
+											ids++;
+											uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										}
+									}
+								}
+							},
+							false,
+							() => {
+								debugger
+								console.log(res)
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			},
+			
+			// 上传图片
+			async upImages(type) {
+				let _this = this,
+					len = type === 'album' ? 9 - _this.photoList.length : 1
+				if(len <= 0 && type === 'album') {
+					uni.showModal({
+						title: '警告',
+						content: '最多只能上传9张',
+						showCancel: false,
+					})
+					return
+				}
+				// #ifdef H5
+				if(type === 'cover') {
+					uni.chooseImage({
+						count: 1,
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album'], //从相册选择
+						success(res) {
+							console.log(res.tempFilePaths[0])
+							_this.tempFilePath = res.tempFilePaths[0]
+						}
+					})
+				}else {
+					if(App.getClientType() == 2){
+						let res = await App.browser_upload(len);
+					    uni.showLoading();
+					    
+					    if(type === 'album') {
+					    	res.tempFilePaths.forEach((item,index) => {
+					    		App._upLoad(item).then(options => {
+					    			_this.form.photo.push(options.data.image)
+					    			_this.photoList.push(options.data.img)
+					    			uni.hideLoading();
+					    		})
+					    	})
+					    }else {
+					    	_this.tempFilePath = res.tempFilePaths[0]
+					    	uni.hideLoading()
+					    	// App._upLoad(res.tempFilePaths[0]).then(options => {
+					    	// 	// _this.form.show_cover = options.data.img
+					    	// 	// _this.form.cover = options.data.image
+					    	// 	_this.tempFilePath = options.data.img
+					    	// 	console.log(_this.tempFilePath)
+					    	// 	uni.hideLoading();
+					    	// })
+					    }
+						return
+					}
+					wxApi.choseImage(res => {
+						let i = res.localIds.length;
+						_this.uoloadIgs(i, 0, res, type);
+					},len);
+				}
+				// #endif
+				// #ifndef H5
+				uni.chooseImage({
+					count: len, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: function(res) {
+						console.log(res)
+						uni.showLoading();
+						
+						if(type === 'album') {
+							res.tempFilePaths.forEach((item,index) => {
+								App._upLoad(item).then(options => {
+									_this.form.photo.push(options.data.image)
+									_this.photoList.push(options.data.img)
+									uni.hideLoading();
+								})
+							})
+						}else {
+							_this.tempFilePath = res.tempFilePaths[0]
+							uni.hideLoading()
+							// App._upLoad(res.tempFilePaths[0]).then(options => {
+							// 	// _this.form.show_cover = options.data.img
+							// 	// _this.form.cover = options.data.image
+							// 	_this.tempFilePath = options.data.img
+							// 	console.log(_this.tempFilePath)
+							// 	uni.hideLoading();
+							// })
+						}
+						
+					},
+					fail: function() {
+						App.showError('上传失败');
+					}
+				});
+				// #endif
+			},
+			
+			// 删除照片
+			deleteImage(type,index) {
+				if(type === 'cover') {
+					this.form.show_cover = ''
+					this.form.cover = ''
+				}else {
+					this.photoList.splice(index,1)
+					this.form.photo.splice(index,1)
+				}
+				this.$forceUpdate()
+			},
+			
+			// 获取定位
+			getLocation() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						_this.form.address = e.address;
+						_this.form.lat = e.latitude;
+						_this.form.lng = e.longitude;
+						let lblis = {
+							lat: e.latitude,
+							lng: e.longitude
+						}
+						_this.getloctions(lblis)
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				     App.navigationTo({
+				      url: 'pages/subPages2/map/index'
+				     });
+				//#endif
+			},
+			
+			// weixin定位弹窗
+			getloctions(lblis) {
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					console.log(res,'定位信息')
+					_this.form.current_province = res.data.provinceid;
+					_this.form.current_city = res.data.cityid;
+					_this.form.current_area = res.data.countyid;
+					_this.owenscitylist.forEach((item, index) => {
+						if (item.id == _this.form.current_province) {
+							_this.currentLiveing = item.name;
+							item.area.forEach(items => {
+								if (items.id == _this.form.current_city) {
+									_this.currentLiveing = _this.currentLiveing + ' ' +items.name;
+									items.dist.forEach(itemss => {
+										if (itemss.id == _this.form.current_area) {
+											_this.currentLiveing = _this.currentLiveing + ' ' + itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+				});
+			},
+			
+			// 裁剪弹窗确定
+			cropperConfirm(e) {
+				console.log(e,'裁剪结果')
+				
+				this.tempFilePath = ''
+				
+				App._upLoad(e.detail.tempFilePath).then(options => {
+					console.log(options,'裁剪后上传');
+					uni.showModal({
+						title:options.message,
+						showCancel:false
+					})
+					this.form.show_cover = options.data.img
+					this.form.cover = options.data.image
+					uni.hideLoading();
+				})
+				
+			},
+			// 裁剪弹窗取消
+			cropperCancel() {
+				this.tempFilePath = ''
+			}
+		}
+		
+	}
+</script>
+
+<style lang="scss" scoped>
+	.bascis-info,.economic-base,.contact,.video,.photo,.mate-standard,.privacy {
+		width: 690rpx;
+		height: auto;
+		margin: auto;
+	}
+	
+	.h1-title {
+		height: 45rpx;
+		line-height: 45rpx;
+		font-size: 32rpx;
+		color: #333;
+		font-weight: bold;
+	}
+	
+	.input {
+		width: 690rpx;
+		height: 100rpx;
+		margin: auto;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid #EEEEEE;
+		font-size: 28rpx;
+		color: #333;
+		.label {
+			flex: 1;
+			text-align: left;
+		}
+		.value {
+			flex: 3;
+			text-align: right;
+		}
+	}
+
+	.select-btn {
+		width: 100%;
+		height: 140rpx;
+		padding: 30rpx 0;
+		font-size: 28rpx;
+		color: #333;
+		border-bottom: 1rpx solid #EEEEEE;
+		.label {
+			height: 40rpx;
+			line-height: 40rpx;
+		}
+		.option {
+			width: 100%;
+			height: 70rpx;
+			margin-top: 30rpx;
+			display: flex;
+			justify-content: space-between;
+			.value {
+				width: 330rpx;
+				height: 70rpx;
+				background-color: #F8F8F8;
+				border-radius: 20rpx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				color: #999;
+				.iconfont {
+					margin-right: 10rpx;
+				}
+				.icon-female {
+					transform: rotate(45deg);
+				}
+			}
+			.man {
+				background-color: #0084FF;
+				color: #fff;
+			}
+			.woman {
+				background-color: #FE83AF;
+				color: #fff;
+			}
+			.selecter {
+				color: #fff;
+				background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+			}
+		}
+	}
+
+	.select {
+		width: 690rpx;
+		height: auto;
+		padding: 30rpx 0;
+		margin: auto;
+		font-size: 28rpx;
+		color: #333;
+		border-bottom: 1rpx solid #EEEEEE;
+		display: flex;
+		align-items: center;
+		.label {
+			flex: 1;
+		}
+		.info {
+			height: auto;
+			flex: 3;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			line-height: 40rpx;
+			.value {
+				margin-right: 20rpx;
+			}
+			.iconfont {
+				font-size: 24rpx;
+			}
+		}
+	}
+
+	.specil-input {
+		width: 690rpx;
+		height: 100rpx;
+		margin: auto;
+		font-size: 28rpx;
+		color: #333;
+		display: flex;
+		align-items: center;
+		border-bottom: 1rpx solid #EEEEEE;
+		.label {
+			flex: 1;
+		}
+		.info {
+			height: 40rpx;
+			flex: 3;
+			display: flex;
+			justify-content: flex-end;
+			align-items: center;
+			line-height: 40rpx;
+			.value {
+				margin-right: 20rpx;
+				text-align: right;
+				padding: 25rpx 0;
+			}
+		}
+	}
+
+	.line {
+		width: 690rpx;
+		height: 8rpx;
+		border-radius: 4rpx;
+		background-color: #F8F8F8;
+		margin: 0 auto 40rpx;
+	}
+
+	.desc {
+		width: 690rpx;
+		height: 220rpx;
+		margin: auto;
+		padding-top: 30rpx;
+		color: #333;
+		font-size: 28rpx;
+		.label {
+			height: 40rpx;
+		}
+		.value {
+			width: 100%;
+			height: 160rpx;
+			margin-top: 20rpx;
+			line-height: 40rpx;
+		}
+	}
+
+	.interest-info {
+		width: 690rpx;
+		height: auto;
+		display: flex;
+		flex-wrap: wrap;
+		margin: auto;
+		.item {
+			width: auto;
+			height: 50rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			padding: 0 30rpx;
+			line-height: 50rpx;
+			color: #333;
+			border: 1rpx solid #707070;
+			margin: 0 20rpx 20rpx 0;
+		}
+		.choose {
+			background: linear-gradient(270deg, #FDAD26 0%, #FF8F86 100%);
+			color: #fff;
+			border: none;
+		}
+	}
+
+	.video-up-load {
+		width: 100%;
+		height: 390rpx;
+		border-radius: 20rpx;
+		border: 1rpx dashed #CCCCCC;
+		line-height: 390rpx;
+		text-align: center;
+		margin: 30rpx auto 40rpx;
+		position: relative;
+		.iconfont {
+			font-size: 54rpx;
+			font-weight: bold;
+		}
+		.video {
+			width: 100%;
+			height: 100%;
+		}
+		.close {
+			width: 60rpx;
+			height: 60rpx;
+			border-radius: 30rpx;
+			color: #fff;
+			background-color: rgba(0,0,0,.5);
+			position: absolute;
+			top: 18rpx;
+			right: 18rpx;
+			transform: rotate(45deg);
+			font-size: 50rpx;
+			line-height: 60rpx;
+			text-align: center;
+			z-index: 999;
+		}
+	}
+
+	.photo {
+		.tips {
+			height: 34rpx;
+			line-height: 34rpx;
+			font-size: 24rpx;
+			color: #999;
+			margin: 20rpx auto 33rpx;
+		}
+		.value-box {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+			margin-bottom: 70rpx;
+			.up-load {
+				width: 335rpx;
+				height: 445rpx;
+				border: 1rpx dashed #CCCCCC;
+				border-radius: 20rpx;
+				line-height: 220rpx;
+				text-align: center;
+				margin: 0 10rpx 10rpx 0;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				.iconfont {
+					font-size: 54rpx;
+					font-weight: bold;
+					
+				}
+			}
+			.img-box {
+				width: 335rpx;
+				height: 445rpx;
+				border-radius: 20rpx;
+				position: relative;
+				margin: 0 10rpx 10rpx 0;
+				&:nth-child(3n) {
+					margin-right: 0;
+				}
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 20rpx;
+				}
+				.close {
+					width: 30rpx;
+					height: 30rpx;
+					border-radius: 15rpx;
+					color: #fff;
+					background-color: rgba(0,0,0,.5);
+					position: absolute;
+					top: 10rpx;
+					right: 10rpx;
+					transform: rotate(45deg);
+					font-size: 32rpx;
+					line-height: 28rpx;
+					text-align: center;
+				}
+			}
+		}
+	}
+	
+	.double-input {
+		width: 690rpx;
+		height: 100rpx;
+		border-bottom: 1rpx solid #EEEEEE;
+		color: #333;
+		font-size: 28rpx;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		.label {
+			flex: 1;
+		}
+		.info-box {
+			flex: 3;
+			height: 40rpx;
+			display: flex;
+			justify-content: flex-end;
+			.value {
+				height: 100%;
+				width: 140rpx;
+				text-align: center;
+			}
+			.interval {
+				height: 40rpx;
+			}
+		}
+	}
+	
+	.else-info {
+		width: 690rpx;
+		height: 160rpx;
+		margin: auto;
+		padding-top: 30rpx;
+		color: #333;
+		font-size: 28rpx;
+		.value {
+			width: 100%;
+			height: 160rpx;
+			line-height: 40rpx;
+		}
+	}
+
+	.agreement {
+		width: 690rpx;
+		height: 38rpx;
+		margin: auto;
+		display: flex;
+		align-items: center;
+		font-size: 	26rpx;
+		color: #333;
+		.iconfont {
+			margin-right: 20rpx;
+		}
+		.text {
+			color: #999;
+		}
+	}
+	
+	.submit-btn {
+		width: 690rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		font-size: 32rpx;
+		color: #fff;
+		font-weight: bold;
+		border-radius: 20rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		margin: 200rpx auto 0;
+	}
+	
+	.no-border {
+		border: none;
+	}
+
+	.picker {
+		width: 100%;
+	}
+	
+	.uni-input {
+		width: 100%;
+		display: flex;
+		justify-content: flex-end;
+	}
+	
+	.placeholder-class {
+		font-size: 28rpx;
+	}
+	
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+
+	.d-picker-view{
+		height: 100%;
+	}
+	
+	.w-picker-item {
+	  text-align: center;
+	  width: 100%;
+	  height: 88upx;
+	  line-height: 88upx;
+	  text-overflow: ellipsis;
+	  white-space: nowrap;
+	  font-size: 30upx;
+	}
+	
+	.necessary {
+		color: #FF4444;
+		font-size: 28rpx;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/index.vue b/pages/subPages2/blindDate/index.vue
new file mode 100644
index 0000000..2e91651
--- /dev/null
+++ b/pages/subPages2/blindDate/index.vue
@@ -0,0 +1,433 @@
+<template>
+	<view>
+		<!-- 搜索框 -->
+		<view class="search-box">
+			<view class="left-box">
+				<view class="location">成都市</view>
+				<view class="iconfont icon-triangledownfill"></view>
+			</view>
+			<view class="right-box">
+				<image src="../../../static/chooseCade/biaoqing.png" mode=""></image>
+				<input type="text" v-model="keyWords" placeholder="输入关键词" placeholder-style="font-size: 28rpx" />
+			</view>
+		</view>
+		<!-- banner -->
+		<view class="banner">
+			<image src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3934629892,4080949712&fm=26&gp=0.jpg" mode=""></image>
+		</view>
+		<!-- 功能选项 -->
+		<view class="menu">
+			<view class="item" v-for="(item,index) in [1,2,3,4]" :key="index">
+				<image src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2612784038,1629336953&fm=26&gp=0.jpg" mode=""></image>
+				<view class="title">全部会员</view>
+			</view>
+		</view>
+		<!-- 会员数与访问量 -->
+		<view class="flow-box">
+			<view class="flow-common-item member">
+				<view class="top-box">
+					<view class="number">4285</view>
+					<view v-if="0" class="unit">万</view>
+				</view>
+				<view class="bottom-box">
+					<view class="title">会员数</view>
+					<image class="member-logo" src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1824211699,1676049546&fm=15&gp=0.jpg" mode=""></image>
+				</view>
+			</view>
+			<view class="flow-common-item browse">
+				<view class="top-box">
+					<view class="number" style="line-height: 50rpx;">15</view>
+					<view v-if="1" class="unit">万</view>
+				</view>
+				<view class="bottom-box">
+					<view class="title">访问量</view>
+					<image class="member-logo" src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2252291903,4053747589&fm=26&gp=0.jpg" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<!-- 内容 -->
+		<view class="content">
+			<view class="navbar">
+				<view class="item" v-for="(item,index) in navbar" :key="index" @click="cureentNavbarIndex = index">
+					<view class="name" :class="{'select' : cureentNavbarIndex == index}">{{item}}</view>
+					<view v-if="cureentNavbarIndex == index" class="line"></view>
+				</view>
+			</view>
+			<view class="nav-content">
+				<view class="target-item" v-for="(item,index) in test" :key="index">
+					<view class="top-info">
+						<!-- 海报图片 -->
+						<image class="poster" src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2774666942,1767404907&fm=15&gp=0.jpg" mode=""></image>
+						<!-- 置顶 -->
+						<view class="top-btn">
+							<!-- 置顶图片 -->
+							<image src="../../../static/chooseCade/chooseCades.png" mode=""></image>
+							<view class="text">置顶</view>
+						</view>
+						<!-- 浏览量 -->
+						<view class="look-box">
+							<image src="../../../static/chooseCade/biaoqing.png" mode=""></image>
+							<view class="num">1580</view>
+						</view>
+						<!-- 位置 -->
+						<view class="location-box">
+							<image src="../../../static/chooseCade/biaoqing.png" mode=""></image>
+							<view class="value">成都市 1.2km</view>
+						</view>
+					</view>
+					<view class="bottom-info">
+						<view class="user-info">
+							<view class="name">小娟</view>
+							<view class="common-info-box man">
+								<image class="sex" src="../../../static/chooseCade/chooseCades.png" mode=""></image>
+								<view class="age">24</view>
+							</view>
+							<view class="common-info-box member">VIP</view>
+						</view>
+						<view class="price-info">
+							<view class="hourse">
+								<image src="../../../static/chooseCade/biaoqing.png" mode=""></image>
+								<view class="title">有房</view>
+							</view>
+							<view class="car">
+								<image src="../../../static/chooseCade/biaoqing.png" mode=""></image>
+								<view class="title">有车</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				keyWords: '',
+				cureentNavbarIndex: 0,
+				navbar: ['推荐','找男友','找女友','附近'],
+				test: [1,2,3,4,5,6,7,8,9,10]
+			}
+		},
+		
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.search-box {
+		width: 630rpx;
+		height: 80rpx;
+		background-color: #F8F8F8;
+		border-radius: 20rpx;
+		margin: 30rpx auto 0;
+		display: flex;
+		align-items: center;
+		padding: 0 30rpx;
+		.left-box {
+			width: auto;
+			height: 40rpx;
+			font-size: 28rpx;
+			font-weight: bold;
+			color: #333;
+			border-right: 1rpx solid #CCCCCC;
+			padding: 0 30rpx;
+			display: flex;
+			align-items: center;
+			flex-wrap: nowrap;
+			.iconfont {
+				font-size: 10rpx;
+			}
+		}
+		.right-box {
+			width: auto;
+			height: 100%;
+			display: flex;
+			align-items: center;
+			padding: 0 30rpx;
+			image {
+				width: 25rpx;
+				height: 25rpx;
+			}
+			input {
+				// width: 100%;
+				margin-left: 20rpx;
+			}
+		}
+	} 
+	
+	.banner {
+		width: 690rpx;
+		height: 300rpx;
+		margin-top: 30rpx;
+		padding: 0 30rpx;
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 20rpx;
+		}
+	}
+
+	.menu {
+		width: 100%;
+		height: 160rpx;
+		display: flex;
+		align-items: cneter;
+		margin-top: 30rpx;
+		.item {
+			flex: 1;
+			height: 100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			image {
+				width: 90rpx;
+				height: 70rpx;
+				margin-top: 20rpx;
+			}
+			.title {
+				width: auto;
+				height: 30rpx;
+				font-size: 24rpx;
+				color: #333;
+				margin-top: 20rpx;
+			}
+		}
+	}
+
+	.flow-box {
+		width: 100%;
+		height: 170rpx;
+		margin-top: 30rpx;
+		padding: 0 30rpx;
+		display: flex;
+		.flow-common-item {
+			width: 275rpx;
+			height: 100%;
+			background-color: #F8F8F8;
+			border-radius: 20rpx;
+			padding: 0 30rpx;
+			.top-box {
+				width: 100%;
+				height: 56rpx;
+				display: flex;
+				align-items: flex-end;
+				color: #333;
+				margin-top: 30rpx;
+				.number {
+					font-size: 48rpx;
+					font-weight: bold;
+				}
+				.unit {
+					font-size: 28rpx;
+				}
+			}
+			.bottom-box {
+				width: 100%;
+				height: 54rpx;
+				display: flex;
+				align-items: flex-end;
+				justify-content: space-between;
+				.title {
+					font-size: 24rpx;
+					color: #999;
+				}
+				.member-logo {
+					width: 58rpx;
+					height: 54rpx;
+				}
+				.browse-logo {
+					width: 65rpx;
+					height: 46rpx;
+				}
+			}
+		}
+		.member {
+			margin-right: 20rpx;
+		}
+	}
+
+	.content {
+		width: 100%;
+		margin-top: 50rpx;
+		.navbar {
+			display: flex;
+			.item {
+				height: 60rpx;
+				flex: 1;
+				line-height: 60rpx;
+				text-align: center;
+				position: relative;
+				.name {
+					font-size: 28rpx;
+					color: #999;
+				}
+				.select {
+					font-size: 36rpx;
+					color: #333;
+					font-weight: bold;
+				}
+				.line {
+					width: 30rpx;
+					height: 6rpx;
+					background-color: #333;
+					border-radius: 2rpx;
+					position: absolute;
+					left: 42%;
+				}
+			}
+		}
+		.nav-content {
+			width: 690rpx;
+			margin: 50rpx auto 0;
+			display: flex;
+			flex-wrap: wrap;
+			.target-item {
+				width: 335rpx;
+				height: 590rpx;
+				border-radius: 20rpx;
+				overflow: hidden;
+				background-color: #F8F8F8;
+				margin-bottom: 20rpx;
+				&:nth-child(2n) {
+					margin-left: 20rpx;
+				}
+				.top-info {
+					width: 100%;
+					height: 445rpx;
+					position: relative;
+					.poster {
+						width: 100%;
+						height: 100%;
+					}
+					.top-btn {
+						width: 56rpx;
+						height: 30rpx;
+						padding: 0 10rpx;
+						border-radius: 10rpx;
+						background: linear-gradient(90deg, #FB5A8C 0%, #F65D10 100%);
+						position: absolute;
+						left: 20rpx;
+						top: 20rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						image {
+							width: 14rpx;
+							height: 14rpx;
+						}
+						.text {
+							font-size: 20rpx;
+							color: #fff;
+						}
+					}
+					.look-box {
+						width: 60rpx;
+						height: 68rpx;
+						position: absolute;
+						top: 20rpx;
+						right: 16rpx;
+						image {
+							width: 40rpx;
+							height: 34rpx;
+						}
+						.num {
+							font-size: 20rpx;
+							color: #fff;
+							margin-top: 6rpx;
+						}
+					}
+					.location-box {
+						width: 140rpx;
+						height: 30rpx;
+						padding: 0 10rpx;
+						position: absolute;
+						right: 20rpx;
+						bottom: 20rpx;
+						background-color: #fff;
+						border-radius: 10rpx;
+						display: flex;
+						align-items: center;
+						justify-content: space-between;
+						image {
+							width: 14rpx;
+							height: 14rpx;
+						}
+						.value {
+							font-size: 20rpx;
+							color: #333;
+						}
+					}
+				}
+				.bottom-info {
+					width: 100%;
+					.user-info {
+						width: 295rpx;
+						height: 45rpx;
+						margin: 20rpx auto 0;
+						display: flex;
+						align-items: center;
+						.name {
+							font-size: 32rpx;
+							color: #333;
+							margin-right: 20rpx;
+						}
+						.common-info-box {
+							width: 50rpx;
+							height: 30rpx;
+							border-radius: 15rpx;
+							padding: 0 10rpx;
+							display: flex;
+							align-items: center;
+							color: #fff;
+							font-size: 20rpx;
+							margin-right: 10rpx;
+							.sex {
+								width: 24rpx;
+								height: 24rpx;
+							}
+						}
+						.man {
+							background-color: #0084FF;
+						}
+						.woman {
+							background-color: #FE83AF;
+						}
+						.member {
+							background-color: #DCC083;
+							justify-content: center;
+						}
+					}
+					.price-info {
+						width: 295rpx;
+						height: 40rpx;
+						margin: 20rpx auto 0;
+						display: flex;
+						.hourse,.car {
+							width: 70rpx;
+							height: 40rpx;
+							padding: 0 10rpx;
+							border-radius: 20rpx;
+							background-color: #fff;
+							display: flex;
+							align-items: center;
+							justify-content: space-between;
+							font-size: 20rpx;
+							color: #333;
+							margin-right: 15rpx;
+							image {
+								width: 20rpx;
+								height: 20rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/subPages2/blindDate/matchmakerService.vue b/pages/subPages2/blindDate/matchmakerService.vue
new file mode 100644
index 0000000..297f8f4
--- /dev/null
+++ b/pages/subPages2/blindDate/matchmakerService.vue
@@ -0,0 +1,231 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<block v-if="myMatchmakerInfo.id">
+			<view class="h1-title">我的红娘</view>
+			<view class="self">
+				<view class="left-info">
+					<view class="avatar">
+						<image :src="myMatchmakerInfo.avatar" mode=""></image>
+					</view>
+					<view class="info">
+						<view class="name">{{myMatchmakerInfo.nickname}}</view>
+						<view class="desc">{{myMatchmakerInfo.describe}}</view>
+					</view>
+				</view>
+				<view class="right-info" @click="handleCallClick">联系</view>
+			</view>
+		</block>
+		<view class="h1-title" style="margin-top: 40rpx;">推荐</view>
+		<view class="content">
+			<view class="item" v-for="item in matchmakerList" :key="item.id">
+				<view class="left-info">
+					<image :src="item.avatar" mode=""></image>
+					<view class="info">
+						<view class="name">{{item.nickname}}</view>
+						<view class="desc">{{item.describe}}</view>
+					</view>
+				</view>
+				<view class="right-info" v-if="!hideChange" @click="change(item.id)">切换</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				matchmakerList: [],
+				myMatchmakerInfo: {},
+				currentPage: 1,
+				totalPage: 1,
+				hideChange:null
+			}
+		},
+		components: {
+			Loadlogo
+		},
+		onLoad() {
+			this.getMatchmakerInfo()
+		},
+		methods: {
+			// 获取红娘信息
+			getMatchmakerInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=matchmakerService`,
+					{
+						page: _this.currentPage
+					},
+					res => {
+						_this.loadlogo = true
+						_this.currentPage ++
+						_this.matchmakerList = res.data.list
+						_this.myMatchmakerInfo = res.data.matchmaker ? res.data.matchmaker : {},
+						_this.hideChange = res.data.hideChange
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+			// 切换红娘
+			change(id) {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=matchmakerChange`,
+					{
+						id: id,
+					},
+					res => {
+						if(res.errno == 0) {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+							_this.currentPage = 1
+							_this.getMatchmakerInfo()
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 联系红娘
+			handleCallClick() {
+				uni.makePhoneCall({
+				    phoneNumber: this.myMatchmakerInfo.phone
+				});
+			},
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.h1-title {
+		height: 50rpx;
+		line-height: 50rpx;
+		margin: 30rpx 0 0 30rpx;
+		font-size: 36rpx;
+		font-weight: bold;
+		color: #333;
+	}
+	
+	.self {
+		width: 630rpx;
+		height: 108rpx;
+		margin: 30rpx auto 0;
+		padding: 30rpx;
+		color: #fff;
+		background: linear-gradient(315deg, #FDAE25 0%, #FF8E8A 100%);
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.left-info {
+			height: 100%;
+			width: auto;
+			display: flex;
+			.avatar {
+				width: 108rpx;
+				height: 108rpx;
+				border-radius: 54rpx;
+				background-color: #fff;
+				position: relative;
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50rpx;
+					position: absolute;
+					left: 4rpx;
+					top: 4rpx;
+				}
+			}
+			.info {
+				height: 100%;
+				margin-left: 30rpx;
+				.name {
+					height: 50rpx;
+					line-height: 50rpx;
+					font-weight: bold;
+					font-size: 36rpx;
+					margin-top: 8rpx;
+				}
+				.desc {
+					height: 32rpx;
+					line-height: 32rpx;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
+		.right-info {
+			width: 120rpx;
+			height: 50rpx;
+			border-radius: 25rpx;
+			line-height: 50rpx;
+			text-align: center;
+			border: 1rpx solid #fff;
+			color: #fff;
+			font-size: 28rpx;
+		}
+	}
+
+	.content {
+		width: 690rpx;
+		height: auto;
+		margin: auto;
+		.item {
+			height: 100rpx;
+			width: 100%;
+			padding: 30rpx 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.left-info {
+				height: 100%;
+				display: flex;
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50rpx;
+				}
+				.info {
+					height: 100%;
+					margin-left: 30rpx;
+					.name {
+						height: 50rpx;
+						line-height: 50rpx;
+						margin-top: 4rpx;
+						color: #333;
+						font-size: 36rpx;
+					}
+					.desc {
+						height: 34rpx;
+						line-height: 34rpx;
+						font-size: 24rpx;
+						color: #999;
+						margin-top: 10rpx;
+					}
+				}
+			}
+			.right-info {
+				width: 120rpx;
+				height: 50rpx;
+				border-radius: 25rpx;
+				line-height: 50rpx;
+				text-align: center;
+				border: 1rpx solid #333;
+				color: #333;
+				font-size: 28rpx;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/blindDate/member/all.vue b/pages/subPages2/blindDate/member/all.vue
new file mode 100644
index 0000000..d5fb60e
--- /dev/null
+++ b/pages/subPages2/blindDate/member/all.vue
@@ -0,0 +1,315 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<!-- 搜索框 -->
+		<view class="header">
+			<view class="search-box">
+				<view class="iconfont icon-sousuo"></view>
+				<input type="text" v-model="keyWords" @confirm="search" confirm-type="搜索" placeholder="输入用户昵称" placeholder-style="font-size: 28rpx" />
+			</view>
+			<view class="search-btn" @click="search">搜索</view>
+		</view>
+		<!-- 筛选 -->
+		<view class="filter-box">
+			<view  style="flex: 0.8;">
+				<filtertab 
+				:requestType="'9'" 
+				:isPageScroll="'1'" 
+				@selectAreaid="selectAreaid" 
+				@selectSort="selectSort" 
+				@getmore="getmore" 
+				@getResumeList="getResumeList"
+				@selectClassTwoid="selectClassTwoid" 
+				@selectOrders="selectOrders" 
+				@getcityWork="getcityWork"
+				@selectGneder="selectGneder"></filtertab>
+			</view>
+			<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="check = !check">
+				<text>更多</text>
+				<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+			</view>
+		</view>
+		
+		<!-- 导航栏 -->
+	<!-- 	<navbar :navbarList="navbar" :topHeight="200" @navbarChange="handleNavbarItemClcik"></navbar> -->
+		
+		<!-- 更多筛选弹窗 -->
+		<view  >
+			 <screening :check="check" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+		</view>
+		
+		<!-- 内容 -->
+		<view class="nav-content">
+			<view class="item" v-for="(item,index) in memberList" :key="index">
+				<user :memberInfo="item" :isShowPlay="item.video.length > 0" :isShowViews="true"></user>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" pageType="16"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue';
+	import screening from '@/components/template/screening.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import navbar from '../template/navbar.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import user from '@/components/template/user.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				check: false,
+				moreData: {},
+				lng: '',
+				lat: '',
+				keyWords: '',
+				currentPage: 1,
+				totalPage: 1,
+				// navbar: ['推荐','找男友','找女友','视频'],
+				navIndex: 1,
+				memberList: [],
+				sort: 1,  //排序
+				gneder: 0,  //性别
+				area_id: '',  //区域id
+				apiParams: {},
+				isShowVideo: false,
+				// is_first: true,  //防止进入页面时getcityWork()中默认请求列表数据
+				get_type: 0
+			}
+		},
+		onLoad(e) {
+			let _this = this,
+				locationInfo = uni.getStorageSync('curLoction') || {}
+			_this.lat = locationInfo.latitude || ''
+			_this.lng = locationInfo.longitude || ''
+			uni.getLocation({
+				type: 'wgs84',
+				success(res) {
+					_this.lat = res.latitude
+					_this.lng = res.longitude
+				}
+			})
+			if(e.get_type) {
+			    _this.get_type = e.get_type;
+			    _this.apiParams.get_type = e.get_type
+			    _this.isShowVideo = true
+			   }
+			this.getMemberList('first')
+		},
+		onShow() {
+			
+		},
+		components: {
+			// navbar,
+			user,
+			Loadlogo,
+			filtertab,
+			screening,
+			TabBars
+		},
+		methods: {
+			// 获取会员列表
+			getMemberList(type) {
+				let _this = this,
+					apiUrl = `&p=dating&do=homeList&type=get&sort=${_this.navIndex}&lng=${_this.lng}&lat=${_this.lat}`
+				if(type === 'first') {
+					_this.currentPage = 1
+				}
+				App._post_form(
+					apiUrl,
+					{	
+						nickname: _this.keyWords,
+						sort: _this.sort,
+						gneder: _this.gneder,
+						area_id: _this.area_id,
+						page: _this.currentPage,
+						is_total: 1,
+						..._this.apiParams
+					},
+					res => {
+						_this.memberList = type === 'first' ? [] : _this.memberList
+						
+						
+						_this.memberList = [..._this.memberList,...res.data.list]
+						
+						_this.totalPage = res.data.total
+						_this.currentPage ++
+						_this.loadlogo = true
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 地区选择
+			getcityWork(area_id) {
+				let is_change = area_id == this.area_id
+				this.area_id = area_id
+				if(!is_change) {
+					this.getMemberList('first')
+				}
+			},
+			
+			// 排序选择
+			selectSort(item) {
+				let is_change = item.val == this.sort
+				this.sort = item.val
+				// 发生改变才请求
+				if(!is_change) {
+					this.getMemberList('first')
+				}
+			},
+			
+			// 性别选择
+			selectGneder(item) {
+				let is_change = item.val - 1 == this.gneder
+				this.gneder = item.val - 1
+				if(!is_change) {
+					this.getMemberList('first')
+				}
+			},
+			
+			getmore(data) {
+				data.top.forEach((item,index) => {
+					if(index > 2){
+						this.moreData[item.subscript] = data[item.subscript];
+					}
+				});
+				this.moreData.top = data.top;
+				for(let key in this.moreData){
+						this.moreData[key].forEach((item,index) => {
+								item.checked = false;
+								if(this.isShowVideo && key == 'get_type' && item.val == 1) {
+									item.checked = true
+								}
+								// if(key == 'job_type' && item.val == this.job_type){
+								// 	item.checked = true;
+								// }
+						})
+				}
+			},
+			
+			// 更多弹窗选项选择
+			checkeda(index,key,flag) {
+				this.moreData[key].forEach(item=>{
+					item.checked = false
+				});
+				let obj = Object.assign({},this.moreData);
+				this.moreData = {...obj}
+				this.moreData[key][index].checked = flag
+			},
+			
+			// 更多弹窗确定
+			confirm(e) {
+				// console.log(e)
+				// this.apiParams.get_type = e.get_type || '';
+				this.apiParams = e
+				this.check = false;
+				this.getMemberList('first')
+				console.log(this.apiParams)
+			},
+			
+			// 关闭和清除
+			close(flag) {
+				// 清除
+				if(!flag) {
+					for(let key in this.moreData){
+						this.moreData[key].forEach((item,index) => {
+								item.checked = false;
+						})
+					}
+					this.apiParams = {}
+					this.getMemberList('first')
+				}
+				
+				this.check = false
+				console.log(this.apiParams)
+			},
+			
+			// 搜索
+			search() {
+				this.getMemberList('first')
+			},
+			
+			getResumeList() {
+				
+			},
+			
+			selectClassTwoid() {
+				
+			},
+			
+			selectOrders() {
+				
+			},
+			
+			selectAreaid(item) {
+				
+			},
+			
+		},
+		onReachBottom() {
+			if(this.currentPage <= this.totalPage && this.loadlogo) {
+				this.getMemberList('more')
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	.header {
+		width: 690rpx;
+		height: 80rpx;
+		margin: 30rpx auto 0;
+		font-size: 28rpx;
+		color: #333;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		.search-box {
+			width: 560rpx;
+			height: 80rpx;
+			display: flex;
+			align-items: center;
+			background-color: #F8F8F8;
+			border-radius: 20rpx;
+			padding: 0 20rpx;
+			.iconfont {
+				color: #999;
+			}
+			input {
+				margin-left: 20rpx;
+			}
+		}
+	}
+	
+	.filter-box {
+		width: 690rpx;
+		display: flex;
+		margin: auto;
+	}
+	
+	.nav-content {
+		width: 690rpx;
+		padding-bottom: 100upx;
+		margin: auto;
+		display: flex;
+		flex-wrap: wrap;
+		.item {
+			width: 335rpx;
+			height: auto;
+			border-radius: 20rpx;
+			overflow: hidden;
+			background-color: #F8F8F8;
+			margin-bottom: 20rpx;
+			&:nth-child(2n) {
+				margin-left: 20rpx;
+			}
+		}
+	}
+	
+	
+</style>
diff --git a/pages/subPages2/blindDate/member/detail.vue b/pages/subPages2/blindDate/member/detail.vue
new file mode 100644
index 0000000..3e2ccba
--- /dev/null
+++ b/pages/subPages2/blindDate/member/detail.vue
@@ -0,0 +1,901 @@
+<template>
+	<view class="page">
+		<loadlogo v-if="!loadlogo" />
+		<!-- <image class="avatar" :src="memberInfo.cover_show" mode=""></image> -->
+		
+		<view v-if="albumNum > 0" class="header">
+			<view style="width: 100%;height: 100%;" :class="{'indistinct-swiper' : memberInfo.is_exchange == 0 && memberInfo.switch_phone == 1 && !isSelf}">
+				<swiper class="swiper" :autoplay="true" :interval="3000" :duration="500" :circular="true">
+					<swiper-item v-for="(item,index) in memberInfo.photo_show" :key="index" style="position: relative;">
+						<view class="swiper-item" @click="handleImgClick(item)" >
+							<image :src="item" mode="widthFix"></image>
+						</view>
+						<view class="num-box">{{index+1}}/{{albumNum}}</view>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view v-if="memberInfo.switch_phone == 1 && !isSelf" class="look-btn" style="top: 250rpx;left: 275rpx;" @click="handleLookInfoClick">查看资料</view>
+		</view>
+		
+		<view class="content" style="padding-bottom: 160rpx;">
+			<view class="header-info">
+				<view class="top-info">
+					<view class="name">{{memberInfo.nickname}}</view>
+					<view @click="handleCollectClick" style="position: relative;top: 28rpx;">
+						<view v-if="memberInfo.is_collection == 0" class="collect yes">收藏({{memberInfo.collection}})</view>
+						<view v-else class="collect no">取消收藏({{memberInfo.collection}})</view>
+					</view>
+				</view>
+				<view class="user-info">
+					<view class="sex-age" :class="{'woman': memberInfo.gneder == 2,'man': memberInfo.gneder == 1}">
+						<view v-if="memberInfo.gneder == 2" class="iconfont icon-female"></view>
+						<view v-else class="iconfont icon-male"></view>
+						<view v-if="memberInfo.age">{{memberInfo.age}}</view>
+					</view>
+					<view v-if="memberInfo.current_address" class="location">{{memberInfo.current_address}}</view>
+					<view v-if="memberInfo.is_vip" class="member">VIP</view>
+				</view>
+				<view v-if="cIntroduce" class="self-introduce">{{memberInfo.introduce}}</view>
+				<view v-else class="self-introduce">这个人很懒，未留下自我介绍！</view>
+				<view class="tags">
+					<view class="item" v-for="(item,index) in memberInfo.label_list" :key="index">{{item}}</view>
+				</view>
+			</view>
+			<view class="line"></view>
+			<view class="navbar">
+				<view 
+				class="item" 
+				:class="{'selected': currenIndex == index}" 
+				v-for="(item,index) in navbar" 
+				:key="index"
+				@click="handleNavbarClcik(index)"
+				>
+					<view>{{item}}</view>
+					<view class="sign" v-if="currenIndex == index"></view>
+				</view>
+			</view>
+			
+			<view style="position: relative;">
+				<!-- 查看资料按钮 -->
+				<view v-if="memberInfo.switch_tel == 1 && (currenIndex != 1 && currenIndex != 2  && currenIndex != 0) && !isSelf" class="look-btn" @click="handleLookInfoClick">查看资料</view>
+				<view v-if="memberInfo.switch_info == 1 && (currenIndex != 1 && currenIndex != 2 && currenIndex != 3) && !isSelf" class="look-btn" @click="handleLookInfoClick">查看资料</view>
+				<!-- 基础资料 -->
+				<view v-if="currenIndex == 0" class="basic-info" :class="{'indistinct' : memberInfo.is_exchange == 0 && memberInfo.switch_info == 1 && !isSelf}">
+					<view class="item" v-for="(item,index) in basicInfo" :key="index">{{item.label}}{{item.value}}</view>
+				</view>
+				<!-- 择偶 -->
+				<view v-else-if="currenIndex == 1" class="mate-select">
+					<view class="item" v-for="(item,index) in mateSelectInfo" :key="index">{{item.label}}{{item.value}}</view>
+					<block v-if="memberInfo.require.length">
+						<view class="else-info">其他要求：{{memberInfo.require}}</view>
+					</block>
+				</view>
+				<!-- 动态 -->
+				<view v-else-if="currenIndex == 2" class="dynamic">
+					<view class="item" v-for="item in dynamicList" :key="item.id" @click="toDetail(item.id)">
+						<personnal-item :dynamicInfo="item"></personnal-item>
+						<view class="line"></view>
+					</view>
+				</view>
+				<!-- 联系TA -->
+				<view v-else-if="currenIndex == 3" class="contact" :class="{'indistinct' : memberInfo.is_exchange == 0 && memberInfo.switch_tel == 1 && !isSelf}">
+					<view class="item we-chat" @click="handleContactClick(1)" v-if="memberInfo.wechat_number.length">
+						<view class="left">
+							<image :src="imgfixUrls + 'dating/bd_wechat.svg'" mode=""></image>
+							<view class="value">{{memberInfo.wechat_number}}</view>
+						</view>
+						<view class="right">复制</view>
+					</view>
+					<view class="item qq" @click="handleContactClick(2)" v-if="memberInfo.qq_number.length">
+						<view class="left">
+							<image :src="imgfixUrls + 'dating/bd_qq.svg'" mode=""></image>
+							<view class="value">{{memberInfo.qq_number}}</view>
+						</view>
+						<view class="right">复制</view>
+					</view>
+					<view class="item phone" @click="handleContactClick(3)" v-if="memberInfo.phone.length">
+						<view class="left">
+							<image :src="imgfixUrls + 'dating/bd_phone.svg'" mode=""></image>
+							<view class="value">{{memberInfo.phone}}</view>
+						</view>
+						<view class="right">拨打</view>
+					</view>
+					<view style="text-align: center;" v-if="!isHaveConcact">暂无联系方式</view>
+				</view>
+				<!-- 视频 -->
+				<view v-else-if="currenIndex == 4" class="album" :class="{'indistinct-album' : memberInfo.is_exchange == 0 && memberInfo.switch_info == 1 && !isSelf}">
+					<block v-if="albumInfo.is_have_video">
+						<video :src="memberInfo.video_show" :show-center-play-btn="isShowVideoPlay" :controls="isShowVideoPlay"></video>
+					</block>
+				</view>
+			</view>
+		</view>
+		
+		<view class="footer">
+			<view class="left-box">
+				<view class="item" @click="toHome">
+					<image :src="imgfixUrls + 'dating/bd_home.svg'" mode=""></image>
+					<view class="title">首页</view>
+				</view>
+				<!-- #ifdef H5 -->
+				<view class="item" @click="shareShow = true">
+					<image :src="imgfixUrls + 'goods/flow.png'" mode=""></image>
+					<view class="title">分享</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<view class="item">
+					<button open-type="share" class="share-button"></button>
+					<image :src="imgfixUrls + 'goods/flow.png'" mode=""></image>
+					<view class="title">分享</view>
+				</view>
+				<!-- #endif -->
+			<!-- 	<view class="item" @click="handleChatClick">
+					<image :src="imgfixUrls + 'dating/bd_message3.svg'" mode=""></image>
+					<view class="title">私信</view>
+				</view> -->
+			</view>
+			<view class="right-box">
+				<view class="common-btn" @click="handleChatClick">{{contactBtnText}}</view>
+				<view class="common-btn" @click="handleContactMatchmakerClick">联系红娘</view>
+			</view>
+		</view>
+		
+		<!-- h5分享图片显示 -->
+		<!-- #ifdef H5 -->
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import personnalItem from '../template/personalItem.vue';
+	import PopManager from '@/components/template/PopManager';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				memberInfo: {},  //会员信息
+				currenIndex: 0,
+				currentPage: 1, //动态信息当前页数
+				totalPage: 1, //动态信息总页数
+				member_id: 0,
+				dynamicList: [],
+				
+				shareShow: false,  //h5分享图片显示
+				isSelf: false, //是否用户进入自己详情页
+				contactBtnText: '查看资料',
+				isShowVideoPlay: true,
+			}
+		},
+		components: {
+			personnalItem,
+			Loadlogo,
+			PopManager
+		},
+		onLoad(e) {
+			this.member_id = e.id
+			this.getMemberDetailInfo(e.id)
+			if(e.is_self) {
+				this.isSelf = e.is_self
+			}
+		},
+		computed: {
+			// 基础资料
+			basicInfo() {
+				let res = [
+					{label: '姓名：',value: this.memberInfo.realname},
+					{label: '身高：',value: `${this.memberInfo.height}cm`},
+					{label: '体重：',value: `${this.memberInfo.weight}Kg`},
+					{label: '名族：',value: `${this.memberInfo.nation}族`},
+					{label: '婚姻状况：',value: this.memberInfo.marital_status_text},
+					{label: '学历：',value: this.memberInfo.education_text},
+					{label: '薪资：',value: `${this.memberInfo.income}/月`},
+					{label: '房产：',value: this.memberInfo.live_text},
+					{label: '车：',value: this.memberInfo.travel == 2 ? `已购车/${this.memberInfo.vehicle}` : '未购车'},
+					{label: '工作：',value: this.memberInfo.work}
+				]
+				if(this.memberInfo.hometown_address) {
+					res.push({label: '籍贯：',value: this.memberInfo.hometown_address})
+				}
+				return res
+			},
+			// 择偶信息
+			mateSelectInfo() {
+				let res = [
+					{label: '婚姻状况：',value: this.memberInfo.require_marital},
+					{label: '学历：',value: this.memberInfo.require_education_text}
+				]
+				if(this.memberInfo.max_age != 0) {
+					res.push({label: '年龄：',value: `${this.memberInfo.min_age}-${this.memberInfo.max_age}岁`})
+				}
+				if(this.memberInfo.max_height != 0) {
+					res.push({label: '身高：',value: `${this.memberInfo.min_height}-${this.memberInfo.max_height}cm`})
+				}
+				return res
+			},
+			// 相册信息
+			albumInfo() {
+				if(this.memberInfo && this.memberInfo.photo_show) {
+					return {
+						is_have_video: this.memberInfo.video_show,  //是否有视频
+						is_show_first: this.memberInfo.photo_show[0] ? true : false,
+						first_photo: this.memberInfo.photo_show[0] || '',
+						is_show_second: this.memberInfo.photo_show[1] ? true : false,
+						second_photo: this.memberInfo.photo_show[1] || '',
+						photo: this.memberInfo.video_show ? this.memberInfo.photo_show.slice(2) : this.memberInfo.photo_show
+					}
+				}
+			},
+			// 相册数量
+			albumNum() {
+				if(this.memberInfo && this.memberInfo.photo_show) {
+					return this.memberInfo.photo_show.length
+				}
+			},
+			
+			// 是否有自我介绍
+			cIntroduce() {
+				if(this.memberInfo && this.memberInfo.introduce) {
+					return this.memberInfo.introduce.length > 0
+				}
+			},
+			// 是否允许查看资料、相册、联系方式
+			showContent() {
+				if(this.memberInfo && this.memberInfo.id) {
+					return (this.currenIndex == 0 || this.currenIndex == 3 || this.currenIndex == 4) && this.memberInfo.is_exchange == 0 && this.memberInfo.switch_info == 1
+				}
+			},
+			// navbar可选项
+			navbar() {
+				let res = ['基础资料','择偶','动态','联系TA']
+				if(this.memberInfo.video_show) {
+					res.push('视频')
+				}
+				return res
+			},
+			// 有无联系方式
+			isHaveConcact() {
+				let res = false
+				if(this.memberInfo && this.memberInfo.id) {
+					res = this.memberInfo.wechat_number.length > 0 || this.memberInfo.qq_number.length > 0 || this.memberInfo.phone.length > 0
+				}
+				return res
+			}
+		
+		},
+		methods: {
+			// 获取会员详情信息
+			getMemberDetailInfo(id) {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=getMemberInfo&id=${id}`,
+					{
+						id: id,
+					},
+					res => {
+						_this.memberInfo = res.data || {}
+						if(res.data.is_exchange == 0 && res.data.switch_info == 1 && !_this.isSelf) {
+							_this.contactBtnText = '查看资料'
+							_this.isShowVideoPlay = false
+						}
+						if(res.data.switch_tel == 2 && !_this.isSelf){
+							_this.contactBtnText = '私信'
+						}
+						_this.loadlogo = true
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 获取动态信息
+			getDynamicInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=dynamicList`,
+					{
+						page: _this.currentPage,
+						member_id: _this.member_id
+					},
+					res => {
+						_this.dynamicList = [..._this.dynamicList,...res.data.list]
+						_this.totalPage = res.data.total
+						_this.currentPage ++
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 联系点击
+			handleContactClick(type) {
+				// 未公开联系方式时直接return
+				if(this.showContent && !this.isSelf) {
+					return
+				}
+				
+				if(type == 3) {
+					uni.makePhoneCall({
+						phoneNumber: this.memberInfo.phone
+					})
+				}else {
+					//#ifdef H5
+						App.clipboard(type == 1 ? this.memberInfo.wechat_number : this.memberInfo.qq_number);
+					//#endif
+					uni.setClipboardData({
+						data: type == 1 ? this.memberInfo.wechat_number : this.memberInfo.qq_number,
+						success() {
+							uni.showToast({
+								title: '复制成功'
+							})
+						}
+					})
+				}
+			},
+			
+			// 导航点击
+			handleNavbarClcik(index) {
+				this.currenIndex = index
+				if(index == 2) {
+					this.currentPage = 1
+					this.dynamicList = []
+					this.getDynamicInfo()
+				}
+			},
+			
+			// 收藏点击
+			handleCollectClick() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=collectionOperation&id=${_this.member_id}`,
+					{
+						id: _this.member_id,
+					},
+					res => {
+						// 请求成功
+						if(res.errno == 0) {
+							if(_this.memberInfo.is_collection == 0) {
+								_this.memberInfo.is_collection = 1
+								_this.memberInfo.collection ++
+							}else {
+								_this.memberInfo.is_collection = 0
+								_this.memberInfo.collection --
+							}
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 预览图片
+			handleImgClick(url) {
+				let _this = this
+				// 未允许游客查看照片直接return
+				if(_this.memberInfo.is_exchange == 0 && _this.memberInfo.switch_info == 1 && !_this.isSelf) {
+					return
+				}
+				uni.previewImage({
+					urls: _this.memberInfo.photo_show,
+					current: url,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log(data,'信息')
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
+			
+			// 返回首页
+			toHome() {
+				let aid = uni.getStorageInfoSync('agencyData').aid
+				App.navigationTo({
+					url: `pages/mainPages/index/diypage?i=1&aid=${aid}&type=16`
+				})
+			},
+		
+			// 联系红娘
+			handleContactMatchmakerClick() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/matchmakerService`
+				})
+			},
+			
+			// 去动态详情
+			toDetail(id) {
+				App.navigationTo({
+					url: 'pages/subPages2/blindDate/dynamics/detail?id=' + id
+				})
+			},
+		
+			// 私信
+			handleChatClick() {
+				if(this.contactBtnText === '私信') {
+					let getSetInfo = uni.getStorageSync('getSetInfo');
+					if(getSetInfo.type == 1){
+						App.navigationTo({
+							url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + this.memberInfo.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}else{
+						App.navigationTo({
+							url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.memberInfo.mid + '&other_party_type=' + 1+ '&type=1' + '&id='
+						})
+					}
+				}else {
+					this.handleLookInfoClick()
+				}
+			},
+			
+			// 申请查看资料
+			handleLookInfoClick() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=seeMemberInfo`,
+					{
+						member_id: _this.member_id
+					},
+					res => {
+						if(res.data.status && res.data.status == 1) {
+							// 显示可查看资料
+							_this.memberInfo.switch_info = 2
+							_this.memberInfo.is_exchange = 1
+							_this.contactBtnText = '私信'
+							_this.isShowVideoPlay = true;
+							_this.isSelf = true;
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			}
+		},
+		onReachBottom() {
+			if(this.currentPage <= this.totalPage) {
+				this.getDynamicInfo()
+			}
+		},
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+	.page {
+		background-color: #f8f8f8;
+		// min-height: 100vh;
+	}
+	
+	.page-navbar {
+		width: 100%;
+		position: fixed;
+		left: 0;
+		top: 0;
+		font-size: 32rpx;
+		color: #333;
+		display: flex;
+		align-items: center;
+		z-index: 10;
+		.iconfont {
+			position: absolute;
+			left: 30rpx;
+		}
+		.title {
+			width: 100%;
+			text-align: center;
+		}
+	}
+	
+	.bg-color {
+		background-color: #F8F8F8;
+		z-index: 999;
+	}
+
+	
+	.header {
+		width: 100%;
+		height: 560rpx;
+		position: relative;
+		.swiper {
+			width: 100%;
+			height: 100%;
+			.swiper-item {
+				width: 100%;
+				height: 100%;
+				image {
+					width: 100%;
+					height: 100%;
+				}
+			}
+			.num-box {
+				width: 50rpx;
+				height: 26rpx;
+				line-height: 26rpx;
+				text-align: center;
+				border-radius: 13rpx;
+				font-size: 20rpx;
+				color: #fff;
+				background-color: #000;
+				opacity: 0.5;
+				position: absolute;
+				bottom: 60rpx;
+				right: 30rpx;
+			}
+		}
+	}
+
+	.avatar {
+		width: 100%;
+		height: 560rpx;
+		display: block;
+	}
+	
+	.content {
+		width: 690rpx;
+		height: 80vh;
+		padding: 0 30rpx;
+		background-color: #f8f8f8;
+		border-radius: 30rpx 30rpx 0 0;
+		z-index: 9;
+		position: relative;
+		top: -30rpx;
+		.header-info {
+			padding: 30rpx 0 40rpx 0;
+			.top-info {
+				width: 100%;
+				height: 80rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.name {
+					font-size: 48rpx;
+					color: #333;
+					font-weight: bold;
+				}
+				.collect {
+					width: 194rpx;
+					height: 80rpx;
+					line-height: 80rpx;
+					text-align: center;
+					font-size: 28rpx;
+					border-radius: 20rpx;
+				}
+				.no {
+					color: #333;
+					background-color: #fff;
+					border: 1rpx solid #ccc;
+				}
+				.yes {
+					color: #fff;
+					background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+				}
+			}
+			.user-info {
+				width: 100%;
+				height: 30rpx;
+				margin-top: 26rpx;
+				display: flex;
+				align-items: center;
+				color: #fff;
+				font-size: 20rpx;
+				.sex-age {
+					// width: 70rpx;
+					height: 35rpx;
+					line-height: 35upx;
+					padding: 0 10upx;
+					border-radius: 60rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-right: 10rpx;
+					font-size: 26upx;
+					.iconfont {
+						font-size: 20rpx;
+						line-height: 30rpx;
+						margin-right: 4rpx;
+					}
+					.icon-female {
+						transform: rotate(45deg);
+					}
+				}
+				.man {
+					background-color: #0084FF;
+				}
+				.woman {
+					background-color: #FE83AF;
+				}
+				.location {
+					height: 35rpx;
+					line-height: 35upx;
+					width: auto;
+					font-size: 26upx;
+					padding: 0 16rpx;
+					border-radius: 60rpx;
+					background-color: #333333;
+					margin-right: 10rpx;
+				}
+				.member {
+					width: 70rpx;
+					height: 30rpx;
+					line-height: 30rpx;
+					border-radius: 15rpx;
+					text-align: center;
+					background-color: #DCC083;
+				}
+			}
+			.self-introduce {
+				height: auto;
+				line-height: 37rpx;
+				margin-top: 20rpx;
+				color: #333;
+				font-size: 26rpx;
+			}
+			.tags {
+				width: 100%;
+				height: auto;
+				display: flex;
+				flex-wrap: wrap;
+				font-size: 20rpx;
+				color: #333;
+				.item {
+					width: auto;
+					height: 34rpx;
+					border-radius: 17rpx;
+					line-height: 34rpx;
+					text-align: center;
+					padding: 0 13rpx;
+					margin-right: 20rpx;
+					background-color: #EEEEEE;
+					margin-top: 20rpx;
+				}
+			}
+		}
+		.line {
+			width: 690rpx;
+			height: 8rpx;
+			border-radius: 4rpx;
+			background-color: #eee;
+		}
+		.navbar {
+			width: 100%;
+			height: 50rpx;
+			padding-top: 40rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			font-size: 28rpx;
+			color: #999;
+			.item {
+				width: auto;
+				height: 100%;
+				line-height: 50rpx;
+				text-align: center;
+				.sign {
+					width: 30rpx;
+					height: 6rpx;
+					background-color: #333;
+					border-radius: 2rpx;
+					margin: 10rpx auto 0;
+				}
+			}
+			.selected {
+				font-size: 36rpx;
+				color: #333;
+				font-weight: bold;
+			}
+		}
+		
+		.basic-info,.mate-select {
+			width: 100%;
+			height: auto;
+			display: flex;
+			flex-wrap: wrap;
+			font-size: 28rpx;
+			color: #333;
+			// padding: 60rpx 0 160rpx 0;
+			padding-top: 60rpx;
+			position: relative;
+			.item {
+				width: 345rpx;
+				height: 40rpx;
+				margin-bottom: 30rpx;
+			}
+			.else-info {
+				width: 100%;
+				height: auto;
+			}
+		}
+		.album {
+			width: 100%;
+			height: auto;
+			padding-top: 50rpx;
+			display: flex;
+			flex-wrap: wrap;
+			video {
+				width: 690rpx;
+				height: 690rpx;
+				border-radius: 20rpx;
+			}
+		}
+		.dynamic {
+			width: 100%;
+			height: auto;
+			padding: 20rpx 0 60rpx 0;
+		}
+		.contact {
+			width: 100%;
+			height: auto;
+			color: #333;
+			padding-top: 60rpx;
+			.item {
+				width: 630rpx;
+				height: 80rpx;
+				padding: 0 30rpx;
+				border-radius: 40rpx;
+				margin-bottom: 20rpx;
+				border: 1rpx solid #fff;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.left {
+					width: auto;
+					height: 100%;
+					display: flex;
+					align-items: center;
+					.value {
+						height: 40rpx;
+						line-height: 40rpx;
+						font-size: 28rpx;
+					}
+				}
+				.right {
+					font-size: 24rpx;
+					height: 33rpx;
+				}
+			}
+			.we-chat {
+				border-color: #07C160;
+				color: #07C160;
+				image {
+					width: 44rpx;
+					height: 36rpx;
+					margin-right: 36rpx;
+				}
+			}
+			.qq {
+				border-color: #DA2820;
+				color: #DA2820;
+				image {
+					width: 36rpx;
+					height: 38rpx;
+					margin-right: 44rpx;
+				}
+			}
+			.phone {
+				border-color: #333333;
+				color: #333333;
+				image {
+					width: 28rpx;
+					height: 38rpx;
+					margin-right: 48rpx;
+				}
+			}
+		}
+	}
+	
+	.look-btn {
+		width: 200rpx;
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 25rpx;
+		text-align: center;
+		font-size: 30rpx;
+		color: #fff;
+		background-color: #F99FBA;
+		z-index: 10;
+		position: absolute;
+		top: 120rpx;
+		left: 245rpx;
+	}
+	
+	.indistinct {
+		filter: blur(10rpx);
+	}
+	
+	.indistinct-swiper {
+		filter: blur(30rpx);
+	}
+	
+	.indistinct-album {
+		filter: blur(16rpx);
+	}
+	
+	.coverImg {
+		width: 750rpx;
+	}
+	
+	.footer {
+		width: 750rpx;
+		height: 140rpx;
+		background-color: #fff;
+		border-top: 1rpx solid #eee;
+		z-index: 10;
+		position: fixed;
+		bottom: 0rpx;
+		left: 0rpx;
+		display: flex;
+		align-items: center;
+		.left-box {
+			width: 230rpx;
+			height: 100%;
+			padding: 0 50rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-around;
+			.item {
+				width: 50rpx;
+				height: 74rpx;
+				position: relative;
+				padding: 33rpx 0;
+				color: #333;
+				font-size: 20rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				justify-content: space-between;
+				.share-button {
+					width: 100%;
+					height: 100%;
+					position: absolute;
+					left: 0;
+					top: 0;
+					background-color: rgba(0,0,0,0);
+				}
+				image {
+					width: 34rpx;
+					height: 34rpx;
+				}
+				.title {
+					height: 28rpx;
+					line-height: 28rpx;
+				}
+			}
+		}
+		.right-box {
+			width: 390rpx;
+			height: 100%;
+			padding-right: 30rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.common-btn {
+				width: 184rpx;
+				height: 100rpx;
+				border-radius: 20rpx;
+				text-align: center;
+				line-height: 100rpx;
+				color: #fff;
+				font-size: 28rpx;
+				&:first-child {
+					background-color: #14BD6C;
+				}
+				&:last-child {
+					background-color: #FF4444;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/blindDate/member/open.vue b/pages/subPages2/blindDate/member/open.vue
new file mode 100644
index 0000000..d953165
--- /dev/null
+++ b/pages/subPages2/blindDate/member/open.vue
@@ -0,0 +1,268 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="header" :style="{'background-image': 'url('+ imgfixUrls + 'dating/bd_omember_bg.svg' +')'}">
+			<view class="user-info">
+				<view class="avatar">
+					<image :src="memberInfo.avatar" mode=""></image>
+				</view>
+				<view class="else-info">
+					<view class="name">{{memberInfo.nickname}}</view>
+					<block v-if="memberInfo.is_vip">
+						<view v-if="memberInfo.vip.type == 1">到期时间：{{memberInfo.vip.end_time_text}}</view>
+						<view v-else-if="memberInfo.vip.type == 2">剩余次数：{{memberInfo.vip.surplus_number}}</view>
+						<view v-else-if="memberInfo.vip.type == 3">已过期</view>
+						<view v-else>已失效</view>
+					</block>
+					<view v-else class="status">未开通</view>
+				</view>
+			</view>
+		</view>
+	
+		<view class="content">
+			<view class="h2-title">购买会员</view>
+			<view class="member-info" :class="{'select': index == currentIndex}" v-for="(item,index) in memberInfo.list" :key="item.id" @click="currentIndex = index">
+				<view class="left-info">
+					<view class="name">{{item.title}}</view>
+					<view v-if="item.type == 1" class="date">有效时间：{{item.day}}天</view>
+					<view v-else class="date">使用次数：{{item.second}}次</view>
+				</view>
+				<view class="right-info">
+					<view class="unit">¥</view>
+					<view class="price">{{item.money}}</view>
+				</view>
+			</view>
+		</view>
+	
+		<view class="foot-btn" @click="handleOpenClick">立即支付</view>
+		<TabBars :tabBarAct="0" pageType="16"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				memberInfo: {},
+				currentIndex: 0,
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars
+		},
+		computed: {
+			
+		},
+		onLoad() {
+			this.getMemberInfo()
+		},
+		methods: {
+			// 获取vip信息
+			getMemberInfo() {
+				let _this = this
+				App._post_form(
+					 `&p=dating&do=vipList`,
+					{},
+					res => {
+						_this.memberInfo = res.data
+						_this.loadlogo = true
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 开通vip
+			handleOpenClick() {
+				let _this = this
+				App._post_form(
+					 `&p=dating&do=vipOpen`,
+					{
+						id: _this.memberInfo.list[_this.currentIndex].id
+					},
+					res => {
+						if(Array.isArray(res.data) || !res.data.orderid) {
+							App.navigationTo({
+								url: 'pages/subPages2/blindDate/personal'
+							})
+						}else {
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=dating'
+							});
+						}
+						console.log(res)
+					},
+					false,
+					() => {
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.header {
+		width: 100%;
+		height: 414rpx;
+		background-size: 100% 100%;
+		overflow: hidden;
+		position: relative;
+		.navbar {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			color: #333;
+			position: relative;
+			.iconfont {
+				font-size: 32rpx;
+				position: absolute;
+				left: 30rpx;
+			}
+			.title {
+				font-size: 36rpx;
+				font-weight: bold;
+				width: 100%;
+				margin: auto;
+				text-align: center;
+			}
+		}
+		.user-info {
+			width: 690rpx;
+			height: 168rpx;
+			background: linear-gradient(315deg, #FDAE25 0%, #FF8E8A 100%);
+			border-radius: 20rpx 20rpx 0 0;
+			position: absolute;
+			left: 30rpx;
+			bottom: 0;
+			display: flex;
+			align-items: center;
+			.avatar {
+				width: 108rpx;
+				height: 108rpx;
+				border-radius: 50%;
+				background-color: #fff;
+				margin-left: 40rpx;
+				position: relative;
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50%;
+					position: absolute;
+					left: 4rpx;
+					top: 4rpx;
+				}
+			}
+			.else-info {
+				height: 108rpx;
+				margin-left: 30rpx;
+				color: #fff;
+				.name {
+					height: 50rpx;
+					margin-top: 7rpx;
+					font-weight: bold;
+					font-size: 36rpx;
+				}
+				.status {
+					width: 70rpx;
+					height: 34rpx;
+					border-radius: 8rpx;
+					border: 1rpx solid #fff;
+					font-size: 20rpx;
+					line-height: 34rpx;
+					text-align: center;
+					margin-top: 10rpx;
+				}
+				.date {
+					height: 33rpx;
+					line-height: 33rpx;
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 20rpx;
+				}
+			}
+		}
+	}
+
+	.content {
+		width: 690rpx;
+		margin: 40rpx auto 0;
+		padding-bottom: 300rpx;
+		.h2-title {
+			height: 50rpx;
+			line-height: 50rpx;
+			font-size: 36rpx;
+			color: #333;
+			font-weight: bold;
+		}
+		.member-info {
+			width: 610rpx;
+			height: 103rpx;
+			padding: 30rpx 40rpx;
+			margin-top: 30rpx;
+			background-color: #FFF;
+			border-radius: 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			border: 1rpx solid #ccc;
+			.left-info {
+				height: 100%;
+				flex: 1;
+				.name {
+					height: 50rpx;
+					line-height: 50rpx;
+					font-size: 36rpx;
+					font-weight: bold;
+					color: #333;
+				}
+				.date {
+					height: 33rpx;
+					line-height: 33rpx;
+					color: #999;
+					font-size: 24rpx;
+					margin-top: 20rpx;
+				}
+			}
+			.right-info {
+				height: 60rpx;
+				color: #FF4444;
+				display: flex;
+				font-weight: bold;
+				.unit {
+					font-size: 24rpx;
+					line-height: 74rpx;
+				}
+				.price {
+					font-size: 48rpx;
+					
+				}
+			}
+		}
+		
+		.select {
+			background-color: #FFEAE8;
+			border: none;
+		}
+	}
+
+	.foot-btn {
+		width: 690rpx;
+		height: 80rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		font-size: 32rpx;
+		color: #fff;
+		text-align: center;
+		line-height: 80rpx;
+		border-radius: 20rpx;
+		position: fixed;
+		left: 30rpx;
+		bottom: 130rpx;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/member/recommend.vue b/pages/subPages2/blindDate/member/recommend.vue
new file mode 100644
index 0000000..d7eff0a
--- /dev/null
+++ b/pages/subPages2/blindDate/member/recommend.vue
@@ -0,0 +1,168 @@
+<template>
+	<view>
+		<!-- <view class="search">
+			<view class="iconfont icon-sousuo1"></view>
+			<input class="input" type="text" v-model="keyWords" placeholder="输入关键词" placeholder-style="fontsize:26rpx">
+		</view> -->
+		
+		<scroll-view scroll-y="true" class="scroll">
+			<view class="content">
+				<view class="item" v-for="item in memberList" :key="item.id">
+					<user :memberInfo="item" :isShowSelect="true" @select="select"></user>
+				</view>
+			</view>
+		</scroll-view>
+		
+		<view @click="handleRecommendClick">
+			<view v-if="options.is_recommend == 1" class="footer-btn">确认推荐</view>
+			<view v-else class="footer-btn" style="background: #333;">确认取消</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import user from '@/components/template/user.vue'
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				lng: '',
+				lat: '',
+				options: {},
+				keyWords: '',
+				currentPage: 1,
+				memberList: [],  //会员列表
+				selectIds: [],
+			}
+		},
+		components: {
+			user,
+			Loadlogo
+		},
+		onLoad(e) {
+			let _this = this
+			_this.options = e
+			_this.lng = e.lng
+			_this.lat = e.lat
+			_this.getMemberList()
+		},
+		methods: {
+			// 获取会员列表
+			getMemberList() {
+				let _this = this,
+					apiUrl = `&p=dating&do=homeList&lng=${_this.lng}&lat=${_this.lat}`
+				App._post_form(
+					apiUrl,
+					{
+						page: _this.currentPage,
+						..._this.options
+					},
+					res => {
+						_this.memberList = res.data || []
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 选择
+			select(type,id) {
+				if(type) {
+					this.selectIds.push(id)
+				}else {
+					let index = this.selectIds.indexOf(id)
+					this.selectIds.splice(index,1)
+				}
+			},
+			
+			// 点击推荐按钮
+			handleRecommendClick() {
+				let _this = this
+				_this.selectIds = JSON.stringify(_this.selectIds)
+				App._post_form(
+					`&p=dating&do=userInfoExchange`,
+					{
+						member_id: _this.options.member_id,
+						ids: _this.selectIds,
+						type: _this.options.is_recommend
+					},
+					res => {
+						if(res.errno == 0) {
+							uni.showToast({
+								title: res.message,
+								icon: 'none'
+							})
+							setTimeout(() => {
+								uni.navigateBack()
+							},1000)
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.search {
+		width: 660rpx;
+		height: 40rpx;
+		border-radius: 40rpx;
+		padding: 20rpx 0 20rpx 30rpx;
+		background-color: #F8F8F8;
+		display: flex;
+		align-items: center;
+		color: #333;
+		font-size: 28rpx;
+		position: fixed;
+		left: 30rpx;
+		top: 30rpx;
+		.iconfont {
+			margin-right: 20rpx;
+			line-height: 40rpx;
+		}
+		.input {
+			width: 580rpx;
+		}
+	}
+
+	.scroll {
+		height: 100vh;
+		// height: calc(100vh - 130rpx);
+		// margin-top: 130rpx;
+	}
+	
+	.content {
+		width: 690rpx;
+		margin: auto;
+		display: flex;
+		flex-wrap: wrap;
+		padding-bottom: 150rpx;
+		.item {
+			&:nth-child(2n+1) {
+				margin-right: 20rpx;
+			}
+		}
+	}
+
+	.footer-btn {
+		width: 690rpx;
+		height: 80rpx;
+		line-height: 80rpx;
+		text-align: center;
+		color: #fff;
+		font-size: 32rpx;
+		border-radius: 20rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		position: fixed;
+		left: 30rpx;
+		bottom: 30rpx;
+		z-index: 10;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/personal.vue b/pages/subPages2/blindDate/personal.vue
new file mode 100644
index 0000000..1d30ce0
--- /dev/null
+++ b/pages/subPages2/blindDate/personal.vue
@@ -0,0 +1,432 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		
+		<view class="header" :style="{'background-image': 'url('+ imgfixUrls + 'dating/bd_personal_bg.png' +')'}">
+			<view class="top-info">
+				<view class="user-info">
+					<image :src="userInfo.avatar" mode=""></image>
+					<view class="user">
+						<view class="name">{{userInfo.nickname}}</view>
+						<view v-if="userInfo.is_vip" class="member">VIP</view>
+					</view>
+				</view>
+				<view class="news" @click="handleNewsClick">
+					<image :src="imgfixUrls + 'dating/bd_message.svg'" mode=""></image>
+					<view v-if="userInfo.im > 0" class="num">{{userInfo.im}}</view>
+				</view>
+			</view>
+			<view class="bottom-info">
+				<view class="item" @click="toRcord(1)">
+					<view class="value">{{userInfo.my_collection}}</view>
+					<view class="title">收藏</view>
+				</view>
+				<view class="item" @click="toRcord(2)">
+					<view class="value">{{userInfo.collection_my}}</view>
+					<view class="title">收藏我</view>
+				</view>
+				<view class="item" @click="toRcord(3)">
+					<view class="value">{{userInfo.my_browse}}</view>
+					<view class="title">我看过谁</view>
+				</view>
+				<view class="item" @click="toRcord(4)">
+					<view class="value">{{userInfo.browse_my}}</view>
+					<view class="title">谁看过我</view>
+				</view>
+			</view>
+			<view class="member-info">
+				<view class="name">相亲会员</view>
+				<block v-if="!Array.isArray(userInfo.vip)">
+					<view v-if="userInfo.vip && userInfo.vip.type == 1" class="date">到期日期：{{userInfo.vip.end_time_text}}</view>
+					<view v-else-if="userInfo.vip && userInfo.vip.type == 2" class="date">剩余次数：{{userInfo.vip.surplus_number}}</view>
+					<view v-else-if="userInfo.vip && userInfo.vip.type == 3">已过期</view>
+					<view v-else>已失效</view>
+				</block>
+				
+				<view @click="openMember" class="btn">{{memberBtnText}}</view>
+			</view>
+		</view>
+	
+		<view class="content">
+			<view class="member-info top">
+				<view v-if="userInfo.is_top == 1" class="name">未置顶</view>
+				<view v-else class="name">置顶中</view>
+				<view v-if="userInfo.is_top == 2" class="date">到期日期：{{userInfo.top_end_time}}</view>
+				<view class="btn">
+					<picker class="picker" @change="change" :range="cTopList">
+						{{topBtnText}}
+					</picker>
+				</view>
+			</view>
+			<view class="h1-title">其它功能</view>
+			<view class="function-content">
+				<view class="item" v-for="(item,index) in options" :key="index" @click="handleFunctionItemClick(index)">
+					<image :src="item.url" mode=""></image>
+					<view class="title">{{item.title}}</view>
+				</view>
+			</view>
+		</view>
+	
+		<view @click="toHome" class="foot-btn">返回首页</view>
+		<TabBars :tabBarAct="0" pageType="16"></TabBars>
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				userInfo: {},  //用户信息
+				currentIndex: 0,
+				lng: '',
+				lat: '',
+			}
+		},
+		components: {
+			Loadlogo,
+			TabBars
+		},
+		computed: {
+			options() {
+				let res = [
+					{url: this.imgfixUrls + 'dating/bd_personal_0.svg',title: '我的资料'},
+					{url: this.imgfixUrls + 'dating/bd_personal_2.svg',title: '我的动态'},
+					// {url: this.imgfixUrls + 'dating/bd_personal_3.svg',title: '个人视频'},
+					{url: this.imgfixUrls + 'dating/bd_personal_4.svg',title: '我的红娘'},
+					{url: this.imgfixUrls + 'dating/bd_personal_5.svg',title: '红娘服务'},
+				]
+				if(this.userInfo && this.userInfo.member_id && this.userInfo.member_id > 0) {
+					res.push({url: this.imgfixUrls + 'dating/bd_personal_1.svg',title: '我的主页'})
+				}
+				return res
+			},
+			cTopList() {
+				if(this.userInfo && this.userInfo.top_rule && this.userInfo.top_rule.length) {
+					let res = []
+					this.userInfo.top_rule.forEach(item => {
+						res.push(`${item.day}天${item.price}元`)
+					})
+					return res
+				}
+			},
+			memberBtnText() {
+				return this.userInfo.is_vip == 0 ? '立即开通' : '立即续费'
+			},
+			
+			topBtnText() {
+				return this.userInfo.is_top == 1 ? '立即开通' : '立即续费'
+			}
+		},
+		onLoad() {
+			let _this = this
+			uni.getLocation({
+			    type: 'wgs84',
+			    success(res) {
+					_this.lng = res.longitude
+					_this.lat = res.latitude
+			    }
+			})
+		},
+		onShow() {
+			this.getUserInfo()
+		},
+		methods: {
+			// 获取个人中心信息
+			getUserInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=memberCenter`,
+					{},
+					res => {
+						_this.userInfo = res.data;
+						if(_this.userInfo.examine == '2'){
+							uni.showModal({
+								showCancel:false,
+								title:`个人信息审核被驳回:${_this.userInfo.reason}`,
+								success() {
+									_this.handleFunctionItemClick(0);
+								}
+							})
+						}
+						console.log(_this.userInfo,'res6666')
+					},
+					false,
+					() => {
+						_this.loadlogo = true
+					}
+				);
+			},
+			
+			async handleFunctionItemClick(index) {
+				let url = '',
+					aid = uni.getStorageSync('agencyData').aid,
+					status = ''
+				switch(index) {
+					case 0: url = `pages/subPages2/blindDate/form/userInfo?lng=${this.lng}&lat=${this.lat}`;break;
+					case 1: url = 'pages/subPages2/blindDate/dynamics/myself'; break;
+					case 2: url = 'pages/subPages2/blindDate/matchmakerService';break;
+					case 3: 
+						status = await this.getStatus()
+						// 已通过跳转去推广中心
+						url = status == 3 ? `pages/subPages2/blindDate/extension?lng=${this.lng}&lat=${this.lat}` : `pages/subPages2/blindDate/form/matchmakerApply?lng=${this.lng}&lat=${this.lat}`; 
+						// url = `pages/subPages2/blindDate/form/matchmakerApply?lng=${this.lng}&lat=${this.lat}`
+						break;
+					case 4: url = `pages/subPages2/blindDate/member/detail?id=${this.userInfo.member_id}&is_self=true`;break;
+				}
+				App.navigationTo({
+					url: url
+				})
+			},
+			
+			// 获取红娘申请状态
+			getStatus() {
+				return new Promise((resolve) => {
+					App._post_form(
+						`&p=dating&do=applyMatchmaker&type=get`,
+						{},
+						res => {
+							resolve(res.data.status)
+						},
+						false,
+						() => {}
+					)
+				})
+			},
+			
+			// 开通续费会员
+			openMember() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/member/open`
+				})
+			},
+			
+			// 开通续费置顶
+			change(e) {
+				let _this = this,
+					day = _this.userInfo.top_rule[e.detail.value].day
+				App._post_form(
+					`&p=dating&do=applyTop`,
+					{
+						day: day
+					},
+					res => {
+						if(res.errno == 0) {
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=dating'
+							});
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 去记录列表
+			toRcord(type) {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/record?type=${type}`
+				})
+			},
+			
+			// 去消息列表
+			handleNewsClick() {
+				App.navigationTo({
+					url: `pages/subPages/homepage/private/private`
+				})
+			},
+			
+			// 返回首页
+			toHome() {
+				App.navigationTo({
+					url: `pages/mainPages/index/index`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.header {
+		width: 100%;
+		height: 400rpx;
+		background-size: 100% 100%;
+		position: relative;
+		overflow: hidden;
+		.top-info {
+			width: 690rpx;
+			height: 100rpx;
+			margin: 30rpx auto 0;
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			.user-info {
+				display: flex;
+				image {
+					width: 100rpx;
+					height: 100rpx;
+					border-radius: 50rpx;
+				}
+				.user {
+					height: 100%;
+					margin-left: 30rpx;
+					.name {
+						height: 50rpx;
+						line-height: 50rpx;
+						margin-top: 3rpx;
+						color: #333;
+						font-size: 36rpx;
+						font-weight: bold;
+					}
+					.member {
+						width: 70rpx;
+						height: 30rpx;
+						line-height: 30rpx;
+						text-align: center;
+						margin-top: 10rpx;
+						border-radius: 15rpx;
+						background-color: #DCC083;
+						font-size: 20rpx;
+						color: #fff;
+					}
+				}
+			}
+			.news {
+				margin-right: 14rpx;
+				position: relative;
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
+				.num {
+					width: 34rpx;
+					height: 34rpx;
+					line-height: 34rpx;
+					text-align: center;
+					border-radius: 17rpx;
+					background-color: #FF4444;
+					color: #fff;
+					font-size: 20rpx;
+					position: absolute;
+					right: -14rpx;
+					top: -15rpx;
+				}
+			}
+		}
+		.bottom-info {
+			width: 100%;
+			height: 87rpx;
+			margin-top: 50rpx;
+			display: flex;
+			.item {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.value {
+					height: 44rpx;
+					line-height: 44rpx;
+					font-size: 36rpx;
+					font-weight: bold;
+					color: #333;
+				}
+				.title {
+					height: 33rpx;
+					line-height: 33rpx;
+					font-size: 24rpx;
+					color: #999;
+				}
+			}
+		}
+	}
+	
+	.member-info {
+		width: 630rpx;
+		height: 44rpx;
+		padding: 18rpx 30rpx;
+		border-radius: 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #fff;
+		font-size: 24rpx;
+		background: #DCC083;
+		margin: 50rpx auto 0;
+		.name {
+			height: 44rpx;
+			font-size: 32rpx;
+			font-weight: bold;
+		}
+		.date {
+			height: 34rpx;
+		}
+		.btn {
+			width: 126rpx;
+			height: 44rpx;
+			line-height: 44rpx;
+			text-align: center;
+			border-radius: 22rpx;
+			border: 1rpx solid #fff;
+		}
+	}
+	.top {
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		margin-top: 20rpx;
+	}
+
+	.content {
+		overflow: hidden;
+		.h1-title {
+			height: 50rpx;
+			line-height: 50rpx;
+			font-weight: bold;
+			font-size: 36rpx;
+			color: #333;
+			margin-left: 30rpx;
+			margin-top: 50rpx;
+		}
+		.function-content {
+			width: 100%;
+			display: flex;
+			flex-wrap: wrap;
+			.item {
+				width: 25vw;
+				height: 83rpx;
+				margin-top: 50rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				image {
+					width: 40rpx;
+					height: 40rpx;
+				}
+				.title {
+					height: 33rpx;
+					line-height: 33rpx;
+					color: #333;
+					font-size: 24rpx;
+					margin-top: 10rpx;
+				}
+			}
+		}
+	}
+
+	.foot-btn {
+		width: 690rpx;
+		height: 80rpx;
+		background-color: #F8F8F8;
+		line-height: 80rpx;
+		text-align: center;
+		color: #999;
+		font-size: 28rpx;
+		border-radius: 20rpx;
+		position: fixed;
+		left: 30rpx;
+		bottom: 130rpx;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/recommend.vue b/pages/subPages2/blindDate/recommend.vue
new file mode 100644
index 0000000..c57aa2f
--- /dev/null
+++ b/pages/subPages2/blindDate/recommend.vue
@@ -0,0 +1,368 @@
+<template>
+	<view class="page" :style="{'background-image': 'url('+ imgfixUrls + 'dating/bd_new_bg.png' +')'}">
+	
+		<view v-if="recommendList.length == 0" class="tips">{{tipsText}}</view>
+	
+		<movable-area class="movable-area">
+			 <movable-view 
+			 @touchend="touchend(index,item.id)" 
+			 :x="item.touchX" 
+			 :y="touchY" 
+			 direction="horizontal"
+			 @change="onChange($event,index)" 
+			 out-of-bounds="true" 
+			 style="width: 560rpx;height: auto;overflow: hidden;transition: top 0.5s;"
+			 :style="{'z-index': 999 - index}"
+			 :class="{'first-class' : currentIndex == index}"
+			 :disabled="currentIndex != index"
+			 v-for="(item,index) in cRecommendList"
+			 :key="index"
+			 >
+				 <view class="common-user" @click="toDetail(item.id)">
+				 	<image class="avatar" :src="item.cover_show" mode=""></image>
+				 	<view class="name">{{item.nickname}}</view>
+				 	<view class="user-info">
+				 		<view class="sex-age" :class="{'woman': item.gneder == 2,'man': item.gneder == 1}">
+				 			<view v-if="item.gneder == 2" class="iconfont icon-female"></view>
+				 			<view v-else class="iconfont icon-male"></view>
+				 			<view>{{item.age}}</view>
+				 		</view>
+				 		<view class="location">{{item.area}}</view>
+				 		<view v-if="item.is_vip == 1" class="member">VIP</view>
+				 	</view>
+				 	<view class="tags">
+				 		<view class="item" v-for="(tag,tagIndex) in item.label_list" :key="tagIndex">{{tag}}</view>
+				 	</view>
+					<!-- 喜欢和无感 -->
+					<view class="common-btn close" :style="{'opacity': item.closeOpacity}">
+						<image :src="imgfixUrls + 'dating/bd_close.svg'" mode=""></image>
+					</view>
+					<view class="common-btn like" :style="{'opacity': item.likeOpacity}">
+						<image :src="imgfixUrls + 'dating/bd_like.svg'" mode=""></image>
+					</view>
+				 </view>
+			 </movable-view>
+		</movable-area>
+		
+		<TabBars :tabBarAct="0" pageType="16"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default {
+		data() {
+			return {
+				recommendList: [],
+				currentPage: 1,
+				totalPage: 1,
+				listlen: 1,  //记录列表有多少条
+				tipsText: '暂无推荐',
+				currentIndex: 0,  //当前第一条的index
+				percent: 0,
+				touchY: 0
+			}
+		},
+		components:{
+			TabBars
+		},
+		onLoad() {
+			let _this = this
+			_this.getRecommendList()
+			uni.getSystemInfo({
+				success(res) {
+					// 换算不同手机rpx转为px的值 ,movable-view组件用rpx有问题
+					_this.percent = (res.windowWidth / 750 * 850).toFixed(0)
+					_this.touchY = (res.windowWidth / 750 * 180).toFixed(0)
+				}
+			})
+		},
+		watch: {
+			// 监听剩余列表数量，当剩余1条并且还有下一页数据时请求第下一页数据
+			listlen(val) {
+				if(val == 0 && this.currentPage <= this.totalPage) {
+					this.getRecommendList()
+					console.log('请求下一页')
+				}else if(val == 0 && this.currentPage > this.totalPage) {
+					// 剩余1，且没有下一页时，重新请求第一页数据
+					this.currentPage = 1
+					this.getRecommendList()
+					console.log('重新请求第一页')
+				}
+			}
+		},
+		computed: {
+			// 加工列表数据
+			cRecommendList() {
+				if(this.recommendList.length) {
+					return this.recommendList.map(item => {
+						item.touchX = this.percent  //开始显示的横向距离
+						// item.touchY = '180rpx'  //开始显示的纵向距离
+						item.likeOpacity = 0  //喜欢图标显示度
+						item.closeOpacity = 0  //无感图标的显示度
+						item.lastX = 0  //最后隐藏的横向距离
+						item.lastY = 0  //最后隐藏的纵向的距离
+						console.log(item,'item值')
+						return item
+					})
+				}
+			}
+		},
+		
+		methods: {
+			// 获取推荐的列表
+			getRecommendList() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=recommendMember`,
+					{
+						page: _this.currentPage
+					},
+					res => {
+						_this.recommendList = res.data.list
+						_this.currentIndex = 0
+						_this.listlen = _this.recommendList.length
+						_this.currentPage ++
+						_this.totalPage = res.data.total
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 松开手指时
+			touchend(index,id) {
+				if(!this.cRecommendList[index]) {
+					return
+				}
+				// 超过滑动幅度时隐藏
+				if(this.cRecommendList[index].likeOpacity > 0.5 || this.cRecommendList[index].closeOpacity > 0.5) {
+					this.cRecommendList[index].touchX = this.cRecommendList[index].lastX
+					// 隐藏一条减1
+					this.listlen --
+					this.currentIndex  = index + 1
+					// 右滑直接收藏
+					if(this.cRecommendList[index].likeOpacity > 0.5) {
+						let _this = this
+						App._post_form(
+							`&p=dating&do=collectionOperation&id=${id}`,
+							{
+								id: id,
+								is_cancel: 2
+							},
+							res => {
+								
+							},
+							false,
+							() => {
+							}
+						);
+					}
+					
+				}else {
+					// 滑动幅度过小回到原处
+					this.cRecommendList[index].touchX = this.cRecommendList[index].touchX == this.percent ? Number(this.percent) + Number(0.01) : this.percent
+				}
+				this.$forceUpdate()
+			},
+			
+			// 滑动
+			onChange(e,index) {
+				if(!this.cRecommendList[index]) {
+					return
+				}
+				
+				// 滑动给最终隐藏位置赋值
+				if(e.detail.x < this.percent) {
+					this.cRecommendList[index].lastX = 0
+				}else if(e.detail.x > this.percent) {
+					this.cRecommendList[index].lastX = 1400
+				}
+				
+				// 滑动的距离
+				let changeNum = e.detail.x - this.percent
+				
+				// 小于0左滑大于0右滑
+				if(changeNum < 0) {
+					this.cRecommendList[index].likeOpacity = 0
+					// 每1px增加0.05opacity值
+					this.cRecommendList[index].closeOpacity = (changeNum * -0.05 > 1 ? 1 : changeNum * -0.05).toFixed(2)
+				}else if(changeNum > 0) {
+					this.cRecommendList[index].closeOpacity = 0
+					this.cRecommendList[index].likeOpacity = (changeNum * 0.05 > 1 ? 1 : changeNum * 0.05).toFixed(2)
+				}else{
+					this.cRecommendList[index].closeOpacity = 0
+					this.cRecommendList[index].likeOpacity = 0
+				}
+				this.$forceUpdate()
+			},
+			
+			// 去详情页面
+			toDetail(id) {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/member/detail?id=${id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		width: 100vw;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		left: 0;
+		background-size: 100% 100%;
+	}
+	
+	.tips {
+		width: 100%;
+		height: 40rpx;
+		text-align: center;
+		line-height: 40rpx;
+		font-size: 36rpx;
+		color: #fff;
+		position: fixed;
+		top: 100rpx;
+		left: 0;
+	}
+	
+	
+	.movable-area {
+		width: 300vw;
+		height: 100vh;
+		position: absolute;
+		top: 0;
+		left: -100vw;
+	}
+	
+	.first-class {
+		top: 20rpx;
+		left: 20rpx;
+	}
+	
+	.common-user {
+		width: 560rpx;
+		height: auto;
+		border-radius: 20rpx;
+		// position: absolute;
+		overflow: hidden;
+		background-color: #fff;
+		position: relative;
+		padding-bottom: 20rpx;
+		.avatar {
+			width: 100%;
+			height: 558rpx;
+			display: block;
+		}
+		.name {
+			height: 70rpx;
+			line-height: 70rpx;
+			font-size: 48rpx;
+			color: #333;
+			margin: 20rpx 0 0 30rpx;
+			font-weight: bold;
+		}
+		.user-info {
+				width: 100%;
+				height: 30rpx;
+				margin: 20rpx 0 0 30rpx;
+				display: flex;
+				align-items: center;
+				color: #fff;
+				font-size: 20rpx;
+				.sex-age {
+					width: 70rpx;
+					height: 30rpx;
+					border-radius: 15rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-right: 10rpx;
+					.iconfont {
+						font-size: 20rpx;
+						line-height: 30rpx;
+						margin-right: 4rpx;
+					}
+					.icon-female {
+						transform: rotate(45deg);
+					}
+				}
+				.man {
+					background-color: #0084FF;
+				}
+				.woman {
+					background-color: #FE83AF;
+				}
+				.location {
+					height: 30rpx;
+					width: auto;
+					padding: 0 16rpx;
+					border-radius: 15rpx;
+					background-color: #333333;
+					margin-right: 10rpx;
+				}
+				.member {
+					width: 70rpx;
+					height: 30rpx;
+					line-height: 30rpx;
+					border-radius: 15rpx;
+					text-align: center;
+					background-color: #DCC083;
+				}
+			
+		}
+		.tags {
+			width: 530rpx;
+			height: 110rpx;
+			overflow: hidden;
+			display: flex;
+			flex-wrap: wrap;
+			font-size: 20rpx;
+			color: #333;
+			padding: 0 0 0 30rpx;
+			.item {
+				width: auto;
+				height: 34rpx;
+				border-radius: 17rpx;
+				line-height: 34rpx;
+				text-align: center;
+				padding: 0 13rpx;
+				margin: 20rpx 20rpx 0 0;
+				background-color: #EEEEEE;
+			}
+		}
+	}
+	
+	
+	.common-btn {
+		width: 120rpx;
+		height: 120rpx;
+		border-radius: 60rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		top: 30rpx;
+	}
+	.close {
+		right: 30rpx;
+		background-color: #333333;
+		image {
+			width: 44rpx;
+			height: 44rpx;
+		}
+	}
+	.like {
+		left: 30rpx;
+		background-color: #FF4444;
+		image {
+			width: 78rpx;
+			height: 72rpx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/blindDate/record.vue b/pages/subPages2/blindDate/record.vue
new file mode 100644
index 0000000..65b6dc1
--- /dev/null
+++ b/pages/subPages2/blindDate/record.vue
@@ -0,0 +1,123 @@
+<template>
+	<view class="page">
+		<loadlogo v-if="!loadlogo" />
+		<block v-else>
+			<view class="record-item" v-for="(item,index) in recordList" :key="index">
+				<user :memberInfo="item"></user>
+			</view>
+			<!-- 返回按钮 -->
+			<view class="back-btn" @click="goindex">返回</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import user from '@/components/template/user.vue'
+	export default {
+		data() {
+			return {
+				loadlogo: false,
+				type: 1,
+				lng: '',
+				lat: '',
+				currentPage: 1,
+				totalPage: 1,
+				recordList: [],
+			}
+			
+		},
+		components: {
+			Loadlogo,
+			user
+		},
+		onLoad(e) {
+			let _this = this
+			_this.type = e.type
+			uni.getLocation({
+			    type: 'wgs84',
+			    success(res) {
+					_this.lng = res.longitude
+					_this.lat = res.latitude
+			    }
+			})
+			_this.getRecordInfo()
+		},
+		methods: {
+			getRecordInfo() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=recordList`,
+					{
+						page: _this.currentPage,
+						type: _this.type,
+						lng: _this.lng,
+						lat: _this.lat
+					},
+					res => {
+						_this.loadlogo = true
+						console.log(_this.loadlogo,'111111111111111111')
+						_this.recordList = [..._this.recordList,...res.data.list]
+						_this.totalPage = res.data.total
+						_this.currentPage ++
+					},
+					false,
+					() => {
+					}
+				);
+			},
+		
+		
+			goindex(){
+				let pages = getCurrentPages();
+				console.log(pages);
+				if(pages.length == 1){
+					App.navigationTo({
+						url: "pages/subPages2/blindDate/personal"
+					})
+				}else{
+					uni.navigateBack({
+						delta:1
+					})
+				}
+			},
+		},
+		onReachBottom() {
+			if(this.currentPage <= this.totalPage) {
+				this.getRecordInfo()
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.page {
+		width: 690rpx;
+		height: auto;
+		margin: auto;
+		display: flex;
+		flex-wrap: wrap;
+		.record-item {
+			margin: 0 20rpx 20rpx 0;
+			&:nth-child(2n) {
+				margin-right: 0;
+			}
+		}
+	}
+	
+	
+	.back-btn {
+		width: 100rpx;
+		height: 100rpx;
+		border-radius: 50rpx;
+		text-align: center;
+		line-height: 100rpx;
+		background: linear-gradient(270deg, #FF8E88 0%, #FDAD28 100%);
+		font-size: 28rpx;
+		color: #fff;
+		position: fixed;
+		right: 30rpx;
+		bottom: 250rpx;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/template/navbar.vue b/pages/subPages2/blindDate/template/navbar.vue
new file mode 100644
index 0000000..e58a57c
--- /dev/null
+++ b/pages/subPages2/blindDate/template/navbar.vue
@@ -0,0 +1,95 @@
+<template>
+	<view>
+		<view class="navbar" :class="{'fix': isfix,'bgclass': isbgf}">
+			<view class="item" 
+			:class="{'select': cureentNavbarIndex == index}"
+			v-for="(item,index) in navbarList" 
+			:key="index" 
+			@click="handleItemClick(index)"
+			>
+				{{item}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				cureentNavbarIndex: 0,
+			}
+		},
+		mounted() {
+			console.log(this.topHeight,'高度')
+		},
+		props: {
+			navbarList: {
+				type: Array,
+				default() {
+					return []
+				}
+			},
+			isfix: {
+				type: Boolean,
+				default: false
+			},
+			topHeight: {
+				type: Number,
+				default: 0
+			},
+			leftWidth: {
+				type: Number,
+				default: 30
+			},
+			isbgf: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			handleItemClick(index) {
+				this.cureentNavbarIndex = index
+				this.$emit('navbarChange',index)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.navbar {
+		width: 690rpx;
+		height: 50rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		margin: auto;
+		.item {
+			width: auto;
+			height: 50rpx;
+			border-radius: 25rpx;
+			line-height: 50rpx;
+			text-align: center;
+			font-size: 28rpx;
+			color: #999;
+			padding: 0 32rpx;
+		}
+		.select {
+			color: #fff;
+			background: linear-gradient(270deg, #FDAD26 0%, #FF8F86 100%);
+		}
+	}
+	
+	.fix {
+		position: fixed;
+		background-color: #F8F8F8;
+		z-index: 9999;
+		padding: 30upx;
+	}
+	
+	.bgclass {
+		padding: 30upx;
+		background-color: #fff;
+		z-index: 9999;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/template/personalItem.vue b/pages/subPages2/blindDate/template/personalItem.vue
new file mode 100644
index 0000000..3c4666e
--- /dev/null
+++ b/pages/subPages2/blindDate/template/personalItem.vue
@@ -0,0 +1,490 @@
+<template>
+	<view class="content-info" :class="{'modular' : isModular}" @click="toDetail">
+		<!-- 头部信息 -->
+		<view v-if="isShowUserInfo" class="header-info">
+			<view class="avatar">
+				<image :src="detailInfo.avatar" mode=""></image>
+				<view class="sex" :class="{'woman': detailInfo.gneder == 2,'man': detailInfo.gneder == 1}">
+					<view v-if="detailInfo.gneder == 2" class="iconfont icon-female"></view>
+					<view v-else class="iconfont icon-male"></view>
+				</view>
+			</view>
+			<view class="user-info">
+				<view class="top-info">
+					<view class="user">
+						<view class="name onelist-hidden" :class="{'width' : detailInfo.is_vip != 1}">{{detailInfo.nickname}}</view>
+						<view v-if="detailInfo.is_vip == 1" class="member">VIP</view>
+					</view>
+					<view class="loaction onelist-hidden" v-if="detailInfo.address">{{detailInfo.address}}{{detailInfo.distances_text}}</view>
+				</view>
+				<view class="date">{{detailInfo.create_time_text}}</view>
+			</view>
+		</view>
+		<view v-else class="header-info-box">
+			<view class="left">{{detailInfo.create_time_text}}</view>
+			<view class="status">{{status}}</view>
+		</view>
+		
+		<!-- 文案 -->
+		<block v-if="showContent">
+			<view class="copywriting" :class="{'hidden' : !isDetail}">{{detailInfo.content}}</view>
+		</block>
+		<!-- 图片视频 -->
+		<block v-if="showPhoto || showVideo">
+			<view class="media" :class="{'show-all' : isDetail}">
+				<view v-if="showVideo" class="img-box">
+					<video 
+						:controls="isControls" 
+						class="video" 
+						:src="detailInfo.video_show" 
+						:show-center-play-btn="false" 
+						@fullscreenchange.stop="fullscreenchange"
+						:id="videoId"
+					></video>
+					<image v-if="isShowPlayBtn" class="play_btn" :src="imgfixUrls + 'dating/bd_play_video.png'" mode=""  @click.stop="videoPlay"></image>
+				</view>
+				<view class="img-box" v-for="(item,index) in detailInfo.photo_show" :key="index" @click.stop="handleImgClick(item)">
+					<image class="img" :src="item" mode=""></image>
+				</view>
+			</view>
+		</block>
+		<!-- 底部信息 -->
+		<view v-if="isShowFooterInfo" class="footer">
+			<view class="item">
+				<image class="look" :src="imgfixUrls + 'dating/bd_look.svg'" mode=""></image>
+				<view class="number">{{detailInfo.pv}}</view>
+			</view>
+			<view class="item" @click.stop="handleCommentClick">
+				<image class="message" :src="imgfixUrls + 'dating/bd_message1.svg'" mode=""></image>
+				<view class="number">{{detailInfo.comment}}</view>
+			</view>
+			<view class="item">
+				<view @click.stop="handleFabulousClick">
+					<image class="praise" v-if="!detailInfo.is_fabulous" :src="imgfixUrls + 'dating/bd_praise.svg'" mode=""></image>
+					<image class="praise" v-else :src="imgfixUrls + 'dating/bd_light_praise.svg'" mode=""></image>
+				</view>
+				<view class="number">{{detailInfo.fabulous}}</view>
+			</view>
+		</view>
+		<view v-else class="footer-box">
+			<view class="btn" @click.stop="handleDeleteClick">删除</view>
+			<view class="btn" @click.stop="handleEditClick">编辑</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	let videoContext = null;
+	export default {
+		data() {
+			return {
+				detailInfo: {},
+				videoId: '',
+				isControls: false,  //显示视频下方控件，全屏时显示
+				isShowPlayBtn: true,  //显示播放按钮
+				
+			}
+		},
+		onReady() {
+			this.videoId = this.dynamicInfo.id
+			videoContext = uni.createVideoContext(this.videoId, this)
+			// console.log('onReady',videoContext)
+		},
+		mounted() {
+			this.detailInfo = this.dynamicInfo
+			this.detailInfo.distances_text = this.detailInfo.distances_text ? this.detailInfo.distances_text : ''
+		},
+		computed: {
+			// 自己动态的发布状态
+			status() {
+				if(this.detailInfo && this.detailInfo.status) {
+					if(this.detailInfo.status == 1) {
+						return '审核中'
+					}else if(this.detailInfo.status == 2) {
+						return '未通过'
+					}else {
+						return '显示中'
+					}
+				}
+			},
+			// 有无文案
+			showContent() {
+				if(this.detailInfo && this.detailInfo.content && this.detailInfo.content.length > 0) {
+					return true
+				}else {
+					return false
+				}
+			},
+			// 有无视频
+			showVideo() {
+				if(this.detailInfo && this.detailInfo.video_show && this.detailInfo.video_show.length > 0) {
+					return true
+				}else {
+					return false
+				}
+			},
+			// 有无图片
+			showPhoto() {
+				if(this.detailInfo && this.detailInfo.photo_show && this.detailInfo.photo_show.length > 0) {
+					return true
+				}else {
+					return false
+				}
+			}
+			
+		},
+		watch: {
+			isShowPlayBtn() {
+				videoContext = uni.createVideoContext(this.videoId, this)
+			},
+		},
+		props: {
+			// 动态内容信息
+			dynamicInfo: {
+				type: Object,
+				default() {
+					return {}
+				}
+			},
+			// 控制头部信息显示的模块
+			isShowUserInfo: {
+				type: Boolean,
+				default: true,
+			},
+			// 控制底部信息显示的模块
+			isShowFooterInfo: {
+				type: Boolean,
+				default: true,
+			},
+			// 是否动态详情页
+			isDetail: {
+				type: Boolean,
+				default: false
+			},
+			// 是否模块显示
+			isModular: {
+				type: Boolean,
+				default: false
+			}
+		},
+		methods: {
+			// 点赞
+			handleFabulousClick() {
+				let _this = this
+				App._post_form(
+					`&p=dating&do=dynamicFabulous`,
+					{
+						id: _this.detailInfo.id
+					},
+					res => {
+						// 点赞
+						if(_this.detailInfo.is_fabulous == 0) {
+							_this.detailInfo.is_fabulous = 1
+							_this.detailInfo.fabulous ++
+						}else {
+							// 取消点赞
+							_this.detailInfo.is_fabulous = 0
+							_this.detailInfo.fabulous --
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			
+			// 点击评论
+			handleCommentClick() {
+				this.$emit('comment')
+			},
+			
+			// 预览图片
+			handleImgClick(url) {
+				let _this = this
+				uni.previewImage({
+					urls: _this.detailInfo.photo_show,
+					current: url,
+					longPressActions: {
+						itemList: ['发送给朋友', '保存图片', '收藏'],
+						success: function(data) {
+							console.log(data,'信息')
+						},
+						fail: function(err) {
+							console.log(err.errMsg);
+						}
+					}
+				});
+			},
+		
+			// 删除动态
+			handleDeleteClick() {
+				this.$emit('delete',this.detailInfo.id)
+			},
+			
+			// 编辑动态
+			handleEditClick() {
+				this.$emit('edit',this.detailInfo.id)
+			},
+			
+			// 去详情页
+			toDetail() {
+				if(!this.isDetail && !this.isControls) {
+					this.$emit('toDetail',this.detailInfo.id,this.isControls)
+				}
+			},
+			
+			// 点击播放视频
+			videoPlay(e) {
+				let that = this;
+				that.videoId = that.dynamicInfo.id
+				that.isShowPlayBtn = false
+				//延时操作,防止视频组件获取失败
+				setTimeout(() => {
+					console.log("video play");
+					videoContext.play();  //播放视频
+					that.isControls = true  //显示video默认控件
+					videoContext.requestFullScreen()  //默认全屏
+				}, 200);
+			},
+			
+			// 退出或进入全屏
+			fullscreenchange(e) {
+				if(!e.detail.fullScreen) {
+					videoContext.pause()
+					this.isShowPlayBtn = true
+					this.isControls = false
+				}
+			}
+		
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-info {
+		width: 690rpx;
+		margin: auto;
+		padding: 40rpx 0;
+	}
+	
+	.modular {
+		background-color: #fff;
+		border-radius: 20rpx;
+		width: 630rpx;
+		padding: 40rpx 30rpx;
+	}
+	
+	.header-info {
+		height: 90rpx;
+		width: 100%;
+		display: flex;
+		align-items: center;
+		.avatar {
+			width: 90rpx;
+			height: 90rpx;
+			border-radius: 45rpx;
+			position: relative;
+			image {
+				width: 90rpx;
+				height: 90rpx;
+				border-radius: 45rpx;
+			}
+			.sex {
+				width: 30rpx;
+				height: 30rpx;
+				line-height: 30rpx;
+				text-align: center;
+				border-radius: 15rpx;
+				position: absolute;
+				right: 0rpx;
+				bottom: 0rpx;
+				.iconfont {
+					font-size: 24rpx;
+					color: #fff;
+				}
+			}
+			.man {
+				background-color: #0084FF;
+			}
+			.woman {
+				background-color: #FE83AF;
+				transform: rotate(45deg);
+			}
+		}
+		.user-info {
+			width: 100%;
+			height: 100%;
+			margin-left: 20rpx;
+			.top-info {
+				width: 100%;
+				height: 40rpx;
+				margin-top: 4rpx;
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.user {
+					display: flex;
+					align-items: center;
+					flex: 1;
+					.name {
+						width: 180rpx;
+						height: 100%;
+						font-size: 28rpx;
+						color: #333;
+						font-weight: bold;
+					}
+					.width {
+						width: 100%;
+					}
+					.member {
+						width: 70rpx;
+						height: 30rpx;
+						text-align: center;
+						background-color: #DCC083;
+						border-radius: 15rpx;
+						color: #fff;
+						font-size: 20rpx;
+						margin-left: 10rpx;
+					}
+				}
+				.loaction {
+					flex: 1;
+					height: 30rpx;
+					// border-radius: 10rpx;
+					// border: 1rpx solid #333;
+					color: #333;
+					font-size: 20rpx;
+					// display: flex;
+					// align-items: center;
+					// opacity: 0.8;
+					// justify-content: center;
+					// padding: 0 10rpx;
+					.iconfont {
+						font-size: 20rpx;
+					}
+				}
+			}
+			.date {
+				margin-top: 10rpx;
+				height: 33rpx;
+				line-height: 33rpx;
+				font-size: 24rpx;
+				color: #999;
+			}
+		}
+	}
+	
+	.header-info-box {
+		width: 100%;
+		height: 40rpx;
+		color: #333;
+		font-size: 28rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+	}
+	
+	.copywriting {
+		margin-top: 40rpx;
+		width: 100%;
+		height: auto;
+		line-height: 44rpx;
+		font-size: 28rpx;
+		color: #333;
+		font-weight: bold;
+	}
+	
+	.hidden {
+		max-height: 88rpx;
+		overflow : hidden;
+		text-overflow: ellipsis;
+		display: -webkit-box;
+		-webkit-line-clamp: 2;
+		-webkit-box-orient: vertical;
+	}
+
+	.media {
+		width: 100%;
+		height: 223rpx;
+		overflow: hidden;
+		margin-top: 40rpx;
+		display: flex;
+		flex-wrap: wrap;
+		.img-box {
+			width: 223rpx;
+			height: 223rpx;
+			display: flex;
+			flex-wrap: wrap;
+			margin: 0 10rpx 10rpx 0;
+			position: relative;
+			.play_btn {
+				width: 60rpx;
+				height: 60rpx;
+				position: absolute;
+				top: 81rpx;
+				left: 81rpx;
+			}
+			.img,.video {
+				width: 223rpx;
+				height: 223rpx;
+				border-radius: 20rpx;
+			}
+			&:nth-child(3n) {
+				margin-right: 0;
+			}
+		}
+	}
+	.show-all {
+		height: auto;
+	}
+
+	.footer {
+		width: 100%;
+		height: 34rpx;
+		margin-top: 35rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		color: #333;
+		.item {
+			display: flex;
+			align-items: center;
+			.look {
+				width: 40rpx;
+				height: 34rpx;
+			}
+			.message,.praise {
+				width: 34rpx;
+				height: 34rpx;
+			}
+			.number {
+				font-size: 28rpx;
+				margin-left: 10rpx;
+			}
+		}
+	}
+
+	.footer-box {
+		width: 100%;
+		height: 50rpx;
+		margin-top: 30rpx;
+		font-size: 24rpx;
+		display: flex;
+		justify-content: flex-end;
+		.btn {
+			width: 130rpx;
+			height: 50rpx;
+			border-radius: 25rpx;
+			border: 1rpx solid #ccc;
+			line-height: 50rpx;
+			text-align: center;
+			color: #0084FF;
+			&:first-child {
+				margin-right: 30rpx;
+				color: #FF4444;
+			}
+		}
+	}
+	
+</style>
diff --git a/pages/subPages2/blindDate/template/user.vue b/pages/subPages2/blindDate/template/user.vue
new file mode 100644
index 0000000..5c86dfc
--- /dev/null
+++ b/pages/subPages2/blindDate/template/user.vue
@@ -0,0 +1,298 @@
+<template>
+	<view @click="toDetail" class="user-item" :class="{'item-select' : isSelect}">
+		<view class="top-info">
+			<!-- 头像 -->
+			<image class="poster" :src="memberInfo.avatar" mode=""></image>
+			<view class="istop" v-if="memberInfo.is_top == 2">
+				<view class="iconfont icon-favor_fill_light"></view>
+				<view class="text">置顶</view>
+			</view>
+			<block v-if="isShowPlay">
+				<image class="play-btn" :src="imgfixUrls + 'dating/bd_play_video.png'" mode=""></image>
+			</block>
+			<!-- 浏览量 -->
+			<block v-if="isShowViews">
+				<view class="look-box">
+					<view class="iconfont icon-attention"></view>
+					<view class="num">{{memberInfo.pv}}</view>
+				</view>
+			</block>
+			<!-- 操作 -->
+			<block v-else>
+				<image class="operation" :src="imgfixUrls + 'dating/bd_message2.png'" mode="" @click.stop="extension"></image>
+			</block>
+			<!-- 位置 -->
+			<view class="location">
+				<view class="iconfont icon-locationfill"></view>
+				<view>{{memberInfo.area}}<span v-if="memberInfo.distances_text">{{memberInfo.distances_text}}</span></view>
+			</view>
+		</view>
+		<view class="user-info">
+			<view class="info">
+				<view class="name">{{memberInfo.nickname}}</view>
+				<view class="sex woman" :class="{'man': memberInfo.gneder == 1}">
+					<view v-if="memberInfo.gneder == 2" class="iconfont icon-female"></view>
+					<view v-else class="iconfont icon-male"></view>
+					<view class="age">{{memberInfo.age}}</view>
+				</view>
+			</view>
+			<view class="property" v-if="propertyInfo.is_show_property">
+				<view v-if="propertyInfo.is_have_house" class="property-item" style="margin-left: 30rpx;">
+					<view class="iconfont icon-home"></view>
+					<view>有房</view>
+				</view>
+				<view v-if="propertyInfo.is_have_car" class="property-item">
+					<view class="iconfont icon-qiche"></view>
+					<view>有车</view>
+				</view>
+				<view v-if="propertyInfo.is_have_house" class="property-item" style="margin-left: 30rpx;">
+					<view class="iconfont icon-wode"></view>
+					<view>{{memberInfo.work}}</view>
+				</view>
+			</view>
+			<view v-if="isShowSelect" @click.stop="select">
+				<view v-if="!isSelect" class="iconfont icon-round select"></view>
+				<view v-else class="iconfont icon-chenggong select"></view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				isSelect: false,
+			}
+		},
+		computed: {
+			propertyInfo() {
+				return {
+					is_have_car: this.memberInfo.travel == 2,
+					is_have_house: (this.memberInfo.live == 1 || this.memberInfo.live == 2),
+					is_show_property: this.memberInfo.travel == 2 || (this.memberInfo.live == 1 || this.memberInfo.live == 2)
+				}
+			}
+		},
+		mounted() {
+			console.log(this.isShowPlay,'6666666666666')
+		},
+		props: {
+			// 是否显示浏览量
+			isShowViews: {
+				type: Boolean,
+				default: true
+			},
+			// 是否可以选择
+			isShowSelect: {
+				type: Boolean,
+				default: false
+			},
+			// 播放按钮
+			isShowPlay: {
+				type: Boolean,
+				default: false,
+			},
+			// 会员信息
+			memberInfo: {
+				type: Object,
+				default() {
+					return {}
+				}
+			}
+		},
+		methods: {
+			// 推荐点击
+			extension() {
+				this.$emit('extension',this.memberInfo.id)
+			},
+			
+			// 选择
+			select() {
+				this.isSelect = !this.isSelect
+				this.$emit('select',this.isSelect,this.memberInfo.id)
+			},
+			
+			toDetail() {
+				App.navigationTo({
+					url: `pages/subPages2/blindDate/member/detail?id=${this.memberInfo.id}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.user-item {
+		width: 335rpx;
+		height: auto;
+		border-radius: 20rpx;
+		background-color: #F8F8F8;
+		overflow: hidden;
+		padding-bottom: 20rpx;
+		.top-info {
+			width: 100%;
+			height: 445rpx;
+			position: relative;
+			.poster {
+				width: 100%;
+				height: 100%;
+			}
+			.istop {
+				width: auto;
+				height: 30rpx;
+				padding: 0 10rpx;
+				border-radius: 15rpx;
+				background: linear-gradient(90deg, #FB5A8C 0%, #F65D10 100%);
+				display: flex;
+				position: absolute;
+				left: 20rpx;
+				top: 20rpx;
+				color: #fff;
+				font-size: 20rpx;
+				align-items: center;
+				justify-content: center;
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+			.play-btn {
+				width: 80rpx;
+				height: 80rpx;
+				position: absolute;
+				top: 184rpx;
+				left: 128rpx;
+			}
+			.look-box {
+				width: 60rpx;
+				height: 68rpx;
+				position: absolute;
+				top: 20rpx;
+				right: 16rpx;
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+				.iconfont {
+					font-size: 34rpx;
+					color: #fff;
+				}
+				.num {
+					font-size: 20rpx;
+					color: #fff;
+					margin-top: 6rpx;
+				}
+			}
+			.operation {
+				width: 50rpx;
+				height: 50rpx;
+				position: absolute;
+				top: 20rpx;
+				right: 20rpx;
+			}
+			.location {
+				width: auto;
+				height: 30rpx;
+				padding: 0 10rpx;
+				background-color: #fff;
+				opacity: 0.8;
+				border-radius: 10rpx;
+				display: flex;
+				color: #333;
+				font-size: 20rpx;
+				align-items: center;
+				justify-content: center;
+				position: absolute;
+				bottom: 20rpx;
+				right: 20rpx;
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+		}
+		
+		.user-info {
+			width: 100%;
+			height: auto;
+			overflow: hidden;
+			position: relative;
+			.info {
+				width: 100%;
+				height: 45rpx;
+				margin-top: 20rpx;
+				display: flex;
+				align-items: center;
+				.name {
+					height: 45rpx;
+					font-size: 32rpx;
+					color: #333;
+					font-weight: bold;
+					margin-left: 30rpx;
+				}
+				.sex {
+					width: 70rpx;
+					height: 30rpx;
+					border-radius: 15rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					color: #fff;
+					margin-left: 20rpx;
+					.iconfont {
+						font-size: 22rpx;
+					}
+					.icon-female {
+						transform: rotate(45deg);
+					}
+					.age {
+						font-size: 20rpx;
+					}
+				}
+				.woman {
+					background-color: #FE83AF;
+				}
+				.man {
+					background-color: #0084FF;
+				}
+			}
+			.property {
+				width: 100%;
+				height: 40rpx;
+				margin-top: 20rpx;
+				display: flex;
+				.property-item {
+					width: 90rpx;
+					height: 40rpx;
+					border-radius: 20rpx;
+					background-color: #fff;
+					color: #333;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					font-size: 20rpx;
+					margin-right: 13rpx;
+					.iconfont {
+						font-size: 24rpx;
+					}
+				}
+			}
+			.select {
+				font-size: 40rpx;
+				position: absolute;
+				right: 20rpx;
+				bottom: 0;
+			}
+			.icon-round {
+				color: #ccc;
+			}
+			.icon-chenggong {
+				color: #FDAD28;
+			}
+		}
+	}
+	
+	.item-select {
+		box-sizing: border-box;
+		border: 1rpx solid #FDAD28;
+	}
+</style>
diff --git a/pages/subPages2/blindDate/withdraw.vue b/pages/subPages2/blindDate/withdraw.vue
new file mode 100644
index 0000000..7569a83
--- /dev/null
+++ b/pages/subPages2/blindDate/withdraw.vue
@@ -0,0 +1,542 @@
+<template>
+	<view class="page">
+		<far-bottom></far-bottom>
+		<block v-if="isPageShow">
+			<view class="header-content b-f m-btm20">
+				<view >
+					
+				</view>
+				<view class="tx-title f-28 col-3">提现金额</view>
+				<view class="money-input dis-flex flex-y-center">
+					<view class="money-icon">¥</view>
+					<input type="digit" class="input" value="" placeholder="请输入提现金额" placeholder-class="placeinput" v-model="tx_money" />
+				</view>
+				<view class="tx-moneyShow dis-flex flex-x-between flex-y-center">
+					<view class="f-24 col-9" style="line-height: 0upx;height: 60upx;">可提现(元):{{drawPrice}}</view>
+					<view class="all-txBtn f-28 col-f t-c" @click="alltx(0)">全部提现</view>
+				</view>
+				<view style="color: #FF4444;font-size: 22upx;margin-top: 10upx;">提现金额{{min_money}}元起,<text v-if="max_money !== 999999999">单次最高提现金额{{max_money}}元</text>提现手续费{{withdrawcharge}}%</view>
+				<view>
+				</view>
+
+				
+			</view>
+			<form @submit="formSubmit">
+				<view class="with-opContent b-f m-btm20">
+					<view class="tx-title f-28 col-3">提现到</view>
+					<view class="op-content">
+						<view class="op-list">
+							<radio-group @change="precedenceChange" name="payment_type">
+								<label v-for="(item, index) in txlist" :key="index" class="label-classtyle dis-flex flex-x-between" style="flex-wrap: wrap;">
+									<view class="dis-flex flex-y-center" style="flex: 0.5;">
+										<view class="op-imag">
+											<image :src="imgfixUrls +  item.imag" mode=""></image>
+										</view>
+										<view class="f-28 col-3">{{(item.title == '账户')?item.title + TextSubstitution.moneytext:item.title}}</view>
+									</view>
+									<view style="flex: 0.5;">
+										<radio :value="item.pay_type" :checked="index === prececurrent" />
+									</view>
+									<view class="userMsg-content" style="flex: 1;min-width: 80%;">
+										<!-- 渠道2 -->
+										<view class="yhk-msg-list" v-if="atpresent==='3' && item.pay_type ==='3'">
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">开户姓名</view>
+												<input class="f-24" type="text" :value="user_info.bank_username" name="bank_username" placeholder="请输入姓名" placeholder-class="placemsg-items" />
+											</view>
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3 onelist-hidden">开户{{examineing==0?'银行':'渠道2'}}</view>
+												<!-- <picker name="bank_name" style="width: 72%;" :value="bankNameIndex" :range="bankNameList" range-key="name"> -->
+												<!-- {{bankNameList[bankNameIndex]['name']}} -->
+												<!-- <view class="f-24" style="height: 52.5upx;line-height: 52.5upx;">123456</view> -->
+												<!-- </picker> -->
+												<input class="f-24" type="text" :value="user_info.bank_name" name="bank_name" :placeholder="examineing==0?'请输入开户银行':'请输入开户渠道2'" placeholder-class="placemsg-items" />
+											</view>
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">{{examineing==0?'银行卡':'渠道2'}}号</view>
+												<input class="f-24" type="text" :value="user_info.card_number" name="card_number" :placeholder="examineing==0?'请输入银行卡号':'请输入开户渠道2号'" placeholder-class="placemsg-items" />
+											</view>
+										</view>
+										<view class="yhk-msg-list" v-if="atpresent==='1' && item.pay_type ==='1'">
+											<!-- 							<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">真实姓名</view>
+												<input class="f-24" type="text" value="" name="alipay_name" placeholder="请输入姓名" placeholder-class="placemsg-items" />
+											</view> -->
+											<view class="msg-items dis-flex flex-y-center">
+												<view class="msg-title f-24 col-3">{{examineing==0?'支付宝账':'渠道1'}}号</view>
+												<input class="f-24" type="text" :value="user_info.alipay" name="alipay" :placeholder="examineing==0?'请输入支付宝账号':'请输入渠道1账号'" placeholder-class="placemsg-items" />
+											</view>
+										</view>
+										<view class="last-hint f-24 col-9" v-if=" item.pay_type ==='1' && atpresent==='1' || item.pay_type ==='3' && atpresent==='3'">请务必填写真实信息
+											<text>*</text>
+										</view>
+									</view>
+								</label>
+							</radio-group>
+						</view>
+					</view>
+					
+				</view>
+				<view class="sub-btn">
+					<!-- {{appDiyFont.to_examine}} -->
+					<button class="f-28 col-f" formType="submit">提现审核</button>
+				</view>
+			</form>
+		</block>
+		<!-- <page-loading ref="loading"></page-loading> -->
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	export default {
+		data() {
+			return {
+				bankNameList: [],
+				bankNameIndex: 0,
+				atpresent: '',
+				prececurrent: 0,
+				txlist: [{
+						id: 'we_chat',
+						title: '微信零钱',
+						imag: 'checkout/weixin.png',
+						pay_type: "2"
+					},
+					{
+						id: 'alipay',
+						title: '渠道1',
+						imag: 'checkout/zhifubao.png',
+						pay_type: "1"
+
+					},
+					{
+						id: 'bank_card',
+						title: '渠道2账户',
+						imag: 'checkout/card.png',
+						pay_type: "3"
+					},
+					{
+						id: 'balance',
+						title: '账户',
+						imag: 'checkout/yue.png',
+						pay_type: "4"
+					}
+				],
+				isPageShow: true,
+				tx_money: null, //输入提现金额,
+				drawPrice: null, //可提现金额,
+				user_info: {}, // 个人信息设置
+				withdrawcharge: null, //提现手续费
+				min_money: "1", //最小提现申请金额（默认最小为1元）；单位：元
+				max_money:'9999999',
+				TextSubstitution:{},
+				is_blindDate: false,
+				examineing:1
+			}
+		},
+		components: {
+
+		},
+		computed: {
+			// appDiyFont() {
+			// 	let appSetting = this.$store.state.appSetting;
+			// 	if (appSetting) {
+			// 		return appSetting.diy_font
+			// 	}
+			// }
+		},
+		beforeCreate() {
+
+		},
+		onLoad(options) {
+			if(options.is_blindDate) {
+				this.is_blindDate = options.is_blindDate
+			}
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.examineing = this.TextSubstitution.examineing || 0;
+			if(this.examineing == 0){
+				this.txlist[1].title = '支付宝'
+				this.txlist[2].title = '银行卡'
+			}
+		},
+
+		onShow() {
+
+		},
+		mounted() {
+			this.withdrawDetail()
+		},
+		methods: {
+			navgateTo() {
+				App.navigationTo({
+					url: 'pages/subPages/dealer/withdraw/withdrawrecord'
+				})
+			},
+			/**
+			 * 获取提现详情
+			 */
+			withdrawDetail() {
+				let _this = this;
+				App._post_form('&p=dating&do=getMatchmakerWithdrawal', {}, res => {
+					_this.setData(res.data);
+					_this.drawPrice = res.data.commission
+					_this.withdrawcharge = res.data.service_charge
+					// _this.max_money = 1;
+					if(_this.max_money == 0){
+						_this.max_money = 999999999;
+					}
+					_this.user_info = res.data.user_info;
+					let payment_set = res.data.type,
+						{
+							txlist
+						} = _this,
+						txlist_toStr = txlist.toString(),
+						newtxlist = [];
+					if (payment_set !== 0) {
+						for (let i = 0; i < txlist.length; i++) {
+							if (txlist_toStr.indexOf(txlist[i].toString()) > -1) {
+								for (let key in payment_set) {
+									if (txlist[i].id === key) {
+										if (payment_set[key] === "1") {
+											newtxlist.push(txlist[i]);
+											_this.atpresent = newtxlist[0].pay_type
+											break;
+										}
+									}
+								}
+							}
+							_this.setData({
+								txlist: newtxlist
+							})
+						}
+					}
+				}, false, () => {})
+			},
+			/**
+			 * 提现类型选择
+			 */
+			precedenceChange(evt) {
+				for (let i = 0; i < this.txlist.length; i++) {
+					if (this.txlist[i].pay_type === evt.target.value) {
+						this.prececurrent = i;
+						break;
+					}
+				}
+				this.atpresent = evt.target.value;
+			},
+			/**
+			 * 全部金额提现按钮
+			 */
+			alltx(num = '0') {
+				let _this = this,
+					drawPrice = _this.drawPrice;
+					if(num !== 0){
+						if(num == 1){
+							_this.tx_money = Number(drawPrice);
+						}else{
+							_this.tx_money = Number(_this.max_money);
+						}
+					}else{
+						if (!!drawPrice && Number(drawPrice) > 0 && Number(_this.max_money) >= Number(drawPrice)) {
+							
+							_this.tx_money = Number(drawPrice);
+						} else if(Number(_this.max_money) < Number(drawPrice) && Number(drawPrice) > 0){
+							uni.showToast({
+								icon:'none',
+								title:`单次最大可提现金额为${_this.max_money}`,
+								duration:2000
+							})
+							// App.showError(``);
+							_this.tx_money = Number(_this.max_money);
+						}else{
+							uni.showToast({
+								icon:'none',
+								title:`没有可提现金额`,
+								duration:2000
+							})
+							
+						}
+					}
+				
+			},
+			/**
+			 * 申请提现
+			 */
+			withdraw(fromData) {
+				uni.showLoading({})
+				let that = this;
+				App._post_form('&p=dating&do=matchmakerWithdrawal', {
+					...fromData
+				}, (result) => {
+					console.log(result, '申请提现')
+					if (result.errno === 0) {
+						console.log(result)
+						App.showSuccess('申请提现成功', () => {
+							App.navigationTo({
+								url: `pages/subPages/dealer/withdraw/withdrawrecord?draw_id=${result.data.id}`,
+								navType: "rediRect"
+							});
+							if(that.is_blindDate) {
+								uni.navigateBack()
+							}
+						})
+					}
+				}, false, () => {
+					uni.hideLoading()
+				})
+			},
+			/**
+			 * 表单
+			 */
+			formSubmit(e) {
+				let _this = this,
+					fromData = {},
+					{
+						min_money,
+						tx_money,
+						drawPrice,
+						withdrawcharge
+					} = _this;
+				fromData = e.detail.value;
+				fromData.sapplymoney = tx_money;
+				console.log(fromData)
+				if (!_this.tx_money) {
+					App.showError('请输入提现金额')
+					return;
+				}
+				// if (Math.round(tx_money * 100) / 100 < Number(min_money) ||
+				// 	(Math.round(tx_money * 100) / 100 > Number(drawPrice))) {
+				// 	App.showError(`请检查输入金额是否小于最少提现金额${min_money}元或输入金额大于可提现金额`)
+				// 	return;
+				// }
+				if (_this.atpresent === "30") {
+					if (!fromData.bank_username) {
+						App.showError('请输入开户姓名')
+						return;
+					}
+					if (!fromData.bank_name) {
+						App.showError(this.examineing == 0?'请输入正确开户银行':'请输入正确开户渠道2')
+						return;
+					}
+					if (fromData.card_number.length < 13 || fromData.card_number.length > 25) {
+						App.showError(this.examineing == 0?'请输入正确的银行卡号':'请输入渠道2号')
+						return;
+					}
+				}
+				if (_this.atpresent === "20") {
+					// if (!fromData.alipay_name) {
+					// 	App.showError('请输入真实姓名')
+					// 	return false
+					// }
+					if (!fromData.alipay) {
+						App.showError(this.examineing == 0?'请输入支付宝':'请输入渠道1账号')
+						return;
+					}
+				}
+				if (withdrawcharge == '' || withdrawcharge == '0') {
+					withdrawcharge = 0
+				}
+				// if(Number(_this.tx_money)>Number(_this.max_money) || Number(_this.tx_money)>Number(_this.drawPrice)){
+				// 	if(Number(_this.max_money)>Number(_this.drawPrice)){
+				// 		uni.showToast({
+				// 			icon:'none',
+				// 			title:`本次最大可提现金额为${_this.drawPrice}`,
+				// 			duration:2000
+				// 		});
+				// 		_this.alltx(1)
+				// 	}else{
+				// 		uni.showToast({
+				// 			icon:'none',
+				// 			title:`单次最大可提现金额为${_this.max_money}`,
+				// 			duration:2000
+				// 		});
+				// 		_this.alltx(2)
+				// 	}
+				// 	// App.showError(``);
+					
+					
+				// 	return;
+				// }
+				// let reali_price = (Math.round(tx_money * 100) / 100) * ((100 - Number(withdrawcharge)) / 100);
+				// let realTimePrice = Math.round((reali_price - (Number(withdrawcharge) / 100 * reali_price)) * 100) / 100;//四舍五入
+				let calculate = {
+					money: tx_money,
+					percent: Number(withdrawcharge)
+				}
+				App._post_form('&p=pay&do=calculationCash', calculate, res => {
+					if (res.errno === 0) {
+						let conpmoney = res.data.realmoney;
+						console.log(conpmoney);
+						if(Number(conpmoney) < 1){
+							uni.showToast({
+								title:'最低实得金额不能小于1元,当前实得金额' + conpmoney + '元',
+								icon:'none'
+							})
+							return
+						}
+						App.showError(
+							`确认提现${tx_money}元,实得${conpmoney}元`, (data) => {
+								if (data.confirm) {
+									!!data && _this.withdraw(fromData)
+								}
+							}, true)
+					}
+				})
+				// App.showError(
+				// 	`确认提现${tx_money}元,实得${realTimePrice}元`, (data) => {
+				// 		if (data.confirm) {
+				// 			!!fromData && _this.withdraw(fromData)
+				// 		}
+				// 	}, true)
+			},
+		}
+	}
+</script>
+
+<style scoped>
+	page {
+		background: #F7F7F7;
+	}
+
+	.page {
+		padding: 30upx 30upx;
+	}
+
+	.header-content {
+		padding: 40upx 36upx 30upx 36upx;
+		border-radius: 10upx;
+	}
+
+	.tx-title {
+		margin-bottom: 40upx;
+	}
+
+	.placeinput {
+		font-size: 30upx;
+		height: 52upx;
+		line-height: 52upx;
+	}
+
+	.money-icon {
+		/* margin-right: 20upx; */
+		font-size: 28upx;
+		padding-top: 8upx;
+		margin-right: 10upx;
+		/* 	height: 1em;
+		line-height: 1em; */
+	}
+
+	.money-input {
+		padding-bottom: 20upx;
+		border-bottom: 1px solid #EEEEEE;
+		/* align-items: baseline; */
+	}
+
+	.money-input .input {
+		width: 100%;
+		font-size: 36upx;
+		/* 		height: 1.1em;
+		line-height: 1.1em; */
+	}
+
+	.tx-moneyShow {
+		padding-top: 34upx;
+	}
+
+	.tx-moneyShow .all-txBtn {
+		background-color: #F44F44;
+		width: 184upx;
+		height: 70upx;
+		line-height: 70upx;
+		background: rgba(244, 79, 68, 1);
+		border-radius: 35upx;
+	}
+
+	.with-opContent {
+		border-radius: 10upx;
+		padding: 36upx 36upx 0 36upx;
+	}
+
+	.op-imag {
+		margin-right: 15upx;
+	}
+
+	.op-imag image {
+		width: 50upx;
+		height: 50upx;
+		vertical-align: middle;
+	}
+
+	.label-classtyle {
+		padding: 20upx 0;
+		border-bottom: 1px solid #EEEEEE;
+	}
+
+	.label-classtyle:last-child {
+		border: none;
+	}
+
+	.userMsg-content {
+		padding: 0 58upx;
+	}
+
+	.msg-title {
+		width: 30%;
+		margin-right: 30upx;
+	}
+
+	.msg-items {
+		border-bottom: 1px solid #EEEEEE;
+		padding: 26upx 0;
+	}
+
+	.placemsg-items {
+		color: #999999;
+	}
+
+	.last-hint {
+		position: relative;
+		text-align: left;
+		padding: 30upx 14upx 30upx 180upx;
+	}
+
+	.last-hint text {
+		/* display: block; */
+		/* position: absolute; */
+		color: red;
+		font-size: 22upx;
+		padding-left: 10upx;
+	}
+
+	.sub-btn button {
+		background: #F44F44;
+		height: 84upx;
+		line-height: 84upx;
+		text-align: center;
+		border-radius: 42upx;
+	}
+
+	.input-hidden {
+		width: 0;
+		height: 0;
+		opacity: 0;
+	}
+
+	/* #ifdef H5*/
+	radio>>>.uni-radio-input {
+		/* 自定义样式.... */
+		height: 36upx;
+		width: 36upx;
+		margin-top: -4upx;
+		border-radius: 50%;
+		border: 2upx solid #999;
+		background: transparent;
+	}
+
+	radio>>>.uni-radio-input.uni-radio-input-checked {
+		background-color: #F44F44 !important;
+		border-color: #F44F44 !important;
+	}
+
+	/* #endif */
+</style>
diff --git a/pages/subPages2/booked/bookedInformation/bookedInformation.vue b/pages/subPages2/booked/bookedInformation/bookedInformation.vue
new file mode 100644
index 0000000..654382a
--- /dev/null
+++ b/pages/subPages2/booked/bookedInformation/bookedInformation.vue
@@ -0,0 +1,391 @@
+<template>
+	<view>
+		<view class="bookedInformation">
+			<view class="booked-title"> 
+			<!-- 头部信息 -->
+				<view class="booked-title-box dis-flex">
+					<view class="booked-img">
+						<image :src="bookedData.goods.logo" mode=""></image>
+					</view>
+					<view class="booked-name">
+						<view class="booked-name-title">
+							{{bookedData.goods.name}}
+						</view>
+						<view class="col-9 f-26 p-top-20" v-if="bookedData.goods.optionName">
+							{{bookedData.goods.optionName}}
+						</view>
+					</view>
+				</view>
+				
+				<!-- 商家详情 -->
+				<view class="store-datum">
+					<view class="store-name">
+						{{bookedData.merchant.storename}}
+					</view>
+					<view class="store-time">
+						营业时间：{{bookedData.merchant.storehours}}
+					</view>
+					<view class="store-phone store-time dis-flex">
+						<view class="phone">
+							商家电话：{{bookedData.merchant.mobile}}
+						</view>
+						<view class="play-call" @click="playcall">
+							<view class="iconfont icon-dianhua play-call-icon">
+								
+							</view>
+						</view>
+					</view>
+					<view class="store-phone store-time dis-flex">
+						<view class="phone">
+							{{bookedData.merchant.address}}
+						</view>
+						<view class="play-call" @click="openNavigation">
+							<view class="iconfont icon-location_light play-call-icon">
+								
+							</view>
+						</view>
+					</view>
+				</view>
+				<view style="padding-bottom: 200upx;">
+					<view class="appointment-box" v-for="(item,index) in bookedData.applist">
+						<view class="appointment-state dis-flex">
+							<view class="state">
+								<view >
+									<view class="dis-il-block iconfont icon-timefill c-ff4444" v-if="item.status == 0">
+										
+									</view>
+									<view class="dis-il-block iconfont icon-roundcheckfill c-ff4444" v-else-if="item.status == 1">
+										
+									</view>
+									<view class="dis-il-block iconfont icon-roundclosefill c-ff4444" v-else>
+										
+									</view>
+									<view class="dis-il-block state-title">
+										{{item.statusTips}}
+									</view>
+								</view>
+								<view class="state-text">
+									{{item.statusText}}
+								</view>
+							</view>
+							<view class="appointment-btn">
+								<view class="btn" v-if="item.status == 0" @click="cancel(item)">
+									取消预约
+								</view>
+							</view>
+						</view>
+						<view class="appointment-data">
+							<view class="dis-flex appointment-time">
+								<view class="time-title">
+									预约时间
+								</view>
+								<view class="time-time t-r">
+									{{item.date}} {{item.starttime}}-{{item.endtime}}
+								</view>
+							</view>
+							<view class="dis-flex appointment-time">
+								<view class="time-title">
+									预约数量
+								</view>
+								<view class="time-time t-r">
+									{{item.num}}份
+								</view>
+							</view>
+						</view>
+						<view class="appointment-remark" v-if="item.remark">
+							<view class="remark-box">
+								<text>{{item.remark}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			<view class="booked-content">
+				
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" />
+	</view>
+	
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				loadlogo:false,
+				bookedData:{},
+				channel:3,
+				ids:{}
+			}
+		},
+		components:{
+			TabBars
+		},
+		onLoad(e) {
+			this.ids = e;
+			this.getBookedData();
+		},
+		methods:{
+			playcall(){  //拨打电话
+				let _this = this;
+				uni.makePhoneCall({
+					phoneNumber: _this.bookedData.merchant.mobile 
+				});
+			},
+			openNavigation(){ //打开地图
+				let detailsData = this.bookedData.merchant;
+				detailsData.location = {
+					lat:detailsData.lat,
+					lng:detailsData.lng
+				}
+				// #ifdef H5
+				console.log(detailsData);
+				wxApi.WxopenLocation(
+					detailsData['lat'],
+					detailsData['lng'],
+					detailsData['storename'],
+					detailsData['address']
+				)
+				// #endif
+				// #ifdef MP-WEIXIN
+				App.openLocation(detailsData)
+				// #endif
+				//#ifdef APP-PLUS
+				    Map.openMap(Number(detailsData['lat']),Number(detailsData['lng']),detailsData['storename'],'gcj02')
+				//#endif
+			},
+			cancel(item){ //预约函数
+				App.showError(
+					`确定取消本次预约?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								appointid:item.id,
+								channel:this.channel
+							}
+							App._post_form(
+								`&p=order&do=cancelAppoint`,
+								data,
+								res => {
+									uni.showToast({
+										title:res.message
+									});
+									this.getBookedData(); //状态更改
+								},
+								false,
+								() => {
+								}
+							);
+						}
+					},
+					true
+				);
+				
+			},
+			getBookedData(){  //初始化信息
+				let data = {
+					orderid:this.ids.orderid,
+					goodsid:this.ids.id,
+					pluginno:this.ids.type
+				}
+				App._post_form(
+					`&p=order&do=appointDetail`,
+					data,
+					res => {
+						this.bookedData = res.data;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.bookedInformation{
+		// padding-bottom: 300upx;
+		.booked-title{
+			width: 750upx;
+			height: 358upx;
+			background: linear-gradient(180deg, #FF4444 0%, #FF9494 76%, rgba(255, 255, 255, 0) 100%);
+			opacity: 1;
+			padding: 40upx 30upx;
+			box-sizing: border-box;
+			.booked-title-box{
+				padding: 30upx;
+				border-radius: 10upx;
+				background-color: #FFFFFF;
+				.booked-img{
+					width: 130upx;
+					height: 130upx;
+					padding-right: 30upx;
+					flex: 0.3;
+					image{
+						width: 100%;
+						height: 100%;
+						border-radius: 6upx;
+					}
+				}
+				.booked-name{
+					flex: 0.7;
+					.booked-name-title{
+						min-height: 76upx;
+						font-size: 28upx;
+						font-weight: bold;
+						line-height: 40upx;
+						color: #333333;
+						letter-spacing: 3upx;
+						opacity: 1;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						/*! autoprefixer: off */
+						-webkit-box-orient: vertical;
+						width: 470upx;
+
+					}
+				}
+			}
+			.store-datum{
+				padding: 30upx;
+				border-radius: 10upx;
+				background-color: #FFFFFF;
+				margin-top: 20upx;
+				.store-name{
+					height: 50upx;
+					font-size: 28upx;
+					font-weight: bold;
+					line-height: 34upx;
+					color: #333333;
+					opacity: 1;
+				}
+				.store-time{
+					height: 50upx;
+					font-size: 24upx;
+					
+					font-weight: 400;
+					line-height: 34upx;
+					color: #999999;
+					opacity: 1;
+				}
+				.store-phone{
+					.phone{
+						flex: 0.9;
+					}
+					.play-call{
+						flex: 0.1;
+						.play-call-icon{
+							font-size: 22upx;
+							float: right;
+							background-color: #FF4444;
+							color: #FFFFFF;
+							height: 40upx;
+							width: 40upx;
+							text-align: center;
+							line-height: 40upx;
+							border-radius: 50%;
+						}
+					}
+				}
+			}
+			.appointment-box{
+				padding: 30upx;
+				border-radius: 10upx;
+				margin-top: 20upx;
+				background-color: #FFFFFF;
+				
+				.appointment-state{
+					padding-bottom: 20upx;
+					border-bottom: 1upx solid #EEEEEE;
+					.state{
+						flex: 0.78;
+
+						.state-title{
+							padding-left: 20upx;
+							font-size: 32upx;
+							font-weight: bold;
+							line-height: 45upx;
+							color: #333333;
+							letter-spacing: 2upx;
+							opacity: 1;
+						}
+						.state-text{
+							height: 50upx;
+							font-size: 24upx;
+							font-weight: 400;
+							line-height: 60upx;
+							color: #333333;
+							opacity: 1;
+						}
+					}
+					.appointment-btn{
+						padding-top: 25upx;
+						flex: 0.22;
+						.btn{
+							float: right;
+							text-align: center;
+							line-height: 50upx;
+							font-size: 24upx;
+							width: 140upx;
+							height: 50upx;
+							border-radius: 60upx;
+							border: 2upx solid #333333;
+							color: #333333;
+						}
+					}
+				}
+				.appointment-data{
+					padding-top: 20upx;
+					.appointment-time{
+						.time-title{
+							font-size: 24upx;
+							font-weight: 400;
+							line-height: 48upx;
+							color: #999999;
+							opacity: 1;
+							flex: 0.3;
+						}
+						.time-time{
+							font-size: 24upx;
+							font-weight: 400;
+							line-height: 48upx;
+							color: #333333;
+							opacity: 1;
+							flex: 0.7;
+						}
+					}
+				}
+				.appointment-remark{
+					background-color: #F8F8F8;
+					border-radius: 10upx;
+					padding: 20upx 30upx;
+					margin-top: 20upx;
+					.remark-box{
+						font-size: 24upx;
+						font-weight: 400;
+						line-height: 42upx;
+						color: #333333;
+						opacity: 1;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/booked/bookedTime/bookedTime.vue b/pages/subPages2/booked/bookedTime/bookedTime.vue
new file mode 100644
index 0000000..81035e1
--- /dev/null
+++ b/pages/subPages2/booked/bookedTime/bookedTime.vue
@@ -0,0 +1,437 @@
+<template>
+	<view>
+		<view class="bookedTime" v-if="loadlogo">
+			<view class="bookedTime-title ">
+				<view :class="item.checked ? 'data-item' : 'data-item-no'" v-for="(item, index) in bookedTime.dayArray" :key="index" @click="weekChecked(item, index)">
+					<view class="data-item-week">{{ item.week }}</view>
+					<view class="data-item-month">{{ item.day }}</view>
+				</view>
+			</view>
+			<view class="data-step dis-flex">
+				<view class="step-title">预约数量</view>
+				<view class="data-stepper dis-flex">
+					<view class="dis-il-block minusBtn" @click="minuNum">-</view>
+					<view class="dis-il-block p-left-right-20" style="padding-top: 10upx;">
+						<input class="input-step" maxlength="3" @input="watchStepNum" type="number" v-model="stepNum"  value="" />
+					</view>
+					<view class="dis-il-block addBtn" @click="addNum">+</view>
+				</view>
+			</view>
+			<view class="timeQuantum">
+				<view class="time-title">预约时间段</view>
+				<view class="time-box dis-flex">
+					<view :class="item.checked ? 'time-item' : 'time-item-no'" v-for="(item, index) in bookedTime.appointarray" :key="index" @click="checkedquantum(index)">
+						<view class="item-quantnm" :style="{lineHeight: item.peoplenums == '0'?'100rpx':'60rpx'}">{{ item.startTime }}-{{ item.endTime }}</view>
+						<view class="item-inventory" v-if="item.peoplenums != '0'">库存:{{ item.surnum }}</view>
+					</view>
+				</view>
+			</view>
+			<view class="leave dis-flex">
+				<view class="leave-title">买家留言</view>
+				<view class="leave-input-box"><input type="text" placeholder="请输入预约备注" v-model="remarkText" class="leave-input" /></view>
+			</view>
+			<view class="confirmBtn" @click="confirm" v-if="appointItem.surnum > 0 || appointItem.peoplenums == '0'">确认</view>
+			<view class="confirmBtn" style="background-color: #999999;" v-else>确认</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {
+			loadlogo: false,
+			bookedTime: {},
+			stepNum: 1,
+			day: {},
+			appointItem: {},
+			remarkText: '',
+			ids: {},
+			delBtn:false
+		};
+	},
+	onLoad(e) {
+		this.ids = e;
+		// this.getDate();
+		this.getBookedTime(false);
+	},
+	watch:{
+		// stepNum(newVal){
+		// 	if(newVal < 1){
+		// 		this.stepNum = 1;
+		// 	}else if(newVal >this.appointItem.surnum){
+		// 		this.stepNum = this.appointItem.surnum;
+		// 	}
+		// }
+	},
+	methods: {
+		watchStepNum(e){
+			console.log(e);
+		},
+		getDate() {
+			let date = new Date();
+			let year = date.getFullYear(); //获取系统的bai年；
+			let month = date.getMonth() + 1; //获取系统月份，du由于月份是从0开始计算，所以要加1
+			let dates = date.getDate(); // 获取系统日，
+			this.date = year + '-' + (month < 10 ? '0' + month : month) + '-' + (dates < 10 ? '0' + dates : dates);
+			
+			console.log(this.date);
+		},
+		confirm() {
+			if(this.delBtn) return
+			this.delBtn = true;
+			setTimeout(()=>{
+				this.delBtn = false; //简易防抖
+			},1500);
+			if(this.stepNum < 1){
+				uni.showToast({
+					icon:'none',
+					title:'预约数量不能小于1'
+				});
+				return
+			}else if(this.stepNum > Number(this.appointItem.surnum) && this.appointItem.peoplenums != 0){
+				uni.showToast({
+					icon:'none',
+					title:'预约数量超过库存'
+				});
+				return
+			}else if(this.stepNum > Number(this.ids.num)){
+				uni.showToast({
+					icon:'none',
+					title:'预约数量超过可预约数量'
+				});
+				return
+			}
+			let data = {
+				num: this.stepNum,
+				appdate: this.day.date,
+				pluginno: this.ids.type,
+				appstarttime: this.appointItem.startTime,
+				appendtime: this.appointItem.endTime,
+				goodsid: this.ids.id,
+				orderid: this.ids.orderid,
+				remark: this.remarkText
+			};
+			App._post_form(
+				`&p=order&do=addAppoint`,
+				data,
+				res => {
+					console.log(res);
+					if (res.data.status == 1) {
+						uni.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							this.delBtn = true;
+							uni.navigateBack({
+								delta: 1
+							});
+						}, 1000);
+					};
+				},
+				false,
+				() => {}
+			);
+		},
+		checkedquantum(index) {
+			this.bookedTime.appointarray.map(item=>{
+				item.checked = false;
+			})
+			this.bookedTime.appointarray[index].checked = true;
+			this.appointItem = this.bookedTime.appointarray[index];
+			this.stepNum = 1;
+			this.loadlogo = !this.loadlogo;
+			this.loadlogo = !this.loadlogo; //$set不生效，重新渲染
+		},
+		addNum() { //加法
+			if(this.stepNum == 0){
+				this.stepNum = 1;
+				return
+			}
+			if(this.appointItem.surnum > Number(this.ids.num)){
+				// debugger
+				if(this.stepNum == Number(this.ids.num)){
+					uni.showToast({
+						icon:'none',
+						title:'预约数量不能超过当前可预约数量'
+					})
+					return
+				}
+			}
+			if (this.stepNum == this.appointItem.surnum) {
+				uni.showToast({
+					icon:'none',
+					title:'预约数量不能超过当前库存'
+				})
+				return
+			} else {
+				this.stepNum = this.stepNum + 1;
+			}
+		},
+		minuNum() { //减法
+			if(this.stepNum == 0){
+				this.stepNum = 1;
+				return
+			}
+			if (this.stepNum == 1) {
+				this.stepNum = 1;
+			} else {
+				this.stepNum = this.stepNum - 1;
+			}
+		},
+		weekChecked(item, index) {  //选中预约
+			this.bookedTime.dayArray.map(item => {
+				item.checked = false;
+			});
+			this.bookedTime.dayArray[index].checked = true;
+			this.day = this.bookedTime.dayArray[index];
+			this.date = this.bookedTime.dayArray[index].date;
+			this.stepNum = 1;
+			this.getBookedTime(true);
+			this.loadlogo = !this.loadlogo;
+			this.loadlogo = !this.loadlogo;
+		},
+		getBookedTime(flag) { //通过flag判断是否为初次加载
+			let data = {
+				appdate: this.date || '',
+				pluginno: this.ids.type,
+				goodsid: this.ids.id,
+				orderid: this.ids.orderid,
+				initialization: 1
+			};
+			App._post_form(
+				`&p=order&do=getAppointNumber`,
+				data,
+				res => {
+					if(flag){
+						this.bookedTime.appointarray = res.data.appointarray;
+						this.bookedTime.appointarray.forEach(item=>{
+							item.checked = false;
+						})
+						this.bookedTime.appointarray[0].checked = true;
+						this.appointItem = this.bookedTime.appointarray[0];
+						
+					}else{
+						console.log(res);
+						this.bookedTime = res.data;
+						this.bookedTime.appointarray.forEach(item=>{
+							item.checked = false;
+						})
+						this.bookedTime.appointarray[0].checked = true;
+						this.appointItem = this.bookedTime.appointarray[0];
+						this.bookedTime.dayArray.forEach(item => {
+							item.checked = false;
+						});
+						// this.bookedTime.dayArray.splice(2,1)
+						this.bookedTime.dayArray[0].checked = true;
+						// this.bookedTime.appointarray.map(item=>{
+						// 	item.checked = false;
+						// });
+						
+						this.day = this.bookedTime.dayArray[0];
+					}
+					
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.bookedTime {
+	padding: 30upx;
+	.bookedTime-title {
+		padding: 20upx 0;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		.data-item {
+			display: inline-block;
+			padding: 20upx 10upx;
+			border-radius: 60upx;
+			background-color: #ff4444;
+			color: #ffffff;
+			.data-item-week {
+				font-size: 24upx;
+				font-weight: 400;
+				text-align: center;
+			}
+			.data-item-month {
+				font-size: 28upx;
+				font-weight: bold;
+				text-align: center;
+			}
+		}
+		.data-item-no {
+			display: inline-block;
+			padding: 20upx 10upx;
+			border-radius: 60upx;
+			color: #ffffff;
+			.data-item-week {
+				font-size: 24upx;
+				font-weight: 400;
+				text-align: center;
+				color: #999999;
+			}
+			.data-item-month {
+				font-size: 28upx;
+				font-weight: bold;
+				text-align: center;
+				color: #333333;
+			}
+		}
+	}
+	// .bookedTime-title:after {
+	// 	margin-right:auto;
+	// 	content: '';
+	// 	flex:auto;
+	// }
+	.data-step {
+		padding: 30upx 0;
+		border-top: 1upx solid #eeeeee;
+		border-bottom: 1upx solid #eeeeee;
+		.step-title {
+			flex: 0.7;
+			font-size: 30upx;
+			font-weight: 400;
+			color: #333333;
+			opacity: 1;
+			line-height: 60upx;
+		}
+		.data-stepper {
+			flex: 0.3;
+			.addBtn {
+				width: 60upx;
+				height: 60upx;
+				border-radius: 50%;
+				background-color: #ff4444;
+				color: #ffffff;
+				font-size: 28upx;
+				font-weight: 700;
+				text-align: center;
+				line-height: 60upx;
+			}
+			.minusBtn {
+				width: 60upx;
+				height: 60upx;
+				line-height: 60upx;
+				border-radius: 50%;
+				background-color: #f8f8f8;
+				color: #999999;
+				font-size: 28upx;
+				font-weight: 700;
+				text-align: center;
+			}
+			.input-step {
+				width: 60upx;
+				text-align: center;
+			}
+		}
+	}
+	.timeQuantum {
+		padding: 30upx 0;
+		border-bottom: 1upx solid #eeeeee;
+		.time-title {
+			font-size: 30upx;
+			font-weight: 400;
+			color: #333333;
+			opacity: 1;
+			padding-bottom: 30upx;
+		}
+		.time-box {
+			flex-wrap: wrap;
+			justify-content: space-between;
+			.time-item {
+				flex: 0 0 30%;
+				height: 100upx;
+				background: #ff4444;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				.item-quantnm {
+					text-align: center;
+					font-size: 28upx;
+					font-weight: bold;
+					line-height: 60upx;
+					color: #ffffff;
+					opacity: 1;
+				}
+				.item-inventory {
+					text-align: center;
+					font-size: 26upx;
+					font-weight: 400;
+					line-height: 20upx;
+					color: #ffffff;
+					opacity: 1;
+				}
+			}
+			.time-item-no {
+				flex: 0 0 30%;
+				height: 100upx;
+				background: #f8f8f8;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				.item-quantnm {
+					text-align: center;
+					font-size: 28upx;
+					font-weight: bold;
+					line-height: 60upx;
+					color: #333333;
+					opacity: 1;
+				}
+				.item-inventory {
+					text-align: center;
+					font-size: 26upx;
+					font-weight: 400;
+					line-height: 20upx;
+					color: #999999;
+					opacity: 1;
+				}
+			}
+		}
+		.time-box:after {
+			content: '';
+			flex: 0 0 30%;
+		}
+	}
+	.leave {
+		padding: 30upx 0;
+		.leave-title {
+			font-size: 30upx;
+			font-weight: 400;
+			flex: 0.3;
+			color: #333333;
+			opacity: 1;
+		}
+		.leave-input-box {
+			flex: 0.7;
+			.leave-input {
+				font-size: 28upx;
+				font-weight: 400;
+				text-align: right;
+				opacity: 1;
+			}
+		}
+	}
+	.confirmBtn {
+		width: 690upx;
+		height: 90upx;
+		background: #ff4444;
+		border: 1px solid rgba(238, 238, 238, 0.6705882352941175);
+		opacity: 1;
+		border-radius: 45px;
+		position: fixed;
+		bottom: 30upx;
+		left: 30upx;
+		text-align: center;
+		font-size: 32upx;
+		font-weight: 400;
+		line-height: 90upx;
+		color: #ffffff;
+	}
+}
+</style>
diff --git a/pages/subPages2/booked/reservationList/reservationList.vue b/pages/subPages2/booked/reservationList/reservationList.vue
new file mode 100644
index 0000000..7502879
--- /dev/null
+++ b/pages/subPages2/booked/reservationList/reservationList.vue
@@ -0,0 +1,442 @@
+<template>
+	<view>
+		<view class="reservationList">
+			<view class="tab-box">
+				<v-tabs					:lineScale="0.3" 					:lineRadius="'4px 4px 0px 0px'" 					:lineHeight="'6rpx'"					:height="'100rpx'"					:fontSize="'30rpx'" 					:paddingItem="'40rpx 22rpx 40rpx'" 					:activeColor="'#3388FF'" 					:lineColor="'#3388FF'"					v-model="sort" 
+					@change="changeTab"					:scroll="false"					:bold="false"					:tabs="['全部','未审核','已通过','已拒绝']"></v-tabs>
+			</view>
+			<view class="list-box" v-if="reservationList.length > 0">
+				<view class="order-item" v-for="(item,index) in reservationList">
+					<view class="dis-flex">
+						<view class="order-number">
+							订单号：{{item.orderno}}
+						</view>
+						<view class="order-state">
+							{{item.status == '0'?'待审核':item.status == '1'?'已审核':item.status == '2'?'已驳回':item.status == '3'?'用户取消':'商户取消'}}
+						</view>
+					</view>
+					<view class="goods-details dis-flex">
+						<view class="img-box">
+							<image :src="item.goodsLogo" mode=""></image>
+						</view>
+						<view class="content-box">
+							<view class="content-title">
+								{{item.goodsName}}
+							</view>
+							<view class="dis-flex content-num">
+								<view  style="flex: 0.7;" v-if="item.optionName">
+									{{item.optionName}}
+								</view>
+								<view class="t-r" style="flex: 0.3;" v-if="item.num">
+									X{{item.num}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="reserveInformation">
+						<view class="Information-item dis-flex p-b-20">
+							<view class="flex-box col-9 f-26">
+								客户姓名
+							</view>
+							<view class="flex-box col-3 f-26 t-r">
+								{{item.username}}
+							</view>
+						</view>
+						<view class="Information-item dis-flex p-b-20">
+							<view class="flex-box col-9 f-26">
+								客户手机号
+							</view>
+							<view class="flex-box col-3 f-26 t-r">
+								{{item.mobile}}
+							</view>
+						</view>
+						<view class="Information-item dis-flex p-b-20">
+							<view class="flex-box col-9 f-26">
+								预约时间
+							</view>
+							<view class="flex-box col-3 f-26 t-r">
+								{{item.date}} {{item.starttime}}-{{item.endtime}}
+							</view>
+						</view>
+					</view>
+					<view class="remark-box" v-if="item.remark">
+						{{item.remark}}
+					</view>
+					<view class="review-button" v-if="item.status == 0">
+						<view class="refuse" @click="refuseClick(item)">
+							拒绝
+						</view>
+						<view class="consent" @click="consentClick(item)">
+							同意
+						</view>
+					</view>
+					<view class="review-button" v-if="item.hexiaoflag == 1 || item.cancelflag == 1">
+						<view class="refuse" @click="hexiaoClick(item)" v-if="item.hexiaoflag == 1">
+							核销
+						</view>
+						<view class="consent" @click="cancelClick(item)" v-if="item.cancelflag == 1">
+							取消
+						</view>
+					</view>
+				</view>
+				<load-more :isMore="isMore"  :bgc="'#f8f8f8'"></load-more>
+			</view>
+			<nonemores v-else></nonemores>
+			<PopManager :show="addteachShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeaddteach">
+				<view class="add-work">
+					<textarea v-if="addteachShow" class="textarea" placeholder="请输入驳回原因" v-model="reject" />
+					<view class="reject-btn" @click="rejectClick">
+						确定
+					</view>
+				</view>
+			</PopManager>
+			<TabBars :tabBarAct="0" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import nonemores from '@/components/template/nonemores.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import PopManager from '@/components/template/PopManager';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		components:{
+			vTabs,
+			nonemores,
+			loadMore,
+			PopManager,
+			TabBars
+		},
+		data(){
+			return{
+				sort:0,
+				page:1,
+				isMore:false,
+				loadlogo:true,
+				reservationList:[],
+				addteachShow:false,
+				reject:'',
+				refuseItem:{},
+				pageStatus:'',
+				sid:''
+			}
+		},
+		onLoad(e) {
+			debugger
+			this.sid = e.sid;
+			this.getReservationList()
+		},
+		onReachBottom() {
+			if(this.pageNum < this.page) return
+			this.isMore = false;
+			this.page++;
+			this.getReservationList(true,false)
+		},
+		methods:{
+			changeTab(e){
+				console.log(e);
+				if(e == 1){
+					this.pageStatus = 5;
+				}else if(e == 2){
+					this.pageStatus = 1;
+				}else if(e == 3){
+					this.pageStatus = 2;
+				}else if(e == 0){
+					this.pageStatus = '';
+				};
+				this.page = 1;
+				this.getReservationList(false,false)
+			},
+			hexiaoClick(item){
+				App.showError(
+					`是否对用户${item.username}的预约申请进行核销?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								id:item.id
+							}
+							App._post_form(
+								`&p=order&do=hexiaoAppoint`,
+								data,
+								res => {
+									uni.showToast({
+											title:res.message
+									});
+									this.getReservationList(false,1);
+								},
+								false,
+								() => {
+								}
+							);
+						}
+					},
+					true
+				);
+			},
+			cancelClick(item){
+				App.showError(
+					`是否取消用户${item.username}的预约申请?`,
+					data => {
+						if (data.confirm) {
+							let data = {
+								appointid:item.id,
+								channel:4
+							}
+							App._post_form(
+								`&p=order&do=cancelAppoint`,
+								data,
+								res => {
+									uni.showToast({
+											title:res.message
+									});
+									this.getReservationList(false,1);
+								},
+								false,
+								() => {
+								}
+							);
+						}
+					},
+					true
+				);
+				
+			},
+			rejectClick(){
+				let data = {
+					id:this.refuseItem.id,
+					examine:2,
+					reason:this.reject
+				}
+				App._post_form(
+					`&p=Order&do=examineAppoint`,
+					data,
+					res => {
+						this.addteachShow = false;
+						this.reject = '';
+						uni.showToast({
+								title:res.message
+						});
+						this.getReservationList(false,1)
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			refuseClick(item){
+				this.refuseItem = item;
+				this.addteachShow = true;
+			},
+			closeaddteach(){
+				this.addteachShow = false;
+				this.reject = '';
+			},
+			consentClick(item){
+				App.showError(
+					`是否同意用户${item.username}的预约申请?`,
+					data => {
+						if (data.confirm) {
+								let data = {
+									id:item.id,
+									examine:1
+								}
+								App._post_form(
+									`&p=Order&do=examineAppoint`,
+									data,
+									res => {
+										uni.showToast({
+												title:res.message
+										});
+										this.getReservationList(false,1)
+									},
+									false,
+									() => {
+									}
+								);
+							return
+						}
+					},
+					true
+				);
+			},
+			getReservationList(flag,page){
+				let data = {
+					sid:this.sid,
+					page:page|| this.page,
+					status:this.pageStatus
+				}
+				App._post_form(
+					`&p=Order&do=appointList`,
+					data,
+					res => {
+						console.log(res);
+						if(flag){  //重回页面数据重载
+							this.reservationList = this.reservationList.concat(res.data.list);
+							if(page){
+								let pages = page + 1;
+								if(pages > this.page) return
+								this.getReservationList(true,pages);
+							}
+						}else{
+							this.reservationList = res.data.list;//新进页面的数据加持
+						}
+						this.pageNum = res.data.pagetotal;
+						this.isMore = true;
+					},
+					false,
+					() => {
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 全页面背景色 */
+	page{
+		background-color: #f8f8f8;
+	}
+</style>
+<style lang="scss" scoped>
+	.list-box{
+		margin: 20upx 30upx 150upx;
+		.order-item{
+			padding: 30upx;
+			margin-bottom: 30upx;
+			background-color: #FFFFFF;
+			border-radius: 15upx;
+			.order-number{
+				font-size: 24upx;
+				font-weight: 400;
+				color: #333333;
+				opacity: 1;
+				flex: 0.8;
+			}
+			.order-state{
+				font-size: 24upx;
+				font-weight: 400;
+				color: #FF4444;
+				opacity: 1;
+				text-align: right;
+				flex: 0.2;
+			}
+			.goods-details{
+				padding: 30upx 0;
+				border-bottom: 1upx solid #EEEEEE;
+				.img-box{
+					flex: 0.3;
+					image{
+						width: 130upx;
+						height: 130upx;
+						border-radius: 6upx;
+					}
+				}
+				.content-box{
+					flex: 0.7;
+					.content-title{
+						min-height: 76upx;
+						font-size: 28upx;
+						font-weight: bold;
+						line-height: 40upx;
+						color: #333333;
+						letter-spacing: 3upx;
+						opacity: 1;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						/*! autoprefixer: off */
+						-webkit-box-orient: vertical;
+						width: 470upx;
+					}
+					.content-num{
+						font-size: 26upx;
+						font-weight: 400;
+						color: #999999;
+						opacity: 1;
+						padding-top: 20upx;
+					}
+				}
+			}
+			.reserveInformation{
+				padding: 30upx 0;
+			}
+			.remark-box{
+				background: #f8f8f8;
+				padding: 20upx;
+				opacity: 1;
+				border-radius: 10upx;
+				font-size: 26upx;
+				font-weight: 400;
+				color: #333333;
+			}
+			.review-button{
+				padding-top: 30upx;
+				height: 60upx;
+				position: relative;
+				.refuse{
+					width: 120upx;
+					height: 60upx;
+					background: #FF4444;
+					opacity: 1;
+					border-radius: 60upx;
+					position: absolute;
+					right: 160upx;
+					font-size: 28upx;
+					font-weight: 400;
+					line-height: 60upx;
+					color: #FFFFFF;
+					opacity: 1;
+					text-align: center;
+				}
+				.consent{
+					width: 120upx;
+					height: 60upx;
+					background: #3388FF;
+					opacity: 1;
+					border-radius: 60upx;
+					position: absolute;
+					right: 0;
+					font-size: 28upx;
+					font-weight: 400;
+					line-height: 60upx;
+					color: #FFFFFF;
+					opacity: 1;
+					text-align: center;
+				}
+			}
+		}
+	}
+	.add-work{
+		width: 500upx;
+		height: 300upx;
+		border-radius: 20upx;
+		background-color: #FFFFFF;
+		padding: 30upx;
+		position: relative;
+		.textarea{
+			font-size: 28upx;
+			width: 98%;
+			padding-bottom: 50upx;
+			height: 75%;
+		}
+		.reject-btn{
+			height: 60upx;
+			width: 200upx;
+			border-radius: 60upx;
+			background-color: #3388FF;
+			position: absolute;
+			left: 50%;
+			bottom: 30upx;
+			font-size: 28upx;
+			color: #FFFFFF;
+			text-align: center;
+			line-height: 60upx;
+			transform: translateX(-50%);
+		}
+	}
+</style>
diff --git a/pages/subPages2/businessCenter/businessCenter.vue b/pages/subPages2/businessCenter/businessCenter.vue
new file mode 100644
index 0000000..281a69f
--- /dev/null
+++ b/pages/subPages2/businessCenter/businessCenter.vue
@@ -0,0 +1,527 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<view class="businessCenter" v-if="loadlogo">
+			
+			<!-- 飞起来的头部 -->
+			<view class="fixedBox dis-flex">
+				<!-- 搜索 -->
+				<view class="f-24">
+					<view class="bankindex" @click="goindex">
+						<text class="iconfont icon-pullleft" style="font-size: 28upx;padding-right: 10upx;"></text>首页
+					</view>
+				</view>
+				<view class="search">
+					<view class="dis-il-block iconfont icon-search f-28 searchIcon" style="color: #999999;"></view>
+					<input
+						class="uni-input"
+						confirm-type="search"
+						v-model="inputValue"
+						placeholder-style="color:#999999;font-size:26upx;background-color: #ffffff;"
+						placeholder="请输入商铺名称"
+						@confirm="search"
+					/>
+					<!-- <view @click="search" class="f-30 dis-il-block t-c searchs">搜索</view> -->
+				</view>
+				<!-- 下拉筛选框 -->
+			</view>
+			<!-- <view class="flxedBoxTwo">
+				<view class="m-top30" v-if="true"><ChooseLits :list="list" :arr="arr" @chooseLike="chooseLike"></ChooseLits></view>
+			</view> -->
+			<!-- 列表分 -->
+			<view class="storeList" style="padding-top: 100upx;">
+				<!-- 商铺配图 -->
+				<view class="swiperBox" :style="{width: listimgstyle.width - 30 + 'px',height: listimgstyle.height - 30 + 'px'}" v-if="swiperList.length !== 0">
+					<swiper class="swiper" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="interval" :duration="duration">
+						<swiper-item v-for="(item, index) in swiperList" :key="index" style="border-radius: 15upx;">
+							<image :src="item.thumb" style="width: 100%; height: 100%;"></image>
+						</swiper-item>
+					</swiper>
+				</view>
+				<filtertab :requestType="'5'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid"
+				 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+				<view  v-if="strodatas.community">
+					<view class="diyPages-community dis-flex flex-x-between flex-y-center" style="margin-bottom: 4upx;background-color: #FFFFFF;margin-top: 20upx;border-radius: 10upx;">
+						<view class="community-user dis-flex flex-y-center flex-box ">
+							<image :src="strodatas.community.communimg" class="community-user-img" style="width: 80upx;height: 80upx;"></image>
+							<view class="community-user-info flex-box">
+								<view class="community-user-name col-0 f-28">{{ strodatas.community.commundesc }}</view>
+								<view class="community-user-des f-24 col-9 onelist-hidden">{{ strodatas.community.communname }}</view>
+							</view>
+						</view>
+						<view class="community-btn">
+							<button class="community-add f-24" style="color: #FFFFFF;background-color: #28BC17;" @click="showCommunity = true" >添加社群</button>
+						</view>
+					</view>
+					<!-- 社群弹窗 -->
+					<popup-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+						<view class="community-detail b-f t-c">
+							<view class="community-header f-w f-36 p-r col-f">
+								<text class="community-header-text p-r">{{ strodatas.community.communname }}</text>
+							</view>
+							<!-- #ifdef H5 -->
+							<view class="community-body">
+								<image :src="strodatas.community.communqrcode" class="community-qrcodeimg"></image>
+								<view class="community-toreply f-26 col-3">长按识别二维码</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view class="community-body f-26 col-3">
+								有任何疑问，点击“
+								<text class="col-m">去回复</text>
+								”发送“
+								<text class="col-m">{{ strodatas.community.systel }}</text>
+								”,即可添加{{ strodatas.community.communname }}
+							</view>
+							<!-- #endif -->
+							<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!strodatas.community.systel">
+								<view class="community-number dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon" style="width: 80upx;height: 80upx;"></image>
+									<view class="f-24 col-3">{{ strodatas.community.systel }}</view>
+								</view>
+								<view class="community-bdial f-24" @click="callPhone(strodatas.community.systel)">拨号</view>
+							</view>
+							<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType === '3'">去回复</button>
+						</view>
+					</popup-view>
+				</view>
+				<view class="dining dis-flex" v-for="(item, index) in diningList" :key="index" @click="selectDining(item)">
+					<view style="flex: 3;position: relative;">
+						<view class="dis-il-block t-c f-30" v-if="item.is_business == 0" style="position: absolute;bottom: 10upx;left: 0;width: 170upx;color: #FFFFFF;z-index: 99;background-color: rgba(0,0,0,0.4);">
+							休息中
+						</view>
+						<image :src="item.logo" mode="aspectFill" style="width: 170upx; height: 170upx;border-radius: 15upx;"></image></view>
+					<view style="flex: 7;padding-left: 20upx;">
+						<view class="diningName f-30">{{ item.storename }}</view>
+						<view class="dis-flex">
+							<view  style="flex: 8;">
+								<tui-rate :current="item.score" :disabled="true" :score="1" active="#F5D145"></tui-rate>
+								<view class="f-24 dis-il-block" style="color: #999999;height: 46upx;line-height: 44upx;">{{ item.score }}分</view>
+							</view>
+							<view class="f-24" style="flex: 2;text-align: right;color: #999999;height: 46upx;line-height: 46upx;">{{ item.distance }}</view>
+						</view>
+						<view style="padding-bottom: 10upx;">
+							<text class="f-24" style="padding-right: 10upx;color: #999999;" v-if="item.deliverymoney !== '0.00'">配送费</text>
+							<text class="f-24" v-if="item.deliverymoney !== '0.00'">¥{{ item.deliverymoney }}</text>
+							<text class="f-24" style="padding:0 10upx 0 20upx;color: #999999;" v-if="item.deliverymoney !== '0.00'">已售</text>
+							<text class="f-24" style="padding:0 10upx 0 0upx;color: #999999;" v-else>已售</text>
+							<text class="f-24">{{ item.salenum }}</text>
+						</view>
+						<view class="f-24" style="color: #999999;padding-bottom: 10upx;">
+							<!-- <view  style="padding: 5upx 10upx;">
+							{{tagItem}}
+						</view> -->
+							<text>{{ item.catename }}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<TabBars :tabBarAct="0" :pageType="''" />
+			<shopPing :shopNum="shopNum" ref="shopPing"></shopPing>
+			<far-bottom></far-bottom>
+			<!-- 下拉刷新 -->
+			<load-more :isMore="isMore"></load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import tuiRate from '@/components/template/rate.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import shopPing from '@/pages/subPages2/tamplate/shopPing.vue';
+import shopEnter from '@/components/page/pageComponents/shopEnter.vue';
+import PopupView from '@/components/template/PopManager.vue';
+import filtertab from '@/components/template/filtertab.vue';
+import TabBars from '@/components/template/tabBar';
+export default {
+	components: {
+		tuiRate,
+		Loadlogo,
+		loadMore,
+		shopPing,
+		shopEnter,
+		PopupView,
+		filtertab,
+		TabBars
+	},
+	onLoad() {
+		this.HomeType = true;
+		this.clienType = App.getClientType();
+		this.lnglat = uni.getStorageSync('agencyData');
+		this.listimgstyle = uni.getStorageSync('listimgstyle');
+		this.getCommercialTenantList();
+	},
+	onShow() {
+		this.pages = 1;
+		this.getCommercialTenantList();
+	},
+	data() {
+		return {
+			loadlogo: false,
+			isMore: true,
+			HomeType: false,
+			showCommunity: false,
+			//餐厅商铺列表
+			diningList: [],
+			// 轮播图
+			swiperList: [],
+			duration: 500, //滑动时间
+			interval: 2000, //间隔时间
+			list: ['商家类别', '全城', '全部筛选'], //筛选条件
+			//筛选详细条件
+			arr: [
+				[],
+				[],
+				[]
+			],
+			i2: [0, 0, 0], //筛选栏索引
+			inputValue: '',
+			strodatas: null,
+			pages: 1,
+			pullUpOn: true,
+			count: 0,
+			shopNum: 0,
+			lnglat:{},
+			clienType:'',
+			cate_one:'',
+			cate_two:'',
+			two_id:'',
+			title:'',
+			orderid:'',
+			onecate_one:'',
+			twocate_two:'',
+			region_id:'',
+			listimgstyle:{}
+		};
+	},
+	computed:{
+		curLoction(){
+			return uni.getStorageSync('curLoction')
+		}
+	},
+	methods: {
+		goindex(){
+			App.navigationTo({
+				url: "pages/mainPages/index/index"
+			})
+		},
+		// handleLaunchFn(e){
+		// 				console.log('跳小程序吗还是不呢')
+		// 			},
+		// handleErrorFn(e){
+		// 				console.log('跳小程序吗')
+		// 			},
+		// getInfoList(){
+			
+		// },
+		selectOrders(data) {
+			console.log('1分类');
+			let _this = this;
+			console.info('selectOrders', data)
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.orderid = data.val;
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		},
+		selectClassTwoid(data) {
+			console.log('2分类');
+			let _this = this;
+			console.info('selectClassTwoid', data)
+			_this.two_id = data.cate_two;
+			_this.cate_two = '';
+			_this.title = '';
+			_this.pages = 1;
+			_this.cate_two = data.cate_two;
+			// _this.getInfoList();
+			_this.getCommercialTenantList();
+		
+		},
+		selectClassid(data) {
+			console.log('3分类');
+			let _this = this;
+			console.info('selectClassid', data)
+			_this.id = data.cate_one;
+			_this.cate_one = '';
+			_this.cate_two = '';
+			_this.title = '';
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.cate_one = data.cate_one;
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		
+		},
+		selectAreaid(data) {
+			console.log('4分类');
+			let _this = this;
+			console.info('selectAreaid', data)
+			// _this.region_id = data.id;
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.cate_one = '';
+			_this.cate_two = '';
+			_this.region_id = data.id;
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		},
+		callPhone(phone) {
+			uni.makePhoneCall({
+				phoneNumber: phone
+			});
+		},
+		communityShow() {
+			this.showCommunity = !this.showCommunity;
+		},
+		search() {
+			this.getCommercialTenantList(this.inputValue);
+		},
+		// 获取初始化数据
+		getCommercialTenantLists(name) {
+			let data={
+				name:this.inputValue || '',
+				page:this.pages,
+				lng:this.curLoction.longitude,
+				lat:this.curLoction.latitude
+			};
+			App._post_form(
+				`&p=citydelivery&do=storeList`,
+				data,
+				res => {
+					this.swiperList = res.data.advs;
+					this.strodatas = res.data;
+					this.loadlogo = true;
+					this.count = res.data.total;
+					this.shopNum = Number(res.data.cartnum);
+					console.log(this.$refs.shopPing);
+				},
+				false,
+				() => {}
+			);
+		},
+		// 获取初始化数据
+		getCommercialTenantList(name) {
+			let data={
+				name:this.inputValue || '',
+				page:this.pages,
+				lng:this.curLoction.longitude || '',
+				lat:this.curLoction.latitude || '',
+				is_init:(this.pages == 1)?1:0,
+				order:this.orderid || '',
+				cate_one:this.cate_one || '',
+				cate_two:this.cate_two || '',
+				region_id:this.region_id || ''
+			};
+			App._post_form(
+				`&p=citydelivery&do=storeList`,
+				data,
+				res => {
+					this.setData({
+						diningList: res.data.list
+					});
+					this.swiperList = res.data.advs;
+					this.strodatas = res.data;
+					this.loadlogo = true;
+					this.count = res.data.total;
+					this.shopNum = Number(res.data.cartnum);
+					console.log(this.$refs.shopPing);
+				},
+				false,
+				() => {}
+			);
+		},
+		chooseLike(i1) {
+			if (this.i2[i1[0]] != i1[1]) {
+				this.i2[i1[0]] = i1[1];
+			}
+		},
+		// 点击商铺
+		selectDining(item) {
+			App.navigationTo({
+				url: 'pages/subPages2/businessCenter/foodList/foodList?id=' + item.id + '&storeid=' + item.storeid
+			});
+		}
+	},
+	//页面相关事件处理函数--监听用户下拉动作
+	onPullDownRefresh: function() {
+		//延时为了看效果
+		// setTimeout(() => {
+		// this.houseDataList = this.newHouseDataList;
+		// this.pageIndex = 1;
+		// this.pullUpOn = true;
+		// this.loadding = false;
+
+		// this.uni.toast("刷新成功");
+		this.pages = 1;
+		let data={
+			name: '',
+			page:1,
+			lng:this.curLoction.longitude || '',
+			lat:this.curLoction.latitude || '',
+			is_init:(this.pages == 1)?1:0,
+			order:'',
+			cate_one:'',
+			cate_two:'',
+			region_id:''
+		};
+		App._post_form(
+			`&p=citydelivery&do=storeList`,
+			data,
+			res => {
+				this.setData({
+					diningList: res.data.list
+				});
+				this.swiperList = res.data.advs;
+				this.strodatas = res.data;
+				this.count = res.data.total;
+				uni.stopPullDownRefresh();
+				uni.showToast({
+					icon: 'none',
+					title: '刷新成功'
+				});
+			},
+			false,
+			() => {}
+		);
+		// }, 200);
+	},
+
+	// 页面上拉触底事件的处理函数
+	onReachBottom: function() {
+		this.isMore = false;
+		if (this.pages == this.count) {
+			this.isMore = true;
+		} else {
+			this.pages++;
+			let data={
+				name:this.inputValue || '',
+				page:this.pages,
+				lng:this.curLoction.longitude || '',
+				lat:this.curLoction.latitude || '',
+				is_init:(this.pages == 1)?1:0,
+				order:this.orderid || '',
+				cate_one:this.cate_one || '',
+				cate_two:this.cate_two || '',
+				region_id:this.region_id || ''
+			};
+			App._post_form(
+				`&p=citydelivery&do=storeList`,
+				data,
+				res => {
+					this.diningList = this.diningList.concat(res.data.list);
+					this.isMore = true;
+				},
+				false,
+				() => {}
+			);
+		}
+	}
+};
+</script>
+
+<style>
+@import '../../../common/css/diyPages.css';
+@import '../../../common/css/old_diyPages';
+@import '../../../pages/subPages/goods/index.css';
+page {
+	background-color: #f7f7f7;
+}
+</style>
+<style lang="scss" scoped>
+	.bankindex{
+		// position: absolute;
+		// left: 3%;
+		// top: 3%;
+		// background-color: rgba(254, 213, 95,1);
+		box-shadow: 0 5px 15px rgba(255,255,255,0.5);
+		padding: 10upx 20upx;
+		color: #333333;
+		font-size: 24upx;
+		line-height: 54upx;
+		// border-radius: 60upx;
+	}
+.dining {
+	padding: 10upx;
+	background-color: #ffffff;
+	margin: 20upx 0;
+	border-radius: 10upx;
+}
+.uni-input{
+	font-size: 30upx;
+	background-color: #FFFFFF;
+	text-align: center;
+	 /deep/.uni-input-placeholder{
+		top: 4upx!important;
+	}
+}
+.diningName {
+	width: 400upx;
+	overflow: hidden; /*超出部分隐藏*/
+	white-space: nowrap; /*不换行*/
+	text-overflow: ellipsis; /*超出部分文字以...显示*/
+	font-weight: 600;
+}
+.fixedBox {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 92%;
+	padding: 10upx 30upx;
+	z-index: 9999;
+	background-color: #f6f6f6;
+}
+.flxedBoxTwo {
+	position: fixed;
+	width: 100%;
+	top: 10%;
+	z-index: 9999;
+	left: 0;
+	background-color: #ffffff;
+}
+.search {
+	background-color: #ffffff;
+	color: #333333;
+	border-radius: 60upx;
+	width: 65%;
+	position: relative;
+	padding: 15upx 0upx 13upx 100upx;
+}
+.searchIcon {
+	position: absolute;
+	left: 5%;
+	line-height: 50upx;
+}
+.uni-input {
+	width: 80%;
+	color: #000000;
+	background-color: #ffffff;
+	display: inline-block;
+}
+.businessCenter {
+	background-color: #f6f6f6;
+}
+.storeList {
+	padding: 200upx 30upx 30upx;
+}
+.swiper {
+	height: 100%;
+	width: 100%;
+}
+.swiperBox {
+	// margin-top: 50upx;
+}
+.searchs {
+	height: 100%;
+	width: 150upx;
+	background-color: #ff4444;
+	color: #ffffff;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 99;
+	border-radius: 0 10upx 10upx 0;
+	line-height: 80upx;
+}
+</style>
diff --git a/pages/subPages2/businessCenter/foodIntroduced/foodIntroduced.vue b/pages/subPages2/businessCenter/foodIntroduced/foodIntroduced.vue
new file mode 100644
index 0000000..1f42b36
--- /dev/null
+++ b/pages/subPages2/businessCenter/foodIntroduced/foodIntroduced.vue
@@ -0,0 +1,602 @@
+<template>
+	<view class="foodIntroduced">
+		<loadlogo v-if="!loadlogo" />
+		
+		<view >
+			<far-bottom></far-bottom>
+		<view class="foodImg" :style="{width: width + 'px',height: height + 'px'}">
+			<view  style="position: absolute;left: 30upx;top: 30upx;z-index: 999;color: #FFFFFF;">
+				<view class="bankindex" @click="goindex">
+					<text class="iconfont icon-pullleft" style="font-size: 28upx;padding-right: 10upx;"></text>返回
+				</view>
+			</view>
+			<swiper class="swiper"  :indicator-dots="true" :autoplay="true" :style="{width: width + 'px',height: height + 'px'}" :interval="interval" :duration="duration">
+				<swiper-item v-for="(item, index) in storeFoodList.thumbs" :key="index" >
+					<image :src="item" mode="aspectFill" :style="{width: width + 'px',height: height + 'px'}"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="foodName b-f" style="padding: 30upx;">
+			<view class="nameText" style="padding-bottom: 20upx;width: 90vw;">{{ storeFoodList.goodsname }}</view>
+			<view class="dis-flex">
+				<view style="flex: 3;">
+					<view  style="padding-bottom: 20upx;">
+						<text class="f-20 c-ff4444">¥</text>
+						<text class="f-36 c-ff4444 f-w">{{ storeFoodList.price }}</text>
+						<text class="f-22" style="text-decoration: line-through;color: #999999;padding-left: 10upx;text-decoration:line-through;" v-if="Number(storeFoodList.oldprice) > 0" >¥{{ storeFoodList.oldprice }}</text>
+					</view>
+					<view class="f-22" style="color: #999999;">
+						<text>已售{{storeFoodList.salenum}}</text>
+						<text style="padding-left: 30upx;" v-if="storeFoodList.deliveryprice != '0.00'">{{storeFoodList.bzftext}}:</text>
+						<text style="padding-left: 10upx;" v-if="storeFoodList.deliveryprice != '0.00'">¥{{storeFoodList.deliveryprice}}</text>
+					</view>
+				</view>
+				<view style="flex: 1;">
+					<view
+						v-if="storeFoodList.specarray.length > 0 && storeFoodList.saleoverflag !== 1"
+						style="padding: 10upx 20upx;border-radius: 10upx;background-color: #FF4444;color: #FFFFFF;font-size: 24upx;text-align: center;"
+						@click.stop="popupOpen"
+					>
+						选规格
+					</view>
+					<view
+						v-else-if="storeFoodList.specarray.length == 0 && storeFoodList.num == 0 && storeFoodList.saleoverflag !== 1" 
+						style="padding: 10upx 20upx;border-radius: 10upx;background-color: #FF4444;color: #FFFFFF;font-size: 24upx;text-align: center;"
+						@click="addShop">
+						加入购物车
+					</view>
+					<view
+						v-else-if="storeFoodList.saleoverflag == 1"
+						style="padding: 10upx 20upx;border-radius: 10upx;background-color: #999999;color: #FFFFFF;font-size: 24upx;text-align: center;"
+						@click.stop="sellout"
+					>
+						已售罄
+					</view>
+					<view  style="flex: 3;padding-top: 30upx;height: 100%;" v-else>
+						<jumpBall ref="jumpBall" @msg="jbMsg" />
+						
+						<tui-numberbox  :value="numbers" id="goshop" @change="change($event,'goshop')" :width="60" :min="0" style="float: right;"></tui-numberbox>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<!-- 商品详情模块 -->
+		<view class="commodityDetails b-f" v-if="storeFoodList.detail">
+			<view class="f-w" style="padding-bottom: 30upx;">商品详情</view>
+			<view  v-if="storeFoodList.detail" style="position: relative;">
+				<!-- <u-parse :content="storeFoodList.detail" /> -->
+				<jyf-parser :html="storeFoodList.detail"></jyf-parser>
+				<view style="color: #999999;position: absolute;right: 0%;bottom: 30%;" class="f-22" @click="lookAll" v-if="false">
+					查看全部
+					<text :class="lookAllShow ? 'iconfont icon-fold' : 'iconfont icon-unfold'" style="font-size: 20upx;"></text>
+				</view>
+			</view>
+		</view>
+		<!-- 评论模块 -->
+		<view ><foodComment :storeFoodList="storeFoodList"></foodComment></view>
+		<!-- 飞行的购物车 -->
+		<shoppingFixation :sid="sid" @onShows="onShowis" :is_business="storeFoodList.is_business" :num="num"></shoppingFixation>
+		<!-- 选规格的弹出层 -->
+		<popup-view :show="showBuyMenu" type="center" @clickmask="onToggleTrade">
+			<view style="background-color: #FFFFFF;border-radius: 15upx;">
+				<view class="footName f-28" style="padding: 20upx 20upx 0;">{{ storeFoodList.goodsname }}</view>
+				<view class="p-top-40 f-24" style="color: #999999;padding: 40upx 20upx 0upx;">规格</view>
+				<view class="dis-flex" style="padding: 0 20upx 30upx;flex-wrap: wrap;">
+					<view
+						:class="item.checked ? 'checked' : 'noChecked'"
+						style="flex: 0.01;padding: 10upx 30upx;margin: 20upx 10upx 20upx 0;text-align: center;width: 100upx;min-width: 100upx;"
+						v-for="(item, index) in storeFoodList.specarray"
+						:key="index"
+						@click="checkedLabel(item)"
+					>
+						{{ item.name }}
+					</view>
+				</view>
+				<view  style="background-color: #F8F8F8;padding: 10upx 20upx;">
+					<text class="f-26" style="color: #999999;">已选规格:</text>
+					<text class="f-26">({{ numberPeople.name }})</text>
+				</view>
+				<view class="dis-flex" style="padding: 0 20upx;">
+					<view  style="flex: 7;padding: 30upx 0;">
+						<text class="f-30 f-w" style="color: #FF4444;">¥{{ numberPeople.price }}</text>
+						<text class="f-24" style="text-decoration: line-through;color: #999999;padding-left: 10upx;text-decoration:line-through;">¥{{ numberPeople.oldprice }}</text>
+					</view>
+					<view  style="flex: 3;padding-top: 30upx;">
+						<button type="warn" size="mini" style="font-size: 20upx;" @click="addShoping" v-if="numberPeople.cartNum == 0">加入购物车</button>
+						<tui-numberbox :value="numberPeople.cartNum"  @change="changes" :width="60" :min="0"  v-if="numberPeople.cartNum > 0"></tui-numberbox>
+						</view>
+				</view>
+			</view>
+		</popup-view>
+		<!-- 购物车弹窗 -->
+		<popup-view :show="show" type="bottom" @clickmask="onShows" :bottom="'7%'" style="margin-bottom: 100upx;">
+			<view  style="width: 93vw;border-radius: 15upx 15upx 0 0;background-color: #f7f7f7;padding: 30upx;height: 50vh;overflow: auto;" v-if="shopingList">
+				<view class="dis-flex f-24" style="padding: 0 30upx 30upx;">
+					<view class="flex-box ">
+						已选商品
+					</view>
+					<view class="dis-il-block" v-if="shopingList.cartinfo.deliveryprice>0" style="padding-left: 30upx;">
+						包装费:<text class="c-ff4444" style="padding-left: 10upx;">¥{{shopingList.cartinfo.deliveryprice}}</text>
+					</view>
+					<view class="flex-box t-r" @click="empty">
+						<text class="iconfont icon-delete" style="font-size: 24upx;"></text>
+						<text>清空</text>
+					</view>
+				</view>
+				<view class="b-f" style="padding: 30upx;" v-for="(item,index) in shopingList.cartinfo.goodslist" :key="index" v-if="shopingList.cartinfo.goodslist[index].num > 0">
+					<view class="dis-flex" style="justify-content: space-between;">
+						<view class="name dis-il-block f-28 f-w" style="flex: 0.35;line-height: 40upx;">
+							{{item.name}}
+						</view>
+						<view class="dis-flex" style="flex: 0.8;">
+							<view class="flex-box f-20 t-r" style="padding-right: 20upx;color: #999999;line-height: 40upx;text-decoration:line-through;">
+								¥{{item.oldprice}}
+							</view>
+							<view class="flex-box f-32 f-w" style="padding-right: 20upx;color: #FF4444;line-height: 40upx;">
+								¥{{item.price}}
+							</view>
+							<view class="flex-box" style="">
+								<tui-numberbox
+									style="float: right;"
+									:value="shopingList.cartinfo.goodslist[index].num"
+									@change="changeis($event,item)"
+									:width="60"
+									:min="0"
+								></tui-numberbox>
+							</view>
+						</view>
+					</view>
+					<view class="f-20" style="color: #999999;">
+						<text>{{item.specname}}</text>
+					</view>
+				</view>
+				<!-- <view class="dis-flex b-f" style="padding: 30upx;margin-top: 20upx;" v-if="shopingList.cartinfo.goodslist.length > 0">
+					<view class="f-32 f-w" style="flex: 0.65;">
+						包装费
+					</view>
+					<view style="flex: 0.55;color: #FF4444;" class="f-32 f-w">
+						¥{{shopingList.cartinfo.deliveryprice}}.00
+					</view>
+				</view> -->
+			</view>
+			<view style="width: 93vw;border-radius: 15upx 15upx 0 0;background-color: #f7f7f7;padding: 30upx;text-align: center;" v-if="!shopingList">
+				购物车空空如也~
+			</view>
+		</popup-view>
+		<!-- 购物车 -->
+		<view class="foot"><view class="cart"></view></view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import PopupView from '@/components/template/PopManager.vue';
+import foodComment from '@/pages/subPages2/tamplate/foodComment.vue';
+import shoppingFixation from '@/pages/subPages2/tamplate/shoppingFixation.vue';
+import tuiNumberbox from '@/components/template/numberbox.vue';
+import jumpBall from '@/components/hx-jump-ball/hx-jump-ball.vue';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue'
+export default {
+	components: {
+		PopupView,
+		foodComment,
+		shoppingFixation,
+		tuiNumberbox,
+		jumpBall,
+		Loadlogo
+	},
+	data() {
+		return {
+			loadlogo: false,
+			duration: 500, //滑动时间
+			interval: 2000, //间隔时间
+			storeData: {},
+			showBuyMenu: false,
+			numberPeople: {
+				numberPeople: 1,
+				originalPrice: '20.00',
+				currentPrice: '10.00',
+				checked: true
+			},
+			storeFoodList: {
+				thumbs:[],
+				specarray:[],
+				detail:'',
+				num:1
+			},
+			lookAllShow: true,
+			introduce: [
+				{
+					key: '套餐内容:',
+					val: '5个素菜+6个荤菜+1份珍珠米饭'
+				},
+				{
+					key: '掌柜描述',
+					val: '5个素菜+6个荤菜+1份珍珠米饭+好多能吃的+小吃+卤蛋+老干妈+肥肉刺身+凉拌生肥肉'
+				},
+				{
+					key: '主料',
+					val: '火腿肠+午餐肉+亲嘴肠'
+				},
+				{
+					key: '荤素',
+					val: '肃魂'
+				},
+				{
+					key: '制作方法',
+					val: '水煮'
+				}
+			],
+			num: 0,
+			sid: 0,
+			numbers:0,
+			show:false,
+			shopingList:null,
+			element: [],
+			width:'100%',
+			height:'45vh'
+		};
+	},
+	onLoad(options) {
+		let _this = this;
+		_this.storeData.id = options.id;
+		this.sid = options.id;
+		this.width = uni.getStorageSync('imgstyle').width
+		this.height = uni.getStorageSync('imgstyle').height
+		// debugger
+		uni.$on('onShows',function(data){
+			this.onShowss();
+		})
+		// this.numberPeople = this.storeData.specifications[0];
+	},
+	onShow() {
+		this.getCommodity();
+	},
+	methods: {
+		goindex(){
+			let pages = getCurrentPages();
+			console.log(pages);
+			if(pages.length == 1){
+				App.navigationTo({
+					url: 'pages/subPages2/businessCenter/foodList/foodList?id=' + this.sid + '&storeid=' + this.sid
+				});
+			}else{
+				uni.navigateBack({
+					delta:1
+				})
+			}
+			// App.navigationTo({
+			// 	url: "pages/mainPages/index/index"
+			// })
+		},
+		jbMsg(){
+		},
+		changeis(e,item){
+			let _this = this;
+			this.shopingList.cartinfo.goodslist.map((items,indexs)=>{
+				if(items.id == item.id){
+					App._post_form(`&p=citydelivery&do=addShopCart&goodid=${item.goodid}&specid=${item.specid}&addtype=${(e.type == "plus")?1:0}`, {}, res => {
+						if(res.errno !== 0){
+							return
+						}
+						items.num = e.value;
+						let storePrice = res.data;
+						storePrice.changenum = e.value;
+						storePrice.changemoney = storePrice.changemoney * e.value;
+						storePrice.id = item.id;
+						if(item.num == 0){
+							_this.shopingList.cartinfo.goodslist.splice(indexs,1);
+							if(_this.shopingList.cartinfo.goodslist.length == 0){
+								_this.show = !_this.show;
+								this.getCommodity();
+							}
+						}
+						// this.$emit('getshopPrice',storePrice);
+						// this.$store.commit('STOREPRICES',storePrice);
+						this.num++;
+						
+					}, false, () => {
+						// _this.loadlogo = true
+					})
+				}
+			})
+		},
+		// 获取数据并显示
+		onShowis(data){
+				this.show = !this.show;
+				this.shopingList = data;
+		},
+		withdraw(){
+			App._post_form(
+				`&p=citydelivery&do=deteShopCart&sid=${this.sid}`,
+				{},
+				res => {
+					if(res.errno == 0){
+						uni.showToast({
+						    title: '移除成功',
+						    duration: 2000
+						});
+						this.num++;
+						this.shopingList = null;
+						this.show = false;
+						this.getCommodity();
+		
+					}
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				})
+				
+		},
+		// 清空购物车
+		empty(){
+			App.showError(
+				`确定移除该商店及所属商品？`, (data) => {
+					if (data.confirm) {
+						!!data && this.withdraw()
+					}
+				}, true)
+		},
+		// 纯控制显示隐藏
+		onShows(){
+			this.show = !this.show;
+		},
+		// 弹出框监听
+		changes(e){
+			App._post_form(`&p=citydelivery&do=addShopCart&goodid=${this.storeData.id}&specid=${this.numberPeople.id}&addtype=${(e.type == 'plus')?1:0}`, {}, res => {
+				if(res.errno !== 0){
+					return
+				}
+				let storePrice = res.data;
+				this.num++
+				storePrice.changenum = this.num;
+				storePrice.changemoney = storePrice.changemoney * this.num;
+				storePrice.id = this.storeData.id;
+				this.numberPeople.cartNum = e.value;
+				// this.$emit('getshopPrice',storePrice);
+				// this.$store.commit('STOREPRICES',storePrice);
+				uni.$emit('STOREPRICES',storePrice);
+			}, false, () => {
+				// _this.loadlogo = true
+			})
+		},
+		// 监听加减
+		change: function(e,classis) {
+			let _this = this;
+			let views; //点击的坐标
+			let viewss; //购物车坐标
+			App._post_form(`&p=citydelivery&do=addShopCart&goodid=${this.storeData.id}&specid=${0}&addtype=${(e.type == 'plus')?1:0}`, {}, res => {
+				if(res.errno !== 0){
+					return
+				}
+				this.numbers = e.value;
+				let storePrice = res.data;
+				this.num++
+				storePrice.changenum = this.num;
+				storePrice.changemoney = storePrice.changemoney * this.num;
+				storePrice.id = this.storeData.id;
+				setTimeout(() => {
+					let view = uni
+						.createSelectorQuery()
+						.in(_this)
+						.select('#' + classis);
+					view.fields(
+						{
+							size: true,
+							rect: true,
+							scrollOffset: true
+						},
+						data => {
+							_this.element.push(data);
+							views = data;
+							// item.top = h;
+							// h += data.height;
+							// item.bottom = h;
+							let viewis = uni
+								.createSelectorQuery()
+								.in(_this)
+								.select('.cart');
+							viewis
+								.fields(
+									{
+										size: true,
+										rect: true,
+										scrollOffset: true
+									},
+									datas => {
+										_this.element.push(datas);
+										viewss = datas;
+										// item.top = h;
+										// h += data.height;
+										// item.bottom = h;
+										if (e.type == 'plus') {
+											// _this.setData({
+											// 	nums:this.nums+1
+											_this.$refs.jumpBall.$emit('childMethod', _this.element);
+										}
+									}
+								)
+								.exec();
+						}
+					).exec();
+				}, 100);
+				// this.$emit('getshopPrice',storePrice);
+				// this.$store.commit('STOREPRICES',storePrice);
+				uni.$emit('STOREPRICES',storePrice);
+				this.getCommodity();
+			}, false, () => {
+				// _this.loadlogo = true
+			})
+		},
+		// 直接加购物车
+		addShop() {
+			App._post_form(
+				`&p=citydelivery&do=addShopCart&goodid=${this.storeData.id}&specid=${0}&addtype=${1}`,
+				{},
+				res => {
+					if(res.errno !== 0){
+						return
+					}
+					let storePrice = res.data;
+					this.num++;
+					storePrice.changenum = this.num;
+					storePrice.changemoney = storePrice.changemoney * this.num;
+					storePrice.id = this.storeData.id;
+					// this.$emit('getshopPrice',storePrice);
+					// this.$store.commit('STOREPRICES',storePrice);
+					this.getCommodity();
+					uni.$emit('STOREPRICES', storePrice);
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		// 从弹窗加入购物车
+		addShoping() {
+			App._post_form(
+				`&p=citydelivery&do=addShopCart&goodid=${this.storeData.id}&specid=${this.numberPeople.id}&addtype=${1}`,
+				{},
+				res => {
+					if(res.errno !== 0){
+						return
+					}
+					let storePrice = res.data;
+					this.num++;
+					storePrice.changenum = this.num;
+					storePrice.changemoney = storePrice.changemoney * this.num;
+					storePrice.id = this.storeData.id;
+					this.numberPeople.cartNum = 1;
+					// this.$emit('getshopPrice',storePrice);
+					// this.$store.commit('STOREPRICES',storePrice);
+					uni.$emit('STOREPRICES', storePrice);
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		// 详情查看全部
+		lookAll() {
+			this.lookAllShow = !this.lookAllShow;
+		},
+		// 初始化商品详情
+		getCommodity() {
+			App._post_form(
+				`&p=citydelivery&do=goodsDetail&id=${this.storeData.id}`,
+				{},
+				res => {
+					this.loadlogo = true
+					this.setData({
+						storeFoodList: res.data
+					});
+					this.$set(this.storeFoodList,'detail',res.data.detail);
+					this.numbers = Number(res.data.num);
+					this.sid = res.data.sid;
+					if (this.storeFoodList.specarray.length > 0) {
+						this.numberPeople = this.storeFoodList.specarray[0];
+						this.numberPeople.checked = true;
+					}
+				},
+				false,
+				() => {
+					
+				}
+			);
+		},
+		popupOpen() {
+			this.showBuyMenu = true;
+		},
+		sellout(){
+			
+		},
+		// 规格弹窗开关
+		onToggleTrade() {
+			//关闭后重置规格数据
+			this.showBuyMenu = !this.showBuyMenu;
+		},
+		// 选中某规格
+		checkedLabel(item) {
+			this.numberPeople = item;
+			this.storeFoodList.specarray.forEach(items => {
+				items.checked = false;
+				if (items.name == item.name) {
+					items.checked = true;
+				}
+			});
+			// this.selectSpecification.map((items,index)=>{
+
+			// })
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.bankindex{
+		position: absolute;
+		left: 3%;
+		top: 3%;
+		background-color: rgba(254, 213, 95,1);
+		box-shadow: 0 5px 15px rgba(255,255,255,0.5);
+		padding: 10upx 20upx;
+		color: #FFFFFF;
+		font-size: 24upx;
+		border-radius: 60upx;
+		width: 12vw;
+	}
+.footName {
+	width: 70vw;
+	overflow: hidden; /*超出部分隐藏*/
+	white-space: nowrap; /*不换行*/
+	text-overflow: ellipsis; /*超出部分文字以...显示*/
+	font-weight: 600;
+}
+.foot {
+	position: fixed;
+	bottom: 60upx;
+	height: 90upx;
+	left: 10upx;
+	width: 100%;
+}
+.foot .cart {
+	width: 180upx;
+	height: 90upx;
+	line-height: 90upx;
+	text-align: center;
+}
+.checked {
+	background-color: #fff5f5;
+	border: 1upx solid #ff4444;
+	border-radius: 10upx;
+	font-size: 24upx;
+	color: #ff4444;
+}
+.noChecked {
+	background-color: #ffffff;
+	border: 1upx solid #999999;
+	border-radius: 10upx;
+	font-size: 24upx;
+}
+.foodImg {
+	height: 45vh;
+}
+.swiper {
+	height: 100%;
+}
+.commodityDetails {
+	padding: 30upx;
+	margin: 20upx 0;
+}
+</style>
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
diff --git a/pages/subPages2/businessCenter/foodList/foodList.vue b/pages/subPages2/businessCenter/foodList/foodList.vue
new file mode 100644
index 0000000..bdd8711
--- /dev/null
+++ b/pages/subPages2/businessCenter/foodList/foodList.vue
@@ -0,0 +1,457 @@
+<template>
+	<view class="foodList">
+		<loadlogo v-if="!loadlogo" />
+		<view  v-if="loadlogo">
+			<far-bottom></far-bottom>
+		<!-- 飞行的头部盒子 -->
+		<view class="flxedBox">
+			<!-- 相对定位父级 -->
+			<view class="relativeBox">
+				<view class="titleImgBox" v-if="storeFoodList.storeinfo.album">
+					<swiper class="swiper" :indicator-dots="true" :autoplay="true" :interval="interval" :duration="duration" :style="{width: (storeFoodList.imgstyle.width * ratio) + 'px',height: (storeFoodList.imgstyle.height * ratio) + 'px'}">
+						<swiper-item v-for="(item, index) in storeFoodList.storeinfo.album" :key="index">
+							<image :src="item" mode="aspectFill" style="width: 100%; height: 100%;"></image>
+						</swiper-item>
+					</swiper>
+					<view class="bankindex" @click="goindex">
+						<text class="iconfont icon-pullleft" style="font-size: 28upx;padding-right: 10upx;"></text>返回
+					</view>
+				</view>
+				<!-- 绝对定位的子级 -->
+				<view class="introduce" :style="{marginTop: !storeFoodList.storeinfo.album?'50rpx':'0rpx'}">
+					<view class="dis-flex" @click="gogoodsins">
+						<view class="storeImgBox" style="flex: 3;position: relative;">
+							<view v-if="storeFoodList.storeinfo.is_business == 0" class="dis-il-block t-c f-30" style="position: relative;bottom: 0;left: 0;width: 170upx;color: #FFFFFF;z-index: 99;background-color: rgba(0,0,0,0.4);">
+								休息中
+							</view>
+							<image :src="storeFoodList.storeinfo.logo" mode="aspectFill" style="width: 170upx; height: 170upx;border-radius: 15upx;"></image>
+						</view>
+						<view  style="flex: 7;">
+							<view class="storeName f-32 f-w">
+								{{storeFoodList.storeinfo.storename}}
+							</view>
+							<view >
+								<tui-rate :current="storeFoodList.storeinfo.score" :disabled="true" :score="1" active="#F5D145"></tui-rate>
+								<view class="f-26 dis-il-block" style="color: #363636;height: 46upx;line-height: 44upx;vertical-align: top;">
+									{{ storeFoodList.storeinfo.score }}分
+								</view>
+							</view>
+							<view class="f-26" style="color: #363636;padding-top: 10upx; ">
+								<text>{{storeFoodList.storeinfo.catename}}</text>
+							</view>
+							<view class="f-26" style="color: #363636;padding-top: 10upx;">
+								<text>{{languageStatus!=1?'营业时间':'영업시간'}}：</text>
+								<text>{{storeFoodList.storeinfo.storehours}}</text>
+							</view>
+						</view>
+					</view>
+					<!-- 标签模块 -->
+					<view class="tagbox" v-if="!!storeFoodList.storeinfo.tag[0]">
+						<view class="label" >
+							<view class="dis-flex tagitembox" >
+								<!-- 标签模块 -->
+								<view class="labelBox" :style="{height:(!labelHeight?'auto':'auto')}" @click="labelClick">
+									<view class="dis-il-block labelItem" v-for="(item,index) in storeFoodList.storeinfo.tag" :key="index">
+										{{item}}
+									</view>
+								</view>
+								<view 
+								:class="!labelHeight? 'iconfont icon-unfold':'iconfont icon-fold'" 
+								style="flex: 1;color: #999999;font-size: 40upx;line-height: 60upx;"
+								@click="labelClick">
+								</view>
+							</view>
+						</view>
+					</view>
+					
+				</view>
+			</view>
+		</view>
+		<!-- 商品列表组件 -->
+		<view :class="flag?'abfoodlist':'Androidfoodlist'">
+			<foodCategory :storeFoodList="storeFoodList" :topshow="topshow" :height="storeFoodList.imgstyle.height * ratio + 'px'" :width="storeFoodList.imgstyle.width * ratio + 'px'"></foodCategory>
+		</view>
+		<!-- 尾部组件，购物车和结算按钮 -->
+		<shoppingFixation :num="num" :sid="sid" :is_business="storeFoodList.storeinfo.is_business" @onShows="onShowis"></shoppingFixation>
+		<!-- 购物车弹窗 -->
+		<popup-view :show="show" type="bottom" @clickmask="onShows" :bottom="'7%'" style="margin-bottom: 100upx;">
+			<view  style="width: 93vw;border-radius: 15upx 15upx 0 0;background-color: #f7f7f7;padding: 30upx;height: 50vh;overflow: auto;" v-if="shopingList">
+				<view class="dis-flex f-24" style="padding: 0 30upx 30upx;">
+					<view class="flex-box ">
+						已选商品
+					</view>
+					<view class="dis-il-block" v-if="shopingList.cartinfo.deliveryprice > 0" style="padding-left: 30upx;">
+						{{languageStatus!=1?'包装费':'포장비용'}}:<text style="padding-left: 10upx;" class="c-ff4444">¥{{shopingList.cartinfo.deliveryprice}}</text>
+					</view>
+					<view class="flex-box t-r" @click="empty">
+						<text class="iconfont icon-delete" style="font-size: 24upx;"></text>
+						<text>清空</text>
+					</view>
+				</view>
+				<view class="b-f" style="padding: 30upx;" v-for="(item,index) in shopingList.cartinfo.goodslist" :key="index" v-if="shopingList.cartinfo.goodslist[index].num > 0">
+					<view class="dis-flex" style="justify-content: space-between;">
+						<view class="name dis-il-block f-28 f-w" style="flex: 0.35;line-height: 40upx;">
+							{{item.name}}
+						</view>
+						<view class="dis-flex" style="flex: 0.8;">
+							<view class="flex-box f-20 t-r" style="padding-right: 20upx;color: #999999;line-height: 40upx;">
+								<!-- ¥{{item.oldprice}} -->
+							</view>
+							<view class="flex-box f-32 f-w" style="padding-right: 20upx;color: #FF4444;line-height: 40upx;">
+								¥{{item.price}}
+							</view>
+							<view class="flex-box" style="">
+								<tui-numberbox
+									style="float: right;"
+									:value="shopingList.cartinfo.goodslist[index].num"
+									@change="change($event,item)"
+									:width="60"
+									:min="0"
+								></tui-numberbox>
+							</view>
+						</view>
+					</view>
+					<view class="f-20" style="color: #999999;">
+						<text>{{item.specname}}</text>
+					</view>
+				</view>
+				<!-- <view class="dis-flex b-f" style="padding: 30upx;margin-top: 20upx;" v-if="shopingList.cartinfo.goodslist.length > 0">
+					<view class="f-32 f-w" style="flex: 0.65;">
+						配送费
+					</view>
+					<view style="flex: 0.55;color: #FF4444;" class="f-32 f-w">
+						¥{{storeFoodList.cartinfo.deliveryprice}}
+					</view>
+				</view> -->
+			</view>
+			<view style="width: 93vw;border-radius: 15upx 15upx 0 0;background-color: #f7f7f7;padding: 30upx;text-align: center;" v-if="!shopingList">
+				购物车空空如也~
+			</view>
+		</popup-view>
+		<!-- 查看tag详情 -->
+		<popup-view :show="labelHeight" :type="'bottom'" @clickmask="labelHeight = false">
+			<view class="b-f" style="width: 92vw;border-radius: 30upx 30upx 0upx 0upx;padding: 30upx 30upx 100upx;">
+				<view class="f-30 f-w">
+					商户标签
+				</view>
+						<view  style="padding: 30upx 0;height: 650upx;overflow: auto;">
+							<view  style="padding-bottom: 20upx;" v-for="(tag,index) in storeFoodList.storeinfo.tagslist" :key="index">
+								<view  style="flex: 0.2;">
+									<view class="t-c f-26 dis-il-block" style="padding: 5upx 20upx;color: #FF4444;border: 1upx solid pink;border-radius: 8upx;">
+										{{tag.title}}
+									</view>
+								</view>
+								<view  style="flex: 0.8;">
+									<view class="t-c f-26 dis-il-block" style="padding: 0upx 0upx;color: #6f6f6f;border: 1upx solid #FFFFFF;line-height: 38upx;height: 38upx;border-radius: 5upx;">
+										{{tag.content}}
+									</view>
+								</view>
+							</view>
+						</view>
+			</view>
+		</popup-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import tuiRate from '@/components/template/rate.vue';
+	import foodCategory from '@/pages/subPages2/tamplate/foodCategory.vue';
+	import shoppingFixation from '@/pages/subPages2/tamplate/shoppingFixation.vue';
+	import PopupView from '@/components/template/PopManager.vue';
+	import tuiNumberbox from '@/components/template/numberbox.vue';
+	export default{
+		components:{
+			tuiRate,
+			foodCategory,
+			shoppingFixation,
+			PopupView,
+			tuiNumberbox,
+			Loadlogo
+		},
+		onLoad(options) {
+			let _this = this;
+			if(uni.getSystemInfoSync().system.indexOf('Android') === -1){
+				_this.flag = true;
+			}else{
+				_this.flag = false;
+			}
+			_this.storeData.id = options.id;
+			_this.storeData.storeid = options.storeid;
+			
+			
+			this.sid = this.storeData.id;
+			uni.$on('onShows',function(data){
+				this.onShowss();
+			})
+		},
+		onShow() {
+			this.getCommodityList();
+			// this.storeFoodList = {};
+			if(this.oneShow){
+				this.oneShow = false;
+				return
+			}
+		
+				this.getlist(false,true);
+				this.topshow = !this.topshow;
+				this.num++;
+			
+			
+			
+		},
+		onHide() {
+			// this.loadlogo = false;
+		},
+		data(){
+			return{
+				oneShow:true,
+				loadlogo: false,
+				duration: 500, //滑动时间
+				interval: 2000, //间隔时间
+				labelHeight:false,
+				ratio:0,
+				storeData:{},
+				storeFoodList:{
+					storeinfo:{
+						tag:[]
+					}
+				},
+				num:0,
+				sid:null,
+				show:false,
+				shopingList:null,//弹出框购物车数据
+				flag:false,
+				topshow:false
+			}
+		},
+		methods:{
+			gogoodsins(){
+				App.navigationTo({
+					url:'pages/mainPages/store/index?sid='+ this.storeData.storeid
+				})
+			},
+			goindex(){
+				let pages = getCurrentPages();
+				console.log(pages);
+				if(pages.length == 1){
+					App.navigationTo({
+						url: "pages/subPages2/businessCenter/businessCenter"
+					})
+				}else{
+					uni.navigateBack({
+						delta:1
+					})
+				}
+				// App.navigationTo({
+				// 	url: "pages/mainPages/index/index"
+				// })
+			},
+			withdraw(){
+				App._post_form(
+					`&p=citydelivery&do=deteShopCart&sid=${this.sid}`,
+					{},
+					res => {
+						if(res.errno == 0){
+							uni.showToast({
+							    title: '移除成功',
+							    duration: 2000
+							});
+							this.num++;
+							this.shopingList = null;
+							this.show = false;
+							this.getlist(true,true);
+
+						}
+					},
+					false,
+					() => {
+						// _this.loadlogo = true
+					})
+					
+			},
+			// 清空购物车
+			empty(){
+				App.showError(
+					`确定移除该商店及所属商品？`, (data) => {
+						if (data.confirm) {
+							!!data && this.withdraw()
+						}
+					}, true)
+			},
+			// 监听购物车弹窗的加减
+			change(e,item){
+				let _this = this;
+				console.log(item)
+				this.shopingList.cartinfo.goodslist.map((items,indexs)=>{
+					if(items.id == item.id){
+						items.num = e.value;
+						App._post_form(`&p=citydelivery&do=addShopCart&goodid=${item.goodid}&specid=${item.specid}&addtype=${(e.type == "plus")?1:0}`, {}, res => {
+							let storePrice = res.data;
+							storePrice.changenum = e.value;
+							storePrice.changemoney = storePrice.changemoney * e.value;
+							storePrice.id = item.id;
+							if(item.num == 0){
+								_this.shopingList.cartinfo.goodslist.splice(indexs,1);
+								if(_this.shopingList.cartinfo.goodslist.length == 0){
+									// _this.show = !_this.show;
+									this.getlist(true,true);
+								}
+							}
+							// this.$emit('getshopPrice',storePrice);
+							// this.$store.commit('STOREPRICES',storePrice);
+							this.num++;
+							
+						}, false, () => {
+							// _this.loadlogo = true
+						})
+					}
+				})
+			},
+			// 纯控制显示隐藏
+			onShows(){
+				this.getlist(true,true);
+			},
+			// 获取数据并显示
+			onShowis(data){
+					
+					console.log(data);
+					this.shopingList = data;
+					this.getlist(true,true);
+			},
+			getCommodityList(flag = false,bor = false){
+				let _this = this;
+				App._post_form(`&p=citydelivery&do=cateList`, {storeid:this.storeData.storeid}, res => {
+					this.setData({
+						storeFoodList: res.data
+					});
+					this.storeFoodList.num = this.num;
+					this.storeFoodList.flag = bor;
+					if(flag) this.show = !this.show;
+					this.getlist();
+					uni.showLoading({
+						title:'加载中'
+					})
+					setTimeout(()=>{
+						uni.getSystemInfo({
+						    success: function (wh) {
+								_this.ratio = wh.windowWidth / _this.storeFoodList.imgstyle.width;
+						    }
+						});
+					})
+				}, false, () => {
+					this.loadlogo = true;
+				})
+			},
+			getlist(flag = false,bor = false){
+				let _this = this;
+				App._post_form(`&p=citydelivery&do=goodsInfo`, {storeid:this.storeData.storeid}, res => {
+					console.log(res);
+					this.storeFoodList.cartinfo.catelist = res.data.catelist;
+					this.storeFoodList.cartinfo.goodslist = res.data.goodslist;
+					_this.$nextTick(() => {
+						uni.hideLoading()
+					});
+					if(flag) this.show = !this.show;
+					// debugger
+				}, false, () => {
+					this.loadlogo = true;
+				})
+			},
+			labelClick(){
+				this.labelHeight = !this.labelHeight;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.titleImgBox /deep/ .uni-swiper-dots-horizontal{
+		bottom: 50upx;
+	}
+	.bankindex{
+		position: absolute;
+		left: 30upx;
+		top: 30upx;
+		background-color: rgba(254, 213, 95,1);
+		box-shadow: 0 5px 15px rgba(255,255,255,0.5);
+		padding: 10upx 20upx;
+		color: #FFFFFF;
+		font-size: 24upx;
+		border-radius: 60upx;
+	}
+	.tagitembox{
+		border-radius: 15upx;
+		background-color: #FFFFFF;
+		z-index: 99;
+		padding: 0 10upx;
+		// transition: box-shadow 0.3s ease-in-out;
+	}
+	.tagitembox:hover {
+	  // box-shadow: 0 5px 15px rgba(0,0,0,0.3);
+	}
+	.tagbox{
+		// position: absolute;
+		// left: 20upx;
+		width: 92%;
+	}
+	.labelBox{
+		flex: 10;
+		overflow: hidden;
+		background-color: #FFFFFF;
+		box-sizing: border-box;
+		// padding: 0 30upx 30upx 30upx;
+		// border: 2upx solid #FF4444;
+		// border-radius: 15upx;
+		// border-top: none;
+		// width: 100vw;
+	}
+	.labelItem{
+		border: 1upx solid #ECECEC;
+		color: #666666;
+		border-radius: 20upx;
+		padding: 5upx 10upx;
+		margin-right: 20upx;
+		font-size: 22upx;
+		margin-bottom: 10upx;
+	}
+	.foodList{
+		width: 100%;
+	}
+	.introduce{
+		width: 92%;
+		position: relative;
+		top: -30upx;
+		background-color: #FFFFFF;
+		border-radius: 40upx 40upx 0 0;
+		padding: 30upx 30upx 0;
+	}
+	.flxedBox{
+		position: relative;
+		width: 100%;
+		z-index: 99;
+		top: 0;
+	}
+	.storeName{
+		width:100%;
+		overflow: hidden; /*超出部分隐藏*/
+		white-space: nowrap; /*不换行*/
+		text-overflow: ellipsis;
+	}
+	.abfoodlist{
+		position: relative;
+		// top: 850upx;
+		width: 100%;
+		height: 75vh;
+		overflow: hidden;
+	}
+	.Androidfoodlist{
+		position: relative;
+		// top: 840upx;
+		width: 100%;
+		height: 80vh;
+		overflow: hidden;
+	}
+</style>
diff --git a/pages/subPages2/businessCenter/foodOrder/foodOrder.vue b/pages/subPages2/businessCenter/foodOrder/foodOrder.vue
new file mode 100644
index 0000000..8913bc7
--- /dev/null
+++ b/pages/subPages2/businessCenter/foodOrder/foodOrder.vue
@@ -0,0 +1,1431 @@
+<template>
+	<view >
+		<loadlogo v-if="loadlogo"></loadlogo>
+		
+		<view >
+			
+		<far-bottom></far-bottom>
+		<view class="header_bg" :style="{'background-image':' url('+imageRoot+'submit_bg.png)'}"></view>
+		<view class="submitOrder p-r">
+		<view class="receivingAdress" v-if="storeData.usestatus == 1">
+			<view class="receivingAdressPackage" @click="goAddress(1)">
+				<!-- 此方法判断是不是个对象 -->
+				<view v-if="Object.prototype.toString.call(storeData.address) === '[object Object]'">
+					<view class="receivingAdressLeft">
+						<view class="receivingAdressTitle">
+							<view v-if="storeData.address.status == 1"><span>默认</span></view>
+							<span>{{ storeData.address.province }} {{ storeData.address.city }} {{ storeData.address.county }}</span>
+						</view>
+						<view class="receivingAdressBody">
+							<span>{{ storeData.address.detailed_address }}</span>
+						</view>
+						<view class="receivingAdressFoot">
+							<span>{{ storeData.address.name }}</span>
+							<span>{{ storeData.address.tel }}</span>
+						</view>
+					</view>
+				</view>
+				<!-- 判断是不是一个数组 -->
+				<view v-if="Array.isArray(storeData.address)">
+					<view class="col-9 f-28">请选择地址</view>
+				</view>
+				<view class="receivingAdressRight iconfont icon-right col-9"></view>
+			</view>
+			<!-- 彩条 -->
+			<view class="receiptDetailsFoot"></view>
+			<!-- 彩条 -->
+			
+		</view>
+		<view class="checkOrderType" v-if="storeData.usestatus == 2">
+						<!-- 切换按钮 -->
+						<view class="checkOrderTypeButton" v-if="(modeNum.use_make == 1 && modeNum.use_own == 1 && modeNum.use_store == 0) || (modeNum.use_make == 1 && modeNum.use_store == 1 && modeNum.use_own == 0) || (modeNum.use_make == 0 && modeNum.use_own == 1 && modeNum.use_store == 1) ">
+							<view :class="[usestatus == 1 ? 'check' : 'nCheck checkOne ncheck1']" @click="clikckusestatus(1)" v-if="modeNum.use_store == 1"><span>{{languageStatus!=1?'商家配送':'상가 배송'}}</span></view>
+							<view :class="[(usestatus == 2 ||usestatus == 1)  ? 'check' : 'nCheck checkOne ncheck1']" @click="clikckusestatus(2)" v-else><span>平台配送</span></view>
+							<view :class="[usestatus == 0 ? 'check check2' : 'nCheck']" @click="clikckusestatus(0)" v-if="modeNum.use_own == 1"><span>{{languageStatus!=1?'到店自取':'방문 수령'}}</span></view>
+							<view :class="[usestatus == 2 ? 'check check2' : 'nCheck']" @click="clikckusestatus(2)" v-else><span>平台配送</span></view>
+							<view :class="[usestatus == 1 ? 'checkPs' : 'Ps']" v-if="modeNum.use_make == 0 && modeNum.use_own == 1 && modeNum.use_store == 1"></view>
+							<view :class="[usestatus == 0 ? 'checkHx' : 'Hx']" v-if="modeNum.use_make == 0 && modeNum.use_own == 1 && modeNum.use_store == 1"></view>
+							<view :class="[usestatus == 2 ? 'checkPs' : 'Ps']" v-if="modeNum.use_make == 1 && modeNum.use_own == 1 && modeNum.use_store == 0"></view>
+							<view :class="[usestatus == 0 ? 'checkHx' : 'Hx']" v-if="modeNum.use_make == 1 && modeNum.use_own == 1 && modeNum.use_store == 0"></view>
+							<view :class="[usestatus == 1 ? 'checkPs' : 'Ps']" v-if="modeNum.use_make == 1 && modeNum.use_own == 0 && modeNum.use_store == 1"></view>
+							<view :class="[usestatus == 2 ? 'checkHx' : 'Hx']" v-if="modeNum.use_make == 1 && modeNum.use_own == 0 && modeNum.use_store == 1"></view>
+							<view></view>
+							<!-- 彩条 -->
+							<view class="receiptDetailsFoot"></view>
+							<!-- 彩条 -->
+						</view>
+						<!-- 切换按钮 -->
+						<view  style="height: 96upx;" v-if="modeNum.use_make == 1 && modeNum.use_own == 1 && modeNum.use_store == 1">
+							<view class="dis-flex">
+								<view  :class="usestatus == 1?'loche':'noloche'" style="border-radius: 15upx 0upx  0upx 15upx;" @click="clikckusestatus(1)"><span>{{languageStatus!=1?'商家配送':'상가 배송'}}</span></view>
+								<view  :class="usestatus == 2?'loche':'noloche'" style="border-radius: 0;" @click="clikckusestatus(2)"><span>平台配送</span></view>
+								<view  :class="usestatus == 0?'loche':'noloche'" style="border-radius: 0upx 15upx  15upx 0upx;" @click="clikckusestatus(0)"><span>{{languageStatus!=1?'到店自取':'방문 수령'}}</span></view>
+							</view>
+							
+							<view></view>
+							<!-- 彩条 -->
+							<!-- <view class="receiptDetailsFoot"></view> -->
+							<!-- 彩条 -->
+						</view>
+						<!-- 收货地址 -->
+						<view class="checkReceivingAdress" v-if="usestatus == 1 || usestatus == 2" :class="{'check-right-radius':usestatus == 1 || usestatus == 2}">
+							<view class="receivingAdressPackage dis-flex flex-y-center flex-x-between" @click="goAddress(1)">
+								<block v-if="Object.prototype.toString.call(storeData.address) === '[object Object]'">
+									<view class="receivingAdressLeft">
+										<view class="receivingAdressTitle">
+											<view v-if="storeData.address.status == 1"><span>默认</span></view>
+											<span>{{ storeData.address.province }} {{ storeData.address.city }} {{ storeData.address.county }}</span>
+										</view>
+										<view class="receivingAdressBody">
+											<span>{{ storeData.address.detailed_address }}</span>
+										</view>
+										<view class="receivingAdressFoot">
+											<span>{{ storeData.address.name }}</span>
+											<span>{{ storeData.address.tel }}</span>
+										</view>
+									</view>
+								</block>
+								<block v-else>
+									<view class="col-9 f-28">请选择地址</view>
+								</block>
+								<view class="receivingAdressRight iconfont icon-right col-9"></view>
+							</view>
+							<!-- 彩条 -->
+							<view class="receiptDetailsFoot"></view>
+							<!-- 彩条 -->
+						</view>
+						<!-- 收货地址 -->
+					
+						<!-- 用户信息 -->
+						<view class="checkUserInfo" v-if="usestatus == 0" :class="{'check-left-radius':usestatus == 0}">
+							<view class="userInfoPackage">
+								<view>
+									<span>姓名</span>
+									<input placeholder="请输入联系人姓名" v-model="storeData.thinfo.thname" />
+								</view>
+								<view>
+									<span>联系电话</span>
+									<input placeholder="请输入联系人电话" type="number" maxlength="11" v-model="storeData.thinfo.thmobile" />
+								</view>
+							</view>
+						</view>
+						<!-- 用户信息 -->
+					</view>
+			<!-- 商品详情 -->
+			<view >
+				<view class="b-f" style="padding: 30upx;margin: 30upx;border-radius: 15upx;" v-for="(item,index) in storeData.list" :key="index">
+					<view  style="padding-bottom: 20upx;">
+						<text class="iconfont icon-shoplight" style="font-size: 24upx;"></text>
+						<text class="f-24" style="padding: 0 10upx;">{{item.storename}}</text>
+						<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+						<view  style="float: right;font-size: 22upx;" v-if="item.distance">
+							{{item.distance}}
+						</view>
+					</view>
+					<view class="dis-flex" style="padding: 20upx 0; border-bottom: 1upx solid #F7F7F7;" v-for="(items,indexs) in item.goodlist" :key="indexs">
+						<view style="flex: 2;text-align: center;">
+							<image style="width: 150upx;height: 150upx; border-radius: 10upx;" :src="items.thumb" mode="aspectFill"></image>
+						</view>
+						<view style="flex: 8;padding-left: 20upx;">
+							<view class="foodName f-30">
+								{{items.name}}
+							</view>
+							<view class="f-24" style="color: #999999; padding: 15upx 0;" v-if="items.specname">
+								规格：{{items.specname}}
+							</view>
+							<view class="f-32 f-w" style="color: #FF4444;">
+								¥{{items.price}}<text style="float: right;color: #999999;font-weight: 500;margin-top: 6upx;" class="f-24">X{{items.num}}</text>
+							</view>
+						</view>
+					</view>
+					<view  style="padding: 10upx 0;">
+						<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="item.redpacklist.list.length > 0">
+							<view style="flex: 0.2;color: #333333;" class="f-24">
+								红包优惠
+							</view>
+							<view style="flex: 0.2;color: #ff4444;" class="f-24 t-r" @click="redPagShows(item.redpackTopMoney,index,item.redpacklist.list)">
+								<view  v-if="item.redPrice">
+									-¥{{item.redPrice}}
+								</view>
+								<view  v-else>
+									可用{{item.redpacklist.list.length}}张<text class="iconfont icon-right" style="font-size: 24upx;"></text>
+								</view>
+								
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0 10upx; justify-content: space-between;" v-if="item.deliverymoney && item.deliverymoney != '0.00'">
+							<view style="flex: 0.2;color: #999999;" class="f-24" >
+								{{languageStatus!=1?'配送费':'배송비용'}}
+							</view> 
+							<view style="flex: 0.2;color: #333333;" class="f-24 t-r f-w">
+								¥{{item.deliverymoney}}
+							</view>
+						</view>
+						<view class="dis-flex" style="padding: 10upx 0 10upx; justify-content: space-between;" v-if="item.packingmoney && item.packingmoney != '0.00'">
+							<view style="flex: 0.2;color: #999999;" class="f-24" >
+								{{languageStatus!=1?item.bzftext:'포장비용'}}
+							</view> 
+							<view style="flex: 0.2;color: #333333;" class="f-24 t-r f-w">
+								¥{{item.packingmoney}}
+							</view>
+						</view>
+						<view class="dis-flex" style="justify-content: space-between;padding-bottom: 10upx;" v-if="item.fulldkmoney && item.fulldkmoney != '0.00'">
+							<view style="flex: 0.2;color: #999999;"class="f-24">
+								满减优惠
+							</view>
+							<view style="flex: 0.2;color: #FF4444;" class="f-24 t-r f-w">
+								-¥{{item.fulldkmoney}}
+							</view>
+						</view>
+						<view class="dis-flex" style="justify-content: space-between;padding-bottom: 10upx;">
+							<view style="flex: 0.2;color: #999999;"class="f-24">
+								{{languageStatus!=1?'小计':'합계'}}
+							</view>
+							<view style="flex: 0.2;color: #333333;" class="f-24 t-r f-w">
+								¥{{item.allmoney}}
+							</view>
+						</view>
+						
+						<view class="dis-flex" style="justify-content: space-between;padding-bottom: 10upx;" v-if="usestatus == 1">
+							<view style="flex: 0.3;color: #999999;"class="f-24">
+								{{languageStatus!=1?'配送范围':'배송범위'}}
+							</view>
+							<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+								{{item.deliverydistance}}KM以内
+							</view>
+						</view>
+						<view class="dis-flex" style="justify-content: space-between;" v-if="(Number(item.lowdeliverymoney) > Number(item.allmoney)) && usestatus !== 0 && usestatus !== 2">
+							<view style="flex: 0.2;color: #999999;"class="f-24">
+								起送金额
+							</view>
+							<view style="flex: 0.2;color: #333333;" class="f-24 t-r f-w">
+								¥{{item.lowdeliverymoney}}
+							</view>
+						</view>
+						<view class="messageSave">
+							<view class="messageSavePackage"><input :placeholder="languageStatus!=1?'请输入留言信息给卖家':'댓글 정보를 입력하여 상가에 보내기'" v-model="item.remark" /></view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 价格及优惠 -->
+			<view class="b-f" style="padding: 30upx;border-radius: 15upx;margin: 30upx;">
+				
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						{{languageStatus!=1?'商品总金额':'상품 총금액'}}
+					</view>
+					<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+						¥{{storeData.statistics.goodallmoney}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.packingmoney !== '0.00'">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						{{languageStatus!=1?'其他费用':'기타비용'}}
+					</view>
+					<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+						￥{{storeData.statistics.packingmoney}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.deliveryprice !== '0.00'">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						{{languageStatus!=1?'运费':'운비'}}
+					</view>
+					<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+						￥{{storeData.statistics.deliveryprice}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.vipdiscount > 0">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						会员优惠
+					</view>
+					<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+						-￥{{storeData.statistics.vipdiscount}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.fulldiscount && storeData.statistics.fulldiscount !== '0.00'">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						满减优惠
+					</view>
+					<view style="flex: 0.3;color: #FF4444;" class="f-24 t-r f-w">
+						-￥{{storeData.statistics.fulldiscount}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.allRedPrice && storeData.statistics.allRedPrice !== '0.00'">
+					<view style="flex: 0.3;color: #333333;" class="f-24">
+						红包减免
+					</view>
+					<view style="flex: 0.3;color: #FF4444;" class="f-24 t-r f-w">
+						-￥{{storeData.statistics.allRedPrice}}
+					</view>
+				</view>
+				<view class="dis-flex" style="padding: 10upx 0 20upx; justify-content: space-between;" v-if="storeData.statistics.creditdiscount && storeData.statistics.creditdiscount !== '0.00'">
+					<view style="flex: 0.5;color: #333333;" class="f-24">
+						积分抵扣
+						<switch :checked="switchChecke.check" ref="switchbtn"  style="padding-left: 20upx;transform:scale(0.7)" @change="switch1Change" />
+					</view>
+					<view style="flex: 0.3;color: #333333;" class="f-24 t-r f-w">
+						-￥{{storeData.statistics.creditdiscount}}
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="dis-flex b-f" style="position: fixed;width: 100%;justify-content: space-between;bottom: 0;left: 0;height: 100upx;z-index: 99;">
+			<view class="t-c" style="flex: 0.5;padding-top: 30upx;">
+				<text class="f-24">合计：</text>
+				<text class="f-24" style="padding-left: 10upx;color: #FF4444;">¥</text>
+				<text class="f-34 f-w" style="color: #FF4444;">{{storeData.statistics.toatlprice}}</text>
+			</view>
+			<view class="t-c f-30" style="flex: 0.33;color: #ffffff;padding-top: 30upx;background-color: #FF4444;"@click="submitOrder">
+				{{languageStatus!=1?'提交订单':'주문서 제출'}}
+			</view>
+		</view>
+		<!-- <redPagDown ref="redPagDown" @closePops="redPagClosePop(event)" :noorderSubmitInfo="[]" :orderSubmitInfo="redPagList" @priceis="prices"></redPagDown> -->
+		</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import redPagDown from '@/components/template/redPagDown.vue';
+	import loadlogo from '@/components/template/loadlogo.vue'
+	export default{
+		components:{
+			redPagDown,
+			loadlogo
+		},
+		data(){
+			return{
+				switch:false,
+				switchChecke:{
+					check:false
+				},
+				storeData:{
+					statistics:{
+						goodallmoney:''
+					}
+				},
+				modeNum:{
+					use_make:0,
+					use_own:0,
+					use_store:0
+				},
+				usestatus:1,
+				redPagList: [],
+				redpackIndex:0,
+				param:null,
+				createOrderInfo:{
+					name:'',
+					phone:''
+				},
+				allFreight:0,
+				allPrice:0,
+				sid:'',
+				param:'',
+				jsonParam:{},
+				loadlogo:true,
+				modeNumcart:true,
+				onepage:1,
+				cut_money:0,
+				toatlprice:0,
+				alltoatlprice:0
+			}
+		},
+		onHide(){
+			console.log('onHide');
+		},
+		onUnload(){
+			uni.setStorageSync('redPagList',[]);
+			console.log('onUnload');
+		},
+		onShow() {
+			this.redPagList = uni.getStorageSync('redPagList');
+			
+				// this.$refs.switchbtn.switchChecked = false;
+				this.$set(this.switchChecke, 'check', false);
+				// this.switchChecke = false;
+			
+			
+			if(this.sid){
+				this.getarrs();
+			}else if(this.param){
+				this.getarr();
+			};
+			
+		},
+		watch:{
+			usestatus(newVal,oldVal){
+				// if(this.onepage == 1 || this.modeNum.use_make == 1 && this.modeNum.use_own == 1&& this.modeNum.use_store == 1) return
+					this.getarr();
+			}
+		},
+		onLoad(option) {
+			if(option.id){
+				this.sid = option.id;
+				// this.getarrs();
+			}
+			uni.setStorageSync('redPagList',[]);
+			console.log(option);
+			this.storeData.param = '';
+			if(option.param){
+				
+				this.param = option.param;
+				// this.getarr();
+				//#ifdef H5
+				let base64 = new this.$util.Base64();
+				let param =base64.decode(option.param);
+				this.jsonParam = JSON.parse(param);
+				// console.log(this.jsonParam,11111111)
+				//#endif
+				//#ifndef H5
+				this.jsonParam = uni.getStorageSync('rameck');
+				//#endif
+			}	
+		},
+		methods:{
+			switch1Change(e){
+				 console.log('switch1 发生 change 事件，携带值为', e.target.value);
+				 this.switch = e.target.value;
+				 this.$set(this.switchChecke, 'check', e.target.value);
+				 if(this.switch){
+					 this.toatlprice = this.storeData.statistics.toatlprice
+					 console.log(Number(this.storeData.statistics.toatlprice),Number(this.storeData.statistics.creditdiscount))
+					 let a = Number(this.storeData.statistics.toatlprice);
+					 let b = Number(this.storeData.statistics.creditdiscount);
+					 if(Number(this.storeData.statistics.toatlprice) > Number(this.storeData.statistics.creditdiscount)){
+						this.storeData.statistics.toatlprice = a-b;
+						 this.storeData.statistics.toatlprice = Math.round(this.storeData.statistics.toatlprice * 100) / 100;
+					 }else{
+						this.toatlprice = this.storeData.statistics.toatlprice
+						this.storeData.statistics.toatlprice = '0.00';
+					 }
+				 }else{
+					 
+					 if(Number(this.storeData.statistics.toatlprice) == 0 || this.storeData.statistics.toatlprice == '0.00'){
+						 this.storeData.statistics.toatlprice = this.toatlprice;
+					 }else{
+						this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) + Number(this.storeData.statistics.creditdiscount) 
+					 }
+					 
+					 // this.storeData.list.map((item)=>{
+					 // 	if(item.redpackPrice){
+					 // 		this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) - Number(item.redpackPrice);
+					 // 	}
+					 // });
+				 };
+				 
+				 this.storeData.statistics.toatlprice = this.storeData.statistics.toatlprice < 0?'0.00':this.storeData.statistics.toatlprice;
+				 // this.toatlprice = this.storeData.statistics.toatlprice;
+			},
+			clikckusestatus(num){
+				App.showError(
+					`是否将收货方式切换为${num==0?(this.languageStatus!=1?'到店自取':'방문 수령'):num==1?(this.languageStatus!=1?'商家配送':'상가 배송'):'平台配送'}?`,
+					data => {
+						if (data.confirm) {
+							this.usestatus = num;
+							// this.switchChecke = !this.switchChecke;switchChecke.check;
+							this.$set(this.switchChecke, 'check', false)
+							this.switch = false;
+							console.log(this.switchChecke,'状态改变',this.$refs.switchbtn)
+							// this.$refs.switch.switchChecked = false;
+							
+						}
+					},
+					true
+				);
+			},
+			getarrs(param){
+				this.loadlogo = true;
+				this.modeNumcart = true;
+				App._post_form(
+					`&p=citydelivery&do=deliveryOrderSubmit&goodsinfo=${this.param}&addressid=${''}&sid=${this.sid}&type=${this.usestatus}`,
+					{},
+					res => {
+						if(res.errno == 0){
+							console.log(res);
+							let orderInfos = {
+								param: this.param,
+								id:this.sid,
+								type:'foodorder'
+							}
+							uni.setStorageSync('orderInfos', orderInfos)
+							this.storeData = res.data;
+							this.storeData.statistics.allRedPrice = 0;
+							this.storeData.list.map((item,index)=>{
+								this.redPagList.map((items,indexs)=>{
+									if(items.index == index){
+										item.redpacklist.list.map((itemss,indexss)=>{
+											if(itemss.id == items.id){
+												item.redpackid = items.id;
+												item.redPrice = itemss.cut_money;
+												this.storeData.statistics.allRedPrice = Number(this.storeData.statistics.allRedPrice) + Number(item.redPrice) + '.00';
+												this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) - Number(item.redPrice) + '.00';
+												this.storeData.statistics.toatlprice = this.storeData.statistics.toatlprice < 0?'0.00':this.storeData.statistics.toatlprice
+											}
+										})
+									}else{
+										item.redpacklist.list.map((itemss,indexss)=>{
+											if(itemss.id == items.id){
+												item.redpacklist.list.splice(indexss,1);
+											}
+										})
+									}
+								})
+							})
+							this.$set(this.modeNum,'use_make',res.data.statistics.use_make);
+							this.$set(this.modeNum,'use_own',res.data.statistics.use_own);
+							this.$set(this.modeNum,'use_store',res.data.statistics.use_store);
+							// this.modeNum.use_make = res.data.statistics.use_make;
+							// this.modeNum.use_own = res.data.statistics.use_own;
+							// this.modeNum.use_store = res.data.statistics.use_store;
+							let status = this.usestatus;
+							if((this.modeNum.use_make == 1 && this.modeNum.use_own == 1 && this.modeNum.use_store == 0) || (this.modeNum.use_make == 1 && this.modeNum.use_store == 1 && this.modeNum.use_own == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_own == 1 && this.modeNum.use_store == 1)){
+								if(this.modeNum.use_store == 1){
+									this.usestatus = 1
+								}else if(this.modeNum.use_make == 1){
+									this.usestatus = 2
+								}
+							}
+							if((this.modeNum.use_make == 1 && this.modeNum.use_own == 0 && this.modeNum.use_store == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_store == 1 && this.modeNum.use_own == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_own == 1 && this.modeNum.use_store == 0)){
+								if(this.modeNum.use_store == 1){
+									this.usestatus = 1
+								}else if(this.modeNum.use_make == 1){
+									this.usestatus = 2
+								}else{
+									this.usestatus = 0;
+								}
+							}
+							
+							if(status !== this.usestatus && this.onepage == 1){
+								console.log(status,'默认',this.usestatus,this.onepage);
+								this.onepage = 2;
+								this.getarrs();
+								return
+							}
+							console.log(this.modeNum,'数量2')
+							this.storeData.list.map(item=>{
+								item.remark = '';
+							})
+							this.storeData.usestatus = 2;
+							console.log(this.storeData);
+							this.loadlogo = false
+						}
+					},
+					false,
+					() => {
+						
+					}
+				
+				);
+			},
+			getarr(param){
+				let _this = this;
+				this.loadlogo = true;
+				this.modeNumcart = true;
+				App._post_form(
+					`&p=citydelivery&do=deliveryOrderSubmit&goodsinfo=${this.param}&addressid=${''}&sid=${this.sid}&type=${this.usestatus}`,
+					{},
+					res => {
+						if(res.errno == 0){
+							console.log(res);
+							let orderInfos = {
+								param: this.param,
+								id:this.sid,
+								type:'foodorder'
+							}
+							uni.setStorageSync('orderInfos', orderInfos)
+							this.storeData = res.data;
+							this.storeData.statistics.allRedPrice = 0;
+							this.storeData.list.map((item,index)=>{
+								this.redPagList.map((items,indexs)=>{
+									if(items.index == index){
+										item.redpacklist.list.map((itemss,indexss)=>{
+											if(itemss.id == items.id){
+												item.redpackid = items.id;
+												item.redPrice = itemss.cut_money;
+												_this.storeData.statistics.allRedPrice = Number(_this.storeData.statistics.allRedPrice) + Number(item.redPrice) + '.00';
+												_this.storeData.statistics.toatlprice = Number(_this.storeData.statistics.toatlprice) - Number(item.redPrice);
+												let StringNumber =  (_this.storeData.statistics.toatlprice + '').indexOf('.');
+												if(StringNumber == -1){
+													_this.storeData.statistics.toatlprice = _this.storeData.statistics.toatlprice + '.00'
+												}
+												_this.storeData.statistics.toatlprice = _this.storeData.statistics.toatlprice < 0?'0.00':_this.storeData.statistics.toatlprice
+											}
+										})
+									}else{
+										item.redpacklist.list.map((itemss,indexss)=>{
+											if(itemss.id == items.id){
+												item.redpacklist.list.splice(indexss,1);
+											}
+										})
+									}
+								})
+							})
+							this.toatlprice = this.storeData.statistics.toatlprice;
+							this.modeNum.use_make = res.data.statistics.use_make;
+							this.modeNum.use_own = res.data.statistics.use_own;
+							this.modeNum.use_store = res.data.statistics.use_store;	
+							let status = this.usestatus;
+							if(this.onepage == 1 && this.modeNum.use_make == 1){
+								if((this.modeNum.use_make == 1 && this.modeNum.use_own == 1 && this.modeNum.use_store == 0) || (this.modeNum.use_make == 1 && this.modeNum.use_store == 1 && this.modeNum.use_own == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_own == 1 && this.modeNum.use_store == 1)){
+									if(this.modeNum.use_store == 1){
+										this.usestatus = 1
+									}else if(this.modeNum.use_make == 1){
+										this.usestatus = 2
+									}
+								}
+								if((this.modeNum.use_make == 1 && this.modeNum.use_own == 0 && this.modeNum.use_store == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_store == 1 && this.modeNum.use_own == 0) || (this.modeNum.use_make == 0 && this.modeNum.use_own == 1 && this.modeNum.use_store == 0)){
+									if(this.modeNum.use_store == 1){
+										this.usestatus = 1
+									}else if(this.modeNum.use_make == 1){
+										this.usestatus = 2
+									}else{
+										this.usestatus = 0;
+									}
+								}
+								
+								if(status !== this.usestatus && this.onepage == 1){
+									console.log(status,'默认',this.usestatus,this.onepage);
+									this.onepage = 2;
+									this.getarr();
+									return
+								}
+							}
+							
+							console.log(this.modeNum,'数量1',res.data.statistics)
+							this.storeData.list.map(item=>{
+								item.remark = '';
+							})
+							this.storeData.usestatus = 2;
+							console.log(this.storeData);
+							this.loadlogo = false
+						}
+						uni.hideLoading();
+					},
+					false,
+					() => {
+						
+					}
+				
+				);
+			},
+			submitOrder(){
+				let param;
+				if(!this.storeData.address.id && this.usestatus !== 0){
+					uni.showToast({
+						icon:'none',
+						title:'请选择收货地址'
+					});
+					return
+				}
+				if((!this.createOrderInfo.phone && !this.storeData.thinfo.thmobile) && this.usestatus == 0){
+					uni.showToast({
+						icon:'none',
+						title:'请填写联系电话'
+					});
+					return
+				}
+				if((!this.createOrderInfo.name && !this.storeData.thinfo.thname) && this.usestatus == 0){
+					uni.showToast({
+						icon:'none',
+						title:'请填写联系人姓名'
+					});
+					return
+				}
+				if(this.param){
+					let _this = this;
+					_this.storeData.list.map((item,index)=>{
+						_this.jsonParam.map((items,indexs)=>{
+							console.log(item,items)
+							if(item.sid == items.sid){
+								console.log(items);
+								_this.jsonParam[indexs].remark = item.remark;
+								_this.jsonParam[indexs].dadaprice = item.deliverymoney;
+								_this.jsonParam[indexs].makeorderno = item.makeorderno;
+								_this.jsonParam[indexs].wlorderno = item.wlorderno;
+								_this.jsonParam[indexs].redpackid = item.redpackid;
+								_this.jsonParam[indexs].uuallprice = item.alldeliverymoney;
+							}
+							
+						})
+					});
+					// debugger
+					let jsonString = JSON.stringify(this.jsonParam);
+					let base64 = new this.$util.Base64();
+					param = base64.encode(jsonString);
+				}
+				let data = {
+					goodsinfo:param || this.param,
+					addressid:this.storeData.address.id || '',
+					thname:this.createOrderInfo.name || this.storeData.thinfo.thname,
+					thmobile:this.createOrderInfo.phone || this.storeData.thinfo.thmobile,
+					buytype:this.usestatus,
+					sid:this.sid,
+					creditstatus:this.switch?1:0
+				};
+				if(this.storeData.list.length == 1){
+					data.remark = this.storeData.list[0].remark;
+					data.deliverymoney = this.storeData.list[0].deliverymoney;
+					data.makeorderno = this.storeData.list[0].makeorderno;
+					data.wlorderno = this.storeData.list[0].wlorderno;
+					data.redpackid = this.storeData.list[0].redpackid;
+					data.alldeliverymoney = this.storeData.list[0].alldeliverymoney;
+				}
+				App._post_form('&p=citydelivery&do=createDeliveryOrder', data, res => {
+					console.log(res);
+					let datas = {
+						plugin:'citydelivery',
+						deliverystring:res.data.info
+					}
+					if(res.data.nopaytid > 0){
+						console.log(res.data)
+							App.navigationTo({
+								url:`pages/subPages/paySuccess/paySuccess?tid=${res.data.nopaytid}&plugin=citydelivery&state=${res.data.nopaystatus}`,
+								navType:'reLaunch'
+							})
+					}else{
+						App.navigationTo({
+							url: 'pages/mainPages/payment/payment?orderid=' + '0' + '&plugin=citydelivery' + '&deliverystring=' + res.data.info,
+							navType:'reLaunch'
+						})
+					}
+					
+				})
+			},
+			prices(redPacketItem) { //红包满减价格计算
+			console.log(redPacketItem,111111111);
+			if(!redPacketItem.check){
+				// debugger
+				if(this.storeData.statistics.toatlprice == '0.00' || this.storeData.statistics.toatlprice == 0){
+					this.storeData.statistics.toatlprice = this.alltoatlprice;
+				}
+				this.storeData.list[this.redpackIndex].redpackPrice = 0;
+				this.storeData.list[this.redpackIndex].redpackid = '';
+				this.storeData.list[this.redpackIndex].allmoney = Number(this.storeData.list[this.redpackIndex].allmoney) + Number(redPacketItem.cut_money) + '.00';
+				this.storeData.statistics.goodallmoney = Number(this.storeData.statistics.goodallmoney) + Number(redPacketItem.cut_money) + '.00';
+				this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) + Number(redPacketItem.cut_money) + '.00';
+				// this.cut_money = 0;
+			}else{
+				if(Number(this.storeData.statistics.toatlprice) == 0){
+					// this.redPagList = [];
+					// this.$refs.redPagDown.redPagId = '';
+					return
+				}
+				if(Number(this.storeData.statistics.toatlprice) < Number(redPacketItem.cut_money)){
+					// debugger
+					this.alltoatlprice = Number(this.storeData.statistics.toatlprice) - Number(redPacketItem.cut_money);
+				}
+				this.storeData.list[this.redpackIndex].redpackid = redPacketItem.id;
+				if(!this.storeData.list[this.redpackIndex].redpackPrice){
+					this.cut_money = Number(redPacketItem.cut_money);
+					this.storeData.list[this.redpackIndex].redpackPrice = redPacketItem.cut_money;
+					// this.storeData.statistics.goodallmoney = Number(this.storeData.statistics.goodallmoney) - Number(redPacketItem.cut_money) + '.00';
+					this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) - Number(redPacketItem.cut_money) + '.00';
+					this.storeData.list[this.redpackIndex].allmoney = Number(this.storeData.list[this.redpackIndex].allmoney) - Number(redPacketItem.cut_money) + '.00';
+				}else{
+					this.storeData.list[this.redpackIndex].redpackPrice = null;
+					this.storeData.list[this.redpackIndex].allmoney = Number(this.storeData.list[this.redpackIndex].allmoney) + Number(redPacketItem.cut_money) + '.00';
+					// this.storeData.statistics.goodallmoney = Number(this.storeData.statistics.goodallmoney) + Number(redPacketItem.cut_money) + '.00';
+					this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) + Number(redPacketItem.cut_money) + '.00';
+					this.cut_money = 0;
+					this.cut_money = Number(redPacketItem.cut_money);
+					this.storeData.list[this.redpackIndex].redpackPrice = redPacketItem.cut_money;
+					// this.storeData.statistics.goodallmoney = Number(this.storeData.statistics.goodallmoney) - Number(redPacketItem.cut_money) + '.00';
+					this.storeData.statistics.toatlprice = Number(this.storeData.statistics.toatlprice) - Number(redPacketItem.cut_money) + '.00';
+					this.storeData.list[this.redpackIndex].allmoney = Number(this.storeData.list[this.redpackIndex].allmoney) - Number(redPacketItem.cut_money) + '.00';
+				}
+			}
+			// this.storeData.statistics.goodallmoney = this.storeData.statistics.goodallmoney < 0?'0.00':this.storeData.statistics.goodallmoney;
+			this.storeData.statistics.toatlprice = this.storeData.statistics.toatlprice < 0?'0.00':this.storeData.statistics.toatlprice;
+			this.storeData.list[this.redpackIndex].allmoney = this.storeData.list[this.redpackIndex].allmoney < 0?'0.00':this.storeData.list[this.redpackIndex].allmoney;
+			this.loadlogo = !this.loadlogo;
+			this.loadlogo = !this.loadlogo;
+			},
+			// 获取红包列表
+			getRedPagList(){
+				
+			},
+			// 跳转地址
+			goAddress(type) {
+				App.navigationTo({
+					url: 'pages/subPages/receivingAddress/receivingAddress?type=' + type
+				});
+			},
+			// 红包弹窗控制
+			redPagClosePop(e) {
+				console.log(e,'444');
+				let _this = this;
+				_this.$refs.redPagDown.redPagss = false;
+			},
+			redPagShows(price,index,list) {
+				let _this = this;
+				_this.redpackIndex = index;
+				App.navigationTo({
+					url: 'pages/subPages2/businessCenter/redReceive/redReceive?price=' + price + '&index=' + index + '&list=' + JSON.stringify(list)
+				});
+				// _this.redPagList = [];
+				// setTimeout(()=>{
+				// 	_this.redPagList  = list;
+				// 	_this.$refs.redPagDown.redPagss = true;
+				// })
+				
+				
+				// console.log(_this.$refs.redPagDown.)
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		height: 100%;
+		background-color: #f7f7f7 !important;
+	}
+</style>
+<style lang="less" scoped>
+	.noloche{
+		width: 33.3333%;
+		text-align: center;
+		color: #FFFFFF;
+		height: 60upx;
+		border: 2upx solid #ffffff;
+		border-radius: 15upx;
+		box-sizing: border-box;
+		>span{
+			font-size: 26upx;
+			line-height: 60upx;
+		}
+	}
+	.loche{
+		width: 33.3333%;
+		color: #FF4444;
+		text-align: center;
+		height: 60upx;
+		border-radius: 15upx;
+		background-color: #FFFFFF;
+		
+		>span{
+			font-size: 26upx;
+			line-height: 60upx;
+		}
+	}
+	.header_bg {
+		width: 100%;
+		height: 320upx;
+		background-size: 100% 320upx;
+		background-repeat: no-repeat;
+	}
+	
+	.checkHx {
+		z-index: 2;
+		position: relative;
+		bottom: 65upx;
+		left: 250upx;
+		width: 80upx;
+		height: 88upx;
+		transform: rotate(15deg);
+		background-color: #ffffff;
+		border-top-left-radius: 14upx;
+	}
+	
+	.Ps {
+		z-index: 1;
+		position: relative;
+		bottom: 64upx;
+		left: 260upx;
+		width: 80upx;
+		height: 88upx;
+		background: #ffe8e8;
+	}
+	
+	.Hx {
+		z-index: 1;
+		position: relative;
+		bottom: 64upx;
+		left: 260upx;
+		width: 80upx;
+		height: 88upx;
+		background: #ffe8e8;
+	}
+	
+	.checkPs {
+		z-index: 2;
+		position: relative;
+		bottom: 65upx;
+		left: 276upx;
+		width: 80upx;
+		height: 88upx;
+		transform: rotate(-15deg);
+		background-color: #ffffff;
+		border-top-right-radius: 14upx;
+	}
+	
+	.check-right-radius {
+		border-top-right-radius: 10upx;
+	}
+	
+	.check-left-radius {
+		border-top-left-radius: 10upx;
+	}
+	
+	.checkOrderTypeButton {
+	
+		height: 71upx;
+		overflow: hidden;
+	
+		>view:nth-child(1) {
+			margin-top: 10upx;
+			border-radius: 10upx 0 0 0;
+		}
+	
+		>view:nth-child(2) {
+			border-radius: 0 10upx 0 0;
+			margin-left: 32upx;
+		}
+	
+		>view {
+	
+			display: inline-block;
+			vertical-align: bottom;
+		}
+	}
+	
+	.nCheck {
+		vertical-align: bottom;
+		width: 316upx;
+		height: 64upx;
+		background: #ffe8e8;
+		text-align: center;
+	
+		>span {
+			line-height: 64upx;
+			font-size: 24upx;
+	
+	
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.ncheck1 {
+		margin-top: 10upx;
+	}
+	
+	.checkOne {
+		margin-left: 8upx;
+	}
+	
+	.check {
+		text-align: center;
+		vertical-align: bottom;
+		width: 334upx;
+		height: 71upx;
+		background: #ffffff;
+	
+		>span {
+			line-height: 71upx;
+			font-size: 28upx;
+	
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.checkReceivingAdress {
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+	}
+	
+	.checkOrderType {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		border-radius: 10upx;
+	}
+	
+	.full {
+		width: 750upx;
+		height: 118upx;
+	}
+	
+	
+	.submitOrder {
+		font-size: 0;
+		margin-top: -40%;
+		padding-bottom: 100upx;
+	}
+	
+	.orderDetails {
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+		margin: 20upx auto 0 auto;
+	}
+	
+	.orderDetailsImg {
+		width: 130upx;
+		height: 130upx;
+	
+		>image {
+			width: 130upx;
+			height: 130upx;
+		}
+	}
+	
+	.orderDetailsPackage {
+		padding: 30upx;
+	
+		>view {
+			vertical-align: top;
+			display: inline-block;
+		}
+	}
+	
+	.orderDetailsInfo {
+		margin-left: 20upx;
+	}
+	
+	.orderInfoTitle {
+		>span {
+			overflow: hidden;
+			text-overflow: ellipsis;
+			white-space: nowrap;
+			display: inline-block;
+			width: 453upx;
+			font-size: 28upx;
+	
+	
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.orderInfoBody {
+		margin-top: 10upx;
+	
+		>span {
+			font-size: 24upx;
+	
+	
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+	
+	.orderInfoFoot {
+		display: flex;
+		justify-content: space-between;
+		margin-top: 15upx;
+	
+		>span:nth-child(1) {
+			display: inline-block;
+			vertical-align: bottom;
+			font-size: 28upx;
+	
+			font-weight: bold;
+			color: rgba(255, 68, 68, 1);
+		}
+	
+		>span:nth-child(2) {
+			display: inline-block;
+			vertical-align: bottom;
+			font-size: 24upx;
+	
+	
+			color: rgba(153, 153, 153, 1);
+		}
+	}
+	
+	.paymentInfo {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.paymentInfoPackage {
+		padding: 30upx;
+	
+		>view:nth-child(1) {
+			margin-top: 0;
+		}
+	
+		>view {
+			margin-top: 30upx;
+			display: flex;
+			justify-content: space-between;
+	
+			>text {
+				vertical-align: middle;
+			}
+	
+			>text:nth-child(1) {
+				font-size: 24upx;
+	
+	
+				color: rgba(51, 51, 51, 1);
+			}
+	
+			>text:nth-child(2) {
+				font-size: 24upx;
+	
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	}
+	
+	.checkUserInfo {
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+	}
+	
+	.userInfo {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.userInfoPackage {
+		padding: 0 30upx;
+	
+		>view:nth-child(1) {
+			border-bottom: 1px solid #eeeeee;
+		}
+	
+		>view {
+			>span {
+				display: inline-block;
+				vertical-align: middle;
+				width: 96upx;
+				font-size: 24upx;
+	
+	
+				color: rgba(51, 51, 51, 1);
+			}
+	
+			>input {
+				margin-left: 40upx;
+				display: inline-block;
+				width: 400upx;
+				height: 82upx;
+				color: rgba(51, 51, 51, 1);
+				font-size: 24upx;
+	
+	
+				vertical-align: middle;
+			}
+		}
+	}
+	
+	input::placeholder {
+		color: rgba(153, 153, 153, 1);
+	}
+	
+	.messageSave {
+		margin: 20upx auto 0 auto;
+		// width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.messageSavePackage {
+		// padding: 30upx;
+	
+		>input {
+			padding-left: 30upx;
+			height: 77upx;
+			background: rgba(248, 248, 248, 1);
+			border-radius: 10upx;
+			font-size: 24upx;
+	
+	
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.navButtom {
+		position: fixed;
+		bottom: 0;
+		width: 750upx;
+		height: 98upx;
+		background: rgba(255, 255, 255, 1);
+		border: 1upx solid rgba(238, 238, 238, 0.67);
+		z-index: 2;
+	}
+	
+	.navButtomLeft {
+		display: inline-block;
+		width: 515upx;
+	}
+	
+	.navButtomLeftPackage {
+		padding: 30upx;
+	
+		>span:nth-child(2) {
+			color: #ff4444;
+		}
+	
+		>span {
+			font-size: 24upx;
+	
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.submitButton {
+		display: inline-block;
+		width: 235upx;
+		height: 98upx;
+		background: rgba(255, 68, 68, 1);
+		text-align: center;
+	
+		>span {
+			line-height: 98upx;
+			font-size: 28upx;
+	
+			font-weight: bold;
+			color: rgba(255, 255, 255, 1);
+		}
+	
+		>button {
+			position: absolute;
+			left: 0;
+			right: 0;
+			top: 0;
+			bottom: 0;
+			opacity: 0;
+		}
+	}
+	
+	.receivingAdress {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.receiptDetailsFoot {
+		background: repeating-linear-gradient(-45deg, white, white 5%, #ff4444 5%, #ff4444 10%, white 10%, white 15%, #52a7f8 15%, #52a7f8 20%);
+		width: 690upx;
+		height: 6upx;
+		border-radius: 10upx;
+	}
+	
+	.receivingAdressPackage {
+		padding: 30upx;
+		display: flex;
+		justify-content: space-between;
+	
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+	
+	.receivingAdressRight {
+		font-size: 28upx;
+	}
+	
+	.receivingAdressTitle {
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+			width: 62upx;
+			height: 35upx;
+			background: rgba(255, 68, 68, 1);
+			border-radius: 4upx;
+			text-align: center;
+	
+			>span {
+				line-height: 35upx;
+				font-size: 14upx;
+	
+	
+				color: rgba(255, 255, 255, 1);
+			}
+		}
+	
+		>span {
+			margin-left: 10upx;
+			vertical-align: middle;
+			font-size: 24upx;
+	
+	
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.receivingAdressBody {
+		margin-top: 10upx;
+	
+		>span {
+			font-size: 32upx;
+	
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+		>text {
+			font-size: 32upx;
+			
+			font-weight: bold;
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.receivingAdressFoot {
+		margin-top: 10upx;
+	
+		>span:nth-child(2) {
+			margin-left: 10upx;
+		}
+		>text:nth-child(2) {
+			margin-left: 10upx;
+		}
+	
+		>span {
+			font-size: 24upx;
+	
+	
+			color: rgba(51, 51, 51, 1);
+		}
+		>text {
+			font-size: 24upx;
+			
+			
+			color: rgba(51, 51, 51, 1);
+		}
+	}
+	
+	.firstCanvas {
+		width: 345upx;
+		height: 71upx;
+		background: white;
+	}
+	
+	.integralInfo {
+		margin: 20upx auto 0 auto;
+		width: 690upx;
+		background: rgba(255, 255, 255, 1);
+		border-radius: 10upx;
+	}
+	
+	.integralInfoPackage {
+		padding: 30upx;
+		display: flex;
+		justify-content: space-between;
+	
+		>view:nth-child(1) {
+			>span {
+				line-height: 40upx;
+				font-size: 24upx;
+	
+	
+				color: rgba(51, 51, 51, 1);
+			}
+			>text {
+				line-height: 40upx;
+				font-size: 24upx;
+				
+				
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+	
+		>view {
+			vertical-align: middle;
+			display: inline-block;
+		}
+	}
+	
+	.switch {
+		width: 80upx;
+		height: 40upx;
+		border-radius: 20upx;
+	
+		.isswitchClose {
+			background: #dddddd;
+		}
+	
+		.isswitchOn {
+			background: rgba(255, 68, 68, 1);
+		}
+	
+		>view {
+			padding: 6upx;
+			display: flex;
+			justify-content: space-between;
+	
+			>view {
+				width: 28upx;
+				height: 28upx;
+				box-shadow: 0upx 2upx 6upx 0upx rgba(255, 68, 68, 0.35);
+				border-radius: 50%;
+			}
+		}
+	}
+	
+	.member {
+		overflow: hidden;
+		margin: 20upx 30upx 0;
+	}
+	
+	.member-header .header-left {
+		padding: 0 20upx;
+		height: 44upx;
+		background-size: 160upx, 44upx;
+		background-color: #36384D;
+		max-width: 40%;
+	}
+	
+	.header-left .left-member-logo {
+		width: 30upx;
+		height: 30upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAAAeCAMAAAAM7l6QAAAAllBMVEUAAAD93Dv+3Dz93Dz93Dz+3Tz93Dv/3Tn93Dv93Tr/3Tn93Dv83Dv93Dv93Tv83Dr82zr93Tz+3Dz+3Dz93Dz93Dv+3Dv93Dz93Dz83Dv72zr/3Dr93Tn93Tf83TX93Dv+3Dz92zv83Dr/3jz/6C7/0S7/3jj83Dz+3Tz93Dv93Dv93Dz92zz93Dz93Dv/2zr/2jz93DzCovTLAAAAMXRSTlMAfuOJ5/BkHPpWFum/pJ1bR+ba0crEuat7TUAvKiAQ9tZqYDULCwe0s5eSg3JubCMirPs29wAAANlJREFUKM/N0FduwzAQBNCRbDb1ZqtG7k4ve//LBQIhMZLAfAZ5P+QsCHAx+Dt3Fd9gtyfaweqLuKIONjdW7A49rGIiDivhHvP0YTVN9Nkf/U/hZp5OzfiuonIY3QvWAh3LrwC8kJzpR+nHwJNshnQ5BIDaymmLC9V7CiNSOtbDPUiogdbLEzijD0DjxE44kzdm9xkQNSaJADa+6TLAyqNp98XHShZh1L5i6Srf8YuWEhP4Zq6Doh/lMubOnOEwGEGJhbKAEWVYyEMYb5RuZ1JyYHiVs1AJ/HPfuCkPAKRs+tsAAAAASUVORK5CYII=);
+		background-size: 30upx 30upx;
+		background-repeat: no-repeat;
+		margin-right: 10upx;
+	}
+	
+	.member-header .header-right {
+		width: 376upx;
+		height: 44upx;
+		line-height: 44upx;
+		background: linear-gradient(90deg, rgba(255, 223, 78, 1), rgba(252, 218, 49, 1));
+		border-radius: 0 0 20upx 0;
+	}
+	
+	.header-left .left-member-title {
+		color: #FCDA31;
+	}
+	
+	.member-header .header-right text {
+		color: #F04C4C;
+	}
+	
+	.member-nowprice {
+		color: #F04C4C;
+	}
+	
+	.member-list .member-list-items {
+		position: relative;
+		padding: 20upx 110upx 20upx 30upx;
+		/* border-bottom: 1px solid #EEEEEE; */
+	}
+	
+	.member-list .member-list-items .select-logo {
+		position: absolute;
+		right: 30upx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+	
+	.member-list .member-list-items .select-logo image {
+		width: 36upx;
+		height: 36upx;
+	}
+	
+	.redPacketIcon {
+		font-size: 24upx;
+	}
+</style>
diff --git a/pages/subPages2/businessCenter/foodShopping/foodShopping.vue b/pages/subPages2/businessCenter/foodShopping/foodShopping.vue
new file mode 100644
index 0000000..2127eed
--- /dev/null
+++ b/pages/subPages2/businessCenter/foodShopping/foodShopping.vue
@@ -0,0 +1,524 @@
+<template>
+	<view  style="padding: 30upx 30upx 100upx;">
+		<far-bottom></far-bottom>
+		<view class="dis-flex f-24" style="color: #999999;padding-bottom: 20upx;">
+			<view class="p-top-bom-10" style="flex: 0.2;">共{{ count }}件商品</view>
+			<view style="flex: 0.65;"></view>
+			<view class="t-c p-top-bom-10" style="flex: 0.15;border-radius: 60upx;border: 1upx solid #999999;" @click="empty">移除</view>
+		</view>
+		<!-- 为空提示 -->
+		<view class="f-36" style="text-align: center;color:#666666;padding: 100upx;" v-if="count == 0">购物车空空如也~</view>
+		<!-- 商品模块 -->
+		<checkbox-group @change="ChangeShop">
+			<view class="b-f" style="padding: 20upx;border-radius: 10upx;margin-bottom: 20upx;" v-for="(item, index) in shoppingList" :key="index">
+				<view style="border-bottom: 1upx solid #F7F7F7;padding-bottom: 20upx;">
+					<label class="tui-checkbox">
+						<checkbox :value="item.storename" v-if="item.is_business !== 0" color="#FFFFFF"  :checked="item.checked" />
+						<text style="padding-left: 10upx; font-size: 24upx;">{{ item.storename }}{{item.is_business == 0?'（休息中）':''}}</text>
+						<text style="float: right;font-size: 24upx;line-height: 60upx;" v-if="item.cartinfo.deliveryprice != '0'">{{item.bzftext}}:<text class="col-f4">¥{{item.cartinfo.deliveryprice}}</text></text>
+					</label>
+				</view>
+				<checkbox-group @change="checkboxChange($event, item.sid)">
+					<view class="dis-flex p-top-bom-20" v-for="(items, indexs) in item.cartinfo.goodslist" :key="indexs">
+						<view style="flex: 0.05;padding-top: 8%;">
+							<label class="tui-checkbox"><checkbox :value="items.name" v-if="item.is_business !== 0" :checked="items.checked" color="#FFFFFF" /></label>
+						</view>
+						<view class="t-c" style="flex: 0.3;"><image style="width: 150upx;height: 150upx;border-radius: 10upx;" :src="items.thumb" mode="aspectFill"></image></view>
+						<view style="flex: 0.6;">
+							<view class="foodName">{{ items.name }}</view>
+							<view class="dis-flex f-24" style="padding: 15upx 0;color: #999999;" v-show="items.specname">
+								<view style="flex: 0.3;" v-if="items.specname">
+									<text>规格:</text>
+									<text>{{ items.specname }}</text>
+								</view>
+								<!-- <view style="flex: 0.7;">
+									<text>参数:</text>
+									<text>{{ items.canshu}}</text>
+								</view> -->
+							</view>
+							<view class="dis-flex">
+								<view style="flex: 0.6;">
+									<text class="f-30 f-w" style="color: #FF4444;">¥{{ items.price }}</text>
+									<text class="f-24" style="text-decoration:line-through;color: #999999;text-decoration:line-through;">¥{{ items.oldprice }}</text>
+								</view>
+								<view style="flex: 0.4;">
+									<view style="float: right;"><tui-numberbox :value="items.num" @change="change($event, items,item.is_business)" :width="50" :min="0"></tui-numberbox></view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</checkbox-group>
+			</view>
+		</checkbox-group>
+		<!-- 结算模块 -->
+		<view class="dis-flex b-f" style="height: 100upx;position: fixed;bottom: 0;width: 96%;left: 0;padding-left: 30upx;z-index: 99;" v-if="count > 0">
+			<view  style="flex: 0.15;padding-top: 30upx;">
+				<checkbox-group @change="checkAllChange">
+					<label class="tui-checkbox">
+						<checkbox value="1" color="#FFFFFF" :checked="allChecked" />
+						<text style="padding-left: 10upx; font-size: 24upx;">全选</text>
+					</label>
+				</checkbox-group>
+			</view>
+			<view class="t-r" style="flex: 0.6;padding-top: 30upx;padding-right: 20upx;">
+				<text class="f-20" v-if="allPrices.deliveryallmoney"> 其他费用:</text>
+				<text class="f-20" v-if="allPrices.deliveryallmoney" style="color: #FF4444;padding-right: 30upx;">¥{{allPrices.deliveryallmoney}}</text>
+				<text class="f-20">合计：</text>
+				<text class="f-24" style="color: #FF4444;">¥</text>
+				<text class="f-30 f-w" style="color: #FF4444;">{{ allPrices.allmoney }}</text>
+				<!-- <text class="f-24 f-w" style="color: #999999;padding-left: 10upx;">运费: {{ allPrices.deliveryallmoney }}</text> -->
+			</view>
+			<view class="t-c" style="flex: 0.3;background-color: #FF4444;padding-top: 30upx;color: #FFFFFF;" @click="settleAccounts">结算</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import EvanRadio from '@/pages/subPages2/tamplate/evan-radio/evan-radio.vue';
+import EvanRadioGroup from '@/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue';
+import UniIcons from '@/pages/subPages2/tamplate/uni-icons/uni-icons.vue';
+import tuiNumberbox from '@/components/template/numberbox.vue';
+export default {
+	components: {
+		EvanRadio,
+		EvanRadioGroup,
+		UniIcons,
+		tuiNumberbox
+	},
+	data() {
+		return {
+			shoppingList: {},
+			colorClear: null,
+			checkedLength: 0,
+			allChecked: false,
+			price: 0,
+			count: null,
+			settleAccountsArr: [],
+			allPrices: {
+				deliveryallmoney: '0.00',
+				allmoney: '0.00'
+			}
+		};
+	},
+	onLoad() {
+		// this.checkedLength = this.checkedLength + this.shoppingList.length;
+		// this.shoppingList.map(item => {
+		// 	this.checkedLength += item.cartinfo.goodslistlength;
+		// });
+		// console.log(this.checkedLength);
+		this.getShoppingList(1);
+		
+	},
+	onShow() {
+		this.getShoppingList(1);
+		this.allChecked = false;
+	},
+	watch: {
+		colorClear(newOld) {
+			if (newOld == '全选') {
+				this.shoppingList.map(item => {
+					this.$set(item, 'checked', true);
+					item.cartinfo.goodslist.map(items => {
+						this.$set(items, 'checked', true);
+					});
+				});
+			} else if (newOld == null) {
+				this.shoppingList.map(item => {
+					this.$set(item, 'checked', false);
+					item.cartinfo.goodslist.map(items => {
+						this.$set(items, 'checked', false);
+					});
+				});
+			}
+		}
+	},
+	methods: {
+		// 确认结账
+		goPay() {
+			uni.setStorageSync('rameck', this.settleAccountsArr);
+			let jsonString = JSON.stringify(this.settleAccountsArr);
+			let base64 = new this.$util.Base64();
+			let param = base64.encode(jsonString);
+			App.navigationTo({
+				url: 'pages/subPages2/businessCenter/foodOrder/foodOrder?param=' + param
+			});
+			// App._post_form(
+			// 	`&p=pay&do=deliveryOrderSubmit&goodsinfo=${param}&addressid=${''}`,
+			// 	{},
+			// 	res => {
+			// 		if(res.errno == 0){
+			// 			console.log(res);
+
+			// 		}
+			// 	},
+			// 	false,
+			// 	() => {
+			// 		// _this.loadlogo = true
+			// 	}
+			// );
+		},
+		// 结账
+		settleAccounts() {
+			this.settleAccountsArr = [];
+			let storeArr = {};
+			let cartidArr = [];
+			this.shoppingList.map(item => {
+				item.cartinfo.goodslist.map(items => {
+					if (items.checked) {
+						cartidArr.push(items.id);
+						storeArr = {
+							sid: item.sid,
+							cartid: cartidArr
+						};
+					}
+				});
+				if (cartidArr[0]) {
+					this.settleAccountsArr.push(storeArr);
+					storeArr = {};
+					cartidArr = [];
+				}
+			});
+			if (this.settleAccountsArr[0]) {
+				App.showError(
+					`确定提交订单并前往支付？`,
+					data => {
+						if (data.confirm) {
+							!!data && this.goPay();
+						}
+					},
+					true
+				);
+			} else {
+				uni.showToast({
+					title: '请选择要购买的商品',
+					duration: 2000,
+					icon: 'none'
+				});
+			}
+		},
+		// 组数组
+		NumArray() {
+			this.settleAccountsArr = [];
+			let storeArr = {};
+			let cartidArr = [];
+			this.shoppingList.map(item => {
+				item.cartinfo.goodslist.map(items => {
+					if (items.checked) {
+						cartidArr.push(items.id);
+						storeArr.sid = item.sid;
+						storeArr.cartid = cartidArr;
+					}
+				});
+				if (cartidArr[0]) {
+					this.settleAccountsArr.push(storeArr);
+					storeArr = {};
+					cartidArr = [];
+				}
+			});
+			let jsonString = JSON.stringify(this.settleAccountsArr);
+			let base64 = new this.$util.Base64();
+			let param = base64.encode(jsonString);
+			App._post_form(
+				`&p=citydelivery&do=CalculationPrice&goodsinfo=${param}`,
+				{},
+				res => {
+					this.allPrices = res.data;
+					console.log(res);
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		// 确定移除
+		withdraw(item) {
+			App._post_form(
+				`&p=citydelivery&do=deteShopCart&sid=${item.sid || ''}`,
+				{},
+				res => {
+					if (res.errno == 0) {
+						uni.showToast({
+							title: '移除成功',
+							duration: 2000
+						});
+						this.getShoppingList(1);
+					}
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		withdraws(item) {
+			console.log(item);
+			App._post_form(
+				`&p=citydelivery&do=deteShopCart`,
+				{},
+				res => {
+					if (res.errno == 0) {
+						uni.showToast({
+							title: '清空成功',
+							duration: 2000
+						});
+						this.getShoppingList(1);
+					}
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		// 移除某店铺的所有商品
+		empty() {
+			for (let i = 0; i < this.shoppingList.length; i++) {
+				if (this.shoppingList[i].checked) {
+					App.showError(
+						`确定移除${this.shoppingList[i].storename}及所属商品?`,
+						data => {
+							if (data.confirm) {
+								!!data && this.withdraw(this.shoppingList[i]);
+							}
+						},
+						true
+					);
+					this.allChecked = false;
+					break;
+				} else if (this.shoppingList[i].checked !== true && this.shoppingList[i].checked !== false) {
+					App.showError(
+						`确定清空购物车?`,
+						data => {
+							if (data.confirm) {
+								!!data && this.withdraws();
+							}
+						},
+						true
+					);
+					break;
+				}
+			}
+			// this.shoppingList.map(item => {});
+		},
+		// 店铺监听
+		ChangeShop(e) {
+			let num = 0;
+			this.shoppingList.map(item => {
+				this.$set(item, 'checked', false);
+				if(item.is_business == 0){
+					num = num+1;
+				}
+				item.cartinfo.goodslist.map(items => {
+					this.$set(items, 'checked', false);
+				});
+			});
+
+			e.detail.value.forEach(t => {
+				this.shoppingList.map(item => {
+					if (t == item.storename) {
+						this.$set(item, 'checked', true);
+						item.cartinfo.goodslist.map(items => {
+							this.$set(items, 'checked', true);
+						});
+					}
+				});
+			});
+			console.log(this.shoppingList.length-num,num,e.detail.value.length)
+			if (e.detail.value.length == this.shoppingList.length - num) {
+				this.allChecked = true;
+			} else {
+				this.allChecked = false;
+			}
+			// this.shoppingList.map(item => {
+			// 	if (item.checked == true) {
+
+			// 	}
+			// 	if (item.checked == false) {
+
+			// 	}
+			// });
+			this.NumArray();
+		},
+		// 全选反选
+		checkAllChange(e) {
+			this.allChecked = !this.allChecked;
+			if (e.detail.value == '1' || e == 1) {
+				this.shoppingList.map(item => {
+					if(item.is_business == 1){
+						this.$set(item, 'checked', true);
+						item.cartinfo.goodslist.map(items => {
+							this.$set(items, 'checked', true);
+						});
+					}
+				});
+			} else if (e.detail.value == '') {
+				this.shoppingList.map(item => {
+					this.$set(item, 'checked', false);
+					item.cartinfo.goodslist.map(items => {
+						this.$set(items, 'checked', false);
+					});
+				});
+			}
+			this.NumArray();
+		},
+		// 单个商品
+		checkboxChange(e, id) {
+			this.allChecked = true;
+			this.shoppingList.map((items, index) => {
+				if(items.is_business == 1){
+					items.cartinfo.goodslist.map((i, indexs) => {
+						e.detail.value.forEach(item => {
+							if (i.name == item) {
+								this.$set(i, 'checked', true);
+								let valueLength = e.detail.value.length;
+								let itemsLength = this.shoppingList[index].cartinfo.goodslist.length;
+								if (valueLength !== itemsLength) {
+									this.$set(items, 'checked', false);
+								} else if (!valueLength || !itemsLength) {
+									this.$set(items, 'checked', false);
+								} else {
+									this.$set(items, 'checked', true);
+								}
+							} else if (!items.checked) {
+								this.allChecked = false;
+							}
+							if (!items.checked) {
+								this.allChecked = false;
+							}
+						});
+						if (e.detail.value == 0) {
+							if (items.sid == id) {
+								this.$set(items, 'checked', false);
+								this.$set(i, 'checked', false);
+							}
+						}
+					});
+				}
+				
+			});
+			if (e.detail.value == 0) {
+				this.allChecked = false;
+				// this.shoppingList.map((item,index)=>{
+				// 	this.$set(item,'checked',false);
+				// 	item.cartinfo.goodslist.map((i,index)=>{
+				// 		this.$set(i,'checked',false);
+				// 	})
+				// })
+			}
+			console.log(this.shoppingList);
+			this.NumArray();
+		},
+		change(e, item,items) {
+			this.allChecked = false;
+			this.shoppingList.map(items => {
+				items.cartinfo.goodslist.map(itemss => {
+					if (item.id == itemss.id) {
+						if(items == 1){
+							itemss.num = e.value;
+						}
+						
+						App._post_form(
+							`&p=citydelivery&do=addShopCart&goodid=${item.goodid}&specid=${item.specid}&addtype=${e.type == 'plus' ? 1 : 0}`,
+							{},
+							res => {
+								this.getShoppingList(1);
+								// this.NumArray();
+								// let alrUs = {
+								// 	detail:{
+								// 		value:1
+								// 	}
+								// }
+								// this.checkAllChange(1);
+								// this.allChecked = true;
+							},
+							false,
+							() => {
+								// _this.loadlogo = true
+							}
+						);
+					}
+				});
+			});
+		},
+		getShoppingList(val) {
+			App._post_form(
+				`&p=citydelivery&do=cartinfo`,
+				{},
+				res => {
+					this.shoppingList = res.data.list;
+					this.price = 0;
+					this.count = 0;
+					this.shoppingList.map(item => {
+						this.price += item.cartinfo.totalmoney;
+						this.count += item.cartinfo.totalnum;
+					});
+					if(val == 1){
+						let alrUs = {
+							detail:{
+								value:1
+							}
+						}
+						this.checkAllChange(alrUs);
+						this.allChecked = true;
+					}
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		getChecked() {}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f7f7f7;
+}
+/* #ifdef APP-PLUS || MP */
+.tui-checkbox .wx-checkbox-input {
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 50%;
+	margin: 0;
+}
+
+.tui-checkbox .wx-checkbox-input.wx-checkbox-input-checked {
+	background: #f82400;
+	width: 40rpx;
+	height: 40rpx;
+	border: none;
+}
+
+/* #endif */
+/* #ifdef H5 */
+>>> .tui-checkbox .uni-checkbox-input {
+	width: 36rpx;
+	height: 36rpx;
+	border-radius: 50% !important;
+	margin: 0;
+}
+
+>>> .tui-checkbox .uni-checkbox-input.uni-checkbox-input-checked {
+	background: #f82400;
+	width: 40rpx;
+	height: 40rpx;
+	border: none;
+}
+
+/* #endif */
+</style>
+<style lang="scss" scoped>
+.foodName {
+	width: 385upx;
+	font-size: 30upx;
+	overflow: hidden; /*超出部分隐藏*/
+	white-space: nowrap; /*不换行*/
+	text-overflow: ellipsis; /*超出部分文字以...显示*/
+	font-weight: 600;
+}
+</style>
diff --git a/pages/subPages2/businessCenter/redReceive/redReceive.vue b/pages/subPages2/businessCenter/redReceive/redReceive.vue
new file mode 100644
index 0000000..dfce723
--- /dev/null
+++ b/pages/subPages2/businessCenter/redReceive/redReceive.vue
@@ -0,0 +1,422 @@
+<template>
+	<view class="container">
+		
+			<!-- style="text-align: center;position: relative;" -->
+			<view class="b-f redPag">
+				<view class="redpacket-title dis-flex flex-y-center">
+					<view class="f-34 redText dis-flex flex-x-center f-30 col-3">我的红包</view>
+					<view class="i iocn iconfont icon-close_light closeBtn f-24 dis-flex flex-box col-3" @click="closeBtn"></view>
+				</view>
+				<scroll-view scroll-y="true" class="scroll-Y">
+					<!-- <radio-group @change="radioChange"> -->
+					<evan-radio-group @change="radioChange" v-model="redPagId">
+						<view v-for="(item,index) in orderSubmitInfo" :key="item.id">
+							<view class="usedpacket m-top-btm10">
+								<view class="usedpacket-list">
+									<view class="usedpacket-list-item dis-flex">
+										<view class="usedpacket-itemleft p-r dis-flex flex-dir-column flex-x-center">
+											<view class="usedpacket-priceStyle col-f f-50 t-c">
+												<text class="f-30">¥</text>
+												{{ item.cut_money }}
+											</view>
+											<view class="f-24 col-f t-c">满{{ item.full_money }}可用</view>
+											<view class="itemleft_bgstyle"></view>
+											<view class="itemleft_bgstyle2"></view>
+										</view>
+										<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+											<view class="usedpacket_titleType dis-flex flex-y-center">
+												<view class="usedpacketType t-c m-right10 dis-flex flex-y-center">
+													<text class="col-f f-24">{{ item.label }}</text>
+												</view>
+												<view class="usedpacketTitle onelist-hidden f-28 col-3">{{ item.title }}</view>
+											</view>
+											<view class="col-9 f-24 m-top-btm10">范围：{{ item.use_where }}</view>
+											<view class="col-9 f-24">{{ item.time }}</view>
+											<view class="getDraw t-c col-f f-24">
+												
+												<!-- <evan-radio :value="item.id" clearable color="#ff4444"  /> -->
+												<!-- <evan-radio-group @change="radioChange" v-model="color"> -->
+													<!-- <view class="evan-radio-show__group-item" v-for="item in colorList" > -->
+														<evan-radio clearable :label="item.id" primaryColor="#ff4444"></evan-radio>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</evan-radio-group>
+					<view class="f-28" style="padding: 20upx 0;color: #333333;" v-if="noorderSubmitInfo.length > 0">
+						暂不可用红包({{noorderSubmitInfo.length}})
+					</view>
+					<evan-radio-group @change="radioChange" v-model="redPagId" v-if="noorderSubmitInfo.length > 0">
+						<view v-for="(item,index) in noorderSubmitInfo" :key="item.id">
+							<view class="usedpacket m-top-btm10">
+								<view class="usedpacket-list">
+									<view class="usedpacket-list-item dis-flex">
+										<view class="usedpacket-itemleft-l p-r dis-flex flex-dir-column flex-x-center">
+											<view class="usedpacket-priceStyle col-f f-50 t-c">
+												<text class="f-30">¥</text>
+												{{ item.cut_money }}
+											</view>
+											<view class="f-24 col-f t-c">满{{ item.full_money }}可用</view>
+											<view class="itemleft_bgstyle"></view>
+											<view class="itemleft_bgstyle2"></view>
+										</view>
+										<view class="usedpacket-itemright p-r flex-box b-f padding-box-all">
+											<view class="usedpacket_titleType dis-flex flex-y-center">
+												<view class="usedpacketType t-c m-right10 dis-flex flex-y-center">
+													<text class="col-f f-24">{{ item.label }}</text>
+												</view>
+												<view class="usedpacketTitle onelist-hidden f-28 col-3">{{ item.title }}</view>
+											</view>
+											<view class="col-9 f-24 m-top-btm10">范围：{{ item.use_where }}</view>
+											<view class="col-9 f-24">{{ item.time }}</view>
+											<view class="getDraw t-c col-f f-24">
+												
+												<!-- <evan-radio :value="item.id" clearable color="#ff4444"  /> -->
+												<!-- <evan-radio-group @change="radioChange" v-model="color"> -->
+													<!-- <view class="evan-radio-show__group-item" v-for="item in colorList" > -->
+														<evan-radio clearable disabled :label="item.id" primaryColor="#ff4444"></evan-radio>
+											</view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</evan-radio-group>
+				</scroll-view>
+			</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import PopManager from '@/components/template/PopManager';
+import EvanRadioGroup from '@/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue'
+import EvanRadio from '@/pages/subPages2/tamplate/evan-radio/evan-radio.vue'
+
+export default {
+	components: {
+		PopManager,
+		EvanRadio,
+		EvanRadioGroup
+	},
+	data() {
+		return {
+			colorList: [{ //暂时无用数据
+					label: '红色',
+					value: 'red'
+				},
+				{
+					label: '绿色',
+					value: 'green'
+				},
+				{
+					label: '蓝色',
+					value: 'blue'
+				},
+				{
+					label: '粉色',
+					value: 'pink'
+				},
+				{
+					label: '黑色',
+					value: 'black'
+				},
+			],
+			redPagId:'',
+			type: 'bottom',
+			redPagss: false,
+			MoneyOff: '',
+			current: 0,
+			flage:false,
+			orderSubmitInfo:[],
+			noorderSubmitInfo:[],
+			index:0,
+			redPagList:[]
+		};
+	},
+	onLoad(e) {
+		this.index = e.index;
+		this.redPagList = uni.getStorageSync('redPagList');
+		// debugger
+		this.orderSubmitInfo = JSON.parse(e.list);
+		this.getRedpag(e.price)
+	},
+	methods: {
+		getRedpag(price){
+			// App._post_form('&p=citydelivery&do=getRedpackList', {redpackTopMoney:price}, res => {
+				// console.log(res);
+				 // this.orderSubmitInfo = res.data.list;
+				 
+				 this.redPagList.map((item,index)=>{
+					 if(item.index == this.index){
+						this.orderSubmitInfo.map((items,indexs)=>{
+							if(items.id == item.id){
+								this.redPagId = item.id;
+							}
+						})
+					 }else{
+						this.orderSubmitInfo.map((items,indexs)=>{
+							if(items.id == item.id){
+								this.orderSubmitInfo.splice(indexs,1);
+							}
+						}) 
+					 }
+				 })
+			// })
+		},
+		closeBtn() {
+			let _this = this;
+			_this.redPagss = false;
+			uni.navigateBack({
+				delta:1
+			})
+			// for (let i = 0; i < this.orderSubmitInfo.length; i++) {
+			// 	_this.orderSubmitInfo[i].checked = false;
+			// }
+		},
+		radioChange: function(e,flag) {
+			let _this = this;
+			let data = {
+				selectId:'',
+				cancelId:419
+			};
+			if(e){
+				let obj = {
+					id:e,
+					index:this.index
+				};
+				this.redPagList.map((item,index)=>{
+					if(item.index == this.index){
+						this.redPagList.splice(index,1);
+					}
+				})
+				this.redPagList.push(obj);
+				uni.setStorageSync('redPagList',this.redPagList);
+				uni.navigateBack({
+					delta:1
+				})
+			}else{
+				this.redPagList.map((item,index)=>{
+					if(item.id == flag){
+						this.redPagList.splice(index,1);
+					}
+				});
+				uni.setStorageSync('redPagList',this.redPagList);
+			}
+			
+			// App._post_form('&p=citydelivery&do=selectRedpack', data, res => {
+			// 	console.log(res);
+				
+			// 	 // this.orderSubmitInfo = res.data.list;
+			// })
+			// let num = _this.orderSubmitInfo.length;
+			console.log(e,flag);
+			// debugger
+			// _this.orderSubmitInfo.forEach((item,index)=>{
+			// 	if(item.id == e){
+			// 		let obj = JSON.parse(JSON.stringify(item));
+			// 		obj.check = true;
+			// 		_this.$emit('priceis', obj);
+			// 	}else if(item.id == flag){
+			// 			let obj = JSON.parse(JSON.stringify(item));
+			// 			obj.check = false;
+			// 			_this.$emit('priceis', obj);
+			// 	}
+			// 	})
+			 // console.log(_this.redPagId);
+			 // console.log(_this.orderSubmitInfo);
+			// for (let i = 0; i < _this.orderSubmitInfo.length; i++) {
+			// 	if (_this.orderSubmitInfo[i].id == evt.target.value) {
+			// 		// _this.orderSubmitInfo[i].isCheked = !_this.orderSubmitInfo[i].isCheked;
+			// 		
+			// 	} else {
+			// 		// _this.orderSubmitInfo[i].isCheked = false;
+			// 	}
+			// }
+			// console.log(_this.orderSubmitInfo);
+			// _this.closeBtn();
+		}
+	},
+	props: {
+		// 红包弹出框显示
+		// noorderSubmitInfo:{
+		// 	type: Array,
+		// 	default: []
+		// }
+	},
+	watch: {
+		'orderSubmitInfo': {
+			handler(val,oldVal) {
+				// debugger
+				// setTimeout(()=>{
+				// 	if(val.length == 0){
+				// 		this.redPagId = ''
+				// 	}
+				// 	if(this.redPagId == ''){
+				// 		this.redPagId = this.orderSubmitInfo[0].id;
+				// 		let obj = JSON.parse(JSON.stringify(this.orderSubmitInfo[0]));
+				// 		obj.check = true;
+				// 		this.$emit('priceis',obj);
+				// 	}else{
+						
+				// 	}
+					
+					
+				// })
+			},
+			immediate: true,
+			deep: true, //对象内部的属性监听，也叫深度监听
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.redPag {
+	width: 100vw;
+	// height: 830upx;
+	padding: 40upx 30upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 20px 20px 0px 0px;
+	box-sizing: border-box;
+}
+.scroll-Y {
+	// height: 750upx;
+}
+.redpacket-title {
+	width: 100%;
+}
+.redText {
+	width: 95%;
+	flex-shrink: 0;
+}
+.usedpacket {
+	.usedpacket-list {
+		.usedpacket-list-item {
+			height: 170upx;
+			.usedpacket-itemleft-l {
+				width: 28%;
+				height: 100%;
+				background-color: #CCCCCC;
+				padding: 0 20upx;
+				flex-shrink: 0;
+			
+				.usedpacket-priceStyle {
+					margin-right: 12upx;
+			
+					> text {
+						display: inline-block;
+						vertical-align: top;
+						margin-top: 4upx;
+					}
+				}
+			
+				.itemleft_bgstyle {
+					width: 30upx;
+					height: 30upx;
+					border-radius: 50%;
+					position: absolute;
+					left: -16upx;
+					top: 50%;
+					transform: translateY(-50%);
+					background-color: #f8f8f8;
+				}
+			
+				.itemleft_bgstyle2 {
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 1%;
+					height: 170upx;
+					padding-left: 4upx;
+					color: #fff;
+					box-sizing: border-box;
+					background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+					background-size: 16upx 16upx;
+					background-position: 16upx 0px;
+					background-color: #fff;
+				}
+			}
+			.usedpacket-itemleft {
+				width: 28%;
+				height: 100%;
+				background: linear-gradient(129deg, rgba(251, 131, 81, 1) 0%, rgba(255, 68, 68, 1) 100%);
+				padding: 0 20upx;
+				flex-shrink: 0;
+
+				.usedpacket-priceStyle {
+					margin-right: 12upx;
+
+					> text {
+						display: inline-block;
+						vertical-align: top;
+						margin-top: 4upx;
+					}
+				}
+
+				.itemleft_bgstyle {
+					width: 30upx;
+					height: 30upx;
+					border-radius: 50%;
+					position: absolute;
+					left: -16upx;
+					top: 50%;
+					transform: translateY(-50%);
+					background-color: #f8f8f8;
+				}
+
+				.itemleft_bgstyle2 {
+					position: absolute;
+					right: 0;
+					top: 0;
+					width: 1%;
+					height: 170upx;
+					padding-left: 4upx;
+					color: #fff;
+					box-sizing: border-box;
+					background: radial-gradient(transparent 0, transparent 8upx, #fff 8upx);
+					background-size: 16upx 16upx;
+					background-position: 16upx 0px;
+					background-color: #fff;
+				}
+			}
+
+			.usedpacket-itemright {
+				height: 100%;
+
+				.usedpacket_titleType {
+					.usedpacketType {
+						padding: 0 6upx;
+						height: 28upx;
+						background-color: #ff4444;
+						border-radius: 14upx;
+
+						> text {
+							display: inline-block;
+							transform: scale(0.85);
+						}
+					}
+
+					.usedpacketTitle {
+						width: 240upx;
+					}
+				}
+			}
+
+			.getDraw {
+				position: absolute;
+				right: 30upx;
+				top: 50%;
+				transform: translateY(-50%);
+				line-height: 40upx;
+				border-radius: 20upx;
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/cleanCustom/bindingPhone.vue b/pages/subPages2/cleanCustom/bindingPhone.vue
new file mode 100644
index 0000000..ca6ee83
--- /dev/null
+++ b/pages/subPages2/cleanCustom/bindingPhone.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="binding"> 
+	<!-- 客户定制绑定手机的组件 -->
+		<view class="img">
+			<image :style="{width: imgStyle.width + 'px', height:imgStyle.height + 'px' }" :src="logo" mode=""></image>
+		</view>
+		<view  style="padding: 50upx;">
+			<view class="f-36 f-w">
+				手机绑定
+			</view>
+			<view class="dis-flex inputbox">
+				<!-- <view class="f-28 col-9">
+					
+				</view> -->
+				<input class="inputclass" placeholder="请输入手机号" v-model="phone" maxlength="11" type="number" value="" />
+			</view>
+			<view class="dis-flex inputbox" v-if='smsver == 0' style="margin-top: 40upx;">
+				<!-- <view class="f-28 col-9">
+					
+				</view> -->
+				<input class="inputclass" placeholder="请输入验证码" v-model="smsCode"  maxlength="11" type="number" value="" />
+				<view class="f-28 col-f4" v-if="min>0">
+					请等待{{min}}s
+				</view>
+				<view class="f-28 col-f4" v-else @click="PIN()">
+					发送验证码
+				</view>
+			</view>
+			<view class="bindingBtn" @click="changeMobile">
+				绑 定
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	export default{
+		data(){
+			return{
+				min:0,
+				phone:'',
+				getSmsCode:'',
+				smsver:'',
+				smsCode:'',
+				imgStyle:{},
+				logo:''
+			}
+		},
+		onLoad() {
+			let _this = this;
+			_this.smsver = uni.getStorageSync('platformInfor').smsver;
+			_this.imgStyle = uni.getStorageSync('imgstyle');
+			_this.logo = uni.getStorageSync('platformInfor').logo;
+		},
+		methods:{
+			// 改绑手机
+			changeMobile() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showModal({
+						showCancel:false,
+						content:'请输入正确的手机号'
+					})
+					return;
+				}
+				if (_this.smsCode == '' && _this.smsver == 0) {
+					uni.showModal({
+						showCancel:false,
+						content:'请输入验证码'
+					})
+					return;
+				}
+				let data = {
+					mobile: _this.phone,
+					mergeflag: '',
+					code: _this.smsCode
+				};
+				App._post_form(
+					'&p=member&do=changeMobile',
+					data,
+					res => {
+						
+						_this.phone = '';
+						_this.smsCode = '';
+						uni.showToast({
+							icon:'success',
+							title: '绑定成功'
+						});
+						setTimeout(()=>{
+							uni.reLaunch({
+							    url: '/pages/mainPages/index/index'
+							});
+						},1000)
+						// _this.show1 = false;
+					},
+					errno => {
+						if (!!errno.data.data.code && errno.data.data.code === 1 || errno.data.message == '手机号已存在,无法重复绑定') return
+						uni.showModal({
+							title: '友情提示',
+							content: errno.data.message,
+							showCancel: true,
+							success(res) {
+								if (res.confirm) {
+									let data = {
+										mobile: _this.phone,
+										mergeflag: 1,
+										code: _this.smsCode
+									};
+									App._post_form('&p=member&do=changeMobile', data, res => {
+										_this.phone = '';
+										_this.smsCode = '';
+										uni.showToast({
+											icon:'success',
+											title: '绑定成功'
+										});
+										setTimeout(()=>{
+											uni.reLaunch({
+											    url: '/pages/mainPages/index/index'
+											});
+										},1000)
+										// _this.$emit('clickmask1');
+										// _this.show1 = false;
+									});
+								}
+							}
+						});
+					}
+				);
+			},
+			PIN() {
+				let _this = this;
+				if (_this.phone == '' || _this.phone.length !== 11) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号',
+						duration: 2000
+					});
+					return;
+				}
+				let data = {
+					phone: _this.phone,
+					type: 2,
+					code:'',
+					time:''
+				};
+				
+				App._post_form('&do=PIN', data, res => {
+					_this.getSmsCode = res.data.code;
+					_this.min = 60;
+					_this.sendcode();
+				});
+			},
+			sendcode(){
+				let _this = this;
+				if(_this.min != 0){
+					_this.min--;
+					setTimeout(()=>{
+						_this.sendcode()
+					},1000)
+				}
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.binding{
+		// padding: 50upx;
+		// margin-top: 240upx;
+		.inputbox{
+			border-bottom: 1upx solid #cccccc;
+			height: 100upx;
+			line-height: 100upx;
+			.inputclass{
+				flex: 1;
+				text-align: left;
+				height: 100upx;
+				line-height: 100upx;
+				font-size: 28upx;
+			}
+		}
+		.bindingBtn{
+			height: 90upx;
+			line-height: 90upx;
+			background-color: #ff4444;
+			border-radius: 60upx;
+			color: #ffffff;
+			text-align: center;
+			font-size: 30upx;
+			margin-top: 90upx;
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #F8f8f8;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages2/cleanCustom/cleanCustom.vue b/pages/subPages2/cleanCustom/cleanCustom.vue
new file mode 100644
index 0000000..5414808
--- /dev/null
+++ b/pages/subPages2/cleanCustom/cleanCustom.vue
@@ -0,0 +1,213 @@
+<template>
+	<view class="cleanCustom">
+		<!-- 用户定制的积分转赠 -->
+		<loadlogo v-if="!loadlogo" />
+		<view class="page-content">
+			<view class="content-title" :style="'background: url('+ (imgfixUrls + 'cleanimg.png') +');background-size: 100% 200upx;background-repeat: no-repeat;'">
+				<view class="f-24 col-f">
+					我的积分
+				</view>
+				<view class="f-50 col-f">
+					{{pageData.mycredit}}
+				</view>
+			</view>
+			<view class="datum">
+				<text class="f-32 f-w">积分转赠</text>
+				<text class="f-20 col-9" style="padding-left: 10upx;">手续费：{{pageData.integralsxf}}%</text>
+				<view class="dis-flex inputClass" style="margin-top: 40upx;">
+					<view class="f-w">
+						对方手机号码
+					</view>
+					<input type="text" v-model="mobile" class="classinput" maxlength="11" />
+				</view>
+				<view class="dis-flex inputClass" style="margin-top: 20upx;">
+					<view class="f-w">
+						转赠数量
+					</view>
+					<input type="digit" @input="inputchage" v-model="numberdata"  class="classinput"  placeholder="积分" />
+				</view>
+				<view class="dis-flex" style="padding-top: 20upx;">
+					<view class="f-24 col-9">
+						最多可赠送{{pageData.mycredit}}积分
+					</view>
+					<view class="f-24 col-9 t-r flex-box">
+						手续费：<text class="col-f4">{{service}}积分</text>
+					</view>
+				</view>
+				<view class="dis-flex inputClass" style="margin-top: 40upx;">
+					<view class="f-w">
+						支付密码
+					</view>
+					<input type="text" v-model="password" class="classinput" />
+				</view>
+			</view>
+		</view>
+		<view class="bottomBtn dis-flex">
+			<view class="flex-box p-30" style="padding: 24upx;">
+				<view class="f-32 f-w col-f4">
+					{{payservice}}
+				</view>
+				<view class="f-24 col-9">
+					支付积分
+				</view>
+			</view>
+			<view class="paybtn" @click="giveas">
+				确认转赠
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import Loadlogo from '@/components/template/loadlogo'
+	export default{
+		data(){
+			return{
+				pageData:{},
+				numberdata:'',
+				password:'',
+				mobile:'',
+				loadlogo:false
+			}
+		},
+		components:{
+			Loadlogo
+		},
+		onLoad() {
+			this.getPageData();
+		},
+		computed:{
+			service() {
+			    return Math.round(this.numberdata * (this.pageData.integralsxf / 100) * 100) / 100 ;
+			},
+			payservice(){
+				return Math.round((Number(this.service) + Number(this.numberdata)) * 100) / 100;
+			}
+		},
+		methods:{
+			giveas(){
+				let _this = this;
+				if(!_this.mobile){
+					uni.showModal({
+						showCancel:false,
+						content:'请输入转赠手机号'
+					});
+					return
+				}
+				if(!_this.numberdata){
+					uni.showModal({
+						showCancel:false,
+						content:'请输入转赠积分'
+					});
+					return
+				}
+				if(!_this.password){
+					uni.showModal({
+						showCancel:false,
+						content:'请输入支付密码'
+					});
+					return
+				}
+				App.showError(
+					`是否确认向手机号位${_this.mobile}的用户转赠${_this.numberdata}积分?`,
+					data => {
+						if (data.confirm) {
+						let data = {
+							credit:_this.numberdata,
+							pwd:_this.password,
+							mobile:_this.mobile
+						}
+						App._post_form('&p=Member&do=integralApi', data, res => {
+							uni.showToast({
+								title:'操作成功'
+							});
+							// _this.numberdata = '';
+							// _this.password = '';
+							// _this.mobile = '';
+						}, false, () => {
+							
+						})
+					}
+					},
+					true
+				);
+				
+			},
+			inputchage(e){
+				console.log(e);
+				
+			},
+			getPageData(){
+				let _this = this;
+				App._post_form('&p=Member&do=integralPage', {}, res => {
+					this.pageData = res.data;
+				}, false, () => {
+					_this.loadlogo = true;
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.cleanCustom{
+		
+		.page-content{
+			padding: 30upx;
+			.content-title{
+				width: 100%;
+				height: 200upx;
+				// line-height: 200upx;
+				border-radius: 20upx;
+				padding: 40upx;
+				box-sizing: border-box;
+			}
+			.datum{
+				margin-top: 50upx;
+				.inputClass{
+					height: 80upx;
+					line-height: 80upx;
+					color: #333333;
+					border: 2upx solid #eeeeee;
+					font-size: 28upx;
+					padding: 0 20upx;
+					border-radius: 10upx;
+				}
+				.classinput{
+					height: 80upx;
+					line-height: 80upx;
+					font-size: 28upx;
+					flex: 1;
+					text-align: right;
+				}
+			}
+		}
+		.bottomBtn{
+			background-color: #ffffff;
+			height: 120upx;
+			position: fixed;
+			width: 100vw;
+			box-sizing: border-box;
+			
+			left: 0;
+			bottom: 0;
+			position: fixed;
+			.paybtn{
+				flex: 0.5;
+				height: 120upx;
+				line-height: 120upx;
+				background-color: #2772FD;
+				color: #ffffff;
+				font-size: 32upx;
+				font-weight: bold;
+				text-align: center;
+			}
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #f8f8f8;
+	}
+</style>
diff --git a/pages/subPages2/coursegoods/coursegoods.vue b/pages/subPages2/coursegoods/coursegoods.vue
new file mode 100644
index 0000000..8bbe28a
--- /dev/null
+++ b/pages/subPages2/coursegoods/coursegoods.vue
@@ -0,0 +1,998 @@
+<template>
+	<view >
+		<view ></view>
+		<view class="audio-main" @click="playAudio" style="top: 1.5%;right: 30upx;" v-if="!!goodsData.bgmusic">
+			<view class="audio-bg" :class="{ 'stop-audio': !play_Audio }">
+				<view class="audio-gif" :style="{ 'background-image': 'url(' + imageRoot + 'musicgif.gif)' }">
+					<view class="audio-png" :style="{ 'background-image': 'url(' + imageRoot + 'music.png)' }"></view>
+				</view>
+			</view>
+		</view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="content" v-if="loadlogo">
+			<view class="titleimg" :style="{ width: imgstyle.width + 'px', height: imgstyle.height + 'px' }" v-if="goodsData.advs.length > 0">
+				<!-- 轮播图 -->
+				<view class="b-f">
+					<swiper
+						:style="{ width: imgstyle.width + 'px', height: imgstyle.height + 'px' }"
+						:indicator-dots="true"
+						indicator-color="#ffffff"
+						indicator-active-color="#cccccc"
+						:autoplay="true"
+						:interval="3000"
+						:circular="true"
+						class="goods-swiper"
+					>
+						<swiper-item class="swiper-item" v-for="(item, index) in goodsData.advs" :key="index">
+							<image :style="{ width: imgstyle.width + 'px', height: imgstyle.height + 'px' }" :src="item"></image>
+							<!-- <view class="swiper-item-img" :style="{backgroundImage: 'url(' + adv_item + ')'}" @load="imageLoad" :data-id="index"></view> -->
+						</swiper-item>
+					</swiper>
+				</view>
+				<view class="titlenum">{{ goodsData.pv }}人喜欢</view>
+			</view>
+			<!-- 商品信息 -->
+			<view class="goodsdatum">
+				<view class="goods_name t-l" @click="copy(goodsData.title)">{{ goodsData.title }}</view>
+				<!-- 价格 -->
+				<view class="goods_price dis-flex">
+					<view  style="flex: 0.5;height: 50upx;">
+						<text class="f-20 c-ff4444">¥</text>
+						<text class="f-50 f-w c-ff4444">{{ goodsData.price }}</text>
+						<text v-if="goodsData.optionstatus == 1" style="font-size: 20upx;color: #FF4444;padding-left: 10upx;">起</text>
+						<!-- <text class="f-20" style="text-decoration:line-through;color: #999999;padding-left: 10upx;">¥100.00</text> -->
+					</view>
+					<view class="t-r f-20" style="color: #999999;flex: 0.5;height: 50upx;line-height: 70upx;">报名{{ goodsData.salenum }}人</view>
+				</view>
+				<!-- 时间 -->
+				<view class="goods_time dis-flex f-26">
+					<view class="iconfont icon-shijian" style="height: 60upx;line-height: 60upx;color: #999999;"></view>
+					<view >
+						<view class="time-item">
+							<text>活动时间:</text>
+							<text class="p-left-right-20">{{ goodsData.activestarttime }}</text>
+							<text>至</text>
+							<text class="p-left-right-20">{{ goodsData.activeendtime }}</text>
+						</view>
+						<view class="time-item">
+							<text>报名时间:</text>
+							<text class="p-left-right-20">{{ goodsData.enrollstarttime }}</text>
+							<text>至</text>
+							<text class="p-left-right-20">{{ goodsData.enrollendtime }}</text>
+						</view>
+					</view>
+				</view>
+				<!-- 图集 -->
+				<view class="goods_time dis-flex f-20" style="border: none; padding-bottom: 0;" v-if="goodsData.thumbs.length > 0">
+					<view class="iconfont icon-pic" style="height: 80upx;line-height: 80upx;color: #999999;padding-right: 20upx;"></view>
+					<view class="img-box dis-flex">
+						<view class="item-img-box dis-il-block" v-for="(item, index) in goodsData.thumbs" :key="index" v-if="index < 5" @click="lookimg(index)">
+							<image class="img-item" :src="item" mode=""></image>
+						</view>
+						<view class="item-img-box dis-il-block f-50 t-c morebox" v-if="goodsData.thumbs.length > 5">...</view>
+					</view>
+					<view class="moreimg" @click="lookimg(0)">
+						{{ goodsData.thumbs.length }}张
+						<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+					</view>
+				</view>
+			</view>
+			<!-- 商家信息 -->
+			<view class="merchant">
+				<view ><goodsHeaderTitle :titleName="'商家详情'"></goodsHeaderTitle></view>
+				<view class="f-30 f-w merchant-title dis-flex" >{{ goodsData.storeinfo.storename }}
+					<view class="t-r col-f4 flex-box" @click="goStore">
+						点击进入<text class="iconfont icon-right" ></text>
+					</view>
+				</view>
+				<view class="f-22 merchant-item" >
+					营业时间:
+					<text style="padding-left: 20upx;">{{ goodsData.storeinfo.storehours }}</text>
+					<view class="dis-il-block merchant-icon" @click.stop="goLt"><image :src="imgfixUrls + 'merchant/spLt.png'" /></view>
+				</view>
+				<view class="f-22 merchant-item" @click.stop="goStore">
+					商家电话:
+					<text style="padding-left: 20upx;">{{ goodsData.storeinfo.mobile }}</text>
+					<view class="dis-il-block iconfont icon-dianhua merchant-icon" @click.stop="suput"></view>
+				</view>
+				<view class="f-22 merchant-item" @click.stop="goStore">
+					{{ goodsData.address || goodsData.storeinfo.address }}
+					<view class="dis-il-block iconfont icon-daohang merchant-icon" @click.stop="addear"></view>
+				</view>
+			</view>
+			<!-- 最近参与 -->
+			<view class="dis-flex recently" v-if="goodsData.memberlist">
+				<view class="f-30" style="padding-right: 20upx;height: 70upx;line-height: 70upx;">最近参与</view>
+				<view class="recently-img-box">
+					<view
+						class="recently-img-item dis-il-block"
+						v-for="(item, index) in goodsData.memberlist"
+						:style="{ left: -(index * 20) + 'rpx', zIndex: 5 - index }"
+						v-if="index < 4"
+					>
+						<image style="width: 100%;height: 100%;border-radius: 50%;" :src="item" mode=""></image>
+					</view>
+					<view
+						class="recently-img-item dis-il-block t-c"
+						v-if="goodsData.memberlist.length > 5"
+						style="background-color: #EEEEEE;color: #999999;left: -80upx;top: -30upx;font-weight: 500;"
+					>
+						...
+					</view>
+				</view>
+			</view>
+			<!-- 活动详情 -->
+			<view class="detailParticulars" v-if="goodsData.detail">
+				<view><goodsHeaderTitle :titleName="'活动信息'"></goodsHeaderTitle></view>
+				<view>
+					<jyf-parser
+						domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+						gesture-zoom
+						lazy-load
+						ref="article"
+						selectable
+						show-with-animation
+						use-anchor
+						:html="goodsData.detail"
+					></jyf-parser>
+				</view>
+			</view>
+			<view class="bottom-btn dis-flex">
+				<view class="dis-flex" style="padding: 0 30upx;flex: 0.5;">
+					<view class="btn-item" @click="goindex">
+						<view class="iconfont icon-home btn-icon"></view>
+						<view class="btn-text">首页</view>
+					</view>
+					<view class="btn-item" @click="openshare">
+						<view class="iconfont icon-share btn-icon"></view>
+						<view class="btn-text">分享</view>
+					</view>
+					<view class="btn-item" @click="goestali">
+						<view class="iconfont icon-wode btn-icon"></view>
+						<view class="btn-text">我的</view>
+					</view>
+				</view>
+				<view class="red_btn">
+					<view class="item-btn" @click="apply">{{ goodsData.status == '1' ? '未开始' : goodsData.status == '2' ? btntext : '已结束' }}</view>
+				</view>
+			</view>
+			<PopManager :show="application" type="bottom" @clickmask="closeapplication">
+				<view class="showApply" style="height: 750upx;overflow: auto;">
+					<view class="f-40 f-w p-b-20">报名须知</view>
+					<view >
+						<jyf-parser
+							domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+							gesture-zoom
+							lazy-load
+							ref="article"
+							selectableshow-with-animation
+							use-anchor
+							:html="goodsData.enrolldetail"
+						></jyf-parser>
+					</view>
+				</view>
+			</PopManager>
+			<PopManager :show="signShow" type="bottom" @clickmask="signShow = false">
+				<view class="showApply" style="position: relative;" v-if="signShow">
+					<view class="dis-flex">
+						<view style="flex: 0.3;"><image class="goodsLogo" :src="goodsData.thumb" mode=""></image></view>
+						<view  style="flex: 0.7;">
+							<view class="dis-flex" style="padding-top: 10upx;">
+								<view class="rmb">¥</view>
+								<view class="picea" v-if="!!goodsData.specarray">{{ goodsData.specarray[checkIndex].price || goodsData.price }}</view>
+								<view class="picea" v-else>{{ goodsData.price }}</view>
+								<view class=" f-20" style="margin-top: 5upx;" v-if="goodsData.vipstatus != '0'">
+									<view class="dis-il-block huiyuan" v-if="goodsData.vipstatus !== '0'">{{ goodsData.levelname }}</view>
+									<view class="dis-il-block zhekou" v-if="goodsData.vipstatus == '1' && goodsData.specarray">
+										立减¥{{ goodsData.specarray[checkIndex].discount_price }}
+									</view>
+									<view class="dis-il-block zhekou" v-if="goodsData.vipstatus == '1' && !goodsData.specarray">立减¥{{ goodsData.discount_price }}</view>
+								</view>
+								<view class="iconfont icon-roundclose roundclose" @click="close"></view>
+							</view>
+							<view class="f-26" style="padding: 90upx 0 0 20upx;" v-if="goodsData.specarray">
+								<text style="padding-right: 10upx;">选择</text>
+								<text style="padding-right: 10upx;">{{ goodsData.specarray[checkIndex].name }}</text>
+								<text style="padding-right: 10upx;">{{ goodsNumber }}件</text>
+							</view>
+							<view class="f-26" style="padding: 90upx 0 0 20upx;" v-else>
+								<text style="padding-right: 10upx;">选择</text>
+								<text style="padding-right: 10upx;">{{ goodsData.title }}</text>
+								<text style="padding-right: 10upx;">{{ goodsNumber }}件</text>
+							</view>
+						</view>
+					</view>
+					<view class="f-32" style="font-weight: 500;padding: 30upx 0;" v-if="goodsData.specarray">规格选择</view>
+					<view
+						class="tag-a dis-flex"
+						:style="{ border: checkIndex == index ? '1rpx solid #ff4444' : '1rpx solid #cccccc' }"
+						v-for="(item, index) in goodsData.specarray"
+						:key="index"
+						@click="checkedTag(item, index)"
+					>
+						<view class="f-32" style="flex: 0.5;line-height: 60upx;width: 300upx;">{{ item.name }}</view>
+						<view class="f-32" style="flex: 0.5;">
+							<view class="dis-flex t-c" style="padding-top: 10upx;">
+								<view
+									class=" f-20"
+									style="margin-top: 5upx;width: 280upx;"
+									v-if="checkIndex == index && (goodsData.vipstatus != '0' && goodsData.vipstatus == '1')"
+								>
+									<view class="dis-il-block huiyuan">{{ goodsData.levelname }}</view>
+									<view class="dis-il-block zhekou">立减¥{{ item.discount_price }}</view>
+								</view>
+								<view
+									class=" f-20"
+									style="margin-top: 5upx;width: 200upx;"
+									v-else-if="checkIndex == index && (goodsData.vipstatus != '0' && goodsData.vipstatus == '2')"
+								>
+									<view class="dis-il-block zhekou" style="border-radius: 60upx;">会员特供</view>
+								</view>
+								<view  style="width: 190upx;" v-else></view>
+								<text class="rmb">¥</text>
+								<text class="picea">{{ item.price }}</text>
+							</view>
+						</view>
+						<view class="iconfont icon-check checked" v-if="checkIndex == index"></view>
+					</view>
+					<view class="dis-flex">
+						<view class="f-32" style="flex: 0.8;">数量</view>
+						<view class="dis-flex" style="flex: 0.2;">
+							<view class="n-Number btnactive" :style="{ color: goodsNumber == 1 ? '#999999' : '#333333' }" @click="reduce">-</view>
+							<view class="n-Number" style="box-sizing: border-box;padding-top: 5upx;margin: 0 10upx;">
+								<input type="number" maxlength="3" @blur="inputNumber" v-model="goodsNumber" />
+							</view>
+							<view class="n-Number btnactive" @click="add">+</view>
+						</view>
+					</view>
+				</view>
+			</PopManager>
+			<view >
+				<follow
+					:followShow="followShow"
+					:followType="followType"
+					:followTitleShow="followTitleShow"
+					@clickmask="openQrShow"
+					@closeFollowPop="closeFollowPop"
+					@closeFollowTitle="closeFollowTitle"
+					:followData="followData"
+				></follow>
+			</view>
+			<shareBottom
+				:shareBottomShow="shareBottomShow"
+				@clickmask="closeShareBottom"
+				:shareShow="shareShow"
+				@closeShareShow="closeShareShow"
+				@shareImgShow="shareImgShow"
+				:isCard="isCard"
+				:postId="id"
+				@gohb="goPost"
+				:postType="'14'"
+			></shareBottom>
+			<!-- #ifdef H5 -->
+			<view class="masking" v-if="isShare" @click="isShare = false"><image :src="imageRoot + 'share.png'" class="to-share" mode="widthFix"></image></view>
+			<!-- #endif -->
+		</view>
+	</view>
+</template>
+
+<script>
+let innerAudioContext = uni.createInnerAudioContext();
+import App from '@/common/js/app.js';
+import goodsHeaderTitle from '@/components/template/goodsHeaderTitle.vue';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import PopManager from '@/components/template/PopManager';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import shareBottom from '@/components/template/shareBottom';
+import follow from '@/components/template/follow.vue';
+import Map from '@/common/js/ms-openMap/openMap.js'
+export default {
+	data() {
+		return {
+			imgstyle: {},
+			imgs: [1, 2, 23, 3, 2, , 1, 1, 1],
+			gdimgs: [1, 2, 2, 3, 1, 1, 1],
+			signShow: false,
+			tags: [1, 2, 3],
+			checkIndex: 0,
+			goodsNumber: 1,
+			goodsData: {
+				thumbs: [],
+				advs: []
+			},
+			loadlogo: false,
+			application: false,
+			shareBottomShow: false,
+			shareShow: false,
+			id: '',
+			isShare: false,
+			goodsId: {},
+			btntext: '立即报名',
+			followTitleShow: true,
+			followShow: false,
+			followType: '10',
+			followData: {},
+			play_Audio: false
+		};
+	},
+	components: {
+		goodsHeaderTitle,
+		jyfParser,
+		PopManager,
+		shareBottom,
+		follow,
+		Loadlogo
+	},
+	onHide() {
+		let _this = this,
+			play_Audio = false,
+			pageAudio = _this.goodsData.bgmusic;
+		if (!play_Audio) {
+			innerAudioContext.pause();
+			innerAudioContext.onPause(() => {
+				console.log('暂停播放');
+			});
+		}
+		_this.play_Audio = play_Audio;
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.id = e.id;
+		_this.imgstyle = uni.getStorageSync('imgstyle');
+		_this.getGoodsData(e.id);
+	},
+	computed: {
+		isCard() {
+			let ClientType = App.getClientType();
+			return ClientType !== '3' ? false : true;
+		},
+		cardShare() {
+			return this.$store.state.isCardshare;
+		}
+	},
+	onShow() {
+		this.playAudio();
+	},
+	methods: {
+		// 联系商家
+		goLt() {
+			let _this = this
+			// App.navigationTo({
+			// 	url: "pages/subPages/homepage/chat/chat?other_party_id=" + _this.dataInfo.sid + '&other_party_type=2' +
+			// 		'&type=1'
+			// })
+			let getSetInfo = uni.getStorageSync('getSetInfo');
+			if(getSetInfo.type == 1){
+				App.navigationTo({
+					url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + _this.goodsData.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+				})
+			}else{
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + _this.goodsData.sid + '&other_party_type=' + 2+ '&type=1' + '&id='
+				})
+			}
+		},
+		goStore(){
+			App.navigationTo({
+				url: `pages/mainPages/store/index?sid=${this.goodsData.sid}`
+			});
+		},
+		copy(value) {
+			//#ifdef H5
+				App.clipboard(value);
+			//#endif
+			uni.setClipboardData({
+				data: value
+			});
+			uni.showToast({
+				title: '商品名已复制到粘贴板',
+				icon: 'none'
+			});
+		},
+		closeapplication() {
+			this.application = false;
+			this.btntext = '立即报名';
+		},
+		closeFollowTitle() {
+			let _this = this;
+			_this.followTitleShow = false;
+		},
+		closeFollowPop() {
+			let _this = this;
+			_this.followShow = false;
+		},
+		openQrShow() {
+			let _this = this;
+			_this.followShow = true;
+		},
+		openshare() {
+			this.shareBottomShow = true;
+		},
+		goPost(data) {
+			let _this = this;
+			_this.shareBottomShow = false;
+		},
+		shareImgShow() {
+			let _this = this;
+			_this.shareShow = true;
+			_this.shareBottomShow = false;
+		},
+		// 关闭分享弹框
+		closeShareShow() {
+			let _this = this;
+			_this.shareShow = false;
+			_this.shareBottomShow = false;
+		},
+		closeShareBottom() {
+			let _this = this;
+			_this.shareBottomShow = false;
+		},
+		lookimg(index) {
+			let _this = this;
+			uni.previewImage({
+				current: _this.goodsData.thumbs[index],
+				urls: _this.goodsData.thumbs
+			});
+		},
+		playAudio() {
+			let _this = this,
+				play_Audio = _this.play_Audio ? false : true,
+				pageAudio = _this.goodsData.bgmusic;
+			if (play_Audio) {
+				//#ifdef H5
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							innerAudioContext.play();
+							innerAudioContext.loop = true;
+						}
+					});
+				});
+				//#endif
+				//#ifndef H5
+				// innerAudioContext.play();
+				innerAudioContext.loop = true;
+				innerAudioContext.play();
+				//#endif
+
+				innerAudioContext.onPlay(() => {
+					console.log('开始播放');
+				});
+			}
+			if (!play_Audio) {
+				innerAudioContext.pause();
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			innerAudioContext.onError(res => {
+				// console.log(res.errMsg);
+				// console.log(res.errCode);
+				innerAudioContext.destroy();
+				//发生错误后，销毁实例
+			});
+			_this.play_Audio = play_Audio;
+		},
+		getGoodsData(id) {
+			let _this = this;
+			App._post_form(
+				`&p=activity&do=activityDetail&id=${id}`,
+				{},
+				res => {
+					console.log(res);
+					if (res.data.url) {
+						// uni.redirectTo({
+						// 	url:
+						// });
+						// debugger
+						if(res.data.url.indexOf('http') === -1){  //判断是否为外链活动
+							App.navigationTo({
+								url:res.data.url
+							})
+						}else{ //外链活动则新建视图
+							let urls = encodeURIComponent(res.data.url);
+							uni.redirectTo({
+								url: `/pages/subPages/webview/webview?src=${urls}`
+							});
+						}
+						return;
+					}
+					_this.goodsData = res.data;
+					if (!_this.goodsData.advs) {
+						_this.goodsData.advs = [];
+					}
+					if (!_this.goodsData.thumbs) {
+						_this.goodsData.thumbs = [];
+					}
+					if (_this.goodsData.specarray) {
+						_this.goodsId = res.data.specarray[0];
+					}
+
+					if (!!res.data.bgmusic) {
+						// innerAudioContext.src = res.data.bgmusic;
+						// console.log(innerAudioContext.src);
+						innerAudioContext.src = encodeURI(res.data.bgmusic);
+						setTimeout(() => {
+							//#ifdef H5
+							jWeixin.ready(() => {
+								innerAudioContext.loop = true;
+								innerAudioContext.play();
+							});
+							//#endif
+							//#ifndef H5
+							innerAudioContext.loop = true;
+							innerAudioContext.play();
+							//#endif
+							
+							// _this.playAudio();
+						});
+					}
+					// console.log(_this.goodsData.)
+					// debugger
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+				}
+			);
+		},
+		goindex() {
+			App.navigationTo({
+				url: `pages/mainPages/index/index`
+			});
+		},
+		goestali() {
+			console.log(111);
+			App.navigationTo({
+				url: `pages/mainPages/userCenter/userCenter`
+			});
+		},
+		addear() {
+			let location = {};
+			if(this.goodsData.addresstype == 1){
+				location = {
+					location:{
+						lat:this.goodsData['lat'],
+						lng:this.goodsData['lng']
+					},
+					storename:this.goodsData['address'],
+					address:this.goodsData['address']
+				}
+			}else{
+				location = this.goodsData.storeinfo;
+			}
+			console.log(location)
+			debugger
+			// #ifdef H5
+			wxApi.WxopenLocation(location.location['lat'], location.location['lng'], location['storename'], location['address']);
+			// #endif
+			// #ifdef MP-WEIXIN
+			App.openLocation(location);
+			// #endif
+			//#ifdef APP-PLUS
+			    Map.openMap(Number(location.location['lat']),Number(location.location['lng']),location['storename'],'gcj02')
+			 //#endif
+		},
+		suput() {
+			uni.makePhoneCall({
+				phoneNumber: this.goodsData.storeinfo.mobile //仅为示例
+			});
+		},
+		apply() {
+			let _this = this;
+			if (this.goodsData.status !== '2') return;
+			let data = {
+				type: '4',
+				id: _this.id
+			};
+
+			console.log('点了');
+			// debugger
+			if (!this.application && !this.signShow && this.goodsData.enrolldetail) {
+				this.application = true;
+				this.btntext = '同意';
+			} else if ((this.application && !this.signShow) || (!this.goodsData.enrolldetail && !this.application && !this.signShow)) {
+				this.application = false;
+				this.signShow = true;
+				this.btntext = '立即报名';
+			} else if (!this.application && this.signShow) {
+				App._post_form('&do=follow', data, res => {
+					if (res.data.status == 0) {
+						let goods;
+						if (this.goodsData.specarray) {
+							this.goodsData.specarray.map(item => {
+								if (item.id == _this.goodsId.id) {
+									goods = item;
+								}
+							});
+						} else {
+							goods = this.goodsData;
+						}
+						if (goods.surplus == 0) {
+							uni.showToast({
+								title: `当前规格报名人数已满`,
+								icon: 'none'
+							});
+							return;
+						} else if (goods.surplus < _this.goodsNumber) {
+							uni.showToast({
+								title: `当前剩余报名人数为${goods.surplus}人`,
+								icon: 'none'
+							});
+							this.goodsNumber = goods.surplus;
+							return;
+						}
+						// 立即购买
+						App.navigationTo({
+							url:
+								'pages/subPages/submitOrder/submitOrder?' +
+								App.urlEncode({
+									goods_id: _this.id,
+									goods_num: _this.goodsNumber,
+									specid: _this.goodsId.id || '',
+									plugin: '11',
+									buystatus: 0,
+									addressid: 0,
+									drawid: ''
+								}),
+							success() {
+								// 关闭弹窗
+								_this.application = false;
+								_this.signShow = false;
+							}
+						});
+					} else {
+						_this.followShow = true;
+						_this.followData = res.data;
+					}
+				});
+			}
+		},
+		close() {
+			this.signShow = false;
+		},
+		checkedTag(item, index) {
+			this.checkIndex = index;
+			this.goodsNumber = 1;
+			this.goodsId = item;
+		},
+		reduce() {
+			if (this.goodsNumber == 1) return;
+			this.goodsNumber--;
+		},
+		add() {
+			if (this.goodsId.surplus == this.goodsNumber) {
+				uni.showToast({
+					title: '已达到最大报名数',
+					icon: 'none'
+				});
+				return;
+			}
+			this.goodsNumber++;
+		},
+		inputNumber() {
+			if (parseInt(this.goodsNumber) < 1) {
+				this.goodsNumber = 1;
+			} else {
+				this.goodsNumber = parseInt(this.goodsNumber);
+			}
+		}
+	},
+	destroyed() {
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			console.log('页面跳转暂停播放');
+		});
+	},
+	onUnload() {
+		this.play_Audio = false;
+		innerAudioContext.stop();
+		innerAudioContext.onStop(() => {
+			console.log('页面跳转暂停播放');
+		});
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.content {
+	padding-bottom: 200upx;
+	.titleimg {
+		position: relative;
+
+		.titlenum {
+			background-color: rgba(0, 0, 0, 0.3);
+			height: 50upx;
+			line-height: 50upx;
+			padding: 0 20upx;
+			right: 0upx;
+			bottom: 50upx;
+			position: absolute;
+			border-radius: 60upx 0upx 0 60upx;
+			font-size: 20upx;
+			color: #ffffff;
+		}
+	}
+
+	.goodsdatum {
+		padding: 20upx 30upx;
+		background-color: #ffffff;
+
+		.goods_name {
+			font-weight: 500;
+		}
+
+		.goods_price {
+			padding: 20upx 0;
+			border-bottom: 2upx solid #f8f8f8;
+		}
+
+		.goods_time {
+			padding: 20upx 0;
+			border-bottom: 2upx solid #f8f8f8;
+
+			.time-item {
+				height: 30upx;
+				line-height: 30upx;
+				padding-left: 20upx;
+			}
+
+			.img-box {
+				flex: 0.85;
+
+				.item-img-box {
+					// flex: 0.8;
+					padding-right: 10upx;
+
+					.img-item {
+						width: 80upx;
+						height: 80upx;
+						border-radius: 5upx;
+					}
+				}
+
+				.morebox {
+					background-color: #eeeeee;
+					width: 80upx;
+					height: 80upx;
+					border-radius: 8upx;
+					padding: 0;
+					line-height: 50upx;
+					color: #999999;
+				}
+			}
+
+			.moreimg {
+				flex: 0.15;
+				color: #999999;
+				line-height: 80upx;
+				text-align: center;
+				font-size: 26upx;
+			}
+		}
+	}
+
+	.merchant {
+		background-color: #ffffff;
+		padding: 30upx;
+		margin-top: 20upx;
+
+		.merchant-title {
+			padding-bottom: 30upx;
+		}
+
+		.merchant-item {
+			padding-bottom: 30upx;
+			color: #999999;
+			position: relative;
+
+			.merchant-icon {
+				height: 50upx;
+				width: 50upx;
+				line-height: 50upx;
+				border-radius: 50%;
+				font-size: 32upx;
+				text-align: center;
+				color: #ffffff;
+				background-color: #ff4444;
+				position: absolute;
+				right: 0;
+				top: -50%;
+				transform: translateY(50%);
+				image{
+					width: 40upx;
+					height: 40upx;
+					margin-top: 6upx;
+				}
+			}
+		}
+	}
+
+	.recently {
+		padding: 20upx 30upx;
+		font-weight: 600;
+		margin: 20upx 0;
+		height: 70upx;
+		background-color: #ffffff;
+
+		.recently-img-box {
+			.recently-img-item {
+				width: 70upx;
+				height: 70upx;
+				border-radius: 50%;
+				position: relative;
+			}
+		}
+	}
+
+	.detailParticulars {
+		padding: 30upx;
+		background-color: #ffffff;
+		padding-bottom: 150upx;
+		overflow: hidden;
+	}
+
+	.bottom-btn {
+		// padding: 20upx 0upx;
+		box-shadow: 0px 0px 10px #cccccc;
+		height: 100upx;
+		background-color: #ffffff;
+		position: fixed;
+		width: 100vw;
+		z-index: 1000;
+		bottom: 0;
+		left: 0;
+
+		.btn-item {
+			width: 50%;
+			// padding: 5upx 0 0;
+			line-height: 50upx;
+
+			.btn-icon {
+				font-size: 36upx;
+				text-align: center;
+			}
+
+			.btn-text {
+				font-size: 20upx;
+				text-align: center;
+			}
+		}
+
+		.red_btn {
+			padding: 10upx 20upx;
+			flex: 0.5;
+
+			.item-btn {
+				height: 80upx;
+				line-height: 80upx;
+				text-align: center;
+				background-color: #ff4444;
+				border-radius: 60upx;
+				width: 350upx;
+				font-size: 34upx;
+				color: #ffffff;
+			}
+		}
+	}
+
+	.showApply {
+		width: 92vw;
+		padding: 30upx;
+		height: 800upx;
+		// overflow: hidden;
+		background-color: #ffffff;
+		border-radius: 30upx 30upx 0upx 0upx;
+		margin-bottom: 100upx;
+		overflow: auto;
+
+		.goodsLogo {
+			width: 200upx;
+			height: 200upx;
+			border-radius: 10upx;
+		}
+
+		.huiyuan {
+			height: 35upx;
+			line-height: 35upx;
+			border-radius: 60upx 0upx 0upx 60upx;
+			background-color: #eed196;
+			color: #333333;
+			padding: 0 10upx;
+		}
+
+		.zhekou {
+			height: 35upx;
+			line-height: 35upx;
+			border-radius: 0 60upx 60upx 0;
+			background-color: #333333;
+			color: #eed196;
+			padding: 0 10upx;
+		}
+
+		.roundclose {
+			font-size: 50upx;
+			color: #cccccc;
+			position: absolute;
+			right: 15upx;
+			top: 15upx;
+		}
+
+		.rmb {
+			font-size: 20upx;
+			color: #ff4444;
+			padding-left: 20upx;
+			vertical-align: bottom;
+			line-height: 52upx;
+		}
+
+		.picea {
+			font-size: 40upx;
+			color: #ff4444;
+			padding-right: 20upx;
+			height: 40upx;
+			line-height: 40upx;
+		}
+
+		.n-Number {
+			width: 60upx;
+			height: 60upx;
+			border-radius: 5upx;
+			background-color: #f8f8f8;
+			text-align: center;
+			line-height: 60upx;
+		}
+
+		.btnactive {
+			transition: transform 0.3s ease-out;
+		}
+
+		.btnactive:active {
+			background-color: #999999;
+		}
+	}
+
+	.tag-a {
+		padding: 25upx 30upx;
+		border-radius: 15upx;
+		// border: 1upx solid #999999;
+		position: relative;
+		overflow: hidden;
+		margin-bottom: 30upx;
+
+		.checked {
+			height: 100upx;
+			width: 100upx;
+			color: #ffffff;
+			background-color: #ff4444;
+			position: absolute;
+			bottom: -80upx;
+			right: -80upx;
+			border-radius: 50%;
+			padding: 0upx 20upx 20upx;
+		}
+	}
+}
+
+.masking {
+	position: fixed;
+	/* 		width: 100%;
+			height: 100%; */
+	top: 0;
+	left: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 100;
+	background: rgba(0, 0, 0, 0.5);
+	/* display: none */
+}
+</style>
diff --git a/pages/subPages2/coursegoods/establishDoods/establishDoods.vue b/pages/subPages2/coursegoods/establishDoods/establishDoods.vue
new file mode 100644
index 0000000..841c7ce
--- /dev/null
+++ b/pages/subPages2/coursegoods/establishDoods/establishDoods.vue
@@ -0,0 +1,1651 @@
+<template>
+	<view class="enterForm">
+		<loadlogo v-if="!loadlogo" />
+		<view class="bgimgbox" v-if="loadlogo"><image class="bgimg" :src="imageRoot + 'demoBackImg.png'" mode=""></image></view>
+		<view class="formbox" v-if="loadlogo">
+			<view class="formdatabox">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">请填写活动详情</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						活动标题
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;"><input class="uni-input f-24" placeholder="请输入活动名称" v-model="userInfo.title" /></view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						活动分类
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="bindPickerChange" :value="pickerindex" range-key="name" :range="catelist">
+							<view class="uni-input">
+								{{ activityName }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;line-height: 100upx;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						活动时间
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<w-picker
+							:visible.sync="visiblec"
+							mode="date"
+							startYear="1970"
+							endYear="2100"
+							:value="userInfo.activestarttime"
+							fields="minute"
+							@confirm="onConfirmdete($event, 'region')"
+							ref="date"
+						></w-picker>
+						<w-picker
+							:visible.sync="visiblec2"
+							mode="date"
+							startYear="1970"
+							endYear="2100"
+							:value="userInfo.activeendtime"
+							fields="minute"
+							@confirm="onConfirmdeteTwo($event, 'region')"
+							ref="date2"
+						></w-picker>
+						<view  style="flex: 0.8;">
+							<view class="uni-input" style="height: 50upx;line-height: 50upx;" @tap="visble">{{ userInfo.activestarttime || '活动开始时间' }}</view>
+							<!-- <view class="uni-input">
+								—
+							</view> -->
+							<view class="uni-input" style="height: 50upx;line-height: 50upx;" @tap="visbleTwo">{{ userInfo.activeendtime || '活动结束时间' }}</view>
+						</view>
+						<view  style="height: 100upx;line-height: 100upx;flex: 0.2;"></view>
+						<!-- <view class="uni-input"><text class="iconfont icon-right"
+						style="float: right;font-size: 20upx;color: #999999;">-</view>
+						<view class="uni-input" @tap="visiblec2 = true">{{endTime || '结束时间'}}<text class="iconfont icon-right"
+						tyle="float: right;font-size: 20upx;color: #999999;">
+						</text></view> -->
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;line-height: 100upx;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						报名时间
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<w-picker
+							:visible.sync="visiblec3"
+							mode="date"
+							startYear="1970"
+							endYear="2100"
+							:value="userInfo.enrollstarttime"
+							fields="minute"
+							@confirm="onConfirmdete3($event, 'region')"
+							ref="date3"
+						></w-picker>
+						<w-picker
+							:visible.sync="visiblec4"
+							mode="date"
+							startYear="1970"
+							endYear="2100"
+							:value="userInfo.enrollendtime"
+							fields="minute"
+							@confirm="onConfirmdete4($event, 'region')"
+							ref="date4"
+						></w-picker>
+						<view  style="flex: 0.8;">
+							<view class="uni-input" style="height: 50upx;line-height: 50upx;" @tap="visble3">{{ userInfo.enrollstarttime || '报名开始时间' }}</view>
+							<!-- <view class="uni-input">
+								—
+							</view> -->
+							<view class="uni-input" style="height: 50upx;line-height: 50upx;" @tap="visble4">{{ userInfo.enrollendtime || '报名结束时间' }}</view>
+						</view>
+						<view  style="height: 100upx;line-height: 100upx;flex: 0.2;"></view>
+						<!-- <view class="uni-input"><text class="iconfont icon-right"
+						style="float: right;font-size: 20upx;color: #999999;">-</view>
+						<view class="uni-input" @tap="visiblec2 = true">{{endTime || '结束时间'}}<text class="iconfont icon-right"
+						tyle="float: right;font-size: 20upx;color: #999999;">
+						</text></view> -->
+					</view>
+				</view>
+				<!-- 	<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						姓名
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入姓名" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						电话
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入联系电话" />
+					</view>
+				</view> -->
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						所在城市
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<w-picker :visible.sync="visiblec" mode="region" :value="[userInfo.provinceid || userInfo.pro_code,userInfo.areaid || userInfo.city_code,userInfo.distid || userInfo.area_code]"
+						 default-type="value" :hide-area="false" @confirm="onConfirm($event,'region')" @cancel="onCancel" ref="region"></w-picker>
+						<view class="uni-input" @tap="visble">{{ provinceidName }} {{ areaidName }} {{ distidName }}<text class="iconfont icon-right"
+							 style="float: right;font-size: 20upx;color: #999999;">
+
+							</text></view>
+
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						地址类型
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="siteChange" :value="siteindex" range-key="name" :range="sitearray">
+							<view class="uni-input">
+								{{ sitearray[siteindex].name }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="siteindex == 1">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						活动地址
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<input class="f-24" style="flex: 0.8;" placeholder="请输入详细地址" v-model="userInfo.address" />
+						<view class="dis-il-block" @click="getLocation" style="flex: 0.2;">
+							<image style="width: 20upx;height: 20upx;padding-left: 10upx;" :src="imgfixUrls + 'merchant/where.svg'" />
+							<span>定位</span>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						活动规格
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="specificationShow">
+							<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+						 	 range-key="name" :value="typeIndex"> -->
+							<view class="uni-input twoLevelList">
+								规格设置
+
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<!-- <view v-else class="uni-input twoLevelList">
+								<view class="dis-il-block" style="width: 90%;">
+									{{industryclass}}
+								</view>
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view> -->
+							<!-- 			</picker> -->
+							<span></span>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">请填写报名规则</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="specificationList.length == 0">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						报名价
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<input style="width: 100%;font-size: 24upx;" auto-height placeholder="报名价" placeholder-style="font-size:24upx" type="digit" v-model="userInfo.price" />
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						微信号
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入微信号" v-model="userInfo.wx" />
+					</view>
+				</view> -->
+
+				<view class="dis-flex f-24 formtitle" v-if="specificationList.length == 0">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #ffffff;float: left;">*</view>
+						最大人数
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;"><input class="uni-input f-24" placeholder="请填写最大报名人数" v-model="userInfo.maxpeoplenum" /></view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="specificationList.length == 0">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #ffffff;float: left;">*</view>
+						最小人数
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;"><input class="uni-input f-24" placeholder="请填写最小报名人数" v-model="userInfo.minpeoplenum" /></view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						报名表单
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="diyformChange" :value="diyformindex" range-key="title" :range="diyform">
+							<view class="uni-input">
+								{{ diyform[diyformindex].title }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">请添加活动图片</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="logobox">
+					<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+					<span>活动图片</span>
+					<view style="padding-left: 20upx;">
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdataon" style="margin: 10upx;" v-if="userInfo.thumb">
+							<image :src="userInfo.thumb" class="imgs" @click="lookimg(1, userInfo.thumb)" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="uploadFiles(1, 1)" style="margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="!userInfo.thumb">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+						</view>
+					</view>
+				</view>
+
+				<view class="logobox">
+					<view class="dis-il-block" style="font-size: 20upx;color: #ffffff;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+					<span>活动轮播图</span>
+					<view class="dis-flex" style="flex-wrap: wrap;align-content: flex-center;align-items: center;justify-content: left;">
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdataon" style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-for="(item, index) in userInfo.advs">
+							<image :src="item" class="imgs" style="width: 100%;" @click="lookimg(3, userInfo.advs, index)" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(3, item)" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view
+							class="userImgUpdata"
+							style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;"
+							v-if="userInfo.advs.length != 6"
+							@click="uploadFiles(3, 6)"
+						>
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+						</view>
+					</view>
+				</view>
+
+				<view class="logobox">
+					<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+					<span>活动图集</span>
+					<view class="dis-flex" style="flex-wrap: wrap;align-content: flex-center;align-items: center;justify-content: left;">
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdataon" style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-for="(item, index) in userInfo.thumbs">
+							<image :src="item" class="imgs" style="width: 100%;" @click="lookimg(2, userInfo.thumbs, index)" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(2, item)" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view
+							class="userImgUpdata"
+							style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;"
+							v-if="userInfo.thumbs.length != 6"
+							@click="uploadFiles(2, 6)"
+						>
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">活动介绍</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						活动状态
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="stateChange" :value="stateindex" range-key="name" :range="statearray">
+							<view class="uni-input">
+								{{ statearray[stateindex].name }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #ffffff;float: left;">*</view>
+						活动详情
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="richTextShow">
+							<view class="uni-input twoLevelList">
+								活动详情富文本
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<span></span>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #ffffff;float: left;">*</view>
+						报名须知
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="richTextShowTwo">
+							<view class="uni-input twoLevelList">
+								报名须知富文本
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<span></span>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view  style="position: relative;">
+				<view class="t-c" style="width: 90vw;height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;" @click="submit">提 交</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="
+						`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${
+							latlngs.longitude
+						}`
+					"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="hangyeshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeShareBottom">
+			<view class="hangye dis-flex" v-if="Array.isArray(industry) && Array.isArray(industrysubdivide)">
+				<view class="f-30 t-c" style="width: 100%;">当前地区暂无相关行业分类</view>
+			</view>
+			<view class="hangye dis-flex" v-else>
+				<view  style="flex: 0.499;overflow: auto;">
+					<view
+						:class="item.checked ? 'industryclass-item classcheck f-28' : 'industryclass-item f-28'"
+						v-for="(item, key, index) in industry"
+						@click="clickindustry(key)"
+					>
+						{{ item.name }}
+					</view>
+				</view>
+				<view  style="flex: 0.499;overflow: auto;">
+					<view
+						:class="item.checked ? 'industryclass-item isclasschecked f-28' : 'industryclass-item f-28'"
+						v-for="(item, index) in industrysubdivide"
+						@click="clickclass(item)"
+					>
+						{{ item.name }}
+					</view>
+				</view>
+			</view>
+			<!-- <view class="b-f dis-flex">
+				
+				<view class="flex-box">
+					<button @click="confirm" style="width: 80%;height: 80%;font-size: 34upx;line-height: 70upx;height: 70upx;margin-bottom: 20upx;" type="warn">确定</button>
+				</view>
+			</view> -->
+		</PopManager>
+		<!-- 规格设置 -->
+		<PopManager :show="specification" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="specification = false">
+			<view class="specificationClass">
+				<view class="tilte f-w">
+					规格设置
+					<text class="f-20 col-9">(可点击下列规格进行修改)</text>
+					<text class="iconfont icon-close" style="font-size: 30upx;float: right;" @click="specification = false"></text>
+				</view>
+				<view  style="height: 800upx;overflow: auto;">
+					<view class="content" v-for="(item, index) in specificationList" :key="index" @click="modification(item, index)">
+						<view
+							class="iconfont icon-guanbishixin t-r"
+							@click.stop="deletet(item, index)"
+							style="font-size: 35upx;right: 0upx;top: 0upx;color: #999999;position: absolute;"
+						></view>
+						<view class="dis-flex content-item">
+							<view  style="flex: 0.5;">规格名字:</view>
+							<view class="t-r" style="flex: 0.5;">{{ item.name }}</view>
+						</view>
+						<view class="dis-flex content-item">
+							<view  style="flex: 0.5;">报名价格:</view>
+							<view class="t-r" style="flex: 0.5;">{{ item.price }}</view>
+						</view>
+						<view class="dis-flex content-item">
+							<view  style="flex: 0.5;">最小报名人数:</view>
+							<view class="t-r" style="flex: 0.5;">{{ item.minnum }}</view>
+						</view>
+						<view class="dis-flex content-item">
+							<view  style="flex: 0.5;">最大报名人数:</view>
+							<view class="t-r" style="flex: 0.5;">{{ item.maxnum }}</view>
+						</view>
+					</view>
+					<view class="t-c col-9" style="line-height: 200upx;" v-if="specificationList.length == 0">暂无相关规格~</view>
+				</view>
+				<view class="specificationBtn" @click="addspecification">添加规格</view>
+			</view>
+			<PopManager :show="addspecificationshow" :type="'center'" :bottom="'-30%'" :overlay="'false'" :showOverlay="'false'" @clickmask="addspecificationshow = false">
+				<view class="addspecificationshow">
+					<view class="f-34 f-w p-b-20">
+						添加规格
+						<text style="float: right;" class="iconfont icon-close" @click="addspecificationshow = false"></text>
+					</view>
+					<view class="dis-flex" style="padding: 30upx 0 ;">
+						<view class=" f-32" style="padding-right: 20upx;width: 150upx;">规格名</view>
+						<view >
+							<input
+								class="uni-input t-r"
+								v-if="addspecificationshow"
+								v-model="addspecificationData.name"
+								placeholder-style="font-size:30upx;"
+								placeholder="请输入规格名字"
+								adjust-position="true"
+							/>
+						</view>
+					</view>
+					<view class="dis-flex" style="padding: 30upx 0 ;">
+						<view class=" f-32" style="padding-right: 20upx;width: 150upx;font-size: ;">报名费</view>
+						<view >
+							<input
+								class="uni-input t-r"
+								v-if="addspecificationshow"
+								v-model="addspecificationData.price"
+								placeholder-style="font-size:30upx;"
+								type="digit"
+								placeholder="请输入报名费"
+								adjust-position="true"
+							/>
+						</view>
+					</view>
+					<view class="dis-flex" style="padding: 30upx 0 ;">
+						<view class=" f-32" style="padding-right: 20upx;width: 150upx;">最小人数</view>
+						<view >
+							<input
+								class="uni-input t-r"
+								v-if="addspecificationshow"
+								v-model="addspecificationData.minnum"
+								type="number"
+								placeholder-style="font-size:30upx;"
+								placeholder="请输入最大报名人数"
+								adjust-position="true"
+							/>
+						</view>
+					</view>
+					<view class="dis-flex" style="padding: 30upx 0 ;">
+						<view class=" f-32" style="padding-right: 20upx;width: 150upx;">最大人数</view>
+						<view >
+							<input
+								class="uni-input t-r"
+								v-if="addspecificationshow"
+								v-model="addspecificationData.maxnum"
+								type="number"
+								placeholder-style="font-size:30upx;"
+								placeholder="请输入最大报名人数"
+								adjust-position="true"
+							/>
+						</view>
+					</view>
+					<view class="addspecificationshow-btn" @click="addspecificationsAdd">确定</view>
+				</view>
+			</PopManager>
+		</PopManager>
+
+		<PopManager :show="richText" type="center" @clickmask="richText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="userInfo.detail">
+				<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#" :html="userInfo.detail"></jinEdit>
+			</view>
+		</PopManager>
+		<PopManager :show="richTextTwo" type="center" @clickmask="richTextTwo = false">
+			<!-- 移动端富文本组件 -->
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="userInfo.enrolldetail">
+				<jinEdit placeholder="请输入内容" @editOk="editOkTwo" uploadFileUrl="/#" :html="userInfo.enrolldetail"></jinEdit>
+			</view>
+		</PopManager>
+		<!-- <phoneNavBar :checked="'入驻'"></phoneNavBar> -->
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import wPicker from '@/components/w-picker/w-picker.vue';
+import PopManager from '@/components/template/PopManager';
+import phoneNavBar from '@/components/template/phoneNavBar';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import jinEdit from '@/components/jin-edit/jin-edit.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	data() {
+		return {
+			provinceidName: '',
+			areaidName: '',
+			distidName: '',
+			visiblec: false,
+			visiblec2: false,
+			visiblec3: false,
+			visiblec4: false,
+			address: '',
+			lblis: {},
+			klis: false,
+			isOpenLaction: false,
+			userInfo: {
+				thumbs: [],
+				thumb: '',
+				advs: [],
+				activeendtime: '',
+				activestarttime: '',
+				enrollstarttime: '',
+				specarray: [],
+				detail: '',
+				enrolldetail: '',
+				addresstype: '0',
+				optionArray: '',
+				enrollendtime: ''
+			},
+			phoneHeight: null,
+			latlngs: null,
+			owenscitylist: [],
+			hangyeshow: false,
+			hangYe: true,
+			industryclass: '',
+			industry: [],
+			industrysubdivide: [],
+			industryAll: {},
+			loadlogo: false,
+			pickerarray: ['上架', '下架', '2', '3'],
+			pickerindex: 0,
+			goodsinfo: {},
+			sid: '',
+			oldDistid: '',
+			uploadlength: 0,
+			localIds: [],
+			specification: false,
+			specificationList: [],
+			addspecificationshow: false,
+			addspecificationData: {
+				name: '',
+				price: '',
+				maxnum: '',
+				minnum: ''
+			},
+			richText: false,
+			richTextVter: '',
+			richTextTwo: false,
+			richTextVterTwo: '',
+			catelist: [],
+			diyform: [],
+			activityName: '',
+			flagIndex: 0,
+			flag: false,
+			diyformindex: 0,
+			statearray: [
+				{
+					name: '上架',
+					id: 1
+				},
+				{
+					name: '下架',
+					id: 0
+				}
+			],
+			sitearray: [
+				{
+					name: '商户店内',
+					id: 0
+				},
+				{
+					name: '其他地址',
+					id: 1
+				}
+			],
+			stateindex: 0,
+			siteindex: 0,
+			flag: false
+		};
+	},
+	components: {
+		wPicker,
+		PopManager,
+		phoneNavBar,
+		jinEdit,
+		Loadlogo
+	},
+	onHide() {},
+	onLoad(e) {
+		let _this = this;
+		if (e.id) {
+			_this.id = e.id;
+		}
+		if (uni.getSystemInfoSync().system.indexOf('Android') === -1) {
+			_this.flag = true;
+		} else {
+			_this.flag = false;
+		}
+		_this.sid = e.sid;
+
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHeight = res.windowHeight + 'px';
+			}
+		});
+		_this.owenscitylist = uni.getStorageSync('cityList');
+		_this.latlngs = uni.getStorageSync('curLoction');
+		_this.getenter(_this.id);
+	},
+	onShow() {
+		let _this = this;
+		// #ifdef H5
+		window.addEventListener( //定位功能多次复用，建议封装为api，定位功能有多次触发的bug，建议做一个防抖功能，因为每一处的处理不一致，我时间来不及了，交给你了。
+			'message',
+			function(event) {
+				// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+				let loc = event.data;
+				if (_this.klis) {
+					return;
+				}
+				if (loc && loc.module == 'locationPicker') {
+					//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+					console.log('location', loc);
+					// _this.thelat = loc.latlng.lat;
+					_this.userInfo.address = loc.poiaddress;
+					_this.userInfo.lat = loc.latlng.lat;
+					_this.userInfo.lng = loc.latlng.lng;
+					_this.isOpenLaction = false;
+					_this.lblis = {
+						lat: loc.latlng.lat,
+						lng: loc.latlng.lng,
+						detailed_address: loc.poiaddress
+					};
+					_this.getloctions(_this.lblis);
+				}
+				_this.klis = true;
+				setTimeout(() => {
+					_this.klis = false;
+				}, 1000);
+			},
+			false
+		);
+		// #endif
+		//#ifdef APP-PLUS
+		if(_this.userInfo.address){
+			_this.lblis.address = _this.userInfo.address;
+		}
+		//#endif
+	},
+	methods: {
+		deletet(item, index) {
+			let _this = this;
+			App.showError(
+				`确定删除规格${item.name}`,
+				data => {
+					if (data.confirm) {
+						_this.specificationList.splice(index, 1);
+					}
+				},
+				true
+			);
+		},
+		siteChange(e) {
+			this.siteindex = e.detail.value;
+			this.userInfo.addresstype = this.sitearray[this.siteindex].id + '';
+		},
+		// 上下架
+		stateChange(e) {
+			this.stateindex = e.detail.value;
+			this.userInfo.status = this.statearray[this.stateindex].id;
+		},
+		diyformChange(e) {
+			this.diyformindex = e.detail.value;
+			this.userInfo.diyformid = this.diyform[this.diyformindex].id;
+		},
+		modification(item, index) {
+			let _this = this;
+			_this.addspecificationData = item;
+			_this.addspecificationshow = true;
+			_this.flag = true;
+			_this.flagIndex = index;
+		},
+		addspecificationsAdd() {
+			let _this = this;
+			for (let i in _this.addspecificationData) {
+				if (!_this.addspecificationData[i]) {
+					uni.showToast({
+						icon: 'none',
+						title: '请完善规格信息'
+					});
+					return;
+				}
+			}
+			if (_this.flag) {
+				// debugger
+				this.specificationList.splice(_this.flagIndex, 1, _this.addspecificationData);
+				_this.flag = false;
+				uni.showToast({
+					title: '修改成功'
+				});
+			} else {
+				this.specificationList.push(_this.addspecificationData);
+				uni.showToast({
+					title: '规格添加成功'
+				});
+			}
+			_this.addspecificationData = {
+				name: '',
+				price: '',
+				maxnum: '',
+				minnum: ''
+			};
+			_this.addspecificationshow = false;
+		},
+		richTextShow() {
+			this.richText = true;
+		},
+		richTextShowTwo() {
+			this.richTextTwo = true;
+		},
+		editOk(res) {
+			console.log(res.html);
+			this.userInfo.detail = res.html;
+			this.richText = false;
+		},
+		editOkTwo(res) {
+			console.log(res.html);
+			this.userInfo.enrolldetail = res.html;
+			this.richTextTwo = false;
+		},
+		addspecification() {
+			this.addspecificationshow = true;
+			this.addspecificationData = {
+				name: '',
+				price: '',
+				maxnum: '',
+				minnum: ''
+			};
+		},
+		specificationShow() {
+			console.log(11111);
+			this.specification = true;
+		},
+		// 活动结束时间
+		onConfirmdeteTwo(e) {
+			this.userInfo.activeendtime = e.value;
+			// let date = new Date(e.value).getTime();
+			// console.log(e, date);
+		},
+		// 活动开始时间
+		onConfirmdete(e) {
+			console.log(this.getDataTime(e.value));
+			this.userInfo.activestarttime = e.value;
+			// let date = new Date(e.value).getTime();
+			// console.log(e, date);
+		},
+		// 报名结束时间
+		onConfirmdete4(e) {
+			this.userInfo.enrollendtime = e.value;
+			// let date = new Date(e.value).getTime();
+			// console.log(e, date);
+		},
+		// 报名开始时间
+		onConfirmdete3(e) {
+			this.userInfo.enrollstarttime = e.value;
+			// let date = new Date(e.value).getTime();
+			// console.log(e, date);
+		},
+		getDataTime(timeValue) {
+			// debugger
+			let ontime;
+			if (this.flag) {
+				ontime = timeValue.replace(/-/g, '/');
+			} else {
+				ontime = timeValue;
+			}
+			let date = new Date(ontime);
+			let time = date.getTime();
+			time = time / 1000;
+			return time;
+		},
+		submit() {
+			let _this = this;
+			_this.userInfo.optionArray = '';
+			let data = JSON.parse(JSON.stringify(_this.userInfo));
+			let param;
+			if (_this.specificationList) {
+				let jsonString = JSON.stringify(_this.specificationList);
+				let base64 = new this.$util.Base64();
+				param = base64.encode(jsonString);
+				// Object.assign(data, {
+				// 	optionArray: param
+				// })
+				data['optionArray'] = param;
+			}
+			// debugger
+			data.sid = _this.sid;
+			if (_this.id) {
+				data.id = _this.id;
+			}
+			// data.activestarttime = new Date(data.activestarttime).getTime();
+			// data.activeendtime = new Date(data.activeendtime).getTime();
+			// data.enrollstarttime = new Date(data.enrollstarttime).getTime();
+			// data.enrollendtime = new Date(data.enrollendtime).getTime();
+			if (data.detail == '<div></div>') {
+				data.detail = '';
+			}
+			if (data.enrolldetail == '<div></div>') {
+				data.enrolldetail = '';
+			}
+			console.log(data);
+			if (!data.activestarttime || !data.activeendtime || !data.enrollstarttime || !data.enrollendtime) {
+				uni.showToast({
+					icon: 'none',
+					title: '请完善活动资料1'
+				});
+
+				return;
+			}
+
+			data.activestarttime = _this.userInfo.activestarttime;
+			data.activeendtime = _this.userInfo.activeendtime;
+			data.enrollstarttime = _this.userInfo.enrollstarttime;
+			data.enrollendtime = _this.userInfo.enrollendtime;
+
+			if (!_this.userInfo.minpeoplenum) {
+				_this.userInfo.minpeoplenum = 0;
+			}
+			if (!_this.userInfo.maxpeoplenum) {
+				_this.userInfo.maxpeoplenum = 0;
+			}
+			if (!_this.userInfo.price) {
+				_this.userInfo.price = 0;
+			}
+			data.status = _this.statearray[_this.stateindex].id;
+
+			console.log(data);
+			if (!data.title || !data.activestarttime || !data.activeendtime || !data.enrollstarttime || !data.enrollendtime) {
+				console.log(data);
+				// 此处ios端口的时间数据会被多规格数据干掉,原因未知,重新赋值一次
+				data.activestarttime = _this.userInfo.activestarttime;
+				data.activeendtime = _this.userInfo.activeendtime;
+				data.enrollstarttime = _this.userInfo.enrollstarttime;
+				data.enrollendtime = _this.userInfo.enrollendtime;
+				if (!data.activestarttime || !data.activeendtime || !data.enrollstarttime || !data.enrollendtime) {
+					console.log(data);
+					uni.showToast({
+						icon: 'none',
+						title: '请完善活动信息'
+					});
+					return;
+				} else {
+					App._post_form(
+						`&p=activity&do=createActivityApi`,
+						data,
+						res => {
+							console.log(res, '提交结果');
+							if (res.errno == 0) {
+								uni.showToast({
+									title: res.message
+								});
+								setTimeout(() => {
+									App.navigationTo({
+										url: 'pages/subPages/merchant/merchantOrder/merchantOrder'
+									});
+								}, 1000);
+							}
+						},
+						false,
+						() => {}
+					);
+					return;
+				}
+				return;
+			}
+			// for (let key in data) {
+			// 	if (key == 'title' || key == 'activestarttime' || key == 'activeendtime' || key == 'enrollstarttime' || key == 'enrollendtime') {
+			// 		if (!data[key]) {
+
+			// 		}
+			// 	}
+			// }
+			App._post_form(
+				`&p=activity&do=createActivityApi`,
+				data,
+				res => {
+					console.log(res, '提交结果');
+					if (res.errno == 0) {
+						uni.showToast({
+							title: res.message
+						});
+						setTimeout(() => {
+							App.navigationTo({
+								url: 'pages/subPages/merchant/merchantOrder/merchantOrder'
+							});
+						}, 1000);
+					}
+				},
+				false,
+				() => {}
+			);
+		},
+		bindPickerChange(e) {
+			// debugger
+			this.pickerindex = e.detail.value;
+			this.userInfo.cateid = this.catelist[this.pickerindex].id;
+			this.activityName = this.catelist[this.pickerindex].name;
+			console.log(e, this.activityName, this.catelist[this.pickerindex].name);
+		},
+		clickclass(item) {
+			// console.log(item);
+			for (let key in this.industryAll) {
+				this.industryAll[key].map(items => {
+					items.checked = false;
+					if (items.id == item.id) {
+						items.checked = true;
+						this.industryclass = items.name;
+						this.userInfo.two_class = items.id;
+						this.industrysubdivide = this.industryAll[key];
+						this.confirm();
+					}
+				});
+			}
+
+			// this.industryAll.map((items,indexs)=>{
+			// 	items.twotype.map((itemss,indexss)=>{
+			// 		itemss.checked = false;
+			// 		if(item.id == itemss.id){
+			// 			itemss.checked = true;
+			// 			this.industryclass = item.name
+			// 		}
+			// 	})
+			// })
+
+			this.loadlogo = false;
+			this.loadlogo = true;
+		},
+		clickindustry(keys) {
+			for (let key in this.industry) {
+				this.industry[key].checked = false;
+				if (keys == key) {
+					this.industry[keys].checked = true;
+					this.userInfo.one_class = this.industry[keys].id;
+				}
+			}
+			for (let key in this.industryAll) {
+				if (keys == key) {
+					this.industrysubdivide = this.industryAll[keys];
+				}
+			}
+			// console.log(item);
+			this.loadlogo = false;
+			this.loadlogo = true;
+		},
+		addtime(value) {
+			let time = value * 1000;
+			if (typeof time == 'undefined') {
+				return '';
+			} else {
+				let date = new Date(parseInt(time));
+				let y = date.getFullYear();
+				let MM = date.getMonth() + 1;
+				MM = MM < 10 ? '0' + MM : MM;
+				let d = date.getDate();
+				d = d < 10 ? '0' + d : d;
+				let h = date.getHours();
+				h = h < 10 ? '0' + h : h;
+				let m = date.getMinutes();
+				m = m < 10 ? '0' + m : m;
+				let s = date.getSeconds();
+				s = s < 10 ? '0' + s : s;
+				return y + '-' + MM + '-' + d + ' ' + h + ':' + m + ':' + s;
+			}
+		},
+		getenter(id) {
+			let _this = this;
+			App._post_form(
+				`&p=activity&do=createActivityPage&id=${id || ''}&sid=${_this.sid || ''}`,
+				{},
+				res => {
+					console.log(res, '活动初始化');
+					_this.catelist = res.data.catelist;
+					_this.diyform = res.data.diyform;
+					let add = {
+						title: '无表单',
+						id: ''
+					};
+					_this.diyform.unshift(add);
+					// _this.activityName = res.data.catelist[0].name;
+					if (res.data.activity) {
+						_this.userInfo = res.data.activity;
+					} else {
+						_this.userInfo.detail = '<div></div>';
+						_this.userInfo.enrolldetail = '<div></div>';
+						_this.pickerindex = 0;
+						_this.userInfo.cateid = _this.catelist[0].id;
+						_this.activityName = _this.catelist[0].name;
+						return;
+					}
+
+					if (!_this.userInfo.detail) {
+						_this.userInfo.detail = '<div></div>';
+						// _this.userInfo.enrolldetail = '<div></div>';
+					}
+					if (!_this.userInfo.enrolldetail) {
+						// _this.userInfo.detail = '<div></div>';
+						_this.userInfo.enrolldetail = '<div></div>';
+					}
+					_this.siteindex = res.data.activity.addresstype;
+					if (_this.userInfo.cateid) {
+						_this.catelist.map((item, index) => {
+							if (item.id == _this.userInfo.cateid) {
+								_this.pickerindex = index;
+								_this.activityName = item.name;
+							}
+						});
+					}
+					if (_this.userInfo.diyformid) {
+						_this.diyform.map((item, index) => {
+							if (item.id == _this.userInfo.diyformid) {
+								_this.diyformindex = index;
+							}
+						});
+					}
+					_this.stateindex = res.data.activity.status == 1 ? 0 : 1;
+					if (_this.userInfo.activeendtime) {
+						_this.userInfo.activeendtime = _this.addtime(Number(_this.userInfo.activeendtime));
+						_this.userInfo.activestarttime = _this.addtime(Number(_this.userInfo.activestarttime));
+						_this.userInfo.enrollendtime = _this.addtime(Number(_this.userInfo.enrollendtime));
+						_this.userInfo.enrollstarttime = _this.addtime(Number(_this.userInfo.enrollstarttime));
+					}
+					if (_this.userInfo.specarray) {
+						_this.specificationList = _this.userInfo.specarray;
+					}
+					console.log(_this.userInfo.activeendtime, _this.userInfo.activestarttime, _this.userInfo.enrollendtime, _this.userInfo.enrollstarttime);
+				},
+				false,
+				() => {
+					_this.loadlogo = true;
+					// console.log('行业加载完')
+				}
+			);
+		},
+		lookimg(type, url, index) {
+			if (type == 1) {
+				let img = [];
+				img.push(url);
+				uni.previewImage({
+					urls: img,
+					current: 0
+				});
+			} else {
+				uni.previewImage({
+					urls: url,
+					current: index
+				});
+			}
+		},
+		closePreview(type, url) {
+			let _this = this;
+			if (type == 2) {
+				for (let i = 0; i < _this.userInfo.thumbs.length; i++) {
+					if (url == _this.userInfo.thumbs[i]) {
+						_this.userInfo.thumbs.splice(i, 1);
+						// _this.userInfo.thumbs.splice(i, 1);
+					}
+				}
+			} else {
+				for (let i = 0; i < _this.userInfo.advs.length; i++) {
+					if (url == _this.userInfo.advs[i]) {
+						_this.userInfo.advs.splice(i, 1);
+						// _this.userInfo.thumbs.splice(i, 1);
+					}
+				}
+			}
+		},
+		closeLogo() {
+			this.userInfo.logo = '';
+			this.userInfo.thumb = '';
+		},
+		uplodephone(length, localIds, type) {
+			let _this = this;
+			wxApi.uoloadIg(localIds[length], data => {
+				if (data.errMsg === 'uploadImage:ok') {
+					uni.showLoading({});
+					let requestData = {
+						upload_type: 2,
+						id: data.serverId
+					};
+					App._post_form(
+						'&do=uploadFiles',
+						requestData,
+						res => {
+							if (res.errno === 0) {
+								let num = length + 1;
+								// uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+								// setTimeout(()=>{
+								// 	_this.uplodephone(_this.uploadlength,_this.localIds);
+								// },100)
+								// uni.showToast({
+								// 	title:'chengg',
+								// 	icon:'none'
+								// })
+								if (type == 2) {
+									_this.userInfo.thumbs.push(res.data.img);
+								} else {
+									_this.userInfo.advs.push(res.data.img);
+								}
+
+								if (num < _this.uploadlength) {
+									uni.setTimeout(_this.uplodephone(num, _this.localIds, type), 500);
+								}
+								// _this.userInfo.thumbs.push(res.data.image);
+							}
+						},
+						false,
+						() => {
+							uni.hideLoading();
+						}
+					);
+				} else {
+					uni.hideLoading();
+					App.showError('上传失败');
+				}
+			});
+		},
+		// 文件上传接口
+		async uploadFiles(type, num) {
+			let _this = this;
+			// _this.uoloadIgs(i, 0, res, type);
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(num);
+			    if(type == 1){
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let aa = await App._upLoad(res.tempFilePaths[i]);
+						_this.userInfo.thumb = aa.data.img;
+						_this.userInfo.logo = aa.data.image;
+					}
+				}else{
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let aa = await App._upLoad(res.tempFilePaths[i]);
+						if (type == 2) {
+							_this.userInfo.thumbs.push(aa.data.img);
+							// _this.userInfo.thumbs.push(aa.data.image);
+							console.log(_this.userInfo, aa.data.img);
+						}
+						if (type == 3) {
+							_this.userInfo.advs.push(aa.data.img);
+							// _this.userInfo.thumbs.push(aa.data.image);
+							console.log(_this.userInfo, aa.data.img);
+						}
+					}
+				}
+				return
+			}
+			if (type == 2) {
+				wxApi.choseImage(res => {
+					// let length
+					_this.localIds = res.localIds;
+					_this.uploadlength = res.localIds.length;
+					_this.uplodephone(0, _this.localIds, type);
+				}, 6);
+			} else if (type == 1) {
+				wxApi.choseImage(res => {
+					let length = res.localIds.length;
+					res.localIds.map(item => {
+						wxApi.uoloadIg(item, data => {
+							if (data.errMsg === 'uploadImage:ok') {
+								uni.showLoading({});
+								let requestData = {
+									upload_type: 2,
+									id: data.serverId
+								};
+								App._post_form(
+									'&do=uploadFiles',
+									requestData,
+									res => {
+										if (res.errno === 0) {
+											if (type == 1) {
+												_this.userInfo.thumb = res.data.img;
+												_this.userInfo.logo = res.data.image;
+											}
+											if (type == 2) {
+												_this.userInfo.thumbs.push(res.data.img);
+												// _this.userInfo.thumbs.push(res.data.image);
+											}
+										}
+									},
+									false,
+									() => {
+										uni.hideLoading();
+									}
+								);
+							} else {
+								uni.hideLoading();
+								App.showError('上传失败');
+							}
+						});
+					});
+				});
+			} else {
+				wxApi.choseImage(res => {
+					// let length
+					_this.localIds = res.localIds;
+					_this.uploadlength = res.localIds.length;
+					_this.uplodephone(0, _this.localIds, type);
+				}, 6);
+			}
+
+			// #endif
+			// #ifndef H5
+			if (type == 1) {
+				wx.chooseImage({
+					count: 1,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						// console.log(_this.userInfo.havestore, _this.page, '-------');
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							_this.userInfo.thumb = aa.data.img;
+							_this.userInfo.logo = aa.data.image;
+						}
+					}
+				});
+			} else {
+				wx.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						// console.log(_this.userInfo.havestore, _this.page, '-------');
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 2) {
+								_this.userInfo.thumbs.push(aa.data.img);
+								// _this.userInfo.thumbs.push(aa.data.image);
+								console.log(_this.userInfo, aa.data.img);
+							}
+							if (type == 3) {
+								_this.userInfo.advs.push(aa.data.img);
+								// _this.userInfo.thumbs.push(aa.data.image);
+								console.log(_this.userInfo, aa.data.img);
+							}
+						}
+					}
+				});
+			}
+
+			// #endif
+		},
+		showThePic() {
+			this.hangYe = !this.hangYe;
+			this.hangyeshow = !this.hangyeshow;
+		},
+		closeShareBottom() {
+			this.hangyeshow = !this.hangyeshow;
+			this.hangYe = !this.hangYe;
+		},
+		onCancel() {},
+		cancel() {
+			this.hangyeshow = false;
+		},
+		confirm() {
+			this.hangyeshow = false;
+		},
+		getcityclass() {
+			// let _this = this;
+			// let data = {
+			// 	provinceid:this.userInfo.provinceid,
+			// 	areaid:this.userInfo.areaid,
+			// 	distid:this.userInfo.distid
+			// }
+			// App._post_form(
+			// 	`&p=yellowpage&do=area2cate`,
+			// 	data,
+			// 	res => {
+			// 		console.log(res,'更换地区结果');
+			// 		_this.industry = res.data.parents;
+			// 		for(let key  in _this.industry){
+			// 				_this.industry[key].checked = false;
+			// 		  };
+			// 		  console.log(_this.industry,'测试自动');
+			// 		_this.industryAll = res.data.childrens;
+			// 		for(let key  in _this.industryAll){
+			// 				_this.industryAll[key].map(item=>{
+			// 					item.checked = false;
+			// 					if(item.id == _this.userInfo.two_class){
+			// 						_this.industrysubdivide = [];
+			// 						_this.loadlogo = false;
+			// 						_this.loadlogo = true;
+			// 					}
+			// 				})
+			// 				console.log(_this.industryAll,'还地区')
+			// 		  };
+			// 		  _this.userInfo.one_class = '';
+			// 		  _this.userInfo.two_class = '';
+			// 		   _this.industryclass = '';
+			// 		  if(Array.isArray(res.data.childrens) || Array.isArray(res.data.parents)){
+			// 			  _this.industrysubdivide = res.data.childrens;
+			// 			  _this.industryclass = '当前地区暂无行业分类';
+			// 			  if(_this.oldDistid !== _this.userInfo.distid){
+			// 			  	uni.showToast({
+			// 			  		title:'当前地区暂无行业分类',
+			// 			  									icon:'none'
+			// 			  	});
+			// 			  }
+			// 		  }else{
+			// 			  console.log(_this.oldDistid,_this.userInfo.distid,777777)
+			// 			  if(_this.oldDistid !== _this.userInfo.distid){
+			// 				  uni.showToast({
+			// 				  	title:'更换地区请重新选择当前地区行业',
+			// 				  	icon:'none'
+			// 				  });
+			// 			  }
+			// 		  }
+			// 		  _this.loadlogo = false;
+			// 		  _this.loadlogo = true;
+			// 		// App.navigationTo({
+			// 		// 	url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid
+			// 		// });
+			// 	},
+			// 	false,
+			// 	() => {
+			// 	}
+			// );
+		},
+		onConfirm(e) {
+			console.log(e);
+			let _this = this;
+			this.provinceidName = e.obj.province.label;
+			this.areaidName = e.obj.city.label;
+			this.distidName = e.obj.area.label;
+			this.oldDistid = this.userInfo.distid;
+			this.userInfo.provinceid = e.value[0];
+			this.userInfo.areaid = e.value[1];
+			this.userInfo.distid = e.value[2];
+			this.getcityclass();
+		},
+		visble() {
+			this.visiblec = true;
+		},
+		visbleTwo() {
+			this.visiblec2 = true;
+		},
+		visble3() {
+			this.visiblec3 = true;
+		},
+		visble4() {
+			this.visiblec4 = true;
+		},
+		getLocation() {
+			let _this = this;
+			// #ifdef MP-WEIXIN
+			uni.chooseLocation({
+				keyword: '',
+				success: function(e) {
+					_this.userInfo.address = e.address;
+					_this.userInfo.lat = e.latitude;
+					_this.userInfo.lng = e.longitude;
+					_this.lblis.lat = e.latitude;
+					_this.lblis.lng = e.longitude;
+					_this.lblis.address = e.address;
+					// console.log(e);
+					// _this.onkoc = 0;
+					_this.getloctions(_this.lblis);
+				}
+			});
+			// #endif
+			// #ifdef H5
+			_this.isOpenLaction = true;
+			// #endif
+			//#ifdef APP-PLUS
+				App.navigationTo({
+					url: 'pages/subPages2/map/index'
+				});
+			//#endif
+		},
+		getloctions(lblis) {
+			let _this = this;
+			// console.log(_this.owenscitylist);
+			App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+				// _this.userInfo.address = lblis.address;
+				console.log(_this.userInfo.distid, res.data.countyid, '666666');
+				_this.oldDistid = _this.userInfo.distid;
+				_this.userInfo.provinceid = res.data.provinceid;
+				_this.userInfo.distid = res.data.countyid;
+				_this.userInfo.areaid = res.data.cityid;
+				_this.owenscitylist.map((item, index) => {
+					if (item.id == _this.userInfo.provinceid) {
+						_this.provinceidName = item.name;
+						item.area.map(items => {
+							if (items.id == _this.userInfo.areaid) {
+								_this.areaidName = items.name;
+								items.dist.map(itemss => {
+									if (itemss.id == _this.userInfo.distid) {
+										_this.distidName = itemss.name;
+										this.getcityclass();
+									}
+								});
+							}
+						});
+					}
+				});
+			});
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f7f7f7;
+}
+</style>
+<style lang="scss" scoped>
+.enterForm {
+	// padding: 30upx;
+	.bgimgbox {
+		.bgimg {
+			width: 100vw;
+			height: 25vh;
+		}
+	}
+	.formbox {
+		padding: 30upx;
+		padding-bottom: 130upx;
+		// height: 50vh;
+		position: relative;
+		.formdatabox {
+			padding: 30upx;
+			width: 84vw;
+			background-color: #ffffff;
+			border-radius: 15upx;
+			position: relative;
+			top: -340upx;
+			.sign {
+				height: 28upx;
+				margin-top: 5upx;
+				width: 8upx;
+				background-color: #ff4444;
+				border-radius: 30%;
+				flex: 0.014;
+			}
+		}
+		.logobox {
+			span {
+				font-size: 24upx;
+			}
+			.userImgUpdataon {
+				width: 180upx;
+				margin: 20upx 0;
+				height: 180upx;
+				border-radius: 10upx;
+				border: 1upx solid #cccccc;
+				position: relative;
+				overflow: hidden;
+				.imgs {
+					width: 180upx;
+					height: 180upx;
+				}
+				.close {
+					position: absolute;
+					width: 30upx;
+					height: 30upx;
+					right: 10upx;
+					top: 10upx;
+				}
+			}
+			.userImgUpdata {
+				width: 180upx;
+				margin: 20upx 0;
+				height: 180upx;
+				border-radius: 10upx;
+				border: 1upx solid #cccccc;
+				position: relative;
+				.img {
+					width: 80upx;
+					height: 80upx;
+					position: absolute;
+					left: 50%;
+					top: 30%;
+					transform: translate(-50%);
+				}
+			}
+		}
+		.formtitle {
+			padding: 25upx 10upx;
+			background-color: #fafafa;
+			margin-top: 20upx;
+			border-radius: 10upx;
+		}
+	}
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+	.hangye {
+		height: 40vh;
+		width: 100vw;
+		box-sizing: border-box;
+		padding: 30upx;
+		background-color: #ffffff;
+		border-radius: 15upx 15upx 0 0;
+		.industryclass-item {
+			padding: 20upx;
+			margin: 15upx;
+			text-align: center;
+			border-radius: 15upx;
+		}
+		.classcheck {
+			background-color: #f7f7f7;
+		}
+		.isclasschecked {
+			background-color: #ff4444;
+			color: #ffffff;
+		}
+	}
+	.timePickerView {
+		width: 100%;
+	}
+}
+.specificationClass {
+	width: 80vw;
+	height: 1000upx;
+	border-radius: 20upx;
+	background-color: #f7f7f7;
+	padding: 30upx;
+	.title {
+		padding: 20upx 0;
+		color: #6f6f6f;
+	}
+	.content {
+		background-color: #ffffff;
+		border-radius: 10upx;
+		margin-top: 20upx;
+		padding: 40upx 20upx 20upx;
+		position: relative;
+		.content-item {
+			border-bottom: 1upx solid #f1f1f1;
+			color: #000000;
+			height: 60upx;
+			line-height: 60upx;
+			font-size: 28upx;
+		}
+	}
+	.specificationBtn {
+		width: 70vw;
+		margin: auto;
+		height: 80upx;
+		line-height: 80upx;
+		background-color: #ff4444;
+		color: #ffffff;
+		margin-top: 50upx;
+		border-radius: 15upx;
+		text-align: center;
+		font-size: 30upx;
+		transition: transform 0.3s ease-out;
+	}
+	.specificationBtn:active {
+		background-color: #bc3434;
+	}
+}
+.addspecificationshow {
+	width: 70vw;
+	// height: 500upx;
+	background-color: #ffffff;
+	border-radius: 15upx;
+	padding: 30upx;
+	border: 1upx solid #ff4444;
+	.addspecificationshow-btn {
+		width: 100%;
+		height: 80upx;
+		color: #ffffff;
+		text-align: center;
+		font-size: 36upx;
+		line-height: 80upx;
+		background-color: #ff4444;
+		transition: transform 0.3s ease-out;
+		border-radius: 10upx;
+	}
+}
+</style>
diff --git a/pages/subPages2/coursegoods/localindex/localindex.vue b/pages/subPages2/coursegoods/localindex/localindex.vue
new file mode 100644
index 0000000..6f23acf
--- /dev/null
+++ b/pages/subPages2/coursegoods/localindex/localindex.vue
@@ -0,0 +1,388 @@
+<template>
+	<view>
+		<loadlogo v-if="!loadlogo" />
+		<view class="localindex" v-if="loadlogo">
+			
+			<!-- 选项卡一 -->
+			<view class="b-f" style="padding: 30upx 30upx 0">
+				<v-tabs 
+				:lineScale="0.3" 
+				:lineRadius="'100rpx'" 
+				:lineHeight="'6rpx'" 
+				:fontSize="'30rpx'" 
+				:paddingItem="'0 22rpx 30rpx'" 
+				:activeColor="'#ff4444'" 
+				:lineColor="'#ff4444'"
+				v-model="sort" 
+				:scroll="false" 
+				:field="'name'"
+				:tabs="tags"></v-tabs>
+			</view>
+			<!-- 选项卡二 -->
+			<view  style="padding: 30upx;">
+				<v-tabs 
+				:color="'#333333'" 
+				:bgColor="'#f6f6f6'" 
+				:activeColor="'#ff4444'" 
+				:height="'40rpx'" 
+				:paddingItem="'5rpx 20rpx'" 
+				:fontSize="'26rpx'" 
+				:pillsColor="'#FFEBEB'" 
+				:pillsBorderRadius="'60rpx'" 
+				v-model="current" 
+				:field="'name'" 
+				:tabs="indexData" 
+				:pills="true" 
+				line-height="0" 
+				:bold="false" 
+				@change="changeTab"></v-tabs>
+			</view>
+			<view  v-if="currentTab ==='activity'">
+				<activityData :tabDataList="indexList"></activityData>
+			</view>
+			<!-- 抢购 -->
+			<block v-if="currentTab ==='rush'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<goods-style goodsStyleType="rush" :goodslistData="indexList" @remindSuccess="remindSuccess"></goods-style>
+				</view>
+			</block>
+			<!-- 卡券 -->
+			<block v-if="currentTab==='coupon'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<goods-style goodsStyleType="coupon" :goodslistData="indexList"></goods-style>
+				</view>
+			</block>	
+			<!-- 折扣 -->
+			<block v-if="currentTab==='halfcard'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<card-components :disCardData_two="indexList" disCardType="disCard1" :disType="2"></card-components>
+				</view>
+			</block>
+			<!-- 拼团 -->
+			<block v-if="currentTab==='wlfightgroup'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<goods-style goodsStyleType="fight" :goodslistData="indexList"></goods-style>
+				</view>
+			</block>
+			<!-- 同城 -->
+			<block v-if="currentTab==='pocket'">
+				<citywide :citywideList="indexList" @getaver="getaver"></citywide>
+			</block>
+			<!-- 团购 -->
+			<block v-if="currentTab ==='groupon'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<goods-style goodsStyleType="groupon" :goodslistData="indexList"></goods-style>
+				</view>
+			</block>
+			<!-- 砍价 -->
+			<block v-if="currentTab ==='bargain'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<goods-style goodsStyleType="bargain" :goodslistData="indexList"></goods-style>
+				</view>
+			</block>
+			<!-- 大礼包 -->
+			<block v-if="currentTab==='package'">
+				<view class="b-e6 padding-box-all" style="padding-bottom: 70upx;">
+					<giftbag-components :giftData_two="indexList" giftType="gift_type1" :disType="2"></giftbag-components>
+				</view>
+			</block>
+			<!-- 积分 -->
+			<block v-if="currentTab==='consumption'">
+				<integral :integralList="indexList"></integral>
+			</block>
+			<!-- <view class="dis-flex goodsList-Box" v-for="(item,index) in indexList" :key="index" @click="toSignUp(item)">
+				<view class="goodsImgBox" style="padding-right: 20upx;">
+					<image style="width: 200upx;height: 200upx;border-radius: 6upx;" :src="item.thumb" mode=""></image>
+				</view>
+				<view class="content" >
+					<view class="f-30" style="padding-bottom: 15upx;">
+						{{item.title}}
+					</view>
+					<view class="col-9 f-20" style="padding-bottom: 15upx;">
+						<view class="dis-il-block" style="width: 350upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">
+							{{item.address}}
+						</view>
+						<view style="float: right;">{{item.distance}}</view>
+					</view>
+					
+					
+					<view class="f-22 col-9" style="height: 30upx;line-height: 30upx;padding-bottom: 15upx;">
+						<view  v-if="item.minprice && item.maxprice">
+							价格: <text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.minprice}}</text>
+							<text style="padding: 0 10upx;color: #FF4444;">~</text>
+							<text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.maxprice}}</text>
+						</view>
+						<view  v-else>
+							价格: <text style="color: #FF4444;font-size: 36upx;padding-left: 10upx;"><text class="f-20">¥</text>{{item.price}}</text>
+						</view> -->
+						<!-- <view >
+							最高价: 
+						</view> -->
+				<!-- 	</view>
+					<view >
+						<view class="f-20 col-9 dis-il-block" style="margin: 10upx  0 10upx;background-color: #FFEBEB;color: #FF4444;border-radius: 60upx;height: 30upx;line-height: 30upx;padding: 5upx 20upx;">
+							{{item.catename}}
+						</view>
+					</view>
+					<view class="f-26 col-f t-c" 
+					style="position: absolute;background-color: #FF4444;height: 50upx;line-height: 50upx;width: 150upx;border-radius: 60upx;right: 30upx;bottom: 30upx;">
+						立即报名
+					</view>
+				</view>
+			</view> -->
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<TabBars :tabBarAct="0" :pageType="''" />
+		<!-- <diypages :diypagesData="diypagesData" :pageData="datas.page" :btngroupData="btngroup" @getChild="getChild" /> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import TabBars from '@/components/template/tabBar';
+	import PopupView from '@/components/template/PopManager.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import activityData from '@/components/template/activityData.vue'
+	import cardComponents from '@/components/page/pageComponents/discountCard.vue'
+	import giftbagComponents from '@/components/page/pageComponents/giftbag.vue'
+	import citywide from '@/components/page/pageComponents/citywide.vue'
+	import integral from '@/components/page/pageComponents/integral.vue'
+	import goodsStyle from '@/components/page/pageComponents/goodsStyle.vue'
+	export default{
+		components:{
+			Loadlogo,
+			vTabs,
+			PopupView,
+			loadMore,
+			TabBars,
+			activityData,
+			cardComponents,
+			giftbagComponents,
+			citywide,
+			integral,
+			goodsStyle
+		},
+		data(){
+			return{
+				loadlogo:false,
+				indexData:{},
+				indexList:[],
+				imgstyle:{},
+				current:0,
+				showCommunity: false,
+				page:1,
+				page_index:10,
+				keyword:'',
+				sort:0,
+				curLoction:{},
+				count:1000,
+				isMore:true,
+				currentTab:'',
+				cate_id:'',
+				type:'',
+				tags:[]
+			}
+		},
+		onLoad(e) {
+			console.log(e);
+			this.type = e.type;
+			if(e.type == 3){  //根据不同的type转换为不同的插件
+				this.currentTab = 'rush'
+			}else if(e.type == 4){
+				this.currentTab = 'groupon'
+			}
+			else if(e.type == 5){
+				this.currentTab = 'coupon'
+			}
+			else if(e.type == 6){
+				this.currentTab = 'wlfightgroup'
+			}
+			else if(e.type == 7){
+				this.currentTab = 'bargain'
+			}
+			else if(e.type == 14){
+				this.currentTab = 'activity'
+			}
+			this.cate_id = e.cate_id;
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			this.clienType = App.getClientType();
+			// console.log(this.clienType,'雷影')
+			this.curLoction = uni.getStorageSync('curLoction');
+		},
+		onShow() {
+			for(let i = 0; i<this.page;i++){//返回页面的递归数据，保证用户下拉到底部的数据不丢失
+				this.getIndexData(true,i);
+			}
+		},
+		watch:{
+			sort(){
+				this.indexList = [];
+				this.getstoreList(true,1);
+			}
+		},
+		onReachBottom() {
+			this.onreach();//下拉加载的函数
+		},
+		methods:{
+			gourl(url){
+				App.navigationTo({
+					url: url
+				})
+			},
+			onreach(){
+				if(this.count == this.page) return
+				this.page++;
+				this.isMore = false;
+				this.getstoreList(true);
+			},
+			toSignUp(item){
+				console.log(item);
+				App.navigationTo({
+					url: `pages/subPages2/coursegoods/coursegoods?id=${item.id}`
+				})
+			},
+			goindex(){
+				App.navigationTo({
+					url: `pages/mainPages/index/index`
+				})
+			},
+			callPhone(phone) {
+				uni.makePhoneCall({
+					phoneNumber: phone
+				});
+			},
+			search(){
+				this.getstoreList();
+			},
+			communityShow() {
+				this.showCommunity = !this.showCommunity;
+			},
+			changeTab(e){
+				console.log(e);
+				this.current = e;
+				this.getstoreList();
+			},
+			bindchange(e){
+				console.log(e)
+			},
+			getIndexData(){
+				let _this = this;
+				let data = {
+					type:_this.type
+				}
+				App._post_form(
+					`&p=goods&do=getGoodsCateList`,
+					data,
+					res => {
+						_this.tags = [];
+						console.log(res);
+						for(let k in res.data.data){
+							_this.tags.push(res.data.data[k]);
+						}
+						
+						_this.indexData = res.data.params.class_list;
+						let data = {
+							name:'全部',
+							id:''
+						}
+						_this.indexData.unshift(data);
+						_this.indexData.map((item,index)=>{
+							if(item.id == _this.cate_id){
+								_this.current = index;
+							}
+						})
+						this.getstoreList();
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			getstoreList(flag,page){
+				// debugger
+				console.log(this.indexData,this.current);
+				let _this = this;
+				if(!flag){
+					_this.page = 1;
+				}
+				let data = {
+					page: page ||_this.page,
+					page_index:_this.page_index,
+					keyword:_this.keyword,
+					sort:_this.sort + 1,
+					cate_id:_this.indexData[_this.current].id,
+					lng:_this.curLoction.longitude,
+					lat:_this.curLoction.latitude
+				};
+				App._post_form(
+					`&p=${this.currentTab}&do=homeList`,
+					data,
+					res => {
+						console.log(res);
+						if(flag){
+							if(this.currentTab == 'activity'){
+								_this.indexList = _this.indexList.concat(res.data.list);
+							}else{
+								_this.indexList = _this.indexList.concat(res.data);
+							}
+							
+							_this.isMore = true;
+						}else{
+							if(this.currentTab == 'activity'){
+								_this.indexList = res.data.list;
+								// _this.count = res.data.total;
+							}else{
+								_this.indexList = res.data;
+							}
+							
+						}
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+						_this.isMore = true;
+					}
+				);
+			},
+			getChild(e){
+				console.log(e)
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F6F6F6;
+	}
+	/* @import '../../../../common/css/diyPages.css';
+	@import '../../../../common/css/old_diyPages';
+	@import '../../../../pages/subPages/goods/index.css'; */
+</style>
+<style lang="scss" scoped>
+	@import '../../../../common/css/diyPages.css';
+	@import '../../../../common/css/old_diyPages';
+	@import '../../../../pages/subPages/goods/index.css';
+	.localindex{
+		// padding: 30upx;
+		padding-bottom: 100upx;
+		.seach-box{
+			padding: 30upx;
+		}
+		.goodsList-Box{
+			padding: 20upx;
+			border-radius: 15upx;
+			margin: 0 30upx 20upx;
+			position: relative;
+			background-color: #FFFFFF;
+			.schedule{
+				height: 100%;
+				border-radius: 60upx;
+				background-color: #FF4444;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/drawGame/drawGame.vue b/pages/subPages2/drawGame/drawGame.vue
new file mode 100644
index 0000000..ab1746c
--- /dev/null
+++ b/pages/subPages2/drawGame/drawGame.vue
@@ -0,0 +1,1456 @@
+<template>
+	<view id="app">
+		<loadlogo v-if="!loadlogo" />
+		<view class="drawGame" :style="{backgroundColor: drawPageData.bg_color || '#FF5555'}" v-if="loadlogo">
+			<view class="audio-main" @click="playAudio" style="top: 1.5%;right: 30upx;" v-if="!!drawPageData.background_music">
+				<view class="audio-bg" :class="{ 'stop-audio': !play_Audio }">
+					<view class="audio-gif" :style="{ 'background-image': 'url(' + imageRoot + 'musicgif.gif)' }">
+						<view class="audio-png" :style="{ 'background-image': 'url(' + imageRoot + 'music.png)' }"></view>
+					</view>
+				</view>
+			</view>
+			<view class="titleBG" :style="{width: imgstyle.width + 'px',height: imgstyle.height + 'px'}">
+				<view class="titleimg" v-if="drawPageData.share_image">
+					<swiper 
+					class="titleimg" 
+					indicator-color="rgba(255,255,255,.4)" 
+					indicator-active-color="rgba(255,255,255,.85)" 
+					:indicator-dots="true" 
+					:autoplay="true" 
+					:interval="interval" 
+					:duration="duration">
+						<swiper-item v-for="(item, index) in drawPageData.share_image" :key="index" style="border-radius: 15upx;">
+							<image class="titleimg" :src="item" ></image>
+						</swiper-item>
+					</swiper>
+				</view>
+				<!-- <image class="titleimg"  :src="drawPageData.share_image" mode=""></image> -->
+				<!-- <view class="gameRule" @click="isRuleShow(1)">
+					活动规则<text class="iconfont icon-gantanhaozhong" style="font-size: 34upx;"></text>
+				</view>
+				<view class="gameRule left" @click="isRuleShow(2)">
+					抽奖规则<text class="iconfont icon-gantanhaozhong" style="font-size: 34upx;"></text>
+				</view> -->
+			</view>
+			<view class="bigbg" style="margin: 30upx;">
+				<view class="dis-flex col-f" style="padding: 0 20upx 20upx;">
+					<view class="flex-box f-26 t-l">
+						参加人数:{{drawPageData.visit}}人
+					</view>
+					<view class="flex-box f-26 t-c">
+						浏览人数:{{drawPageData.pv}}人
+					</view>
+					<view class="flex-box f-26 t-r">
+						中奖人数:{{drawPageData.prize}}人
+					</view>
+				</view>
+				<view class="bg" :style="{background: 'url('+drawPageData.background_image +')',backgroundSize: '100% 100%'}">
+					<!-- <view class="bg"> -->
+					<view  style="height: 188upx;">
+						<view class="scroll-wrap">
+							<view class="scroll-content" :style="{ top }" @mouseenter="Stop()" @mouseleave="Up()">
+								<view class="scroll-content-item" v-for="item in prizeList" v-bind:key="item.id">{{item.nickname}}获得{{item.title}}</view>
+							</view>
+						</view>
+					</view>
+					<!-- 抽奖组件 -->
+					<view style="position: relative;" v-if="parameterid">
+						<view  v-if="drawPageData.type == '1'">
+							<FGame :goodsList="goodsList" @startMusic="startMusic" @endMusic="endMusic" :opendraw="opendraw" :parameterid="parameterid"></FGame>
+						</view>
+						<view v-else-if="drawPageData.type == '2'">
+							<FGamesix :goodsList="goodsList" @startMusic="startMusic" @endMusic="endMusic" :opendraw="opendraw" :parameterid="parameterid"></FGamesix>
+						</view>
+						<view  style="height: 600upx;padding: 10upx;" v-else-if="drawPageData.type == '3' && goodsList">
+							<raffle-wheel
+							  ref="raffleWheel"
+							  :prizeList="goodsList"
+							  strKey="name"
+							  :ringCount="5"
+							  :duration="5"
+							  :colors="drawPageData.wheel_bg"
+							  :canvas-width="canvasData.width"
+							  :canvas-height="canvasData.height"
+							  :num="opendraw"
+							  @actionStart="handleActionStart"
+							  @actionEnd="handleActionEnd"
+							  @done="handleDrawDone"
+							  @playdraw="playdraw"
+							  v-if="goodsList.length"
+							/>
+						</view>
+						<view class="imgs" v-if="startImg">
+							<image :src="drawPageData.start_image" style="position: absolute;z-index: 99;top: 30%;left: 50%;transform: translate(-50%);width: 300upx;height: 300upx;"
+							 mode=""></image>
+						</view>
+						
+					</view>
+					
+					<view class="dis-flex f-28" style="padding: 71upx 0upx 0upx;color: #955F19;">
+						<view class="dis-flex" style="flex: 0.3;">
+							<view >
+								<view class="dis-flex" style="margin-top: 20upx;">
+									<view class="b-f" style="width: 10upx;height: 10upx;border-radius: 50% 0% 0% 50%;border-right: 3upx solid #D4D3D4;"></view>
+									<view class="b-f" style="width: 8upx;height: 10upx;;border-right: 3upx solid #D4D3D4;"></view>
+									<view class="b-f" style="width: 8upx;height: 10upx;;border-right: 3upx solid #D4D3D4;"></view>
+								</view>
+								<view class="dis-flex" style="margin-top: 60upx;">
+									<view class="b-f" style="width: 10upx;height: 10upx;border-radius: 50% 0% 0% 50%;border-right: 3upx solid #D4D3D4;"></view>
+									<view class="b-f" style="width: 8upx;height: 10upx;;border-right: 3upx solid #D4D3D4;"></view>
+									<view class="b-f" style="width: 8upx;height: 10upx;;border-right: 3upx solid #D4D3D4;"></view>
+								</view>
+							</view>
+							<view class="ifeng" :style="{backgroundColor: drawPageData.button_shadow || '#AF1010'}">
+								<view class="ifelit" :style="{backgroundColor: drawPageData.button_color || '#FD7058'}">
+									<view class="f-28 col-f t-c" style="height: 50upx;line-height: 50upx;">
+										我的<text>{{TextSubstitution.credittext}}</text>
+									</view>
+									<view class="b-f f-28 f-w t-c" style="margin: 0 3upx;height: 62upx;border-radius: 0upx 0upx 8upx 8upx;color: #FF4444;line-height: 62upx;">
+										{{parseInt(drawPageData.user_integral)}}
+									</view>
+								</view>
+							</view>
+						</view>
+						<view  style="flex: 0.4;">
+							<view style="width: 248upx;height: 120upx;margin: auto;" @click="playdraw">
+								<image class="btnimg" style="width: 100%;height: 100%;" :src="drawPageData.button_draw ||  imgfixUrls + '/ljcj.png'"
+								 mode=""></image>
+							</view>
+						</view>
+						<view class="t-r f-24 col-f" style="padding-top: 6upx;flex: 0.3;">
+							<view  style="float: right;margin-right: 2upx;">
+								<view class="dis-flex">
+									<view class="dis-il-block dis-flex description" :style="{backgroundColor: drawPageData.button_shadow || '#AF1010'}">
+										<view class="dis-il-block descriptionrulo" @click="isRuleShow(2)" :style="{backgroundColor: drawPageData.button_color || '#FD7058'}">
+											<view class="dis-il-block t-c" style="height: 45upx;line-height: 45upx;">
+												规则说明
+											</view>
+											<view class="dis-il-block iconfont icon-video t-c" style="font-weight: 400;font-size: 28upx;height: 45upx;width: 46upx;line-height: 45upx;">
+												
+											</view>
+										</view>
+										
+										<!-- <view class="b-f dis-il-block" style="width: 20upx;height: 58upx;border-radius: 0 60upx 60upx 0;background-color: #FFFFFF;">
+											<view  style="width: 10upx;height: 30upx;border-radius: 0 60upx 60upx 0;background-color: #ff4444;float: right;">
+												
+											</view>
+										</view> -->
+									</view>
+									<view class="dis-flex" style="margin-top: 20upx;">
+										<view  style="width: 10upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;"></view>
+										<view  style="width: 8upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;"></view>
+										<view  style="width: 6upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;border-radius: 0 60upx 60upx 0upx;"></view>
+									</view>
+									
+								</view>
+								<view class="dis-flex" style="margin-top: 10upx;">
+									<view class="dis-il-block dis-flex awardbtn" :style="{backgroundColor: drawPageData.button_shadow || '#AF1010'}">
+										<view class="dis-il-block awardbtnrulo" @click="myprize" :style="{backgroundColor: drawPageData.button_color || '#FD7058'}">
+											<view class="dis-il-block t-c" style="height: 45upx;line-height: 45upx;">
+												我的奖品
+											</view>
+											<view class="dis-il-block iconfont icon-video t-c" style="font-weight: 400;font-size: 28upx;height: 45upx;width: 46upx;line-height: 45upx;">
+												
+											</view>
+										</view>
+										
+										<!-- <view class="b-f dis-il-block" style="width: 20upx;height: 58upx;border-radius: 0 60upx 60upx 0;background-color: #FFFFFF;">
+											<view  style="width: 10upx;height: 30upx;border-radius: 0 60upx 60upx 0;background-color: #ff4444;float: right;">
+												
+											</view>
+										</view> -->
+									</view>
+									<view class="dis-flex" style="margin-top: 20upx;">
+										<view  style="width: 10upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;"></view>
+										<view  style="width: 8upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;"></view>
+										<view  style="width: 6upx;height: 10upx;background-color: #FFFFFF;border-right: 2upx solid #D4D3D4;border-radius: 0 60upx 60upx 0upx;"></view>
+									</view>
+									
+								</view>
+							</view>
+						<!-- 	<view class="t-r" >
+								规则说明
+							</view>
+							<view class="t-r" style="margin-top: 40upx;height: 44upx;line-height: 44upx;" > 
+								我的奖品
+							</view> -->
+							
+							
+							
+							<!-- <view class="dis-il-block" v-if="drawPageData.surplus_day_join_times == 0" style="padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(0,0,0,0.1);">
+								<text style="color: #FF4444;">{{drawPageData.integral_consume}}</text>
+								<text>{{TextSubstitution.credittext}}</text>抽
+								<text style="color: #FF4444;">1</text>
+								次
+							</view>
+							<view class="dis-il-block" v-else style="padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(0,0,0,0.1);">
+								<text>今日免费次数:</text>
+								<text style="color: #FF4444;">{{drawPageData.surplus_day_join_times}}</text>
+							</view> -->
+						</view>
+						
+					</view>
+					
+					<view class="dis-flex" style="padding: 20upx 30upx 0;">
+						<view  style="flex: 0.5;">
+							<view style="width: 382upx;height: 90upx;" @click="gogetintegral">
+								<image class="btnimg" style="width: 100%;height: 100%;" :src="drawPageData.button_more || imgfixUrls + '/hqgdbtn.png'"
+								 mode=""></image>
+							</view>
+						</view>
+						<view  style="flex: 0.5;">
+							<view style="width: 220upx;height: 90upx;float: right;" @click="GenerateAPoster">
+								<image class="btnimg" style="width: 100%;height: 100%;" :src="drawPageData.button_prize || imgfixUrls + '/schbbtn.png'"
+								 mode=""></image>
+							</view>
+						</view>
+					</view>
+					<view class="f-26 t-c" style="color: rgb(184, 47, 57);height: 60upx;line-height: 60upx;">
+						<text style="padding-right: 30upx;" v-if="drawPageData.surplus_day_join_times != 0">今日免费<text style="color: #FF4444;">{{drawPageData.surplus_day_join_times}}</text>次</text>
+						<text style="color: #FF4444;"></text>
+						<text>每消耗</text>
+						<text style="color: #FF4444;">{{drawPageData.integral_consume}}</text>
+						<text>{{TextSubstitution.credittext}}</text>抽
+						<text style="color: #FF4444;">1</text>
+						次
+						<text style="padding-left: 30upx;" v-if="drawPageData.surplus_day_parin_times != 0">今日可抽<text style="color: #FF4444;">{{drawPageData.surplus_day_parin_times}}</text>
+						次</text>
+						
+					</view>
+					<!-- 按钮组 -->
+					<!-- <view class="dis-flex" style="padding: 0 20upx;">
+						<view >
+							<view style="height: 124upx;width: 184upx;" @click="gogetintegral">
+								<image class="btnimg" style="width: 100%;height: 100%;" :src="imgfixUrls + '/hqgd.png'" mode=""></image>
+							</view>
+						</view>
+						<view  style="padding: 0 20upx;" @click="playdraw">
+							<view style="width: 288upx;height: 124upx;">
+								<image class="btnimg" style="width: 100%;height: 100%;" :src="drawPageData.start_image ||  imgfixUrls + '/ljcj.png'"
+								 mode=""></image>
+							</view>
+						</view>
+						<view >
+							<view style="width: 122upx;height: 124upx;" @click="myprize">
+								<image class="btnimg" style="height: 100%;width: 100%;" :src="imgfixUrls + '/wdjp.png'" mode=""></image>
+							</view>
+						</view>
+					</view> -->
+					<!-- <view class="t-c f-26" style="color: #955F19;">
+						<text>今日免费次数:</text>
+						<text>3</text>
+					</view> -->
+
+				</view>
+				<!-- 活动商家 -->
+				<view class="activity" v-if="storeList.length > 0">
+					<view class="tagbox">
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-bottom: 34upx solid #D68009;
+						border-left: 26upx solid transparent;
+						position: absolute;
+						top: 0;
+						left: -8%;
+						z-index: 98;
+						">
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-top: 69upx solid #FCD83D;
+						border-left: 8upx solid transparent;
+						position: relative;
+						z-index: 99;
+						">
+						</view>
+						<view class="contentbox dis-il-block">
+							<view class="text">
+								商家列表
+							</view>
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						position: relative;
+						z-index: 99;
+						border-top: 69upx solid #FCD83D;
+						border-right: 8upx solid transparent;
+						">
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-bottom: 34upx solid #D68009;
+						border-right: 24upx solid transparent;
+						position: absolute;
+						right: -8%;
+						top: 0;
+						">
+						</view>
+
+						<!-- <view class="dis-il-block" 
+						style="width: 0;
+						height: 0;
+						border-top: 36upx solid #FFEA72;
+						border-left: 8upx solid transparent;">
+						</view> -->
+
+					</view>
+					<view class="activity-content">
+						<view class="storeList dis-flex" :style="{ left }" @mouseenter="cartStop()" @mouseleave="cartUp()">
+							<view class="storeList-item dis-il-block" v-for="(item,index) in storeList" :key="index" @click="gostore(item.id)">
+								<image :src="item.logo" style="width: 189upx;height: 189upx;border-radius: 10upx;" mode=""></image>
+								<view class="f-26" style="color: #999999;font-weight: 500;padding-bottom: 20upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;width: 180upx;">
+									{{item.storename}}
+								</view>
+								<view class="dis-flex" style="font-size: 24upx;font-family: PingFang SC;font-weight: 500;color: #333333;line-height: 36upx;">
+									<image style="width: 40upx;height: 40upx;" :src="item.goods_logo" mode=""></image>
+									<view class="f-26">
+										<view style="padding-left: 10upx;width: 140upx;overflow: hidden;
+										text-overflow:ellipsis; white-space: nowrap;">{{item.goods_name}}</view>
+										<!-- <text style="padding-left: 10upx;">1个</text> -->
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="f-24 t-c" style="font-size: 24upx;color: #999999;line-height: 50upx;">
+							<text class="iconfont icon-back_light" style="font-size: 24upx;"></text>
+							<text class="iconfont icon-back_light" style="font-size: 24upx;"></text>
+							左右滑动
+							<text class="iconfont icon-jinrujiantouxiao1" style="font-size: 24upx;"></text>
+							<text class="iconfont icon-jinrujiantouxiao1" style="font-size: 24upx;"></text>
+						</view>
+					</view>
+				</view>
+				<!-- 活动商家 -->
+				<view class="activity" style="top: 150upx;" v-if="friendList.list.length > 0">
+					<view class="tagbox">
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-bottom: 34upx solid #D68009;
+						border-left: 26upx solid transparent;
+						position: absolute;
+						top: 0;
+						left: -8%;
+						z-index: 98;
+						">
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-top: 69upx solid #FCD83D;
+						border-left: 8upx solid transparent;
+						position: relative;
+						z-index: 99;
+						">
+						</view>
+						<view class="contentbox dis-il-block">
+							<view class="text">
+								助力好友排行
+							</view>
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						position: relative;
+						z-index: 99;
+						border-top: 69upx solid #FCD83D;
+						border-right: 8upx solid transparent;
+						">
+						</view>
+						<view class="dis-il-block" style="width: 0;
+						height: 0;
+						border-bottom: 34upx solid #D68009;
+						border-right: 24upx solid transparent;
+						position: absolute;
+						right: -8%;
+						top: 0;
+						">
+						</view>
+
+						<!-- <view class="dis-il-block" 
+						style="width: 0;
+						height: 0;
+						border-top: 36upx solid #FFEA72;
+						border-left: 8upx solid transparent;">
+						</view> -->
+
+					</view>
+					<view class="activity-friend">
+						<view class="f-28 t-c" style="color: #333333;padding-bottom: 20upx;" v-if="friendList.total_friends !== 0 && friendList.total_friends !== '0'">
+							已有
+							<text style="color: #FF4444;">{{friendList.total_friends}}</text>
+							位好友帮您获得
+							<text style="color: #FF4444;">{{friendList.total_integral}}</text>
+							{{TextSubstitution.credittext}}
+						</view>
+						<view  style="overflow: auto;">
+							<view class="dis-flex" style="padding: 30upx 0;border-bottom: 2upx dashed #cccccc;" v-for="(item,index) in friendList.list"
+							 :key="index">
+								<view  style="flex: 0.1;margin: auto;">
+									<image style="width: 39upx;height: 47upx;" v-if="index == 0" :src="imgfixUrls + '/j.png'" mode=""></image>
+									<image style="width: 39upx;height: 47upx;" v-else-if="index == 1" :src="imgfixUrls + '/y.png'" mode=""></image>
+									<image style="width: 39upx;height: 47upx;" v-else-if="index == 2" :src="imgfixUrls + '/t.png'" mode=""></image>
+									<text class="f-28 t-c" style="line-height: 60upx;" v-else>{{index + 1}}</text>
+								</view>
+								<view class="dis-flex" style="flex: 0.6;">
+									<view >
+										<image style="height: 60upx;width: 60upx;border-radius: 50%;border: 2upx solid #333333;" :src="item.avatar"
+										 mode=""></image>
+									</view>
+									<view class="f-28" style="line-height: 60upx;padding-left: 15upx;color: #333333;overflow: hidden;text-overflow:ellipsis; white-space: nowrap;width: 300upx;">
+										{{item.nickname}}
+									</view>
+								</view>
+								<view class="f-28" style="flex: 0.3;line-height: 60upx;">
+									<text style="color: #FF4444;">{{item.total_integral}}</text>
+									{{TextSubstitution.credittext}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 规则 -->
+		<PopManager :show="ruleShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="ruleShow = false">
+			<view class="rulebox t-c">
+				<view class="f-32" style="font-weight: 500;color: #6f6f6f;padding-bottom: 30upx;">
+					活动规则
+				</view>
+				<view v-if="parser" style="height: 75vh;overflow: auto;">
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+					 selectable show-with-animation use-anchor :html="parser"></jyf-parser>
+				</view>
+			</view>
+			<view  style="position: relative;height: 40upx;">
+				<view  style="border-left: 1upx solid #FFFFFF;height: 50upx;position: absolute;left: 50%;transform: translateX(-50%);">
+
+				</view>
+			</view>
+			<view  style="position: relative;">
+				<view class="iconfont icon-roundclose col-f" style="position: absolute;left: 50%;transform: translateX(-50%);font-size: 50upx;"
+				 @click="ruleShow = false">
+
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="endImg" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="endImg = false">
+			<view class="zjbj" :style="{background: 'url('+ (drawPageData.prize_image|| (imgfixUrls + '/kjbj2.png')) +')',backgroundSize: '100% 100%'}">
+				<!-- <image style="width: 70vw;height: 80vh;" :src="imgfixUrls + '/kjbj.png'" mode=""></image> -->
+				<text class="iconfont icon-close dis-il-block t-c f-w closeBtn" @click="close"></text>
+				<!-- <view class="contenttitle t-c">
+					<view class="text" v-if="endid !== '0' && endid !== 0">
+						中奖啦
+					</view>
+					<view class="text" v-else>
+						谢谢惠顾
+					</view>
+				</view> -->
+				<view class="zjbox" style="margin: auto;" v-if="endImg">
+					<view class="f-w f-48 t-c" style="color: #FB2F24;padding-bottom: 36upx;">
+						{{endid !== '0'&& endid !== 0?'中奖了':'感谢参与'}}
+					</view>
+					<view >
+						<image style="border-radius: 50%;height: 240upx;width: 240upx;margin-left: 20vw;border: 2upx solid #FFC853;" :src="effect_image || drawPageData.not_prize_image"
+						 mode=""></image>
+					</view>
+					<view  style="padding:20upx 0 50upx;">
+						<!-- <view class="col-f f-38" style="text-align: center;">
+							{{}}
+						</view> -->
+
+						<view class="col-f f-40 " style="text-align: center;margin-bottom: 10upx;">
+							<text style="color: #E5492C;">{{endid !== '0'&& endid !== 0?'恭喜你抽中了':'很遗憾'}}</text>
+						</view>
+						<view class="col-f f-50 t-c" style="text-align: center;">
+							<text style="color: #FF2D26;">{{endid !== '0'&& endid !== 0?endDraw:'没有中奖哦！'}}</text>
+						</view>
+					</view>
+					<view class="dis-flex">
+						<view  style="flex: 0.45;position: relative;height: 90upx;">
+							<!-- <view class="t-c f-34" style="background-color: #EB9B2F;color: #FFFFFF;padding: 15upx 30upx;border-radius: 10upx;margin-top: 30upx;"
+							 >
+								查看奖品
+							</view> -->
+							<image style="width: 250upx;height: 90upx;" :src="imgfixUrls + '/hsbtn.png'" mode=""></image>
+							<view @click="myprize" class="f-32 t-c" style="position: absolute;left: 0;top: 0;height: 90upx;line-height: 80upx;width: 250upx;color: #FF3D25;">
+								查看奖品
+							</view>
+						</view>
+						<view  style="flex: 0.1;width: 30upx;">
+
+						</view>
+						<view class="f-34" style="flex: 0.45;position: relative;height: 90upx;">
+							<!-- <view class="t-c" style="background-color: #EB9B2F;color: #FFFFFF;padding: 15upx 30upx;border-radius: 10upx;margin-top: 30upx;"
+							 @click="close(1)">
+								继续抽奖
+							</view> -->
+							<image style="width: 250upx;height: 90upx;" :src="imgfixUrls + '/cjredbtn.png'" mode=""></image>
+							<view @click="close(1)" class="f-32 t-c" style="position: absolute;left: 0;top: 0;height: 90upx;line-height: 80upx;width: 250upx;color: #FFFFFF;">
+								继续抽奖
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <view class="imgs-box" v-if="endImg" :style="{background: 'url('+drawPageData.effect_image+')',backgroundSize: '100% 100%'}"> -->
+
+				<!-- <image :src="drawPageData.effect_image" style="z-index: 99;width: 300upx;height: 300upx;" mode=""></image> -->
+
+				<!-- </view> -->
+
+			</view>
+
+		</PopManager>
+		<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false">
+			<view  v-if="showCommunity" style="width: 80vw;height: 90vh;padding: 30upx;overflow: hidden;border-radius: 20upx;">
+				<posterlate :postId="parameterid" :postType="'13'"></posterlate>
+			</view>
+		</PopManager>
+		<view  v-if="menuList.id">
+			<TabBars :tabBarAct="0" :pageType="'draw'" :tabBarData="menuList.data" />
+		</view>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+		<view>
+			<follow
+				:followShow="followShow"
+				:followType="followType"
+				:followTitleShow="followTitleShow"
+				@clickmask="openQrShow"
+				@closeFollowPop="closeFollowPop"
+				@closeFollowTitle="closeFollowTitle"
+				:followData="followData"
+			></follow>
+		</view>
+		
+	</view>
+
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import FGame from '../tamplate/FGame.vue';
+	import FGamesix from '../tamplate/FGamesix.vue';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import PopManager from '@/components/template/PopManager';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import posterlate from '@/components/template/posterlate';
+	import TabBars from '@/components/template/tabBar';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue';
+	import follow from '@/components/template/follow.vue';
+	import RaffleWheel from '@/components/raffle-wheel/raffle-wheel.vue'
+	let innerAudioContext = uni.createInnerAudioContext();
+	let drawAudio = uni.createInnerAudioContext();
+	export default {
+		components: {
+			FGame,
+			FGamesix,
+			PopManager,
+			jyfParser,
+			Loadlogo,
+			posterlate,
+			TabBars,
+			PhoneMask,
+			getvxphone,
+			follow,
+			RaffleWheel
+		},
+		data() {
+			return {
+				//获奖名单滚动列表
+				prizeList: [],
+				loadlogo: false,
+				activeIndex: 0,
+				cartactiveIndex: 0,
+				intnum: undefined,
+				cartintnum: undefined,
+				storeList: [], //横着滑动的商家列表
+				friendList: [], //竖着排列的助力列表
+				ruleShow: false,
+				drawPageData: {
+					effect_image: ''
+				}, //页面基本信息
+				goodsList: null, //抽奖列表
+				play_Audio: false,
+				opendraw: 0,
+				startImg: false,
+				endImg: false,
+				endDraw: '',
+				endid: 0,
+				parameter: {},
+				effect_image: '',
+				parser: '',
+				TextSubstitution: {}, //文本替换
+				parameterid: '',
+				ratio:0,
+				imgstyle:{},
+				showCommunity:false,
+				menuList:{},
+				popShow: false,
+				vxshow:false,
+				followTitleShow: true,
+				followShow: false,
+				followType: '10',
+				followData:{
+				},
+				// canvas 宽高
+				canvasData: {
+				  width: 260,
+				  height: 260
+				},
+				duration:500,
+				interval:2000,
+				// 奖品数据
+				// 中奖下标
+				targetIndex: 0,
+				// 中奖类目名称
+				targetName: '',
+				// 是否由前端控制概率
+				isFrontend: true,
+				// 权重随机数的最大值
+				weightTotal: 0,
+				// 权重数组
+				weightArr: [],
+				serial_number:0
+			}
+		},
+		computed: {
+			top() {
+				return -this.activeIndex * 15 + 'px';
+			},
+			left() {
+				return -this.cartactiveIndex * 10 + 'rpx';
+			}
+		},
+		onHide() {
+			let _this = this,
+				play_Audio = false,
+				pageAudio = _this.drawPageData.background_music;
+			if (!play_Audio) {
+				innerAudioContext.pause()
+				innerAudioContext.onPause(() => {
+					console.log('暂停播放');
+				});
+			}
+			_this.play_Audio = play_Audio
+		},
+		onLoad(e) {
+			let _this = this;
+			this.parameter = e;
+			this.parameterid = e.id;
+			this.ScrollUp();
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			uni.setStorageSync('Dparameterid', this.parameterid);
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			if (!this.parameter.head_id || this.parameter.head_id == '0') {
+				this.parameter.head_id = 0;
+			}
+			console.log(e, 'canshu')
+
+			// this.cartScrollUp();
+		},
+		onShow() {
+			this.startDraw = false;
+			this.getDrawData();
+			this.playAudio();
+		},
+		destroyed() {
+			innerAudioContext.stop();
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			});
+		},
+		onUnload() {
+			this.play_Audio = false;
+			innerAudioContext.stop();
+			innerAudioContext.onStop(() => {
+				console.log('页面跳转暂停播放');
+			});
+		},
+		methods: {
+			play(){
+						this.prizeList.map(item=>{
+							item.weight = 0;
+						});
+						this.prizeList[6].weight = 1;
+						if (this.isFrontend) {
+						  this.prizeList.forEach((item) => this.weightTotal += item.weight)
+						  this.weightArr = this.prizeList.map((item) => item.weight)
+						}
+						setTimeout(()=>{
+							this.num++;
+						})
+						
+						
+					},
+			// 重新生成
+			handleInitCanvas () {
+			  this.prizeList = []
+			  this.getPrizeList();
+			},
+			// 获取奖品列表
+			getPrizeList () {
+			  uni.showLoading({
+			    title: '奖品准备中...'
+			  })
+			  // 模拟请求奖品列表
+			  let stoTimer = setTimeout(() => {
+			    clearTimeout(stoTimer)
+			    stoTimer = null
+			    
+			    // stock 奖品库存
+			    // weight 中奖概率，数值越大中奖概率越高
+			    this.prizeList = [
+			      
+			    ]
+			    
+			    // 计算出权重的总和并生成权重数组
+			    if (this.isFrontend) {
+			      this.prizeList.forEach((item) => this.weightTotal += item.weight)
+			      this.weightArr = this.prizeList.map((item) => item.weight)
+			    }
+			  }, 500)
+			},
+			// 本次抽奖开始
+			handleActionStart () {
+					  // this.prizeList.map(item=>{
+						 //  item.weight = 0;
+					  // })
+					  // this.prizeList[1].weight = 1;
+					  // console.log();
+			  this.targetName = ''
+			  
+			  let list = [...this.goodsList]
+			  
+			  // 模拟请求
+			  let stoTimer = setTimeout(() => {
+			    clearTimeout(stoTimer)
+			    stoTimer = null
+			    
+			    // 判断是否由前端控制概率
+			    // 前端控制概率的情况下，需要拿到最接近随机权重且大于随机权重的值
+			    // 后端控制概率的情况下，通常会直接返回 prizeId
+			    if (this.isFrontend && this.weightTotal) {
+			      console.warn('###当前处于前端控制中奖概率，安全起见，强烈建议由后端控制###')
+			      console.log('当前权重总和为 =>', this.weightTotal)
+			      
+			      // 注意这里使用了 Math.ceil，如果某个权重的值为 0，则始终无法中奖
+			      let weight = Math.ceil(Math.random() * this.weightTotal)
+			      console.log('本次权重随机数 =>', weight)
+			      
+			      // 生成大于等于随机权重的数组
+			      let tempMaxArrs = []
+			      list.forEach((item) => {
+			        if (item.weight >= weight) {
+			          tempMaxArrs.push(item.weight)
+			        }
+			      })
+			      
+			      // 如果大于随机权重的数组有值，先对这个数组排序然后取值
+			      // 反之新建一个临时的包含所有权重的已排序数组，然后取值
+			      if (tempMaxArrs.length) {
+			        tempMaxArrs.sort((a, b) => a - b)
+			        this.targetIndex = this.weightArr.indexOf(tempMaxArrs[0])
+			      } else {
+			        let tempWeightArr = [...this.weightArr]
+			        tempWeightArr.sort((a, b) => a - b)
+			        this.targetIndex = this.weightArr.indexOf(tempWeightArr[tempWeightArr.length - 1])
+			      }
+			    } else {
+			      // 这里随机产生的 prizeId 是模拟后端返回的 prizeId
+			      let prizeId = Math.floor(Math.random() * list.length)
+			      list.forEach((item, index) => {
+			        if (item.draw_goods_id === prizeId) {
+			          // 中奖下标
+			          this.targetIndex = 0
+			        }
+			      })
+			    }
+			    
+			    console.log('本次抽中奖品 =>', this.goodsList[this.targetIndex].title)
+			    // console.log('本次奖品库存 =>', this.prizeList[this.targetIndex].stock)
+			    
+			    // 开始执行旋转定位
+			    this.$refs.raffleWheel.handleStartRotate(this.targetIndex)
+			  }, 200)
+			},
+			// 本次抽奖结束
+			handleActionEnd () {
+				this.endMusic(this.serial_number);
+			  console.log('旋转结束，执行拿到结果后到逻辑')
+			  // let prizeName = this.prizeList[this.targetIndex].name
+			  // let prizeStock = this.prizeList[this.targetIndex].stock
+			  // this.targetName = prizeName === '谢谢参与' ? prizeName : prizeStock ? `恭喜您，获得 ${prizeName}` : '很抱歉，您来晚了，当前奖品已无库存'
+			},
+			// 抽奖转盘绘制完成
+			handleDrawDone () {
+			  console.log('抽奖转盘绘制完成')
+			  uni.hideLoading()
+			  // uni.showToast({
+			  //   title: '奖品准备就绪'
+			  // })
+			},
+			closeFollowTitle() {
+				let _this = this;
+				_this.followTitleShow = false;
+			},
+			closeFollowPop() {
+				let _this = this;
+				_this.followShow = false;
+			},
+			openQrShow() {
+				let _this = this;
+				_this.followShow = true;
+			},
+			showFalse(){
+				console.log('进了showfalse')
+				this.vxshow = false;
+			},
+			closePop() {
+				let _this = this
+				_this.popShow = false
+			},
+			GenerateAPoster(){
+				this.showCommunity = true;
+			},
+			gostore(id) {
+				App.navigationTo({
+					url: `pages/mainPages/store/index?sid=${id}`
+				})
+			},
+			close(type) {
+				this.endImg = false;
+				if (type == 1) {
+					this.playdraw()
+				}
+			},
+			endMusic(ind) {
+				drawAudio.stop();
+				drawAudio.onStop(() => {
+					console.log('页面跳转暂停播放');
+				});
+				this.goodsList.map(item => {
+					if (item.serial_number == ind) {
+						this.effect_image = item.image;
+						if (item.draw_goods_id == '0') {
+							this.effect_image = '';
+						};
+						// this.effect_image = '../../../static/images/xxhg3.png';
+						this.endDraw = item.title;
+						this.endid = item.draw_goods_id;
+						console.log(item, this.endid);
+						this.endImg = true;
+						this.startDraw = false;
+						if(this.drawPageData.use_music){
+							this.playAudio();
+						}
+						this.getDrawData(1);
+					}
+				})
+			},
+			startMusic(flag,msg) {
+				let _this = this;
+				if (flag == false) {
+					this.startDraw = false;
+					if(this.drawPageData.use_music){
+						this.playAudio();
+					}
+					if(msg == '未绑定手机号'){
+						//#ifdef H5
+						_this.popShow = true;
+						//#endif
+						//#ifndef H5
+						_this.vxshow = true;
+						//#endif
+					}
+					return
+				}
+				drawAudio.src = _this.drawPageData.use_music;
+				//#ifdef H5
+				jWeixin.ready(() => {
+					jWeixin.getLocation({
+						type: 'gcj02',
+						success: function(res) {
+							drawAudio.play();
+						}
+					});
+				});
+				//#endif
+				//#ifndef H5
+				drawAudio.play();
+				//#endif
+
+				drawAudio.onPlay(() => {
+					console.log('开始播放');
+				});
+			},
+			playAudio() {
+				let _this = this,
+					play_Audio = _this.play_Audio ? false : true,
+					pageAudio = _this.drawPageData.background_music;
+				if (play_Audio) {
+					//#ifdef H5
+					jWeixin.ready(() => {
+						jWeixin.getLocation({
+							type: 'gcj02',
+							success: function(res) {
+								innerAudioContext.play();
+								innerAudioContext.loop = true;
+							}
+						});
+					});
+					//#endif
+					//#ifndef H5
+					innerAudioContext.loop = true;
+					innerAudioContext.play();
+					//#endif
+
+					innerAudioContext.onPlay(() => {
+						console.log('开始播放');
+					});
+				}
+				if (!play_Audio) {
+					innerAudioContext.pause();
+					innerAudioContext.onPause(() => {
+						console.log('暂停播放');
+					});
+				}
+				innerAudioContext.onError(res => {
+					// console.log(res.errMsg);
+					// console.log(res.errCode);
+					innerAudioContext.destroy();
+					//发生错误后，销毁实例
+				});
+				_this.play_Audio = play_Audio;
+			},
+			getDrawData(flag) {
+				let _this = this;
+				App._post_form(
+					`&p=draw&do=home&id=${_this.parameterid}&draw_id=${_this.parameterid || 0}&head_id=${_this.parameter.head_id}`, {},
+					res => {
+						// console.log(res);
+						_this.drawPageData = res.data.info;
+						if (!_this.drawPageData.not_prize_image) {
+							_this.drawPageData.not_prize_image = _this.imgfixUrls + 'wzjbj.png'
+							// debugger
+						}
+						if(!_this.drawPageData.share_image){
+							_this.drawPageData.share_image = [_this.imgfixUrls + 'cjzybj.jpg']
+							// debugger
+						}
+						// let rule = decodeURIComponent(_this.drawPageData.rule);
+						// _this.drawPageData.rule = rule;
+						// console.log(rule)
+						if (!_this.drawPageData.background_image) {
+							_this.drawPageData.background_image = _this.imgfixUrls + 'cjbj.png';
+						}
+						_this.prizeList = res.data.record;
+						_this.storeList = res.data.shop;
+						_this.friendList = res.data.help;
+						if(res.data.help instanceof Array){
+							if(res.data.help.length == 0){
+								_this.friendList = {
+									list:[]
+								}
+							}
+						}
+						_this.goodsList = res.data.prize;
+						_this.menuList = res.data.menu;
+						if(_this.drawPageData.type == '3'){
+							if(!_this.drawPageData.wheel_bg){
+								_this.drawPageData.wheel_bg = ['#8EC074','#E6A53F'];
+							}
+							_this.goodsList.map((item,index)=>{
+								item.weight = 1;
+								item.prizeId = index + 1;
+								item.stock = 100;
+								item.name = item.title;
+								if(!item.title){
+									item.name = '谢谢参与'
+								}
+								// item.name = item.title;
+							})
+							// 这个是初始化转盘抽奖序列的
+							if (this.isFrontend) {
+							  this.goodsList.forEach((item) => this.weightTotal += item.weight)
+							  this.weightArr = this.goodsList.map((item) => item.weight)
+							}
+						}
+						
+						
+						if (flag == 1) return;
+						if (res.data.info.background_music) {
+							innerAudioContext.src = res.data.info.background_music;
+							console.log(innerAudioContext.src);
+							setTimeout(()=>{
+								//#ifdef H5
+								jWeixin.ready(() => {
+									innerAudioContext.loop = true;
+									innerAudioContext.play();
+								});
+								//#endif
+								//#ifndef H5
+								innerAudioContext.loop = true;
+								innerAudioContext.play();
+								//#endif
+								// _this.playAudio();
+							})
+						}
+						// uni.showToast({
+						// 	title:'转发成功'
+						// })
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			gogetintegral() {
+				App.navigationTo({
+					url: `pages/subPages2/drawGame/gameIntegral?id=${this.parameterid}`
+				})
+			},
+			myprize() {
+				App.navigationTo({
+					url: `pages/subPages2/drawGame/myPrize`
+				})
+			},
+			isRuleShow(flag) {
+				if (flag == 1) {
+					this.parser = this.drawPageData.rule;
+				} else {
+					this.parser = this.drawPageData.introduce;
+				}
+
+				this.ruleShow = true;
+			},
+			// 开始抽奖
+			playdraw() {
+				let _this = this;
+				let data = {
+					type:'10',
+					id:this.parameterid
+				}
+				let type = '10'
+				App._post_form('&do=follow',
+					data
+				, res => {
+					if (res.data.status == 0) {
+						console.log('点了');
+						if (this.startDraw) return;
+						this.startDraw = true;
+						this.startImg = true;
+						setTimeout(() => {
+							this.startImg = false;
+						}, 1000);
+						if(this.drawPageData.use_music){
+							this.playAudio();
+						};
+						if(this.drawPageData.type == '3'){
+							App._post_form(
+								`&p=draw&do=draw&id=${_this.parameterid}`,
+								{},
+								res => {
+									
+									console.log(res)
+									console.log('点击');
+									_this.startMusic()
+									_this.goodsList.map(item=>{
+										item.weight = 0;
+									});
+									_this.goodsList[Number(res.data.serial_number) - 1].weight = 1;
+									if (this.isFrontend) {
+									  this.goodsList.forEach((item) => this.weightTotal += item.weight)
+									  this.weightArr = this.goodsList.map((item) => item.weight)
+									}
+									_this.serial_number = res.data.serial_number;
+									_this.startDraw = false;
+									this.opendraw++;
+									// _this.ind = Number(res.data.serial_number) - 1 // 随机产生一个中奖号码
+									// // _this.ind = 14;
+									// _this.index = 1;
+									// _this.speed = 30;
+									// _this.times = 0;
+									// _this.startRoll();
+								},fail=>{
+									let msg = '';
+									if(fail.data.message == '未绑定手机号'){
+										msg = fail.data.message;
+									}
+								_this.startMusic(false,msg)
+							});
+						}else{
+							this.opendraw++;
+						}
+						
+					}else{
+						_this.followShow = true;
+						_this.followData = res.data;
+					}
+				})
+				
+			},
+			ScrollUp() {
+				// eslint-disable-next-line no-unused-vars
+				this.intnum = setInterval(_ => {
+					if (this.activeIndex < this.prizeList.length) {
+						this.activeIndex += 1;
+					} else {
+						this.activeIndex = 0;
+					}
+				}, 1000);
+			},
+
+			Stop() {
+				clearInterval(this.intnum);
+			},
+			Up() {
+				this.ScrollUp();
+			},
+			cartScrollUp() {
+				// eslint-disable-next-line no-unused-vars
+				this.cartintnum = setInterval(_ => {
+					if (this.cartactiveIndex < this.storeList.length * 22.8) {
+						this.cartactiveIndex += 1;
+					} else {
+						this.cartactiveIndex = 0;
+					}
+				}, 50);
+			},
+
+			cartStop() {
+				// clearInterval(this.cartintnum);
+				setTimeout(() => {
+					// this.cartScrollUp();
+				}, 3000)
+			},
+			cartUp() {
+				// this.cartScrollUp();
+			}
+		}
+	}
+</script>
+
+<style>
+	/* page {
+		background-color: #F74740;
+	} */
+</style>
+<style lang="scss" scoped>
+	$wheelBgUrl: '~static/raffle-wheel/raffle-wheel__bg';
+	.home {
+		width: 100vw;
+		height: 100vh;
+	  padding: 50px 0;
+	}
+	.home-title {
+	  text-align: center;
+	  margin-bottom: 50px;
+	}
+	.home-title__text {
+	  color: #ffffff;
+	  font-size: 30px;
+	  font-weight: bold;
+	}
+	.home-result {
+	  text-align: center;
+	  margin-top: 50px;
+	}
+	.home-result__text {
+	  color: #ffffff;
+	  font-size: 20px;
+	  font-weight: bold;
+	}
+	.home-wheel {
+	  text-align: center;
+	}
+	.raffle-wheel__tip {
+	  font-size: 24rpx;
+	}
+	.home-action {
+	  position: absolute;
+	  left: 0;
+	  right: 0;
+	  bottom: 40rpx;
+	  width: 260rpx;
+	  height: 80rpx;
+	  display: flex;
+	  flex-direction: row;
+	  justify-content: center;
+	  align-items: center;
+	  border-radius: 10rpx;
+	  text-align: center;
+	  background-color: #00ff99;
+	  margin: 0 auto;
+	}
+	.home-action__text {
+	  color: #FFFFFF;
+	  font-size: 24rpx;
+	}
+	.drawGame {
+		padding-bottom: 300upx;
+
+		.titleBG {
+			// width: 100vw;
+			// height: 450upx;
+			position: relative;
+
+			.titleimg {
+				width: 100vw;
+				height: 100%;
+			}
+
+			.gameRule {
+				font-size: 28upx;
+				font-weight: 500;
+				color: #FFFFFF;
+				width: 50upx;
+				text-align: center;
+				background-color: #FB3A3A;
+				height: 160upx;
+				padding: 20upx 0 0upx;
+				position: absolute;
+				right: 0;
+				top: 30%;
+				transform: translateY(-50%);
+				border-radius: 10upx 0 0 10upx;
+				border: 2upx solid #FFFFFF;
+				line-height: 28upx;
+				border-right: none;
+			}
+
+			.left {
+				left: 0;
+				border-radius: 0upx 10upx 10upx 0upx;
+				border: 2upx solid #FFFFFF;
+				border-left: none;
+			}
+		}
+
+		.bigbg {
+			background-size: 100% 100%;
+			// position: relative;
+			// top:-5%;
+			// margin-top: 48upx;
+		}
+
+		.bg {
+			// background: url(../../../static/images/bg.png);
+			background-size: 100% 100%;
+			height: 1200upx;
+			// margin: 30upx;
+			margin-top: 0;
+			position: relative;
+
+			.scroll-wrap {
+				height: 30upx;
+				overflow: hidden;
+				// font-size: 20upx;
+				position: absolute;
+				line-height: 30upx;
+				left: 50%;
+				top: 2.5%;
+				transform: translate(-50%);
+			}
+
+			.scroll-content {
+				position: relative;
+				height: 15px;
+				transition: top 0.5s;
+				color: #FF4444;
+				font-size: 15px;
+			}
+
+			.scroll-content-item {
+				line-height: 15px;
+				text-align: center;
+			}
+
+			.btnimg {
+				transition: transform 0.3s ease-out;
+			}
+
+			.btnimg:active {
+				transform: scale(0.9)
+			}
+			.ifeng{
+				width: 160upx;
+				height: 120upx;
+				border-radius: 8upx;
+				.ifelit{
+					width: 160upx;
+					height: 112upx;
+					border-radius: 8upx;
+				}
+			}
+			.description{
+				width: 160upx;
+				height: 52upx;
+				border-radius: 60upx;
+				.descriptionrulo{
+					width: 160upx;
+					height: 45upx;
+					border-radius: 60upx;
+					box-shadow: 0px 0px 5px #FFFFFF inset;
+				}
+			}
+			.awardbtn{
+				width: 160upx;
+				height: 52upx;
+				border-radius: 60upx;
+				.awardbtnrulo{
+					width: 160upx;
+					height: 45upx;
+					border-radius: 60upx;
+					box-shadow: 0px 0px 5px #FFFFFF inset;
+				}
+			}
+
+		}
+
+		.activity {
+			position: relative;
+			top: 60upx;
+
+			// padding: 30upx;
+			.tagbox {
+				position: absolute;
+				left: 50%;
+				top: -34upx;
+				transform: translateX(-50%);
+			}
+
+			.contentbox {
+				width: 236upx;
+				height: 69upx;
+				position: relative;
+				z-index: 99;
+				// margin: auto;
+				background: linear-gradient(to bottom, #FEE76A 0%, #FBCD1C 100%);
+
+				.text {
+					position: absolute;
+					text-align: center;
+					color: #FFFFFF;
+					line-height: 69upx;
+					font-size: 33upx;
+					width: 100%;
+					height: 100%;
+					font-weight: 700;
+					text-shadow:
+						-2upx -2upx 0 #FE8834,
+						4upx -2upx 0 #FE8834,
+						-4upx 4upx 0 #FE8834,
+						4upx 4upx 0 #FE8834,
+						0upx 4upx 4upx rgba(0, 0, 0, 0.6);
+				}
+			}
+
+			.activity-friend {
+				padding: 80upx 30upx 0;
+				background-color: #FFFFFF;
+				border-radius: 30upx;
+			}
+
+			.activity-content {
+				border-radius: 30upx;
+				width: 100%;
+				height: 490upx;
+				
+				background-color: #FFFFFF;
+				margin: auto;
+				overflow: auto;
+
+				.storeList {
+					position: relative;
+					transition: top 0.5s;
+					overflow: auto;
+					margin: 0upx 10upx 0upx;
+					padding: 80upx 20upx 20upx;
+					.storeList-item {
+						padding: 20upx;
+						margin-right: 20upx;
+						box-shadow: 1upx 1upx 12upx 1upx #CCCCCC;
+					}
+				}
+			}
+		}
+
+		// .bgcs{
+		// 	background: url(../../../static/images/cjbj.png);
+		// 	width: 100vw;
+		// 	height: 100vh;
+		// }
+	}
+
+	.rulebox {
+		background: #FFFFFF;
+		padding: 20upx;
+		width: 75vw;
+		height: 80vh;
+		overflow: hidden;
+		border-radius: 20upx;
+	}
+
+	.imgs-box {
+		width: 500upx;
+		height: 500upx;
+		border-radius: 20upx;
+	}
+
+	.zjbj {
+		// background-image: url(../../../static/images/xxhg3.png);
+		// background-size: 100% 100%;
+		// padding: 54upx;
+		border-radius: 10upx;
+		width: 85vw;
+		height: 870upx;
+		position: relative;
+
+		.zjbox {
+			position: absolute;
+			left: 50%;
+			top: 24%;
+			transform: translate(-50%);
+		}
+
+		.closeBtn {
+			font-size: 28upx;
+			height: 40upx;
+			width: 40upx;
+			border-radius: 60upx;
+			background-color: rgba(0, 0, 0, 0.8);
+			color: #A8A2B2;
+			line-height: 40upx;
+			position: absolute;
+			right: 0upx;
+			top: 0upx;
+		}
+
+		.contenttitle {
+			// width: 236upx;
+			// height: 69upx;
+			// position: relative;
+			z-index: 99;
+			// margin: auto;
+			// background: linear-gradient(to bottom, #FEE76A 0%, #FBCD1C 100%);
+			padding-bottom: 30upx;
+			margin-bottom: 30upx;
+			border-bottom: 1upx dotted #CCCCCC;
+
+			.text {
+
+				text-align: center;
+				color: #ffffff;
+				line-height: 69upx;
+				font-size: 40upx;
+				font-weight: 700;
+				text-shadow:
+					-2upx -2upx 0 #ff4444,
+					4upx -2upx 0 #ff4444,
+					-4upx 4upx 0 #ff4444,
+					4upx 4upx 0 #ff4444,
+					0upx 4upx 4upx rgba(0, 0, 0, 0.6);
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/drawGame/gameIntegral.vue b/pages/subPages2/drawGame/gameIntegral.vue
new file mode 100644
index 0000000..1d803fd
--- /dev/null
+++ b/pages/subPages2/drawGame/gameIntegral.vue
@@ -0,0 +1,251 @@
+<template>
+	<view class="myPrize" :style="{backgroundColor: bgcAndbgimg.color}">
+		<view class="load">
+			
+		</view>
+		<view class="content">
+			<view class="title">
+				<image :src="bgcAndbgimg.image ||  imgfixUrls + '/cjfxbj.jpg'" @click="goUrl()"  class="tilteimg" mode=""></image>
+			</view>
+			<view class="prizeList">
+				<view class="prize-item dis-flex">
+					<view  style="flex: 0.15;">
+						<image :src="imgfixUrls + '/wxhaoyou.png'" style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.8;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							分享微信好友/群/朋友圈获取
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">每一个好友点击后获得<text>{{TextSubstitution.credittext}}</text></text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;">
+						
+						<view class="btnred" @click="goshare">
+							去分享
+						</view>
+						
+					</view>
+				</view>
+				<!-- <view class="prize-item dis-flex">
+					<view  style="flex: 0.15;">
+						<image src="../../../static/images/pengyouquan.png" style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.6;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							分享朋友圈获得
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">每一个好友点击后获得{{TextSubstitution.credittext}}</text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;">
+						<view class="btnred">
+							去分享
+						</view>
+					</view>
+				</view> -->
+				<view class="prize-item dis-flex">
+					<view  style="flex: 0.15;">
+						<image :src="imgfixUrls + '/qiandao.png'" style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.6;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							每日签到获得
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">参与{{TextSubstitution.credittext}}签到获得{{TextSubstitution.credittext}}</text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;">
+						<view class="btnred" @click="gosign()">
+							去签到
+						</view>
+					</view>
+				</view>
+		<!-- 		<view class="prize-item dis-flex">
+					<view  style="flex: 0.15;">
+						<image src="https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=3269968356,3620643396&fm=26&gp=0.jpg" style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.6;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							参与某某活动获得
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">参与专题活动获得{{TextSubstitution.credittext}}</text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;">
+						<view class="btnred">
+							去参与
+						</view>
+					</view>
+				</view> -->
+				<view class="prize-item dis-flex">
+					<view  style="flex: 0.15;">
+						<image :src="imgfixUrls + 'gouwudai.png'" style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.6;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							去商场购物获得
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">参与商城购物获得{{TextSubstitution.credittext}}</text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;">
+						<view class="btnred" @click="goindex">
+							去逛逛
+						</view>
+					</view>
+				</view>
+			</view>
+			<shareBottom :shareBottomShow="shareBottomShow" @clickmask="closeShareBottom" :shareShow="shareShow" @closeShareShow="closeShareShow"
+			 @shareImgShow="shareImgShow" :isCard="isCard" :postId="id" @gohb="goPost" :postType="'13'"></shareBottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import shareBottom from '@/components/template/shareBottom';
+	export default{
+		data(){
+			return{
+				prizeList:[true,false,true,true,true,false,false],
+				TextSubstitution:{},
+				shareBottomShow: false,
+				shareShow: false,
+				id:'',
+				bgcAndbgimg:{},
+				imgstyle:{}
+			}
+		},
+		components:{
+			shareBottom
+		},
+		computed: {
+			isCard() {
+				let ClientType = App.getClientType();
+				return ClientType !== '3' ? false : true
+			},
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.id = e.id;
+			_this.imgstyle = uni.getStorageSync('imgstyle');
+			_this.getbgimg();
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		},
+		methods:{
+			getbgimg(){
+				App._post_form(
+					`&p=draw&do=shareSetInfo`,
+					{},
+					res => {
+						console.log(res);
+						this.bgcAndbgimg = res.data;
+					},
+					false,
+					() => {
+						// _this.loadlogo = true;
+					}
+				);
+			},
+			goshare(){
+				this.shareBottomShow =true;
+			},
+			goPost(data) {
+				let _this = this;
+				_this.shareBottomShow = false;
+			},
+			shareImgShow() {
+				let _this = this;
+				_this.shareShow = true;
+				_this.shareBottomShow = false;
+			},
+			// 关闭分享弹框
+			closeShareShow() {
+				let _this = this;
+				_this.shareShow = false;
+				_this.shareBottomShow = false;
+			},
+			closeShareBottom() {
+				let _this = this;
+				_this.shareBottomShow = false;
+			},
+			goindex(){
+				App.navigationTo({
+					url: 'pages/mainPages/index/index'
+				});
+			},
+			gosign(){
+				App.navigationTo({
+					url: 'pages/subPages/signdesk/index/index'
+				});
+			},
+			goUrl(){
+				App.navigationTo({
+					url: this.bgcAndbgimg.url
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.myPrize{
+		height: 100vh;
+		.content{
+			.title{
+				.tilteimg{
+					height: 300upx;
+					width: 750upx;
+				}
+			}
+			.prizeList{
+				padding: 30upx;
+				.prize-item{
+					background-color: #FFFFFF;
+					padding: 30upx 30upx;
+					border-radius: 10upx;
+					margin-bottom: 20upx;
+					.btnred{
+						width: 100upx;
+						height: 44upx;
+						background-color: #FF4444;
+						line-height: 44upx;
+						border-radius: 7upx;
+						position: absolute;
+						right: 0;
+						top: 50%;
+						margin: 0;
+						font-size: 24upx;
+						padding: 0;
+						transform: translateY(-50%);
+						text-align: center;
+					}
+					.btnfff{
+						width: 100upx;
+						height: 44upx;
+						color: #9A9A9A;
+						background-color: #F8F8F8;
+						line-height: 44upx;
+						border-radius: 7upx;
+						position: absolute;
+						right: 0;
+						top: 50%;
+						transform: translateY(-50%);
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+</style>
+<style>
+	/* page{
+		background-color: #FF4444;
+	} */
+</style>
diff --git a/pages/subPages2/drawGame/myPrize.vue b/pages/subPages2/drawGame/myPrize.vue
new file mode 100644
index 0000000..59392c7
--- /dev/null
+++ b/pages/subPages2/drawGame/myPrize.vue
@@ -0,0 +1,251 @@
+<template>
+	<view class="myPrize">
+		<loadlogo v-if="!loadlogo" />
+		<view class="content" v-if="loadlogo" :style="{backgroundColor: bgc || '#ff4444'}">
+			<view class="title" @click="gourl">
+				<image :src="top || imgfixUrls + '/jpbj.png'" class="tilteimg" style="width: 750upx;height: 300upx;" mode=""></image>
+			</view>
+			<view class="prizeList">
+				<view class="prize-item dis-flex" v-for="(item,index) in prizeList" :key="index">
+					<view  style="flex: 0.15;">
+						<image :src="item.image " style="height: 70upx;width: 70upx;margin-top: 10upx;" mode=""></image>
+					</view>
+					<view  style="flex: 0.6;">
+						<view class="f-32" style="color: #343434;margin-bottom: 10upx;">
+							{{item.title}}
+						</view>
+						<view class="f-24" style="color: #9A9A9A;">
+							<text style="padding-right: 10upx;">{{item.create_time}}</text>
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;" v-if="item.is_get == 1" @click="getordraw(item)">
+						<view class="btnred">
+							领取
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;"  v-if="item.is_get == 2 && item.type == 5" @click="goUse(item)">
+						<view class="btnred">
+							去使用
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;" v-if="item.is_get == 3 && item.token_code" @click="govip(item)">
+						<view class="btnred">
+							去激活
+						</view>
+					</view>
+					<view class="col-f f-24 t-c" style="flex: 0.25;position: relative;" v-if="item.is_get == 4 || (item.is_get == 2 && item.type != 5)">
+						<view class="btnfff">
+							已使用
+						</view>
+					</view>
+				</view>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<PopManager :show="ruleShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="ruleShow = false">
+			<view class="rulebox t-c">
+				<view class="f-32" style="font-weight: 500;color: #FFFEFE;padding-bottom: 50upx;">
+					您的激活码是: <text style="color: #ffffff; font-size: 44upx;">{{code}}</text>
+				</view>
+			</view>
+			<view  style="position: relative;height: 40upx;">
+				<view  style="border-left: 1upx solid #FFFFFF;height: 50upx;position: absolute;left: 50%;transform: translateX(-50%);">
+			
+				</view>
+			</view>
+			<view  style="position: relative;">
+				<view class="iconfont icon-roundclose col-f" style="position: absolute;left: 50%;transform: translateX(-50%);"
+				 @click="ruleShow = false">
+			
+				</view>
+			</view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import PopManager from '@/components/template/PopManager';
+	export default{
+		data(){
+			return{
+				prizeList:[true,false,true,true,true,false,false],
+				page:1,
+				count:0,
+				isMore:true,
+				loadlogo:false,
+				TextSubstitution:{},
+				top:'',
+				ruleShow:false,
+				code:'',
+				color:'',
+				imgstyle:{},
+				memberInfo:{},
+				card:'have',
+				url:''
+			}
+		},
+		components:{
+			loadMore,
+			Loadlogo,
+			PopManager
+		},
+		onLoad() {
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+			this.memberInfo = uni.getStorageSync('userinfo');
+		},
+		onShow() {
+			this.getprizeList();
+		},
+		onReachBottom() {
+			let _this = this;
+			if(_this.count == _this.page) return;
+			_this.isMore = false;
+			_this.page++;
+			this.getprizeList();
+		},
+		methods:{
+			gourl(){
+				App.navigationTo({
+					url: this.url
+				})
+			},
+			goUse(item){
+				App.navigationTo({
+					url: `pages/subPages/orderList/orderDetails/orderDetails?orderid=${item.order_id}&plugin=${item.goods_plugin}`
+				});
+			},
+			govip(item){
+				let _this = this;
+				if (_this.memberInfo.halfcardflag == 0) {
+					_this.card = 'nhave';
+				} else {
+					_this.card = 'have';
+				}
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/getMembership/getMembership?card=' + _this.card + '&code=' + item.token_code
+				});
+			},
+			lookcode(item){
+				this.code = item.token_code;
+				this.ruleShow = true;
+			},
+			getprizeList(){
+				let _this = this;
+				App._post_form(
+					`&p=draw&do=prizeList&page=${_this.page}`,
+					{},
+					res => {
+						console.log(res);
+						if(_this.page == 1){
+							_this.prizeList = res.data.list;
+							_this.count = res.data.total;
+							_this.top = res.data.top;
+							_this.bgc = res.data.color;
+							_this.url = res.data.url;
+						}else{
+							_this.prizeList = _this.prizeList.concat(res.data.list);
+							_this.isMore = true;
+						}
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			getordraw(item){
+				let _this = this;
+				if(item.goods_plugin){
+					let _this = this,
+						buy_barginData = {
+							goods_id: item.goods_id,
+							plugin: item.goods_plugin,
+							drawid: item.id,
+							goods_num: 1
+						};
+					App.navigationTo({
+						url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode(buy_barginData)
+					});
+				}else if(item.token_code){
+					_this.code = item.token_code;
+				}else{
+					App._post_form(
+						`&p=draw&do=getPrize&id=${item.id}`,
+						{},
+						res => {
+							uni.showToast({
+								title:res.message
+							})
+						},
+						false,
+						() => {
+							_this.loadlogo = true;
+						}
+					);
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.myPrize{
+		.content{
+			.title{
+				.tilteimg{
+					// height: 300upx;
+					// width: 750upx;
+				}
+			}
+			.prizeList{
+				padding: 30upx;
+				.prize-item{
+					background-color: #FFFFFF;
+					padding: 30upx 30upx;
+					border-radius: 10upx;
+					margin-bottom: 20upx;
+					.btnred{
+						width: 100upx;
+						height: 44upx;
+						background-color: #FF4444;
+						line-height: 44upx;
+						border-radius: 7upx;
+						position: absolute;
+						right: 0;
+						top: 50%;
+						transform: translateY(-50%);
+						text-align: center;
+					}
+					.btnfff{
+						width: 100upx;
+						height: 44upx;
+						color: #9A9A9A;
+						background-color: #F8F8F8;
+						line-height: 44upx;
+						border-radius: 7upx;
+						position: absolute;
+						right: 0;
+						top: 50%;
+						transform: translateY(-50%);
+						text-align: center;
+					}
+				}
+			}
+		}
+		.rulebox {
+		background: linear-gradient(to bottom, #FD7238 0%, #FD444A 100%);
+		padding: 50upx 30upx;
+		width: 65vw;
+		border-radius: 20upx;
+	}
+	}
+</style>
+<style>
+	/* page{
+		background-color: #FF4444;
+	} */
+</style>
\ No newline at end of file
diff --git a/pages/subPages2/grace/animate.css b/pages/subPages2/grace/animate.css
new file mode 100644
index 0000000..a6497b9
--- /dev/null
+++ b/pages/subPages2/grace/animate.css
@@ -0,0 +1,2052 @@
+/*
+ * 整理自 animate.css 
+ * animate.css -http://daneden.me/animate
+ * Version - 3.7.0
+ * Licensed under the MIT license - http://opensource.org/licenses/MIT
+ * Copyright (c) 2018 Daniel Eden
+*/
+.grace-animate{animation:1s linear;}
+@keyframes bounce {
+	from,
+	20%,
+	53%,
+	80%,
+	to {
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		transform: translate3d(0, 0, 0);
+	}
+	40%,
+	43% {
+		animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+		transform: translate3d(0, -30px, 0);
+	}
+	70% {
+		animation-timing-function: cubic-bezier(0.755, 0.05, 0.855, 0.06);
+		transform: translate3d(0, -15px, 0);
+	}
+	90% {
+		transform: translate3d(0, -4px, 0);
+	}
+}
+
+.bounce {
+	animation-name: bounce;
+	transform-origin: center bottom;
+}
+
+@keyframes flash {
+	from,
+	50%,
+	to {
+		opacity: 1;
+	}
+
+	25%,
+	75% {
+		opacity: 0;
+	}
+}
+
+.flash {
+	-webkit-animation-name: flash;
+	animation-name: flash;
+}
+
+
+@keyframes pulse {
+	from {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+
+	50% {
+		-webkit-transform: scale3d(1.05, 1.05, 1.05);
+		transform: scale3d(1.05, 1.05, 1.05);
+	}
+
+	to {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+.pulse {
+	-webkit-animation-name: pulse;
+	animation-name: pulse;
+}
+
+@keyframes rubberBand {
+	from {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+
+	30% {
+		-webkit-transform: scale3d(1.25, 0.75, 1);
+		transform: scale3d(1.25, 0.75, 1);
+	}
+
+	40% {
+		-webkit-transform: scale3d(0.75, 1.25, 1);
+		transform: scale3d(0.75, 1.25, 1);
+	}
+
+	50% {
+		-webkit-transform: scale3d(1.15, 0.85, 1);
+		transform: scale3d(1.15, 0.85, 1);
+	}
+
+	65% {
+		-webkit-transform: scale3d(0.95, 1.05, 1);
+		transform: scale3d(0.95, 1.05, 1);
+	}
+
+	75% {
+		-webkit-transform: scale3d(1.05, 0.95, 1);
+		transform: scale3d(1.05, 0.95, 1);
+	}
+
+	to {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+.rubberBand {
+	-webkit-animation-name: rubberBand;
+	animation-name: rubberBand;
+}
+
+
+@keyframes shake {
+	from,
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	10%,
+	30%,
+	50%,
+	70%,
+	90% {
+		-webkit-transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
+	}
+
+	20%,
+	40%,
+	60%,
+	80% {
+		-webkit-transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
+	}
+}
+
+.shake {
+	-webkit-animation-name: shake;
+	animation-name: shake;
+}
+
+
+@keyframes headShake {
+	0% {
+		-webkit-transform: translateX(0);
+		transform: translateX(0);
+	}
+
+	6.5% {
+		-webkit-transform: translateX(-6px) rotateY(-9deg);
+		transform: translateX(-6px) rotateY(-9deg);
+	}
+
+	18.5% {
+		-webkit-transform: translateX(5px) rotateY(7deg);
+		transform: translateX(5px) rotateY(7deg);
+	}
+
+	31.5% {
+		-webkit-transform: translateX(-3px) rotateY(-5deg);
+		transform: translateX(-3px) rotateY(-5deg);
+	}
+
+	43.5% {
+		-webkit-transform: translateX(2px) rotateY(3deg);
+		transform: translateX(2px) rotateY(3deg);
+	}
+
+	50% {
+		-webkit-transform: translateX(0);
+		transform: translateX(0);
+	}
+}
+
+.headShake {
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out;
+	-webkit-animation-name: headShake;
+	animation-name: headShake;
+}
+
+
+@keyframes swing {
+	20% {
+		-webkit-transform: rotate3d(0, 0, 1, 15deg);
+		transform: rotate3d(0, 0, 1, 15deg);
+	}
+
+	40% {
+		-webkit-transform: rotate3d(0, 0, 1, -10deg);
+		transform: rotate3d(0, 0, 1, -10deg);
+	}
+
+	60% {
+		-webkit-transform: rotate3d(0, 0, 1, 5deg);
+		transform: rotate3d(0, 0, 1, 5deg);
+	}
+
+	80% {
+		-webkit-transform: rotate3d(0, 0, 1, -5deg);
+		transform: rotate3d(0, 0, 1, -5deg);
+	}
+
+	to {
+		-webkit-transform: rotate3d(0, 0, 1, 0deg);
+		transform: rotate3d(0, 0, 1, 0deg);
+	}
+}
+
+.swing {
+	-webkit-transform-origin: top center;
+	transform-origin: top center;
+	-webkit-animation-name: swing;
+	animation-name: swing;
+}
+
+
+@keyframes tada {
+	from {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+
+	10%,
+	20% {
+		-webkit-transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg);
+		transform: scale3d(0.9, 0.9, 0.9) rotate3d(0, 0, 1, -3deg);
+	}
+
+	30%,
+	50%,
+	70%,
+	90% {
+		-webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+		transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, 3deg);
+	}
+
+	40%,
+	60%,
+	80% {
+		-webkit-transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+		transform: scale3d(1.1, 1.1, 1.1) rotate3d(0, 0, 1, -3deg);
+	}
+
+	to {
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+.tada {
+	-webkit-animation-name: tada;
+	animation-name: tada;
+}
+
+
+@-webkit-keyframes wobble {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	15% {
+		-webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+		transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+	}
+
+	30% {
+		-webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+		transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+	}
+
+	45% {
+		-webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+		transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+	}
+
+	60% {
+		-webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+		transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+	}
+
+	75% {
+		-webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+		transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+@keyframes wobble {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	15% {
+		-webkit-transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+		transform: translate3d(-25%, 0, 0) rotate3d(0, 0, 1, -5deg);
+	}
+
+	30% {
+		-webkit-transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+		transform: translate3d(20%, 0, 0) rotate3d(0, 0, 1, 3deg);
+	}
+
+	45% {
+		-webkit-transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+		transform: translate3d(-15%, 0, 0) rotate3d(0, 0, 1, -3deg);
+	}
+
+	60% {
+		-webkit-transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+		transform: translate3d(10%, 0, 0) rotate3d(0, 0, 1, 2deg);
+	}
+
+	75% {
+		-webkit-transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+		transform: translate3d(-5%, 0, 0) rotate3d(0, 0, 1, -1deg);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.wobble {
+	-webkit-animation-name: wobble;
+	animation-name: wobble;
+}
+
+
+@keyframes jello {
+	from,
+	11.1%,
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	22.2% {
+		-webkit-transform: skewX(-12.5deg) skewY(-12.5deg);
+		transform: skewX(-12.5deg) skewY(-12.5deg);
+	}
+
+	33.3% {
+		-webkit-transform: skewX(6.25deg) skewY(6.25deg);
+		transform: skewX(6.25deg) skewY(6.25deg);
+	}
+
+	44.4% {
+		-webkit-transform: skewX(-3.125deg) skewY(-3.125deg);
+		transform: skewX(-3.125deg) skewY(-3.125deg);
+	}
+
+	55.5% {
+		-webkit-transform: skewX(1.5625deg) skewY(1.5625deg);
+		transform: skewX(1.5625deg) skewY(1.5625deg);
+	}
+
+	66.6% {
+		-webkit-transform: skewX(-0.78125deg) skewY(-0.78125deg);
+		transform: skewX(-0.78125deg) skewY(-0.78125deg);
+	}
+
+	77.7% {
+		-webkit-transform: skewX(0.390625deg) skewY(0.390625deg);
+		transform: skewX(0.390625deg) skewY(0.390625deg);
+	}
+
+	88.8% {
+		-webkit-transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+		transform: skewX(-0.1953125deg) skewY(-0.1953125deg);
+	}
+}
+
+.jello {
+	-webkit-animation-name: jello;
+	animation-name: jello;
+	-webkit-transform-origin: center;
+	transform-origin: center;
+}
+
+
+@keyframes heartBeat {
+	0% {
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+
+	14% {
+		-webkit-transform: scale(1.3);
+		transform: scale(1.3);
+	}
+
+	28% {
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+
+	42% {
+		-webkit-transform: scale(1.3);
+		transform: scale(1.3);
+	}
+
+	70% {
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+}
+
+.heartBeat {
+	-webkit-animation-name: heartBeat;
+	animation-name: heartBeat;
+	-webkit-animation-duration: 1.3s;
+	animation-duration: 1.3s;
+	-webkit-animation-timing-function: ease-in-out;
+	animation-timing-function: ease-in-out;
+}
+
+
+@keyframes bounceIn {
+	from,
+	20%,
+	40%,
+	60%,
+	80%,
+	to {
+		-webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+	}
+
+	0% {
+		opacity: 0;
+		-webkit-transform: scale3d(0.3, 0.3, 0.3);
+		transform: scale3d(0.3, 0.3, 0.3);
+	}
+
+	20% {
+		-webkit-transform: scale3d(1.1, 1.1, 1.1);
+		transform: scale3d(1.1, 1.1, 1.1);
+	}
+
+	40% {
+		-webkit-transform: scale3d(0.9, 0.9, 0.9);
+		transform: scale3d(0.9, 0.9, 0.9);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: scale3d(1.03, 1.03, 1.03);
+		transform: scale3d(1.03, 1.03, 1.03);
+	}
+
+	80% {
+		-webkit-transform: scale3d(0.97, 0.97, 0.97);
+		transform: scale3d(0.97, 0.97, 0.97);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: scale3d(1, 1, 1);
+		transform: scale3d(1, 1, 1);
+	}
+}
+
+.bounceIn {
+	-webkit-animation-duration: 0.75s;
+	animation-duration: 0.75s;
+	-webkit-animation-name: bounceIn;
+	animation-name: bounceIn;
+}
+
+
+@keyframes bounceInDown {
+	from,
+	60%,
+	75%,
+	90%,
+	to {
+		-webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+	}
+
+	0% {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -3000px, 0);
+		transform: translate3d(0, -3000px, 0);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 25px, 0);
+		transform: translate3d(0, 25px, 0);
+	}
+
+	75% {
+		-webkit-transform: translate3d(0, -10px, 0);
+		transform: translate3d(0, -10px, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(0, 5px, 0);
+		transform: translate3d(0, 5px, 0);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.bounceInDown {
+	-webkit-animation-name: bounceInDown;
+	animation-name: bounceInDown;
+}
+
+
+@keyframes bounceInLeft {
+	from,
+	60%,
+	75%,
+	90%,
+	to {
+		-webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+	}
+
+	0% {
+		opacity: 0;
+		-webkit-transform: translate3d(-3000px, 0, 0);
+		transform: translate3d(-3000px, 0, 0);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: translate3d(25px, 0, 0);
+		transform: translate3d(25px, 0, 0);
+	}
+
+	75% {
+		-webkit-transform: translate3d(-10px, 0, 0);
+		transform: translate3d(-10px, 0, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(5px, 0, 0);
+		transform: translate3d(5px, 0, 0);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.bounceInLeft {
+	-webkit-animation-name: bounceInLeft;
+	animation-name: bounceInLeft;
+}
+
+
+@keyframes bounceInRight {
+	from,
+	60%,
+	75%,
+	90%,
+	to {
+		-webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+	}
+
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(3000px, 0, 0);
+		transform: translate3d(3000px, 0, 0);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: translate3d(-25px, 0, 0);
+		transform: translate3d(-25px, 0, 0);
+	}
+
+	75% {
+		-webkit-transform: translate3d(10px, 0, 0);
+		transform: translate3d(10px, 0, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(-5px, 0, 0);
+		transform: translate3d(-5px, 0, 0);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.bounceInRight {
+	-webkit-animation-name: bounceInRight;
+	animation-name: bounceInRight;
+}
+
+
+@keyframes bounceInUp {
+	from,
+	60%,
+	75%,
+	90%,
+	to {
+		-webkit-animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+		animation-timing-function: cubic-bezier(0.215, 0.61, 0.355, 1);
+	}
+
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 3000px, 0);
+		transform: translate3d(0, 3000px, 0);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: translate3d(0, -20px, 0);
+		transform: translate3d(0, -20px, 0);
+	}
+
+	75% {
+		-webkit-transform: translate3d(0, 10px, 0);
+		transform: translate3d(0, 10px, 0);
+	}
+
+	90% {
+		-webkit-transform: translate3d(0, -5px, 0);
+		transform: translate3d(0, -5px, 0);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.bounceInUp {
+	-webkit-animation-name: bounceInUp;
+	animation-name: bounceInUp;
+}
+
+
+@keyframes bounceOut {
+	20% {
+		-webkit-transform: scale3d(0.9, 0.9, 0.9);
+		transform: scale3d(0.9, 0.9, 0.9);
+	}
+
+	50%,
+	55% {
+		opacity: 1;
+		-webkit-transform: scale3d(1.1, 1.1, 1.1);
+		transform: scale3d(1.1, 1.1, 1.1);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: scale3d(0.3, 0.3, 0.3);
+		transform: scale3d(0.3, 0.3, 0.3);
+	}
+}
+
+.bounceOut {
+	-webkit-animation-duration: 0.75s;
+	animation-duration: 0.75s;
+	-webkit-animation-name: bounceOut;
+	animation-name: bounceOut;
+}
+
+
+@keyframes bounceOutDown {
+	20% {
+		-webkit-transform: translate3d(0, 10px, 0);
+		transform: translate3d(0, 10px, 0);
+	}
+
+	40%,
+	45% {
+		opacity: 1;
+		-webkit-transform: translate3d(0, -20px, 0);
+		transform: translate3d(0, -20px, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 2000px, 0);
+		transform: translate3d(0, 2000px, 0);
+	}
+}
+
+.bounceOutDown {
+	-webkit-animation-name: bounceOutDown;
+	animation-name: bounceOutDown;
+}
+
+
+@keyframes bounceOutLeft {
+	20% {
+		opacity: 1;
+		-webkit-transform: translate3d(20px, 0, 0);
+		transform: translate3d(20px, 0, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(-2000px, 0, 0);
+		transform: translate3d(-2000px, 0, 0);
+	}
+}
+
+.bounceOutLeft {
+	-webkit-animation-name: bounceOutLeft;
+	animation-name: bounceOutLeft;
+}
+
+
+@keyframes bounceOutRight {
+	20% {
+		opacity: 1;
+		-webkit-transform: translate3d(-20px, 0, 0);
+		transform: translate3d(-20px, 0, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(2000px, 0, 0);
+		transform: translate3d(2000px, 0, 0);
+	}
+}
+
+.bounceOutRight {
+	-webkit-animation-name: bounceOutRight;
+	animation-name: bounceOutRight;
+}
+
+
+@keyframes bounceOutUp {
+	20% {
+		-webkit-transform: translate3d(0, -10px, 0);
+		transform: translate3d(0, -10px, 0);
+	}
+
+	40%,
+	45% {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 20px, 0);
+		transform: translate3d(0, 20px, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -2000px, 0);
+		transform: translate3d(0, -2000px, 0);
+	}
+}
+
+.bounceOutUp {
+	-webkit-animation-name: bounceOutUp;
+	animation-name: bounceOutUp;
+}
+
+
+@keyframes fadeIn {
+	from {
+		opacity: 0;
+	}
+
+	to {
+		opacity: 1;
+	}
+}
+
+.fadeIn {
+	-webkit-animation-name: fadeIn;
+	animation-name: fadeIn;
+}
+
+
+@keyframes fadeInDown {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -100%, 0);
+		transform: translate3d(0, -100%, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInDown {
+	-webkit-animation-name: fadeInDown;
+	animation-name: fadeInDown;
+}
+
+
+@keyframes fadeInDownBig {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -2000px, 0);
+		transform: translate3d(0, -2000px, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInDownBig {
+	-webkit-animation-name: fadeInDownBig;
+	animation-name: fadeInDownBig;
+}
+
+@keyframes fadeInLeft {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInLeft {
+	-webkit-animation-name: fadeInLeft;
+	animation-name: fadeInLeft;
+}
+
+
+@keyframes fadeInLeftBig {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(-2000px, 0, 0);
+		transform: translate3d(-2000px, 0, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInLeftBig {
+	-webkit-animation-name: fadeInLeftBig;
+	animation-name: fadeInLeftBig;
+}
+
+
+@keyframes fadeInRight {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInRight {
+	-webkit-animation-name: fadeInRight;
+	animation-name: fadeInRight;
+}
+
+
+@keyframes fadeInRightBig {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(2000px, 0, 0);
+		transform: translate3d(2000px, 0, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInRightBig {
+	-webkit-animation-name: fadeInRightBig;
+	animation-name: fadeInRightBig;
+}
+
+@keyframes fadeInUp {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 100%, 0);
+		transform: translate3d(0, 100%, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInUp {
+	-webkit-animation-name: fadeInUp;
+	animation-name: fadeInUp;
+}
+
+
+@keyframes fadeInUpBig {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 2000px, 0);
+		transform: translate3d(0, 2000px, 0);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.fadeInUpBig {
+	-webkit-animation-name: fadeInUpBig;
+	animation-name: fadeInUpBig;
+}
+
+@keyframes fadeOut {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+	}
+}
+
+.fadeOut {
+	-webkit-animation-name: fadeOut;
+	animation-name: fadeOut;
+}
+
+@keyframes fadeOutDown {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 100%, 0);
+		transform: translate3d(0, 100%, 0);
+	}
+}
+
+.fadeOutDown {
+	-webkit-animation-name: fadeOutDown;
+	animation-name: fadeOutDown;
+}
+
+
+@keyframes fadeOutDownBig {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, 2000px, 0);
+		transform: translate3d(0, 2000px, 0);
+	}
+}
+
+.fadeOutDownBig {
+	-webkit-animation-name: fadeOutDownBig;
+	animation-name: fadeOutDownBig;
+}
+
+@keyframes fadeOutLeft {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+
+.fadeOutLeft {
+	-webkit-animation-name: fadeOutLeft;
+	animation-name: fadeOutLeft;
+}
+
+
+@keyframes fadeOutLeftBig {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(-2000px, 0, 0);
+		transform: translate3d(-2000px, 0, 0);
+	}
+}
+
+.fadeOutLeftBig {
+	-webkit-animation-name: fadeOutLeftBig;
+	animation-name: fadeOutLeftBig;
+}
+
+@keyframes fadeOutRight {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0);
+	}
+}
+
+.fadeOutRight {
+	-webkit-animation-name: fadeOutRight;
+	animation-name: fadeOutRight;
+}
+
+@keyframes fadeOutRightBig {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(2000px, 0, 0);
+		transform: translate3d(2000px, 0, 0);
+	}
+}
+
+.fadeOutRightBig {
+	-webkit-animation-name: fadeOutRightBig;
+	animation-name: fadeOutRightBig;
+}
+
+@keyframes fadeOutUp {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -100%, 0);
+		transform: translate3d(0, -100%, 0);
+	}
+}
+
+.fadeOutUp {
+	-webkit-animation-name: fadeOutUp;
+	animation-name: fadeOutUp;
+}
+
+@keyframes fadeOutUpBig {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(0, -2000px, 0);
+		transform: translate3d(0, -2000px, 0);
+	}
+}
+
+.fadeOutUpBig {
+	-webkit-animation-name: fadeOutUpBig;
+	animation-name: fadeOutUpBig;
+}
+
+
+@keyframes flip {
+	from {
+		-webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0)
+			rotate3d(0, 1, 0, -360deg);
+		transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, -360deg);
+		-webkit-animation-timing-function: ease-out;
+		animation-timing-function: ease-out;
+	}
+
+	40% {
+		-webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px)
+			rotate3d(0, 1, 0, -190deg);
+		transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px)
+			rotate3d(0, 1, 0, -190deg);
+		-webkit-animation-timing-function: ease-out;
+		animation-timing-function: ease-out;
+	}
+
+	50% {
+		-webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px)
+			rotate3d(0, 1, 0, -170deg);
+		transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 150px)
+			rotate3d(0, 1, 0, -170deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+	}
+
+	80% {
+		-webkit-transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0)
+			rotate3d(0, 1, 0, 0deg);
+		transform: perspective(400px) scale3d(0.95, 0.95, 0.95) translate3d(0, 0, 0)
+			rotate3d(0, 1, 0, 0deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+	}
+
+	to {
+		-webkit-transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0)
+			rotate3d(0, 1, 0, 0deg);
+		transform: perspective(400px) scale3d(1, 1, 1) translate3d(0, 0, 0) rotate3d(0, 1, 0, 0deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+	}
+}
+
+.flip {
+	-webkit-backface-visibility: visible;
+	backface-visibility: visible;
+	-webkit-animation-name: flip;
+	animation-name: flip;
+}
+
+
+@keyframes flipInX {
+	from {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+		opacity: 0;
+	}
+
+	40% {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+	}
+
+	60% {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, 10deg);
+		opacity: 1;
+	}
+
+	80% {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, -5deg);
+	}
+
+	to {
+		-webkit-transform: perspective(400px);
+		transform: perspective(400px);
+	}
+}
+
+.flipInX {
+	-webkit-backface-visibility: visible !important;
+	backface-visibility: visible !important;
+	-webkit-animation-name: flipInX;
+	animation-name: flipInX;
+}
+
+
+@keyframes flipInY {
+	from {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+		opacity: 0;
+	}
+
+	40% {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, -20deg);
+		-webkit-animation-timing-function: ease-in;
+		animation-timing-function: ease-in;
+	}
+
+	60% {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, 10deg);
+		opacity: 1;
+	}
+
+	80% {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, -5deg);
+	}
+
+	to {
+		-webkit-transform: perspective(400px);
+		transform: perspective(400px);
+	}
+}
+
+.flipInY {
+	-webkit-backface-visibility: visible !important;
+	backface-visibility: visible !important;
+	-webkit-animation-name: flipInY;
+	animation-name: flipInY;
+}
+
+
+@keyframes flipOutX {
+	from {
+		-webkit-transform: perspective(400px);
+		transform: perspective(400px);
+	}
+
+	30% {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, -20deg);
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+		transform: perspective(400px) rotate3d(1, 0, 0, 90deg);
+		opacity: 0;
+	}
+}
+
+.flipOutX {
+	-webkit-animation-duration: 0.75s;
+	animation-duration: 0.75s;
+	-webkit-animation-name: flipOutX;
+	animation-name: flipOutX;
+	-webkit-backface-visibility: visible !important;
+	backface-visibility: visible !important;
+}
+
+
+@keyframes flipOutY {
+	from {
+		-webkit-transform: perspective(400px);
+		transform: perspective(400px);
+	}
+
+	30% {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, -15deg);
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+		transform: perspective(400px) rotate3d(0, 1, 0, 90deg);
+		opacity: 0;
+	}
+}
+
+.flipOutY {
+	-webkit-animation-duration: 0.75s;
+	animation-duration: 0.75s;
+	-webkit-backface-visibility: visible !important;
+	backface-visibility: visible !important;
+	-webkit-animation-name: flipOutY;
+	animation-name: flipOutY;
+}
+
+@keyframes lightSpeedIn {
+	from {
+		-webkit-transform: translate3d(100%, 0, 0) skewX(-30deg);
+		transform: translate3d(100%, 0, 0) skewX(-30deg);
+		opacity: 0;
+	}
+
+	60% {
+		-webkit-transform: skewX(20deg);
+		transform: skewX(20deg);
+		opacity: 1;
+	}
+
+	80% {
+		-webkit-transform: skewX(-5deg);
+		transform: skewX(-5deg);
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.lightSpeedIn {
+	-webkit-animation-name: lightSpeedIn;
+	animation-name: lightSpeedIn;
+	-webkit-animation-timing-function: ease-out;
+	animation-timing-function: ease-out;
+}
+
+@keyframes lightSpeedOut {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform: translate3d(100%, 0, 0) skewX(30deg);
+		transform: translate3d(100%, 0, 0) skewX(30deg);
+		opacity: 0;
+	}
+}
+
+.lightSpeedOut {
+	-webkit-animation-name: lightSpeedOut;
+	animation-name: lightSpeedOut;
+	-webkit-animation-timing-function: ease-in;
+	animation-timing-function: ease-in;
+}
+
+
+@keyframes rotateIn {
+	from {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: rotate3d(0, 0, 1, -200deg);
+		transform: rotate3d(0, 0, 1, -200deg);
+		opacity: 0;
+	}
+
+	to {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
+}
+
+.rotateIn {
+	-webkit-animation-name: rotateIn;
+	animation-name: rotateIn;
+}
+
+
+@keyframes rotateInDownLeft {
+	from {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: rotate3d(0, 0, 1, -45deg);
+		transform: rotate3d(0, 0, 1, -45deg);
+		opacity: 0;
+	}
+
+	to {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
+}
+
+.rotateInDownLeft {
+	-webkit-animation-name: rotateInDownLeft;
+	animation-name: rotateInDownLeft;
+}
+
+@keyframes rotateInDownRight {
+	from {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: rotate3d(0, 0, 1, 45deg);
+		transform: rotate3d(0, 0, 1, 45deg);
+		opacity: 0;
+	}
+
+	to {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
+}
+
+.rotateInDownRight {
+	-webkit-animation-name: rotateInDownRight;
+	animation-name: rotateInDownRight;
+}
+
+
+@keyframes rotateInUpLeft {
+	from {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: rotate3d(0, 0, 1, 45deg);
+		transform: rotate3d(0, 0, 1, 45deg);
+		opacity: 0;
+	}
+
+	to {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
+}
+
+.rotateInUpLeft {
+	-webkit-animation-name: rotateInUpLeft;
+	animation-name: rotateInUpLeft;
+}
+
+@keyframes rotateInUpRight {
+	from {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: rotate3d(0, 0, 1, -90deg);
+		transform: rotate3d(0, 0, 1, -90deg);
+		opacity: 0;
+	}
+
+	to {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+		opacity: 1;
+	}
+}
+
+.rotateInUpRight {
+	-webkit-animation-name: rotateInUpRight;
+	animation-name: rotateInUpRight;
+}
+
+@keyframes rotateOut {
+	from {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform-origin: center;
+		transform-origin: center;
+		-webkit-transform: rotate3d(0, 0, 1, 200deg);
+		transform: rotate3d(0, 0, 1, 200deg);
+		opacity: 0;
+	}
+}
+
+.rotateOut {
+	-webkit-animation-name: rotateOut;
+	animation-name: rotateOut;
+}
+
+@keyframes rotateOutDownLeft {
+	from {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: rotate3d(0, 0, 1, 45deg);
+		transform: rotate3d(0, 0, 1, 45deg);
+		opacity: 0;
+	}
+}
+
+.rotateOutDownLeft {
+	-webkit-animation-name: rotateOutDownLeft;
+	animation-name: rotateOutDownLeft;
+}
+
+@keyframes rotateOutDownRight {
+	from {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: rotate3d(0, 0, 1, -45deg);
+		transform: rotate3d(0, 0, 1, -45deg);
+		opacity: 0;
+	}
+}
+
+.rotateOutDownRight {
+	-webkit-animation-name: rotateOutDownRight;
+	animation-name: rotateOutDownRight;
+}
+
+@keyframes rotateOutUpLeft {
+	from {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform-origin: left bottom;
+		transform-origin: left bottom;
+		-webkit-transform: rotate3d(0, 0, 1, -45deg);
+		transform: rotate3d(0, 0, 1, -45deg);
+		opacity: 0;
+	}
+}
+
+.rotateOutUpLeft {
+	-webkit-animation-name: rotateOutUpLeft;
+	animation-name: rotateOutUpLeft;
+}
+
+@keyframes rotateOutUpRight {
+	from {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform-origin: right bottom;
+		transform-origin: right bottom;
+		-webkit-transform: rotate3d(0, 0, 1, 90deg);
+		transform: rotate3d(0, 0, 1, 90deg);
+		opacity: 0;
+	}
+}
+
+.rotateOutUpRight {
+	-webkit-animation-name: rotateOutUpRight;
+	animation-name: rotateOutUpRight;
+}
+
+
+@keyframes hinge {
+	0% {
+		-webkit-transform-origin: top left;
+		transform-origin: top left;
+		-webkit-animation-timing-function: ease-in-out;
+		animation-timing-function: ease-in-out;
+	}
+
+	20%,
+	60% {
+		-webkit-transform: rotate3d(0, 0, 1, 80deg);
+		transform: rotate3d(0, 0, 1, 80deg);
+		-webkit-transform-origin: top left;
+		transform-origin: top left;
+		-webkit-animation-timing-function: ease-in-out;
+		animation-timing-function: ease-in-out;
+	}
+
+	40%,
+	80% {
+		-webkit-transform: rotate3d(0, 0, 1, 60deg);
+		transform: rotate3d(0, 0, 1, 60deg);
+		-webkit-transform-origin: top left;
+		transform-origin: top left;
+		-webkit-animation-timing-function: ease-in-out;
+		animation-timing-function: ease-in-out;
+		opacity: 1;
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 700px, 0);
+		transform: translate3d(0, 700px, 0);
+		opacity: 0;
+	}
+}
+
+.hinge {
+	-webkit-animation-duration: 2s;
+	animation-duration: 2s;
+	-webkit-animation-name: hinge;
+	animation-name: hinge;
+}
+
+@keyframes jackInTheBox {
+	from {
+		opacity: 0;
+		-webkit-transform: scale(0.1) rotate(30deg);
+		transform: scale(0.1) rotate(30deg);
+		-webkit-transform-origin: center bottom;
+		transform-origin: center bottom;
+	}
+
+	50% {
+		-webkit-transform: rotate(-10deg);
+		transform: rotate(-10deg);
+	}
+
+	70% {
+		-webkit-transform: rotate(3deg);
+		transform: rotate(3deg);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: scale(1);
+		transform: scale(1);
+	}
+}
+
+.jackInTheBox {
+	-webkit-animation-name: jackInTheBox;
+	animation-name: jackInTheBox;
+}
+
+@keyframes rollIn {
+	from {
+		opacity: 0;
+		-webkit-transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+		transform: translate3d(-100%, 0, 0) rotate3d(0, 0, 1, -120deg);
+	}
+
+	to {
+		opacity: 1;
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.rollIn {
+	-webkit-animation-name: rollIn;
+	animation-name: rollIn;
+}
+
+@keyframes rollOut {
+	from {
+		opacity: 1;
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+		transform: translate3d(100%, 0, 0) rotate3d(0, 0, 1, 120deg);
+	}
+}
+
+.rollOut {
+	-webkit-animation-name: rollOut;
+	animation-name: rollOut;
+}
+
+@keyframes zoomIn {
+	from {
+		opacity: 0;
+		-webkit-transform: scale3d(0.3, 0.3, 0.3);
+		transform: scale3d(0.3, 0.3, 0.3);
+	}
+
+	50% {
+		opacity: 1;
+	}
+}
+
+.zoomIn {
+	-webkit-animation-name: zoomIn;
+	animation-name: zoomIn;
+}
+
+
+@keyframes zoomInDown {
+	from {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -1000px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomInDown {
+	-webkit-animation-name: zoomInDown;
+	animation-name: zoomInDown;
+}
+
+@keyframes zoomInLeft {
+	from {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(-1000px, 0, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(10px, 0, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomInLeft {
+	-webkit-animation-name: zoomInLeft;
+	animation-name: zoomInLeft;
+}
+
+@keyframes zoomInRight {
+	from {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(1000px, 0, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(-10px, 0, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomInRight {
+	-webkit-animation-name: zoomInRight;
+	animation-name: zoomInRight;
+}
+
+@keyframes zoomInUp {
+	from {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 1000px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	60% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomInUp {
+	-webkit-animation-name: zoomInUp;
+	animation-name: zoomInUp;
+}
+
+@keyframes zoomOut {
+	from {
+		opacity: 1;
+	}
+
+	50% {
+		opacity: 0;
+		-webkit-transform: scale3d(0.3, 0.3, 0.3);
+		transform: scale3d(0.3, 0.3, 0.3);
+	}
+
+	to {
+		opacity: 0;
+	}
+}
+
+.zoomOut {
+	-webkit-animation-name: zoomOut;
+	animation-name: zoomOut;
+}
+
+@keyframes zoomOutDown {
+	40% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(0, -60px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(0, 2000px, 0);
+		-webkit-transform-origin: center bottom;
+		transform-origin: center bottom;
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomOutDown {
+	-webkit-animation-name: zoomOutDown;
+	animation-name: zoomOutDown;
+}
+
+@keyframes zoomOutLeft {
+	40% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(42px, 0, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: scale(0.1) translate3d(-2000px, 0, 0);
+		transform: scale(0.1) translate3d(-2000px, 0, 0);
+		-webkit-transform-origin: left center;
+		transform-origin: left center;
+	}
+}
+
+.zoomOutLeft {
+	-webkit-animation-name: zoomOutLeft;
+	animation-name: zoomOutLeft;
+}
+
+@keyframes zoomOutRight {
+	40% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(-42px, 0, 0);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: scale(0.1) translate3d(2000px, 0, 0);
+		transform: scale(0.1) translate3d(2000px, 0, 0);
+		-webkit-transform-origin: right center;
+		transform-origin: right center;
+	}
+}
+
+.zoomOutRight {
+	-webkit-animation-name: zoomOutRight;
+	animation-name: zoomOutRight;
+}
+
+@keyframes zoomOutUp {
+	40% {
+		opacity: 1;
+		-webkit-transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0);
+		transform: scale3d(0.475, 0.475, 0.475) translate3d(0, 60px, 0);
+		-webkit-animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+		animation-timing-function: cubic-bezier(0.55, 0.055, 0.675, 0.19);
+	}
+
+	to {
+		opacity: 0;
+		-webkit-transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0);
+		transform: scale3d(0.1, 0.1, 0.1) translate3d(0, -2000px, 0);
+		-webkit-transform-origin: center bottom;
+		transform-origin: center bottom;
+		-webkit-animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+		animation-timing-function: cubic-bezier(0.175, 0.885, 0.32, 1);
+	}
+}
+
+.zoomOutUp {
+	-webkit-animation-name: zoomOutUp;
+	animation-name: zoomOutUp;
+}
+
+@keyframes slideInDown {
+	from {
+		-webkit-transform: translate3d(0, -100%, 0);
+		transform: translate3d(0, -100%, 0);
+		visibility: visible;
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.slideInDown {
+	-webkit-animation-name: slideInDown;
+	animation-name: slideInDown;
+}
+
+@keyframes slideInLeft {
+	from {
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0);
+		visibility: visible;
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.slideInLeft {
+	-webkit-animation-name: slideInLeft;
+	animation-name: slideInLeft;
+}
+
+@keyframes slideInRight {
+	from {
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0);
+		visibility: visible;
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.slideInRight {
+	-webkit-animation-name: slideInRight;
+	animation-name: slideInRight;
+}
+
+@keyframes slideInUp {
+	from {
+		-webkit-transform: translate3d(0, 100%, 0);
+		transform: translate3d(0, 100%, 0);
+		visibility: visible;
+	}
+
+	to {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+}
+
+.slideInUp {
+	-webkit-animation-name: slideInUp;
+	animation-name: slideInUp;
+}
+
+@keyframes slideOutDown {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	to {
+		visibility: hidden;
+		-webkit-transform: translate3d(0, 100%, 0);
+		transform: translate3d(0, 100%, 0);
+	}
+}
+
+.slideOutDown {
+	-webkit-animation-name: slideOutDown;
+	animation-name: slideOutDown;
+}
+
+@keyframes slideOutLeft {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	to {
+		visibility: hidden;
+		-webkit-transform: translate3d(-100%, 0, 0);
+		transform: translate3d(-100%, 0, 0);
+	}
+}
+
+.slideOutLeft {
+	-webkit-animation-name: slideOutLeft;
+	animation-name: slideOutLeft;
+}
+
+@keyframes slideOutRight {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	to {
+		visibility: hidden;
+		-webkit-transform: translate3d(100%, 0, 0);
+		transform: translate3d(100%, 0, 0);
+	}
+}
+
+.slideOutRight {
+	-webkit-animation-name: slideOutRight;
+	animation-name: slideOutRight;
+}
+
+@keyframes slideOutUp {
+	from {
+		-webkit-transform: translate3d(0, 0, 0);
+		transform: translate3d(0, 0, 0);
+	}
+
+	to {
+		visibility: hidden;
+		-webkit-transform: translate3d(0, -100%, 0);
+		transform: translate3d(0, -100%, 0);
+	}
+}
+
+.slideOutUp {
+	-webkit-animation-name: slideOutUp;
+	animation-name: slideOutUp;
+}
\ No newline at end of file
diff --git a/pages/subPages2/hirePlatform/addResume/addResume.vue b/pages/subPages2/hirePlatform/addResume/addResume.vue
new file mode 100644
index 0000000..f7424fa
--- /dev/null
+++ b/pages/subPages2/hirePlatform/addResume/addResume.vue
@@ -0,0 +1,1757 @@
+<template>
+	<view class="enterForm">
+		
+		<view class="formbox" v-if="loadlogo">
+			<view class="formdatabox">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">{{languageStatus!=1?'请填写个人信息':'개인정보를 입력하세요'}}</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'姓名':'성명'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;"><input class="uni-input f-24" :placeholder="languageStatus!=1?'请输入姓名':'성명을 입력하세요'" v-model="userInfo.name" /></view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'生日':'생일'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<view class="uni-input" @click="ageshow = true">
+							{{ userInfo.birth_time || (languageStatus!=1?'请选择出生年月日':'출생년원일을 입력하세요') }}
+							<text class="iconfont icon-right" style="float: right;font-size: 20upx;color: #999999;"></text>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'联系方式':'연락방식'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="number" :placeholder="languageStatus!=1?'请输入联系电话':'연락 전화를 입력하세요'" v-model="userInfo.phone" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'性别':'성별'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="genderChange" :value="genderIndex" :range="genderList">
+							<view class="uni-input">
+								{{ genderList[genderIndex] }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'所在城市':'현재도시'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<w-picker
+							:visible.sync="visiblec"
+							mode="region"
+							:value="[userInfo.provinceid,userInfo.areaid,userInfo.distid]"
+							default-type="value"
+							:hide-area="false"
+							@confirm="onConfirm($event, 'region')"
+							@cancel="onCancel"
+							ref="region"
+						></w-picker>
+						<view class="uni-input" @tap="visble">
+							{{ provinceidName }} {{ areaidName }} {{ distidName }}
+							<text class="iconfont icon-right" style="float: right;font-size: 20upx;color: #999999;"></text>
+						</view>
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						详细地址
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<input class="f-24" style="flex: 0.8;" placeholder="请输入详细地址" v-model="userInfo.address" />
+						<view class="dis-il-block" @click="getLocation" style="flex: 0.3;">
+							<image style="width: 20upx;height: 20upx;padding-left: 10upx;" :src="imgfixUrls + 'merchant/where.svg'" />
+							<span>定位</span>
+						</view>
+					</view>
+				</view> -->
+
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						商家简介
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<textarea style="width: 100%;font-size: 24upx;" v-if="!hangyeshow" auto-height placeholder="请输入商户简介" placeholder-style="font-size:24upx"
+						 v-model="userInfo.desc" />
+						</view>
+				</view> -->
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">{{languageStatus!=1?'请填写更多资料':'추가 자료를 입력하세요'}}</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						微信号
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入微信号" v-model="userInfo.wx" />
+					</view>
+				</view> -->
+
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'最高学历':'최고 학력'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" v-if="educationList.length > 0">
+						<picker @change="educationChange" :value="educationIndex" range-key="title" :range="educationList">
+							<view class="uni-input">
+								{{ educationList[educationIndex].title }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'上岗状态':'업무상태'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="incumbencyChange" :value="incumbencyIndex" range-key="title" :range="incumbencyList">
+							<view class="uni-input">
+								{{ incumbencyList[incumbencyIndex].title }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'工作经验':'업무경력'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="experienceChange" :value="experienceIndex" range-key="title" :range="experienceList">
+							<view class="uni-input">
+								{{ experienceList[experienceIndex].title }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'工作类型':'업무 유형'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<picker @change="workTypeChange" :value="workTypeIndex" range-key="title" :range="workTypeList">
+							<view class="uni-input">
+								{{ workTypeList[workTypeIndex].title }}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'最低薪资':'최저 봉급'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="number" :placeholder="languageStatus!=1?'请填写最低期盼薪资':'희망 최저봉급 입력'" v-model="userInfo.expect_salary_min" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'最高薪资':'최고 봉급'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="number" :placeholder="languageStatus!=1?'请填写最高期盼薪资':'희망 최저봉급 입력'" v-model="userInfo.expect_salary_max" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus!=1?'期望职位':'희망 직위'}}
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="showThePic">
+							<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+						 	 range-key="name" :value="typeIndex"> -->
+							<view v-if="businessList.length == 0" class="uni-input twoLevelList">
+								{{languageStatus!=1?'请选择行业分类':'항업 분류 선택'}}
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;margin-top: 5upx;"></text>
+							</view>
+							<view v-else class="uni-input twoLevelList">
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 1">
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{ businessList[0].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
+										<!-- <text class="iconfont icon-close_light"></text> -->
+									</view>
+								</view>
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 2">
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;">
+										{{ businessList[0].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
+									</view>
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{ businessList[1].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text>
+									</view>
+									<!-- {{businessList[0].title}},{{businessList[1].title}} -->
+								</view>
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 3">
+									<!-- {{businessList[0].title}},{{businessList[1].title}},{{businessList[2].title}} -->
+									<view
+										class="dis-il-block t-c"
+										style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;margin-bottom: 20upx;"
+									>
+										{{ businessList[0].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(0)"></text>
+									</view>
+									<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;">
+										{{ businessList[1].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(1)"></text>
+									</view>
+									<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{ businessList[2].title }}
+										<text class="iconfont icon-close_light" style="font-size: 26upx;padding-left: 10upx;" @click.stop="splicebusinde(2)"></text>
+									</view>
+								</view>
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<!-- 			</picker> -->
+							<span></span>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">{{languageStatus!=1?'头像上传':'이미지 올리기'}}</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="logobox">
+					<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+					<span>{{languageStatus!=1?'用户头像':'사용자 이미지'}}(200X200)</span>
+					<view style="padding-left: 20upx;">
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdataon" style="margin: 10upx;" v-if="userInfo.avatar">
+							<image :src="userInfo.avatar" class="imgs" @click="lookimg(1, userInfo.avatar)" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="uploadFiles(1, 1)" style="margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="!userInfo.avatar">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign"></view>
+					<view  style="padding-left: 20upx;flex: 0.45;">个人经历</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						工作经历
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" @click="afterWorkShow = true">
+						<view class="uni-input">
+							点击编辑项目经验
+							<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						教育经历
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" @click="educationShow = true">
+						<view class="uni-input">
+							点击编辑教育经历
+							<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;"></view>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						自我评价
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<view ><textarea v-if="!afterWorkShow && !educationShow" style="width: 100%;font-size: 26upx;" maxlength="9999" v-model="userInfo.self_evaluation" placeholder="请填写自我评价" /></view>
+					</view>
+				</view>
+			</view>
+			<view  style="padding-bottom: 100upx;">
+				<view class="t-c" style="width: 90vw;height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;" @click="submit">提 交</view>
+			</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="
+						`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${
+							latlngs.longitude
+						}`
+					"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="hangyeshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeShareBottom">
+			<view class="hangye dis-flex">
+				<view  style="flex: 0.33;overflow: auto;">
+					<view :class="item.checked ? 'industryclass-item classcheck f-28' : 'industryclass-item f-28'" v-for="(item, index) in industry" @click="clickindustry(item)">
+						{{ item.title }}
+					</view>
+				</view>
+				<view  style="flex: 0.33;overflow: auto;">
+					<view
+						:class="item.checked ? 'industryclass-item classcheck f-28' : 'industryclass-item f-28'"
+						v-for="(item, index) in industrysubdivide"
+						@click="clickclass(item)"
+					>
+						{{ item.title }}
+					</view>
+				</view>
+				<view  style="flex: 0.33;overflow: auto;">
+					<view
+						:class="item.checked ? 'industryclass-item isclasschecked f-28' : 'industryclass-item f-28'"
+						v-for="(item, index) in industrysublevel"
+						@click="clickclassTwo(item)"
+					>
+						{{ item.title }}
+					</view>
+				</view>
+			</view>
+			<!-- <view class="b-f dis-flex">
+				
+				<view class="flex-box">
+					<button @click="confirm" style="width: 80%;height: 80%;font-size: 34upx;line-height: 70upx;height: 70upx;margin-bottom: 20upx;" type="warn">确定</button>
+				</view>
+			</view> -->
+		</PopManager>
+		<PopManager :show="afterWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'">
+			<view class="after-work">
+				<view class="after-work-title dis-flex">
+					<view class="flex-box f-32 f-w">项目经历</view>
+					<view class="flex-box iconfont icon-close t-r" @click="afterWorkShow = false"></view>
+				</view>
+				<view class="f-28" style="padding: 30upx 0;height: 50vh;overflow: auto;">
+					<view class="after-item" v-for="(item, index) in work_experienceList">
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">项目名称</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.title }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">项目时间</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.start_time }}-{{ item.end_time }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">所在企业</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.corporate_name }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">基本描述</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.content }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.5;" class="f-w"></view>
+							<view style="flex: 0.5;text-align: right;">
+								<view class="dis-il-block c-ff4444" @click="deleteWork(index)">删除</view>
+								<view class="dis-il-block" style="color: #008CFF;padding-left: 50upx;" @click="redact(item, index)">编辑</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="work-btn" @click="addWorkShow = true">添加经历</view>
+				<PopManager :show="addWorkShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeadd">
+					<view class="add-work" v-show="addWorkShow"><!-- 此处添加v-show，增强视图效果 -->
+						<view class="dis-flex" style="padding-bottom: 30upx;">
+							<view class="flex-box f-32">添加项目经历</view>
+							<view class="flex-box iconfont icon-close t-r" @click="closeadd"></view>
+						</view>
+						<view>
+							<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;line-height: 45upx;">项目名称</view>
+								<view  style="flex: 0.7;">
+									<input type="text" style="font-size: 26upx;" placeholder="请填写项目名称" v-model="work_experience.title" />
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">公司名称</view>
+								<view  style="flex: 0.7;">
+									<input type="text" style="font-size: 26upx;" placeholder="请填写公司名称" v-model="work_experience.corporate_name" />
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">开始时间</view>
+								<view :class="work_experience.start_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="startTime = true">
+									{{ work_experience.start_time || '请选择项目开始时间' }}
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">结束时间</view>
+								<view :class="work_experience.end_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="endTime = true">
+									{{ work_experience.end_time || '请选择项目结束时间' }}
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 20upx;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">项目内容</view>
+								<view  style="flex: 0.7;">
+									<textarea 
+										type="text"
+										style="font-size: 26upx;width: 100%;height: 400upx;"
+										maxlength="9999"
+										placeholder="请填写项目内容"
+										v-model="work_experience.content"
+									/>
+								</view>
+							</view>
+							<view class="dis-il-block t-c redbtn" @click.stop="addwork_experience">保存</view>
+						</view>
+					</view>
+				</PopManager>
+			</view>
+		</PopManager>
+		<PopManager :show="educationShow" :type="'center'" :overlay="'false'" :showOverlay="'false'">
+			<view class="after-work">
+				<view class="after-work-title dis-flex">
+					<view class="flex-box f-32 f-w">教育经历</view>
+					<view class="flex-box iconfont icon-close t-r" @click="educationShow = false"></view>
+				</view>
+				<view class="f-28" style="padding: 30upx 0;height: 50vh;overflow: auto;">
+					<view class="after-item" v-for="(item, index) in educational_experienceList">
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">学校名称</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.school }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">就读时间</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.start_time }}-{{ item.end_time }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.3;" class="f-w">就读专业</view>
+							<view style="flex: 0.8;padding-left: 20upx;">{{ item.major }}</view>
+						</view>
+						<view class="dis-flex after-item-item">
+							<view style="flex: 0.5;" class="f-w"></view>
+							<view style="flex: 0.5;text-align: right;">
+								<view class="dis-il-block c-ff4444" @click="deleteteach(index)">删除</view>
+								<view class="dis-il-block" style="color: #008CFF;padding-left: 50upx;" @click="redactteach(item, index)">编辑</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="work-btn" @click="addteachShow = true">添加经历</view>
+				<PopManager :show="addteachShow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeaddteach">
+					<view class="add-work" v-show="addteachShow"><!-- 此处添加v-show，增强视图效果 -->
+						<view class="dis-flex" style="padding-bottom: 30upx;">
+							<view class="flex-box f-32">添加教育经历</view>
+							<view class="flex-box iconfont icon-close t-r" @click="closeaddteach"></view>
+						</view>
+						<view>
+							<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;line-height: 34upx;">学校名称</view>
+								<view  style="flex: 0.7;">
+									<input type="text" style="font-size: 26upx;" placeholder="请填写学校名称" v-model="educational_experience.school" />
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">所属专业</view>
+								<view  style="flex: 0.7;">
+									<input type="text" style="font-size: 26upx;" placeholder="请填写就读专业" v-model="educational_experience.major" />
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;border-bottom: 1upx solid #EEEEEE;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">开始时间</view>
+								<view :class="educational_experience.start_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="startTime = true">
+									{{ educational_experience.start_time || '请选择就读时间' }}
+								</view>
+							</view>
+							<view class="dis-flex" style="padding-bottom: 40upx;padding-top: 10upx;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">结束时间</view>
+								<view :class="educational_experience.end_time ? 'f-26' : 'f-26 col-6'" style="flex: 0.7;line-height: 30upx;" @click="endTime = true">
+									{{ educational_experience.end_time || '请选毕业时间' }}
+								</view>
+							</view>
+							<!-- <view class="dis-flex" style="padding-bottom: 20upx;padding-top: 40upx;">
+								<view class="f-26" style="flex: 0.3;">
+									项目内容
+								</view>
+								<view  style="flex: 0.7;">
+									<textarea  type="text"  style="font-size: 26upx;width: 100%;height: 400upx;" maxlength="9999" placeholder="请填写项目内容" v-model="work_experience.content" />
+								</view>
+							</view> -->
+							<view class="dis-il-block t-c redbtn" style="bottom: -20%;" @click.stop="addTeach_experience">保存</view>
+						</view>
+					</view>
+				</PopManager>
+			</view>
+		</PopManager>
+		<!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
+		<far-bottom></far-bottom>
+		<w-picker
+			:visible.sync="startTime"
+			mode="date"
+			startYear="2000"
+			endYear="2100"
+			fields="day"
+			@confirm="onConfirmstartTime($event, 'date')"
+			@cancel="onCancel"
+			:disabled-after="false"
+			ref="datea"
+		></w-picker>
+		<w-picker
+			:visible.sync="endTime"
+			mode="date"
+			startYear="1900"
+			endYear="2100"
+			fields="day"
+			@confirm="onConfirmendTime($event, 'date')"
+			@cancel="onCancel"
+			:disabled-after="false"
+			ref="date"
+		></w-picker>
+		<w-picker
+			:visible.sync="ageshow"
+			mode="date"
+			:value="userInfo.birth_time"
+			startYear="1900"
+			endYear="2100"
+			
+			fields="day"
+			@confirm="onConfirmage($event, 'date')"
+			:disabled-after="false"
+			ref="dateb"
+		></w-picker>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import wPicker from '@/components/w-picker/w-picker.vue';
+import PopManager from '@/components/template/PopManager';
+import phoneNavBar from '@/components/template/phoneNavBar';
+import TabBars from '@/components/template/tabBar.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default{
+	data(){
+		return{
+			provinceidName:'',
+			areaidName:'',
+			distidName:'',
+			visiblec:false,
+			ageshow:false,
+			startTime:false,
+			endTime:false,
+			addWorkShow:false,
+			addteachShow:false,
+			afterWorkShow:false,
+			educationShow:false,
+			address:'',
+			lblis:{},
+			klis:false,
+			isOpenLaction:false,
+			userInfo:{
+
+			},
+			phoneHeight:null,
+			latlngs:null,
+			owenscitylist:[],
+			hangyeshow:false,
+			hangYe:true,
+			industryclass:'',
+			industry:[],
+			industrysubdivide:[],
+			industrysublevel:[],
+			industryAll:{},
+			loadlogo:true,
+			pickerarray:['全部','1','2','3'],
+			pickerindex:0,
+			goodsinfo:{},
+			sid:'',
+			oldDistid:'',
+			uploadlength:0,
+			localIds:[],
+			genderList:['男','女'],
+			genderIndex:0,
+			educationList:[],
+			workTypeList:[{title:'全职',id:1},{title:'兼职',id:2}],
+			workTypeIndex:0,
+			educationIndex:0,
+			incumbencyList:[
+				{title:'随时上岗',id:1},
+				{title:'一周之内',id:2},
+				{title:'一月之内',id:3},
+				{title:'考虑中',id:4},
+				{title:'无换岗意向',id:5},
+			],
+			incumbencyIndex:0,
+			experienceList:[],
+			experienceIndex:0,
+			businessList:[],
+			work_experience:{
+				title:'',
+				corporate_name:'',
+				start_time:'',
+				end_time:'',
+				content:''
+			},
+			educational_experience:{
+				school:'',
+				major:'',
+				start_time:'',
+				end_time:'',
+			},
+			work_experienceList:[],
+			educational_experienceList:[],
+			redactIndex:null,
+			upimg:false
+		}
+	},
+	components:{
+		wPicker,
+		PopManager,
+		phoneNavBar,
+		TabBars
+	},
+	onHide() {
+
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.id = e.id;
+		_this.sid = e.sid;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHeight = res.windowHeight + 'px';
+			}
+		});
+		_this.owenscitylist = uni.getStorageSync('cityList');
+		_this.agencyData = uni.getStorageSync('agencyData');
+		_this.latlngs = uni.getStorageSync('curLoction');
+		// _this.userInfo.meralid = _this.pickerarray[0].id;
+		
+		
+		
+	},
+	onShow() {
+		let _this = this;
+		// #ifdef H5
+		window.addEventListener(
+			'message',
+			function(event) {
+				// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+				let loc = event.data;
+				if(_this.klis){
+					return
+				}
+				if (loc && loc.module == 'locationPicker') {
+					//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+					console.log('location', loc);
+					// _this.thelat = loc.latlng.lat;
+					// _this.userInfo.address = loc.poiaddress;
+					_this.isOpenLaction = false;
+					_this.lblis = {
+								lat:loc.latlng.lat,
+								lng:loc.latlng.lng,
+								detailed_address:loc.poiaddress
+							}
+					_this.getloctions(_this.lblis)
+				}
+				_this.klis = true;
+				setTimeout(()=>{
+					_this.klis = false;
+				},1000)
+			},
+			false
+		);
+		
+		// #endif
+		//#ifdef APP-PLUS
+		if(_this.userInfo.address){
+			_this.lblis.address = e.address
+			_this.getloctions(_this.lblis)
+		}
+		//#endif
+		if(_this.upimg){
+			_this.upimg = false;
+			return
+		}
+		setTimeout(()=>{
+			_this.getenter(_this.id);
+			_this.geteducationList();
+		})
+	},
+	methods:{
+		splicebusinde(index){
+			this.businessList.splice(index,1);
+			this.userInfo.expect_position.splice(index,1);
+		},
+		getData(){
+			let _this = this;
+			App._post_form(
+				`&p=recruit&do=editResume&type=get`,
+				{},
+				res => {
+					if(!res.data) return
+					console.log(res,'提交结果');
+					_this.userInfo = res.data;
+					// 初始化数据处理
+					_this.educationList.map((item,index)=>{
+						if(item.id == _this.userInfo.education_label_id){
+							_this.educationIndex = index;
+						}
+					})
+					_this.experienceList.map((item,index)=>{
+						if(item.id == _this.userInfo.experience_label_id){
+							_this.experienceIndex = index;
+						}
+					})
+					_this.incumbencyList.map((item,index)=>{
+						if(item.id == _this.userInfo.work_status){
+							_this.incumbencyIndex = index;
+						}
+					})
+					_this.workTypeList.map((item,index)=>{
+						if(item.id == _this.userInfo.job_type){
+							_this.workTypeIndex = index;
+						}
+					})
+					_this.genderIndex = Number(_this.userInfo.gender) - 2;
+					_this.educational_experienceList = _this.userInfo.educational_experience;
+					_this.work_experienceList = _this.userInfo.work_experience;
+					_this.userInfo.provinceid = _this.userInfo.expect_work_province;
+					_this.userInfo.areaid = _this.userInfo.expect_work_city;
+					_this.userInfo.distid = _this.userInfo.expect_work_area;
+					_this.businessList = _this.userInfo.show_expect_position;
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userInfo.provinceid){
+							_this.provinceidName = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userInfo.areaid){
+									_this.areaidName = items.name;
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userInfo.distid){
+											_this.distidName = itemss.name;
+										}
+									})
+								}
+							})
+						}
+					})
+					// _this.expect_position 后台处理成对象形式携带名字
+					_this.loadlogo = !_this.loadlogo;
+					_this.loadlogo = !_this.loadlogo;
+				},
+				false,
+				() => {
+				}
+			);
+		},
+		redact(item,index){
+			// this.work_experience = item;
+			let objString = JSON.stringify(item);
+			this.work_experience = JSON.parse(objString);
+			this.redactIndex = index;
+			this.addWorkShow = true;
+		},
+		redactteach(item,index){
+			let objString = JSON.stringify(item);
+			this.educational_experience = JSON.parse(objString);
+			this.redactIndex = index;
+			this.addteachShow = true;
+		},
+		deleteteach(index){
+			App.showError(
+				`确定要删除该教育经历?`,
+				data => {
+					if (data.confirm) {
+						this.educational_experienceList.map((item,indexs)=>{
+							if(index == indexs){
+								this.educational_experienceList.splice(index,1)
+							}
+						})
+						return
+					}
+				},
+				true
+			);
+		},
+		deleteWork(index){
+			App.showError(
+				`确定要删除该项目经历?`,
+				data => {
+					if (data.confirm) {
+						this.work_experienceList.map((item,indexs)=>{
+							if(index == indexs){
+								this.work_experienceList.splice(index,1)
+							}
+						})
+						return
+					}
+				},
+				true
+			);
+		},
+		addTeach_experience(){
+			for(let key in this.educational_experience){
+				if(!this.educational_experience[key]){
+					if(key != 'major'){
+						uni.showToast({
+							icon:'none',
+							title:'请完善教育经历'
+						});
+						return
+					}
+				}
+			}
+			if(this.redactIndex != null){
+				this.educational_experienceList.splice(this.redactIndex,1,this.educational_experience);
+				this.redactIndex = null;
+			}else{
+				this.educational_experienceList.push(this.educational_experience);
+			}
+			this.addteachShow = false;
+			this.educational_experience ={
+				school:'',
+				major:'',
+				start_time:'',
+				end_time:'',
+			};
+			this.work_experience ={
+				title:'',
+				corporate_name:'',
+				start_time:'',
+				end_time:'',
+				content:''
+			};
+		},
+		addwork_experience(){
+			for(let key in this.work_experience){
+				if(!this.work_experience[key]){
+					uni.showToast({
+						icon:'none',
+						title:'请完善项目经历'
+					});
+					return
+				}
+			}
+			if(this.redactIndex != null){
+				this.work_experienceList.splice(this.redactIndex,1,this.work_experience);
+				this.redactIndex = null;
+			}else{
+				this.work_experienceList.push(this.work_experience);
+			}
+			this.addWorkShow = false;
+			this.work_experience ={
+				title:'',
+				corporate_name:'',
+				start_time:'',
+				end_time:'',
+				content:''
+			};
+			this.educational_experience ={
+				school:'',
+				major:'',
+				start_time:'',
+				end_time:'',
+			};
+		},
+		onConfirmage(e){
+			this.userInfo.birth_time = e.result;
+		},
+		onConfirmendTime(e){
+			this.educational_experience.end_time = e.result;
+			this.work_experience.end_time = e.result;
+		},
+		onConfirmstartTime(e){
+			console.log(e, '111111111111111111')
+			this.educational_experience.start_time = e.result;
+			this.work_experience.start_time = e.result;
+		},
+		closeaddteach(){
+			this.addteachShow = false;
+			setTimeout(()=>{
+				this.educational_experience ={
+					school:'',
+					major:'',
+					start_time:'',
+					end_time:'',
+				};
+			},500)
+		},
+		closeadd(){
+			this.addWorkShow = false;
+			setTimeout(()=>{
+				this.work_experience ={
+								title:'',
+								corporate_name:'',
+								start_time:'',
+								end_time:'',
+								content:''
+							};
+			},500)
+			
+		},
+		geteducationList(){
+			App._post_form(
+				`&p=recruit&do=getLabel&type=1`,
+				{},
+				res => {
+					this.educationList = res.data;
+					App._post_form(
+						`&p=recruit&do=getLabel&type=3`,
+						{},
+						res => {
+							this.experienceList = res.data;
+							this.getData();
+						},
+						false,
+						() => {
+						}
+					);
+				},
+				false,
+				() => {
+				}
+			);
+			
+		},
+		// 时间转时间戳
+		getDataTime(timeValue) {
+			let ontime;
+			ontime = timeValue.replace(/-/g, '/');
+			let date = new Date(ontime);
+			let time = date.getTime() / 1000;
+			return time;
+		},
+		submit(){
+			let _this = this;
+			let data = JSON.parse(JSON.stringify(_this.userInfo));
+			
+			console.log(data,'------------')
+			
+			data.work_experience = JSON.parse(JSON.stringify(_this.work_experienceList));
+			data.educational_experience = JSON.parse(JSON.stringify(_this.educational_experienceList));
+			data.expect_work_province = _this.userInfo.provinceid || data.expect_work_province;
+			data.expect_work_city = _this.userInfo.areaid || data.expect_work_city;
+			data.expect_work_area = _this.userInfo.distid || data.expect_work_area;
+			if(!data.gender){
+				data.gender = _this.genderIndex + 2;
+			}
+			if(!data.education_label_id){
+				data.education_label_id = _this.educationList[0].id;
+			}
+			if(!data.work_status){
+				data.work_status = this.incumbencyList[0].id;
+			}
+			if(!data.experience_label_id){
+				data.experience_label_id = this.experienceList[0].id;
+			}
+			if(!data.job_type){
+				data.job_type = this.workTypeList[0].id;
+			}
+			delete data.provinceid;
+			delete data.areaid;
+			delete data.distid;
+			delete data.logo;
+			delete data.show_avatar;
+			delete data.industry_id;
+			delete data.industry_pid;
+			delete data.show_expect_position;
+			console.log(data);
+			 for(let key  in data){
+			        if(!data[key] && data[key] !== 0){
+							uni.showToast({
+								icon:'none',
+								title:'请完善资料'
+							});
+							return
+							
+					}else if(Array.isArray(data[key])){
+						if(data[key].length == 0 && key != 'educational_experience' && key != 'work_experience'){
+							uni.showToast({
+								icon:'none',
+								title:'请完善资料'
+							});
+							return
+						}
+					}
+			  }
+			  data.work_experience.map(item=>{
+			  	item.start_time = item.start_time ? this.getDataTime(item.start_time):'';
+			  	item.end_time = item.end_time ? this.getDataTime(item.end_time):'';
+			  })
+			  data.educational_experience.map(item=>{
+			  	item.start_time = item.start_time ? this.getDataTime(item.start_time):'';
+			  	item.end_time = item.end_time ? this.getDataTime(item.end_time):'';
+			  })
+			  data.birth_time = this.getDataTime(data.birth_time);
+			  let datas = {};
+			  datas.data = JSON.stringify(data);
+			App._post_form(
+				`d&p=recruit&do=editResume&type=post`,
+				datas,
+				res => {
+					console.log(res,'提交结果');
+					uni.showToast({
+						title:res.message
+					});
+					setTimeout(()=>{
+						uni.navigateBack({
+							delta: 1
+						});
+					},1000)
+					
+				},
+				false,
+				() => {
+				}
+			);
+		},
+		workTypeChange(e){
+			this.workTypeIndex = e.detail.value;
+			this.userInfo.job_type = this.workTypeList[this.workTypeIndex].id;
+		},
+		experienceChange(e){
+			this.experienceIndex = e.detail.value;
+			this.userInfo.experience_label_id = this.experienceList[this.experienceIndex].id;
+		},
+		incumbencyChange(e){
+			this.incumbencyIndex = e.detail.value;
+			this.userInfo.work_status = this.incumbencyList[this.incumbencyIndex].id;
+		},
+		educationChange(e){
+			// debugger
+			this.educationIndex = e.detail.value;
+			this.userInfo.education_label_id = this.educationList[this.educationIndex].id;
+			// this.educationIndex = e.detail.value;
+			// this.userInfo.education = this.educationIndex + 1;
+		},
+		genderChange(e){
+			this.genderIndex = e.detail.value;
+			this.userInfo.gender = Number(this.genderIndex) + 2;
+		},
+		bindPickerChange(e){
+			this.pickerindex = e.detail.value;
+			this.userInfo.meralid = this.pickerarray[this.pickerindex].id;
+		},
+		clickclassTwo(item){
+			if(this.businessList.length == 3 && !item.checked){
+				uni.showToast({
+					icon:'none',
+					title:'最多选择三个职位'
+				});
+				return
+			}
+			if(item.checked){
+				this.businessList.map((items,index)=>{
+					if(items.id == item.id){
+						this.businessList.splice(index,1)
+					}
+				});
+				this.industrysublevel.map(items=>{
+					items.checked = false;
+					this.businessList.map(it=>{
+						if(it.id == items.id){
+							items.checked = true;
+						}
+					})
+				});
+			}else{
+				this.businessList.push(item);
+				this.industrysublevel.map(items=>{
+					items.checked = false;
+					if(item.id == items.id){
+						items.checked = !item.checked;
+					};
+					this.businessList.map(it=>{
+						if(it.id == items.id){
+							items.checked = true;
+						}
+					})
+				});
+			}
+			if(this.businessList.length == 1){
+				this.userInfo.expect_position = [this.businessList[0].id];
+			}else if(this.businessList.length == 2){
+				this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id];
+			}else{
+				this.userInfo.expect_position = [this.businessList[0].id,this.businessList[1].id,this.businessList[2].id];
+			}
+
+
+		this.loadlogo = false;
+		this.loadlogo = true;
+			console.log(item)
+		},
+		clickclass(item){
+			// console.log(item);
+
+			this.industrysubdivide.map(items=>{
+				items.checked = false;
+				if(item.id == items.id){
+					items.checked = true;
+				}
+			});
+			App._post_form(
+				`&p=recruit&do=industryList&type=3&pid=${item.id}`,
+				{},
+				res => {
+					this.industrysublevel = res.data;
+					this.industrysublevel.map(item=>{
+						item.checked = false;
+						this.businessList.map(items=>{
+							if(items.id == item.id){
+								item.checked = true;
+							}
+						})
+					})
+
+					this.loadlogo = false;
+					this.loadlogo = true;
+				},
+				false,
+				() => {
+				}
+			);
+			// this.industryAll.map((items,indexs)=>{
+			// 	items.twotype.map((itemss,indexss)=>{
+			// 		itemss.checked = false;
+			// 		if(item.id == itemss.id){
+			// 			itemss.checked = true;
+			// 			this.industryclass = item.name
+			// 		}
+			// 	})
+			// })
+
+			this.loadlogo = false;
+			this.loadlogo = true;
+		},
+		clickindustry(item){
+			this.industry.map(items=>{
+				items.checked = false;
+				if(item.id == items.id){
+					items.checked = true;
+				}
+			})
+			App._post_form(
+				`&p=recruit&do=industryList&type=2&pid=${item.id}`,
+				{},
+				res => {
+					this.industrysubdivide = res.data;
+					this.industrysubdivide.map(item=>{
+						item.checked = false;
+					})
+
+					this.loadlogo = false;
+					this.loadlogo = true;
+				},
+				false,
+				() => {
+				}
+			);
+			// console.log(item);
+
+		},
+		getenter(id){
+			let _this = this;
+			_this.owenscitylist.map((item,index)=>{
+				item.area.map(items=>{
+					items.dist.map(itemss=>{
+						if(itemss.id == _this.agencyData.areaid){
+							_this.userInfo.provinceid = item.id;
+							_this.userInfo.areaid = items.id;
+							_this.userInfo.distid = itemss.id;
+							_this.provinceidName = item.name;
+							_this.areaidName = items.name;
+							_this.distidName = itemss.name;
+						}
+					})
+				})
+			});
+			if(!_this.provinceidName){
+				_this.provinceidName = _this.languageStatus != 1?'请选择工作地区':'업무 지역을 선택하세요'
+			};
+		},
+		lookimg(type,url,index){
+			if(type == 1){
+				let img = [];
+				img.push(url);
+				uni.previewImage({
+					urls:img,
+					current:0
+				})
+			}else{
+				uni.previewImage({
+					urls:url,
+					current:index
+				})
+			}
+
+		},
+		closePreview(type, url) {
+			let _this = this;
+			for (let i = 0; i < _this.userInfo.thumbs.length; i++) {
+				if (url == _this.userInfo.thumbs[i]) {
+					_this.userInfo.thumbs.splice(i, 1);
+					// _this.userInfo.thumbs.splice(i, 1);
+				}
+			}
+		},
+		closeLogo(){
+			this.userInfo.logo = '';
+			this.userInfo.avatar = '';
+		},
+		uplodephone(length,localIds){
+		let _this = this;
+				wxApi.uoloadIg(localIds[length], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+										let num = length + 1;
+										// uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+										// setTimeout(()=>{
+										// 	_this.uplodephone(_this.uploadlength,_this.localIds);
+										// },100)
+										// uni.showToast({
+										// 	title:'chengg',
+										// 	icon:'none'
+										// })
+										_this.userInfo.thumbs.push(res.data.img);
+										if(num < _this.uploadlength){
+											uni.setTimeout(_this.uplodephone(num,_this.localIds),500);
+										}
+										// _this.userInfo.thumbs.push(res.data.image);
+
+
+								}
+							},
+							false,
+							() => {
+
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+
+		},
+		// 文件上传接口
+		async uploadFiles(type, num) {
+			let _this = this;
+			_this.upimg = true;
+			// _this.uoloadIgs(i, 0, res, type);
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(num);
+			    for (let i = 0; i < res.tempFilePaths.length; i++) {
+			    	let aa = await App._upLoad(res.tempFilePaths[i]);
+			    	if (type == 1) {
+			    		_this.userInfo.avatar = aa.data.img;
+			    		_this.userInfo.logo = aa.data.image;
+			    	}
+			    	if (type == 2) {
+			    		_this.userInfo.thumbs.push(aa.data.img);
+			    		// _this.userInfo.thumbs.push(aa.data.image);
+			    		console.log(_this.userInfo,aa.data.img);
+			    	}
+			    }
+				return
+			}
+			if(type == 2){
+				wxApi.choseImage(res => {
+					// let length
+					_this.localIds = res.localIds;
+					_this.uploadlength = res.localIds.length;
+					_this.uplodephone(0,_this.localIds);
+				},6);
+			}else{
+				wxApi.choseImage(res => {
+					let length = res.localIds.length;
+					res.localIds.map(item=>{
+
+							wxApi.uoloadIg(item, data => {
+								if (data.errMsg === 'uploadImage:ok') {
+									uni.showLoading({});
+									let requestData = {
+										upload_type: 2,
+										id: data.serverId
+									};
+									App._post_form(
+										'&do=uploadFiles',
+										requestData,
+										res => {
+											if (res.errno === 0) {
+												if (type == 1) {
+													_this.userInfo.avatar = res.data.img;
+													_this.userInfo.logo = res.data.image;
+												}
+												if (type == 2) {
+													_this.userInfo.thumbs.push(res.data.img);
+													// _this.userInfo.thumbs.push(res.data.image);
+
+												}
+												_this.loadlogo = !_this.loadlogo;
+												_this.loadlogo = !_this.loadlogo;
+											}
+										},
+										false,
+										() => {
+											uni.hideLoading();
+										}
+									);
+								} else {
+									uni.hideLoading();
+									App.showError('上传失败');
+								}
+							});
+
+
+					})
+
+
+				});
+			}
+
+			// #endif
+			// #ifndef H5
+			if(type == 1){
+				wx.chooseImage({
+					count: 1,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						// console.log(_this.userInfo.havestore, _this.page, '-------');
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.userInfo.avatar = aa.data.img;
+								_this.userInfo.logo = aa.data.image;
+							}
+							if (type == 2) {
+								_this.userInfo.thumbs.push(aa.data.img);
+								// _this.userInfo.thumbs.push(aa.data.image);
+								console.log(_this.userInfo,aa.data.img);
+							}
+						}
+						_this.loadlogo = !_this.loadlogo;
+						_this.loadlogo = !_this.loadlogo;
+					}
+				});
+			}else{
+				wx.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						// console.log(_this.userInfo.havestore, _this.page, '-------');
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.userInfo.avatar = aa.data.img;
+								_this.userInfo.logo = aa.data.image;
+							}
+							if (type == 2) {
+								_this.userInfo.thumbs.push(aa.data.img);
+								// _this.userInfo.thumbs.push(aa.data.image);
+								console.log(_this.userInfo,aa.data.img);
+							}
+						}
+					}
+				});
+			}
+
+			// #endif
+		},
+		showThePic(){
+			App._post_form(
+				`&p=recruit&do=industryList&type=1`,
+				{},
+				res => {
+					this.industry = res.data;
+					this.industry.map(item=>{
+						item.checked = false;
+					})
+					this.industrysubdivide = [];
+					this.industrysublevel = [];
+					this.hangYe = !this.hangYe;
+					this.hangyeshow = !this.hangyeshow;
+				},
+				false,
+				() => {
+				}
+			);
+
+
+		},
+		closeShareBottom(){
+			this.hangyeshow = !this.hangyeshow;
+			this.hangYe = !this.hangYe;
+		},
+		onCancel(){
+
+		},
+		cancel(){
+			this.hangyeshow = false;
+		},
+		confirm(){
+			this.hangyeshow = false;
+		},
+		getcityclass(){
+			return
+			let _this = this;
+			let data = {
+				provinceid:this.userInfo.provinceid,
+				areaid:this.userInfo.areaid,
+				distid:this.userInfo.distid
+			}
+			App._post_form(
+				`&p=yellowpage&do=area2cate`,
+				data,
+				res => {
+
+					console.log(res,'更换地区结果');
+					_this.industry = res.data.parents;
+					for(let key  in _this.industry){
+							_this.industry[key].checked = false;
+					  };
+					  console.log(_this.industry,'测试自动');
+					_this.industryAll = res.data.childrens;
+					for(let key  in _this.industryAll){
+							_this.industryAll[key].map(item=>{
+								item.checked = false;
+								if(item.id == _this.userInfo.two_class){
+									_this.industrysubdivide = [];
+									_this.loadlogo = false;
+									_this.loadlogo = true;
+								}
+							})
+							console.log(_this.industryAll,'还地区')
+					  };
+					  _this.userInfo.one_class = '';
+					  _this.userInfo.two_class = '';
+					   _this.industryclass = '';
+					  if(Array.isArray(res.data.childrens) || Array.isArray(res.data.parents)){
+						  _this.industrysubdivide = res.data.childrens;
+						  _this.industryclass = '当前地区暂无行业分类';
+
+						  if(_this.oldDistid !== _this.userInfo.distid){
+						  	uni.showToast({
+						  		title:'当前地区暂无行业分类',
+						  									icon:'none'
+						  	});
+						  }
+					  }else{
+						  console.log(_this.oldDistid,_this.userInfo.distid,777777)
+						  if(_this.oldDistid !== _this.userInfo.distid){
+							  uni.showToast({
+							  	title:'更换地区请重新选择当前地区行业',
+							  	icon:'none'
+							  });
+						  }
+					  }
+					  _this.loadlogo = false;
+					  _this.loadlogo = true;
+					// App.navigationTo({
+					// 	url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid
+					// });
+				},
+				false,
+				() => {
+				}
+			);
+		},
+		onConfirm(e){
+			console.log(e);
+			let _this = this;
+			this.provinceidName = e.obj.province.label;
+			this.areaidName = e.obj.city.label;
+			this.distidName = e.obj.area.label;
+			this.oldDistid = this.userInfo.distid;
+			this.userInfo.provinceid = e.value[0];
+			this.userInfo.areaid = e.value[1];
+			this.userInfo.distid = e.value[2];
+			this.getcityclass();
+		},
+		visble(){
+			this.visiblec = true;
+		},
+		getLocation() {
+			let _this = this;
+			// #ifdef MP-WEIXIN
+			uni.chooseLocation({
+				keyword: '',
+				success: function(e) {
+					// _this.userInfo.address = e.address;
+					_this.lblis.lat = e.latitude;
+					_this.lblis.lng = e.longitude;
+					_this.lblis.address = e.address
+					// console.log(e);
+					// _this.onkoc = 0;
+					_this.getloctions(_this.lblis)
+				}
+			});
+			// #endif
+			// #ifdef H5
+			_this.isOpenLaction = true;
+			// #endif
+			//#ifdef APP-PLUS
+			      App.navigationTo({
+			       url: 'pages/subPages2/map/index'
+			      });
+			      //#endif
+		},
+		getloctions(lblis){
+
+			let _this = this;
+			// console.log(_this.owenscitylist);
+			App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+				// _this.userInfo.address = lblis.address;
+				console.log(_this.userInfo.distid,res.data.countyid,'666666');
+				_this.oldDistid = _this.userInfo.distid;
+				_this.userInfo.provinceid = res.data.provinceid;
+				_this.userInfo.distid = res.data.countyid;
+				_this.userInfo.areaid = res.data.cityid;
+				_this.owenscitylist.map((item,index)=>{
+					if(item.id == _this.userInfo.provinceid){
+						_this.provinceidName = item.name;
+						item.area.map(items=>{
+							if(items.id == _this.userInfo.areaid){
+								_this.areaidName = items.name;
+								items.dist.map(itemss=>{
+									if(itemss.id == _this.userInfo.distid){
+										_this.distidName = itemss.name;
+										this.getcityclass();
+									}
+								})
+							}
+						})
+					}
+				})
+			});
+		},
+	}
+}
+</script>
+
+<style>
+page {
+	background-color: #f7f7f7;
+}
+</style>
+<style lang="scss" scoped>
+.enterForm {
+	padding: 100upx 0 0;
+	.bgimgbox {
+		.bgimg {
+			width: 100vw;
+			height: 25vh;
+		}
+	}
+	.formbox {
+		padding: 30upx;
+		padding-bottom: 130upx;
+		// height: 50vh;
+		position: relative;
+		.formdatabox {
+			padding: 30upx;
+			width: 84vw;
+			background-color: #ffffff;
+			border-radius: 15upx;
+			position: relative;
+			top: -100upx;
+			.sign {
+				height: 28upx;
+				margin-top: 5upx;
+				width: 8upx;
+				background-color: #ff4444;
+				border-radius: 30%;
+				flex: 0.014;
+			}
+		}
+		.logobox {
+			span {
+				font-size: 24upx;
+			}
+			.userImgUpdataon {
+				width: 180upx;
+				margin: 20upx 0;
+				height: 180upx;
+				border-radius: 10upx;
+				border: 1upx solid #cccccc;
+				position: relative;
+				overflow: hidden;
+				.imgs {
+					width: 180upx;
+					height: 180upx;
+				}
+				.close {
+					position: absolute;
+					width: 30upx;
+					height: 30upx;
+					right: 10upx;
+					top: 10upx;
+				}
+			}
+			.userImgUpdata {
+				width: 180upx;
+				margin: 20upx 0;
+				height: 180upx;
+				border-radius: 10upx;
+				border: 1upx solid #cccccc;
+				position: relative;
+				.img {
+					width: 80upx;
+					height: 80upx;
+					position: absolute;
+					left: 50%;
+					top: 30%;
+					transform: translate(-50%);
+				}
+			}
+		}
+		.formtitle {
+			padding: 25upx 10upx;
+			background-color: #fafafa;
+			margin-top: 20upx;
+			border-radius: 10upx;
+		}
+	}
+	.iframe-wid-hgt {
+		width: 100vw;
+	}
+	.hangye {
+		height: 40vh;
+		width: 100vw;
+		box-sizing: border-box;
+		padding: 30upx;
+		background-color: #ffffff;
+		border-radius: 15upx 15upx 0 0;
+		.industryclass-item {
+			padding: 20upx;
+			margin: 15upx;
+			text-align: center;
+			border-radius: 15upx;
+		}
+		.classcheck {
+			background-color: #f7f7f7;
+		}
+		.isclasschecked {
+			background-color: #ff4444;
+			color: #ffffff;
+		}
+	}
+	.timePickerView {
+		width: 100%;
+	}
+}
+.after-work {
+	width: 80vw;
+	height: 70vh;
+	background-color: #f8f8f8;
+	padding: 30upx;
+	overflow: auto;
+	border-radius: 20upx;
+	.after-work-title {
+		font-size: 28upx;
+		
+	}
+	.after-item {
+		margin-bottom: 30upx;
+		border-radius: 20upx;
+		padding: 30upx;
+		background-color: #ffffff;
+		.after-item-item {
+			padding-bottom: 20upx;
+		}
+	}
+	.work-btn {
+		position: fixed;
+		bottom:70upx;
+		left: 50%;
+		transform: translate(-50%);
+		display: inline-block;
+		// margin-left: 32%;
+		padding: 15upx 80upx;
+		background-color: #ff4444;
+		color: #ffffff;
+		border-radius: 8upx;
+	}
+	.add-work {
+		width: 80vw;
+		padding: 30upx;
+		// height: 50vh;
+		background-color: #ffffff;
+		border-radius: 15upx;
+		position: relative;
+		.redbtn {
+			width: 50%;
+			padding: 10upx;
+			background-color: #ff4444;
+			color: #ffffff;
+			border-radius: 10upx;
+			position: absolute;
+			bottom: 10%;
+			left: 50%;
+			transform: translate(-50%);
+			z-index: 9;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/hirePlatform/companiesList/companiesList.vue b/pages/subPages2/hirePlatform/companiesList/companiesList.vue
new file mode 100644
index 0000000..d0f75cb
--- /dev/null
+++ b/pages/subPages2/hirePlatform/companiesList/companiesList.vue
@@ -0,0 +1,328 @@
+<template>
+	<view style="padding-bottom: 100upx;">
+		<loadlogo v-if="!loadlogo" />
+		<far-bottom></far-bottom>
+		<view v-if="loadlogo">
+			<view class="dis-flex companiesList">
+				<view  style="flex: 0.8;">
+					<filtertab :pageName="'企业'" :requestType="'8'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid" @getmore="getmore" @getResumeList="getResumeList"
+					 @selectClassTwoid="selectClassTwoid" @getcityWork="getcityWork" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+				</view>
+				<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+					<text>更多</text>
+					<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+				</view>
+			</view>
+			<view class="enterpriseList" v-if="inviteList.length > 0">
+				<view class="enterprise-item " v-for="(item,index) in inviteList" :key="index" @click="toCompanyDetails(item)">
+					<view class="enterprise-border dis-flex">
+						<view class="item-img"><image :src="item.logo" mode=""></image></view>
+						<view class="item-content">
+							<view class="content-title">
+								{{item.storename}}
+								<view class="dis-il-block title-tag" v-if="item.is_authentication == 1">已认证</view>
+								<view class="f-24 col-9" style="float: right;font-weight: 500;">
+									{{item.distances_text}}
+								</view>
+							</view>
+							<view class="content-label">{{item.nature}} · {{item.scale}} · {{item.industry}}</view>
+							<view class="content-num">
+								{{item.area}} · 在招
+								<text style="color: #3388FF;">{{ item.release_recruit }}</text>
+								个
+							</view>
+						</view>
+					</view>
+				</view>
+				<load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+			</view>
+			<nonemores v-if="inviteList.length == 0 && isMore"></nonemores>
+		</view>
+		 <screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+		
+		<!-- 城市 -->
+		<TabBars :tabBarAct="0" pageType="15"></TabBars>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import wPicker from '@/components/w-picker/w-picker.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import filtertab from '@/components/template/filtertab.vue';
+import screening from '@/components/template/screening.vue';
+import TabBars from '@/components/template/tabBar.vue';
+import nonemores from '@/components/template/nonemores.vue'
+export default {
+	data() {
+		return {
+			cate_one:'',
+			cate_two:'',
+			title:'',
+			check:false,
+			resumeID:['','',''],
+			inviteList:[],
+			moreData:{},
+			page:1,
+			page_index:10,
+			loadlogo:true,
+			num:0,
+			Areaid:'',
+			ordersId:'',
+			datas:{},
+			isMore:true,
+			total:1,
+			enterpriseList:[],
+			AreaidAt:''
+		};
+	},
+	components: {
+		wPicker,
+		loadMore,
+		Loadlogo,
+		filtertab,
+		screening,
+		TabBars,
+		nonemores
+	},
+	onLoad(e) {
+		this.locationArray = uni.getStorageSync('agencyData');
+		this.isMore = false;
+		console.log(this.locationArray,'定位定位')
+		// debugger
+		// this.getCompaniesList()
+	},
+	onShow() {
+		if(this.num != 0){
+			// debugger
+			this.confirm();
+		}
+	},
+	onReachBottom() {
+		if(this.total < this.page) return
+		this.isMore = false;
+		this.page++;
+		this.confirm(false,true)
+	},
+	methods: {
+		getcityWork(id){
+			
+			// debugger
+			this.AreaidAt = id;
+			if(this.num != 0){
+				
+				
+				this.confirm();
+			}
+			
+		},
+		toCompanyDetails(item){
+			App.navigationTo({
+				url: "pages/subPages2/hirePlatform/companyDetails/companyDetails?id=" + item.id
+			});
+		},
+		confirm(datas,flag){
+			// debugger
+			if(datas != false){
+				this.page = 1;
+			}
+			if(datas){
+				this.datas = datas;
+			}
+			let indata = {
+				recruit_industry_id:this.resumeID[0],
+				sort:this.ordersId,
+				lat:this.locationArray.lat,
+				lng:this.locationArray.lng,
+				area_id:this.AreaidAt,
+				is_total:1,
+				page:this.page,
+				page_index:this.page_index
+			}
+			let data = Object.assign(indata ,this.datas);
+			App._post_form(
+				`&p=recruit&do=enterpriseList`,
+				data,
+				res => {
+					if(flag){
+						this.inviteList = this.inviteList.concat(res.data.list);
+					}else{
+						this.inviteList = res.data.list;
+					}
+					this.inviteList.map(item=>{
+						item.open = false;
+					});
+					this.total = res.data.total;
+					this.check = false;
+					this.isMore = true;
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		checkeda(index,key){
+			console.log(index,key);
+			this.moreData[key].map(item=>{
+				item.checked = false
+			});
+			this.moreData[key][index].checked = true;
+			let obj = Object.assign({},this.moreData);
+			console.log(obj);
+			this.moreData = {...obj}
+			this.loadlogo = !this.loadlogo;
+			this.loadlogo = !this.loadlogo;
+		},
+		getmore(data){
+			data.top.map((item,index)=>{
+				if(index > 2){
+					this.moreData[item.subscript] = data[item.subscript];
+				}
+			});
+			this.moreData.top = data.top;
+			for(let key in this.moreData){
+					this.moreData[key].map((item,index)=>{
+							item.checked = false;
+					})
+			}
+		},
+		getResumeList(ids){
+			this.resumeID = ids;
+			this.num = 1;
+			if(this.num != 0){
+				this.confirm();
+				console.log('职位');
+			}
+			
+			// App._post_form(
+			// 	`&p=recruit&do=resumeList`,
+			// 	{},
+			// 	res => {
+			// 		this.inviteList = res.data;
+			// 		this.inviteList.map(item=>{
+			// 			item.open = false;
+			// 		})
+			// 	},
+			// 	false,
+			// 	() => {
+					
+			// 	}
+			// );
+		},
+		close(flag){
+			console.log(this.moreData);
+			if(!flag){
+				for(let key in this.moreData){
+						this.moreData[key].map((item,index)=>{
+								item.checked = false;
+						})
+				}
+			}else{
+				this.check = !this.check;
+			}
+		},
+		openclass(){
+			
+			this.check = !this.check;
+		},
+		clickcheck(){
+			this.check = !this.check;
+		},
+		selectOrders(data){
+			
+			this.ordersId = data.val;
+			if(this.num != 0){
+				// debugger
+				this.confirm();
+				console.log('排序');
+			}
+			console.log(data)
+			
+		},
+		selectAreaid(data){
+			this.num = 1;
+			console.log('地区');
+			this.Areaid = data.id;
+			// debugger
+			this.confirm();
+			console.log(data)
+		},
+		selectClassid(data){
+			console.log(data)
+		},
+		selectClassTwoid(data){
+			console.log(data)
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.companiesList {
+	padding: 10upx 0upx;
+	.tab-item {
+		font-size: 28upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		.fonts {
+			padding-left: 10upx;
+			font-size: 26upx;
+			color: #333333;
+		}
+	}
+}
+.enterpriseList {
+	// padding-bottom: 100upx;
+	.enterprise-item {
+		padding: 0upx 30upx;
+		.item-img {
+			flex: 0.2;
+			image {
+				width: 100upx;
+				height: 100upx;
+				border-radius: 10upx;
+			}
+		}
+		.item-content {
+			padding-left: 30upx;
+			flex: 0.8;
+			.content-title {
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				.title-tag {
+					font-size: 22upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #ffffff;
+					padding: 3upx 7upx;
+					background: #3388ff;
+					border-radius: 4upx;
+					margin-left: 20upx;
+				}
+			}
+			.content-label {
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				padding: 30upx 0;
+			}
+			.content-num {
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+		.enterprise-border{
+			padding: 40upx 0;
+			border-top: 1upx solid #EEEEEE;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue b/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue
new file mode 100644
index 0000000..427038a
--- /dev/null
+++ b/pages/subPages2/hirePlatform/companyDetails/companyDetails.vue
@@ -0,0 +1,472 @@
+<template>
+	<view class="companyDetails">
+		<loadlogo v-if="!loadlogo" />
+		<far-bottom></far-bottom>
+		<view class="content">
+			<!-- 头部 -->
+			<view class="content-title dis-flex">
+				<view class="left">
+					<view class=" dis-flex">
+						<view class="name">
+							{{detailsData.storename}}
+						</view>
+						<view class="tag" v-if="detailsData.is_authentication == 1">
+							已认证
+						</view>
+					</view>
+					<view class="tabs">
+						<text class="tabs-item">{{detailsData.nature}}</text>
+						<text class="tabs-item-l">·</text>
+						<text class="tabs-item">{{detailsData.scale}}</text>
+						<text class="tabs-item-l">·</text>
+						<text class="tabs-item">{{detailsData.industry}}</text>
+					</view>
+				</view>
+				<view class="right">
+					<view class="right-img">
+						<image :src="detailsData.logo" mode=""></image>
+					</view>
+				</view>
+			</view>
+			<!-- 切换 -->
+			<view class="content-tabs dis-flex">
+				<view  style="flex:0.5;">
+					<v-tabs
+					:lineScale="0.3" 
+					:lineRadius="'4px 4px 0px 0px'" 
+					:lineHeight="'6rpx'"
+					:height="'100rpx'"
+					:fontSize="'30rpx'" 
+					:paddingItem="'40rpx 22rpx 40rpx'" 
+					:activeColor="'#3388FF'" 
+					:lineColor="'#3388FF'"
+					v-model="sort" 
+					:scroll="false"
+					:bold="false"
+					:tabs="['简介','职位','动态']"></v-tabs>
+				</view>
+				<view class="b-f" style="flex:0.5;">
+					
+				</view>
+			</view>
+			<!-- 切换内容 -->
+			<view class="content-content" v-if="sort == 0">
+				<view :class="islook? 'content-brief-l b-f':'content-brief b-f'">
+					<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+			show-with-animation use-anchor  :html="detailsData.introduction"></jyf-parser>
+					<!-- {{detailsData.introduction || '暂无简介'}} -->
+				</view>
+				<view class="lookadd b-f" v-if="detailsData.introduction" @click="islook = !islook">
+					{{islook?'收起':'查看更多'}}
+				</view>
+				<view class="content-navigation">
+					<view class="n-title">
+						公司地址
+					</view>
+					<view class="dis-flex n-address">
+						<view class="n-content" style="flex: 0.85;">
+						{{detailsData.address}}
+						</view>
+						<view  style="flex: 0.15;">
+							<view class="address-btn" @click="openNavigation">
+								<text class="iconfont icon-daohang1" style="padding-right: 10upx;"></text>
+								<text>导航</text>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex container" style="padding:30upx;">
+					<view style="flex:0 0 30%;height:210upx;padding-bottom: 30upx;" v-for="(item,index) in detailsData.album">
+						<image style="width: 100%;height: 100%;border-radius: 15upx;" :src="item" mode="aspectFill" @click="lookimg(detailsData.album,index)"></image>
+					</view>
+					<nonemores v-if="detailsData.album.length == 0"></nonemores>
+				</view>
+			</view>
+			<view class="content-content" style="padding: 30upx;" v-if="sort == 1">
+				<view  v-if="companyList.length > 0">
+					<work-List :inviteList="companyList"></work-List>
+					<load-more :isMore="isMore1" :bgc="'#ffffff'"></load-more>
+				</view>
+				<nonemores v-if="companyList.length == 0"></nonemores>
+				
+			</view>
+			<view class="dis-flex flex-warp flex-x-between" style="padding:10px;" v-if="sort == 2">
+				<view v-for="(item,index) in trendsListData" :key="index" style="width: 48%;margin-bottom: 10px;box-shadow: 0px 0px 2px 2px rgba(0,0,0,0.03);">
+					<post-list-two :itemInfo="item" :indexNumber="index" :indexShow='indexShow' @operationShow="operationShow" @delet="" :isMe="false"></post-list-two>
+				</view>
+				<load-more :isMore="isMore2" :bgc="'#ffffff'" style="width: 100%;"></load-more>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadMore from '@/components/template/loadmore.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import workList from '@/components/template/workList.vue';
+	// #ifdef H5
+	import wxApi from "@/common/js/wxApi.js"
+	// #endif
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import nonemores from '@/components/template/nonemores.vue'
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	import postListTwo from '@/components/template/postListTwo.vue'
+	export default{
+		data(){
+			return{
+				sort:0,
+				islook:false,
+				pageId:'',
+				detailsData:{},
+				companyList:[],
+				loadlogo:false,
+				isMore1:false,
+				isMore2:false,
+				page:1,
+				pageIndex:10,
+				total:1,
+				indexShow: -1,
+				trendsListData: []
+			}
+		},
+		components:{
+			vTabs,
+			Loadlogo,
+			jyfParser,
+			loadMore,
+			workList,
+			nonemores,
+			postListTwo
+		},
+		onReachBottom() {
+			if(this.sort==1 && this.page == this.total) return
+			this.page++;
+			this.isMore1 = false;
+			this.isMore2 = false;
+			this.getCompanyList(true);
+			this.getTrendsListData(true);
+		},
+		onLoad(e) {
+			this.pageId = e.id;
+		},
+		onShow(){
+			this.page = 1;
+			this.getCompanyDetails();
+			this.getCompanyList();
+			this.getTrendsListData();
+		},
+		methods:{
+			lookimg(imgs,index){
+				wx.previewImage({
+					current: index,
+					urls: imgs
+				})
+			},
+			openNavigation(){
+				let detailsData = this.detailsData;
+				detailsData.location = {
+					lat:detailsData.lat,
+					lng:detailsData.lng
+				}
+				// #ifdef H5
+				console.log(detailsData);
+				wxApi.WxopenLocation(
+					detailsData['lat'],
+					detailsData['lng'],
+					detailsData['storename'],
+					detailsData['address']
+				)
+				// #endif
+				// #ifdef MP-WEIXIN
+				App.openLocation(detailsData)
+				// #endif
+				//#ifdef APP-PLUS
+				    Map.openMap(Number(detailsData['lat']),Number(detailsData['lng']),detailsData['storename'],'gcj02')
+				 //#endif
+			},
+			getCompanyList(flag){
+				let data = {
+					page:this.page,
+					page_index:this.pageIndex,
+					release_sid:this.pageId,
+					is_total:1
+				}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						console.log(res);
+						if(flag){
+							this.companyList = this.companyList.concat(res.data.list);
+						}else{
+							this.companyList = res.data.list;
+							this.total = res.data.total;
+						}
+					},
+					false,
+					() => {
+						this.isMore1 = true;
+					}
+				);
+			},
+			getCompanyDetails(){
+				
+					App._post_form(
+						`&p=recruit&do=enterpriseDesc&id=${this.pageId}`,
+						{},
+						res => {
+							console.log(res)
+							this.detailsData = res.data;
+						},
+						false,
+						() => {
+							this.loadlogo = true;
+						}
+					);
+				
+			},
+			operationShow(e) {
+				let _this = this;
+				_this.indexShow = e;
+			},
+			getTrendsListData(flag){
+				let data = {
+					page:this.page,
+					// page_index:this.pageIndex,
+					sid:this.pageId,
+					// is_total:1
+				}
+				App._post_form(
+					`&p=pocket&do=getStorePocketList`,
+					data,
+					res => {
+						console.log(res);
+						if(flag){
+							this.trendsListData = this.trendsListData.concat(res.data.list);
+						}else{
+							this.trendsListData = res.data.list;
+							this.total = res.data.total;
+						}
+					},
+					false,
+					() => {
+						this.isMore2 = true;
+					}
+				);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content-content{
+		padding-bottom: 100upx;
+	}
+	.content{
+		.content-title{
+			background-color: #FFFFFF;
+			padding: 50upx 30upx;
+			border-bottom: 20upx solid #F8F8F8;
+			.left{
+				flex: 0.85;
+				.name{
+					height: 60upx;
+					font-size: 48upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					width: 550upx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+				.tag{
+					font-size: 22upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					// height: 20upx;
+					margin: 10upx 20upx;
+					color: #FFFFFF;
+					padding: 4upx 7upx;
+					background-color: #3388FF;
+					border-radius: 4upx;
+				}
+				.tabs{
+					padding-top: 10upx;
+					.tabs-item{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+					}
+					.tabs-item-l{
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						margin: 0 10upx;
+					}
+				}
+			}
+			.right{
+				flex: 0.15;
+				.right-img{
+					image{
+						width: 110upx;
+						height: 110upx;
+						border-radius: 10px;
+					}
+				}
+			}
+		}
+		.content-tabs{
+			border-bottom: 1upx solid #eeeeee;
+		}
+		.content-content{
+			// background-color: #FFFFFF;
+			.content-brief{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 60upx;
+				padding: 30upx 30upx 0;
+				overflow: hidden;
+				display:-webkit-box;
+				-webkit-box-orient:vertical;
+				-webkit-line-clamp:8;
+			}
+			.content-brief-l{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 60upx;
+				padding: 30upx 30upx 0;
+			}
+			.lookadd{
+				font-size: 28upx;
+				padding: 0 30upx 30upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3388FF;
+				line-height: 48upx;
+			}
+			.content-navigation{
+				border-top: 20upx solid #F8F8F8;
+				padding: 50upx 30upx 20upx;
+				background-color: #FFFFFF;
+				.n-title{
+					font-size: 32upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+					line-height: 26upx;
+				}
+				.n-address{
+					padding-top: 30upx;
+					.n-content{
+						width: 500upx;
+						height: 75upx;
+						font-size: 28upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #333333;
+						line-height: 80upx;
+						padding-right: 30upx;
+					}
+					.address-btn{
+						margin-top: 8upx;
+						width: 141upx;
+						// height: 71upx;
+						border: 1upx solid #3388FF;
+						border-radius: 35upx;
+						padding: 5upx 22upx;
+						box-sizing: border-box;
+						text{
+							font-size: 24upx;
+							font-family: PingFang SC;
+							font-weight: 500;
+							color: #3388FF;
+							text-align: center;
+						}
+					}
+					
+				}
+			}
+			.card-name{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.card-tag{
+				// width: 30upx;
+				height: 30upx;
+				background: #F1C426;
+				border-radius: 4upx;
+				font-size: 22upx;
+				line-height: 30upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				text-align: center;
+				padding: 4upx 6upx;
+				margin: 5upx 0 0 20upx;
+			}
+			.card-pay{
+				flex: 1;
+				font-size: 32upx;
+				font-family: DINPro;
+				font-weight: 600;
+				color: #FF4444;
+				text-align: right;
+			}
+			.tab-item{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				background: #F4F4F4;
+				border-radius: 4px;
+				padding: 8upx 20upx;
+				display: inline-block;
+				margin-right: 10upx;
+			}
+			.advance-the-date{
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				text-align: right;
+			}
+			.bottom-border{
+				border-bottom: 1upx solid #EEEEEE;
+			}
+			// .container{
+			// 	display:flex;
+			// 	      display: -webkit-flex; /* Safari */
+			// 	      flex-wrap: wrap;
+			// 	      justify-content: space-between;
+			// }
+			// .container:after {
+			//                 content: ' ';
+			//                 flex: 0 0 30%;
+			//             }
+			
+		}
+		.container{
+		    display: flex;
+		    width: auto;
+		    justify-content: space-between;
+		    flex-wrap: wrap;
+		    overflow: scroll;
+		  }
+		  .container:after {
+		      content: "";
+		      flex: 0 0 30%;
+		   }
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/curriculumVitae/curriculumVitae.vue b/pages/subPages2/hirePlatform/curriculumVitae/curriculumVitae.vue
new file mode 100644
index 0000000..315c57a
--- /dev/null
+++ b/pages/subPages2/hirePlatform/curriculumVitae/curriculumVitae.vue
@@ -0,0 +1,757 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<far-bottom></far-bottom>
+		<view class="curriculumVitae" >
+			<view :style="{padding:!pageId?'20upx 0':'0',height:!pageId?'auto':'0',overflow: 'hidden'}" class="dis-flex">
+				<view  style="flex: 0.8;">
+					<!-- <filtertab :requestType="'7'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid" @getmore="getmore" @getResumeList="getResumeList"
+					 @selectClassTwoid="selectClassTwoid" @getcityWork="getcityWork" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab> -->
+				</view>
+				<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+					<text>更多</text>
+					<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+				</view>
+			</view>
+			<v-tabs
+			:lineScale="0.3" 
+			:lineRadius="'100rpx'" 
+			:lineHeight="'6rpx'" 
+			:fontSize="'28rpx'" 
+			:paddingItem="'20rpx'" 
+			:activeColor="'#FCDB36'" 
+			:lineColor="'#FCDB36'"
+			v-model="sort" 
+			:scroll="false"
+			field="name"
+			@change="vtabschange"
+			:tabs="tabBarSetList">
+			</v-tabs>
+			 <view class="curriculum-list" v-if="inviteList.length > 0">
+			 	<view class="curriculum-item" v-for="(item,index) in inviteList" :key="index" @click="lookResume(item)">
+			 		<view class="item-personal">
+			 			<view class="personal-img dis-il-block">
+			 				<image class="img" :src="item.avatar" mode=""></image>
+							<view class="gender" v-if="item.gender_text == '女'"><image style="width: 100%;height: 100%;vertical-align: top;" :src="imgfixUrls + 'inviteImg/nvxing.png'" mode=""></image></view>
+							<view class="gender" style="background-color: #007AFF;" v-else><image style="width: 100%;height: 100%;vertical-align: top;" :src="imgfixUrls + 'inviteImg/nanxing.png'" mode=""></image></view>
+			 			</view>
+						<view class="personal-data dis-il-block">
+							<view class="data-name">
+								{{item.name}}
+							</view>
+							<view class="data-item">
+								{{item.age}}岁 · {{item.experience}} · {{item.education}}
+							</view>
+						</view>
+						<view class="data-salary" v-if="!pageId || checked == 1">
+							{{item.salary}}
+						</view>
+						<view class="data-salary" v-else>
+							{{item.status == 0?'未查看':item.status == 1?'已查看':item.status == 2?'已邀请':'已完成'}}
+						</view>
+			 		</view>
+					<view class="item-tags dis-flex">
+						<view  style="flex: 0.1;">
+							
+						</view>
+						<view class="tags-box dis-flex" style="flex: 0.9;">
+							<view style="flex: 0.8;">
+								<view class="tags-item" v-for="(item,index) in item.expect_position_list" :key="index">
+									{{item}}
+								</view>
+							</view>
+							<view class="f-24 col-9" style="flex: 0.2;line-height: 58upx;">
+								{{item.region}}
+							</view>
+						</view>
+					</view>
+					<view class="dis-flex date-and-button" v-if="pageId && checked == 0">
+						<view class="date">
+							{{item.work_status_text || item.create_time_text}}
+						</view>
+						<view class="button t-r">
+							<view class="delete dis-il-block" @click.stop="deleteWork(item)">
+								删除
+							</view>
+							<view class="invitation dis-il-block" @click.stop="accomplish(item)" v-if="item.status == 2">
+								面试完成
+							</view>
+							<view class="invitation dis-il-block" @click.stop="interview(item)" v-else-if="item.status != 3">
+								邀请面试
+							</view>
+						</view>
+					</view>
+			 	</view>
+				<load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+			 </view>
+			 <nonemores v-if="inviteList.length == 0"></nonemores>
+			 
+			 <view  v-if="loadlogo">
+			 	 <screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+			 </view>
+			<TabBars :tabBarAct="0" pageType="15"></TabBars>
+			<PopManager :show="isShow" type="center" @clickmask="closes">
+				<view class="b-f invitePop">
+					<view class="invitePop-title f-w">
+						邀请面试
+						<text class="iconfont icon-close" style="float: right;vertical-align: top;font-size: 30upx;" @click="closes"></text>
+					</view>
+					<view class="f-26 dis-flex" style="padding: 30upx 0;" @click="visiblec = true">
+						<view class="flex-box">
+							面试时间
+						</view>
+						<view :class="time?'f-26':'f-26 col-9'">
+							{{time || '请选择面试时间	'}}
+						</view>
+					</view>
+					<view class="f-26 dis-flex" style="padding: 0upx 0 30upx;">
+						<view style="flex: 0.3;">
+							面试地点
+						</view>
+						<view style="flex: 0.7;">
+							<input v-if="isShow" type="text" class="t-r f-26" placeholder-style="color: #999999;" placeholder="请输入面试地址" v-model="site" />
+						</view>
+					</view>
+					<view class="f-26 dis-flex" style="padding: 0upx 0 30upx;">
+						<view style="flex: 0.3;">
+							面试职位
+						</view>
+						<view style="flex: 0.7;" @click="visible = true">
+							<view :class="selectorItem?'f-26 t-r':'f-26 col-9 t-r'">
+								{{selectorItem || '请选择面试职位'}}
+							</view>
+						</view>
+					</view>
+					<view class="abBox" @click="invitationLetter">
+						确定
+					</view>
+				</view>
+			</PopManager>
+			<w-picker
+				:visible.sync="visiblec"
+				mode="date"
+				startYear="1970"
+				endYear="2100"
+				:value="time"
+				fields="minute"
+				@confirm="onConfirmdete($event, 'region')"
+				ref="date"
+			></w-picker>
+			<w-picker
+			:visible.sync="visible"
+			mode="selector"
+			:value="selectorItem"
+			default-type="title"
+			:default-props="defaultProps"
+			:options="selectorList"
+			@confirm="onConfirm($event,'selector')"
+			ref="selector"></w-picker>
+		</view>
+	</view>
+	
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue';
+	import workList from '@/components/template/workList.vue';
+	import screening from '@/components/template/screening.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import PopManager from '@/components/template/PopManager';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import nonemores from '@/components/template/nonemores.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'',
+				cate_two:'',
+				title:'',
+				check:false,
+				isShow:false,
+				resumeID:['','',''],
+				inviteList:[],
+				moreData:{},
+				page:1,
+				page_index:10,
+				loadlogo:false,
+				num:0,
+				Areaid:'',
+				ordersId:'',
+				datas:{},
+				isMore:true,
+				total:1,
+				pageId:'',
+				job_type:null,
+				time:'',
+				visiblec:false,
+				visible:false,
+				site:'',
+				selectorItem:'',
+				selectorItemId:'',
+				defaultProps:{"label":"title","value":"id"},
+				selectorList:[],
+				recruitment_type:'',
+				userInfoId:'',
+				userId:'',
+				release_sid:'',
+				AreaidAt:'',
+				pagenum:false,
+				tabBarSetList:[
+					{name:'已投递简历',id:1},
+					{name:'推荐简历',id:2}
+				],
+				sort:'',
+				pid:'',
+				checked:0
+			}
+		},
+		components:{
+			filtertab,
+			workList,
+			screening,
+			loadMore,
+			Loadlogo,
+			TabBars,
+			PopManager,
+			wPicker,
+			vTabs,
+			nonemores
+		},
+		onLoad(e) {
+			// debugger
+			if(e.sid && e.sid != 'null'){
+				this.release_sid = e.sid;
+				this.recruitment_type = 2;
+				// debugger
+			}else{
+				this.recruitment_type = 1;
+			}
+			this.userInfoId = uni.getStorageSync('userinfo').mid;
+			if(e.id){
+				this.pageId = e.id;
+			}
+			if(e.pid){
+				this.pid = e.pid;
+			}
+			if(e.job_type){
+				this.job_type = e.job_type
+			};
+			if(!this.pagenum){
+				this.confirm()
+			}
+			// this.getResumeList(this.resumeID);
+			// 初始化从地区选择器默认选择完毕发送请求，不从onload
+		},
+		onShow() {
+			if(!this.pagenum){
+				this.pagenum = true;
+				return
+			}
+			this.confirm(false,true,1)
+		},
+		onReachBottom() {
+			if(this.total < this.page) return
+			this.isMore = false;
+			this.page++;
+			this.confirm(false,true)
+		},
+		methods:{
+			vtabschange(e){
+				console.log(e);
+				this.checked = e;
+				this.page = 1;
+				this.confirm();
+			},
+			accomplish(item){
+				App._post_form(
+					`&p=recruit&do=interviewEnd`,
+					{id:item.submit_id},
+					res => {
+						console.log(res)
+						// debugger
+						uni.showToast({
+							title:res.message
+						});
+						this.confirm(false,true,1);
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			onConfirm(e){
+				console.log(e);
+				this.selectorItem = e.result;
+				this.selectorItemId = e.value;
+			},
+			onConfirmdete(e) {
+				console.log(e);
+				this.time = e.result;
+				// let date = new Date(e.value).getTime();
+				// console.log(e, date);
+			},
+			invitationLetter(){
+				if(!this.time){
+					uni.showToast({
+						icon:'none',
+						title:'请选择面试时间'
+					});
+					return
+				}else if(!this.site){
+					uni.showToast({
+						icon:'none',
+						title:'请填写面试地址'
+					});
+					return
+				}else if(!this.selectorItemId){
+					uni.showToast({
+						icon:'none',
+						title:'请选择面试职位'
+					});
+					return
+				}
+				let data = {
+					resume_id:this.userId,
+					recruit_id:this.selectorItemId,
+					interview_time:this.getDataTime(this.time),
+					interview_area:this.site
+				}
+				App._post_form(
+					`&p=recruit&do=inviteAnInterview`,
+					data,
+					res => {
+						console.log(res)
+						// debugger
+						this.isShow = false;
+						uni.showToast({
+							title:res.message
+						});
+						this.confirm(false,true,1);
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			// 时间转时间戳
+			getDataTime(timeValue) {
+				let ontime;
+				ontime = timeValue.replace(/-/g, '/');
+				let date = new Date(ontime);
+				let time = date.getTime() / 1000;
+				return time;
+			},
+			closes(){
+				this.isShow = false
+				this.time = '';
+				this.site = '';
+			},
+			interview(item){
+				this.userId = item.id;
+				let data = {
+					status:4,
+					recruitment_type:this.recruitment_type,
+					release_mid:this.recruitment_type==1?this.userInfoId:'',
+					release_sid:this.recruitment_type==2?this.release_sid:'',
+					}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						console.log(res)
+						this.selectorList = res.data;
+						this.selectorList.map(item=>{
+							if(item.id == this.pageId){
+								this.selectorItem = item.title;
+								this.selectorItemId = item.id;
+								// debugger
+							}
+						})
+						if(this.selectorList.length == 0){
+							App.showError(
+								`您尚无招聘中的岗位,是否前往添加?`,
+								data => {
+									if (data.confirm) {
+										App.navigationTo({
+											url: `pages/subPages2/hirePlatform/postRecruitment/postRecruitment`
+										});
+										return
+									}
+								},
+								true
+							);
+						}else{
+							this.isShow = true;
+						}
+						// this.selectorItem = res.data[0].title;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						
+						
+					}
+				);
+			},
+			deleteWork(item){
+				App.showError(
+					`确认删除${item.name}的求职简历?`,
+					data => {
+						if (data.confirm) {
+							App._post_form(
+								`&p=recruit&do=deleteSubmit`,
+								{id:item.submit_id},
+								res => {
+									console.log(res);
+									this.inviteList.map((items,index)=>{
+										if(items.id == item.id){
+											this.inviteList.splice(index,1);
+										}
+									});
+								},
+								false,
+								() => {
+									// this.loadlogo = true;
+								}
+							);
+						}
+					},
+					true
+				);
+			},
+			lookResume(item){
+				App.navigationTo({
+					url: "pages/subPages2/hirePlatform/resume/resume?id=" + item.id + `&flag=${this.recruitment_type}&pageId=${this.pageId}&sid=${this.release_sid}`
+				});
+			},
+			getcityWork(id){
+				this.num = 1;
+				if(this.num != 0){
+					this.AreaidAt = id;
+					this.confirm();
+				}
+				
+			},
+			confirm(datas,flag,page){
+				console.log(datas);
+				if(this.pageId && this.checked == 0){
+					let data = {
+						page:page || this.page,
+						page_index:this.page_index,
+					}
+					App._post_form(
+						`&p=recruit&do=submitResumeList&id=${this.pageId}`,
+						data,
+						res => {
+							if(flag){
+								if(page == 1){
+									this.inviteList = [];
+								}
+								this.inviteList = this.inviteList.concat(res.data.list);
+								let pages = page + 1;
+								if(Number(pages) > Number(this.page)){
+									return
+								}else if(page){
+									this.confirm(false,true,pages);
+								}
+							}else{
+								this.inviteList = res.data.list;
+							}
+							this.isMore = true;
+						},
+						false,
+						() => {
+							this.loadlogo = true;
+						}
+					);
+				}else{
+					if(datas){
+						this.datas = datas;
+					}
+					let indata = {
+						position_id:this.pid,
+						is_total:1,
+						recruit_id:this.pageId,
+						page:page || this.page,
+						page_index:this.page_index,
+					}
+					let data = Object.assign(indata ,this.datas);
+					App._post_form(
+						`&p=recruit&do=resumeList`,
+						data,
+						res => {
+							if(flag){
+								if(page == 1){
+									this.inviteList = [];
+								}
+								this.inviteList = this.inviteList.concat(res.data.list);
+								let pages = page + 1;
+								if(Number(pages) > Number(this.page)){
+									return
+								}else if(page){
+									this.confirm(false,true,pages);
+								}
+							}else{
+								this.inviteList = res.data.list;
+							}
+							this.inviteList.map(item=>{
+								item.open = false;
+							});
+							this.total = res.data.total;
+							this.check = false;
+							this.isMore = true;
+						},
+						false,
+						() => {
+							this.loadlogo = true;
+						}
+					);
+				}
+				
+			},
+			checkeda(index,key){
+				console.log(index,key);
+				this.moreData[key].map(item=>{
+					item.checked = false
+				});
+				this.moreData[key][index].checked = true;
+				let obj = Object.assign({},this.moreData);
+				console.log(obj);
+				this.moreData = {...obj}
+				this.loadlogo = !this.loadlogo;
+				this.loadlogo = !this.loadlogo;
+			},
+			getmore(data){
+				data.top.map((item,index)=>{
+					if(index > 2){
+						this.moreData[item.subscript] = data[item.subscript];
+					}
+				});
+				this.moreData.top = data.top;
+				for(let key in this.moreData){
+						this.moreData[key].map((item,index)=>{
+								item.checked = false;
+								if(key == 'job_type' && item.val == this.job_type){
+									item.checked = true;
+								}
+						})
+				}
+			},
+			getResumeList(ids){
+				this.resumeID = ids;
+				if(this.num != 0){
+					this.confirm();
+					console.log('职位');
+				}
+				
+				// App._post_form(
+				// 	`&p=recruit&do=resumeList`,
+				// 	{},
+				// 	res => {
+				// 		this.inviteList = res.data;
+				// 		this.inviteList.map(item=>{
+				// 			item.open = false;
+				// 		})
+				// 	},
+				// 	false,
+				// 	() => {
+						
+				// 	}
+				// );
+			},
+			close(){
+				console.log(this.moreData);
+				for(let key in this.moreData){
+						this.moreData[key].map((item,index)=>{
+				
+								item.checked = false;
+						})
+				}
+				this.check = !this.check;
+			},
+			openclass(){
+				
+				this.check = !this.check;
+			},
+			clickcheck(){
+				this.check = !this.check;
+			},
+			selectOrders(data){
+				
+				this.ordersId = data.val;
+				if(this.num != 0){
+					this.confirm();
+					console.log('排序');
+				}
+				console.log(data)
+				
+			},
+			selectAreaid(data){
+				this.num = 1;
+				console.log('地区');
+				this.Areaid = data.id;
+				this.confirm();
+				console.log(data)
+			},
+			selectClassid(data){
+				console.log(data)
+			},
+			selectClassTwoid(data){
+				console.log(data)
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #ffffff;
+	}
+</style>
+<style lang="scss" scoped>
+	.curriculumVitae{
+		background-color: #FFFFFF;
+		padding-bottom: 100upx;
+	}
+	.curriculum-list{
+		// padding-bottom: 100upx;
+		// height: 80vh;
+		.curriculum-item{
+			padding: 0 30upx 30upx;
+			.item-personal{
+				padding-top: 30upx;
+				border-top: 1upx solid #EEEEEE;
+				.personal-img{
+					position: relative;
+					.img{
+						width: 100upx;
+						height: 100upx;
+						border-radius: 50%;
+					}
+					.gender {
+						background-color: #ff838e;
+						padding: 8upx;
+						border-radius: 50%;
+						width: 16upx;
+						height: 16upx;
+						position: absolute;
+						bottom: 8upx;
+						right: 0;
+						z-index: 9;
+						uni-image {
+							width: 16upx;
+							height: 16upx;
+							vertical-align: top;
+						}
+					}
+				}
+				.personal-data{
+					padding-left: 30upx;
+					.data-name{
+						font-size: 32upx;
+						height: 32upx;
+						line-height: 26upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #333333;
+						// vertical-align: bottom;
+						margin-bottom: 30upx;
+					}
+					.data-item{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						// vertical-align: text-top;
+					}
+				}
+				.data-salary{
+					font-size: 32upx;
+					font-family: DINPro;
+					font-weight: 500;
+					color: #FF4444;
+					float: right;
+				}
+			}
+			.item-tags{
+				.tags-box{
+					padding:  30upx 0 10upx 64upx;
+					.tags-item{
+						background: #F4F4F4;
+						display: inline-block;
+						border-radius: 4upx;
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #666666;
+						padding: 10upx 20upx;
+						margin-bottom: 20upx;
+						margin-right: 20upx;
+					}
+				}
+			}
+			.date-and-button{
+				.date{
+					flex: 0.5;
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					height: 68upx;
+					line-height: 68upx;
+				}
+				.button{
+					flex: 0.5;
+					.delete{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #3388FF;
+						border: 1px solid #3388FF;
+						border-radius: 4upx;
+						padding: 15upx 25upx;
+					}
+					.invitation{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						background-color: #3388FF;
+						border: 1px solid #3388FF;
+						border-radius: 4upx;
+						padding: 15upx 25upx;
+						margin-left: 20upx;
+					}
+				}
+			}
+		}
+	}
+	.invitePop{
+		width: 70vw;
+		border-radius: 20upx;
+		padding: 30upx;
+		position: relative;
+		.invitePop-title{
+			font-size: 26upx;
+		}
+		.abBox{
+			font-size: 30upx;
+			color: #FFFFFF;
+			padding: 10upx 50upx;
+			background-color: #FF4444;
+			border-radius: 60upx;
+			display: inline-block;
+			position: absolute;
+			left: 50%;
+			bottom: -40%;
+			transform: translate(-50%);
+		}
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/deliverList/deliverList.vue b/pages/subPages2/hirePlatform/deliverList/deliverList.vue
new file mode 100644
index 0000000..813940b
--- /dev/null
+++ b/pages/subPages2/hirePlatform/deliverList/deliverList.vue
@@ -0,0 +1,158 @@
+<template>
+	<view class="deliverList">
+		<view class="dis-flex flex-x-around" style="margin-bottom: 20upx;">
+			<view class="page_tab" :class="detail_page==1?'active':''" @click="changePage(1)">我投递的</view>
+			<view class="page_tab" :class="detail_page==2?'active':''" @click="changePage(2)">我收藏的</view>
+		</view>
+		<view class="detail_page" v-if="detail_page==1">
+			<loadlogo v-if="!loadlogo" />
+			<view  v-if="loadlogo && inviteList.length > 0">
+				<work-List :flag="false" :inviteList="inviteList"></work-List>
+				<load-more :isMore="isMore1"  :bgc="'#ffffff'"></load-more>
+				<TabBars :tabBarAct="0" pageType="15"></TabBars>
+			</view>
+			<nonemores v-else-if="inviteList.length == 0"></nonemores>
+		</view>
+		<view class="detail_page" v-if="detail_page==2">
+			<loadlogo v-if="!loadlogo" />
+			<view  v-if="loadlogo && collectList.length > 0">
+				<work-List :flag="false" :inviteList="collectList"></work-List>
+				<load-more :isMore="isMore2"  :bgc="'#ffffff'"></load-more>
+				<!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
+			</view>
+			<nonemores v-else-if="collectList.length == 0"></nonemores>
+		</view>
+		
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import workList from '@/components/template/workList.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import nonemores from '@/components/template/nonemores.vue'
+	export default{
+		data(){
+			return{
+				loadlogo:true,
+				isMore1:true,
+				isMore2:true,
+				inviteList:[],
+				collectList: [],
+				page:1,
+				page_index:10,
+				total:1,
+				detail_page: 1
+			}
+		},
+		components:{
+			loadMore,
+			Loadlogo,
+			workList,
+			TabBars,
+			nonemores
+		},
+		onShow() {
+			this.page = 1;
+			this.getList()
+			this.getCollectList();
+		},
+		onReachBottom() {
+			if(this.detail_page==1 && this.total < this.page) return
+			this.isMore1 = false;
+			this.isMore2 = false;
+			this.page++;
+			this.getList(true);
+			this.getCollectList(true);
+		},
+		methods:{
+			changePage(page){
+				if(this.detail_page==page) return;
+				this.detail_page = page;
+			},
+			getList(flag){
+				let data = {
+					is_total:1,
+					page:this.page,
+					page_index:this.page_index
+				}
+				App._post_form(
+					`&p=recruit&do=getMyJobSearch`,
+					data,
+					res => {
+						if(flag){
+							this.inviteList = this.inviteList.concat(res.data.list);
+						}else{
+							this.inviteList = res.data.list;
+						}
+						console.log(this.inviteList,res.data.list);
+						this.total = res.data.total;
+						this.isMore1 = true;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			getCollectList(flag){
+				let data = {
+					// is_total:1,
+					page:this.page,
+					page_index:this.page_index
+				}
+				App._post_form(
+					`&p=recruit&do=getRecruitCollect`,
+					data,
+					res => {
+						if(flag){
+							this.collectList = this.collectList.concat(res.data.list);
+						}else{
+							this.collectList = res.data.list;
+						}
+						console.log(this.collectList,res.data.list);
+						// this.total = res.data.total;
+						this.isMore2 = true;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.deliverList{
+		background-color: #FFFFFF;
+		padding-bottom: 100upx;
+	}
+	.page_tab{
+		padding: 10upx 30upx;
+		line-height: 30px;
+		color: #666;
+		font-size: 15px;
+		&.active{
+			color: #f00;
+			position: relative;
+		}
+		&.active::after{
+			content: '';
+			position: absolute;
+			width: 16px;
+			height: 4px;
+			background-color: #f00;
+			border-radius: 3px;
+			bottom: 0px;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/hiringResume/hiringResume.vue b/pages/subPages2/hirePlatform/hiringResume/hiringResume.vue
new file mode 100644
index 0000000..3662590
--- /dev/null
+++ b/pages/subPages2/hirePlatform/hiringResume/hiringResume.vue
@@ -0,0 +1,234 @@
+<template>
+	<view class="curriculumVitae"> 
+	<!-- 当前页面暂未启用 -->
+		<far-bottom></far-bottom>
+		<view style="padding: 20upx 0;" class="dis-flex">
+			<view  style="flex: 0.8;">
+				<filtertab :requestType="'5'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid"
+				 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+			</view>
+			<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+				<text>更多</text>
+				<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+			</view>
+		</view>
+		 <view class="curriculum-list">
+		 	<view class="curriculum-item" v-for="(item,index) in [1,2,3]">
+		 		<view class="item-personal">
+		 			<view class="personal-img dis-il-block">
+		 				<image class="img" src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=2334304083,597995583&fm=26&gp=0.jpg" mode=""></image>
+						<view class="gender" v-if="true"><image :src="imgfixUrls + 'inviteImg/nvxing.png'" mode=""></image></view>
+						<view class="gender" v-else><image :src="imgfixUrls + 'inviteImg/nanxing.png'" mode=""></image></view>
+		 			</view>
+					<view class="personal-data dis-il-block">
+						<view class="data-name">
+							牛妹妹
+						</view>
+						<view class="data-item">
+							36岁 · 6年以上 · 本科
+						</view>
+					</view>
+					<view class="data-salary">
+						5-8k
+					</view>
+		 		</view>
+				<view class="item-tags dis-flex">
+					<view  style="flex: 0.1;">
+						
+					</view>
+					<view class="tags-box" style="flex: 0.75;">
+						<view class="tags-item">
+							助理
+						</view>
+						<view class="tags-item">
+							人力资源
+						</view>
+						<view class="tags-item">
+							敲山震虎
+						</view>
+					</view>
+					<view class="region t-r" style="flex: 0.15;">
+						双流区
+					</view>
+				</view>
+				<!-- <view class="dis-flex date-and-button">
+					<view class="date">
+						2020-09-22 15:30
+					</view>
+					<view class="button t-r">
+						<view class="delete dis-il-block">
+							删除
+						</view>
+						<view class="invitation dis-il-block">
+							邀请面试
+						</view>
+					</view>
+				</view> -->
+		 	</view>
+		 </view>
+		 <screening :check="check" @openclass="openclass"></screening>
+	</view>
+</template>
+
+<script>
+	import filtertab from '@/components/template/filtertab.vue';
+	import workList from '@/components/template/workList.vue';
+	import screening from '@/components/template/screening.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'',
+				cate_two:'',
+				title:'',
+				check:false
+			}
+		},
+		components:{
+			filtertab,
+			workList,
+			screening
+		},
+		methods:{
+			openclass(){
+				this.check = !this.check;
+			},
+			clickcheck(){
+				this.check = !this.check;
+			},
+			selectOrders(data){
+				console.log(data)
+			},
+			selectAreaid(data){
+				console.log(data)
+			},
+			selectClassid(data){
+				console.log(data)
+			},
+			selectClassTwoid(data){
+				console.log(data)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.curriculum-list{
+		.curriculum-item{
+			padding: 0 30upx 30upx;
+			.item-personal{
+				padding-top: 30upx;
+				border-top: 1upx solid #EEEEEE;
+				.personal-img{
+					position: relative;
+					.img{
+						width: 100upx;
+						height: 100upx;
+						border-radius: 50%;
+					}
+					.gender {
+						background-color: #ff838e;
+						padding: 8upx;
+						border-radius: 50%;
+						width: 16upx;
+						height: 16upx;
+						position: absolute;
+						bottom: 8upx;
+						right: 0;
+						z-index: 9;
+						uni-image {
+							width: 16upx;
+							height: 16upx;
+							vertical-align: top;
+						}
+					}
+				}
+				.personal-data{
+					padding-left: 30upx;
+					.data-name{
+						font-size: 32upx;
+						height: 32upx;
+						line-height: 26upx;
+						font-family: PingFang SC;
+						font-weight: bold;
+						color: #333333;
+						// vertical-align: bottom;
+						margin-bottom: 30upx;
+					}
+					.data-item{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #999999;
+						// vertical-align: text-top;
+					}
+				}
+				.data-salary{
+					font-size: 32upx;
+					font-family: DINPro;
+					font-weight: 500;
+					color: #FF4444;
+					float: right;
+				}
+			}
+			.item-tags{
+				.tags-box{
+					padding:  30upx 0 10upx 64upx;
+					.tags-item{
+						background: #F4F4F4;
+						display: inline-block;
+						border-radius: 4upx;
+						font-size: 24upx;
+						font-family: PingFang SC;
+						font-weight: 400;
+						color: #666666;
+						padding: 10upx 20upx;
+						margin-bottom: 20upx;
+						margin-right: 20upx;
+					}
+				}
+				.region{
+					font-size: 26upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					line-height: 60upx;
+					padding-top: 30upx;
+				}
+			}
+			.date-and-button{
+				.date{
+					flex: 0.5;
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					height: 68upx;
+					line-height: 68upx;
+				}
+				.button{
+					flex: 0.5;
+					.delete{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #3388FF;
+						border: 1px solid #3388FF;
+						border-radius: 4upx;
+						padding: 15upx 25upx;
+					}
+					.invitation{
+						font-size: 26upx;
+						font-family: PingFang SC;
+						font-weight: 500;
+						color: #FFFFFF;
+						background-color: #3388FF;
+						border: 1px solid #3388FF;
+						border-radius: 4upx;
+						padding: 15upx 25upx;
+						margin-left: 20upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue b/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
new file mode 100644
index 0000000..3d39d36
--- /dev/null
+++ b/pages/subPages2/hirePlatform/postRecruitment/postRecruitment.vue
@@ -0,0 +1,2354 @@
+<template>
+	<view class="enterForm">
+		<view class="bgimgbox">
+			<view  v-if="userInfo.disclaimers || disclaimers">
+				<text class="iconfont icon-tishi" style="color: #FF4444;"></text>
+				<text>{{userInfo.disclaimers || disclaimers}}</text>
+			</view>
+		</view>
+		<view class="formbox" v-if="loadlogo">
+			<view class="formdatabox">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						{{languageStatus !=1?'请填写职位信息':'직위 정보 입력하세요'}}
+					</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'职位名称':'구직 명칭'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" :placeholder="languageStatus !=1?'请输入职位名称':'직위 명칭을 입력하세요'" v-model="userInfo.title" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'行业职位':'항업 직위'}}
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="showThePic">
+							<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+						 	 range-key="name" :value="typeIndex"> -->
+							<view v-if="businessList.length == 0" class="uni-input twoLevelList">{{languageStatus !=1?'请选择行业分类':'항업 직위를 입력하세요'}}<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;margin-top: 5upx;"></text></view>
+							<view v-else class="uni-input twoLevelList">
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 1">
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{businessList[0].title}}
+									</view>
+								</view>
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 2">
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;">
+										{{businessList[0].title}}
+									</view>
+									<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{businessList[1].title}}
+									</view>
+									<!-- {{businessList[0].title}},{{businessList[1].title}} -->
+								</view>
+								<view class="dis-il-block" style="width: 90%;" v-if="businessList.length == 3">
+									<!-- {{businessList[0].title}},{{businessList[1].title}},{{businessList[2].title}} -->
+									<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;margin-bottom: 20upx;">
+										{{businessList[0].title}}
+									</view>
+									<view class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;">
+										{{businessList[1].title}}
+									</view>
+									<view v-if="businessList[2].title" class="dis-il-block t-c" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;">
+										{{businessList[2].title}}
+									</view>
+								</view>
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<!-- 			</picker> -->
+							<span></span>
+						</view>
+				
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						招聘类型
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="genderChange" :value="genderIndex" :range="genderList">
+						        <view class="uni-input">{{genderList[genderIndex]}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'工作类型':'업무 유형'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="wderTypeChange" :value="wderTypeIndex" range-key="title" :range="wderTypeList">
+						        <view class="uni-input">{{wderTypeList[wderTypeIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'类型分类':'업무 유형'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+							<picker @change="childTypeChange" :value="childTypeIndex" range-key="title" :range="childTypeList" @click.stop="">
+								<view class="uni-input">{{childTypeList[childTypeIndex].title}}
+									<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+									</view>
+								</view>
+							</picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type == 1 || userInfo.job_type == 3">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'福利待遇':'복리대우'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" @click="openwelfare(false)">
+						<view v-if="welfarecheckedList.length == 0" class="uni-input twoLevelList">{{languageStatus !=1?'请选择福利待遇':'복리대우를 선택하세요'}}<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;margin-top: 5upx;"></text></view>
+						<view v-else class="uni-input twoLevelList">
+							<view class="dis-il-block" style="width: 90%;">
+								<view class="dis-il-block" style="padding: 5upx 10upx;background-color: #FF4444;color: #FFFFFF;border-radius: 6upx;margin-right: 10upx;margin-bottom: 10upx;" v-for="(item,index) in welfarecheckedList" :key="index">
+									{{item.title}}
+								</view>
+							</view>
+							<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type == 1 || userInfo.job_type == 3">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'薪资待遇':'급여대우'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="isAssignChange" :value="isAssignIndex" range-key="title" :range="isAssignList">
+						        <view class="uni-input">{{isAssignList[isAssignIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="(userInfo.job_type == 1 && userInfo.full_type == 2) || (userInfo.job_type == 3 && userInfo.full_type == 2)">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						薪资区间
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;" >
+						  <view class="flex-box inputBox">
+						  	<input type="number" style="font-size: 26upx;text-align: center;" placeholder="最低薪资" v-model="userInfo.full_salary_min" />
+						  </view>
+						  <view  style="padding-left: 0;">
+						  	-
+						  </view>
+						  <view class="flex-box inputBox">
+						  	<input type="number" style="font-size: 26upx;text-align: center;" placeholder="最高薪资" v-model="userInfo.full_salary_max" />
+						  </view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type == 2">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'薪资待遇':'급여대우'}}
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;" >
+						<input type="number" style="font-size: 26upx;" placeholder="请输入兼职薪资" v-model="userInfo.part_salary" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type == 2">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						兼职类型
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="PartTypeChange" :value="PartTypeIndex" range-key="title" :range="PartTypeList">
+						        <view class="uni-input">{{PartTypeList[PartTypeIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type == 2">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						结算方式
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="wayChange" :value="wayIndex" range-key="title" :range="wayList">
+						        <view class="uni-input">{{wayList[wayIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'联系人':'연락인'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="text" :placeholder="languageStatus !=1?'请输入联系人姓名':'연락인 명함을 입력하세요'" v-model="userInfo.contacts" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'联系电话':'연락전화'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24" type="number"  :placeholder="languageStatus !=1?'请输入联系电话':'연락전화를 입력하세요'" v-model="userInfo.contact_phone" />
+					</view>
+				</view>
+					
+				
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'所在城市':'현재도시'}}
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<w-picker :visible.sync="visiblec" mode="region" :value="[userInfo.provinceid,userInfo.areaid,userInfo.distid]"
+						 default-type="value" :hide-area="false" @confirm="onConfirm($event,'region')" @cancel="onCancel" ref="region"></w-picker>
+						<view class="uni-input" @tap="visble">{{ provinceidName }} {{ areaidName }} {{ distidName }}<text class="iconfont icon-right"
+							 style="float: right;font-size: 20upx;color: #999999;">
+							</text></view>
+
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						{{languageStatus !=1?'详细地址':'상세주소'}}
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<input class="f-24" style="flex: 0.8;" :placeholder="languageStatus !=1?'请输入详细地址':'상세주소를 입력하세요'" v-model="userInfo.address" />
+						<view class="dis-il-block" @click="getLocation" style="flex: 0.4;">
+							<image style="width: 20upx;height: 20upx;padding-left: 10upx;" :src="imgfixUrls + 'merchant/where.svg'" />
+							<span>{{languageStatus !=1?'定位':'위치설정'}}</span>
+						</view>
+					</view>
+				</view>
+				
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						商家简介
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<textarea style="width: 100%;font-size: 24upx;" v-if="!hangyeshow" auto-height placeholder="请输入商户简介" placeholder-style="font-size:24upx"
+						 v-model="userInfo.desc" />
+						</view>
+				</view> -->
+			</view>
+			
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						请上传图集、视频
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						图集
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;"></view>
+				</view>
+				<view class="upLoadFile">
+					<!-- 图集阅览 -->
+					<view class="zsView" v-for="(item, index) in userInfo.img" style="fontSize:24upx">
+						<image :src="item" mode="aspectFill" />
+						<image :src="imgfixUrls + 'merchant/close.png'" @click="deletImg(item, 'img')" />
+					</view>
+					<!-- 图集上传按钮 -->
+					<!-- <view class="upLoadImg" @click="uploadFiles(9-userInfo.img.length, 'img')" v-if="userInfo.img.length < 9"> -->
+					<view class="upLoadImg" @click="uploadFiles(6, 'img')">
+						<view>
+							<image :src="imgfixUrls + 'merchant/sctp.png'" />
+						</view>
+						<text class="upText">{{languageStatus!=1?'上传图片':'이미지 올리기'}}</text>
+					</view>
+					<view ref="input" class="input" style="display: none;"></view>
+				</view>
+				
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						视频
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;"></view>
+				</view>
+				<view class="upLoadFile">
+					<!-- 封面阅览 -->
+					<view class="zsView" style="fontSize:24upx" v-if="userInfo.video_img_link !== '' && !!userInfo.video_img_link">
+						<image :src="userInfo.video_img_link" mode="aspectFill" />
+						<image :src="imgfixUrls + 'merchant/close.png'" @click="deletImg(userInfo.video_img_link, 'video')" />
+					</view>
+					<view ref="input" class="input" style="display: none;"></view>
+					<!-- 封面图上传按钮 -->
+					<view class="upLoadImg" @click="uploadFiles(1, 'video')" v-if="!userInfo.video_img_link">
+						<view>
+							<image :src="imgfixUrls + 'merchant/sctp.png'" />
+						</view>
+						<text class="upText">{{languageStatus!=1?'上传视频封面':'이미지 올리기'}}</text>
+					</view>
+					<!-- 视频上传按钮 -->
+					<view ref="input" class="input" style="display: none;"></view>
+					<block v-if="src == ''">
+						<view class="upLoadVideo" @click="upButton">
+							<view>
+								<image :src="imgfixUrls + 'merchant/scsp.png'" />
+							</view>
+							<text class="upText">{{languageStatus!=1?'上传视频':'동영상 올리기'}}</text>
+						</view>
+					</block>
+				</view>
+				<!-- 上传视频展示 -->
+				<view class="Zsvideo-main" v-if="userInfo.video_link !== '' && !!userInfo.video_link">
+					<!-- <view class="t-r" v-if="isAndroid === '1' && isAdclose"> -->
+					<view class="t-r" v-if="isAndroid === '1'">
+						<image :src="imgfixUrls + 'merchant/close.png'" class="adcloseImg" @click="deletVideo"></image>
+					</view>
+					<video class="zsVideo" :src="src">
+						<block v-if="isAndroid === '2'">
+							<cover-image :src="imgfixUrls + 'merchant/close.png'" class="closeImg" @click="deletVideo"></cover-image>
+						</block>
+					</video>
+				</view>
+			
+				<!-- 兼职封面图 -->
+				<view class="dis-flex f-24 formtitle" v-if="userInfo.job_type==2">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						兼职封面
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;"></view>
+				</view>
+				<view class="upLoadFile" v-if="userInfo.job_type==2">
+					<!-- 兼职封面阅览 -->
+					<view class="zsView" style="fontSize:24upx" v-if="userInfo.recruit_img !== '' && !!userInfo.recruit_img">
+						<image :src="userInfo.recruit_img" mode="aspectFill" />
+						<image :src="imgfixUrls + 'merchant/close.png'" @click="deletImg(userInfo.recruit_img, 'recruit_img')" />
+					</view>
+					<view ref="input" class="input" style="display: none;"></view>
+					<!-- 兼职封面图上传按钮 -->
+					<view class="upLoadImg" @click="uploadFiles(1, 'recruit_img')" v-if="!userInfo.recruit_img">
+						<view>
+							<image :src="imgfixUrls + 'merchant/sctp.png'" />
+						</view>
+						<text class="upText">{{languageStatus!=1?'上传兼职封面':'이미지 올리기'}}</text>
+					</view>
+				</view>
+				
+			</view>
+			
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						请选择其他要求
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						微信号
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入微信号" v-model="userInfo.wx" />
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						性别要求
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="gendersChange" :value="gendersIndex" range-key="title" :range="gendersList">
+						        <view class="uni-input">{{gendersList[gendersIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						年龄区间
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;" >
+						  <view class="flex-box inputBox">
+						  	<input type="number" style="font-size: 26upx;text-align: center;" placeholder="最低年龄" v-model="userInfo.age_min" />
+						  </view>
+						  <view  style="padding-left: 0;">
+						  	-
+						  </view>
+						  <view class="flex-box inputBox">
+						  	<input type="number" style="font-size: 26upx;text-align: center;" placeholder="最高年龄" v-model="userInfo.age_max" />
+						  </view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						招聘人数
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24" type="number"  placeholder="请输入招聘人数" v-model="userInfo.people_number" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						学历要求
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="educationChange" :value="educationIndex" range-key="title" :range="educationList">
+						        <view class="uni-input">{{educationList[educationIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						上岗状态
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="incumbencyChange" :value="incumbencyIndex" range-key="title" :range="incumbencyList">
+						        <view class="uni-input">{{incumbencyList[incumbencyIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						工作经验
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="experienceChange" :value="experienceIndex" range-key="title" :range="experienceList">
+						        <view class="uni-input">{{experienceList[experienceIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+						职位描述
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<view  > 
+							<textarea style="width: 100%;font-size: 26upx;" maxlength="9999" v-model="userInfo.job_description" placeholder="请填写职位描述" />
+						</view>
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						工作类型
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;" >
+						  <picker @change="workTypeChange" :value="workTypeIndex" range-key="title" :range="workTypeList">
+						        <view class="uni-input">{{workTypeList[workTypeIndex].title}}
+								<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+						        </view>
+								</view>
+						  </picker>
+					</view>
+				</view> -->
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						最低薪资
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="number" placeholder="请填写最低期盼薪资" v-model="userInfo.expect_salary_min" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.3;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						最高薪资
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" type="number" placeholder="请填写最高期盼薪资" v-model="userInfo.expect_salary_max" />
+					</view>
+				</view> -->
+				
+			</view>
+			<!-- <view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+						
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						头像上传
+					</view>
+					<view class="t-r" style="flex: 0.6;"> -->
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+				<!-- 	</view>
+				</view> -->
+			<!-- <view class="logobox">
+				<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+				<span>用户头像(200X200)</span>
+				<view style="padding-left: 20upx;"> -->
+					<!-- 图片预览循环模板 -->
+					<!-- <view class="userImgUpdataon" style="margin: 10upx;" v-if="userInfo.avatar">
+						<image :src="userInfo.avatar" class="imgs"  @click="lookimg(1,userInfo.avatar)" />
+						<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo" />
+					</view> -->
+					<!-- 图片预览循环模板 -->
+					<!-- <view class="userImgUpdata" @click="uploadFiles(1, 1)"  style="margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="!userInfo.logo">
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+					</view>
+				</view>
+			</view> -->
+			
+			
+			
+		 <!-- </view> -->
+		<!-- <view class="formdatabox" style="margin-top: 20upx;" >
+		 	<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+		 		<view class="sign">
+		 		</view>
+		 		<view  style="padding-left: 20upx;flex: 0.45;">
+		 			个人经历
+		 		</view>
+		 	</view>
+		 	<view class="dis-flex f-24 formtitle">
+		 		<view class="t-r" style="flex: 0.3;">
+		 			<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+		 			工作经历
+		 		</view>
+		 		<view  style="flex: 0.8;padding-left: 40upx;" @click="afterWorkShow= true">
+		 			 <view class="uni-input">点击编辑项目经验
+		 			 <view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+		 			 </view>
+		 			 </view>
+		 		</view>
+		 	</view>
+			<view class="dis-flex f-24 formtitle">
+				<view class="t-r" style="flex: 0.3;">
+					<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+					教育经历
+				</view>
+				<view  style="flex: 0.8;padding-left: 40upx;" @click="educationShow = true">
+					 <view class="uni-input">点击编辑教育经历
+					 <view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+					 </view>
+					 </view>
+				</view>
+			</view>
+			
+		 </view> -->
+		<view  style="padding-bottom: 100upx;">
+		 	<view class="t-c" style="width: 90vw;height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;margin-top: 50upx;" @click="submit">
+		 		提 交
+		 	</view>
+		</view>
+		</view>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="hangyeshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeShareBottom">
+			<view class="hangye dis-flex" >
+				<view  style="flex: 0.33;overflow: auto;">
+					<view :class="item.checked?'industryclass-item isclasschecked f-28' :'industryclass-item f-28'" v-for="(item,index) in industry" @click="clickindustry(item)">
+						{{item.title}}
+					</view>
+				</view>
+				<view  style="flex: 0.33;overflow: auto;">
+					<view :class="item.checked?'industryclass-item isclasschecked f-28' :'industryclass-item f-28'" v-for="(item,index) in industrysubdivide" @click="clickclass(item)">
+						{{item.title}}
+					</view>
+				</view>
+				<view  style="flex: 0.33;overflow: auto;">
+					<view :class="item.checked?'industryclass-item isclasschecked f-28' :'industryclass-item f-28'" v-for="(item,index) in industrysublevel" @click="clickclassTwo(item)">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+			<!-- <view class="b-f dis-flex">
+				
+				<view class="flex-box">
+					<button @click="confirm" style="width: 80%;height: 80%;font-size: 34upx;line-height: 70upx;height: 70upx;margin-bottom: 20upx;" type="warn">确定</button>
+				</view>
+			</view> -->
+		</PopManager>
+		
+		<!-- 未上传视频的弹窗 -->
+		<PopManager :show="showModalA" :type="'center'" :overlay="'false'" :showOverlay="'false'">
+			<view class="modal_A" v-if="showModalA">
+				<view class="title">温馨提示</view>
+				<view class="content">你尚未上传招聘视频，可能会影响招聘效果</view>
+				<view class="dis-flex">
+					<view class="left-1">联系平台制作宣传片</view>
+					<view class="left-2" @click="showModalA = false;upButton()">上传</view>
+					<view class="right" @click="submitRequest()">跳过</view>
+				</view>
+			</view>
+		</PopManager>
+		
+		<!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
+		<far-bottom></far-bottom>
+		<w-picker
+		       :visible.sync="startTime"
+		       mode="date" 
+		       startYear="2000" 
+		       endYear="2100"
+		       :current="true"
+		       fields="day"
+		       @confirm="onConfirmstartTime($event,'date')"
+		       @cancel="onCancel"
+		       :disabled-after="false"
+		       ref="datea" 
+		   ></w-picker>
+		   <w-picker
+		          :visible.sync="endTime"
+		          mode="date" 
+		          startYear="1900" 
+		          endYear="2100"
+		          :current="true"
+		          fields="day"
+		          @confirm="onConfirmendTime($event,'date')"
+		          @cancel="onCancel"
+		          :disabled-after="false"
+		          ref="date" 
+		      ></w-picker>
+			  <PopManager :show="welfareShow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="welfareShow = false">
+			  	<view class="welfareCss">
+			  		<view :class="item.checked?'welfare-item-check':'welfare-item'" v-for="(item,index) in welfareList" :key="index" @click="checkwelfare(item,index)">
+			  			{{item.title}}
+			  		</view>
+			  	</view>
+			  </PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	import PopManager from '@/components/template/PopManager';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import TabBars from '@/components/template/tabBar.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				provinceidName:'',
+				areaidName:'',
+				distidName:'',
+				visiblec:false,
+				startTime:false,
+				endTime:false,
+				addWorkShow:false,
+				addteachShow:false,
+				afterWorkShow:false,
+				educationShow:false,
+				address:'',
+				lblis:{},
+				klis:false,
+				isOpenLaction:false,
+				userInfo:{
+					job_type:1,
+					title:'',
+					industry_pid:'',
+					industry_id:'',
+					position_id:'',
+					recruitment_type:'',
+					full_type:'',
+					full_salary_min:'',
+					full_salary_max:'',
+					welfare:[],
+					img: [],
+					video_img_link: '',
+					video_link: '',
+					// 增加内容在方法getenter中增加
+				},
+				phoneHeight:null,
+				latlngs:null,
+				owenscitylist:[],
+				hangyeshow:false,
+				hangYe:true,
+				industryclass:'',
+				industry:[],
+				industrysubdivide:[],
+				industrysublevel:[],
+				industryAll:{},
+				loadlogo:true,
+				pickerarray:['全部','1','2','3'],
+				pickerindex:0,
+				goodsinfo:{},
+				sid:'',
+				oldDistid:'',
+				uploadlength:0,
+				localIds:[],
+				genderList:['个人招聘','企业招聘'],
+				gendersList:[{title:'不限',id:1},
+					{title:'男',id:2},
+					{title:'女',id:3},],
+				gendersIndex:0,
+				genderIndex:0,
+				educationList:[],
+				workTypeList:[{title:'全职',id:1},{title:'兼职',id:2}],
+				workTypeIndex:0,
+				educationIndex:0,
+				incumbencyList:[
+					{title:'随时上岗',id:1},
+					{title:'一周之内',id:2},
+					{title:'一月之内',id:3},
+					{title:'考虑中',id:4},
+					{title:'无换岗意向',id:5},
+				],
+				incumbencyIndex:0,
+				experienceList:[],
+				experienceIndex:0,
+				businessList:[],
+				work_experience:{
+					title:'',
+					corporate_name:'',
+					start_time:'',
+					end_time:'',
+					content:''
+				},
+				educational_experience:{
+					school:'',
+					major:'',
+					start_time:'',
+					end_time:'',
+				},
+				work_experienceList:[],
+				educational_experienceList:[],
+				redactIndex:null,
+				wderTypeList:[{
+					title:'全职',
+					id:'1',
+					cc_id: '9'//一级分类id
+				},{
+					title:'兼职',
+					id:'2',
+					cc_id: '7'
+				},{
+					title:'实习',
+					id:'3',
+					cc_id: '8'
+				}],
+				childTypeList: [],
+				childTypeIndex: 0,
+				PartTypeList:[
+					{title:'时薪',id:1},
+					{title:'日薪',id:2},
+					{title:'月薪',id:3}
+				],
+				PartTypeIndex:0,
+				isAssignList:[
+					{title:'面议',id:1},
+					{title:'指定',id:2}
+				],
+				isAssignIndex:0,
+				wderTypeIndex:0,
+				wayList:[{title:'日结',id:1},
+				{title:'周结',id:2},
+				{title:'月结',id:3},
+				{title:'完工结算',id:4}],
+				wayIndex:0,
+				welfareShow:false,
+				welfarecheckedList:[],
+				welfareList:[],
+				agencyData:{},
+				disclaimers:'',
+				isAndroid: '',
+				isAdclose: false,
+				// images: [],
+				src: '',
+				showModalA: false,
+				submitDatas: {}//提交的数据集合
+			}
+		},
+		components:{
+			wPicker,
+			PopManager,
+			phoneNavBar,
+			TabBars
+		},
+		onHide() {
+			
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.id = e.id;
+			if(_this.languageStatus == 1){
+				_this.$set(_this.wderTypeList[0],'title','전직');
+				_this.$set(_this.wderTypeList[1],'title','겸직하다.겸직');
+				_this.$set(_this.isAssignList[0],'title','상의');
+				_this.$set(_this.isAssignList[1],'title','지정하다');
+			}
+			if(e.sid && e.sid != 'null'){  //区分进入页面者为个人还是企业，sid存在即为企业
+				_this.sid = e.sid;
+				this.userInfo.recruitment_type = 2;
+				
+			}else{
+				this.userInfo.recruitment_type = 1;
+				
+			}
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+					_this.isAndroid = res.platform === 'android' ? '1' : '2';
+				}
+			});
+			_this.owenscitylist = uni.getStorageSync('cityList')
+			_this.latlngs = uni.getStorageSync('curLoction');
+			_this.agencyData = uni.getStorageSync('agencyData');
+			if(_this.latlngs.latitude){
+				_this.userInfo.lat = _this.latlngs.latitude;
+				_this.userInfo.lng = _this.latlngs.longitude;
+			}
+			_this.getenter();
+			
+			setTimeout(()=>{
+				_this.getData();
+				
+			},1000)
+		},
+		onShow() {
+			let _this = this;
+			_this.geteducationList();
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					if(_this.klis){
+						return
+					}
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						// _this.thelat = loc.latlng.lat;
+						_this.userInfo.address = loc.poiaddress;
+						_this.userInfo.lat = loc.latlng.lat;
+						_this.userInfo.lng = loc.latlng.lng;
+						_this.isOpenLaction = false;
+						_this.lblis = {
+									lat:loc.latlng.lat,
+									lng:loc.latlng.lng,
+									detailed_address:loc.poiaddress
+								}
+						_this.getloctions(_this.lblis)
+					}
+					_this.klis = true;
+					setTimeout(()=>{
+						_this.klis = false;
+					},1000)
+				},
+				false
+			);
+			// #endif
+			//#ifdef APP-PLUS
+			if(_this.userInfo.address){
+				_this.lblis.address = _this.userInfo.address
+				_this.getloctions(_this.lblis)
+			}
+			//#endif
+			// console.log(_this.userInfo.img, '测试img')
+		},
+		methods:{
+			getData(){
+				let _this = this;
+				App._post_form(
+					`&p=recruit&do=editRecruit&type=get&id=${_this.id || ''}`,
+					{},
+					res => {
+						if(!_this.id){
+							_this.disclaimers = res.data.disclaimers;
+							this.getChildTypeList();//初始化
+							// console.log(_this.userInfo.img, '测试img')
+							return
+						}
+						console.log('数据回填');
+						let data = _this.userInfo;
+						_this.userInfo = res.data;
+						if(res.data.img){
+							// _this.images = res.data.img;
+						}else{
+							_this.userInfo.img = [];
+						}
+						_this.src = res.data.video_link;
+						if(res.data.recruit_img.indexOf('https://qingyuan.xingtongworld.com/attachment/')==-1){
+							_this.userInfo.recruit_img = 'https://qingyuan.xingtongworld.com/attachment/' + res.data.recruit_img
+						}
+						
+						_this.userInfo.provinceid = res.data.work_province;
+						_this.userInfo.areaid = res.data.work_city;
+						_this.userInfo.distid = res.data.work_area;
+						_this.userInfo.address = res.data.work_address;
+						_this.userInfo.lat = res.data.work_lat;
+						_this.userInfo.lng = res.data.work_lng;
+						_this.genderIndex = Number(res.data.recruitment_type) - 1;
+						_this.wderTypeList.map((item,index)=>{
+							if(item.id == res.data.job_type){
+								_this.wderTypeIndex = index;
+							}
+						})
+						_this.getChildTypeList('回填');
+						
+						
+						_this.businessList.push(res.data.show_industry_pid);
+						_this.businessList.push(res.data.show_industry_id);
+						_this.businessList.push(res.data.show_position_id);//第三级没有填的时候会push一个false
+						
+						
+						
+						_this.isAssignList.map((item,index)=>{
+							if(item.id == res.data.full_type){
+								_this.isAssignIndex = index;
+							}
+						});
+						_this.isAssignList.map((item,index)=>{
+							if(item.id == res.data.full_type){
+								_this.isAssignIndex = index;
+							}
+						})
+						_this.PartTypeList.map((item,index)=>{
+							if(item.id == res.data.part_type){
+								_this.PartTypeIndex = index;
+							}
+						})
+						_this.wayList.map((item,index)=>{
+							if(item.id == res.data.part_settlement){
+								_this.wayIndex = index;
+							}
+						});
+						_this.gendersList.map((item,index)=>{
+							if(item.id == res.data.gender){
+								_this.gendersIndex = index;
+							}
+						})
+						_this.educationList.map((item,index)=>{
+							if(item.id == res.data.education_label_id){
+								_this.educationIndex = index;
+							}
+						})
+						_this.experienceList.map((item,index)=>{
+							if(item.id == res.data.experience_label_id){
+								_this.experienceIndex = index;
+							}
+						})
+						console.log(_this.userInfo,'提交结果');
+						// 
+						
+						_this.owenscitylist.map((item,index)=>{
+							if(item.id == _this.userInfo.provinceid){
+								_this.provinceidName = item.name;
+								item.area.map(items=>{
+									if(items.id == _this.userInfo.areaid){
+										_this.areaidName = items.name;
+										items.dist.map(itemss=>{
+											if(itemss.id == _this.userInfo.distid){
+												_this.distidName = itemss.name;
+											}
+										})
+									}
+								})
+							}
+						});
+						
+						_this.openwelfare(res.data.welfare);
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			checkwelfare(item,index){
+				this.welfarecheckedList = [];
+				this.userInfo.welfare = [];
+				this.welfareList.map((items,indexs)=>{
+					if(index == indexs){
+						item.checked = !item.checked;
+						this.loadlogo = !this.loadlogo;
+						this.loadlogo = !this.loadlogo;
+					}
+					if(items.checked){
+						this.welfarecheckedList.push(items);
+						this.userInfo.welfare.push(items.id);
+					}
+					
+				});
+			},
+			openwelfare(bilis = false){
+				console.log(bilis)
+				// 
+				let _this = this;
+				App._post_form(
+					`&p=recruit&do=getLabel&type=2`,
+					{},
+					res => {
+						console.log(res);
+						_this.welfareShow = true;
+						_this.welfareList = res.data;
+						
+						_this.welfareList.map(item=>{
+							item.checked = false;
+							if(bilis){
+								bilis.map(items=>{
+									if(item.id == items){
+										_this.welfarecheckedList.push(item);
+									}
+								});
+								_this.welfareShow = false;
+							}
+							// _this.welfarecheckedList.map(items=>{
+							// 	if(item.id == items.id){
+							// 		item.checked = true;
+							// 	}
+							// })
+						});
+						_this.welfareList.map(item=>{
+							item.checked = false;
+							// 
+							_this.welfarecheckedList.map(items=>{
+								if(item.id == items.id){
+									item.checked = true;
+								}
+							})
+						});
+						console.log(_this.welfarecheckedList);
+						// 
+						// this.experienceList = res.data;
+						
+						
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			redact(item,index){
+				// this.work_experience = item;
+				let objString = JSON.stringify(item);
+				this.work_experience = JSON.parse(objString);
+				this.redactIndex = index;
+				this.addWorkShow = true;
+			},
+			redactteach(item,index){
+				let objString = JSON.stringify(item);
+				this.educational_experience = JSON.parse(objString);
+				this.redactIndex = index;
+				this.addteachShow = true;
+			},
+			onConfirmendTime(e){
+				this.educational_experience.end_time = e.result;
+				this.work_experience.end_time = e.result;
+			},
+			onConfirmstartTime(e){
+				this.educational_experience.start_time = e.result;
+				this.work_experience.start_time = e.result;
+			},
+			closeaddteach(){
+				this.addteachShow = false;
+								this.educational_experience ={
+									school:'',
+									major:'',
+									start_time:'',
+									end_time:'',
+								};
+			},
+			closeadd(){
+				this.addWorkShow = false;
+				this.work_experience ={
+					title:'',
+					corporate_name:'',
+					start_time:'',
+					end_time:'',
+					content:''
+				};
+			},
+			geteducationList(){
+				App._post_form(
+					`&p=recruit&do=getLabel&type=1`,
+					{},
+					res => {
+						this.educationList = res.data;
+						// this.educationList.unshift({
+						// 	id:'0',
+						// 	title:'不限'
+						// })
+						this.userInfo.education_label_id = this.educationList[0].id;
+						App._post_form(
+							`&p=recruit&do=getLabel&type=3`,
+							{},
+							res => {
+								this.experienceList = res.data;
+								// this.experienceList.unshift({
+								// 	id:'0',
+								// 	title:'不限'
+								// })
+								this.userInfo.experience_label_id = this.experienceList[0].id;
+								this.userInfo.gender = 1;
+								
+							},
+							false,
+							() => {
+							}
+						);
+					},
+					false,
+					() => {
+					}
+				);
+				
+			},
+			// 时间转时间戳
+			getDataTime(timeValue) {
+				let ontime;
+				ontime = timeValue.replace(/-/g, '/');
+				let date = new Date(ontime);
+				let time = date.getTime();
+				return time;
+			},
+			submit(){
+				// if(!this.userInfo.video_link){
+				// 	uni.showToast({
+				// 		title: '请上传视频',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+				// if(!this.userInfo.video_img_link){
+				// 	uni.showToast({
+				// 		title: '请上传视频封面图',
+				// 		icon: 'none'
+				// 	})
+				// 	return;
+				// }
+				if(this.userInfo.img.length==0){
+					uni.showToast({
+						title: '请上传轮播图',
+						icon: 'none'
+					})
+					return;
+				}
+				if(this.userInfo.job_type==2 && !this.userInfo.recruit_img){
+					uni.showToast({
+						title: '请选择兼职封面',
+						icon: 'none'
+					})
+					return;
+				}
+				let _this = this;
+				let data = JSON.parse(JSON.stringify(_this.userInfo));
+				// this.work_experienceList.map()
+				data.work_province = _this.userInfo.provinceid ||data.work_province;
+				data.work_city = _this.userInfo.areaid || data.work_city;
+				data.work_area = _this.userInfo.distid ||data.work_area;
+				data.work_address = _this.userInfo.address || data.work_address;
+				_this.userInfo.address = data.work_address;
+				data.work_lng = _this.userInfo.lng || _this.agencyData.lng ||data.work_lng;
+				data.work_lat = _this.userInfo.lat || _this.agencyData.lat || data.work_lat;
+				if(!data.work_lng || !data.work_lat){
+					uni.showToast({
+						icon:'none',
+						title:'请选择定位'
+					});
+					return
+				}
+				if(_this.businessList.length < 2){
+					uni.showToast({
+						icon:'none',
+						title:'请选择具体行业'
+					});
+					return
+				}
+				if(!data.people_number){
+					data.people_number = '';
+				}
+				data.industry_pid = _this.businessList[0].id;
+				data.industry_id = _this.businessList[1].id;
+				if(_this.businessList[2]){
+					data.position_id = _this.businessList[2].id;
+				}
+				if(!data.job_type){
+					data.job_type = this.wderTypeList[0].id;
+				}
+				if(!data.cc_id){//这个是二级分类的id,和其他接口一级分类id传参重名了，需要注意
+					data.cc_id = this.childTypeList[0].id;
+				}
+				if(!data.full_type){
+					data.full_type = this.isAssignList[0].id;
+				}
+				
+				if(!data.part_type){
+					data.part_type = this.PartTypeList[0].id;
+				}
+				if(!data.part_settlement){
+					data.part_settlement = this.wayList[0].id;
+				}
+				if(!data.gender){
+					data.gender = this.gendersList[0].id;
+				}
+				if(!data.education_label_id){
+					data.education_label_id = this.educationList[0].id;
+				}
+				if(!data.experience_label_id){
+					data.experience_label_id = this.experienceList[0].id;
+				}
+				console.log(data);
+				if(data.job_type == 1 || data.job_type == 3){
+					delete data.part_type;
+					delete data.part_salary;
+					delete data.part_settlement;
+					if(data.full_type == 1){
+						delete data.full_salary_min;
+						delete data.full_salary_max;
+					}
+				}else{
+					delete data.full_salary_min;
+					delete data.full_salary_max;
+					delete data.full_type;
+					delete data.welfare;
+				}
+				delete data.provinceid;
+				delete data.areaid;
+				delete data.distid;
+				delete data.logo;
+				delete data.show_avatar;
+				delete data.show_expect_position;
+				delete data.lng;
+				delete data.lat;
+				delete data.show_industry_id;
+				delete data.address;
+				delete data.show_industry_pid;
+				delete data.show_position_id;
+				delete data.disclaimers;
+				delete data.reason;//这个东西页面上没有，所以回填提交会报错
+				if(!data.position_id){
+					delete data.position_id;//这个东西后台没有设置，后台设置招聘没得选，所以回填提交会报错(手机设置招聘的话这种不完整的根本就发不出去)
+				}
+				if(!data.job_description){
+					uni.showToast({
+						icon:'none',
+						title:'请填写职位描述'
+					});
+					return
+				}
+				
+				// delete data.ing;
+					
+					// for(let key  in data){
+				 //    if(!data[key] && data[key] !== 0 && key != 'people_number'){
+					// 			uni.showToast({
+					// 				icon:'none',
+					// 				title:'请完善资料'
+					// 				// title:key+'1'
+					// 			});
+					// 			return
+					// 	}else if(Array.isArray(data[key])){
+					// 		if(data[key].length == 0){
+					// 			uni.showToast({
+					// 				icon:'none',
+					// 				title:'请完善资料'
+					// 				// title:key+'2'
+					// 			});
+					// 			return
+					// 		}
+					// 	}
+				 //  }
+				
+				this.submitDatas = {};
+				this.submitDatas.data = JSON.stringify(data);
+				if(!this.userInfo.video_link){
+					this.showModalA = true;
+					return;
+				}
+				this.submitRequest();
+			},
+			// 提交发布最后的步骤--发起网络请求
+			submitRequest(){
+				let _this = this;
+				uni.showLoading({
+					title:'提交中',
+					mask:true
+				});
+				  // data.sid = _this.sid || '';
+				App._post_form(
+					`&p=recruit&do=editRecruit&type=post&sid=${_this.sid || ''}&id=${_this.id || ''}`,
+					_this.submitDatas,
+					res => {
+						if(res.data.status > 0){
+							App.navigationTo({
+								url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+`&plugin=${res.data.type}`
+							})
+						}else{
+							uni.showToast({
+								title:'发布成功'
+							});
+							setTimeout(()=>{
+								uni.navigateBack({
+									delta:1
+								})
+							},1000)
+							
+						}
+					},
+					false,
+					() => {
+						setTimeout(()=>{
+							uni.hideLoading()
+						},1000)
+						
+					}
+				);
+			},
+			workTypeChange(e){
+				this.workTypeIndex = e.detail.value;
+				this.userInfo.job_type = this.workTypeList[this.workTypeIndex].id;
+			},
+			experienceChange(e){
+				this.experienceIndex = e.detail.value;
+				this.userInfo.experience_label_id = this.experienceList[this.experienceIndex].id;
+			},
+			incumbencyChange(e){
+				this.incumbencyIndex = e.detail.value;
+				this.userInfo.work_status = this.incumbencyList[this.incumbencyIndex].id;
+			},
+			educationChange(e){
+				// 
+				this.educationIndex = e.detail.value;
+				this.userInfo.education_label_id = this.educationList[this.educationIndex].id;
+				// this.educationIndex = e.detail.value;
+				// this.userInfo.education = this.educationIndex + 1;
+			},
+			PartTypeChange(e){
+				this.PartTypeIndex = e.detail.value;
+				this.userInfo.part_type = this.PartTypeList[this.PartTypeIndex].id;
+			},
+			wayChange(e){
+				this.wayIndex = e.detail.value;
+				this.userInfo.part_settlement = this.wayList[this.wayIndex].id;
+			},
+			isAssignChange(e){
+				this.isAssignIndex = e.detail.value;
+				this.userInfo.full_type = this.isAssignList[this.isAssignIndex].id;
+			},
+			wderTypeChange(e){
+				this.wderTypeIndex = e.detail.value;
+				this.userInfo.job_type = this.wderTypeList[this.wderTypeIndex].id;
+				this.getChildTypeList();
+			},
+			
+			getChildTypeList(str){
+				let _this = this;
+				console.log(this.wderTypeList[this.wderTypeIndex])
+				App._post_form(
+					`&p=cultivateClass&do=getCultivateClassChildList`,
+					{cc_id: this.wderTypeList[this.wderTypeIndex].cc_id},
+					res => {
+						this.childTypeList = res.data.map(item=>{
+							return {
+								...item,
+								title: item.name
+							}
+						});
+						if(str=='回填'){
+							_this.childTypeList.map((item,index)=>{
+								if(item.id == _this.userInfo.cc_id){//cc_id=二级分类
+									_this.childTypeIndex = index;
+								}
+							})
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			childTypeChange(e){
+				this.childTypeIndex = e.detail.value;
+				this.userInfo.cc_id = this.childTypeList[this.childTypeIndex].id;
+				// console.log(this.userInfo.cc_id);
+			},
+			gendersChange(e){
+				this.gendersIndex = e.detail.value;
+				this.userInfo.gender = this.gendersList[this.gendersIndex].id;
+			},
+			genderChange(e){
+				this.genderIndex = e.detail.value;
+				this.userInfo.recruitment_type = this.genderIndex + 1;
+			},
+			bindPickerChange(e){
+				this.pickerindex = e.detail.value;
+				this.userInfo.meralid = this.pickerarray[this.pickerindex].id;
+			},
+			clickclassTwo(item){
+				this.businessList = [this.businessList[0],this.businessList[1],item];
+					this.industrysublevel.map(items=>{
+						items.checked = false;
+						this.businessList.map(it=>{
+							if(it.id == items.id){
+								items.checked = true;
+							}
+						})
+					});
+				
+			
+			
+			this.loadlogo = false;
+			this.loadlogo = true;
+			},
+			clickclass(item){
+				this.businessList = [this.businessList[0],item];
+				this.industrysublevel = [];
+				// console.log(item);
+				
+				this.industrysubdivide.map(items=>{
+					items.checked = false;
+					if(item.id == items.id){
+						items.checked = true;
+					}
+				});
+				App._post_form(
+					`&p=recruit&do=industryList&type=3&pid=${item.id}`,
+					{},
+					res => {
+						this.industrysublevel = res.data;
+						this.industrysublevel.map(item=>{
+							item.checked = false;
+							this.businessList.map(items=>{
+								if(items.id == item.id){
+									item.checked = true;
+									this.businessList = [this.businessList[0],this.businessList[1],item];
+								}
+							})
+						})
+						  
+						this.loadlogo = false;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+					}
+				);
+				// this.industryAll.map((items,indexs)=>{
+				// 	items.twotype.map((itemss,indexss)=>{
+				// 		itemss.checked = false;
+				// 		if(item.id == itemss.id){
+				// 			itemss.checked = true;
+				// 			this.industryclass = item.name
+				// 		}
+				// 	})
+				// })
+				
+				this.loadlogo = false;
+				this.loadlogo = true;
+			},
+			clickindustry(item){
+				this.businessList = [item];
+				this.industrysubdivide = [];
+				this.industrysublevel = [];
+				this.industry.map(items=>{
+					items.checked = false;
+					if(item.id == items.id){
+						items.checked = true;
+					}
+				})
+				App._post_form(
+					`&p=recruit&do=industryList&type=2&pid=${item.id}`,
+					{},
+					res => {
+						this.industrysubdivide = res.data;
+						this.industrysubdivide.map(item=>{
+							item.checked = false;
+						})
+						  
+						this.loadlogo = false;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+					}
+				);
+				// console.log(item);
+				
+			},
+			getenter(id){
+				let _this = this;
+				_this.userInfo = {
+					title:'',
+					industry_pid:'',
+					industry_id:'',
+					position_id:'',
+					recruitment_type:_this.userInfo.recruitment_type,
+					job_type:1,
+					full_type:1,
+					full_salary_min:'',
+					full_salary_max:'',
+					welfare:[],
+					part_type:1,
+					part_salary:'',
+					part_settlement:1,
+					contacts:'',
+					contact_phone:'',
+					gender:1,
+					age_min:'',
+					age_max:'',
+					job_description:'',
+					people_number:'',
+					img: [],
+					video_img_link: '',
+					video_link: '',
+					recruit_img: '',
+					cc_id: ''//工作二级分类,和其他接口一级分类id传参重名了，需要注意
+				}
+				
+				_this.owenscitylist.map((item,index)=>{
+					item.area.map(items=>{
+						items.dist.map(itemss=>{
+							if(itemss.id == _this.agencyData.areaid){
+								_this.userInfo.provinceid = item.id;
+								_this.userInfo.areaid = items.id;
+								_this.userInfo.distid = itemss.id;
+								_this.provinceidName = item.name;
+								_this.areaidName = items.name;
+								_this.distidName = itemss.name;
+							}
+						})
+					})
+				})
+				if(!_this.provinceidName){
+					_this.provinceidName = _this.languageStatus != 1?'请选择工作地区':'업무 지역을 선택하세요'
+				};
+				// App._post_form(
+				// 	`&p=yellowpage&do=getPageInfo&id=${id || ''}&sid=${_this.sid|| ''}`,
+				// 	{},
+				// 	res => {
+				// 		_this.oldDistid = _this.userInfo.area_code || res.data.distid;
+				// 		_this.userInfo.provinceid = _this.userInfo.pro_code || res.data.provinceid;
+				// 		_this.userInfo.areaid = _this.userInfo.city_code || res.data.areaid;
+				// 		_this.userInfo.distid = _this.userInfo.area_code || res.data.distid;
+						
+				// 	},
+				// 	false,
+				// 	() => {
+				// 		// console.log('行业加载完')
+				// 	}
+				// );
+			},
+			lookimg(type,url,index){
+				if(type == 1){
+					let img = [];
+					img.push(url);
+					uni.previewImage({
+						urls:img,
+						current:0
+					})
+				}else{
+					uni.previewImage({
+						urls:url,
+						current:index
+					})
+				}
+				
+			},
+			closePreview(type, url) {
+				let _this = this;
+				for (let i = 0; i < _this.userInfo.thumbs.length; i++) {
+					if (url == _this.userInfo.thumbs[i]) {
+						_this.userInfo.thumbs.splice(i, 1);
+						// _this.userInfo.thumbs.splice(i, 1);
+					}
+				}
+			},
+			closeLogo(){
+				this.userInfo.logo = '';
+				this.userInfo.avatar = '';
+			},
+			uplodephone(length,localIds){
+			let _this = this;
+					wxApi.uoloadIg(localIds[length], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+											let num = length + 1;
+											// uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+											// setTimeout(()=>{
+											// 	_this.uplodephone(_this.uploadlength,_this.localIds);
+											// },100)
+											// uni.showToast({
+											// 	title:'chengg',
+											// 	icon:'none'
+											// })
+											_this.userInfo.thumbs.push(res.data.img);
+											if(num < _this.uploadlength){
+												uni.setTimeout(_this.uplodephone(num,_this.localIds),500);
+											}
+											// _this.userInfo.thumbs.push(res.data.image);
+											
+										
+									}
+								},
+								false,
+								() => {
+									
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				
+			},
+
+			showThePic(){
+				let _this = this;
+				App._post_form(
+					`&p=recruit&do=industryList&type=1`,
+					{},
+					res => {
+						this.industry = res.data;
+						this.industry.map(item=>{
+							item.checked = false;
+							if(_this.businessList.length > 0 && _this.businessList[0].id == item.id){
+								item.checked = true;
+							}
+						})
+						  
+						this.hangYe = !this.hangYe;
+						this.hangyeshow = !this.hangyeshow;
+					},
+					false,
+					() => {
+					}
+				);
+				
+				
+			},
+			closeShareBottom(){
+				this.hangyeshow = !this.hangyeshow;
+				this.hangYe = !this.hangYe;
+			},
+			onCancel(){
+				
+			},
+			cancel(){
+				this.hangyeshow = false;
+			},
+			confirm(){
+				this.hangyeshow = false;
+			},
+			getcityclass(){
+				return
+				let _this = this;
+				let data = {
+					provinceid:this.userInfo.provinceid,
+					areaid:this.userInfo.areaid,
+					distid:this.userInfo.distid
+				}
+				App._post_form(
+					`&p=yellowpage&do=area2cate`,
+					data,
+					res => {
+						
+						console.log(res,'更换地区结果');
+						_this.industry = res.data.parents;
+						for(let key  in _this.industry){
+								_this.industry[key].checked = false;
+						  };
+						  console.log(_this.industry,'测试自动');
+						_this.industryAll = res.data.childrens;
+						for(let key  in _this.industryAll){
+								_this.industryAll[key].map(item=>{
+									item.checked = false;
+									if(item.id == _this.userInfo.two_class){
+										_this.industrysubdivide = [];
+										_this.loadlogo = false;
+										_this.loadlogo = true;
+									}
+								})
+								console.log(_this.industryAll,'还地区')
+						  };
+						  _this.userInfo.one_class = '';
+						  _this.userInfo.two_class = '';
+						   _this.industryclass = '';
+						  if(Array.isArray(res.data.childrens) || Array.isArray(res.data.parents)){
+							  _this.industrysubdivide = res.data.childrens;
+							  _this.industryclass = '当前地区暂无行业分类';
+							  
+							  if(_this.oldDistid !== _this.userInfo.distid){
+							  	uni.showToast({
+							  		title:'当前地区暂无行业分类',
+							  									icon:'none'
+							  	});
+							  }
+						  }else{
+							  console.log(_this.oldDistid,_this.userInfo.distid,777777)
+							  if(_this.oldDistid !== _this.userInfo.distid){
+								  uni.showToast({
+								  	title:'更换地区请重新选择当前地区行业',
+								  	icon:'none'
+								  });
+							  }
+						  }
+						  _this.loadlogo = false;
+						  _this.loadlogo = true;
+						// App.navigationTo({
+						// 	url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid
+						// });
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			onConfirm(e){
+				console.log(e);
+				let _this = this;
+				this.provinceidName = e.obj.province.label;
+				this.areaidName = e.obj.city.label;
+				this.distidName = e.obj.area.label;
+				this.oldDistid = this.userInfo.distid;
+				this.userInfo.provinceid = e.value[0];
+				this.userInfo.areaid = e.value[1];
+				this.userInfo.distid = e.value[2];
+				// this.getcityclass();
+			},
+			visble(){
+				this.visiblec = true;
+			},
+			getLocation() {
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						_this.userInfo.address = e.address;
+						_this.userInfo.lat = e.latitude;
+						_this.userInfo.lng = e.longitude;
+						_this.lblis.lat = e.latitude;
+						_this.lblis.lng = e.longitude;
+						_this.lblis.address = e.address
+						// console.log(e);
+						// _this.onkoc = 0;
+						_this.getloctions(_this.lblis)
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				//#endif
+			},
+			getloctions(lblis){
+				let _this = this;
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					_this.oldDistid = _this.userInfo.distid;
+					_this.userInfo.provinceid = res.data.provinceid;
+					_this.userInfo.distid = res.data.countyid;
+					_this.userInfo.areaid = res.data.cityid;
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userInfo.provinceid){
+							_this.provinceidName = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userInfo.areaid){
+									_this.areaidName = items.name;
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userInfo.distid){
+											_this.distidName = itemss.name;
+											// this.getcityclass();
+										}
+									})
+								}
+							})
+						}
+					})
+				});
+			},
+			// 删除图片
+			deletImg(item, deleteType) {
+				let _this = this;
+				if(deleteType == 'img'){
+					// for (let i = 0; i < _this.images.length; i++) {
+					// 	if (_this.images[i] == item) {
+					// 		_this.images.splice(i, 1);
+					// 	}
+					// }
+					for (let i = 0; i < _this.userInfo.img.length; i++) {
+						if (_this.userInfo.img[i] == item) {
+							_this.userInfo.img.splice(i, 1);
+						}
+					}
+				}else if(deleteType == 'video'){
+					_this.userInfo.video_img_link = '';
+				}else if(deleteType == 'recruit_img'){
+					_this.userInfo.recruit_img = '';
+				}
+				
+			},
+			// 文件上传接口
+			async uploadFiles(len, uploadType) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(len);
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let imageData = await App._upLoad(res.tempFilePaths[i]);
+						// _this.images.push(imageData.data.img);
+						_this.userInfo.img.push(imageData.data.img);
+					}
+			
+					return
+				}
+				// debugger
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							let length = res.localIds.length;
+							let ids = 0;
+							let resImg = res;
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+										if (res.errno === 0) {
+											// _this.images.push(res.data.img);
+											_this.userInfo.img.push(res.data.img);
+											if (ids < length - 1) {
+												ids++;
+												uni.setTimeout(_this.uoloadIgs(length, ids, resImg), 500);
+											}
+										}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				},9);
+				// wxApi.choseImage(res => {
+				// 	console.log(res)
+				// 	let i = res.localIds.length;
+				// 	_this.uoloadIgs(i, 0, res);
+				// }, 6);
+				// #endif
+				// #ifndef H5
+				wx.chooseMedia({//基础库 2.10.0 开始支持
+					count: len,
+					mediaType: ['image'],
+					sourceType: ['album', 'camera'],
+					sizeType: ['original', 'compressed'],
+					success: async function(res) {
+						console.log(res.tempFiles.length, 'res.tempFiles.length')
+						for (let i = 0; i < res.tempFiles.length; i++) {
+							let imageData = await App._upLoad(res.tempFiles[i].tempFilePath);
+							console.log(imageData.data.img, 111)
+							if(imageData.data.img){
+								if(uploadType=='img'){
+									// _this.images.push(imageData.data.img);
+									_this.userInfo.img.push(imageData.data.img);
+									console.log(_this.userInfo.img, '测试userInfo.img')
+									// console.log(_this.images, '测试images')
+								}else if(uploadType=='video'){
+									_this.userInfo.video_img_link = imageData.data.img;
+								}else if(uploadType=='recruit_img'){
+									_this.userInfo.recruit_img = imageData.data.img;
+								}
+							}else{
+								uni.showToast({
+									title:"上传失败",
+									icon:'none'
+								})
+							}
+						}
+					}
+				});
+				// #endif
+			},
+			upButton() {
+				let _this = this;
+				// #ifdef H5
+				if (_this.isAndroid === '2') {
+					return document.getElementById('fileInput').click();
+				} else {
+					_this.ChooseVdo();
+				}
+				// #endif
+				// #ifndef H5
+				_this.ChooseVdo();
+				// #endif
+			},
+			ChooseVdo() {
+				let _this = this;
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						_this.userInfo.video_link = res.tempFilePath;
+						console.info(res.tempFilePath);
+						let siteroot = null;
+						siteroot = App.siteInfo.siteroot + `${App.routers}`;
+						uni.showLoading();
+						uni.uploadFile({
+							url: App.api_root + '&do=uploadFiles',
+							filePath: res.tempFilePath,
+							name: 'file',
+							formData: {
+								upload_type: 1,
+								is_base: 1
+							},
+							success: res => {
+								let data = JSON.parse(res.data),
+									base64 = new _this.$util.Base64();
+								console.info('data', data);
+								// _this.marginT.marginTop = '380rpx'
+								if (data.errno === 0) {
+									_this.src = base64.decode(data.data.img);
+									_this.userInfo.video_link = base64.decode(data.data.image);
+									_this.isAdclose = true;
+								} else {
+									App.showError(data.message, () => {});
+								}
+								uni.hideLoading();
+							},
+							fail: res => {
+								console.info('resInfofail', res);
+								// _this.showmain = JSON.stringify(res);
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			// 删除视频
+			deletVideo() {
+				let _this = this;
+				_this.src = '';
+				_this.userInfo.video_link = '';
+				_this.userInfo.video_img_link = '';
+				_this.isAdclose = false;
+				// _this.marginT.marginTop = '20rpx'
+			},
+		}
+	}
+</script>
+
+<style>
+	/* @font-face {
+		font-family:"iconfont";
+		src: url();
+	} */
+		/*每个页面公共css */
+		@import '../../../../common/css/common.css';
+		@import "../../../../common/css/new_iconfont.css";
+		@import '../../../../common/css/iconfont.css';
+		@import '../../../../pages/subPages2/grace/animate.css';
+		/* @import './pages/subPages2/grace/graceIcons.css'; */
+		/* @import './pages/subPages2/grace/graceUI.css';
+	@import './pages/subPages/grace2/graceWeex.css'; */
+
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.enterForm{
+		// padding: 30upx;
+		.bgimgbox{
+			padding: 30upx 30upx 0;
+			font-size: 24upx;
+			.bgimg{
+				width: 100vw;
+				height: 25vh;
+			}
+		}
+		.formbox{
+			padding: 30upx;
+			padding-bottom: 130upx;
+			// height: 50vh;
+			position: relative;
+			.formdatabox{
+				padding: 30upx;
+				width: 84vw;
+				background-color: #FFFFFF;
+				border-radius: 15upx;
+				// position: relative;
+				// top: -100upx;
+				.sign{
+					height: 28upx;
+					margin-top: 5upx;
+					width: 8upx;
+					background-color: #FF4444;
+					border-radius: 30%;
+					flex: 0.014;
+				}
+			}
+			.logobox{
+				span{
+					font-size: 24upx;
+				}
+				.userImgUpdataon{
+					width: 180upx;
+					margin: 20upx 0;
+					height: 180upx;
+					border-radius: 10upx;
+					border: 1upx solid #CCCCCC;
+					position: relative;
+					overflow: hidden;
+					.imgs{
+						width: 180upx;
+						height: 180upx;
+					}
+					.close{
+						position: absolute;
+						width: 30upx;
+						height: 30upx;
+						right: 10upx;
+						top: 10upx;
+					}
+				}
+				.userImgUpdata{
+					width: 180upx;
+					margin: 20upx 0;
+					height: 180upx;
+					border-radius: 10upx;
+					border: 1upx solid #CCCCCC;
+					position: relative;
+					.img{
+						width: 80upx;
+						height: 80upx;
+						position: absolute;
+						left: 50%;
+						top: 30%;
+						transform: translate(-50%);
+					}
+				}
+			}
+			.formtitle{
+				padding: 25upx 10upx;
+				background-color: #fafafa;
+				margin-top: 20upx;
+				border-radius: 10upx;
+				.inputBox{
+					/deep/ .uni-input-input{
+						// padding: 5upx 20upx;
+						border-radius: 8upx;
+						// width: 90%;
+						text-align: center;
+						// border: 1upx solid #FF4444;
+						font-size: 26upx;
+						// color: #FF4444;
+					}
+				}
+			}
+		}
+		.iframe-wid-hgt{
+			width: 100vw;
+		}
+		.hangye{
+			height: 40vh;
+			width: 100vw;
+			box-sizing: border-box;
+			padding: 30upx;
+			padding-bottom: 200upx;
+			background-color: #FFFFFF;
+			border-radius: 15upx 15upx 0 0;
+			.industryclass-item{
+				padding: 20upx;
+				margin: 15upx;
+				text-align: center;
+				border-radius: 15upx;
+			}
+			.classcheck{
+				background-color: #F7F7F7;
+			}
+			.isclasschecked{
+				background-color: #ff4444;
+				color: #ffffff;
+			}
+		}
+		.timePickerView{
+			width: 100%;
+		}
+	}
+	.after-work{
+		width: 92vw;
+		height: 96vh;
+		background-color: #F8F8F8;
+		padding: 30upx;
+		overflow: auto;
+		.after-work-title{
+			font-size: 28upx;
+		}
+		.after-item{
+			margin-bottom: 30upx;
+			border-radius: 20upx;
+			padding: 30upx;
+			background-color: #FFFFFF;
+			.after-item-item{
+				padding-bottom: 20upx;
+			}
+		}
+		.work-btn{
+			position: fixed;
+			bottom: 30upx;
+			left: 50%;
+			transform: translate(-50%);
+			display: inline-block;
+			// margin-left: 32%;
+			padding: 15upx 100upx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			border-radius: 8upx;
+		}
+		.add-work{
+			width: 80vw;
+			padding: 30upx;
+			// height: 50vh;
+			background-color: #ffffff;
+			border-radius: 15upx;
+			position: relative;
+			.redbtn{
+				width: 50%;
+				padding: 10upx;
+				background-color: #FF4444;
+				color: #FFFFFF;
+				border-radius: 10upx;
+				position: absolute;
+				bottom: -10%;
+				left: 50%;
+				transform: translate(-50%);
+			}
+		}
+		
+	}
+	.welfareCss{
+		width: 92vw;
+		padding: 30upx;
+		background-color: #FFFFFF;
+		height: 40vh;
+		overflow: auto;
+		border-radius: 20upx 20upx 0 0;
+		.welfare-item{
+			display: inline-block;
+			padding: 5upx 20upx;
+			background-color: #EEEEEE;
+			color: #666666;
+			border-radius: 4upx;
+			font-size: 26upx;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+		}
+		.welfare-item-check{
+			display: inline-block;
+			padding: 5upx 20upx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			border-radius: 4upx;
+			font-size: 26upx;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+		}
+	}
+	.upLoadFile {
+		margin: 20upx 0 0 0upx;
+	
+		>view {
+			margin-top: 10upx;
+			vertical-align: middle;
+			margin-right: 20upx;
+			display: inline-block;
+			width: 134upx;
+			height: 134upx;
+			background: rgba(251, 251, 251, 1);
+			border: 1upx dashed rgba(204, 204, 204, 1);
+			border-radius: 10upx;
+		}
+	}
+	.zsVideo {
+		background: red;
+		margin-top: 20upx;
+		width: 630upx;
+		height: 355upx;
+		border-radius: 10upx;
+		// position: absolute;
+		z-index: 10;
+	}
+	.zsView {
+		vertical-align: middle !important;
+		display: inline-block !important;
+		width: 134upx !important;
+		height: 133upx !important;
+		border-radius: 10upx !important;
+		overflow: hidden !important;
+		border: none !important;
+	
+		>image:nth-child(1) {
+			width: 134upx !important;
+			height: 133upx !important;
+		}
+	
+		>image:nth-child(2) {
+			left: 100upx;
+			position: relative;
+			bottom: 130upx;
+			width: 34upx;
+			height: 34upx;
+			border-radius: 50%;
+		}
+	}
+	.upLoadImg {
+		text-align: center;
+	
+		>view {
+			>image {
+				width: 48upx;
+				height: 48upx;
+				margin: 30upx 0upx 0upx 0upx;
+			}
+		}
+	}
+	.upLoadVideo {
+		text-align: center;
+	
+		>view {
+			>image {
+				width: 48upx;
+				height: 48upx;
+				margin: 30upx 0upx 0upx 0upx;
+			}
+		}
+	}
+	.upText {
+		font-size: 22upx;
+		color: rgba(51, 51, 51, 1);
+	}
+	.closeImg {
+		width: 40upx;
+		height: 40upx;
+		float: right;
+		position: relative;
+		z-index: 999;
+	}
+	.adcloseImg {
+		width: 40upx;
+		height: 40upx;
+	}
+	.modal_A{
+		width: 608upx;
+		height: 336upx;
+		text-align: center;
+		background: #fff;
+		border-radius: 10px;
+		overflow: hidden;
+		
+		.title{
+			font-size: 16px;
+			color: #444444;
+			line-height: 96upx;
+			padding: 12upx 0px;
+		}
+		.content{
+			font-size: 14px;
+			color: #999;
+			line-height: 48upx;
+			padding: 0px 124upx;
+		}
+		.dis-flex{
+			font-size: 14px;
+			border-top: 1px solid #e4e4e4;
+			line-height: 80upx;
+			margin-top: 38rpx;
+		}
+		.left-1{
+			border-right: 1px solid #e4e4e4;
+			color: #376CF3;
+			flex: 0.54;
+		}
+		.left-2{
+			border-right: 1px solid #e4e4e4;
+			color: #444;
+			flex: 0.23;
+		}
+		.right{
+			color: #999;
+			flex: 0.23;
+		}
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue b/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
new file mode 100644
index 0000000..4514139
--- /dev/null
+++ b/pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails.vue
@@ -0,0 +1,757 @@
+<template>
+	<view >
+		<far-bottom></far-bottom>
+		<loadlogo v-if="!loadlogo" />
+		<view class="recruitmentDetails" v-else>
+			<view class="media_wrapper" v-if="recruitmentDetails.video_link || recruitmentDetails.img.length>0">
+				<video id="myvideo" class="videoPlay" :src="recruitmentDetails.video_link" v-if="showVideo&&recruitmentDetails.video_link" :poster="recruitmentDetails.video_img_link"></video>
+				<!-- <view class="videoPlay" style="position: absolute;left: 0;top: 35px;" -->
+				 <!-- @click.stop="playing(recruitmentDetails.video_link)"></view> -->
+				<swiper :indicator-dots="true" :autoplay="true" :interval="3000" :duration="1000"
+				 v-if="!showVideo&&recruitmentDetails.img.length>0" indicator-active-color="#ffffff">
+					<swiper-item v-for="(item, index) in recruitmentDetails.img" :key="index">
+						<view class="swiper-item">
+							<image :src="item" mode="aspectFill"></image>
+						</view>
+					</swiper-item>
+				</swiper>
+				<view class="type_indicator" v-if="recruitmentDetails.video_link || recruitmentDetails.img.length>0">
+					<view class="indicator-item" :class="showVideo?'active':''" v-if="recruitmentDetails.video_link" @click="changeMedia(true)">视频</view>
+					<view class="indicator-item" :class="!showVideo?'active':''" v-if="recruitmentDetails.img.length>0" @click="changeMedia(false)">图集</view>
+				</view>
+			</view>
+			<!-- <view class="dis-flex" style="margin-bottom: 20upx;">
+				<view class="page_tab" :class="detail_page==1?'active':''" @click="changePage(1)">岗位信息</view>
+				<view class="page_tab" :class="detail_page==2?'active':''" @click="changePage(2)" v-if="recruitmentDetails.recruit_long_img.length>0">企业长图</view>
+			</view> -->
+			<view class="detail_page" v-if="detail_page==1">
+				<view class="Details-title">
+					<view class="dis-il-block Details">{{ recruitmentDetails.title }}</view>
+					<view class="sticky" v-if="recruitmentDetails.is_top == 1">顶</view>
+					<view class="dis-il-block salary">{{ recruitmentDetails.salary }}</view>
+				</view>
+				<view class="Details-tags">
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'gongzuo.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.experience }}</view>
+					</view>
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'xueli.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.education }}</view>
+					</view>
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'cksl.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.pv }}</view>
+					</view>
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'shengri.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.age }}</view>
+					</view>
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'xingbie.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.gender_text }}</view>
+					</view>
+					<view class="tags-item">
+						<image :src="imgfixUrls + 'dingwei.png'" mode=""></image>
+						<view class="dis-il-block text">{{ recruitmentDetails.region }}</view>
+					</view>
+					<view class="tags-item" v-if="recruitmentDetails.people_number && recruitmentDetails.people_number != '0'">
+						<view class="dis-il-block iconfont icon-friend_light" style="line-height: 30upx;">
+							
+						</view>
+						<view class="dis-il-block text">{{ recruitmentDetails.people_number }}人</view>
+					</view>
+				</view>
+				<view class="psition-details">
+					<view class="psition-title">
+						<view class="title dis-il-block" style="display: inline-block;">职位详情</view>
+						<view class="date dis-il-block" style="display: inline-block;">发布于{{ recruitmentDetails.release_time }}</view>
+					</view>
+					<view class="psition-tag">
+						<view class="dis-il-block tag-item" v-for="(item, index) in recruitmentDetails.welfare_list" :key="index">{{ item }}</view>
+					</view>
+					<view class="psition-tag">
+						<view class="dis-il-block tag-item">{{ recruitmentDetails.release.nature }}</view>
+						<view class="dis-il-block tag-item">{{ recruitmentDetails.release.scale }}</view>
+						<view class="dis-il-block tag-item">{{ recruitmentDetails.release.industry }}</view>
+					</view>
+					<view class="qualification" v-if="0">
+						<view class="qualification-entry">
+							{{recruitmentDetails.release.nature}} · {{recruitmentDetails.release.scale}} · {{recruitmentDetails.release.industry}}
+						</view>
+					</view>
+			<view class="" v-if="111===0">
+				<view class="ksfjaslfjsa">热更新频繁报错，写东西进去再更新一下 </view>
+				<view class="ksfjaslfjsa">dgjthdgdrwelktu</view>
+			</view>
+					<view class="qualification" v-if="recruitmentDetails.job_description">
+						<view class="qualification-title">任职资格:</view>
+						<view class="qualification-entry">
+							<view class="entry-item" :style="{height: 'auto'}">
+								<!-- <jyf-parser
+									domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+									gesture-zoom
+									lazy-load
+									ref="article"
+									selectable
+									show-with-animation
+									use-anchor
+									:html="recruitmentDetails.job_description"
+								></jyf-parser> -->
+								<text class="entry-text">{{recruitmentDetails.job_description}}</text>
+							</view>
+						</view>
+						<view class="lookall" @click="lookalls" v-if="recruitmentDetails.job_description && dataHeight > 50">
+							<!-- <text style="color: #666666;">...</text> -->
+							<text>{{ lookindex == 6 ? '查看全部' : '收起' }}</text>
+						</view>
+					</view>
+					<view class="psition-title" v-if="recruitmentDetails.recruit_long_img.length>0">
+						<view class="title dis-il-block" style="display: inline-block;">企业简介</view>
+					</view>
+					<view class="psition-tag" v-if="recruitmentDetails.recruit_long_img.length>0">
+						<image class="longpic" :src="item" mode="widthFix" v-for="(item, index) in recruitmentDetails.recruit_long_img" :key="index"></image>
+					</view>
+				</view>
+				<view class="information">
+					<view class="dis-flex" @click="nvgeing">
+						<view class="information-img"><image :src="recruitmentDetails.release.logo" mode=""></image></view>
+						<view class="information-content">
+							<view class="content-name">
+								<view class="dis-il-block" style="display: inline-block;font-size: 32upx;">{{ recruitmentDetails.release.name }}</view>
+								<view class="dis-il-block authentication" v-if="recruitmentDetails.release.is_authentication == 1">已认证</view>
+							</view>
+							<view class="content-tag" v-if="recruitmentDetails.release.nature || recruitmentDetails.release.scale || recruitmentDetails.release.industry">
+								{{ recruitmentDetails.release.nature }} · {{ recruitmentDetails.release.scale }} · {{ recruitmentDetails.release.industry }}
+							</view>
+						</view>
+						<view class="iconfont icon-right t-r f-24" style="flex: 0.05;line-height: 100upx;" v-if="recruitmentDetails.recruitment_type != '1'"></view>
+					</view>
+				</view>
+				<view class="orientation">
+					<view class="f-32 f-w t-l">所在地址</view>
+					<view class="dis-flex p-top-bom-30">
+						<view class="orientation-loc">{{ recruitmentDetails.work_address }}</view>
+						<view class="locBnt t-c" @click="openNavigation">
+							<text class="iconfont icon-daohang1"></text>
+							<text style="padding-left: 10upx;">导航</text>
+						</view>
+					</view>
+				</view>
+				<view class="orientation">
+					<view class="f-32 f-w t-l">
+						免责声明
+						<!-- <text class="iconfont icon-tishi" style="color: #FF4444;padding-left: 20upx;"></text> -->
+					</view>
+					<view class="dis-flex p-top-bom-30">
+						<view class="f-28 col-3" style="max-height: 300upx;overflow: auto;"><text>{{ recruitmentDetails.desc_disclaimers }}</text></view>
+					</view>
+				</view>
+				<view class="position-title" v-if="recommendList.length > 0">职位推荐</view>
+				<view class="recommend-position" v-if="recommendList.length > 0">
+					<!-- <workList :inviteList="recruitmentDetails.recommend"></workList> -->
+					<view v-for="(item,index) in recommendList" :key="index" class="recommend-item" @click="toNewDetail(item)">
+						<image :src="item.release.logo" mode=""></image>
+						<view style="font-size: 14px;" class="leave_out">{{item.title}}</view>
+						<view style="color: #f00;font-size: 13px;">{{item.salary}}</view>
+					</view>
+				</view>
+				
+			</view>
+			<view class="detail_page" v-if="detail_page==2">
+				
+			</view>
+			<view class="btn-box dis-flex">
+				<view class="left-btn-group">
+					<button class="collectBtn" open-type="contact" hover-class="none"
+					 style="background: none;">
+						<view style="font-size: 21px;margin-bottom: 3px;" class="iconfont icon-service"></view>
+						联系客服
+					</button>
+					<view class="collectBtn" @click="collect(pageId)">
+						<view style="font-size: 21px;margin-bottom: 3px;" v-if="!recruitmentDetails.is_collect" class="iconfont icon-favor"></view>
+						<view style="font-size: 21px;margin-bottom: 3px;color: #f00;" v-else class="iconfont icon-favorfill"></view>
+						收藏
+					</view>
+				</view>
+				<view class="right-btn-group">
+					<view class="playcall" @click="playcall">电话沟通</view>
+					<view class="candidate" v-if="recruitmentDetails.is_delivery == 0" @click="applicant">我要应聘</view>
+					<view class="candidate" v-else style="background-color: #999999;border: 1upx solid #999999;">我要应聘</view>
+				</view>
+			</view>
+		</view>
+		<!-- 全屏视频 -->
+		<!-- <PopManager :show="videoshow" @clickmask="videoshow = false" type="center">
+			<view v-if="videoshow" class="videoshow">
+				<video id="myvideo" :src="videolint" @fullscreenchange="videoControl"  style="width: 100%;height: 100%;"
+				  @click.stop="" :show-fullscreen-btn="false" autoplay ></video>
+				<view  style="position: absolute;left: 30upx;top: 80upx;color: #ffffff;padding: 10upx 20upx;border-radius: 60upx;background-color: rgba(255,255,255,0.3);" @click.stop="videoshow = false">
+				 	<text class="iconfont icon-roundleftfill" style="font-size: 36upx;"></text>
+					<text class="f-36">返回</text>
+				</view>
+			</view>
+		</PopManager> -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import workList from '@/components/template/workList.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import Map from '@/common/js/ms-openMap/openMap.js'
+import PopManager from '@/components/template/PopManager';
+export default {
+	data() {
+		return {
+			lookindex: 6,
+			pageId: '',
+			recruitmentDetails: {},
+			loadlogo: false,
+			dataHeight:0,
+			showVideo: true,
+			album: [1, 2],
+			detail_page: 1,
+			videoshow: '',
+			videolint: '',
+			recommendList: [],
+		};
+	},
+	components:{
+		PopManager
+	},
+	onLoad(e) {
+		this.pageId = e.id;
+		this.getRecruitmentDetails();
+		this.getPositionRecommendList();
+		// 页面初次渲染！  createVideoContext uni video自带 上下文 如果不懂可以去百度
+		this.videoContext = uni.createVideoContext('myvideo');
+		// this.videoContext.requestFullScreen();
+	},
+	components: {
+		workList,
+		Loadlogo,
+		jyfParser
+	},
+	methods: {
+		changeMedia(type){
+			if(this.showVideo==type) return;
+			this.showVideo = type;
+		},
+		changePage(page){
+			if(this.detail_page==page) return;
+			this.detail_page = page;
+		},
+		openNavigation() {
+			let detailsData = this.recruitmentDetails;
+			detailsData.location = {
+				lat: detailsData.work_lat,
+				lng: detailsData.work_lng
+			};
+			detailsData.lat = detailsData.work_lat;
+			detailsData.lng = detailsData.work_lng;
+			detailsData.address = detailsData.work_address;
+			detailsData.storename = detailsData.title;
+			// #ifdef H5
+			console.log(detailsData);
+			wxApi.WxopenLocation(detailsData['lat'], detailsData['lng'], detailsData['storename'], detailsData['address']);
+			// #endif
+			// #ifdef MP-WEIXIN
+			App.openLocation(detailsData);
+			// #endif
+			//#ifdef APP-PLUS
+			Map.openMap(Number(detailsData['lat']),Number(detailsData['lng']),detailsData['storename'],'gcj02')
+			 //#endif
+		},
+		playcall() {
+			uni.makePhoneCall({
+				phoneNumber: this.recruitmentDetails.contact_phone //仅为示例
+			});
+		},
+		applicant() {
+			App.showError(
+				`是否向该职位投递简历?`,
+				data => {
+					if (data.confirm) {
+						App._post_form(
+							`&p=recruit&do=submitResume`,
+							{ id: this.pageId },
+							res => {
+								uni.showToast({
+									title: res.message
+								});
+								this.getRecruitmentDetails();
+							},
+							fail => {
+								// debugger
+								if (fail.data.message == '请先完善简历信息！') {
+									App.navigationTo({
+										url: 'pages/subPages2/hirePlatform/addResume/addResume'
+									});
+								}
+							}
+						);
+					}
+				},
+				true
+			);
+		},
+		nvgeing() {
+			if (this.recruitmentDetails.recruitment_type == 1) return;
+			App.navigationTo({
+				url: 'pages/subPages2/hirePlatform/companyDetails/companyDetails?id=' + this.recruitmentDetails.release_sid
+			});
+		},
+		getRecruitmentDetails() {
+			let _this = this;
+			App._post_form(
+				`&p=recruit&do=recruitDesc`,
+				{ id: this.pageId },
+				res => {
+					this.recruitmentDetails = res.data;
+					if(!this.recruitmentDetails.video_link){
+						this.showVideo = false;
+					}
+					this.$nextTick(function(){
+						setTimeout(()=>{
+							uni.createSelectorQuery().in(_this).select('.entry-text').boundingClientRect(data => {
+								_this.dataHeight = data.height;
+								console.log(data,_this.dataHeight,2333333)
+							}).exec();
+						})
+					})
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		getPositionRecommendList(){
+			let _this = this;
+			App._post_form(
+				`&p=recruit&do=getPositionRecommendList`,
+				{ recruit_id: this.pageId },
+				res => {
+					this.recommendList = res.data;
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		lookalls() {
+			if (this.lookindex == 6) {
+				this.lookindex = 9999;
+			} else {
+				this.lookindex = 6;
+			}
+		},
+		videoControl(e){
+			console.log(e)
+			if(e.detail.fullScreen){  //e.detail.fullScreen是否为全屏
+				this.videoContext.play();
+			}else{
+				//停止播放
+				// this.videoContext.stop();   各位老板不要选择stop 选择了stop 缩小视频还会自动播放
+				this.videoContext.pause();
+			}
+		},
+		playing(lint) {
+			this.videoshow = true;
+			this.videolint = lint;
+			// 获取当前视频id
+			// let currentId = e.currentTarget.dataset.id
+			// uni.createVideoContext获取视频上下文对象
+			this.videoContext.requestFullScreen({
+				direction:0
+			})
+		 },
+		 collect(recruit_id){
+			 let type = !this.recruitmentDetails.is_collect ? 'collect' : 'cancel';
+			 let id = !this.recruitmentDetails.is_collect ? '' : this.recruitmentDetails.collect_id.id;
+			 App._post_form(
+			 	`&p=recruit&do=recruitCollect`,
+			 	{
+					type: type,
+					recruit_id: recruit_id,
+					id: id
+				},
+			 	res => {
+					if(res.errno==0){
+						uni.showToast({
+							title: res.message,
+							icon: 'none'
+						})
+						this.recruitmentDetails.is_collect = !this.recruitmentDetails.is_collect;
+						this.getRecruitmentDetails();
+					}
+			 	},
+			 	false,
+			 	() => {
+			 		
+			 	}
+			 );
+		 },
+		 toNewDetail(item){
+			 App.navigationTo({
+			 	url: "pages/subPages2/hirePlatform/recruitmentDetails/recruitmentDetails?id=" + item.id
+			 });
+		 },
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+	.dis-flex{
+		display: flex;
+	}
+.recruitmentDetails {
+	// padding: 50upx 0upx 190upx;
+	padding: 0upx 0upx 190upx;
+	.media_wrapper{
+		width: 100vw;
+		height: 422rpx;
+		position: relative;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		background-color: #00000d;
+		.videoPlay{
+			width: 100vw;
+			height: 422rpx;
+		}
+		swiper, image{
+			width: 100vw;
+			height: 422rpx;
+		}
+	}
+	.type_indicator{
+		width: 90px;
+		height: 26px;
+		line-height: 26px;
+		position: absolute;
+		top: 6px;
+		left: 10px;
+		display: flex;
+		justify-content: space-around;
+		color: #ffffff;
+		background: rgba(255, 255, 255, 0.1);
+		border-radius: 15px;
+		font-size: 12px;
+		.indicator-item{
+			padding: 0 10px;
+			line-height: 26px;
+		}
+		.indicator-item.active{
+			color: #333;
+			background-color: #fff;
+			border-radius: 15px;
+		}
+	}
+	.page_tab{
+		padding: 10upx 30upx;
+		line-height: 30px;
+		color: #666;
+		font-size: 15px;
+		&.active{
+			color: #f00;
+			position: relative;
+		}
+		&.active::after{
+			content: '';
+			position: absolute;
+			width: 16px;
+			height: 4px;
+			background-color: #f00;
+			border-radius: 3px;
+			bottom: 0px;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	}
+	.Details-title {
+		padding: 20upx 30upx;
+		.Details {
+			font-size: 40upx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+		.sticky {
+			font-size: 22upx;
+			background: #f1c426;
+			border-radius: 4upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			padding: 3upx 5upx;
+			display: inline-block;
+			margin-left: 20upx;
+		}
+		.salary {
+			font-size: 36upx;
+			font-family: PingFang SC;
+			font-weight: 600;
+			color: #ff4444;
+			text-align: right;
+			float: right;
+		}
+	}
+	.Details-tags {
+		padding: 0 30upx;
+		display: flex;
+		flex-wrap: wrap;
+		width: 80%;
+		padding-top: 30upx;
+		justify-content: space-between;
+		padding-bottom: 10upx;
+		.tags-item {
+			flex: 0 0 30%;
+			// height:210upx;
+			display: flex;
+			padding-bottom: 20upx;
+
+			image {
+				height: 30upx;
+				width: 30upx;
+			}
+			.text {
+				width: 130upx;
+				overflow: hidden;/*超出部分隐藏*/
+				white-space: nowrap;/*不换行*/
+				text-overflow:ellipsis;/*超出部分文字以...显示*/
+				padding-left: 20upx;
+				font-size: 26upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+				vertical-align: top;
+				
+			}
+		}
+	}
+	.Details-tags:after {
+		content: ' ';
+		flex: 0 0 30%;
+	}
+	.psition-details {
+		padding: 0 30upx;
+		.psition-title {
+			padding-top: 40upx;
+			border-top: 1upx solid #eeeeee;
+
+			.title {
+				font-size: 30upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.date {
+				float: right;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #999999;
+				line-height: 52upx;
+			}
+		}
+		.psition-tag {
+			padding: 40upx 0 0;
+			.tag-item {
+				background: #f4f4f4;
+				border-radius: 4upx;
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				padding: 10upx 20upx;
+				margin: 0 10upx 10upx 0;
+			}
+		}
+		.qualification {
+			.qualification-title {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 96upx;
+			}
+			.qualification-entry {
+				.entry-item {
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #666666;
+					line-height: 48upx;
+					padding: 20upx 0;
+					overflow: hidden;
+				}
+			}
+			.lookall {
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3388ff;
+				line-height: 48upx;
+			}
+		}
+	}
+	.information {
+		border-top: 20upx solid #f8f8f8;
+		border-bottom: 20upx solid #f8f8f8;
+		padding: 30upx;
+		.information-img {
+			flex: 0.2;
+			image {
+				width: 100upx;
+				height: 100upx;
+				border-radius: 10upx;
+			}
+		}
+		.information-content {
+			flex: 0.75;
+			.content-name {
+				font-size: 22upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				.authentication {
+					// font-size: 22upx;
+					// font-weight: 500;
+					// color: #FFFFFF;
+					background: #3388ff;
+					border-radius: 4upx;
+					color: #ffffff;
+					padding: 3upx 7upx;
+					margin-left: 20upx;
+				}
+			}
+			.content-tag {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				padding-top: 25upx;
+			}
+		}
+	}
+	.orientation {
+		border-bottom: 20upx solid #f8f8f8;
+		padding: 30upx;
+		.orientation-loc {
+			flex: 0.8;
+			font-size: 26upx;
+			color: #666666;
+			padding-top: 10upx;
+			line-height: 28px;
+		}
+		.locBnt {
+			flex: 0.2;
+			font-size: 28upx;
+			color: #3388ff;
+			border-radius: 60upx;
+			border: 1upx solid #3388ff;
+			padding: 10upx 20upx;
+			align-self: center;
+			line-height: 20px;
+		}
+	}
+	.position-title {
+		font-size: 32upx;
+		padding: 30upx 30upx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+		// border-bottom: 1upx solid #EEEEEE;
+	}
+	.recommend-position {
+		display: flex;
+		justify-content: space-around;
+		flex-wrap: wrap;
+		.recommend-item{
+			width: 29vw;
+			margin: 0 0 10upx;
+			
+			image{
+				width: 29vw;
+				height: 29vw;
+			}
+		}
+	}
+	.btn-box {
+		justify-content: space-around;
+		align-items: center;
+		padding: 20upx 10upx 40upx;
+		position: fixed;
+		bottom: 0;
+		background-color: #ffffff;
+		width: 100vw;
+		box-sizing: border-box;
+		border-top: 1upx solid #eeeeee;
+		.left-btn-group{
+			display: flex;
+		}
+		.right-btn-group{
+			width: 460upx;
+			height: 80upx;
+			border-radius: 40upx;
+			overflow: hidden;
+			display: flex;
+		}
+		.collectBtn{
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #a3a3a3;
+			padding: 0upx 24upx;
+			line-height: 40upx;
+			text-align: center;
+		}
+		.playcall {
+			width: 50%;
+			font-size: 32upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			text-align: center;
+			line-height: 80upx;
+			color: #fff;
+			background-color: #ff8d30;
+		}
+		.candidate {
+			width: 50%;
+			font-size: 32upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			text-align: center;
+			line-height: 80upx;
+			color: #ffffff;
+			background-color: #f00;
+		}
+	}
+	.detail_page{
+		width: 100vw;
+		.longpic{
+			width: 90vw;
+			// margin: 0upx 5vw;
+			margin: 0upx auto;
+			display: block;//解决图片之间的缝隙
+		}
+	}
+
+}
+.videoshow{
+	width: 100vw;
+	height: 100vh;
+	position: relative;
+}
+.leave_out{
+		// 省略号样式
+		display: -webkit-box;
		-webkit-box-orient: vertical;
		-webkit-line-clamp: 1;//设置显示多少行
		overflow: hidden;
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue b/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue
new file mode 100644
index 0000000..694955a
--- /dev/null
+++ b/pages/subPages2/hirePlatform/recruitmentEnter/recruitmentEnter.vue
@@ -0,0 +1,516 @@
+<template>
+	<view class="recruitmentEnter">
+		<loadlogo v-if="!loadlogo" />
+		<view style="padding: 0upx 0;height: 0;overflow: hidden;" class="dis-flex">
+			<view  style="flex: 0.8;">
+				<filtertab
+					:requestType="'7'"
+					:isPageScroll="'1'"
+					@selectAreaid="selectAreaid"
+					@selectClassid="selectClassid"
+					@getmore="getmore"
+					@getResumeList="getResumeList"
+					@selectClassTwoid="selectClassTwoid"
+					@getcityWork="getcityWork"
+					@selectOrders="selectOrders"
+					:cate_one="cate_one"
+					:cate_two="cate_two"
+					:title="title"
+				></filtertab>
+			</view>
+			<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+				<text>更多</text>
+				<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+			</view>
+		</view>
+		<view class="inviteList">
+			<view class="invite-item" v-for="(item, index) in inviteList">
+				<view  style="padding-top: 40upx;border-top: 1upx solid #EEEEEE;">
+					<view class="item-name">{{ item.title }}</view>
+					<view class="item-tag" v-if="item.is_top == 1">顶</view>
+					<view class="item-salary">{{ item.salary }}</view>
+				</view>
+				<view class="invite-tags dis-flex">
+					<view class="tags-item">
+						<view class="dis-il-block items" v-for="(items, indexs) in item.welfare_list" :key="indexs">{{ items }}</view>
+					</view>
+					<view class="tags-region">{{item.status_text}}</view>
+				</view>
+				<view class="button-set dis-flex">
+					<view class="flex-box set-data">{{ item.release_time }}</view>
+					<view class="flex-box set-compile t-c" @click="compile(item, index)" v-if="item.status == 3 || item.status == 5">
+						<!-- <text class="iconfont icon-bianji" style="font-size: 26upx;color: #333333;"></text> -->
+						<text>编辑</text>
+					</view>
+					<view class="flex-box set-compile t-c" v-if="item.status == 4 && StickyList.length > 0">
+						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
+						<view  v-if="item.is_top == 0">
+							<picker @change="StickyChange($event,item)" :value="StickyIndex" range-key="title" :range="StickyList">
+								<view class="uni-input">
+									<text>置顶</text>
+								</view>
+							</picker>
+						</view>
+						<view v-else>
+							<text>置顶中</text>
+						</view>
+					</view>
+					<view class="flex-box set-compile t-c" @click="over(item,index,4)" v-if="item.status == 5">
+						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
+						<text>重新打开</text>
+					</view>
+					<view class="flex-box set-compile t-c" @click="over(item,index,5)" v-if="item.status == 4">
+						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
+						<text>招聘结束</text>
+					</view>
+					<view class="flex-box set-compile t-c" @click="deleteWred(item, index)">
+						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
+						<text>删除</text>
+					</view>
+					<view class="flex-box set-compile t-r" v-if="item.status == '1'" @click="payment(item, index)">
+						<!-- <text class="iconfont icon-shanchu" style="font-size: 26upx;color: #333333;"></text> -->
+						<view class="btmn">
+							去付款
+						</view>
+					</view>
+					<view class="flex-box set-compile t-r" @click="resumeList(item)" v-if="item.status == 4">
+						<text class="iconfont icon-form_fill_light" style="font-size: 26upx;color: #3388FF;"></text>
+						<text style="color: #3388FF;">简历列表</text>
+					</view>
+				</view>
+				<view class="c-ff4444 f-24" style="padding-top: 20upx;" v-if="item.status == 3">
+					驳回原因：{{item.reason}}
+				</view>
+			</view>
+		</view>
+		<load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+		<view  v-if="loadlogo">
+			<screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+		</view>
+		<view class="addBtn" @click="openAdd">招聘发布</view>
+		<!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import filtertab from '@/components/template/filtertab.vue';
+import workList from '@/components/template/workList.vue';
+import screening from '@/components/template/screening.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import TabBars from '@/components/template/tabBar.vue';
+export default {
+	data() {
+		return {
+			cate_one: '',
+			cate_two: '',
+			title: '',
+			check: false,
+			resumeID: ['', '', ''],
+			inviteList: [],
+			moreData: {},
+			page: 1,
+			page_index: 10,
+			loadlogo: false,
+			num: 0,
+			Areaid: '',
+			ordersId: '',
+			datas: {},
+			isMore: true,
+			total: 1,
+			sid: null,
+			userinfo: {},
+			StickyList: [],
+			StickyIndex:0
+			
+		};
+	},
+	components: {
+		filtertab,
+		workList,
+		screening,
+		loadMore,
+		Loadlogo,
+		TabBars
+	},
+	onLoad(e) {
+		if (e.sid) {
+			this.sid = e.sid;
+		}
+		this.userinfo = uni.getStorageSync('userinfo');
+		this.getStickyList();
+		// this.getResumeList(this.resumeID);
+		// 初始化从地区选择器默认选择完毕发送请求，不从onload
+	},
+	onShow() {
+		this.confirm(null, false,1);
+	},
+	onReachBottom() {
+		if (this.total < this.page) return; //上拉加载
+		this.isMore = false;
+		this.page++;
+		this.confirm(false, true);
+	},
+	methods: {
+		over(item,index,type){  //招聘状态开关
+			
+			let datas = {
+				id:item.id,
+				status:type
+			}
+			App.showError(
+				`是否${type == 5?'结束该岗位招聘':'重新打开该岗位招聘'}?`,
+				data => {
+					if (data.confirm) {
+						App._post_form(
+							`&p=recruit&do=recruitChangeStatus`,
+							datas,
+							res => {
+								console.log(res);
+								uni.showToast({
+									title:res.message
+								})
+								this.confirm(null, false,1);
+							},
+							false,
+							() => {}
+						);
+					}
+				},
+				true
+			);
+			
+		},
+		StickyChange(e,item){
+			let data = {
+				type:'post',
+				recruit_id:item.id,
+				top_day:this.StickyList[e.detail.value].day,
+				top_price:this.StickyList[e.detail.value].price
+			}
+			App._post_form(
+				`&p=recruit&do=recruitTop`,
+				data,
+				res => {
+					console.log(res);
+					App.navigationTo({
+						url:'pages/mainPages/payment/payment?orderid='+res.data.orderid+`&plugin=${res.data.type}`
+					})
+				},
+				false,
+				() => {}
+			);
+		},
+		getStickyList() {
+			App._post_form(
+				`&p=recruit&do=recruitTop`,
+				{},
+				res => {
+					this.StickyList = res.data;
+					this.StickyList.map(item => {
+						item.title = `${item.day}天/${item.price}元`;
+					});
+				},
+				false,
+				() => {}
+			);
+		},
+		openAdd() {
+			App.navigationTo({
+				url: 'pages/subPages2/hirePlatform/postRecruitment/postRecruitment' + '?sid=' + this.sid
+			});
+		},
+		resumeList(item) {
+			App.navigationTo({
+				url: 'pages/subPages2/hirePlatform/curriculumVitae/curriculumVitae?id=' + item.id + '&sid=' + this.sid + '&pid=' + item.position_id
+			});
+		},
+		compile(item, index) {
+			App.navigationTo({
+				url: 'pages/subPages2/hirePlatform/postRecruitment/postRecruitment?id=' + item.id 
+			});
+		},
+		Sticky(item, index) {},
+		payment(item, index){
+			if(item.status == '1'){
+				App.navigationTo({
+					url:'pages/mainPages/payment/payment?orderid='+item.order_id+`&plugin=${item.order_plugin}`
+				})
+			}
+		},
+		deleteWred(item, index) {
+			App.showError(
+				`确定删除该职位?`,
+				data => {
+					if (data.confirm) {
+						App._post_form(
+							`&p=recruit&do=deleteRecruit&id=${item.id}`,
+							{},
+							res => {
+								this.confirm(null, false, 1);
+							},
+							false,
+							() => {}
+						);
+					}
+				},
+				true
+			);
+		},
+		getcityWork(id) {
+			this.num = 1;
+			if (this.num != 0) {
+				// this.AreaidAt = id;
+				this.confirm();
+			}
+		},
+		confirm(datas, flag, page) {
+			// debugger
+			console.log(datas);
+			if (datas) {
+				this.datas = datas;
+			}
+			let indata = {
+				industry_pid: this.resumeID[0],
+				industry_id: this.resumeID[1],
+				position_id: this.resumeID[2],
+				sort: this.ordersId,
+				recruitment_type: this.sid ? 2 : 1,
+				release_sid: this.sid ? this.sid : '',
+				release_mid: this.sid ? '' : this.userinfo.mid,
+				// area_id:this.Areaid,
+				is_total: 1,
+				page: page || this.page,
+				page_index: this.page_index,
+				is_private:1
+			};
+			let data = Object.assign(indata, this.datas);
+			App._post_form(
+				`&p=recruit&do=homeList`,
+				data,
+				res => {
+					if (flag) {
+						this.inviteList = this.inviteList.concat(res.data.list);
+					} else {
+						this.inviteList = res.data.list;
+					}
+					this.inviteList.map(item => {
+						item.open = false;
+					});
+					console.log(this.inviteList, res.data.list);
+					this.total = res.data.total;
+					this.check = false;
+					this.isMore = true;
+					this.loadlogo = true;
+					let pageis = page;
+					if (pageis) {
+						if (pageis > this.page) return;
+						pageis++;
+						this.confirm(null, true, pageis);
+					}
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		checkeda(index, key) {
+			console.log(index, key);
+			this.moreData[key].map(item => {
+				item.checked = false;
+			});
+			this.moreData[key][index].checked = true;
+			let obj = Object.assign({}, this.moreData);
+			console.log(obj);
+			this.moreData = { ...obj };
+			this.loadlogo = !this.loadlogo;
+			this.loadlogo = !this.loadlogo;
+		},
+		getmore(data) {
+			data.top.map((item, index) => {
+				if (index > 2) {
+					this.moreData[item.subscript] = data[item.subscript];
+				}
+			});
+			this.moreData.top = data.top;
+			for (let key in this.moreData) {
+				this.moreData[key].map((item, index) => {
+					item.checked = false;
+				});
+			}
+		},
+		getResumeList(ids) {
+			this.resumeID = ids;
+			if (this.num != 0) {
+				this.confirm();
+				console.log('职位');
+			}
+
+			// App._post_form(
+			// 	`&p=recruit&do=resumeList`,
+			// 	{},
+			// 	res => {
+			// 		this.inviteList = res.data;
+			// 		this.inviteList.map(item=>{
+			// 			item.open = false;
+			// 		})
+			// 	},
+			// 	false,
+			// 	() => {
+
+			// 	}
+			// );
+		},
+		close(flag = false) {
+			console.log(flag);
+			if (!flag) {
+				for (let key in this.moreData) {
+					this.moreData[key].map((item, index) => {
+						item.checked = false;
+					});
+				}
+			} else {
+				this.check = !this.check;
+			}
+		},
+		openclass() {
+			this.check = !this.check;
+		},
+		clickcheck() {
+			this.check = !this.check;
+		},
+		selectOrders(data) {
+			this.ordersId = data.val;
+			if (this.num != 0) {
+				this.confirm();
+				console.log('排序');
+			}
+			console.log(data);
+		},
+		selectAreaid(data) {
+			this.num = 1;
+			console.log('地区');
+			this.Areaid = data.id;
+			this.confirm();
+			console.log(data);
+		},
+		selectClassid(data) {
+			console.log(data);
+		},
+		selectClassTwoid(data) {
+			console.log(data);
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #ffffff;
+}
+</style>
+<style lang="scss" scoped>
+.inviteList {
+	padding-bottom: 240upx;
+	.invite-item {
+		padding: 0upx 30upx 40upx;
+		.item-name {
+			display: inline-block;
+			font-size: 32upx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+		}
+		.item-tag {
+			display: inline-block;
+			background: #f1c426;
+			border-radius: 4upx;
+			font-size: 22upx;
+			padding: 2upx 6upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #ffffff;
+			margin-left: 20upx;
+		}
+		.item-salary {
+			display: inline-block;
+			font-size: 32upx;
+			font-family: DINPro;
+			font-weight: 500;
+			color: #ff4444;
+			float: right;
+		}
+	}
+	.invite-tags {
+		padding-top: 30upx;
+		.tags-item {
+			flex: 0.85;
+			height: 70upx;
+			overflow: hidden;
+			.items {
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 400;
+				color: #666666;
+				background: #f4f4f4;
+				border-radius: 4upx;
+				padding: 10upx 20upx;
+				display: inline-block;
+				margin: 0 20upx 20upx 0;
+			}
+		}
+		.tags-region {
+			flex: 0.15;
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+			text-align: right;
+			line-height: 52upx;
+		}
+	}
+	.button-set {
+		padding-top: 10upx;
+		.set-data {
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #999999;
+		}
+		.set-compile {
+			font-size: 26upx;
+			font-family: PingFang SC;
+			font-weight: 500;
+			color: #333333;
+			position: relative;
+			.btmn{
+				position: absolute;
+				right: 0;
+				top: -16upx;
+				width: 150upx;
+				height: 60upx;
+				line-height: 60upx;
+				border-radius: 60upx;
+				background-color: #FF4444;
+				color: #FFFFFF;
+				font-size: 28upx;
+				text-align: center;
+			}
+		}
+	}
+}
+.addBtn {
+	padding: 15upx 50upx;
+	background-color: #3388ff;
+	color: #ffffff;
+	font-size: 30upx;
+	border-radius: 60upx;
+	position: fixed;
+	bottom: 200upx;
+	left: 50%;
+	transform: translateX(-50%);
+}
+</style>
diff --git a/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue b/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
new file mode 100644
index 0000000..795a2d4
--- /dev/null
+++ b/pages/subPages2/hirePlatform/recruitmentList/recruitmentList.vue
@@ -0,0 +1,313 @@
+<template>
+	<view class="recruitmentList">
+		<loadlogo v-if="!loadlogo" />
+		<view style="padding: 20upx 0;" class="dis-flex" v-if="0">
+			<view  style="flex: 0.8;">
+				<filtertab 
+				:requestType="'7'" 
+				:isPageScroll="'1'" 
+				@selectAreaid="selectAreaid" 
+				@selectClassid="selectClassid" 
+				@getmore="getmore" 
+				@getResumeList="getResumeList"
+				@selectClassTwoid="selectClassTwoid" 
+				@selectOrders="selectOrders" 
+				@getcityWork="getcityWork"
+				:cate_one="cate_one" 
+				:cate_two="cate_two"></filtertab>
+			</view>
+			<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+				<text>更多</text>
+				<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+			</view>
+		</view>
+		
+		<view  v-if="loadlogo">
+			<tabs :pageType="job_type" :cc_id="cc_id" @changeChildType="changeChildType"></tabs>
+			<block v-if="job_type!=2">
+				<work-List :flag="false" :inviteList="inviteList"></work-List>
+			</block>
+			<block v-else>
+				<part-time-job :flag="false" :inviteList="inviteList"></part-time-job>
+			</block>
+			<view v-if="!isMore">
+				 <load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+			</view>
+			<nonemores v-if="isMore && inviteList.length == 0"></nonemores>
+		</view>
+		
+		<view  >
+		 	<screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+		</view>
+		 <!-- <TabBars :tabBarAct="0" pageType="15"></TabBars> -->
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue';
+	import workList from '@/components/template/workList.vue';
+	import partTimeJob from '@/components/template/partTimeJob.vue';
+	import screening from '@/components/template/screening.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import nonemores from '@/components/template/nonemores.vue';
+	import tabs from '@/components/template/tabs/tabs.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'',
+				cate_two:'',
+				title:'',
+				check:false,
+				resumeID:['','',''],
+				inviteList:[],
+				moreData:{},
+				page:1,
+				page_index:10,
+				loadlogo:false,
+				num:0,
+				Areaid:'',
+				ordersId:'',
+				datas:{},
+				isMore:true,
+				total:1,
+				job_type:null,
+				cc_id: 0,
+				cc_child_id: 0,
+				AreaidAt:'',
+				pagenum:1
+			}
+		},
+		components:{
+			filtertab,
+			workList,
+			partTimeJob,
+			screening,
+			loadMore,
+			Loadlogo,
+			TabBars,
+			nonemores,
+			tabs
+		},
+		onLoad(e) {
+			console.log(e, e.job_type, 'p---------')
+			if(e.job_type){
+				this.job_type = e.job_type;
+			};
+			if(e.cc_id){
+				this.cc_id = e.cc_id;
+			};
+			this.isMore = false;
+			if(this.num != 0) return
+			this.pagenum = 4;
+			this.confirm();
+			// this.getResumeList(this.resumeID); 
+			// 初始化从地区选择器默认选择完毕发送请求，不从onload
+			// console.log(e.type, '--------');
+			let title;
+			switch(e.job_type){
+				case '1':
+				title = '就业招聘';
+				break;
+				case '2':
+				title = '学校兼职';
+				break;
+				case '3':
+				title = '实习实践';
+				break;
+			}
+			setTimeout(()=>{
+				uni.setNavigationBarTitle({
+					title:title
+				})
+			}, 500)
+		},
+		onShow() {
+			if(this.num != 1) return
+			this.pagenum = 4;
+			this.confirm();
+			console.log(this.num)
+			// this.confirm();
+		},
+		onReachBottom() {
+			
+			if(this.total == this.page) return
+			this.isMore = false;
+			this.page++;
+			this.confirm(false,true)
+		},
+		methods:{
+			confirm(datas,flag){
+				if(datas != false){
+					this.page = 1;
+				}
+				if(this.pagenum < 4){
+					this.pagenum++;
+					this.loadlogo = true;
+					return
+				}
+				// console.log(JSON.stringify(datas));
+				
+				if(datas){
+					this.datas = datas;
+				}
+				let indata = {
+					industry_pid:this.resumeID[0],
+					industry_id:this.resumeID[1],
+					position_id:this.resumeID[2],
+					sort:this.ordersId,
+					area_id:this.AreaidAt,
+					is_total:1,
+					page:this.page,
+					page_index:this.page_index,
+					job_type: this.job_type,
+					cc_id: this.cc_child_id//子分类id，和大分类id重名注意
+				}
+				if(!datas || JSON.stringify(datas) == '{}'){
+					indata.job_type = this.job_type;
+				}else{
+					this.page = 1;
+				}
+				let data = Object.assign(indata ,this.datas);
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						if(flag){
+							this.inviteList = this.inviteList.concat(res.data.list);
+						}else{
+							this.inviteList = res.data.list;
+						}
+						this.inviteList.map(item=>{
+							item.open = false;
+						});
+						// console.log(this.inviteList,res.data.list);
+						this.total = res.data.total;
+						this.check = false;
+						this.isMore = true;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			checkeda(index,key,flag){
+				console.log(index,key);
+				this.moreData[key].map(item=>{
+					item.checked = false
+				});
+				this.moreData[key][index].checked = flag;
+				let obj = Object.assign({},this.moreData);
+				console.log(obj);
+				this.moreData = {...obj}
+				this.loadlogo = !this.loadlogo;
+				this.loadlogo = !this.loadlogo;
+			},
+			getmore(data){
+				data.top.map((item,index)=>{
+					if(index > 2){
+						this.moreData[item.subscript] = data[item.subscript];
+					}
+				});
+				this.moreData.top = data.top;
+				for(let key in this.moreData){
+						this.moreData[key].map((item,index)=>{
+								item.checked = false;
+								if(key == 'job_type' && item.val == this.job_type){
+									item.checked = true;
+								}
+						})
+				}
+			},
+			getcityWork(id){
+				this.num = 1;
+				if(this.num != 0){
+					this.AreaidAt = id;
+					this.confirm();
+				}
+				
+			},
+			getResumeList(ids){
+				this.resumeID = ids;
+				if(this.num != 0){
+					this.confirm();
+					console.log('职位');
+				}
+				
+				// App._post_form(
+				// 	`&p=recruit&do=resumeList`,
+				// 	{},
+				// 	res => {
+				// 		this.inviteList = res.data;
+				// 		this.inviteList.map(item=>{
+				// 			item.open = false;
+				// 		})
+				// 	},
+				// 	false,
+				// 	() => {
+						
+				// 	}
+				// );
+			},
+			close(flag){
+				console.log(this.moreData);
+				if(!flag){
+					for(let key in this.moreData){
+							this.moreData[key].map((item,index)=>{
+									item.checked = false;
+							})
+					}
+				}else{
+					this.check = !this.check;
+				}
+			},
+			openclass(){
+				
+				this.check = !this.check;
+			},
+			clickcheck(){
+				this.check = !this.check;
+			},
+			selectOrders(data){
+				
+				this.ordersId = data.val;
+				if(this.num != 0){
+					this.confirm();
+					console.log('排序');
+				}
+				console.log(data)
+				
+			},
+			selectAreaid(data){
+				
+				this.num = 1;
+				console.log('地区');
+				this.Areaid = data.id;
+				this.confirm();
+				console.log(data)
+			},
+			selectClassid(data){
+				
+				console.log(data)
+			},
+			selectClassTwoid(data){
+				console.log(data)
+			},
+			changeChildType(e){
+				this.cc_child_id = e;
+				this.confirm();
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.recruitmentList{
+		padding-bottom: 150upx;
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/resume/resume.vue b/pages/subPages2/hirePlatform/resume/resume.vue
new file mode 100644
index 0000000..c52b570
--- /dev/null
+++ b/pages/subPages2/hirePlatform/resume/resume.vue
@@ -0,0 +1,618 @@
+<template>
+	<view class="resume">
+		<loadlogo v-if="!loadlogo" />
+		<far-bottom></far-bottom>
+		<view class="resume-content" v-if="loadlogo">
+			<view class="resume-content-title">
+				<view class="dis-flex">
+					<view class="content-title-data flex-box">
+						<view class="title-name">{{resumeData.name}}</view>
+						<view class="title-time">{{resumeData.work_status_text}}
+						<text style="padding-left: 90upx;font-size: 26upx;">
+						<text class="iconfont icon-phone" style="font-size: 26upx;color: #333333;padding-right: 10upx;"></text>
+						{{resumeData.phone}}</text>
+						</view>
+						<view class="title-tag">
+							<image :src="imgfixUrls + 'gongzuo.png'" mode=""></image>
+							<text>{{resumeData.experience}}</text>
+							<image :src="imgfixUrls + 'xueli.png'" mode=""></image>
+							<text>{{resumeData.education}}</text>
+							<image :src="imgfixUrls + 'shengri.png'" mode=""></image>
+							<text>{{resumeData.age}}岁</text>
+						</view>
+					</view>
+					<view class="title-img">
+						<view style="width: 120upx;height: 120upx;position: relative;">
+							<view class="gender" v-if="resumeData.gender_text == '女'">
+								<image :src="imgfixUrls + 'inviteImg/nvxing.png'" mode="" style="width: 10px;height: 10px;position: absolute;"></image>
+							</view>
+							<view class="gender" style="background-color: #008CFF;" v-else>
+								<image :src="imgfixUrls + 'inviteImg/nanxing.png'" mode="" style="width: 10px;height: 10px;position: absolute;"></image>
+							</view>
+							<image
+								style="width: 120upx;height: 120upx;border-radius: 50%;"
+								:src="resumeData.avatar"
+							></image>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="Self-introduction">
+				<view class="dis-flex Self-text">
+					<view class="left-name">个人介绍</view>
+					<view class="rigth-text">发布于{{resumeData.create_time_text}}</view>
+				</view>
+				<view class="Self-content">
+					{{resumeData.self_evaluation}}
+				</view>
+			</view>
+			<view class="job-intention">
+				<view class="job-title">
+					求职意向
+				</view>
+				<view class="job-tag">
+					<view class="tag-item" v-for="(item,index) in resumeData.expect_position_list">
+						{{item}}
+					</view>
+				</view>
+				<view class="intention">
+					<view class="dis-il-block" style="padding-right: 45upx;">
+						<text class="iconfont icon-recharge c-ff4444" style="font-size: 32upx;"></text>
+						<text class="salary">{{resumeData.salary}}</text>
+					</view>
+					<view class="dis-il-block">
+						<text class="iconfont icon-location" style="font-size: 28upx;"></text>
+						<text class="job-location">{{resumeData.region}}</text>
+					</view>
+				</view>
+			</view>
+			<view class="work-experience" >
+				<view class="work-title">
+					工作经历
+				</view>
+				<view class="experience-item" v-for="(item,index) in resumeData.work_experience">
+					<!-- 小球 -->
+					<view class="item-ball"></view>
+					<view class="item-title dis-flex">
+						<view class="item-post">
+							{{item.title}}
+						</view>
+						<view class="item-date">
+							{{item.start_time}}至{{item.end_time}}
+						</view>
+					</view>
+					<view class="company-name">
+						{{item.corporate_name}}
+					</view>
+					<view class="working">
+						{{item.content}}
+					</view>
+<!-- 					<view class="working">
+						2、有较强的文字驾驭能力,有两年的事业单位文书经验,擅长各类公文写作;
+					</view> -->
+				</view>
+			</view>
+			<view class="education">
+				<view class="education-title">
+					教育经历
+				</view>
+				<view class="experience-item" v-for="(item,index) in resumeData.educational_experience">
+					<!-- 小球 -->
+					<view class="item-ball"></view>
+					<view class="item-title dis-flex">
+						<view class="item-post">
+							{{item.school}}
+						</view>
+					</view>
+					<view class="company-name" style="padding: 10upx 0 30upx;">
+						{{item.start_time}} - {{item.end_time}}
+					</view>
+					<view class="working education-working">
+						{{item.major}}
+					</view>
+				</view>
+			</view>
+			<view class="btns-box dis-flex">
+				<view class="invite" @click="invitation">
+					邀请面试
+				</view>
+				<view class="online-chat" @click="goChat">
+					在线聊天
+				</view>
+			</view>
+		</view>
+		<PopManager :show="isShow" type="center" @clickmask="close">
+			<view class="b-f invitePop">
+				<view class="invitePop-title f-w">
+					邀请面试
+					<text class="iconfont icon-close" style="float: right;vertical-align: top;font-size: 30upx;" @click="close"></text>
+				</view>
+				<view class="f-26 dis-flex" style="padding: 30upx 0;" @click="visiblec = true">
+					<view class="flex-box">
+						面试时间
+					</view>
+					<view :class="time?'f-26':'f-26 col-9'">
+						{{time || '请选择面试时间	'}}
+					</view>
+				</view>
+				<view class="f-26 dis-flex" style="padding: 0upx 0 30upx;">
+					<view style="flex: 0.3;">
+						面试地点
+					</view>
+					<view style="flex: 0.7;">
+						<input v-if="isShow" type="text" class="t-r f-26" placeholder-style="color: #999999;" placeholder="请输入面试地址" v-model="site" />
+					</view>
+				</view>
+				<view class="f-26 dis-flex" style="padding: 0upx 0 30upx;">
+					<view style="flex: 0.3;">
+						面试职位
+					</view>
+					<view style="flex: 0.7;" @click="visible = true">
+						<view :class="selectorItem?'f-26 t-r':'f-26 col-9 t-r'">
+							{{selectorItem || '请选择面试职位'}}
+						</view>
+					</view>
+				</view>
+				<view class="abBox" @click="invitationLetter">
+					确定
+				</view>
+			</view>
+		</PopManager>
+		<w-picker
+			:visible.sync="visiblec"
+			mode="date"
+			startYear="1970"
+			endYear="2100"
+			:value="time"
+			fields="minute"
+			@confirm="onConfirmdete($event, 'region')"
+			ref="date"
+		></w-picker>
+		<w-picker
+		:visible.sync="visible"
+		mode="selector"
+		:value="selectorItem"
+		default-type="title"
+		:default-props="defaultProps"
+		:options="selectorList"
+		@confirm="onConfirm($event,'selector')"
+		ref="selector"></w-picker>
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import PopManager from '@/components/template/PopManager';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	export default{
+		data(){
+			return{
+				resumeData:{},
+				loadlogo:false,
+				isShow:false,
+				visiblec:false,
+				visible:false,
+				time:'',
+				site:'',
+				recruitment_type:1,
+				pageId:0,
+				userInfoId:'',
+				defaultProps:{"label":"title","value":"id"},
+				selectorList:[],
+				selectorItem:'',
+				selectorItemId:'',
+				release_sid:'',
+				workId:'',
+			}
+		},
+		components:{
+			Loadlogo,
+			PopManager,
+			wPicker
+		},
+		onLoad(e) {
+			this.recruitment_type = e.flag;
+			this.pageId = e.id;
+			this.workId = e.pageId;
+			this.release_sid = e.sid;
+			this.userInfoId = uni.getStorageSync('userinfo');
+			this.getResumeData(e.id);
+		},
+		methods:{
+			
+			goChat(){ //联系对方，instantMessenger为websocket链接，chat页面为循环调用最新消息并渲染
+				// App.navigationTo({
				// 	url: `pages/subPages/homepage/chat/chat?id=${this.release_sid || this.userInfoId.mid}&other_party_id=${this.resumeData.mid}&other_party_type=1&type=${this.release_sid?2:1}`
				// })
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + this.resumeData.mid + '&other_party_type=' + 1+ '&type=' + (this.release_sid?2:1) + '&id=' + (this.release_sid || this.userInfoId.mid)
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.resumeData.mid + '&other_party_type=' + 1+ '&type=' + (this.release_sid?2:1) + '&id=' +(this.release_sid || this.userInfoId.mid)
+					})
+				}
+			},
+			invitationLetter(){
+				if(!this.time){
+					uni.showToast({
+						icon:'none',
+						title:'请选择面试时间'
+					});
+					return
+				}else if(!this.site){
+					uni.showToast({
+						icon:'none',
+						title:'请填写面试地址'
+					});
+					return
+				}else if(!this.selectorItemId){
+					uni.showToast({
+						icon:'none',
+						title:'请选择面试职位'
+					});
+					return
+				}
+				let data = {
+					resume_id:this.pageId,
+					recruit_id:this.selectorItemId,
+					interview_time:this.getDataTime(this.time),
+					interview_area:this.site
+				}
+				App._post_form(
+					`&p=recruit&do=inviteAnInterview`,
+					data,
+					res => {
+						console.log(res)
+						this.isShow = false;
+						uni.showToast({
+							title:res.message
+						})
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			// 时间转时间戳
+			getDataTime(timeValue) {
+				let ontime;
+				ontime = timeValue.replace(/-/g, '/');
+				let date = new Date(ontime);
+				let time = date.getTime();
+				return time;
+			},
+			close(){
+				this.isShow = false
+				this.time = '';
+				this.site = '';
+			},
+			invitation(){
+				let data = {
+					status:4,
+					recruitment_type:this.recruitment_type,
+					release_mid:this.recruitment_type==1?this.userInfoId:'',
+					release_sid:this.recruitment_type==2?this.release_sid:'',
+					}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						console.log(res)
+						this.selectorList = res.data;
+						this.selectorList.map(item=>{
+							if(item.id == this.workId){
+								this.selectorItem = item.title;
+								this.selectorItemId = item.id;
+							}
+						})
+						if(this.selectorList.length == 0){
+							App.showError(
+								`您尚无招聘中的岗位,是否前往添加?`,
+								data => {
+									if (data.confirm) {
+										App.navigationTo({
+											url: `pages/subPages2/hirePlatform/postRecruitment/postRecruitment`
+										});
+										return
+									}
+								},
+								true
+							);
+						}else{
+							this.isShow = true;
+						}
+						// this.selectorItem = res.data[0].title;
+						
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+						
+					}
+				);
+			},
+			onConfirm(e){
+				console.log(e);
+				this.selectorItem = e.result;
+				this.selectorItemId = e.value;
+			},
+			onConfirmdete(e) {
+				console.log(e);
+				this.time = e.result;
+				// let date = new Date(e.value).getTime();
+				// console.log(e, date);
+			},
+			getResumeData(id){
+				App._post_form(
+					`&p=recruit&do=resumeDesc&id=${id}&recruit_id=${this.workId || ''}`,
+					{},
+					res => {
+						console.log(res)
+						this.resumeData = res.data;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.resume {
+	// padding: 30upx;
+	.resume-content {
+		padding: 50upx 30upx 0;
+		.resume-content-title {
+			padding-bottom: 50upx;
+			border-bottom: 1upx solid #eeeeee;
+			.content-title-data {
+				.title-name {
+					font-size: 48upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				.title-time {
+					font-size: 32upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					padding: 30upx 0;
+				}
+				.title-tag {
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					image {
+						height: 30upx;
+						width: 30upx;
+						vertical-align: top;
+						padding-top: 5upx;
+						padding-right: 10upx;
+					}
+					text {
+						padding-right: 80upx;
+					}
+				}
+			}
+			.title-img {
+				position: relative;
+				.gender {
+					background-color: #ff838e;
+					padding: 8upx;
+					border-radius: 50%;
+					width: 20upx;
+					height: 20upx;
+					position: absolute;
+					bottom: 0;
+					right: 0;
+					z-index: 9;
+					uni-image {
+						width: 20upx;
+						height: 20upx;
+						vertical-align: top;
+					}
+				}
+			}
+		}
+		.Self-introduction {
+			padding: 50upx 0upx 0;
+			.Self-text {
+				.left-name {
+					flex: 0.5;
+					text-align: left;
+					font-size: 32upx;
+					font-family: PingFang SC;
+					font-weight: bold;
+					color: #333333;
+				}
+				.rigth-text {
+					flex: 0.5;
+					text-align: right;
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #999999;
+				}
+			}
+			.Self-content{
+				padding: 40upx 0;
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				line-height: 48upx;
+				border-bottom: 1upx solid #EEEEEE;
+			}
+		}
+		.job-intention{
+			padding: 50upx 0;
+			border-bottom: 1upx solid #EEEEEE;
+			.job-title{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			.job-tag{
+				padding: 40upx 0;
+				.tag-item{
+					display: inline-block;
+					padding: 12upx 20upx;
+					margin-right: 10upx;
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 400;
+					color: #666666;
+					background: #F4F4F4;
+					border-radius: 4upx;
+				}
+			}
+			.intention{
+				.salary{
+					font-size: 32upx;
+					font-family: DINPro;
+					font-weight: 500;
+					color: #FF4444;
+				}
+				.job-location{
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+				}
+			}
+		}
+		.work-experience{
+			padding: 50upx 0;
+			border-bottom: 1upx solid #EEEEEE;
+			.work-title{
+				font-size: 32upx;
+				padding-bottom: 50upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+			}
+			
+		}
+		.experience-item{
+			padding-left: 40upx;
+			position: relative;
+			border-left: 1upx solid #EEEEEE;
+			.item-ball{
+				width: 12upx;
+				height: 12upx;
+				border: 4upx solid #3388FF;
+				border-radius: 50%;
+				position: absolute;
+				left: -10upx;
+				top: -10upx;
+			}
+			.item-title{
+				position: relative;
+				bottom: 20upx;
+				.item-post{
+					font-size: 28upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #333333;
+					flex: 0.5;
+				}
+				.item-date{
+					font-size: 24upx;
+					font-family: PingFang SC;
+					font-weight: 500;
+					color: #999999;
+					flex: 0.5;
+					text-align: right;
+				}
+			}
+			.company-name{
+				font-size: 24upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #999999;
+				padding-bottom: 40upx;
+			}
+			.working{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #666666;
+				padding: 0upx 0 50upx;
+				line-height: 48upx;
+			}
+			.education-working{
+				font-size: 28upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #333333;
+			}
+		}
+		.education{
+			padding: 55upx 0;
+			border-bottom: 1upx solid #EEEEEE;
+			.education-title{
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #333333;
+				padding-bottom: 50upx;
+			}
+		}
+		.btns-box{
+			padding: 25upx 0upx;
+			.invite{
+				margin-right: 20upx;
+				border: 1upx solid #3388FF;
+				border-radius: 4upx;
+				padding: 30upx 75upx;
+				font-size: 32upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #3388FF;
+				text-align: center;
+			}
+			.online-chat{
+				background: #3388FF;
+				border-radius: 4upx;
+				font-size: 32upx;
+				padding: 30upx 130upx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #FFFFFF;
+				text-align: center;
+			}
+		}
+	}
+	.invitePop{
+		width: 70vw;
+		border-radius: 20upx;
+		padding: 30upx;
+		position: relative;
+		.invitePop-title{
+			font-size: 26upx;
+		}
+		.abBox{
+			font-size: 30upx;
+			color: #FFFFFF;
+			padding: 10upx 50upx;
+			background-color: #FF4444;
+			border-radius: 60upx;
+			display: inline-block;
+			position: absolute;
+			left: 50%;
+			bottom: -40%;
+			transform: translate(-50%);
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/hirePlatform/serchWork/serchWork.vue b/pages/subPages2/hirePlatform/serchWork/serchWork.vue
new file mode 100644
index 0000000..21fe06d
--- /dev/null
+++ b/pages/subPages2/hirePlatform/serchWork/serchWork.vue
@@ -0,0 +1,167 @@
+<template>
+	<view class="serchWork">
+		<!-- 插件为招聘时进入简历搜索页面 -->
+		<view class="input-title dis-flex">
+			<view class="input-seach">
+				<input style="font-size: 28upx;" @confirm="seacha" v-model="seachContent" placeholder="请搜索职位关键词" type="text" value="" />
+			</view>
+			<view class="cancel" @click="goOut">
+				取消
+			</view>
+		</view>
+		<view class="seach-history" v-if="inviteListShow">
+			<view class="dis-flex">
+				<view class="flex-box f-36 t-l f-w">
+					历史搜索
+				</view>
+				<view class="flex-box f-28 t-r col-9 iconfont icon-delete" @click="deleteSeach">
+					
+				</view>
+			</view>
+			<view class="history-content" v-if="seachList.length > 0">
+				<view class="history-item" v-for="(item,index) in seachList" @click="seachText(item)">
+					{{item}}
+				</view>
+			</view>
+			<view class="p-top-20 f-26 col-9" v-else>
+				暂无搜索记录
+			</view>
+		</view>
+		<view v-else>
+			<work-List :flag="false" :inviteList="inviteList"></work-List>
+			<load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+		</view>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import workList from '@/components/template/workList.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	export default{
+		data(){
+			return{
+				inviteList:[],
+				isMore:true,
+				loadlogo:false,
+				page:1,
+				pageIndex:10,
+				seachContent:'',
+				total:1,
+				inviteListShow:true,
+				seachList:[]
+			}
+		},
+		onLoad() {
+			let seachList = uni.getStorageSync('workSeachList');
+			if(seachList){
+				this.seachList = seachList;
+			}
+		},
+		components:{
+			workList,
+			loadMore,
+			Loadlogo
+		},
+		onReachBottom() {
+			if(this.total == this.page) return
+			this.isMore = false;
+			this.page++;
+			this.seach(true)
+		},
+		methods:{
+			deleteSeach(){
+				this.seachList = [];
+				uni.clearStorageSync('workSeachList')
+			},
+			seachText(item){
+				this.seachContent = item;
+			},
+			goOut(){
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			seacha(){
+				this.page = 1;
+				this.seach();
+			},
+			seach(flag){
+				let _this = this;
+				let data = {
+					page:this.page,
+					pageIndex:this.pageIndex,
+					is_total:1,
+					title:this.seachContent
+				}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						if(flag == true){
+							this.inviteList = this.inviteList.concat(res.data.list);
+						}else{
+							this.inviteList = res.data.list;
+						}
+						if(_this.seachContent && _this.seachContent != ' '){
+							this.seachList.unshift(this.seachContent);
+							this.seachList = [...new Set(this.seachList)];
+							uni.setStorageSync('workSeachList',this.seachList);
+						}
+						this.total = res.data.total;
+						this.isMore = true;
+						this.inviteListShow = false;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.serchWork{
+		.input-title{
+			padding: 30upx;
+			.input-seach{
+				border-radius: 60upx;
+				background-color: #EEEEEE;
+				padding: 10upx 40upx;
+				flex: 0.85;
+			}
+			.cancel{
+				font-size: 32upx;
+				flex: 0.15;
+				line-height: 58upx;
+				text-align: right;
+				color: #666666;
+			}
+		}
+		.seach-history{
+			padding: 30upx;
+			.history-content{
+				padding: 30upx 0;
+				.history-item{
+					background-color: #EEEEEE;
+					padding: 8upx 20upx;
+					border-radius: 5upx;
+					display: inline-block;
+					font-size: 22upx;
+					margin-right: 20upx;
+					margin-bottom: 20upx;
+				}
+			}
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #FFFFFF;
+	}
+</style>
diff --git a/pages/subPages2/hirePlatform/workClassList/workClassList.vue b/pages/subPages2/hirePlatform/workClassList/workClassList.vue
new file mode 100644
index 0000000..6939517
--- /dev/null
+++ b/pages/subPages2/hirePlatform/workClassList/workClassList.vue
@@ -0,0 +1,201 @@
+<template>
+	<view class="workClassList">
+		<view >
+			<far-bottom></far-bottom>
+		</view>
+		<view >
+			<view class="b-f">
+				<v-tabs
+					:lineScale="0.3" 
+					:lineRadius="'4px 4px 0px 0px'" 
+					:lineHeight="'6rpx'"
+					:height="'100rpx'"
+					:fontSize="'30rpx'" 
+					:paddingItem="'40rpx 22rpx 40rpx'" 
+					:activeColor="'#3388FF'" 
+					:lineColor="'#3388FF'"
+					v-model="sort" 
+					:field="'title'" 
+					@change="changeTab"
+					:bold="false"
+					:tabs="industryList"></v-tabs>
+			</view>
+			<!-- 分类切换 -->
+			<view class="b-f p-b-20">
+				<v-tabs
+				:color="'#333333'" 
+				:bgColor="'#ffffff'" 
+				:activeColor="'#ff4444'" 
+				:height="'40rpx'" 
+				:paddingItem="'5rpx 20rpx'" 
+				:fontSize="'26rpx'" 
+				:pillsColor="'#FFEBEB'" 
+				:pillsBorderRadius="'60rpx'" 
+				v-model="current" 
+				:tabs="industryListTwo" 
+				:pills="true" 
+				line-height="0" 
+				:bold="false" 
+				:field="'title'" 
+				@change="changeTabTwo"></v-tabs>
+			</view>
+			<view class="p-btm-50" v-if="inviteList.length > 0">
+				<work-List :flag="false" :tabStyle="true" :inviteList="inviteList"></work-List>
+				<load-more :isMore="isMore" :bgc="'#f8f8f8'"></load-more>
+			</view>
+			<nonemores v-else></nonemores>
+			 <TabBars :tabBarAct="0" pageType="15"></TabBars>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import workList from '@/components/template/workList.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import nonemores from '@/components/template/nonemores.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				sort:0,
+				current:0,
+				inviteList:[],
+				industryList:[],
+				industryListTwo:[],
+				page:1,
+				pageIndex:1,
+				industry_pid:'',
+				industry_id:''
+			}
+		},
+		components:{
+			vTabs,
+			workList,
+			loadMore,
+			Loadlogo,
+			nonemores,
+			TabBars
+		},
+		onLoad(e) {
+			if(e.pid){
+				this.industry_pid = e.pid;
+			}
+			if(e.id){
+				this.industry_id = e.id;
+			}
+			this.getClass();
+		},
+		onReachBottom() {
+			if(this.total == this.page) return
+			this.isMore = false;
+			this.page++;
+			this.getWorkList(true)
+		},
+		methods:{
+			changeTabTwo(e){
+				this.page = 1;
+				this.industry_id = this.industryListTwo[e].id;
+				this.getWorkList();
+			},
+			getWorkList(flag){
+				let data = {
+					page:this.page,
+					pageIndex:this.pageIndex,
+					is_total:1,
+					industry_pid:this.industry_pid,
+					industry_id:this.industry_id
+				}
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						if(flag == true){
+							this.inviteList = this.inviteList.concat(res.data.list);
+						}else{
+							this.inviteList = res.data.list;
+						}
+						this.total = res.data.total;
+						this.isMore = true;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			getClassTwo(id,flag){
+				App._post_form(
+					`&p=recruit&do=industryList&type=2&pid=${id}`,
+					{},
+					res => {
+						this.industryListTwo = res.data;
+						this.industryListTwo.unshift({
+							title:'全部',
+							id:0
+						})
+						if(flag && this.industry_id == ''){
+							this.industry_id = this.industryListTwo[0].id;
+						}else{
+							this.industryListTwo.map((item,index)=>{
+								if(item.id == this.industry_id){
+									this.current = index;
+								}
+							})
+						}
+						this.getWorkList();
+						console.log(res)
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			getClass(){
+				App._post_form(
+					`&p=recruit&do=industryList&type=1`,
+					{},
+					res => {
+						this.industryList = res.data;
+						if(this.industry_pid == ''){
+							this.industry_pid = this.industryList[0].id;
+						}else{
+							this.industryList.map((item,index)=>{
+								if(item.id == this.industry_pid){
+									this.sort = index;
+								}
+							})
+						}
+						this.getClassTwo(this.industry_pid,true);
+						console.log(res)
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			changeTab(e){
+				this.page = 1;
+				this.current = 0;
+				this.industry_pid = this.industryList[e].id;
+				this.getClassTwo(this.industryList[e].id,true);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #f8f8f8;
+	}
+</style>
+<style lang="scss" scoped>
+	.workClassList{
+		// padding: 30upx;
+	}
+</style>
diff --git a/pages/subPages2/hitchRide/hitchList/hitchList.vue b/pages/subPages2/hitchRide/hitchList/hitchList.vue
new file mode 100644
index 0000000..d93dbb0
--- /dev/null
+++ b/pages/subPages2/hitchRide/hitchList/hitchList.vue
@@ -0,0 +1,208 @@
+<template>
+	<view class="hitchList">
+		<loadlogo v-if="!loadlogo" />
+		<view v-else>
+			<view v-if="list.length > 0">
+				<view class="hitch-item"  v-for="(item,index) in list" :key="index" >
+					<journey :hitchItem="item"></journey>
+					<view class="operation">
+						<text class="f-28" style="color: #FFCF01;">{{item.status == 1?'待付款':item.status == 2?'待审核':item.status == 3?'未通过':item.status == 4?'进行中':'已完成'}}</text>
+						<view class="pay" v-if="flag != 'collect' && item.status == 1" @click="gopay(item)">
+							去支付
+						</view>
+						<view class="compile" v-if="flag == 'issue'" @click="compile(item.id)">
+							编辑
+						</view>
+						
+						<view class="compile" v-if="flag == 'collect'" @click="HitchRideDetails(item.id)">
+							查看
+						</view>
+						<view class="delete-btn" @click="deleteAll(item.history_id,item.id)" v-if="flag != 'collect'">
+							删除
+						</view>
+						
+					</view>
+				</view>
+			</view>
+			
+			<nonemores v-else></nonemores>
+		</view>
+		<far-bottom></far-bottom>
+		<phoneNavBar :checked="''" :page="'hitch'"></phoneNavBar>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import nonemores from '@/components/template/nonemores.vue';
+	import journey from '@/components/template/journey.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	export default{
+		data(){
+			return{
+				arr:[1,2,3],
+				flag:null,
+				page:1,
+				list:[1],
+				total:1,
+				loadlogo:false
+			}
+		},
+		components:{
+			journey,
+			nonemores,
+			Loadlogo,
+			phoneNavBar
+		},
+		onLoad(e) {
+			this.flag = e.flag;
+			console.log(e);
+			this.getList();
+		},
+		onReachBottom() {
+			if(this.page == this.total) return
+			this.page++;
+			this.getList(true);
+		},
+		methods:{
+			gopay(item){
+				App.navigationTo({
+					url: `pages/mainPages/payment/payment?orderid=${item.order.orderid}&plugin=${item.order.type}`
+				});
+			},
+			compile(id){
+				App.navigationTo({
+					url: "pages/subPages2/hitchRide/hitchSchedule/hitchSchedule?id=" + id
+				});
+			},
+			HitchRideDetails(id){
+				App.navigationTo({
+					url: "pages/subPages2/hitchRide/hitchRideDetails/hitchRideDetails?id=" + id
+				});
+			},
+			deleteAll(id,ids){
+				let _this = this;
+				let requst = this.flag == 'record'?'&p=vehicle&do=delHistory':'&p=vehicle&do=delMyRelease';
+				let data = {};
+				if(this.flag == 'record'){
+					data.history_id = id
+				}else{
+					data.id = ids
+				}
+				uni.showModal({
+					title: '提示',
+					content: '确定删除此条信息?',
+					success: function(res) {
+						if (res.confirm) {
+							App._post_form(
+								requst,
+								data,
+								res => {
+									uni.showToast({
+										title:res.message
+									});
+									_this.getList(false,1)
+								},
+								false,
+								() => {}
+							);
+						} else if (res.cancel) {
+						}
+					}
+				});
+				
+				
+			},
+			getList(flag,num){
+				let requst = this.flag == 'record'?'&p=vehicle&do=getHistory':this.flag == 'collect'?'&p=vehicle&do=getCollection':'&p=vehicle&do=getMyRelease';
+				App._post_form(
+					requst,
+					{page:num || this.page},
+					res => {
+						if(flag){
+							this.list = this.list.concat(res.data.list);
+							if(this.page == num) return
+							this.getList(true,num++);
+						}else{
+							this.list = res.data.list;
+							this.total = res.data.total;
+							this.loadlogo = true;
+							if(num == 1 && this.page != 1){
+								this.getList(true,2);
+							}
+						}
+						
+					},
+					false,
+					() => {}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.hitchList{
+		padding: 30upx;
+		padding-bottom: 240upx;
+		.hitch-item{
+			padding: 0upx 30upx;
+			margin-bottom: 30upx;
+			background-color: #FFFFFF;
+			border-radius: 20upx;
+			.operation{
+				padding-bottom: 30upx;
+				height: 60upx;
+				.compile{
+					display: inline-block;
+					width: 114upx;
+					height: 60upx;
+					border-radius: 10upx;
+					border: 1upx solid #72AAFD;
+					line-height: 60upx;
+					color: #72AAFD;
+					text-align: center;
+					font-size: 28upx;
+					font-weight: 700;
+					float: right;
+				}
+				.pay{
+					display: inline-block;
+					width: 114upx;
+					height: 60upx;
+					border-radius: 10upx;
+					border: 1upx solid #FFCF01;
+					line-height: 60upx;
+					color: #FFCF01;
+					text-align: center;
+					font-size: 28upx;
+					font-weight: 700;
+					float: right;
+					margin-left: 30upx;
+				}
+				.delete-btn{
+					display: inline-block;
+					width: 114upx;
+					height: 60upx;
+					border-radius: 10upx;
+					border: 1upx solid #FF4444;
+					line-height: 60upx;
+					color: #FF4444;
+					text-align: center;
+					font-size: 28upx;
+					font-weight: 700;
+					float: right;
+					margin-right: 30upx;
+				}
+				
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/subPages2/hitchRide/hitchRideDetails/hitchRideDetails.vue b/pages/subPages2/hitchRide/hitchRideDetails/hitchRideDetails.vue
new file mode 100644
index 0000000..ec0dc61
--- /dev/null
+++ b/pages/subPages2/hitchRide/hitchRideDetails/hitchRideDetails.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="hitchRideDetails">
+		<view class="disclaimer dis-flex">
+			<text style="font-size: 24upx;padding-right: 10upx;" class="iconfont icon-info"></text>
+			<view class="text dis-il-block" @click="disclaimerPopShow = true">{{hitchDetails.desc_disclaimers}}</view>
+			<view style="font-size: 24upx;" class="iconfont icon-right t-r flex-box"></view>
+		</view>
+		<view class="generalize">
+			<journey :hitchItem="hitchDetails" :flag="true"></journey>
+		</view>
+		<view class="particulars">
+			<view class="particulars-box">
+				<view class="particulars-title">
+					出发时间：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.start_time_text}}
+				</view>
+			</view>
+			<view class="particulars-box">
+				<view class="particulars-title">
+					出发地：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.start_address}}
+				</view>
+			</view>
+			<view class="particulars-box" v-if="hitchDetails.frequency == 2">
+				<view class="particulars-title">
+					班次：
+				</view>
+				<view class="particulars-content">
+					每天
+				</view>
+			</view>
+			<view class="particulars-box" v-if="hitchDetails.pass_by.length > 0">
+				<view class="particulars-title">
+					途径地：
+				</view>
+				<view class="particulars-content">
+					<view class="dis-il-block tags" style="padding-right: 6upx;" v-for="(item,index) in hitchDetails.pass_by" :key="index">{{item}}</view>
+				</view>
+			</view>
+			<view class="particulars-box"  v-if="hitchDetails.transport_type == 1 || hitchDetails.transport_type == 3">
+				<view class="particulars-title">
+					{{hitchDetails.transport_type == 1?'人数':'空座'}}：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.people}}
+				</view>
+			</view>
+			<view class="particulars-box" v-if="hitchDetails.transport_type == 2 || hitchDetails.transport_type == 4">
+				<view class="particulars-title">
+					{{hitchDetails.transport_type == 2?'货重':'载重'}}：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.weight}}KG
+				</view>
+			</view>
+			<view class="particulars-box">
+				<view class="particulars-title">
+					手机号：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.contacts_phone}}
+				</view>
+			</view>
+			<view class="particulars-box">
+				<view class="particulars-title">
+					联系人：
+				</view>
+				<view class="particulars-content">
+					{{hitchDetails.contacts}}
+				</view>
+			</view>
+		</view>
+		<view class="remark">
+			<view class="remark-title col-9 f-30">
+				备注说明
+			</view>
+			<view class="f-28">
+				{{hitchDetails.remarks}}
+			</view>
+		</view>
+		<view class="bottomMenu dis-flex">
+			<view class=" dis-flex" style="flex: 0.4;">
+				<view class="flex-box" @click="report">
+					<view class="t-c">
+						<image :src="imgfixUrls + 'f4jubao.png'" mode=""></image>
+					</view>
+					<view class="f-26 c-ff4444 t-c">
+						举报
+					</view>
+				</view>
+				<view class="flex-box" @click="collect">
+					<view :class="hitchDetails.is_collection == 1?'iconfont icon-xihuan t-c':'iconfont icon-xihuan1 t-c'" style="font-size: 40upx;" :style="{color: hitchDetails.is_collection == 1?'#FF4444':'#333333'}">
+						
+					</view>
+					<view class="f-26 color333333 t-c">
+						收藏
+					</view>
+				</view>
+				
+			</view>
+			<view  style="flex: 0.6;">
+				<view class="consult" @click="consule">
+					在线咨询
+				</view>
+				<view class="playCall" @click="kfPhone">
+					拨打电话
+				</view>
+			</view>
+		</view>
+		<PopManager :show="show" type="center" @clickmask="close">
+			<view class="reportPop">
+				<view class="reportPop-title">
+					举报信息
+					<text class="iconfont icon-close" style="font-size: 36upx;float: right;" @click="close"></text>
+				</view>
+				<view class="reportPop-content">
+					<textarea v-if="show" class="textarea" placeholder-class="col-9" v-model="describe" value="" placeholder="请输入举报信息" />
+				</view>
+				<view class="submit" @click="submitReport">
+					提交
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="disclaimerPopShow" type="center" @clickmask="disclaimerPopShow = false">
+			<view class="disclaimerPop">
+				{{hitchDetails.desc_disclaimers}}
+			</view>
+			<view class="line">
+				
+			</view>
+			<view class="iconfont icon-roundclose col-f icons" @click="disclaimerPopShow = false">
+				
+			</view>
+		</PopManager>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import journey from '@/components/template/journey.vue';
+	import PopManager from '@/components/template/PopManager';
+	export default{
+		data(){
+			return{
+				flag:false,
+				disclaimerPopShow:false,
+				show:false,
+				hitchDetails:{},
+				id:null,
+				describe:''
+			}
+		},
+		components:{
+			journey,
+			PopManager
+		},
+		onLoad(e) {
+			console.log(e);
+			this.id = e.id;
+			this.getHitchDetails(e.id);
+		},
+		methods:{
+			kfPhone() {
+				let _this = this
+				uni.makePhoneCall({
+					phoneNumber: _this.hitchDetails.contacts_phone //仅为示例
+				});
+			},
+			consule(){
+				let getSetInfo = uni.getStorageSync('getSetInfo');
+				if(getSetInfo.type == 1){
+					App.navigationTo({
+						url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + this.hitchDetails.mid + '&other_party_type=' + 1+ '&type=1'
+					})
+				}else{
+					App.navigationTo({
+						url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.hitchDetails.mid + '&other_party_type=' + 1+ '&type=1'
+					})
+				}
+			},
+			collect(){
+				App._post_form(
+					`&p=vehicle&do=collection`,
+					{id:this.id},
+					res => {
+						uni.showToast({
+							title:this.hitchDetails.is_collection == 0?'收藏成功':'取消收藏成功'
+						});
+						this.getHitchDetails(this.id);
+					},
+					false,
+					() => {}
+				);
+			},
+			submitReport(){
+				this.show = false;
+				App._post_form(
+					`&p=vehicle&do=report`,
+					{id:this.id,describe:this.describe},
+					res => {
+						
+						uni.showToast({
+							title:res.message
+						});
+						this.describe = '';
+					},
+					false,
+					() => {}
+				);
+			},
+			getHitchDetails(id){
+				App._post_form(
+					`&p=vehicle&do=routeDesc`,
+					{id:id},
+					res => {
+						this.hitchDetails = res.data;
+						console.log(res);
+					},
+					false,
+					() => {}
+				);
+			},
+			report(){
+				this.show = true;
+			},
+			close(){
+				this.show = false;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.hitchRideDetails{
+		padding-bottom: 200upx;
+		.disclaimer{
+			padding: 15upx 30upx;
+			background-color: #FDFBE6;
+			font-size: 24upx;
+			color: #FFA62E;
+			.text{
+				width: 630upx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+				line-height: 28upx;
+			}
+		}
+		.generalize{
+			margin: 30upx;
+			padding: 0 30upx;
+			background: #FFFFFF;
+			box-shadow: 0upx 8upx 24upx rgba(221, 221, 221, 0.5);
+			border-radius: 20upx;
+		}
+		.particulars{
+			padding: 30upx;
+			font-size: 28upx;
+			.particulars-box{
+				display: flex;
+				padding-bottom: 30upx;
+				.particulars-title{
+					width: 140upx;
+					color: #999999;
+					text-align: right;
+				}
+				.particulars-content{
+					flex: 1;
+					color: #333333;
+					.tags{
+						height: 40upx;
+						line-height: 40upx;
+						padding: 0 10upx;
+						background-color: #ff4444;
+						border-radius: 6upx;
+						color: #ffffff;
+						font-size: 24upx;
+						margin-right: 10upx;
+						margin-bottom: 10upx;
+					}
+				}
+			}
+			
+		}
+		.remark{
+			padding: 0 30upx;
+			.remark-title{
+				padding: 30upx 0;
+				border-top: 8upx solid #f8f8f8;
+			}
+		}
+		.bottomMenu{
+			padding: 20upx 30upx;
+			background-color: #FFFFFF;
+			border: 1upx solid #EEEEEE;
+			image{
+				width: 34upx;
+				height: 40upx;
+			}
+			position: fixed;
+			left: 0;
+			bottom: 0;
+			width: 750upx;
+			box-sizing: border-box;
+			.consult{
+				display: inline-block;
+				width: 190upx;
+				height: 100upx;
+				line-height: 100upx;
+				text-align: center;
+				border-radius: 10upx;
+				border: 1upx solid #72AAFD;
+				color: #72AAFD;
+				font-size: 28upx;
+				font-weight: 700;
+				margin-right: 20upx;
+			}
+			.playCall{
+				display: inline-block;
+				width: 190upx;
+				height: 100upx;
+				line-height: 100upx;
+				text-align: center;
+				border-radius: 10upx;
+				background: linear-gradient(180deg, #6EA6FD 0%, #6094FD 100%);
+				color: #FFFFFF;
+				font-size: 28upx;
+				font-weight: 700;
+			}
+		}
+		.reportPop{
+			width: 630upx;
+			// height: 630upx;
+			padding: 50upx;
+			box-sizing: border-box;
+			border-radius: 30upx;
+			background-color: #FFFFFF;
+			.reportPop-title{
+				font-size: 36upx;
+				font-weight: 700;
+				color: #333333;
+				text-align: center;
+			}
+			.reportPop-content{
+				margin: 50upx 0;
+				padding: 30upx;
+				background-color: #F8F8F8;
+				/deep/ .uni-textarea-textarea{
+					width: 100%;
+					height: 300upx;
+				}
+				.textarea{
+					width: 100%;
+				}
+			}
+			.submit{
+				width: 520upx;
+				height: 80upx;
+				line-height: 80upx;
+				text-align: center;
+				color: #FFFFFF;
+				font-size: 28upx;
+				background: linear-gradient(180deg, #6EA6FD 0%, #6094FD 100%);
+				border-radius: 20upx;
+			}
+		}
+		.disclaimerPop{
+			width: 600upx;
+			height: 600upx;
+			border-radius: 20upx;
+			padding: 30upx;
+			background-color: #FFFFFF;
+			font-size: 30upx;
+			overflow: auto;
+		}
+		.line{
+			width: 1upx;
+			border-left: 1upx dashed #F9F9F9;
+			margin: auto;
+			height: 100upx;
+		}
+		.icons{
+			margin: auto;
+			text-align: center;
+			position: relative;
+			font-size: 40upx;
+			top: -10upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/hitchRide/hitchSchedule/hitchSchedule.vue b/pages/subPages2/hitchRide/hitchSchedule/hitchSchedule.vue
new file mode 100644
index 0000000..728954d
--- /dev/null
+++ b/pages/subPages2/hitchRide/hitchSchedule/hitchSchedule.vue
@@ -0,0 +1,953 @@
+<template>
+	<view class="hitchSchedule">
+		<view
+			class="logo"
+			
+		>
+		<!-- style="background: url(https://ss3.bdstatic.com/70cFv8Sh_Q1YnxGkpoWK1HF6hhy/it/u=132021381,521786388&fm=11&gp=0.jpg);background-size: 100% 400upx;background-repeat: no-repeat;" -->
+			<view class="formItem">
+				<view class="formItem-title dis-flex">
+					<view class="left"></view>
+					<view class="f-30 f-w">请填写发布信息</view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<!-- <text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text> -->
+						发布角色
+					</view>
+					<view class="content f-26">
+						<picker @change="bindPickerChange" disabled :value="index" :range="array" range-key="title">
+							<view class="uni-input">{{ array[index].title }}</view>
+						</picker>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view>
+				<view class="formItem-item" v-if="index == 0">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						运输类型
+					</view>
+					<view class="content f-26">
+						<picker @change="carriageArrayChange" :value="carriageArrayindex" :range="carriageArray" range-key="title">
+							<view class="uni-input">{{ carriageArray[carriageArrayindex].title }}</view>
+						</picker>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view>
+				<view class="formItem-item" v-else>
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						运输类型
+					</view>
+					<view class="content f-26">
+						<picker @change="loadingArrayChange" :value="loadingArrayindex" :range="loadingArray" range-key="title">
+							<view class="uni-input">{{ loadingArray[loadingArrayindex].title }}</view>
+						</picker>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view>
+				<view class="formItem-item" v-if="index == 1">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						班次
+					</view>
+					<view class="content f-26">
+						<picker @change="classesChange" :value="classesindex" :range="classes" range-key="title">
+							<view class="uni-input">{{ classes[classesindex].title }}</view>
+						</picker>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view>
+				<view class="formItem-item" v-if="index == 0 && carriageArrayindex == 0">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						人数
+					</view>
+					<view class="content f-26"><input type="number" placeholder="请输入乘车人数" class="input" v-model="numberPeople" value="" /></view>
+				</view>
+				<view class="formItem-item" v-if="index == 0 && carriageArrayindex == 1">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						重量(kg)
+					</view>
+					<view class="content f-26"><input type="number" placeholder="请输入货物重量" class="input" v-model="numberPeople" value="" /></view>
+				</view>
+				<view class="formItem-item" v-if="index == 1 && loadingArrayindex == 0">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						空位
+					</view>
+					<view class="content f-26"><input type="number" placeholder="请填写空余位置" class="input" v-model="numberPeople" value="" /></view>
+				</view>
+				<view class="formItem-item" v-if="index == 1 && loadingArrayindex == 1">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						载重(kg)
+					</view>
+					<view class="content f-26"><input type="number" placeholder="请填写剩余载重" class="input" v-model="numberPeople" value="" /></view>
+				</view>
+			</view>
+			<view class="formItem">
+				<view class="formItem-title dis-flex">
+					<view class="left"></view>
+					<view class="f-30 f-w">请填写路程详情</view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						出发时间
+					</view>
+					<view class="content f-26">
+						<w-picker
+							:visible.sync="visible"
+							mode="shortTerm"
+							:expand="90"
+							startYear="2021"
+							endYear="2029"
+							value="2020-04-07"
+							:current="true"
+							fields="minute"
+							@cancel="onCancel"
+							@confirm="onConfirm($event, 'date')"
+							:disabled-after="false"
+							ref="date"
+						></w-picker>
+						<view :class="goOff == '请选择出发时间'?'col-9':'col-3'"  @click="open">{{goOff}}</view>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view>
+				<!-- <view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						出发城市
+					</view>
+					<view class="content f-26">
+						<w-picker :visible.sync="visiblecs" mode="region" :value="[provinceidNameId,areaidNameId,distidNameId]"
+						 default-type="value" :hide-area="false" @confirm="onConfirms($event,'region')" @cancel="onCancel" ref="region"></w-picker>
+						<view class="uni-input" @tap="visble" v-if="provinceidName || areaidName || distidName">{{ provinceidName }} {{ areaidName }} {{ distidName }}</view>
+						<view class="uni-input col-9" @tap="visble" v-else>
+							请选择出发城市
+						</view>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view> -->
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						出发地址
+					</view>
+					<view class="content f-26" @click="getLocation(1)"><input disabled type="text" placeholder="请输入详细地址" class="input" v-model="address" value="" /></view>
+					<view @click="getLocation(1)" class="f-26" style="margin-top: 24upx;padding-right: 30upx;">
+						<image :src="imgfixUrls + 'merchant/where.svg'" />
+						<span>定位</span>
+					</view>
+				</view>
+				<!-- <view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						终点城市
+					</view>
+					<view class="content f-26">
+						<w-picker :visible.sync="visiblecsend" mode="region" :value="[endprovinceidNameId,endareaidNameId,enddistidNameId]"
+						 default-type="value" :hide-area="false" @confirm="onConfirmsend($event,'region')" @cancel="onCancel" ref="regionend"></w-picker>
+						<view class="uni-input" @tap="visbleend" v-if="endprovinceidName || endareaidName ||enddistidName">{{ endprovinceidName }} {{ endareaidName }} {{ enddistidName }}</view>
+						<view class="uni-input col-9" @tap="visbleend" v-else>请选择终点城市</view>
+					</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;"></view>
+				</view> -->
+				<view class="formItem-item" >
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						终点地址
+					</view>
+					<view class="content f-26"@click="getLocation(2)"><input disabled type="text" placeholder="请输入详细地址" class="input" v-model="addressTwo" value="" /></view>
+					<view @click="getLocation(2)" class="f-26" style="margin-top: 24upx;padding-right: 30upx;">
+						<image :src="imgfixUrls + 'merchant/where.svg'" />
+						<span>定位</span>
+					</view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<!-- <text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text> -->
+						途经地点
+					</view>
+					<view class="content f-26" style="height: auto;" @click="openAdd">
+						<view class="input col-9" v-if="citys.length == 0">
+							请添加途经地点
+						</view>
+						<view class="tag-item" v-for="item,index in citys" :key="index" v-else>
+							{{item}}
+							<text class="iconfont icon-close iconclose" @click.stop="deletCity(index)"></text>
+						</view>
+					</view>
+					<view class="iconfont icon-add" style="font-size: 30upx;line-height: 80upx;padding-right: 30upx;" @click="openAdd"></view>
+				</view>
+			</view>
+			<view class="formItem">
+				<view class="formItem-title dis-flex">
+					<view class="left"></view>
+					<view class="f-30 f-w">其他信息</view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						联系人
+					</view>
+					<view class="content f-26"><input type="text" placeholder="请填写联系人姓名" v-model="linkman" class="input"  value="" /></view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text>
+						联系方式
+					</view>
+					<view class="content f-26"><input type="number" placeholder="请填写联系方式" maxlength="11" v-model="linkmanPhone" class="input"  value="" /></view>
+				</view>
+				<view class="formItem-item">
+					<view class="f-26 headline">
+						<!-- <text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text> -->
+						标签
+					</view>
+						<view class="content f-26" style="height: auto;" @click="tagsShow = true">
+							<view class="input col-9" v-if="tags.length == 0">
+								请添加标签信息
+							</view>
+							<view class="tag-item" v-for="item,index in tags" :key="index" v-else>
+								{{item.name}}
+								<!-- <text class="iconfont icon-close iconclose" @click="deletTags(index)"></text> -->
+							</view>
+						</view>
+					<view class="iconfont icon-right" style="font-size: 26upx;line-height: 80upx;padding-right: 30upx;" @click="tagsShow = true"></view>
+				</view>
+				<view class="formItem-item" style="display: block;">
+					<view class="f-26 headline">
+						<!-- <text class="c-ff4444" style="float: left;margin-left: 10upx;">*</text> -->
+						备注
+					</view>
+					<view class="content f-26" style="padding: 0upx 30upx 30upx;height: 150upx;">
+						<textarea value=""  class="f-28 textarea" v-model="remark" placeholder="填写备注信息" />
+					</view>
+				</view>
+			</view>
+			<button class="comfia" @click="submit" :disabled="ifsubmit">
+				提交
+			</button>
+		</view>
+		
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="midway" :type="'center'" @clickmask="closeAdd">
+			<view class="midway">
+				<view class="input">
+					<input type="text" v-if="midway" class="f-28" v-model="addSite" placeholder="请输入途经地点" />
+				</view>
+				<view class="addMidwayBtn">
+					<view class="close" @click="closeAdd">
+						取消
+					</view>
+					<view class="add" @click="addCity">
+						确定
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="tagsShow" :type="'bottom'" @clickmask="closeTags">
+			<view class="tagsPop">
+				<view class="tags-title f-34 f-w">
+					标签选择
+					<text class="iconfont icon-close_light" style="float: right;" @click="closeTags"></text>
+				</view>
+				<view class="tagsBox">
+					<view :class="item.check?'checkTagItem':'tagItem'" v-for="(item,indexs) in tagsList" :key="indexs" @click="checked(indexs)"
+					v-if="(item.is_passenger == '2' && index == 0 &&  carriageArrayindex == 0)
+					|| (item.is_goods == '2' && index == 0 &&  carriageArrayindex == 1)
+					|| (item.are_passenger == '2' && index == 1 &&  loadingArrayindex == 0)
+					|| (item.are_goods == '2' && index == 1 &&  loadingArrayindex == 1)">
+						{{item.name}}
+					</view>
+				</view>
+				
+			</view>
+		</PopManager>
+		<far-bottom></far-bottom>
+		<phoneNavBar :checked="'发布行程'" :page="'hitch'" v-if="!id"></phoneNavBar>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import wPicker from '@/components/w-picker/w-picker.vue';
+import PopManager from '@/components/template/PopManager';
+import phoneNavBar from '@/components/template/phoneNavBar';
+export default {
+	components: {
+		wPicker,
+		PopManager,
+		phoneNavBar
+	},
+	data() {
+		return {
+			tagsShow:false,
+			midway:false,
+			visiblecs:false,
+			visiblecsend:false,
+			ifsubmit:false,
+			provinceidName:'',
+			areaidName:'',
+			distidName:'',
+			provinceidNameId:'',
+			areaidNameId:'',
+			distidNameId:'',
+			endprovinceidName:'',
+			endareaidName:'',
+			enddistidName:'',
+			endprovinceidNameId:'',
+			endareaidNameId:'',
+			enddistidNameId:'',
+			addSite:'',
+			remark:'',
+			tagsList:[
+				
+			],
+			array: [
+				{
+					title: '乘客',
+					id: 0
+				},
+				{
+					title: '车主',
+					id: 1
+				}
+			],
+			carriageArray: [
+				{
+					title: '载客',
+					id: 0
+				},
+				{
+					title: '载货',
+					id: 1
+				}
+			],
+			loadingArray: [
+				{
+					title: '找客',
+					id: 0
+				},
+				{
+					title: '找货',
+					id: 1
+				}
+			],
+			classes: [
+				{
+					title: '一次',
+					id: 0
+				},
+				{
+					title: '每天',
+					id: 1
+				}
+			],
+			classesindex: 0,
+			index: 0,
+			carriageArrayindex: 0,
+			loadingArrayindex: 0,
+			numberPeople: '',
+			passengerWeight: '',
+			vacancy: '',
+			visible:false,
+			goOff:'请选择出发时间',
+			phoneHeight:null,
+			owenscitylist:null,
+			latlngs:null,
+			latlngTwo:{},
+			latlng:{},
+			isOpenLaction:false,
+			addressTwo:'',
+			address:'',
+			citys:[],
+			tags:[],
+			id:'',
+			linkmanPhone:'',
+			linkman:'',
+			infos:{},
+			userInfo:{},
+			lblis:{}
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHeight = res.windowHeight + 'px';
+			}
+		});
+		_this.owenscitylist = uni.getStorageSync('cityList')
+		_this.latlngs = uni.getStorageSync('curLoction');
+		_this.index = e.index || 0;
+		if(e.id){
+			this.id = e.id;
+			_this.getMyHitch();
+		}else{
+			_this.getMyHitch();
+		}
+		
+	},
+	onShow() {
+		let _this = this;
+		// #ifdef H5
+		window.addEventListener(
+			'message',
+			function(event) {
+				// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+				let loc = event.data;
+				if (_this.klis) {
+					return
+				}
+				if (loc && loc.module == 'locationPicker') {
+					//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+					console.log('location', loc);
+					// _this.userInfo.address = loc.poiaddress;
+					// _this.userInfo.lat = loc.latlng.lat;
+					// _this.userInfo.lng = loc.latlng.lng;
+					
+					if(_this.isOpenLaction == 1){
+						_this.address = loc.poiname;
+						_this.latlng = loc.latlng;
+					}else{
+						_this.addressTwo = loc.poiname;
+						_this.latlngTwo = loc.latlng;
+					}
+					
+					// debugger
+					_this.isOpenLaction = false;
+					let lblis = {
+						lat: loc.latlng.lat,
+						lng: loc.latlng.lng,
+						detailed_address: loc.poiaddress
+					}
+	
+				}
+			},
+			false
+		);
+		// #endif
+		//#ifdef APP-PLUS
+		if(_this.userInfo.lat){
+			if(_this.isOpenLaction == 1){
+				_this.address = _this.userInfo.address;
+				_this.latlng.lat = _this.userInfo.lat;
+				_this.latlng.lng = _this.userInfo.lng;
+			}else{
+				_this.addressTwo = _this.userInfo.address;
+				_this.latlngTwo.lat = _this.userInfo.lat;
+				_this.latlngTwo.lng = _this.userInfo.lng;
+			}
+			_this.isOpenLaction = false;
+		}
+		//#endif
+	},
+	methods: {
+		// 时间转时间戳
+		getDataTime(timeValue) {
+			let time;
+			if(timeValue == '请选择出发时间'){
+				time = '';
+			}else{
+				let ontime;
+				ontime = timeValue.replace(/-/g, '/');
+				let date = new Date(ontime);
+				time = date.getTime() / 1000;
+			}
+			
+			return time;
+		},
+		// 时间戳转时间
+		getTimeData(dataValue) {
+			// debugger
+			 let date = new Date(Number(dataValue) * 1000) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+			        let Y = date.getFullYear() + '-'
+			        let M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'
+			        let D = date.getDate() + ' '
+			        let h = date.getHours() + ':'
+			        let m = date.getMinutes()
+			        let s = date.getSeconds()
+			        // return Y+M+D+h+m+s
+			        // console.log(timestampToTime (1533293827000))
+			return {
+				label: Y + M + D + h + m
+			};
+		},
+		getMyHitch(){
+			let _this = this;
+			App._post_form(
+				`&p=vehicle&do=editRoute`,
+				{id:_this.id},
+				res => {
+					console.log(res);
+					_this.tagsList = res.data.label;
+					if(_this.id){
+						_this.infos = res.data.info;
+						_this.index = _this.infos.type;
+						if(_this.infos.transport_type == '1'){
+							_this.index = 0 ;
+							_this.carriageArrayindex = 0;
+						}else if(_this.infos.transport_type == '2'){
+							_this.index = 0 ;
+							_this.carriageArrayindex = 1;
+						}
+						else if(_this.infos.transport_type == '3'){
+							_this.index = 1 ;
+							_this.carriageArrayindex = 0;
+						}else{
+							_this.index = 1 ;
+							_this.carriageArrayindex = 1;
+						}
+						_this.goOff = _this.getTimeData(_this.infos.start_time).label;
+						// _this.provinceidNameId = _this.infos.start_province_id;
+						// _this.areaidNameId = _this.infos.start_city_id;
+						// _this.distidNameId = _this.infos.start_area_id;
+						_this.address = _this.infos.start_address;
+						_this.latlng.lng = _this.infos.start_lng;
+						_this.latlng.lat = _this.infos.start_lat;
+						// _this.endprovinceidNameId = _this.infos.end_province_id;
+						// _this.endareaidNameId = _this.infos.end_city_id;
+						// _this.enddistidNameId = _this.infos.end_area_id;
+						_this.addressTwo = _this.infos.end_address;
+						_this.latlngTwo.lng = _this.infos.end_lng;
+						_this.latlngTwo.lat = _this.infos.end_lat;
+						_this.citys = _this.infos.pass_by;
+						_this.linkman = _this.infos.contacts;
+						_this.linkmanPhone = _this.infos.contacts_phone;
+						_this.numberPeople = _this.infos.weight || _this.infos.people;
+						_this.classesindex = _this.infos.frequency - 1;
+						_this.remark = _this.infos.remarks;
+						_this.tags = [];
+						_this.tagsList.map(item=>{
+							item.check = false;
+							_this.infos.label_id.forEach((items,index)=>{
+								if(items == item.id){
+									item.check = true;
+									_this.tags.push(item);
+								}
+							})
+						});
+						// _this.owenscitylist.map(item=>{
+						// 	if(item.id == _this.provinceidNameId){
+						// 		_this.provinceidName = item.name
+						// 	}
+						// 	if(item.id == _this.endprovinceidNameId){
+						// 		_this.endprovinceidName = item.name
+						// 	}
+						// 	item.area.map(items=>{
+						// 		if(items.id == _this.endareaidNameId){
+						// 			_this.endareaidName = items.name;
+						// 		}
+						// 		if(items.id == _this.areaidNameId){
+						// 			_this.areaidName = items.name;
+						// 		}
+						// 		items.dist.map(itemss=>{
+						// 			if(itemss.id == _this.enddistidNameId){
+						// 				_this.enddistidName = itemss.name;
+						// 			}
+						// 			if(itemss.id == _this.distidNameId){
+						// 				_this.distidName = itemss.name;
+						// 			}
+						// 		})
+						// 	})
+						// })
+					}else{
+						// _this.index = _this.index - 1;
+					}
+				},
+				false,
+				() => {}
+			);
+		},
+		submit(){
+			let data = {
+				type:Number(this.index) + 1,
+				transport_type:(this.index == 0 && this.carriageArrayindex == 0)?1:(this.index == 0 && this.carriageArrayindex == 1)?2:(this.index == 1 && this.loadingArrayindex == 0)?3:4,
+				start_time:this.getDataTime(this.goOff),
+				start_address:this.address,
+				start_lng:this.latlng.lng,
+				start_lat:this.latlng.lat,
+				end_address:this.addressTwo,
+				end_lng:this.latlngTwo.lng,
+				end_lat:this.latlngTwo.lat,
+				pass_by:this.citys,
+				contacts:this.linkman,
+				contacts_phone:this.linkmanPhone
+			};
+			if((this.index == 0 && this.carriageArrayindex == 0) || (this.index == 1 && this.loadingArrayindex == 0)){
+				data.people = this.numberPeople;
+			}else{
+				data.weight = this.numberPeople;
+			}
+			if(this.index ==  1){
+				data.frequency = this.classesindex + 1;
+			}
+			
+			for(let k in data){
+				if(!data[k]){
+					console.log(data);
+					uni.showToast({
+						icon:'none',
+						title:'请完善发布信息'
+					})
+					return false
+				}
+			}
+			data.remarks = this.remark;
+			data.label_id = [];
+			this.tags.map(item=>{
+				data.label_id.push(item.id);
+			});
+			let datas = {
+				type:'post'
+			};
+			if(this.id){
+				datas.id = this.id;
+			}
+			datas.data = JSON.stringify(data);
+			this.ifsubmit = true;
+			setTimeout(()=>{
+				this.ifsubmit = false;
+			},2000)
+			console.log(data)
+			App._post_form(
+				`&p=vehicle&do=editRoute`,
+				datas,
+				res => {
+					if(res.data.length == 0){
+							App.navigationTo({
+								url: `pages/subPages2/hitchRide/hitchList/hitchList?flag=${'issue'}`
+							});
+					}else{
+							App.navigationTo({
+								url: `pages/mainPages/payment/payment?orderid=${res.data.orderid}&plugin=${res.data.type}`
+							});
+					}
+					this.ifsubmit = false;
+				},
+				false,
+				() => {}
+			);
+		},
+		checked(index){
+			this.tags = [];
+			this.tagsList[index].check = !this.tagsList[index].check;
+			this.tagsList.map(item=>{
+				if(item.check){
+					this.tags.push(item)
+				}
+			})
+		},
+		closeTags(){
+			this.tagsShow = false;
+		},
+		deletTags(index){
+			this.tags.splice(index,1)
+		},
+		deletCity(index){
+			this.citys.splice(index,1)
+		},
+		addCity(){
+			this.midway = false;
+			this.citys.map(item=>{
+				
+			})
+			if(!this.addSite && this.addSite == ''){
+				uni.showToast({
+					icon:'none',
+					title:'途经地点不能为空'
+				});
+				return
+			}
+			this.citys.push(this.addSite);
+			this.addSite = '';
+		},
+		openAdd(){
+			this.addSite = '';
+			this.midway = true;
+		},
+		closeAdd(){
+			this.midway = false;
+		},
+		getLocation(num) {
+			let _this = this;
+			_this.isOpenLaction = num;
+			// #ifdef MP-WEIXIN
+			uni.chooseLocation({
+				keyword: '',
+				success: function(e) {
+					if(_this.isOpenLaction == 1){
+						_this.address = e.name;
+						_this.latlng.lat = e.latitude;
+						_this.latlng.lng = e.longitude;
+						return
+					}else{
+						_this.addressTwo = e.name;
+						_this.latlngTwo.lat = e.latitude;
+						_this.latlngTwo.lng = e.longitude;
+						return
+					}
+					// console.log(e);
+				}
+			});
+			// #endif
+			//#ifdef APP-PLUS
+			      App.navigationTo({
+			       url: 'pages/subPages2/map/index'
+			      });
+			      //#endif
+		},
+		visble(){
+			this.visiblecs = true;
+		},
+		visbleend(){
+			this.visiblecsend = true;
+		},
+		open(){
+			this.$refs.date.show()
+		},
+		onConfirm(e){
+			console.log(e);
+			this.goOff  = e.result;
+		},
+		onConfirmsend(e){
+			console.log(e);
+			this.endprovinceidName = e.obj.province.label;
+			this.endareaidName = e.obj.city.label;
+			this.enddistidName = e.obj.area.label;
+			this.endprovinceidNameId = e.value[0];
+			this.endareaidNameId = e.value[1];
+			this.enddistidNameId = e.value[2];
+		},
+		onConfirms(e){
+			console.log(e);
+			this.provinceidName = e.obj.province.label;
+			this.areaidName = e.obj.city.label;
+			this.distidName = e.obj.area.label;
+			this.provinceidNameId = e.value[0];
+			this.areaidNameId = e.value[1];
+			this.distidNameId = e.value[2];
+		},
+		onCancel(e) {
+			// this.$refs.date.hide()
+			console.log(e);
+		},
+		classesChange(e) {
+			this.classesindex = e.detail.value;
+		},
+		loadingArrayChange(e) {
+			this.numberPeople = '';
+			this.loadingArrayindex = e.detail.value;
+		},
+		carriageArrayChange(e) {
+			this.numberPeople = '';
+			this.carriageArrayindex = e.detail.value;
+		},
+		bindPickerChange(e) {
+			this.numberPeople = '';
+			this.index = e.detail.value;
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.hitchSchedule {
+	
+	.logo {
+		// height: 400rpx;
+		padding-bottom: 240upx;
+		width: 750upx;
+		padding-top: 50upx;
+		.formItem {
+			width: 690upx;
+			background-color: #ffffff;
+			border-radius: 15upx;
+			padding: 30upx;
+			box-sizing: border-box;
+			margin-left: 30upx;
+			margin-bottom: 30upx;
+			.formItem-title {
+				padding-bottom: 30upx;
+				.left {
+					height: 26upx;
+					margin-top: 8upx;
+					width: 8upx;
+					background-color: #ff4444;
+					border-radius: 60upx;
+					margin-right: 30upx;
+				}
+			}
+			.formItem-item {
+				display: flex;
+				background-color: #f8f8f8;
+				border-radius: 10upx;
+				margin-bottom: 30upx;
+				image{
+					width: 22upx;
+					height: 22upx;
+				}
+				.headline {
+					width: 130upx;
+					height: 80upx;
+					line-height: 80upx;
+
+					text-align: right;
+				}
+				.content {
+					flex: 1;
+					height: 80upx;
+					line-height: 80upx;
+					padding-left: 30upx;
+					// background-color: #f8f8f8;
+					.input {
+						height: 80upx;
+						line-height: 80upx;
+						font-size: 26upx;
+					}
+					.tag-item{
+						margin-right: 20upx;
+						// width: 100upx;
+						padding: 0 10upx;
+						display: inline-block;
+						height: 50upx;
+						border-radius: 10upx;
+						background-color: #FF4444;
+						color: #FFFFFF;
+						line-height: 50upx;
+						text-align: center;
+						margin-top: 18upx;
+						.iconclose{
+							font-size: 20upx;
+							margin-left: 10upx;
+						}
+					}
+					.textarea{
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+	}
+	.iframe-wid-hgt{
+		width: 100vw;
+	}
+	.tagsPop{
+		width: 750upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		border-radius: 30upx 30upx 0 0;
+		background-color: #FFFFFF;
+		// height: 560upx;
+		// overflow: auto;
+		.tagsBox{
+			height: 400upx;
+			overflow: auto;
+		}
+		.tags-title{
+			margin-bottom: 30upx;
+		}
+		.tagItem{
+			padding: 0 20upx;
+			height: 60upx;
+			line-height: 60upx;
+			display: inline-block;
+			border-radius: 10upx;
+			text-align: center;
+			font-size: 28upx;
+			border: 1upx solid #EEEEEE;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+		}
+		.checkTagItem{
+			padding: 0 20upx;
+			height: 60upx;
+			line-height: 60upx;
+			display: inline-block;
+			border-radius: 10upx;
+			text-align: center;
+			font-size: 28upx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+		}
+	}
+	.midway{
+		width: 630upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		background-color: #f8f8f8;
+		border-radius: 20upx;
+		.input{
+			padding: 20upx 30upx;
+			background-color: #FFFFFF;
+			border-radius: 10upx;
+		}
+		.addMidwayBtn{
+			display: flex;
+			margin-top: 50upx;
+			.close{
+				width: 180upx;
+				height: 60upx;
+				line-height: 80upx;
+				background-color: #CCCCCC;
+				color: #FFFFFF;
+				border-radius: 10upx;
+				text-align: center;
+				line-height: 60upx;
+				flex: 1;
+				margin: 0 60upx;
+				font-size: 32upx;
+				font-weight: 700;
+			}
+			.add{
+				width: 180upx;
+				margin: 0 60upx;
+				flex: 1;
+				height: 60upx;
+				line-height: 60upx;
+				background-color: #ff4444;
+				color: #FFFFFF;
+				border-radius: 10upx;
+				text-align: center;
+				line-height: 60upx;
+				font-size: 32upx;
+				font-weight: 700;
+			}
+		}
+	}
+	.comfia{
+		width: 600upx;
+		height: 80upx;
+		line-height: 80upx;
+		text-align: center;
+		color: #FFFFFF;
+		background-color: #FF4444;
+		border-radius: 15upx;
+		font-size: 30upx;
+		font-weight: 700;
+		margin: auto;
+		// margin-bottom: 240upx;
+	}
+}
+</style>
diff --git a/pages/subPages2/hitchRide/index/index.vue b/pages/subPages2/hitchRide/index/index.vue
new file mode 100644
index 0000000..6d60605
--- /dev/null
+++ b/pages/subPages2/hitchRide/index/index.vue
@@ -0,0 +1,595 @@
+<template>
+	<view class="hitchRide">
+		<loadlogo v-if="!loadlogo" />
+		<view class="hitchRide-title" :style="{height: HitchData.adv.length == 0? '60rpx':'422rpx'}" v-else>
+			<view class="swiperBox" style="width: 100%;height: 100%;" >
+				<swiper class="swiper" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+					<swiper-item v-for="(item, index) in HitchData.adv" :key="index" >
+						<image :src="item.thumb" style="width: 100%;height: 100%;"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<!-- <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fi0.hdslb.com%2Fbfs%2Farticle%2F99fc792ef019f8457cc753964bd6d92c37111136.jpg&refer=http%3A%2F%2Fi0.hdslb.com&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1620526828&t=a675342b718d142e7925668bf2e81371" mode=""></image> -->
+			<view class="yongche" v-if="type == 1" :style="{top: HitchData.adv.length == 0? '0rpx':'360rpx'}">
+				<image :src="imgfixUrls + 'yongche.png'" mode=""></image>
+				<view class="yongcheBtn f-36 f-w">
+					<view class="flex-box t-c col-f">
+						<image :src="imgfixUrls + 'baiyongche.png'" mode="aspectFit"></image>
+						我要用车
+					</view>
+					<view class="flex-box t-c col-9" @click="changeType(2)">
+						<image :src="imgfixUrls + 'huichezhu.png'" mode="aspectFit"></image>
+						我是车主
+					</view>
+				</view>
+			</view>
+			<view class="yongche" v-else :style="{top: HitchData.adv.length == 0? '0rpx':'360rpx'}">
+				<image :src="imgfixUrls + 'chezhu.png'" mode=""></image>
+				<view class="yongcheBtn f-36 f-w">
+					<view class="flex-box t-c col-9" @click="changeType(1)">
+						<image :src="imgfixUrls + 'huiyongche.png'" mode="aspectFit"></image>
+						我要用车
+					</view>
+					<view class="flex-box t-c col-f" >
+						<image :src="imgfixUrls + 'baichezhu.png'" mode="aspectFit"></image>
+						我是车主
+					</view>
+				</view>
+			</view>
+			<view class="f-24 aggregate">
+				共{{count}}条用车信息
+			</view>
+			<view class="destination">
+				
+				<view class="punctuation">
+					<view class="dot dis-il-block">
+						
+					</view>
+					<view class="dis-il-block destination-origin-go"  @click="getLocat(1)">
+						<input type="text" disabled v-model="start_address" placeholder="点击定位出发地址"class="f-28 inouts" style="color:#185DE9;padding-top: 6upx;" placeholder-class="f-28" placeholder-style="color:#185DE9;" value="" />
+					</view>
+				</view>
+				<view class="punctuation " style="background-color: #F8F8F8;margin-top: 30upx;">
+					<view class="dot dis-il-block" style="background-color: #FF4444;">
+						
+					</view>
+					<view class="dis-il-block destination-origin" style="padding: 30upx 30upx 30upx 60upx;" @click="getLocat(2)">
+						<input type="text" disabled v-model="end_address" value="" class="f-32 col-3 f-w inouts" placeholder="点击定位目的地" placeholder-class="f-32 col-3 f-w"/>
+					</view>
+					<view class="dis-il-block f-w f-32 p-top-bom-30" style="float: right;padding-right: 30upx;color: #185DE9;" @click="search">
+						搜索
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="hitchRide-content">
+			
+			<view class="filter-box dis-flex">
+				<!-- <view  style="flex: 0.8;">
+					<filtertab 
+					:requestType="'9'" 
+					:isPageScroll="'1'" 
+					@selectAreaid="selectAreaid" 
+					@selectSort="selectSort" 
+					@getmore="getmore" 
+					@getResumeList="getResumeList"
+					@selectClassTwoid="selectClassTwoid" 
+					@selectOrders="selectOrders" 
+					@getcityWork="getcityWork"
+					@selectGneder="selectGneder"></filtertab>
+				</view>
+				<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="check = !check">
+					<text>更多</text>
+					<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+				</view> -->
+				<view class="flex-box">
+					<view :class="transport_type == 0?'left-check':'left-nocheck'" @click="checkLeft(0)">
+						全部
+					</view>
+					<view :class="transport_type == 1 || transport_type == 3?'left-check':'left-nocheck'" @click="checkLeft(type == 1?3:1)">
+						乘用
+					</view>
+					<view :class="transport_type == 2 || transport_type == 4?'left-check':'left-nocheck'" @click="checkLeft(type == 1?4:2)">
+						载货
+					</view>
+				</view>
+				<!-- <view class="flex-box dis-flex flex-around flex-warp flex-x-around" v-if="type == 1">
+					<view :class="frequency == 1?'right-check':'right-nocheck'" @click="checkRight(1)">
+						全部
+					</view>
+					<view :class="frequency == 1?'right-check':'right-nocheck'" @click="checkRight(1)">
+						一次
+					</view>
+					<view :class="frequency == 2?'right-check':'right-nocheck'" @click="checkRight(2)">
+						
+					</view>
+				</view> -->
+			</view>
+			<view class="journey-box" v-if="HitchData.list.length > 0">
+				<view class="journey-item" v-for="(item,index) in HitchData.list" :key="index">
+					<journey :phones="true" :boxPadding="false" :hitchItem="item"></journey>
+				</view>
+			</view>
+			<view class="journey-box" v-else>
+				<nonemores></nonemores>
+			</view>
+			
+			<!-- 地址选择 -->
+			<!-- #ifdef H5 -->
+			<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+				<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngis">
+					<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngis.latitude},${latlngis.longitude}`"></iframe>
+				</view>
+				<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngis">
+					<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+				</view>
+			</PopManager>
+			<!-- #endif -->
+			
+			<!-- 更多筛选弹窗 -->
+			<view  >
+				 <screening :check="check" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+			</view>
+			<phoneNavBar :type="type" :checked="'首页'" :payclose="HitchData.payclose" :page="'hitch'"></phoneNavBar>
+			<far-bottom></far-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import nonemores from '@/components/template/nonemores.vue';
+	import filtertab from '@/components/template/filtertab.vue';
+	import screening from '@/components/template/screening.vue';
+	import journey from '@/components/template/journey.vue';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import PopManager from '@/components/template/PopManager';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	let videoAd = null;
+	export default{
+		data(){
+			return{
+				arr:[1,2,3],
+				check:false,
+				checked:false,
+				checkedLeft:1,
+				checkedRight:1,
+				moreData:{},
+				page:1,
+				total:1,
+				agencyData:{},
+				listimgstyle:{},
+				HitchData:{
+					list:[],
+					adv:[]
+				},
+				sort:0,
+				type:1,
+				transport_type:0,
+				frequency:1,
+				end_address:'',
+				start_address:'',
+				latlng:null,
+				latlngTwo:{},
+				latlngis:{},
+				isOpenLaction:false,
+				phoneHeight:null,
+				count:0,
+				loadlogo:false,
+				userInfo:{},
+				lblis:{}
+			}
+		},
+		components:{
+			filtertab,
+			journey,
+			screening,
+			nonemores,
+			phoneNavBar,
+			PopManager,
+			Loadlogo
+		},
+		onLoad() {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			// #ifdef MP-WEIXIN
+			// 在页面中定义激励视频广告
+			
+			
+			// 在页面onLoad回调事件中创建激励视频广告实例
+			// if (wx.createRewardedVideoAd) {
+			//   videoAd = wx.createRewardedVideoAd({
+			//     adUnitId: 'adunit-13ceba8798651263'
+			//   })
+			//   videoAd.onLoad(() => {})
+			//   videoAd.onError((err) => {})
+			//   videoAd.onClose((res) => {})
+			// }
+			
+			
+			// #endif
+			_this.latlngis = uni.getStorageSync('curLoction');
+			_this.latlng = uni.getStorageSync('curLoction');
+			this.agencyData = uni.getStorageSync('agencyData');
+			this.listimgstyle = uni.getStorageSync('listimgstyle');
+			this.getHitchList()
+		},
+		onShow() {
+			let _this = this;
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						if(_this.isOpenLaction == 1){
+							_this.start_address = loc.poiname;
+							_this.latlng = loc.latlng;
+							
+						}else{
+							_this.end_address = loc.poiname;
+							_this.latlngTwo = loc.latlng;
+						}
+						_this.isOpenLaction = false;
+		
+					}
+				},
+				false
+			);
+			// #endif
+			//#ifdef APP-PLUS
+			if(_this.userInfo.lat){
+				if(_this.isOpenLaction == 1){
+					_this.address = _this.userInfo.address;
+					_this.latlng.lat = _this.userInfo.lat;
+					_this.latlng.lng = _this.userInfo.lng;
+				}else{
+					_this.addressTwo = _this.userInfo.address;
+					_this.latlngTwo.lat = _this.userInfo.lat;
+					_this.latlngTwo.lng = _this.userInfo.lng;
+				}
+				_this.isOpenLaction = false;
+			}
+			//#endif
+		},
+		onReachBottom() {
+			if(this.total == this.page) return
+			this.page++;
+			this.getHitchList(true);
+		},
+		methods:{
+			changeType(num){
+				// 用户触发广告后，显示激励视频广告
+				// if (videoAd) {
+				//   videoAd.show().catch(() => {
+				//     // 失败重试
+				//     videoAd.load()
+				//       .then(() => videoAd.show())
+				//       .catch(err => {
+				//         console.log('激励视频 广告显示失败')
+				//       })
+				//   })
+				// }
+				this.type = num;
+				this.transport_type = 0;
+				// this.frequency = 1;
+				this.page = 1;
+				this.latlng = uni.getStorageSync('curLoction');
+				this.end_address = '';
+				this.start_address = '';
+				this.getHitchList();
+			},
+			getLocat(num){
+				this.isOpenLaction = num;
+				let _this = this;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					success: function(res) {
+						if(_this.isOpenLaction == 1){
+							// _this.start_address = loc.poiname;
+							// _this.latlng = loc.latlng;
+							_this.start_address = res.name;
+							_this.latlng.lat = res.latitude;
+							_this.latlng.lng = res.longitude;
+							console.log(res);
+						}else{
+							// _this.end_address = loc.poiname;
+							// _this. = loc.latlng;
+							_this.end_address = res.name;
+							_this.latlngTwo.lat = res.latitude;
+							_this.latlngTwo.lng = res.longitude;
+						}
+						_this.isOpenLaction = false;
+						
+					}
+				});
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				      //#endif
+			},
+			checkLeft(num){
+				this.page = 1;
+				this.transport_type = num;
+				this.getHitchList();
+			},
+			checkRight(num){
+				this.page = 1;
+				this.frequency = num;
+				this.getHitchList();
+			},
+			search(){
+				this.getHitchList();
+			},
+			getHitchList(flag){
+				let data = {
+					page:this.page,
+					is_total:1,
+					type:this.type == 1?2:1,
+					transport_type:this.transport_type,
+					start_lat:this.latlng.lat || '',
+					start_lng:this.latlng.lng || '',
+					end_lat:this.latlngTwo.lat || '',
+					end_lng:this.latlngTwo.lng || ''
+				}
+				App._post_form(
+					`&p=vehicle&do=homeList`,
+					data,
+					res => {
+						if(flag){
+							this.HitchData.list = this.HitchData.list.concat(res.data.list);
+						}else{
+							console.log(res);
+							this.HitchData = res.data;
+							uni.setStorageSync('payclose',this.HitchData.payclose);
+							this.total = res.data.total;
+							this.count = res.data.count;
+						}
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			getmore(data) {
+				data.top.forEach((item,index) => {
+					if(index > 2){
+						this.moreData[item.subscript] = data[item.subscript];
+					}
+				});
+				this.moreData.top = data.top;
+				for(let key in this.moreData){
+						this.moreData[key].forEach((item,index) => {
+								item.checked = false;
+								if(this.isShowVideo && key == 'get_type' && item.val == 1) {
+									item.checked = true
+								}
+								// if(key == 'job_type' && item.val == this.job_type){
+								// 	item.checked = true;
+								// }
+						})
+				}
+			},
+			// 更多弹窗确定
+			confirm(e) {
+				console.log(e)
+				// this.apiParams = {...this.apiParams,...e}
+				// this.check = false
+				// this.currentPage = 1
+				// this.memberList = []
+				// this.getMemberList()
+				// console.log(this.apiParams)
+			},
+			// 更多弹窗选项选择
+			checkeda(index,key,flag) {
+				// this.moreData[key].forEach(item=>{
+				// 	item.checked = false
+				// });
+				// let obj = Object.assign({},this.moreData);
+				// this.moreData = {...obj}
+				// this.moreData[key][index].checked = flag
+			},
+			// 关闭和清除
+			close(flag) {
+				console.log(flag)
+			},
+			selectGneder(item){
+				console.log(item)
+			},
+			selectSort(item){
+				console.log(item)
+			},
+			getResumeList(item) {
+				console.log(item)
+			},
+			
+			selectClassTwoid(item) {
+				console.log(item)
+			},
+			
+			selectOrders(item) {
+				console.log(item)
+			},
+			
+			selectAreaid(item) {
+				console.log(item)
+			},
+		}
+	}
+</script>
+
+<style>
+	
+</style>
+<style lang="scss" scoped>
+	.hitchRide{
+		padding-bottom: 240upx;
+		.hitchRide-title{
+			height: 422upx;
+			width: 750upx;
+			position: relative;
+			image{
+				width: 100%;
+				height: 100%;
+			}
+			.swiper {
+				height: 100%;
+				width: 100%;
+			}
+			.yongche{
+				width: 750upx;
+				height: 110upx;
+				position: absolute;
+				top: 360upx;
+				left: 0;
+				.yongcheBtn{
+					position: absolute;
+					left: 0;
+					top: 0;
+					width: 100%;
+					height: 110upx;
+					line-height: 110upx;
+					display: flex;
+					image{
+						width: 32upx;
+						height: 38upx;
+						vertical-align: middle;
+						margin-bottom: 6upx;
+						margin-right: 10upx;
+					}
+				}
+			}
+			.aggregate{
+				padding: 20upx 30upx;
+				padding-top: 70upx;
+				color: #C1D6FF;
+			}
+			.destination{
+				padding: 30upx;
+				border-radius: 20upx;
+				background-color: #FFFFFF;
+				width: 690upx;
+				height: 235upx;
+				box-sizing: border-box;
+				margin: auto;
+				.punctuation{
+					position:relative;
+					.dot{
+						width: 12upx;
+						height: 12upx;
+						border-radius: 50%;
+						background-color: #00C095;
+						position: absolute;
+						left: 30upx;
+						top: 50%;
+						transform: translateY(-50%);
+					}
+					.destination-origin{
+						color: #00C095;
+						font-size: 30upx;
+						padding-left: 60upx;
+						
+						/deep/ .uni-input-input{
+							width: 430upx;
+							overflow:hidden;
+							text-overflow:ellipsis;
+							-o-text-overflow:ellipsis;
+							white-space:nowrap;
+						}
+						// line-height: 40upx;
+					}
+					.destination-origin-go{
+						color: #00C095;
+						font-size: 30upx;
+						padding-left: 60upx;
+						
+						/deep/ .uni-input-input{
+							width: 540upx;
+							overflow:hidden;
+							text-overflow:ellipsis;
+							-o-text-overflow:ellipsis;
+							white-space:nowrap;
+						}
+					}
+				}
+			}
+		}
+		.hitchRide-content{
+			padding: 30upx;
+			padding-top: 380upx;
+			background: linear-gradient(180deg, #185DE9 450upx, #185DE9 1%, #F8F8F8 750upx);
+			background-repeat: no-repeat;
+			// background-color: #FFFFFF;
+			.journey-box{
+				.journey-item{
+					background-color: #FFFFFF;
+					padding: 30upx;
+					margin-bottom: 20upx;
+					border-radius: 20upx;
+				}
+			}
+			.filter-box{
+				padding: 10upx 0upx  26upx;
+				.left-nocheck{
+					width: 90upx;
+					height: 48upx;
+					line-height: 48upx;
+					font-size: 28upx;
+					color: #C1D6FF;
+					margin-right: 20upx;
+					text-align: center;
+					display: inline-block;
+				}
+				.left-check{
+					width: 90upx;
+					height: 48upx;
+					line-height: 48upx;
+					font-size: 28upx;
+					color: #FFFFFF;
+					font-weight: 700;
+					border: 1upx solid #FFFFFF;
+					border-radius: 60upx;
+					margin-right: 20upx;
+					text-align: center;
+					display: inline-block;
+				}
+				.right-nocheck{
+					width: 150upx;
+					height: 48upx;
+					line-height: 48upx;
+					font-size: 28upx;
+					color: #C1D6FF;
+					// margin-right: 20upx;
+					text-align: center;
+					display: inline-block;
+				}
+				.right-check{
+					width: 150upx;
+					height: 48upx;
+					line-height: 48upx;
+					font-size: 28upx;
+					color: #FFFFFF;
+					font-weight: 700;
+					border: 1upx solid #FFFFFF;
+					border-radius: 60upx;
+					margin-right: 0upx;
+					text-align: center;
+					display: inline-block;
+				}
+			}
+		}
+		.iframe-wid-hgt{
+			width: 100vw;
+		}
+	}
+</style>
diff --git a/pages/subPages2/hitchRide/personalCenter/personalCenter.vue b/pages/subPages2/hitchRide/personalCenter/personalCenter.vue
new file mode 100644
index 0000000..5bedfe1
--- /dev/null
+++ b/pages/subPages2/hitchRide/personalCenter/personalCenter.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="personalCenter">
+		<view class="user-title">
+			<image :src="userInfo.avatar" mode=""></image>
+			<view class="user-name">
+				{{userInfo.nickname}}
+			</view>
+		</view>
+		<view class="segmentation">
+			
+		</view>
+		<view class="menuList">
+			<view class="dis-flex menu-item" @click="goList('record')"> 
+				<image :src="imgfixUrls + 'liulan.png'" mode=""></image>
+				<view class="flex-box menu-name f-28 col-3">
+					浏览记录
+					<view class="iconfont icon-right" style="float: right;font-size: 24upx;">
+						
+					</view>
+				</view>
+				
+			</view>
+			<view class="dis-flex menu-item" @click="goList('collect')">
+				<image :src="imgfixUrls + 'shoucang.png'" mode=""></image>
+				<view class="flex-box menu-name f-28 col-3">
+					我的收藏
+					<view class="iconfont icon-right" style="float: right;font-size: 24upx;">
+						
+					</view>
+				</view>
+				
+			</view>
+			<view class="dis-flex menu-item" @click="goList('issue')">
+				<image :src="imgfixUrls + 'fabu.png'" mode=""></image>
+				<view class="flex-box menu-name f-28 col-3">
+					我的发布
+					<view class="iconfont icon-right" style="float: right;font-size: 24upx;">
+						
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="indexBtn" @click="goIndex">
+			返回首页
+		</view>
+		<phoneNavBar :checked="'个人中心'" :page="'hitch'"></phoneNavBar>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	export default{
+		data(){
+			return{
+				userInfo:{},
+				payclose:0
+			}
+		},
+		components:{
+			phoneNavBar
+		},
+		onLoad() {
+			this.payclose = uni.getStorageSync('payclose');
+			this.userInfo = uni.getStorageSync('userinfo');
+		},
+		methods:{
+			goList(flag){
+				App.navigationTo({
+					url: `pages/subPages2/hitchRide/hitchList/hitchList?flag=${flag}`
+				});
+			},
+			goIndex(){
+				App.navigationTo({
+					url: "pages/mainPages/index/index"
+				});
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #FFFFFF;
+	}
+</style>
+<style lang="scss" scoped>
+	.personalCenter{
+		height: 100vh;
+		background-color: #FFFFFF;
+		.user-title{
+			display: flex;
+			padding: 40upx 30upx;
+			image{
+				width: 120upx;
+				height: 120upx;
+				border-radius: 50%;
+			}
+			.user-name{
+				padding-left: 40upx;
+				font-weight: 700;
+				line-height: 120upx;
+				font-size: 42upx;
+				color: #333333;
+			}
+		}
+		.segmentation{
+			height: 20upx;
+			background-color: #F8F8F8;
+		}
+		.menuList{
+			.menu-item{
+				display: flex;
+				padding: 0upx 30upx;
+				image{
+					margin-top: 40upx;
+					width: 40upx;
+					height: 40upx;
+				}
+				.menu-name{
+					line-height: 40upx;
+					padding: 40upx 0;
+					padding-left: 20upx;
+					border-bottom: 1upx solid #EEEEEE;
+				}
+			}
+		}
+		.indexBtn{
+			width: 690upx;
+			height: 80upx;
+			font-size: 28upx;
+			border-radius: 20upx;
+			background-color: #F8F8F8;
+			color: #999999;
+			line-height: 80upx;
+			text-align: center;
+			position: absolute;
+			left: 30upx;
+			bottom: 240upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/customerDemand/customerDemand.vue b/pages/subPages2/homemaking/customerDemand/customerDemand.vue
new file mode 100644
index 0000000..ab85df8
--- /dev/null
+++ b/pages/subPages2/homemaking/customerDemand/customerDemand.vue
@@ -0,0 +1,173 @@
+<template>
+	<view class="myDemand">
+		<loadlogo v-if="!loadlogo" />
+		<filtertab
+		:requestType="'需求列表'" 
+		:isPageScroll="'1'" 
+		@selectAreaid="selectAreaid" 
+		@selectClassid="selectClassid" 
+		@getmore="getmore"
+		@getResumeList="getResumeList"
+		@selectClassTwoid="selectClassTwoid" 
+		@selectOrders="selectOrders" 
+		@getcityWork="getcityWork"
+		:cate_one="cate_one" 
+		:cate_two="cate_two"></filtertab>
+		<view  v-if="demandList.length > 0">
+			<view class="myDemand-item" v-for="(item,index) in demandList" :key="index">
+				<demand-item :demanItem="item"></demand-item>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<view  v-else>			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		</view>
+		<!-- <view class="issue-myDemand">
+			<text class="iconfont icon-add" style="font-size: 32upx;color: #FFFFFF;padding-right: 20upx;"></text> 
+			 发布需求
+		</view> -->
+		<TabBars :tabBarAct="0" pageType="18"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar.vue';
+	import demandItem from '@/components/template/demandItem.vue';
+	import filtertab from '@/components/template/filtertab.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'0',
+				cate_two:'0',
+				latlngs:{},
+				page:1,
+				demandList:[],
+				page_number:1,
+				isMore:true,
+				loadlogo:false,
+				sort:1,
+				typeid:'',
+				city_id:''
+			}
+		},
+		components:{
+			demandItem,
+			filtertab,
+			loadMore,
+			Loadlogo,
+			TabBars
+		},
+		onLoad() {
+			this.latlngs = uni.getStorageSync('curLoction');
+			this.getDemandList();
+		},
+		onReachBottom() {
+			if(this.page_number == this.page) return
+			this.page++;
+			this.isMore = false;
+			this.getDemandList(true)
+		},
+		methods:{
+			getDemandList(flag){
+				let data = {
+					pege:this.page,
+					lat:this.latlngs.latitude || '',
+					lng:this.latlngs.longitude || '',
+					sort:this.sort,
+					typeid:this.typeid,
+					city_id:this.city_id
+				}
+				App._post_form(
+					`&p=housekeep&do=getDemandlist`,
+					data,
+					res => {
+						if(flag){
+							this.demandList = this.demandList.concat(res.data.list);
+						}else{
+							this.demandList = res.data.list;
+							this.page_number = res.data.page_number;
+						}
+						this.isMore = true;
+						console.log(res);
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			selectAreaid(e){
+				this.city_id = e.id;
+				console.log(e,1);
+				this.getDemandList()
+			},
+			selectClassid(e){
+				this.typeid = e.cate_one;
+				console.log(e,2);
+				this.getDemandList()
+			},
+			getmore(e){
+				console.log(e,3)
+			},
+			getResumeList(e){
+				console.log(e,4)
+			},
+			selectClassTwoid(e){
+				console.log(e,5);
+				this.typeid = e.cate_two;
+				console.log(e,2);
+				this.getDemandList()
+			},
+			selectOrders(e){
+				console.log(e,6);
+				this.sort = e.val;
+				this.getDemandList();
+			},
+			getcityWork(e){
+				console.log(e,7)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.myDemand{
+		// padding: 20upx 30upx;
+		margin-bottom: 150upx;
+		.myDemand-item{
+			margin-bottom: 20upx;
+			padding: 20upx 30upx;
+		}
+		.reject{
+			width: 610upx;
+			padding: 20upx;
+			border-radius: 0 0 20upx 20upx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-left: 20upx;
+			
+		}
+		.issue-myDemand{
+			width: 690upx;
+			height: 80upx;
+			text-align: center;
+			line-height: 80upx;
+			color: #FFFFFF;
+			font-size: 32upx;
+			background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+			opacity: 1;
+			border-radius: 20upx;
+			position: fixed;
+			bottom: 30upx;
+			left: 30upx;
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
diff --git a/pages/subPages2/homemaking/homeUser/homeUser.vue b/pages/subPages2/homemaking/homeUser/homeUser.vue
new file mode 100644
index 0000000..e583d46
--- /dev/null
+++ b/pages/subPages2/homemaking/homeUser/homeUser.vue
@@ -0,0 +1,311 @@
+<template>
+	<view class="homeUser">
+		<view class="title">
+			<view class="title-img">
+				<image :src="user.avatar" mode=""></image>
+			</view>
+			<view class="name">
+				<view class="nameText">
+					{{user.nickname}}
+				</view>
+				<view class="approve">
+					{{user.mobile}}
+				</view>
+			</view>
+		</view>
+		<view class="content">
+			<view class="btn-box" :style="{padding: user.status == 1?'40rpx 30rpx 0':'20rpx'}" >
+				<view class="box-item t-c" v-if="user.status == 1" @click="service">
+					<image :src="imgfixUrls + 'homemakingImg/fabufuwu.png'" mode=""></image>
+					发布服务
+				</view>
+				<view class="box-item t-c" v-if="user.status == 1" style="background-color: #FDAD28;margin-left: 20upx;" @click="navItemPage('pages/subPages2/homemaking/myorderForm/myorderForm?type=2')">
+					<image :src="imgfixUrls + 'homemakingImg/yewuorder.png'" mode=""></image>
+					业务订单
+					<!-- <view class="statistics">
+						1
+					</view> -->
+				</view>
+			</view>
+			<view class="item">
+				<view class="content-item" @click="navItemPage('pages/subPages2/homemaking/myorderForm/myorderForm?type=1')">
+					<image :src="imgfixUrls + 'homemakingImg/dingdan.png'" mode=""></image>
+					我的订单
+					<view class="flex-box t-r">
+						{{user.ordernum}} <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			<view class="item">
+				<view class="content-item" @click="navItemPage('pages/subPages2/homemaking/myDemand/myDemand')">
+					<image :src="imgfixUrls + 'homemakingImg/xuqiu.png'"  mode=""></image>
+					我发布的需求
+					<view class="flex-box t-r">
+						{{user.demandnum}} <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			<view class="item">
+				<view class="content-item" @click="navItemPage(`pages/subPages/merchant/merchantComment/merchantComment?type=1&id=${user.arid}`)">
+					<image :src="imgfixUrls + 'homemakingImg/pingjiakuang.png'" mode=""></image>
+					用户评价
+					<view class="flex-box t-r">
+						<text v-if="user.commentnum">{{user.commentnum}}</text> <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			
+			<view class="item" v-if="user.status == 1">
+				<view class="content-item" @click="navItemPage(`pages/subPages2/homemaking/myServiceList/myServiceList?type=2&id=${user.arid}`)">
+					<image :src="imgfixUrls + 'homemakingImg/yewu.png'" mode=""></image>
+					我的业务
+					<view class="flex-box t-r">
+						{{user.servicenum}} <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			<view class="item" v-if="user.attSwitch == 1">
+				<view class="content-item" @click="navItemPage('pages/subPages/attestationCenter/index?rzType=1&type=1')">
+					<image :src="imgfixUrls + 'homemakingImg/renzheng1.png'"  mode=""></image>
+					我的认证
+					<view class="flex-box t-r col-9">
+						{{user.attestation.attestation == 1?'已认证':'未认证'}} <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			
+			<view class="item" v-if="user.moneySwitch == 1">
+				<view class="content-item" @click="navItemPage('pages/subPages/attestationCenter/index?rzType=1&type=1')">
+					<image :src="imgfixUrls + 'homemakingImg/baozhengjin.png'"  mode=""></image>
+					我的保证金
+					<view class="flex-box t-r col-9" v-if="user.attestation.bondmoney">
+						{{user.attestation.bondmoney}}元 <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+					<view class="flex-box t-r col-9" v-else>
+						未缴纳 <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="line">
+					
+				</view>
+			</view>
+			<view class="item">
+				<view class="content-item" @click="navItemPage(`pages/subPages2/homemaking/serviceIn/serviceIn?id=${user.arid}`)">
+					<image :src="imgfixUrls + 'homemakingImg/ruzhu.png'"  mode=""></image>
+					我的入驻
+					<view class="flex-box t-r col-9">
+						{{user.status == 1?'入驻中':user.status == 2?'未支付':user.status == 5?'待审核':user.status == 6?'被驳回':''}} <text class="iconfont icon-right" style="font-size: 24upx;color: #333333;padding-left: 20upx;"></text>
+					</view>
+				</view>
+				<view class="reject" v-if="user.status == 6">
+					驳回原因:{{user.reason}}
+				</view>
+			</view>
+		</view>
+		<view class="indexBtn" @click="navIndex">
+			返回首页
+		</view>
+		<TabBars :tabBarAct="0" pageType="18"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				user:{}
+			}
+		},
+		components:{
+			TabBars
+		},
+		onLoad() {
+			// this.user = uni.getStorageSync('userinfo');
+			
+		},
+		onShow() {
+			this.getUser()
+		},
+		methods:{
+			navItemPage(url){
+				App.navigationTo({
+					url: url
+				});
+			},
+			service(){
+				// if(this.user.attestation.attestation != 1){
+				// 	uni.showToast({
+				// 		title:'请先进行认证',
+				// 		icon:'none'
+				// 	});
+				// 	return
+				// }
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/pubService/pubService?arid=" + this.user.arid + '&type=2'
+				});
+			},
+			navIndex(){
+				App.navigationTo({
+					url: "pages/mainPages/index/index"
+				});
+			},
+			getUser(){
+				App._post_form(
+					`&p=housekeep&do=personalCenter`,
+					{},
+					res => {
+						console.log(res);
+						this.user = res.data;
+						// debugger
+					},
+					false,
+					() => {
+						
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.homeUser{
+		padding-bottom: 300upx;
+		.title{
+			display: flex;
+			background: linear-gradient(180deg, #72ABFD 0%, #6093FD 100%);
+			padding: 52upx 32upx 92upx;
+			.title-img{
+				padding-right: 32upx;
+				image{
+					width: 110upx;
+					height: 110upx;
+					border-radius: 50%;
+				}
+			}
+			.name{
+				color: #FFFFFF;
+				.nameText{
+					font-size: 42upx;
+					font-weight: bold;
+				}
+				.approve{
+					// width: 124upx;
+					margin-top: 10upx;
+					padding: 0 10upx;
+					height: 32upx;
+					border-radius: 10upx;
+					border: 1upx solid #EEEEEE;
+					font-size: 20upx;
+					display: inline-block;
+					image{
+						width: 16upx;
+						height: 19upx;
+						margin-right: 10upx;
+					}
+				}
+			}
+		}
+		.content{
+			border-radius: 50upx 50upx 0px 0px;
+			position: relative;
+			top: -24upx;
+			.btn-box{
+				background-color: #FFFFFF;
+				
+				border-radius: 50upx 50upx 0px 0px;
+				display: flex;
+				.box-item{
+					width: 335upx;
+					height: 90upx;
+					border-radius: 20upx;
+					background: #72AAFD;
+					font-size: 28upx;
+					line-height: 90upx;
+					font-weight: bold;
+					color: #FFFFFF;
+					position: relative;
+					.statistics{
+						height: 30upx;
+						padding: 0 6upx;
+						min-width: 18upx;
+						background-color: #FF4444;
+						border-radius: 60upx;
+						font-size: 20upx;
+						font-weight: bold;
+						text-align: center;
+						line-height: 30upx;
+						position: absolute;
+						right: 60upx;
+						top: 10upx;
+					}
+					image{
+						width: 40upx;
+						height: 40upx;
+						vertical-align: top;
+						padding-top: 26upx;
+						margin-right: 20upx;
+					}
+				}
+			}
+			.content-item{
+				padding: 40upx 30upx;
+				font-size: 28upx;
+				line-height: 41upx;
+				color: #333333;
+				display: flex;
+				image{
+					width: 41upx;
+					height: 41upx;
+					margin-right: 20upx;
+				}
+				
+			}
+			.reject{
+				background-color: #FF4444;
+				border-radius:  0 0 30upx 30upx;
+				padding: 20upx 30upx;
+				color: #FFFFFF;
+				font-size: 28upx;
+				margin: 0 30upx;
+			}
+			.line{
+				margin-left: 90upx;
+				width: 630upx;
+				height: 2upx;
+				background-color: #EEEEEE;
+				margin-right: 30upx;
+			}
+		}
+		.indexBtn{
+			width: 690upx;
+			height: 80upx;
+			line-height: 80upx;
+			text-align: center;
+			background-color: #F8F8F8;
+			font-size: 28upx;
+			color: #999999;
+			border-radius: 20upx;
+			position: relative;
+			left: 30upx;
+			top: 30upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/homemaSearch/homemaSearch.vue b/pages/subPages2/homemaking/homemaSearch/homemaSearch.vue
new file mode 100644
index 0000000..433cb6e
--- /dev/null
+++ b/pages/subPages2/homemaking/homemaSearch/homemaSearch.vue
@@ -0,0 +1,235 @@
+<template>
+	<view class="homemaSearch">
+		<loadlogo v-if="!loadlogo"></loadlogo>
+		<view class="title">
+			<view class="seach">
+				<text class="iconfont icon-search searchbox"></text>
+				<input type="text" @confirm="confirm" v-model="search" class="seachInput " style="font-size: 26upx;" placeholder- placeholder-style="font-size: 26upx;" placeholder="  搜索我的服务" value="" />
+			</view>
+			<view class="tab">
+				<v-tabs
+					:lineScale="0.25"
+					:lineRadius="'100rpx 100rpx 0 0'"
+					:lineHeight="'8rpx'"
+					:fontSize="'32rpx'"
+					:activeFontSize="'32rpx'"
+					:bold="true"
+					:height="'100rpx'"
+					:paddingItem="'0 22rpx 20rpx'"
+					:activeColor="'#333333'"
+					:lineColor="'#333333'"
+					:color="'#999999'"
+					v-model="sort"
+					:scroll="false"
+					@change="vtabschange"
+					:tabs="['服务','商家', '需求']"
+				></v-tabs>
+			</view>
+		</view>
+		<view class="contcnt" v-if="sort == 1">
+			<view class="serItem" v-for="(item,index) in serList" :key="index">
+				<homemakingItem :items="item"></homemakingItem>
+				<!-- <myser-item @getMyserList="getMyserList" @openbtn="openbtn" :serItem="item" :type="type"></myser-item> -->
+			</view>
+		</view>
+		<view class="contcnt" v-if="sort == 0">
+			<view class="serItem" v-for="(item,index) in serList" :key="index">
+				<serveItem :serItem="item"></serveItem>
+				<!-- <myser-item @getMyserList="getMyserList" @openbtn="openbtn" :serItem="item" :type="type"></myser-item> -->
+			</view>
+		</view>
+		<view class="contcnt" v-if="sort == 2">
+			<view class="serItem" v-for="(item,index) in serList" :key="index" style="margin-bottom: 30upx;">
+				<demand-item :demanItem="item"></demand-item>
+				<!-- <myser-item @getMyserList="getMyserList" @openbtn="openbtn" :serItem="item" :type="type"></myser-item> -->
+			</view>
+		</view>
+		
+		<view  v-if="type == 21">
+			<TabBars :tabBarAct="0" pageType="18"></TabBars>
+		</view>
+	<!-- 	<view class="appbtnm" v-else @click="fabuing">
+			+
+		</view> -->
+		<load-more :isMore="loadingMore"></load-more>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import myserItem from '@/components/template/myserItem.vue';
+	import homemakingItem from '@/components/template/homemakingItem.vue';
+	import serveItem from '@/components/template/serveItem.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import demandItem from '@/components/template/demandItem.vue';
+	export default{
+		data(){
+			return{
+				sort:0,
+				page:1,
+				type:2,
+				storeid:0,
+				search:'',
+				loadlogo:false,
+				serList:[],
+				total:1,
+				onPage:false,
+				loadingMore:true,
+				sid:'',
+				id:''
+			}
+		},
+		components:{
+			vTabs,
+			myserItem,
+			TabBars,
+			Loadlogo,
+			loadMore,
+			homemakingItem,
+			serveItem,
+			demandItem
+		},
+		onLoad(e) {
+			this.type = e.type;
+			this.sid = e.sid;
+			this.id = e.id;
+			this.getMyserList()
+		},
+		onShow() {
+			if(!this.onPage) return
+			this.getMyserList(false,1)
+		},
+		onReachBottom() {
+			// debugger
+			if(this.total <= this.page) return
+			this.page++;
+			this.loadingMore = false;
+			this.getMyserList(true)
+		},
+		methods:{
+			fabuing(){
+				App.navigationTo({
+					url: `pages/subPages2/homemaking/pubService/pubService?arid=${this.sid ||this.id}&type=${this.type}`
+				})
+			},
+			openbtn(id){
+				
+				this.serList.map(item=>{
+					item.checked = false;
+					if(item.id == id){
+						// debugger
+						item.checked = true;
+					}
+				});
+				this.loadlogo = !this.loadlogo
+				this.loadlogo = !this.loadlogo
+			},
+			getMyserList(flag,page = false){
+				let data = {
+					page:page || this.page,
+					search:this.search
+				}
+				if(this.sort == 0){
+					data.status = 1;
+				}
+				let url = this.sort == 0?'&p=housekeep&do=getServicelist':this.sort == 1?'&p=housekeep&do=getNewStorelist':'&p=housekeep&do=getDemandlist'
+				App._post_form(
+					url,
+					data,
+					res => {
+						if(flag){
+							this.serList = this.serList.concat(res.data.list);
+							this.loadingMore = true;
+							if(page == this.page && page) return
+							this.getoderList(true,page++);
+						}else{
+							console.log(res);
+							this.serList = res.data.list;
+							this.total = res.data.page_number;
+							if(page){
+								page++;
+								this.getMyserList(true,page);
+							}
+						};
+						this.loadingMore = true;
+						// this.serList.map(item=>{
+						// 	item.checked = false;
+						// })
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			vtabschange(e){
+				this.page = 1;
+				this.sort = e;
+				this.getMyserList();
+				console.log(e)
+			},
+			confirm(){
+				this.page = 1;
+				this.getMyserList();
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.homemaSearch{
+		padding-bottom: 150upx;
+		.title{
+			background-color: #FFFFFF;
+			.seach{
+				padding: 30upx 30upx;
+				position: relative;
+				.seachInput{
+					width: 690upx;
+					height: 80upx;
+					background-color: #F8F8F8;
+					border-radius: 20upx;
+					text-align: center;
+					line-height: 80upx;
+					font-size: 26upx;
+				}
+				.searchbox{
+					position: absolute;
+					top: 48upx;
+					left: 50upx;
+				}
+			}
+			.tab{
+				
+			}
+		}
+		.contcnt{
+			padding: 20upx 30upx;
+		}
+		.appbtnm{
+			position: fixed;
+			width: 90upx;
+			height: 90upx;
+			line-height: 90upx;
+			font-size: 40upx;
+			font-weight: 600;
+			text-align: center;
+			left: 50%;
+			bottom: 60upx;
+			transform: translateX(-50%);
+			padding: 0upx 0upx;
+			color: #FFFFFF;
+			border-radius: 50%;
+			background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+		}
+	}
+</style>
+
diff --git a/pages/subPages2/homemaking/homemakingDetails/homemakingDetails.vue b/pages/subPages2/homemaking/homemakingDetails/homemakingDetails.vue
new file mode 100644
index 0000000..7c30818
--- /dev/null
+++ b/pages/subPages2/homemaking/homemakingDetails/homemakingDetails.vue
@@ -0,0 +1,700 @@
+<template>
+	<view class="homemakingDetails">
+		<view class="homemakingDetails-title" v-if="service.videourl || service.adv.length > 0">
+			<view class="swiperBox" v-if="imgMa">
+				<swiper
+					class="swiper"
+					indicator-color="rgba(255,255,255,.4)"
+					indicator-active-color="rgba(255,255,255,.85)"
+					:indicator-dots="true"
+					:autoplay="true"
+					:interval="2000"
+					:duration="500"
+				>
+					<swiper-item v-for="(item, index) in service.adv" :key="index" style="border-radius: 15upx;">
+						<image :src="item"  mode="aspectFill"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+			<view class="swiperBox" v-else>
+				<!-- <video :src="" controls></video> -->
+				<video 
+				x5-video-player-type='h5' 
+				:autoplay="true" 
+				x5-video-player-fullscreen='true' 
+				x5-video-orientation='portraint' 
+				class="text-video-left" 
+				:controls="false" 
+				:src="service.videourl"
+				:loop="true"
+				controls></video>
+			</view>
+			<view class="videoOrImg" v-if="service.videourl && service.adv.length > 0">
+				<view class="flex-box t-r" style="margin-right: 30upx;">
+					<view class="boex boexleft" 
+					@click="imgMa = true" 
+					:style="{backgroundColor: imgMa?'#FF4444':'#ffffff',color: imgMa?'#FFFFFF':'#333333'}">
+						图片
+					</view>
+				</view>
+				<view class="flex-box t-c" style="margin-left: 30upx;" >
+					<view class="boex"  
+					@click="imgMa = false" 
+					:style="{backgroundColor: imgMa == false?'#FF4444':'#ffffff',color: imgMa == false?'#FFFFFF':'#333333'}">
+						视频
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="homemakingDetails-content">
+			<view class="particulars">
+				<view class="particulars-title f-36 col-3 f-w">{{ service.title }}</view>
+				<view class="dis-flex p-top-20">
+					<view class="flex-box f-24 c-ff4444">
+						<text>¥</text>
+						<text class="f-48 f-w">{{ service.price }}</text>
+					</view>
+					<view class="flex-box f-24 t-r col-9" style="line-height: 60upx;">已售{{ service.salenum }}</view>
+				</view>
+				<view class="introduce">
+					<view class="f-36 f-w col-3">
+						服务详情
+						<view class="f-24" style="color: #72AAFD;float: right;line-height: 40upx;" @click="ishow = true">查看更多</view>
+					</view>
+					<view class="introduce-cpntent">
+						<jyf-parser
+							domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+							gesture-zoom
+							lazy-load
+							ref="article"
+							selectable
+							show-with-animation
+							use-anchor
+							:html="service.detail"
+						></jyf-parser>
+					</view>
+				</view>
+			</view>
+			<view class="line"></view>
+			<view class="company">
+				<view class="company-name">
+					{{ storeinfo.name }}
+					<image v-if="storeinfo.attestation?storeinfo.attestation.bondflag:false" :src="imgfixUrls + 'homemakingImg/dunpai.png'" mode=""></image>
+					<image v-if="storeinfo.attestation?storeinfo.attestation.attestation:false" :src="imgfixUrls + 'homemakingImg/yaoqian.png'" mode=""></image>
+				</view>
+				<view class="dis-flex" style="padding: 30upx 0;">
+					<image class="company-logo" :src="storeinfo.logo" mode=""></image>
+					<view class="flex-box" style="position: relative;">
+						<view class="f-28 col-3" style="width: 400upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ storeinfo.address }}
+						<view class="col-f t-c" @click="conloding" 
+						style="background-color: #6093FD;border-radius: 60upx;position: absolute;right: -0upx;top: 0;width: 40upx;height: 40upx;line-height: 40upx;">
+							<text class="iconfont icon-daohang"></text>
+						</view>
+						<view  @click="chat" style="background-color: #6093FD;border-radius: 60upx;position: absolute;right: -0upx;top: 65upx;">
+							<image style="width:40upx;height: 35upx;" :src="imgfixUrls + 'merchant/spLt.png'" mode=""></image>
+						</view>
+						</view>
+						<view class="company-tags">
+							<view class="company-tags-item" v-for="(item, index) in storeinfo.catearray" :key="index">{{ item }}</view>
+						</view>
+						<!-- <view class="f-28 liaobtn" style="margin-top: 20upx;" @click="chat">
+							在线聊
+						</view> -->
+					</view>
+				</view>
+				<view class="enterBtn" @click="enterIndex">查看服务商</view>
+				<view class="evaluate">
+					<view class="f-36 col-3 f-w">热门评论</view>
+					<view
+						
+						v-for="(item, index) in comment"
+						:key="index"
+						
+						:style="{ borderBottom: index != 1 ? '1upx solid #eeeeee' : '' }"
+					>
+						<evaluateItem :evaItem="item" :hidereply="hidereply" @getData="getData" @getmoreCom="getmoreCom($event,index)"></evaluateItem>
+					</view>
+				</view>
+				<view class="examine" @click="evenMore" v-if="commenttotal != page">
+					{{comment.length > 3?'查看更多':'暂无数据'}}
+					<text v-if="comment.length > 0" :class="'iconfont icon-unfold'" style="font-size: 20upx;padding-left: 10upx;"></text>
+				</view>
+			</view>
+		</view>
+		<view class="btn-group">
+			<view class="dis-flex f-20 col-3" style="flex: 0.4;">
+				<view class="t-c flex-box" style="margin: auto;" @click="navIndex">
+					<image :src="imgfixUrls + 'homemakingImg/homemakingHome.png'" mode=""></image>
+					<view >首页</view>
+				</view>
+				<view class="t-c flex-box" style="margin: auto;" @click="sher">
+					<image :src="imgfixUrls + 'homemakingImg/homemakingHaibao.png'" mode=""></image>
+					<view >海报</view>
+				</view>
+			</view>
+			<view class="dis-flex" style="flex: 0.6;">
+				<view class="relation-btn flex-box btnClass" @click="relation">联系TA</view>
+				<view class="subscribe-btn flex-box btnClass" @click="placeAnorder">下单</view>
+			</view>
+		</view>
+		<PopManager :show="showCommunity" type="center" @clickmask="showCommunity = false">
+			<view  v-if="showCommunity" style="width: 80vw;height: 90vh;padding: 30upx;overflow: hidden;border-radius: 20upx;">
+				<posterlate :postId="pageId" :postType="'16'"></posterlate>
+			</view>
+		</PopManager>
+		<PopManager :show="ishow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="ishow = false">
+			<view class="rulebox">
+				<view class="f-32 t-c" style="font-weight: 500;color: #6f6f6f;padding-bottom: 30upx;">服务详情</view>
+				<view v-if="service.detail" style="height: 60vh;overflow: auto;">
+					<jyf-parser
+						domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+						gesture-zoom
+						lazy-load
+						ref="article"
+						selectable
+						show-with-animation
+						use-anchor
+						:html="service.detail"
+					></jyf-parser>
+				</view>
+			</view>
+			<view style="position: relative;height: 40upx;">
+				<view style="border-left: 1upx solid #FFFFFF;height: 50upx;position: absolute;left: 50%;transform: translateX(-50%);"></view>
+			</view>
+			<view style="position: relative;">
+				<view class="iconfont icon-roundclose col-f" style="position: absolute;left: 50%;transform: translateX(-50%);font-size: 50upx;" @click="ishow = false"></view>
+			</view>
+		</PopManager>
+		<PopManager :show="deviceshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="close">
+			<view class="devicesnum">
+				<view class="dis-flex">
+					<view class="f-28 col-3 f-w flex-box" style="line-height: 100upx;">份数</view>
+					<view  style="padding-top: 20upx;"><tui-numberbox :value="num" @change="changes($event)" :width="60" :min="0"></tui-numberbox></view>
+				</view>
+				<view class="dis-flex" @click="goAddress">
+					<view class="f-28 col-3 f-w " style="line-height: 100upx;">上门地址</view>
+					<view class="f-28 flex-box t-r" style="padding-top: 20upx;line-height: 60upx;padding-left: 20upx;">
+						<text class="col-9" v-if="!address">点击选择上门地址</text>
+						<text v-else>{{address}}</text>
+					</view>
+				</view>
+				<view class="dis-flex" style="flex-direction:row-reverse;margin-top: 30upx;">
+					<view class="downOrder" @click="ConfirmOrder">
+						确认
+					</view>
+					<!-- <view class="close" @click="close">
+						取消
+					</view> -->
+				</view>
+			</view>
+		</PopManager>
+		<!-- <TabBars :tabBarAct="0" pageType="18"></TabBars> -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+//#ifdef H5
+import wxApi from "@/common/js/wxApi.js";
+//#endif
+import tuiNumberbox from '@/components/template/numberbox.vue';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import PopManager from '@/components/template/PopManager';
+import evaluateItem from '@/components/template/evaluateItem';
+import posterlate from '@/components/template/posterlate';
+import TabBars from '@/components/template/tabBar.vue';
+import Map from '@/common/js/ms-openMap/openMap.js'
+export default {
+	data() {
+		return {
+			pageId: 0,
+			ishow: false,
+			storeinfo: {},
+			service: {
+				adv: []
+			},
+			listimgstyle: null,
+			comindex: false,
+			deviceshow: false,
+			num: 1,
+			desd:false,
+			page:1,
+			comment:[],
+			commenttotal:1,
+			showCommunity:false,
+			parameterid:0,
+			hidereply:0,
+			imgMa:true,
+			address:''
+		};
+	},
+	components: {
+		jyfParser,
+		PopManager,
+		evaluateItem,
+		tuiNumberbox,
+		posterlate,
+		TabBars
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.pageId = e.id;
+		if(e.deviceshow){
+			_this.deviceshow = e.deviceshow;
+		}
+		if(e.num){
+			_this.num = e.num;
+		}
+		if(e.address){
+			_this.address = e.address;
+			_this.expressid = e.expressid;
+		}
+		_this.listimgstyle = uni.getStorageSync('listimgstyle');
+		_this.getData();
+	},
+	methods: {
+		goAddress() {
+			let orderInfos = {
+				id:this.pageId,
+				type:'housekeep',
+				num:this.num,
+				deviceshow:this.deviceshow
+			}
+			uni.setStorageSync('orderInfos', orderInfos)
+			App.navigationTo({
+				url: 'pages/subPages/receivingAddress/receivingAddress?type=' + 1
+			});
+		},
+		sher(){
+			App.navigationTo({
+				url: `pages/mainPages/poster/poster?id=${this.pageId}&type=16`
+			})
+		},
+		conloding(){
+			let storeInfo = {};
+			storeInfo = {
+				location:{
+					lat:this.storeinfo.lat,
+					lng:this.storeinfo.lng
+				},
+				address:this.storeinfo.address
+			}
+			// #ifdef H5
+			
+			console.log(storeInfo);
+			wxApi.WxopenLocation(
+				storeInfo['location']['lat'],
+				storeInfo['location']['lng'],
+				storeInfo['address']
+			)
+			// #endif
+			// #ifdef MP-WEIXIN
+			App.openLocation(storeInfo)
+			// #endif
+			//#ifdef APP-PLUS
+			    Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['address'],'gcj02')
+			 //#endif
+		},
+		chat(){
+			// debugger
+			App.navigationTo({
+				url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.storeinfo.sid + '&other_party_type=' +  (this.service.type == '1'?'2':'1')+ '&type=1' + '&id='
+			})
+		},
+		relation(){
+			uni.makePhoneCall({
+				phoneNumber: this.storeinfo.mobile
+			})
+			
+		},
+		navIndex(){
+			App.navigationTo({
+				url: "pages/mainPages/index/diypage?type=18"
+			});
+		},
+		getmoreCom(id,index){
+			uni.showLoading({
+				title:'加载中'
+			})
+			App._post_form(
+				`&p=housekeep&do=showAllMessage`,
+				{cid:id},
+				res => {
+					console.log(this.comment[index].replylist.length -1,Number(this.comment[index].replytotal),index);
+					if(this.comment[index].replylist.length - 1 == Number(this.comment[index].replytotal)){
+						uni.hideLoading();
+						return
+					}
+					this.comment[index].replylist = this.comment[index].replylist.concat(res.data);
+					// this.comment = this.comment.concat(res.data);
+					uni.hideLoading();
+				},
+				false,
+				() => {
+			
+				}
+			);
+		},
+		evenMore(flag){
+			if(this.commenttotal == this.page) return
+			this.page++;
+			uni.showLoading({
+				title:'加载中'
+			})
+			App._post_form(
+				`&p=housekeep&do=showMoreComment`,
+				{id:this.pageId,page:this.page},
+				res => {
+					this.comment = this.comment.concat(res.data);
+					// debugger
+					if(flag == false){
+						this.evenMore(false)
+					}
+					
+					uni.hideLoading();
+					
+				},
+				false,
+				() => {
+			
+				}
+			);
+		},
+		ConfirmOrder(){
+			if(this.desd) return
+			this.desd = true;
+			App._post_form(
+				`&p=housekeep&do=creatOrderApi`,
+				{id:this.pageId,num:this.num,expressid:this.expressid},
+				res => {
+					console.log(res);
+					if(res.data.status == 0){
+						this.desd = false;
+						App.navigationTo({
+							url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=housekeep' 
+						});
+					}else{
+						
+						uni.showToast({
+							title:'下单成功'
+						});
+						setTimeout(()=>{
+							this.desd = false;
+							App.navigationTo({
+								url: 'pages/subPages2/homemaking/myorderForm/myorderForm?type=1' 
+							});
+						},1000)
+						
+						
+					}
+				},
+				false,
+				() => {
+			
+				}
+			);
+		},
+		close(){
+			this.deviceshow = false;
+			this.num = 1;
+		},
+		changes(e) {
+			console.log(e);
+			if (e.type == 'reduce' && e.value == 0) {
+				return;
+			}
+			this.num = e.value;
+		},
+		placeAnorder() {
+			this.deviceshow = true;
+			
+		},
+		getData() {
+			let _this = this;
+			App._post_form(
+				`&p=housekeep&do=serviceDetail`,
+				{ id: this.pageId },
+				res => {
+					console.log(res);
+					_this.service = res.data.service;
+					_this.storeinfo = res.data.storeinfo;
+					_this.comment = res.data.comment;
+					_this.commenttotal = res.data.commenttotal;
+					_this.hidereply = res.data.hidereply;
+					let page = _this.page;
+					_this.page = 1;
+					if(!_this.address){
+						_this.address = res.data.address;
+						_this.expressid = res.data.expressid;
+					}
+					if(_this.service.adv.length > 0){
+						_this.imgMa = true;
+					}else if(_this.service.adv.length == 0 && _this.service.videourl){
+						_this.imgMa = false;
+					}
+					for(let i = 1; i<page+1;i++){
+						if(i > 1){
+							if(i == page) return
+							_this.evenMore(false);
+						}
+					}
+				},fail=>{
+					if(fail.data.message == '项目已下架或被删除'){
+						App.navigationTo({
+							url: `pages/mainPages/index/diypage?type=18`
+						});
+					}
+					console.log(fail)
+				});
+		},
+		enterIndex() {
+			if(this.service.type == 1){
+				App.navigationTo({
+					url: "pages/mainPages/store/index?i=1&aid=125&sid=" + this.storeinfo.sid
+				});
+			}else{
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter?mid=" + this.storeinfo.sid + '&id=' + this.service.objid
+				});
+				// App.navigationTo({
+				// 	url: `pages/subPages/homepage/homepage/homepage?mid=${this.storeinfo.sid}&checkType=1`
+				// });
+			}
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.homemakingDetails {
+	.rulebox {
+		background: #ffffff;
+		padding: 20upx;
+		width: 75vw;
+		height: 60vh;
+		overflow: hidden;
+		border-radius: 20upx;
+	}
+	.homemakingDetails-title {
+		width: 750upx;
+		height: 563upx;
+		position: relative;
+		.videoOrImg{
+			display: flex;
+			position: absolute;
+			bottom: 100upx;
+			width: 100%;
+			.boex{
+				width: 100upx;
+				height: 50upx;
+				border-radius: 60upx;
+				line-height: 50upx;
+				background-color: #ff4444;
+				font-size: 24upx;
+				color: #ffffff;
+				text-align: center;
+			}
+			.boexleft{
+				float: right;
+			}
+		}
+		.swiperBox{
+			width: 100%;
+			height: 100%;
+			video{
+				width: 100%;
+				height: 97%;
+			}
+			.swiper{
+				width: 100%;
+				height: 100%;
+				image {
+					width: 750upx;
+					height: 563upx;
+				}
+			}
+			
+		}
+		
+	}
+	.homemakingDetails-content {
+		background-color: #ffffff;
+		border-radius: 30upx 30upx 0 0;
+		padding-top: 30upx;
+		position: relative;
+		top: -40upx;
+		padding-bottom: 140upx;
+		position: relative;
+		z-index: 9;
+		.particulars {
+			padding: 30upx;
+			.introduce {
+				padding: 30upx;
+				border-radius: 20upx;
+				background-color: #f8f8f8;
+				margin-top: 40upx;
+				.introduce-cpntent {
+					padding-top: 20upx;
+					font-size: 28upx;
+					color: #333333;
+					width: 630upx;
+					height: 100upx;
+					// overflow: hidden;
+					// text-indent:-50upx;
+					overflow: hidden; /*必须结合的属性,当内容溢出元素框时发生的事情*/
+					text-overflow: ellipsis; /*可以用来多行文本的情况下，用省略号“…”隐藏超出范围的文本 。*/
+					display: -webkit-box; /*必须结合的属性 ，将对象作为弹性伸缩盒子模型显示 。*/
+					-webkit-line-clamp: 2; /*用来限制在一个块元素显示的文本的行数。*/
+					-webkit-box-orient: vertical; /*必须结合的属性 ，设置或检索伸缩盒对象的子元素的排列方式 。*/
+				}
+			}
+		}
+		.line {
+			height: 20upx;
+			background-color: #f8f8f8;
+		}
+		.company {
+			padding: 40upx 30upx;
+			.company-name {
+				font-weight: bold;
+				height: 50upx;
+				line-height: 50upx;
+				font-size: 36upx;
+				image {
+					width: 32upx;
+					height: 32upx;
+					margin-left: 10upx;
+				}
+			}
+			.enterBtn {
+				width: 690upx;
+				height: 80upx;
+				line-height: 80upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				color: #999999;
+				font-size: 28upx;
+				border-radius: 10upx;
+				margin: auto;
+			}
+			.examine {
+				width: 180upx;
+				height: 60upx;
+				line-height: 60upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				color: #999999;
+				font-size: 24upx;
+				border-radius: 10upx;
+				margin: auto;
+				margin-bottom: 20upx;
+			}
+			.evaluate {
+				padding: 30upx 0;
+			}
+			.company-logo {
+				width: 170upx;
+				height: 170upx;
+				border-radius: 20upx;
+				margin-right: 30upx;
+			}
+			.liaobtn{
+				width: 120upx;
+				height: 50upx;
+				line-height: 50upx;
+				border-radius: 60upx;
+				background-color: #FF4444;
+				text-align: center;
+				color: #F8F8F8;
+			}
+			.company-tags {
+				// display: flex;
+				width: 400upx;
+				padding: 22upx 0;
+				height: 32upx;
+				overflow: hidden;
+				.company-tags-item {
+					// width: 100upx;
+					height: 32upx;
+					line-height: 32upx;
+					text-align: center;
+					background-color: #eeeeee;
+					color: #999999;
+					font-size: 20upx;
+					padding: 0 10upx;
+					border-radius: 6upx;
+					margin-right: 10upx;
+					display: inline-block;
+					margin-bottom: 40upx;
+				}
+			}
+		}
+	}
+	.btn-group {
+		position: fixed;
+		width: 750upx;
+		padding: 30upx;
+		background-color: #ffffff;
+		z-index: 999;
+		box-sizing: border-box;
+		bottom: 0;
+		left: 0;
+		display: flex;
+		border-top: 1upx solid #eeeeee;
+		image {
+			width: 34upx;
+			height: 34upx;
+		}
+		.relation-btn {
+			height: 100upx;
+			background: linear-gradient(180deg, #6ea6fd 0%, #6094fd 100%);
+			opacity: 1;
+			border-radius: 10upx;
+			margin-right: 20upx;
+		}
+		.btnClass {
+			font-size: 28upx;
+			color: #ffffff;
+			font-weight: bold;
+			line-height: 100upx;
+			text-align: center;
+		}
+		.subscribe-btn {
+			height: 100upx;
+			background: linear-gradient(180deg, #fece02 0%, #fdad28 100%);
+			opacity: 1;
+			border-radius: 10upx;
+		}
+	}
+	.devicesnum {
+		width: 690upx;
+		padding: 30upx;
+		border-radius: 20upx 20upx 0 0;
+		background-color: #ffffff;
+		// padding-bottom: 170upx;
+		.close{
+			background-color: #e7e7e7;
+			color: #333333;
+			font-size: 30upx;
+			font-weight: 700;
+			height: 70upx;
+			line-height: 70upx;
+			width: 150upx;
+			border-radius: 15upx;
+			text-align: center;
+		}
+		.downOrder{
+			width: 690upx;
+			background: linear-gradient(180deg, #6ea6fd 0%, #6094fd 100%);
+			color: #FFFFFF;
+			font-size: 30upx;
+			font-weight: 700;
+			height: 70upx;
+			line-height: 70upx;
+			border-radius: 60upx;
+			text-align: center;
+			// margin-left: 30upx;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/homemaking/homemakingMerchant/homemakingMerchant.vue b/pages/subPages2/homemaking/homemakingMerchant/homemakingMerchant.vue
new file mode 100644
index 0000000..a2b8e88
--- /dev/null
+++ b/pages/subPages2/homemaking/homemakingMerchant/homemakingMerchant.vue
@@ -0,0 +1,165 @@
+<template>
+	<view class="app">
+		<loadlogo v-if="!loadlogo" />
+		<view class="title">
+			<filtertab
+			:requestType="'服务列表'" 
+			:isPageScroll="'1'" 
+			@selectAreaid="selectAreaid" 
+			@selectClassid="selectClassid" 
+			@getmore="getmore" 
+			@getResumeList="getResumeList"
+			@selectClassTwoid="selectClassTwoid" 
+			@selectOrders="selectOrders" 
+			@getcityWork="getcityWork"
+			:cate_one="cate_one"
+			:title="title"
+			:cate_two="cate_two"></filtertab>
+		</view>
+		<view class="item" v-if="storelist.length > 0">
+			<view  v-for="(item,index) in storelist" :key="index">
+				<homemakingItem :items="item"></homemakingItem>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<view  v-else>
+			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>
+		</view>
+		
+		<TabBars :tabBarAct="0" pageType="18"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	import homemakingItem from '@/components/template/homemakingItem.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'0',
+				cate_two:'0',
+				latlngs:{},
+				page:1,
+				storelist:[],
+				page_number:1,
+				isMore:true,
+				loadlogo:false,
+				sort:1,
+				city_id:'',
+				typeid:'',
+				title:''
+			}
+		},
+		components:{
+			filtertab,
+			homemakingItem,
+			loadMore,
+			Loadlogo,
+			TabBars
+		},
+		onLoad(e) {
+			if(e.onelevelid){
+				this.cate_one = e.onelevelid;
+				this.typeid = e.onelevelid;
+				if(e.twolevelid != '0'){
+					this.cate_two = e.twolevelid;
+				}
+				this.title = e.title;
+			}
+			console.log(e);
+			this.latlngs = uni.getStorageSync('curLoction');
+			
+		},
+		onReachBottom() {
+			if(this.page_number == this.page) return
+			this.isMore = false;
+			this.page++;
+			this.getstoreList(true)
+		},
+		methods:{
+			getstoreList(flag){
+				let data = {
+					pege:this.page,
+					lat:this.latlngs.latitude || '',
+					lng:this.latlngs.longitude || '',
+					sort:this.sort,
+					city_id:this.city_id,
+					typeid:this.typeid
+				}
+				App._post_form(
+					`&p=housekeep&do=getNewStorelist`,
+					data,
+					res => {
+						if(flag){
+							this.storelist = this.storelist.concat(res.data.list);
+						}else{
+							this.storelist = res.data.list;
+							this.page_number = res.data.page_number;
+						}
+						this.isMore = true;
+						console.log(res);
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			selectAreaid(e){
+				this.city_id = e.id;
+				console.log(e,1);
+				this.getstoreList()
+			},
+			selectClassid(e){
+				this.typeid = e.cate_one;
+				this.cate_one = e.cate_one;
+				console.log(e,2);
+				this.title = e.name;
+				this.getstoreList()
+			},
+			getmore(e){
+				console.log(e,3)
+			},
+			getResumeList(e){
+				console.log(e,4)
+			},
+			selectClassTwoid(e){
+				console.log(e,5);
+				this.typeid = e.cate_two;
+				this.cate_two = e.cate_two;
+				this.title = e.name;
+				this.getstoreList()
+			},
+			selectOrders(e){
+				console.log(e,6);
+				this.sort = e.val;
+				this.getstoreList();
+			},
+			getcityWork(e){
+				console.log(e,7)
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.app{
+		padding-bottom: 150upx;
+		.title{
+			padding: 10upx 30upx;
+			background-color: #FFFFFF;
+		}
+		.item{
+			margin: 30upx 30upx 0;
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/homemakingUser/homemakingUser.vue b/pages/subPages2/homemaking/homemakingUser/homemakingUser.vue
new file mode 100644
index 0000000..cba6bb7
--- /dev/null
+++ b/pages/subPages2/homemaking/homemakingUser/homemakingUser.vue
@@ -0,0 +1,9 @@
+<template>
+	
+</template>
+
+<script>
+</script>
+
+<style>
+</style>
diff --git a/pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter.vue b/pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter.vue
new file mode 100644
index 0000000..afd7819
--- /dev/null
+++ b/pages/subPages2/homemaking/homepersonalCenter/homepersonalCenter.vue
@@ -0,0 +1,327 @@
+<template>
+	<view class="homepersonalCenter">
+		<view class="title">
+			<view class="swiperBox">
+				<swiper class="swiper" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+					<swiper-item v-for="(item, index) in userData.thumbs" :key="index" @click="lookImg(userData.thumbs,index)">
+						<image :src="item" mode="aspectFill"></image>
+					</swiper-item>
+				</swiper>
+			</view>
+		</view>
+		<view class="content">
+			<view class="nameAndlogo">
+				<image :src="userData.thumb" mode=""></image>
+				<view  style="padding: 10upx 0;">
+					<view class="f-32 f-w">
+						{{userData.name}}<text class="iconfont icon-female nv" style="color:#FE83AF ;padding-left: 10upx;" v-if="userData.gender != 1"></text>
+						<text class="iconfont iconfont icon-male" style="color:#0084FF ;padding-left: 10upx;" v-else></text>
+					</view>
+					<view class="tags">
+						<view class="tags-item" v-for="(item,index) in userData.catearray">
+							{{item}}
+						</view>
+					</view>
+					<view class="location f-28" style="padding-top: 20upx;" @click="conloding">
+						<text class="iconfont icon-location" style="font-size: 28upx;"></text>
+						<text style="padding: 0 20upx;">{{userData.address}}</text>
+						<text style="padding-right: 20upx;" v-if="false">210m</text>
+						<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+					</view>
+				</view>
+			</view>
+			<view class="yab">
+				<v-tabs
+					:lineScale="0.25"
+					:lineRadius="'100rpx 100rpx 0 0'"
+					:lineHeight="'8rpx'"
+					:fontSize="'32rpx'"
+					:activeFontSize="'32rpx'"
+					:bold="true"
+					:height="'100rpx'"
+					:paddingItem="'0 22rpx 20rpx'"
+					:activeColor="'#333333'"
+					:lineColor="'#333333'"
+					:color="'#999999'"
+					v-model="sort"
+					:scroll="false"
+					@change="vtabschange"
+					:tabs="['服务项目','案例图片']"
+				></v-tabs>
+			</view>
+		</view>
+		<view class="listmen" v-if="sort == 0">
+			<view class="listItem" v-for="(item,index) in serverList" :key="index" >
+				<serveItem :serItem="item"></serveItem>
+			</view>
+		</view>
+		<view class="listmen" v-else style="column-count: 3;column-gap: 0;">
+			<view class="imgitrm" v-for="(item,index) in userData.casethumbs" :key="index" @click="lookImg(userData.casethumbs,index)">
+				<view class="imgbox">
+					<image  style="width: 100%;height: 100%;" :src="item" mode="widthFix"></image>
+				</view>
+			</view>
+		</view>
+		<view class="bpttombox dis-flex">
+			<view  style="flex: 0.2;" @click="navIndex">
+				<view class="iconfont icon-home t-c" style="font-size: 44upx;">
+					
+				</view>
+				<view class="t-c f-20">
+					首页
+				</view>
+			</view>
+			<view class="liaot" style="background-color: #FDAD28;" @click="chat">
+				在线聊
+			</view>
+			<view class="liaot" style="background-color: #72AAFD;" @click="call">
+				电话联系
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	//#ifdef H5
+	import wxApi from "@/common/js/wxApi.js";
+	//#endif
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import serveItem from '@/components/template/serveItem.vue';
+	import Map from '@/common/js/ms-openMap/openMap.js'
+	export default{
+		data(){
+			return{
+				sort:0,
+				userData:{},
+				mid:'',
+				id:'',
+				page:1,
+				total:1,
+				serverList:[]
+				
+			}
+		},
+		onLoad(e) {
+			this.mid = e.mid || '';
+			this.id = e.id || ''
+			this.getuserData();
+		},
+		methods:{
+			lookImg(img,index){
+				uni.previewImage({
+					current:img[index],
+					urls: img
+				})
+			},
+			chat(){
+				// debugger
+				App.navigationTo({
+					url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.mid + '&other_party_type=' +  1 + '&type=1' + '&id='
+				})
+			},
+			call(){
+				uni.makePhoneCall({
+					phoneNumber: this.userData.mobile
+				})
+			},
+			navIndex(){
+				App.navigationTo({
+					url: "pages/mainPages/index/diypage?type=18"
+				});
+			},
+			opendelit(item){
+				App.navigationTo({
+					url:`pages/subPages2/homemaking/homemakingDetails/homemakingDetails?id=${item.pid}`
+				});
+			},
+			getseverList(){
+				App._post_form(
+					`&p=housekeep&do=getServicelist`,
+					{
+						status:0,
+						page:this.page,
+						mid:this.mid,
+						type:2
+					},
+					res => {
+						console.log(res);
+						this.total = res.data.total;
+						this.serverList = res.data.list;
+						// this.userData = res.data;
+						// debugger
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			conloding(){
+				let storeInfo = {};
+				storeInfo = {
+					location:{
+						lat:this.userData.lat,
+						lng:this.userData.lng
+					},
+					address:this.userData.address
+				}
+				// #ifdef H5
+				
+				console.log(storeInfo);
+				wxApi.WxopenLocation(
+					storeInfo['location']['lat'],
+					storeInfo['location']['lng'],
+					storeInfo['address']
+				)
+				// #endif
+				// #ifdef MP-WEIXIN
+				App.openLocation(storeInfo)
+				// #endif
+				//#ifdef APP-PLUS
+				    Map.openMap(Number(storeInfo['location']['lat']),Number(storeInfo['location']['lng']),storeInfo['address'],'gcj02')
+				    //#endif
+			},
+			getuserData(){
+				App._post_form(
+					`&p=housekeep&do=personalHomepage`,
+					{id:this.id},
+					res => {
+						console.log(res);
+						this.userData = res.data;
+						// debugger
+						this.getseverList();
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			vtabschange(e){
+				
+			}
+		},
+		components:{
+			vTabs,
+			serveItem
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.homepersonalCenter{
+		padding-bottom: 150upx;
+		.title{
+			.swiperBox{
+				.swiper{
+					width: 750upx;
+					height: 430upx;
+					image{
+						width: 750upx;
+						height: 430upx;
+					}
+				}
+				
+			}
+		}
+		.bpttombox{
+			width: 750upx;
+			padding: 30upx 0;
+			background-color: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			.liaot{
+				flex: 0.4;
+				margin-right: 20upx;
+				height: 82upx;
+				line-height: 82upx;
+				text-align: center;
+				border-radius: 10upx;
+				color: #FFFFFF;
+				font-size: 28upx;
+			}
+		}
+		.listmen{
+			padding: 0upx 30upx 20upx;
+			position: relative;
+			top: -20upx;
+			
+			// padding-bottom: 150upx;
+			.listItem{
+				
+			}
+			.imgitrm{
+				box-sizing: border-box;
+				    break-inside: avoid;
+				    padding: 10upx;
+					.imgbox{
+						    display: flex;
+						    flex-direction: column;
+						    justify-content: center;
+						    align-items: center;
+						    // padding: 10px;
+						    height: auto;
+						    font-size: 20px;
+						    color: #686868;
+							background-color: #ffffff;
+						    box-sizing: border-box;
+						    // border: 1px solid #ccc;
+							border-radius: 20upx;
+							image{
+								border-radius: 20upx;
+							}
+					}
+			}
+		}
+		.content{
+			width: 690upx;
+			padding: 30upx 30upx 0;
+			background-color: #FFFFFF;
+			border-radius: 30upx 30upx 0 0;
+			position: relative;
+			top: -40upx;
+			.nameAndlogo{
+				position: relative;
+				padding-top: 50upx;
+				image{
+					width: 130upx;
+					height: 130upx;
+					margin-right: 30upx;
+					border-radius: 50%;
+					position: absolute;
+					left: 0upx;
+					top: -100upx;
+					border: 6upx solid #FFFFFF;
+				}
+				.nv{
+					transform: rotate(45deg);
+				}
+				.tags{
+					padding-top: 10upx;
+					height: 50upx;
+					overflow: hidden;
+					.tags-item{
+						background-color: #EEEEEE;
+						color: #999999;
+						height: 30upx;
+						line-height: 30upx;
+						padding: 0 10upx;
+						border-radius: 8upx;
+						font-size: 24upx;
+						text-align: center;
+						display: inline-block;
+						margin-right: 10upx;
+						margin-bottom: 10upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/myDemand/myDemand.vue b/pages/subPages2/homemaking/myDemand/myDemand.vue
new file mode 100644
index 0000000..59a5da2
--- /dev/null
+++ b/pages/subPages2/homemaking/myDemand/myDemand.vue
@@ -0,0 +1,112 @@
+<template>
+	<view class="myDemand">
+		<view  v-if="MyDemandList.length > 0">
+			<view class="myDemand-item" v-for="(item,index) in MyDemandList" :key="index">
+				<demand-item :demanItem="item" @getMyDemandList="getMyDemandList" :myDemandData="myDemandData"></demand-item>
+				<view class="reject" v-if="item.status == '6'">
+					驳回原因:{{item.reason}}
+				</view>
+			</view>
+		</view>
+		<view  v-else>			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		</view>
+		<view class="issue-myDemand-box">
+			<view class="issue-myDemand" @click="issue">
+				<text class="iconfont icon-add" style="font-size: 32upx;color: #FFFFFF;padding-right: 20upx;"></text> 
+				 发布需求
+			</view>
+		</view>
+		<!-- <TabBars :tabBarAct="0" pageType="18"></TabBars> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import demandItem from '@/components/template/demandItem.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				MyDemandList:[],
+				myDemandData:{}
+			}
+		},
+		components:{
+			demandItem,
+			TabBars
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+			this.getMyDemandList();
+		},
+		methods:{
+			issue(){
+				App.navigationTo({
+					url: "pages/subPages2/homemaking/postDemand/postDemand"
+				});
+			},
+			getMyDemandList(){
+				App._post_form(
+					`&p=housekeep&do=myDemandList`,
+					{},
+					res => {
+						console.log(res);
+						this.MyDemandList = res.data.list;
+						this.myDemandData = res.data;
+					},
+					false,
+					() => {
+						
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.myDemand{
+		padding: 20upx 30upx;
+		margin-bottom: 100upx;
+		.myDemand-item{
+			margin-bottom: 20upx;
+		}
+		.reject{
+			width: 610upx;
+			padding: 20upx;
+			border-radius: 0 0 20upx 20upx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			font-size: 28upx;
+			font-weight: 400;
+			margin-left: 20upx;
+			
+		}
+		.issue-myDemand-box{
+			position: fixed;
+			bottom: 0upx;
+			left: 0upx;
+			background-color: #F9F9F9;
+			.issue-myDemand{
+				width: 690upx;
+				height: 80upx;
+				text-align: center;
+				line-height: 80upx;
+				color: #FFFFFF;
+				font-size: 32upx;
+				background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+				opacity: 1;
+				border-radius: 20upx;
+				
+				margin: 30upx;
+			}
+		}
+		
+	}
+</style>
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
diff --git a/pages/subPages2/homemaking/myServiceList/myServiceList.vue b/pages/subPages2/homemaking/myServiceList/myServiceList.vue
new file mode 100644
index 0000000..ca9c566
--- /dev/null
+++ b/pages/subPages2/homemaking/myServiceList/myServiceList.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="myServiceList">
+		<loadlogo v-if="!loadlogo"></loadlogo>
+		<view class="title">
+			<view class="seach">
+				<input type="text" @confirm="confirm" v-model="search" class="seachInput " style="font-size: 26upx;" placeholder-class="iconfont icon-search" placeholder-style="font-size: 26upx;" placeholder="  搜索我的服务" value="" />
+			</view>
+			<view class="tab">
+				<v-tabs
+					:lineScale="0.25"
+					:lineRadius="'100rpx 100rpx 0 0'"
+					:lineHeight="'8rpx'"
+					:fontSize="'32rpx'"
+					:activeFontSize="'32rpx'"
+					:bold="true"
+					:height="'100rpx'"
+					:paddingItem="'0 22rpx 20rpx'"
+					:activeColor="'#333333'"
+					:lineColor="'#333333'"
+					:color="'#999999'"
+					v-model="sort"
+					:scroll="false"
+					@change="vtabschange"
+					:tabs="['全部', '销售中','审核中','已下架']"
+				></v-tabs>
+			</view>
+		</view>
+		<view class="contcnt" v-if="serList.length > 0">
+			<view class="serItem" v-for="(item,index) in serList" :key="index">
+				<myser-item @getMyserList="getMyserList" @openbtn="openbtn" :serItem="item" :type="type"></myser-item>
+				<view class="turnhu f-24 col-f" v-if="item.status == 6">
+					驳回理由:{{item.reason}}
+				</view>
+			</view>
+			<load-more :isMore="loadingMore"></load-more>
+		</view>
+		<view  v-else>			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		</view>
+		<view  v-if="type == 21">
+			<TabBars :tabBarAct="0" pageType="18"></TabBars>
+		</view>
+		<view class="appbtnm" v-else @click="fabuing">
+			+
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import myserItem from '@/components/template/myserItem.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				sort:0,
+				page:1,
+				type:2,
+				storeid:0,
+				search:'',
+				loadlogo:false,
+				serList:[],
+				total:1,
+				onPage:false,
+				loadingMore:true,
+				sid:'',
+				id:''
+			}
+		},
+		components:{
+			vTabs,
+			myserItem,
+			TabBars,
+			Loadlogo,
+			loadMore
+		},
+		onLoad(e) {
+			this.type = e.type;
+			this.sid = e.sid;
+			this.id = e.id;
+			this.getMyserList()
+		},
+		onShow() {
+			if(!this.onPage) return
+			this.getMyserList(false,1)
+		},
+		onReachBottom() {
+			if(this.total == this.page) return
+			this.page++;
+			this.loadingMore = false;
+			this.getMyserList(true)
+		},
+		methods:{
+			fabuing(){
+				App.navigationTo({
+					url: `pages/subPages2/homemaking/pubService/pubService?arid=${this.sid ||this.id}&type=${this.type}`
+				})
+			},
+			openbtn(id){
+				
+				this.serList.map(item=>{
+					item.checked = false;
+					if(item.id == id){
+						// debugger
+						item.checked = true;
+					}
+				});
+				this.loadlogo = !this.loadlogo
+				this.loadlogo = !this.loadlogo
+			},
+			getMyserList(flag,page = false){
+				let data = {
+					page:page || this.page,
+					status:this.sort,
+					type:this.type,
+					search:this.search,
+					storeid:this.sid || ''
+				}
+				App._post_form(
+					'&p=housekeep&do=getServicelist',
+					data,
+					res => {
+						if(flag){
+							this.orderList = this.orderList.concat(res.data.list);
+							if(page == this.page && page) return
+							this.getoderList(true,page++);
+						}else{
+							console.log(res);
+							this.serList = res.data.list;
+							this.total = res.data.total;
+							if(page){
+								page++;
+								this.getMyserList(true,page)
+							}
+						};
+						this.loadingMore = true;
+						this.serList.map(item=>{
+							item.checked = false;
+						})
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			vtabschange(e){
+				this.page = 1;
+				this.sort = e;
+				this.getMyserList();
+				console.log(e)
+			},
+			confirm(){
+				this.page = 1;
+				this.getMyserList();
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.myServiceList{
+		padding-bottom: 150upx;
+		.title{
+			background-color: #FFFFFF;
+			.seach{
+				padding: 30upx 30upx;
+				.seachInput{
+					width: 690upx;
+					height: 80upx;
+					background-color: #F8F8F8;
+					border-radius: 20upx;
+					text-align: center;
+					line-height: 80upx;
+					font-size: 26upx;
+				}
+			}
+			.tab{
+				
+			}
+		}
+		.contcnt{
+			padding: 20upx 30upx;
+			.serItem{
+				margin-bottom: 20upx;
+				.turnhu{
+					background-color: #FF4444;
+					padding: 30upx 30upx;
+					width: 570upx;
+					margin-left: 30upx;
+					border-radius: 0 0 30upx 30upx;
+				}
+			}
+			
+		}
+		.appbtnm{
+			position: fixed;
+			width: 90upx;
+			height: 90upx;
+			line-height: 90upx;
+			font-size: 40upx;
+			font-weight: 600;
+			text-align: center;
+			left: 50%;
+			bottom: 60upx;
+			transform: translateX(-50%);
+			padding: 0upx 0upx;
+			color: #FFFFFF;
+			border-radius: 50%;
+			background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/myorderForm/myorderForm.vue b/pages/subPages2/homemaking/myorderForm/myorderForm.vue
new file mode 100644
index 0000000..1341c7f
--- /dev/null
+++ b/pages/subPages2/homemaking/myorderForm/myorderForm.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="myorderForm">
+		<loadlogo v-if="!loadlogo" />
+
+		
+		<view class="vtabs">
+			<v-tabs
+				:lineScale="0.25"
+				:lineRadius="'100rpx 100rpx 0 0'"
+				:lineHeight="'8rpx'"
+				:fontSize="'32rpx'"
+				:activeFontSize="'32rpx'"
+				:bold="true"
+				:height="'100rpx'"
+				:paddingItem="'0 22rpx 20rpx'"
+				:activeColor="'#333333'"
+				:lineColor="'#333333'"
+				:color="'#999999'"
+				v-model="sort"
+				:scroll="false"
+				@change="vtabschange"
+				:tabs="type=='1'?arr:brr"
+			></v-tabs>
+		</view>
+		<view class="order-list" v-if="orderList.length > 0">
+			<view  v-for="(item,index) in orderList" :key="index">
+				<homemakingOrder ref="homemakingOrder" :orderItem="item" :hidefish="hidefish" @getoderList="getoderList" :type="type"></homemakingOrder>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<view  v-else>			<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		</view>
+		<TabBars :tabBarAct="0" pageType="18"></TabBars>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import vTabs from '@/components/v-tabs/v-tabs.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import homemakingOrder from '@/components/template/homemakingOrder.vue';
+import TabBars from '@/components/template/tabBar.vue';
+export default {
+	data() {
+		return {
+			sort:0,
+			page:1,
+			orderList:[],
+			total:1,
+			isMore:true,
+			loadlogo:false,
+			pageOne:false,
+			arr:['全部', '待支付','待服务','已完成'],
+			brr:['全部', '待服务','待评价','已完成'],
+			hidefish:0
+		};
+	},
+	components: {
+		vTabs,
+		homemakingOrder,
+		loadMore,
+		Loadlogo,
+		TabBars
+	},
+	onLoad(e) {
+		this.type = e.type;
+		this.getoderList()
+	},
+	onShow() {
+		if(!this.pageOne) return
+		this.getoderList(false,1)
+	},
+	onReachBottom() {
+		if(this.total == this.page) return
+		this.page++;
+		this.isMore = false;
+		this.getoderList(true,this.page)
+	},
+	methods:{
+		getoderList(flag,page){
+			let _this = this;
+			let data = {
+				page:page ||this.page,
+				status:this.sort
+			}
+			let url = this.type == '1'?'&p=housekeep&do=memberOrderList':'&p=housekeep&do=artificerOrderList'
+			App._post_form(
+				url,
+				data,
+				res => {
+					if(flag){
+						_this.isMore = true;
+						_this.orderList = _this.orderList.concat(res.data.list);
+						_this.orderList.map(item=>{
+							item.type = _this.type;
+						})
+						if(page == _this.page && page) return
+						// debugger
+						let pages = page + 1;
+						_this.getoderList(true,pages);
+					}else{
+						console.log(res);
+						_this.orderList = res.data.list;
+						_this.total = res.data.total;
+						_this.pageOne = true;
+						_this.orderList.map(item=>{
+							item.type = _this.type;
+						})
+						if(page == _this.page || !page) return
+						_this.getoderList(true,page++);
+					};
+					_this.hidefish = res.data.hidefish;
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		vtabschange(e){
+			console.log(e);
+			this.sort = e;
+			this.page = 1;
+			this.getoderList()
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.myorderForm {
+	padding-bottom: 130upx;
+	.order-list{
+		padding: 0 30upx;
+	}
+}
+</style>
diff --git a/pages/subPages2/homemaking/postDemand/postDemand.vue b/pages/subPages2/homemaking/postDemand/postDemand.vue
new file mode 100644
index 0000000..f7af542
--- /dev/null
+++ b/pages/subPages2/homemaking/postDemand/postDemand.vue
@@ -0,0 +1,618 @@
+<template>
+	<view class="postDemand">
+		<view class="formItem">
+			<view class="f-w col-3 f-32 p-t-30">
+				基础信息
+			</view>
+			<view class="menu-item">
+				<view class="menu-name">
+					需求类型
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="menu-content flex-box" @click="openlink">
+					<!-- <picker @change="Change" :value="index" :range="Arr" mode="multiSelector" range-key="title"> -->
+						<view class="uni-input" >{{categoryText }}</view>
+					<!-- </picker> -->
+				</view>
+				<view class=" t-r iconfont icon-right" style="font-size: 24upx;color: #333333;">
+					
+				</view>
+			</view>
+			<view class="menu-item">
+				<view class="menu-name">
+					上门时间
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="menu-content flex-box" @click="openTime" v-if="time">
+					<input type="text" disabled v-model="time" class="menu-input" value="" />
+				</view>
+				<view class="menu-content flex-box col-9" @click="openTime" style="color: #999999;" v-else>
+					请选择上门时间
+				</view>
+				<view class=" t-r iconfont icon-right" style="font-size: 24upx;color: #333333;">
+					
+				</view>
+			</view>
+			<view class="menu-item">
+				<view class="menu-name">
+					具体地址
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="menu-content flex-box" @click="goLocation" v-if="site">
+					<input type="text" disabled v-model="site" class="menu-input" value="" />
+				</view>
+				<view class="menu-content flex-box col-9" @click="goLocation" style="color: #999999;" v-else>
+					请选择具体地址
+				</view>
+				<view class=" t-r" style="font-size: 24upx;color: #FF4444;border-left: 1upx solid #EEEEEE;width: 100upx;" @click="goLocation">
+					定位
+				</view>
+			</view>
+			<view class="menu-item"  style="border: none;">
+				<view class="menu-name">
+					联系方式
+					<!-- <text class="f-20 c-ff4444">*</text> -->
+				</view>
+				<view class="menu-content flex-box">
+					<input type="number" maxlength="11" v-model="phone" placeholder="填写后服务商可直接通过电话联系您" class="menu-input" value="" />
+				</view>
+				
+			</view>
+			
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="requirement">
+			<view class="f-w f-32 col-3">
+				需求说明
+			</view>
+			<view class="text">
+				<textarea  class="textarea" v-model="editorText" placeholder="请输入需求说明"></textarea>
+			</view>
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="uploading">
+			<view class="f-w f-32 col-3">
+				上传照片
+			</view>
+			<view class="col-9 f-24" style="padding-top: 20upx;">
+				(上传照片，最多上传5张照片)
+			</view>
+			<view class="imgs">
+				<view class="img-item" v-for="(item,index) in imglinks" :key="index">
+					<image :src="item" mode=""></image>
+					<image class="imgclise" @click="deletImg(index)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+				<view class="img-item" @click="uploadFiles(2, 6)" v-if="imglinks.length < 5">
+					<image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="issue" @click="issueclick">
+			发布需求
+		</view>
+		<w-picker :visible.sync="visibletimeone" mode="date" fields="minute" :value="time" :current="false"
+		 :second="false" @confirm="bindTimeChangeStar($event)" @cancel="onCancel" ref="time"></w-picker>
+		 <w-picker
+		         :visible.sync="visible"
+		         mode="linkage"
+		         :value="'94'"
+		         :options="Arr"
+		         :level="2"
+		         default-type="id"
+		         :default-props="pospt"
+		         @confirm="onConfirm($event,'linkage')"
+		         ref="linkage" 
+		     ></w-picker>
+		 <!-- #ifdef H5 -->
+		 <PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+		 	<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="latlngs.latitude">
+		 		<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"></iframe>
+		 	</view>
+		 	<view class="iframe-wid-hgt" :style="{ height: phoneHight,width:phoneWidth }" v-if="!latlngs.latitude">
+		 		<iframe id="mapPage" width="100%" height="100%" frameborder="0" :src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"></iframe>
+		 	</view>
+		 </PopManager>
+		 <!-- #endif -->
+		 <!-- <TabBars :tabBarAct="0" pageType="18"></TabBars> -->
+		 <PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		 <getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import PopManager from '@/components/template/PopManager';
+	import TabBars from '@/components/template/tabBar.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue'
+	export default{
+		data(){
+			return{
+				index:0,
+				visible:false,
+				isOpenLaction:false,
+				time:'',
+				site:'',
+				pospt:{"label":"title","value":"id","children":"list"},
+				Arr:[
+				],
+				visibletimeone:false,
+				localIds:null,
+				uploadlength:0,
+				imglinks:[],
+				phoneHight:null,
+				phoneWidth:null,
+				phone:'',
+				latlngs:{},
+				loadlogo:false,
+				uesrInfo:{},
+				editorText:'',
+				lng:'',
+				lat:'',
+				categoryText:'',
+				pageId:0,
+				userInfo:{},
+				lblis:{},
+				upimg:false,
+				popShow:false,
+				vxshow:false
+			}
+		},
+		onLoad(e) {
+			// debugger
+			let _this = this;
+			_this.pageId = e.id;
+			_this.latlngs = uni.getStorageSync('curLoction');
+			_this.uesrInfo = uni.getStorageSync('userinfo');
+			uni.getSystemInfo({
+				success(res) {
+					console.log(res);
+					_this.phoneHight = res.windowHeight + 'px';
+					_this.phoneWidth = res.windowWidth + 'px';
+				}
+			});
+			
+			
+		},
+		onShow() {
+			let _this = this;
+			let lblis = {}
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					
+						if (loc && loc.module == 'locationPicker') {
+							lblis = {
+								lat:loc.latlng.lat,
+								lng:loc.latlng.lng,
+								detailed_address:loc.poiaddress
+							}
+							_this.site = loc.poiaddress;
+							_this.lat = loc.latlng.lat;
+							_this.lng = loc.latlng.lng;
+							_this.isOpenLaction = false;
+						}
+				},
+				false
+			);
+			
+			// #endif
+			//#ifdef APP-PLUS
+			if(_this.uesrInfo.address){
+				let bilis = {
+					detailed_address:_this.uesrInfo.address,
+					lat:_this.uesrInfo.lat,
+					lng:_this.uesrInfo.lng
+				};
+				_this.site = _this.uesrInfo.address;
+				_this.lat = _this.uesrInfo.lat;
+				_this.lng = _this.uesrInfo.lng;
+			}
+			//#endif
+			if(_this.upimg){
+				_this.upimg = false;
+				return
+			}
+			_this.getTypeinitialize(_this.pageId)
+		},
+		components:{
+			wPicker,
+			PopManager,
+			TabBars,
+			PhoneMask,
+			getvxphone
+		},
+		methods:{
+			showFalse(flag){
+				console.log('进了showfalse')
+				this.vxshow = false;
+				if(flag){
+					this.getTypeinitialize(this.pageId)
+				}
+				
+			},
+			closePop(flag) {
+				let _this = this
+				_this.popShow = false
+				if(flag){
+					_this.getTypeinitialize(this.pageId)
+				}
+				
+			},
+			onConfirm(e){
+				console.log(e);
+				this.categoryId = e.value[1];
+				this.Arr.map((item,index)=>{
+					if(item.id == e.value[0]){
+						item.list.map((items,indexs)=>{
+							if(items.id == e.value[1]){
+								this.categoryText = items.title;
+							}
+						})
+					}
+				})
+			},
+			// 时间戳转时间
+			getTimeData(dataValue) {
+				// debugger
+				 var date = new Date(Number(dataValue)) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				        var Y = date.getFullYear() + '-'
+				        var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'
+				        var D = date.getDate() + ' '
+				        var h = date.getHours() + ':'
+				        var m = date.getMinutes()
+				        var s = date.getSeconds()
+				        // return Y+M+D+h+m+s
+				        // console.log(timestampToTime (1533293827000))
+				return {
+					label: Y + M + D + h + m
+				};
+			},
+			// 时间转时间戳
+			getDataTime(timeValue) {
+				let ontime;
+				// debugger
+				ontime = timeValue.replace(/-/g, '/');
+				let date = new Date(ontime);
+				let time = date.getTime() / 1000;
+				return time;
+			},
+			issueclick(){
+				let _this = this;
+				if(!_this.time){
+					uni.showToast({
+						title:'上门时间不能为空',
+						icon:'none'
+					});
+					return
+				}
+				if(!_this.site){
+					uni.showToast({
+						title:'具体地址不能为空',
+						icon:'none'
+					});
+					return
+				};
+				let serviceinfo = {
+					visitingtime:_this.getDataTime(_this.time),
+					thumbs:_this.imglinks,
+					detail:_this.editorText,
+					lng:_this.lng,
+					lat:_this.lat,
+					type:_this.categoryId,
+					address:_this.site,
+					mobile:_this.phone
+				}
+				console.log(serviceinfo);
+				let data = {
+					id:this.pageId
+				};
+				// debugger
+				let storehours = JSON.stringify(serviceinfo);
+				let base64 = new this.$util.Base64();
+				storehours = base64.encode(storehours);
+				data.demandinfo = storehours;
+					App._post_form(
+						`&p=housekeep&do=editDemandApi`,
+						data,
+						res => {
+							console.log(res);
+							if(this.pageId || !res.data.orderid){
+								App.navigationTo({
+									url: 'pages/subPages2/homemaking/myDemand/myDemand',
+									 navType:'reLaunch'
+								});
+							}else{
+								App.navigationTo({
+									url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=housekeep',
+									navType:'reLaunch'
+								});
+							}
+							
+						},
+						false,
+						() => {
+							
+						}
+					);
+			},
+			getTypeinitialize(id = ''){
+				let _this = this;
+					App._post_form(
+						`&p=housekeep&do=editDemandPage`,
+						{id},
+						res => {
+							_this.Arr = res.data.cate;
+							_this.categoryText = _this.Arr[0].list[0].title;
+							_this.categoryId = _this.Arr[0].list[0].id;
+							let demand = res.data.demand;
+							if(id){
+								_this.Arr.map((item,index)=>{
+										item.list.map((items,indexs)=>{
+											if(items.id == id){
+												this.categoryText = items.title;
+											}
+										})
+								});
+								_this.time = _this.getTimeData(demand.visitingtime *  1000).label;
+								_this.site = demand.address;
+								_this.lat = demand.lat;
+								_this.lng = demand.lng;
+								_this.editorText = demand.detail;
+								_this.imglinks = demand.thumbs;
+								
+							}
+							_this.phone = demand.mobile;
+							// debugger
+							console.log(res);
+						},fail=>{
+						if(fail.data.message == '认证后才能发布需求'){						
+							App.navigationTo({
+								url: `pages/subPages/attestationCenter/index?rzType=1&type=1`,
+								navType:'reLaunch'						,
+							});					
+						}					
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+							
+						}			
+					});
+			},
+			goLocation(){
+				let _this = this;
+				_this.upimg = true;
+				// #ifdef MP-WEIXIN
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						let bilis = {
+							detailed_address:e.address,
+							lat:e.latitude,
+							lng:e.longitude
+						};
+						_this.site = e.address;
+						_this.lat = e.latitude;
+						_this.lng = e.longitude;
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				      //#endif
+			},
+			deletImg(index){
+				this.imglinks.splice(index,1)
+			},
+			openTime(){
+				this.visibletimeone = true;
+			},
+			openlink(){
+				this.visible = true;
+			},
+			Change(e){
+				console.log(e);
+				this.index = e.detail.value;
+			},
+			bindTimeChangeStar(e){
+				console.log(e);
+				// debugger
+				this.time = e.result
+			},
+			onCancel(){
+				
+			},
+			uplodephone(length,localIds){
+			let _this = this;
+					wxApi.uoloadIg(localIds[length], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+											let num = length + 1;
+											_this.imglinks.push(res.data.img);
+											if(num < _this.uploadlength){
+												uni.setTimeout(_this.uplodephone(num,_this.localIds),500);
+											}
+									}
+								},
+								false,
+								() => {
+									
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				
+			},
+			// 文件上传接口
+			async uploadFiles(type, num) {
+				let _this = this;
+				_this.upimg = true;
+				// _this.uoloadIgs(i, 0, res, type);
+				// #ifdef H5
+					if(App.getClientType() == 2){
+						let res = await App.browser_upload(num);
+					    for (let i = 0; i < res.tempFilePaths.length; i++) {
+					    	let aa = await App._upLoad(res.tempFilePaths[i]);
+					    	if (type == 2) {
+					    		_this.imglinks.push(aa.data.img);
+					    		// _this.userInfo.thumbs.push(aa.data.image);
+					    		console.log(_this.imglinks,aa.data.img);
+					    	}
+					    }
+						return
+					}
+					wxApi.choseImage(res => {
+						// let length 
+						_this.localIds = res.localIds;
+						_this.uploadlength = res.localIds.length;
+						_this.uplodephone(0,_this.localIds);
+					},5);
+				// #endif
+				// #ifndef H5
+					wx.chooseImage({
+						count: 5,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							// console.log(_this.userInfo.havestore, _this.page, '-------');
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+								if (type == 2) {
+									_this.imglinks.push(aa.data.img);
+									// _this.userInfo.thumbs.push(aa.data.image);
+									console.log(_this.imglinks,aa.data.img);
+								}
+							}
+						}
+					});
+				// #endif
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.postDemand{
+		padding-bottom: 100upx;
+		.line{
+			height: 20upx;
+			background-color: #F8F8F8;
+		}
+		.requirement{
+			padding: 30upx;
+			.text{
+				padding: 20upx 0;
+				.textarea{
+					width: 100%;
+					height: 160upx;
+					font-size: 28upx;
+				}
+			}
+		}
+		.issue{
+			width: 750upx;
+			height: 90upx;
+			background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+			line-height: 90upx;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			text-align: center;
+			font-size: 32upx;
+			color: #FFFFFF;
+			font-weight: bold;
+			border-radius: 30upx 30upx 0 0;
+		}
+		.uploading{
+			padding: 30upx;
+			.imgs{
+				padding: 30upx 0;
+				display: flex;
+				flex-wrap: wrap;
+				align-content: flex-center;
+				align-items: center;
+				justify-content: left;
+				.img-item{
+					height: 158upx;
+					border-radius: 20upx;
+					flex: auto;
+					margin: 10upx;
+					width: 158upx;
+					min-width: 158upx;
+					max-width: 158upx;
+					position: relative;
+					image{
+						width: 100%;
+						height: 100%;
+						border-radius: 20upx;
+					}
+					.imgclise{
+						width: 30upx;
+						height: 30upx;
+						position: absolute;
+						right: 10upx;
+						top: 10upx;
+					}
+				}
+			}
+		}
+		.formItem{
+			padding: 0 30upx;
+			
+			.menu-item{
+				display: flex;
+				padding: 30upx 0;
+				border-bottom: 1upx solid #EEEEEE;
+				.menu-name{
+					font-size: 28upx;
+					color: #333333;
+					width: 130upx;
+					padding-right: 50upx;
+				}
+				.menu-content{
+					font-size: 28upx;
+					color: #333333;
+					.menu-input{
+						height: 100%;
+						font-size: 28upx;
+					}
+				}
+			}
+		}
+		.p-t-30{
+			padding-top: 30upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/pubService/pubService.vue b/pages/subPages2/homemaking/pubService/pubService.vue
new file mode 100644
index 0000000..48b6ba7
--- /dev/null
+++ b/pages/subPages2/homemaking/pubService/pubService.vue
@@ -0,0 +1,734 @@
+<template>
+	<view class="pubService">
+		<view class="form">
+			<view class="title">
+				基础信息
+			</view>
+			<view class="formItem ">
+				<view class="formName">
+					服务标题
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="formContent">
+					<input type="text" class="input" v-model="fromData.title" value="" placeholder="请输入服务标题说明" />
+				</view>
+			</view>
+			
+			<view class="formItem" style="line-height: 0;height: auto;">
+				<view class="formName" style="line-height: 100upx;">
+					服务类型
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="formContent" style="padding: 30upx 0;" @click="showoccupation = true">
+					<input type="number" v-if="fromData.catearray.length == 0" maxlength="11" style="line-height: 40upx;height: 50upx;" disabled class="inputLeft" value="" placeholder-class="col-9" placeholder="点击选择所属服务" />
+					<view v-else class="f-28 col-3">
+						<view class="check-item" v-for="(item,index) in fromData.catearray" :key="index">
+						{{item.title}}
+						<image :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode="" @click.stop="deletcheck(item.id)"></image>
+						</view>
+					</view>
+				</view>
+				<view class="iconfont icon-right t-r f-28" style="font-size: 28upx;color: #999999;line-height: 100upx;"  @click="showoccupation = true">
+					
+				</view>
+			</view>
+			<view class="formItem" style="line-height: 0;height: auto;">
+				<view class="formName" style="line-height: 100upx;">
+					支付方式
+					<!-- <text class="f-20 c-ff4444">*</text> -->
+				</view>
+				<view class="formContent" >
+					<picker @change="Change" :value="indexs" :range="arrs"  range-key="title">
+						<view class="input" >{{arrs[indexs].title}}</view>
+					</picker>
+				</view>
+				<view class="iconfont icon-right t-r f-28" style="font-size: 28upx;color: #999999;line-height: 100upx;"  >
+					
+				</view>
+			</view>
+			<view class="formItem " v-if="indexs != 0">
+				<view class="formName">
+					支付金额
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="formContent dis-flex">
+					<input type="text" class="input" v-model="fromData.price" value="" placeholder="请输入支付金额" /><text class="f-28 col-3">元</text>
+				</view>
+			</view>
+			<view class="formItem " v-if="indexs != 0">
+				<view class="formName">
+					计费单位
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="formContent dis-flex">
+					<input type="text" class="input" v-model="fromData.unit" value="" placeholder="例：小时、平方、KG" />
+				</view>
+			</view>
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="form">
+			<view class="title">
+				首图展示
+			</view>
+			<view class="f-24 col-9" style="padding-top: 20upx;">
+				(推荐尺寸200x200)
+			</view>
+			<view class="imgs">
+			<view class="img-item" v-if="fromData.thumb">
+				<image :src="fromData.thumb" mode=""></image>
+				<image class="imgclise" @click="deletImg(0,true)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+			</view>
+			<view class="img-item" @click="uploadFiles(1, 6)" v-else>
+				<image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image>
+			</view>
+			</view>
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="form">
+			<view class="title">
+				案例图
+			</view>
+			<view class="f-24 col-9" style="padding-top: 20upx;">
+				(上传案例图，最多上传5张照片)
+			</view>
+			<view class="imgs">
+				<view class="img-item" v-for="(item,index) in fromData.adv" :key="index">
+					<image :src="item" mode=""></image>
+					<image class="imgclise" @click="deletImg(index)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+				<view class="img-item" @click="uploadFiles(2, 5)" v-if="fromData.adv.length < 5">
+					<image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="form">
+			<view class="title" style="padding-bottom: 30upx;">
+				上传视频
+			</view>
+			<view class="videoBox">
+				<view class="video" @click="upVideo" v-if="!fromData.videourl">
+					<image :src="imgfixUrls + 'homemakingImg/videoUpload.png'" mode=""></image>
+				</view>
+				<view class="video" v-else>
+					<video x5-video-player-type='h5' x5-video-player-fullscreen='true' x5-video-orientation='portraint' class="text-video-left" :controls="false" :src="fromData.videourl" controls></video>
+					<!-- <video x5-video-player-type='h5' x5-video-player-fullscreen='true' x5-video-orientation='portraint' class="text-video-left" :src="" controls></video> -->
+					<image class="imgclise" @click="deletvideo" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="line">
+			
+		</view>
+		<view class="form">
+			<view class="title" style="padding-bottom: 30upx;">
+				服务说明
+			</view>
+			<view class="textarea-box">
+				<textarea value="" class="textarea" v-model="fromData.detail" placeholder="请输入服务说明" />
+			</view>
+		</view>
+		<view class="issue" @click.stop="Adservice">
+			发布服务
+		</view>
+		<PopManager :show="showoccupation" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="showoccupation = false">
+			<view class="cicupation">
+				<view class="cicupation-left">
+					<view :class="item.checked?'left-item':'left-nocheck'" v-for="(item,index) in cate" :key="index" @click="checkLeft(item.id)" >
+						{{item.title}}
+					</view>
+				</view>
+				<view class="cicupation-right">
+					<view :class="item.checked?'right-item':'right-nocheck'" v-for="(item,index) in rightList" :key="index" @click="checkRight(item.id)">
+					{{item.title}}
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<!-- <TabBars :tabBarAct="0" pageType="18"></TabBars> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	import TabBars from '@/components/template/tabBar.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				fromData:{
+					catearray:[],
+					adv:[],
+					title:''
+				},
+				showoccupation:false,
+				cate:[],
+				rightList:[],
+				loadlogo:false,
+				arrs:[{
+					title:'面议',
+					id:0
+				},
+				{
+					title:'预约金',
+					id:1
+				},
+				{
+					title:'实价',
+					id:2
+				}],
+				indexs:0,
+				userinfo:{},
+				id:'',
+				arid:''
+			}
+		},
+		components:{
+			PopManager,
+			TabBars
+		},
+		onLoad(e) {
+			this.id = e.id || '';
+			this.arid = e.arid || '';
+			this.type = e.type;
+			this.userinfo = uni.getStorageSync('userinfo');
+			this.getinitialize();
+		},
+		methods:{
+			deletcheck(id){
+				let _this = this;
+				_this.cate.map((item,index)=>{
+					item.list.map((items,indexs)=>{
+						if(items.id == id){
+							items.checked = false;
+						}
+					})
+					
+				});
+				_this.fromData.catearray.map((items,indexs)=>{
+					if(items.id == id){
+						_this.fromData.catearray.splice(indexs,1)
+					}
+				})
+				_this.rightList.map((items,indexs)=>{
+					if(items.id == id){
+						items.checked = false;
+					}
+				})
+			},
+			Adservice(){
+				let _this = this;
+				let data = {
+					type:this.type,
+					objid:_this.arid,
+					id:_this.fromData.id || ''
+				};
+				let fromData = JSON.parse(JSON.stringify(_this.fromData));
+				if(!fromData.title){
+					uni.showToast({
+						title:'服务标题不能为空',
+						icon:'none'
+					});
+					return
+				}
+				if(fromData.catearray.length == 0){
+					uni.showToast({
+						title:'请选择服务类型',
+						icon:'none'
+					});
+					return
+				}
+				if(!fromData.price && _this.indexs != 0){
+					uni.showToast({
+						title:'请输入支付金额',
+						icon:'none'
+					});
+					return
+				}
+				if(!fromData.unit && _this.indexs != 0){
+					uni.showToast({
+						title:'请输入服务计量单位',
+						icon:'none'
+					});
+					return
+				}
+				let cateIds = [];
+				fromData.catearray.map((item,index)=>{
+					cateIds.push(item.id);
+				});
+				fromData.pricetype = _this.arrs[_this.indexs].id;
+				fromData.catearray = cateIds;
+				let storehours = JSON.stringify(fromData);
+				let base64 = new this.$util.Base64();
+				storehours = base64.encode(storehours);
+				data.serviceinfo = storehours;
+					App._post_form(
+						`&p=housekeep&do=editServiceApi`,
+						data,
+						res => {
+							console.log(res);
+							App.navigationTo({
+								url: `pages/subPages2/homemaking/myServiceList/myServiceList?type=${this.type}&sid=${this.arid}`,
+								navType:'reLaunch'
+							});
+						},
+						false,
+						() => {
+							this.loadlogo = true;
+						}
+					);
+			},
+			deletvideo(){
+				this.fromData.videourl = '';
+			},
+			upVideo(){
+				let _this = this;
+				uni.chooseVideo({
+					count: 1,
+					sourceType: ['camera', 'album'],
+					success: function(res) {
+						uni.showLoading();
+						uni.uploadFile({
+							url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+							filePath: res.tempFilePath,
+							name: 'file',
+							formData: {
+								upload_type: 1,
+								is_base: 1
+							},
+							success: res => {
+								
+								let data = JSON.parse(res.data),
+									base64 = new _this.$util.Base64();
+									debugger
+								if (data.errno === 0) {
+									_this.fromData.videourl = base64.decode(data.data.img)
+								} else {	
+									App.showError(data.message, () => {});
+								}
+								uni.hideLoading();
+							},
+							fail: res => {
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			deletImg(index,flag = false){
+				if(!flag){
+					this.fromData.adv.splice(index,1)
+				}else{
+					this.fromData.thumb = '';
+				}
+				
+			},
+			Change(e){
+				console.log(e);
+				this.indexs = e.detail.value;
+			},
+			checkRight(id){
+				let _this = this;
+				_this.rightList.map((item,index)=>{
+					// item.checked = false;
+					if(item.id == id){
+						item.checked = !item.checked;
+						if(item.checked){
+							_this.fromData.catearray.push(item);
+						}else{
+							_this.fromData.catearray.map((items,indexs)=>{
+								if(items.id == item.id){
+									_this.fromData.catearray.splice(indexs,1);
+								}
+							})
+						}
+						
+					}
+				});
+				_this.loadlogo = !_this.loadlogo;
+				_this.loadlogo = !_this.loadlogo;
+			},
+			checkLeft(id){
+				let _this = this;
+				_this.cate.map((item,index)=>{
+					item.checked = false;
+					if(item.id == id){
+						item.checked = true;
+						_this.rightList = item.list;
+					}
+				});
+				_this.loadlogo = !_this.loadlogo;
+				_this.loadlogo = !_this.loadlogo;
+			},
+			getinitialize(){
+				let _this = this;
+					App._post_form(
+						`&p=housekeep&do=editServicePage`,
+						{id:_this.id,type:_this.type,objid:_this.arid},
+						res => {
+							console.log(res);
+							// debugger
+							// _this.areas = res.data.areas;
+							_this.fromData = res.data.service;
+							_this.cate = res.data.cate;
+							_this.indexs = _this.fromData.pricetype || 0;
+							// _this.meals = res.data.meals;
+							_this.cate.map((item,index)=>{
+								item.checked = false;
+								item.list.map((items,indexs)=>{
+									items.checked = false;
+									_this.fromData.catearray.map((itemis,indexss)=>{
+										if(items.id == itemis.id){
+											items.checked = true;
+										}
+									})
+								})
+							});
+							// _this.areas.map((item,index)=>{
+							// 	item.checked = false;
+							// })
+						},fail=>{					if(fail.data.message == '认证后才能发布服务项目'){
+						if(_this.type != 1){
+							App.navigationTo({
+								url: `pages/subPages/attestationCenter/index?rzType=1&type=1`,
+								navType:'reLaunch'
+							});
+						}else{
+							App.navigationTo({
+								url: `pages/subPages/attestationCenter/index?rzType=2`,
+								navType:'reLaunch'
+							});
+						}											
+						}					
+						console.log(fail)				
+						});
+			
+			},
+			uplodephone(length,localIds,type){
+			let _this = this;
+					wxApi.uoloadIg(localIds[length], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										if(type == 1){
+											_this.fromData.thumb = res.data.img;
+										}else{
+											let num = length + 1;
+											_this.fromData.adv.push(res.data.img);
+											if(num < _this.uploadlength){
+												uni.setTimeout(_this.uplodephone(num,_this.localIds),500);
+											}
+										}
+											
+									}
+								},
+								false,
+								() => {
+									
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				
+			},
+			// 文件上传接口
+			async uploadFiles(type, num) {
+				let _this = this;
+				// _this.uoloadIgs(i, 0, res, type);
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(num);
+				    if(type == 1){
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+								_this.fromData.thumb = aa.data.img;
+						}
+					}else{
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 2) {
+								_this.fromData.adv.push(aa.data.img);
+								// _this.userInfo.thumbs.push(aa.data.image);
+								console.log(_this.fromData.adv,aa.data.img);
+								
+							}else{
+								_this.fromData.adv.push(aa.data.img);
+							}
+						}
+					}
+					return
+				}
+				if(type == 1){
+					wxApi.choseImage(res => {
+						// let length 
+						_this.localIds = res.localIds;
+						_this.uploadlength = res.localIds.length;
+						_this.uplodephone(0,_this.localIds,type);
+					},1);
+				}else{
+					wxApi.choseImage(res => {
+						// let length 
+						_this.localIds = res.localIds;
+						_this.uploadlength = res.localIds.length;
+						_this.uplodephone(0,_this.localIds);
+					},5);
+				}
+					
+				// #endif
+				// #ifndef H5
+				if(type == 1){
+					wx.chooseImage({
+						count: 1,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							// console.log(_this.userInfo.havestore, _this.page, '-------');
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+									_this.fromData.thumb = aa.data.img;
+							}
+						}
+					});
+				}else{
+					wx.chooseImage({
+						count: 5,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							// console.log(_this.userInfo.havestore, _this.page, '-------');
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+								if (type == 2) {
+									_this.fromData.adv.push(aa.data.img);
+									// _this.userInfo.thumbs.push(aa.data.image);
+									console.log(_this.fromData.adv,aa.data.img);
+									
+								}else{
+									_this.fromData.adv.push(aa.data.img);
+								}
+							}
+						}
+					});
+				}
+					
+				// #endif
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.pubService{
+		.line{
+			height: 20upx;
+			background-color: #F8F8F8;
+		}
+		.issue{
+			width: 750upx;
+			height: 90upx;
+			background: linear-gradient(360deg, #6094FD 0%, #70A8FD 100%);
+			line-height: 90upx;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			text-align: center;
+			font-size: 32upx;
+			color: #FFFFFF;
+			font-weight: bold;
+			border-radius: 30upx 30upx 0 0;
+			z-index: 999;
+		}
+		.form{
+			padding: 30upx;
+			.title{
+				font-size: 32upx;
+				color: #333333;
+				font-weight: bold;
+			}
+			.textarea-box{
+				.textarea{
+					width: 100%;
+					height: 250upx;
+					font-size: 28upx;
+				}
+			}
+			.videoBox{
+				position: relative;
+				.video{
+					width: 690upx;
+					height: 388upx;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+					video{
+						width: 100%;
+						height: 100%;
+					}
+					.imgclise{
+						width: 40upx;
+						height: 40upx;
+						position: absolute;
+						right: 10upx;
+						top: 10upx;
+						z-index: 9999;
+					}
+				}
+			}
+			.imgs{
+				padding: 30upx 0;
+				display: flex;
+				flex-wrap: wrap;
+				align-content: flex-center;
+				align-items: center;
+				justify-content: left;
+				.img-item{
+					height: 158upx;
+					border-radius: 20upx;
+					flex: auto;
+					margin: 10upx;
+					width: 158upx;
+					min-width: 158upx;
+					max-width: 158upx;
+					position: relative;
+					image{
+						width: 100%;
+						height: 100%;
+						border-radius: 20upx;
+					}
+					.imgclise{
+						width: 30upx;
+						height: 30upx;
+						position: absolute;
+						right: 10upx;
+						top: 10upx;
+					}
+				}
+			}
+			.formItem{
+				height: 100upx;
+				line-height: 100upx;
+				display: flex;
+				.formName{
+					width: 172upx;
+					font-size: 28upx;
+					color: #333333;
+				}
+				.formContent{
+					flex: 1;
+					.input{
+						height: 100upx;
+						line-height: 100upx;
+						font-size: 28upx;
+					}
+					.inputLeft{
+						font-size: 28upx;
+						height: 100upx;
+						line-height: 100upx;
+						width: 100%;
+						text-align: left;
+					}
+					.check-item{
+						padding: 0 10upx;
+						border-radius: 10upx;
+						background-color: #FF4444;
+						color: #FFFFFF;
+						height: 40upx;
+						line-height: 40upx;
+						text-align: center;
+						display: inline-block;
+						margin-right: 10upx;
+						margin-bottom: 10upx;
+						position: relative;
+						image{
+							width: 30upx;
+							height: 30upx;
+							margin-top: 5upx;
+							vertical-align: top;
+							margin-left: 10upx;
+						}
+					}
+				}
+			}
+		}
+		.cicupation{
+			width: 750upx;
+			height: 550upx;
+			padding: 30upx;
+			box-sizing: border-box;
+			background-color: #FFFFFF;
+			border-radius: 30upx 30upx 0 0;
+			display: flex;
+			.cicupation-left{
+				padding-right: 10upx;
+				height: 450upx;
+				flex: 1;
+				overflow: auto;
+				.left-item{
+					line-height: 60upx;
+					font-size: 26upx;
+					text-align: center;
+					background-color: #ff4444;
+					color: #FFFFFF;
+					border-bottom: 1upx solid #EEEEEE;
+					border-radius: 15upx;
+					margin-bottom: 20upx;
+					font-weight: bold;
+				}
+				.left-nocheck{
+					line-height: 60upx;
+					font-size: 26upx;
+					text-align: center;
+					background-color: #F8F8F8;
+					border-bottom: 1upx solid #EEEEEE;
+					border-radius: 15upx;
+					margin-bottom: 20upx;
+				}
+			}
+			.cicupation-right{
+				flex: 1;
+				padding-left: 10upx;
+				height: 450upx;
+				overflow: auto;
+				.right-item{
+					line-height: 60upx;
+					font-size: 26upx;
+					text-align: center;
+					background-color: #ff4444;
+					border-bottom: 1upx solid #EEEEEE;
+					border-radius: 15upx;
+					margin-bottom: 20upx;
+					color: #FFFFFF;
+				}
+				.right-nocheck{
+					line-height: 60upx;
+					font-size: 26upx;
+					text-align: center;
+					background-color: #F8F8F8;
+					border-bottom: 1upx solid #EEEEEE;
+					border-radius: 15upx;
+					margin-bottom: 20upx;
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/homemaking/serviceIn/serviceIn.vue b/pages/subPages2/homemaking/serviceIn/serviceIn.vue
new file mode 100644
index 0000000..ef75a86
--- /dev/null
+++ b/pages/subPages2/homemaking/serviceIn/serviceIn.vue
@@ -0,0 +1,988 @@
+<template>
+	<view class="serviceIn" v-if="loadlogo">
+		<view class="from">
+			<view class="title">基础信息</view>
+			<view class="fromItem">
+				<view class="fromName">
+					联系人
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="fromContent"><input type="text" class="inputs" v-model="artificer.name" value="" placeholder-class="col-9" placeholder="请输入姓名" /></view>
+			</view>
+			<view class="fromItem">
+				<view class="fromName">性别</view>
+				<view class="fromContent">
+					<radio-group class="dis-flex f-28" style="justify-content: flex-end;" @change="radioChange">
+						<label
+							class="uni-list-cell uni-list-cell-pd dis-flex"
+							:style="{ paddingRight: index != 1 ? '50rpx' : '0px' }"
+							v-for="(item, index) in items"
+							:key="item.value"
+						>
+							<view><radio color="#70A8FD" :value="item.value" :checked="index === current" /></view>
+							<view>{{ item.name }}</view>
+						</label>
+					</radio-group>
+				</view>
+			</view>
+			<view class="fromItem">
+				<view class="fromName">
+					手机号
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="fromContent">
+					<input type="number" maxlength="11" v-model="artificer.mobile" class="inputs" value="" placeholder-class="col-9" placeholder="请输入手机号码" />
+				</view>
+			</view>
+			<view class="fromItem">
+				<view class="fromName">
+					联系地址
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="fromContent" style="overflow: hidden;" @click="goLocation">
+					<input type="number" v-if="!artificer.address" maxlength="11" disabled class="inputLeft" value="" placeholder-class="col-9" placeholder="点击定位详细地址" />
+					<view v-else class="f-28 col-3">{{ artificer.address }}</view>
+				</view>
+				<view class="textbox t-r f-28 c-ff4444" @click="goLocation">
+					定位
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+			</view>
+			<view class="fromItem" style="line-height: 0;height: auto;">
+				<view class="fromName" style="line-height: 110upx;">
+					服务类型
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="fromContent" style="padding: 30upx 0;" @click="showoccupation = true">
+					<input
+						type="number"
+						v-if="artificer.catearray.length == 0"
+						maxlength="11"
+						style="line-height: 40upx;height: 50upx;"
+						disabled
+						class="inputLeft"
+						value=""
+						placeholder-class="col-9"
+						placeholder="点击选择所属服务"
+					/>
+					<view v-else class="f-28 col-3">
+						<view class="check-item" v-for="(item, index) in artificer.catearray" :key="index">
+							{{ item.title }}
+							<image :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode="" @click.stop="deletcheck(item.id)"></image>
+						</view>
+					</view>
+				</view>
+				<view class="iconfont icon-right t-r f-28" style="font-size: 28upx;color: #999999;line-height: 110upx;" @click="showoccupation = true"></view>
+			</view>
+			<view class="fromItem" style="line-height: 0;height: auto;border: none;">
+				<view class="fromName" style="line-height: 110upx;">
+					服务区域
+					<text class="f-20 c-ff4444">*</text>
+				</view>
+				<view class="fromContent" style="padding: 30upx 0;" @click="showodistrict = true">
+					<input
+						type="number"
+						v-if="artificer.region.length == 0"
+						maxlength="11"
+						style="line-height: 40upx;height: 50upx;"
+						disabled
+						class="inputLeft"
+						value=""
+						placeholder-class="col-9"
+						placeholder="点击选择服务区域"
+					/>
+					<view v-else class="f-28 col-3">
+						<view class="check-item" v-for="(item, index) in artificer.region" :key="index">
+							{{ item.name }}
+							<!-- <image :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode="" @click.stop="deletcheck(item.id)"></image> -->
+						</view>
+					</view>
+				</view>
+				<view class="iconfont icon-right t-r f-28" style="font-size: 28upx;color: #999999;line-height: 110upx;" @click="showodistrict = true"></view>
+			</view>
+		</view>
+		<!-- <view class="line"></view>
+		<view class="addTag">
+			<view class="f-32 col-3 f-w">添加标签</view>
+			<view class="tag">
+				<view class="tag-item" v-for="(item, index) in artificer.tagarray" :key="index" @click="deletTag(index)">
+					{{ item }}
+					<view class="iconfont icon-close icong"></view>
+				</view>
+				<view class="addbtn iconfont icon-add" @click="addshow = true"></view>
+			</view>
+		</view> -->
+		<view class="line"></view>
+		<view class="workingPhoto">
+			<view class="f-32 f-w">入驻头像</view>
+			<view class="f-24 col-9" style="padding-top: 20upx;">(上传真实的照片，更容易接单成功)</view>
+			<view class="imgs">
+				<view class="img-item" v-if="artificer.thumb">
+					<image :src="artificer.thumb" mode=""></image>
+					<image class="imgclise" @click="deletImg(1,index)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+				<view class="img-item" @click="uploadFiles(1, 1)" v-else><image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image></view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<view class="workingPhoto">
+			<view class="f-32 f-w">工作照片</view>
+			<view class="f-24 col-9" style="padding-top: 20upx;">(上传真实的照片，最多上传5张，推荐尺寸750x430)</view>
+			<view class="imgs">
+				<view class="img-item" v-for="(item, index) in artificer.thumbs" :key="index">
+					<image :src="item" mode=""></image>
+					<image class="imgclise" @click="deletImg(2,index)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+				<view class="img-item" @click="uploadFiles(2, 5)" v-if="artificer.thumbs.length < 5"><image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image></view>
+			</view>
+		</view>
+		<view class="line"></view>
+		<view class="workingPhoto">
+			<view class="f-32 f-w">真实案例</view>
+			<view class="f-24 col-9" style="padding-top: 20upx;">(上传真实案例，最多上传9张照片)</view>
+			<view class="imgs">
+				<view class="img-item" v-for="(item, index) in artificer.casethumbs" :key="index">
+					<image :src="item" mode=""></image>
+					<image class="imgclise" @click="deletImg(3,index)" :src="imgfixUrls + 'homemakingImg/imgcolse.png'" mode=""></image>
+				</view>
+				<view class="img-item" @click="uploadFiles(3, 9)" v-if="artificer.casethumbs.length < 9">
+					<image :src="imgfixUrls + 'homemakingImg/upload.png'" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="line" v-if="meals"></view>
+		<view class="from" v-if="meals">
+			<view class="f-32 f-w">入驻套餐</view>
+			<view class="fromItem" style="border: none;">
+				<view class="fromName">套餐选择</view>
+				<view class="fromContent f-28">
+					<picker @change="Change" :value="index" :range="meals" range-key="name">
+						<view class="uni-input">{{ meals[index].name }}</view>
+					</picker>
+					<view class=" t-r iconfont icon-right" style="font-size: 24upx;color: #333333;"></view>
+				</view>
+			</view>
+		</view>
+		<view class="issue" @click="issueclick">立即入驻</view>
+		<PopManager :show="addshow" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="addshow = false">
+			<view class="addbox">
+				<view class="addinput"><input type="text" v-model="newTag" class="input" value="" /></view>
+				<view class="dis-flex btnbox f-30">
+					<view class="btnleft" @click="closeAdd">取消</view>
+					<view class="btnright" @click="addtagItem">确定</view>
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="showoccupation" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="showoccupation = false">
+			<view class="cicupation">
+				<view class="cicupation-left">
+					<view :class="item.checked ? 'left-item' : 'left-nocheck'" v-for="(item, index) in cate" :key="index" @click="checkLeft(item.id)">{{ item.title }}</view>
+				</view>
+				<view class="cicupation-right">
+					<view :class="item.checked ? 'right-item' : 'right-nocheck'" v-for="(item, index) in rightList" :key="index" @click="checkRight(item.id)">
+						{{ item.title }}
+					</view>
+				</view>
+			</view>
+		</PopManager>
+		<PopManager :show="showodistrict" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="showodistrict = false">
+			<view class="district">
+				<view :class="item.checked ? 'district-item' : 'district-nocheck'" v-for="(item, index) in areas" :key="index" @click="checkCity(item.id)">{{ item.name }}</view>
+			</view>
+		</PopManager>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight, width: phoneWidth }" v-if="latlngs.latitude">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="
+						`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${
+							latlngs.longitude
+						}`
+					"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHight, width: phoneWidth }" v-if="!latlngs.latitude">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- <TabBars :tabBarAct="0" pageType="18"></TabBars> -->
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import PopManager from '@/components/template/PopManager';
+import TabBars from '@/components/template/tabBar.vue';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+export default {
+	data() {
+		return {
+			index: 0,
+			items: [
+				{
+					value: '1',
+					name: '男'
+				},
+				{
+					value: '2',
+					name: '女'
+				}
+			],
+			current: 0,
+			isOpenLaction: false,
+			phoneHight: null,
+			phoneWidth: null,
+			latlngs: {},
+			site: '',
+			loadlogo: false,
+			showoccupation: false,
+			areas: [],
+			artificer: {},
+			cate: [],
+			meals: [],
+			rightList: [],
+			showodistrict: false,
+			addshow: false,
+			newTag: '',
+			localIds: null,
+			uploadlength: 0,
+			id: '',
+			userInfo:{},
+			lblis:{},
+			islocation:false
+		};
+	},
+	components: {
+		PopManager,
+		TabBars
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.id = e.id || '';
+		_this.latlngs = uni.getStorageSync('curLoction');
+		uni.getSystemInfo({
+			success(res) {
+				console.log(res);
+				_this.phoneHight = res.windowHeight + 'px';
+				_this.phoneWidth = res.windowWidth + 'px';
+			}
+		});
+		this.getinitialize();
+	},
+	onShow() {
+		let _this = this;
+		let lblis = {};
+		if(!this.islocation){
+			this.getinitialize();
+		}else{
+			this.islocation = false;
+		}
+		// #ifdef H5
+		window.addEventListener(
+			'message',
+			function(event) {
+				// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+				let loc = event.data;
+				_this.islocation = true;
+				if (loc && loc.module == 'locationPicker') {
+					lblis = {
+						lat: loc.latlng.lat,
+						lng: loc.latlng.lng,
+						detailed_address: loc.poiaddress
+					};
+					_this.artificer.address = loc.poiaddress;
+					_this.artificer.lat = loc.latlng.lat;
+					_this.artificer.lng = loc.latlng.lng;
+					_this.isOpenLaction = false;
+				}
+			},
+			false
+		);
+
+		// #endif
+		//#ifdef APP-PLUS
+		if(_this.userInfo.address){
+			let bilis = {
+				detailed_address: _this.userInfo.address,
+				lat: _this.userInfo.lat,
+				lng: _this.userInfo.lng
+			};
+			_this.artificer.address = _this.userInfo.address;
+			_this.artificer.lat =	_this.userInfo.lat;
+			_this.artificer.lng =	_this.userInfo.lng;
+		}
+		//#endif
+	},
+	methods: {
+		deletImg(type,index){
+			if(type == 1){
+				this.artificer.thumb = '';
+			}else if(type == 2){
+				this.artificer.thumbs.splice(index,1);
+			}else{
+				this.artificer.casethumbs.splice(index,1);
+			}
+		},
+		Change(e) {
+			console.log(e);
+			this.index = e.detail.value;
+		},
+		issueclick() {
+			let _this = this;
+			let artificer = JSON.parse(JSON.stringify(_this.artificer));
+			if (!artificer.name) {
+				uni.showToast({
+					title: '联系人不能为空',
+					icon: 'none'
+				});
+				return;
+			}
+			if (!artificer.mobile) {
+				uni.showToast({
+					title: '手机号不能为空',
+					icon: 'none'
+				});
+				return;
+			}
+			if (!artificer.address) {
+				uni.showToast({
+					title: '详细地址不能为空',
+					icon: 'none'
+				});
+				return;
+			}
+			if (artificer.region.length == 0) {
+				uni.showToast({
+					title: '请至少选择一个服务区域',
+					icon: 'none'
+				});
+				return;
+			}
+			if (artificer.catearray.length == 0) {
+				uni.showToast({
+					title: '请至少选择一个服务类型',
+					icon: 'none'
+				});
+				return;
+			}
+			let data = {
+				artificerinfo: null,
+				id:_this.id || artificer.id,
+			}
+			if (_this.meals) {
+				data = {
+					mealid: _this.meals[_this.index].id
+				};
+			}
+
+			artificer.gender = _this.items[_this.current].value;
+			let catearray = [];
+			let region = [];
+
+			artificer.catearray.map((item, index) => {
+				catearray.push(item.id);
+			});
+			artificer.region.map((item, index) => {
+				region.push(item.id);
+			});
+			artificer.region = region;
+			artificer.catearray = catearray;
+			console.log(artificer);
+			let storehours = JSON.stringify(artificer);
+			let base64 = new this.$util.Base64();
+			storehours = base64.encode(storehours);
+			data.artificerinfo = storehours;
+			App._post_form(
+				`&p=housekeep&do=editArtificerApi`,
+				data,
+				res => {
+					if(res.data.orderid == 0){
+						App.navigationTo({
+							url: 'pages/subPages2/homemaking/homeUser/homeUser',
+							navType:'reLaunch'
+						});
+					}else{
+						App.navigationTo({
+							url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=housekeep',
+							navType:'reLaunch'
+						});
+					}
+					
+				},
+				false,
+				() => {}
+			);
+		},
+		deletTag(index) {
+			this.artificer.tagarray.splice(index, 1);
+		},
+		uplodephone(length, localIds, type) {
+			let _this = this;
+			wxApi.uoloadIg(localIds[length], data => {
+				if (data.errMsg === 'uploadImage:ok') {
+					uni.showLoading({});
+					let requestData = {
+						upload_type: 2,
+						id: data.serverId
+					};
+					App._post_form(
+						'&do=uploadFiles',
+						requestData,
+						res => {
+							if (res.errno === 0) {
+								let num = length + 1;
+								if (type == 2) {
+									_this.artificer.thumbs.push(res.data.img);
+								} else if(type ==3){
+									_this.artificer.casethumbs.push(res.data.img);
+								}else{
+									_this.artificer.thumb = res.data.img;
+								}
+
+								if (num < _this.uploadlength) {
+									uni.setTimeout(_this.uplodephone(num, _this.localIds, type), 500);
+								}
+							}
+						},
+						false,
+						() => {
+							uni.hideLoading();
+						}
+					);
+				} else {
+					uni.hideLoading();
+					App.showError('上传失败');
+				}
+			});
+		},
+		// 文件上传接口
+		async uploadFiles(type, num) {
+			let _this = this;
+			_this.islocation = true;
+			// _this.uoloadIgs(i, 0, res, type);
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(num);
+			    for (let i = 0; i < res.tempFilePaths.length; i++) {
+			    	let aa = await App._upLoad(res.tempFilePaths[i]);
+			    	if (type == 2) {
+			    		_this.artificer.thumbs.push(aa.data.img);
+			    		// _this.userInfo.thumbs.push(aa.data.image);
+			    		console.log(_this.artificer.thumbs, aa.data.img);
+			    	} else if(type == 3){
+			    		_this.artificer.casethumbs.push(aa.data.img);
+			    	}else{
+			    		_this.artificer.thumb = aa.data.img;
+			    	}
+			    }
+				return
+			}
+			wxApi.choseImage(res => {
+				// let length
+				_this.localIds = res.localIds;
+				_this.uploadlength = res.localIds.length;
+				_this.uplodephone(0, _this.localIds, type);
+			}, num);
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: num,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					// console.log(_this.userInfo.havestore, _this.page, '-------');
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let aa = await App._upLoad(res.tempFilePaths[i]);
+						if (type == 2) {
+							_this.artificer.thumbs.push(aa.data.img);
+							// _this.userInfo.thumbs.push(aa.data.image);
+							console.log(_this.artificer.thumbs, aa.data.img);
+						} else if(type == 3){
+							_this.artificer.casethumbs.push(aa.data.img);
+						}else{
+							_this.artificer.thumb = aa.data.img;
+						}
+					}
+				}
+			});
+			// #endif
+		},
+		addtagItem() {
+			if (!this.newTag) {
+				uni.showToast({
+					icon: 'none',
+					title: '新增标签不能为空'
+				});
+				return;
+			}
+			this.artificer.tagarray.push(this.newTag);
+			this.addshow = false;
+			this.newTag = '';
+		},
+		closeAdd() {
+			this.addshow = false;
+			this.newTag = '';
+		},
+		checkCity(id) {
+			let _this = this;
+			_this.areas.map((item, index) => {
+				if (item.id == id) {
+					item.checked = !item.checked;
+					if (item.checked) {
+						_this.artificer.region.push(item);
+					} else {
+						_this.artificer.region.map((items, indexs) => {
+							if (items.id == id) {
+								_this.artificer.region.splice(indexs, 1);
+							}
+						});
+					}
+				}
+			});
+			_this.loadlogo = !_this.loadlogo;
+			_this.loadlogo = !_this.loadlogo;
+		},
+		deletcheck(id) {
+			let _this = this;
+			_this.cate.map((item, index) => {
+				item.list.map((items, indexs) => {
+					if (items.id == id) {
+						items.checked = false;
+					}
+				});
+			});
+			_this.artificer.catearray.map((items, indexs) => {
+				if (items.id == id) {
+					_this.artificer.catearray.splice(indexs, 1);
+				}
+			});
+			_this.rightList.map((items, indexs) => {
+				if (items.id == id) {
+					items.checked = false;
+				}
+			});
+		},
+		checkRight(id) {
+			let _this = this;
+			_this.rightList.map((item, index) => {
+				// item.checked = false;
+				if (item.id == id) {
+					item.checked = !item.checked;
+
+					if (item.checked) {
+						_this.artificer.catearray.push(item);
+					} else {
+						_this.artificer.catearray.map((items, indexs) => {
+							if (items.id == item.id) {
+								_this.artificer.catearray.splice(indexs, 1);
+							}
+						});
+					}
+				}
+			});
+			_this.loadlogo = !_this.loadlogo;
+			_this.loadlogo = !_this.loadlogo;
+		},
+		checkLeft(id) {
+			let _this = this;
+			_this.cate.map((item, index) => {
+				item.checked = false;
+				if (item.id == id) {
+					item.checked = true;
+					_this.rightList = item.list;
+				}
+			});
+			_this.loadlogo = !_this.loadlogo;
+			_this.loadlogo = !_this.loadlogo;
+		},
+		getinitialize() {
+			let _this = this;
+			App._post_form(
+				`&p=housekeep&do=editArtificerPage`,
+				{ id: this.id },
+				res => {
+					console.log(res);
+					_this.areas = res.data.areas;
+					_this.artificer = res.data.artificer;
+					if (!_this.artificer.region) _this.artificer.region = [];
+					let region = [];
+					_this.areas.map((item, index) => {
+						item.checked = false;
+					});
+					_this.artificer.region.map((item,index)=>{
+						_this.areas.map((items,indexs)=>{
+							if(items.id == item){
+								items.checked = true;
+								region.push(items);
+							}
+						})
+					});
+					_this.artificer.region = region;
+					_this.cate = res.data.cate;
+					_this.meals = res.data.meals || null;
+					_this.items.map((item,index)=>{
+						if(item.value == _this.artificer.gender){
+							_this.current = index;
+						}
+					})
+					_this.cate.map((item, index) => {
+						item.checked = false;
+						item.list.map((items, indexs) => {
+							items.checked = false;
+							_this.artificer.catearray.map((itemis,index)=>{
+								if(items.id == itemis.id){
+									items.checked = true;
+								}
+							})
+						});
+					});
+					_this.loadlogo = true;
+				},fail=>{					
+					if(fail.data.message == '认证后才能入驻成为服务者'){						
+						App.navigationTo({							
+							url: `pages/subPages/attestationCenter/index?rzType=1&type=1`,
+							navType:'reLaunch',
+						});					
+						}					
+					console.log(fail)				
+				});
+		},
+		radioChange(e) {
+			console.log(e.target.value);
+			this.items.map((item, index) => {
+				if (item.value == e.target.value) {
+					this.current = index;
+				}
+			});
+		},
+		goLocation() {
+			let _this = this;
+			_this.upimg = true;
+			// #ifdef MP-WEIXIN
+			uni.chooseLocation({
+				keyword: '',
+				success: function(e) {
+					let bilis = {
+						detailed_address: e.address,
+						lat: e.latitude,
+						lng: e.longitude
+					};
+					_this.artificer.address = e.address;
+					_this.artificer.lat = e.latitude;
+					_this.artificer.lng = e.longitude;
+					_this.islocation = true;
+				}
+			});
+			// #endif
+			// #ifdef H5
+			_this.isOpenLaction = true;
+			// #endif
+			//#ifdef APP-PLUS
+			      App.navigationTo({
+			       url: 'pages/subPages2/map/index'
+			      });
+			      //#endif
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+.serviceIn {
+	padding-bottom: 100upx;
+	.from {
+		padding: 30upx 30upx 0;
+		.title {
+			font-size: 32upx;
+			font-weight: bold;
+			color: #333333;
+		}
+		.fromItem {
+			display: flex;
+			height: 110upx;
+			line-height: 110upx;
+			border-bottom: 1upx solid #eeeeee;
+			.fromName {
+				width: 172upx;
+				font-size: 28upx;
+				color: #333333;
+			}
+			.fromContent {
+				flex: 1;
+				.inputs {
+					font-size: 28upx;
+					height: 110upx;
+					line-height: 110upx;
+					width: 100%;
+					text-align: right;
+				}
+				.inputLeft {
+					font-size: 28upx;
+					height: 110upx;
+					line-height: 110upx;
+					width: 100%;
+					text-align: left;
+				}
+				.check-item {
+					padding: 0 10upx;
+					border-radius: 10upx;
+					background-color: #ff4444;
+					color: #ffffff;
+					height: 40upx;
+					line-height: 40upx;
+					text-align: center;
+					display: inline-block;
+					margin-right: 10upx;
+					margin-bottom: 10upx;
+					position: relative;
+					image {
+						width: 30upx;
+						height: 30upx;
+						margin-top: 5upx;
+						vertical-align: top;
+						margin-left: 10upx;
+					}
+				}
+			}
+			.textbox {
+				width: 116upx;
+				border-left: 1upx solid #eeeeee;
+				margin: 20upx 0;
+				line-height: 70upx;
+			}
+		}
+	}
+	.workingPhoto {
+		padding: 30upx;
+		.imgs {
+			padding: 30upx 0;
+			display: flex;
+			flex-wrap: wrap;
+			align-content: flex-center;
+			align-items: center;
+			justify-content: left;
+			.img-item {
+				height: 158upx;
+				border-radius: 20upx;
+				flex: auto;
+				margin: 10upx;
+				width: 158upx;
+				min-width: 158upx;
+				max-width: 158upx;
+				position: relative;
+				image {
+					width: 100%;
+					height: 100%;
+					border-radius: 20upx;
+				}
+				.imgclise {
+					width: 30upx;
+					height: 30upx;
+					position: absolute;
+					right: 10upx;
+					top: 10upx;
+				}
+			}
+		}
+	}
+	.line {
+		height: 20upx;
+		background-color: #f8f8f8;
+	}
+	.addTag {
+		padding: 30upx;
+		.tag {
+			padding: 30upx 0;
+			.tag-item {
+				padding: 0 70upx 0 30upx;
+				height: 50upx;
+				line-height: 50upx;
+				font-size: 24upx;
+				color: #333333;
+				border: 1upx solid #707070;
+				border-radius: 60upx;
+				display: inline-block;
+				position: relative;
+				margin-right: 30upx;
+				margin-bottom: 20upx;
+				.icong {
+					position: absolute;
+					right: 20upx;
+					top: -5upx;
+					font-weight: bold;
+				}
+			}
+			.addbtn {
+				font-size: 20upx;
+				width: 50upx;
+				background: linear-gradient(360deg, #6096fd 0%, #6ea6fd 100%);
+				height: 50upx;
+				line-height: 50upx;
+				border-radius: 50%;
+				text-align: center;
+				color: #ffffff;
+				display: inline-block;
+			}
+		}
+	}
+	.issue {
+		width: 750upx;
+		height: 90upx;
+		background: linear-gradient(360deg, #6094fd 0%, #70a8fd 100%);
+		line-height: 90upx;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		text-align: center;
+		font-size: 32upx;
+		color: #ffffff;
+		font-weight: bold;
+		border-radius: 30upx 30upx 0 0;
+	}
+	.addbox {
+		width: 630upx;
+		padding: 30upx;
+		background-color: #ffffff;
+		border-radius: 20upx;
+		box-sizing: border-box;
+		.addinput {
+			padding: 30upx;
+			border: 1upx solid #eeeeee;
+			border-radius: 20upx;
+			.input {
+				font-size: 28upx;
+			}
+		}
+		.btnbox {
+			.btnleft {
+				flex: 1;
+				margin: 30upx 30upx 0 0;
+				height: 60upx;
+				line-height: 60upx;
+				text-align: center;
+				border-radius: 60upx;
+				background-color: #ffffff;
+				border: 1upx solid #eeeeee;
+				color: #333333;
+			}
+			.btnright {
+				flex: 1;
+				margin: 30upx 0upx 0 30upx;
+				background-color: #ff4444;
+				height: 60upx;
+				line-height: 60upx;
+				text-align: center;
+				border-radius: 60upx;
+				color: #ffffff;
+			}
+		}
+	}
+	.cicupation {
+		width: 750upx;
+		height: 550upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		border-radius: 30upx 30upx 0 0;
+		display: flex;
+		.cicupation-left {
+			padding-right: 10upx;
+			height: 450upx;
+			flex: 1;
+			overflow: auto;
+			.left-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				color: #ffffff;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				font-weight: bold;
+			}
+			.left-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+		.cicupation-right {
+			flex: 1;
+			padding-left: 10upx;
+			height: 450upx;
+			overflow: auto;
+			.right-item {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #ff4444;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+				color: #ffffff;
+			}
+			.right-nocheck {
+				line-height: 60upx;
+				font-size: 26upx;
+				text-align: center;
+				background-color: #f8f8f8;
+				border-bottom: 1upx solid #eeeeee;
+				border-radius: 15upx;
+				margin-bottom: 20upx;
+			}
+		}
+	}
+	.district {
+		width: 750upx;
+		height: 550upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		border-radius: 30upx 30upx 0 0;
+		background-color: #ffffff;
+		.district-item {
+			height: 50upx;
+			line-height: 50upx;
+			padding: 0 20upx;
+			margin-right: 10upx;
+			margin-bottom: 10upx;
+			text-align: center;
+			font-size: 28upx;
+			color: #ffffff;
+			border-radius: 10upx;
+			background-color: #ff4444;
+			display: inline-block;
+		}
+		.district-nocheck {
+			height: 50upx;
+			line-height: 50upx;
+			padding: 0 20upx;
+			margin-right: 10upx;
+			margin-bottom: 10upx;
+			text-align: center;
+			font-size: 28upx;
+			color: #333333;
+			border-radius: 10upx;
+			background-color: #f8f8f8;
+			// border: 1upx solid #EEEEEE;
+			display: inline-block;
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/lottery/lotteryCode/lotteryCode.vue b/pages/subPages2/lottery/lotteryCode/lotteryCode.vue
new file mode 100644
index 0000000..3d6542f
--- /dev/null
+++ b/pages/subPages2/lottery/lotteryCode/lotteryCode.vue
@@ -0,0 +1,332 @@
+<template>
+	<view class="lotteryCode">
+		<view class="vtbs">
+			<v-tabs
+				:lineScale="0.3" 
+				:lineRadius="'4px 4px 0px 0px'" 
+				:lineHeight="'6rpx'"
+				:height="'100rpx'"
+				:fontSize="'30rpx'" 
+				:paddingItem="'40rpx 22rpx 40rpx'" 
+				:activeColor="'#ff4444'" 
+				:activeFontSize="'30rpx'"
+				:lineColor="'#ff4444'"
+				v-model="sort" 
+				@change="changeTab"
+				:scroll="false"
+				:bold="false"
+				:tabs="['全部','未开奖','已中奖','未中奖']"></v-tabs>
+		</view>
+		<view class="listBox" v-if="codeList && codeList.length > 0">
+			<view class="codeItem" v-for="(item,index) in codeList" :key="index" @click="drawIndex(item)">
+				<view class="codeDetail">
+					<view class="f-32 f-w">
+						<view class="codename">
+						{{item.drawname}}
+						</view>
+						
+						<view class="codenum"
+						:style="{background: 'url('+ imgfixUrls + 'lotteryImg/jinkuang.png)',backgroundSize: '100% 100%',backgroundRepeat: 'no-repeat'}">
+							{{item.codenum}}
+						</view>
+					</view>
+					<view class="t-r flex-box">
+						<view class="codeState">
+							<view class="stateText" v-if="item.status == 0">
+								未开奖
+							</view>
+							<view class="stateText" style="color: #999999;" v-else-if="item.status == 1">
+								未中奖
+							</view>
+							<view  v-else-if="item.status == 2">
+								<image :src="imgfixUrls + 'lotteryImg/yone.png'" mode=""></image>
+							</view>
+							<view  v-else-if="item.status == 3">
+								<image :src="imgfixUrls + 'lotteryImg/ytwo.png'" mode=""></image>
+							</view>
+							<view  v-else>
+								<image :src="imgfixUrls + 'lotteryImg/ythree.png'" mode=""></image>
+							</view>
+							
+						</view>
+						<view class="buyingBtn">
+							{{item.title}}
+						</view>
+					</view>
+				</view>
+				<view class="receiveAward" v-if="item.status != 1 && item.status != 0">
+					<image :src="item.goodlogo" mode=""></image>
+					<view class="prize">
+						{{item.goodname}}
+					</view>
+					<view class="getBtn" v-if="item.is_get == 0" @click.stop="getBoom(index,item.id)">
+						领取奖品
+					</view>
+					<view class="onGetBtn" v-else>
+						已领奖
+					</view>
+				</view>
+			</view>
+			<load-more :isMore="loadingMore"></load-more>
+		</view>
+		<view  v-else>			
+		<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		
+		</view>
+		<TabBars :tabBarAct="0" />
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js";
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	//#endif
+	import vTabs from '@/components/v-tabs/v-tabs.vue';
+	import TabBars from '@/components/template/tabBar';
+	import loadMore from '@/components/template/loadmore.vue';
+	export default{
+		components:{
+			vTabs,
+			loadMore,
+			TabBars
+		},
+		data(){
+			return{
+				sort:0,
+				page:1,
+				codeList:[],
+				pagetotal:1,
+				loadingMore:true,
+				pluginList:[
+					{
+						type:'rush',
+						title:'抢购'
+					},
+					{
+						type:'groupon',
+						title:'团购'
+					},
+					{
+						type:'fightgroup',
+						title:'拼团'
+					},
+					{
+						type:'coupon',
+						title:'卡券'
+					},
+					{
+						type:'bargain',
+						title:'砍价'
+					},
+					{
+						type:'activity',
+						title:'活动'
+					},
+					{
+						type:'payonline',
+						title:'买单'
+					},
+					{
+						type:'citydelivery',
+						title:'配送'
+					},
+					{
+						type:'drawvideo',
+						title:'视频'
+					},
+					{
+						type:'drawshare',
+						title:'分享'
+					},
+					{
+						type:'wlfightgroup',
+						title:'拼团'
+					}
+				]
+			}
+		},
+		onLoad(e) {
+			if(e.type){
+				this.sort = e.type;
+			}
+			this.getCodeList();
+		},
+		methods:{
+			drawIndex(item){
+				App.navigationTo({					url: `pages/subPages2/lottery/lotteryIndex/lotteryIndex?recordid=${item.recordid}&id=${item.drawid}`				});
+			},
+			changeTab(e){
+				this.sort = e;
+				this.page = 1;
+				this.getCodeList();
+			},
+			getBoom(i,id){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=getDrawGoods', {
+					id:id
+				}, res => {
+					if(JSON.stringify(res.data) == '[]'){
+						uni.showToast({
+							icon:'success',
+							title:'领取成功'
+						})
+						_this.codeList[i].is_get = '1';
+					}else{
+						let buy_barginData = {
+								goods_id: res.data.goodsid,
+								plugin: res.data.plugin,
+								luckydrawid:id,
+								goods_num: 1
+							};
+						App.navigationTo({
+							url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode(buy_barginData)
+						});
+					}
+					
+				}, false, () => {
+					// _this.loadlogo = false;
+				})
+			},
+			getCodeList(flag){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=getCodeList', {
+					status:_this.sort,
+					page:this.page
+				}, res => {
+					if(flag){
+						this.codeList = this.codeList.concat(res.data.list);
+						this.loadingMore = true;
+					}else{
+						this.codeList = res.data.list;
+						this.pagetotal = res.data.pagetotal;
+					}
+					_this.codeList.map((item,index)=>{
+						_this.pluginList.map((items,indess)=>{
+							if(item.plugin == items.type){
+								item.title = items.title;
+							}
+						})
+					})
+				}, false, () => {
+					// _this.loadlogo = false;
+				})
+			},
+		},
+		onReachBottom() {
+			if(this.page == this.pagetotal) return
+			this.loadingMore = false;
+			this.page++;
+			this.getCodeList(true);
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.lotteryCode{
+		padding-bottom: 120upx;
+		.vtbs{
+			background-color: #ffffff;
+		}
+		.listBox{
+			margin: 30upx;
+			.codeItem{
+				padding: 20upx;
+				border-radius: 20upx;
+				margin-bottom: 20upx;
+				background-color: #ffffff;
+				.codeDetail{
+					display: flex;
+					.codenum{
+						width: 136upx;
+						height: 56upx;
+						font-size: 24upx;
+						line-height: 56upx;
+						text-align: center;
+						color: #AB815D;
+						margin-top: 30upx;
+						background-size: 100% 100%;
+						background-repeat: no-repeat;
+					}
+					.codename{
+						width: 480upx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+					.codeState{
+						font-size: 28upx;
+						color: #ff4444;
+						image{
+							width: 80upx;
+							height: 80upx;
+							border-radius: 50%;
+						}
+						.stateText{
+							margin-bottom: 40upx;
+						}
+					}
+					.buyingBtn{
+						width: 70upx;
+						height: 34upx;
+						line-height: 34upx;
+						background-color: #eeeeee;
+						text-align: center;
+						color: #999999;
+						font-size: 20upx;
+						border-radius: 10upx;
+						float: right;
+						margin-top: 15upx;
+					}
+				}
+				.receiveAward{
+					margin-top: 20upx;
+					border-top: 1upx solid #eeeeee;
+					padding-top: 20upx;
+					display: flex;
+					image{
+						width: 60upx;
+						height: 60upx;
+						margin-right: 20upx;
+					}
+					.prize{
+						flex: 1;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+						font-size: 28upx;
+						line-height: 56upx;
+					}
+					.getBtn{
+						width: 120upx;
+						height: 50upx;
+						line-height: 50upx;
+						background-color: #ff4444;
+						color: #ffffff;
+						text-align: center;
+						font-size: 24upx;
+						border-radius: 10upx;
+					}
+					.onGetBtn{
+						width: 120upx;
+						height: 50upx;
+						line-height: 50upx;
+						background-color: #eeeeee;
+						color: #999999;
+						text-align: center;
+						font-size: 24upx;
+						border-radius: 10upx;
+					}
+				}
+			}
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #f8f8f8;
+	}
+</style>
diff --git a/pages/subPages2/lottery/lotteryIndex/lotteryIndex.vue b/pages/subPages2/lottery/lotteryIndex/lotteryIndex.vue
new file mode 100644
index 0000000..3ccb974
--- /dev/null
+++ b/pages/subPages2/lottery/lotteryIndex/lotteryIndex.vue
@@ -0,0 +1,1231 @@
+<template>
+	<view class="lotteryIndex">
+		<loadlogo v-if="loadlogo"></loadlogo>
+		<view class="title" :style="{ width: imgstyle.width + 'px', height: (!!lotteryInfo.adv && lotteryInfo.adv.length > 0)?imgstyle.height + 'px':'35px' }" >
+			<swiper class="swiper" v-if="!!lotteryInfo.adv && lotteryInfo.adv.length > 0"  indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+				<swiper-item v-for="(item, index) in lotteryInfo.adv" :key="index" @click="goLink(item.link)">
+					<image :src="item.thumb" style="width: 100%; height: 100%;" mode="scaleToFill"></image>
+				</swiper-item>
+			</swiper>
+			<view class="countDown" v-if="lotteryInfo.supstatus == 0&& !!time.timeobj">
+				<view class="tag"></view>
+				<view class="tagText">距离开奖</view>
+				<view class="numberBox">{{time.timeobj.day1}}</view>
+				<view class="numberBox">{{time.timeobj.day2}}</view>
+				<view class="day">天</view>
+				<view class="numberBox">{{time.timeobj.hous1}}</view>
+				<view class="numberBox">{{time.timeobj.hous2}}</view>
+				<view class="douhao">:</view>
+				<view class="numberBox">{{time.timeobj.min1}}</view>
+				<view class="numberBox">{{time.timeobj.min2}}</view>
+				<view class="douhao">:</view>
+				<view class="numberBox">{{time.timeobj.sin1}}</view>
+				<view class="numberBox" style="margin: 0;">{{time.timeobj.sin2}}</view>
+			</view>
+			<view class="countDown" v-else>
+				<view class="tag" style="background-color: #398CFF;"></view>
+				<view class="tagText">剩余人数</view>
+				<view class="day f-w">还差</view>
+				<view class="bnumberBox" v-for="(item,index) in time.timeobj" :key="index">{{item}}</view>
+				<view class="day f-w">人次开奖，敬请期待！</view>
+			</view>
+		</view>
+		<view class="barrage" :class="{tipsShow:tipsShow}" v-if="lotteryInfo.luckylist.length > 0 && barrageIndex == index" v-for="(item,index) in lotteryInfo.luckylist" :key="index">
+			<image :src="item.avatar" mode=""></image>
+			<view class="barrageText">
+				<text style="padding-right: 10upx;">{{item.nickname}}</text>
+				<text style="padding-right: 10upx;">抽中</text>
+				<text>{{item.goodsname}}</text>
+			</view>
+		</view>
+		<view class="content">
+			<view class="award">
+				<view class="commodityList">
+					<view class="commodityItem" v-for="(item,index) in lotteryInfo.prize" :key="index">
+						<image class="grade" :src="imgfixUrls + 'lotteryImg/fone.png'" mode="" v-if="index == 0"></image>
+						<image class="grade" :src="imgfixUrls + 'lotteryImg/ftwo.png'" mode="" v-if="index == 1"></image>
+						<image class="grade" :src="imgfixUrls + 'lotteryImg/fthree.png'" mode="" v-if="index == 2"></image>
+						<image :src="item.image" mode=""></image>
+						<view class="commodityName">
+							{{item.title}}
+						</view>
+						<view class="awardNum">
+							{{item.number}}份奖品
+						</view>
+					</view>
+				</view>
+				<view class="publicityText">
+					{{lotteryInfo.tips}}
+				</view>
+				<view class="participationNumber">
+					<view class="imgbox">
+						<image class="clientTitle" :src="item.avatar" mode="" v-for="(item,index) in lotteryInfo.headlist" :key="index"></image>
+					</view>
+					<view class="numberText">
+						{{lotteryInfo.joinnum}}人次正在参与
+					</view>
+				</view>
+			</view>
+			<view class="winner" v-if="!!codes && codes.length > 0">
+				<view class="switchover">
+					<v-tabs
+						:lineScale="0.3" 
+						:lineRadius="'4px 4px 0px 0px'" 
+						:lineHeight="'6rpx'"
+						:height="'100rpx'"
+						:fontSize="'30rpx'"
+						:activeFontSize="'30rpx'"
+						:paddingItem="'40rpx 22rpx 40rpx'" 
+						:activeColor="'#ff4444'" 
+						:lineColor="'#ff4444'"
+						v-model="sort" 
+						@change="changeTab"
+						:scroll="false"
+						:bold="false"
+						:tabs="tabsList"></v-tabs>
+				</view>
+				<view class="winnerText">
+					中奖者名单({{codesMumber}}人)
+				</view>
+				<view class="winnerList">
+					<view class="winnerItem"  v-for="(item,index) in codes" :key="index">
+						<view class="winnerImg">
+							<image :src="item.avatar" mode=""></image>
+							<view class="ibox" v-if="item.own == 1">
+								我
+							</view>
+						</view>
+						<view class="winnerName">
+							{{item.nickname}}
+						</view>
+						<view class="winnerCode">
+							{{item.codenum}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="LotteryYards" v-if="!!lotteryInfo.mycode && lotteryInfo.mycode.length > 0">
+				<view>
+					<text class="col-3 f-32 f-w">我的抽奖码</text>
+					<text class="col-f4 f-24">({{!!lotteryInfo.mycode && lotteryInfo.mycode.length > 0?lotteryInfo.mycode.length:0}}张)</text>
+				</view>
+				<view class="LotteryYardsList">
+					<view class="yardsItem" 
+					:style="{background:'url('+ imgfixUrls + 'lotteryImg/jinkuang.png)',backgroundSize: '100% 100%',backgroundRepeat: 'no-repeat'}" 
+					v-for="(item,index) in lotteryInfo.mycode" :key="index" v-if="index < 8">
+						{{item.codenum}}
+					</view>
+					<view class="yardsItem textmroe" @click="goCodeList" v-if="lotteryInfo.mycode.length > 9"
+					:style="{background:'url('+ imgfixUrls + 'lotteryImg/yinkang.png)',backgroundSize: '100% 100%',backgroundRepeat: 'no-repeat'}">
+						查看更多
+					</view>
+				</view>
+			</view>
+			<view class="merchandiseList" v-if="!!lotteryInfo.buygoodslist && lotteryInfo.buygoodslist.length > 0">
+				<view class="f-32 f-w col-3 m-btm30">
+					购买商品获得抽奖码
+				</view>
+				<view  v-for="(item,index) in lotteryInfo.buygoodslist" :key="index">
+					<draw-commodity :goodItem="item"></draw-commodity>
+				</view>
+				<view class="f-24 col-9 t-c" @click="goshoping">
+					<text>查看更多</text>
+					<text style="font-size: 24upx;" class="iconfont icon-unfold"></text>
+				</view>
+			</view>
+			<view class="richText">
+				<view class="f-32 f-w col-3 m-btm30">
+					抽奖说明
+				</view>
+				<view v-if="lotteryInfo.detail">
+					<jyf-parser  domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article"
+					 selectable showWithAnimation show-with-animation use-anchor :html="lotteryInfo.detail"></jyf-parser>
+				</view>
+			</view>
+		</view>
+		<view class="more" >
+			<view class="dis-flex flex-box">
+				<view class="flex-box t-c" @click="goIndex">
+					<image :src="imgfixUrls + 'lotteryImg/home.png'" mode=""></image>
+					<view class="f-20 col-3">
+						首页
+					</view>
+				</view>
+				<view class="flex-box t-c" @click="goCodeList">
+					<image :src="imgfixUrls + 'lotteryImg/LotteryYards.png'" mode=""></image>
+					<view class="f-20 col-3">
+						抽奖码
+					</view>
+				</view>
+				<view class="flex-box t-c" @click="goPrevious">
+					<image :src="imgfixUrls + 'lotteryImg/previous.png'" mode=""></image>
+					<view class="f-20 col-3">
+						往期
+					</view>
+				</view>
+			</view>
+			<view class="moreBtn" @click="openshow" v-if="lotteryInfo.status == 0">
+				获取更多抽奖码
+			</view>
+			<view class="nomoreBtn" @click="openshow" v-else>
+				{{lotteryInfo.status == 1?'活动即将抽奖,敬请期待':'抽奖已结束,请关注其他活动'}}
+			</view>
+		</view>
+		<!-- //弹窗 -->
+		<PopManager :show="showRule" type="bottom" @clickmask="showRule = false">
+			<view class="popShareBox">
+				<view class="classShare">
+					<view class="classItem" @click="goshoping" v-if="!!lotteryInfo.buygoodslist && lotteryInfo.buygoodslist.length > 0">
+						<image :src="imgfixUrls + 'lotteryImg/shoping.png'" mode=""></image>
+						<view class="className">
+							购买商品
+						</view>
+					</view>
+					<!-- #ifdef MP-WEIXIN -->
+					<view class="classItem" v-if="lotteryInfo.drawvideostatus == 1" @click="videoDarw">
+						<image :src="imgfixUrls + 'lotteryImg/lookvideo.png'" mode=""></image>
+						<view class="className">
+							视频广告
+						</view>
+					</view>
+					<view class="classItem" v-if="lotteryInfo.drawsharestatus == 1 && lotteryInfo.nomobile == 1" @click="openShare">
+						<image :src="imgfixUrls + 'lotteryImg/shareDraw.png'" mode=""></image>
+						<view class="className">
+							好友分享
+						</view>
+					</view>
+					<button open-type="share" class="classItem" v-else-if="lotteryInfo.drawsharestatus == 1 && lotteryInfo.nomobile != 1">
+						<image :src="imgfixUrls + 'lotteryImg/shareDraw.png'" mode=""></image>
+						<view class="className">
+							好友分享
+						</view>
+					</button>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view class="classItem" v-if="lotteryInfo.drawsharestatus == 1" @click="openShare">
+						<image :src="imgfixUrls + 'lotteryImg/shareDraw.png'" mode=""></image>
+						<view class="className">
+							好友分享
+						</view>
+					</view>
+					<!-- #endif -->
+					
+				</view>
+				<view class="close" @click="showRule = false">
+					关闭
+				</view>
+			</view>
+		</PopManager>
+		<!-- #ifdef H5 -->
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+		<!-- #endif -->
+		<!-- 获奖样式 -->
+		<PopManager :show="winner" :type="'center'" :overlay="'false'" :showOverlay="'false'" @clickmask="winner = false">
+			<view class="zjbj" :style="{background: 'url('+ (imgfixUrls + '/kjbj2.png') +')',backgroundSize: '100% 100%'}">
+				<!-- <image style="width: 70vw;height: 80vh;" :src="imgfixUrls + '/kjbj.png'" mode=""></image> -->
+				<text class="iconfont icon-close dis-il-block t-c f-w closeBtn" @click="winner = false"></text>
+				<!-- <view class="contenttitle t-c">
+					<view class="text" v-if="endid !== '0' && endid !== 0">
+						中奖啦
+					</view>
+					<view class="text" v-else>
+						谢谢惠顾
+					</view>
+				</view> -->
+				<view class="zjbox" style="margin: auto;" v-if="winner">
+					<view class="f-w f-48 t-c" style="color: #FB2F24;padding-bottom: 36upx;">
+						{{lotteryInfo.mycodestatus == 2?'一等奖':lotteryInfo.mycodestatus == 3?'二等奖':'三等奖'}}
+					</view>
+					<view >
+						<image style="border-radius: 50%;height: 240upx;width: 240upx;margin-left: 20vw;border: 2upx solid #FFC853;" :src="lotteryInfo.mygoodslogo"
+						 mode=""></image>
+					</view>
+					<view  style="padding:20upx 0 50upx;">
+						<!-- <view class="col-f f-38" style="text-align: center;">
+							{{}}
+						</view> -->
+		
+						<view class="col-f f-40 " style="text-align: center;margin-bottom: 10upx;">
+							<text style="color: #E5492C;">{{'恭喜你获得了'}}</text>
+						</view>
+						<view class="col-f f-50 t-c" style="text-align: center;">
+							<text style="color: #FF2D26;">{{lotteryInfo.mygoodstitle}}</text>
+						</view>
+					</view>
+					<view class="dis-flex">
+						<view  style="flex: 0.45;position: relative;height: 90upx;">
+							<!-- <view class="t-c f-34" style="background-color: #EB9B2F;color: #FFFFFF;padding: 15upx 30upx;border-radius: 10upx;margin-top: 30upx;"
+							 >
+								查看奖品
+							</view> -->
+							<image style="width: 250upx;height: 90upx;" :src="imgfixUrls + '/hsbtn.png'" mode=""></image>
+							<view @click="myprize" class="f-32 t-c" style="position: absolute;left: 0;top: 0;height: 90upx;line-height: 80upx;width: 250upx;color: #FF3D25;">
+								查看奖品
+							</view>
+						</view>
+						<view  style="flex: 0.1;width: 30upx;">
+		
+						</view>
+						<view class="f-34" style="flex: 0.45;position: relative;height: 90upx;">
+							<!-- <view class="t-c" style="background-color: #EB9B2F;color: #FFFFFF;padding: 15upx 30upx;border-radius: 10upx;margin-top: 30upx;"
+							 @click="close(1)">
+								继续抽奖
+							</view> -->
+							<image style="width: 250upx;height: 90upx;" :src="imgfixUrls + '/cjredbtn.png'" mode=""></image>
+							<view @click="getMyPrize(lotteryInfo.mycodeid)" class="f-32 t-c" style="position: absolute;left: 0;top: 0;height: 90upx;line-height: 80upx;width: 250upx;color: #FFFFFF;">
+								领取奖品
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		
+		</PopManager>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import drawCommodity from '@/components/template/drawCommodity.vue';
+	import loadlogo from '@/components/template/loadlogo';
+	import follow from '@/components/template/follow.vue';
+	import PopManager from '@/components/template/PopManager';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	import PhoneMask from '@/components/template/PhoneMask';
+	import getvxphone from '@/components/template/getVXphone.vue';
+	import vTabs from '@/components/v-tabs/v-tabs.vue'
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	//#endif
+	export default{
+		data(){
+			return{
+				imgstyle:{},
+				swiperList:[1,2,3],
+				text:'',
+				sort:0,
+				popShow: false,
+				vxshow:false,
+				showRule:false,
+				loadlogo:true,
+				lotteryInfo:{},
+				time:{},
+				barrageIndex:0,
+				barr:null,
+				timeout:null,
+				tipsShow:false,
+				videoAd:null,
+				codes:[],
+				codesMumber:0,
+				shareShow:false,
+				winner:false,
+				pluginList:[
+					{
+						type:'rush',
+						title:'抢购'
+					},
+					{
+						type:'groupon',
+						title:'团购'
+					},
+					{
+						type:'fightgroup',
+						title:'拼团'
+					},
+					{
+						type:'coupon',
+						title:'卡券'
+					},
+					{
+						type:'bargain',
+						title:'砍价'
+					},
+					{
+						type:'activity',
+						title:'活动'
+					},
+					{
+						type:'payonline',
+						title:'买单'
+					},
+					{
+						type:'citydelivery',
+						title:'配送'
+					},
+					{
+						type:'drawvideo',
+						title:'视频'
+					},
+					{
+						type:'drawshare',
+						title:'分享'
+					},
+					{
+						type:'store',
+						title:'商户'
+					},
+					{
+						type:'wlfightgroup',
+						title:'拼团'
+					}
+				],
+				recordid:'',
+				pageId:'',
+				userInfo:{},
+				tabsList:['一等奖','二等奖','三等奖'],
+				lat:'',
+				lng:''
+			}
+		},
+		components:{
+			drawCommodity,
+			loadlogo,
+			follow,
+			PopManager,
+			jyfParser,
+			PhoneMask,
+			getvxphone,
+			vTabs
+		},
+		onLoad(e) {
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			this.userInfo = uni.getStorageSync('userinfo');
+			this.recordid = e.recordid || '';
+			this.pageId = e.id || '';
+			this.head_id = e.head_id || '';
+			let myLocation = uni.getStorageSync('curLoction');
+			this.lng = myLocation.longitude || '';
+			this.lat = myLocation.latitude || '';
+			
+			// if(e.head_id){
+				
+			// }
+			
+		},
+		onShow() {
+			this.getLotteryInfo();
+		},
+		methods:{
+			openshow(){
+				let _this = this;
+				let token = uni.getStorageSync('weliam_user_token');
+				if (token) {
+					_this.showRule = true;
+				}else{
+					//#ifdef H5
+					// _this.popShow = true;
+						// App.doLogin();
+					//#endif
+					//#ifndef H5
+					App.doLogin();
+					App.loginstate = true;
+					//#endif
+					return
+				}
+			},
+			getMyPrize(id){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=getDrawGoods', {
+					id:id
+				}, res => {
+					if(JSON.stringify(res.data) == '[]'){
+						uni.showToast({
+							icon:'success',
+							title:'领取成功'
+						})
+						_this.winner = false;
+					}else{
+						let buy_barginData = {
+								goods_id: res.data.goodsid,
+								plugin: res.data.plugin,
+								luckydrawid:id,
+								goods_num: 1
+							};
+						App.navigationTo({
+							url: 'pages/subPages/submitOrder/submitOrder?' + App.urlEncode(buy_barginData)
+						});
+					}
+					
+				}, false, () => {
+					// _this.loadlogo = false;
+				})
+			},
+			myprize(){
+				App.navigationTo({
+					url:'pages/subPages2/lottery/lotteryCode/lotteryCode?type=2'
+				})
+			},
+			showFalse(flag){
+				console.log('进了showfalse')
+				this.vxshow = false;
+				if(flag){
+					_this.lotteryInfo.nomobile = 0;
+				}
+			},
+			closePop(flag) {
+				let _this = this
+				_this.popShow = false;
+				if(flag){
+					_this.lotteryInfo.nomobile = 0;
+				}
+			},
+			goIndex(){
+				uni.reLaunch({
+				    url: '/pages/mainPages/index/index'
+				});
+			},
+			goCodeList(){
+				App.navigationTo({
+					url:'pages/subPages2/lottery/lotteryCode/lotteryCode'
+				})
+			},
+			goPrevious(){
+				App.navigationTo({
+					url:'pages/subPages2/lottery/previous/previous?id=' + this.pageId
+				})
+			},
+			openShare(){
+				let _this = this;
+				if (_this.lotteryInfo.nomobile == 1) {
+					//#ifdef H5
+					_this.popShow = true;
+					//#endif
+					//#ifndef H5
+					_this.vxshow = true;
+					//#endif
+					return
+				}
+				this.shareShow = true;
+			},
+			goshoping(){
+				let _this = this;
+				App.navigationTo({
+					url:'pages/subPages2/lottery/lotteryList/lotteryList?id=' + _this.pageId
+				})
+			},
+			videoDarw(){
+				let _this = this;
+				if (_this.lotteryInfo.nomobile == 1) {
+					//#ifdef H5
+					_this.popShow = true;
+					//#endif
+					//#ifndef H5
+					_this.vxshow = true;
+					//#endif
+					return
+				}
+				this.videoAd.show();
+			},
+			//看视频获取分享次数
+			getVideoNum(){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=getVideoCode', {
+					id:_this.pageId,
+					recordid:_this.lotteryInfo.recordid
+				}, res => {
+					uni.showToast({
+						title:'抽奖码领取成功'
+					})
+					this.getLotteryInfo(true);
+				}, false, () => {
+					_this.loadlogo = false;
+				})
+			},
+			//分享获取抽奖次数
+			getDrawNum(sharemid,recordid){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=getShareCode', {
+					sharemid:sharemid,
+					recordid:_this.lotteryInfo.recordid
+				}, res => {
+					_this.head_id = '';
+					this.getLotteryInfo(true);
+				}, false, () => {
+					// _this.loadlogo = false;
+				})
+			},
+			getShareInfo() {
+				//#ifdef H5
+				let	url = location.href,
+					head_id = uni.getStorageSync('userinfo').mid;
+					url = url.split('/#/')[1] + '&sharemid=' + head_id + '&recordid=' + this.lotteryInfo.recordid;
+				//#endif
+				//#ifdef MP-WEIXIN
+				//#endif
+				let _this = this,
+					data = {
+						pageinfo: url
+					};
+				App._post_form('&do=Shareinfo', data, res => {
+					this.shareinfo = res.data;
+					//#ifdef H5
+					wxApi.wxRegister(() => {
+						wxApi.wxShare({
+							title: this.shareinfo.title || '',
+							desc: this.shareinfo.desc || '',
+							link: this.shareinfo.mpurl || '',
+							imgUrl: this.shareinfo.img || '',
+							success: function() {
+							},
+							trigger: function(res) {
+								// _this.isshare();
+							},
+							cancel: function() {}
+						});
+					});
+					//#endif
+				})
+			},
+			getLotteryInfo(flag = false){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=drawPageInfo', {
+					id:_this.pageId,
+					recordid:_this.recordid,
+					lat:_this.lat,
+					lng:_this.lng
+				}, res => {
+					_this.lotteryInfo = res.data;
+					if(_this.head_id){
+						_this.getDrawNum(_this.head_id);
+						// return
+					}
+					_this.lotteryInfo.buygoodslist.map(item=>{
+						_this.pluginList.map(it=>{
+							if(item.plugin == it.type){
+								item.pluginName = it.title;
+							}
+						})
+					})
+					if(res.data.onecodenum){
+						_this.codesMumber = _this.lotteryInfo.onecodenum;
+						_this.codes = _this.lotteryInfo.onecodes;
+					};
+					if(_this.lotteryInfo.mycodeid > 0 && !flag){
+						_this.winner = true;
+					}
+					_this.tabsList = !res.data.twocodenum && !res.data.thrcodenum?['一等奖']:res.data.twocodenum && !res.data.thrcodenum?['一等奖','二等奖']:!res.data.twocodenum && res.data.thrcodenum?['一等奖','三等奖']:['一等奖','二等奖','三等奖']
+					// #ifdef MP-WEIXIN
+					// 在页面中定义激励视频广告
+					// 在页面onLoad回调事件中创建激励视频广告实例
+					if (wx.createRewardedVideoAd && !_this.videoAd) {
+					  _this.videoAd = wx.createRewardedVideoAd({
+					    adUnitId: _this.lotteryInfo.videoid
+					  })
+					  _this.videoAd.onLoad(() => {})
+					  _this.videoAd.onError((err) => {
+						  
+					  })
+					  _this.videoAd.onClose((res) => {
+						  if (res && res.isEnded) {
+						        // 正常播放结束，可以下发游戏奖励
+								_this.getVideoNum()
+						      } else {
+						        // 播放中途退出，不下发游戏奖励
+						      }
+					  })
+					}
+					// #endif
+					// clearInterval(_this.barr)
+					clearInterval(_this.barrb)
+					_this.barrb = setInterval(()=>{
+						_this.tipsShow = true;
+						setTimeout(()=>{
+							_this.tipsShow = false;
+							if(_this.barrageIndex == _this.lotteryInfo.luckylist.length - 1){
+								_this.barrageIndex = 0;
+							}else{
+								_this.barrageIndex++;
+							}
+						},3000)
+					},5000)
+					//#ifdef H5
+					// _this.getShareInfo()
+					//#endif
+					if(_this.lotteryInfo.supstatus == 1){
+						// _this.$set(_this.time, 'timeobj', timeobj)
+						let timeobj = [];
+						_this.lotteryInfo.supnum = _this.lotteryInfo.supnum + '';
+						let length = _this.lotteryInfo.supnum.length;
+						for(let i = 0;i<length;i++){
+							timeobj[i] = _this.lotteryInfo.supnum[i];
+						}
+						_this.$set(_this.time, 'timeobj', timeobj)
+					}else{
+					clearInterval(_this.timeout)
+					_this.timeout = setInterval(function() {
+						if(_this.lotteryInfo.supnum > 0){
+							_this.lotteryInfo.supnum = _this.lotteryInfo.supnum - 1;
+						}else{
+							_this.getTimeData(_this.lotteryInfo.supnum);
+							return
+						}
+						_this.getTimeData(_this.lotteryInfo.supnum);
+							// if (timer_num == 0) {
+							// 	clearInterval(timeClock);
+							// }
+						}, 1000);
+					}
+					
+				}, false, () => {
+					_this.loadlogo = false;
+				})
+			},
+			// 时间戳转时间
+			getTimeData(dataValue) {
+				let _this = this;
+				// debugger
+				 var date = new Date(Number(dataValue)) //时间戳为10位需*1000，时间戳为13位的话不需乘1000
+				        // var Y = date.getFullYear() + '-'
+				        // var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'
+				        // let day = date.getDate()  + ''
+				        // let hous = date.getHours() + ''
+				        // let min = date.getMinutes() + ''
+				        // let sin = date.getSeconds() + ''
+						let day = parseInt(dataValue / (60 * 60 * 24)) + '';
+						let hous = parseInt((dataValue % (60 * 60 * 24)) / (60 * 60)) + '';
+						let min = parseInt((dataValue % (60 * 60)) / (60)) + '';
+						let sin = parseInt((dataValue % (60))) + '';
+						day =  day.length == 1?'0' + day:day;
+						hous = hous.length == 1?'0' + hous:hous;
+						min =  min.length == 1?'0' + min:min;
+						sin =  sin.length == 1?'0' + sin:sin;
+						let timeobj = {};
+						timeobj.day1 =  day[0] < 0?0:day[0]
+						timeobj.day2 =  day[1] < 0?0:day[1]
+						timeobj.hous1 = hous[0] < 0?0:hous[0]
+						timeobj.hous2 = hous[1] < 0?0:hous[1]
+						timeobj.min1 = min[0] < 0?0:min[0]
+						timeobj.min2 = min[1] < 0?0:min[1]
+						timeobj.sin1 = sin[0] < 0?0:sin[0]
+						timeobj.sin2 =  sin[1] < 0?0:sin[1]
+						_this.$set(_this.time, 'timeobj', timeobj)
+						// console.log(_this.time)
+						// debugger
+				        // return Y+M+D+h+m+s
+				        // console.log(timestampToTime (1533293827000))
+				// return {
+				// 	label: Y + M + D + h + m
+				// };
+			},
+			goLink(url) {
+				App.navigationTo({
+					url: url
+				});
+			},
+			changeTab(e){
+				if(e==0){
+					this.codes = this.lotteryInfo.onecodes;
+					this.codesMumber = this.lotteryInfo.onecodenum;
+				}else if(e==1){
+					this.codes = this.lotteryInfo.twocodes;
+					this.codesMumber = this.lotteryInfo.twocodenum;
+				}else{
+					this.codes = this.lotteryInfo.thrcodes;
+					this.codesMumber = this.lotteryInfo.thrcodenum;
+				}
+			}
+		},
+		onShareAppMessage() {
+			let _this = this,
+			head_id = uni.getStorageSync('userinfo').mid;
+			_this.shareinfo = uni.getStorageSync('shareDataInfo');
+			return {
+				title: _this.shareinfo.title, // 分享标题
+				desc: _this.shareinfo.desc, // 分享描述
+				imageUrl:_this.shareinfo.img,
+				path: _this.shareinfo.mpurl + '&head_id=' + head_id + '&recordid=' + this.lotteryInfo.recordid + '&id=' +  _this.pageId
+			};
+		},
+		onShareTimeline() {
+			let _this = this,
+			head_id = uni.getStorageSync('userinfo').mid;
+			_this.shareinfo = uni.getStorageSync('shareDataInfo');
+			// '&head_id=' + head_id + '&recordid=' + _this.lotteryInfo.recordid;
+			let	query = 'head_id=' + head_id + '&recordid=' + _this.lotteryInfo.recordid + '&id=' +  _this.pageId;
+			return {
+				title: _this.shareinfo.title,  // 分享描述
+				imageUrl:_this.shareinfo.img,
+				query:query
+			};
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.lotteryIndex{
+		padding-bottom: 150upx;
+		.popShareBox{
+			border-radius: 20upx 20upx 0 0;
+			background-color: #ffffff;
+			width: 100vw;
+			.classShare{
+				display: flex;
+				padding: 30upx 0;
+				
+			}
+			.close{
+				padding: 30upx 0;
+				text-align: center;
+				font-size: 28upx;
+				width: 100%;
+				border-top: 1upx solid #EEEEEE;
+			}
+			.classItem{
+				text-align: center;
+				background-color: #ffffff;
+				flex: 1;
+				image{
+					width: 100upx;
+					height: 100upx;
+				}
+				.className{
+					font-size: 24upx;
+					padding-top: 10upx;
+					color: #333333;
+				}
+			}
+		}
+		.more{
+			width: 92%;
+			// height: 120upx;
+			// line-height: 120upx;
+			text-align: center;
+			background: #ffffff;
+			font-size: 32upx;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			opacity: 1;
+			display: flex;
+			padding: 20upx 30upx;
+			border-top: 1upx solid #f8f8f8;
+			// border-radius: 30upx 30upx 0upx 0upx;
+			z-index: 1;
+			image{
+				width: 40upx;
+				height: 40upx;
+				margin-top: 10upx;
+				margin-bottom: 10upx;
+			}
+			.moreBtn{
+				width: 350upx;
+				height: 100upx;
+				border-radius: 10upx;
+				line-height: 100upx;
+				text-align: center;
+				background-color: #ff4444;
+				color: #ffffff;
+				font-size: 30upx;
+				font-weight: bold;
+			}
+			.nomoreBtn{
+				width: 350upx;
+				height: 100upx;
+				border-radius: 10upx;
+				line-height: 100upx;
+				text-align: center;
+				background-color: #cccccc;
+				color: #ffffff;
+				font-size: 28upx;
+				font-weight: bold;
+			}
+		}
+		.title{
+			position: relative;
+			.swiper{
+				height: 100%;
+				width: 100%;
+			}
+			.countDown{
+				margin: 30upx;
+				width: 86%;
+				border-radius: 10upx;
+				padding: 20upx;
+				background-color: #FFFFFF;
+				display: flex;
+				position: absolute;
+				bottom: -110upx;
+				.tag{
+					width: 10upx;
+					height: 70upx;
+					background-color: #ff4444;
+					border-radius: 8upx;
+					margin-right: 20upx;
+				}
+				.tagText{
+					width: 56upx;
+					font-size: 28upx;
+					font-weight: bold;
+					line-height: 36upx;
+					color: #333333;
+					height: 76upx;
+					margin-right: 20upx;
+				}
+				.bnumberBox{
+					background-color: #333333;
+					width: 30upx;
+					height: 70upx;
+					line-height: 70upx;
+					text-align: center;
+					border-radius: 8upx;
+					color: #FFFFFF;
+					font-size: 40upx;
+					margin-right: 10upx;
+				}
+				.numberBox{
+					background-color: #333333;
+					width: 40upx;
+					height: 70upx;
+					line-height: 70upx;
+					text-align: center;
+					border-radius: 8upx;
+					color: #FFFFFF;
+					font-size: 50upx;
+					margin-right: 10upx;
+				}
+				.day{
+					font-size: 24upx;
+					height: 70upx;
+					line-height: 70upx;
+					padding: 0 16upx 0 6upx;
+				}
+				.douhao{
+					font-size: 50upx;
+					font-weight: bold;
+					height: 70upx;
+					line-height: 70upx;
+					padding: 0 16upx 0 6upx;
+				}
+			}
+		}
+		.tipsShow{
+			opacity: 1!important;
+			
+		}
+		.barrage{
+			display: flex;
+			position: absolute;
+			left: 30upx;
+			top: 400upx;
+			height: 50upx;
+			line-height: 50upx;
+			min-width: 300upx;
+			background-color: rgba(0,0,0,0.3);
+			border-radius: 60upx;
+			font-size: 26upx;
+			color: #ffffff;
+			opacity: 0;
+			transition: opacity 1s;
+			.barrageText{
+				padding-right: 10upx;
+				max-width: 500upx;
+				overflow: hidden; /*超出部分隐藏*/
+				text-overflow: ellipsis; /* 超出部分显示省略号 */
+				white-space: nowrap; /*规定段落中的文本不进行换行 */
+			}
+			
+			image{
+				width: 40upx;
+				height: 40upx;
+				border-radius: 50%;
+				margin: 5upx;
+				margin-right: 10upx;
+			}
+		}
+		.content{
+			padding: 30upx;
+			margin-top: 75upx;
+			
+			.award{
+				padding: 20upx 0upx 20upx 20upx;
+				background-color: #FFFFFF;
+				border-radius: 15upx;
+				.publicityText{
+					color: #EE6E0C;
+					width: 610upx;
+					padding: 0 20upx;
+					// height: 50upx;
+					line-height: 50upx;
+					text-align: left;
+					background-color: #FDF5E3;
+					border-radius: 60upx;
+					font-size: 24upx;
+					margin: 20upx 0;
+				}
+				.participationNumber{
+					display: flex;
+					
+					.imgbox{
+						justify-content: center;
+						flex-wrap: wrap;
+						.clientTitle{
+							width: 56upx;
+							height: 56upx;
+							border-radius: 60upx;
+							margin-right: -20upx;
+							// position: relative;
+						}
+					}
+					.numberText{
+						text-align: right;
+						font-size: 24upx;
+						color: #333333;
+						height: 56upx;
+						line-height: 56upx;
+						flex: 1;
+						margin-right: 30upx;
+					}
+					
+				}
+				.commodityList{
+					overflow: auto;
+					display: flex;
+					.commodityItem{
+						width: 300upx;
+						background-color: #F8F8F8;
+						border-radius: 15upx;
+						margin-right: 20upx;
+						position: relative;
+						image{
+							width: 300upx;
+							height: 300upx;
+							border-radius: 15upx;
+						}
+						.grade{
+							position: absolute;
+							width: 50upx;
+							height: 120upx;
+							left: 10upx;
+							top: 10upx;
+							z-index: 1;
+							border-radius: 0;
+						}
+						.awardNum{
+							font-size: 20upx;
+							color: #FFFFFF;
+							background-color: rgba(0,0,0,0.3);
+							position: absolute;
+							right: 10upx;
+							top: 240upx;
+						}
+						.commodityName{
+							font-size: 30upx;
+							font-weight: 700;
+							margin: 10upx;
+							text-overflow: -o-ellipsis-lastline;
+							overflow: hidden;
+							text-overflow: ellipsis;
+							display: -webkit-box;
+							border-radius: 0 0 20upx 20upx;
+							-webkit-line-clamp: 2;
+							line-clamp: 2;
+							-webkit-box-orient: vertical;
+						}
+					}
+				}
+			}
+			.winner{
+				background-color: #FFFFFF;
+				padding: 0upx 20upx 30upx 30upx;
+				border-radius: 20upx;
+				margin: 20upx 0;
+				.winnerText{
+					width: 690upx;
+					height: 54upx;
+					line-height: 54upx;
+					background: #FDF5E3;
+					color: #EE6E0C;
+					font-size: 24upx;
+					text-align: center;
+					position: relative;
+					left: -30upx;
+				}
+				.winnerList{
+					padding: 30upx 0 0;
+					display: flex;
+					width: auto;
+					justify-content: space-between;
+					flex-wrap: wrap;
+					width: 100%;
+					overflow: hidden;
+					.winnerItem{
+						text-align: center;
+						padding: 10upx;
+						margin-bottom: 12upx;
+						// border-radius: 10upx;
+						flex: 0.18;
+						min-width: 18%;
+						margin-right: 10upx;
+						width: 120upx;
+						// height: 80upx;
+						// line-height: 80upx;
+						overflow: hidden;
+						.winnerImg{
+							position: relative;
+							.ibox{
+								position: absolute;
+								width: 35upx;
+								height: 35upx;
+								background-color: #ff4444;
+								line-height: 35upx;
+								text-align: center;
+								color: #ffffff;
+								font-size: 20upx;
+								right: 10upx;
+								bottom: 10upx;
+								border-radius: 50%;
+							}
+							image{
+								width: 70upx;
+								height: 70upx;
+								border-radius: 50%;
+							}
+						}
+						.winnerName{
+							font-size: 24upx;
+							padding: 10upx 0;
+							height: 30upx;
+							line-height: 30upx;
+							text-align: center;
+							width:120upx;
+							overflow:hidden;
+							text-overflow:ellipsis;
+							-o-text-overflow:ellipsis;
+							white-space:nowrap;
+						}
+						.winnerCode{
+							height: 30upx;
+							line-height: 30upx;
+							font-size: 24upx;
+							color: #FF4444;
+						}
+					}
+				}
+				.winnerList:after {
+				      content: "";
+				      flex: 0.18;
+					  min-width: 18%;
+				}
+			}
+			.LotteryYards{
+				background-color: #FFFFFF;
+				padding: 30upx 20upx 30upx 30upx;
+				border-radius: 20upx;
+				margin: 20upx 0;
+				.LotteryYardsList{
+					padding: 30upx 0;
+					display: flex;
+					width: auto;
+					justify-content: space-between;
+					flex-wrap: wrap;
+					width: 100%;
+					overflow: hidden;
+					.yardsItem{
+						text-align: center;
+						padding: 10upx;
+						font-size: 28upx;
+						margin-bottom: 12upx;
+						// border-radius: 10upx;
+						flex: 0.28;
+						min-width: 28%;
+						margin-right: 10upx;
+						width: 196upx;
+						height: 80upx;
+						line-height: 80upx;
+						overflow: hidden;
+					}
+					.textmroe{
+						color: #999999;
+						font-size: 28upx;
+					}
+				}
+				.LotteryYardsList:after {
+				      content: "";
+				      flex: 0.33;
+					  min-width: 33%;
+				}
+			}
+			.merchandiseList{
+				padding: 30upx;
+				background-color: #FFFFFF;
+				border-radius: 20upx;
+			}
+			.richText{
+				padding: 30upx;
+				background-color: #FFFFFF;
+				border-radius: 20upx;
+				margin-top: 20upx;
+			}
+		}
+	}
+	.coverImg {
+		width: 750upx;
+	}
+	.zjbj {
+		// background-image: url(../../../static/images/xxhg3.png);
+		// background-size: 100% 100%;
+		// padding: 54upx;
+		border-radius: 10upx;
+		width: 85vw;
+		height: 870upx;
+		position: relative;
+	
+		.zjbox {
+			position: absolute;
+			left: 50%;
+			top: 24%;
+			transform: translate(-50%);
+		}
+	
+		.closeBtn {
+			font-size: 28upx;
+			height: 40upx;
+			width: 40upx;
+			border-radius: 60upx;
+			background-color: rgba(0, 0, 0, 0.8);
+			color: #A8A2B2;
+			line-height: 40upx;
+			position: absolute;
+			right: 0upx;
+			top: 0upx;
+		}
+	
+		.contenttitle {
+			// width: 236upx;
+			// height: 69upx;
+			// position: relative;
+			z-index: 99;
+			// margin: auto;
+			// background: linear-gradient(to bottom, #FEE76A 0%, #FBCD1C 100%);
+			padding-bottom: 30upx;
+			margin-bottom: 30upx;
+			border-bottom: 1upx dotted #CCCCCC;
+	
+			.text {
+	
+				text-align: center;
+				color: #ffffff;
+				line-height: 69upx;
+				font-size: 40upx;
+				font-weight: 700;
+				text-shadow:
+					-2upx -2upx 0 #ff4444,
+					4upx -2upx 0 #ff4444,
+					-4upx 4upx 0 #ff4444,
+					4upx 4upx 0 #ff4444,
+					0upx 4upx 4upx rgba(0, 0, 0, 0.6);
+			}
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #f8f8f8;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages2/lottery/lotteryList/lotteryList.vue b/pages/subPages2/lottery/lotteryList/lotteryList.vue
new file mode 100644
index 0000000..1fa9ca3
--- /dev/null
+++ b/pages/subPages2/lottery/lotteryList/lotteryList.vue
@@ -0,0 +1,148 @@
+<template>
+	<view class="lotteryList">
+		<view class="title" :style="{ width: imgstyle.width + 'px', height: imgstyle.height + 'px' }" >
+			<swiper class="swiper" v-if="!!adv && adv.length > 0"  indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+				<swiper-item v-for="(item, index) in adv" :key="index" @click="goLink(item.link)">
+					<image :src="item.thumb" style="width: 100%; height: 100%;" mode="scaleToFill"></image>
+				</swiper-item>
+			</swiper>
+		</view>
+		<view class="content">
+			<view  v-for="(item,index) in swiperList" :key="index">
+				<draw-commodity :goodItem="item"></draw-commodity>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" />
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import drawCommodity from '@/components/template/drawCommodity.vue';
+	import TabBars from '@/components/template/tabBar';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	//#endif
+	export default{
+		data(){
+			return{
+				imgstyle:{},
+				page:1,
+				swiperList:[],
+				adv:[],
+				pluginList:[
+					{
+						type:'rush',
+						title:'抢购'
+					},
+					{
+						type:'groupon',
+						title:'团购'
+					},
+					{
+						type:'fightgroup',
+						title:'拼团'
+					},
+					{
+						type:'coupon',
+						title:'卡券'
+					},
+					{
+						type:'bargain',
+						title:'砍价'
+					},
+					{
+						type:'activity',
+						title:'活动'
+					},
+					{
+						type:'payonline',
+						title:'买单'
+					},
+					{
+						type:'citydelivery',
+						title:'配送'
+					},
+					{
+						type:'drawvideo',
+						title:'视频'
+					},
+					{
+						type:'drawshare',
+						title:'分享'
+					},
+					{
+						type:'store',
+						title:'商户'
+					}
+				],
+				lat:'',
+				lng:''
+			}
+		},
+		components:{
+			drawCommodity,
+			TabBars
+		},
+		onLoad(e) {
+			let myLocation = uni.getStorageSync('curLoction');
+			this.lng = myLocation.longitude || '';
+			this.lat = myLocation.latitude || '';
+			this.getStore(e.id);
+			this.imgstyle = uni.getStorageSync('imgstyle');
+		},
+		methods:{
+			goLink(url) {
+				App.navigationTo({
+					url: url
+				});
+			},
+			getStore(id,flag){
+				let _this = this;
+				App._post_form('&p=luckydraw&do=goodsListInfo', {
+					id:id,
+					page:this.page,
+					lat:_this.lat,
+					lng:_this.lng
+				}, res => {
+					if(flag){
+						this.swiperList = this.swiperList.concat(res.data.buygoodslist);
+					}else{
+						this.swiperList = res.data.buygoodslist;
+						this.adv = res.data.adv;
+					}
+					this.swiperList.map((item,index)=>{
+						this.pluginList.map((it,i)=>{
+							if(item.plugin == it.type){
+								item.pluginName = it.title;
+							}
+						})
+					});
+					console.log(this.swiperList);
+				}, false, () => {
+					// _this.loadlogo = false;
+				})
+			},
+		},
+		// onReachBottom() {
+		// 	this.page++;
+		// 	this.getStore(true)
+		// },
+	}
+</script>
+
+<style scoped lang="scss">
+	.lotteryList{
+		padding-bottom: 120upx;
+		.title{
+			position: relative;
+			.swiper{
+				height: 100%;
+				width: 100%;
+			}
+		}
+		.content{
+			padding: 30upx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/lottery/previous/previous.vue b/pages/subPages2/lottery/previous/previous.vue
new file mode 100644
index 0000000..f3aa74b
--- /dev/null
+++ b/pages/subPages2/lottery/previous/previous.vue
@@ -0,0 +1,200 @@
+<template>
+	<view class="previous">
+		<view class="previousList" v-if="!!previousList && previousList.length > 0">
+			<view class="previousItem" @click="goLotteryIndex(item)" v-for="(item,index) in previousList" :key="index">
+				<view class="imgbox">
+					<image :src="item.logo" mode=""></image>
+					<view class="tag">
+						抽奖
+					</view>
+				</view>
+				<view class="content">
+					<view class="title">
+						<view class="periods">
+							{{item.issueno}}期
+						</view>
+						{{item.title}}
+					</view>
+					<view class="f-24 col-9">
+						开奖时间：{{item.drawtime == 0?'暂未开奖':item.drawtime}}
+					</view>
+					<view class="stationBtn" v-if="item.status == 0">
+						进行中
+					</view>
+					<view class="nostationBtn" v-if="item.status == 1">
+						待抽奖
+					</view>
+					<view class="yesstationBtn" v-if="item.status == 2">
+						已抽奖
+					</view>
+				</view>
+			</view>
+		</view>
+		<view  v-else>
+		<image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image>		
+		</view>
+		<TabBars :tabBarAct="0" />
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import TabBars from '@/components/template/tabBar';
+	export default{
+		data(){
+			return{
+				id:'',
+				page:1,
+				previousList:[]
+			}
+		},
+		components:{
+			TabBars
+		},
+		onLoad(e) {
+			this.id = e.id;
+			this.getPrevious(e.id)
+		},
+		onReachBottom() {
+			this.page++;
+			this.getPrevious(this.id,true)
+		},
+		methods:{
+			goLotteryIndex(item){
+				App.navigationTo({
+					url: `pages/subPages2/lottery/lotteryIndex/lotteryIndex?recordid=${item.id}&id=${item.drawid}`
+				});
+			},
+			getPrevious(id,flag = false){
+					let _this = this;
+					App._post_form('&p=luckydraw&do=getRecordList', {
+						id:id,
+						page:this.page
+					}, res => {
+						if(flag){
+							this.previousList = this.previousList.concat(res.data);
+						}else{
+							this.previousList = res.data;
+						}
+						// this.previousList.map((item,index)=>{
+						// 	this.pluginList.map((it,i)=>{
+						// 		if(item.plugin == it.type){
+						// 			item.pluginName = it.title;
+						// 		}
+						// 	})
+						// });
+						console.log(this.previousList);
+					}, false, () => {
+						// _this.loadlogo = false;
+					})
+				},
+			},
+		}
+</script>
+
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
+<style lang="scss" scoped>
+	.previous{
+		padding: 30upx 30upx 130upx;
+		.previousList{
+			.previousItem{
+				padding: 20upx;
+				display: flex;
+				position: relative;
+				background-color: #FFFFFF;
+				border-radius: 20upx;
+				margin-bottom: 20upx;
+				.imgbox{
+					position: relative;
+					.tag{
+						width: 70upx;
+						height: 34upx;
+						background: linear-gradient(130deg, #FEDB58 0%, #FBC84A 100%);
+						opacity: 1;
+						line-height: 34upx;
+						font-size: 24upx;
+						color: #E3A815;
+						text-align: center;
+						font-weight: bold;
+						border-radius: 10upx 0upx 10upx 0upx;
+						position: absolute;
+						left: 0;
+						top: 0;
+					}
+					image{
+						width: 220upx;
+						height: 220upx;
+						border-radius: 10upx;
+					}
+				}
+				.content{
+					margin-left: 20upx;
+					.title{
+						overflow:hidden;
+						text-overflow:ellipsis;
+						display:-webkit-box;
+						-webkit-box-orient:vertical;
+						-webkit-line-clamp:2;
+						font-size: 28upx;
+						font-weight: bold;
+						color: #333333;
+						height: 70upx;
+						margin-bottom: 30upx;
+						.periods{
+							display: inline-block;
+							padding: 0 10upx;
+							font-size: 20upx;
+							font-weight: 300;
+							margin-right: 10upx;
+							color: #FFFFFF;
+							background-color: #FF4444;
+						}
+					}
+					.stationBtn{
+						width: 90upx;
+						height: 40upx;
+						line-height: 40upx;
+						text-align: center;
+						background-color: #16D46B;
+						color: #ffffff;
+						border-radius: 10upx;
+						font-size: 24upx;
+						position: absolute;
+						right: 20upx;
+						bottom: 20upx;
+					}
+					.nostationBtn{
+						width: 90upx;
+						height: 40upx;
+						line-height: 40upx;
+						text-align: center;
+						background-color: #FFC91E;
+						color: #ffffff;
+						border-radius: 10upx;
+						font-size: 24upx;
+						position: absolute;
+						right: 20upx;
+						bottom: 20upx;
+					}
+					.yesstationBtn{
+						width: 90upx;
+						height: 40upx;
+						line-height: 40upx;
+						text-align: center;
+						background-color: #eeeeee;
+						color: #999999;
+						border-radius: 10upx;
+						font-size: 24upx;
+						position: absolute;
+						right: 20upx;
+						bottom: 20upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/management/addGoods/addGoods.vue b/pages/subPages2/management/addGoods/addGoods.vue
new file mode 100644
index 0000000..4c81bc7
--- /dev/null
+++ b/pages/subPages2/management/addGoods/addGoods.vue
@@ -0,0 +1,712 @@
+<template>
+	<view class="addGoods">
+		<far-bottom></far-bottom>
+		<view  style="overflow: auto;padding-bottom: 200upx;">
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">商品名称</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<input class="uni-input" placeholder="请输入商品名称" style="text-align: right;" v-model="form.name" />
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">商品分类</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<picker @change="bindPickerChange" :value="index" :range="array">
+					    <view class="uni-input t-r f-34" style="color: #999999;">{{form.cateid}}</view>
+					</picker>
+				</view>
+			</view>
+			
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">价格</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<input class="uni-input" placeholder="请输入销售价格" type="digit" style="text-align: right;" v-model="form.price" />
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">市场价</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<input class="uni-input" type="digit" placeholder="请输入商品市场价" style="text-align: right;" cursor-spacing="140" v-model="form.oldprice" />
+					<!-- <input placeholder="请输入商品市场价(元)" cursor-spacing="140" class="inputMain" type="digit" v-model="goodsInfo.goods.oldprice" @blur="handleoldprice"						 /> -->
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">包装费</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<input class="uni-input" placeholder="请输入包装费" type="number" style="text-align: right;" v-model="form.deliveryprice" />
+				</view>
+			</view>
+			<view class="uploadView diy-nav-list border-line b-f1">
+				<view class="f-l" style="line-height: 150upx;"><text class="keys">缩略图</text></view>
+				<view class="verMid uploadButton f-r" >
+					<!-- 图片预览循环模板 -->
+					<view class="imgPreview" v-if="form.thumb != ''" style="position: relative;display: inline-block;">
+						<image :src="form.thumb" />
+						<image :src="imgfixUrls + 'merchant/close.png'" style="width: 30upx;height: 30upx;" class="close" @click="closeImg(1)" />
+					</view>
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdata" @click="updataImg(1)" v-else>
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+					</view>
+				</view>
+			</view>
+			<view class="uploadView b-f1">
+				<view class="f-l" style="line-height: 150upx;"><text class="keys">轮播图</text></view>
+				<view class="verMid uploadButton f-r dis-flex swiperBox" style="flex-wrap: wrap;justify-content: space-between;">
+					<!-- 图片预览循环模板 -->
+					<block v-for="(item, index) in form.thumbs" class="verMid" style="flex: 0.33;" v-if="item">
+						<view class="imgPreview verMid" v-if="form.thumbs !== []" style="position: relative;">
+							<image :src="item" />
+							<image :src="imgfixUrls + 'merchant/close.png'" style="width: 30upx;height: 30upx;" class="close" @click="closeImg(2, index)" />
+						</view>
+					</block>
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdata verMid" @click="updataImg(2)" v-if="form.thumbs.length < 6" >
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" />
+					</view>
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text class="keys">状态</text><text class="xingxing">*</text>
+				</view>
+				<view class="f-r">
+					<picker @change="shangjia" :value="indexis" :range="arrays">
+					    <view class="uni-input t-r f-34" style="color: #999999;">{{status}}</view>
+					</picker>
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text  class="keys">商品规格</text>
+				</view>
+				<view class="f-r t-r" style="font-size: 28upx; color: #999999;" @click="openguige">
+					规格<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+				</view>
+			</view>
+			<view class="b-f1">
+				<view class="f-l">
+					<text  class="keys">商品详情</text>
+				</view>
+				<view class="f-r t-r" style="font-size: 28upx; color: #999999;" @click="openrithtext">
+					详情编辑<text class="iconfont icon-right" style="font-size: 28upx;"></text>
+				</view>
+			</view>
+			<view  style="position: fixed;left: 0;bottom: 0;width: 92%;padding: 30upx;">
+				<button type="primary" @click="addGoods">确认{{addgood}}</button>
+			</view>
+		</view>
+		
+		<view class="popfixed" v-if="show">
+			<view class="f-w" style="padding-bottom: 50upx;">
+				商品规格<text class="f-20 col-9">(点击下列规格进行修改)</text> <text class="dis-il-block iconfont icon-close" style="float: right;padding: 0upx 20upx 20upx;" @click="closePop"></text>
+			</view>
+			<view  style="height: 700upx;overflow: auto;" v-if="form.optionArray.length > 0">
+				<view  @click="modification(item,index)" 
+				style="border: 1px solid #f8f8f8;border-radius: 15upx; padding: 50upx;background-color: #FFFFFF;margin-bottom: 30upx;position: relative;" v-for="(item,index) in form.optionArray" :key="index"  >
+					<view class="iconfont icon-close" @click.stop="modificationClose(item.name,index)" style="position: absolute;right: 10upx;top: 10upx;color: #999999;">
+						
+					</view>
+					<view class="dis-flex" style="padding-bottom: 10upx;border-bottom: 1px solid #f1f1f1;">
+						<view class="flex-box" style="font-size: 30upx;">
+							商品名称
+						</view>
+						<view class="flex-box t-r" style="font-size: 30upx;color: #999999;">
+							{{item.name}}
+						</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 10upx;padding-top: 10upx;border-bottom: 1px solid #f1f1f1;">
+						<view class="flex-box" style="font-size: 30upx;">
+							商品价格
+						</view>
+						<view class="flex-box t-r" style="font-size: 30upx;color: #999999;">
+							￥{{item.price}}
+						</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 10upx;padding-top: 10upx;border-bottom: 1px solid #f1f1f1;">
+						<view class="flex-box" style="font-size: 30upx;">
+							商品市场价
+						</view>
+						<view class="flex-box t-r" style="font-size: 30upx;color: #999999;">
+							￥{{item.oldprice}}
+						</view>
+					</view>
+					<view class="dis-flex" style="padding-bottom: 10upx;padding-top: 10upx;border-bottom: 1px solid #f1f1f1;">
+						<view class="flex-box" style="font-size: 30upx;">
+							单日库存
+						</view>
+						<view class="flex-box t-r" style="font-size: 30upx;color: #999999;">
+							{{item.daystock}}
+						</view>
+					</view>
+					<view class="dis-flex" style="padding-top: 10upx;">
+						<view class="flex-box" style="font-size: 30upx;">
+							全部库存
+						</view>
+						<view class="flex-box t-r" style="font-size: 30upx;color: #999999;">
+							{{item.allstock}}
+						</view>
+					</view>
+				</view>
+				
+			</view>
+			<view  style="height: 700upx;overflow: auto;" v-else>
+				<view class="f-40 t-c" style="color: #999999;" >
+					暂无规格数据,请点击按钮进行添加~
+				</view>
+			</view>
+			<view  style="height: 160upx;width: 100%;">
+				
+			</view>
+			<view :class="android?'bottom-33':'bottom-30'" style="position: relative;z-index: 98;width: 90%;padding: 30upx;">
+				<button type="primary" @click="addSpecification">添加规格</button>
+			</view>
+		</view>
+		<popup-view :show="richText" type="center" @clickmask="richText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="form.detail">
+				<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#" :html="form.detail"></jinEdit> 
+			</view>
+		</popup-view>
+		<popup-view :show="shows" type="center" @clickmask="onShows" :bottom="'0%'">
+			<view class="b-f" style="padding: 30upx;width: 65vw;border-radius: 15upx;">
+				<view class="f-w f-34" style="padding: 30upx 0;">
+					规格添加<text class="dis-il-block iconfont icon-close" style="float: right;padding: 0upx 20upx 20upx;" @click="onShows"></text>
+				</view>
+				<view class="dis-flex f-30" style="padding-bottom: 20upx;">
+					<view  style="flex: 0.3;">
+						规格名称
+					</view>
+					<view  style="flex: 0.7;">
+						<input v-if="shows" class="uni-input" placeholder="请输入规格名称" @blur="toTop"  style="text-align: right;" v-model="addSpecifications.name" />
+					</view>
+				</view>
+				<view class="dis-flex f-30" style="padding-bottom: 20upx;">
+					<view  style="flex: 0.3;">
+						价格
+					</view>
+					<view  style="flex: 0.7;">
+						<input v-if="shows" class="uni-input" type="digit"  placeholder="请输入销售价格" @blur="toTop" style="text-align: right;"  v-model="addSpecifications.price" />
+					</view>
+				</view>
+				<view class="dis-flex f-30" style="padding-bottom: 20upx;">
+					<view  style="flex: 0.3;">
+						市场价
+					</view>
+					<view  style="flex: 0.7;">
+						<input v-if="shows" class="uni-input" type="digit" placeholder="请输入规格市场价" style="text-align: right;" @blur="toTop" v-model="addSpecifications.oldprice" />
+					</view>
+				</view>
+				<view class="dis-flex f-30" style="padding-bottom: 20upx;">
+					<view  style="flex: 0.3;">
+						单日库存
+					</view>
+					<view  style="flex: 0.7;">
+						<input v-if="shows" class="uni-input" type="number" placeholder="请输入单日库存" style="text-align: right;" @blur="toTop" v-model="addSpecifications.daystock" />
+					</view>
+				</view>
+				<view class="dis-flex f-30" style="padding-bottom: 50upx;">
+					<view  style="flex: 0.3;">
+						全部库存
+					</view>
+					<view  style="flex: 0.7;">
+						<input v-if="shows" class="uni-input" type="number" placeholder="请输入全部库存" style="text-align: right;" @blur="toTop" v-model="addSpecifications.allstock" />
+					</view>
+				</view>
+				<view >
+					<button type="warn" @click="confirmAdd">确 定</button>
+				</view>
+			</view>
+		</popup-view>
+		<view class="popsocks" v-if="shcket" @click.stop.prevent="shcketto">
+			
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import App from "@/common/js/app.js";
+	import PopupView from '@/components/template/PopManager.vue'
+	import jinEdit from '@/components/jin-edit/jin-edit.vue';
+	export default{
+		components:{
+			PopupView,
+			jinEdit
+		},
+		data(){
+			return{
+				arrays:['上架','下架'],
+				status:'上架',
+				form:{
+					name:'',
+					cateid:'',
+					price:'',
+					oldprice:'',
+					deliveryprice:'',
+					thumb:'',
+					thumbs:[],
+					optionArray:[],
+					detail:''
+				},
+				shows:false,
+				array: [],
+				index:0,
+				show:false,
+				shcket:false,
+				addSpecifications:{
+					name:'',
+					price:'',
+					oldprice:'',
+					allstock:'',
+					daystock:''
+				},
+				storeid:'',
+				id:'',
+				indexis:0,
+				addgood:'添加',
+				android:true,
+				richText:false,
+				richTextVter:'',
+				changedIndex:0,
+				flag:false
+			}
+		},
+		onLoad(options) {
+			let _this = this;
+			this.android = uni.getSystemInfoSync().platform === 'android';
+			_this.id = options.id;
+			if(_this.id){
+				this.addgood = '修改';
+			}
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.getform();
+				}
+			});
+			
+			
+		},
+		watch:{
+			shows(newVal){
+				if(!newVal){
+					this.flag = false;
+				}
+			}
+		},
+		methods:{
+			modificationClose(name,index){
+				let _this = this;
+				App.showError(
+					`确定删除规格${name}`,
+					data => {
+						if (data.confirm) {
+							_this.form.optionArray.splice(index,1)
+						}
+					},
+					true
+				);
+			},
+			modification(item,index){
+				let _this = this;
+				_this.addSpecifications = item;
+				_this.shows = true;
+				_this.flag = true;
+				_this.changedIndex = index;
+			},
+			openrithtext(){
+				this.richText = true;
+			},
+			editOk(res) {
+			    console.log(res.html);
+							 this.richTextVter = res.html;
+							 this.richText = false;
+			},
+			// 页面滚回
+			toTop() {
+				  uni.pageScrollTo({
+				    scrollTop: 0,
+				    duration: 0
+				  })
+			},
+			shcketto(){
+				this.show = !this.show;
+				this.shcket = !this.shcket;
+			},
+			getform(){
+				let _this = this;
+				App._post_form(`&p=citydelivery&do=createGoodsPage&storeid=${this.storeid}&id=${this.id}`,{},res=>{
+					if(Array.isArray(res.data.goods)){
+						_this.array = [];
+						_this.form.detail = '请输入内容'
+						_this.cateList = res.data.catelist;
+						_this.cateList.map(item=>{
+							_this.array.push(item.name);
+						});
+						_this.form.cateid = _this.array[_this.index];
+						console.log(222)
+					}else{
+						_this.form.optionArray = [];
+						_this.form = res.data.goods;
+						if(res.data.goods){
+							_this.$set(_this.form,'detail',res.data.goods.detail);
+							if(!_this.form.detail){
+								_this.$set(_this.form,'detail','请输入内容');
+							}
+							if(!res.data.goods.optionArray){
+								_this.form.optionArray = [];
+							}
+						}
+						// debugger
+						console.log(_this.form.detail)
+						_this.cateList = res.data.catelist;
+						_this.cateList.map(item=>{
+							_this.array.push(item.name);
+						});
+						if(Number(_this.form.cateid)){
+							_this.cateList.map(item=>{
+								if(item.id == _this.form.cateid){
+									_this.form.cateid = item.name;
+								}
+							})
+						}else{
+							_this.form.cateid = _this.array[_this.index];
+						}
+						if(!_this.form.thumbs){
+							_this.form.thumbs = [];
+						}
+						
+					}
+					
+				})
+			},
+			addGoods(){
+				// debugger
+				console.log(this.form);
+				debugger
+				if(!this.form.name){
+					uni.showToast({
+						title:'商品名称不能为空',
+						icon:'none'
+					})
+				}else if(!this.form.cateid){
+					uni.showToast({
+						title:'商品分类不能为空',
+						icon:'none'
+					})
+				}else if(!this.form.price){
+					uni.showToast({
+						title:'商品价格不能为空',
+						icon:'none'
+					})
+				}else if(!this.form.oldprice){
+					uni.showToast({
+						title:'商品市场价不能为空',
+						icon:'none'
+					})
+				}else if(!this.form.deliveryprice){
+					uni.showToast({
+						title:'配送价格不能为空',
+						icon:'none'
+					})
+				}else{
+					if(this.form.optionArray.length == 0){
+						this.form.optionstatus = 0;
+					}else{
+						this.form.optionstatus = 1;
+					}
+					let data = this.form;
+					data.storeid = this.storeid;
+					let jsonString;
+					let param = '';
+					// debugger
+					
+					if(data.optionArray){
+						jsonString = JSON.stringify(data.optionArray);
+						let base64 = new this.$util.Base64();
+						param = base64.encode(jsonString);
+					};
+					data.optionArray = param;
+					data.detail = (this.richTextVter !== '请输入内容')?this.richTextVter:'';
+					// delete data.optionArray;
+					this.cateList.map(item=>{
+						if(item.name == data.cateid){
+							data.cateid = item.id;
+						}
+					})
+					if(this.status == '上架'){
+						data.status = '2';
+					}else{
+						data.status = '4';
+					}
+					
+					
+					console.log(data);
+					App._post_form(`&p=citydelivery&do=saveDeliveryGoods`,data,res=>{
+						console.log(res);
+						uni.$emit('datagoods',data)
+						uni.showToast({
+							title:`${this.addgood}成功`
+						})
+						uni.navigateBack();
+					})
+				}
+			},
+			confirmAdd(){
+				let state = true;
+				Object.values(this.addSpecifications).forEach(item=>{
+					if(!item){
+						uni.showToast({
+							title:'请填写完整规格数据',
+							icon:'none'
+						})
+						state = false;
+					}
+				})
+				if(state){
+					console.log(Object.values(this.addSpecifications));
+					if(this.flag){
+						this.form.optionArray.splice(this.changedIndex,1,this.addSpecifications);
+					}else{
+						this.form.optionArray.push(this.addSpecifications);
+					}
+					this.addSpecifications = {
+					name:'',
+					price:'',
+					oldprice:'',
+					daystock:'',
+					allstock:''
+				},
+					this.shows = false;
+					if(this.flag){
+						uni.showToast({
+							title:'修改成功'
+						})
+					}else{
+						uni.showToast({
+							title:'添加成功'
+						})
+					}
+					
+				}
+				
+			},
+			// 关闭添加规格弹窗
+			onShows(){
+				this.shows = !this.shows;
+			},
+			// 打开添加规格弹窗
+			addSpecification(){
+				this.addSpecifications.name = '';
+				this.addSpecifications.price = '';
+				this.addSpecifications.oldprice = '';
+				this.addSpecifications.allstock = '';
+				this.addSpecifications.daystock = '';
+				this.shows = !this.shows;
+			},
+			// 关闭规格列表弹窗
+			closePop(){
+				this.show = !this.show;
+				this.shcket = !this.shcket;
+			},
+			// 打开规格列表弹窗
+			openguige(){
+				this.show = !this.show;
+				this.shcket = !this.shcket;
+			},
+			// prcker监听
+			bindPickerChange(e){
+				this.index = e.target.value;
+				this.form.cateid = this.array[this.index];
+			},
+			shangjia(e){
+				this.indexis = e.target.value;
+				this.status = this.arrays[this.indexis];
+			},
+			closeImg(type, index) {
+				let _this = this;
+				if (type == 1) {
+					_this.form.thumb = '';
+				} else if (type == 2) {
+					for (let i = 0; i < _this.form.thumbs.length; i++) {
+						if (i == index) {
+							_this.form.thumbs.splice(i, 1);
+						}
+					}
+				}
+			},
+			async updataImg(type) {
+				let _this = this;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(6);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i]);
+				    	if (type == 1) {
+				    		_this.form.thumb = aa.data.img;
+				    	}
+				    	if (type == 2) {
+				    		_this.form.thumbs.push(aa.data.img);
+				    	}
+				    }
+					return
+				}
+				wxApi.choseImage(res => {
+					wxApi.uoloadIg(res.localIds[0], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+										if (type == 1) {
+											_this.form.thumb = res.data.img;
+										}
+										if (type == 2) {
+											_this.form.thumbs.push(res.data.img);
+										}
+									}
+								},
+								false,
+								() => {
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				});
+				// #endif
+				// #ifndef H5
+				wx.chooseImage({
+					count: 6,
+					sourceType: ['album', 'camera'],
+					success: async function(res) {
+						console.info(res);
+						for (let i = 0; i < res.tempFilePaths.length; i++) {
+							let aa = await App._upLoad(res.tempFilePaths[i]);
+							if (type == 1) {
+								_this.form.thumb = aa.data.img;
+							}
+							if (type == 2) {
+								_this.form.thumbs.push(aa.data.img);
+							}
+						}
+					}
+				});
+				// #endif
+			},
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	image{
+		height: 150upx;
+		width: 150upx;
+		border-radius: 10upx;
+	}
+	.bottom-33{
+		bottom: 28%;
+	}
+	.bottom-30{
+		bottom: 25%;
+	}
+	.swiperBox:after{
+		content: '';
+		width: 30%;
+	}
+	.uni-input{
+		font-size: 30upx;
+	}
+	.close{
+		position: absolute;
+		right: 0;
+		top: 0;
+	}
+	.popsocks{
+		position: fixed;
+		width: 100%;
+		height: 100%;
+		left: 0;
+		top: 0;
+		background-color: rgba(0,0,0,0.3);
+	}
+	.popfixed{
+		width: 80vw;
+		height: 50vh;
+		overflow: hidden;
+		// padding-bottom: 300upx;
+		background-color: #F7F7F7;
+		position: fixed;
+		left: 6%;
+		top: 8%;
+		padding: 30upx;
+		z-index: 99;
+		padding-bottom: 300upx;
+		border-radius: 15upx;
+	}
+	.keys{
+		// text-align-last: justify;
+		display: inline-block;
+		color: #999999;
+		font-size: 30upx;
+		// width: 90%;
+	}
+	.userImgUpdata{
+		width: 150upx;
+		height: 150upx;
+		border-radius: 10upx;
+		background-color: #f8f8f8;
+		border: 1px solid #999999;
+		text-align: center;
+		> image{
+			margin-top: 50upx;
+			width: 50upx;
+			height: 50upx;
+		}
+	}
+	.f-l{
+		flex: 0.3;
+	}
+	.f-r{
+		flex: 0.7;
+		padding-top: 8upx;
+	}
+	.b-f1{
+		border-bottom: 1px solid #f8f8f8;
+		padding: 15upx 0 20upx;
+		display: flex;
+	}
+	.addGoods{
+		padding: 0 30upx;
+	}
+	.xingxing{
+		padding-left: 10upx;
+		display: inline-block;
+		line-height: 40upx;
+		font-weight: 700;
+		font-size: 40upx;
+		color: #FF4444;
+	}
+</style>
diff --git a/pages/subPages2/management/foodclassify/foodclassify.vue b/pages/subPages2/management/foodclassify/foodclassify.vue
new file mode 100644
index 0000000..90cfbb6
--- /dev/null
+++ b/pages/subPages2/management/foodclassify/foodclassify.vue
@@ -0,0 +1,193 @@
+<template>
+	<view class="foodclassify" style="padding: 30upx;">
+		<far-bottom></far-bottom>
+		<view >
+			 <button type="primary" plain="true" style="border-radius: 60upx;height: 80upx;line-height: 78upx;font-size: 30upx;" @click="onShows">添加分类</button>
+		</view>
+		<view  style="padding-top: 30upx;">
+			<view class="dis-flex" style="background-color: #f8f8f8;padding: 30upx;margin-bottom: 30upx;" v-for="(item,index) in classList" :key="index">
+				<view  style="flex: 0.6;">
+					<view class="f-30" style="padding-bottom: 20upx;">
+						<view class="dis-il-block" style="vertical-align: bottom;">
+							{{item.name}} 
+						</view>
+						<view class="dis-il-block" style="padding-left: 20upx;vertical-align: bottom;padding-bottom: 3upx;">
+						<image class="iconbox" :src="imgfixUrls + 'centerMerchant/clerksuccess.png'" v-if="item.status == 1" />
+						<image class="iconbox" :src="imgfixUrls + 'centerMerchant/clerkjian.png'" v-if="item.status == 0" />	
+						</view>
+					</view>
+					<view class="f-24" style="color: #999999;">
+						排序:<text style="padding-left: 20upx;">{{item.sort}}</text>
+					</view>
+				</view>
+				<view  style="flex: 0.5;padding-top: 15upx;">
+					<view  style="float: right;">
+						<button type="primary" plain="true" class="btn" style="margin-right: 20upx;" @click="compile(item)">编辑</button>
+						<button type="warn" plain="true" class="btn" @click="exspot(item)">删除</button>
+					</view>
+				</view>
+			</view>
+		</view>
+		<popup-view :show="show" type="center" @clickmask="onShows" :bottom="'0%'">
+			<view class="b-f" style="padding: 30upx;width: 70vw;border-radius: 15upx;">
+				<view class="tilte t-c f-32" style="padding-bottom: 20upx;">
+					{{tilte}}分类
+					<view style="float: right;" class="iconfont icon-guanbijiantou" @click="close"></view>
+				</view>
+				<view class="home dis-flex" style="padding: 30upx 0 ;border-bottom: 1px solid #f1f1f1;">
+					<view class="t-r f-30" style="flex: 0.3;color: #999999;line-height: 60upx;">
+						分类名称
+					</view>
+					<view  style="flex: 0.7;padding-left: 20upx;">
+						<input v-if="show" class="uni-input" placeholder="请输入分类的名称" v-model="className" />
+					</view>
+					
+				</view>
+				<view class="home dis-flex"  style="padding: 30upx 0 ;border-bottom: 1px solid #f1f1f1;">
+					<view class="t-r f-30" style="flex: 0.3;color: #999999;line-height: 60upx;">
+						排序
+					</view>
+					<view  style="flex: 0.7;padding-left: 20upx;">
+						<input v-if="show" class="uni-input" placeholder="请输入排序数字" v-model="sortNum" />
+					</view>
+					
+				</view>
+				<view class="home dis-flex"  style="padding: 30upx 0 ;border-bottom: 1px solid #f1f1f1;" v-if="tilte == '编辑'">
+					<view class="t-r f-30" style="flex: 0.3;color: #999999;line-height: 60upx;">
+						分类开关
+					</view>
+					<view  style="flex: 0.7;padding-left: 20upx;">
+						 <switch :checked="status=='1'?true:false" @change="switch2Change" />
+					</view>
+					
+				</view>
+				<button type="primary" style="height: 70upx;line-height: 68upx;font-size: 30upx;margin-top: 100upx;" @click="addOrComlit">确认</button>
+			</view>
+		</popup-view>
+	</view>
+</template>
+
+<script>
+	import App from "@/common/js/app.js"
+	import PopupView from '@/components/template/PopManager.vue'
+	export default{
+		components:{
+			PopupView
+		},
+		data(){
+			return{
+				show:false,
+				className:'',
+				sortNum:'',
+				tilte:'添加',
+				classList:[],
+				storeId:'',
+				id:'',
+				status:0
+			}
+		},
+		onLoad() {
+			this.init();
+		},
+		methods:{
+			switch2Change(e){
+				console.log(e);
+				this.status = e.detail.value?1:0
+			},
+			addOrComlit(){
+				let data={
+					id:this.id,
+					storeid:this.storeId,
+					name:this.className,
+					sort:this.sortNum,
+					status:this.status
+				}
+				App._post_form(`&p=citydelivery&do=addCate`,data,res=>{
+					console.log(res);
+					uni.showToast({
+						title:'操作成功',
+						icon:'none'
+					});
+					this.close();
+					this.init();
+				})
+			},
+			getClass(id){
+				App._post_form(`&p=citydelivery&do=storeCateList&storeid=${id}`,{},res=>{
+					console.log(res);
+					this.classList = res.data.list;
+				})
+			},
+			init(){
+				let _this = this;
+				uni.getStorage({
+					key: 'checkStoreid',
+					success: function(res) {
+						_this.storeId = res.data;
+						_this.getClass(res.data);
+					}
+				});
+			},
+			compile(item){
+				this.tilte = '编辑';
+				this.id = item.id;
+				this.className = item.name;
+				this.sortNum = item.sort;
+				this.status = item.status;
+				this.show = !this.show;
+			},
+			close(){
+				this.className = '';
+				this.sortNum = '';
+				this.status = false;
+				this.show = !this.show;
+			},
+			onShows(){
+				this.show = !this.show;
+				this.tilte = '添加';
+				this.id = '';
+			},
+			withdraw(id){
+				App._post_form(`&p=citydelivery&do=deleteCate&id=${id}`,{},res=>{
+					console.log(res);
+					uni.showToast({
+						title:'删除成功',
+						icon:'none'
+					});
+					this.init();
+				})
+			},
+			exspot(item){
+				App.showError(
+					`确定删除该分类"${item.name}"?`, (data) => {
+						if (data.confirm) {
+							!!data && this.withdraw(item.id)
+						}
+					}, true)
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-input{
+		display: inline-block;
+	}
+	.btn{
+		width: 120rpx;
+		height: 55rpx;
+		line-height: 53rpx;
+		margin: 0;
+		display: inline-block;
+		font-size: 24rpx;
+	}
+	.home{
+		// padding-top: 10upx;
+		text-align: center;
+	}
+	.iconbox{
+		vertical-align: middle;
+		width: 30upx;
+		height: 30upx;
+		border-radius: 50%;
+	}
+</style>
diff --git a/pages/subPages2/management/management.vue b/pages/subPages2/management/management.vue
new file mode 100644
index 0000000..6e4f197
--- /dev/null
+++ b/pages/subPages2/management/management.vue
@@ -0,0 +1,852 @@
+<template>
+	<view>
+		<view class="container">
+			<far-bottom></far-bottom>
+			<view class="orderList">
+				<view class="dis-flex flex-dir-column orderList-header">
+					<view class="orderList-search">
+						<view class="search-main">
+							<view class="search-box dis-flex flex-y-center">
+								<view class="search-input">
+									<view class="i icon iconfont icon-sousuo"></view>
+									<input
+										type="text"
+										value=""
+										placeholder="请输入关键字进行搜索"
+										placeholder-style="color:#999999;margin-left:10upx;"
+										class="f-24"
+										v-model="keyword"
+										@blur="doSearch"
+									/>
+								</view>
+								<view class="pullDown">
+									<picker @change="bindPickerChange" :value="index" :range="array">
+										<view class="uni-input t-r f-28" style="color: #999999;">
+											{{ array[index] }}
+											<text class="iconfont icon-unfold" style="font-size: 28upx;"></text>
+										</view>
+									</picker>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="topNav">
+						<view @click="changeStatus(2)">
+							<view :class="status == 2 ? 'check' : ''">
+								<span>出售中</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(4)">
+							<view :class="status == 4 ? 'check' : ''">
+								<span>已下架</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(5)">
+							<view :class="status == 5 ? 'check' : ''">
+								<span>审核中</span>
+								<view class="line"></view>
+							</view>
+						</view>
+						<view @click="changeStatus(8)">
+							<view :class="status == 8 ? 'check' : ''">
+								<span>回收站</span>
+								<view class="line"></view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="full"></view>
+
+				<!-- 列表区域 -->
+				<scroll-view class="scrollList" :style="{ height: scrollHeight }" :scroll-y="true" @scrolltolower="load" :lower-threshold="0">
+					<!-- 循环模板 -->
+					<nonemores v-if="total == 0"></nonemores>
+					<view class="orderMb" v-for="(item, index) in goodsList" v-if="total !== 0">
+						<view class="orderMbPackage">
+							<view class="mbLeft"><image :src="item.thumb" /></view>
+							<view class="mbRight">
+								<view>
+									<view class="mbRightTitle">
+										<!-- <view><span>{{typeList[item.type-1]}}</span></view> -->
+										<span style="display: block;width: 440upx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ item.name }}</span>
+									</view>
+									<view class="mbRightBody">
+										<view>
+											<span>销量:{{ item.salenum || '0' }}</span>
+										</view>
+										<view>
+											<text>
+												{{
+													item.status == '4'
+														? '已下架'
+														: item.status == '2'
+														? '出售中'
+														: item.status == '5'
+														? '审核中'
+														: item.status == '8'
+														? '回收站'
+														: ''
+												}}
+											</text>
+										</view>
+									</view>
+									<view class="mbRightFoot">
+										<span>
+											<span></span>
+										<!-- 	{{ item.price }} -->
+										</span>
+										<view @click="popT(index)">
+											<view></view>
+											<view></view>
+											<view></view>
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="popView" v-if="indexs == index" @click="indexs = null">
+							<view @click="changeGoodsStatus(item, 2)" v-if="item.status == '4'">
+								<view><image :src="imgfixUrls + 'merchant/sj.png'" /></view>
+								<span>上架</span>
+							</view>
+							<view @click="changeGoodsStatus(item, 4)" v-if="item.status == '2'">
+								<view><image :src="imgfixUrls + 'merchant/xj.png'" /></view>
+								<span>下架</span>
+							</view>
+							<view @click="changeGoodsStatus(item, 8)" v-if="item.status !== '8'">
+								<view><image :src="imgfixUrls + 'merchant/sc.png'" /></view>
+								<span>删除</span>
+							</view>
+						<!-- 	<view @click="changeGoodsStatus(item, 8)" v-if="item.status == '8'">
+								<view><image :src="imgfixUrls + 'merchant/sc.png'" /></view>
+								<span>删除</span>
+							</view> -->
+							<view @click="goBj(item)">
+								<view><image :src="imgfixUrls + 'merchant/bianj.png'" /></view>
+								<span>编辑</span>
+							</view>
+						</view>
+					</view>
+					<!-- 循环模板 -->
+					<view class="tips" v-if="total !== 0"><loadmore :isMore="isMore"></loadmore></view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<view class="addOrderButton" @click="goAddGoods"><text class="iconfont icon-add f-w"></text></view>
+
+		<popup-view :show="show" type="bottom" @clickmask="onShows" :bottom="'0%'">
+			<view class="b-f popup">
+				<view class="dis-flex" style="padding: 50upx 0;">
+					<view class="flex-box t-c" @click="addGoods">
+						<view
+							class="iconfont icon-goodsfill"
+							style="width: 100upx;height: 100upx;border-radius: 60upx;background-color: #FBC420;margin: 0 auto 30upx;line-height: 100upx;font-size: 40upx;color: #FFFFFF;"
+						></view>
+						<view  style="font-size: 28upx;">添加商品</view>
+					</view>
+					<view class="flex-box t-c" @click="lookclass">
+						<view
+							class="iconfont icon-jingdianwanfa1"
+							style="width: 100upx;height: 100upx;border-radius: 60upx;background-color: #4693FF;margin: 0 auto 30upx;line-height: 100upx;font-size: 40upx;color: #FFFFFF;"
+						></view>
+						<view  style="font-size: 28upx;">查看分类</view>
+					</view>
+				</view>
+				<view class="t-c" style="font-size: 28upx;padding: 20upx 0;border-top: 1px solid #f8f8f8;" @click="onShows">关闭</view>
+			</view>
+		</popup-view>
+	</view>
+</template>
+<script>
+import App from '@/common/js/app.js';
+import Loadlogo from '@/components/template/loadlogo';
+import nonemores from '@/components/template/nonemores.vue';
+import loadmore from '@/components/template/loadmore.vue';
+import PopupView from '@/components/template/PopManager.vue';
+// import TabBars from '@/components/template/tabBar.vue'
+export default {
+	data() {
+		const date = new Date();
+		const years = [];
+		const year = date.getFullYear();
+		const months = [];
+		const month = date.getMonth() + 1;
+		const days = [];
+		const day = date.getDate();
+		for (let i = 1990; i <= date.getFullYear(); i++) {
+			years.push(i);
+		}
+		for (let i = 1; i <= 12; i++) {
+			months.push(i);
+		}
+		for (let i = 1; i <= 31; i++) {
+			days.push(i);
+		}
+		return {
+			hidegoods: 1,
+			isMore: true,
+			indexs: null,
+			typeList: ['抢购', '团购', '拼团', '', '优惠卷', '', '砍价商品'],
+			total: null,
+			goodsList: [],
+			typeShow: 'bottom',
+			keyword: '',
+			popShow: false,
+			scdpText: '',
+			orderlist: [],
+			orderInfo: {},
+			storeid: null,
+			pagetotal: null,
+			type: '',
+			status: 2,
+			sort: '',
+			time: '',
+			page: 1,
+			array: [],
+			catelist: [],
+			index: 0,
+			loadlogo: false,
+			shopShow: '',
+			filterDialog: true,
+			title: 'picker-view',
+			years,
+			year,
+			months,
+			month,
+			days,
+			day,
+			value: [9999, month - 1, day - 1],
+			visible: true,
+			indicatorStyle: `height: ${Math.round(uni.getSystemInfoSync().screenWidth / (750 / 100))}px;`,
+			show: false,
+			itemid:''
+		};
+	},
+	components: {
+		Loadlogo,
+		nonemores,
+		loadmore,
+		PopupView
+	},
+	computed: {},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight;
+				_this.scrollHeight = _this.phoneHight - 125 + 'px';
+			}
+		});
+		
+	},
+	onShow(e) {
+		let _this = this;
+		 uni.$on('datagoods',function(data){
+		        _this.goodsList.forEach((item,index)=>{
+					if(data.id == item.id){
+						console.log(data,_this.goodsList)
+						_this.$set(item,'name',data.name);
+						_this.$set(item,'thumb',data.thumb);
+						if(data.status !== item.status){
+							_this.goodsList.splice(index,1)
+						}
+					}
+				})
+		    });
+			uni.getStorage({
+				key: 'checkStoreid',
+				success: function(res) {
+					_this.storeid = res.data;
+					_this.getStoreGoods('',false,1);
+				}
+			});
+			console.log(_this.goodsList)
+	},
+	mounted() {},
+	//#ifndef H5
+	onReachBottom() {
+		let _this = this;
+		if (_this.total == _this.page) {
+			_this.isMore = true;
+		} else {
+			_this.page++;
+			console.log('下拉了')
+			_this.getStoreGoods('',true);
+		}
+	},
+	//#endif
+	methods: {
+		bindPickerChange(e) {
+			this.goodsList =[];
+			console.log(e);
+			this.index = e.target.value;
+			if (this.index == 0) {
+				this.getStoreGoods();
+			} else {
+				this.catelist.map(item => {
+					if (this.array[this.index] === item.name) {
+						this.itemid = item.id;
+						this.getStoreGoods(item.id);
+					}
+				});
+			}
+		},
+		// 添加商品
+		addGoods() {
+			App.navigationTo({
+				url: 'pages/subPages2/management/addGoods/addGoods'
+			});
+		},
+		// 查看分类
+		lookclass() {
+			App.navigationTo({
+				url: 'pages/subPages2/management/foodclassify/foodclassify'
+			});
+		},
+		// 纯控制显示隐藏
+		onShows() {
+			this.show = !this.show;
+		},
+		goBj(item) {
+			let _this = this;
+			App.navigationTo({
+				url: 'pages/subPages2/management/addGoods/addGoods?id=' + item.id
+			});
+		},
+		goAddGoods() {
+			this.show = !this.show;
+		},
+		init() {
+			
+		},
+		goPost(item) {
+			let _this = this;
+			let type = null;
+			if (item.type == '1') {
+				type = 3;
+			} else if (item.type == '2') {
+				type = 4;
+			} else if (item.type == '3') {
+				type = 6;
+			} else if (item.type == '5') {
+				type = 5;
+			} else {
+				type = 7;
+			}
+			console.info('type', item.type);
+			App.navigationTo({
+				url: 'pages/mainPages/poster/poster?type=' + type + '&id=' + item.id
+			});
+		},
+		// 上下架删除商品接口
+		changeGoodsStatus(item, type) {
+			let _this = this;
+			let data = {
+				storeid: _this.storeid,
+				goodsid: item.id,
+				status: type
+			};
+			App._post_form('&p=citydelivery&do=changeGoodStatus', data, res => {
+				_this.doSearch();
+				uni.showToast({
+					icon: 'none',
+					title: '操作成功',
+					duration: 2000
+				});
+			});
+		},
+		popT(index) {
+			let _this = this;
+			_this.popShow = true;
+			_this.indexs = index;
+		},
+		load() {
+			let _this = this;
+			if (_this.total == _this.page) {
+				_this.isMore = true;
+			} else {
+				_this.page++;
+				console.log('下拉了')
+				_this.getStoreGoods('',true);
+			}
+		},
+		doSearch() {
+			let _this = this;
+			_this.isMore = false;
+			_this.page = 1;
+			_this.indexs = null;
+			let data = {
+				cateid: _this.itemid || '',
+				storeid: _this.storeid,
+				page: _this.page,
+				initialization: 1,
+				status: _this.status,
+				name: _this.keyword
+			};
+			App._post_form('&p=citydelivery&do=deliveGoodsList', data, res => {
+				console.log(res);
+				_this.goodsList = res.data.list;
+				_this.total = res.data.total;
+				_this.isMore = true;
+			});
+		},
+		// 获取店铺商品信息
+		getStoreGoods(cateid,istrue,index) {
+			let _this = this;
+			if(index > _this.page) return;
+			_this.isMore = false;
+			let data = {
+				cateid: cateid || '',
+				storeid: _this.storeid,
+				page: index || _this.page,
+				initialization: 1,
+				status: _this.status,
+				name: _this.keyword
+			};
+			App._post_form('&p=citydelivery&do=deliveGoodsList', data, res => {
+				_this.array = ['全部'];
+				if(istrue){
+					_this.goodsList.push(...res.data.list);
+				}else{
+					_this.goodsList = res.data.list;
+				}
+				_this.total = res.data.total;
+				_this.catelist = res.data.catelist;
+				_this.catelist.map(item => {
+					_this.array.push(item.name);
+				});
+				// for(let i=0;i<res.data.list.length;i++){
+				// 	if((res.data.list[i].goods_name).length>30){
+				// 		console.info('length',(res.data.list[i].goods_name).length)
+				// 		res.data.list[i].goods_name= res.data.list[i].goods_name.slice(0,30)+'...'
+				// 	}
+				// }
+				_this.isMore = true;
+				if(!!index){
+					_this.getStoreGoods('',true,index+1);
+				}
+			});
+		},
+		changeStatus(status) {
+			let _this = this;
+			_this.status = status;
+			_this.doSearch();
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.popup {
+	width: 100vw;
+}
+.dataPicker1 {
+	width: 70upx;
+	height: 82upx;
+	display: inline-block;
+}
+.addOrderButton {
+	width: 80upx;
+	height: 80upx;
+	position: fixed;
+	border-radius: 60upx;
+	bottom: 80upx;
+	left: 330upx;
+	background: rgba(51, 136, 255, 1);
+	text-align: center;
+	> text {
+		line-height: 76upx;
+		font-size: 40upx;
+		color: rgba(255, 255, 255, 1);
+	}
+}
+.tips {
+	height: 180upx;
+	text-align: center;
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+		color: black;
+	}
+}
+.popView {
+	position: relative;
+	bottom: 220upx;
+	background: rgba(0, 0, 0, 0.5);
+	height: 220upx;
+	width: 100%;
+	display: flex;
+	justify-content: space-around;
+	> view {
+		margin-top: 60upx;
+		display: inline-block;
+		vertical-align: middle;
+		text-align: center;
+		> view {
+			overflow: hidden;
+			width: 66upx;
+			height: 66upx;
+			border-radius: 50%;
+			> image {
+				width: 66upx;
+				height: 66upx;
+			}
+		}
+		> span {
+			display: inline-block;
+			margin-top: 10upx;
+			font-size: 24upx;
+			color: rgba(221, 221, 221, 1);
+		}
+	}
+}
+.mbRightFoot {
+	display: flex;
+	justify-content: space-between;
+	> span {
+		vertical-align: bottom;
+		font-size: 36upx;
+		color: rgba(255, 68, 68, 1);
+		> span {
+			font-size: 24upx;
+		}
+	}
+	> view {
+		width: 52upx;
+		height: 52upx;
+		border: 2upx solid rgba(204, 204, 204, 1);
+		border-radius: 50%;
+		display: flex;
+		justify-content: space-around;
+		> view {
+			margin-top: 25upx;
+			line-height: 52upx;
+			width: 7upx;
+			height: 7upx;
+			background: rgba(102, 102, 102, 1);
+			border-radius: 50%;
+		}
+	}
+}
+.mbRightBody {
+	display: flex;
+	justify-content: space-between;
+	margin-top: 10upx;
+	> view {
+		> span {
+			font-size: 24upx;
+			color: rgba(153, 153, 153, 1);
+		}
+		> span:nth-child(2) {
+			margin-left: 10upx;
+		}
+	}
+	> view {
+		> text {
+			font-size: 24upx;
+			color: #ff4444;
+		}
+	}
+}
+.mbRight {
+	height: 159upx;
+	margin-left: 20upx;
+	width: 450upx;
+	> view {
+		height: 159upx;
+		display: flex;
+		justify-content: space-between;
+		flex-direction: column;
+	}
+}
+.mbRightTitle {
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+		width: 52upx;
+		height: 30upx;
+		background: rgba(255, 68, 68, 1);
+		border-radius: 4upx;
+		text-align: center;
+		> span {
+			line-height: 30upx;
+			display: inline-block;
+			font-size: 20upx;
+
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+	> span {
+		margin-left: 10upx;
+		vertical-align: middle;
+		font-size: 26upx;
+
+		font-weight: bold;
+		color: rgba(51, 51, 51, 1);
+	}
+}
+.mbLeft {
+	width: 159upx;
+	height: 159upx;
+	border-radius: 10upx;
+	> image {
+		width: 159upx;
+		height: 159upx;
+	}
+}
+.orderMbPackage {
+	padding: 30upx;
+	> view {
+		display: inline-block;
+		vertical-align: middle;
+	}
+}
+.orderMb {
+	height: 220upx;
+	overflow: hidden;
+	margin: 20upx auto 0 auto;
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.full {
+	height: 220upx;
+	background: #f6f6f6;
+}
+.scrollList {
+	background: #f6f6f6;
+}
+.tips {
+	height: 180upx;
+	text-align: center;
+
+	> span {
+		line-height: 80upx;
+		font-size: 28upx;
+
+		color: black;
+	}
+}
+page {
+	font-size: 0;
+	background-color: #f6f6f6;
+}
+
+.color-33 {
+	color: #333333;
+}
+
+.color-red {
+	color: #ff4444;
+}
+.container {
+	.orderList-header {
+		z-index: 2;
+		position: fixed;
+		top: 0upx;
+		left: 0;
+		right: 0;
+	}
+	.topNav {
+		// top: 88upx;
+		// width: 750upx;
+		// height: 86upx;
+		background: rgba(255, 255, 255, 1);
+		display: flex;
+		justify-content: space-between;
+
+		.line {
+			position: absolute;
+			opacity: 0;
+			bottom: 0;
+			display: inline-block;
+			width: 48upx;
+			height: 7upx;
+			left: 50%;
+			transform: translateX(-50%);
+			background: #3388ff;
+			border-radius: 4px 4px 0px 0px;
+		}
+
+		> view {
+			text-align: center;
+			width: 20%;
+			display: inline-block;
+
+			> view {
+				height: 81upx;
+				margin: auto;
+				border-bottom: 4upx solid rgba(0, 0, 0, 0);
+				position: relative;
+
+				> span {
+					line-height: 85upx;
+					font-size: 24upx;
+
+					color: rgba(51, 51, 51, 1);
+				}
+			}
+		}
+	}
+	.check {
+		.line {
+			opacity: 1;
+		}
+
+		> span {
+			font-size: 28upx !important;
+
+			font-weight: 500 !important;
+			color: #3388ff !important;
+		}
+	}
+	// 搜索栏内容
+	.search-main {
+		.search-box {
+			.search-input {
+				position: relative;
+				padding: 0 60upx 0 80upx;
+				margin-right: 40upx;
+				background: rgba(246, 246, 246, 1);
+				height: 76upx;
+				border-radius: 38upx;
+				flex: 0.8;
+
+				input {
+					width: 100%;
+					height: 100%;
+				}
+
+				.icon.icon-sousuo {
+					position: absolute;
+					top: 50%;
+					transform: translateY(-50%);
+					left: 30upx;
+				}
+			}
+			.pullDown {
+				flex: 0.2;
+			}
+
+			.search-select {
+				width: 100upx;
+				white-space: nowrap;
+				color: #333333;
+
+				.icon {
+					margin-left: 10upx;
+					color: #999999;
+				}
+			}
+		}
+	}
+
+	//权限名字
+	.permission-name {
+		font-size: 28upx;
+
+		color: rgba(153, 153, 153, 1);
+	}
+
+	// 头部内容
+	.pages-header {
+		width: 100%;
+		height: 400upx;
+		background-repeat: no-repeat;
+		background-size: 100% 400upx;
+	}
+
+	// 详情内容
+	.orderList {
+		background-color: #ffffff;
+		// padding-bottom: 100upx;
+		.orderList-search {
+			padding: 30upx;
+			background-color: #ffffff;
+		}
+
+		.orderList-body {
+			padding: 30upx;
+			margin-top: 206upx;
+			background-color: #f6f6f6;
+
+			.orderList-list-item {
+				padding: 30upx;
+				border-radius: 10upx;
+				background: #ffffff;
+				.user-msg {
+					padding: 25upx 30upx;
+					background: rgba(248, 248, 248, 1);
+					border-radius: 8upx;
+					color: #999999;
+					.blue {
+						color: #2196f3;
+					}
+					.img {
+						margin: 0 15upx 0 43upx;
+						height: 34upx;
+						width: 34upx;
+					}
+				}
+				.orderList-list-item-header {
+					padding-bottom: 28upx;
+					.color-status {
+						color: #3388ff;
+					}
+					.tag {
+						padding: 4upx;
+						border: 1px solid #ff4444;
+						border-radius: 4upx;
+						text-align: center;
+						font-size: 20upx;
+						margin-right: 20upx;
+						color: #ff4444;
+					}
+				}
+
+				.orderList-list-item-content {
+					padding: 30upx 0;
+					border-bottom: 1px solid rgb(238, 238, 238);
+
+					.orderList-img {
+						width: 130upx;
+						height: 130upx;
+						border-radius: 4upx;
+						margin-right: 30upx;
+						flex-shrink: 0;
+					}
+
+					.goods-name {
+						color: #000000;
+						line-height: 36upx;
+					}
+
+					.goods-sku {
+						color: #999999;
+					}
+				}
+
+				.orderList-list-item-footer {
+					.footer-item {
+						padding-top: 30upx;
+						.btn {
+							width: 109upx;
+							height: 50upx;
+							line-height: 50upx;
+							text-align: center;
+							background: #3388ff;
+							color: #ffffff;
+							font-size: 24upx;
+							border-radius: 25upx;
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/map/address-search.vue b/pages/subPages2/map/address-search.vue
new file mode 100644
index 0000000..8ff8ef5
--- /dev/null
+++ b/pages/subPages2/map/address-search.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class='container'>
+		<view class='header bg-ff row padding'>
+			<icon type='search' size='22' color='#999' />
+			<input placeholder='请输入地址' class='col padding-l' @input='bindInput' focus auto-focus @confirm='bindConfirm'></input>
+		</view>
+		<view class='bg-ff'>
+			<view class='padding color-99 font-26'>从下面列表中选择</view>
+			<view class='padding border-t list position-r' v-for='(item, index) in list' :key='index' @click='address(item)'>
+				<view class='padding-b'>{{item.title}}</view>
+				<view class='color-99'>{{item.address}}</view>
+			</view>
+			<view class='icon_img_tip' v-if='pageStatus && list.length == 0'>
+				<image src='/icon/icon_tip.png' />
+				<view>快去添加地址吧~~</view>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	const app = getApp()
+	var QQMapWX = require('@/common/js/qqmap-wx-jssdk.min.js')
+	var qqmapsdk = new QQMapWX({
+		key: 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
+	})
+	export default {
+		data() {
+			return {
+				list: []
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: '搜索地址'
+			})
+		},
+		methods: {
+			searchList(n) {
+				let that = this
+				qqmapsdk.getSuggestion({
+					keyword: n,
+					success: res => {
+						console.log(res)
+						that.setData({
+							list: res.data
+						})
+					},
+					fail: err => {
+						console.log(err)
+					}
+				})
+			},
+			bindInput(e) {
+				let val = e.detail.value
+				this.searchList(val)
+			},
+			bindConfirm(e) {
+				let val = e.detail.value
+				this.searchList(val)
+			},
+			address(item) {
+				console.log(item);
+				let pages = getCurrentPages()
+				let prePages = pages[pages.length - 2].$vm
+				
+				console.log(prePages);
+				let list = prePages.list
+				let map = prePages.map
+				map.longitude = item.location.lng
+				map.latitude = item.location.lat
+				prePages.address = item
+				prePages.list = list
+				prePages.map = map
+				prePages.position = {
+						longitude: item.location.lng,
+						latitude: item.location.lat
+					}
+				prePages.checked = 0
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			setData(obj) {
+				Object.assign(this, obj)
+			},
+		}
+	}
+</script>
+
+<style>
+	/**app.wxss**/
+	page, view, scroll-view, swiper, block, icon, text, rich-text, button, input, label, picker, picker-view, slider, textarea, navigator, image, video, map, video{margin: 0; padding: 0; box-sizing: border-box;}
+	
+	page{background: #F6F6F6;font-size: 32rpx;}
+	image{display: block;}
+	
+	.item, .item-forward{background: #fff;padding: 25rpx 90rpx 25rpx 25rpx;position: relative;line-height: 46rpx;}
+	.item-forward::before{content: '';width: 20rpx;height: 20rpx;border-top: 2px solid #a9a9a9;border-right: 2px solid #a9a9a9;border-radius: 2px;position: absolute;top: 50%;right: 35rpx;transform: rotate(45deg) translateY(-50%);}
+	.item image, .item-forward image{width: 46rpx;height: 46rpx;display: block;margin-right: 10rpx;position: relative;}
+	.active{background: #eee;}
+	
+	.row, .item, .item-forward, .coupons{display: flex;width: 100%;}
+	.row-wrap{flex-wrap: wrap;}
+	.col, .coupons .left{flex: 1;display: block;width: 100%;}
+	.col-center{height: 100%;display: flex;align-items: center;}
+	.float-r{float: right;}
+	.padding{padding: 20rpx 25rpx;}
+	.padding-t{padding-top: 20rpx;}
+	.padding-b{padding-bottom: 20rpx;}
+	.padding-l{padding-left: 25rpx;}
+	.padding-r{padding-right: 25rpx;}
+	.padding-tb{padding-top: 20rpx;padding-bottom: 20rpx;}
+	.padding-lr{padding-left: 25rpx;padding-right: 25rpx;}
+	.margin{margin: 20rpx 25rpx;}
+	.margin-t{margin-top: 20rpx;}
+	.margin-b{margin-bottom: 20rpx;}
+	.margin-tb{margin-top: 20rpx;margin-bottom: 20rpx;}
+	.margin-lr{margin-left: 25rpx;margin-right: 25rpx;}
+	.border, .border-t, .border-r, .border-b, .border-l{position: relative;}
+	.border{border: .5px solid #eee;}
+	.border-t::after, .border-r::after, .border-b::after, .border-l::after{content: '';position: absolute;/*background: #eee;*/background: linear-gradient(to top, #eee .7px, transparent .7px);}
+	.border-t::after, .border-b::after{height: 1px;left: 25rpx;right: 25rpx;top: 0;}
+	.border-b::after{top: auto;bottom: 0;}
+	.border-l::after, .border-r::after{width: 1px;top: 0;bottom: 0;left: 0;background: linear-gradient(to right, #eee .7px, transparent .7px);}
+	.border-r::after{left: auto;right: 0;}
+	
+	.bg{background: #E74246;}
+	.bg-ff{background: #fff;}
+	.color{color: #E74246;}
+	.color-00{color: #000;}
+	.color-ff{color: #fff;}
+	.color-99, .icon_img_tip{color: #999;}
+	.color-6c{color: #6c6c6c;} 
+	.text-right{text-align: right;}
+	.font-26{font-size: 26rpx;}
+	
+	.position-r{position: relative;}
+.container{padding-top: 110rpx;}
+.header{position: fixed;z-index: 999;top: 0;left: 0;border-bottom: 1px solid #eee;}
+</style>
diff --git a/pages/subPages2/map/index.vue b/pages/subPages2/map/index.vue
new file mode 100644
index 0000000..6bc7677
--- /dev/null
+++ b/pages/subPages2/map/index.vue
@@ -0,0 +1,409 @@
+<template>
+	<view class='container'>
+		<view class='header bg-ff'>
+			<view class='row padding border-b font-26'>
+				<view class='col ellipsis-1'>
+					<view class='ellipsis-1'>
+						<view class=''>
+							<text class='color'>[当前] </text>{{address.title}}
+						</view>
+						<view class='color-99 ellipsis-1'>
+							{{address.address}}
+						</view>
+					</view>
+				</view>
+				<view class='padding-l' @click='addressSearch'>
+					<icon class='icon_search' type='search' size='22' color='#666' />
+				</view>
+			</view>
+			<view class='row padding font-26'>
+				<input class='col' placeholder='补充详细地址：门牌号、楼房、房间号' v-model='detail' @confirm='submit'></input>
+				<view class='bg color-ff padding-lr btn border' @click='submit'>确定</view>
+			</view>
+		</view>
+		<map id='map' :scale='map.scale' :show-location='map.showLocation' :longitude='map.longitude' :latitude='map.latitude'
+		 :width='map.width' :height='map.height' :controls='map.controls' :markers='map.markers' @regionchange='mapChange'>
+			<!-- <cover-view class='icon-position' style="margin-top: 100px;"> -->
+				<cover-image src="/static/icon_position.png" class="icon-img"></cover-image>
+			<!-- </cover-view> -->
+		</map>
+		
+		<view class='footer bg-ff font-26'>
+			<scroll-view scroll-y class='scroll' :scroll-top='scrollTop'>
+				<view >
+					<view class='padding border-b position-r' v-for='(item, index) in list' :key='index' @click='bindAddress(index)'>
+						<view class='row'>{{item.title}}</view>
+						<view class='row color-99'>{{item.address}}</view>
+						<icon type='success' color='#E74246' size='22' class='icon_circle' v-if='checked === index' />
+					</view>
+				</view>
+				
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	const app = getApp()
+	var QQMapWX = require('@/common/js/qqmap-wx-jssdk.min.js')
+	var qqmapsdk = new QQMapWX({
+	  key: 'LXCBZ-NNIKD-UZ64F-H6AFI-UNJLH-OCFGE'
+	})
+	export default {
+		data() {
+			return {
+				detail: '',
+				map: {
+					longitude: 113.76927057974245,
+					latitude: 34.76670519464811,
+					showLocation: true,
+					iconPath: '/static/icon_position.png',
+					width: 40,
+					height: 40,
+					scale: 16,
+					controls: [{
+						id: 'map',
+						iconPath: '/static/icon_position.png',
+						position: { left: 1200, top: 1200, width: 40, height: 40},
+						clickable: false
+					}]
+				},
+				list: [],
+				oftenList: [],
+				address: {
+					title: '',
+					address: ''
+				},
+				checked: 0,
+				scrollTop: 0,
+				mapStatus: 1 // 控制选择地址时 地图不加载附近列表
+			}
+		},
+		created() {
+			uni.setNavigationBarTitle({
+				title: '搜索地址'
+			})
+		},
+		onLoad(options) {
+			console.log('改了又把',JSON.stringify(options))
+			let curLoction = uni.getStorageSync('curLoction')
+			if(!!curLoction && curLoction.longitude){
+				this.map.longitude = curLoction.longitude;
+				this.map.latitude = curLoction.latitude;
+			}
+			if(options.lat){
+				this.map.longitude = options.lng;
+				this.map.latitude = options.lat;
+			}
+			let map = this.map;
+			this.getAddress()
+			// this.getWidthHeight(e => {
+			// 	console.log(e);
+			//   map.controls[0].position.top = e.height - 45
+			//   map.controls[0].position.left = e.width/2 - 10
+			//   this.setData({
+			// 	map: map
+			//   })
+			// })
+			
+		},
+		methods: {
+			getAddress (){
+			    let that = this
+			    uni.getLocation({
+			      type: 'gcj02',
+			      success: function(res) {
+			        console.log(res)
+			        let map = that.data.map
+			        map.longitude = res.longitude
+			        map.latitude = res.latitude
+			        that.getWidthHeight(e => {
+			          map.controls[0].position.top = e.height / 2 - 35
+			          map.controls[0].position.left = e.width / 2 - 20
+			          that.setData({
+			            map: map,
+			            position: {
+			              longitude: res.longitude,
+			              latitude: res.latitude
+			            }
+			          })
+			          that.getAddressList(1)
+			        })
+			      },
+			    })
+			  },
+			  
+			getWidthHeight (fn){
+				var query = uni.createSelectorQuery()
+				query.select('#map').boundingClientRect()
+				query.exec(res => {
+				  fn(res[0])
+				})
+			  },
+			getAddressList(s = 0) {
+				let that = this
+				let position = that.position
+				console.log(position)
+				qqmapsdk.reverseGeocoder({
+					location: {
+						latitude: position.latitude,
+						longitude: position.longitude
+					},
+					get_poi: 1,
+					poi_options: "page_size=20;page_index=1",
+					success: function(e) {
+						if (s) {
+							e.result.pois[0].select = 1
+							that.setData({
+								list: e.result.pois,
+								address: e.result.pois[0],
+								checked: 0
+							})
+						} else {
+							that.setData({
+								list: e.result.pois
+							})
+						}
+						
+						setTimeout(() => {
+							console.log('************');
+							that.scrollTop = 1
+						}, 1000)
+					},
+					fail: err => {
+						console.log(err)
+					}
+				})
+			},
+			mapChange(e) {
+				let that = this
+				console.log(this.mapStatus);
+				clearTimeout(this.timer)
+				this.timer = setTimeout(() => {
+					if (e.type == 'end') {
+						that.mapCtx = uni.createMapContext('map')
+						that.mapCtx.getCenterLocation({
+							success: res => {
+								console.log(res)
+								that.setData({
+									position: {
+										latitude: res.latitude,
+										longitude: res.longitude
+									}
+								})
+								
+								if (that.mapStatus) { // 防止地图点击时 进行多次加载
+									that.getAddressList(1)
+								} else {
+									that.mapStatus = 1
+								}
+							}
+						})
+					}
+				}, 200)
+				
+			},
+			bindAddress(index) {
+				let list = this.list
+				let map = this.map
+				map.latitude = list[index].location.lat
+				map.longitude = list[index].location.lng
+				this.setData({
+					map: map,
+					checked: index,
+					address: list[index],
+					mapStatus: 0
+				})
+			},
+			setData(obj){
+				Object.assign(this, obj)
+			},
+			addressSearch() {
+				// uni.navigateTo({
+				// 	url: '/pages/address-search/address-search'
+				// });
+				App.navigationTo({
+					url: 'pages/subPages2/map/address-search'
+				});
+			},
+			submit() {
+				let that = this
+				let detail = that.detail || ''
+				let address = that.address
+				let a = {
+					address: address.title + detail,
+					lat: address.location.lat,
+					lng: address.location.lng
+				}
+				let pages = getCurrentPages()
+				let prePages = pages[pages.length - 2].$vm
+				let lblis = prePages.lblis
+				if(!lblis){
+					lblis = {}
+				}
+				let userInfo = prePages.userInfo
+				userInfo.address = a.address
+				lblis.lng = a.lng
+				lblis.lat = a.lat
+				userInfo.lng = a.lng
+				userInfo.lat = a.lat
+				prePages.userInfo = userInfo
+				prePages.lblis = lblis
+				uni.navigateBack({
+					delta: 1
+				})
+				console.log(address, a,)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/**app.wxss**/
+	page, view, scroll-view, swiper, block, icon, text, rich-text, button, input, label, picker, picker-view, slider, textarea, navigator, image, video, map, video{margin: 0; padding: 0; box-sizing: border-box;}
+	
+	page{background: #F6F6F6;font-size: 32rpx;}
+	image{display: block;}
+	
+	.item, .item-forward{background: #fff;padding: 25rpx 90rpx 25rpx 25rpx;position: relative;line-height: 46rpx;}
+	.item-forward::before{content: '';width: 20rpx;height: 20rpx;border-top: 2px solid #a9a9a9;border-right: 2px solid #a9a9a9;border-radius: 2px;position: absolute;top: 50%;right: 35rpx;transform: rotate(45deg) translateY(-50%);}
+	.item image, .item-forward image{width: 46rpx;height: 46rpx;display: block;margin-right: 10rpx;position: relative;}
+	.active{background: #eee;}
+	
+	.row, .item, .item-forward, .coupons{display: flex;width: 100%;}
+	.row-wrap{flex-wrap: wrap;}
+	.col, .coupons .left{flex: 1;display: block;width: 100%;}
+	.col-center{height: 100%;display: flex;align-items: center;}
+	.float-r{float: right;}
+	.padding{padding: 20rpx 25rpx;}
+	.padding-t{padding-top: 20rpx;}
+	.padding-b{padding-bottom: 20rpx;}
+	.padding-l{padding-left: 25rpx;}
+	.padding-r{padding-right: 25rpx;}
+	.padding-tb{padding-top: 20rpx;padding-bottom: 20rpx;}
+	.padding-lr{padding-left: 25rpx;padding-right: 25rpx;}
+	.margin{margin: 20rpx 25rpx;}
+	.margin-t{margin-top: 20rpx;}
+	.margin-b{margin-bottom: 20rpx;}
+	.margin-tb{margin-top: 20rpx;margin-bottom: 20rpx;}
+	.margin-lr{margin-left: 25rpx;margin-right: 25rpx;}
+	.border, .border-t, .border-r, .border-b, .border-l{position: relative;}
+	.border{border: .5px solid #eee;}
+	.border-t::after, .border-r::after, .border-b::after, .border-l::after{content: '';position: absolute;/*background: #eee;*/background: linear-gradient(to top, #eee .7px, transparent .7px);}
+	.border-t::after, .border-b::after{height: 1px;left: 25rpx;right: 25rpx;top: 0;}
+	.border-b::after{top: auto;bottom: 0;}
+	.border-l::after, .border-r::after{width: 1px;top: 0;bottom: 0;left: 0;background: linear-gradient(to right, #eee .7px, transparent .7px);}
+	.border-r::after{left: auto;right: 0;}
+	.ellipsis-1{overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+	.bg{background: #E74246;}
+	.bg-ff{background: #fff;}
+	.color{color: #E74246;}
+	.color-00{color: #000;}
+	.color-ff{color: #fff;}
+	.color-99, .icon_img_tip{color: #999;}
+	.color-6c{color: #6c6c6c;} 
+	.text-right{text-align: right;}
+	.font-26{font-size: 26rpx;}
+	
+	.position-r{position: relative;}
+	
+	
+	
+
+
+	page {
+		position: relative;
+	}
+
+	.map, map {
+		width: auto;
+		height: auto;
+		position: fixed;
+		left: 0;
+		top: 100px;
+		right: 0;
+		bottom: 210px;
+	}
+	.map{display: flex;align-items: center;justify-content: center;}
+	.header {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		height: 100px;
+		overflow: hidden;
+	}
+
+	.icon_search {
+		margin-top: 20rpx;
+	}
+
+	.btn {
+		line-height: 25px;
+		border-radius: 4rpx;
+		margin-top: -5rpx;
+	}
+
+	.footer {
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		height: 210px;
+	}
+
+	.foot-border {
+		border-bottom: 1px solid #eee;
+		line-height: 32rpx;
+	}
+
+	.foot-border .padding {
+		padding: 25rpx;
+	}
+
+	.foot-active {
+		color: #E74246;
+		position: relative;
+	}
+
+	.foot-active::after {
+		content: '';
+		position: absolute;
+		height: 2px;
+		background: #E74246;
+		border-radius: 2px;
+		bottom: 0;
+		width: 5em;
+		left: 50%;
+		transform: translateX(-50%);
+	}
+
+	.scroll {
+		position: absolute;
+		left: 0;
+		right: 0;
+		top: 0;
+		bottom: 0;
+	}
+
+	.scroll .padding {
+		padding-right: 40px;
+	}
+
+	.scroll .icon_circle {
+		position: absolute;
+		right: 25rpx;
+		top: 50%;
+		transform: translateY(-50%);
+	}
+
+	.icon_img_tip {
+		padding: 20rpx 0;
+	}
+	.icon-position{
+		position: relative;top: 50%;left: 50%;width: 36px;height: 36px;transform: translate(-50%, -50%);
+		.icon-img{width: 36px;height: 36px;display: block;position: fixed;top: 100px;left: 100px;}
+	}
+	.icon-img{width: 36px;height: 36px;display: block;position: fixed;top: 50%;left: 50%;transform: translate(-50%, -50%);margin-top: -70px;}
+</style>
diff --git a/pages/subPages2/newBuyOrder/buyOrder.vue b/pages/subPages2/newBuyOrder/buyOrder.vue
new file mode 100644
index 0000000..e638204
--- /dev/null
+++ b/pages/subPages2/newBuyOrder/buyOrder.vue
@@ -0,0 +1,1269 @@
+<template>
+	<loadlogo v-if="loadlogo"></loadlogo>
+	<view v-else class="buyOrder" :style="{ height: phoneHight }">
+		<far-bottom></far-bottom>
+		<!-- <loading v-if="loadlogo"></loading> -->
+		<view class="content padding-box-all" style="padding-top: 66upx;">
+			<form>
+				<view class="gross-amount" v-if="type != 3 && useInfo.payonline != 0 && type != 1">
+					<view class="amount-img">
+						<image
+							style="width: 100%;height: 100%;"
+							:src="useInfo.storelogo"
+							mode=""
+						></image>
+					</view>
+					<view class="amount-title">{{useInfo.name}}</view>
+					<view class="amount-je" style="">金额</view>
+					<view class="amount-input dis-flex">
+						<view class="amount-icon" style="flex: 0.1;">¥</view>
+						<view  style="flex: 0.9;">
+							<input type="digit" class="t-r amount-input-l" placeholder-style="color: #999999;font-weight: 400;font-size: 16px;" placeholder="输入支付金额" v-model="consumPrice" value="" />
+						</view>
+					</view>
+					<view class="dis-flex amount-radio" v-if="Number(useInfo.discount) != 10">
+						<view class="radio-name">输入不参与优惠金额</view>
+						<view class="radio-radio" @click="iScouponCheck">
+							<radio-group name="couponPrice"><radio value="radio1" :checked="iScoupon" color="#FF4444" /></radio-group>
+						</view>
+					</view>
+					<view class="amount-num" v-if="iScoupon">
+						<view class="dis-flex">
+							<view class="amount-icon">{{'不参与优惠金额(元)'}}
+							<view class="f-20 col-9" style="padding-top: 10upx;">
+								{{useInfo.limit}}
+							</view>
+							</view>
+							<view  style="flex: 0.5;">
+								<input type="digit" value="" class="t-r" name="notconsumpPrice" placeholder-style="color: #999999;font-weight: 400;" placeholder="请输入具体金额" :disabled="!iScoupon" v-model="notconsumPrice" />
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="preferential b-f" v-if="useInfo.payonline != 0 && type != 1">
+					<view class="dis-flex bottom-bor" style="" v-if="consumPrice>0 && useInfo.redpackflag == 1">
+						<view class="regpack">红包优惠</view>
+						<view class="regpacknum" @click="openRegpack">
+							<text>{{redPackageNum}}</text>
+							<!-- <text>使用红包</text> -->
+							<text class="iconfont icon-right" style="color: #999999;font-size: 26upx;"></text>
+						</view>
+					</view>
+					<view class="bottom-bor dis-flex" v-if="Number(useInfo.discount) != 10 || vipCouponPrice != 0">
+						<view class="regpack">{{useInfo.levelarmy == 1?'拥军减免':'会员减免'}}</view>
+						<view class="regpacknum" >
+							<text v-if="useInfo.tip == 0">{{vipCouponPrice==0?`${useInfo.discount}折`:`-¥${vipCouponPrice}`}}</text>
+							<text v-else>{{useInfo.tip}}</text>
+						</view>
+					</view>
+					<view class="bottom-bor" v-if="useInfo.payinrate && maxPointsDeduction > 0" style="padding: 30upx 0;">
+						<view >
+							<view class=" dis-flex flex-x-between flex-y-center" v-if="type == '2' || (type == '1' && payonline == '0') || type == ''">
+								<view class="dis-flex flex-y-center">
+									<!-- <view class="iconfont icon-check f-w t-c checkedjifen" @click="jifenchecked(0)" v-if="checkedjifen" ></view>
+									<view class="checkedjifen" @click="jifenchecked(1)" v-else></view> -->
+									<view class="f-28 col-3 m-right10">{{ TextSubstitution.credittext }}抵扣</view>
+									<switch style="padding-left: 20upx;transform:scale(0.7)" @change="switch1Change" />
+								</view>
+								<view class="mitigate-price f-24" style="line-height: 30upx;" v-if="!checkedjifen">
+									最多抵扣{{ Math.round((Number(maxPointsDeduction)) * 100) / 100}}元
+								</view>
+								<view class="mitigate-price f-28" style="line-height: 30upx;color: #FF4444;font-size: 28upx;" v-if="checkedjifen">
+									-¥{{ Math.round((Number(maxPointsDeduction)) * 100) / 100}}
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="bottom-bor dis-flex" v-if="consumPrice>0 && Number(overprice)">
+						<view class=" flex-y-center" style="flex: 0.5;">
+							<view class="f-30 col-3 m-right10">{{ useInfo.fullreducelist.title }}</view>
+						</view>
+						<view class="mitigate-price f-26 t-r" style="flex: 0.5;line-height: 40upx;color: #FF4444;">-¥{{ overprice }}</view>
+					</view>
+					<view class="bottom-bor" v-if="type !== '3'">
+						<view class="settlement t-c">
+							<view class="f-32 dis-il-block" style="line-height: 68upx;vertical-align: top;">¥</view>
+							<text>{{ Math.round((Number(buyPrice)) * 100) / 100}}</text>
+						</view>
+					</view>
+					<button
+						formType="submit"
+						class="submit-btn t-c bor-radius-10upx f-28 col-f"
+						hover-class="hoverButton"
+						v-if="type != 3"
+						@click="usePayOnline"
+						:class="buttonType == '1' ? '' : 'cantClick'"
+					>
+						{{ type == '' ? '和店员已确认,立即买单' : type == '1' || type == '2' ? '确认核销使用' : '点击使用礼包' }}
+					</button>
+					<view class="t-c" style="padding: 30upx 0;color: #999999;font-size: 24upx;" v-if="type != 3" @click="shopShowrich = true">
+						买单说明
+						<text class="iconfont icon-right" style="color: #999999;font-size: 24upx;"></text>
+					</view>
+				</view>
+				<view class="t-c col-9 f-24" style="padding: 20upx 0;" v-if="type != 3 && useInfo.payonline != 0 && type != 1">
+					<text class="iconfont icon-gantanhao f-24"></text>
+					买单仅限于到店支付，请确认金额后提交
+				</view>
+				<view class="input-box b-f" v-if="type == '2' || (type == '1' && payonline == '0') || type == '' && false">
+					<view class="consumption-box-input dis-flex flex-x-between flex-y-center bor-radius-10upx">
+						<view class="f-30 col-3 nwrap">消费总金额</view>
+						<view class="input-style">
+							<input
+								style="background: white;width: 400upx;height: 80upx;font-size: 40upx;"
+								type="digit"
+								value=""
+								class="t-r"
+								name="consumpPrice"
+								v-model="consumPrice"
+							/>
+						</view>
+					</view>
+					<block>
+						<view class="couponPrice-box dis-flex flex-y-center">
+							<view class="radio m-right10" @click="iScouponCheck">
+								<radio-group name="couponPrice"><radio value="radio1" :checked="iScoupon" color="#27CE00" /></radio-group>
+							</view>
+							<view class="f-28 col-c">{{ useInfo.limit }}</view>
+						</view>
+						<block v-if="iScoupon">
+							<view class="consumption-box-input dis-flex flex-x-between flex-y-center bor-radius-10upx">
+								<view class="f-30 col-3">不可优惠金额</view>
+								<view class="input-style">
+									<input style="background: white;" type="digit" value="" class="t-r" name="notconsumpPrice" :disabled="!iScoupon" v-model="notconsumPrice" />
+								</view>
+							</view>
+						</block>
+					</block>
+				</view>
+				<view class="mitigate-pocket b-f p-r" style="margin-bottom: 30upx;" v-if="type == 3 || !!useInfo.pack">
+					<view class="mitigate dis-flex flex-x-between flex-y-center flex-warp" v-for="(item, index) in useInfo.pack">
+						<view >
+							<view class="f-30 col-3 m-right10">{{ item.name }}</view>
+							<view class="f-24 col-c"></view>
+							<view class="f-24" style="flex: 1;color: #999999;padding-top: 10upx;">
+								<text>{{ item.limit }},</text>
+								<text>剩余{{ item.surplus }}次</text>
+							</view>
+						</view>
+
+						<view class="mitigate-price f-24">
+							<view class="switch" :class="packids.indexOf(item.id) == -1 ? 'grayLine' : ''">
+								<view class="switchOn" @click="checkLb(item.id)" v-if="packids.indexOf(item.id) !== -1">
+									<span></span>
+									<view></view>
+								</view>
+								<view class="switchOff" @click="checkLb(item.id)" v-if="packids.indexOf(item.id) == -1">
+									<view></view>
+									<span></span>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="mitigate-pocket-fgx" v-if="type == '2' || (type == '1' && payonline == '0')">
+						<view class="dotLeft"></view>
+						<view class="dotRight"></view>
+					</view>
+					<view class="mitigate dis-flex flex-x-between flex-y-center" v-if="type == '2' || (type == '1' && payonline == '0') || type == ''">
+						<view class="dis-flex flex-y-center">
+							<view class="f-30 col-3 m-right10">会员减免</view>
+							<view class="f-24 col-c" v-if="useInfo.tip == '0'">会员特权{{ useInfo.discount }}折</view>
+							<view class="f-24 col-c" v-else>{{ useInfo.tip }}</view>
+						</view>
+						<view class="mitigate-price f-24">{{ vipCouponPrice }}元</view>
+					</view>
+					<view class="out-pocket" v-if="useInfo.payinrate && maxPointsDeduction > 0">
+						<view class="mitigate dis-flex flex-x-between flex-y-center" v-if="type == '2' || (type == '1' && payonline == '0') || type == ''">
+							<view class="dis-flex flex-y-center">
+								<!-- <view class="iconfont icon-check f-w t-c checkedjifen" @click="jifenchecked(0)" v-if="checkedjifen" ></view>
+								<view class="checkedjifen" @click="jifenchecked(1)" v-else></view> -->
+								<view class="f-30 col-3 m-right10">{{ TextSubstitution.credittext }}抵扣</view>
+								<switch style="padding-left: 20upx;transform:scale(0.7)" @change="switch1Change" />
+							</view>
+							<view class="mitigate-price f-24" style="line-height: 30upx;">最多抵扣{{ (parseInt(maxPointsDeduction * 100) / 100).toFixed(2) }}元</view>
+						</view>
+					</view>
+					<view class="out-pocket" v-if="useInfo.fullreducelist && flag">
+						<view class="mitigate dis-flex flex-x-between flex-y-center" v-if="type == '2' || (type == '1' && payonline == '0') || type == ''">
+							<view class="dis-flex flex-y-center">
+								<view class="f-30 col-3 m-right10">{{ useInfo.fullreducelist.title }}</view>
+							</view>
+							<view class="mitigate-price f-24">{{ overprice }}元</view>
+						</view>
+					</view>
+					<view class="out-pocket">
+						<view class="mitigate dis-flex flex-x-between flex-y-center" v-if="type == '2' || (type == '1' && payonline == '0') || type == ''">
+							<view class="dis-flex flex-y-center"><view class="f-30 col-3 m-right10">实付金额</view></view>
+							<view class="mitigate-price f-24">{{ (parseInt(buyPrice * 100) / 100).toFixed(2) }}元</view>
+						</view>
+					</view>
+				</view>
+				<view class="store-title f-24 t-c" v-if="type == 3 || useInfo.payonline == 0">
+					<span class="useName">{{ type !== '' ? '持卡人' : '商户' }}:{{ useInfo.name }}</span>
+				</view>
+				<view class="buy-label f-24 col-6" v-if="type == '' && false">买单仅限于到店支付,请确认金额后提交</view>
+				<button
+					formType="submit"
+					class="submit-btn t-c bor-radius-10upx f-28 col-f"
+					hover-class="hoverButton"
+					v-if="type == 3 || useInfo.payonline == 0 || type == 1"
+					@click="usePayOnline"
+					:class="buttonType == '1' ? '' : 'cantClick'"
+				>
+					{{ type == '' ? '和店员已确认,立即买单' : type == '1' || type == '2' ? '确认核销使用' : '点击使用礼包' }}
+				</button>
+			</form>
+		</view>
+
+		<!-- 选择店铺弹框 -->
+		<PopManager :show="shopShow" :type="showType">
+			<view :style="{ height: phoneHight }" class="shopShow">
+				<!-- 商户循环模板 -->
+				<view class="checkStoreMb" v-for="(item, index) in useInfo.shop_list" @click="closeShopShow(item.id)">
+					<view class="checkStoreMbPackage">
+						<view class="logoMb"><image :src="item.logo" /></view>
+						<view class="infoMb">
+							<view>
+								<view>
+									<span>{{ item.storename }}</span>
+								</view>
+								<view>
+									<span>{{ item.address }}</span>
+								</view>
+							</view>
+							<image :src="imgfixUrls + 'merchant/right.svg'" />
+						</view>
+					</view>
+				</view>
+				<!-- 商户循环模板 -->
+			</view>
+		</PopManager>
+		<!-- 选择店铺弹框 -->
+		
+		<!-- 选择店铺弹框 -->
+		<PopManager :show="shopShowrich" :type="'bottom'" @clickmask="shopShowrich = false">
+			<view class="Showrichtext">
+				<view class="Showrichtext-title">
+					买单说明
+				</view>
+				<view  style="overflow: auto;">
+					<jyf-parser
+						domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+						gesture-zoom
+						lazy-load
+						ref="article"
+						selectable
+						show-with-animation
+						use-anchor
+						:html="useInfo.describe"
+					></jyf-parser>
+				</view>
+				
+			</view>
+		</PopManager>
+		
+		<follow
+			:followShow="followShow"
+			:followType="followType"
+			:followTitleShow="followTitleShow"
+			@clickmask="openQrShow"
+			@closeFollowPop="closeFollowPop"
+			@closeFollowTitle="closeFollowTitle"
+		></follow>
+
+		<view class="buyOrderParse b-f padding-box-all" v-if="!!useInfo.describe && type == 3 || useInfo.payonline == 0">
+			<view class="buyOrderParse-title f-28 col-3 t-c m-btm40">买单说明</view>
+			<jyf-parser
+				domain="https://6874-html-foe72-1259071903.tcb.qcloud.la"
+				gesture-zoom
+				lazy-load
+				ref="article"
+				selectable
+				show-with-animation
+				use-anchor
+				:html="useInfo.describe"
+			></jyf-parser>
+		</view>
+		<view  v-if="redPagList.length > 0 || noredPagList.length > 0">
+			<redPagDown ref="redPagDown" @closePops="redPagClosePop(event)" :noorderSubmitInfo="noredPagList" :orderSubmitInfo="redPagList" @priceis="prices"></redPagDown>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+import PopManager from '@/components/template/PopManager';
+import App from '@/common/js/app.js';
+import loading from '@/components/template/loadlogo';
+import util from '@/common/js/util.js';
+import loadlogo from '@/components/template/loadlogo';
+import follow from '@/components/template/follow.vue';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import redPagDown from '@/components/template/redPagDown.vue';
+export default {
+	data() {
+		return {
+			tipsText: '',
+			e: null,
+			followTitleShow: true,
+			followShow: false,
+			followType: '6',
+			sid: null,
+			iScoupon: false,
+			buyData: {},
+			loadlogo: true,
+			vipCouponPrice: 0, //会员优惠价格
+			consumPrice: '', // 消费金额
+			notconsumPrice: '', //不参与优惠金额
+			buyPrice: '0.00', //实付付款金额
+			type: '',
+			sid: '',
+			pack_id: '',
+			useInfo: {
+				pack:[]
+			},
+			shopShow: false,
+			showType: 'bottom',
+			phoneHight: 0,
+			sid: '',
+			packids: [],
+			payonline: null,
+			loading: true,
+			buttonType: 1,
+			usepayonlines: 0,
+			pnePayonlines: 0,
+			overprice: 0,
+			maxPointsDeduction: 0,
+			flag: false,
+			checkedjifen: false,
+			TextSubstitution: {},
+			redPagList: [],
+			noredPagList:[],
+			redpackId:null,
+			cut_money:0,
+			full_money:0,
+			redPackageNum:'使用红包',
+			shopShowrich:false
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		_this.TextSubstitution = uni.getStorageSync('TextSubstitution');
+		_this.e = e;
+		_this.setData({
+			type: e.type || '',
+			mid: e.mid || '',
+			sid: e.sid || ''
+		});
+		console.log(this.e)
+	},
+	components: {
+		loading,
+		PopManager,
+		loadlogo,
+		follow,
+		jyfParser,
+		redPagDown
+	},
+	onShow() {
+		let _this = this;
+		_this.type = _this.e.type || '';
+		_this.mid = _this.mid || '';
+		_this.sid = _this.sid || '';
+		_this.pack_id = _this.e.pack_id || '';
+		let data = {
+			type: _this.type,
+			mid: _this.mid,
+			sid: _this.sid,
+			pack_id: _this.pack_id
+		};
+		console.info('e', _this.e);
+		if (!!_this.type) {
+			if (_this.type == '1') {
+				_this.getUseInfo(_this.type, _this.mid, _this.sid, '', function() {
+					console.info(_this.useInfo);
+					if (_this.useInfo.is_shop == '1') {
+						_this.shopShow = true;
+					}
+				});
+				uni.setNavigationBarTitle({
+					title: '特权使用'
+				});
+			}
+			if (_this.type == '2') {
+				_this.sid = _this.e.sid || '';
+				_this.getUseInfo(_this.type, _this.mid, _this.sid, '', function() {});
+				uni.setNavigationBarTitle({
+					title: '在线买单'
+				});
+			}
+			if (_this.type == '3') {
+				_this.pack_id = _this.e.pack_id || '';
+				_this.getUseInfo(_this.type, _this.mid, '', _this.pack_id, function() {});
+				uni.setNavigationBarTitle({
+					title: '礼包使用'
+				});
+			}
+		} else {
+			_this.payonline = 1;
+			_this.getPayOnlineInfo(_this.sid);
+		}
+	},
+	watch: {
+		notconsumPrice: {
+			handler() {
+				let _this = this;
+				_this.overprice = '0.00';
+				_this.useInfo.discount = Number(_this.useInfo.discount);
+				_this.consumPrice = Number(_this.consumPrice);
+				_this.notconsumPrice = Number(_this.notconsumPrice);
+				_this.buyPrice = Number(_this.buyPrice);
+				_this.vipCouponPrice = Number(_this.vipCouponPrice);
+
+				_this.buyPrice = util.subtractionFloat(_this.consumPrice, _this.notconsumPrice, 100) * (_this.useInfo.discount / 10) + _this.notconsumPrice;
+				if (_this.buyPrice != 0) {
+					_this.buyPrice = _this.buyPrice.toFixed(2);
+				} else {
+					_this.buyPrice = _this.buyPrice;
+				}
+				_this.vipCouponPrice = util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100);
+				if (_this.vipCouponPrice != 0) {
+					_this.vipCouponPrice = _this.vipCouponPrice.toFixed(2);
+				} else {
+					_this.vipCouponPrice = _this.vipCouponPrice;
+				}
+				console.log(this.useInfo, _this.buyPrice, '服劲儿');
+				let buyPriceall = Number(_this.buyPrice);
+				_this.maxPointsDeduction = Math.round((Number(_this.buyPrice) * Number(_this.useInfo.payinrate)) * 100) / 100; //可被积分抵扣的
+				let allintegral = _this.maxPointsDeduction * Number(_this.useInfo.payintegral); //总共需要的积分
+				if (_this.type != '1') {
+					if (allintegral <= Number(_this.useInfo.memberintegral)) {
+						//如果总积分大于需要积分
+						_this.buyPrice = _this.buyPrice - _this.maxPointsDeduction;
+					} else {
+						_this.maxPointsDeduction = Math.round((Number(_this.useInfo.memberintegral) / Number(_this.useInfo.payintegral)) * 100) / 100;
+						_this.buyPrice = _this.buyPrice - _this.maxPointsDeduction;
+					}
+					if (!_this.checkedjifen) {
+						_this.buyPrice = _this.buyPrice + _this.maxPointsDeduction;
+					}
+				}
+				if(buyPriceall >= _this.full_money){
+					_this.buyPrice = Number(_this.buyPrice) - Number(this.cut_money);
+				}
+				console.log('不满减后的计算', _this.buyPrice, _this.maxPointsDeduction);
+				if(_this.buyPrice < 0){
+					_this.buyPrice = 0
+				}
+				if (this.useInfo.fullreducelist) {
+					for (let i = 0; i < this.useInfo.fullreducelist.list.length; i++) {
+						if (
+							Number(buyPriceall) >= Number(this.useInfo.fullreducelist.list[i].full_money) &&
+							(i == 0 ? true : Number(buyPriceall) < Number(this.useInfo.fullreducelist.list[i - 1].full_money))
+						) {
+							console.log(_this.buyPrice, this.useInfo.fullreducelist.list[i]);
+							_this.flag = true;
+							_this.buyPrice = Number(_this.buyPrice) - Number(this.useInfo.fullreducelist.list[i].cut_money);
+							_this.overprice = this.useInfo.fullreducelist.list[i].cut_money;
+							if(_this.buyPrice < 0){
+								_this.buyPrice = 0
+							}
+							return;
+						} else {
+							_this.flag = false;
+						}
+					}
+				}
+				
+			}
+		},
+		iScoupon: {
+			handler() {
+				let _this = this;
+				_this.notconsumPrice = '';
+			}
+		},
+		consumPrice: {
+			handler() {
+				this.consumPrices();
+				this.redPackageNum = '使用红包';
+				this.redpackId = null;
+				this.cut_money = 0;
+				this.full_money = 0;
+				this.checkedjifen = false;
+				this.redPagList = [];
+				this.noredPagList = [];
+			}
+		}
+	},
+	methods: {
+		prices(item){
+			console.log(item);
+			let _this = this;
+			// _this.redpackId = item.id;
+			if (item.check) {
+				_this.redpackId = item.id;
+				_this.cut_money = Number(item.cut_money);
+				_this.full_money = Number(item.full_money);
+				_this.redPackageNum = `-¥${_this.cut_money}`;
+			} else {
+				_this.redpackId = null;
+				_this.cut_money = 0;
+				_this.full_money = 0;
+				_this.redPackageNum = '使用红包';
+			}
+			console.log(_this.cut_money,_this.full_money)
+			_this.consumPrices()
+			
+			// vipCouponPrice
+		},
+		openRegpack(){
+			let _this = this,
+				data = {
+					sid:_this.sid,
+					money:_this.consumPrice -_this.vipCouponPrice
+				};
+			App._post_form(
+				'&p=halfcard&do=getRedpackList',
+				data,
+				res => {
+					console.log(res);
+					let redPagList = res.data.useList;
+					redPagList.map((val,index) => {
+						val.isCheked = false;
+					});
+					_this.setData({
+						redPagList
+					});
+					_this.setData({
+						noredPagList:res.data.noUseList
+					});
+					if(res.data.noUseList.length > 0 || res.data.useList.length > 0){
+						setTimeout(()=>{
+							_this.$refs.redPagDown.redPagss = true;
+						},100)
+					}else{
+						uni.showToast({
+							title:'暂无可用红包',
+							icon:'none'
+						})
+					}
+					
+				},
+				fail => {
+					
+				}
+			);
+		},
+		redPagClosePop(e) {
+			let _this = this;
+			_this.$refs.redPagDown.redPagss = false;
+		},
+		consumPrices() {
+			let _this = this;
+			_this.overprice = '0.00';
+			if (_this.iScoupon) {
+				_this.useInfo.discount = Number(_this.useInfo.discount);
+				_this.consumPrice = Number(_this.consumPrice);
+				_this.notconsumPrice = Number(_this.notconsumPrice);
+				_this.buyPrice = Number(_this.buyPrice);
+				_this.vipCouponPrice = Number(_this.vipCouponPrice);
+				if (util.subtractionFloat(_this.consumPrice, _this.notconsumPrice, 100) * (_this.useInfo.discount / 10) + _this.notconsumPrice != 0) {
+					_this.buyPrice = (util.subtractionFloat(_this.consumPrice, _this.notconsumPrice, 100) * (_this.useInfo.discount / 10) + _this.notconsumPrice).toFixed(2);
+				} else {
+					_this.buyPrice = util.subtractionFloat(_this.consumPrice, _this.notconsumPrice, 100) * (_this.useInfo.discount / 10) + _this.notconsumPrice;
+				}
+				if (util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100) != 0) {
+					_this.vipCouponPrice = util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100).toFixed(2);
+				} else {
+					_this.vipCouponPrice = util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100);
+				}
+			} else {
+				_this.useInfo.discount = Number(_this.useInfo.discount);
+				_this.consumPrice = Number(_this.consumPrice);
+				_this.notconsumPrice = Number(_this.notconsumPrice);
+				_this.buyPrice = Number(_this.buyPrice);
+				_this.vipCouponPrice = Number(_this.vipCouponPrice);
+				if (_this.consumPrice * (_this.useInfo.discount / 10) != 0) {
+					_this.buyPrice = (_this.consumPrice * (_this.useInfo.discount / 10)).toFixed(2);
+				} else {
+					_this.buyPrice = _this.consumPrice * (_this.useInfo.discount / 10);
+				}
+				if (util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100) != 0) {
+					_this.vipCouponPrice = util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100).toFixed(2);
+				} else {
+					_this.vipCouponPrice = util.subtractionFloat(_this.consumPrice, _this.buyPrice, 100);
+				}
+			}
+			console.log('测试价格', _this.buyPrice,Number(_this.buyPrice));
+			let buyPriceall = _this.buyPrice;
+			_this.maxPointsDeduction =  Math.round((Number(_this.buyPrice) * Number(_this.useInfo.payinrate)) * 100) / 100; //可被积分抵扣的
+			let allintegral = _this.maxPointsDeduction * Number(_this.useInfo.payintegral); //总共需要的积分
+			if (_this.type != '1') {
+				if (allintegral <= Number(_this.useInfo.memberintegral)) {
+					//如果总积分大于需要积分
+					_this.buyPrice = _this.buyPrice - _this.maxPointsDeduction;
+				} else {
+					_this.maxPointsDeduction = Math.round((Number(_this.useInfo.memberintegral) / Number(_this.useInfo.payintegral)) * 100) / 100;
+					_this.buyPrice = _this.buyPrice - _this.maxPointsDeduction;
+				}
+				if (!_this.checkedjifen) {
+					_this.buyPrice = _this.buyPrice + _this.maxPointsDeduction;
+				}
+			}
+			
+			console.log('朱劲儿111', _this.buyPrice, _this.maxPointsDeduction);
+			if(buyPriceall >= _this.full_money){
+				_this.buyPrice = _this.buyPrice - Number(_this.cut_money);
+			}
+			if(_this.buyPrice < 0){
+				_this.buyPrice = 0
+			}
+			if (_this.useInfo.fullreducelist) {
+				for (let i = 0; i < _this.useInfo.fullreducelist.list.length; i++) {
+					if (
+						Number(buyPriceall) >= Number(_this.useInfo.fullreducelist.list[i].full_money) &&
+						(i == 0 ? true : Number(buyPriceall) < Number(_this.useInfo.fullreducelist.list[i - 1].full_money))
+					) {
+						_this.flag = true;
+						_this.buyPrice = Number(_this.buyPrice) - Number(_this.useInfo.fullreducelist.list[i].cut_money);
+						_this.overprice = _this.useInfo.fullreducelist.list[i].cut_money;
+						if(_this.buyPrice < 0){
+							_this.buyPrice = 0
+						}
+						return;
+					} else {
+						_this.flag = false;
+					}
+				}
+			}
+			
+		},
+		switch1Change(e) {
+			console.log(e);
+			if (e.detail.value) {
+				this.jifenchecked(1);
+			} else {
+				this.jifenchecked(0);
+			}
+		},
+		jifenchecked(type) {
+			let _this = this;
+			if (type == 0) {
+				this.checkedjifen = false;
+				this.consumPrices();
+			} else {
+				this.checkedjifen = true;
+				this.consumPrices();
+			}
+		},
+		closeFollowTitle() {
+			let _this = this;
+			_this.followTitleShow = false;
+		},
+		closeFollowPop() {
+			let _this = this;
+			_this.followShow = false;
+		},
+		openQrShow() {
+			let _this = this;
+			_this.followShow = true;
+		},
+		iScouponCheck() {
+			let _this = this;
+			_this.iScoupon = !_this.iScoupon;
+			if (!_this.iScoupon) {
+				_this.notconsumPrice = '';
+			}
+		},
+		checkLb(id) {
+			let _this = this;
+			if (_this.packids.indexOf(id) == -1) {
+				_this.packids.push(id);
+			} else {
+				for (let i = 0; i < _this.packids.length; i++) {
+					if (_this.packids[i] == id) {
+						_this.packids.splice(i, 1);
+					}
+				}
+			}
+		},
+		closeShopShow(id) {
+			let _this = this;
+			_this.sid = id;
+			_this.pack_id = '';
+			_this.shopShow = false;
+			_this.getUseInfo(_this.type, _this.mid, _this.sid, _this.pack_id, function() {});
+		},
+		// 在线买单获取折扣信息
+		getPayOnlineInfo(sid) {
+			let _this = this,
+				data = {
+					sid
+				};
+			App._post_form(
+				'&p=halfcard&do=getPayOnlineInfo',
+				data,
+				res => {
+					_this.useInfo = res.data;
+					_this.usepayonlines = res.data.usepayonline;
+					_this.pnePayonlines = res.data.payonline;
+
+					// if(res.data.newpageflag){
+					// 	uni.redirectTo({
+					// 		url: '/pages/subPages2/newBuyOrderOrder?sid=' + _this.sid + '&mid=' + _this.mid
+					// 	});
+					// }else{
+					_this.loadlogo = false;
+					_this.loading = false;
+					// }
+				},
+				fail => {
+					if (_this.useInfo.newpageflag) {
+						_this.loadlogo = true;
+					} else {
+						_this.loadlogo = false;
+					}
+
+					if (fail.message == '非核销员') {
+						App.navigationTo({
+							url: 'pages/mainPages/index/index'
+						});
+					}
+				}
+			);
+		},
+		// 管理员扫码使用户进行消费的操作请求
+		usePrivileged() {
+			let _this = this;
+		},
+		// 请求使用在线买单
+		usePayOnline() {
+			let _this = this;
+			let data = {
+				sid: _this.sid,
+				money: _this.consumPrice,
+				redpackid:_this.redpackId,
+				no_money: _this.notconsumPrice,
+				integralstatus: _this.useInfo.payintegral > 0 && _this.useInfo.payinrate > 0 && _this.checkedjifen ? 1 : 0
+			};
+			_this.buttonType = 2;
+			if (_this.type == '') {
+				// 在线买单创建订单
+				let data = {
+					type: _this.type || _this.followType,
+					id: _this.sid
+				};
+				App._post_form('&do=Follow', data, res => {
+					if (res.data.status == '0') {
+						let data = {
+							sid: _this.sid,
+							money: _this.consumPrice,
+							redpackid:_this.redpackId,
+							no_money: _this.notconsumPrice,
+							integralstatus: _this.useInfo.payintegral > 0 && _this.useInfo.payinrate > 0 && _this.checkedjifen ? 1 : 0
+						};
+						App._post_form(
+							'&p=halfcard&do=usePayOnline',
+							data,
+							res => {
+								if(res.data.status == 0){
+									App.navigationTo({
+										url: 'pages/subPages/paySuccess/paySuccess?tid=' + res.data.tid + '&plugin=' + res.data.plugin,
+										navType: 'rediRect'
+									});
+								}else{
+									_this.buttonType = 1;
+									App.navigationTo({
+										url: 'pages/mainPages/payment/payment?orderid=' + res.data + '&plugin=halfcard'
+									});
+								}
+								
+							},
+							fail => {
+								_this.buttonType = 1;
+								if (fail.message == '非核销员') {
+									App.navigationTo({
+										url: 'pages/mainPages/index/index'
+									});
+								}
+							}
+						);
+					} else {
+						_this.buttonType = 1;
+						_this.followShow = true;
+					}
+				});
+			} else {
+				let data = {
+					mid: _this.mid,
+					packids: _this.packids,
+					money: _this.consumPrice,
+					no_money: _this.notconsumPrice,
+					card_id: _this.useInfo.card_id
+				};
+				_this.buttonType = 2;
+				App._post_form(
+					'&p=halfcard&do=usePrivileged',
+					data,
+					res => {
+						uni.showToast({
+							icon: 'none',
+							title: '消费成功',
+							duration: 2000,
+							success: function() {
+								setTimeout(function() {
+									App.navigationTo({
+										url: 'pages/mainPages/index/index'
+									});
+								}, 2000);
+							}
+						});
+					},
+					fail => {
+						_this.buttonType = 1;
+						if (fail.message == '非核销员') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							});
+						}
+					}
+				);
+			}
+		},
+		// 一卡通，折扣卡，礼包使用信息
+		getUseInfo(type, mid, sid, pack_id, callback) {
+			let _this = this;
+			let data = {
+				type: _this.type || type,
+				sid: _this.sid || sid,
+				pack_id: _this.pack_id || pack_id,
+				mid: _this.mid || mid
+			};
+			App._post_form(
+				'&p=halfcard&do=useInfo',
+				data,
+				res => {
+					_this.loading = false;
+					_this.useInfo = res.data;
+					_this.payonline = res.data.payonline;
+					_this.usepayonlines = res.data.usepayonline;
+					_this.pnePayonlines = res.data.payonline;
+
+					_this.loadlogo = false;
+					if (!!callback) {
+						callback();
+					}
+				},
+				fail => {
+					App.navigationTo({
+						url: 'pages/mainPages/userCenter/userCenter'
+					});
+				}
+			);
+		}
+	},
+	computed: {
+		// buyPrice() {
+		// 	let _this = this,
+		// 		buyData = _this.buyData,
+		// 		consumPrice = Number(_this.consumPrice),
+		// 		notconsumPrice = Number(_this.notconsumPrice);
+		// 	if (buyData.discount === 10) {
+		// 		return consumPrice.toFixed(2);
+		// 	}
+		// 	if (buyData.discount !== 10 && !_this.iScoupon) {
+		// 		_this.vipCouponPrice = (consumPrice * Number(buyData.discount / 10)).toFixed(2);
+		// 		return (consumPrice - consumPrice * Number(buyData.discount / 10)).toFixed(2);
+		// 	}
+		// 	if (buyData.discount !== 10 && _this.iScoupon) {
+		// 		if (consumPrice > 0 && consumPrice <= notconsumPrice) {
+		// 			App.showError('不可消费金额不能大于消费金额最低支付0.01元');
+		// 		} else {
+		// 			let countPrice = consumPrice - notconsumPrice;
+		// 			_this.vipCouponPrice = (countPrice * Number(buyData.discount / 10)).toFixed(2);
+		// 			return (countPrice - countPrice * Number(buyData.discount / 10) + notconsumPrice).toFixed(2);
+		// 		}
+		// 	}
+		// }
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.cantClick {
+	pointer-events: none !important;
+}
+
+.dotLeft {
+	right: 47upx;
+	position: relative;
+	bottom: 14upx;
+	display: inline-block;
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+	background: rgb(240, 237, 244);
+}
+
+.dotRight {
+	left: 47upx;
+	position: relative;
+	bottom: 14upx;
+	display: inline-block;
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+	background: rgb(240, 237, 244);
+}
+
+.nwrap {
+	white-space: nowrap;
+}
+
+.switchOn {
+	> view {
+		width: 28upx;
+		height: 28upx;
+		background: rgba(255, 68, 68, 1);
+		box-shadow: 0upx 2upx 6upx 0upx rgba(255, 68, 68, 0.35);
+		border-radius: 50%;
+	}
+}
+
+.grayLine {
+	border: 2upx solid rgb(204, 204, 204) !important;
+}
+
+.switchOff {
+	> view {
+		width: 28upx;
+		height: 28upx;
+		background: rgb(204, 204, 204);
+		box-shadow: 0upx 2upx 6upx 0upx rgb(204, 204, 204);
+		border-radius: 50%;
+	}
+}
+
+.switch {
+	width: 80upx;
+	height: 40upx;
+	border: 2upx solid rgba(255, 68, 68, 1);
+	border-radius: 20upx;
+
+	> view {
+		padding: 6upx;
+		display: flex;
+		justify-content: space-between;
+	}
+}
+
+.useName {
+	color: #ff4444;
+	font-size: 24upx;
+}
+
+.infoMb {
+	width: 550upx;
+	margin-left: 20upx;
+	display: inline-block;
+	vertical-align: top;
+
+	> view {
+		vertical-align: middle;
+		display: inline-block;
+
+		> view:nth-child(1) {
+			> span {
+				font-size: 28upx;
+
+				font-weight: bold;
+				color: rgba(51, 51, 51, 1);
+			}
+		}
+
+		> view:nth-child(2) {
+			> span {
+				display: inline-block;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+				width: 520upx;
+				font-size: 24upx;
+
+				color: rgba(153, 153, 153, 1);
+			}
+		}
+	}
+
+	> image {
+		margin-top: 40upx;
+		float: right;
+		vertical-align: middle;
+		width: 25upx;
+		height: 30upx;
+	}
+}
+
+.logoMb {
+	vertical-align: top;
+	display: inline-block;
+
+	> image {
+		height: 100upx;
+		width: 100upx;
+	}
+}
+
+.shopShow {
+	background: #ffffff;
+	width: 750upx;
+}
+
+page {
+	background-color: #F9F9F9;
+}
+
+.buyOrder {
+	background-color: #F9F9F9;
+}
+
+.checkStoreMbPackage {
+	border-bottom: 1upx solid gray;
+	padding: 30upx;
+}
+
+.input-box {
+	padding: 20upx;
+	border: 1px solid rgb(207, 206, 211);
+	box-shadow: 0 0 10upx 4upx rgb(207, 206, 211);
+	position: relative;
+	z-index: 2;
+	margin-top: 4upx;
+	position: relative;
+
+	.consumption-box-input {
+		background-color: rgb(244, 244, 246);
+		height: 100upx;
+		padding: 0 20upx;
+		box-shadow: 0 0 10upx rgb(244, 244, 246);
+	}
+
+	.couponPrice-box {
+		padding: 0 10upx;
+		margin: 30upx 0;
+	}
+}
+.gross-amount {
+	padding: 30upx 30upx 0;
+	background-color: #ffffff;
+	border-radius: 10upx;
+	position: relative;
+	margin-bottom: 20upx;
+	.amount-title {
+		font-weight: bold;
+		color: #000000;
+		padding-left: 160upx;
+	}
+	.amount-img {
+		width: 120upx;
+		height: 120upx;
+		border-radius: 10upx;
+		position: absolute;
+		top: -26upx;
+		left: 30upx;
+		> image {
+			width: 120upx;
+			height: 120upx;
+			border-radius: 10upx;
+		}
+	}
+	.amount-je {
+		font-size: 24upx;
+		font-weight: bold;
+		color: #999999;
+		padding: 50upx 0 30upx;
+	}
+	.amount-input {
+		padding-bottom: 26upx;
+		.amount-icon {
+			font-size: 36upx;
+			font-weight: bold;
+			color: #333333;
+			vertical-align: top;
+		}
+		.amount-input-p {
+			font-size: 32upx;
+			font-family: PingFang SC;
+			font-weight: 400;
+			color: #999999;
+		}
+		.amount-input-l {
+			font-size: 56upx;
+			font-family: DINPro;
+			font-weight: bold;
+			color: #333333;
+			height: 56upx;
+		}
+	}
+	.amount-radio {
+		padding: 30upx 0;
+		border-top: 1upx solid #eeeeee;
+		.radio-name {
+			font-size: 30upx;
+			font-family: PingFang SC;
+			font-weight: bold;
+			color: #333333;
+			flex: 0.95;
+			line-height: 60upx;
+		}
+		.radio-radio {
+			flex: 0.05;
+		}
+		.radio-radio /deep/ .uni-radio-input {
+			width: 35upx;
+			height: 35upx;
+		}
+	}
+	.amount-num{
+		padding: 40upx 0 ;
+		border-top: 1upx solid #EEEEEE;
+		font-size: 30upx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+		.amount-icon{
+			flex: 0.5;
+			line-height: 40upx;
+		}
+	}
+}
+.preferential {
+	padding: 0upx 30upx 0;
+	border-radius: 10upx;
+	.bottom-bor {
+		padding: 40upx 0;
+		border-bottom: 1upx solid #eeeeee;
+	}
+	.regpack {
+		font-size: 28upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+		flex: 0.5;
+	}
+	.regpacknum {
+		text-align: right;
+		font-size: 28upx;
+		flex: 0.5;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #ff4444;
+	}
+	.mitigate-price {
+		font-size: 26upx;
+		font-family: PingFang SC;
+		font-weight: 500;
+		color: #333333;
+	}
+	.settlement{
+		font-size: 76upx;
+		font-family: DINPro;
+		font-weight: bold;
+		color: #333333;
+	}
+}
+.mitigate-pocket {
+	box-shadow: 0 0 5px #cfced3;
+
+	.mitigate-pocket-fgx {
+		display: flex;
+		justify-content: space-between;
+		margin: auto;
+		width: 630upx;
+		height: 2upx;
+		border-bottom: 1px dashed #eeeeee;
+	}
+}
+
+.mitigate-pocket::before {
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+	background-color: rgb(240, 237, 244);
+	position: relative;
+}
+
+.mitigate-pocket::after {
+	position: relative;
+	width: 30upx;
+	height: 30upx;
+	border-radius: 50%;
+	background-color: rgb(240, 237, 244);
+}
+
+.mitigate {
+	padding: 40upx 30upx 40upx 40upx;
+
+	.mitigate-price {
+		color: rgb(205, 133, 83);
+	}
+}
+
+.store-title {
+	color: #cd8553;
+	background-color: rgb(254, 249, 237);
+	height: 70upx;
+	line-height: 70upx;
+	margin: 0 2upx;
+}
+
+.buy-label {
+	margin: 10upx 0 20upx;
+	padding: 0 10upx;
+	letter-spacing: 2upx;
+}
+
+.submit-btn {
+	background-color: #FF4444;
+	font-size: 28upx;
+	height: 90upx;
+	line-height: 90upx;
+}
+
+.hoverButton {
+	opacity: 0.2;
+	background-color: #000000;
+}
+
+.checkedjifen {
+	width: 40upx;
+	height: 40upx;
+	border-radius: 50%;
+	background-color: #ffffff;
+	border: 1upx solid #ff4444;
+	color: #ff4444;
+	line-height: 35upx;
+	margin-right: 10upx;
+}
+.Showrichtext{
+	width: 92vw;
+	height: 831upx;
+	padding: 30upx;
+	background: #FFFFFF;
+	border-radius: 20px 20px 0px 0px;
+	.Showrichtext-title{
+		font-size: 30upx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #333333;
+		text-align: center;
+		padding-bottom: 30upx;
+	}
+}
+</style>
diff --git a/pages/subPages2/newBuyOrder/newBuyOrder.vue b/pages/subPages2/newBuyOrder/newBuyOrder.vue
new file mode 100644
index 0000000..cc7104c
--- /dev/null
+++ b/pages/subPages2/newBuyOrder/newBuyOrder.vue
@@ -0,0 +1,795 @@
+<template>
+	<view >
+		<loadlogo v-if="loadlogo"></loadlogo>
+		<view class="newBuyOrder" v-if="!loadlogo" @click.stop="nosck">
+			<far-bottom></far-bottom>
+			<!-- 头部 -->
+			<view class="titleImgBox">
+				<image class="titleImg" :src="useInfo.bgthumb" mode=""></image>
+				<view class="usercontent dis-flex">
+					<view >
+						<image :src="menberinfo.avatar" class="imgs" mode=""></image>
+					</view>
+					<view  style="padding-left: 20upx;">
+						<view  style="padding-bottom: 20upx;font-size: 34upx;">
+							<text style="font-size: 34upx;background: linear-gradient(to top, #FAE3B6, #DFCA98);-webkit-background-clip: text;font-weight: 700;color: transparent;">{{menberinfo.nickname}}</text>
+						</view>
+						<view class="f-28 vipcar dis-il-block">
+							<text class="iconfont icon-choicenessfill" style="font-size: 24upx;"></text>
+							<text style="font-size: 24upx;">{{useInfo.levelname}}</text>
+						</view>
+					</view>
+					<view class="t-r flex-box" style="position: relative;">
+						<view  style="position: absolute;right: -50upx;top: -60upx;" v-if="useInfo.surflag == 1">
+							<view class="f-20 dis-il-block col-f" style="padding: 0upx 20upx;border-radius: 60upx;background-color: #FF4444;font-weight: 400;">
+								<view class="f-20" >
+									今日名额仅剩{{useInfo.surnum}}个
+								</view>
+							</view>
+							<view  style=" width: 0;height: 0;border-left: 8upx solid transparent;border-right: 8upx solid transparent;border-top: 8upx solid #ff4444;position: absolute;left: 50%;bottom: -4upx;transform: translateX(-50%);">
+								
+							</view>
+						</view>
+						<view class="t-r f-20" style="padding-bottom: 10upx;padding-right: 20upx;background: linear-gradient(to top, #FAE3B6, #DFCA98);-webkit-background-clip: text;font-weight: 700;color: transparent;">
+							买单
+						</view>
+						<view >
+							<text class="f-w" style="font-size: 66upx;background: linear-gradient(to top, #FAE3B6, #DFCA98);-webkit-background-clip: text;font-weight: 700;color: transparent;">{{useInfo.discount}}</text>
+							<text class="f-20" style="background: linear-gradient(to top, #FAE3B6, #DFCA98);-webkit-background-clip: text;font-weight: 700;color: transparent;">折</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 纯粹为了弯弯的 -->
+			<view class="dis-flex bigaobox">
+				<view class="aobox">
+				</view>
+				<view class="aotobox">
+				</view>
+			</view>
+			<!-- 价格和优惠 -->
+			<view class="pricebox">
+				<view class="oldprice dis-flex" @tap.stop="clickinput(1)">
+					<view class="pricename f-30 f-w">
+						消费市场价
+					</view>
+					<view :class="cart == 1?'input f-w': mone?'input2 f-w':'input1 f-w'" v-text="mone || quittext" style="text-align: right;flex: 1;"></view>
+					<!-- <view class="input2 f-w t-r" style="font-size: 28upx;color: #CCCCCC;font-weight: 400;flex: 1;" v-else>
+					询问服务员后填写
+				</view> -->
+
+					<!-- <input class="uni-input f-w" focus placeholder="询问服务员后填写" style="text-align: right;flex: 1;" placeholder-class="inputclass" placeholder-style="font-size: 28upx;color: #CCCCCC;font-weight: 400;" :cursor="mone.length" @blur="monefalse" @focus="mones" v-model="mone" /> -->
+				</view>
+				<view class="nodiscounts dis-flex" v-if="flag">
+					<view class="pricename f-30 f-w" style="flex: 0.4;">
+						不参与优惠金额
+					</view>
+					<view class="dis-flex f-30" style="flex: 0.58;" @tap.stop="clickinput(2)">
+						<view :class="cart == 2?'uinput f-w': inputmodel?'uinput2 f-w':'uinput1 f-w'" v-text="inputmodel || quittext2"
+						 style="text-align: right;flex: 1;">
+							<!-- 询问服务员后填写 -->
+							<span class="cursor-blink">&nbsp;</span>
+						</view>
+						<!-- <input class="uni-input inputs f-w" placeholder="询问服务员后填写"  placeholder-style="font-size: 28upx;color: #CCCCCC;font-weight: 400;" :cursor="inputmodel.length" v-model="inputmodel" @blur="inputmodelfalse" @focus="inputmodelfocus" /> -->
+					</view>
+				</view>
+			</view>
+			<!-- #ifdef H5 -->
+			<view class="bottombox dis-flex" style="font-size: 20upx;">
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<view class="bottombox dis-flex" style="font-size: 22upx;">
+					<!-- #endif -->
+
+					<view class="iconfont icon-check checked" @click="ischecked()" v-if="flag">
+					</view>
+					<view class="nochecked" @click="ischecked()" v-else>
+					</view>
+					<view  style="width: 160upx;" @click="ischecked()">
+						不参与优惠：
+					</view>
+					<view :class="pulldown?'ischeck':''" style="color: #E75D4F;width: 470upx;height: 28upx;">
+						{{useInfo.limit}}
+					</view>
+					<view class="iconfont icon-xialajiantouxiao" style="color: #E75D4F;padding: 0 20upx;" v-if="pulldown" @click="pulldownis(false)"></view>
+					<view class="iconfont icon-shouqijiantouxiao" style="color: #E75D4F;padding: 0 20upx;" v-if="!pulldown" @click="pulldownis(true)"></view>
+				</view>
+				<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+				 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle"></follow>
+				<custom-digitKeyboard :visible="visible" @close="closeHandle" :lilv="useInfo.discount" :inputmodel="inputmodel"
+				 :mone="mone" @pay="pay" :inputValues="inputValue" @confirm="confirmHandle"></custom-digitKeyboard>
+				 <popup-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+				 	<view class="b-f pops">
+				 		<view class="f-36 f-w" style="padding: 10upx 0;">
+				 			会员即将到期,赶快续费吧
+				 		</view>
+						<view class="f-28" style="color: #E64F3F;padding: 10upx 0;">
+							会员到期后将无法享受买单折扣
+						</view>
+						<view class="dis-flex" style="padding: 20upx 20upx;">
+							<view  style="padding: 20upx 0;flex: 0.5;">
+								<view class="f-32 f-w" style="padding: 20upx 30upx;background-color: #F0F0F0;border-radius: 20upx;" @click="showCommunity = false">
+									我知道了
+								</view>
+							</view>
+							<view  style="padding: 20upx 20upx;flex: 0.5;">
+								<view class="f-32 f-w col-f" style="padding: 20upx 30upx;background-color: #FF4444;border-radius: 20upx;" @click="vipurl">
+									立即续费
+								</view>
+							</view>
+						</view>
+				 	</view>
+				 </popup-view>
+				<view  style="width: 100%;height: 69%;background-color: #F9F9F9;" @click="visible = false">
+
+				</view>
+			</view>
+		</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadlogo from '@/components/template/loadlogo';
+	import follow from '@/components/template/follow.vue';
+	import PopupView from '@/components/template/PopManager.vue';
+	import customDigitKeyboard from '@/components/template/custom-digitKeyboard.vue'
+	export default {
+		data() {
+			return {
+				rmbBOX: '20',
+				inputbox: '0.1',
+				inputmodel: '',
+				mone: '',
+				followType: 'payonline',
+				pulldown: true,
+				visible: true,
+				inputfur: false,
+				inputValue: [],
+				inputValueis: [],
+				flag: false,
+				evens: {},
+				loadlogo: false,
+				useInfo: {},
+				followShow: false,
+				followTitleShow: true,
+				menberinfo: {},
+				time: '',
+				names: '',
+				showCommunity:false,
+				cart: 0,
+				quittext: '请询问服务员后填写',
+				quittext2: '请询问服务员后填写'
+			}
+		},
+		components: {
+			customDigitKeyboard,
+			loadlogo,
+			follow,
+			PopupView
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.evens = e;
+			console.log(e);
+			_this.menberinfo = uni.getStorageSync('userinfo');
+			_this.names = _this.menberinfo.nickname;
+			// _this.visible = true;
+			//#ifndef H5
+			// wx.hideKeyboard()
+			//#endif
+
+			// uni.hideKeyboard();
+		},
+		onShow() {
+			this.getPayOnlineInfo(this.evens.sid);
+			// this.time = setInterval(function() {
+			// 	//#ifndef H5
+			// 	wx.hideKeyboard()
+			// 	//#endif
+			// 	uni.hideKeyboard(); //隐藏软键盘
+			// 	// plus.key.hideSoftKeybord();
+			// }, 50);
+		},
+		onHide() {
+			// clearTimeout(this.time)
+		},
+		methods: {
+			vipurl(){
+				let _this = this;
+				App.navigationTo({
+					url: 'pages/mainPages/memberCard/getMembership/getMembership?card=have'
+				});
+			},
+			nosck() {
+				this.cart = 0;
+				this.visible = false;
+				if(this.mone == '¥' || this.mone == ''){
+					this.mone = '';
+					this.quittext = '请询问服务员后填写';
+				}
+				if(this.inputmodel == '¥' || this.inputmodel == ''){
+					this.inputmodel = '';
+					this.quittext2 = '请询问服务员后填写';
+				}
+			},
+			clickinput(num) {
+				this.visible = true;
+				this.cart = num;
+				if (num == 1) {
+					this.quittext = '';
+					if(this.inputmodel == '¥' || this.inputmodel == ''){
+						this.inputmodel = '';
+						this.quittext2 = '请询问服务员后填写';
+					}
+					let _this = this;
+					_this.inputfur = false;
+					if (_this.mone) {
+						_this.inputValue = _this.mone.split('');
+						if (_this.mone.substr(0, 1) == '¥') {
+							return
+						} else {
+							_this.mone = '¥' + _this.mone;
+						}
+					} else if (_this.mone == '¥' || !_this.mone) {
+						_this.inputValue = ['11'];
+						if (_this.mone.substr(0, 1) == '¥') {
+							return
+						} else {
+							_this.mone = '¥' + _this.mone;
+						}
+					}
+				} else {
+					this.quittext2 = '';
+					if(this.mone == '¥' || this.mone == ''){
+						this.mone = '';
+						this.quittext = '请询问服务员后填写';
+					}
+					let _this = this;
+					_this.inputfur = true;
+					if (_this.inputmodel) {
+						_this.inputValue = _this.inputmodel.split('');
+						if (_this.inputmodel.substr(0, 1) == '¥') {
+							return
+						} else {
+							_this.inputmodel = '¥' + _this.inputmodel;
+						}
+					} else if (_this.inputValue = '¥' || !_this.inputValue) {
+						_this.inputValue = ['112'];
+						if (_this.inputmodel.substr(0, 1) == '¥') {
+							return
+						} else {
+							_this.inputmodel = '¥' + _this.inputmodel;
+						}
+					}
+				}
+				// setTimeout(function() {
+				// 	//#ifndef H5
+				// 	wx.hideKeyboard()
+				// 	//#endif
+				// 	uni.hideKeyboard(); //隐藏软键盘
+				// 	//         // plus.key.hideSoftKeybord();
+				// }, 700);
+			},
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			pay() {
+				let _this = this;
+				if(_this.useInfo.surflag == 1 &&  _this.useInfo.surnum == 0){
+					uni.showToast({
+						title:'温馨提示:今日折扣名额已用完,明天再来吧',
+						icon:'none'
+					});
+					return
+				}else if(_this.mone.replace("¥", "") == 0){
+					uni.showToast({
+						title:'买单金额不能为0',
+						icon:'none'
+					});
+					return
+				}
+				console.log(_this.evens.sid, _this.mone.replace("¥", ""), _this.inputmodel.replace("¥", ""))
+				let data = {
+					sid: _this.evens.sid,
+					money: _this.mone.replace("¥", ""),
+					no_money: _this.inputmodel.replace("¥", "")
+				};
+				// if (!_thise.e.type) {
+				// 在线买单创建订单
+				let datas = {
+					type: _this.evens.type || '',
+					id: _this.sid
+				};
+				App._post_form('&do=Follow', datas, res => {
+					if (res.data.status == '0') {
+						// let data = {
+						// 	sid: _this.sid, 
+						// 	money: _this.mone.replace("¥",""),
+						// 	no_money: _this.inputmodel.replace("¥","")
+						// };
+						App._post_form('&p=halfcard&do=usePayOnline', data, res => {
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data + '&plugin=halfcard'
+							})
+						}, fail => {
+							if (fail.message == '非核销员') {
+								App.navigationTo({
+									url: 'pages/mainPages/index/index'
+								})
+							}
+						});
+					} else {
+						_this.followShow = true
+					}
+				})
+
+				// } else {
+				// 	let data = {
+				// 		mid: _this.evens.mid || '',
+				// 		packids: _this.packids,
+				// 		money: _this.consumPrice,
+				// 		no_money: _this.notconsumPrice,
+				// 		card_id: _this.useInfo.card_id
+				// 	};
+				// 	App._post_form('&p=halfcard&do=usePrivileged', data, res => {
+				// 		uni.showToast({
+				// 			icon: 'none',
+				// 			title: '消费成功',
+				// 			duration: 2000,
+				// 			success: function() {
+				// 				setTimeout(function() {
+				// 					App.navigationTo({
+				// 						url: 'pages/mainPages/index/index'
+				// 					})
+				// 				}, 2000);
+				// 			}
+				// 		});
+				// 	}, fail => {
+				// 		_this.buttonType = 1
+				// 		if (fail.message == '非核销员') {
+				// 			App.navigationTo({
+				// 				url: 'pages/mainPages/index/index'
+				// 			})
+				// 		}
+				// 	});
+				// }
+			},
+			getPayOnlineInfo(sid) {
+				let _this = this,
+					data = {
+						sid
+					};
+				App._post_form(
+					'&p=halfcard&do=getPayOnlineInfo',
+					data,
+					res => {
+						_this.setData({
+							useInfo: res.data
+						});
+						console.log(res.data.overflag, 221212);
+						// if(_this.userInfo.overflag == 1){}
+						_this.showCommunity = (res.data.overflag == 1)?true:false;
+						// _this.menberinfo = uni.getStorageSync('userinfo');
+						// _this.useInfo = res.data;
+						
+						// _this.usepayonlines = res.data.usepayonline;
+						// _this.pnePayonlines = res.data.payonline;
+						_this.loadlogo = false;
+						_this.loadlogo = true;
+						_this.loadlogo = false;
+					},
+					fail => {
+						// _this.menberinfo = uni.getStorageSync('userinfo');
+						_this.loadlogo = false;
+						if (fail.message == '非核销员') {
+							App.navigationTo({
+								url: 'pages/mainPages/index/index'
+							})
+						}
+					}
+				);
+			},
+			ischecked() {
+				this.flag = !this.flag;
+				
+				if (this.flag) {
+					// this.flag = false;
+					this.inputmodel = '';
+				}
+			},
+			inputmodelfalse() {
+				if (this.inputmodel == '¥') {
+					this.inputmodel = '';
+				}
+				// this.visible = false;
+			},
+			monefalse() {
+				if (this.mone == '¥') {
+					this.mone = '';
+				}
+				// this.visible = false;
+			},
+			closeHandle(value) {
+
+			},
+			confirmHandle(value, Arr) {
+				this.visible = true;
+				console.log(this.inputfur);
+				this.inputValueis = Arr;
+				if (this.inputfur) {
+					// this.inputmodel = '¥' + value;
+					if (value.substr(0, 1) == '¥') {
+						this.inputmodel = value;
+						return
+					} else {
+						this.inputmodel = '¥' + value;
+					}
+				} else {
+					// this.mone = '¥' + value;
+					if (value.substr(0, 1) == '¥') {
+						this.mone = value;
+						return
+					} else {
+						this.mone = '¥' + value;
+					}
+				}
+			},
+			pulldownis(flag) {
+				if (flag) {
+					this.pulldown = true;
+				} else {
+					this.pulldown = false;
+				}
+			},
+			mones(e) {
+				console.log(e)
+				let _this = this;
+				_this.inputfur = false;
+				if (_this.mone) {
+					_this.inputValue = _this.mone.split('');
+					if (_this.mone.substr(0, 1) == '¥') {
+						return
+					} else {
+						_this.mone = '¥' + _this.mone;
+					}
+				} else if (_this.mone == '¥' || !_this.mone) {
+					_this.inputValue = ['11'];
+					if (_this.mone.substr(0, 1) == '¥') {
+						return
+					} else {
+						_this.mone = '¥' + _this.mone;
+					}
+				}
+
+				// setTimeout(function(){
+				//         uni.hideKeyboard();//隐藏软键盘
+				//         // plus.key.hideSoftKeybord();
+				//     },10);
+			},
+			inputmodelfocus(e) {
+				console.log(e)
+				let _this = this;
+				_this.inputfur = true;
+
+
+
+				if (_this.inputmodel) {
+					_this.inputValue = _this.inputmodel.split('');
+					if (_this.inputmodel.substr(0, 1) == '¥') {
+						return
+					} else {
+						_this.inputmodel = '¥' + _this.inputmodel;
+					}
+				} else if (_this.inputValue = '¥' || !_this.inputValue) {
+					_this.inputValue = ['112'];
+					if (_this.inputmodel.substr(0, 1) == '¥') {
+						return
+					} else {
+						_this.inputmodel = '¥' + _this.inputmodel;
+					}
+				}
+				// setTimeout(function(){
+				//         uni.hideKeyboard();//隐藏软键盘
+				//         // plus.key.hideSoftKeybord();
+				//     },10);
+
+			}
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #f0f0f0;
+	}
+</style>
+<style lang="scss" scoped>
+	.newBuyOrder {
+		height: 100vh;
+
+		// /deep/ .uni-input-input{
+		// 	font-family: 'ch';
+		// 	font-size: 40upx;
+		// }
+		.titleImgBox {
+			padding: 20upx 40upx 0upx;
+			position: relative;
+
+			.titleImg {
+				border-radius: 20upx;
+				width: 90vw;
+				height: 180upx;
+			}
+
+			.usercontent {
+				width: 80%;
+				position: absolute;
+				padding: 50upx 80upx 0upx;
+				top: 0;
+				left: 0;
+				font-weight: 700;
+
+				.imgs {
+					width: 80upx;
+					height: 80upx;
+					border-radius: 50%;
+					border: 2upx solid #FFFFFF;
+					margin-top: 15upx;
+				}
+
+				.vipcar {
+					font-size: 24upx;
+					padding: 2.5upx 8upx;
+					border: 2upx solid #FAE3B6;
+					border-radius: 6upx;
+					background: linear-gradient(to top, #FAE3B6, #DFCA98);
+					-webkit-background-clip: text;
+					font-weight: 700;
+					color: transparent;
+				}
+			}
+		}
+
+		.bigaobox {
+			position: absolute;
+			top: 14upx;
+
+			.aobox {
+				height: 200upx;
+				width: 50vw;
+				background: radial-gradient(120vw 184upx at top right, transparent 100%, #F9F9F9 101%);
+			}
+
+			.aotobox {
+				height: 200upx;
+				width: 50vw;
+				background: radial-gradient(120vw 184upx at top left, transparent 100%, #F9F9F9 101%);
+			}
+		}
+
+		.inputclass {
+			font-size: 28upx;
+			color: #CCCCCC;
+			font-weight: 400;
+		}
+
+		.pricebox {
+			background-color: #F9F9F9;
+			padding: 20upx 30upx 0upx 30upx;
+
+			.oldprice {
+				padding: 0upx 40upx;
+				height: 120upx;
+				line-height: 120upx;
+				background-color: #FFFFFF;
+				position: relative;
+
+				.inputclass {
+					font-size: 28upx;
+					color: #CCCCCC;
+					font-weight: 400;
+				}
+
+				.input {
+					// width:200px;
+					// height:24px;
+					// line-height:24px;
+					font-size: 40upx;
+					// padding:5px 8px;
+					// border:1px solid #ddd;
+				}
+
+				.input1 {
+					font-size: 28upx;
+					color: #CCCCCC;
+				}
+
+				.input2 {
+					font-size: 40upx;
+					// color: #CCCCCC;
+				}
+
+				
+				.input:after {
+					position: absolute;
+					content: '';
+					display: inline-block;
+					width: 2px;
+					height: 18px;
+					top: 50%;
+					transform: translateY(-50%);
+					animation: blink 1.2s infinite steps(1, start);
+				}
+
+				
+				/* #ifdef H5 */
+				// .input:after {
+				// 	position: absolute;
+				// 	content: '';
+				// 	display: inline-block;
+				// 	width: 2px;
+				// 	height: 18px;
+				// 	top: 21.5%;
+				// 	transform: translateY(-50%);
+				// 	animation: blink 1.2s infinite steps(1, start);
+				// }
+
+				/* #endif */
+				@keyframes blink {
+
+					0%,
+					100% {
+						background-color: #000;
+					}
+
+					50% {
+						background-color: transparent;
+					}
+				}
+
+
+
+				// .input:empty::before {
+				//     content: attr(placeholder);
+				// }
+			}
+
+			.nodiscounts {
+				padding: 0upx 0 0upx 20upx;
+				height: 80upx;
+				line-height: 80upx;
+				border-bottom: 2upx solid #EEEEEE;
+				position: relative;
+
+				.inputclass {
+					font-size: 28upx;
+					color: #CCCCCC;
+					font-weight: 400;
+				}
+
+				.inputs {
+					text-align: right;
+				}
+
+				.rmbbix {
+					padding-right: 20upx;
+					padding-left: 20upx;
+				}
+
+				.uinput {
+					font-size: 40upx;
+				}
+
+				.uinput1 {
+					font-size: 28upx;
+					color: #CCCCCC;
+				}
+
+				.uinput2 {
+					font-size: 40upx;
+					// color: #CCCCCC;
+				}
+
+				// .uinput:after {
+				// 	position: absolute;
+				// 	content: '';
+				// 	display: inline-block;
+				// 	width: 2px;
+				// 	height: 18px;
+				// 	top: 29%;
+				// 	transform: translateY(-50%);
+				// 	animation: blink 1.2s infinite steps(1, start);
+				// }
+				
+				.uinput:after {
+					position: absolute;
+					content: '';
+					display: inline-block;
+					width: 2px;
+					height: 18px;
+					top: 50%;
+					transform: translateY(-50%);
+					animation: blink 1.2s infinite steps(1, start);
+				}
+				
+				
+				/* #ifdef H5 */
+				// .uinput:after {
+				// 	position: absolute;
+				// 	content: '';
+				// 	display: inline-block;
+				// 	width: 2px;
+				// 	height: 18px;
+				// 	top: 29%;
+				// 	transform: translateY(-50%);
+				// 	animation: blink 1.2s infinite steps(1, start);
+				// }
+				
+				/* #endif */
+				@keyframes blink {
+
+					0%,
+					100% {
+						background-color: #000;
+					}
+
+					50% {
+						background-color: transparent;
+					}
+				}
+			}
+		}
+
+		.bottombox {
+			padding: 10upx 20upx 10upx 35upx;
+			background-color: #F9F9F9;
+
+			.checked {
+				color: #FF4444;
+				padding-bottom: 5upx;
+				font-size: 24upx;
+				border: 1px solid #CCCCCC;
+				border-radius: 5upx;
+				height: 20upx;
+				line-height: 20upx;
+				margin-right: 10upx;
+				margin-top: 5upx;
+			}
+
+			.nochecked {
+				color: #FF4444;
+				padding-bottom: 5upx;
+				font-size: 24upx;
+				width: 26.5upx;
+				height: 30upx;
+				border: 1px solid #CCCCCC;
+				border-radius: 5upx;
+				height: 20upx;
+				line-height: 20upx;
+				margin-right: 10upx;
+				margin-top: 5upx;
+			}
+
+			.ischeck {
+				overflow: hidden;
+			}
+			
+		}
+		.pops{
+				width: 80vw;
+				height: 25vh;
+				padding: 30upx 30upx 0upx 30upx;
+				border-radius: 15upx;
+				text-align: center;
+			}
+	}
+</style>
diff --git a/pages/subPages2/orderLink/orderLink.vue b/pages/subPages2/orderLink/orderLink.vue
new file mode 100644
index 0000000..b46be7e
--- /dev/null
+++ b/pages/subPages2/orderLink/orderLink.vue
@@ -0,0 +1,51 @@
+<template>
+	<view class="page-box" style="display: grid;">
+		<view style="text-align: center;margin: 100rpx;">
+			<u-icon name="checkbox-mark" color="#2979ff" size="50"></u-icon>您的订单支付完成
+		</view>
+		<u-button type="primary" size='medium' shape="circle" @click = 'toOrder()' :plain="true">返回查看订单</u-button>
+	</view>
+</template>
+
+<script>
+	// var goldPlan = require('../../common/jgoldplan-1.0.0.js');
+	// import api from '@/common/api.js'
+	export default {
+		data() {
+			return {
+				sub_mch_id: '',
+				out_trade_no: '',
+				orderInfo : {}
+			}
+		},
+		onLoad(option) {
+			this.sub_mch_id = option.sub_mch_id; //特约商户号
+			this.out_trade_no = option.out_trade_no; //商户订单号
+		},
+		onReady() {
+			let mchData = {
+				action: 'onIframeReady',
+				displayStyle: 'SHOW_CUSTOM_PAGE'
+			};
+			let postData = JSON.stringify(mchData);
+			parent.postMessage(postData, 'https://payapp.weixin.qq.com');
+		},
+		methods: {
+			//注册点击事件(去详情)
+			// getOrder(){
+			// 	setTimeout(async function(){
+			// 		let info = await api.getOrderInfo(this.out_trade_no);
+			// 		this.orderInfo = info;
+			// 	},1000);
+			// },
+			toOrder: function() {
+				var mchData = {
+					action: 'jumpOut',
+					jumpOutUrl: 'https://fjmp.yuchangchina.com/test/hkzxh5/?rd=order' //跳转的页面
+				}				
+				var pData = JSON.stringify(mchData);
+				parent.postMessage(pData, 'https://payapp.weixin.qq.com')
+			}
+		}
+	}
+</script>
\ No newline at end of file
diff --git a/pages/subPages2/panorama/panorama.vue b/pages/subPages2/panorama/panorama.vue
new file mode 100644
index 0000000..5972cab
--- /dev/null
+++ b/pages/subPages2/panorama/panorama.vue
@@ -0,0 +1,25 @@
+<template>
+	<view class="panorama">
+		<view  v-if="url">
+			<web-view :src="url" class="iframeView" style="height:75vh;position: fixed;" />
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default{
+		data(){
+			return{
+				url:''
+			}
+		},
+		onLoad(e) {
+			console.log('我是全景页面')
+			this.url = e.url;
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/subPages2/phoneBook/enterForm/enterForm.vue b/pages/subPages2/phoneBook/enterForm/enterForm.vue
new file mode 100644
index 0000000..23b8f75
--- /dev/null
+++ b/pages/subPages2/phoneBook/enterForm/enterForm.vue
@@ -0,0 +1,1134 @@
+<template>
+	<view class="enterForm">
+		<view class="bgimgbox">
+			<image class="bgimg" :src="imageRoot + 'demoBackImg.png'" mode=""></image>
+		</view>
+		<view class="formbox" v-if="loadlogo">
+			<view class="formdatabox">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						请填写店铺信息
+					</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						商家名称
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<input class="uni-input f-24" placeholder="请输入店铺名称" v-model="userInfo.name" />
+					</view>
+				</view>
+				<!-- 	<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						姓名
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入姓名" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						电话
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入联系电话" />
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						所在城市
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						<w-picker :visible.sync="visiblec" mode="region" :value="[userInfo.provinceid,userInfo.areaid,userInfo.distid]"
+						 default-type="value" :hide-area="false" @confirm="onConfirm($event,'region')" @cancel="onCancel" ref="region"></w-picker>
+						<view class="uni-input" @tap="visble">{{ provinceidName }} {{ areaidName }} {{ distidName }}<text class="iconfont icon-right"
+							 style="float: right;font-size: 20upx;color: #999999;">
+
+							</text></view>
+
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						详细地址
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;"  @click="getLocation">
+						<input class="f-24" disabled style="flex: 0.8;" placeholder="点击定位详细地址" v-model="userInfo.address" />
+						<view class="dis-il-block"  style="flex: 0.2;">
+							<image style="width: 20upx;height: 20upx;padding-left: 10upx;" :src="imgfixUrls + 'merchant/where.svg'" />
+							<span>定位</span>
+						</view>
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						所属行业
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="showThePic">
+							<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+						 	 range-key="name" :value="typeIndex"> -->
+							<view v-if="industryclass == ''" class="uni-input twoLevelList">请选择行业分类<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text></view>
+							<view v-else class="uni-input twoLevelList">
+								<view class="dis-il-block" style="width: 90%;">
+									{{industryclass}}
+								</view>
+								<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text>
+							</view>
+							<!-- 			</picker> -->
+							<span></span>
+						</view>
+
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						商家简介
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<textarea style="width: 100%;font-size: 24upx;" v-if="!hangyeshow" auto-height placeholder="请输入商户简介" placeholder-style="font-size:24upx"
+						 v-model="userInfo.desc" />
+						</view>
+				</view> 
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						富文本
+					</view>
+					<view class="dis-flex" style="flex: 0.8;padding-left: 40upx;">
+						<view class="timePickerView" @click="richText = true">
+							<!-- 	<picker mode="multiSelector" class="dataPicker" :range="typelist" @change="checkType" @columnchange="changeKey"
+						 	 range-key="name" :value="typeIndex"> -->
+							<view  class="uni-input twoLevelList">富文本编辑<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;float: right;"></text></view>
+							
+							<!-- 			</picker> -->
+							<span></span>
+						</view>
+				
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.8;">
+						请填写联系方式<text class="f-20 col-9">(至少填写一项)</text>
+					</view>
+				</view>
+				<!-- <view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view>
+						微信号
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入微信号" v-model="userInfo.wx" />
+					</view>
+				</view> -->
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						联系方式
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入联系电话" v-model="userInfo.mobile" />
+					</view>
+				</view>
+				<view class="dis-flex f-24 formtitle">
+					<view class="t-r" style="flex: 0.2;">
+						<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;">*</view> -->
+						微信号
+					</view>
+					<view  style="flex: 0.8;padding-left: 40upx;">
+						 <input class="uni-input f-24"  placeholder="请输入微信号" v-model="userInfo.wechat_number" />
+					</view>
+				</view>
+				<view class="logobox" style="padding-top: 20upx;">
+					<!-- <view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view> -->
+					<span>微信二维码</span>
+					<view style="padding-left: 0upx;">
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdataon"  v-if="userInfo.wechat_qrcodes">
+							<image :src="userInfo.wechat_qrcodes" class="imgs"  @click="lookimg(1,userInfo.wechat_qrcodes)" />
+							<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo(true)" />
+						</view>
+						<!-- 图片预览循环模板 -->
+						<view class="userImgUpdata" @click="uploadFiles(3, 1)"  style="margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="!userInfo.wechat_qrcode">
+							<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="formdatabox" style="margin-top: 20upx;">
+				<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+					<view class="sign">
+						
+					</view>
+					<view  style="padding-left: 20upx;flex: 0.45;">
+						商家展示
+					</view>
+					<view class="t-r" style="flex: 0.6;">
+						<!-- 直接联系客服<text class="iconfont icon-right" style="font-size: 20upx;color: #999999;padding-left: 10upx;"></text> -->
+					</view>
+				</view>
+			<view class="logobox">
+				<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+				<span>店铺LOGO(200X200)</span>
+				<view style="padding-left: 20upx;">
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdataon" style="margin: 10upx;" v-if="userInfo.logos">
+						<image :src="userInfo.logos" class="imgs"  @click="lookimg(1,userInfo.logos)" />
+						<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closeLogo(false)" />
+					</view>
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdata" @click="uploadFiles(1, 1)"  style="margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="!userInfo.logo">
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" />
+					</view>
+				</view>
+			</view>
+			
+			<view class="logobox">
+				<view class="dis-il-block" style="font-size: 20upx;color: #FF4444;float: left;line-height: 70upx;padding-right: 10upx;">*</view>
+				<span>店铺相册(750X750)</span>
+				<view class="dis-flex" style="flex-wrap: wrap;align-content: flex-center;align-items: center;justify-content: left;">
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdataon" style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-for="(item, index) in userInfo.thumbs">
+						<image :src="item" class="imgs" style="width: 100%;" @click="lookimg(2,userInfo.thumbs,index)" />
+						<image :src="imgfixUrls + 'merchant/close.png'" class="close" @click="closePreview(2, item)" />
+					</view>
+					<!-- 图片预览循环模板 -->
+					<view class="userImgUpdata" style="flex: auto;margin: 10upx;width: 180upx;min-width: 180upx;max-width: 180upx;" v-if="userInfo.thumbs.length !== 6" @click="uploadFiles(2, 6)">
+						<image :src="imgfixUrls + 'merchant/addImg.svg'" class="img" /></view>
+				</view>
+			</view>
+			
+		 </view>
+		 <view class="formdatabox" style="margin-top: 20upx;" >
+		 	<view class="dis-flex f-26" style="padding-bottom: 20upx;">
+		 		<view class="sign">
+		 		</view>
+		 		<view  style="padding-left: 20upx;flex: 0.45;">
+		 			请选择入驻类型
+		 		</view>
+		 	</view>
+		 	<view class="dis-flex f-24 formtitle">
+		 		<view class="t-r" style="flex: 0.2;">
+		 			<view class="dis-il-block" style="font-size: 20upx;color: #FFFFFF;float: left;">*</view>
+		 			入驻类型
+		 		</view>
+		 		<view  style="flex: 0.8;padding-left: 40upx;" v-if="pickerarray.length > 0" >
+		 			  <picker @change="bindPickerChange" :value="pickerindex" range-key="name" :range="pickerarray">
+		 			        <view class="uni-input">{{pickerarray[pickerindex].name}}
+							<view class="dis-il-block iconfont icon-right" style="float: right;font-size: 24upx;color: #6f6f6f;">
+		 			        </view>
+							</view>
+		 			  </picker>
+		 		</view>
+		 	</view>
+		 </view>
+		 <view >
+		 	<view class="t-c" style="width: 90vw;height: 80upx;line-height: 80upx;background-color: #FF4444;color: #FFFFFF;border-radius: 60upx;" @click="submit">
+		 		提 交
+		 	</view>
+		 </view>
+		</view>
+		<!-- #ifdef H5 -->
+		<PopManager :show="isOpenLaction" :type="'bottom'" :overlay="'false'" :showOverlay="'false'">
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp&coord=${latlngs.latitude},${latlngs.longitude}`"
+				></iframe>
+			</view>
+			<view class="iframe-wid-hgt" :style="{ height: phoneHeight }" v-if="!latlngs">
+				<iframe
+					id="mapPage"
+					width="100%"
+					height="100%"
+					frameborder="0"
+					:src="`https://apis.map.qq.com/tools/locpicker?search=1&type=1&key=KIQBZ-6OT3G-AOMQD-IHW6J-PEUDV-VCFAF&referer=myapp`"
+				></iframe>
+			</view>
+		</PopManager>
+		<!-- #endif -->
+		<PopManager :show="hangyeshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="closeShareBottom">
+			<view class="hangye dis-flex" v-if="industry.length == 0 &&  Array.isArray(industrysubdivide)">
+				<view class="f-30 t-c" style="width: 100%;">
+					当前地区暂无相关行业分类
+				</view>
+			</view>
+			<view class="hangye dis-flex" v-else>
+				<view  style="flex: 0.499;overflow: auto;height: 360upx;">
+					<view :class="item.checked?'industryclass-item classcheck f-28' :'industryclass-item f-28'" v-for="(item,key,index) in industry" @click="clickindustry(item.id)">
+						{{item.name}}
+					</view>
+				</view>
+				<view  style="flex: 0.499;overflow: auto;height: 360upx;">
+					<view :class="item.checked?'industryclass-item isclasschecked f-28' :'industryclass-item f-28'" v-for="(item,index) in industrysubdivide" @click="clickclass(item)">
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+			<!-- <view class="b-f dis-flex">
+				
+				<view class="flex-box">
+					<button @click="confirm" style="width: 80%;height: 80%;font-size: 34upx;line-height: 70upx;height: 70upx;margin-bottom: 20upx;" type="warn">确定</button>
+				</view>
+			</view> -->
+		</PopManager>	
+		<!-- 商品详情富文本弹窗 -->
+		<PopManager :show="richText" type="center" @clickmask="richText = false">
+			<view class="b-f" style="width: 80vw;height: 80vh;border-radius: 10upx;overflow: auto;" v-if="userInfo.detail || userInfo.detail == ''">
+				<jinEdit placeholder="请输入内容" @editOk="editOk" uploadFileUrl="/#" :html="userInfo.detail"></jinEdit>
+			</view>
+		</PopManager>
+		<!-- <phoneNavBar :checked="'入驻'"></phoneNavBar> -->
+		<TabBars :tabBarAct="0" :pageType="'19'"></TabBars>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import wPicker from '@/components/w-picker/w-picker.vue';
+	import PopManager from '@/components/template/PopManager';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import jinEdit from '@/components/jin-edit/jin-edit.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	export default{
+		data(){
+			return{
+				provinceidName:'',
+				areaidName:'',
+				distidName:'',
+				visiblec:false,
+				address:'',
+				lblis:{},
+				klis:false,
+				isOpenLaction:false,
+				richText:false,
+				userInfo:{
+					pageid:'',
+					detail:'',
+					storeid:0,
+					meralid:0,
+					thumbs:[],
+					name:'',
+					logo:'',
+					mobile:'',
+					desc:'',
+					address:'',
+					one_class:'',
+					two_class:'',
+					provinceid:'',
+					areaid:'',
+					distid:'',
+					lng:'',
+					lat:''
+				},
+				phoneHeight:null,
+				latlngs:null,
+				owenscitylist:[],
+				hangyeshow:false,
+				hangYe:true,
+				industryclass:'',
+				industry:[],
+				industrysubdivide:[],
+				industryAll:{},
+				loadlogo:true,
+				pickerarray:['全部','1','2','3'],
+				pickerindex:0,
+				goodsinfo:{},
+				sid:'',
+				oldDistid:'',
+				uploadlength:0,
+				localIds:[],
+				upimg:false
+				
+			}
+		},
+		components:{
+			wPicker,
+			PopManager,
+			phoneNavBar,
+			jinEdit,
+			TabBars
+		},
+		onHide() {
+			
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.id = e.id;
+			_this.sid = e.sid;
+			_this.userInfo.storeid = e.sid;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHeight = res.windowHeight + 'px';
+				}
+			});
+			_this.owenscitylist = uni.getStorageSync('cityList')
+			_this.latlngs = uni.getStorageSync('curLoction');
+			_this.userInfo.lat = _this.latlngs.latitude;
+			_this.userInfo.lng = _this.latlngs.longitude;
+			_this.userInfo.meralid = _this.pickerarray[0].id;
+			//#ifdef H5
+			_this.getenter(_this.id);
+			//#endif
+			
+		},
+		onShow() {
+			let _this = this;
+			// #ifdef H5
+			window.addEventListener(
+				'message',
+				function(event) {
+					// 接收位置信息，用户选择确认位置点后选点组件会触发该事件，回传用户的位置信息
+					let loc = event.data;
+					if(_this.klis){
+						return
+					}
+					if (loc && loc.module == 'locationPicker') {
+						//防止其他应用也会向该页面post信息，需判断module是否为'locationPicker'
+						console.log('location', loc);
+						// _this.thelat = loc.latlng.lat;
+						_this.userInfo.address = loc.poiaddress;
+						_this.userInfo.lat = loc.latlng.lat;
+						_this.userInfo.lng = loc.latlng.lng;
+						_this.isOpenLaction = false;
+						_this.lblis = {
+									lat:loc.latlng.lat,
+									lng:loc.latlng.lng,
+									detailed_address:loc.poiaddress
+								}
+						_this.getloctions(_this.lblis)
+					}
+					_this.klis = true;
+					setTimeout(()=>{
+						_this.klis = false;
+					},1000)
+				},
+				false
+			);
+			// #endif
+			//#ifdef APP-PLUS
+			if(_this.userInfo.address){
+				_this.lblis.address = _this.userInfo.address
+				_this.getloctions(_this.lblis);
+			}
+			//#endif
+			//#ifdef MP-WEIXIN
+			if(_this.upimg){
+				_this.upimg = false;
+				return
+			}else{
+				_this.getenter(_this.id);
+			}
+			//#endif
+			
+			
+		},
+		methods:{
+			editOk(res) {
+				console.log('shabi', res.html);
+				this.userInfo.detail = res.html;
+				this.richText = false;
+			},
+			submit(){
+				let _this = this;
+				let data = _this.userInfo;
+				if(!data.provinceid){
+				data.provinceid = _this.userInfo.pro_code;
+				data.areaid = _this.userInfo.city_code;
+				data.distid = _this.userInfo.area_code;	
+				}
+				console.log(data);
+				 for(let key  in data){
+					 // debugger
+					 if(key != 'wechat_number' && key != 'wechat_qrcode' && key != 'detail' && key != 'mobile' && key !='wechat_qrcodes' && key !='storeid' && key !='pageid' &&  key != 'wechat_qrcodes'){
+						if(!data[key] && data[key] !== 0){
+								uni.showToast({
+									icon:'none',
+									title:'请完善资料'
+								});
+								return
+						}else if(Array.isArray(data[key])){
+							if(data[key].length == 0){
+								uni.showToast({
+									icon:'none',
+									title:'请完善资料'
+								});
+								return
+							}
+						} 
+					 }
+				        
+				  };
+				  if(!data.wechat_number && !data.wechat_qrcode && !data.mobile){
+					  uni.showToast({
+					  	icon:'none',
+					  	title:'请至少完善一项联系方式'
+					  });
+					  return
+				  }
+				  data.wechat_qrcodes = data.wechat_qrcodes || ''
+				  data.storeid = data.storeid || ''
+				  data.pageid = data.pageid || ''
+				App._post_form(
+					`&p=yellowpage&do=pageSettlement`,
+					data,
+					res => {
+						console.log(res,'提交结果');
+						if(res.data.status == 0){
+							uni.showToast({
+								title:res.message
+							});
+							setTimeout(()=>{
+								App.navigationTo({
+									url: 'pages/subPages2/phoneBook/myGoods/myGoods'
+								});
+							},1000)
+						}else{
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid +'&plugin=yellowpage'
+							});
+						}
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			bindPickerChange(e){
+				this.pickerindex = e.detail.value;
+				this.userInfo.meralid = this.pickerarray[this.pickerindex].id;
+			},
+			clickclass(item){
+				// console.log(item);
+				for(let key  in this.industryAll){
+					this.industryAll[key].map(items=>{
+						items.checked = false;
+						if(items.id == item.id){
+							items.checked = true;
+							this.industryclass = items.name
+							this.userInfo.two_class = items.id;
+							this.industrysubdivide = this.industryAll[key];
+							this.confirm();
+						}
+					})
+				};
+				
+				// this.industryAll.map((items,indexs)=>{
+				// 	items.twotype.map((itemss,indexss)=>{
+				// 		itemss.checked = false;
+				// 		if(item.id == itemss.id){
+				// 			itemss.checked = true;
+				// 			this.industryclass = item.name
+				// 		}
+				// 	})
+				// })
+				
+				this.loadlogo = false;
+				this.loadlogo = true;
+			},
+			clickindustry(keys){
+				this.industry.map((item,index)=>{
+					item.checked = false;
+					if(keys == item.id){
+						item.checked = true;
+						this.userInfo.one_class = item.id;
+					}
+					// this.userInfo.one_class = this.industry[keys].id;
+				})
+				// for(let key  in this.industry){
+				// 	this.industry[key].checked = false;
+				// 	if(keys == key){
+				// 		this.industry[keys].checked = true;
+				// 		this.userInfo.one_class = this.industry[keys].id;
+				// 	}
+				// };
+				for(let key  in this.industryAll){
+					if(keys == key){
+						this.industrysubdivide = this.industryAll[keys];
+					}
+				};
+				// console.log(item);
+				this.loadlogo = false;
+				this.loadlogo = true;
+			},
+			getenter(id){
+				let _this = this;
+				App._post_form(
+					`&p=yellowpage&do=getPageInfo&id=${id || ''}&sid=${_this.sid|| ''}`,
+					{},
+					res => {
+						console.log(res,'入驻初始化');
+						_this.pickerarray = res.data.meallist;
+						// debugger
+						if(res.data.pageinfo){
+							_this.userInfo = res.data.pageinfo;
+						}
+						if(_this.upimg){
+							_this.upimg = false;
+							return
+						}else{
+							_this.userInfo.logos = _this.userInfo.logo;
+							_this.userInfo.wechat_qrcodes = _this.userInfo.wechat_qrcode
+						}
+						
+						if(_this.userInfo.name){
+							_this.userInfo.pageid = _this.id;
+						}else{
+							delete _this.userInfo.pageid
+						}
+						if(_this.userInfo.thumbs == false){
+							_this.userInfo.thumbs = [];
+						}
+						// _this.userInfo.thumbs = _this.userInfo.thumbs;
+						if(res.data.meallist.length > 0){
+							_this.userInfo.meralid = _this.pickerarray[0].id;
+						}
+					
+						_this.oldDistid = _this.userInfo.area_code || res.data.distid;
+						_this.userInfo.provinceid = _this.userInfo.pro_code || res.data.provinceid;
+						_this.userInfo.areaid = _this.userInfo.city_code || res.data.areaid;
+						_this.userInfo.distid = _this.userInfo.area_code || res.data.distid;
+						_this.owenscitylist.map((item,index)=>{
+							if(item.id == _this.userInfo.provinceid){
+								_this.provinceidName = item.name;
+								item.area.map(items=>{
+									if(items.id == _this.userInfo.areaid){
+										_this.areaidName = items.name;
+										items.dist.map(itemss=>{
+											if(itemss.id == _this.userInfo.distid){
+												_this.distidName = itemss.name;
+											}
+										})
+									}
+								})
+							}
+						})
+						_this.industry = res.data.catelist.parents;
+						for(let key  in _this.industry){
+								_this.industry[key].checked = false;
+								if(_this.industry[key].id == _this.userInfo.one_class){
+										_this.industry[key].checked = true;
+									}
+						  };
+						  console.log(_this.industry,'测试自动')
+						_this.industryAll = res.data.catelist.childrens;
+						for(let key  in _this.industryAll){
+								_this.industryAll[key].map(item=>{
+									item.checked = false;
+									if(item.id == _this.userInfo.two_class){
+										item.checked = true;
+										_this.industryclass = item.name;
+										_this.industrysubdivide = _this.industryAll[key];
+									}
+								})
+						  };
+					},
+					false,
+					() => {
+						// console.log('行业加载完')
+					}
+				);
+			},
+			lookimg(type,url,index){
+				if(type == 1 || type == 3){
+					let img = [];
+					img.push(url);
+					uni.previewImage({
+						urls:img,
+						current:0
+					})
+				}else{
+					uni.previewImage({
+						urls:url,
+						current:index
+					})
+				}
+				
+			},
+			closePreview(type, url) {
+				let _this = this;
+				for (let i = 0; i < _this.userInfo.thumbs.length; i++) {
+					if (url == _this.userInfo.thumbs[i]) {
+						_this.userInfo.thumbs.splice(i, 1);
+						// _this.userInfo.thumbs.splice(i, 1);
+					}
+				}
+			},
+			closeLogo(flag){
+				if(flag){
+					this.userInfo.wechat_qrcode = '';
+					this.userInfo.wechat_qrcodes = '';
+				}else{
+					this.userInfo.logo = '';
+					this.userInfo.logos = '';
+				}
+				this.loadlogo = !this.loadlogo;
+				this.loadlogo = !this.loadlogo;
+			},
+			uplodephone(length,localIds){
+			let _this = this;
+			_this.upimg = true;
+					wxApi.uoloadIg(localIds[length], data => {
+						if (data.errMsg === 'uploadImage:ok') {
+							uni.showLoading({});
+							let requestData = {
+								upload_type: 2,
+								id: data.serverId
+							};
+							App._post_form(
+								'&do=uploadFiles',
+								requestData,
+								res => {
+									if (res.errno === 0) {
+											let num = length + 1;
+											// uni.setTimeout(_this.uoloadIgs(length, ids, resImg, type), 500);
+											// setTimeout(()=>{
+											// 	_this.uplodephone(_this.uploadlength,_this.localIds);
+											// },100)
+											// uni.showToast({
+											// 	title:'chengg',
+											// 	icon:'none'
+											// })
+											_this.userInfo.thumbs.push(res.data.img);
+											if(num < _this.uploadlength){
+												uni.setTimeout(_this.uplodephone(num,_this.localIds),500);
+											}
+											// _this.userInfo.thumbs.push(res.data.image);
+											
+										
+									}
+								},
+								false,
+								() => {
+									
+									uni.hideLoading();
+								}
+							);
+						} else {
+							uni.hideLoading();
+							App.showError('上传失败');
+						}
+					});
+				
+			},
+			// 文件上传接口
+			async uploadFiles(type, num) {
+				let _this = this;
+				_this.upimg = true;
+				// #ifdef H5
+				if(App.getClientType() == 2){
+					let res = await App.browser_upload(num);
+				    for (let i = 0; i < res.tempFilePaths.length; i++) {
+				    	let aa = await App._upLoad(res.tempFilePaths[i]);
+				    	if (type == 1) {
+				    		_this.userInfo.logos = aa.data.img;
+				    		_this.userInfo.logo = aa.data.image;
+				    		return
+				    	}
+				    	if (type == 3) {
+				    		_this.userInfo.wechat_qrcodes = aa.data.img;
+				    		_this.userInfo.wechat_qrcode = aa.data.image;
+				    		_this.loadlogo = !_this.loadlogo;
+				    		_this.loadlogo = !_this.loadlogo;
+				    		return
+				    	}
+						if (type == 2) {
+							_this.userInfo.thumbs.push(aa.data.img);
+							// _this.userInfo.thumbs.push(aa.data.image);
+							console.log(_this.userInfo,aa.data.img);
+						}
+				    }
+					return
+				}
+				if(type == 2){
+					wxApi.choseImage(res => {
+						_this.localIds = res.localIds;
+						_this.uploadlength = res.localIds.length;
+						_this.uplodephone(0,_this.localIds);
+					},6);
+				}else{
+					wxApi.choseImage(res => {
+						let length = res.localIds.length;
+						res.localIds.map(item=>{
+								wxApi.uoloadIg(item, data => {
+									if (data.errMsg === 'uploadImage:ok') {
+										uni.showLoading({});
+										let requestData = {
+											upload_type: 2,
+											id: data.serverId
+										};
+										App._post_form(
+											'&do=uploadFiles',
+											requestData,
+											res => {
+												if (res.errno === 0) {
+													if (type == 1) {
+														_this.userInfo.logos = res.data.img;
+														_this.userInfo.logo = res.data.image;
+														_this.loadlogo = !_this.loadlogo;
+														_this.loadlogo = !_this.loadlogo;
+														return
+													}
+													if (type == 3) {
+														_this.userInfo.wechat_qrcodes = res.data.img;
+														_this.userInfo.wechat_qrcode = res.data.image;
+														_this.loadlogo = !_this.loadlogo;
+														_this.loadlogo = !_this.loadlogo;
+														return
+													}
+													
+												}
+											},
+											false,
+											() => {
+												uni.hideLoading();
+											}
+										);
+									} else {
+										uni.hideLoading();
+										App.showError('上传失败');
+									}
+								});
+						})
+					});
+				}
+				// #endif
+				// #ifndef H5
+				if(type == 1 || type == 3){
+					wx.chooseImage({
+						count: 1,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							// console.log(_this.userInfo.havestore, _this.page, '-------');
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+								if (type == 1) {
+									_this.userInfo.logos = aa.data.img;
+									_this.userInfo.logo = aa.data.image;
+									return
+								}
+								if (type == 3) {
+									_this.userInfo.wechat_qrcodes = aa.data.img;
+									_this.userInfo.wechat_qrcode = aa.data.image;
+									_this.loadlogo = !_this.loadlogo;
+									_this.loadlogo = !_this.loadlogo;
+									return
+								}
+							}
+						}
+					});
+				}else{
+					wx.chooseImage({
+						count: 6,
+						sourceType: ['album', 'camera'],
+						success: async function(res) {
+							// console.log(_this.userInfo.havestore, _this.page, '-------');
+							for (let i = 0; i < res.tempFilePaths.length; i++) {
+								let aa = await App._upLoad(res.tempFilePaths[i]);
+								if (type == 1) {
+									_this.userInfo.logos = aa.data.img;
+									_this.userInfo.logo = aa.data.image;
+								}
+								if (type == 2) {
+									_this.userInfo.thumbs.push(aa.data.img);
+									// _this.userInfo.thumbs.push(aa.data.image);
+									console.log(_this.userInfo,aa.data.img);
+								}
+							}
+						}
+					});
+				}
+				
+				// #endif
+			},
+			showThePic(){
+				this.hangYe = !this.hangYe;
+				this.hangyeshow = !this.hangyeshow;
+			},
+			closeShareBottom(){
+				this.hangyeshow = !this.hangyeshow;
+				this.hangYe = !this.hangYe;
+			},
+			onCancel(){
+				
+			},
+			cancel(){
+				this.hangyeshow = false;
+			},
+			confirm(){
+				this.hangyeshow = false;
+			},
+			getcityclass(){
+				let _this = this;
+				let data = {
+					provinceid:this.userInfo.provinceid,
+					areaid:this.userInfo.areaid,
+					distid:this.userInfo.distid
+				}
+				App._post_form(
+					`&p=yellowpage&do=area2cate`,
+					data,
+					res => {
+						
+						console.log(res,'更换地区结果');
+						_this.industry = res.data.parents;
+						for(let key  in _this.industry){
+								_this.industry[key].checked = false;
+						  };
+						  console.log(_this.industry,'测试自动');
+						_this.industryAll = res.data.childrens;
+						for(let key  in _this.industryAll){
+								_this.industryAll[key].map(item=>{
+									item.checked = false;
+									if(item.id == _this.userInfo.two_class){
+										_this.industrysubdivide = [];
+										_this.loadlogo = false;
+										_this.loadlogo = true;
+									}
+								})
+								console.log(_this.industryAll,'还地区')
+						  };
+						  _this.userInfo.one_class = '';
+						  _this.userInfo.two_class = '';
+						   _this.industryclass = '';
+						  if(Array.isArray(res.data.childrens) || res.data.parents.length == 0){
+							  _this.industrysubdivide = res.data.childrens;
+							  _this.industryclass = '当前地区暂无行业分类';
+							  
+							  if(_this.oldDistid !== _this.userInfo.distid){
+							  	uni.showToast({
+							  		title:'当前地区暂无行业分类',
+							  		icon:'none'
+							  	});
+							  }
+						  }else{
+							  console.log(_this.oldDistid,_this.userInfo.distid,777777)
+							  if(_this.oldDistid !== _this.userInfo.distid){
+								  uni.showToast({
+								  	title:'更换地区请重新选择当前地区行业',
+								  	icon:'none'
+								  });
+							  }
+						  }
+						  _this.loadlogo = false;
+						  _this.loadlogo = true;
+						// App.navigationTo({
+						// 	url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid
+						// });
+					},
+					false,
+					() => {
+					}
+				);
+			},
+			onConfirm(e){
+				console.log(e);
+				let _this = this;
+				this.provinceidName = e.obj.province.label;
+				this.areaidName = e.obj.city.label;
+				this.distidName = e.obj.area.label;
+				this.oldDistid = this.userInfo.distid;
+				this.userInfo.provinceid = e.value[0];
+				this.userInfo.areaid = e.value[1];
+				this.userInfo.distid = e.value[2];
+				this.getcityclass();
+			},
+			visble(){
+				this.visiblec = true;
+			},
+			getLocation() {
+				let _this = this;
+				// #ifndef H5
+				uni.chooseLocation({
+					keyword: '',
+					success: function(e) {
+						_this.userInfo.address = e.address;
+						_this.userInfo.lat = e.latitude;
+						_this.userInfo.lng = e.longitude;
+						_this.lblis.lat = e.latitude;
+						_this.lblis.lng = e.longitude;
+						_this.lblis.address = e.address
+						// console.log(e);
+						// _this.onkoc = 0;
+						_this.getloctions(_this.lblis)
+					}
+				});
+				// #endif
+				// #ifdef H5
+				_this.isOpenLaction = true;
+				// #endif
+				//#ifdef APP-PLUS
+				      App.navigationTo({
+				       url: 'pages/subPages2/map/index'
+				      });
+				      //#endif
+			},
+			getloctions(lblis){
+				
+				let _this = this;
+				// console.log(_this.owenscitylist);
+				App._post_form(`&p=member&do=lng2areaid&lng=${lblis.lng}&lat=${lblis.lat}`, {}, res => {
+					// _this.userInfo.address = lblis.address;
+					console.log(_this.userInfo.distid,res.data.countyid,'666666');
+					_this.oldDistid = _this.userInfo.distid;
+					_this.userInfo.provinceid = res.data.provinceid;
+					_this.userInfo.distid = res.data.countyid;
+					_this.userInfo.areaid = res.data.cityid;
+					_this.owenscitylist.map((item,index)=>{
+						if(item.id == _this.userInfo.provinceid){
+							_this.provinceidName = item.name;
+							item.area.map(items=>{
+								if(items.id == _this.userInfo.areaid){
+									_this.areaidName = items.name;
+									items.dist.map(itemss=>{
+										if(itemss.id == _this.userInfo.distid){
+											_this.distidName = itemss.name;
+											this.getcityclass();
+										}
+									})
+								}
+							})
+						}
+					})
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.enterForm{
+		// padding: 30upx;
+		.bgimgbox{
+			.bgimg{
+				width: 100vw;
+				height: 25vh;
+			}
+		}
+		.formbox{
+			padding: 30upx;
+			padding-bottom: 130upx;
+			// height: 50vh;
+			position: relative;
+			.formdatabox{
+				padding: 30upx;
+				width: 84vw;
+				background-color: #FFFFFF;
+				border-radius: 15upx;
+				position: relative;
+				top: -100upx;
+				.sign{
+					height: 28upx;
+					margin-top: 5upx;
+					width: 8upx;
+					background-color: #FF4444;
+					border-radius: 30%;
+					flex: 0.014;
+				}
+			}
+			.logobox{
+				span{
+					font-size: 24upx;
+				}
+				.userImgUpdataon{
+					width: 180upx;
+					margin: 20upx 0;
+					height: 180upx;
+					border-radius: 10upx;
+					border: 1upx solid #CCCCCC;
+					position: relative;
+					overflow: hidden;
+					.imgs{
+						width: 180upx;
+						height: 180upx;
+					}
+					.close{
+						position: absolute;
+						width: 30upx;
+						height: 30upx;
+						right: 10upx;
+						top: 10upx;
+					}
+				}
+				.userImgUpdata{
+					width: 180upx;
+					margin: 20upx 0;
+					height: 180upx;
+					border-radius: 10upx;
+					border: 1upx solid #CCCCCC;
+					position: relative;
+					.img{
+						width: 80upx;
+						height: 80upx;
+						position: absolute;
+						left: 50%;
+						top: 30%;
+						transform: translate(-50%);
+					}
+				}
+			}
+			.formtitle{
+				padding: 25upx 10upx;
+				background-color: #fafafa;
+				margin-top: 20upx;
+				border-radius: 10upx;
+			}
+		}
+		.iframe-wid-hgt{
+			width: 100vw;
+		}
+		.hangye{
+			height: 560upx;
+			width: 100vw;
+			box-sizing: border-box;
+			padding: 30upx;
+			background-color: #FFFFFF;
+			border-radius: 15upx 15upx 0 0;
+			.industryclass-item{
+				padding: 20upx;
+				margin: 15upx;
+				text-align: center;
+				border-radius: 15upx;
+			}
+			.classcheck{
+				background-color: #F7F7F7;
+			}
+			.isclasschecked{
+				background-color: #ff4444;
+				color: #ffffff;
+			}
+		}
+		.timePickerView{
+			width: 100%;
+		}
+	}
+</style>
diff --git a/pages/subPages2/phoneBook/goodsClass/goodsClass.vue b/pages/subPages2/phoneBook/goodsClass/goodsClass.vue
new file mode 100644
index 0000000..ff03f5b
--- /dev/null
+++ b/pages/subPages2/phoneBook/goodsClass/goodsClass.vue
@@ -0,0 +1,186 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<view class="goodsClass" v-if="loadlogo">
+			<filtertab :requestType="'6'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid"
+			 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab>
+			 <view >
+			 	<view  v-if="cardlist">
+			 		<business-card :businCard_list="cardlist" :is_collcet="'0'" :is_have="1" :is_pading="false" :is_yellow="true"></business-card>
+			 	</view>
+			 	<load-more :isMore="isMore"></load-more>
+			 </view>
+			 <far-bottom></far-bottom>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import filtertab from '@/components/template/filtertab.vue';
+	import businessCard from '@/components/page/pageComponents/businessCard.vue';
+	export default{
+		data(){
+			return{
+				cate_one:'0',
+				cate_two:'0',
+				title:'全部',
+				cardlist:null,
+				isMore:true,
+				count:1,
+				loadlogo:false,
+				page:1,
+				orderid:'',
+				region_id:'',
+				flag:false
+			}
+		},
+		components:{
+			filtertab,
+			loadMore,
+			Loadlogo,
+			businessCard
+		},
+		onLoad(e) {
+			console.log(e)
+			let _this = this;
+			_this.cate_one = e.cate_one;
+			_this.cate_two = e.cate_two;
+			_this.title = e.title;
+			this.getlist(true);
+		},
+		computed:{
+			curLoction(){
+				return uni.getStorageSync('curLoction')
+			}
+		},
+		methods:{
+			getlist(flag){
+				let _this = this;
+				let data={
+					page:_this.page,
+					lng:_this.curLoction.longitude || '',
+					lat:_this.curLoction.latitude || '',
+					sort:_this.orderid || '',
+					cate_one:_this.cate_one || '',
+					cate_two:_this.cate_two || '',
+					city_id:_this.region_id || ''
+				};
+				App._post_form(
+					`&p=yellowpage&do=homeList`,
+					data,
+					res => {
+						console.log(res);
+						
+						_this.cardlist = res.data.list;
+						if(_this.cardlist.length == 0){
+							_this.cardlist = null;
+						}
+						// debugger
+						setTimeout(()=>{
+							this.flag = true;
+						},1000)
+						// this.swiperList = res.data.adv;
+						// this.strodatas = res.data;
+						// this.loadlogo = true;
+						_this.count = res.data.total;
+						// this.shopNum = Number(res.data.cartnum);
+						// console.log(this.$refs.shopPing);
+						
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			selectOrders(data) {
+				let _this = this;
+				if(!this.flag) return
+				console.log('1分类',data);
+				// _this.cate_one = '';
+				// _this.cate_two = '';
+				// _this.title = '';
+				_this.page = 1;
+				this.orderid = data.val;
+				this.getlist();
+			},
+			selectClassTwoid(data) {
+				let _this = this;
+				if(!this.flag) return
+				console.log('2分类',data);
+				// _this.cate_one = '';
+				_this.cate_two = '';
+				_this.title = '';
+				_this.page = 1;
+				this.cate_two = data.cate_two;
+				this.getlist();
+			},
+			selectClassid(data) {
+				let _this = this;
+				if(!this.flag) return
+				console.log('3分类',data);
+				_this.cate_one = '';
+				_this.cate_two = '';
+				_this.title = '';
+				_this.page = 1;
+				this.cate_one = data.cate_one;
+				this.getlist();
+			},
+			selectAreaid(data,flag) {
+				let _this = this;
+				if(!this.flag) return
+				console.log('4分类',data);
+				_this.page = 1;
+				this.region_id = data.id;
+				this.flag = true;
+				this.getlist();
+			},
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom: function() {
+			let _this = this;
+			this.isMore = false;
+			console.log(this.page,this.count)
+			if (this.page == this.count) {
+				this.isMore = true;
+			} else {
+				this.page++;
+				let data={
+					page:this.page,
+					lng:this.curLoction.longitude || '',
+					lat:this.curLoction.latitude || '',
+					sort:this.orderid || '',
+					cate_one:this.cate_one || '',
+					cate_two:this.cate_two || '',
+					city_id:this.region_id || ''
+				};
+				App._post_form(
+					`&p=yellowpage&do=homeList`,
+					data,
+					res => {
+						console.log(res)
+						this.cardlist = this.cardlist.concat(res.data.list);
+						this.isMore = true;
+						// this.count = res.data.total;
+					},
+					false,
+					() => {}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.goodsClass{
+		
+	}
+</style>
diff --git a/pages/subPages2/phoneBook/logistics/logistics.vue b/pages/subPages2/phoneBook/logistics/logistics.vue
new file mode 100644
index 0000000..39a5a82
--- /dev/null
+++ b/pages/subPages2/phoneBook/logistics/logistics.vue
@@ -0,0 +1,975 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<view class="logistics">
+			<far-bottom></far-bottom>
+			<view class="card dis-flex" style="border-radius: 10upx 10upx 0 0;position: relative;">
+				<view >
+					<image class="img" :src="phoneclassdata.logo" mode=""></image>
+				</view>
+				<view  style="padding-top: 15upx;padding-left: 20upx;">
+					<view class="f-36 names" style="color: #000000;font-weight: 600;">
+						{{phoneclassdata.name}}
+					</view>
+					<view class="f-22" style="color: #4D4D4D;padding-top: 36upx;">
+						{{phoneclassdata.oneCateName}} · {{phoneclassdata.twoCateName}}
+					</view>
+				</view>
+				<view class="f-26 col-f storeBtn" v-if="phoneclassdata.storeid !== '0'" @click="goStore(phoneclassdata.storeid)">
+					前往商户
+				</view>
+			</view>
+			<view class="f-24 synopsis">
+				<text>简介:</text>
+				<text style="color: #C1C1C1;padding-left: 30upx;">{{phoneclassdata.desc}}</text>
+			</view>
+			<view class="f-26 imgs dis-flex" v-if="phoneclassdata.thumbs">
+				<!-- <view style="min-width: 60upx;">照片</view> -->
+				<view class="dis-il-block dis-flex fleximg">
+					<image class="flex-item" v-for="(item,index) in phoneclassdata.thumbs" :src="item" @click="lookimg(phoneclassdata.thumbs,index)"
+					 mode=""></image>
+					 <view v-if="phoneclassdata.thumbs" class="f-20 t-c col-f" style="position: absolute;width: 100upx;height: 35upx;border-radius: 60upx;background-color: rgba(0,0,0,0.5);left: 20upx;bottom: 20upx;line-height: 35upx;">
+					 	共{{phoneclassdata.thumbs.length}}张
+					 </view>
+				</view>
+			</view>
+			<view class="cardis f-24">
+				<view  style="padding:0upx 20upx;border-bottom: 1upx solid #F8F8F8;height: 80upx;line-height: 70upx;" v-if="phoneclassdata.wechat_number">
+					<text class="iconfont icon-weixin"  style="padding-right: 20upx;"></text>{{phoneclassdata.wechat_number}}
+				</view>
+				<view  style="padding:0upx 20upx;border-bottom: 1upx solid #F8F8F8;height: 80upx;line-height: 70upx;" v-if="phoneclassdata.mobile">
+					<text class="iconfont icon-dianhua1"  style="padding-right: 20upx;"></text>{{phoneclassdata.mobile}}
+				</view>
+				<view  style="padding: 0upx 20upx 0upx;line-height: 70upx;" @click="goStorein">
+					<text class="iconfont icon-dingweixiao" style="padding-right: 20upx;"></text>{{phoneclassdata.address}}
+				</view>
+				<view  style="padding: 0upx 20upx 0upx;border-top: 1upx solid #f8f8f8;" v-if="phoneclassdata.showtel == 1 && phoneclassdata.wechat_qrcode">
+					<view  style="height: 70upx;line-height: 70upx;">
+						微信二维码
+					</view>
+					<view >
+						<image :src="phoneclassdata.wechat_qrcode" style="width: 200upx;height: 200upx;border-radius: 10upx;" mode="" @click="lookimg([phoneclassdata.wechat_qrcode],0)"></image>
+					</view>
+				</view>
+				<view  style="padding: 0upx 20upx 0upx;border-top: 1upx solid #f8f8f8;" v-if="phoneclassdata.detail">
+					<view  style="height: 70upx;line-height: 70upx;">
+						黄页详情
+					</view>
+					<view  style="padding: 30upx 0;">
+						<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+						show-with-animation use-anchor  @imgtap="imgtap" :html="phoneclassdata.detail" ></jyf-parser>
+					</view>
+				</view>
+			</view>
+			<view class="dis-flex btnbox">
+				<view class="left" style="margin-bottom: 20upx;" @click="claim" v-if="phoneclassdata.claimdiv !== 0">
+					<view class="leftbtn">
+						<text class="iconfont icon-news_light"></text>
+						<text style="padding-left: 20upx;">认领</text>
+					</view>
+				</view>
+				<view class="right">
+					<view class="rightbtn" @click="inform(1)">
+						<text class="iconfont icon-bianji"></text>
+						<text style="padding-left: 20upx;">纠错</text>
+					</view>
+				</view>
+				<view class="right">
+					<view class="rightbtn" @click="openshare">
+						<text class="iconfont icon-share"></text>
+						<text style="padding-left: 20upx;">转发{{phoneclassdata.share}}</text>
+					</view>
+				</view>
+				<!-- <view class="right">
+					<button  @click="openshare" class="rightbtn dis-il-block" style="width: 90%;height: 100%;padding: 0;line-height: 60upx;background-color: #ffffff;font-size: 34upx;color: #6f6f6f;vertical-align: top;">
+					<text class="iconfont icon-share" style="padding-right: 20upx;"></text>
+					
+					<text class="f-20">{{phoneclassdata.share}}</text></button>
+				</view> -->
+			</view>
+			<view class="dis-flex record f-26">
+				<view class="flex-box record-item" >
+					<view >
+						{{phoneclassdata.pv}}
+					</view>
+					<view >
+						<text class="iconfont icon-hotfill"></text>
+						<text>浏览</text>
+					</view>
+				</view>
+				<view class="flex-box record-item" @click="ischeck(1)">
+					<view >
+						{{phoneclassdata.collectNum}}
+					</view>
+					<view >
+						<text :class="phoneclassdata.aCollect == 1?'iconfont icon-favor_fill_light check' : 'iconfont icon-favor_fill_light'"></text>
+						<text>收藏</text>
+					</view>
+				</view>
+				<view class="flex-box record-item" @click="openshare">
+					<view >
+						{{phoneclassdata.share}}
+					</view>
+					<view >
+						<text class="iconfont icon-forwardfill"></text>
+						<text></text>
+					</view>
+				</view>
+			</view>
+			<!-- <view class="f-26 synopsis">
+				<text>简介</text>
+				<text style="color: #6f6f6f;padding-left: 30upx;">{{phoneclassdata.desc}}</text>
+			</view> -->
+			<!-- <view class="f-26 imgs dis-flex">
+				<view style="min-width: 60upx;">照片</view>
+				<view class="dis-il-block dis-flex fleximg">
+					<image class="flex-item" v-for="(item,index) in phoneclassdata.thumbs" :src="item" @click="lookimg(phoneclassdata.thumbs,index)"
+					 mode=""></image>
+				</view>
+			</view> -->
+			
+			<view class="dis-flex inform f-26">
+				<view  style="flex: 0.8;padding-top: 10upx;" v-if="remark">
+					{{remark}}
+				</view>
+				<view  style="flex: 0.8;padding-top: 10upx;" v-else>
+					<view >
+						办理服务前请勿付<text style="color: #FF4444;">订金，押金</text>等费用！
+					</view>
+					<view >
+						请先确认对方资质,谨防上当受骗！
+					</view>
+				</view>
+				<view  style="flex: 0.2;border-left: 1px solid #F8F8F8;">
+					<view  style="margin-left: 50upx;" @click="inform(2)">
+						<image style="width: 50upx;height: 50upx;" :ssrc="imgfixUrls + 'jubao.png'" mode=""></image>
+						<view  style="color: #03C0C3;">
+							举报
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="menu">
+				<view class="dis-flex">
+					<view class="dis-flex" style="flex: 0.5;">
+						<view class="menu-item" @click="gohome">
+							<image :src="imgfixUrls + 'businesscard/index.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">首页</view>
+						</view>
+						<view class="menu-item" @click="gomycart">
+							<image :src="imgfixUrls + 'businesscard/card.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">我的黄页</view>
+						</view>
+						<view class="menu-item" @click="openshare">
+							<image :src="imgfixUrls + 'businesscard/share.png'" class="menu-itemImage"></image>
+							<view class="menu-name f-24 col-3">转发</view>
+						</view>
+						<!-- <button class="menu-item" style="padding: 0;line-height: 40upx;margin: 0;background-color: #FFFFFF;"  @click="openshare">
+							<image :src="imgfixUrls + 'businesscard/share.png'" class="menu-itemImage" style="margin: 0;"></image>
+							<view class="menu-name f-24 col-3">转发</view>
+						</button> -->
+						
+					</view>
+					<view class="dis-flex" style="flex: 0.5;">
+						<view  style="flex: 1;padding: 12upx 10upx;" v-if="phoneclassdata.mid !== '0'">
+							<view class="menu-btn" style="background-color: #17D117;" @click="chat">
+								<image :src="imgfixUrls + 'businesscard/chat.png'" class="menuimg" mode=""></image>
+								<view class="menutext dis-il-block">在线聊</view>
+							</view>
+						</view>
+						<!-- <view  style="flex: 0.5;" v-else>
+							
+						</view> -->
+						<view  style="flex: 1;padding: 12upx 10upx;" v-if="phoneclassdata.showtel !== 1">
+							<view class="menu-btn" style="background-color: #FF4444;" @click="playphone">
+								<image :src="imgfixUrls + 'businesscard/phone.png'" class="menuimg" mode=""></image>
+								<view class="menutext dis-il-block">查看电话</view>
+							</view>
+						</view>
+						<view  style="flex: 1;padding: 12upx 10upx;" v-else>
+							<view class="menu-btn t-c" style="background-color: #FF4444;" @click="playphone">
+								<image :src="imgfixUrls + 'businesscard/phone.png'" class="menuimg" mode=""></image>
+								<view class="menutext dis-il-block t-c">打电话</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<popup-view :show="show" type="center" @clickmask="close">
+			<view class="popup">
+				<view class="f-30 t-c f-w" style="color: #333333;padding:30upx 40upx 0;">
+					认领{{phoneclassdata.name}}
+				</view>
+				<view class="f-24 t-c" style="color: #C1C1C1;padding:30upx 40upx 15upx;">
+					<text v-if="Number(phoneclassdata.claimmoney) == 0">审核通过即可认领成功</text> <text v-else>支付<text style="color: #FF4444;">{{phoneclassdata.claimmoney}}</text>元审核认领!</text>
+				</view>
+				<view  style="width: 60vw;padding:20upx 40upx 0;position: relative;">
+					<view class="dis-il-block iconfont icon-people" style="position: absolute;top: 38%;left: 11%;font-weight: 100;color: #999999;">
+						
+					</view>
+					<input class="uni-input" v-if="show" v-model="name"
+					 placeholder="请输入认领人姓名" placeholder-style="font-size:26upx;color:#999999;" />
+				</view>
+				<view  style="width: 60vw;padding:20upx 40upx 0;position: relative;">
+					<view class="dis-il-block iconfont icon-mobile" style="position: absolute;top: 38%;left: 11%;font-weight: 100;color: #999999;">
+						
+					</view>
+					<input class="uni-input" v-if="show" v-model="phone" type="number" maxlength="11"
+					 placeholder="请输入认领人联系方式" placeholder-style="font-size:26upx;color:#999999;" />
+				</view>
+				<view  style="width: 60vw;margin:20upx 40upx 0;border: 1upx;border: 1upx solid #dfdfdf;box-sizing: border-box;">
+					<textarea v-if="show" class="uni-textarea"
+					 placeholder-style="color:#999999;font-size:28upx;" style="height: 10vh;width: 100%;" v-model="textarea" placeholder="请填写认领说明" />
+					</view>
+				<view class="f-26" style="padding: 30upx 0;margin-top: 20upx;color: #6f6f6f;">
+					<view class="t-c" style="color: #FFFFFF;padding: 20upx 0;background-color: #FF4444;width: 80%;margin: auto;" @click="goclaim" v-if="Number(phoneclassdata.claimmoney) == 0">
+						申请认领
+					</view>
+					<view class="t-c" style="color: #FFFFFF;padding: 20upx 0;background-color: #FF4444;width: 80%;margin: auto;" @click="goclaim" v-else>
+						支付认领
+					</view>
+					<view class="t-c" style="padding: 20upx 0;" @click="close">
+						取消
+					</view>
+				</view>
+			</view>
+		</popup-view>
+		<popup-view :show="report" type="center" @clickmask="closereport">
+			<view class="popup">
+				<view class="f-30 t-c f-w" style="color: #333333;padding:30upx 40upx 0;">
+					{{type == 1?'纠错':'举报'}}
+				</view>
+				<view  style="width: 60vw;padding:20upx 40upx 0;position: relative;">
+					<view class="dis-il-block iconfont icon-people" style="position: absolute;top: 38%;left: 11%;font-weight: 100;color: #999999;">
+						
+					</view>
+					<input class="uni-input" v-if="report" v-model="name" 
+					 placeholder="请输入姓名" placeholder-style="font-size:26upx;color:#999999;" />
+				</view>
+				<view  style="width: 60vw;padding:20upx 40upx 0;position: relative;">
+					<view class="dis-il-block iconfont icon-mobile" style="position: absolute;top: 38%;left: 11%;font-weight: 100;color: #999999;">
+						
+					</view>
+					<input class="uni-input" v-if="report" v-model="phone" type="number" maxlength="11"
+					 placeholder="请输入联系方式" placeholder-style="font-size:26upx;color:#999999;" />
+				</view>
+				<view class="uni-textarea" style="width: 60vw;margin:20upx 40upx 0;border: 1upx solid #dfdfdf;box-sizing: border-box;">
+					<textarea v-if="report" 
+					 placeholder-style="color:#999999;font-size:28upx;" style="height: 10vh;width: 100%;" v-model="textarea" :placeholder="`请描述${type==1?'纠错':'举报'}详情`" />
+					</view>
+				
+				<view class="f-26" style="padding: 30upx 0;margin-top: 20upx;color: #6f6f6f;">
+					<view class=" t-c" style="color: #FFFFFF;padding: 20upx 0;background-color: #FF4444;width: 80%;margin: auto;" @click="whistleblowing">
+						提交
+					</view>
+					<view class=" t-c" style="padding: 20upx 0;" @click.stop="closereport">
+						取消
+					</view>
+<!-- 					<view class="flex-box t-c" style="color: #03C0C3;" @click="goclaim" v-if="Number(phoneclassdata.claimmoney) == 0">
+						申请认领
+					</view> -->
+					
+				</view>
+			</view>
+		</popup-view>
+		<shareBottom :shareBottomShow="shareBottomShow" @clickmask="closeShareBottom" :shareShow="shareShow" @closeShareShow="closeShareShow"
+		 @shareImgShow="shareImgShow" :isCard="isCard" :postId="id" @gohb="goPost" :postType="'12'"></shareBottom>
+		<!-- #ifdef H5 -->
+				<view class="masking" v-if="isShare" @click="isShare=false">
+					<image :src="imageRoot + 'share.png'" class="to-share" mode="widthFix"></image>
+				</view>
+		<!-- #endif -->
+		<!-- <phoneNavBar></phoneNavBar> -->
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import diypages from '@/components/template/diypages.vue';
+	import PopupView from '@/components/template/PopManager.vue';
+	import shareBottom from '@/components/template/shareBottom';
+	import Map from '@/common/js/ms-openMap/openMap.js';
+	import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	// import phoneNavBar from '@/components/template/phoneNavBar';
+	export default{
+		data(){
+			return{
+				phoneclassdata:{},
+				loadlogo:false,
+				checknum:1,
+				show:false,
+				userinfo:{},
+				textarea:'',
+				name:'',
+				phone:'',
+				report:false,
+				type:0,
+				isShare:false,
+				shareBottomShow: false,
+				shareShow: false,
+				id:'',
+				sid:'',
+				share:'',
+				remark:'',
+				isopenImg:false,
+				shareinfo:{}
+			}
+		},
+		components:{
+			Loadlogo,
+			diypages,
+			PopupView,
+			shareBottom,
+			jyfParser
+			// phoneNavBar
+		},
+		onLoad(e) {
+			let _this = this;
+			_this.id = e.id;
+			_this.sid = e.sid;
+			_this.share = e.share;
+			// if(e.share){
+			// 	this.isshare();
+			// }
+			//#ifdef H5
+			_this.getShareInfo()
+			//#endif
+			
+			uni.$on('shareLogistics',function(data){
+				_this.isshare();
+			})
+			// console.log(e,'eeeeee');
+			_this.userinfo = uni.getStorageSync('userinfo');
+		},
+		onUnload() {
+			uni.$off('shareLogistics')
+		},
+		onShow() {
+			if(this.isopenImg){
+				this.isopenImg = false;
+				return
+			}
+			this.getPagesDetails(this.id);
+			
+			
+		},
+		computed: {
+			isCard() {
+				let ClientType = App.getClientType();
+				return ClientType !== '3' ? false : true
+			},
+			cardShare() {
+				return this.$store.state.isCardshare
+			}
+		},
+		methods:{
+			getShareInfo() {
+				let	aa = location.href,
+					head_id = uni.getStorageSync('userinfo').mid;
+					aa = aa.split('/#/')[1] + '&head_id=' + head_id;
+				let _this = this,
+					data = {
+						pageinfo: aa
+					};
+				App._post_form('&do=Shareinfo', data, res => {
+					_this.shareinfo = res.data;
+					wxApi.wxRegister(() => {
+						wxApi.wxShare({
+							title: _this.shareinfo.title || '',
+							desc: _this.shareinfo.desc || '',
+							link: aa,
+							imgUrl: _this.shareinfo.img || '',
+							success: function() {
+							},
+							trigger: function(res) {
+								_this.isshare();
+							},
+							cancel: function() {}
+						});
+					});
+				})
+			},
+			// 发帖导航
+			   goStorein() {
+				   let _this = this;
+				   // #ifdef MP-WEIXIN
+				   uni.getLocation({
+				       success(res) {
+				       // console.log('定位1',res,Number(_this.detailinfo.location.lat),Number(_this.detailinfo.location.lng));
+				   	setTimeout(()=>{
+				   		uni.openLocation({
+				   		    latitude: Number(_this.phoneclassdata.lat),
+				   		    longitude: Number(_this.phoneclassdata.lng),
+				   			success: function () {
+				   				console.log('success');
+				   			},
+				   			fail: function () {
+				   				console.log('success');
+				   			},
+				   		})
+				   	})
+				           
+				       }
+				   })
+				   //#endif
+				   //#ifdef H5
+				   wxApi.WxopenLocation(Number(_this.phoneclassdata.lat), Number(_this.phoneclassdata.lng), '', _this.phoneclassdata.address);
+				   //#endif
+				   //#ifdef APP-PLUS
+				       Map.openMap(Number(_this.phoneclassdata.lat),Number(_this.phoneclassdata.lng), _this.phoneclassdata.address,'gcj02')
+				       //#endif
+			   },
+			// 前往商户
+			goStore(sid){
+				App.navigationTo({
+					url:'pages/mainPages/store/index?sid=' + sid
+				})
+			},
+			// 从分享页面进入
+			isshare(){
+				App._post_form(
+					`&p=yellowpage&do=addShare&id=${this.id}`,
+					{},
+					res => {
+						// uni.showToast({
+						// 	title:'转发成功'
+						// })
+					},
+					false,
+					() => {
+						// _this.loadlogo = true;
+					}
+				);
+			},
+			goPost(data) {
+				let _this = this;
+				_this.shareBottomShow = false;
+			},
+			shareImgShow() {
+				let _this = this;
+				_this.shareShow = true;
+				_this.shareBottomShow = false;
+			},
+			// 关闭分享弹框
+			closeShareShow() {
+				let _this = this;
+				_this.shareShow = false;
+				_this.shareBottomShow = false;
+			},
+			closeShareBottom() {
+				let _this = this;
+				_this.shareBottomShow = false;
+			},
+			playphone(){
+				if(this.phoneclassdata.showtel !== 1){
+					App.showError(
+						`是否支付${this.phoneclassdata.querymoney}元查看商家电话?`,
+						data => {
+							if (data.confirm) {
+								App._post_form(
+									`&p=yellowpage&do=pageQuery&id=${this.id}`,
+									{},
+									res => {
+										console.log(res);
+										if(res.data.status == 1){
+											App.navigationTo({
+												url: `pages/mainPages/payment/payment?orderid=${res.data.orderid}`
+											})
+										}
+										// pages/mainPages/payment/payment
+										// _this.phoneclassdata = res.data.info;
+										// _this.list = res.data.list
+									},
+									false,
+									() => {
+										
+									}
+								);
+							}
+						},
+						true
+					);
+				}else{
+					uni.makePhoneCall({
+						phoneNumber: this.phoneclassdata.mobile //仅为示例
+					});
+				}
+				
+			},
+			chat(){
+				App.navigationTo({
+					url: `pages/subPages/homepage/chat/chat?other_party_id=${this.phoneclassdata.mid}&type=1&other_party_type=1`
+				});
+				// let getSetInfo = uni.getStorageSync('getSetInfo');
+				// if(getSetInfo.type == 1){
+				// 	App.navigationTo({
+				// 		url: 'pagesA/instantMessenger/instantMessenger?other_party_id=' + this.phoneclassdata.mid + '&other_party_type=' + 1+ '&type=1'
+				// 	})
+				// }else{
+				// 	App.navigationTo({
+				// 		url: 'pages/subPages/homepage/chat/chat?other_party_id=' + this.phoneclassdata.mid + '&other_party_type=' + 1+ '&type=1'
+				// 	})
+				// }
+			},
+			gomycart(){
+				App.navigationTo({
+					url: 'pages/subPages2/phoneBook/myGoods/myGoods'
+				});
+			},
+			gohome(){
+				App.navigationTo({
+					url: `pages/subPages2/phoneBook/phoneBook`
+				});
+			},
+			openshare(){
+				this.shareBottomShow = true;
+			},
+			whistleblowing(){
+				let _this = this;
+				if(!_this.name){
+					uni.showToast({
+						title:`${_this.type==1?'纠错':'举报'}人姓名不能为空`,
+						icon:'none'
+					});
+					return
+				}
+				if(!_this.phone){
+					uni.showToast({
+						title:`${_this.type==1?'纠错':'举报'}人联系方式不能为空`,
+						icon:'none'
+					});
+					return
+				}
+				if(!_this.textarea){
+					uni.showToast({
+						title:`${_this.type==1?'纠错':'举报'}说明不能为空`,
+						icon:'none'
+					});
+					return
+				}
+				let data={
+					id:_this.id,
+					desc:_this.textarea,
+					name:_this.name,
+					mobile:_this.phone,
+					type:_this.type
+				}
+				App._post_form(
+					`&p=yellowpage&do=pageCorrection`,
+					data,
+					res => {
+						console.log(res);
+							uni.showToast({
+								title:'提交成功',
+							});
+						// pages/mainPages/payment/payment
+						// _this.phoneclassdata = res.data.info;
+						// _this.list = res.data.list
+						_this.closereport()
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			closereport(){
+				this.report = false;
+				this.name = '';
+				this.phone = '';
+				this.textarea = '';
+			},
+			inform(type){
+				this.type = type;
+				this.report = true;
+			},
+			goclaim(){
+				let _this = this;
+				if(!_this.name){
+					uni.showToast({
+						title:'认领人姓名不能为空',
+						icon:'none'
+					});
+					return
+				}
+				if(!_this.phone){
+					uni.showToast({
+						title:'认领人联系方式不能为空',
+						icon:'none'
+					});
+					return
+				}
+				if(!_this.textarea){
+					uni.showToast({
+						title:'认领说明不能为空',
+						icon:'none'
+					});
+					return
+				}
+				let data={
+					id:_this.id,
+					desc:_this.textarea,
+					name:_this.name,
+					mobile:_this.phone
+				}
+				App._post_form(
+					`&p=yellowpage&do=pageClaim`,
+					data,
+					res => {
+						console.log(res);
+						if(res.data.status == 1){
+							App.navigationTo({
+								url: `pages/mainPages/payment/payment?orderid=${res.data.orderid}`
+							})
+						}else{
+							uni.showToast({
+								title:'申请成功',
+							});
+						}
+						// pages/mainPages/payment/payment
+						// _this.phoneclassdata = res.data.info;
+						// _this.list = res.data.list
+						_this.close()
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			imgtap(){
+				this.isopenImg = true;
+			},
+			lookimg(imgs,index){
+				this.isopenImg = true;
+				uni.previewImage({
+					current:index,
+					urls:imgs
+				})
+			},
+			getPagesDetails(id){
+				let _this = this;
+				App._post_form(
+					`&p=yellowpage&do=pageDetail&id=${id || ''}&sid=${_this.sid || ''}`,
+					{},
+					res => {
+						console.log(res);
+						_this.phoneclassdata = res.data.info;
+						_this.remark = res.data.remark;
+						let phonetitle,end;
+						if(_this.phoneclassdata.showtel !== 1){
+							 if(_this.phoneclassdata.mobile.length == 11){
+								 phonetitle = _this.phoneclassdata.mobile.substring(0,3);
+								 end = _this.phoneclassdata.mobile.substring(7,11);
+								 console.log(phonetitle,end);
+								 _this.phoneclassdata.mobile = phonetitle + '****'+end;
+							 }else{
+								 phonetitle = _this.phoneclassdata.mobile.substring(0,5);
+								 end = _this.phoneclassdata.mobile.substring(8,11);
+								 console.log(phonetitle,end);
+								 _this.phoneclassdata.mobile = phonetitle + '****'+end;
+							 }
+							 phonetitle = _this.phoneclassdata.wechat_number.substring(0,3);
+							 end = _this.phoneclassdata.wechat_number.substring(7,11);
+							 console.log(phonetitle,end);
+							 _this.phoneclassdata.wechat_number = phonetitle + '****'+end;
+							// let reg = /^(\d{3})\d{4}(\d{4})$/;
+							// _this.phoneclassdata.mobile = str;
+							// replace(/^(.{6})(?:\d+)(.{4})$/, "$1****$2")
+						}
+						// _this.list = res.data.list
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			ischeck(num){
+				let _this = this;
+				App._post_form(
+					`&p=yellowpage&do=pageCollect&id=${_this.id}`,
+					{},
+					res => {
+						if(res.message == '取消收藏成功'){
+							this.phoneclassdata.aCollect = 0;
+							this.phoneclassdata.collectNum = Number(this.phoneclassdata.collectNum) - 1;
+						}else{
+							this.phoneclassdata.aCollect = 1;
+							this.phoneclassdata.collectNum = Number(this.phoneclassdata.collectNum) + 1;
+						}
+						uni.showToast({
+							title:res.message
+						});
+						// _this.list = res.data.list
+					},
+					false,
+					() => {
+						
+					}
+				);
+				
+				
+			},
+			claim(){
+				this.show = true;
+			},
+			close(){
+				this.show = false;
+				this.name = '';
+				this.phone = '';
+				this.textarea = '';
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.logistics{
+		padding: 25upx;
+		padding-bottom: 140upx;
+		.card{
+			padding: 30upx 30upx 20upx;
+			background-color: #FFFFFF;
+			.img{
+				width: 120upx;
+				height: 120upx;
+				border-radius: 8upx;
+				margin-top: 10upx;
+			}
+			.storeBtn{
+				position: absolute;
+				top: 50%;
+				transform: translateY(-50%);
+				right: 30upx;
+				padding: 10upx 20upx;
+				background-color: #FF4444;
+				border-radius: 10upx;
+			}
+			.names{
+				width: 360upx;
+				overflow: hidden;
+				white-space: nowrap;
+				text-overflow: ellipsis;
+			}
+		}
+		.cardis{
+			// padding: 40upx 30upx;
+			background-color: #FFFFFF;
+			color: #6f6f6f;
+			// border-top: 4upx solid #F7F7F7;
+			box-shadow: 0 14upx 10upx -6upx #CCCCCC;
+			// border-radius:  0 0 10upx 10upx;
+			.cardcontent{
+				color: #6f6f6f;
+				display: inline-block;
+				height: 80upx;
+				line-height: 80upx;
+				padding-left: 20upx;
+			}
+		}
+		.record{
+			background-color: #ffffff;
+			border-radius: 10upx;
+			margin-top: 15upx;
+			color: #6f6f6f;
+			padding:  15upx 0;
+			.record-item{
+				text-align: center;
+			}
+			.check{
+				color: #FF4444;
+			}
+		}
+		.synopsis{
+			color: #C1C1C1;
+			padding: 0 30upx;
+			background-color: #FFFFFF;
+			// border-radius: 10upx;
+			// margin-top: 5upx;
+		}
+		.imgs{
+			color: #C1C1C1;
+			padding: 30upx 30upx 0;
+			background-color: #FFFFFF;
+			border-radius: 10upx;
+			// margin-top: 5upx;
+			.fleximg{
+				display: flex;
+				position: relative;
+				    width: auto;
+				    // justify-content: space-between;
+				    // flex-wrap: wrap;
+				    overflow: scroll;
+				.flex-item{
+					// min-width: 20vw;
+					// align-self:flex-start;
+					margin-bottom: 10upx;
+					border-radius: 10upx;
+					flex: 0.4;
+					margin-right: 20upx;
+					// width: 300upx;
+					// height: 60upx;
+					height: 180upx;
+					min-width: 40%;
+					// height: 50upx;
+				}
+			}
+			// .fleximg:after {
+			//       content: "";
+			//       flex: 0.32;
+			// 	  min-width: 32%;
+			//    }
+		}
+		.btnbox{
+			padding: 40upx 30upx;
+			background-color: #FFFFFF;
+			border-radius: 0 0 10upx 10upx;
+			// margin-top: 2upx;
+			border-top: 2upx solid #f8f8f8;
+			font-size: 28upx;
+			color: #6f6f6f;
+			.left{
+				width: 50%;
+				.leftbtn{
+					text-align: center;
+					width: 150upx;
+					border-radius: 60upx;
+					border: 1upx solid #CCCCCC;
+					padding: 10upx 20upx;
+					margin: auto;
+					height: 45upx;
+					line-height: 40upx;
+				}
+			}
+			.right{
+				width: 50%;
+				.rightbtn{
+					width: 150upx;
+					height: 45upx;
+					line-height: 40upx;
+					text-align: center;
+					border-radius: 60upx;
+					padding: 10upx 20upx;
+					border: 1upx solid #CCCCCC;
+					margin: auto;
+				}
+			}
+		}
+		.inform{
+			padding: 30upx;
+			background-color: #FFFFFF;
+			border-radius: 10upx;
+			margin-top: 5upx;
+			color: #6f6f6f;
+		}
+		.menu{
+			position: fixed;
+			width: 100%;
+			padding: 15upx 0;
+			background-color: #FFFFFF;
+			bottom: 0;
+			box-sizing: border-box;
+			left: 0;
+			.menu-item{
+				flex: 0.33;
+				.menu-itemImage{
+					width: 40upx;
+					height: 40upx;
+					margin-left: 6vw;
+				}
+				.menu-name{
+					text-align: center;
+				}
+			}
+			.menu-btn{
+				// width: 70%;
+				// height: 60upx;
+				border-radius: 60upx;
+				font-size: 24upx;
+				margin: auto;
+				color: #FFFFFF;
+				text-align: center;
+				padding: 4upx 10upx;
+				.menuimg{
+					width: 40upx;
+					height: 40upx;
+					margin-top: 8upx;
+				}
+				.menutext{
+					vertical-align: top;
+					height: 32upx;
+					line-height: 54upx;
+				}
+			}
+		}
+	}
+	.popup{
+		// padding: 30upx;
+		background-color: #FFFFFF;
+		// width: 80%;
+		// margin-left: 10vw;
+		border-radius: 10upx;
+		font-size: 28upx;
+		/deep/ .uni-textarea-textarea{
+			color: #6f6f6f;
+			// border: 1upx solid #dfdfdf;
+		}
+		/deep/ .uni-input{
+			border: 1upx solid #dfdfdf;
+			border-radius: 10upx;
+			padding: 20upx 60upx;
+			font-size:26upx;
+			font-weight: 100;
+		}
+		/deep/ uni-textarea{
+			border: 1upx solid #dfdfdf;
+			border-radius: 10upx;
+			font-weight: 100;
+			height: 10vh;
+			width: 100%;
+			box-sizing: border-box;
+			padding: 20upx 20upx;
+			font-size: 26upx;
+		}
+		/* #ifndef H5 */
+		/deep/ .uni-textarea{
+			// border: 1upx solid #dfdfdf;
+			border-radius: 10upx;
+			font-weight: 100;
+			// height: 10vh;
+			width: 100%;
+			box-sizing: border-box;
+			padding: 20upx 20upx;
+			font-size: 26upx;
+			textarea{
+				
+			}
+		}
+		
+		/* #endif */
+		
+	}
+	.masking {
+		position: fixed;
+		/* 		width: 100%;
+			height: 100%; */
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		z-index: 100;
+		background: rgba(0, 0, 0, .5);
+		/* display: none */
+	}
+</style>
diff --git a/pages/subPages2/phoneBook/myGoods/myGoods.vue b/pages/subPages2/phoneBook/myGoods/myGoods.vue
new file mode 100644
index 0000000..3cdfe9e
--- /dev/null
+++ b/pages/subPages2/phoneBook/myGoods/myGoods.vue
@@ -0,0 +1,288 @@
+<template>
+	<view >
+	<view class="myGoods">
+		<loadlogo v-if="!loadlogo" />
+		<view class="goodsList" v-if="loadlogo">
+			<!-- 列表循环 -->
+			<view class="dis-flex b-f" style="padding: 30upx;border-radius: 10upx;margin-bottom: 20upx;" v-for="(item,index) in list" :key="index">
+				<view class="img-box">
+					<image style="width: 150upx;height: 150upx;margin: 0upx 10upx;border-radius: 10upx;" :src="item.logo" mode=""></image>
+				</view>
+				<view class="content-box f-25">
+					<view class="text">
+						{{item.name}}
+					</view>
+					<view class="text" >
+						<view class="dis-il-block" style="color: #FF4444; background-color: #FEF1F1;margin-right: 20upx;padding: 3upx 10upx;">
+							{{item.oneClassName }}
+						</view>
+						<view class="dis-il-block" style="color: #FF4444; background-color: #FEF1F1;padding: 3upx 10upx;">
+							{{ item.twoClassName}}
+						</view>
+					</view>
+					<view class="text" v-if="item.meal_endtime !== '0'">
+						过期时间:{{item.meal_endtime}}
+					</view>
+				</view>
+				<view class="btnbox f-24">
+					<view :class="item.showstatus == '0'?'toaudit2':item.showstatus == '1'?'toaudit1':item.showstatus == '2'?'toaudit0':item.showstatus == '3'?'toaudit0':'toaudit2'">
+						{{item.showstatus == '0'?'已关闭':item.showstatus == '1'?'展示中':item.showstatus == '2'?'待付款':item.showstatus == '3'?'待审核':'被驳回'}}
+					</view>
+					<view class="administrationbtn" @click="administration(item)" >
+						{{item.showstatus == '2'?'付款':'管理'}}
+					</view>
+				</view>
+			</view>
+			<load-more :isMore="loadingMore"></load-more>
+		</view>
+		<!-- 管理栏 -->
+		<PopManager :show="administrationshow" :type="'bottom'" :overlay="'false'" :showOverlay="'false'" @clickmask="administrationshow = false">
+			<view class="admin">
+				<view class="t-c f-30 f-w" style="background-color: #DCDCDC;padding: 30upx;border-radius: 15upx 15upx 0 0;">
+					商家：{{theitem.name}}
+				</view>
+				<view class="t-c f-30 f-w b-f" style="padding: 30upx;margin-bottom: 5upx;">
+					<picker @change="bindPickerChange" :value="pickerindex" range-key="name" :range="pickerarray">
+						续费
+					</picker>
+				</view>
+				<view class="t-c f-30 f-w b-f" style="padding: 30upx;margin-bottom: 5upx;" @click="compile">
+					编辑
+				</view>
+				<view class="t-c f-30 f-w b-f" style="padding: 30upx;margin-bottom: 5upx;" @click="soldOut">
+					{{theitem.status == '0'?'上架':'下架'}}
+				</view>
+				<view class="t-c f-30 f-w b-f" style="padding: 30upx;margin-top: 20upx;" @click="cloce">
+					取消
+				</view>
+			</view>
+		</PopManager>
+		
+	</view>
+	<!-- <phoneNavBar :checked="'我的'"></phoneNavBar> -->
+	<TabBars :tabBarAct="0" :pageType="'19'"></TabBars>
+	<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import PopManager from '@/components/template/PopManager';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				list:[1,1,1,1],
+				loadingMore:true,
+				administrationshow:false,
+				page:1,
+				theitem:{},
+				pickerindex:0,
+				pickerarray:[],
+				total:0,
+				loadlogo:false
+			}
+		},
+		components:{
+			loadMore,
+			PopManager,
+			phoneNavBar,
+			Loadlogo,
+			TabBars
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+			this.getlist();
+		},
+		methods:{
+			// 续费
+			bindPickerChange(e){
+				let _this = this;
+				console.log(e,_this.pickerarray);
+				let data = {
+					pageid:_this.theitem.id,
+					mealid:_this.pickerarray[e.detail.value].id
+				}
+				App._post_form(
+					`&p=yellowpage&do=renewPage`,
+					data,
+					res => {
+						console.log(res);
+						// uni.showToast({
+						// 	title:res.message
+						// });
+						_this.cloce();
+						if(res.data.status == 0){
+							uni.showToast({
+								title:'续费成功'
+							})
+							this.getlist();
+						}else{
+							App.navigationTo({
+								url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid +'&plugin=yellowpage'
+							});
+						}
+						
+						// this.administrationshow = false;
+					},
+					false,
+					() => {
+						
+					}
+				);
+			},
+			// 编辑页面
+			compile(){
+				this.cloce();
+				App.navigationTo({
+					url: `pages/subPages2/phoneBook/enterForm/enterForm?id=${this.theitem.id}`
+				})
+			},
+			cloce(){
+				this.administrationshow = false;
+			},
+			// 上下架
+			soldOut(){
+				App._post_form(
+					`&p=yellowpage&do=changeStatus&id=${this.theitem.id}`,
+					{},
+					res => {
+						console.log(res);
+						uni.showToast({
+							title:res.message
+						});
+						this.getlist();
+						this.administrationshow = false;
+					},
+					false,
+					() => {
+						// _this.loadlogo = true;
+					}
+				);
+			},
+			// 初始化列表
+			getlist(){
+				let _this = this;
+				// _this.list = [];
+				for(let i = 0;i < _this.page;i++){
+					App._post_form(
+						`&p=yellowpage&do=myPageList&page=${i+1}`,
+						{},
+						res => {
+							console.log(res);
+							// _this.list = res.data.list;
+							
+							if(i == 0){
+								_this.total = res.data.total;
+								_this.pickerarray = res.data.meallist;
+								_this.list = res.data.list;
+							}else{
+								_this.list = _this.list.concat(res.data.list);
+							}
+							console.log(_this.list)
+						},
+						false,
+						() => {
+							_this.loadlogo = true;
+						}
+					);
+				}
+				
+			},
+			// 管理栏显示
+			administration(item){
+				if(item.showstatus == 2){
+					App.navigationTo({
+						url: 'pages/mainPages/payment/payment?orderid=' + item.orderid +'&plugin=yellowpage'
+					});
+				}else{
+					this.theitem = item;
+					this.administrationshow = true;
+				}
+			}
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom: function() {
+			this.loadingMore = false;
+			if (this.page == this.total) {
+				this.loadingMore = true;
+			} else {
+				this.page++;
+				App._post_form(
+					`&p=yellowpage&do=myPageList&page=${this.page}`,
+					{},
+					res => {
+						this.list = this.list.concat(res.data.list);
+						this.loadingMore = true;
+					},
+					false,
+					() => {}
+				);
+			}
+		}
+
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.myGoods{
+		padding: 30upx 30upx 150upx;
+		.goodsList{
+			.img-box{
+				flex: 0.3;
+			}
+			.content-box{
+				flex: 0.6;
+				color: #6f6f6f;
+				.text{
+					padding: 10upx 0;
+				}
+			}
+			.btnbox{
+				flex: 0.2;
+				text-align: right;
+				position: relative;
+				.toaudit0{
+					color: #E77A4B;
+				}
+				.toaudit1{
+					color: #81D740;
+				}
+				.toaudit2{
+					color: #999999;
+				}
+				.administrationbtn{
+					padding: 2upx 10upx;
+					width: 55upx;
+					background-color: #307EF8;
+					position: absolute;
+					right: 0;
+					bottom: 10upx;
+					text-align: center;
+					color: #FFFFFF;
+					border-radius: 8upx;
+				}
+			}
+		}
+		.admin{
+			// padding: 30upx;
+			// width: 100%;
+			background-color: #F8F8F8;
+			height: 40vh;
+			// background-color: #FFFFFF;
+			width: 100vw;
+			padding-bottom: 50upx;
+			border-radius: 15upx 15upx 0 0;
+		}
+	}
+</style>
diff --git a/pages/subPages2/phoneBook/phoneBook.vue b/pages/subPages2/phoneBook/phoneBook.vue
new file mode 100644
index 0000000..ab9e448
--- /dev/null
+++ b/pages/subPages2/phoneBook/phoneBook.vue
@@ -0,0 +1,653 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<!-- <filtertab :requestType="'6'" :isPageScroll="'1'" @selectAreaid="selectAreaid" @selectClassid="selectClassid"
+		 @selectClassTwoid="selectClassTwoid" @selectOrders="selectOrders" :cate_one="cate_one" :cate_two="cate_two" :title="title"></filtertab> -->
+		<view class="businessCenter" v-if="loadlogo">
+			<!-- <far-bottom></far-bottom> -->
+			<!-- 飞起来的头部 -->
+			<view class="fixedBox dis-flex">
+				<!-- 搜索 -->
+				<view class="f-26">
+					<view class="bankindex" @click="goindex">
+						<text class="iconfont icon-pullleft" style="font-size: 26upx;padding-right: 10upx;"></text>首页
+					</view>
+				</view>
+				<view class="search">
+					<view class="dis-il-block iconfont icon-search f-28 searchIcon" style="color: #999999;"></view>
+					<input
+						class="uni-input"
+						confirm-type="search"
+						v-model="inputValue"
+						placeholder-style="color:#999999;font-size:28upx;background-color: #ffffff;"
+						placeholder="请输入关键字进行搜索"
+						@confirm="search"
+					/>
+					<!-- <view @click="search" class="f-30 dis-il-block t-c searchs">搜索</view> -->
+				</view>
+				<!-- <diyPages></diyPages> -->
+				<!-- 下拉筛选框 -->
+			</view>
+			<!-- <view class="flxedBoxTwo">
+				<view class="m-top30" v-if="true"><ChooseLits :list="list" :arr="arr" @chooseLike="chooseLike"></ChooseLits></view>
+			</view> -->
+			<!-- 坐下去的列表部 -->
+			<view class="storeList" style="padding-top: 00upx;">
+				<!-- 商铺配图 -->
+				<view class="swiperBox" :style="{width: listimgstyle.width - 30 + 'px',height: listimgstyle.height - 30 + 'px'}" v-if="swiperList.length > 0">
+					<swiper class="swiper" indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="interval" :duration="duration">
+						<swiper-item v-for="(item, index) in swiperList" :key="index" @click="goUrl(item.link)" style="border-radius: 15upx;">
+							<image :src="item.thumb"  style="width: 100%; height: 100%;"></image>
+						</swiper-item>
+					</swiper>
+				</view>
+				<view  style="height: 50upx;" v-else>
+					
+				</view>
+				
+				<view  v-if="!Array.isArray(strodatas.community)">
+					<view class="diyPages-community dis-flex flex-x-between flex-y-center" style="margin-bottom: 4upx;background-color: #FFFFFF;margin-top: 20upx;border-radius: 10upx;">
+						<view class="community-user dis-flex flex-y-center flex-box ">
+							<image :src="strodatas.community.communimg" class="community-user-img" style="width: 80upx;height: 80upx;"></image>
+							<view class="community-user-info flex-box">
+								<view class="community-user-name col-0 f-28">{{ strodatas.community.commundesc }}</view>
+								<view class="community-user-des f-24 col-9 onelist-hidden">{{ strodatas.community.communname }}</view>
+							</view>
+						</view>
+						<view class="community-btn">
+							<button class="community-add f-24" style="color: #FFFFFF;background-color: #28BC17;" @click="showCommunity = true" >添加社群</button>
+						</view>
+					</view>
+					<!-- 社群弹窗 -->
+					<popup-view :show="showCommunity" type="center" @clickmask="showCommunity = false">
+						<view class="community-detail b-f t-c">
+							<view class="community-header f-w f-36 p-r col-f">
+								<text class="community-header-text p-r">{{ strodatas.community.communname }}</text>
+							</view>
+							<!-- #ifdef H5 -->
+							<view class="community-body">
+								<image :src="strodatas.community.communqrcode" class="community-qrcodeimg"></image>
+								<view class="community-toreply f-26 col-3">长按识别二维码</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view class="community-body f-26 col-3">
+								有任何疑问，点击“
+								<text class="col-m">去回复</text>
+								”发送“
+								<text class="col-m">{{ strodatas.community.id }}</text>
+								”,即可添加{{ strodatas.community.communname }}
+							</view>
+							<!-- #endif -->
+							<view class="community-phone dis-flex flex-y-center flex-x-between" v-if="!!strodatas.community.systel">
+								<view class="community-number dis-flex flex-y-center">
+									<image :src="imgfixUrls + 'goods/community.png'" class="community-number-icon" style="width: 80upx;height: 80upx;"></image>
+									<view class="f-24 col-3">{{ strodatas.community.systel }}</view>
+								</view>
+								<view class="community-bdial f-24" @click="callPhone(strodatas.community.systel)">拨号</view>
+							</view>
+							<button class="community-reply f-24 col-f" open-type="contact" v-if="clienType === '3'">去回复</button>
+						</view>
+					</popup-view>
+				</view>
+				<!-- 滚动新闻区域 -->
+				<view class="swiperNews" style="margin-bottom: 20upx;">
+					<view class="swiperNewsLeft">
+						<view style="line-height: 20upx;"><span>最新</span></view>
+						<view style="line-height: 40upx;"><span>发布</span></view>
+					</view>
+					<view class="linePackage">
+						<view class="line"></view>
+					</view>
+					<swiper class="swiperNewShow" :vertical="true" :autoplay="true" :interval="2000" :circular="true" v-if="strodatas.notice.length > 0">
+						<swiper-item v-for="(item, index) in strodatas.notice" @click="goPostDetail(item.id)" :key="index">
+							<text class="text" style="font-size: 24upx;">[{{ item.createtime }}]{{ item.name }}</text>
+						</swiper-item>
+					</swiper>
+					<view class="swiperNewShow" v-else>
+						<text class="text" style="font-size: 24upx;">暂无数据</text>
+					</view>
+					<view class="swiperNewsButton" @click="goSendInformation"><span>我要发布</span></view>
+				</view>
+				<!-- 滚动新闻区域 -->
+				<business-card v-if="cardlist.length > 0" :businCard_list="cardlist" :is_collcet="'0'" :is_have="1" :is_pading="false" :is_yellow="true"></business-card>
+				<load-more :isMore="isMore"></load-more>
+			</view>
+			<!-- <shopPing :shopNum="shopNum" ref="shopPing"></shopPing> -->
+			<far-bottom></far-bottom>
+			<!-- 下拉刷新 -->
+			
+		</view>
+		<TabBars :tabBarAct="0" :pageType="'19'"></TabBars>
+		<!-- <phoneNavBar :checked="'首页'"></phoneNavBar> -->
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import tuiRate from '@/components/template/rate.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import shopPing from '@/pages/subPages2/tamplate/shopPing.vue';
+import shopEnter from '@/components/page/pageComponents/shopEnter.vue';
+import PopupView from '@/components/template/PopManager.vue';
+import filtertab from '@/components/template/filtertab.vue';
+import diypages from '@/components/template/diypages.vue';
+import businessCard from '@/components/page/pageComponents/businessCard.vue';
+import phoneNavBar from '@/components/template/phoneNavBar';
+import TabBars from '@/components/template/tabBar.vue';
+export default {
+	components: {
+		tuiRate,
+		Loadlogo,
+		loadMore,
+		shopPing,
+		shopEnter,
+		PopupView,
+		filtertab,
+		diypages,
+		businessCard,
+		phoneNavBar,
+		TabBars
+	},
+	onLoad() {
+		this.HomeType = true;
+		this.clienType = App.getClientType();
+		this.lnglat = uni.getStorageSync('agencyData');
+		this.listimgstyle = uni.getStorageSync('listimgstyle')
+		this.citylist = uni.getStorageSync('cityList');
+		this.getCommercialTenantList();
+	},
+	onShow() {
+		// this.pages = 1;
+		if(!this.onepage) return
+		
+		this.getCommercialTenantList();
+		
+	},
+	data() {
+		return {
+			onepage:false,
+			loadlogo: false,
+			isMore: true,
+			HomeType: false,
+			showCommunity: false,
+			//餐厅商铺列表
+			diningList: [],
+			// 轮播图
+			swiperList: [],
+			duration: 500, //滑动时间
+			interval: 2000, //间隔时间
+			list: ['商家类别', '全城', '全部筛选'], //筛选条件
+			//筛选详细条件
+			arr: [
+				['不限类别', '川湘菜', '火锅', '日本料理', '泰国菜', '港式茶餐厅'],
+				['距离不限', '1km以内', '3km以内', '5km以内', '金牛区', '青羊区', '成华区', '新都区', '高新区', '双流区'],
+				['综合排序', '销量优先', '评价优先', '距离优先', '老板长得帅优先']
+			],
+			i2: [0, 0, 0], //筛选栏索引
+			inputValue: '',
+			strodatas: null,
+			pages: 1,
+			pullUpOn: true,
+			count: 0,
+			shopNum: 0,
+			lnglat:{},
+			clienType:'',
+			cate_one:'0',
+			cate_two:'',
+			two_id:'',
+			title:'',
+			orderid:'',
+			onecate_one:'',
+			twocate_two:'',
+			region_id:'',
+			diypagesData:[],
+			cardlist:[],
+			citylist:[],
+			listimgstyle:{}
+		};
+	},
+	computed:{
+		curLoction(){
+			return uni.getStorageSync('curLoction')
+		}
+	},
+	methods: {
+		goUrl(url) {
+			App.navigationTo({
+				url: url
+			});
+		},
+		// 去分类
+		goSendInformation() {
+			App.navigationTo({
+				url: 'pages/subPages2/phoneBook/enterForm/enterForm'
+			});
+		},
+		goPostDetail(id) {
+			App.navigationTo({
+				url: 'pages/subPages2/phoneBook/logistics/logistics?id=' + id
+			});
+		},
+		goindex(){
+			App.navigationTo({
+				url: "pages/mainPages/index/index"
+			})
+		},
+		handleLaunchFn(e){
+						console.log('跳小程序吗还是不呢')
+					},
+		handleErrorFn(e){
+						console.log('跳小程序吗')
+					},
+		getInfoList(){
+			
+		},
+		selectOrders(data) {
+			console.log('1分类');
+			let _this = this;
+			console.info('selectOrders', data)
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.orderid = data.val;
+			if(!this.onepage) return
+			
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		},
+		selectClassTwoid(data) {
+			console.log('2分类');
+			let _this = this;
+			console.info('selectClassTwoid', data)
+			_this.two_id = data.cate_two;
+			_this.cate_two = '';
+			_this.title = '';
+			_this.pages = 1;
+			_this.cate_two = data.cate_two;
+			// _this.getInfoList();
+			if(!this.onepage) return
+			_this.getCommercialTenantList();
+		
+		},
+		selectClassid(data) {
+			console.log('3分类');
+			let _this = this;
+			console.info('selectClassid', data)
+			_this.id = data.cate_one;
+			_this.cate_one = '';
+			_this.cate_two = '';
+			_this.title = '';
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.cate_one = data.cate_one;
+			if(!this.onepage) return
+			
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		
+		},
+		selectAreaid(data) {
+			console.log('4分类');
+			let _this = this;
+			console.info('selectAreaid', data);
+			if(!this.onepage) return
+			// _this.region_id = data.id;
+			_this.two_id = 0;
+			_this.pages = 1;
+			_this.cate_one = '';
+			_this.cate_two = '';
+			_this.region_id = data.id;
+			_this.onepage = true;
+			
+			_this.getCommercialTenantList();
+			// _this.getInfoList();
+		},
+		callPhone(phone) {
+			uni.makePhoneCall({
+				phoneNumber: phone
+			});
+		},
+		communityShow() {
+			this.showCommunity = !this.showCommunity;
+		},
+		search() {
+			this.getCommercialTenantList(this.inputValue);
+		},
+		// 获取初始化数据
+		getCommercialTenantList(name) {
+			let _this = this;
+			let data={
+				keyword:name || '',
+				page:1,
+				lng:this.curLoction.longitude || '',
+				lat:this.curLoction.latitude || '',
+				sort:this.orderid || '',
+				cate_one:this.cate_one || '',
+				cate_two:this.cate_two || '',
+				city_id:this.region_id || ''
+			};
+			_this.cardlist = [];
+			App._post_form(
+				`&p=yellowpage&do=homeInfo`,
+				{},
+				res => {
+					this.setData({
+						diningList: res.data.list
+					});
+					this.swiperList = res.data.adv;
+					this.strodatas = res.data;
+					
+					this.count = res.data.total;
+					this.shopNum = Number(res.data.cartnum);
+					console.log(this.$refs.shopPing);
+					App._post_form(
+						`&p=yellowpage&do=homeList`,
+						data,
+						res => {
+							console.log(res)
+							this.setData({
+								cardlist: res.data.list
+							});
+							// this.swiperList = res.data.adv;
+							// this.strodatas = res.data;
+							// this.loadlogo = true;
+							this.count = res.data.total;
+							// this.shopNum = Number(res.data.cartnum);
+							// console.log(this.$refs.shopPing);
+							
+						},
+						false,
+						() => {
+							_this.loadlogo = true;
+						}
+					);
+				},
+				false,
+				() => {}
+			);
+		},
+		chooseLike(i1) {
+			if (this.i2[i1[0]] != i1[1]) {
+				this.i2[i1[0]] = i1[1];
+			}
+		},
+		// 点击商铺
+		selectDining(item) {
+			App.navigationTo({
+				url: 'pages/subPages2/businessCenter/foodList/foodList?id=' + item.id + '&storeid=' + item.storeid
+			});
+		}
+	},
+	//页面相关事件处理函数--监听用户下拉动作
+	onPullDownRefresh: function() {
+		//延时为了看效果
+		// setTimeout(() => {
+		// this.houseDataList = this.newHouseDataList;
+		// this.pageIndex = 1;
+		// this.pullUpOn = true;
+		// this.loadding = false;
+
+		// this.uni.toast("刷新成功");
+		this.pages = 1;
+		let data={
+			page:1,
+			lng:this.curLoction.longitude || '',
+			lat:this.curLoction.latitude || '',
+			sort:'',
+			cate_one:'',
+			cate_two:'',
+			city_id:''
+		};
+		App._post_form(
+			`&p=yellowpage&do=homeList`,
+			data,
+			res => {
+				console.log(res)
+				this.setData({
+					cardlist: res.data.list
+				});
+				uni.stopPullDownRefresh();
+				uni.showToast({
+					icon: 'none',
+					title: '刷新成功'
+				});
+				// this.swiperList = res.data.adv;
+				// this.strodatas = res.data;
+				// this.loadlogo = true;
+				this.count = res.data.total;
+				// this.shopNum = Number(res.data.cartnum);
+				// console.log(this.$refs.shopPing);
+				
+			},
+			false,
+			() => {}
+		);
+		// }, 200);
+	},
+
+	// 页面上拉触底事件的处理函数
+	onReachBottom: function() {
+		this.isMore = false;
+		if (this.pages == this.count) {
+			this.isMore = true;
+		} else {
+			// debugger
+			this.pages++;
+			let data={
+				keyword:this.inputValue || '',
+				page:this.pages,
+				lng:this.curLoction.longitude || '',
+				lat:this.curLoction.latitude || '',
+				sort:this.orderid || '',
+				cate_one:this.cate_one || '',
+				cate_two:this.cate_two || '',
+				city_id:this.region_id || ''
+			};
+			App._post_form(
+				`&p=yellowpage&do=homeList`,
+				data,
+				res => {
+					console.log(res)
+					this.cardlist = this.cardlist.concat(res.data.list);
+					this.isMore = true;
+					// this.count = res.data.total;
+				},
+				false,
+				() => {}
+			);
+		}
+	}
+};
+</script>
+
+<style>
+@import '../../../common/css/diyPages.css';
+@import '../../../common/css/old_diyPages';
+@import '../../../pages/subPages/goods/index.css';
+page {
+	background-color: #f7f7f7;
+}
+</style>
+<style lang="less" scoped>
+	.bankindex{
+		// position: absolute;
+		// left: 3%;
+		// top: 3%;
+		// background-color: rgba(254, 213, 95,1);
+		box-shadow: 0 5px 15px rgba(255,255,255,0.5);
+		padding: 10upx 20upx;
+		color: #333333;
+		font-size: 26upx;
+		line-height: 54upx;
+		// border-radius: 60upx;
+	}
+.dining {
+	padding: 10upx;
+	background-color: #ffffff;
+	margin: 20upx 0;
+	border-radius: 10upx;
+}
+.uni-input{
+	font-size: 30upx;
+	background-color: #FFFFFF;
+	text-align: center;
+	/deep/.uni-input-placeholder{
+		top: 4upx!important;
+	}
+}
+.diningName {
+	width: 400upx;
+	overflow: hidden; /*超出部分隐藏*/
+	white-space: nowrap; /*不换行*/
+	text-overflow: ellipsis; /*超出部分文字以...显示*/
+	font-weight: 600;
+}
+.fixedBox {
+	position: fixed;
+	top: 0;
+	left: 0;
+	width: 92%;
+	padding: 10upx 30upx;
+	z-index: 9999;
+	background-color: #f6f6f6;
+}
+.flxedBoxTwo {
+	position: fixed;
+	width: 100%;
+	top: 10%;
+	z-index: 9999;
+	left: 0;
+	background-color: #ffffff;
+}
+.search {
+	background-color: #ffffff;
+	color: #333333;
+	border-radius: 60upx;
+	width: 65%;
+	position: relative;
+	padding: 15upx 0upx 13upx 100upx;
+}
+.searchIcon {
+	position: absolute;
+	left: 5%;
+	line-height: 50upx;
+}
+.uni-input {
+	width: 80%;
+	color: #000000;
+	background-color: #ffffff;
+	display: inline-block;
+}
+.businessCenter {
+	background-color: #f6f6f6;
+	padding-top: 50upx;
+	padding-bottom: 100upx;
+}
+.storeList {
+	padding: 200upx 30upx 100upx;
+}
+.swiper {
+	height: 100%;
+	width: 100%;
+}
+.swiperBox {
+	margin-top: 30upx;
+}
+.searchs {
+	height: 100%;
+	width: 150upx;
+	background-color: #ff4444;
+	color: #ffffff;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 99;
+	border-radius: 0 10upx 10upx 0;
+	line-height: 80upx;
+}
+.swiperNewsButton {
+		width: 144upx;
+		height: 76upx;
+		background: linear-gradient(0deg, rgba(252, 104, 104, 1) 0%, rgba(255, 68, 68, 1) 100%);
+		text-align: center;
+		border-radius: 0 15upx 15upx 0;
+
+		>span {
+			line-height: 76upx;
+			font-size: 24upx;
+			color: rgba(255, 255, 255, 1);
+		}
+	}
+
+	.swiperNewShow {
+		background: #ffffff;
+		padding: 0 30upx;
+		vertical-align: middle;
+		display: inline-block;
+		width: 383upx;
+		height: 76upx;
+	}
+	
+	.linePackage {
+		height: 100%;
+		background: #FFFFFF;
+	}
+	.line {
+		margin-top: 25upx;
+		width: 2upx;
+		height: 33upx;
+		background: rgba(221, 221, 221, 1);
+	}
+	
+	.text {
+		line-height: 76upx;
+		font-size: 24upx;
+	
+		color: black;
+	}
+	
+	.swiperNewsLeft {
+		height: 100%;
+		background: #FFFFFF;
+		width: 100upx;
+
+		>view:nth-child(1) {
+			margin-top: 10upx;
+
+			>span {
+				font-style: italic;
+				padding: 0 0 0 30upx;
+				font-size: 22upx;
+
+				color: rgba(255, 68, 68, 1);
+			}
+		}
+
+		>view:nth-child(2) {
+			>span {
+				font-style: italic;
+				padding: 0 0 0 30upx;
+				font-size: 22upx;
+
+				color: #333333;
+			}
+		}
+	}
+
+	.swiperNews {
+		border: 1upx solid rgba(0, 0, 0, 0);
+		overflow: hidden;
+		margin: auto;
+		width: 690upx;
+		height: 76upx;
+		background-color: #ffffff;
+		border-radius: 15upx;
+		margin-top: 20upx;
+
+		>view {
+			display: inline-block;
+			vertical-align: middle;
+		}
+	}
+</style>
diff --git a/pages/subPages2/phoneBook/phoneClass/phoneClass.vue b/pages/subPages2/phoneBook/phoneClass/phoneClass.vue
new file mode 100644
index 0000000..ea0c038
--- /dev/null
+++ b/pages/subPages2/phoneBook/phoneClass/phoneClass.vue
@@ -0,0 +1,213 @@
+<template>
+	<view class="phoneBook">
+		<loadlogo v-if="!loadlogo" />
+		<view  v-if="loadlogo">
+			<!-- 搜索 -->
+			<view class="searchBigBox">
+				<view class="searchBox">
+					<input class="uni-input" @confirm="keySearch" v-model="search" confirm-type="search" placeholder-class="iconfont icon-sousuoxiao" placeholder=" 全部应用" placeholder-style="color:#bbbbbb;font-size:28upx;" />
+					<!-- <view class="iconfont icon-sousuoxiao" style="height: 70upx;line-height: 70upx;color: #bbbbbb;"></view> -->
+				</view>
+			</view>
+			<!-- 分类列表 -->
+			<view class="classbox">
+				<view class="phoneClassListBox" :style="{marginTop: (index !== 0)?'20upx':'0'}" v-for="(item,index) in list.parents" :key="key">
+					<view class="classtitle" >
+						<image class="titleimg" :src="item.logo" mode=""></image>
+						<view class="dis-il-block f-28 titletext" style="">{{item.name}}</view>
+					</view>
+					<view class="dis-flex tagbox" v-for="(items,keys,indexs) in list.childrens" :key="keys" v-if="item.id == keys">
+						<view class="f-28 t-c itembox dis-il-block"  @click="goodsdeilt(item.id,itemss.id,itemss.name)" v-for="(itemss,indexss) in items" :key="indexss">
+							<!-- <image :src="itemss.logo" class="imgs" mode=""></image> -->
+							<view class="item-name">
+								{{itemss.name}}
+							</view>
+							<view class="dis-il-block item-class">{{itemss.num}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <phoneNavBar :checked="'分类'"></phoneNavBar> -->
+		<TabBars :tabBarAct="0" :pageType="'19'"></TabBars>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				phoneBookList:{},
+				loadlogo:false,
+				list:{}
+			}
+		},
+		components:{
+			Loadlogo,
+			phoneNavBar,
+			TabBars
+		},
+		onLoad() {
+			this.getclasslist()
+		},
+		methods:{
+		compare(property) {
+		  return function (a, b) {
+		    let value1 = a[property];
+		    let value2 = b[property];
+		    return value2 - value1;
+		  }
+		},
+			keySearch(e){
+				this.getclasslist(e.detail.value);
+			},
+			getclasslist(search){
+				let _this = this;
+				App._post_form(
+					`&p=yellowpage&do=cateList`,
+					{search:search || ''},
+					res => {
+						console.log(res);
+						// let aa = [
+						// 	{a:1},
+						// 	{a:2},
+						// 	{a:3},
+						// 	{a:4},
+						// 	{a:5},
+						// 	{a:6},
+						// 	{a:7},
+						// ]
+						_this.list = res.data.list;
+						// let parents = _this.list.parents;
+						// parents.sort(_this.compare('sort'));
+						console.log(_parents)
+					},
+					false,
+					() => {
+						_this.loadlogo = true;
+					}
+				);
+			},
+			goodsdeilt(id,two_id,title){
+				console.log(id,two_id,title);
+				App.navigationTo({
+					url: `pages/subPages2/phoneBook/goodsClass/goodsClass?cate_one=${id}&cate_two=${two_id}&title=${title}`
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.phoneBook{
+		padding-bottom: 130upx;
+		.classbox{
+			// padding-top: 30upx;
+		}
+	}
+	.searchBigBox{
+		padding: 30upx;
+		background-color: #F7F7F7;
+		.searchBox{
+			border-radius: 10upx;
+			display: flex;
+			background-color: #FFFFFF;
+			padding-left: 20upx;
+			/deep/ .uni-input{
+				font-size: 28upx;
+				height: 90upx;
+				text-align: center;
+				line-height: 90upx;
+				width: 90%;
+			}
+		}
+	}
+	.phoneClassListBox{
+		background-color: #FFFFFF;
+		border-radius: 20upx;
+		// border-top: 2upx solid #E8E8E8;
+		// border-bottom: 2upx solid #e8e8e8;
+		margin: 0 30upx 30upx;
+		.classtitle{
+			border-bottom: 1upx solid #F8F8F8;
+			.titleimg{
+				width: 80upx;
+				height: 80upx;
+				border-radius: 50%;
+				margin: 30upx 30upx 10upx;
+			}
+			.titletext{
+				line-height: 130upx;
+				height: 130upx;
+				font-size: 30upx;
+				vertical-align: top;
+				font-weight: bold;
+				color: #000000;
+			}
+		}
+		.tagbox{
+			width: 92vw;
+			flex-wrap: wrap;
+			align-content: flex-center;
+			align-items: center;
+			justify-content: space-around;
+			.itembox{
+				// display: flex;
+				border-bottom: 1upx solid #f8f8f8;
+				border-right: 1upx solid #F8F8F8;
+				// max-width: 44%;
+				flex: 0 0 33%;
+				padding: 30upx 0;
+				// padding: 0 20upx;
+				// height: 80upx;
+				// line-height: 80upx;
+				color: #B0B0B0;
+				.item-class{
+					// padding: 0upx 5upx;
+					// display: inline-block;
+					border-radius: 60upx;
+					margin-left: 10upx;
+					// line-height: 30upx;
+					// background-color: #bdbdbd;
+					font-size: 30upx;
+					color: #000000;
+					font-weight: bold;
+					text-align: center;
+					// height: 30upx;
+					// margin-top: 24upx;
+				}
+				.item-name{
+					padding: 0 20upx;
+					margin-bottom: 10upx;
+					display: -webkit-box;
+					-webkit-box-orient: vertical;
+					-webkit-line-clamp: 1;
+					overflow: hidden;
+					color: #333333;
+				}
+				.imgs{
+					width: 50upx;
+					height: 50upx;
+					position: relative;
+					top: 50%;
+					transform: translateY(-50%);
+					padding-right: 10upx;
+				}
+			}
+		}
+		.tagbox:after{
+			content: "";
+			flex: 0 0 33%;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages2/phoneBook/yellowGoods/yellowGoods.vue b/pages/subPages2/phoneBook/yellowGoods/yellowGoods.vue
new file mode 100644
index 0000000..3f3f67f
--- /dev/null
+++ b/pages/subPages2/phoneBook/yellowGoods/yellowGoods.vue
@@ -0,0 +1,126 @@
+<template>
+	<view >
+		<loadlogo v-if="!loadlogo" />
+		<view class="yellowGoods" v-if="loadlogo">
+			<view  v-if="cardlist">
+				<business-card :businCard_list="cardlist" :is_collcet="'0'" :is_have="1" :is_pading="false" :is_yellow="true" @deleteis="deleteis"></business-card>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<far-bottom></far-bottom>
+		<!-- <phoneNavBar :checked="'收藏'"></phoneNavBar> -->
+		<TabBars :tabBarAct="0" :pageType="'19'"></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import businessCard from '@/components/page/pageComponents/businessCard.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import phoneNavBar from '@/components/template/phoneNavBar';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		components:{
+			businessCard,
+			phoneNavBar,
+			loadMore,
+			Loadlogo,
+			TabBars
+		},
+		data(){
+			return{
+				cardlist:null,
+				isMore:true,
+				count:1,
+				loadlogo:false,
+				page:1
+			}
+		},
+		onLoad() {
+			
+		},
+		onShow() {
+			this.getlist();
+		},
+		computed:{
+			curLoction(){
+				return uni.getStorageSync('curLoction')
+			}
+		},
+		methods:{
+			deleteis(){
+				this.getlist();
+			},
+			getlist(){
+				let _this = this;
+				for(let i = 0;i < _this.page;i++){
+					let data={
+						page:i,
+						lng:this.curLoction.longitude || '',
+						lat:this.curLoction.latitude || '',
+					}
+					App._post_form(
+						`&p=yellowpage&do=myCollectList`,
+						data,
+						res => {
+							console.log(res);
+							if(i == 0){
+								_this.setData({
+									cardlist: res.data.list
+								});
+								_this.count = res.data.total;
+							}else{
+								_this.cardlist = _this.cardlist.concat(res.data.list);
+							}
+						},
+						false,
+						() => {
+							_this.loadlogo = true;
+						}
+					);
+				}
+				
+			}
+		},
+		// 页面上拉触底事件的处理函数
+		onReachBottom: function() {
+			let _this = this;
+			this.isMore = false;
+			console.log(this.page,this.count)
+			if (this.page == this.count) {
+				this.isMore = true;
+			} else {
+				this.page++;
+				let data={
+					page:_this.page,
+					lng:this.curLoction.longitude || '',
+					lat:this.curLoction.latitude || '',
+				};
+				App._post_form(
+					`&p=yellowpage&do=myCollectList`,
+					data,
+					res => {
+						console.log(res)
+						this.cardlist = this.cardlist.concat(res.data.list);
+						this.isMore = true;
+						// this.count = res.data.total;
+					},
+					false,
+					() => {}
+				);
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F7F7F7;
+	}
+</style>
+<style lang="scss" scoped>
+	.yellowGoods{
+		padding: 30upx 30upx 150upx;
+	}
+</style>
diff --git a/pages/subPages2/practice/partTimeJob.vue b/pages/subPages2/practice/partTimeJob.vue
new file mode 100644
index 0000000..814968a
--- /dev/null
+++ b/pages/subPages2/practice/partTimeJob.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="partTimeJobList">
+		<loadlogo v-if="!loadlogo" />
+		<view style="padding: 20upx 0;" class="dis-flex">
+			<view  style="flex: 0.8;">
+				<filtertab 
+				:requestType="'7'" 
+				:isPageScroll="'1'" 
+				@selectAreaid="selectAreaid" 
+				@selectClassid="selectClassid" 
+				@getmore="getmore" 
+				@getResumeList="getResumeList"
+				@selectClassTwoid="selectClassTwoid" 
+				@selectOrders="selectOrders" 
+				@getcityWork="getcityWork"
+				:cate_one="cate_one" 
+				:cate_two="cate_two"></filtertab>
+			</view>
+			<view class="f-26" style="flex: 0.2;line-height: 75upx;padding-left: 20upx;" @click="openclass">
+				<text>更多</text>
+				<text class="iconfont icon-unfold" style="padding-left: 10upx;vertical-align: top;"></text>
+			</view>
+		</view>
+		
+		 <view  v-if="loadlogo">
+		 	<work-List :flag="false" :inviteList="inviteList"></work-List>
+			<view v-if="!isMore">
+				 <load-more :isMore="isMore" :bgc="'#ffffff'"></load-more>
+			</view>
+			<nonemores v-if="isMore && inviteList.length == 0"></nonemores>
+		 </view>
+		
+		 <view  >
+		 	 <screening :check="check" :num="num" @close="close" @checkeda="checkeda" @confirm="confirm" v-bind:moreData.sync="moreData"></screening>
+		 </view>
+		 <far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import filtertab from '@/components/template/filtertab.vue';
+	import workList from '@/components/template/workList.vue';
+	import screening from '@/components/template/screening.vue';
+	import loadMore from '@/components/template/loadmore.vue';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import nonemores from '@/components/template/nonemores.vue'
+	export default{
+		data(){
+			return{
+				cate_one:'',
+				cate_two:'',
+				title:'',
+				check:false,
+				resumeID:['','',''],
+				inviteList:[],
+				moreData:{},
+				page:1,
+				page_index:10,
+				loadlogo:false,
+				num:0,
+				Areaid:'',
+				ordersId:'',
+				datas:{},
+				isMore:true,
+				total:1,
+				job_type:null,
+				AreaidAt:'',
+				pagenum:1
+			}
+		},
+		components:{
+			filtertab,
+			workList,
+			screening,
+			loadMore,
+			Loadlogo,
+			nonemores
+		},
+		onLoad(e) {
+			if(e.job_type){
+				this.job_type = e.job_type;
+			};
+			this.isMore = false;
+			if(this.num != 0) return
+			this.pagenum = 4;
+			this.confirm();
+			// this.getResumeList(this.resumeID); 
+			// 初始化从地区选择器默认选择完毕发送请求，不从onload
+		},
+		onShow() {
+			if(this.num != 1) return
+			this.pagenum = 4;
+			this.confirm();
+			console.log(this.num)
+			// this.confirm();
+		},
+		onReachBottom() {
+			
+			if(this.total == this.page) return
+			this.isMore = false;
+			this.page++;
+			this.confirm(false,true)
+		},
+		methods:{
+			confirm(datas,flag){
+				if(datas != false){
+					this.page = 1;
+				}
+				if(this.pagenum < 4){
+					this.pagenum++;
+					this.loadlogo = true;
+					return
+				}
+				console.log(JSON.stringify(datas));
+				
+				if(datas){
+					this.datas = datas;
+				}
+				let indata = {
+					industry_pid:this.resumeID[0],
+					industry_id:this.resumeID[1],
+					position_id:this.resumeID[2],
+					sort:this.ordersId,
+					area_id:this.AreaidAt,
+					is_total:1,
+					page:this.page,
+					page_index:this.page_index
+				}
+				if(!datas || JSON.stringify(datas) == '{}'){
+					indata.job_type = this.job_type;
+				}else{
+					this.page = 1;
+				}
+				let data = Object.assign(indata ,this.datas);
+				App._post_form(
+					`&p=recruit&do=homeList`,
+					data,
+					res => {
+						if(flag){
+							this.inviteList = this.inviteList.concat(res.data.list);
+						}else{
+							this.inviteList = res.data.list;
+						}
+						this.inviteList.map(item=>{
+							item.open = false;
+						});
+						console.log(this.inviteList,res.data.list);
+						this.total = res.data.total;
+						this.check = false;
+						this.isMore = true;
+						this.loadlogo = true;
+					},
+					false,
+					() => {
+						this.loadlogo = true;
+					}
+				);
+			},
+			checkeda(index,key,flag){
+				console.log(index,key);
+				this.moreData[key].map(item=>{
+					item.checked = false
+				});
+				this.moreData[key][index].checked = flag;
+				let obj = Object.assign({},this.moreData);
+				console.log(obj);
+				this.moreData = {...obj}
+				this.loadlogo = !this.loadlogo;
+				this.loadlogo = !this.loadlogo;
+			},
+			getmore(data){
+				data.top.map((item,index)=>{
+					if(index > 2){
+						this.moreData[item.subscript] = data[item.subscript];
+					}
+				});
+				this.moreData.top = data.top;
+				for(let key in this.moreData){
+						this.moreData[key].map((item,index)=>{
+								item.checked = false;
+								if(key == 'job_type' && item.val == this.job_type){
+									item.checked = true;
+								}
+						})
+				}
+			},
+			getcityWork(id){
+				this.num = 1;
+				if(this.num != 0){
+					this.AreaidAt = id;
+					this.confirm();
+				}
+				
+			},
+			getResumeList(ids){
+				this.resumeID = ids;
+				if(this.num != 0){
+					this.confirm();
+					console.log('职位');
+				}
+				
+				// App._post_form(
+				// 	`&p=recruit&do=resumeList`,
+				// 	{},
+				// 	res => {
+				// 		this.inviteList = res.data;
+				// 		this.inviteList.map(item=>{
+				// 			item.open = false;
+				// 		})
+				// 	},
+				// 	false,
+				// 	() => {
+						
+				// 	}
+				// );
+			},
+			close(flag){
+				console.log(this.moreData);
+				if(!flag){
+					for(let key in this.moreData){
+							this.moreData[key].map((item,index)=>{
+									item.checked = false;
+							})
+					}
+				}else{
+					this.check = !this.check;
+				}
+			},
+			openclass(){
+				
+				this.check = !this.check;
+			},
+			clickcheck(){
+				this.check = !this.check;
+			},
+			selectOrders(data){
+				
+				this.ordersId = data.val;
+				if(this.num != 0){
+					this.confirm();
+					console.log('排序');
+				}
+				console.log(data)
+				
+			},
+			selectAreaid(data){
+				
+				this.num = 1;
+				console.log('地区');
+				this.Areaid = data.id;
+				this.confirm();
+				console.log(data)
+			},
+			selectClassid(data){
+				
+				console.log(data)
+			},
+			selectClassTwoid(data){
+				console.log(data)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	
+</style>
diff --git a/pages/subPages2/practice/practice.vue b/pages/subPages2/practice/practice.vue
new file mode 100644
index 0000000..8183fd0
--- /dev/null
+++ b/pages/subPages2/practice/practice.vue
@@ -0,0 +1,22 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/pages/subPages2/redClothes/redClothes.vue b/pages/subPages2/redClothes/redClothes.vue
new file mode 100644
index 0000000..83921ee
--- /dev/null
+++ b/pages/subPages2/redClothes/redClothes.vue
@@ -0,0 +1,224 @@
+<template>
+	<view class="redClothes">
+		<view class="redSerach">
+			<view class="iconfont icon-search" style="color: #999999;padding:20upx;">
+				
+			</view>
+			<input type="number" class="input" v-model="phone" maxlength="11" value="" placeholder="请输入转赠号码" />
+			<view  v-if="phone" class="iconfont icon-shibai" style="color: #CCCCCC;padding: 10upx 30upx 20upx;font-size: 44upx;" @click="clear"></view>
+			<view v-else class="iconfont icon-shibai"  style="padding: 10upx 30upx 20upx;font-size: 44upx;color: #F8F8F8;"></view>
+			<view class="line">
+				
+			</view>
+			<view class="search-btn" @click="getUserList">
+				搜索
+			</view>
+		</view>
+		<view class="Linkman" v-if="userData">
+			<view class="dis-flex linkItem">
+				<image :src="userData.avatar" mode=""></image>
+				<view class="flex-box" style="padding-left: 40upx;">
+					<view class="f-32 f-w" style="padding-bottom: 22upx;">
+						{{userData.nickname}}
+					</view>
+					<view class="f-28" style="color: #666666;">
+						{{userData.mobile}}
+					</view>
+				</view>
+				<view class="makeBtn" @click="openBox">
+					转赠
+				</view>
+			</view>
+		</view>
+		<view class="noneLinkman" v-else>
+			<view class="content" v-if="userData  == 0">
+				<image :src="imgfixUrls  + 'redLinkman.png'" mode=""></image>
+				<view class="t-c f-28" style="padding: 60upx 0;color: #999999;">
+					<view class="t-c">
+						暂未查询到该用户
+					</view>
+					<view class="t-c">
+						快邀请对方来注册
+					</view>
+				</view>
+				<!-- #ifdef H5 || APP-PLUS -->
+					<button class="invite-btn" @click="shareShow = true">
+						邀请用户
+					</button>
+				<!-- #endif -->
+				<!-- #ifdef MP-WEIXIN -->
+					<button class="invite-btn" open-type="share">
+						邀请用户
+					</button>
+				<!-- #endif -->
+				
+			</view>
+		</view>
+		<PopManager :show="shareShow" :type="'top'" @clickmask="shareShow = false">
+			<cover-view>
+				<cover-image :src="imageRoot + 'share.png'" class="coverImg"></cover-image>
+			</cover-view>
+		</PopManager>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+	import PopManager from '@/components/template/PopManager.vue';
+	export default{
+		data(){
+			return{
+				phone:'',
+				userData:null,
+				id:null,
+				type:null,
+				shareShow:false
+			}
+		},
+		components:{
+			PopManager
+		},
+		onLoad(e) {
+			this.id = e.id;
+			this.type = e.type;
+			setTimeout(()=>{
+				uni.setNavigationBarTitle({
+				　　title:'选择转赠对象'
+				})
+			})
+			
+		},
+		methods:{
+			getUserList(){
+				let _this = this;
+				App._post_form(
+					'&p=Member&do=mobileToMmeber',{
+						mobile:_this.phone
+					},
+					res => {
+						if(Array.isArray(res.data)){
+							_this.userData = 0;
+							return
+						}else{
+							_this.userData = res.data;
+						}
+					}
+				);
+			},
+			clear(){
+				this.phone = '';
+			},
+			openBox(){
+				let _this = this;
+				App.showError(
+					`是否向对方转赠?`,
+					data => {
+						if (data.confirm) {
+							App._post_form(
+								'&p=Order&do=transferApi',{
+									mobile:_this.phone,
+									id:_this.id,
+									type:_this.type
+								},
+								res => {
+									uni.showToast({
+										title:'转赠成功'
+									});
+									setTimeout(()=>{
+										uni.navigateBack({
+											delta:1
+										})
+									},1000)
+								}
+							);
+						}
+					},
+					true
+				);
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.coverImg {
+		width: 750upx;
+	}
+	.redClothes{
+		padding: 30upx;
+		.redSerach{
+			border-radius: 20upx;
+			background-color: #F8F8F8;
+			display: flex;
+			/deep/ .input{
+				height: 80upx;
+				font-size: 28upx;
+				width: 410upx;
+			}
+			.line{
+				margin: 25upx 0;
+				border-left: 1upx solid #CCCCCC;
+			}
+			.search-btn{
+				font-size: 28upx;
+				padding: 20upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #666666;
+			}
+		}
+		.Linkman{
+			.linkItem{
+				padding: 30upx 0;
+				border-bottom: 1upx solid #EEEEEE;
+				image{
+					width: 98upx;
+					height: 98upx;
+					border-radius: 50%;
+					border: 1upx solid #333333;
+				}
+				.makeBtn{
+					width: 100upx;
+					height: 60upx;
+					line-height: 60upx;
+					text-align: center;
+					font-size: 28upx;
+					font-weight: bold;
+					background-color: #FF4444;
+					border-radius: 10upx;
+					color: #FFFFFF;
+					margin: 20upx 0;
+				}
+			}
+		}
+		.noneLinkman{
+			padding-top: 200upx;
+			position: relative;
+			.content{
+				position: absolute;
+				left: 50%;
+				transform: translateX(-50%);
+				image{
+					width: 300upx;
+					height: 300upx;
+					margin: auto;
+				}
+				.invite-btn{
+					width: 310upx;
+					height: 70upx;
+					line-height: 70upx;
+					font-size: 28upx;
+					background-color: #ff4444;
+					border-radius: 20upx;
+					text-align: center;
+					color: #FFFFFF;
+				}
+			}
+		}
+		
+	}
+</style>
diff --git a/pages/subPages2/storeClass/storeClass.vue b/pages/subPages2/storeClass/storeClass.vue
new file mode 100644
index 0000000..c3b3fe2
--- /dev/null
+++ b/pages/subPages2/storeClass/storeClass.vue
@@ -0,0 +1,189 @@
+<template>
+	<view class="storeClass">
+		<Loadlogo v-if="Loadlogo"></Loadlogo>
+		<view class="page">
+			<view class="seach">
+				<view class="iconfont icon-back" @click="nextPage">
+					
+				</view>
+				<view class="flex-box t-c f-32 f-w" v-if="!ifSeach">
+					{{title}}
+				</view>
+				<view class="flex-box inputbox" v-else>
+					<input type="text" v-model="seach"  placeholder="请输入搜索内容" class="input"/>
+				</view>
+				<view class="iconfont icon-search" @click="seachStore">
+					
+				</view>
+			</view>
+			<view style="height: 80upx;"></view>
+			<view class="title" :style="{ width: imgstyle.width  + 'px', height: imgstyle.height + 'px' }" v-if="!!swiperList && swiperList.length > 0">
+				<swiper class="swiper"  indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+					<swiper-item v-for="(item, index) in swiperList" :key="index" @click="goUrl(item.link)">
+						<image :src="item.thumb" style="width: 100%; height: 100%;" mode="scaleToFill"></image>
+					</swiper-item>
+				</swiper>
+				<!-- <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fnimg.ws.126.net%2F%3Furl%3Dhttp%3A%2F%2Fdingyue.ws.126.net%2F2021%2F0903%2Fcebd2315p00qyv1qs003bc000hs009fm.png%26thumbnail%3D650x2147483647%26quality%3D80%26type%3Djpg&refer=http%3A%2F%2Fnimg.ws.126.net&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1638425989&t=ba41b7eca9681c46067a2154454236e5" ></image> -->
+			</view>
+			<view class="classList">
+				<view class="classItem" v-for="(item,index) in classList" :key="index" @click="goStore(item)">
+					<image :src="item.thumb" mode=""></image>
+					<view class="f-28 col-3">
+						{{item.name}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" pageType=""></TabBars>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				imgstyle:{},
+				swiperList:[],
+				seach:'',
+				title:'',
+				id:'',
+				classList:[],
+				ifSeach:false,
+				Loadlogo:true
+			}
+		},
+		components:{
+			Loadlogo,
+			TabBars
+		},
+		onLoad(e) {
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			this.id = e.id;
+			this.getStoreList(e.id);
+		},
+		methods:{
+			nextPage(){
+				if(this.ifSeach){
+					this.ifSeach = false;
+				}else{
+					uni.navigateBack({
+					    delta: 1
+					});
+				}
+			},
+			seachStore(){
+				if(!this.ifSeach){
+					this.ifSeach = true;
+				}else{
+					App.navigationTo({
+						url: `pages/mainPages/store/list?cate_one=${this.id}&cate_two=${''}&title=${''}&search=${this.seach}`
+					});
+				}
+			},
+			goStore(item){
+				App.navigationTo({
+					url: `pages/mainPages/store/list?cate_one=${this.id}&cate_two=${item.id}&title=${item.name}`
+				});
+			},
+			goUrl(url){
+				App.navigationTo({
+					url: url
+				});
+			},
+			getStoreList(id){
+				let _this = this;
+				let datas = {
+					id:id
+				}
+				App._post_form(
+					`&p=Store&do=oneCatePage`,
+					datas,
+					res => {
+						_this.swiperList = res.data.adv;
+						_this.classList = res.data.chilread;
+						_this.title = res.data.title;
+						// App.navigationTo({
+						// 	url: ''
+						// });
+					},
+					false,
+					() => {
+						_this.Loadlogo = false;
+					}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.storeClass{
+		padding-bottom: 100upx;
+		.page{
+			.seach{
+				display: flex;
+				height: 80upx;
+				line-height: 80upx;
+				padding: 0upx 30upx;
+				background-color: #fff;
+				position: fixed;
+				left: 0;
+				top: 0;
+				z-index: 1;
+				width: 100vw;
+				box-sizing: border-box;
+				.inputbox{
+					.input{
+						width: 300upx;
+						margin: auto;
+						height: 50upx;
+						line-height: 50upx;
+						margin-top: 15upx;
+						border: 1upx solid #eeeeee;
+						padding: 0 30upx ;
+						border-radius: 60upx;
+						font-size: 28upx;
+					}
+				}
+			}
+			.title{
+				// margin-top: 80upx;
+				.swiper{
+					width: 100%;
+					height: 100%;
+					image{
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+			.classList{
+				display: flex;
+				width: auto;
+				justify-content: flex-start;
+				flex-wrap: wrap;
+				width: 100%;
+				overflow: hidden;
+				.classItem{
+					flex: 0.25;
+					text-align: center;
+					height: 130upx;
+					min-width: 25%;
+					margin-top: 20upx;
+					image{
+						width: 80upx;
+						height: 80upx;
+					}
+				}
+			}
+			.classList:after {
+			      content: "";
+			      flex: 0.25;
+				  min-width: 25%;
+			}
+		}
+	}
+</style>
diff --git a/pages/subPages2/subscription/subscription.vue b/pages/subPages2/subscription/subscription.vue
new file mode 100644
index 0000000..a78e743
--- /dev/null
+++ b/pages/subPages2/subscription/subscription.vue
@@ -0,0 +1,281 @@
+<template>
+	<view class="subscription">
+		<view>
+			
+		</view>
+		<view class="subscription-content">
+			<view class="subscription-title">
+				<view class="title-content">
+					<view class="f-32 col-f">
+						温馨提示:
+					</view>
+					<view class="f-24 col-f p-top-20">
+						<view class="p-top-10">
+							1、为了您及时接收本程序的消息，请进行手动订阅操作。
+						</view>
+						<view class="p-top-10">
+							2、订阅后面数字代表可发送次数，点击一次增加一次。
+						</view>
+						<view class="p-top-10">
+							3、请选择“总是保存以上选择，不再询问”。
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="subscription-box">
+				<!-- <view  v-html="oaoao">
+					
+				</view> -->
+				
+				<!-- #ifndef H5 -->
+					<view class="subscription-box-title f-28 f-w">
+						小程序订阅消息
+					</view>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+					<view class="subscription-box-title f-28 f-w">
+						公众号订阅消息
+					</view>
+				<!-- #endif -->
+					<view class="subscription-content-box" v-if="sbuscriptionList.list.length > 0">
+						<view class="subscription-box-item dis-flex f-28" v-for="(item,index) in sbuscriptionList.list" :key="index" >
+							<view style="flex: 0.8;">
+								{{item.title}}
+							</view>
+							<!-- #ifdef H5 -->
+							<view style="flex: 0.2;padding-top: 30upx;" >
+								<wx-open-subscribe :template="item.id" id="launch-wxapp" @success="success($event,item)">
+								
+									<script type="text/wxtag-template">
+									        <style>
+									            .btn2 {
+									                height: 50rpx;
+									                width: 250rpx;
+									                line-height: 50rpx;
+									                background-color: #FF4444;
+									                color: #FFFFFF;
+									                float: right;
+									                text-align: center;
+									                border: none;
+									                font-size: 24rpx;
+									            }
+									        </style>
+									        <button class="btn2">订阅
+												<text>{{item.num?'+' + item.num : ''}}</text>
+											</button>
+									    </script>
+									</wx-open-subscribe>
+								<!-- <view class="subscription-item-btn t-c" @click="subscriptionClik(item)">
+									订阅 <text v-if="item.num != 0">+{{item.num}}</text>
+								</view> -->
+								
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<view style="flex: 0.3;">
+								<view class="subscription-item-btn t-c" @click="subscriptionClik(item)">
+									订阅 <text v-if="item.num != 0">+{{item.num}}</text>
+								</view>
+							</view>
+							<!-- #endif -->
+						</view>
+					</view>
+					
+			</view>
+		</view>
+		<TabBars :tabBarAct="0" :pageType="''"/>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import TabBars from '@/components/template/tabBar.vue';
+	export default{
+		data(){
+			return{
+				sbuscriptionList:[],
+				oaoao:''
+			}
+		},
+		components:{
+			TabBars
+		},
+		onLoad(option) {
+			this.getSbuscriptionList();
+			this.opens(option);
+		},
+		methods:{
+			opens(options){
+				let _this = this;
+				
+				
+				const { openid, action } = options;
+						
+			},
+			subscriptionClik(item){
+				let _this = this;
+						// #ifndef H5
+						uni.requestSubscribeMessage({
+							tmplIds: [item.id],
+							success(res) {
+								console.log(res);
+								for(let key in res){
+									if(key != 'errMsg'){
+										if(res[key] == 'accept'){
+											let data = {
+												info:{
+													form_id:item.id,
+													temp_type:item.temp_type,
+													scene:Number(item.scene)>9999?1:Number(item.scene) + 1
+													
+												}
+											};
+											data.info = JSON.stringify(data.info);
+											App._post_form(
+												`&do=saveFromId`,
+												data,
+												res => {
+													// console.log(res);
+													uni.showToast({
+														title:`订阅成功`
+													})
+													console.log(res);
+													_this.getSbuscriptionList();
+													// this.sbuscriptionList = res.data;
+												},
+												false,
+												() => {}
+											);
+										}
+									}
+								}
+							}
+						})
+						// #endif
+				 
+						// #ifdef H5
+						//记录场景值到缓存，用户授权成功后传给后端
+				        uni.setStorageSync('courseInfo', JSON.stringify(item));
+						
+						let redirect_url = encodeURIComponent(location.href);
+						// let appId = uni.getAccountInfoSync().miniProgram.appId;
+						// debugger
+						// return
+						location.href =
+							`https://mp.weixin.qq.com/mp/subscribemsg?action=get_confirm&appid=${this.sbuscriptionList.app_id}&scene=${Number(item.scene)>9999?1:Number(item.scene) + 1}&template_id=${this.sbuscriptionList.temp_id}&redirect_url=${redirect_url}&reserved=test#wechat_redirect`;
+						
+						// #endif
+
+			},
+			success(e,item){
+				// uni.showToast({
+				// 	title:'进来事件'
+				// })
+				
+					
+					// let class_id = JSON.parse(uni.getStorageSync('courseInfo'));
+					// let token = uni.getStorageSync('weliam_user_token');
+					let data = {
+						info:{
+							form_id:item.id,
+							temp_type:item.temp_type,
+						}
+					};
+					data.info = JSON.stringify(data.info);
+					App._post_form(
+						`&do=saveFromId`,
+						data,
+						res => {
+							// console.log(res);
+							console.log(res);
+							uni.showToast({
+								title:`订阅成功`
+							})
+							this.sbuscriptionList.list = [];
+							this.getSbuscriptionList();
+							// this.sbuscriptionList = res.data;
+						},
+						false,
+						() => {}
+					);
+				
+				
+			},
+			getSbuscriptionList(){
+				App._post_form(
+					`&do=getTempList`,
+					{},
+					res => {
+						
+						this.$forceUpdate();
+						// console.log(res);
+						this.sbuscriptionList = res.data;
+					},
+					false,
+					() => {}
+				);
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.subscription{
+		.subscription-content{
+			.subscription-title{
+				width: 750upx;
+				height: 355upx;
+				background-color: #FF4444;
+				
+				.title-content{
+					padding: 30upx;
+				}
+			}
+			.subscription-box{
+				border-radius: 20upx;
+				width: 90%;
+				position: absolute;
+				margin-bottom: 300upx;
+				
+				// padding: 30upx;
+				background-color: #FFFFFF;
+				left: 50%;
+				top: 22%;
+				transform: translate(-50%);
+				.subscription-box-title{
+					line-height: 100upx;
+					height: 100upx;
+					border-bottom: 1upx solid #EEEEEE;
+					padding: 0upx 30upx;
+				}
+				.subscription-content-box{
+					padding: 0upx 30upx;
+					.subscription-box-item{
+						line-height: 100upx;
+						height: 100upx;
+						border-bottom: 1upx solid #EEEEEE;
+						padding: 0upx 0upx;
+						.subscription-item-btn{
+							height: 50upx;
+							width: 128upx;
+							line-height: 50upx;
+							background-color: #FF4444;
+							color: #FFFFFF;
+							float: right;
+							margin-top: 25upx;
+							font-size: 24upx;
+						}
+					}
+					.subscription-box-item:last-child{
+						border: none;
+					}
+				}
+			}
+		}
+	}
+</style>
+<style>
+	page{
+		background-color: #F8F8F8;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/subPages2/tamplate/FGame.vue b/pages/subPages2/tamplate/FGame.vue
new file mode 100644
index 0000000..2ba4634
--- /dev/null
+++ b/pages/subPages2/tamplate/FGame.vue
@@ -0,0 +1,203 @@
+<template>
+	<view id="app" style="width: 80vw;margin: auto;">
+		<view class="lotteryBox fleximg dis-flex">
+			<view v-for='(item,key) in goodsList' :key="item.id" :class="key === index?'active':'noactive'">
+				<view >
+					<image :src="Number(item.draw_goods_id) !== 0?item.image:imgfixUrls + 'xxhg.png'"  class="itemImg" mode=""></image>
+					<p class="f-24" style="color: #B82F39;height: 50upx;line-height: 50upx;">{{Number(item.draw_goods_id) !== 0?item.title:'谢谢参与'}}</p>
+				</view>
+				<!-- <view  v-else>
+					<image src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4090871184,759043574&fm=26&gp=0.jpg" v-if="key == 1" style="width: 100%;height: 160upx;" mode=""></image>
+					<image src="https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=3290312065,2512676871&fm=26&gp=0.jpg" v-if="key == 5" style="width: 100%;height: 160upx;" mode=""></image>
+					<image src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=1658812503,2306493526&fm=26&gp=0.jpg" v-if="key == 7" style="width: 100%;height: 160upx;" mode=""></image>
+					<image v-if="key == 3" src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1600767797445&di=df36e84cab77e7fed8933f7f4c3c2cdb&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180510%2Fe275f6ffa1f54fcfac1585a6493f6a7e.jpeg" style="width: 100%;height: 160upx;" mode=""></image>
+				</view> -->
+			</view>
+
+
+		</view>
+		<!-- <view class="lotteryBtn" @click='lotteryBtn'>
+			立即抽奖
+		</view> -->
+	</view>
+
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				index: 0, //滚动下标
+				times: -1, //滚动次数（每一个方格为一次）
+				cycle: 27, //循环滚动的次数
+				speed: 1, //转动速度
+				ind:7,
+				count:18
+			}
+		},
+		props:{
+			goodsList:{
+				type: Array,
+				default: false
+			},
+			opendraw:{
+				type: Number,
+				default: 0
+			},
+			parameterid:{
+				type: String,
+				default: ''
+			}
+		},
+		watch:{
+			opendraw(newPage,oldPage){
+				this.lotteryBtn();
+			}
+		},
+		mounted() {
+			let _this = this;
+			   // uni.$on('opendraw',function(data){
+				  //  console.log(111111)
+			   //      _this.lotteryBtn();
+			   //  })
+		},
+		methods: {
+			lotteryBtn() {
+				let _this = this;
+				
+				App._post_form(
+					`&p=draw&do=draw&id=${_this.parameterid}`,
+					{},
+					res => {
+						console.log(res)
+						console.log('点击');
+						_this.$emit('startMusic')
+						_this.ind = Number(res.data.serial_number) - 1 // 随机产生一个中奖号码
+						// _this.ind = 14;
+						_this.index = 1;
+						_this.speed = 30;
+						_this.times = 0;
+						_this.startRoll();
+					},fail=>{
+						let msg = '';
+						if(fail.data.message == '未绑定手机号'){
+							msg = fail.data.message;
+						}
+					_this.$emit('startMusic',false,msg)
+				});
+				// console.log('点击');
+				// this.ind = parseInt(Math.random() * 8, 0) || 0; // 随机产生一个中奖号码
+				// this.startRoll();
+				
+			},
+			roll: function() {
+				let index = this.index;
+				let count = this.goodsList.length; //总长度
+				index += 1;
+				if (index > count - 1) {
+					index = 0
+				}
+				this.index = index
+			},
+			startRoll: function() {
+				
+				this.times += 1;
+				this.roll();
+				console.log(this.times,this.cycle  + this.ind,this.speed,this.ind);
+				// console.log((this.cycle + this.count) / 9)
+				if (this.times == (this.cycle  + this.ind)) {
+					// this.speed += 10;
+					this.$emit('endMusic',this.ind + 1)
+					clearTimeout(timer); //清除延迟函数
+					this.times = 0;
+					this.index = this.ind;
+				} else {
+					
+					if (this.times < ((this.cycle + this.ind) /2) ) {
+						this.speed -= 1; //加快转动速度
+					} else if(this.times > ((this.cycle + this.ind) /2) ){
+						this.speed += 30;
+					}
+					var timer;
+					setTimeout(()=>{
+						timer = setTimeout(this.startRoll, this.speed)
+					},3000 / this.cycle)
+					
+				}
+
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.fleximg{
+		display: flex;
+		width: auto;
+		justify-content: space-between;
+		flex-wrap: wrap;
+		width: 100%;
+		overflow: hidden;
+		.flex-item{
+			// min-width: 20vw;
+			// align-self:flex-start;
+			margin-bottom: 10upx;
+			border-radius: 10upx;
+			flex: 0.28;
+			height: 200upx;
+			min-width: 28%;
+			// height: 50upx;
+		}
+		.active {
+			// flex:0 0 28%;
+			/* border: 3upx solid #F82400; */
+			background-color: #FFEF94;
+			text-align: center;
+			padding: 10upx;
+			margin-bottom: 12upx;
+			border-radius: 10upx;
+			flex: 0.28;
+			// height: 200upx;
+			min-width: 28%;
+			margin-right: 10upx;
+			width: 180upx;
+			height: 180upx;
+			overflow: hidden;
+		}
+		.noactive{
+			// flex:0 0 28%;
+			padding: 10upx;
+			text-align: center;
+			background-color: #FFFFFF;
+			margin-bottom: 12upx;
+			margin-right: 10upx;
+			border-radius: 10upx;
+			width: 180upx;
+			height: 180upx;
+			overflow: hidden;
+			flex: 0.28;
+			// height: 200upx;
+			min-width: 28%;
+		}
+	}
+	.fleximg:after {
+		content: "";
+		flex: 0.28;
+		min-width: 28%;
+	}
+	.lotteryBox{
+		padding-bottom: 5upx;
+	}
+	.lotteryBtn{
+		position: absolute;
+	}
+	.itemImg {
+		width: 120upx;
+		height: 120upx;
+		/* width: 30%; */
+	}
+
+	
+</style>
diff --git a/pages/subPages2/tamplate/FGamesix.vue b/pages/subPages2/tamplate/FGamesix.vue
new file mode 100644
index 0000000..4bc998a
--- /dev/null
+++ b/pages/subPages2/tamplate/FGamesix.vue
@@ -0,0 +1,201 @@
+<template>
+	<view id="app" style="width: 80vw;margin: auto;">
+		<view class="lotteryBox fleximg dis-flex">
+			<view v-for='(item,key) in goodsList' :key="item.id" :class="key + 1 === index?'active':'noactive'">
+				<view >
+					<image :src="Number(item.draw_goods_id) !== 0?item.image:imgfixUrls + 'xxhg.png'"   class="itemImg" mode=""></image>
+					<p class="f-24" style="color: #B82F39;height: 40upx;line-height: 40upx;">{{Number(item.draw_goods_id) !== 0?item.title:'谢谢参与'}}</p>
+				</view>
+				<!-- <view  v-else>
+					<image src="https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4090871184,759043574&fm=26&gp=0.jpg" style="width: 100%;height: 110upx;" mode=""></image>
+				</view> -->
+			</view>
+
+
+		</view>
+		<!-- <view class="lotteryBtn" @click='lotteryBtn'>
+			立即抽奖
+		</view> -->
+	</view>
+
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				index: 0, //滚动下标
+				times: -1, //滚动次数（每一个方格为一次）
+				cycle: 48, //循环滚动的次数
+				speed: 1, //转动速度
+				ind:7,
+				count:10
+			}
+		},
+		mounted() {
+			let _this = this;
+			   uni.$on('opendraw',function(data){
+				   console.log(111111)
+			        _this.lotteryBtn();
+			    })
+		},
+		props:{
+			goodsList:{
+				type: Array,
+				default: false
+			},
+			opendraw:{
+				type: Number,
+				default: 0
+			},
+			parameterid:{
+				type: String,
+				default: 0
+			},
+		},
+		watch:{
+			opendraw(newPage,oldPage){
+				this.lotteryBtn();
+			}
+		},
+		methods: {
+			lotteryBtn() {
+				let _this = this;
+				App._post_form(
+					`&p=draw&do=draw&id=${_this.parameterid}`,
+					{},
+					res => {
+						console.log(res)
+						console.log('点击');
+						_this.$emit('startMusic')
+						_this.ind = Number(res.data.serial_number) // 随机产生一个中奖号码
+						// _this.ind = 14;
+						_this.index = 1;
+						_this.speed = 30;
+						_this.times = 0;
+						_this.startRoll();
+					},fail=>{
+					let msg = '';
+						if(fail.data.message == '未绑定手机号'){
+							msg = fail.data.message;
+						}
+					_this.$emit('startMusic',false,msg)
+				});
+				
+				
+			},
+			roll: function() {
+				let index = this.index;
+				let count = this.goodsList.length; //总长度
+				index += 1;
+				if (index > count) {
+					index = 1
+				}
+				this.index = index
+			},
+			startRoll: function() {
+				
+				this.times += 1;
+				this.roll();
+				console.log(this.times,this.cycle  + this.ind,this.speed,this.ind);
+				// console.log((this.cycle + this.count) / 9)
+				if (this.times == (this.cycle  + this.ind)) {
+					// this.speed += 10;
+					this.$emit('endMusic',this.ind)
+					clearTimeout(timer); //清除延迟函数
+					this.times = 0;
+					this.index = this.ind;
+				} else {
+					
+					if (this.times < ((this.cycle + this.ind) /2) ) {
+						this.speed -= 1; //加快转动速度
+					} else if(this.times > ((this.cycle + this.ind) /2) ){
+						this.speed += 10;
+					}
+					var timer;
+					setTimeout(()=>{
+						timer = setTimeout(this.startRoll, this.speed)
+					},3000 / this.cycle)
+					
+				}
+
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.fleximg{
+		display: flex;
+		    width: auto;
+		    justify-content: space-between;
+		    flex-wrap: wrap;
+			width: 100%;
+		    overflow: hidden;
+		.flex-item{
+			// min-width: 20vw;
+			// align-self:flex-start;
+			margin-bottom: 10upx;
+			border-radius: 10upx;
+			flex: 0.20;
+			height: 130upx;
+			min-width: 20%;
+			// height: 50upx;
+		}
+		.active {
+			// flex:0 0 28%;
+			/* border: 3upx solid #F82400; */
+			background-color: #FFEF94;
+			text-align: center;
+			padding: 10upx;
+			margin-bottom: 10upx;
+			border-radius: 10upx;
+			flex: 0.20;
+			// height: 200upx;
+			min-width: 20%;
+			margin-right: 10upx;
+			width: 180upx;
+			height: 130upx;
+			overflow: hidden;
+		}
+		.noactive{
+			// flex:0 0 28%;
+			padding: 10upx;
+			text-align: center;
+			background-color: #FFFFFF;
+			margin-bottom: 10upx;
+			margin-right: 10upx;
+			border-radius: 10upx;
+			width: 180upx;
+			height: 130upx;
+			flex: 0.20;
+			// height: 200upx;
+			min-width: 20%;
+			overflow: hidden;
+		}
+	}
+	.fleximg:after {
+	      content: "";
+	      flex: 0.20;
+		  min-width: 20%;
+	   }
+	// .lotteryBox{
+	// 	display: -webkit-flex; /* Safari */
+	// 	      justify-content: center;
+	// 	      align-items: center;
+	// 		  width: 100%;
+	// 		  flex-wrap:wrap;
+	// }
+	.lotteryBtn{
+		position: absolute;
+	}
+	.itemImg {
+		width: 80upx;
+		height: 80upx;
+		/* width: 30%; */
+	}
+
+	
+</style>
diff --git a/pages/subPages2/tamplate/choose-Cade/choose-Cade.vue b/pages/subPages2/tamplate/choose-Cade/choose-Cade.vue
new file mode 100644
index 0000000..a7ece5e
--- /dev/null
+++ b/pages/subPages2/tamplate/choose-Cade/choose-Cade.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="boxa">
+		<view class="top_kbox">
+			<block v-for="(item,i) in newlist" :key="i">
+				<view class="ibox" @tap="alertnum(i)" :class="[i== i1?'actives':'']">
+					<text class="uni_14">{{item}}</text>
+					<image v-if="i != i1" class="ii" src="/static/chooseCade/chooseCadex.png" mode=""></image>
+					<image v-else class="ii" src="/static/chooseCade/chooseCades.png" mode=""></image>
+				</view>
+			</block>
+		</view>
+		<view  :class="[show?'list_boxs2':'list_boxs']">
+			<view class="lione">
+				<block v-for="(item,i) in listchild" :key="i">
+					<view class="mli" @tap="chooseOne(i)">
+						<text :class="[i== i2?'actives':'']" class="uni_14">{{item}}</text>
+						<image v-if="i == i2" class="ii" src="/static/chooseCade/chooseCadecc.png" mode=""></image>
+					</view>
+				</block>
+			</view>
+			<view class="hideA" @tap="hide">
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: ['list', 'arr'], //数组  arr
+		data() {
+			return {
+				i1: null,
+				i2: null,
+				show: false,
+				listchild: [],
+				newlist: this.list
+			}
+		},
+		methods: {
+			alertnum(i) {
+				if (this.i1 != i) {
+					this.listchild = [];
+					this.i1 = i;
+					this.listchild = this.arr[i];
+					this.i2 = null;
+					this.show = true;
+					let ins = this.listchild.indexOf(this.newlist[i]);
+					if (ins > -1) {
+						this.i2 = ins
+					}
+				}
+
+			},
+			chooseOne(i) {
+				this.i2 = i;
+				this.newlist[this.i1] = this.listchild[i];
+				this.$emit('chooseLike', [this.i1, this.i2])
+			},
+			hide() {
+				this.show = false;
+				this.i1 = null;
+				this.i2 = null;
+			}
+		}
+	}
+</script>
+
+<style>
+	.hideA {
+		height: calc(100% - 700upx);
+	}
+
+	.mli {
+		/* border: 1upx solid red; */
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding: 22upx 0;
+	}
+
+	.lione {
+		background-color: #fff;
+		/* height: 262upx; */
+		padding: 10upx 40upx;
+
+	}
+
+	.list_boxs {
+		background-color: rgba(84, 80, 80, 0.48);
+		position: fixed;
+		height: calc(100%);
+		width: 100%;
+		z-index: 88;
+		/* transition: all .5s; */
+		transform: translateY(-130%);
+	}
+	.list_boxs2{
+		background-color: rgba(84, 80, 80, 0.48);
+		position: fixed;
+		height: calc(100%);
+		width: 100%;
+		z-index: 88;
+		transform: translateY(0);
+		/* transition: all .5s; */
+	}
+
+	.ii {
+		width: 30upx;
+		height: 30upx;
+		display: block;
+		margin-left: 12upx;
+	}
+
+	.actives {
+		color: #F0AD4E;
+	}
+
+	.ibox {
+		display: flex;
+		align-items: center;
+	}
+
+	.top_kbox {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		background-color: #FFFFFF;
+		/* padding: 28upx 5%; */
+		/* position: fixed; */
+		/* top: 88upx; */
+		width: 92%;
+		z-index: 99;
+		padding: 0 30upx 30upx;
+		/* #ifdef APP-PLUS */
+		/* top: 0; */
+		/* #endif */
+	}
+	.boxa{
+		/* padding-top: 84upx; */
+		position: relative;
+	}
+</style>
diff --git a/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue b/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue
new file mode 100644
index 0000000..a07c995
--- /dev/null
+++ b/pages/subPages2/tamplate/evan-radio/evan-radio-group.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="evan-radio-group">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'EvanRadioGroup',
+		props: {
+			value: {
+				type: [String, Number, Boolean],
+				default: null
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			value: {
+				handler(value) {
+					this.deepSetValue(this.$children)
+				}
+			}
+		},
+		methods: {
+			onRadioChange(label,flag = false) {
+				// debugger
+				this.$emit('input', label,flag)
+				this.$emit('change', label,flag)
+			},
+			deepSetValue(array) {
+				if (Array.isArray(array)) {
+					array.forEach((child) => {
+						let childName = child.$options.name
+						if (childName === 'EvanRadio') {
+							if (typeof child.setValue === 'function') {
+								child.setValue(this.value)
+							}
+						} else if (child.$children) {
+							this.deepSetValue(child.$children)
+						}
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/pages/subPages2/tamplate/evan-radio/evan-radio.vue b/pages/subPages2/tamplate/evan-radio/evan-radio.vue
new file mode 100644
index 0000000..dbd860b
--- /dev/null
+++ b/pages/subPages2/tamplate/evan-radio/evan-radio.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="evan-radio" @click="onRadioClick">
+		<slot v-if="$slots.icon" name="icon"></slot>
+		<template v-else>
+			<uni-icons v-if="icon" :type="icon" :size="iconSize" :color="iconColor"></uni-icons>
+			<view v-else class="evan-radio__inner" :class="['evan-radio__inner--'+shape]" :style="{width:iconSize+'px',height:iconSize+'px',backgroundColor:innerBackgroundColor,borderColor:innerBorderColor}">
+				<uni-icons v-if="isChecked" type="checkmarkempty" :size="iconSize" :color="isDisabled?'#c8c9cc':'#fff'"></uni-icons>
+			</view>
+		</template>
+		<text v-if="$slots.default" class="evan-radio__label" :style="mTitleStlye">
+			<slot></slot>
+		</text>
+	</view>
+</template>
+
+<script>
+	import UniIcons from '@/pages/subPages2/tamplate/uni-icons/uni-icons.vue'
+	export default {
+		name: 'EvanRadio',
+		components: {
+			UniIcons
+		},
+		props: {
+			shape: {
+				type: String,
+				default: 'round'
+			},
+			value: {
+				type: [String, Number, Boolean],
+				default: null
+			},
+			label: {
+				type: [String, Number, Boolean],
+				default: null
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			icon: {
+				type: String,
+				default: null
+			},
+			iconSize: {
+				type: Number,
+				default: 20
+			},
+			primaryColor: {
+				type: String,
+				default: '#108ee9'
+			},
+			titleStyle: {
+				type: Object,
+				default: () => {
+					return {}
+				}
+			},
+			preventClick: {
+				type: Boolean,
+				default: false
+			},
+			clearable: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			isGroup() {
+				let parent = this.getParent()
+				if (parent) {
+					return true
+				}
+				return false
+			},
+			isDisabled() {
+				if (this.isGroup) {
+					return this.getParent().disabled || this.disabled
+				}
+				return this.disabled
+			},
+			mTitleStlye() {
+				let titleStyle = Object.assign({}, this.titleStyle || {})
+				let arr = Object.keys(titleStyle).map((key) => {
+					if (key === 'color' && this.disabled) {
+						return null
+					}
+					return `${key}:${titleStyle[key]}`
+				}).filter((v) => v)
+				return arr.join(';')
+			},
+			isChecked() {
+				let parent = this.getParent()
+				if ((this.isGroup && parent.value === this.label) || (!this.isGroup && this.currentValue === this.label)) {
+					return true
+				}
+				return false
+			},
+			innerBackgroundColor() {
+				if (this.isDisabled) {
+					return '#ebedf0'
+				}
+				let parent = this.getParent()
+				if (this.isChecked) {
+					return this.primaryColor
+				}
+				return '#fff'
+			},
+			innerBorderColor() {
+				if (this.isDisabled) {
+					return '#c8c9cc'
+				}
+				if (this.isChecked) {
+					return this.primaryColor
+				}
+				return '#c8c9cc'
+			},
+			iconColor() {
+				if (this.isDisabled) {
+					return '#ebedf0'
+				}
+				if (this.isChecked) {
+					return this.primaryColor
+				}
+				return '#c8c9cc'
+			}
+		},
+		watch: {
+			value: {
+				immediate: true,
+				handler(value) {
+					this.currentValue = value
+				}
+			}
+		},
+		data() {
+			return {
+				currentValue: null
+			}
+		},
+		methods: {
+			// 获取EvanRadioGroup组件
+			getParent() {
+				let parent = this.$parent
+				if (parent) {
+					let parentName = parent.$options.name
+					while (parentName !== 'EvanRadioGroup') {
+						parent = parent.$parent
+						if (parent) {
+							parentName = parent.$options.name
+						} else {
+							return null
+						}
+					}
+					return parent
+				}
+				return null
+			},
+			onRadioClick() {
+				if (!this.isDisabled && !this.preventClick) {
+					this.choose()
+				}
+			},
+			select() {
+				if (!this.isDisabled) {
+					this.choose()
+				}
+			},
+			choose() {
+				if (this.currentValue !== this.label) {
+					this.currentValue = this.label
+					this.$emit('input', this.currentValue)
+					if (this.isGroup) {
+						let parent = this.getParent()
+						parent.onRadioChange(this.label)
+					}
+				} else if (this.clearable) {
+					this.currentValue = null
+					this.$emit('input', this.currentValue)
+					if (this.isGroup) {
+						let parent = this.getParent()
+						parent.onRadioChange(null,this.label)
+					}
+				}
+			},
+			setValue(groupValue) {
+				this.currentValue = groupValue
+			}
+		},
+		created() {
+			let parent = this.getParent()
+			if (parent) {
+				this.setValue(parent.value)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.evan-radio {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.evan-radio__label {
+		font-size: 24upx;
+		margin-left: 16upx;
+		color: #333;
+	}
+
+	.evan-radio__inner {
+		border-width: 1px;
+		border-style: solid;
+		background-color: #fff;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.evan-radio__inner--round {
+		border-radius: 50%;
+	}
+</style>
diff --git a/pages/subPages2/tamplate/foodCategory.vue b/pages/subPages2/tamplate/foodCategory.vue
new file mode 100644
index 0000000..205d48a
--- /dev/null
+++ b/pages/subPages2/tamplate/foodCategory.vue
@@ -0,0 +1,659 @@
+<template>
+	<view class="content">
+		<!-- <slot>加载中，请稍后...</slot> -->
+		<scroll-view scroll-y class="left-aside">
+			<view v-for="item in flist" :key="item.id" class="f-item" :class="{ active: item.id === currentId }" @click="tabtap(item)">{{ item.name }}</view>
+		</scroll-view>
+		<scroll-view scroll-with-animation scroll-y class="right-aside" @scroll="asideScroll" :scroll-top="tabScrollTop">
+			<view v-for="item in slist" :key="item.id" class="s-list" :id="'main-' + item.id">
+				<text class="s-item">{{ item.catename }}</text>
+				<view class="t-list">
+					<view @click="navToList(item.id, titem)" v-if="titem.pid === item.id" class="t-item" v-for="(titem, index) in tlist" :key="titem.id">
+						<view  style="flex: 3;position: relative;overflow: hidden;"><image :src="titem.thumb" mode="aspectFill" style="width: 150upx; height: 150upx; border-radius: 10upx;"></image>
+						<view class="f-w viptag iconfont icon-choicenessfill" v-if="titem.vipstatus == '2'">
+							
+						</view>
+						</view>
+						<view  style="flex: 7;padding-left: 20upx;">
+							<view class="f-32 f-w" style="color: #333333;width: 10em;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;">{{ titem.name }}</view>
+							<view  style="color: #999999;padding: 16upx 0;">已售{{titem.salenum}}
+							<view class="dis-flex flex-y-center member-coupon-view" v-if="titem.vipstatus == '1'">
+								<view class="member-price-label f-22">会员</view>
+								<view class="f-22 col-f onelist-hidden b-0 coupon-price-2">-<text class="member-coupon-price">{{titem.vipdiscount}}</text>元</view>
+							</view>
+							<view class="member-coupon-view f-22" style="background-color: #efd68f;border-radius: 7upx;padding: 5upx 10upx;color: #333333;" v-if="titem.vipstatus == '2'">
+								会员专享
+							</view>
+							</view>
+							<view class="dis-flex">
+								<view class="flex-box">
+									<text class="f-26" style="color: #F44F44;">¥{{ titem.price }}</text>
+									<text class="f-20" style="text-decoration:line-through;color: #999999;padding-left: 10upx;" v-if=" Number(titem.oldprice) > 0">¥{{ titem.oldprice }}</text>
+								</view>
+
+								<view class="flex-box">
+									<view  style="float: right;">
+										<view :animation="animationData" v-if="false" style="width: 100upx;height: 100upx;background-color: #33ff55;"></view>
+										<jumpBall ref="jumpBall" @msg="jbMsg" />
+
+										<tui-numberbox
+											:class="'admin' + index"
+											:value="tlist[index].num"
+											v-if="!titem.optionarray.length && titem.saleoverflag !== 1"
+											@change="change($event, titem, 'admin' + index, index)"
+											:width="40"
+											:min="0"
+											@click.stop=""
+										></tui-numberbox>
+										<view
+											
+											v-else-if="!!titem.optionarray.length && titem.saleoverflag !== 1"
+											style="padding: 10upx 20upx;border-radius: 10upx;background-color: #FF4444;color: #FFFFFF;"
+											@click.stop="popupOpen(titem)"
+										>
+											选规格
+										</view>
+										<view
+											
+											v-else-if="titem.saleoverflag == 1"
+											style="padding: 10upx 20upx;border-radius: 10upx;background-color: #999999;color: #FFFFFF;"
+											@click.stop="sellout"
+										>
+											已售罄
+										</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+		<!-- 购物车 -->
+		<view class="foot"><view class="cart"></view></view>
+		<!-- 选规格弹窗 -->
+		<popup-view :show="showBuyMenu" type="center" @clickmask="onToggleTrade">
+			<view style="background-color: #FFFFFF;border-radius: 15upx;">
+				<view class="footName f-28" style="padding: 20upx 20upx 0;">{{ selectSpecification.name }}</view>
+				<view class="p-top-40 f-24" style="color: #999999;padding: 40upx 20upx 0upx;">规格</view>
+				<view class="dis-flex" style="padding: 0 20upx 30upx;flex-wrap: wrap;overflow: auto;max-height: 40vh;">
+					<view :class="item.checked ? 'checked' : 'noChecked'"
+					style="flex: 0.01;padding: 10upx 30upx;margin: 20upx 10upx 20upx 0;text-align: center;width: 100upx;min-width: 100upx;"
+					v-for="(item, index) in selectSpecification.optionarray"
+					:key="index"
+					@click="checkedLabel(item)">{{ item.name }}</view>
+				</view>
+				<view  style="background-color: #F8F8F8;padding: 10upx 20upx;">
+					<text class="f-26" style="color: #999999;">已选规格:</text>
+					<text class="f-26">({{ numberPeople.name }})</text>
+				</view>
+				<view class="dis-flex" style="padding: 0 20upx;">
+					<view  style="flex: 7;padding: 30upx 0;">
+						<text class="f-30 f-w" style="color: #FF4444;">¥{{ numberPeople.price }}</text>
+						<text class="f-24" style="text-decoration: line-through;color: #999999;padding-left: 10upx;">¥{{ numberPeople.oldprice }}</text>
+					</view>
+					<view  style="flex: 3;padding-top: 30upx;">
+						<button type="warn" size="mini" v-if="numberPeople.num == 0" style="font-size: 20upx;" @click="addShoping">加入购物车</button>
+						<tui-numberbox @click.stop="" :value="numberPeople.num" v-if="numberPeople.num > 0" @change="changes($event, numberPeople)" :width="60" :min="0"></tui-numberbox>
+					</view>
+				</view>
+			</view>
+		</popup-view>
+		
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import PopupView from '@/components/template/PopManager.vue';
+import tuiNumberbox from '@/components/template/numberbox.vue';
+import jumpBall from '@/components/hx-jump-ball/hx-jump-ball.vue';
+export default {
+	components: {
+		tuiNumberbox,
+		PopupView,
+		jumpBall
+	},
+	data() {
+		return {
+			nums: 1,
+			element: [],
+			animation: '',
+			animationData: {},
+			off: false,
+			selectSpecification: {},
+			showBuyMenu: false,
+			sizeCalcState: false,
+			tabScrollTop: 0,
+			currentId: 1,
+			flist: [],
+			slist: [],
+			tlist: [],
+			value: 0,
+			numberPeople: {
+			},
+			goodid: 0,
+			num: 0,
+			record:true,
+			onepoc:true
+		};
+	},
+	mounted() {
+		let _this = this;
+		var animation = uni.createAnimation({
+			duration: 1000,
+			timingFunction: 'ease'
+		});
+		this.animation = animation;
+		// let q = uni.createSelectorQuery();
+		// setTimeout(function() {
+		// 	q.select('#cart')
+		// 		.boundingClientRect(data => {
+		// 			_this.setData({
+		// 				cartBasketRect: data,
+		// 			})
+		// 			// this.cartBasketRect = data;
+		// 			// console.log(data);
+		// 			// console.log(this.$refs.inCart);
+		// 		})
+		// 		.exec();
+		// }, 100);
+		// uni.$on('addShopings',function(data){
+		//  console.log(data);
+		//      this.addShopingas(data);
+		//  })
+		// this.loadData();
+	},
+	props: {
+		storeFoodList: {
+			type: Object,
+			default: null
+		},
+		topshow:{
+			type:Boolean,
+			default:null
+		},
+		height:{
+			type:String,
+			default:'45vh'
+		},
+		width:{
+			type:String,
+			default:'100vw'
+		}
+	},
+	watch: {
+		storeFoodList: {
+			handler(newData, oldData) {
+				let foodList = [];
+				this.tlist = [];
+				this.flist = [];
+				this.slist = [];
+				this.flist = newData.cartinfo.catelist;
+				this.slist = newData.cartinfo.goodslist;
+				this.slist.map(item => {
+					// this.tlist.push(...item.categoods);
+					this.tlist.push.apply(this.tlist, item.categoods);
+					this.tlist.map(items => {
+						items.optionarray.forEach((i, index) => {
+						i.checked = false;
+						items.optionarray[0].checked = true;
+						if(this.num > 0){
+							this.checkedLabel(this.numberPeople);
+						}
+						});
+					});
+				});
+				
+				console.log(newData.flag);
+				if(newData.num !== 1 && newData.num>1){
+					this.calcSize();
+					return
+				}
+					// this.tabtap(this.flist[0]);
+					this.currentId = this.flist[0].id;
+			},
+			deep: true
+		},
+		topshow:{
+			handler(newdata){
+				this.calcSize();
+				this.sizeCalcState = false;
+			},
+			deep:true
+		}
+	},
+	mounted() {
+		this.calcSize();
+	},
+	onShow() {
+		if(this.onepic){
+			this.onepoc = false;
+		};
+		this.calcSize();
+	},
+	methods: {
+		changes(e,item){
+			App._post_form(
+				`&p=citydelivery&do=addShopCart&goodid=${this.selectSpecification.id}&specid=${this.numberPeople.id}&addtype=${e.type == 'plus' ? 1 : 0}`,
+				{},
+				res => {
+					if(res.errno !== 0){
+						return
+					}
+					let storePrice = res.data;
+					this.num++;
+					storePrice.changenum = this.num;
+					storePrice.changemoney = storePrice.changemoney * this.num;
+					storePrice.id = this.selectSpecification.id;
+					// this.$emit('getshopPrice',storePrice);
+					// this.$store.commit('STOREPRICES',storePrice);
+					uni.$emit('STOREPRICES', storePrice);
+					this.numberPeople.num = e.value;
+				},
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		jbMsg() {},
+		// 定义动画内容
+		rotateAndScale() { //手动动画方法废弃无用
+			// 定义动画内容
+			this.animation
+				.rotate(45)
+				.scale(2, 2)
+				.step();
+			// 导出动画数据传递给data层
+			this.animationData = this.animation.export();
+		},
+		norotateAndScale() {
+			this.animation
+				.rotate(0)
+				.scale(1, 1)
+				.step();
+			this.animationData = this.animation.export();
+		},
+		addShoping() {
+			App._post_form(
+				`&p=citydelivery&do=addShopCart&goodid=${this.selectSpecification.id}&specid=${this.numberPeople.id}&addtype=${1}`,
+				{},
+				res => {
+					if(res.errno !== 0){
+						return
+					}
+					let storePrice = res.data;
+					this.num++;
+					this.numberPeople.num = 1;
+					storePrice.changenum = this.num;
+					storePrice.changemoney = storePrice.changemoney * this.num;
+					storePrice.id = this.selectSpecification.id;
+					uni.$emit('STOREPRICES', storePrice);
+				},
+				fail=>{
+					console.log(fail,123321)
+				}
+				,
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+		},
+		change: function(e, titem, classis, index) {
+			let _this = this;
+			let views; //点击的坐标
+			let viewss; //购物车坐标
+			_this.element = [];
+
+			// this.element = ['.' + classis,'.cart'];
+			// this.nums ++;
+			// this.$refs.jumpBall[0].start = this.nums
+			
+			App._post_form(
+				`&p=citydelivery&do=addShopCart&goodid=${titem.id}&specid=${0}&addtype=${e.type == 'plus' ? 1 : 0}`,
+				{},
+				res => {
+					if(res.errno != 0){
+						return
+					}
+					let storePrice = res.data;
+					storePrice.changenum = e.value;
+					storePrice.changemoney = storePrice.changemoney * e.value;
+					storePrice.id = titem.id;
+					this.tlist.map((items, index) => {
+						if (items.id == titem.id) {
+							this.tlist[index].num = e.value;
+						}
+					});
+					setTimeout(() => {
+						let view = uni
+							.createSelectorQuery()
+							.in(_this)
+							.select('.' + classis);
+						view.fields(
+							{
+								size: true,
+								rect: true,
+								scrollOffset: true
+							},
+							data => {
+								_this.element.push(data);
+								views = data;
+								// item.top = h;
+								// h += data.height;
+								// item.bottom = h;
+								let viewis = uni
+									.createSelectorQuery()
+									.in(_this)
+									.select('.cart');
+								viewis
+									.fields(
+										{
+											size: true,
+											rect: true,
+											scrollOffset: true
+										},
+										datas => {
+											_this.element.push(datas);
+											viewss = datas;
+											// item.top = h;
+											// h += data.height;
+											// item.bottom = h;
+											if (e.type == 'plus') {
+												// _this.setData({
+												// 	nums:this.nums+1
+												// });
+												_this.$refs.jumpBall[index].$emit('childMethod', _this.element);
+											}
+										}
+									)
+									.exec();
+							}
+						).exec();
+					}, 100);
+					// this.$emit('getshopPrice',storePrice);
+					// this.$store.commit('STOREPRICES',storePrice);
+					uni.$emit('STOREPRICES', storePrice);
+				},
+				fail=>{
+					console.log(fail,102210)
+				}
+				,
+				false,
+				() => {
+					// _this.loadlogo = true
+				}
+			);
+			//
+		},
+		//一级分类点击
+		tabtap(item) {
+			// if (!this.sizeCalcState) {
+				this.calcSize();
+			// }
+			setTimeout(()=>{
+				this.record = false;
+				this.currentId = item.id;
+				let index = this.slist.findIndex(sitem => sitem.pid === item.id);
+				this.tabScrollTop = this.slist[index].top;
+			})
+			
+			
+		},
+		//右侧栏滚动
+		asideScroll(e) {
+			if(!this.record){
+				this.record = true;
+				return
+			}
+			// if (!this.sizeCalcState) {
+				this.calcSize();
+			// }
+			setTimeout(()=>{
+				let scrollTop = e.detail.scrollTop;
+				let tabs = this.slist.filter(item => item.top <= scrollTop).reverse();
+				if (tabs.length > 0) {
+					this.currentId = tabs[0].pid;
+				}
+			})
+			
+		},
+		//计算右侧栏每个tab的高度等信息
+		calcSize() {
+			let _this = this;
+			let h = 0;
+			this.slist.forEach(item => {
+				let view = uni
+					.createSelectorQuery()
+					.in(_this)
+					.select('#main-' + item.id);
+				view.fields(
+					{
+						size: true,
+						rect: true,
+						scrollOffset: true
+					},
+					data => {
+						item.top = h;
+						h += data.height;
+						item.bottom = h;
+					}
+				).exec();
+			});
+			this.sizeCalcState = true;
+		},
+		navToList(sid, item) {
+			App.navigationTo({
+				url: 'pages/subPages2/businessCenter/foodIntroduced/foodIntroduced?id=' + item.id + '&num=' + item.num + '&width=' + this.width + '&height=' + this.height
+			});
+		},
+		// 选择规格商品
+		popupOpen(item) {
+			this.showBuyMenu = true;
+			this.selectSpecification = item;
+			console.log(item);
+			item.optionarray.forEach(items=>{
+				if(items.checked){
+					this.numberPeople = items;
+				}
+			})
+				
+			
+			
+		},
+		sellout(){
+			
+		},
+		// 规格弹窗开关
+		onToggleTrade() {
+			//关闭后重置规格数据
+			this.showBuyMenu = !this.showBuyMenu;
+		},
+		// 选中某规格
+		checkedLabel(item) {
+			this.numberPeople = item;
+			this.selectSpecification.optionarray.forEach(items => {
+				items.checked = false;
+				if (items.id == item.id) {
+					items.checked = true;
+				}
+			});
+			// this.selectSpecification.map((items,index)=>{
+
+			// })
+		}
+	}
+};
+</script>
+
+<style lang="scss" scoped>
+page,
+.content {
+	height:100%;
+	background-color: #ffffff;
+}
+.viptag{
+	position: absolute;
+	right: 0;
+	color: #FFFFFF;
+	top: 0;
+	background: linear-gradient(580deg, #31b968 50%, transparent 50%);
+	font-size: 24upx;
+	text-align: right;
+	width: 50upx;
+	height: 50upx;
+
+}
+.foot {
+	position: fixed;
+	bottom: 60upx;
+	height: 90upx;
+	left: 10upx;
+	width: 100%;
+}
+.foot .cart {
+	width: 180upx;
+	height: 90upx;
+	line-height: 90upx;
+	text-align: center;
+}
+.content {
+	display: flex;
+}
+.left-aside {
+	flex-shrink: 0;
+	width: 200upx;
+	height: 100%;
+	background-color: #f8f8f8;
+}
+.f-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100upx;
+	font-size: 28upx;
+	color: #888888;
+	position: relative;
+	&.active {
+		color: #3a3a3a;
+		background: #ffffff;
+		&:before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			height: 36upx;
+			width: 8upx;
+			background-color: red;
+			border-radius: 0 4px 4px 0;
+			opacity: 0.8;
+		}
+	}
+}
+.f-item:last-child{
+	margin-bottom: 110upx;
+}
+
+.right-aside {
+	flex: 1;
+	overflow: hidden;
+	padding-left: 20upx;
+	// padding-bottom: 100upx;
+}
+.s-list:last-child{
+	// flex: 1;
+	// overflow: hidden;
+	// padding-left: 20upx;
+	padding-bottom: 200upx;
+}
+.s-item {
+	display: flex;
+	align-items: center;
+	height: 70upx;
+	padding-top: 8upx;
+	font-size: 28upx;
+	color: #ff4444;
+}
+.t-list .t-item:last-child {
+	border: none;
+}
+.t-list {
+	/* display: flex; */
+	flex-wrap: wrap;
+	width: 100%;
+	background: #fff;
+	padding-top: 12upx;
+	&:after {
+		content: '';
+		flex: 99;
+		height: 0;
+	}
+}
+.t-item {
+	/* flex-shrink: 0; */
+	display: flex;
+	/* justify-content: center;
+		align-items: center;
+		flex-direction: column; */
+	/* width: 176upx; */
+	font-size: 26upx;
+	color: #666;
+	padding-bottom: 10upx;
+	width: 95%;
+	border-bottom: 1upx solid #f1f1f1;
+	padding-top: 10upx;
+	image {
+		width: 140upx;
+		height: 140upx;
+	}
+}
+.footName {
+	width: 70vw;
+	overflow: hidden; /*超出部分隐藏*/
+	white-space: nowrap; /*不换行*/
+	text-overflow: ellipsis; /*超出部分文字以...显示*/
+	font-weight: 600;
+}
+.checked {
+	background-color: #fff5f5;
+	border: 1upx solid #ff4444;
+	border-radius: 10upx;
+	font-size: 24upx;
+	color: #ff4444;
+}
+.noChecked {
+	background-color: #ffffff;
+	border: 1upx solid #999999;
+	border-radius: 10upx;
+	font-size: 24upx;
+}
+.member-coupon-view {
+		float: right;
+}
+.member-price-label {
+		color: #333333;
+		height: 0;
+		line-height: 30upx;
+		border-width: 0upx 10upx 30upx 0;
+		border-style: none solid solid;
+		border-color: transparent #000 #efd68f;
+		position: relative;
+		left: 10upx;
+		padding-left: 6upx;
+		border-radius: 4upx 0 0 4upx;
+		margin-left: -10upx;
+}
+.coupon-price-2 {
+		padding: 0 10upx;
+		height: 30upx;
+		line-height: 30upx;
+		border-radius: 0 4upx 4upx 0;
+}
+.member-coupon-price {
+		color: #efd68f;
+}
+</style>
diff --git a/pages/subPages2/tamplate/foodComment.vue b/pages/subPages2/tamplate/foodComment.vue
new file mode 100644
index 0000000..0a4963d
--- /dev/null
+++ b/pages/subPages2/tamplate/foodComment.vue
@@ -0,0 +1,107 @@
+<template>
+	<view class="foodComment b-f" style="padding: 30upx;padding-bottom: 100upx;">
+		<view >
+			<view class="header dis-flex">
+				<view class="f-w" style="flex: 0.3;">评价</view>
+				<view  style="flex: 0.5;"></view>
+				<view class="f-24" style="flex: 0.2;color: #999999;text-align: right;" v-if="false">
+					{{evaluateList.totalnum}}条评论
+					<text class="iconfont icon-right" style="font-size: 22upx;"></text>
+				</view>
+			</view>
+			<view class="content p-top-bom-20" style="border-bottom: 1upx solid #f1f1f1;" v-for="(item,index) in evaluateList.commentinfo" :key="index">
+				<view class="dis-flex">
+					<view  style="flex: 0.15;">
+						<image
+							style="width: 100upx;height: 100upx;border-radius: 50%;"
+							:src="item.headimg"
+							mode="aspectFill"
+						></image>
+					</view>
+					<view  style="flex: 0.6;padding: 20upx 10upx;">
+						<view class="f-28">{{item.nickname}}</view>
+						<view class="f-24" style="color: #999999;">{{item.createtime}}</view>
+					</view>
+					<view  style="flex: 0.25;padding: 4% 0;"><tui-rate :current="item.star" :disabled="true" :score="1" active="#F5D145"></tui-rate></view>
+				</view>
+				<view class="evaluate">
+					<view class="f-24" style="padding: 20upx 0;">
+						{{item.text}}
+					</view>
+					<view class="dis-flex" style="flex-wrap: wrap;">
+						<view  style="flex: 1;padding-right: 10upx;width: 31%;min-width: 31%;max-width: 31%;" v-for="(picItem,i) in item.pic" :key="i">
+							<image style="width: 100%;height: 200upx;border-radius: 15upx;" :src="picItem" mode="aspectFill" @click="lookImg(item.pic,i)"></image>
+						</view>
+					</view>
+					<view class="f-24" style="padding: 20upx 0;" v-if="item.replytextone || item.replypicone[0]">
+						<view  >
+							<text class="iconfont icon-comment" style="color: #999999; font-size: 24upx;"></text>
+							<text style="color: #999999;">商家回复:</text>
+							<text style="padding-left: 20upx;">{{item.replytextone}}</text>
+						</view>
+						<view class="dis-flex" style="flex-wrap: wrap;">
+						<view  style="flex: 1;padding-right: 10upx;width: 31%;min-width: 31%;max-width: 31%;" v-for="(replypiconeItem,i) in item.replypicone" :key="i">
+							<image style="width: 100%;height: 200upx;border-radius: 15upx;" :src="replypiconeItem" mode="aspectFill"></image>
+						</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import tuiRate from '@/components/template/rate.vue';
+export default {
+	components: {
+		tuiRate
+	},
+	data() {
+		return {
+			evaluateList:{
+				commentinfo:[]
+			},
+		};
+	},
+	mounted() {
+		
+	},
+	props:{
+		storeFoodList: {
+			type: Object,
+			default: null
+		}
+	},
+	watch:{
+		'storeFoodList': {
+			handler(newData, oldData) {
+				console.log(newData);
+				this.getEvaluateList();
+			},
+			deep: true
+		},
+	},
+	methods:{
+		lookImg(imgList,index){
+			uni.previewImage({
+				current: index,
+				urls: imgList
+			})
+		},
+		getEvaluateList(){
+			App._post_form(`&p=Goods&do=getComment&sid=${this.storeFoodList.sid}&page=${1}`, {}, res => {
+				this.setData({
+					evaluateList: res.data
+				});
+				console.log(this.evaluateList);
+			}, false, () => {
+				// _this.loadlogo = true
+			})
+		}
+	}
+};
+</script>
+
+<style></style>
diff --git a/pages/subPages2/tamplate/shopPing.vue b/pages/subPages2/tamplate/shopPing.vue
new file mode 100644
index 0000000..1366f72
--- /dev/null
+++ b/pages/subPages2/tamplate/shopPing.vue
@@ -0,0 +1,61 @@
+<template>
+	<view >
+		<view class="iconfont icon-gouwuche t-c shopping" @click="goShopping">
+			
+		</view>
+		<view class="f-28 f-w t-c shopnums" v-if="shopNum > 0">
+			{{shopNum}}
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default{
+		methods:{
+			goShopping(){
+				App.navigationTo({
+					url:'pages/subPages2/businessCenter/foodShopping/foodShopping'
+				})
+			}
+		},
+		props:{
+			shopNum: {
+				type: Number,
+				default: 0
+			}
+		},
+		watch:{
+			shopNum(newVal,oldVal){
+				console.log(newVal,'woshigouwuche');
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.shopping{
+		width: 100upx;
+		height: 100upx;
+		border-radius: 50%;
+		line-height: 100upx;
+		border: 1px solid #F1F1F1;
+		position: fixed;
+		right: 5%;
+		bottom: 25%;
+		font-size: 60upx;
+		background-color: #FF4444;
+		color: #FFFFFF;
+		font-weight: 700;
+	}
+	.shopnums{
+		position: fixed;
+		right: 5%;
+		bottom: 31%;
+		border-radius: 60upx;
+		background-color: #ffffff;
+		border: 1px solid #FF4444;
+		color: #FF4444;
+		padding: 5upx 15upx;
+	}
+</style>
diff --git a/pages/subPages2/tamplate/shoppingFixation.vue b/pages/subPages2/tamplate/shoppingFixation.vue
new file mode 100644
index 0000000..f0b8fb5
--- /dev/null
+++ b/pages/subPages2/tamplate/shoppingFixation.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="shoppingFixation" style="z-index: 1000;">
+		<view class="settleAccounts" style="z-index: 1000;">
+			<view style="flex: 4;" class="dis-flex">
+				<view style="flex: 1;position: relative;">
+					<view class="shopping iconfont icon-gouwuche" :style="{'backgroundColor':(count>0 && is_business !== 0)?'#ff4444':'#666666'}" @click="pops"></view>
+					<view class="commodity" v-if="count > 0 && is_business !== 0">
+						{{count}}
+					</view>
+				</view>
+				<view style="flex: 3;padding: 28upx 20upx;box-sizing: border-box;">
+					<text class="dis-il-block f-34 f-w" :style="{'color':(count>0 && is_business !== 0)?'#ff4444':'#666666'}">
+						¥{{totalPrices.toFixed(2)}}
+						<text class="dis-il-block" v-if="deliveryprice !== 0 && (count>0 && is_business !== 0)">
+							<text class="f-20" style="padding-left: 60upx;color: #6f6f6f;">{{packing}}:</text><text class="c-ff4444 f-20" style="padding-left: 10upx;">¥{{deliveryprice}}</text>
+						</text>
+					</text>
+					
+					<!-- <text class="dis-il-block f-24" style="text-decoration:line-through;color: #999999;padding-left: 10upx;" v-if="false">
+						¥125.00
+					</text> -->
+				</view>
+				
+			</view>
+			<view class="close" :style="{'backgroundColor':(count>0 && is_business !== 0)?'#17D117':'#666666'}" @click="goShopping">
+				{{(is_business == 0)?'休息中':(languageStatus!=1?'去结算':'결재하기')}}
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	
+	export default{
+		data(){
+			return{
+				totalPrices:0,
+				count:0,
+				total:[],
+				numberAndPricea:null,
+				show:false,
+				poststat:false,
+				deliveryprice:0,
+				packing:'包装费'
+			}
+		},
+		mounted() {
+			let _this = this;
+			_this.packing = _this.languageStatus  !=1?'包装费':'포장비용'
+			this.getShopNum();
+			// debugger
+			  uni.$on('STOREPRICES',function(data){
+				  if(this.poststat){
+				  	return
+				  }
+				  // debugger
+					_this.getShopNum();
+					
+				})
+				
+		},
+		onUnload() {
+			uni.$off('STOREPRICES')
+		},
+		computed:{
+		},
+		props:{
+			num: {
+				type: Number,
+				default: null
+			},
+			sid: {
+				default: null
+			},
+			is_business: {
+				default: null
+			}
+		},
+		watch:{
+			'numberAndPricea': {
+				handler(newData, oldData) {
+					console.log(newData)
+					
+				},
+				deep: true
+			},
+			'num': {
+				handler(newData, oldData) {
+					console.log(newData)
+					this.getShopNum();
+				},
+				deep: true
+			}
+		},
+		methods:{
+			// 下弹窗
+			pops(){
+				App._post_form(
+					`&p=citydelivery&do=cartinfo`,
+					{},
+					res => {
+						this.totalPrices = 0;
+						this.count = 0;
+						 let stotal = res.data.list;
+						 stotal.map(item=>{
+							 if(item.sid == this.sid){
+								 this.total = item;
+								 this.packing = item.bzftext;
+								 this.packing = this.languageStatus  !=1?item.bzftext:'포장비용'
+								 this.totalPrices = item.cartinfo.totalmoney;
+								 this.deliveryprice = item.cartinfo.deliveryprice;
+								 this.count = item.cartinfo.totalnum;
+								 this.$emit('onShows',item);
+							 };
+						 })
+					},
+					false,
+					() => {
+						// _this.loadlogo = true
+					}
+				);
+				
+			},
+			getShopNum(){
+				
+				this.poststat = true;
+				App._post_form(
+					`&p=citydelivery&do=cartinfo`,
+					{},
+					res => {
+						this.totalPrices = 0;
+						this.count = 0;
+						 let stotal = res.data.list;
+						 stotal.map(item=>{
+							 if(item.sid == this.sid){
+								 this.total = item;
+								 this.totalPrices = item.cartinfo.totalmoney;
+								 this.deliveryprice = item.cartinfo.deliveryprice;
+								 this.count = item.cartinfo.totalnum;
+							 };
+						 })
+						 uni.$emit('end','aa');
+						 setTimeout(()=>{
+							 this.poststat = false;
+						 },500);
+					},
+					false,
+					() => {
+						// _this.loadlogo = true
+					}
+				);
+			},
+			goShopping(){
+				if(this.is_business == 0){
+					return
+				}
+				// debugger
+				if(this.count){
+					App.navigationTo({
+						url:'pages/subPages2/businessCenter/foodOrder/foodOrder?id=' + this.sid
+					})
+					
+					// uni.navigateTo({
+					// 	url:'/pages/subPages2/businessCenter/foodOrder/foodOrder?item=' + encodeURIComponent(JSON.stringify(res.data)) + '&routers=foodShopping&param=' + param
+					// })
+				}else{
+					uni.showToast({
+					    title: '请选择要购买的商品',
+					    duration: 2000,
+						icon:'none'
+					});
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.close{
+		flex: 2;
+		background-color: #17D117;
+		color: #FFFFFF;
+		text-align: center;
+		line-height: 100upx;
+	}
+	.settleAccounts{
+		height: 100upx;
+		width: 100%;
+		position: fixed;
+		bottom: 0;
+		border-top: 1upx solid #ECECEC;
+		background-color: #FFFFFF;
+		display: flex;
+		.shopping{
+			display: inline-block;
+			border-radius: 15upx;
+			color: #FFFFFF;
+			font-size: 44upx;
+			font-weight: 700;
+			padding: 15upx 20upx;
+			position: absolute;
+			right: 0;
+			top: -20%;
+		}
+		.commodity{
+			border-radius: 60rpx;
+			background-color: #FF4444;
+			color: #FFFFFF;
+			border: 1rpx solid #FFFFFF;
+			position: absolute;
+			right: -15%;
+			top: -37%;
+			text-align: center;
+			font-size: 26rpx;
+			padding: 5rpx 15rpx;
+		}
+	}
+</style>
diff --git a/pages/subPages2/tamplate/uni-icons/icons.js b/pages/subPages2/tamplate/uni-icons/icons.js
new file mode 100644
index 0000000..1f5a778
--- /dev/null
+++ b/pages/subPages2/tamplate/uni-icons/icons.js
@@ -0,0 +1,96 @@
+export default {
+	'contact': '\ue100',
+	'person': '\ue101',
+	'personadd': '\ue102',
+	'contact-filled': '\ue130',
+	'person-filled': '\ue131',
+	'personadd-filled': '\ue132',
+	'phone': '\ue200',
+	'email': '\ue201',
+	'chatbubble': '\ue202',
+	'chatboxes': '\ue203',
+	'phone-filled': '\ue230',
+	'email-filled': '\ue231',
+	'chatbubble-filled': '\ue232',
+	'chatboxes-filled': '\ue233',
+	'weibo': '\ue260',
+	'weixin': '\ue261',
+	'pengyouquan': '\ue262',
+	'chat': '\ue263',
+	'qq': '\ue264',
+	'videocam': '\ue300',
+	'camera': '\ue301',
+	'mic': '\ue302',
+	'location': '\ue303',
+	'mic-filled': '\ue332',
+	'speech': '\ue332',
+	'location-filled': '\ue333',
+	'micoff': '\ue360',
+	'image': '\ue363',
+	'map': '\ue364',
+	'compose': '\ue400',
+	'trash': '\ue401',
+	'upload': '\ue402',
+	'download': '\ue403',
+	'close': '\ue404',
+	'redo': '\ue405',
+	'undo': '\ue406',
+	'refresh': '\ue407',
+	'star': '\ue408',
+	'plus': '\ue409',
+	'minus': '\ue410',
+	'circle': '\ue411',
+	'checkbox': '\ue411',
+	'close-filled': '\ue434',
+	'clear': '\ue434',
+	'refresh-filled': '\ue437',
+	'star-filled': '\ue438',
+	'plus-filled': '\ue439',
+	'minus-filled': '\ue440',
+	'circle-filled': '\ue441',
+	'checkbox-filled': '\ue442',
+	'closeempty': '\ue460',
+	'refreshempty': '\ue461',
+	'reload': '\ue462',
+	'starhalf': '\ue463',
+	'spinner': '\ue464',
+	'spinner-cycle': '\ue465',
+	'search': '\ue466',
+	'plusempty': '\ue468',
+	'forward': '\ue470',
+	'back': '\ue471',
+	'left-nav': '\ue471',
+	'checkmarkempty': '\ue472',
+	'home': '\ue500',
+	'navigate': '\ue501',
+	'gear': '\ue502',
+	'paperplane': '\ue503',
+	'info': '\ue504',
+	'help': '\ue505',
+	'locked': '\ue506',
+	'more': '\ue507',
+	'flag': '\ue508',
+	'home-filled': '\ue530',
+	'gear-filled': '\ue532',
+	'info-filled': '\ue534',
+	'help-filled': '\ue535',
+	'more-filled': '\ue537',
+	'settings': '\ue560',
+	'list': '\ue562',
+	'bars': '\ue563',
+	'loop': '\ue565',
+	'paperclip': '\ue567',
+	'eye': '\ue568',
+	'arrowup': '\ue580',
+	'arrowdown': '\ue581',
+	'arrowleft': '\ue582',
+	'arrowright': '\ue583',
+	'arrowthinup': '\ue584',
+	'arrowthindown': '\ue585',
+	'arrowthinleft': '\ue586',
+	'arrowthinright': '\ue587',
+	'pulldown': '\ue588',
+	'closefill': '\ue589',
+	'sound': '\ue590',
+	'scan': '\ue612'
+}
diff --git a/pages/subPages2/tamplate/uni-icons/uni-icons.vue b/pages/subPages2/tamplate/uni-icons/uni-icons.vue
new file mode 100644
index 0000000..9ff4ea5
--- /dev/null
+++ b/pages/subPages2/tamplate/uni-icons/uni-icons.vue
@@ -0,0 +1,35 @@
+<template>
+	<text :style="{ color: color, 'font-size': size + 'px'}" class="iconfont icon-check" @click="_onClick"></text>
+</template>
+
+<script>
+	export default {
+		name: 'UniIcons',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			}
+		},
+		data() {
+			return {
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/pages/subPages2/userInfo/userInfo.vue b/pages/subPages2/userInfo/userInfo.vue
new file mode 100644
index 0000000..eda6c71
--- /dev/null
+++ b/pages/subPages2/userInfo/userInfo.vue
@@ -0,0 +1,214 @@
+<template>
+	<view class="userInfo">
+		<scroll-view :scroll-y="true" :style="{ height: phoneHight }">
+			<view class="p30">
+				<image :src="imgfixUrls + 'merchant/ts.png'" class="tspng verCenter"></image>
+				<span class="font24 color666666 verCenter pL18">{{languageStatus!=1?'请填写真实有效的信息！':'진실유효된 정보를 입력하세요'}}</span>
+			</view>
+			<view class="backColorW backColorW">
+				<span class="font28 color333333 verCenter pL30 width148 disInline ">{{languageStatus!=1?'姓名':'성명'}}：</span>
+				<input placeholder="请输入姓名" class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.realname"/>
+			</view>
+			<view class="inputView backColorW" v-if="userInfo.bankstatus == 1 || userInfo.alipaystatus == 1">
+				<view class="backColorW marT20 height108" v-if="userInfo.bankstatus == 1">
+					<span class="font28 color333333 verCenter pL30 width148 disInline ">{{examineing == 0?(languageStatus!=1?'开户行':'개설은행'):'备注信息1'}}：</span>
+					<input :placeholder="examineing == 0?(languageStatus!=1?'请输入银行卡开户行':'개설은행명칭을 입력하세요'):'请输入备注信息1'" class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.bank_name"/>
+					<view class="Bottline"></view>
+				</view>
+				<view class="backColorW height108" v-if="userInfo.bankstatus == 1">
+					<span class="font28 color333333 verCenter pL30 width148 disInline ">{{examineing == 0?(languageStatus!=1?'开户人':'예금주 '):'备注信息2'}}：</span>
+					<input :placeholder="examineing == 0?(languageStatus!=1?'请输入银行卡开户行人姓名':'예금주 이름을 입력하세요'):'请输入备注信息2'"  class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.bank_username"/>
+					<view class="Bottline"></view>
+				</view>
+				<view class="backColorW height108" v-if="userInfo.bankstatus == 1">
+					<span class="font28 color333333 verCenter pL30 width148 disInline ">{{examineing == 0?(languageStatus!=1?'银行卡账号':'은행카드 계좌번호'):'备注信息3'}}：</span>
+					<input type="number" :placeholder="examineing == 0?(languageStatus!=1?'请输入银行卡账号':'은행카드 계좌번호를 입력하세요'):'请输入备注信息3'" class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.card_number"/>
+					<view class="Bottline"></view>
+				</view>
+				<view class="backColorW height108" v-if="userInfo.alipaystatus == 1">
+					<span class="font28 color333333 verCenter pL30 width148 disInline ">{{examineing == 0?(languageStatus!=1?'支付宝账号':'즈푸보 계좌번호'):'备注信息4'}}：</span>
+					<input :placeholder="examineing == 0?(languageStatus!=1?'请输入支付宝账号':'계좌번호를 입력하세요'):'请输入备注信息4'"  class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.alipay"/>
+					<view class="Bottline"></view>
+				</view>
+				<!-- <view class="backColorW height108">
+					<span class="font28 color333333 verCenter pL30 width148 disInline ">{{examineing == 0?'支付密码':'备注信息5'}}：</span>
+					<input :placeholder="examineing == 0?'请输入支付密码':'请输入备注信息4'"  class="font28 height107 color333333 verCenter disInline pL30" v-model="userInfo.integralpwd"/>
+					<view class="Bottline"></view>
+				</view> -->
+				<view class="submitBotton marT80 textC" @click="setUserInfo">
+					<span class="line96 font30 colorW">{{languageStatus!=1?'保存':'저장'}}</span>
+				</view>
+			</view>
+			<!-- <view class="inputView backColorW" v-else>
+				
+				<view class="submitBotton marT80 textC" @click="setUserInfo">
+					<span class="line96 font30 colorW">保存</span>
+				</view>
+			</view> -->
+		</scroll-view>
+		<far-bottom></far-bottom>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js'	
+	
+export default {
+	data() {
+		return {
+			phoneHight: null,
+			userInfo:{},
+			examineing:1
+		};
+	},
+	onLoad(e) {
+		let _this = this;
+		let TextSubstitution = uni.getStorageSync('TextSubstitution');
+		_this.examineing = TextSubstitution.examineing || 0;
+		_this.init();
+	},
+	methods: {
+		init() {
+			let _this = this;
+			uni.getSystemInfo({
+				success(res) {
+					_this.phoneHight = res.windowHeight + 'px';
+				}
+			});
+			_this.getUserInfo();
+		},
+		// 修改个人信息
+		getUserInfo(){
+			let _this=this
+			let data={
+				type:'get',
+			}
+			
+			App._post_form('&p=member&do=setUserInfo',data,res=>{
+				_this.userInfo=res.data
+				// _this.userInfo.bankstatus = 1;
+				// _this.userInfo.alipaystatus = 1;
+			})
+		},
+		setUserInfo(){
+			let _this=this
+			let data={
+				type:'set',
+				realname:_this.userInfo.realname,
+				bank_name:_this.userInfo.bank_name,
+				card_number:_this.userInfo.card_number,
+				bank_username:_this.userInfo.bank_username,
+				alipay:_this.userInfo.alipay
+			}
+			if(_this.userInfo.realname=='' && _this.examineing == 0){
+				uni.showToast({
+					icon:"none",
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return;
+			}
+			if((_this.userInfo.card_number.length < 13 || _this.userInfo.card_number.length > 25) && _this.examineing == 0) {
+				uni.showToast({
+					icon:"none",
+				    title: '请输入正确银行卡号',
+				    duration: 2000
+				});
+				return;
+			}
+			App._post_form('&p=member&do=setUserInfo',data,res=>{
+				uni.navigateBack({
+				    delta: 1
+				});
+			})
+		}
+	}
+};
+</script>
+
+<style lang="less">
+.userInfo {
+	background: #f8f8f8;
+	font-size: 0;
+}
+.inputView {
+	height: 890upx;
+}
+.tspng {
+	width: 40upx;
+	height: 40upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.color666666 {
+	color: #666666;
+}
+.pL18 {
+	padding-left: 18upx;
+}
+.verCenter {
+	vertical-align: middle;
+}
+.p30 {
+	padding: 30upx;
+}
+.font28 {
+	font-size: 28upx;
+}
+.height107 {
+	height: 107upx;
+	width: 400upx;
+}
+.height108 {
+	height: 109upx;
+}
+.backColorW {
+	background: rgba(255, 255, 255, 1);
+}
+.color333333 {
+	color: #333333;
+}
+.disInline {
+	display: inline-block;
+}
+.pL30 {
+	padding-left: 30upx;
+}
+.width148 {
+	width: 168upx;
+}
+.textRight {
+	text-align: right;
+}
+.marT20 {
+	margin-top: 20upx;
+}
+.Bottline {
+	height: 1upx;
+	width: 690upx;
+	background: rgba(238, 238, 238, 1);
+	margin: auto;
+}
+.submitBotton{
+	width:690upx;
+	height:96upx;
+	background:rgba(255,68,68,1);
+	border-radius:10upx;
+}
+.line96{
+	line-height: 96upx;
+}
+.marT80{
+	margin: 80upx auto 0 auto;
+}
+.textC{
+	text-align: center;
+}
+.font30{
+	font-size: 30upx;
+}
+.colorW{
+	color:rgba(255,255,255,1);
+}
+</style>
diff --git a/pages/subPages2/voucherCenter/phoneOrders.vue b/pages/subPages2/voucherCenter/phoneOrders.vue
new file mode 100644
index 0000000..eb46bf6
--- /dev/null
+++ b/pages/subPages2/voucherCenter/phoneOrders.vue
@@ -0,0 +1,209 @@
+<template>
+	<view class="phoneOrders">
+		<loadlogo v-if="!loadlogo" />
+
+		<view class="vtabs">
+			<v-tabs
+				:lineScale="0.25"
+				:lineRadius="'100rpx 100rpx 0 0'"
+				:lineHeight="'8rpx'"
+				:fontSize="'32rpx'"
+				:activeFontSize="'32rpx'"
+				:bold="true"
+				:height="'100rpx'"
+				:paddingItem="'0 22rpx 20rpx'"
+				:activeColor="'#2D5FFC'"
+				:lineColor="'#2D5FFC'"
+				:color="'#999999'"
+				v-model="sort"
+				:scroll="false"
+				@change="vtabschange"
+				:tabs="arr"
+			></v-tabs>
+		</view>
+		<!-- 列表 -->
+		<view class="order-list" v-if="orderList.length > 0">
+			<view  v-for="(item, index) in orderList" :key="index">
+				<!-- <homemakingOrder ref="homemakingOrder" :orderItem="item" :hidefish="hidefish" @getoderList="getoderList" :type="type"></homemakingOrder> -->
+				<view class="order-item">
+					<view class="dis-flex">
+						<view class="order-number f-24 col-3">订单号：{{item.orderno}}</view>
+						<view class="flex-box t-r f-24" :style="{color:item.status == '1'?'#ff4444':item.status == '2'?'#23D96E':'#999999'}">{{item.status == '1'?'充值中':item.status == '2'?'已到账':'已退款'}}</view>
+					</view>
+					<view class="dis-flex orderZ">
+						<image :src="imgfixUrls + (item.operator == 1?'zgyd.png':item.operator == 2?'zglt.png':item.operator == 3?'zgdx.png':'hfcz.png')" mode="scaleToFill"></image>
+						<view class="msg">
+							<view class="title">手机话费充值卡{{item.money}}元</view>
+							<view class="tag">
+								{{item.type == '1'?'慢充':item.type == '2'?'快充':'特快充'}}
+							</view>
+							<view class="dis-flex">
+								<view class="f-36 col-f4 f-w">
+									<text class="f-24">¥</text>{{item.price}}
+								</view>
+								<view class="flex-box t-r col-9 f-24" style="line-height: 50upx;">
+									充值号：{{item.mobile}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<load-more :isMore="isMore"></load-more>
+		</view>
+		<view  v-else><image style="width: 750upx;height: 560upx;" :src="imgfixUrls + 'homemakingImg/wushuju.png'" mode=""></image></view>
+		<TabBars :tabBarAct="0" pageType=""></TabBars>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import vTabs from '@/components/v-tabs/v-tabs.vue';
+import loadMore from '@/components/template/loadmore.vue';
+import Loadlogo from '@/components/template/loadlogo.vue';
+import homemakingOrder from '@/components/template/homemakingOrder.vue';
+import TabBars from '@/components/template/tabBar.vue';
+export default {
+	data() {
+		return {
+			sort: 0,
+			page: 1,
+			orderList: [],
+			total: 1,
+			isMore: true,
+			loadlogo: false,
+			pageOne: false,
+			arr: ['全部', '充值中', '已到账', '已退款'],
+			// brr:['全部', '待服务','待评价','已完成'],
+			hidefish: 0
+		};
+	},
+	components: {
+		vTabs,
+		homemakingOrder,
+		loadMore,
+		Loadlogo,
+		TabBars
+	},
+	onLoad(e) {
+		this.type = e.type || 1;
+		this.getoderList();
+	},
+	onShow() {
+		if (!this.pageOne) return;
+		this.getoderList(false, 1);
+	},
+	onReachBottom() {
+		if (this.total == this.page) return;
+		this.page++;
+		this.isMore = false;
+		this.getoderList(true, this.page);
+	},
+	methods: {
+		getoderList(flag, page) {
+			let _this = this;
+			let data = {
+				page: page || this.page,
+				status: this.sort
+			};
+			let url = '&p=mobilerecharge&do=mrechargeOrderList';
+			App._post_form(
+				url,
+				data,
+				res => {
+					if (flag) {
+						_this.isMore = true;
+						_this.orderList = _this.orderList.concat(res.data.list);
+						// _this.orderList.map(item => {
+						// 	item.type = _this.type;
+						// });
+						if (page == _this.page && page) return;//判断是否为onshow页面的数据加载
+						// debugger
+						let pages = page + 1;
+						_this.getoderList(true, pages);
+					} else {
+						console.log(res);
+						_this.orderList = res.data.list;
+						_this.total = res.data.total;
+						_this.pageOne = true;
+						// _this.orderList.map(item => {
+						// 	item.type = _this.type;
+						// });
+						if (page == _this.page || !page) return;
+						_this.getoderList(true, page++);
+					}
+					// _this.hidefish = res.data.hidefish;
+				},
+				false,
+				() => {
+					this.loadlogo = true;
+				}
+			);
+		},
+		vtabschange(e) {
+			console.log(e);
+			this.sort = e;
+			this.page = 1;
+			this.getoderList();
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.phoneOrders {
+	padding-bottom: 130upx;
+	.order-list {
+		padding: 30upx;
+		.order-item {
+			background-color: #ffffff;
+			border-radius: 20upx;
+			padding: 30upx;
+			margin-bottom: 20upx;
+			.orderZ {
+				padding-top: 30upx;
+				image {
+					width: 200upx;
+					height: 200upx;
+					border-radius: 10upx;
+				}
+				.msg {
+					padding-left: 32upx;
+					flex: 1;
+					.title {
+						font-size: 28upx;
+						font-weight: bold;
+						color: #333333;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+					.tag{
+						display: inline-block;
+						// width: 70upx;
+						padding: 0 15upx;
+						height: 34upx;
+						line-height: 34upx;
+						text-align: center;
+						border-radius: 60upx;
+						background-color: #EEEEEE;
+						color: #999999;
+						font-size: 20upx;
+						margin: 40upx 0;
+					}
+				}
+				
+			}
+		}
+	}
+}
+</style>
diff --git a/pages/subPages2/voucherCenter/voucherCenter.vue b/pages/subPages2/voucherCenter/voucherCenter.vue
new file mode 100644
index 0000000..1550c43
--- /dev/null
+++ b/pages/subPages2/voucherCenter/voucherCenter.vue
@@ -0,0 +1,435 @@
+<template>
+	<view class="voucherCenter">
+		<loadlogo v-if="!loadlogo" />
+		<view class="pageContent" v-if="loadlogo">
+			<view class="title" :style="{ width: imgstyle.width - 30 + 'px', height: imgstyle.height - 30 + 'px' }" v-if="!!swiperList && swiperList.length > 0">
+				<swiper class="swiper"  indicator-color="rgba(255,255,255,.4)" indicator-active-color="rgba(255,255,255,.85)" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
+					<swiper-item v-for="(item, index) in swiperList" :key="index" style="border-radius: 15upx;">
+						<image :src="item.thumb" style="width: 100%; height: 100%;" mode="scaleToFill"></image>
+					</swiper-item>
+				</swiper>
+				<!-- <image src="https://gimg2.baidu.com/image_search/src=http%3A%2F%2Fnimg.ws.126.net%2F%3Furl%3Dhttp%3A%2F%2Fdingyue.ws.126.net%2F2021%2F0903%2Fcebd2315p00qyv1qs003bc000hs009fm.png%26thumbnail%3D650x2147483647%26quality%3D80%26type%3Djpg&refer=http%3A%2F%2Fnimg.ws.126.net&app=2002&size=f9999,10000&q=a80&n=0&g=0n&fmt=jpeg?sec=1638425989&t=ba41b7eca9681c46067a2154454236e5" ></image> -->
+			</view>
+			<view class="dis-flex">
+				<view :class="type == 1?'checkSpeedItem':'speedItem'" @click="checkItem(1)" v-if="voucherData.slowre == 1">
+					慢充
+				</view>
+				<view :class="type == 2?'checkSpeedItem':'speedItem'" @click="checkItem(2)" v-if="voucherData.fastre == 1">
+					快充
+				</view>
+				<view :class="type == 3?'checkSpeedItem':'speedItem'" @click="checkItem(3)" v-if="voucherData.mostre == 1">
+					特快充
+				</view>
+			</view>
+			<view class="phoneInput">
+				<input type="number" class="input" maxlength="11" placeholder-style="color:#cccccc;" placeholder="请输入充值号码" v-model="phoneCrad"  />
+				<view class="f-20 col-9" style="padding: 10upx 0 0 20upx;">
+					{{type == 1?voucherData.slowtext:type == 2?voucherData.fasttext:voucherData.mosttext}}
+				</view>
+			</view>
+			<view style="position: relative;">
+				<view class="denomination dis-flex">
+					<view :class="money.money == item.money?'checkDenominaItem':'denominaItem'" v-for="(item,index) in denominaList" @click="checkPrice(item)">
+						<view class="price">
+							{{item.money}}元
+						</view>
+						<view class="onlyNeed" v-if="voucherData.vipflag == '0'">
+							只需
+						</view>
+						<view class="newPrice" v-if="voucherData.vipflag == '0'">
+							{{item.prcie}}元
+						</view>
+						<view class="onlyNeed" style="font-size: 20upx;padding: 20upx 0;" v-if="voucherData.vipflag != '0'">
+							会员价{{item.vipprice}}元
+						</view>
+						<view class="onlyNeed" style="font-size: 20upx;" v-if="voucherData.vipflag != '0'">
+							非会员价{{item.prcie}}元
+						</view>
+					</view>
+				</view>
+				<view class="denominaTiele">
+					<image :src="imgfixUrls + 'miane.png'" mode=""></image>
+					<view class="tieleText">
+						充值面额
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<view class="affirm">
+			<view class="flex-box f-50 col-f4 f-w" style="padding-left: 30upx;">
+				<text style="padding-right: 20upx;">¥</text>{{money && voucherData.vipflag != '0'?money.vipprice:money.prcie || '0'}}
+			</view>
+			<view class="recharge" @click="topUp">
+				立即充值
+			</view>
+		</view>
+		<view class="share" @click="crodShow = true">
+			<view class="iconfont icon-forward" style="font-size: 46upx;padding-top: 6upx;">
+				
+			</view>
+			分享
+		</view>
+		<view class="order" @click="goOrder">
+			<view class="iconfont icon-dingdan" style="font-size: 46upx;padding-top: 6upx;">
+				
+			</view>
+			订单
+		</view>
+		<PopManager :show="crodShow" :type="'center'" @clickmask="crodShow = false">
+			<view class="crod">
+				<image :src="voucherData.qrimg" mode=""></image>
+			</view>
+		</PopManager>
+		<follow  :followShow="followShow" :followType="followType" :followTitleShow="followTitleShow" @clickmask="openQrShow"
+		 @closeFollowPop="closeFollowPop" @closeFollowTitle="closeFollowTitle" :shareId="shareId" :followData="followData"></follow>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import Loadlogo from '@/components/template/loadlogo.vue';
+	import PopManager from '@/components/template/PopManager';
+	import follow from '@/components/template/follow.vue';
+	
+	export default{
+		data(){
+			return{
+				type:1,
+				swiperList:[],
+				voucherData:{},
+				denominaList:[],
+				money:'',
+				phoneCrad:'',
+				loadlogo:false,
+				crodShow:false,
+				imgstyle:{},
+				followShow: false,
+				followType: '0',
+				followTitleShow: true,
+				shareId: null,
+				followData:{}
+			}
+		},
+		components:{
+			Loadlogo,
+			PopManager,
+			follow
+		},
+		onLoad() {
+			this.imgstyle = uni.getStorageSync('imgstyle');
+			this.getVoucherData()
+		},
+		methods:{
+			closeFollowTitle() {
+				let _this = this
+				_this.followTitleShow = false
+			},
+			closeFollowPop() {
+				let _this = this
+				_this.followShow = false
+			},
+			openQrShow() {
+				let _this = this
+				_this.followShow = true
+			},
+			goOrder(){
+				App.navigationTo({
+					url: 'pages/subPages2/voucherCenter/phoneOrders'
+				});
+			},
+			topUp(){
+				let _this = this;
+				// 关注相关
+				if(!_this.money){
+					uni.showModal({
+						showCancel:false,
+						content:'请选择充值金额',
+						title:'温馨提示'
+					});
+					return
+				}
+				let myreg=/^[1][3,4,5,7,8,9][0-9]{9}$/;
+				if (!myreg.test(_this.phoneCrad)) {
+				    uni.showModal({
+				    	showCancel:false,
+				    	content:'请填写正确的手机号码',
+				    	title:'温馨提示'
+				    });
+				    return
+				}
+				let data = {
+					id:'',
+					type:11
+				}
+				App._post_form('&do=Follow', data, res => {
+					if (res.data.status == '1') {
+						_this.followShow = true;
+						_this.followData = res.data
+						// console.log('2');
+						// if (goodsType !== 'integral') {
+						// 	this.getGoodsDetail(_this.goods_id, _this.goodsType); 
+						// }
+						// _this.getover();
+						return false
+					}else{
+						let datas = {
+							mobile:_this.phoneCrad,
+							type:_this.type,
+							money:_this.money.money
+						}
+						App.showError(
+							`正在为号码${_this.phoneCrad}进行充值,选择充值方式为${_this.type == 1?'慢充':_this.type == 2?'快充':'特快充'},请确认号码是否无误?`,
+							data => {
+								if (data.confirm) {
+								App._post_form(
+									`&p=mobilerecharge&do=createMrechargeOrder`,
+									datas,
+									res => {
+										App.navigationTo({
+											url: 'pages/mainPages/payment/payment?orderid=' + res.data.orderid + '&plugin=mobilerecharge&types=1'
+										});
+									},
+									false,
+									() => {}
+								);
+									}
+							},
+							true
+						);
+					}
+				});
+				
+				
+				
+				
+			},
+			checkPrice(money){
+				this.money = money;
+			},
+			getVoucherData(){
+				let _this = this;
+				App._post_form(
+					`&p=mobilerecharge&do=rechargePageInfo`,
+					{},
+					res => {
+						console.log(res);
+						_this.voucherData = res.data;
+						if(res.data.slowre == '1'){
+							_this.type = 1;
+							_this.denominaList = _this.voucherData.pricediv[1];
+						}else if(res.data.fastre == '1'){
+							_this.type = 2;
+							_this.denominaList = _this.voucherData.pricediv[2];
+						}else if(res.data.mostre == '1'){
+							_this.type = 3;
+							_this.denominaList = _this.voucherData.pricediv[3];
+						}
+						// debugger
+						_this.swiperList = res.data.advs;
+						
+						_this.loadlogo = true;
+					},
+					false,
+					() => {}
+				);
+			},
+			checkItem(type){
+				if(this.type == type) return
+				this.type = type;
+				this.money = '';
+				this.denominaList = this.voucherData.pricediv[type];
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background-color: #F5F4F4;
+	}
+</style>
+<style lang="scss" scoped>
+	.voucherCenter{
+		padding-bottom: 500upx;
+		.affirm{
+			width: 100%;
+			height: 130upx;
+			background-color: #ffffff;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			display: flex;
+			line-height: 130upx;
+			.recharge{
+				width: 260upx;
+				height: 80upx;
+				line-height: 80upx;
+				text-align: center;
+				color: #ffffff;
+				background-color: #2D5FFC;
+				margin-top: 25upx;
+				margin-right: 30upx;
+				border-radius: 60upx;
+				font-size: 34upx;
+				font-weight: 600;
+			}
+		}
+		
+		.share{
+			width: 120upx;
+			height: 120upx;
+			border-radius: 50%;
+			background-color: #FA4243;
+			color: #FFFFFF;
+			text-align: center;
+			font-size: 30upx;
+			position: fixed;
+			right: 30upx;
+			bottom: 300upx;
+			// line-height: 50upx;
+		}
+		.order{
+			width: 120upx;
+			height: 120upx;
+			border-radius: 50%;
+			background-color: #2D5FFC;
+			color: #FFFFFF;
+			text-align: center;
+			font-size: 30upx;
+			position: fixed;
+			right: 30upx;
+			bottom: 150upx;
+		}
+		.crod{
+			width: 400upx;
+			height: 400upx;
+			image{
+			width: 400upx;
+			height: 400upx;	
+			}
+		}
+		.pageContent{
+			padding: 0 30upx;
+			.title{
+				padding: 80upx 0upx;
+				height: 360upx;
+				.swiper{
+					height: 100%;
+					width: 100%;
+				}
+				image{
+					width: 100%;
+					height: 360upx;
+				}
+			}
+			.speedItem{
+				flex: 1;
+				height: 90upx;
+				line-height: 90upx;
+				border: 3upx solid #EDEBEE;
+				font-size: 40upx;
+				font-weight: normal;
+				text-align: center;
+				color: #999999;
+				background-color: #ffffff;
+			}
+			.checkSpeedItem{
+				flex: 1;
+				height: 90upx;
+				line-height: 90upx;
+				border: 3upx solid #2D5FFC;
+				font-size: 40upx;
+				font-weight: normal;
+				text-align: center;
+				color: #ffffff;
+				background-color: #2D5FFC;
+			}
+			.phoneInput{
+				.input{
+					font-size: 55upx;
+					line-height: 120upx;
+					height: 120upx;
+					color: #999999;
+					padding-left: 20upx;
+					border-bottom: 4upx solid #D0D0D0;
+					padding-top: 55upx;
+				}
+			}
+			.denominaTiele{
+				position: absolute;
+				width: 210upx;
+				height: 80upx;
+				top: -50upx;
+				right: -18upx;
+				image{
+					width: 210upx;
+					height: 80upx;
+				}
+				.tieleText{
+					font-size: 34upx;
+					color: #875A19;
+					font-weight: 600;
+					position: absolute;
+					left: 0;
+					top: 0;
+					height: 60upx;
+					line-height: 60upx;
+					text-align: center;
+					width: 200upx;
+				}
+			}
+			.denomination{
+				width: 90%;
+				padding: 40upx 20upx 30upx;
+				background-color: #ffffff;
+				border-radius: 30upx;
+				margin-top: 80upx;
+				display: flex;
+				width: auto;
+				justify-content: space-between;
+				flex-wrap: wrap;
+				// width: 100%;
+				overflow: hidden;
+				.denominaItem{
+					flex: 0.32;
+					color: #999999;
+					min-width: 32%;
+					background-color: #EAEDFF;
+					border-radius: 20upx;
+					padding: 20upx 0;
+					margin-bottom: 15upx;
+					text-align: center;
+					
+				}
+				.checkDenominaItem{
+					flex: 0.32;
+					text-align: center;
+					color: #FFFFFF;
+					min-width: 32%;
+					background-color: #2D5FFC;
+					border-radius: 20upx;
+					padding: 20upx 0;
+					margin-bottom: 15upx;
+					
+				}
+				.price{
+					font-size: 46upx;
+					font-weight: bold;
+				}
+				.onlyNeed{
+					font-size: 26upx;
+				}
+				.newPrice{
+					font-size: 30upx;
+					font-weight: bold;
+				}
+			}
+			.denomination:after {
+			      content: "";
+			      flex: 0.32;
+				  min-width: 32%;
+			}
+		}
+	}
+</style>
diff --git a/pagesA/articleDetails/articleDetails.vue b/pagesA/articleDetails/articleDetails.vue
new file mode 100644
index 0000000..8b64330
--- /dev/null
+++ b/pagesA/articleDetails/articleDetails.vue
@@ -0,0 +1,230 @@
+<template>
+	<view style="padding-top: 80px;padding-bottom: 70px;">
+		<view class="status_bar"><!-- 这里是状态栏 --></view>
+		<view class="dis-flex top-nav">
+			<view class="back" @click="back"></view>
+			<view class="title">
+				文章详情
+			</view>
+			<view style="width: 40px;"></view>
+		</view>
+		<view style="padding: 20px 15px;">
+			<view style="font-weight: bold;font-size: 18px;line-height: 28px;etter-spacing: 2px;">赛道很宽、需求长远，光伏等新能源领域“就业”热!</view>
+			<view style="font-size: 14px;margin: 7px 0px;">中国光伏行业协会CPIA <text style="margin-left:10px;color: #999999;font-size: 12px;">2023-01-25 21:23</text></view>
+			<view style="color: #999999;font-size: 12px;">发表于北京</view>
+			<view class="" v-html=""></view>
+			<image src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/art_1.png" ></image>
+		</view>
+		<view style="margin-bottom: 10px;">
+			<view style="font-size: 18px;font-weight: bold;padding: 10px;color: #333;">评论</view>
+			<view style="padding: 0px 10px;color: #333;">
+				<view class="comment-item" v-for="(item) in 2">
+					<view class="dis-flex">
+						<image class="avatar2" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/index_1.png" mode=""></image>
+						<view class="name">温柔的晚风</view>
+						<view style="font-size: 12px;">赞</view>
+					</view>
+					<view style="padding-left: 38px;font-size: 14px;margin: 5px auto 10px;">小仙女的分享，必须来看看</view>
+					<view class="dis-flex" style="padding-left: 38px;">
+						<view class="comment-num">3回复</view>
+						<view style="color: #999999;font-size: 12px;">02-19 12:04:04</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="">
+			<view style="font-size: 18px;font-weight: bold;padding: 10px;color: #333;">热点推荐</view>
+			<view style="padding: 0px 10px;">
+				<view @click="toArticle" class="list-item" v-for="(item) in 3">
+					<view style="flex: 1;">
+						<view class="list-title">资金火速进场，央企板块迎来高光时刻? 一图读懂那些「高分红+连年增息」，的港股低估啊啊啊啊啊啊</view>
+						<view style="color: #999999;font-size: 12px;">人工智能那点事 13:05</view>
+					</view>
+					<image class="list-img" src="" mode=""></image>
+				</view>
+			</view>
+		</view>
+		<view class="footer-wrapper">
+			<view class="input-box">
+				<uni-icons type="" style="width: 20px;height: 20px;margin-left: 10px;background: #000;display: inline-block;"></uni-icons>
+				<input type="text" placeholder="说点什么吧？">
+			</view>
+			<view class="message1">12</view>
+			<view class="appreciate1">12</view>
+			<view class="share"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js'
+	export default {
+		data() {
+			return {
+				id: null,
+			}
+		},
+		onLoad(e) {
+			this.id = e.id;
+			this.getheadlinedl();
+		},
+		methods: {
+			back(){
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			getheadlinedl() {
+				let _this = this,
+					requestData = {
+						id
+					};
+				App._post_form('&p=headline&do=HeadlineInfo', requestData, res => {
+					if (!!res.data && res.errno === 0) {
+						console.log(res);
+						
+					}
+				}, false, () => {
+					
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.status_bar {
+	width: 100%;
+	height: var(--status-bar-height);
+	padding-bottom: 15px;
+	background-color: #fff;
+	position: fixed;
+	top: 0px;
+	z-index: 99;
+}
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.top-nav{
+	width: 100vw;
+	position: fixed;
+	top: 40px;
+	background: #fff;
+	border-bottom: 1px solid #efefef;
+	z-index: 99;
+	.back{
+		width: 40px;
+		height: 40px;
+		position: relative;
+	}
+	.back::before{
+		content: '';
+		position: absolute;
+		top: 24rpx;
+		left: 45rpx;
+		width: 10px;
+		height: 10px;
+		border-top: 2px solid transparent;
+		border-left: 2px solid #333;
+		border-right: 2px solid transparent;
+		border-bottom: 2px solid #333;
+		transform: rotate(45deg);
+	}
+	.title{
+		text-align: center;
+		flex: 1;
+	}
+}
+image{
+	width: calc(100vw - 30px);
+	height: 500rpx;
+	
+}
+.comment-item{
+	padding: 10px 0px;
+	border-bottom: 1px solid #efefef;
+	.avatar2{
+		width: 30px;
+		height: 30px;
+		background-color: #000;
+		border-radius: 50%;
+		margin-right: 8px;
+	}
+	.name{
+		font-size: 13px;
+		flex: 1;
+	}
+	.comment-num{
+		padding: 2px 8px;
+		border-radius: 20px;
+		background-color: #efefef;
+		margin-right: 8px;
+		font-size: 13px;
+	}
+}
+.list-item{
+	display: flex;
+	justify-content: space-between;
+	border-bottom: 1px solid #efefef;
+	padding: 10px 4px;
+	.list-title{
+		display:-webkit-box;//将盒子转换为弹性盒子
+		-webkit-box-orient:vertical;//文本显示方式，默认水平
+		-webkit-line-clamp:2;//设置显示多少行
+		overflow:hidden;
+		font-size: 14px;
+		color: #333;
+		margin-bottom: 7px;
+	}
+	.list-img{
+		width: 80px;
+		height: 60px;
+		border-radius: 8px;
+		margin-left: 20px;
+		background-color: #000;
+	}
+}
+.footer-wrapper{
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	position: fixed;
+	bottom: 0;
+	z-index: 99;
+	width: 100vw;
+	height: 50px;
+	padding-bottom: 20px;
+	background-color: #FFF;
+	.input-box{
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		background: #f5f5f5;
+		border-radius: 30px;
+		width: 160px;
+		height: 36px;
+	}
+	input{
+		width: 120px;
+		font-size: 14px;
+	}
+	.message1,.appreciate1{
+		position: relative;
+	}
+	.message1::before{
+		content: '✈';
+		position: absolute;
+		top: 0;
+	}
+	.appreciate1::before{
+		content: '❤';
+	}
+	.share{
+		width: 36px;
+		height: 36px;
+		background-color: #c25959;
+		border-radius: 50%;
+	}
+}
+</style>
diff --git a/pagesA/businessCooperation/index.vue b/pagesA/businessCooperation/index.vue
new file mode 100644
index 0000000..a4c38a5
--- /dev/null
+++ b/pagesA/businessCooperation/index.vue
@@ -0,0 +1,400 @@
+<template>
+	<view class="personAttestation">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<view class="mainView">
+				<view class="informationView marginAuto">
+					<!-- 基本信息 -->
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">资料填写</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">姓名</text>
+								<input placeholder="请输入姓名/昵称" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="business.name" />
+							</view>
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">职务</text>
+								<input placeholder="请输入您的职务" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="business.position" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">联系电话</text>
+								<input placeholder="请输入您的联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="business.mobile" />
+							</view>
+							<view class="inputView marginT18" style="display: flex;align-items: center;background: #fff;">
+								<view class="inputView" style="width:">
+									<text class="colorBlack font24 verticalM">手机验证码</text>
+									<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
+									 v-model="business.code" style="width:190upx;" />
+								</view>
+								<view class="font24 verticalM marginL10"
+								 style="color: #fff;background: #509DFD;border-radius: 10rpx;line-height: 83rpx;padding: 0px 10px;flex-shrink: 0;"
+								 @click="getCode" >{{codeBtnText}}</view> 
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提交按钮 -->
+				<!-- <view class="marginT70auto textC" :class="agree == true ? 'submitButton' : 'submitButton1'" @click="setInfo"> -->
+				<view class="marginT70auto textC submitButton" @click="setInfo">
+					<text class="lineHeight80 colorW font28">提交认证申请</text>
+				</view>
+				<!-- 提交按钮 -->
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+// import popAgreement from '@/components/template/popAgreement';
+export default {
+	components: {
+		// popAgreement
+	},
+	data() {
+		return {
+			agree: false,
+			phoneHight: null,
+			show: false,
+			userInfo: {},
+			business: {
+				name: '',
+				position: '',
+				mobile: '',
+				code: '',
+				storeid: ''
+			},
+			id: null,
+			codeBtnText: '获取验证码',
+			getSmsCode: '',
+		};
+	},
+	computed: {
+		
+	},
+	onLoad(e) {
+		this.business.storeid = e.sid;
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		uni.getStorage({
+			key: 'userinfo',
+			success: async function(res) {
+				_this.init(res.data.mid);
+				_this.id = res.data.mid;
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+		},
+		// 信息设置接口
+		getInfo(mid) {
+			let _this = this;
+			let data = {
+				mid: mid
+			};
+			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+				_this.setData({
+					studInfo: res.data
+				})
+				console.log(_this.studInfo)
+			});
+		},
+		setInfo() {
+			let _this = this;
+			let data = {
+				name: _this.business.name,
+				position: _this.business.position,
+				mobile: _this.business.mobile,
+				code: _this.business.code,
+				storeid: _this.business.storeid
+			};
+			if(data.name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.position==''){
+				uni.showToast({
+					icon:'none',
+				    title: '职务不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.mobile==''){
+				uni.showToast({
+					icon:'none',
+				    title: '联系电话不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			// if(data.code==''){
+			// 	uni.showToast({
+			// 		icon:'none',
+			// 	    title: '验证码不能为空',
+			// 	    duration: 2000
+			// 	});
+			// 	return ;
+			// }
+			setTimeout(()=>{
+				App._post_form('&p=certified&do=applyMerchantCertified',data, res => {
+					if(res.errno==0){
+						uni.showToast({
+							title: res.message
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						}, 2000)
+					}
+				}, (err)=>{
+					console.log(err.data.message);
+					// uni.navigateBack({
+					// 	delta: 1
+					// })
+				}, ()=>{
+					console.log('complete');
+				});
+			})
+		},
+		// 文件上传接口
+		async uploadFiles() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(6);
+				for (let i = 0; i < res.tempFilePaths.length; i++) {
+				let aa = await App._upLoad(res.tempFilePaths[i]);
+
+				}
+				return
+			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 1,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let result = await App._MYupLoad(res.tempFilePaths[i]);
+						console.log(result.data.img, result);
+						_this.business.screenshot = result.data.img;
+						uni.showToast({
+							title: result.message
+						})
+					}
+				}
+			});
+			// #endif
+		},
+		// 获取验证码
+		getCode(){
+			if(this.codeBtnText!='获取验证码'){
+				return;
+			}
+			let _this = this;
+			if (_this.business.mobile == '' || _this.business.mobile.length !== 11) {
+				uni.showToast({
+					icon: 'none',
+					title: '请输入正确的手机号',
+					duration: 2000
+				});
+				return;
+			}
+			let data = {
+				phone: _this.business.mobile,
+				type: 2
+			};
+			App._post_form('&do=PIN', data, res => {
+				let timer_num = 60;
+				let timeClock = setInterval(function() {
+					timer_num--;
+					_this.codeBtnText = timer_num + 's后重试';
+					// _this.timeCount = timer_num;
+					if (timer_num == 0) {
+						clearInterval(timeClock);
+						_this.codeBtnText='获取验证码';
+					}
+				}, 1000);
+				_this.getSmsCode = res.data.code;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.personAttestation {
+	padding-bottom: 100upx;
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.informationView {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin-top: 10px!important;
+}
+.marginAuto {
+	margin: auto;
+}
+.mainView {
+	width: 750upx;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+.line {
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.colorBlack {
+	color: rgba(51, 51, 51, 1);
+}
+.font28 {
+	font-size: 28upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.p30 {
+	padding: 30upx;
+}
+.marginT29 {
+	margin-top: 29upx;
+}
+.inputView {
+	width: 630upx;
+	height: 83upx;
+	background: rgba(250, 250, 250, 1);
+	border-radius: 10upx;
+	> text {
+		display: inline-block;
+		line-height: 83upx;
+		width: 160upx;
+		text-align: right;
+		position: relative;
+	}
+	> text::before {
+		content: '*';
+		position: absolute;
+		top: 2px;
+		left: 6px;
+		color: #f00;
+	}
+	> input {
+		height: 100%;
+		width: 365upx;
+	}
+}
+.marginT18 {
+	margin-top: 18upx;
+}
+.marginT30auto {
+	margin: 30upx auto 0 auto;
+}
+.p0p50 {
+	padding: 0 50upx;
+}
+.uploadButton {
+	width: 160upx;
+	height: 160upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10upx;
+	border: 1px solid #e0e0e0;
+}
+.imageHave{
+	width:630upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.upLoadImg {
+	width: 48upx;
+	height: 48upx;
+	margin: 56upx auto;
+}
+.textC {
+	text-align: center;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: #509DFD;
+	border-radius: 40upx;
+}
+.marginT70auto {
+	margin: 0upx auto 70upx auto;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+</style>
diff --git a/pagesA/campusActivities/campusActivities.vue b/pagesA/campusActivities/campusActivities.vue
new file mode 100644
index 0000000..6b5204f
--- /dev/null
+++ b/pagesA/campusActivities/campusActivities.vue
@@ -0,0 +1,270 @@
+<template>
+	<view style="padding: 10px 10px 65px;">
+		<view class="content_wrapper">
+			<image :src="activitiesInfo.promotional_img" mode="widthFix" style="width: calc(100vw - 20px);"></image>
+			<view style="font-size: 18px;line-height: 30px;font-weight: bold;margin: 16px 0px;">{{activitiesInfo.title}}</view>
+			<view class="text">发布时间：{{activitiesInfo.publish_time}}</view>
+			<view class="text" v-html="activitiesInfo.describe"></view>
+		</view>
+		<view class="">
+			<view class="comment-wrapper">
+				<view style="flex: 1;">用户评价（{{activitiesInfo.evaluation_list.length}}）</view>
+				<view style="margin-right: 20px;" @click="favorite">
+					<image v-if="!activitiesInfo.is_thumbs_up" src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-grey.png" mode=""></image>
+					<image v-else src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/appreciate-red.png" mode=""></image>
+					{{activitiesInfo.thumbs_up_count}}
+				</view>
+				<view class="leave" @click="tabLeave">
+					写留言
+					<image src="https://qingyuan.xingtongworld.com/addons/weliam_smartcity/data/img/fa-comment.png"></image>
+				</view>
+			</view>
+			<view class="comment-item" v-for="(item, index) in activitiesInfo.evaluation_list" :key="index">
+				<view class="dis-flex">
+					<image class="avatar2" :src="item.avatar" mode=""></image>
+					<view class="name">{{ item.nickname }}</view>
+				</view>
+				<view style="padding-left: 38px;font-size: 14px;margin: 5px auto 10px;">{{ item.content }}</view>
+			</view>
+		</view>
+		<view class="btn-wrapper">
+			<view class="join-btn" v-if="!activitiesInfo.is_enroll" @click="join">立即报名</view>
+			<view class="join-btn" v-if="activitiesInfo.is_enroll" @click="cancelJoin">取消报名</view>
+		</view>
+		<!-- 留言弹窗 -->
+		<view style="width: 100%;height: 100%;position: fixed;top: 0;left: 0;
+		background-color: rgba(0,0,0,.3);" v-show="showLeave" @click.stop="tabLeave"></view>
+		<view class="reply-wrapper" v-show="showLeave">
+			<textarea @click.stop class="my-text" v-model="comment" name="" id="" cols="30" rows="10" placeholder="留言"></textarea>
+			<button type="primary" style="margin: 20rpx 80rpx;border-radius: 50px;" @click.stop="addComment">发送</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				mid: null,
+				id: null,
+				activitiesInfo: {
+					evaluation_list:[],
+				},
+				page: 1,
+				comment: '',
+				showLeave: false,
+			}
+		},
+		onLoad(e) {
+			let _this = this;
+			this.id = e.id;
+			this.getDetail();
+			let user_info = uni.getStorageSync('userInfo');
+			if(!user_info){
+				App._post_form('&p=member&do=memberInfo', {}, res => {
+					// uni.setStorageSync('userinfo', res.data);
+					_this.mid = res.data.mid
+				});
+			}else{
+				_this.mid = user_info.mid;
+			}
+		},
+		methods: {
+			getDetail(){
+				let _this = this;
+				App._post_form('&p=student&do=campusActivitiesFind', {id:_this.id}, res => {
+					if(_this.page===1){
+						_this.setData({
+							activitiesInfo: res.data.data
+						})
+					}else{
+						// if(res.data.data.length>0){
+						// 	let dataList = _this.dataList.concat(res.data.data);
+						// 	_this.setData({
+						// 		dataList
+						// 	})
+						// }
+					}
+				});
+			},
+			tabLeave(){
+				this.showLeave=!this.showLeave;
+			},
+			addComment(){
+				let _this = this,
+				data = {
+					mid: this.mid,
+					caid: this.id,
+					content: this.comment
+				}
+				App._post_form('&p=student&do=addEvaluation', data, res => {
+					uni.showToast({
+						title: res.message
+					})
+					_this.showLeave = false;
+					_this.comment = '';
+					_this.getDetail();
+				})
+			},
+			join(){
+				let _this = this,
+				data = {
+					caid: this.id
+				}
+				uni.showModal({
+					title: '温馨提示',
+					content: '请确认是否报名',
+					success(res) {
+						if(res.confirm){
+							App._post_form('&p=student&do=immediatelyEnrollActivities', data, res => {
+								uni.showToast({
+									title: res.message
+								})
+								_this.activitiesInfo.is_enroll = true;
+							})
+						}
+					}
+				})
+			},
+			cancelJoin(){
+				let _this = this,
+				data = {
+					caid: this.id
+				}
+				App._post_form('&p=student&do=cancelEnrollActivities', data, res => {
+					uni.showToast({
+						title: res.message
+					})
+					_this.activitiesInfo.is_enroll = false;
+				})
+			},
+			favorite(){
+				let _this = this,
+				data = {
+					caid: this.id
+				}
+				App._post_form('&p=student&do=thumbsUpActivities', data, res => {
+					uni.showToast({
+						title: res.message
+					})
+					_this.activitiesInfo.is_thumbs_up = !_this.activitiesInfo.is_thumbs_up
+					if(res.message=='点赞成功'){
+						++_this.activitiesInfo.thumbs_up_count;
+					}else if(res.message=='已取消'){
+						--_this.activitiesInfo.thumbs_up_count;
+					}
+				})
+			}
+		},
+		onReachBottom(){
+			// this.page++;
+			// this.getList();
+		}
+	}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.content_wrapper{
+	border-bottom: 1px solid #efefef;
+	.text{
+		font-size: 13px;
+		color: #999;
+		margin: 15px 0px 20px;
+	}
+	
+	// image, img, .content-picture, .nfw-cms-img{
+	// 	width: calc(100vw - 20px);
+	// }
+	rich-text{
+		/deep/img{
+			width: calc(100vw - 20px);//代码无效
+		}
+		.content-picture, .nfw-cms-img{
+			width: calc(100vw - 20px);
+		}
+	}
+}
+.comment-wrapper{
+	font-size: 18px;
+	font-weight: bold;
+	padding: 10px;
+	color: #333;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	
+	.leave{
+		padding: 0px 5px;
+	}
+	image{
+		width: 20px;
+		height: 20px;
+		vertical-align: middle;
+		margin: 0px 10rpx;
+	}
+}
+.comment-item{
+	padding: 10px 0px;
+	border-bottom: 1px solid #efefef;
+	.avatar2{
+		width: 30px;
+		height: 30px;
+		background-color: #000;
+		border-radius: 50%;
+		margin-right: 8px;
+	}
+	.name{
+		font-size: 13px;
+		flex: 1;
+	}
+	.comment-num{
+		padding: 2px 8px;
+		border-radius: 20px;
+		background-color: #efefef;
+		margin-right: 8px;
+		font-size: 13px;
+	}
+}
+.btn-wrapper{
+	width: 92vw;
+	height: 40px;
+	padding: 10px 4vw;
+	position: fixed;
+	bottom: 0px;
+	left: 0;
+	background: #FFF;
+	border-top: 1px solid #efefef;
+	.join-btn{
+		width: 92vw;
+		height: 40px;
+		border-radius: 30px;
+		color: #f00;
+		border: 1px solid #f00;
+		text-align: center;
+		line-height: 40px;
+		font-size: 16px;
+	}
+}
+.reply-wrapper{
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	width: 560rpx;
+	height: 430rpx;
+	background-color: #fff;
+	border-radius: 20px;
+	transform: translate(-50%, -50%);
+	box-shadow: 0px 0px 3px 0px rgba(0,0,0,.05);
+	
+	.my-text{
+		padding: 50rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+}
+</style>
diff --git a/pagesA/campusActivities/index.vue b/pagesA/campusActivities/index.vue
new file mode 100644
index 0000000..1b64599
--- /dev/null
+++ b/pagesA/campusActivities/index.vue
@@ -0,0 +1,101 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
+		<view class="content_wrapper">
+			<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.id)">
+				<image :src="item.promotional_img" mode="aspectFill"></image>
+				<view class="text-box">
+					<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view>
+					<!-- <view class="text" v-html="item.describe"></view> -->
+					<view class="text">{{item.publish_time}}</view>
+				</view>
+			</view>
+			<view class="" v-if="dataList.length==0">
+				<loadmore :isMore="true" v-if="dataList.length=='0'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				page: 1,
+				dataList: []
+			}
+		},
+		components: {
+			loadmore
+		},
+		onShow() {
+			this.getList();
+		},
+		methods: {
+			getList(){
+				let _this = this;
+				App._post_form('&p=student&do=campusActivitiesList', {page:_this.page, size: 10}, res => {
+					if(_this.page===1){
+						if(res.data.data.length>0){
+							_this.setData({
+								dataList: res.data.data
+							})
+						}
+					}else{
+						if(res.data.data.length>0){
+							let dataList = _this.dataList.concat(res.data.data);
+							_this.setData({
+								dataList
+							})
+						}
+					}
+				}, false, err=>{
+					
+				});
+			},
+			toDetail(id){
+				uni.navigateTo({
+					url:'/pagesA/campusActivities/campusActivities?id='+id
+				})
+			}
+		},
+		onReachBottom(){
+			this.page++;
+			this.getList();
+		}
+	}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.content_wrapper{
+	padding: 10px 15px;
+	.list-item{
+		display: flex;
+		padding: 15px 0px;
+		border-bottom: 1px solid #efefef;
+	}
+	image{
+		width: 80px;
+		height: 80px;
+		border-radius: 6px;
+		margin-right: 10px;
+	}
+	.text-box{
+		flex: 1;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+	.text{
+		display: -webkit-box;//将盒子转换为弹性盒子
		-webkit-box-orient: vertical;//文本显示方式，默认水平
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+		font-size: 13px;
+		color: #999;
+	}
+}
+</style>
diff --git a/pagesA/campusActivities/myActivities.vue b/pagesA/campusActivities/myActivities.vue
new file mode 100644
index 0000000..5ab0f8b
--- /dev/null
+++ b/pagesA/campusActivities/myActivities.vue
@@ -0,0 +1,105 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
+		<view class="content_wrapper">
+			<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.id)">
+				<image :src="item.promotional_img" mode="aspectFill"></image>
+				<view class="text-box">
+					<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view>
+					<!-- <view class="text" v-html="item.describe"></view> -->
+					<view class="text">{{item.publish_time}}</view>
+				</view>
+			</view>
+			<view class="" v-if="dataList.length==0">
+				<loadmore :isMore="true" v-if="dataList.length=='0'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				page: 1,
+				dataList: [],
+				mid:null
+			}
+		},
+		components: {
+			loadmore
+		},
+		onLoad() {
+			this.mid = uni.getStorageSync('userinfo').mid;
+		},
+		onShow(){
+			this.dataList=[];
+			this.getList();
+		},
+		methods: {
+			getList(){
+				let _this = this;
+				App._post_form('&p=student&do=campusActivitiesList', 
+					{page:_this.page, size: 10, mid: _this.mid}, res => {
+					if(_this.page===1){
+						if(res.data.data.length>0){
+							_this.setData({
+								dataList: res.data.data
+							})
+						}
+					}else{
+						if(res.data.data.length>0){
+							let dataList = _this.dataList.concat(res.data.data);
+							_this.setData({
+								dataList
+							})
+						}
+					}
+				});
+			},
+			toDetail(id){
+				uni.navigateTo({
+					url:'/pagesA/campusActivities/campusActivities?id='+id
+				})
+			}
+		},
+		onReachBottom(){
+			this.page++;
+			this.getList();
+		}
+	}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.content_wrapper{
+	padding: 10px 15px;
+	.list-item{
+		display: flex;
+		padding: 15px 0px;
+		border-bottom: 1px solid #efefef;
+	}
+	image{
+		width: 80px;
+		height: 80px;
+		border-radius: 6px;
+		margin-right: 10px;
+	}
+	.text-box{
+		flex: 1;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+	.text{
+		display: -webkit-box;//将盒子转换为弹性盒子
		-webkit-box-orient: vertical;//文本显示方式，默认水平
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+		font-size: 13px;
+		color: #999;
+	}
+}
+</style>
diff --git a/pagesA/commentSubject/commentSubject.vue b/pagesA/commentSubject/commentSubject.vue
new file mode 100644
index 0000000..3071639
--- /dev/null
+++ b/pagesA/commentSubject/commentSubject.vue
@@ -0,0 +1,139 @@
+<template>
+	<view>
+		<view class="" style="padding: 10px;">
+			<view class="dis-flex" style="padding: 10px 0px;border-bottom: 1px solid #efefef;">
+				<!-- <image src="https://qingyuan.xingtongworld.com/attachment/images/weliam_smartcity/1/167720398280232.png" mode="" style="width: 70px;height: 70px;background-color: #000;"></image> -->
+				<view style="margin-left: 10px;line-height: 24px;">
+					<view class="">#{{keyword}}#</view>
+					<view style="color: #999999;font-size: 12px;">{{communityList.length}}条内容</view>
+					<view style="color: #999999;font-size: 12px;">今日阅读量：{{communityList.length}}，今日讨论{{communityList.length}}</view>
+				</view>
+			</view>
+			<view class="conc">
+				<block v-for="(item, index) in communityList" :key="index">
+					<view @click="toDetails(item.id)" style="border-bottom: 1px solid #efefef;">
+						<pic-text :info="item"></pic-text>
+					</view>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+// 参考pages/mainPages/econdaryClassification/econdaryClassification
+import App from '@/common/js/app.js';
+import picText from "@/components/template/pic_text/pic_text.vue"
+export default {
+	data() {
+		return {
+			communityList: [],
+			page_index: 10,
+			keyword: '',
+			indexShow: -1,
+		}
+	},
+	components:{
+		picText
+	},
+	onLoad(e) {
+		this.keyword = e.keyword;
+		this.getList();
+	},
+	methods: {
+		getList(page = 1, isPage = false){
+			let _this = this;
+			let data = {
+				id: 0,//0对应掌上生活的全部类目
+				two_id: undefined,
+				page,
+				page_index: _this.page_index,
+				homeflag: 1,
+				keyword:'',
+			};
+			
+			App._post_form('&p=pocket&do=infoList', data, res => {
+				console.log(res, '--------------')
+				let list = [];
+				if (!isPage) {
+					if (res.data.list.length > 0) {
+						list = res.data.list.map(item=>{
+							let itemN = {...item}
+							itemN.comment_list.total = item.comment_list.list.length;//暂时传给组件需要(后端给的total值不对)
+							return itemN
+						})
+						list = list.sort(function(){// 乱序一下
+							return Math.random() - 0.5;
+						});
+						_this.setData({
+							communityList: list
+						})
+					} else {
+						// _this.isMore = true;
+					}
+				} else {
+					
+				};
+			});
+		},
+		lookimg(){
+			// this.isOnshow = false;
+		},
+		operationShow(e) {
+			// let _this = this;
+			// _this.indexShow = e;
+		},
+		getover(id,bor){
+			
+		},
+		// 跳转正文详情
+		toDetails(id){
+			uni.navigateTo({
+				url:"/pagesA/pictureTextDetails/pictureTextDetails?id=" + id
+			})
+		},
+	},
+	onShareAppMessage(res){
+		let _this = this;
+		if (res.from === 'button') {// 来自页面内分享按钮
+			let listId = res.target.id;
+			let title = res.target.dataset.title;
+			App._post_form('&p=pocket&do=shareNum', { id: listId }, res => {
+				for(let index=0;index<_this.communityList.length;index++){
+					if(_this.communityList[index].id == listId){
+						_this.communityList[index].share++;
+					}
+				}
+				setTimeout(()=>{
+					uni.showToast({
+						icon: 'none',
+						title: '分享成功',
+						duration: 2000
+					});
+				}, 2000)
+			});
+			return {
+				title: '粤职才',
+				path: '/pagesA/pictureTextDetails/pictureTextDetails?id='+listId
+			}
+		}else{
+			return {
+				title: '粤职才',
+				path: '/pages/mainPages/index/index'
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.conc{
+	image{
+		width: calc(100vw - 20px);
+	}
+}
+</style>
diff --git a/pagesA/follow_fans/fans.vue b/pagesA/follow_fans/fans.vue
new file mode 100644
index 0000000..89a8e27
--- /dev/null
+++ b/pagesA/follow_fans/fans.vue
@@ -0,0 +1,88 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;padding-top: 20px;box-sizing: border-box;">
+		<view style="padding: 0px 15px;">
+			<view class="list-item" v-for="(item,index) in listData" :key="index">
+				<image :src="item.avatar" mode="" style="width: 40px;height: 40px;border-radius: 50%;" @click="goHomePage(item.fans_mid)"></image>
+				<view class="txt">
+					{{item.nickname}}
+				</view>
+			</view>
+			<view class="" v-if="listData.length==0">
+				<loadmore :isMore="true" v-if="listData.length=='0'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				listData: [],
+				myName: '',
+				keyword: '',
+				mid: '',
+			}
+		},
+		components: {
+			loadmore
+		},
+		onLoad(e){
+			// this.myName = uni.getStorageSync('userinfo').nickname;
+			this.mid = e.id;
+			this.getFans();
+		},
+		methods: {
+			getFans(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						name: this.keyword,
+						mid: this.mid
+					};
+				App._post_form('&p=member&do=getFansUserList', requestData, res => {
+					_this.listData = res.data.data;
+				}, false, () => {
+					
+				})
+			},
+			goHomePage(id){
+				if (id > 0) {
+					App.navigationTo({
+						url: 'pages/subPages/homepage/homepage/homepage?mid=' + id + '&checkType=' + 1
+					});
+				}
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.list-item{
+	display: flex;
+	align-items: flex-start;
+	line-height: 26px;
+	margin-bottom: 10px;
+	padding-right: 10px;
+	padding-bottom: 8px;
+	border-bottom: 1px solid #efefef;
+	
+	image{
+		margin-right: 5px;
+		color: #999;
+		font-size: 13px;
+	}
+	.txt{
+		display:-webkit-box;//将盒子转换为弹性盒子
+		-webkit-box-orient:vertical;//文本显示方式，默认水平
+		-webkit-line-clamp:2;//设置显示多少行
+		overflow:hidden;
+	}
+}
+</style>
diff --git a/pagesA/follow_fans/follow.vue b/pagesA/follow_fans/follow.vue
new file mode 100644
index 0000000..59cbbe7
--- /dev/null
+++ b/pagesA/follow_fans/follow.vue
@@ -0,0 +1,87 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;padding-top: 20px;box-sizing: border-box;">
+		<view style="padding: 0px 15px;">
+			<view class="list-item" v-for="(item,index) in listData" :key="index">
+				<image :src="item.avatar" mode="" style="width: 40px;height: 40px;border-radius: 50%;" @click="goHomePage(item.interest_mid)"></image>
+				<view class="txt">
+					{{item.nickname}}
+				</view>
+			</view>
+			<view class="" v-if="listData.length==0">
+				<loadmore :isMore="true" v-if="listData.length=='0'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				listData: [],
+				myName: '',
+				keyword: '',
+				mid: '',
+			}
+		},
+		components: {
+			loadmore
+		},
+		onLoad(e){
+			// this.myName = uni.getStorageSync('userinfo').nickname;
+			this.mid = e.id;
+			this.getFollow();
+		},
+		methods: {
+			getFollow(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						name: this.keyword,
+						mid: this.mid
+					};
+				App._post_form('&p=member&do=getInterestUserList', requestData, res => {
+					_this.listData = res.data.data;
+				}, false, () => {
+					
+				})
+			},
+			goHomePage(id){
+				if (id > 0) {
+					App.navigationTo({
+						url: 'pages/subPages/homepage/homepage/homepage?mid=' + id + '&checkType=' + 1
+					});
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.list-item{
+	display: flex;
+	align-items: flex-start;
+	line-height: 26px;
+	margin-bottom: 10px;
+	padding-right: 10px;
+	padding-bottom: 8px;
+	border-bottom: 1px solid #efefef;
+	
+	image{
+		margin-right: 5px;
+		color: #999;
+		font-size: 13px;
+	}
+	.txt{
+		display:-webkit-box;//将盒子转换为弹性盒子
+		-webkit-box-orient:vertical;//文本显示方式，默认水平
+		-webkit-line-clamp:2;//设置显示多少行
+		overflow:hidden;
+	}
+}
+</style>
diff --git a/pagesA/identityList/bloggerCertification.vue b/pagesA/identityList/bloggerCertification.vue
new file mode 100644
index 0000000..3423639
--- /dev/null
+++ b/pagesA/identityList/bloggerCertification.vue
@@ -0,0 +1,401 @@
+<template>
+	<view class="personAttestation">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<view class="mainView">
+				<view class="informationView marginAuto">
+					<!-- 基本信息 -->
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">博主信息</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">姓名/昵称</text>
+								<input placeholder="请输入姓名/昵称" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="bloggerInfo.name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">联系电话</text>
+								<input placeholder="请输入您的联系电话" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="bloggerInfo.mobile" />
+							</view>
+							<view class="inputView marginT18" style="display: flex;align-items: center;background: #fff;">
+								<view class="inputView" style="width:">
+									<text class="colorBlack font24 verticalM">手机验证码</text>
+									<input placeholder="请输入验证码" class="colorBlack font24 inlineBlock verticalM p0p50"
+									 v-model="bloggerInfo.code" style="width:190upx;" />
+								</view>
+								<view class="colorBlack font24 verticalM marginL10"
+								 style="background: #fafafa;border-radius: 10rpx;line-height: 83rpx;padding: 0px 10px;flex-shrink: 0;"
+								 @click="getCode" >{{codeBtnText}}</view> 
+							</view>
+						</view>
+					</view>
+					<!-- 上传证件 -->
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">其他平台粉丝截图</text>
+						</view>
+						<view class="marginT29 flex">
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="bloggerInfo.screenshot == '' || bloggerInfo.screenshot == undefined">
+								<image src="../../static/mb-plus.png" class="upLoadImg"></image>
+							</view>
+							<view class="inlineBlock textC" v-else @click="uploadFiles()">
+								<image :src="bloggerInfo.screenshot" class="imageHave" mode="aspectFit"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提交按钮 -->
+				<!-- <view class="marginT70auto textC" :class="agree == true ? 'submitButton' : 'submitButton1'" @click="setInfo"> -->
+				<view class="marginT70auto textC submitButton" @click="setInfo">
+					<text class="lineHeight80 colorW font28">提交认证申请</text>
+				</view>
+				<!-- 提交按钮 -->
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+// import popAgreement from '@/components/template/popAgreement';
+export default {
+	components: {
+		// popAgreement
+	},
+	data() {
+		return {
+			agree: false,
+			phoneHight: null,
+			show: false,
+			userInfo: {},
+			bloggerInfo: {
+				name:'',
+				mobile:'',
+				code:'',
+				screenshot:''
+			},
+			id: null,
+			codeBtnText: '获取验证码',
+			getSmsCode: '',
+		};
+	},
+	computed: {
+		
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		uni.getStorage({
+			key: 'userinfo',
+			success: async function(res) {
+				_this.init(res.data.mid);
+				_this.id = res.data.mid;
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+		},
+		// 信息设置接口
+		getInfo(mid) {
+			let _this = this;
+			let data = {
+				mid: mid
+			};
+			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+				_this.setData({
+					studInfo: res.data
+				})
+				console.log(_this.studInfo)
+			});
+		},
+		setInfo() {
+			let _this = this;
+			let data = {
+				name: _this.bloggerInfo.name,
+				mobile: _this.bloggerInfo.mobile,
+				code: _this.bloggerInfo.code,
+				screenshot: _this.bloggerInfo.screenshot
+			};
+			if(data.name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.mobile==''){
+				uni.showToast({
+					icon:'none',
+				    title: '联系电话不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			// if(data.code==''){
+			// 	uni.showToast({
+			// 		icon:'none',
+			// 	    title: '验证码不能为空',
+			// 	    duration: 2000
+			// 	});
+			// 	return ;
+			// }
+			if(data.documents==''){
+				uni.showToast({
+					icon:'none',
+				    title: '请上传截图',
+				    duration: 2000
+				});
+				return ;
+			}
+			setTimeout(()=>{
+				App._post_form('&p=certified&do=applyBloggerCertified',data, res => {
+					if(res.errno==0){
+						uni.showToast({
+							title: res.message
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						}, 2000)
+					}
+				});
+			})
+		},
+		// 文件上传接口
+		async uploadFiles() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(6);
+				for (let i = 0; i < res.tempFilePaths.length; i++) {
+				let aa = await App._upLoad(res.tempFilePaths[i]);
+
+				}
+				return
+			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 1,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let result = await App._MYupLoad(res.tempFilePaths[i]);
+						console.log(result.data.img, result);
+						_this.bloggerInfo.screenshot = result.data.img;
+						uni.showToast({
+							title: result.message
+						})
+					}
+				}
+			});
+			// #endif
+		},
+		// 获取验证码
+		getCode(){
+			if(this.codeBtnText!='获取验证码'){
+				return;
+			}
+			let _this = this;
+			if (_this.bloggerInfo.mobile == '' || _this.bloggerInfo.mobile.length !== 11) {
+				uni.showToast({
+					icon: 'none',
+					title: '请输入正确的手机号',
+					duration: 2000
+				});
+				return;
+			}
+			let data = {
+				phone: _this.bloggerInfo.mobile,
+				type: 2
+			};
+			App._post_form('&do=PIN', data, res => {
+				let timer_num = 60;
+				let timeClock = setInterval(function() {
+					timer_num--;
+					_this.codeBtnText = timer_num + 's后重试';
+					// _this.timeCount = timer_num;
+					if (timer_num == 0) {
+						clearInterval(timeClock);
+						_this.codeBtnText='获取验证码';
+					}
+				}, 1000);
+				_this.getSmsCode = res.data.code;
+			});
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.personAttestation {
+	padding-bottom: 100upx;
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.informationView {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin-top: 10px!important;
+}
+.marginAuto {
+	margin: auto;
+}
+.mainView {
+	width: 750upx;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+.line {
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.colorBlack {
+	color: rgba(51, 51, 51, 1);
+}
+.font28 {
+	font-size: 28upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.p30 {
+	padding: 30upx;
+}
+.marginT29 {
+	margin-top: 29upx;
+}
+.inputView {
+	width: 630upx;
+	height: 83upx;
+	background: rgba(250, 250, 250, 1);
+	border-radius: 10upx;
+	> text {
+		display: inline-block;
+		line-height: 83upx;
+		width: 160upx;
+		text-align: right;
+		position: relative;
+	}
+	> text::before {
+		content: '*';
+		position: absolute;
+		top: 2px;
+		left: 6px;
+		color: #f00;
+	}
+	> input {
+		height: 100%;
+		width: 365upx;
+	}
+}
+.marginT18 {
+	margin-top: 18upx;
+}
+.marginT30auto {
+	margin: 30upx auto 0 auto;
+}
+.p0p50 {
+	padding: 0 50upx;
+}
+.uploadButton {
+	width: 160upx;
+	height: 160upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10upx;
+	border: 1px solid #e0e0e0;
+}
+.imageHave{
+	width:630upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.upLoadImg {
+	width: 48upx;
+	height: 48upx;
+	margin: 56upx auto;
+}
+.textC {
+	text-align: center;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: #509DFD;
+	border-radius: 40upx;
+}
+.marginT70auto {
+	margin: 0upx auto 70upx auto;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+</style>
diff --git a/pagesA/identityList/identityList.vue b/pagesA/identityList/identityList.vue
new file mode 100644
index 0000000..6f9aba9
--- /dev/null
+++ b/pagesA/identityList/identityList.vue
@@ -0,0 +1,112 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
+		<view class="content_wrapper">
+			<view style="color: #444;font-size: 18px;font-weight: bold;line-height: 40px;">距离完成身份还差一步</view>
+			<view style="color: #999;font-size: 12px;line-height: 20px;">
+				我们针对不同身份的您，精心准备了定制功能，请选择您的身份分类
+			</view>
+		</view>
+		<view class="content_wrapper">
+			<view v-for="(item,index) in dataList" :key="index" class="list-item" @click="toDetail(item.url)">
+				<view class="text-box">
+					<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title1}}</view>
+					<view class="text">{{item.title2}}</view>
+				</view>
+				<image :src="item.img" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				page: 1,
+				dataList: [
+					{title1:"我是学生",title2:"I am a student",img:"../../static/Learning-cuate.png", url:'/pagesA/studentIdentification/studentIdentification'},
+					{title1:"我是教师",title2:"I am a teacher",img:"../../static/Learning-pana.png", url:'/pagesA/identityList/teacherCertification'},
+					{title1:"我是企业",title2:"I am an enterprise",img:"../../static/partner-rafiki.png", url:'/pages/mainPages/Settled/Settled'},
+					{title1:"我是博主",title2:"I am a blogger",img:"../../static/Influencer-rafiki.png", url:'/pagesA/identityList/bloggerCertification'}
+				]
+			}
+		},
+		components: {
+			loadmore
+		},
+		onShow() {
+			// this.getList();
+		},
+		methods: {
+			getList(){
+				let _this = this;
+				App._post_form('&p=student&do=campusActivitiesList', {page:_this.page, size: 10}, res => {
+					if(_this.page===1){
+						if(res.data.data.length>0){
+							_this.setData({
+								dataList: res.data.data
+							})
+						}
+					}else{
+						if(res.data.data.length>0){
+							let dataList = _this.dataList.concat(res.data.data);
+							_this.setData({
+								dataList
+							})
+						}
+					}
+				}, false, err=>{
+					
+				});
+			},
+			toDetail(url){
+				uni.navigateTo({
+					url:url
+				})
+			}
+		},
+		onReachBottom(){
+			this.page++;
+			this.getList();
+		}
+	}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.content_wrapper{
+	padding: 10px 20px;
+	.list-item{
+		display: flex;
+		padding: 0px 15px;
+		border-bottom: 1px solid #efefef;
+		box-shadow: 0px 0px 2px 2px rgba(0, 0, 0, .05);
+		margin-bottom: 40upx;
+		border-radius: 10upx;
+	}
+	image{
+		width: 180upx;
+		height: 180upx;
+		border-radius: 0upx;
+		margin: 0px 0px 0px 10px;
+	}
+	.text-box{
+		flex: 1;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		line-height: 20px;
+	}
+	.text{
+		display: -webkit-box;//将盒子转换为弹性盒子
		-webkit-box-orient: vertical;//文本显示方式，默认水平
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+		font-size: 13px;
+		color: #999;
+	}
+}
+</style>
diff --git a/pagesA/identityList/teacherCertification.vue b/pagesA/identityList/teacherCertification.vue
new file mode 100644
index 0000000..68a7624
--- /dev/null
+++ b/pagesA/identityList/teacherCertification.vue
@@ -0,0 +1,376 @@
+<template>
+	<view class="personAttestation">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<view class="mainView">
+				<view class="informationView marginAuto">
+					<!-- 基本信息 -->
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">教师信息</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">姓名</text>
+								<input placeholder="请输入姓名" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="teacherInfo.name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">学校名称</text>
+								<input placeholder="请输入学校名称" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="teacherInfo.school_name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">院系</text>
+								<input placeholder="请输入所属院系" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="teacherInfo.faculty" />
+							</view>
+						</view>
+					</view>
+					<!-- 上传证件 -->
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">教师工作证件</text>
+						</view>
+						<view class="marginT29 flex">
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="teacherInfo.document_img == '' || teacherInfo.document_img == undefined">
+								<image src="../../static/mb-plus.png" class="upLoadImg"></image>
+							</view>
+							<view class="inlineBlock textC" v-else @click="uploadFiles()">
+								<image :src="teacherInfo.document_img" class="imageHave" mode="aspectFit"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+				
+				<!-- 提交按钮 -->
+				<!-- <view class="marginT70auto textC" :class="agree == true ? 'submitButton' : 'submitButton1'" @click="setInfo"> -->
+				<view class="marginT70auto textC submitButton" @click="setInfo">
+					<text class="lineHeight80 colorW font28">提交认证申请</text>
+				</view>
+				<!-- 提交按钮 -->
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+// import popAgreement from '@/components/template/popAgreement';
+export default {
+	components: {
+		// popAgreement
+	},
+	data() {
+		return {
+			agree: false,
+			phoneHight: null,
+			show: false,
+			userInfo: {},
+			teacherInfo: {
+				name:'',
+				school_name:'',
+				faculty:'',
+				document_img:''
+			},
+			id: null
+		};
+	},
+	computed: {
+		
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		uni.getStorage({
+			key: 'userinfo',
+			success: async function(res) {
+				_this.init(res.data.mid);
+				_this.id = res.data.mid;
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+		},
+		// 信息设置接口
+		getInfo(mid) {
+			let _this = this;
+			let data = {
+				mid: mid
+			};
+			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+				_this.setData({
+					studInfo: res.data
+				})
+				console.log(_this.studInfo)
+			});
+		},
+		setInfo() {
+			let _this = this;
+			let data = {
+				name: _this.teacherInfo.name,
+				school_name: _this.teacherInfo.school_name,
+				faculty: _this.teacherInfo.faculty,
+				documents: _this.teacherInfo.document_img
+			};
+			if(data.name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.school_name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '学校名称不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.faculty==''){
+				uni.showToast({
+					icon:'none',
+				    title: '院系不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(data.documents==''){
+				uni.showToast({
+					icon:'none',
+				    title: '请上传证件',
+				    duration: 2000
+				});
+				return ;
+			}
+			setTimeout(()=>{
+				App._post_form('&p=certified&do=applyTeacherCertified',data, res => {
+					if(res.errno==0){
+						uni.showToast({
+							title: res.message
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						}, 2000)
+					}
+				});
+			})
+		},
+		// 文件上传接口
+		async uploadFiles() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(6);
+				for (let i = 0; i < res.tempFilePaths.length; i++) {
+				let aa = await App._upLoad(res.tempFilePaths[i]);
+
+				}
+				return
+			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 1,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let result = await App._MYupLoad(res.tempFilePaths[i]);
+						console.log(result.data.img, result);
+						_this.teacherInfo.document_img = result.data.img;
+						uni.showToast({
+							title: result.message
+						})
+					}
+				}
+			});
+			// #endif
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		showPop() {
+			let _this = this;
+			_this.show = true;
+		},
+		changeDate(e){
+			console.log(e);
+			this.studInfo.start_date = e;
+		},
+		maskClick(){
+			
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.personAttestation {
+	padding-bottom: 100upx;
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.informationView {
+	width: 690upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin-top: 10px!important;
+}
+.marginAuto {
+	margin: auto;
+}
+.mainView {
+	width: 750upx;
+	height: 100%;
+	display: flex;
+	flex-direction: column;
+	justify-content: space-between;
+}
+.line {
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.colorBlack {
+	color: rgba(51, 51, 51, 1);
+}
+.font28 {
+	font-size: 28upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.p30 {
+	padding: 30upx;
+}
+.marginT29 {
+	margin-top: 29upx;
+}
+.inputView {
+	width: 630upx;
+	height: 83upx;
+	background: rgba(250, 250, 250, 1);
+	border-radius: 10upx;
+	> text {
+		display: inline-block;
+		line-height: 83upx;
+		width: 126upx;
+		text-align: right;
+		position: relative;
+	}
+	> text::before {
+		content: '*';
+		position: absolute;
+		top: 2px;
+		left: 6px;
+		color: #f00;
+	}
+	> input {
+		height: 100%;
+		width: 400upx;
+	}
+}
+.marginT18 {
+	margin-top: 18upx;
+}
+.marginT30auto {
+	margin: 30upx auto 0 auto;
+}
+.p0p50 {
+	padding: 0 50upx;
+}
+.uploadButton {
+	width: 160upx;
+	height: 160upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10upx;
+	border: 1px solid #e0e0e0;
+}
+.imageHave{
+	width:630upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.upLoadImg {
+	width: 48upx;
+	height: 48upx;
+	margin: 56upx auto;
+}
+.textC {
+	text-align: center;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: #509DFD;
+	border-radius: 40upx;
+}
+.marginT70auto {
+	margin: 0upx auto 70upx auto;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+</style>
diff --git a/pagesA/informationHot/informationHot.vue b/pagesA/informationHot/informationHot.vue
new file mode 100644
index 0000000..80d715b
--- /dev/null
+++ b/pagesA/informationHot/informationHot.vue
@@ -0,0 +1,115 @@
+<template>
+	<view>
+		<view style="color: #999;font-size: 12px;padding: 10px;">更新时间：{{time}}</view>
+		<view style="padding: 0px 15px;">
+			<view class="list-item" v-for="(item,index) in HeadlineData.list" :key="index" @click="toArticle(item.id)">
+				<i :style="{color:index === 0 ? '#f00' : (index === 1?'#ff8c00':(index === 2?'#ffd900':'#999'))}">{{index+1}}</i>
+				<view class="txt">
+					{{item.title}}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+	export default {
+		data() {
+			return {
+				HeadlineData: {},
+				time: null
+			}
+		},
+		onLoad(){
+			this.getHeadlineInfo();
+			this.time = this.timeFormate(new Date().getTime());
+		},
+		methods: {
+			getHeadlineInfo(page = 1, isPage = false) {
+				let _this = this,
+					requestData = {
+						page:page,
+						one_id:'',
+						two_id:'',
+						sort:1
+					};
+				App._post_form('&p=headline&do=HeadlineList', requestData, res => {
+					let HeadlineData = res.data;
+					console.log(HeadlineData)
+					_this.setData({
+						HeadlineData
+					})
+				}, false, () => {
+					
+				})
+			},
+			toArticle(id){
+				App.navigationTo({
+					url:`pages/mainPages/headline/headlineDetail?headline_id=${id}`
+				})
+			},
+			// 时间戳转年月日时分秒星期
+			timeFormate (timeStamp) {
+			      let y = new Date(timeStamp).getFullYear().toString()
+			      let M = new Date(timeStamp).getMonth() + 1 < 10 ? '0' + (new Date(timeStamp).getMonth() + 1) : new Date(timeStamp).getMonth() + 1
+			      let d = new Date(timeStamp).getDate() < 10 ? '0' + new Date(timeStamp).getDate() : new Date(timeStamp).getDate()
+			      let h = new Date(timeStamp).getHours() < 10 ? '0' + new Date(timeStamp).getHours() : new Date(timeStamp).getHours()
+			      let m = new Date(timeStamp).getMinutes() < 10 ? '0' + new Date(timeStamp).getMinutes() : new Date(timeStamp).getMinutes()
+			      let s = new Date(timeStamp).getSeconds() < 10 ? '0' + new Date(timeStamp).getSeconds() : new Date(timeStamp).getSeconds()
+			      // let w = new Date(timeStamp).getDay().toString()
+			      // switch (w) {
+			      //   case '1':
+			      //     w = '一'
+			      //     break
+			      //   case '2':
+			      //     w = '二'
+			      //     break
+			      //   case '3':
+			      //     w = '三'
+			      //     break
+			      //   case '4':
+			      //     w = '四'
+			      //     break
+			      //   case '5':
+			      //     w = '五'
+			      //     break
+			      //   case '6':
+			      //     w = '六'
+			      //     break
+			      //   default:
+			      //     w = '日'
+			      // }
+			      return y + '年' + M + '月' + d + '日' + '  ' + '  ' + h + ':' + m + ':' + s
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.list-item{
+	display: flex;
+	align-items: flex-start;
+	line-height: 26px;
+	margin-bottom: 10px;
+	padding-right: 10px;
+	padding-bottom: 8px;
+	border-bottom: 1px solid #efefef;
+	
+	i{
+		margin-right: 5px;
+		color: #999;
+		font-size: 13px;
+	}
+	.txt{
+		display:-webkit-box;//将盒子转换为弹性盒子
+		-webkit-box-orient:vertical;//文本显示方式，默认水平
+		-webkit-line-clamp:2;//设置显示多少行
+		overflow:hidden;
+	}
+}
+</style>
diff --git a/pagesA/instantMessenger/instantMessenger.vue b/pagesA/instantMessenger/instantMessenger.vue
new file mode 100644
index 0000000..39e9523
--- /dev/null
+++ b/pagesA/instantMessenger/instantMessenger.vue
@@ -0,0 +1,1739 @@
+<template>
+	<view>
+		<view  v-if="!logoding"></view>
+		<view class="instantMessenger" v-if="logoding">
+			<view class="instantMessenger-title dis-flex">
+				<view class="p-top-bom-30 instantIten" @click="sendPictures">
+					<view class="iconfont icon-pic t-c" style="font-size: 40upx;"></view>
+					<view class="f-24 t-c col-3 p-top-10">发图片</view>
+				</view>
+				<view class="p-top-bom-30 instantIten" @click="sendVideo">
+					<view class="iconfont icon-camera t-c f-44" style="font-size: 40upx;"></view>
+					<view class="f-24 t-c col-3 p-top-10">发视频</view>
+					<view ref="input" class="input" style="display: none;"></view>
+				</view>
+				<view class="p-top-bom-30 instantIten" @click="sendCard" v-if="getSetInfo.is_card == 1 && setFomeData.receive_type == 1">
+					<view class="iconfont icon-news t-c f-44" style="font-size: 40upx;"></view>
+					<view class="f-24 t-c col-3 p-top-10">发名片</view>
+				</view>
+				<view class="p-top-bom-30 instantIten" @click="sendResume" v-if="getSetInfo.is_recruit == 1 && setFomeData.receive_type == 1">
+					<view class="iconfont icon-copy t-c f-44" style="font-size: 40upx;"></view>
+					<view class="f-24 t-c col-3 p-top-10">发简历</view>
+				</view>
+			</view>
+
+			<!-- 内容 -->
+			<scroll-view class="scroll-view" :scroll-y="true" :scroll-top="scrollTop" ref="boxRef">
+				<view class="content-box" id="boxbox" :style="{ marginBottom: off ? '0' : '500rpx' }" @click="closeEmoji">
+					<!-- 我发的文本消息 -->
+					<view  v-for="(item, index) in chattingRecordsLisy" :key="item.id">
+						<!-- 我的文本消息 -->
+						<view class="content-item" v-if="item.type == 0 && item.is_my == 0">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-content">
+									<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+									show-with-animation use-anchor  :html="item.content" ></jyf-parser>
+									<!-- <rich-text :nodes=""></rich-text> -->
+									</view>
+								<view class="text-img"><image :src="item.avatar" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 对方文本消息 -->
+						<view class="content-item" v-if="item.type == 0 && item.is_my == 1">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-img-left"><image :src="item.avatar" mode=""></image></view>
+								<view class="text-content-left">
+									<jyf-parser domain="https://6874-html-foe72-1259071903.tcb.qcloud.la" gesture-zoom lazy-load ref="article" selectable
+									show-with-animation use-anchor  :html="item.content" ></jyf-parser>
+									<!-- <rich-text :nodes="item.content"></rich-text> -->
+									</view>
+							</view>
+						</view>
+						<!-- 对方图片消息 -->
+						<view class="content-item" v-if="item.type == 1 && item.is_my == 1">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-img-left"><image :src="item.avatar" mode=""></image></view>
+								<view class="text-content-img" @click="lookimg(item.content)"><image :src="item.content" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 对方视频消息 -->
+						<view class="content-item" v-if="item.type == 2 && item.is_my == 1">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-img-left"><image :src="item.avatar" mode=""></image></view>
+								<view class="text-content-img">
+									<video x5-video-player-type='h5' x5-video-player-fullscreen='true' x5-video-orientation='portraint' class="text-video-left" @fullscreenchange="play" :controls="false" :src="item.content" controls></video>
+								</view>
+							</view>
+						</view>
+						<!-- 我的图片消息 -->
+						<view class="content-item" v-if="item.type == 1 && item.is_my == 0">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-content-img-r" @click="lookimg(item.content)"><image :src="item.content" mode="aspectFill"></image></view>
+								<view class="text-img"><image :src="item.avatar" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 我的视频消息 -->
+						<view class="content-item" v-if="item.type == 2 && item.is_my == 0">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-content-img-r">
+									<video x5-video-player-type='h5' x5-video-player-fullscreen='true' x5-video-orientation='portraint' class="text-video-left" @fullscreenchange="play" :controls="false" :src="item.content" controls></video>
+								</view>
+								<view class="text-img"><image :src="item.avatar" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 我的名片消息 -->
+						<view class="content-item" v-if="item.type == 3 && item.is_my == 0 && !!item.cardInfo" @click.stop="cardHome(item.cardInfo.id)">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-content-img-r">
+									<view class="card">
+										<view class="dis-flex">
+											<view class="card-logo"><image :src="item.cardInfo.logo" mode=""></image></view>
+											<view class="cart-content">
+												<view class="cart-title">
+													<text class="f-32 f-w col-3">{{ item.cardInfo.name }}</text>
+													<text class="f-24 col-9" style="padding-left: 20upx;">{{ item.cardInfo.position }}</text>
+												</view>
+												<view class="segmentation"></view>
+												<view class="col-3 f-24 card-cart">{{ item.cardInfo.company }} | {{ item.cardInfo.branch }}</view>
+											</view>
+										</view>
+										<view class="col-9 f-20 p-top-bom-10" style="border-top: 1upx solid #eeeeee;margin-top: 20upx;">个人名片</view>
+									</view>
+								</view>
+								<view class="text-img"><image :src="item.avatar" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 我的简历消息 -->
+						<view class="content-item" v-if="item.type == 4 && item.is_my == 0 && !!item.cardInfo" @click.stop="goRecruit_resume(item)">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-content-img-r">
+									<view class="card">
+										<view class="dis-flex">
+											<view class="card-logo"><image :src="item.cardInfo.avatar" mode=""></image></view>
+											<view class="cart-content">
+												<view class="cart-title">
+													<text class="f-32 f-w col-3">{{ item.cardInfo.name }}</text>
+													<!-- <text class="f-24 col-9" style="padding-left: 20upx;">产品经理</text> -->
+												</view>
+												<view class="segmentation-class">{{ item.cardInfo.age }} · {{ item.cardInfo.experience }} · {{ item.cardInfo.education }}</view>
+												<view class="col-3 f-24 card-cart-item">
+													<view class="cart-item" v-for="(items, indexs) in item.cardInfo.expect_position_list" :key="indexs">{{ items }}</view>
+												</view>
+											</view>
+										</view>
+										<view class="col-9 f-20 p-top-bom-10" style="border-top: 1upx solid #eeeeee;margin-top: 20upx;">个人简历</view>
+									</view>
+								</view>
+								<view class="text-img"><image :src="item.avatar" mode=""></image></view>
+							</view>
+						</view>
+						<!-- 对方名片消息 -->
+						<view class="content-item" v-if="item.type == 3 && item.is_my == 1 && !!item.cardInfo" @click.stop="cardHome(item.cardInfo.id)">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-img-left"><image :src="item.avatar" mode=""></image></view>
+								<view >
+									<view class="card">
+										<view class="dis-flex">
+											<view class="card-logo"><image :src="item.cardInfo.logo" mode=""></image></view>
+											<view class="cart-content">
+												<view class="cart-title">
+													<text class="f-32 f-w col-3">{{ item.cardInfo.name }}</text>
+													<text class="f-24 col-9" style="padding-left: 20upx;">{{ item.cardInfo.position }}</text>
+												</view>
+												<view class="segmentation"></view>
+												<view class="col-3 f-24 card-cart">{{ item.cardInfo.company }} | {{ item.cardInfo.branch }}</view>
+											</view>
+										</view>
+										<view class="col-9 f-20 p-top-bom-10" style="border-top: 1upx solid #eeeeee;margin-top: 20upx;">个人名片</view>
+									</view>
+								</view>
+							</view>
+						</view>
+						<!-- 对方简历消息 -->
+						<view class="content-item" v-if="item.type == 4 && item.is_my == 1 && !!item.cardInfo" @click.stop="goRecruit_resume(item)">
+							<view class="content-title-time">{{ item.date_time }}</view>
+							<view class="dis-flex">
+								<view class="text-img-left"><image :src="item.avatar" mode=""></image></view>
+								<view >
+									<view class="card">
+										<view class="dis-flex">
+											<view class="card-logo"><image :src="item.cardInfo.avatar" mode=""></image></view>
+											<view class="cart-content">
+												<view class="cart-title">
+													<text class="f-32 f-w col-3">{{ item.cardInfo.name }}</text>
+													<!-- <text class="f-24 col-9" style="padding-left: 20upx;">产品经理</text> -->
+												</view>
+												<view class="segmentation-class">{{ item.cardInfo.age }} · {{ item.cardInfo.experience }} · {{ item.cardInfo.education }}</view>
+												<view class="col-3 f-24 card-cart-item">
+													<view class="cart-item" v-for="(items, indexs) in item.cardInfo.expect_position_list" :key="indexs">{{ items }}</view>
+												</view>
+											</view>
+										</view>
+										<view class="col-9 f-20 p-top-bom-10" style="border-top: 1upx solid #eeeeee;margin-top: 20upx;">个人简历</view>
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+			<!-- 底部 -->
+			<view class="bottom-box">
+				<view class="instantMessenger-bottom dis-flex">
+					<view class="img-box" @click="declick"><image src="../../static/chooseCade/biaoqing.png" mode=""></image></view>
+					<view class="input-box"><textarea v-if="!showCommunity" @focus="focus" @blur="blur" :fixed="true" :auto-height="true" class="inputs" type="text" v-model="setFomeData.content" placeholder="请输入内容..." :cursor-spacing="20" /></view>
+					<view class="btn-box"><view :class="setFomeData.content ? 'btn-option' : 'btn'" @click="sendMmsg('', 0, 2)">发送</view></view>
+				</view>
+				<view class="dis-flex expression-box" :style="{ padding: off || offis ? '0rpx 30upx' : '30rpx' }" :animation="animationData">
+					<swiper class="slider" :current="0">
+						<swiper-item v-for="(item, index) in emojiList" :key="index" class="slider-emoji" :class="[index == emojiList.length - 1 ? 'lastbox' : '']">
+							<!-- <text class="f-20 slider-emoji-icon" v-for="(emoji, indexs) in item" :key="indexs">{{ imgUrl + '/emoji'+ emoji.url }}</text> -->
+							<image
+								v-for="(emoji, indexs) in item"
+								:key="indexs"
+								class="slider-emoji-icon"
+								@click="selemoji(emoji)"
+								:src="imgUrl + '/emoji/' + emoji.url"
+								mode=""
+							></image>
+						</swiper-item>
+					</swiper>
+				</view>
+			</view>
+			<PopManager :show="showCommunity" type="bottom" @clickmask="showCommunity = false">
+				<view class="popBox">
+					<view class="f-30 col-3 f-w t-c">
+						我的名片
+						<text class="iconfont icon-close" style="float: right;" @click="showCommunity = false"></text>
+					</view>
+					<view class="cardItemBox">
+						<radio-group @change="radioChange">
+							<view class="card-item dis-flex" v-for="(item, index) in cardList">
+								<view class="ridio">
+									<view class="ridio-item"><radio :value="index" :checked="index == current" /></view>
+								</view>
+								<view class="flex-box data">
+									<view class="name">
+										<view class="data-name dis-il-block">{{ item.name }}</view>
+										<view class="dis-il-block data-post">{{ item.position }}</view>
+									</view>
+									<view class="f-24 col-3 company">{{ item.company }} | {{ item.branch }}</view>
+								</view>
+								<view class="data-img"><image :src="item.logo" mode=""></image></view>
+							</view>
+						</radio-group>
+					</view>
+					<view class="data-btn" @click="sendchexcedecard">选定了</view>
+				</view>
+			</PopManager>
+		</view>
+		<PhoneMask :show1="popShow" @clickmask1="closePop"></PhoneMask>
+		<getvxphone :show="vxshow" @showFalse="showFalse"></getvxphone>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+import PopManager from '@/components/template/PopManager';
+import jyfParser from '@/components/jyf-parser/jyf-parser.vue';
+import PhoneMask from '@/components/template/PhoneMask';
+import getvxphone from '@/components/template/getVXphone.vue';
+	// #ifdef H5
+	import wxApi from '@/common/js/wxApi.js';
+	// #endif
+export default {
+	components: {
+		PopManager,
+		jyfParser,
+		PhoneMask,
+		getvxphone
+	},
+	data() {
+		return {
+			videoContext: '',
+			showCommunity: false,
+			scrollTop: 0,
+			scrollHeight: 0,
+			textarea: '',
+			animation: {},
+			animationData: {},
+			off: true,
+			emojiData: [],
+			animationT: {},
+			logoding:true,
+			animationDataT: {},
+			popShow: false,
+			vxshow:false,
+			emojiList: [
+				[
+					{ url: '100.gif', alt: '[微笑]' },
+					{ url: '101.gif', alt: '[伤心]' },
+					{ url: '102.gif', alt: '[美女]' },
+					{ url: '103.gif', alt: '[发呆]' },
+					{ url: '104.gif', alt: '[墨镜]' },
+					{ url: '105.gif', alt: '[哭]' },
+					{ url: '106.gif', alt: '[羞]' },
+					{ url: '107.gif', alt: '[哑]' },
+					{ url: '108.gif', alt: '[睡]' },
+					{ url: '109.gif', alt: '[哭]' },
+					{ url: '110.gif', alt: '[囧]' },
+					{ url: '111.gif', alt: '[怒]' },
+					{ url: '112.gif', alt: '[调皮]' },
+					{ url: '113.gif', alt: '[笑]' },
+					{ url: '114.gif', alt: '[惊讶]' },
+					{ url: '115.gif', alt: '[难过]' },
+					{ url: '116.gif', alt: '[酷]' },
+					{ url: '117.gif', alt: '[汗]' },
+					{ url: '118.gif', alt: '[抓狂]' },
+					{ url: '119.gif', alt: '[吐]' },
+					{ url: '120.gif', alt: '[笑]' },
+					{ url: '121.gif', alt: '[快乐]' },
+					{ url: '122.gif', alt: '[奇]' },
+					{ url: '123.gif', alt: '[傲]' }
+				],
+				[
+					{ url: '124.gif', alt: '[饿]' },
+					{ url: '125.gif', alt: '[累]' },
+					{ url: '126.gif', alt: '[吓]' },
+					{ url: '127.gif', alt: '[汗]' },
+					{ url: '128.gif', alt: '[高兴]' },
+					{ url: '129.gif', alt: '[闲]' },
+					{ url: '130.gif', alt: '[努力]' },
+					{ url: '131.gif', alt: '[骂]' },
+					{ url: '132.gif', alt: '[疑问]' },
+					{ url: '133.gif', alt: '[秘密]' },
+					{ url: '134.gif', alt: '[乱]' },
+					{ url: '135.gif', alt: '[疯]' },
+					{ url: '136.gif', alt: '[哀]' },
+					{ url: '137.gif', alt: '[鬼]' },
+					{ url: '138.gif', alt: '[打击]' },
+					{ url: '139.gif', alt: '[bye]' },
+					{ url: '140.gif', alt: '[汗]' },
+					{ url: '141.gif', alt: '[抠]' },
+					{ url: '142.gif', alt: '[鼓掌]' },
+					{ url: '143.gif', alt: '[糟糕]' },
+					{ url: '144.gif', alt: '[恶搞]' },
+					{ url: '145.gif', alt: '[什么]' },
+					{ url: '146.gif', alt: '[什么]' },
+					{ url: '147.gif', alt: '[累]' }
+				],
+				[
+					{ url: '148.gif', alt: '[看]' },
+					{ url: '149.gif', alt: '[难过]' },
+					{ url: '150.gif', alt: '[难过]' },
+					{ url: '151.gif', alt: '[坏]' },
+					{ url: '152.gif', alt: '[亲]' },
+					{ url: '153.gif', alt: '[吓]' },
+					{ url: '154.gif', alt: '[可怜]' },
+					{ url: '155.gif', alt: '[刀]' },
+					{ url: '156.gif', alt: '[水果]' },
+					{ url: '157.gif', alt: '[酒]' },
+					{ url: '158.gif', alt: '[篮球]' },
+					{ url: '159.gif', alt: '[乒乓]' },
+					{ url: '160.gif', alt: '[咖啡]' },
+					{ url: '161.gif', alt: '[美食]' },
+					{ url: '162.gif', alt: '[动物]' },
+					{ url: '163.gif', alt: '[鲜花]' },
+					{ url: '164.gif', alt: '[枯]' },
+					{ url: '165.gif', alt: '[唇]' },
+					{ url: '166.gif', alt: '[爱]' },
+					{ url: '167.gif', alt: '[分手]' },
+					{ url: '168.gif', alt: '[生日]' },
+					{ url: '169.gif', alt: '[电]' },
+					{ url: '170.gif', alt: '[炸弹]' },
+					{ url: '171.gif', alt: '[刀子]' }
+				],
+				[
+					{ url: '172.gif', alt: '[足球]' },
+					{ url: '173.gif', alt: '[瓢虫]' },
+					{ url: '174.gif', alt: '[翔]' },
+					{ url: '175.gif', alt: '[月亮]' },
+					{ url: '176.gif', alt: '[太阳]' },
+					{ url: '177.gif', alt: '[礼物]' },
+					{ url: '178.gif', alt: '[抱抱]' },
+					{ url: '179.gif', alt: '[拇指]' },
+					{ url: '180.gif', alt: '[贬低]' },
+					{ url: '181.gif', alt: '[握手]' },
+					{ url: '182.gif', alt: '[剪刀手]' },
+					{ url: '183.gif', alt: '[抱拳]' },
+					{ url: '184.gif', alt: '[勾引]' },
+					{ url: '185.gif', alt: '[拳头]' },
+					{ url: '186.gif', alt: '[小拇指]' },
+					{ url: '187.gif', alt: '[拇指八]' },
+					{ url: '188.gif', alt: '[食指]' },
+					{ url: '189.gif', alt: '[ok]' },
+					{ url: '190.gif', alt: '[情侣]' },
+					{ url: '191.gif', alt: '[爱心]' },
+					{ url: '192.gif', alt: '[蹦哒]' },
+					{ url: '193.gif', alt: '[颤抖]' },
+					{ url: '194.gif', alt: '[怄气]' },
+					{ url: '195.gif', alt: '[跳舞]' }
+				],
+				[
+					{ url: '196.gif', alt: '[发呆]' },
+					{ url: '197.gif', alt: '[背着]' },
+					{ url: '198.gif', alt: '[伸手]' },
+					{ url: '199.gif', alt: '[耍帅]' },
+					{ url: '200.png', alt: '[微笑]' },
+					{ url: '201.png', alt: '[生病]' },
+					{ url: '202.png', alt: '[哭泣]' },
+					{ url: '203.png', alt: '[吐舌]' },
+					{ url: '204.png', alt: '[迷糊]' },
+					{ url: '205.png', alt: '[瞪眼]' },
+					{ url: '206.png', alt: '[恐怖]' },
+					{ url: '207.png', alt: '[忧愁]' },
+					{ url: '208.png', alt: '[眨眉]' },
+					{ url: '209.png', alt: '[闭眼]' },
+					{ url: '210.png', alt: '[鄙视]' },
+					{ url: '211.png', alt: '[阴暗]' },
+					{ url: '212.png', alt: '[小鬼]' },
+					{ url: '213.png', alt: '[礼物]' },
+					{ url: '214.png', alt: '[拜佛]' },
+					{ url: '215.png', alt: '[力量]' },
+					{ url: '216.png', alt: '[金钱]' },
+					{ url: '217.png', alt: '[蛋糕]' },
+					{ url: '218.png', alt: '[彩带]' },
+					{ url: '219.png', alt: '[礼物]' }
+				]
+			],
+			imgUrl: '',
+			content: '',
+			videos: '',
+			images: '',
+			isSocketClose: false, // 是否关闭socket
+			reconnectCount: 5, // 重连次数
+			heartbeatInterval: '', // 心跳定时器
+			isStart: false, // 是否启动设备
+			setFomeData: {
+				i: 0,
+				aid: 0,
+				source: 0,
+				send_id: 51,
+				receive_id: 24,
+				page: 1,
+				page_index: 10,
+				send_type: 1,
+				receive_type: 1,
+				type: 0,
+				content: '',
+				im_type: 4
+			},
+			chattingRecords: [],
+			chattingRecordsLisy: [],
+			userinfo: {},
+			current: 0,
+			cardList: [],
+			getSetInfo: {},
+			isAndroid:1,
+			offis:true,
+			id:''
+			
+		};
+	},
+	async onPullDownRefresh() {
+		let _this = this;
+		if (this.total == this.setFomeData.page) {
+			setTimeout(() => {
+				uni.stopPullDownRefresh();
+			});
+			return;
+		}
+		this.setFomeData.page++;
+		let datas = {
+			id:this.setFomeData.id,
+			other_party_id:this.setFomeData.receive_id,
+			other_party_type:this.setFomeData.receive_type,
+			type:this.setFomeData.send_type,
+			page:this.setFomeData.page
+		}
+		let data;
+		_this.chattingRecords = await _this.getChatNewList(datas);
+		_this.chattingRecords.list.map( async (item,index)=>{
+			if(item.type == 3 || item.type==4){
+				item.cardInfo = await _this.getCardInfo(item);
+			}
+		})
+		uni.getSystemInfo({
+		  success: function (res) { // res - 各种参数
+		    let obj = uni.createSelectorQuery().select('.content-box')
+		    obj.boundingClientRect(function (data) { // data - 各种参数
+				let height = data.height;
+					let list = _this.chattingRecordsLisy;
+					_this.chattingRecordsLisy = _this.chattingRecords.list;
+					_this.chattingRecordsLisy = _this.chattingRecordsLisy.concat(list);
+					uni.stopPullDownRefresh();
+					setTimeout(() => {
+						uni.getSystemInfo({
+						  success: function (res) { // res - 各种参数
+						    let obj = uni.createSelectorQuery().select('.content-box')
+						    obj.boundingClientRect(function (datais) { // data - 各种参数
+						      console.log(datais);
+							  // debugger
+								let heightT = datais.height;
+								_this.scrollTop = heightT - height;
+								// debugger
+								setTimeout(()=>{
+									_this.webSocket()
+								},5000)
+						    }).exec()
+						  }
+						})
+					});
+				
+		    }).exec()
+		  }
+		})
+		// this.webSocket(false,true)
+	},
+	onReady() {
+		// this.videoContext = uni.createVideoContext('myVideo');
+		// this.videoContext.requestFullScreen();
+		uni.getSystemInfo({
+			success: function(res) {
+				console.log(res.windowHeight);
+				this.scrollHeight = res.windowHeight;
+			}
+		});
+	},
+	mounted() {
+		// #ifdef H5
+		let _this = this;
+		let input = document.createElement('input');
+		console.info('input', input);
+		input.type = 'file';
+		input.id = 'fileInput';
+		// input.style.display = 'none'
+		_this.$refs.input.$el.appendChild(input);
+		input.onchange = event => {
+			let filesObj = event.target.files['0'];
+			var reader = new FileReader();
+			// 传入一个参数对象即可得到基于该参数对象的文本内容
+			reader.readAsDataURL(filesObj);
+			reader.onload = function(e) {
+				_this.uploadVideo(e.target.result);
+			};
+			//上传方法
+		};
+		// #endif
+	},
+	onLoad(e) {
+		// debugger
+		this.setFomeData.receive_id = e.other_party_id;
+		this.setFomeData.receive_type = e.other_party_type;
+		this.setFomeData.send_type = e.type;
+		this.setFomeData.id = e.id || '';
+		this.setFomeData.i = App.siteInfo.uniacid;
+		this.setFomeData.source = App.getClientType();
+		setTimeout(()=>{
+			
+		},3000)
+		this.userinfo = uni.getStorageSync('userinfo');
+		
+		
+		this.setFomeData.send_id =  this.userinfo.mid;
+		// console.log(this.getSetInfo,111111111111111111111111);
+		uni.getSystemInfo({
+			success(res) {
+				this.isAndroid = res.platform === 'android' ? '1' : '2';
+			}
+		});
+		// debugger
+		this.imgUrl = uni.getStorageSync('imgPrefix');
+		// uni.onWindowResize((res) => {
+		// 	// this.declick();
+		//     console.log('变化后的窗口宽度=' + res.size.windowWidth)
+		//     console.log('变化后的窗口高度=' + res.size.windowHeight)
+		// })
+		this.webSocket();
+		// debugger
+		if(!this.getSetInfo.is_card){
+			this.getSet();
+		}
+		
+		// let page = Math.ceil(emoji.length / 20);
+		// for (let i = 0; i < page; i++) {
+		// 	this.emojiData[i] = [];
+		// 	for (let k = 0; k < 20; k++) {
+		// 		emoji[i * 20 + k] ? this.emojiData[i].push(emoji[i * 20 + k]) : '';
+		// 	}
+		// }
+	},
+	onUnload() {
+		uni.closeSocket();
+		uni.onSocketClose(function(res) {
+			console.log('WebSocket 已关闭1！');
+		});
+	},
+	onHide() {
+		uni.closeSocket();
+		uni.onSocketClose(function(res) {
+			console.log('WebSocket 已关闭2！',res);
+		});
+		// uni.onSocketError(function (res) {
+		//   console.log('WebSocket连接打开失败，请检查！');
+		// });
+	},
+	onShow() {
+		// 初始化一个动画
+		let animation = uni.createAnimation({
+			duration: 300,
+			timingFunction: 'ease'
+		});
+		this.animation = animation;
+		let animationT = uni.createAnimation({
+			duration: 300,
+			timingFunction: 'ease'
+		});
+		this.animationT = animationT;
+		
+	},
+	methods: {
+		getSet(){
+			App._post_form('&p=Im&do=getSetInfo', {}, res => {
+				// uni.setStorageSync('getSetInfo', res.data);
+				this.getSetInfo = res.data;
+			});
+		},
+		showFalse(){
+			console.log('进了showfalse')
+			this.vxshow = false;
+		},
+		closePop() {
+			let _this = this
+			_this.popShow = false
+		},
+		blur(){
+			// this.rotateAndScale();
+			this.off = true;
+			this.offis = true;
+			let div = this.$refs.boxRef;
+			// #ifdef H5
+			
+			this.scrollTop = 0;
+			//#endif
+			
+			//此时必须异步执行滚动条滑动至底部
+			this.add();
+		},
+		focus(){
+			// this.declick()
+			// if (this.off) {
+			// 	// 使用动画
+			// 	this.rotateAndScale();
+			// 	this.rotateAndScaleT();
+			// } else {
+			// 	this.norotateAndScale();
+			// 	this.norotateAndScaleT();
+			// }
+			this.norotateAndScale();
+			this.offis = true;
+			// #ifdef H5
+			
+			this.off = false;
+			let div = this.$refs.boxRef;
+			this.scrollTop = 0;
+			//#endif
+			
+			
+			
+			//此时必须异步执行滚动条滑动至底部
+			this.add();
+		},
+		// 选择视频
+		uploadVideo(file) {
+			let _this = this;
+			uni.showLoading();
+			uni.uploadFile({
+				url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+				filePath: file,
+				name: 'file',
+				formData: {
+					upload_type: 1
+				},
+				success: res => {
+					let data = JSON.parse(res.data);
+					console.info('res', res);
+					_this.marginT.marginTop = '300rpx';
+					if (data.errno === 0) {
+						_this.videos = base64.decode(data.data.img);
+						// _this.info.video_link = data.data.image;
+						_this.sendMmsg(_this.videos, 2, 2);
+					} else {
+						App.showError(data.message);
+					}
+					uni.hideLoading();
+				},
+				fail: res => {
+					uni.hideLoading();
+				}
+			});
+		},
+		getchatting(){
+			let _this = this;
+			let data = {
+				other_party_id:this.setFomeData.receive_id,
+				other_party_type:this.setFomeData.receive_type,
+				type:this.setFomeData.send_type,
+				page:1,
+				id:this.setFomeData.id
+			}
+			App._post_form(
+				`&p=im&do=get`,
+				data,
+				res => {
+					let obj = res.data.list[res.data.list.length - 1];
+					obj.type = 0;
+					_this.chattingRecordsLisy.push(obj);
+					
+					setTimeout(() => {
+						_this.add();
+					});
+				},
+				false,
+				() => {}
+			);
+		},
+		scrolltoupper(e) {
+			console.log(this.scrollTop);
+		},
+		goRecruit_resume(item) {
+			App.navigationTo({
+				url: `pages/subPages2/hirePlatform/resume/resume?id=${item.content}&flag=2`
+			});
+		},
+		cardHome(id) {
+			App.navigationTo({
+				url: `pages/subPages/businesscard/carddetail/carddetail?cardid=${id}`
+			});
+		},
+		sendchexcedecard() {
+			this.sendMmsg(this.cardList[this.current].id, 3, 2);
+			this.showCommunity = false;
+		},
+		radioChange: function(evt) {
+			console.log(evt);
+			this.current = evt.detail.value;
+		},
+		sendResume() {
+			if (this.getSetInfo.is_resume == 0) {
+				App.showError(
+					`您尚未创建简历，是否前往创建?`,
+					data => {
+						if (data.confirm) {
+							App.navigationTo({
+								url: 'pages/subPages2/hirePlatform/addResume/addResume'
+							});
+						}
+					},
+					true
+				);
+			} else {
+				App.showError(
+					`确定向对方发送简历?`,
+					data => {
+						if (data.confirm) {
+							this.sendMmsg(this.getSetInfo.resume_id, 4, 2);
+						}
+					},
+					true
+				);
+			}
+		},
+		sendCard() {
+			App._post_form(
+				`&p=citycard&do=myCard`,
+				{
+					page: 1,
+					page_index: 999
+				},
+				res => {
+					console.log(res);
+					this.cardList = res.data.list;
+					this.showCommunity = true;
+				},
+				false,
+				() => {}
+			);
+		},
+		sendMmsg(content = '', type = 0, im_type = 0) {
+			if (!this.content && !content && im_type != 4 && !this.setFomeData.content) return;
+			this.setFomeData.type = type;
+			this.setFomeData.im_type = im_type;
+			this.setFomeData.content = content || this.setFomeData.content;
+			if (type == 0) {
+				this.setFomeData.content = this.replaceEmoji(this.setFomeData.content);
+			}
+			// let textarea = JSON.stringify(this.setFomeData);
+			// debugger
+			// uni.sendSocketMessage({
+			// 	data: 
+			// });
+			let _this = this,
+				requestData = {
+					send_id: _this.setFomeData.id,
+					send_type: this.setFomeData.send_type,
+					receive_type: this.setFomeData.receive_type,
+					type: this.setFomeData.type,
+					receive_id: this.setFomeData.receive_id,
+					content: this.setFomeData.content
+				};
+				App._post_form(
+					'&p=im&do=send',
+					requestData,
+					res => {
+						if (res.errno === 0) {
+							// debugger
+							// _this.chattingRecordsLisy.push(_this.chattingRecords.list[0]);
+							// _this.scrollTop = 0;
+							setTimeout(()=>{
+								uni.getSystemInfo({
+								  success: function (res) { // res - 各种参数
+								
+								    let obj = uni.createSelectorQuery().select('.content-box')
+								
+								    obj.boundingClientRect(function (datas) { // data - 各种参数
+								      
+								      console.log(datas);
+									  
+										let heightT = datas.height;
+										
+										_this.scrollTop = heightT;
+										// setTimeout(()=>{
+											_this.webSocket()
+										// },5000)
+								    }).exec()
+								  }
+								})
+							})
+						}
+					},
+					fail => {
+						if (fail.data.message == '未绑定手机号') {
+							//#ifdef H5
+							_this.popShow = true;
+							//#endif
+							//#ifndef H5
+							_this.vxshow = true;
+							//#endif
+						}
+					}
+				);
+			if (im_type != 4) {
+				this.setFomeData.content = '';
+				// this.setFomeData.page++;
+				// this.sendMmsg('', 0, 4);
+				// this.getchatting()
+				
+			}
+			// debugger
+			this.setFomeData.content = '';
+			this.content = '';
+		},
+		
+		async webSocket(page = 1,flag = false) {
+			let _this = this;
+			// let div = this.$refs.boxRef;
+			// let url = App.siteInfo.siteroot.split(':')[1];
+			// // debugger
+			// if(url.charAt(url.length - 1) == '/'){
+			// 	url = url.substring(0, url.length - 1);
+			// }
+			// debugger
+			// uni.connectSocket({
+			// 	url: `wss:${url}:${_this.getSetInfo.port}`,
+			// 	fail: err => {
+			// 		console.log(err);
+			// 	}
+			// });
+			
+			let datas = {
+				other_party_id:this.setFomeData.receive_id,
+				other_party_type:this.setFomeData.receive_type,
+				type:this.setFomeData.send_type,
+				page:1,
+				id:this.setFomeData.id
+			}
+			_this.chattingRecords = await _this.getChatNewList(datas);
+			_this.chattingRecords.list.map( async (item,index)=>{
+				if(item.type == 3 || item.type == 4){
+					item.cardInfo = await _this.getCardInfo(item);
+				}
+			})
+			let data;
+			uni.getSystemInfo({
+			  success: function (res) { // res - 各种参数
+				
+			    let obj = uni.createSelectorQuery().select('.content-box')
+			
+			    obj.boundingClientRect(function (data) { // data - 各种参数
+				
+					console.log(data)
+					let height = data.height;
+					if (flag) {
+						// return
+						let list = _this.chattingRecordsLisy;
+						_this.chattingRecordsLisy = _this.chattingRecords.list;
+						_this.chattingRecordsLisy = _this.chattingRecordsLisy.concat(list);
+						uni.stopPullDownRefresh();
+						setTimeout(() => {
+							uni.getSystemInfo({
+							  success: function (res) { // res - 各种参数
+							
+							    let obj = uni.createSelectorQuery().select('.content-box')
+							
+							    obj.boundingClientRect(function (datais) { // data - 各种参数
+							      
+							      console.log(datais);
+								  // debugger
+									let heightT = datais.height;
+									_this.scrollTop = heightT - height;
+									// debugger
+									setTimeout(()=>{
+										_this.webSocket()
+									},5000)
+							    }).exec()
+							  }
+							})
+							
+							
+						});
+					} else if (_this.chattingRecords.im_type == 2) {
+						_this.chattingRecordsLisy.push(_this.chattingRecords.list[0]);
+						// _this.scrollTop = 0;
+						setTimeout(()=>{
+							uni.getSystemInfo({
+							  success: function (res) { // res - 各种参数
+							
+							    let obj = uni.createSelectorQuery().select('.content-box')
+							
+							    obj.boundingClientRect(function (datas) { // data - 各种参数
+							      
+							      console.log(datas);
+								  
+									let heightT = datas.height;
+									
+									_this.scrollTop = heightT;
+									setTimeout(()=>{
+										_this.webSocket()
+									},5000)
+							    }).exec()
+							  }
+							})
+						})
+							
+						// return
+					} else {
+						if (_this.chattingRecordsLisy.length > 0) {
+							let newArray = _this.chattingRecordsLisy.concat(..._this.chattingRecords.list),
+								temp = {},
+								result = [];
+							newArray.map((item, index) => {
+								if (!temp[item.id]) {
+									result.push(item);
+									temp[item.id] = true;
+								}
+							});
+							_this.chattingRecordsLisy = result;
+							_this.add();
+							setTimeout(()=>{
+								_this.webSocket()
+							},5000);
+						} else{
+							// let chatList = _this.chattingRecordsLisy;
+							// _this.getCardInfo(chatList);
+							_this.chattingRecordsLisy = _this.chattingRecords.list;
+							_this.total = _this.chattingRecords.total;
+							setTimeout(() => {
+								_this.add();
+								setTimeout(()=>{
+									_this.webSocket()
+								},5000)
+							});
+						}
+						
+					}
+					// console.log(res.data,'收到服务器内容：', JSON.parse(res.data));
+					// debugger
+					
+			    }).exec()
+			  }
+			})
+			// App._post_form(
+			// 	'&p=im&do=get',
+			// 	datas,
+			// 	res => {
+			// 		_this.chattingRecords = res.data;
+					
+			// 		// debugger
+			// 		console.log(_this.chattingRecords,111)
+			// 		//此时必须异步执行滚动条滑动至底部
+					
+			// 		// this.scrollTop = 0;
+					
+			// 	},
+			// 	err => {
+			// 		if (err.data.errno === 1) {
+			// 			App.navigationTo({
+			// 				url: err.data.data.url
+			// 			});
+			// 		}
+			// 	},
+			// 	() => {}
+			// );
+			
+			// uni.onSocketMessage(function(res) {
+				
+				
+				
+			// });
+			// // 连接打开
+			// uni.onSocketOpen(function(res) {
+			// 	console.log('WebSocket打开');
+			// 	_this.sendMmsg('', 0, 4);
+			// 	// 断线后重连几次
+			// 	_this.reconnectCount = 5
+			// 	// 5秒发送一次心跳
+			// 	// _this.heartbeatInterval = setInterval(()=>{
+				  
+			// 	// },5000)
+			// });
+			// uni.onSocketClose(function(res) {
+			// 	console.log('WebSocket 已关闭2！',res);
+			// 	 // _this.webSocket()
+			// });
+			// uni.onSocketError(function (res) {
+			//   console.log('WebSocket连接打开失败，请检查！',res);
+			// });
+		},
+		async getChatNewList(data){
+			return new Promise((resolve, reject) => {
+				App._post_form(
+					'&p=im&do=get',
+					data,
+					res=> {
+						resolve(res.data);
+						// _this.chattingRecords = res.data;
+						// _this.chattingRecords.list.map((item,index)=>{
+						// 	if(item.type == 3 || item.type == 4){
+						// 		item.cardInfo = await _this.getCardInfo(item);
+						// 	}
+						// })
+					},
+					err => {
+						if (err.data.errno === 1) {
+							App.navigationTo({
+								url: err.data.data.url
+							});
+						}
+					},
+					() => {})
+			})
+			
+		},
+		// 获取名片数据
+		getCardInfo(item) {
+			return new Promise((resolve, reject) => {
+				if (item.type == 3 && !item.cardInfo) {
+					App._post_form(
+						`&p=citycard&do=cardInfo`,
+						{
+							id: item.content
+						},
+						res => {
+							resolve(res.data);
+							// item.cardInfo = res.data;
+							// this.chattingRecordsLisy = cardList;
+							// // console.log(this.chattingRecordsLisy);
+							// if (this.setFomeData.page == 1) {
+							// 	this.add();
+							// }
+						},
+						false,
+						() => {}
+					);
+				} else if (item.type == 4) {
+					App._post_form(
+						`&p=recruit&do=resumeDesc`,
+						{
+							id: item.content
+						},
+						res => {
+							resolve(res.data);
+							// item.cardInfo = res.data;
+							// this.chattingRecordsLisy = cardList;
+							// console.log(this.chattingRecordsLisy);
+							// if (this.setFomeData.page == 1) {
+							// 	this.add();
+							// }
+						},
+						false,
+						() => {}
+					);
+				}
+				// App._post_form('&p=Order&do=planTransfer', {
+				// 	id,
+				// 	type
+				// }, res => {
+					
+				// })
+			})
+		},
+		//替换表情符号为图片
+		replaceEmoji(str) {
+			let replacedStr = str.replace(/\[([^(\]|\[)]*)\]/g, (item, index) => {
+				console.log('item: ' + item);
+				for (let i = 0; i < this.emojiList.length; i++) {
+					let row = this.emojiList[i];
+					for (let j = 0; j < row.length; j++) {
+						let EM = row[j];
+						if (EM.alt == item) {
+							//在线表情路径，图文混排必须使用网络路径，请上传一份表情到你的服务器后再替换此路径
+							//比如你上传服务器后，你的100.gif路径为https://www.xxx.com/emoji/100.gif 则替换onlinePath填写为https://www.xxx.com/emoji/
+							// let onlinePath = 'https://s2.ax1x.com/2019/04/12/'
+							let imgstr = '<img src="' + this.imgUrl + 'emoji/' + EM.url + '">';
+							console.log('imgstr: ' + imgstr);
+							return imgstr;
+						}
+					}
+				}
+			});
+			return '<div style="display: flex;align-items: center;word-wrap:break-word;flex-wrap: wrap;">' + replacedStr + '</div>';
+		},
+		async sendPictures() {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+				let res = await App.browser_upload(1);
+			    for (let i = 0; i < res.tempFilePaths.length; i++) {
+			    	let aa = await App._upLoad(res.tempFilePaths[i])
+			    	// _this.pic.push(aa.data.image);
+			    	// _this.picArray.push(aa.data.img);
+			    	_this.images = aa.data.img;
+			    	_this.sendMmsg(_this.images, 1, 2);
+			    }
+				return
+			}
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									// _this.pic.push(res.data.image);
+									// _this.picArray.push(res.data.img);
+									_this.images = res.data.img;
+									_this.sendMmsg(_this.images, 1, 2);
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 1,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let aa = await App._upLoad(res.tempFilePaths[i])
+						// _this.pic.push(aa.data.image);
+						// _this.picArray.push(aa.data.img);
+						_this.images = aa.data.img;
+						_this.sendMmsg(_this.images, 1, 2);
+					}
+				}
+			})
+			// #endif
+			// let _this = this;
+			// uni.chooseImage({
+			// 	count: 1,
+			// 	sourceType: ['album', 'camera'],
+			// 	success: async function(res) {
+			// 		for (let i = 0; i < res.tempFilePaths.length; i++) {
+			// 			let aa = await App._upLoad(res.tempFilePaths[i]);
+			// 			console.log(aa);
+			// 			_this.images = aa.data.img;
+			// 			_this.sendMmsg(_this.images, 1, 2);
+			// 		}
+			// 	}
+			// });
+		},
+		videoUp(){
+			let _this = this;
+						uni.chooseVideo({
+							count: 1,
+							sourceType: ['camera', 'album'],
+							success: function(res) {
+								// _this.info.video_link = res.tempFilePath;
+								// console.info(res.tempFilePath);
+								// let siteroot = null;
+								
+								uni.showLoading();
+								uni.uploadFile({
+									url: App.api_root + '&do=uploadFiles', //仅为示例，非真实的接口地址
+									filePath: res.tempFilePath,
+									name: 'file',
+									formData: {
+										upload_type: 1,
+										is_base: 1
+									},
+									success: res => {
+										let data = JSON.parse(res.data),
+											base64 = new _this.$util.Base64();
+										console.info('data', data);
+										// _this.marginT.marginTop = '300rpx'
+										if (data.errno === 0) {
+											// _this.src = base64.decode(data.data.img);
+											_this.videos = base64.decode(data.data.img);
+											_this.sendMmsg(_this.videos, 2, 2);
+										} else {
+											App.showError(data.message, () => {});
+										}
+										uni.hideLoading();
+									},
+									fail: res => {
+										console.info('resInfofail', res);
+										// _this.showmain = JSON.stringify(res);
+										uni.hideLoading();
+									}
+								});
+							}
+						});
+		},
+		sendVideo() {
+			let _this = this;
+			// #ifdef H5
+			if (_this.isAndroid === '2') {
+				return document.getElementById('fileInput').click();
+			} else {
+				_this.videoUp();
+			}
+			// #endif
+			// #ifndef H5
+			_this.videoUp();
+			// #endif
+			
+		},
+		selemoji(m) {
+			this.setFomeData.content = this.setFomeData.content + m.alt;
+
+			console.log(this.setFomeData.content, this.content);
+		},
+		closeEmoji() {
+			if (this.off) {
+				// 使用动画
+				// this.rotateAndScale();
+				// this.rotateAndScaleT();
+			} else {
+				this.norotateAndScale();
+				// this.norotateAndScaleT();
+			}
+			this.off = true;
+			this.offis = true;
+			// let div = this.$refs.boxRef;
+		},
+		declick(flag) {
+			if (this.off) {
+				// 使用动画
+				this.rotateAndScale();
+				this.rotateAndScaleT();
+			} else {
+				this.norotateAndScale();
+				this.norotateAndScaleT();
+			}
+			this.off = !this.off;
+			this.offis = !this.offis;
+			let div = this.$refs.boxRef;
+			this.scrollTop = 1000;
+			//此时必须异步执行滚动条滑动至底部
+			this.add();
+			// setTimeout(() => {
+			// 	this.scrollTop = 0;
+			// 	this.$nextTick(() => {
+			// 		let con = document.getElementById('boxbox'); // 获取对象
+
+			// 		this.scrollTop = con.scrollHeight; // 滚动高度
+			// 		console.log(con.scrollHeight, this.scrollTop);
+			// 	});
+			// 	// console.log(`点击了添加按钮，更新时间：,此时的div.scrollHeight是：${div.scrollHeight}`)
+			// }, 0);
+		},
+		// 定义动画内容
+		rotateAndScale() {
+			// 定义动画内容
+			this.animation
+				.height(200)
+				.scale(1, 1)
+				.step();
+			// 导出动画数据传递给data层
+			this.animationData = this.animation.export();
+		},
+		norotateAndScale() {
+			this.animation
+				.height(0)
+				.scale(1, 1)
+				.step();
+			this.animationData = this.animation.export();
+		},
+		// 定义动画内容
+		rotateAndScaleT() {
+			// 定义动画内容
+			console.log(this.animationT);
+			// debugger
+			this.animationT
+				.translateY(100)
+				.scale(1, 1)
+				.step();
+			// 导出动画数据传递给data层
+			this.animationDataT = this.animationT.export();
+		},
+		norotateAndScaleT() {
+			this.animationT
+				.translateY(0)
+				.scale(1, 1)
+				.step();
+			this.animationDataT = this.animationT.export();
+		},
+		play(e) {
+			console.log(e);
+			// debugger
+
+			// this.videoContext.requestFullScreen();
+		},
+		pullUp() {},
+		add() {
+			// let div = this.$refs.boxRef;
+			let _this = this;
+			//此时必须异步执行滚动条滑动至底部
+			// this.scrollTop = 0;
+			setTimeout(() => {
+				
+				uni.getSystemInfo({
+				  success: function (res) { // res - 各种参数
+				
+				    let obj = uni.createSelectorQuery().select('.content-box')
+				
+				    obj.boundingClientRect(function (data) { // data - 各种参数
+				      
+				      console.log(data)
+						_this.scrollTop = data.height;
+						_this.logoding = _this.logoding
+						_this.logoding = _this.logoding
+						_this.showCommunity = !_this.showCommunity
+						_this.showCommunity = !_this.showCommunity
+						// debugger
+				    }).exec()
+				  }
+				})
+				// this.$nextTick(() => {
+				// 	let con = document.getElementById('boxbox'); // 获取对象
+
+				// 	this.scrollTop = con.scrollHeight; // 滚动高度
+				// 	console.log(con.scrollTop, this.scrollTop);
+				// });
+				// console.log(`点击了添加按钮，更新时间：,此时的div.scrollHeight是：${div.scrollHeight}`)
+			}, 0);
+		},
+		lookimg(imgUrl) {
+			let img = [imgUrl];
+			uni.previewImage({
+				current: 1,
+				urls: img
+			});
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background-color: #f8f8f8;
+}
+</style>
+<style lang="scss" scoped>
+.instantMessenger {
+	.instantMessenger-title {
+		position: fixed;
+		width: 100vw;
+		display: flex;
+		display: -webkit-flex;
+		justify-content: space-between;
+		flex-direction: row;
+		flex-wrap: wrap;
+		background-color: #ffffff;
+		z-index: 9999;
+		.instantIten{
+			flex: 1;
+			min-width: 25%;
+		}
+	}
+	// .instantMessenger-title:after {
+	//     content: "";
+	//     flex: 0.25;
+	// 	min-width: 25%;
+	// }
+	.scroll-view {
+		padding: 160upx 0 100upx;
+		// overflow: hidden;
+		height: 80vh;
+	}
+	.content-box {
+		position: relative;
+		padding: 30upx;
+		width: 92vw;
+		// bottom: 140upx;
+		left: 0;
+		min-height: 950upx;
+		// overflow: auto;
+		.content-item {
+			padding-bottom: 70upx;
+		}
+		// background-color: #F000EE;
+		.content-title-time {
+			padding-bottom: 20upx;
+			color: #999999;
+			font-size: 24upx;
+			text-align: center;
+		}
+		.text-content {
+			max-width: 400upx;
+			padding: 20upx 40upx;
+			background-color: #3388ff;
+			font-size: 28upx;
+			color: #ffffff;
+			border-radius: 20upx 0upx 20upx 20upx;
+			flex-direction: row-reverse;
+			margin-left: auto;
+		}
+		.text-content-left {
+			max-width: 400upx;
+			padding: 20upx 40upx;
+			background-color: #ffffff;
+			font-size: 28upx;
+			min-height: 40upx;
+			line-height: 40upx;
+			color: #333333;
+			border-radius: 00upx 20upx 20upx 20upx;
+			flex-direction: row-reverse;
+		}
+		.text-content-img {
+			image {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+			uni-video {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+			video {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+		}
+		.text-content-img-r {
+			margin-left: auto;
+			image {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+			uni-video {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+			video {
+				width: 300upx;
+				height: 400upx;
+				border-radius: 20upx;
+			}
+		}
+		.text-img {
+			flex: 0.2;
+			// margin-left:auto;
+			padding-left: 30upx;
+			image {
+				width: 80upx;
+				height: 80upx;
+				border-radius: 50%;
+				float: right;
+			}
+		}
+		.text-img-left {
+			flex: 0.2;
+			// margin-left:auto;
+			padding-right: 30upx;
+			image {
+				width: 80upx;
+				height: 80upx;
+				border-radius: 50%;
+			}
+		}
+		.card {
+			width: 480upx;
+			// height: 200upx;
+			border-radius: 10upx;
+			background-color: #ffffff;
+			padding: 30upx 30upx 0;
+			.card-logo {
+				width: 90upx;
+				height: 90upx;
+				border-radius: 50%;
+				padding-right: 20upx;
+				image {
+					width: 90upx;
+					height: 90upx;
+					border-radius: 50%;
+				}
+			}
+			.cart-content {
+				.segmentation {
+					width: 90upx;
+					height: 1upx;
+					background: #ffffff;
+					border-top: 2upx solid #707070;
+					margin: 20upx 0;
+					opacity: 1;
+				}
+				.segmentation-class {
+					margin: 20upx 0;
+					font-size: 24upx;
+					color: #999999;
+				}
+				.card-cart {
+					width: 360upx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+				.card-cart-item {
+					height: 35upx;
+					overflow: hidden;
+					.cart-item {
+						display: inline-block;
+						// width: 55upx;
+						padding: 0 10upx;
+						height: 35upx;
+						border-radius: 4upx;
+						color: #666666;
+						background-color: #f4f4f4;
+						margin-right: 10upx;
+						font-size: 20upx;
+						line-height: 35upx;
+						text-align: center;
+					}
+				}
+			}
+		}
+	}
+	.bottom-box {
+		background-color: #ffffff;
+		width: 100vw;
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		left: 0;
+		.instantMessenger-bottom {
+			padding: 20upx 30upx;
+			// padding-bottom: 40px;
+			.img-box {
+				border-radius: 60upx;
+				// padding-top: 5upx;
+				image {
+					width: 60upx;
+					height: 60upx;
+				}
+			}
+			.input-box {
+				flex: 1;
+				padding: 5upx 30upx 0;
+				.inputs {
+					// min-height: 70upx!important;
+					width: 100%;
+					height: auto;//设置了高度自动随着文本增高的话，样式表里的高度就没用了
+					font-size: 28upx;
+					padding-top: 10upx;
+					min-height: 70upx;
+					// max-height: 100upx;
+					// overflow: auto;
+				}
+				.inputs /deep/ uni-textarea {
+					height: auto;//设置了高度自动随着文本增高的话，样式表里的高度就没用了
+					min-height: 70rpx;
+				}
+			}
+			.btn-box {
+				float: right;
+				.btn {
+					width: 90upx;
+					height: 50upx;
+					background: #e4efff;
+					opacity: 1;
+					border-radius: 60upx;
+					padding: 10upx 32upx;
+					font-size: 32upx;
+					color: #ffffff;
+					line-height: 50upx;
+					text-align: center;
+				}
+				.btn-option {
+					width: 90upx;
+					height: 50upx;
+					background: #3388ff;
+					opacity: 1;
+					border-radius: 60upx;
+					padding: 10upx 32upx;
+					font-size: 32upx;
+					color: #ffffff;
+					line-height: 50upx;
+					text-align: center;
+				}
+			}
+		}
+		.expression-box {
+			// padding: 30upx;
+			// height: 0;
+			border-top: 1upx solid #eeeeee;
+			flex-wrap: wrap;
+			justify-content: space-between;
+			height: 0;
+			overflow: auto;
+			.expression-item {
+				flex: 0 0 12.5%;
+				width: 60upx;
+				height: 60upx;
+				image {
+					width: 60upx;
+					height: 60upx;
+				}
+			}
+			.slider {
+				width: 100%;
+				height: 100%;
+				.slider-emoji {
+					width: 375upx;
+					flex-direction: row;
+					flex-wrap: wrap;
+					justify-content: flex-start;
+					display: flex;
+					.slider-emoji-icon {
+						width: 30upx;
+						height: 60upx;
+						text-align: center;
+						padding: 20upx;
+						flex: 0 0 10.25%;
+						// margin-bottom: 30upx;
+						// display: inline-block;
+					}
+				}
+			}
+
+			.lastbox {
+				justify-content: flex-start;
+			}
+		}
+	}
+	.popBox {
+		width: 750upx;
+		height: 750upx;
+		background: #ffffff;
+		opacity: 1;
+		border-radius: 30upx 30upx 0upx 0upx;
+		padding: 30upx;
+		box-sizing: border-box;
+		background-color: #ffffff;
+		position: relative;
+		.cardItemBox {
+			padding-top: 30upx;
+			height: 500upx;
+			overflow: auto;
+			.card-item {
+				padding: 30upx;
+				border: 1upx solid #eeeeee;
+				box-sizing: border-box;
+				border-radius: 10upx;
+				margin-bottom: 20upx;
+				.ridio {
+					height: 150upx;
+					line-height: 150upx;
+					width: 100upx;
+					.ridio-item {
+						margin: auto;
+					}
+				}
+				.data {
+					.name {
+						.data-name {
+							color: #333333;
+							width: 100upx;
+							text-align: center;
+							font-size: 32upx;
+							font-weight: bold;
+							padding-bottom: 30upx;
+							border-bottom: 4upx solid #cccccc;
+						}
+						.data-post {
+							font-size: 24upx;
+							color: #999999;
+							margin-left: 20upx;
+						}
+					}
+					.company {
+						padding-top: 30upx;
+					}
+				}
+				.data-img {
+					padding-top: 10upx;
+					image {
+						width: 100upx;
+						height: 100upx;
+						border-radius: 60upx;
+					}
+				}
+			}
+		}
+		.data-btn {
+			width: 690upx;
+			height: 80upx;
+			background: #3388ff;
+			opacity: 1;
+			border-radius: 60upx;
+			line-height: 80upx;
+			text-align: center;
+			font-size: 28upx;
+			color: #ffffff;
+			position: absolute;
+			bottom: 30upx;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	}
+}
+</style>
diff --git a/pagesA/pictureTextDetails/pictureTextDetails.vue b/pagesA/pictureTextDetails/pictureTextDetails.vue
new file mode 100644
index 0000000..91467a2
--- /dev/null
+++ b/pagesA/pictureTextDetails/pictureTextDetails.vue
@@ -0,0 +1,617 @@
+<template>
+	<view>
+		<view class="">
+			<pic-text :info="detailinfo" :isDetail="true" :index="-1" :stopVideo="stopVideo" @addComment="changeCommentNum" :currentPlay="currentPlay" @changePlay="changePlay()"></pic-text>
+		</view>
+		<view class="">
+			<view style="font-size: 18px;font-weight: bold;padding: 10px;color: #333;">评论</view>
+			<view style="padding: 0px 10px;color: #333;">
+				<view class="comment-item" v-for="(item, index) in commentList" :key="index">
+					<view class="dis-flex">
+						<image class="avatar2" :src="item.avatar" mode="" @click="toHomePage(item.mid)"></image>
+						<view class="name">{{ item.nickname }}</view>
+						<view style="font-size: 12px;margin-right: 20upx;" @click="like(item)">
+							<text v-show="!item.is_fabulous" class="iconfont icon-like" style="font-size: 30upx;padding-right: 8upx;"></text>
+							<text v-show="item.is_fabulous" class="iconfont icon-likefill" style="font-size: 30upx;padding-right: 8upx;color: #f00;"></text>
+							<text v-if="item.likenum>0">{{item.likenum}}</text>
+						</view>
+						<view style="margin-right: 20upx;" v-if="myMid == item.mid" @click="editCommentShow(item,index)">
+							<text class="iconfont icon-bianji" style="font-size: 30upx;padding-right: 8upx;"></text>
+						</view>
+						<view style="margin-right: 20upx;" v-if="myMid == item.mid" @click="deleteComt(item,index)">
+							<text class="iconfont icon-delete" style="font-size: 30upx;padding-right: 8upx;"></text>
+						</view>
+					</view>
+					<view style="padding-left: 38px;font-size: 14px;margin: 5px auto 10px;" @click="replyShow(item.id, item.mid, item.list, item.nickname)">{{ item.content }}</view>
+					<view class="dis-flex" style="padding-left: 38px;">
+						<view class="comment-num" @click="showReply()">{{ item.list.length }}条回复</view>
+						<view style="color: #999999;font-size: 12px;">{{ item.createtime }}</view>
+					</view>
+					<view class="" v-show="item.list.length>0" style="padding-left: 38px;">
+						<view v-for="(items,indexs) in item.list" :key="indexs" class="dis-flex" style="padding: 4px 0px;" @click="replyShow(item.id, items.smid, item.list, items.reply_name)">
+							<view style="flex: 1;">
+								<span class="name" style="color: #4280c5;">{{ items.reply_name }}</span>
+								<span style="font-size: 13px;margin: 0px 2px;">回复</span>
+								<span class="name" style="color: #4280c5;">{{ items.name }}</span>
+								<span style="font-size: 13px;">:</span>
+								<span style="font-size: 13px;margin: 0px 2px;white-space: pre-wrap;word-break: break-all;">{{ items.content }}</span>
+							</view>
+							<view>
+								<text class="iconfont icon-bianji" v-if="myMid == items.smid" style="color: #80A9D6;font-size: 30upx;padding-right: 20upx;" @click.stop="xghuPopShow(items,index,indexs)"></text>
+								<text class="iconfont icon-delete" v-if="myMid == items.smid" style="color: #ff4444;font-size: 30upx;" @click.stop="deletehcomnt(items,index,indexs)"></text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view style="text-align: center;font-size: 14px;padding: 20px;" @click="showMoreComment">
+				<text style="color: #f00;" v-if="!commentText">查看更多评论</text>
+				<text v-else>{{commentText}}</text>
+			</view>
+		</view>
+		<view class="">
+			<view style="font-size: 18px;font-weight: bold;padding: 10px;color: #333;">热门推荐</view>
+			<view style="padding: 0px 10px;">
+				<block v-for="(item, index) in communityList" :key="index">
+					<view @click="toDetails(item.id)" style="border-bottom: 1px solid #efefef;">
+						<pic-text :info="item" :index="index" :stopVideo="stopVideo" :currentPlay="currentPlay" @changePlay="changePlay()"></pic-text>
+					</view>
+				</block>
+			</view>
+		</view>
+		<!-- 评论弹窗 -->
+		<view style="width: 100%;height: 100%;position: fixed;top: 0;left: 0;z-index:9;
+		background-color: rgba(0,0,0,.3);" v-if="rpShow" @click.stop="rpShow=false"></view>
+		<view class="reply-wrapper" v-if="rpShow">
+			<textarea @click.stop class="my-text" v-model="rpText" name="" id="" cols="30" rows="10" placeholder="回复"></textarea>
+			<button type="primary" style="margin: 20rpx 80rpx;border-radius: 50px;" @click.stop="reply">发送</button>
+		</view>
+	</view>
+</template>
+
+<script>
+// 这个页面参考 'pages/subPages/postDetails/postDetails?id='
+import App from '@/common/js/app.js';
+
+import picText from "@/components/template/pic_text/pic_text.vue"
+export default {
+	data() {
+		return {
+			detailinfo: {},
+			id: null,//帖子id
+			commentList: [],
+			commentPage: 1,
+			page_index: 10,
+			forwardTotal: 0,
+			commentTotal: null,
+			appreciateTotal: 0,
+			commentText: null,//文字“查看更多评论”
+			communityList: [],//热门推荐
+			page_index: 10,
+			indexShow: -1,
+			rpText: '',//回复。修改回复。修改评论弹出框
+			rpShow: false,
+			myMid: null,
+			items: [],
+			commentItem: {},//编辑评论时的信息
+			popType: "",//edReply编辑回复，edCom编辑评论
+			CommentNum: 1, //1增加评论，2删除评论
+			stopVideo: 0,
+			scrollLock: false,
+			scrollTimer: null,
+			currentPlay: -2,//当前正在播放的视频在列表中的索引,-2表示没有正在播放，-1是帖子详情的视频
+		}
+	},
+	components:{
+		picText
+	},
+	onLoad(e) {
+		let _this = this;
+		_this.id = e.id;
+		uni.setStorageSync('DetailsId',_this.id);
+		_this.poster = uni.getStorageSync('platformInfor').videoimg;
+		_this.myMid = uni.getStorageSync('userinfo').mid;
+		_this.examine = e.examine || 0;
+		uni.getStorage({
+			key: 'location',
+			success: function(res) {
+				_this.lat = res.data.latitude;
+				_this.lng = res.data.longitude;
+			}
+		});
+		
+		this.commentList = [];
+		this.init(this.id);
+		this.getHotList();
+	},
+	onShow() {
+	},
+	methods: {
+		init(id){
+			let _this = this,
+				client = App.getClientType();
+			_this.getCommentList(id);
+			let curLoction = uni.getStorageSync('curLoction'),
+				// 手动选择位置信息
+				agencyData = uni.getStorageSync('agencyData');
+			if (client === "1" || client === "3") {
+				if (!!curLoction) {
+					if (!!agencyData) {
+						_this.getDetailinfo(id, curLoction)
+					} else {
+						App.getAreaId(curLoction, "", "", (options) => {
+							console.log(options,'post1');
+							_this.getDetailinfo(id, curLoction)
+						})
+					}
+				} else {
+					if (!!agencyData) {
+						_this.getDetailinfo(id, _this.currentLoction)
+					} else {
+						App.getLocation().then(res => {
+							App.getAreaId(res, "", "", (options) => {
+								_this.$nextTick(function() {
+									_this.getDetailinfo(id, res)
+								})
+							});
+							_this.setData({
+								currentLoction: res
+							});
+							uni.setStorageSync('curLoction', res);
+						})
+					}
+				}
+			} else {
+				_this.getDetailinfo(id)
+			}
+		},
+		getCommentList(id){
+			let _this = this;
+			let data = {
+				id: _this.id || id,
+				page: _this.commentPage,
+				page_index: _this.page_index
+			};
+			App._post_form('&p=pocket&do=commentList', data, res => {
+				_this.commentList = [..._this.commentList, ...res.data.list];
+				_this.commentTotal = res.data.total;
+				if (_this.commentPage == res.data.total || res.data.list.length < 2) {
+					_this.commentText = '已无更多数据';
+				}else{
+					_this.commentText = null;
+				}
+			});
+		},
+		showMoreComment(){
+			let _this = this;
+			if (!_this.commentText) {
+				if (_this.page_index == 2) {
+					_this.page_index = 10;
+					let data = {
+						id: _this.id,
+						page: _this.commentPage,
+						page_index: _this.page_index
+					};
+					App._post_form('&p=pocket&do=commentList', data, res => {
+						_this.commentList = res.data.list;
+						_this.commentTotal = res.data.total;
+						if (_this.commentPage == res.data.total) {
+							_this.commentText = '已无更多数据';
+						}
+					});
+				} else {
+					_this.commentPage++;
+					_this.page_index = 10;
+					_this.getCommentList();
+				}
+			}
+		},
+		// 获取帖子详细信息
+		getDetailinfo(id = "", location = "") {
+			let _this = this;
+			let data = {
+				id: _this.id || id,
+				lat: !!location ? location.latitude : "",
+				lng: !!location ? location.longitude : "",
+				examine: _this.examine
+			};
+			App._post_form(
+				'&p=pocket&do=detail',
+				data,
+				res => {
+					let newData = {...res.data}
+					newData.comment_list = {total:newData.comment_total};//传给组件需要
+					newData.id = _this.id;//传给组件需要
+					_this.setData({
+						detailinfo: newData,
+					})
+				},
+				fail => {
+					if (fail.message == '掌上信息已关闭') {
+						App.navigationTo({
+							url: 'pages/mainPages/index/index'
+						});
+					}
+				}
+			);
+		},
+		getHotList(page = 1, isPage = false){
+			let _this = this;
+			let data = {
+				id: 0,//0对应掌上生活的全部类目
+				two_id: undefined,
+				page,
+				page_index: _this.page_index,
+				homeflag: 1,
+				keyword:'',
+			};
+			
+			App._post_form('&p=pocket&do=infoList', data, res => {
+				console.log(res, '--------------')
+				let list = [];
+				if (!isPage) {
+					if (res.data.list.length > 0) {
+						list = res.data.list;
+						list = list.sort(function(){// 乱序一下
+							return Math.random() - 0.5;
+						});
+						_this.setData({
+							communityList: list
+						})
+					} else {
+						
+					}
+				} else {
+					
+				};
+			});
+		},
+		lookimg(){},
+		operationShow(e) {},
+		getover(id,bor){},
+		changeCommentNum(data){
+			if(this.CommentNum === 1){
+				this.commentList.unshift(data);
+				let newData = {...this.detailinfo}
+				newData.comment_list.total++;//传给组件需要
+				this.setData({
+					detailinfo: newData,
+				})
+			}else{
+				let newData = {...this.detailinfo}
+				newData.comment_list.total--;//传给组件需要
+				this.setData({
+					detailinfo: newData,
+				})
+				this.CommentNum = 1;
+			}
+		},
+		// 打开编辑评论弹框
+		editCommentShow(item,index){
+			let _this = this;
+			_this.commentItem = item;
+			_this.commentItem.index = index;
+			_this.rpText = item.content;
+			_this.rpShow = true;
+			_this.popType = 'edCom';
+		},
+		// 修改评论
+		changeComment(){
+			let _this = this;
+			if(_this.rpText == _this.commentItem.content){
+				uni.showToast({
+					icon:'none',
+					title:'请先进行修改'
+				});
+				return
+			}
+			let datas = {
+				id:_this.commentItem.id,
+				type:1,
+				text:_this.rpText
+			}
+			App._post_form('&p=pocket&do=changeComment', datas, res =>{
+				uni.showToast({
+					title: '修改成功'
+				})
+				_this.commentList.map((item,index)=>{
+					if(index == _this.commentItem.index){
+						item.content = _this.rpText
+					}
+				});
+				_this.rpText = '';
+				_this.rpShow = false;
+				_this.commentItem = {};
+			})
+		},
+		/** 删除评论
+		 * @param {Object} item
+		 * @param {Object} index
+		 */
+		deleteComt(item,index){
+			let _this = this;
+			let datas = {
+				id:item.id,
+				type:0
+			}
+			App.showError(
+				`确认删除此条评论?`,
+				data => {
+					if (data.confirm) {
+						App._post_form('&p=pocket&do=changeComment', datas, res => {
+							// _this.plShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.commentList.map((items,indexs)=>{
+									if(index == indexs){
+										_this.commentList.splice(indexs,1);
+									}
+								});
+								_this.CommentNum = 2;
+								_this.changeCommentNum();
+							})
+						},fail=>{
+						});
+					}
+				},
+				true
+			);
+		},
+		// 打开回复弹窗
+		replyShow(cid, amid, items, name) {
+			let _this = this;
+			_this.rpShow = true;
+			_this.cid = cid;//主评论id
+			_this.amid = amid;//任意被回复用户的id
+			_this.items = items;//主评论的回复列表
+			_this.name = name;//任意被回复用户的name
+			console.info(_this.items);
+		},
+		// 发送回复、编辑回复、编辑评论
+		reply(){
+			if(this.commentItem.content){// 编辑
+				if(this.popType=='edReply'){
+					this.changeReply();
+					return;
+				}else if(this.popType=='edCom'){
+					this.changeComment();
+					return;
+				}
+			}
+			let _this = this;
+			let data = {
+				id: _this.id,//帖子id
+				cid: _this.cid,//主评论id
+				amid: _this.amid,//任意被回复用户的id
+				text: _this.rpText
+			};
+			App._post_form('&p=pocket&do=reply', data, res => {
+				_this.rpShow = false;
+				// _this.isComment = false;
+				let arr = {
+					content: _this.rpText,
+					reply_name: uni.getStorageSync('userinfo').nickname,
+					name: _this.name,//任意被回复用户的name
+					smid:_this.myMid,//写回复用户的id
+					id:res.data
+				};
+				console.info(_this.items);
+				_this.items.push(arr);
+				_this.rpText = '';
+				uni.showToast({
+					title: res.message,
+					icon: 'none'
+				})
+			});
+		},
+		/** 打开编辑回复弹窗
+		 * @param {Object} data 回复的信息
+		 * @param {Object} index 主评论的索引
+		 * @param {Object} indexs 回复信息的索引
+		 */
+		xghuPopShow(data,index,indexs){
+			let _this = this;
+			_this.commentItem = data;
+			_this.commentItem.index = index;
+			_this.commentItem.indexs = indexs;
+			_this.rpText = data.content;
+			_this.rpShow = true;
+			console.log(this.commentItem);
+			_this.popType = 'edReply';
+		},
+		/** 修改回复
+		 * @param {Object} type
+		 */
+		changeReply(type){
+			let _this = this,
+			data = {
+				id: _this.commentItem.id,
+				type: 1,
+				text: _this.rpText
+			};
+			App._post_form('&p=pocket&do=changeReply', data, res => {
+				_this.rpShow = false;
+				uni.showToast({
+					title:'修改成功'
+				});
+				_this.commentList.map((item,index)=>{
+					if(index == _this.commentItem.index){
+						item.list.map((items,indexs)=>{
+							if(indexs == _this.commentItem.indexs){
+								items.content = _this.rpText;
+							}
+						})
+					}
+				})
+				_this.rpText = '';
+				_this.commentItem = {};
+			});
+		},
+		/** 删除回复
+		 * @param {Object} item
+		 * @param {Object} index
+		 * @param {Object} indexs
+		 */
+		deletehcomnt(item,index,indexs){
+			let _this = this;
+			let datas = {
+				id:item.id,
+				type:0
+			}
+			App.showError(
+				`确认删除此条评论?`,
+				data => {
+					if (data.confirm) {
+						App._post_form('&p=pocket&do=changeReply', datas, res => {
+							// _this.plShow = false;
+							App.showSuccess('删除成功', () => {
+								_this.commentList.map((items,i)=>{
+									if(index == i){
+										items.list.map((itemss,indexss)=>{
+											if(indexss == indexs){
+												_this.commentList[i].list.splice(indexs,1);
+											}
+										})
+										
+									}
+								})
+							})
+						},fail=>{
+							// _this.isComment = false;
+						});
+					}
+				},
+				true
+			);
+		},
+		like(item){
+			App._post_form('&p=pocket&do=fabulousReply', {id: item.id}, res => {
+				if(item.is_fabulous){
+					uni.showToast({
+						title: '取消成功',
+						icon:'none'
+					})
+					item.likenum--;
+					item.is_fabulous = false;
+				}else{
+					uni.showToast({
+						title: '点赞成功',
+						icon:'none'
+					})
+					item.likenum++;
+					item.is_fabulous = true;
+				}
+			})
+		},
+		// 跳转正文详情
+		toDetails(id){
+			uni.navigateTo({
+				url:"/pagesA/pictureTextDetails/pictureTextDetails?id=" + id
+			})
+		},
+		toHomePage(mid){
+			App.navigationTo({
+				url: 'pages/subPages/homepage/homepage/homepage?mid=' + mid + '&checkType=' + 1
+			});
+		},
+		handlerScroll(){
+			if(this.scrollLock){
+				clearTimeout(this.scrollTimer);
+			}
+			this.scrollTimer = setTimeout(()=>{
+				this.scrollLock = false;
+				this.stopVideo++;
+			}, 500)
+		},
+		changePlay(e){
+			this.stopVideo++;//先关闭上一个播放的按钮，再改变当前播放索引=最新播放视频索引
+			this.currentPlay = e;
+		}
+	},
+	onShareAppMessage(res){
+		let _this = this;
+		if (res.from === 'button') {// 来自页面内分享按钮
+			let listId = res.target.id;
+			let title = res.target.dataset.title;
+			App._post_form('&p=pocket&do=shareNum', { id: listId }, res => {
+				if(listId == _this.id){
+					_this.detailinfo.share++;
+				}else{
+					for(let index=0;index<_this.communityList.length;index++){
+						if(_this.communityList[index].id == listId){
+							_this.communityList[index].share++;
+						}
+					}
+				}
+				setTimeout(()=>{
+					uni.showToast({
+						icon: 'none',
+						title: '分享成功',
+						duration: 2000
+					});
+				}, 2000)
+			});
+			return {
+				title: '粤职才',
+				path: '/pagesA/pictureTextDetails/pictureTextDetails?id='+listId
+			}
+		}else{
+			return {
+				title: '粤职才',
+				path: '/pages/mainPages/index/index'
+			}
+		}
+	},
+	onPageScroll(){
+		//页面滚动，视频暂停
+		this.scrollLock = true;
+		this.handlerScroll();
+	},
+}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.comment-item{
+	padding: 10px 0px;
+	border-bottom: 1px solid #efefef;
+	.avatar2{
+		width: 30px;
+		height: 30px;
+		background-color: #000;
+		border-radius: 50%;
+		margin-right: 8px;
+	}
+	.name{
+		font-size: 13px;
+		flex: 1;
+	}
+	.comment-num{
+		padding: 2px 8px;
+		border-radius: 20px;
+		background-color: #efefef;
+		margin-right: 8px;
+		font-size: 13px;
+	}
+}
+.reply-wrapper{
+	position: fixed;
+	top: 50%;
+	left: 50%;
+	z-index: 9;
+	width: 560rpx;
+	height: 430rpx;
+	background-color: #fff;
+	border-radius: 20px;
+	transform: translate(-50%, -50%);
+	box-shadow: 0px 0px 3px 0px rgba(0,0,0,.05);
+	
+	.my-text{
+		padding: 50rpx 30rpx;
+		width: 100%;
+		box-sizing: border-box;
+	}
+}
+</style>
diff --git a/pagesA/rule_center/rule_center.vue b/pagesA/rule_center/rule_center.vue
new file mode 100644
index 0000000..63cf257
--- /dev/null
+++ b/pagesA/rule_center/rule_center.vue
@@ -0,0 +1,101 @@
+<template>
+	<view style="min-height: 100vh;background-color: #f8f8f8;box-sizing: border-box;">
+		<view class="content_wrapper">
+			<view v-for="(item,index) in dataList" :key="item.id" class="list-item" @click="toDetail(item.id)">
+				<image :src="item.img" mode="aspectFill"></image>
+				<!-- <view class="text-box">
+					<view style="font-size: 14px;line-height: 22px;font-weight: bold;">{{item.title}}</view>
+					<view class="text" v-html="item.describe"></view>
+					<view class="text">{{item.publish_time}}</view>
+				</view> -->
+			</view>
+			<view class="" v-if="dataList.length==0">
+				<loadmore :isMore="true" v-if="dataList.length=='0'" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import App from '@/common/js/app.js';
+	import loadmore from '@/components/template/loadmore.vue'
+	export default {
+		data() {
+			return {
+				page: 1,
+				dataList: []
+			}
+		},
+		components: {
+			loadmore
+		},
+		onShow() {
+			this.getList();
+		},
+		methods: {
+			getList(){
+				let _this = this;
+				App._post_form('&p=member&do=getRuleCenterList', {page:_this.page, pageSize: 10}, res => {
+					if(_this.page===1){
+						if(res.data.data.length>0){
+							_this.setData({
+								dataList: res.data.data
+							})
+						}
+					}else{
+						if(res.data.data.length>0){
+							let dataList = _this.dataList.concat(res.data.data);
+							_this.setData({
+								dataList
+							})
+						}
+					}
+				}, false, err=>{
+					
+				});
+			},
+			toDetail(id){
+				// uni.navigateTo({
+				// 	url:'/pagesA/campusActivities/campusActivities?id='+id
+				// })
+			}
+		},
+		onReachBottom(){
+			this.page++;
+			this.getList();
+		}
+	}
+</script>
+
+<style lang="scss">
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.content_wrapper{
+	padding: 10px 15px;
+	.list-item{
+		display: flex;
+		padding: 15px 0px;
+		border-bottom: 1px solid #efefef;
+	}
+	image{
+		width: 660upx;
+		height: 220upx;
+		border-radius: 40upx;
+		margin: 0px auto;
+	}
+	.text-box{
+		flex: 1;
+		overflow: hidden;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+	}
+	.text{
+		display: -webkit-box;//将盒子转换为弹性盒子
		-webkit-box-orient: vertical;//文本显示方式，默认水平
		-webkit-line-clamp: 2;//设置显示多少行
		overflow: hidden;
+		font-size: 13px;
+		color: #999;
+	}
+}
+</style>
diff --git a/pagesA/studentIdentification/studentIdentification.vue b/pagesA/studentIdentification/studentIdentification.vue
new file mode 100644
index 0000000..40ddaab
--- /dev/null
+++ b/pagesA/studentIdentification/studentIdentification.vue
@@ -0,0 +1,512 @@
+<template>
+	<view class="personAttestation">
+		<far-bottom></far-bottom>
+		<scroll-view :style="{ height: phoneHight }" :scroll-y="true">
+			<view class="mainView absolute0">
+				<!-- 基本信息 -->
+				<view class="informationView marginAuto">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">学生信息</text>
+						</view>
+						<view class="marginT29">
+							<view class="inputView">
+								<text class="colorBlack font24 verticalM">姓名</text>
+								<input placeholder="请输入真实姓名" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="studInfo.name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">学校名称</text>
+								<input placeholder="请输入学校名称" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="studInfo.school_name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">院系</text>
+								<input placeholder="请输入院系" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="studInfo.department_name" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">学号</text>
+								<input placeholder="请输入学号" class="colorBlack font24 inlineBlock verticalM p0p50" v-model="studInfo.code" />
+							</view>
+							<view class="inputView marginT18">
+								<text class="colorBlack font24 verticalM">入学时间</text>
+								<!-- <input placeholder="请选择入学时间" class="colorBlack font24 inlineBlock verticalM p0p50" type="number" v-model="studInfo.start_date" /> -->
+								<view class="colorBlack font24 inlineBlock verticalM p0p50" style="height: 100%;width: 400upx;">
+									<uni-datetime-picker type="date" :clear-icon="false" v-model="studInfo.start_date" @maskClick="maskClick"
+									 @change="changeDate" placeholder="请选择" />
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 基本信息 -->
+				<!-- 上传证件 -->
+				<view class="uploadView marginAuto marginT35">
+					<view class="p30">
+						<view>
+							<view class="line inlineBlock verticalM"></view>
+							<text class="colorBlack font28 verticalM marginL10">学生证件</text>
+						</view>
+						<view class="marginT29 flex">
+							<view class="uploadButton inlineBlock textC" @click="uploadFiles()" v-if="studInfo.certificate_img == '' || studInfo.certificate_img == undefined">
+								<image :src="sfzZ" class="upLoadImg marginT30auto"></image>
+							</view>
+							<view class="uploadButton inlineBlock textC" v-else @click="uploadFiles(1)"><image :src="studInfo.certificate_img" class="imageHave"></image></view>
+						</view>
+					</view>
+				</view>
+				<!-- 上传证件 -->
+				
+				<!-- 协议 -->
+				<view class="marginT40" v-if="0">
+					<view class="pL30">
+						<view class="bor1gray" v-if="agree == false" @click="agree = true"></view>
+						<image :src="imgfixUrls + 'merchant/tyXy.png'" class="image22" v-if="agree == true" @click="agree = false"></image>
+						<text class="font24 color999999 marginL10"  @click="agree = !agree">阅读并同意</text>
+						<text class="font24 color4F6D8C" @click="showPop">《用户协议条款》</text>
+					</view>
+				</view>
+				<!-- 协议 -->
+
+				<!-- 提交按钮 -->
+				<!-- <view class="marginT70auto textC" :class="agree == true ? 'submitButton' : 'submitButton1'" @click="setInfo"> -->
+				<view class="marginT70auto textC submitButton" @click="setInfo">
+					<text class="lineHeight80 colorW font28">提交认证申请</text>
+				</view>
+				<!-- 提交按钮 -->
+				<!-- <popAgreement :show="show" @clickmask="closePop" :buttonColor="buttonColor" :textInfo="userInfo.agreement"></popAgreement> -->
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+// #ifdef H5
+import wxApi from '@/common/js/wxApi.js';
+// #endif
+// import popAgreement from '@/components/template/popAgreement';
+export default {
+	components: {
+		// popAgreement
+	},
+	data() {
+		return {
+			agree: false,
+			phoneHight: null,
+			show: false,
+			buttonColor: 'rgba(255,68,68,1)',
+			userInfo: {},
+			studInfo: {
+				start_date: '',
+				certificate_img: '',
+				id: null
+			},
+			id: null
+		};
+	},
+	computed: {
+		grrzBack() {
+			let _this = this;
+			return _this.imageRoot + 'grrzBack.png';
+		},
+		sfzZ() {
+			let _this = this;
+			return _this.imageRoot + 'sfzZ.png';
+		},
+		sfzB() {
+			let _this = this;
+			return _this.imageRoot + 'sfzB.png';
+		}
+	},
+	onLoad(e) {
+		let _this = this;
+		uni.getSystemInfo({
+			success(res) {
+				_this.phoneHight = res.windowHeight + 'px';
+			}
+		});
+		uni.getStorage({
+			key: 'userinfo',
+			success: async function(res) {
+				_this.init(res.data.mid);
+				_this.id = res.data.mid;
+			}
+		});
+	},
+	methods: {
+		init(mid) {
+			let _this = this;
+			// #ifdef H5
+			wxApi.wxRegister();
+			// #endif
+			_this.getInfo(mid);
+		},
+		// 信息设置接口
+		getInfo(mid) {
+			let _this = this;
+			let data = {
+				// type: 1,
+				mid: mid
+				// operation: 'get'
+			};
+			App._post_form('&p=student&do=studentIdentityIndex', data, res => {
+				_this.setData({
+					studInfo: res.data
+				})
+				console.log(_this.studInfo)
+			});
+		},
+		setInfo() {
+			let _this = this;
+			let data = {
+				// type: 1,
+				// sid: _this.id,
+				// operation: 'set',
+				name: _this.studInfo.name,
+				school_name: _this.studInfo.school_name,
+				department_name: _this.studInfo.department_name,
+				code: _this.studInfo.code,
+				start_date: _this.studInfo.start_date,
+				certificate_img: _this.studInfo.img,
+				id: _this.studInfo.id,
+			};
+			if(_this.studInfo.name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '姓名不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.school_name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '学校名称不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.department_name==''){
+				uni.showToast({
+					icon:'none',
+				    title: '院系不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.code==''){
+				uni.showToast({
+					icon:'none',
+				    title: '学号不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.start_date==''){
+				uni.showToast({
+					icon:'none',
+				    title: '入学时间不能为空',
+				    duration: 2000
+				});
+				return ;
+			}
+			if(_this.studInfo.img==''){
+				uni.showToast({
+					icon:'none',
+				    title: '请上传证件',
+				    duration: 2000
+				});
+				return ;
+			}
+			setTimeout(()=>{
+				App._post_form('&p=student&do=studentIdentityAttestation',data, res => {
+					if(res.errno==0){
+						uni.showToast({
+							title: res.message
+						})
+						setTimeout(()=>{
+							uni.navigateBack({
+								delta:1
+							})
+						}, 2000)
+					}
+				}, (err)=>{
+					if(err.data.message=='认证已成功，请勿重复申请认证'){
+						uni.navigateBack({
+							delta: 1
+						})
+					}
+				}, ()=>{
+					console.log('complete');
+				});
+			})
+		},
+		// 文件上传接口
+		async uploadFiles(type=1) {
+			let _this = this;
+			// #ifdef H5
+			if(App.getClientType() == 2){
+			     let res = await App.browser_upload(6);
+			     for (let i = 0; i < res.tempFilePaths.length; i++) {
+			     	let aa = await App._upLoad(res.tempFilePaths[i]);
+			     	if (type == 1) {
+			     		_this.studInfo.pic.splice(0, 1, aa.data.image);
+			     		_this.picArray.splice(0, 1, aa.data.img);
+			     	} else {
+			     		_this.studInfo.pic.splice(1, 1, aa.data.image);
+			     		_this.picArray.splice(1, 1, aa.data.img);
+			     	}
+			     }
+			
+			     return
+			    }
+			wxApi.choseImage(res => {
+				wxApi.uoloadIg(res.localIds[0], data => {
+					if (data.errMsg === 'uploadImage:ok') {
+						uni.showLoading({});
+						let requestData = {
+							upload_type: 2,
+							id: data.serverId
+						};
+						App._post_form(
+							'&do=uploadFiles',
+							requestData,
+							res => {
+								if (res.errno === 0) {
+									if (type == 1) {
+										_this.studInfo.pic.splice(0, 1, res.data.image);
+										_this.picArray.splice(0, 1, res.data.img);
+									} else {
+										_this.studInfo.pic.splice(1, 1, res.data.image);
+										_this.picArray.splice(1, 1, res.data.img);
+									}
+								}
+							},
+							false,
+							() => {
+								uni.hideLoading();
+							}
+						);
+					} else {
+						uni.hideLoading();
+						App.showError('上传失败');
+					}
+				});
+			});
+			// #endif
+			// #ifndef H5
+			wx.chooseImage({
+				count: 6,
+				sourceType: ['album', 'camera'],
+				success: async function(res) {
+					for (let i = 0; i < res.tempFilePaths.length; i++) {
+						let result = await App._MYupLoad(res.tempFilePaths[i]);
+						console.log(result)
+						_this.studInfo.certificate_img = result.data.img;
+						_this.studInfo.img = result.data.image;
+						console.log(_this.studInfo.certificate_img, _this.studInfo.img, '1222')
+						console.log(result.data.img, result.data.image, '12233');
+						uni.showToast({
+							title: result.message
+						})
+					}
+				}
+			});
+			// #endif
+		},
+		closePop() {
+			let _this = this;
+			_this.show = false;
+		},
+		showPop() {
+			let _this = this;
+			_this.show = true;
+		},
+		changeDate(e){
+			console.log(e);
+			this.studInfo.start_date = e;
+		},
+		maskClick(){
+			
+		}
+	}
+};
+</script>
+
+<style lang="less" scoped>
+.submitButton1 {
+	width: 690upx;
+	height: 80upx;
+	background: #999999;
+	border-radius: 40upx;
+	pointer-events: none;
+}
+.bor1gray {
+	width: 21upx;
+	height: 21upx;
+	display: inline-block;
+	background: white;
+	border: 1upx solid #999999;
+	border-radius: 50%;
+}
+.personAttestation {
+	padding-bottom: 100upx;
+	font-size: 0;
+	background-color: #f8f8f8;
+}
+.wid750 {
+	width: 750upx;
+	height: 340upx;
+}
+.informationView {
+	width: 690upx;
+	height: 600upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+	margin-top: 10px!important;
+}
+.marginAuto {
+	margin: auto;
+}
+.absolute0 {
+	// position: absolute;
+	// top: 179upx;
+	width: 750upx;
+}
+.line {
+	width: 8upx;
+	height: 27upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 4upx;
+}
+.colorBlack {
+	color: rgba(51, 51, 51, 1);
+}
+.font28 {
+	font-size: 28upx;
+}
+.font24 {
+	font-size: 24upx;
+}
+.inlineBlock {
+	display: inline-block;
+}
+.verticalM {
+	vertical-align: middle;
+}
+.marginL10 {
+	margin-left: 10upx;
+}
+.p30 {
+	padding: 30upx;
+}
+.pL30 {
+	padding: 0 30upx;
+}
+.marginT29 {
+	margin-top: 29upx;
+}
+.marginT40 {
+	margin-top: 40upx;
+}
+.inputView {
+	width: 630upx;
+	height: 83upx;
+	background: rgba(250, 250, 250, 1);
+	border-radius: 10upx;
+	> text {
+		display: inline-block;
+		line-height: 83upx;
+		width: 126upx;
+		text-align: right;
+		position: relative;
+	}
+	> text::before {
+		content: '*';
+		position: absolute;
+		top: 2px;
+		left: 6px;
+		color: #f00;
+	}
+	> input {
+		height: 100%;
+		width: 400upx;
+	}
+}
+.marginT18 {
+	margin-top: 18upx;
+}
+.marginT35 {
+	margin-top: 35upx;
+}
+.marginT30auto {
+	margin: 30upx auto 0 auto;
+}
+.p0p50 {
+	padding: 0 50upx;
+}
+.uploadView {
+	width: 690upx;
+	height: 379upx;
+	background: rgba(255, 255, 255, 1);
+	border-radius: 10upx;
+}
+.uploadButton {
+	width: 290upx;
+	height: 200upx;
+	background: rgba(248, 248, 248, 1);
+	border-radius: 10upx;
+}
+.imageHave {
+	width: 290upx;
+	height: 263upx;
+}
+.flex {
+	display: flex;
+	justify-content: space-between;
+}
+.upLoadImg {
+	width: 212upx;
+	height: 141upx;
+}
+.color999999 {
+	color: rgba(153, 153, 153, 1);
+}
+.color4F6D8C {
+	color: #4f6d8c;
+}
+.textC {
+	text-align: center;
+}
+.image22 {
+	width: 22upx;
+	height: 22upx;
+}
+.submitButton {
+	width: 690upx;
+	height: 80upx;
+	background: rgba(255, 68, 68, 1);
+	border-radius: 40upx;
+}
+.marginT70auto {
+	margin: 70upx auto 20upx auto;
+}
+.lineHeight80 {
+	line-height: 80upx;
+}
+.colorW {
+	color: rgba(255, 255, 255, 1);
+}
+/deep/ .uni-date-x--border{
+	border: none;
+}
+/deep/ .uni-date-x{
+	background-color: transparent;
+}
+/deep/ .uni-date__x-input{
+	line-height: 40px;
+}
+.icon-calendar:before {
+	content: none;
+}
+</style>
diff --git a/pagesA/topSearch/topSearch.vue b/pagesA/topSearch/topSearch.vue
new file mode 100644
index 0000000..c6917f8
--- /dev/null
+++ b/pagesA/topSearch/topSearch.vue
@@ -0,0 +1,163 @@
+<template>
+	<view style="padding-top: 80px;">
+		<view class="status_bar">
+			<!-- 这里是状态栏 -->
+		</view>
+		<view class="dis-flex top-nav">
+			<view class="back" @click="back"></view>
+			<!-- <view class="dis-flex input-box">
+				<uni-icons type="search"></uni-icons>
+				<input type="text" placeholder="请输入关键字进行搜索">
+			</view> -->
+			<view class="title">
+				热搜榜单
+			</view>
+			<view style="width: 40px;"></view>
+		</view>
+		<view class="">
+			<view class="list-box">
+				<view class="title">热搜</view>
+				<view class="list-content">
+					<view class="dis-flex list-item" v-for="(item, index) in hotSearchData" @click="toSubject(item)">
+						<view class="" :class="index<3?'red':'yellow'">{{index+1}}</view>
+						<view class="text11">{{item}}</view>
+						<view class="red_bg" v-if="index<2">热</view>
+						<view class="yellow_bg" v-else-if="index<4">新</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import App from '@/common/js/app.js';
+export default {
+	data() {
+		return {
+			hotSearchData:[]
+		};
+	},
+	onShow() {
+		this.getinfoHot();
+	},
+	methods: {
+		back(){
+			uni.navigateBack({
+				delta: 1
+			})
+		},
+		toSubject(t){
+			uni.navigateTo({
+				url:"/pagesA/commentSubject/commentSubject?keyword="+t
+			})
+		},
+		// 热门话题
+		getinfoHot(){
+			let _this = this;
+			App._post_form('&do=GetPlatformInfor&type=2', {}, res => {
+				_this.setData({
+					hotSearchData: res.data.data
+				});
+			}, false, () => {
+				
+			})
+		},
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.status_bar {
+	width: 100%;
+	height: var(--status-bar-height);
+	padding-bottom: 15px;
+	background-color: #fff;
+	position: fixed;
+	top: 0px;
+	z-index: 99;
+}
+.dis-flex{
+	display: flex;
+	align-items: center;
+}
+.top-nav{
+	width: 100vw;
+	position: fixed;
+	top: 40px;
+	background: #fff;
+	border-bottom: 1px solid #efefef;
+	z-index: 99;
+	.back{
+		width: 40px;
+		height: 40px;
+		position: relative;
+	}
+	.back::before{
+		content: '';
+		position: absolute;
+		top: 24rpx;
+		left: 45rpx;
+		width: 10px;
+		height: 10px;
+		border-top: 2px solid transparent;
+		border-left: 2px solid #333;
+		border-right: 2px solid transparent;
+		border-bottom: 2px solid #333;
+		transform: rotate(45deg);
+	}
+	.input-box{
+		width: 56vw;
+		height: 30px;
+		padding: 0 10px;
+		background-color: #f3f3f3;
+		border-radius: 15px;
+		font-size: 14px;
+	}
+	.title{
+		text-align: center;
+		flex: 1;
+	}
+}
+
+.list-box{
+	padding: 20rpx;
+	.title{
+		text-align: center;
+		font-size: 18px;
+		font-weight: bold;
+		margin: 10px;
+	}
+	.list-item{
+		line-height: 70rpx;
+		justify-content: space-between;
+		border-bottom: 1px solid #efefef;
+	}
+	.text11{
+		flex: 1;
+	}
+	.red{
+		color: #f00;
+		margin-right: 10px;
+	}
+	.yellow{
+		color: #ffd900;
+		margin-right: 10px;
+	}
+	.red_bg, .yellow_bg{
+		width: 22px;
+		height: 22px;
+		line-height: 22px;
+		color: #fff;
+		text-align: center;
+		border-radius: 4px;
+		font-size: 14px;
+	}
+	.red_bg{
+		background-color: #f00;
+	}
+	.yellow_bg{
+		background-color: #ffd900;
+	}
+}
+</style>
diff --git a/project.config.json b/project.config.json
new file mode 100644
index 0000000..f89aae2
--- /dev/null
+++ b/project.config.json
@@ -0,0 +1,29 @@
+{
+  "appid": "wx0c70dd5cbbd75583",
+  "compileType": "miniprogram",
+  "libVersion": "2.30.0",
+  "packOptions": {
+    "ignore": [],
+    "include": []
+  },
+  "setting": {
+    "coverView": true,
+    "es6": true,
+    "postcss": true,
+    "minified": true,
+    "enhance": true,
+    "showShadowRootInWxmlPanel": true,
+    "packNpmRelationList": [],
+    "babelSetting": {
+      "ignore": [],
+      "disablePlugins": [],
+      "outputPath": ""
+    },
+    "condition": false
+  },
+  "condition": {},
+  "editorSetting": {
+    "tabIndent": "insertSpaces",
+    "tabSize": 2
+  }
+}
\ No newline at end of file
diff --git a/project.private.config.json b/project.private.config.json
new file mode 100644
index 0000000..7cfc084
--- /dev/null
+++ b/project.private.config.json
@@ -0,0 +1,21 @@
+{
+  "description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
+  "projectname": "weliam-smartcity-smartcity-app-master",
+  "setting": {
+    "compileHotReLoad": true,
+    "urlCheck": false
+  },
+  "condition": {
+    "miniprogram": {
+      "list": [
+        {
+          "name": "",
+          "pathName": "pages/mainPages/index/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/siteinfo.json b/siteinfo.json
new file mode 100644
index 0000000..1c41d6e
--- /dev/null
+++ b/siteinfo.json
@@ -0,0 +1,8 @@
+{
+	"siteroot": "https://qingyuan.xingtongworld.com/", 
+	"uniacid": "1",
+	"base":"/addons/weliam_smartcity/h5/",
+	"routers":"/addons/weliam_smartcity/core/common/",
+	"name": "weliam_smartcity",
+	"weliamv": "1.0.0"
+}
diff --git a/static/Influencer-rafiki.png b/static/Influencer-rafiki.png
new file mode 100644
index 0000000..64edf2f
Binary files /dev/null and b/static/Influencer-rafiki.png differ
diff --git a/static/Learning-cuate.png b/static/Learning-cuate.png
new file mode 100644
index 0000000..8c173e3
Binary files /dev/null and b/static/Learning-cuate.png differ
diff --git a/static/Learning-pana.png b/static/Learning-pana.png
new file mode 100644
index 0000000..f3c397f
Binary files /dev/null and b/static/Learning-pana.png differ
diff --git a/static/chooseCade/BG.png b/static/chooseCade/BG.png
new file mode 100644
index 0000000..4b9c4c0
Binary files /dev/null and b/static/chooseCade/BG.png differ
diff --git a/static/chooseCade/biaoqing.png b/static/chooseCade/biaoqing.png
new file mode 100644
index 0000000..49fe31e
Binary files /dev/null and b/static/chooseCade/biaoqing.png differ
diff --git a/static/chooseCade/chooseCadecc.png b/static/chooseCade/chooseCadecc.png
new file mode 100644
index 0000000..6907e90
Binary files /dev/null and b/static/chooseCade/chooseCadecc.png differ
diff --git a/static/chooseCade/chooseCades.png b/static/chooseCade/chooseCades.png
new file mode 100644
index 0000000..6ae4d68
Binary files /dev/null and b/static/chooseCade/chooseCades.png differ
diff --git a/static/chooseCade/chooseCadex.png b/static/chooseCade/chooseCadex.png
new file mode 100644
index 0000000..fbc533c
Binary files /dev/null and b/static/chooseCade/chooseCadex.png differ
diff --git a/static/chooseCade/qian.png b/static/chooseCade/qian.png
new file mode 100644
index 0000000..67901eb
Binary files /dev/null and b/static/chooseCade/qian.png differ
diff --git a/static/chooseCade/reddogbg.png b/static/chooseCade/reddogbg.png
new file mode 100644
index 0000000..87050fb
Binary files /dev/null and b/static/chooseCade/reddogbg.png differ
diff --git a/static/home_123.png b/static/home_123.png
new file mode 100644
index 0000000..8d7c70e
Binary files /dev/null and b/static/home_123.png differ
diff --git a/static/hot_list_logo.png b/static/hot_list_logo.png
new file mode 100644
index 0000000..aae5029
Binary files /dev/null and b/static/hot_list_logo.png differ
diff --git a/static/icon_certificate.png b/static/icon_certificate.png
new file mode 100644
index 0000000..2c4c5a0
Binary files /dev/null and b/static/icon_certificate.png differ
diff --git a/static/icon_position.png b/static/icon_position.png
new file mode 100644
index 0000000..d60b492
Binary files /dev/null and b/static/icon_position.png differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..c4ddbaf
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/mb-plus.png b/static/mb-plus.png
new file mode 100644
index 0000000..b82cb2c
Binary files /dev/null and b/static/mb-plus.png differ
diff --git a/static/partner-rafiki.png b/static/partner-rafiki.png
new file mode 100644
index 0000000..90b3896
Binary files /dev/null and b/static/partner-rafiki.png differ
diff --git a/static/rule.png b/static/rule.png
new file mode 100644
index 0000000..1d15e2f
Binary files /dev/null and b/static/rule.png differ
diff --git a/store/actions.js b/store/actions.js
new file mode 100644
index 0000000..0c55d4c
--- /dev/null
+++ b/store/actions.js
@@ -0,0 +1,34 @@
+import App from "@/common/js/app.js"
+const action = {
+	getTabBarData({
+		commit
+	}) {
+		let _this = this;
+		App._post_form("&p=headline&do=headlineMenu", {}, res => {
+			commit("HIDDENTABBAR", true);
+			commit("SETTABBAR", res.data);
+			// let tabBarData = res.data[0],
+			// 	sotrList = res.data.name_list,
+			// 	checkList = tabBarData.checkList,
+			// 	data = tabBarData.menu.data,
+			// 	style = tabBarData.menu.style,
+			// 	list = [];
+			// for (let key in data) {
+			// 	let tabItem = data[key],
+			// 		item = {
+			// 			name: tabItem.name,
+			// 			pagePath: tabItem.linkurl,
+			// 			text: tabItem.text,
+			// 			iconPath: tabItem.iconPath.file_path,
+			// 			selectedIconPath: tabItem.iconactivePath.file_path,
+			// 		};
+			// 	list.push(item);
+			// }
+			// //不同平台底部菜单顺序调整
+			// list.sort((a, b) => {
+			// 	return sotrList.indexOf(a.name) - sotrList.indexOf(b.name);
+			// });
+		})
+	}
+}
+export default action
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..f583083
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,43 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+import mutations from './mutations'
+import actions from './actions.js'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+	state: {
+		appInfo: {},
+		aidCity: {
+			aid: '0',
+			cityname: ''
+		},
+		userInfo: '',
+		ruzhushow: false,
+		kefushow: false,
+		phoneshow: false,
+		advertShow: false,
+		advertFlag: false,
+		codetime: '',
+		orderList: '',
+		cmtShareAppMsg: '',
+		tabBar: null, //底部菜单数据
+		hiddenTabBar: false, //隐藏底部菜单
+		dealerInfo:{} ,//分销设置信息
+		recomid:null ,//推荐人id
+		istabcontro:0 ,//选项卡1
+		selectCity:0 ,// 第一次进来选择地址
+		wxlogin:0 ,// 微信判断第一次登陆
+		mpshareInfo : {} ,//微信公共分享,
+		isCardshare:0,
+		couplePacket:0, //新人红包
+		festivalPacket:0, // 节日红包
+		isWxAudit:true, //小程序审核判断
+		storePrice:{}//同城配送购物车数据
+	},
+	// actions,
+	mutations
+})
+
+export default store
diff --git a/store/mutation-types.js b/store/mutation-types.js
new file mode 100644
index 0000000..330c4fb
--- /dev/null
+++ b/store/mutation-types.js
@@ -0,0 +1,24 @@
+export const APPINFO = 'APPINFO'
+export const AIDCITY = 'AIDCITY'
+export const USERINFO = 'USERINFO'
+export const RUZHU = 'RUZHU'
+export const KEFU = 'KEFU'
+export const PHONE = 'PHONE'
+export const ADVERT = 'ADVERT'
+export const ADVERTFLAG = 'ADVERTFLAG'
+export const CODETIME = 'CODETIME'
+export const ORDERLIST = 'ORDERLIST'
+export const CMTSHAREAPPMSG = 'CMTSHAREAPPMSG'
+export const SETTABBAR = 'SETTABBAR'
+export const HIDDENTABBAR = 'HIDDENTABBAR'
+export const DEALERINFO = 'DEALERINFO'
+export const RECOMID = 'RECOMID'
+export const ISTABCONTRO = 'ISTABCONTRO'
+export const SELECTCITY = 'SELECTCITY'
+export const WXLOGIN = 'WXLOGIN'
+export const MPSHAREINFO = 'MPSHAREINFO'
+export const ISCARDSHARE = 'ISCARDSHARE'
+export const COUPLEPACKET = 'COUPLEPACKET'
+export const FESTIVALPACKET = 'FESTIVALPACKET'
+export const ISWXAUDIT = 'ISWXAUDIT'
+export const STOREPRICES = 'STOREPRICES'
diff --git a/store/mutations.js b/store/mutations.js
new file mode 100644
index 0000000..fab05a9
--- /dev/null
+++ b/store/mutations.js
@@ -0,0 +1,102 @@
+import {
+	APPINFO,
+	AIDCITY,
+	USERINFO,
+	RUZHU,
+	KEFU,
+	PHONE,
+	ADVERT,
+	ADVERTFLAG,
+	CODETIME,
+	ORDERLIST,
+	CMTSHAREAPPMSG,
+	SETTABBAR,
+	HIDDENTABBAR,
+	DEALERINFO,
+	RECOMID,
+	ISTABCONTRO,
+	SELECTCITY,
+	WXLOGIN,
+	MPSHAREINFO,
+	DEALERSHAREINFO,
+	ISCARDSHARE,
+	COUPLEPACKET,
+	FESTIVALPACKET,
+	ISWXAUDIT,
+	STOREPRICES
+} from './mutation-types'
+
+export default {
+	[APPINFO](state, val) {
+		state.appInfo = val
+	},
+	[AIDCITY](state, val) {
+		state.aidCity = val
+	},
+	[USERINFO](state, val) {
+		state.userInfo = val
+	},
+	[RUZHU](state, val) {
+		state.ruzhushow = val
+	},
+	[KEFU](state, val) {
+		state.kefushow = val
+	},
+	[PHONE](state, val) {
+		state.phoneshow = val
+	},
+	[ADVERT](state, val) {
+		state.advertShow = val
+	},
+	[ADVERTFLAG](state, val) {
+		state.advertFlag = val
+	},
+	[CODETIME](state, val) {
+		state.codetime = val
+	},
+	[ORDERLIST](state, val) {
+		state.orderList = val
+	},
+	[CMTSHAREAPPMSG](state, val) {
+		state.cmtShareAppMsg = val
+	},
+	[SETTABBAR](state, val) {
+		state.tabBar = val;
+	},
+	[HIDDENTABBAR](state, val) {
+		state.hiddenTabBar = val;
+	},
+	[DEALERINFO](state, val) {
+		state.dealerInfo = val;
+	},
+	[RECOMID](state, val) {
+		state.recomid = val;
+	},
+	[ISTABCONTRO](state, val) {
+		state.istabcontro = val
+	},
+	[SELECTCITY](state, val) {
+		state.selectCity = val;
+	},
+	[WXLOGIN](state, val) {
+		state.wxlogin = val;
+	},
+	[MPSHAREINFO](state, val) {
+		state.mpshareInfo = val;
+	},
+	[ISCARDSHARE](state,val){
+		state.isCardshare = val;
+	},
+	[COUPLEPACKET](state,val){
+		state.couplePacket = val;
+	},
+	[FESTIVALPACKET](state,val){
+		state.festivalPacket = val;
+	},
+	[ISWXAUDIT](state,val){
+		state.isWxAudit = val;
+	},
+	[STOREPRICES](state,val){
+		state.storePrice = val;
+	}
+}
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..f0f426c
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,76 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$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:24upx;
+$uni-font-size-base:28upx;
+$uni-font-size-lg:32upx;
+
+/* 图片尺寸 */
+$uni-img-size-sm:40upx;
+$uni-img-size-base:52upx;
+$uni-img-size-lg:80upx;
+
+/* Border Radius */
+$uni-border-radius-sm: 4upx;
+$uni-border-radius-base: 6upx;
+$uni-border-radius-lg: 12upx;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 10px;
+$uni-spacing-row-base: 20upx;
+$uni-spacing-row-lg: 30upx;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 8upx;
+$uni-spacing-col-base: 16upx;
+$uni-spacing-col-lg: 24upx;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:40upx;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:36upx;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:30upx;
\ 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..d737c8f
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/changelog.md
@@ -0,0 +1,130 @@
+## 2.2.21（2023-02-20）
+- 修复 firefox 浏览器显示区域点击无法拉起日历弹框的Bug [详情](https://ask.dcloud.net.cn/question/163362)
+## 2.2.20（2023-02-17）
+- 优化 值为空依然选中当天问题
+- 优化 提供 default-value 属性支持配置选择器打开时默认显示的时间
+- 优化 非范围选择未选择日期时间，点击确认按钮选中当前日期时间
+- 优化 字节小程序日期时间范围选择，底部日期换行问题
+## 2.2.19（2023-02-09）
+- 修复 2.2.18 引起范围选择配置 end 选择无效的Bug [详情](https://github.com/dcloudio/uni-ui/issues/686)
+## 2.2.18（2023-02-08）
+- 修复 移动端范围选择change事件触发异常的Bug [详情](https://github.com/dcloudio/uni-ui/issues/684)
+- 优化 PC端输入日期格式错误时返回当前日期时间
+- 优化 PC端输入日期时间超出 start、end 限制的Bug
+- 优化 移动端日期时间范围用法时间展示不完整问题
+## 2.2.17（2023-02-04）
+- 修复 小程序端绑定 Date 类型报错的Bug [详情](https://github.com/dcloudio/uni-ui/issues/679)
+- 修复 vue3 time-picker 无法显示绑定时分秒的Bug
+## 2.2.16（2023-02-02）
+- 修复 字节小程序报错的Bug
+## 2.2.15（2023-02-02）
+- 修复 某些情况切换月份错误的Bug
+## 2.2.14（2023-01-30）
+- 修复 某些情况切换月份错误的Bug [详情](https://ask.dcloud.net.cn/question/162033)
+## 2.2.13（2023-01-10）
+- 修复 多次加载组件造成内存占用的Bug
+## 2.2.12（2022-12-01）
+- 修复 vue3 下 i18n 国际化初始值不正确的Bug
+## 2.2.11（2022-09-19）
+- 修复 支付宝小程序样式错乱的Bug [详情](https://github.com/dcloudio/uni-app/issues/3861)
+## 2.2.10（2022-09-19）
+- 修复 反向选择日期范围，日期显示异常的Bug [详情](https://ask.dcloud.net.cn/question/153401?item_id=212892&rf=false)
+## 2.2.9（2022-09-16）
+- 可以使用 uni-scss 控制主题色
+## 2.2.8（2022-09-08）
+- 修复 close事件无效的Bug
+## 2.2.7（2022-09-05）
+- 修复 移动端 maskClick 无效的Bug [详情](https://ask.dcloud.net.cn/question/140824)
+## 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/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..1b1a2eb
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar-item.vue
@@ -0,0 +1,186 @@
+<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-primary: #007aff !default;
+
+	.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: darken($color: $uni-primary, $amount: 40%);
+	}
+
+	.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 {
+		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: $uni-primary;
+		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: $uni-primary;
+		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.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
new file mode 100644
index 0000000..560acc1
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/calendar.vue
@@ -0,0 +1,944 @@
+<template>
+	<view class="uni-calendar" @mouseleave="leaveCale">
+		<view v-if="!insert&&show" class="uni-calendar__mask" :class="{'uni-calendar--mask-show':aniMaskShow}"
+			@click="clean();maskClick()"></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>
+			</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 && hasTime" 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="timepickerStartTime" :end="timepickerEndTime" v-model="time"
+					:disabled="!tempSingleDate" :border="false" :hide-second="hideSecond" class="time-picker-style">
+				</time-picker>
+			</view>
+
+			<view v-if="!insert && range && hasTime" 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="timepickerStartTime" v-model="timeRange.startTime" :border="false"
+						:hide-second="hideSecond" :disabled="!tempRange.before" class="time-picker-style">
+					</time-picker>
+				</view>
+				<view style="line-height: 50px;">
+					<uni-icons type="arrowthinright" color="#999"></uni-icons>
+				</view>
+				<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="timepickerEndTime" 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-datetime-picker--btn" @click="confirm">{{confirmText}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { Calendar, getDate, getTime } from './util.js';
+	import calendarItem from './calendar-item.vue'
+	import timePicker from './time-picker.vue'
+
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const { t } = initVueI18n(i18nMessages)
+
+	/**
+	 * 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 是否选择月份为背景
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @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: ''
+			},
+      startPlaceholder: {
+        type: String,
+				default: ''
+			},
+			endPlaceholder: {
+				type: String,
+				default: ''
+			},
+			range: {
+				type: Boolean,
+				default: false
+			},
+			hasTime: {
+				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: ''
+					}
+				}
+			},
+      defaultValue: {
+        type: String,
+        default: ''
+      }
+		},
+		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) {
+					if (!this.range) {
+						this.tempSingleDate = newVal
+						setTimeout(() => {
+							this.init(newVal)
+						}, 100)
+					}
+				}
+			},
+			defTime: {
+				immediate: true,
+				handler(newVal) {
+					if (!this.range) {
+						this.time = newVal
+					} else {
+						this.timeRange.startTime = newVal.start
+						this.timeRange.endTime = newVal.end
+					}
+				}
+			},
+			startDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.resetSatrtDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			endDate(val) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.resetEndDate(val)
+				this.cale.setDate(this.nowDate.fullDate)
+				this.weeks = this.cale.weeks
+			},
+			selected(newVal) {
+				// 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setSelectInfo(this.nowDate.fullDate, newVal)
+				this.weeks = this.cale.weeks
+			},
+			pleStatus: {
+				immediate: true,
+				handler(newVal) {
+					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 {
+              // 字节小程序 watch 早于 created
+              if(!this.cale){
+                return
+              }
+
+							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: {
+			timepickerStartTime() {
+				const activeDate = this.range ? this.tempRange.before : this.calendar.fullDate
+				return activeDate === this.startDate ? this.selectableTimes.start : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.range ? this.tempRange.after : this.calendar.fullDate
+				return activeDate === this.endDate ? this.selectableTimes.end : ''
+			},
+			/**
+			 * 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({
+				selected: this.selected,
+				startDate: this.startDate,
+				endDate: this.endDate,
+				range: this.range,
+			})
+			// 选中某一天
+			this.init(this.date)
+		},
+		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()
+			},
+
+			// 蒙版点击事件
+			maskClick() {
+				this.$emit('maskClose')
+			},
+
+			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) {
+        // 字节小程序 watch 早于 created
+				if(!this.cale){
+					return
+				}
+				this.cale.setDate(date)
+				this.weeks = this.cale.weeks
+				this.nowDate = this.cale.getInfo(date)
+        this.calendar = {...this.nowDate}
+        if(!date){
+          // 优化date为空默认不选中今天
+          this.calendar.fullDate = ''
+          if(this.defaultValue && !this.range){
+            // 暂时只支持移动端非范围选择
+            const defaultDate = new Date(this.defaultValue)
+            const fullDate = getDate(defaultDate)
+            const year = defaultDate.getFullYear()
+            const month = defaultDate.getMonth()+1
+            const date = defaultDate.getDate()
+            const day = defaultDate.getDay()
+            this.calendar = {
+              fullDate,
+              year,
+              month,
+              date,
+              day
+            },
+            this.tempSingleDate = fullDate
+            this.time = getTime(defaultDate, this.hideSecond)
+          }
+        }
+			},
+			/**
+			 * 打开日历弹窗
+			 */
+			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) {
+        if(!this.range){
+					if(!this.calendar.fullDate){
+					  this.calendar = this.cale.getInfo(new Date())
+					  this.tempSingleDate = this.calendar.fullDate
+					}
+					if(this.hasTime && !this.time) {
+					  this.time = getTime(new Date(), this.hideSecond)
+					}
+				}
+				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
+				const beforeDate = new Date(this.cale.multipleStatus.before).getTime()
+				const afterDate = new Date(this.cale.multipleStatus.after).getTime()
+				if (beforeDate > afterDate && afterDate) {
+					this.tempRange.before = this.cale.multipleStatus.after
+					this.tempRange.after = this.cale.multipleStatus.before
+				} else {
+					this.tempRange.before = this.cale.multipleStatus.before
+					this.tempRange.after = this.cale.multipleStatus.after
+				}
+				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" >
+	$uni-primary: #007aff !default;
+
+	.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: $uni-primary;
+		/* #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;
+    /* #ifdef MP-TOUTIAO */
+    font-size: 16px;
+    /* #endif */
+		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: $uni-primary;
+		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/time-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
new file mode 100644
index 0000000..04113ac
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/time-picker.vue
@@ -0,0 +1,933 @@
+<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>
+	</view>
+</template>
+
+<script>
+	import { initVueI18n } from '@dcloudio/uni-i18n'
+	import i18nMessages from './i18n/index.js'
+	const {	t	} = initVueI18n(i18nMessages)
+
+	/**
+	 * 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',
+		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: {
+			// #ifndef VUE3
+			value: {
+				handler(newVal) {
+          if (newVal) {
+            this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+            this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+        handler(newVal) {
+          if (newVal) {
+						this.parseValue(this.fixIosDateFormat(newVal)) //兼容 iOS、safari 日期格式
+						this.initTime(false)
+					} else {
+						this.time = ''
+						this.parseValue(Date.now())
+					}
+				},
+				immediate: true
+			},
+			// #endif
+			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)) {
+					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)) {
+						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.time)
+				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 lang="scss">
+	$uni-primary: #007aff !default;
+
+	.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: $uni-primary;
+	}
+
+	.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;
+		line-height: 50px
+	}
+
+	.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..c6d93f2
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue
@@ -0,0 +1,1026 @@
+<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 class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+						<view class="uni-date__x-input">{{ displayValue || singlePlaceholderText }}</view>
+					</view>
+
+					<view v-else class="uni-date-x uni-date-range">
+            <uni-icons class="icon-calendar" type="calendar" color="#c0c4cc" size="22"></uni-icons>
+            <view class="uni-date__x-input text-center">{{ displayRangeValue.startDate || startPlaceholderText }}</view>
+
+            <view class="range-separator">{{rangeSeparator}}</view>
+
+            <view class="uni-date__x-input text-center">{{ displayRangeValue.endDate || endPlaceholderText }}</view>
+					</view>
+
+					<view v-if="showClearIcon" class="uni-date__icon-clear" @click.stop="clear">
+						<uni-icons type="clear" color="#c0c4cc" size="22"></uni-icons>
+					</view>
+				</view>
+			</slot>
+		</view>
+
+		<view v-show="pickerVisible" class="uni-date-mask--pc" @click="close"></view>
+
+		<view v-if="!isPhone" v-show="pickerVisible" ref="datePicker" class="uni-date-picker__container">
+			<view v-if="!isRange" class="uni-date-single--x" :style="pickerPositionStyle">
+				<view class="uni-popper__arrow"></view>
+
+				<view v-if="hasTime" class="uni-date-changed popup-x-header">
+					<input class="uni-date__input text-center" type="text" v-model="inputDate"
+						:placeholder="selectDateText" />
+
+					<time-picker type="time" v-model="pickerTime" :border="false" :disabled="!inputDate"
+						:start="timepickerStartTime" :end="timepickerEndTime" :hideSecond="hideSecond" style="width: 100%;">
+						<input class="uni-date__input text-center" type="text" v-model="pickerTime" :placeholder="selectTimeText"
+							:disabled="!inputDate" />
+					</time-picker>
+				</view>
+
+				<Calendar ref="pcSingle" :showMonth="false" :start-date="calendarRange.startDate"
+					:end-date="calendarRange.endDate" :date="calendarDate" @change="singleChange"
+          :default-value="defaultValue"
+					style="padding: 0 8px;" />
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text class="confirm-text" @click="confirmSingleChange">{{okText}}</text>
+				</view>
+			</view>
+
+			<view v-else class="uni-date-range--x" :style="pickerPositionStyle">
+				<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="timepickerStartTime" :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="timepickerEndTime" :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="calendarRange.startDate"
+            :end-date="calendarRange.endDate" :range="true" :pleStatus="endMultipleStatus"
+            @change="leftChange" @firstEnterCale="updateRightCale" style="padding: 0 8px;" />
+					<Calendar ref="right" :showMonth="false" :start-date="calendarRange.startDate"
+						:end-date="calendarRange.endDate" :range="true" @change="rightChange"
+						:pleStatus="startMultipleStatus" @firstEnterCale="updateLeftCale"
+						style="padding: 0 8px;border-left: 1px solid #F1F1F1;" />
+				</view>
+
+				<view v-if="hasTime" class="popup-x-footer">
+					<text @click="clear">{{clearText}}</text>
+					<text class="confirm-text" @click="confirmRangeChange">{{okText}}</text>
+				</view>
+			</view>
+		</view>
+
+		<Calendar v-if="isPhone" ref="mobile" :clearDate="false" :date="calendarDate" :defTime="mobileCalendarTime"
+			:start-date="calendarRange.startDate" :end-date="calendarRange.endDate" :selectableTimes="mobSelectableTime"
+      :startPlaceholder="startPlaceholder" :endPlaceholder="endPlaceholder"
+      :default-value="defaultValue"
+			:pleStatus="endMultipleStatus" :showMonth="false" :range="isRange" :hasTime="hasTime" :insert="false"
+			:hideSecond="hideSecond" @confirm="mobileChange" @maskClose="close" />
+	</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端适用）
+	 * @property {[String} defaultValue 选择器打开时默认显示的时间
+	 * @event {Function} change 确定日期时触发的事件
+	 * @event {Function} maskClick 点击遮罩层触发的事件
+	 * @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 i18nMessages from './i18n/index.js'
+  import { getDateTime, getDate, getTime, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat } from './util'
+
+	export default {
+		name: 'UniDatetimePicker',
+		options: {
+			virtualHost: true
+		},
+		components: {
+			Calendar,
+			TimePicker
+		},
+		data() {
+			return {
+				isRange: false,
+				hasTime: false,
+				displayValue: '',
+				inputDate: '',
+				calendarDate: '',
+				pickerTime: '',
+				calendarRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				displayRangeValue: {
+					startDate: '',
+					endDate: '',
+				},
+				tempRange: {
+					startDate: '',
+					startTime: '',
+					endDate: '',
+					endTime: ''
+				},
+				// 左右日历同步数据
+				startMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				endMultipleStatus: {
+					before: '',
+					after: '',
+					data: [],
+					fulldate: ''
+				},
+				pickerVisible: false,
+				pickerPositionStyle: null,
+				isEmitValue: false,
+				isPhone: false,
+				isFirstShow: true,
+        i18nT: () => {}
+			}
+		},
+		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
+			},
+      defaultValue: {
+        type: String,
+        default: ''
+      }
+		},
+		watch: {
+			type: {
+				immediate: true,
+				handler(newVal) {
+          this.hasTime = newVal.indexOf('time') !== -1
+					this.isRange = newVal.indexOf('range') !== -1
+				}
+			},
+			// #ifndef VUE3
+			value: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			// #ifdef VUE3
+			modelValue: {
+				immediate: true,
+				handler(newVal) {
+					if (this.isEmitValue) {
+						this.isEmitValue = false
+						return
+					}
+					this.initPicker(newVal)
+				}
+			},
+			// #endif
+			start: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.startDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.startTime = getTime(newVal)
+					}
+				}
+			},
+			end: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) return
+					this.calendarRange.endDate = getDate(newVal)
+					if (this.hasTime) {
+						this.calendarRange.endTime = getTime(newVal, this.hideSecond)
+					}
+				}
+			},
+		},
+		computed: {
+			timepickerStartTime() {
+				const activeDate = this.isRange ? this.tempRange.startDate : this.inputDate
+				return activeDate === this.calendarRange.startDate ? this.calendarRange.startTime : ''
+			},
+			timepickerEndTime() {
+				const activeDate = this.isRange ? this.tempRange.endDate : this.inputDate
+				return activeDate === this.calendarRange.endDate ? this.calendarRange.endTime : ''
+			},
+			mobileCalendarTime() {
+				const timeRange = {
+					start: this.tempRange.startTime,
+					end: this.tempRange.endTime
+				}
+				return this.isRange ? timeRange : this.pickerTime
+			},
+			mobSelectableTime() {
+				return {
+					start: this.calendarRange.startTime,
+					end: this.calendarRange.endTime
+				}
+			},
+			datePopupWidth() {
+				// todo
+				return this.isRange ? 653 : 301
+			},
+
+			/**
+			 * for i18n
+			 */
+			singlePlaceholderText() {
+				return this.placeholder || (this.type === 'date' ? this.selectDateText : this.selectDateTimeText)
+			},
+			startPlaceholderText() {
+				return this.startPlaceholder || this.startDateText
+			},
+			endPlaceholderText() {
+				return this.endPlaceholder || this.endDateText
+			},
+			selectDateText() {
+				return this.i18nT("uni-datetime-picker.selectDate")
+			},
+      selectDateTimeText() {
+        return this.i18nT("uni-datetime-picker.selectDateTime")
+      },
+			selectTimeText() {
+				return this.i18nT("uni-datetime-picker.selectTime")
+			},
+			startDateText() {
+				return this.startPlaceholder || this.i18nT("uni-datetime-picker.startDate")
+			},
+			startTimeText() {
+				return this.i18nT("uni-datetime-picker.startTime")
+			},
+			endDateText() {
+				return this.endPlaceholder || this.i18nT("uni-datetime-picker.endDate")
+			},
+			endTimeText() {
+				return this.i18nT("uni-datetime-picker.endTime")
+			},
+			okText() {
+				return this.i18nT("uni-datetime-picker.ok")
+			},
+			clearText() {
+				return this.i18nT("uni-datetime-picker.clear")
+			},
+			showClearIcon() {
+				return this.clearIcon && !this.disabled && (this.displayValue || (this.displayRangeValue.startDate && this.displayRangeValue.endDate))
+			}
+		},
+		created() {
+			this.initI18nT()
+      this.platform()
+		},
+		methods: {
+      initI18nT() {
+        const vueI18n = initVueI18n(i18nMessages)
+        this.i18nT = vueI18n.t
+      },
+			initPicker(newVal) {
+				if ((!newVal && !this.defaultValue) || Array.isArray(newVal) && !newVal.length) {
+					this.$nextTick(() => {
+						this.clear(false)
+					})
+					return
+				}
+
+				if (!Array.isArray(newVal) && !this.isRange) {
+          if(newVal){
+            this.displayValue = this.inputDate = this.calendarDate = getDate(newVal)
+            if (this.hasTime) {
+              this.pickerTime = getTime(newVal, this.hideSecond)
+              this.displayValue = `${this.displayValue} ${this.pickerTime}`
+            }
+          }else if(this.defaultValue){
+            this.inputDate = this.calendarDate = getDate(this.defaultValue)
+            if(this.hasTime){
+              this.pickerTime = getTime(this.defaultValue, this.hideSecond)
+            }
+          }
+				} else {
+					const [before, after] = newVal
+					if (!before && !after) return
+          const beforeDate = getDate(before)
+          const beforeTime = getTime(before, this.hideSecond)
+
+          const afterDate = getDate(after)
+          const afterTime = getTime(after, this.hideSecond)
+					const startDate = beforeDate
+					const endDate = afterDate
+					this.displayRangeValue.startDate = this.tempRange.startDate = startDate
+					this.displayRangeValue.endDate = this.tempRange.endDate = endDate
+
+					if (this.hasTime) {
+						this.displayRangeValue.startDate = `${beforeDate} ${beforeTime}`
+						this.displayRangeValue.endDate = `${afterDate} ${afterTime}`
+						this.tempRange.startTime = beforeTime
+						this.tempRange.endTime = afterTime
+					}
+					const defaultRange = {
+						before: beforeDate,
+						after: afterDate
+					}
+					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 { windowWidth } = uni.getSystemInfoSync()
+				this.isPhone = windowWidth <= 500
+				this.windowWidth = windowWidth
+			},
+			show() {
+				if (this.disabled) {
+					return
+				}
+				this.platform()
+				if (this.isPhone) {
+					this.$refs.mobile.open()
+					return
+				}
+				this.pickerPositionStyle = {
+					top: '10px'
+				}
+				const dateEditor = uni.createSelectorQuery().in(this).select(".uni-date-editor")
+				dateEditor.boundingClientRect(rect => {
+					if (this.windowWidth - rect.left < this.datePopupWidth) {
+						this.pickerPositionStyle.right = 0
+					}
+				}).exec()
+				setTimeout(() => {
+					this.pickerVisible = !this.pickerVisible
+					if (!this.isPhone && this.isRange && this.isFirstShow) {
+						this.isFirstShow = false
+						const {
+							startDate,
+							endDate
+						} = this.calendarRange
+						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.pickerVisible = false
+					this.$emit('maskClick', this.value)
+					this.$refs.mobile && this.$refs.mobile.close()
+				}, 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('update:modelValue', value)
+				this.$emit('input', value)
+				this.$emit('change', value)
+				this.isEmitValue = true
+			},
+			createTimestamp(date) {
+				date = fixIosDateFormat(date)
+				return Date.parse(new Date(date))
+			},
+			singleChange(e) {
+				this.calendarDate = this.inputDate = e.fulldate
+				if (this.hasTime) return
+				this.confirmSingleChange()
+			},
+			confirmSingleChange() {
+        if(!checkDate(this.inputDate)){
+					const now = new Date()
+          this.calendarDate = this.inputDate = getDate(now)
+					this.pickerTime = getTime(now, this.hideSecond)
+        }
+
+        let startLaterInputDate = false
+        let startDate, startTime
+        if(this.start) {
+          let startString = this.start
+          if(typeof this.start === 'number'){
+            startString = getDateTime(this.start, this.hideSecond)
+          }
+          [startDate, startTime] = startString.split(' ')
+          if(this.start && !dateCompare(startDate, this.inputDate)) {
+            startLaterInputDate = true
+            this.inputDate = startDate
+          }
+        }
+
+        let endEarlierInputDate = false
+        let endDate, endTime
+        if(this.end) {
+          let endString = this.end
+          if(typeof this.end === 'number'){
+            endString = getDateTime(this.end, this.hideSecond)
+          }
+          [endDate, endTime] = endString.split(' ')
+          if(this.end && !dateCompare(this.inputDate, endDate)) {
+            endEarlierInputDate = true
+            this.inputDate = endDate
+          }
+        }
+				if (this.hasTime) {
+          if(startLaterInputDate){
+            this.pickerTime = startTime || getDefaultSecond(this.hideSecond)
+          }
+          if(endEarlierInputDate){
+            this.pickerTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.pickerTime){
+            this.pickerTime = getTime(Date.now(), this.hideSecond)
+          }
+					this.displayValue = `${this.inputDate} ${this.pickerTime}`
+				} else {
+          this.displayValue = this.inputDate
+				}
+				this.setEmit(this.displayValue)
+				this.pickerVisible = 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
+
+          if(!before || !after){
+            return
+          }
+
+					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.displayValue = e.fulldate + ' ' + e.time
+					} else {
+						this.displayValue = e.fulldate
+					}
+					this.setEmit(this.displayValue)
+				}
+				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.pickerVisible = false
+					return
+				}
+        if(!checkDate(this.tempRange.startDate)){
+          this.tempRange.startDate = getDate(Date.now())
+        }
+        if(!checkDate(this.tempRange.endDate)){
+          this.tempRange.endDate = getDate(Date.now())
+        }
+
+				let start, end
+
+        let startDateLaterRangeStartDate = false
+        let startDateLaterRangeEndDate = false
+        let startDate, startTime
+        if(this.start) {
+          let startString = this.start
+          if(typeof this.start === 'number'){
+            startString = getDateTime(this.start, this.hideSecond)
+          }
+          [startDate,startTime] = startString.split(' ')
+          if(this.start && !dateCompare(this.start, this.tempRange.startDate)) {
+            startDateLaterRangeStartDate = true
+            this.tempRange.startDate = startDate
+          }
+          if(this.start && !dateCompare(this.start, this.tempRange.endDate)) {
+            startDateLaterRangeEndDate = true
+            this.tempRange.endDate = startDate
+          }
+        }
+        let endDateEarlierRangeStartDate = false
+        let endDateEarlierRangeEndDate = false
+        let endDate, endTime
+        if(this.end) {
+          let endString = this.end
+          if(typeof this.end === 'number'){
+            endString = getDateTime(this.end, this.hideSecond)
+          }
+          [endDate,endTime] = endString.split(' ')
+
+          if(this.end && !dateCompare(this.tempRange.startDate, this.end)) {
+            endDateEarlierRangeStartDate = true
+            this.tempRange.startDate = endDate
+          }
+          if(this.end && !dateCompare(this.tempRange.endDate, this.end)) {
+            endDateEarlierRangeEndDate = true
+            this.tempRange.endDate = endDate
+          }
+        }
+				if (!this.hasTime) {
+          start = this.displayRangeValue.startDate = this.tempRange.startDate
+					end = this.displayRangeValue.endDate = this.tempRange.endDate
+				} else {
+          if(startDateLaterRangeStartDate){
+            this.tempRange.startTime = startTime || getDefaultSecond(this.hideSecond)
+          }else if(endDateEarlierRangeStartDate){
+            this.tempRange.startTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.tempRange.startTime){
+            this.tempRange.startTime = getTime(Date.now(), this.hideSecond)
+          }
+
+          if(startDateLaterRangeEndDate){
+            this.tempRange.endTime = startTime || getDefaultSecond(this.hideSecond)
+          }else if(endDateEarlierRangeEndDate){
+            this.tempRange.endTime = endTime || getDefaultSecond(this.hideSecond)
+          }
+          if(!this.tempRange.endTime){
+            this.tempRange.endTime = getTime(Date.now(), this.hideSecond)
+          }
+					start = this.displayRangeValue.startDate = `${this.tempRange.startDate} ${this.tempRange.startTime}`
+					end = this.displayRangeValue.endDate = `${this.tempRange.endDate} ${this.tempRange.endTime}`
+				}
+        if(!dateCompare(start,end)){
+          [start, end] = [end, start]
+        }
+				this.displayRangeValue.startDate = start
+				this.displayRangeValue.endDate = end
+				const displayRange = [start, end]
+				this.setEmit(displayRange)
+				this.pickerVisible = false
+			},
+			handleStartAndEnd(before, after, temp = false) {
+				if (!(before && after)) return
+
+				const type = temp ? 'tempRange' : 'range'
+        const isStartEarlierEnd = dateCompare(before, after)
+        this[type].startDate = isStartEarlierEnd ? before : after
+        this[type].endDate = isStartEarlierEnd ? after : before
+    },
+			/**
+			 * 比较时间大小
+			 */
+			dateCompare(startDate, endDate) {
+				// 计算截止时间
+				startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
+				// 计算详细项的截止时间
+				endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
+				return startDate <= endDate
+			},
+
+			/**
+			 * 比较时间差
+			 */
+			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.displayValue = ''
+					this.inputDate = ''
+					this.pickerTime = ''
+					if (this.isPhone) {
+						this.$refs.mobile && this.$refs.mobile.clearCalender()
+					} else {
+						this.$refs.pcSingle && this.$refs.pcSingle.clearCalender()
+					}
+					if (needEmit) {
+						this.$emit('change', '')
+						this.$emit('input', '')
+						this.$emit('update:modelValue', '')
+					}
+				} else {
+					this.displayRangeValue.startDate = ''
+					this.displayRangeValue.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', [])
+					}
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	$uni-primary: #007aff !default;
+
+	.uni-date {
+		width: 100%;
+		flex: 1;
+	}
+	.uni-date-x {
+		display: flex;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 4px;
+		background-color: #fff;
+		color: #666;
+		font-size: 14px;
+		flex: 1;
+
+    .icon-calendar{
+      padding-left: 3px;
+    }
+    .range-separator{
+      height: 35px;
+      /* #ifndef MP */
+      padding: 0 2px;
+      /* #endif */
+			line-height: 35px;
+    }
+	}
+
+	.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-right: 3px;
+		display: flex;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-date__x-input {
+		width: auto;
+		height: 35px;
+    /* #ifndef MP */
+    padding-left: 5px;
+    /* #endif */
+		position: relative;
+		flex: 1;
+		line-height: 35px;
+		font-size: 14px;
+		overflow: hidden;
+	}
+
+	.text-center {
+		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;
+	}
+
+	.uni-date-mask--pc {
+		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 {
+		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 {
+		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;
+	}
+
+	.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;
+		line-height: 40px;
+		text-align: right;
+		color: #666;
+	}
+
+	.popup-x-footer text:hover {
+		color: $uni-primary;
+		cursor: pointer;
+		opacity: 0.8;
+	}
+
+	.popup-x-footer .confirm-text {
+		margin-left: 20px;
+		color: $uni-primary;
+	}
+
+	.uni-date-changed {
+		text-align: center;
+		color: #333;
+		border-bottom-color: #F1F1F1;
+		border-bottom-style: solid;
+		border-bottom-width: 1px;
+	}
+
+	.uni-date-changed--time text {
+		height: 50px;
+		line-height: 50px;
+	}
+
+	.uni-date-changed .uni-date-changed--time {
+		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: 6px solid transparent;
+		border-top-width: 0;
+	}
+
+	.uni-popper__arrow {
+		filter: drop-shadow(0 2px 12px rgba(0, 0, 0, 0.03));
+		top: -6px;
+		left: 10%;
+		margin-right: 3px;
+		border-bottom-color: #EBEEF5;
+	}
+
+	.uni-popper__arrow::after {
+		content: " ";
+		top: 1px;
+		margin-left: -6px;
+		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..98e6b79
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js
@@ -0,0 +1,464 @@
+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 && AddDayCount>0) {
+					dd.setDate(dd.getDate() + AddDayCount)
+				} else {
+					const preMonth = dd.getMonth()
+					dd.setMonth(preMonth + AddDayCount) // 获取AddDayCount天后的日期
+					const nextMonth = dd.getMonth()
+					// 处理 pre 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount<0 && preMonth!==0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth+(nextMonth-preMonth+AddDayCount))
+					}
+					// 处理 next 切换月份目标月份为2月没有当前日(30 31) 切换错误问题
+					if(AddDayCount>0 && nextMonth-preMonth>AddDayCount){
+						dd.setMonth(nextMonth-(nextMonth-preMonth-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
+	}
+}
+
+function getDateTime(date, hideSecond){
+  return `${getDate(date)} ${getTime(date, hideSecond)}`
+}
+
+function getDate(date) {
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const year = date.getFullYear()
+  const month = date.getMonth()+1
+  const day = date.getDate()
+  return `${year}-${addZero(month)}-${addZero(day)}`
+}
+
+function getTime(date, hideSecond){
+  date = fixIosDateFormat(date)
+  date = new Date(date)
+  const hour = date.getHours()
+  const minute = date.getMinutes()
+  const second = date.getSeconds()
+  return hideSecond ? `${addZero(hour)}:${addZero(minute)}` : `${addZero(hour)}:${addZero(minute)}:${addZero(second)}`
+}
+
+function addZero(num) {
+  if(num < 10){
+    num = `0${num}`
+  }
+  return num
+}
+
+function getDefaultSecond(hideSecond) {
+  return hideSecond ? '00:00' : '00:00:00'
+}
+
+function dateCompare(startDate, endDate) {
+  startDate = new Date(startDate.replace(/-/g, '/'))
+  endDate = new Date(endDate.replace(/-/g, '/'))
+  return startDate <= endDate
+}
+
+function checkDate(date){
+  const dateReg = /((19|20)\d{2})(-|\/)\d{1,2}(-|\/)\d{1,2}/g
+  return date.match(dateReg)
+}
+
+function fixIosDateFormat(value) {
+  // #ifndef MP
+  if (typeof value === 'string') {
+    value = value.replace(/-/g, '/')
+  }
+  // #endif
+  return value
+}
+
+export {Calendar, getDateTime, getDate, getTime, addZero, getDefaultSecond, dateCompare, checkDate, fixIosDateFormat}
\ No newline at end of file
diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json
new file mode 100644
index 0000000..25fbb6c
--- /dev/null
+++ b/uni_modules/uni-datetime-picker/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "uni-datetime-picker",
+  "displayName": "uni-datetime-picker 日期选择器",
+  "version": "2.2.21",
+  "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": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-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-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/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-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/version.json b/version.json
new file mode 100644
index 0000000..8a673a6
--- /dev/null
+++ b/version.json
@@ -0,0 +1,6 @@
+{
+	"siteroot": "https://citydev.weliam.com.cn",
+	"uniacid": "1",
+	"name": "weliam_smartcity",
+	"weliamv": "1.0.0"
+}
diff --git a/vuex/LICENSE b/vuex/LICENSE
new file mode 100644
index 0000000..478332a
--- /dev/null
+++ b/vuex/LICENSE
@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015-2016 Evan You
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/vuex/README.md b/vuex/README.md
new file mode 100644
index 0000000..37e6c5e
--- /dev/null
+++ b/vuex/README.md
@@ -0,0 +1,29 @@
+# Vuex [![Build Status](https://circleci.com/gh/vuejs/vuex/tree/dev.png?style=shield)](https://circleci.com/gh/vuejs/vuex)
+
+> Centralized State Management for Vue.js.
+
+<p align="center">
+  <img width="700px" src="https://raw.githubusercontent.com/vuejs/vuex/dev/docs/en/images/vuex.png">
+</p>
+
+- [What is Vuex?](http://vuex.vuejs.org/en/intro.html)
+- [Full Documentation](http://vuex.vuejs.org/)
+
+## Examples
+
+- [Counter](https://github.com/vuejs/vuex/tree/dev/examples/counter)
+- [Counter with Hot Reload](https://github.com/vuejs/vuex/tree/dev/examples/counter-hot)
+- [TodoMVC](https://github.com/vuejs/vuex/tree/dev/examples/todomvc)
+- [Flux Chat](https://github.com/vuejs/vuex/tree/dev/examples/chat)
+- [Shopping Cart](https://github.com/vuejs/vuex/tree/dev/examples/shopping-cart)
+
+Running the examples:
+
+``` bash
+$ npm install
+$ npm run dev # serve examples at localhost:8080
+```
+
+## License
+
+[MIT](http://opensource.org/licenses/MIT)
diff --git a/vuex/dist/logger.d.ts b/vuex/dist/logger.d.ts
new file mode 100644
index 0000000..9863e85
--- /dev/null
+++ b/vuex/dist/logger.d.ts
@@ -0,0 +1,15 @@
+/**
+ * Types for the logger plugin.
+ * This file must be put alongside the JavaScript file of the logger.
+ */
+
+import { Payload, Plugin } from "../types/index";
+
+export interface LoggerOption<S> {
+  collapsed?: boolean;
+  filter?: <P extends Payload>(mutation: P, stateBefore: S, stateAfter: S) => boolean;
+  transformer?: (state: S) => any;
+  mutationTransformer?: <P extends Payload>(mutation: P) => any;
+}
+
+export default function createLogger<S>(option: LoggerOption<S>): Plugin<S>;
diff --git a/vuex/dist/logger.js b/vuex/dist/logger.js
new file mode 100644
index 0000000..1a551e0
--- /dev/null
+++ b/vuex/dist/logger.js
@@ -0,0 +1,122 @@
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global.createVuexLogger = factory());
+}(this, (function () { 'use strict';
+
+/**
+ * Get the first item that pass the test
+ * by second argument function
+ *
+ * @param {Array} list
+ * @param {Function} f
+ * @return {*}
+ */
+function find (list, f) {
+  return list.filter(f)[0]
+}
+
+/**
+ * Deep copy the given object considering circular structure.
+ * This function caches all nested objects and its copies.
+ * If it detects circular structure, use cached copy to avoid infinite loop.
+ *
+ * @param {*} obj
+ * @param {Array<Object>} cache
+ * @return {*}
+ */
+function deepCopy (obj, cache) {
+  if ( cache === void 0 ) cache = [];
+
+  // just return if obj is immutable value
+  if (obj === null || typeof obj !== 'object') {
+    return obj
+  }
+
+  // if obj is hit, it is in circular structure
+  var hit = find(cache, function (c) { return c.original === obj; });
+  if (hit) {
+    return hit.copy
+  }
+
+  var copy = Array.isArray(obj) ? [] : {};
+  // put the copy into cache at first
+  // because we want to refer it in recursive deepCopy
+  cache.push({
+    original: obj,
+    copy: copy
+  });
+
+  Object.keys(obj).forEach(function (key) {
+    copy[key] = deepCopy(obj[key], cache);
+  });
+
+  return copy
+}
+
+/**
+ * forEach for object
+ */
+
+// Credits: borrowed code from fcomb/redux-logger
+
+function createLogger (ref) {
+  if ( ref === void 0 ) ref = {};
+  var collapsed = ref.collapsed; if ( collapsed === void 0 ) collapsed = true;
+  var filter = ref.filter; if ( filter === void 0 ) filter = function (mutation, stateBefore, stateAfter) { return true; };
+  var transformer = ref.transformer; if ( transformer === void 0 ) transformer = function (state) { return state; };
+  var mutationTransformer = ref.mutationTransformer; if ( mutationTransformer === void 0 ) mutationTransformer = function (mut) { return mut; };
+  var logger = ref.logger; if ( logger === void 0 ) logger = console;
+
+  return function (store) {
+    var prevState = deepCopy(store.state);
+
+    store.subscribe(function (mutation, state) {
+      if (typeof logger === 'undefined') {
+        return
+      }
+      var nextState = deepCopy(state);
+
+      if (filter(mutation, prevState, nextState)) {
+        var time = new Date();
+        var formattedTime = " @ " + (pad(time.getHours(), 2)) + ":" + (pad(time.getMinutes(), 2)) + ":" + (pad(time.getSeconds(), 2)) + "." + (pad(time.getMilliseconds(), 3));
+        var formattedMutation = mutationTransformer(mutation);
+        var message = "mutation " + (mutation.type) + formattedTime;
+        var startMessage = collapsed
+          ? logger.groupCollapsed
+          : logger.group;
+
+        // render
+        try {
+          startMessage.call(logger, message);
+        } catch (e) {
+          console.log(message);
+        }
+
+        logger.log('%c prev state', 'color: #9E9E9E; font-weight: bold', transformer(prevState));
+        logger.log('%c mutation', 'color: #03A9F4; font-weight: bold', formattedMutation);
+        logger.log('%c next state', 'color: #4CAF50; font-weight: bold', transformer(nextState));
+
+        try {
+          logger.groupEnd();
+        } catch (e) {
+          logger.log('—— log end ——');
+        }
+      }
+
+      prevState = nextState;
+    });
+  }
+}
+
+function repeat (str, times) {
+  return (new Array(times + 1)).join(str)
+}
+
+function pad (num, maxLength) {
+  return repeat('0', maxLength - num.toString().length) + num
+}
+
+return createLogger;
+
+})));
diff --git a/vuex/dist/vuex.common.js b/vuex/dist/vuex.common.js
new file mode 100644
index 0000000..8a0b2ab
--- /dev/null
+++ b/vuex/dist/vuex.common.js
@@ -0,0 +1,932 @@
+/**
+ * vuex v3.0.1
+ * (c) 2017 Evan You
+ * @license MIT
+ */
+'use strict';
+
+var applyMixin = function (Vue) {
+  var version = Number(Vue.version.split('.')[0]);
+
+  if (version >= 2) {
+    Vue.mixin({ beforeCreate: vuexInit });
+  } else {
+    // override init and inject vuex init procedure
+    // for 1.x backwards compatibility.
+    var _init = Vue.prototype._init;
+    Vue.prototype._init = function (options) {
+      if ( options === void 0 ) options = {};
+
+      options.init = options.init
+        ? [vuexInit].concat(options.init)
+        : vuexInit;
+      _init.call(this, options);
+    };
+  }
+
+  /**
+   * Vuex init hook, injected into each instances init hooks list.
+   */
+
+  function vuexInit () {
+    var options = this.$options;
+    // store injection
+    if (options.store) {
+      this.$store = typeof options.store === 'function'
+        ? options.store()
+        : options.store;
+    } else if (options.parent && options.parent.$store) {
+      this.$store = options.parent.$store;
+    }
+  }
+};
+
+var devtoolHook =
+  typeof window !== 'undefined' &&
+  window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
+
+function devtoolPlugin (store) {
+  if (!devtoolHook) { return }
+
+  store._devtoolHook = devtoolHook;
+
+  devtoolHook.emit('vuex:init', store);
+
+  devtoolHook.on('vuex:travel-to-state', function (targetState) {
+    store.replaceState(targetState);
+  });
+
+  store.subscribe(function (mutation, state) {
+    devtoolHook.emit('vuex:mutation', mutation, state);
+  });
+}
+
+/**
+ * Get the first item that pass the test
+ * by second argument function
+ *
+ * @param {Array} list
+ * @param {Function} f
+ * @return {*}
+ */
+/**
+ * Deep copy the given object considering circular structure.
+ * This function caches all nested objects and its copies.
+ * If it detects circular structure, use cached copy to avoid infinite loop.
+ *
+ * @param {*} obj
+ * @param {Array<Object>} cache
+ * @return {*}
+ */
+
+
+/**
+ * forEach for object
+ */
+function forEachValue (obj, fn) {
+  Object.keys(obj).forEach(function (key) { return fn(obj[key], key); });
+}
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isPromise (val) {
+  return val && typeof val.then === 'function'
+}
+
+function assert (condition, msg) {
+  if (!condition) { throw new Error(("[vuex] " + msg)) }
+}
+
+var Module = function Module (rawModule, runtime) {
+  this.runtime = runtime;
+  this._children = Object.create(null);
+  this._rawModule = rawModule;
+  var rawState = rawModule.state;
+  this.state = (typeof rawState === 'function' ? rawState() : rawState) || {};
+};
+
+var prototypeAccessors$1 = { namespaced: { configurable: true } };
+
+prototypeAccessors$1.namespaced.get = function () {
+  return !!this._rawModule.namespaced
+};
+
+Module.prototype.addChild = function addChild (key, module) {
+  this._children[key] = module;
+};
+
+Module.prototype.removeChild = function removeChild (key) {
+  delete this._children[key];
+};
+
+Module.prototype.getChild = function getChild (key) {
+  return this._children[key]
+};
+
+Module.prototype.update = function update (rawModule) {
+  this._rawModule.namespaced = rawModule.namespaced;
+  if (rawModule.actions) {
+    this._rawModule.actions = rawModule.actions;
+  }
+  if (rawModule.mutations) {
+    this._rawModule.mutations = rawModule.mutations;
+  }
+  if (rawModule.getters) {
+    this._rawModule.getters = rawModule.getters;
+  }
+};
+
+Module.prototype.forEachChild = function forEachChild (fn) {
+  forEachValue(this._children, fn);
+};
+
+Module.prototype.forEachGetter = function forEachGetter (fn) {
+  if (this._rawModule.getters) {
+    forEachValue(this._rawModule.getters, fn);
+  }
+};
+
+Module.prototype.forEachAction = function forEachAction (fn) {
+  if (this._rawModule.actions) {
+    forEachValue(this._rawModule.actions, fn);
+  }
+};
+
+Module.prototype.forEachMutation = function forEachMutation (fn) {
+  if (this._rawModule.mutations) {
+    forEachValue(this._rawModule.mutations, fn);
+  }
+};
+
+Object.defineProperties( Module.prototype, prototypeAccessors$1 );
+
+var ModuleCollection = function ModuleCollection (rawRootModule) {
+  // register root module (Vuex.Store options)
+  this.register([], rawRootModule, false);
+};
+
+ModuleCollection.prototype.get = function get (path) {
+  return path.reduce(function (module, key) {
+    return module.getChild(key)
+  }, this.root)
+};
+
+ModuleCollection.prototype.getNamespace = function getNamespace (path) {
+  var module = this.root;
+  return path.reduce(function (namespace, key) {
+    module = module.getChild(key);
+    return namespace + (module.namespaced ? key + '/' : '')
+  }, '')
+};
+
+ModuleCollection.prototype.update = function update$1 (rawRootModule) {
+  update([], this.root, rawRootModule);
+};
+
+ModuleCollection.prototype.register = function register (path, rawModule, runtime) {
+    var this$1 = this;
+    if ( runtime === void 0 ) runtime = true;
+
+  if (process.env.NODE_ENV !== 'production') {
+    assertRawModule(path, rawModule);
+  }
+
+  var newModule = new Module(rawModule, runtime);
+  if (path.length === 0) {
+    this.root = newModule;
+  } else {
+    var parent = this.get(path.slice(0, -1));
+    parent.addChild(path[path.length - 1], newModule);
+  }
+
+  // register nested modules
+  if (rawModule.modules) {
+    forEachValue(rawModule.modules, function (rawChildModule, key) {
+      this$1.register(path.concat(key), rawChildModule, runtime);
+    });
+  }
+};
+
+ModuleCollection.prototype.unregister = function unregister (path) {
+  var parent = this.get(path.slice(0, -1));
+  var key = path[path.length - 1];
+  if (!parent.getChild(key).runtime) { return }
+
+  parent.removeChild(key);
+};
+
+function update (path, targetModule, newModule) {
+  if (process.env.NODE_ENV !== 'production') {
+    assertRawModule(path, newModule);
+  }
+
+  // update target module
+  targetModule.update(newModule);
+
+  // update nested modules
+  if (newModule.modules) {
+    for (var key in newModule.modules) {
+      if (!targetModule.getChild(key)) {
+        if (process.env.NODE_ENV !== 'production') {
+          console.warn(
+            "[vuex] trying to add a new module '" + key + "' on hot reloading, " +
+            'manual reload is needed'
+          );
+        }
+        return
+      }
+      update(
+        path.concat(key),
+        targetModule.getChild(key),
+        newModule.modules[key]
+      );
+    }
+  }
+}
+
+var functionAssert = {
+  assert: function (value) { return typeof value === 'function'; },
+  expected: 'function'
+};
+
+var objectAssert = {
+  assert: function (value) { return typeof value === 'function' ||
+    (typeof value === 'object' && typeof value.handler === 'function'); },
+  expected: 'function or object with "handler" function'
+};
+
+var assertTypes = {
+  getters: functionAssert,
+  mutations: functionAssert,
+  actions: objectAssert
+};
+
+function assertRawModule (path, rawModule) {
+  Object.keys(assertTypes).forEach(function (key) {
+    if (!rawModule[key]) { return }
+
+    var assertOptions = assertTypes[key];
+
+    forEachValue(rawModule[key], function (value, type) {
+      assert(
+        assertOptions.assert(value),
+        makeAssertionMessage(path, key, type, value, assertOptions.expected)
+      );
+    });
+  });
+}
+
+function makeAssertionMessage (path, key, type, value, expected) {
+  var buf = key + " should be " + expected + " but \"" + key + "." + type + "\"";
+  if (path.length > 0) {
+    buf += " in module \"" + (path.join('.')) + "\"";
+  }
+  buf += " is " + (JSON.stringify(value)) + ".";
+  return buf
+}
+
+var Vue; // bind on install
+
+var Store = function Store (options) {
+  var this$1 = this;
+  if ( options === void 0 ) options = {};
+
+  // Auto install if it is not done yet and `window` has `Vue`.
+  // To allow users to avoid auto-installation in some cases,
+  // this code should be placed here. See #731
+  if (!Vue && typeof window !== 'undefined' && window.Vue) {
+    install(window.Vue);
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Vue, "must call Vue.use(Vuex) before creating a store instance.");
+    assert(typeof Promise !== 'undefined', "vuex requires a Promise polyfill in this browser.");
+    assert(this instanceof Store, "Store must be called with the new operator.");
+  }
+
+  var plugins = options.plugins; if ( plugins === void 0 ) plugins = [];
+  var strict = options.strict; if ( strict === void 0 ) strict = false;
+
+  var state = options.state; if ( state === void 0 ) state = {};
+  if (typeof state === 'function') {
+    state = state() || {};
+  }
+
+  // store internal state
+  this._committing = false;
+  this._actions = Object.create(null);
+  this._actionSubscribers = [];
+  this._mutations = Object.create(null);
+  this._wrappedGetters = Object.create(null);
+  this._modules = new ModuleCollection(options);
+  this._modulesNamespaceMap = Object.create(null);
+  this._subscribers = [];
+  this._watcherVM = new Vue();
+
+  // bind commit and dispatch to self
+  var store = this;
+  var ref = this;
+  var dispatch = ref.dispatch;
+  var commit = ref.commit;
+  this.dispatch = function boundDispatch (type, payload) {
+    return dispatch.call(store, type, payload)
+  };
+  this.commit = function boundCommit (type, payload, options) {
+    return commit.call(store, type, payload, options)
+  };
+
+  // strict mode
+  this.strict = strict;
+
+  // init root module.
+  // this also recursively registers all sub-modules
+  // and collects all module getters inside this._wrappedGetters
+  installModule(this, state, [], this._modules.root);
+
+  // initialize the store vm, which is responsible for the reactivity
+  // (also registers _wrappedGetters as computed properties)
+  resetStoreVM(this, state);
+
+  // apply plugins
+  plugins.forEach(function (plugin) { return plugin(this$1); });
+
+  if (Vue.config.devtools) {
+    devtoolPlugin(this);
+  }
+};
+
+var prototypeAccessors = { state: { configurable: true } };
+
+prototypeAccessors.state.get = function () {
+  return this._vm._data.$$state
+};
+
+prototypeAccessors.state.set = function (v) {
+  if (process.env.NODE_ENV !== 'production') {
+    assert(false, "Use store.replaceState() to explicit replace store state.");
+  }
+};
+
+Store.prototype.commit = function commit (_type, _payload, _options) {
+    var this$1 = this;
+
+  // check object-style commit
+  var ref = unifyObjectStyle(_type, _payload, _options);
+    var type = ref.type;
+    var payload = ref.payload;
+    var options = ref.options;
+
+  var mutation = { type: type, payload: payload };
+  var entry = this._mutations[type];
+  if (!entry) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] unknown mutation type: " + type));
+    }
+    return
+  }
+  this._withCommit(function () {
+    entry.forEach(function commitIterator (handler) {
+      handler(payload);
+    });
+  });
+  this._subscribers.forEach(function (sub) { return sub(mutation, this$1.state); });
+
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    options && options.silent
+  ) {
+    console.warn(
+      "[vuex] mutation type: " + type + ". Silent option has been removed. " +
+      'Use the filter functionality in the vue-devtools'
+    );
+  }
+};
+
+Store.prototype.dispatch = function dispatch (_type, _payload) {
+    var this$1 = this;
+
+  // check object-style dispatch
+  var ref = unifyObjectStyle(_type, _payload);
+    var type = ref.type;
+    var payload = ref.payload;
+
+  var action = { type: type, payload: payload };
+  var entry = this._actions[type];
+  if (!entry) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] unknown action type: " + type));
+    }
+    return
+  }
+
+  this._actionSubscribers.forEach(function (sub) { return sub(action, this$1.state); });
+
+  return entry.length > 1
+    ? Promise.all(entry.map(function (handler) { return handler(payload); }))
+    : entry[0](payload)
+};
+
+Store.prototype.subscribe = function subscribe (fn) {
+  return genericSubscribe(fn, this._subscribers)
+};
+
+Store.prototype.subscribeAction = function subscribeAction (fn) {
+  return genericSubscribe(fn, this._actionSubscribers)
+};
+
+Store.prototype.watch = function watch (getter, cb, options) {
+    var this$1 = this;
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(typeof getter === 'function', "store.watch only accepts a function.");
+  }
+  return this._watcherVM.$watch(function () { return getter(this$1.state, this$1.getters); }, cb, options)
+};
+
+Store.prototype.replaceState = function replaceState (state) {
+    var this$1 = this;
+
+  this._withCommit(function () {
+    this$1._vm._data.$$state = state;
+  });
+};
+
+Store.prototype.registerModule = function registerModule (path, rawModule, options) {
+    if ( options === void 0 ) options = {};
+
+  if (typeof path === 'string') { path = [path]; }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+    assert(path.length > 0, 'cannot register the root module by using registerModule.');
+  }
+
+  this._modules.register(path, rawModule);
+  installModule(this, this.state, path, this._modules.get(path), options.preserveState);
+  // reset store to update getters...
+  resetStoreVM(this, this.state);
+};
+
+Store.prototype.unregisterModule = function unregisterModule (path) {
+    var this$1 = this;
+
+  if (typeof path === 'string') { path = [path]; }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+  }
+
+  this._modules.unregister(path);
+  this._withCommit(function () {
+    var parentState = getNestedState(this$1.state, path.slice(0, -1));
+    Vue.delete(parentState, path[path.length - 1]);
+  });
+  resetStore(this);
+};
+
+Store.prototype.hotUpdate = function hotUpdate (newOptions) {
+  this._modules.update(newOptions);
+  resetStore(this, true);
+};
+
+Store.prototype._withCommit = function _withCommit (fn) {
+  var committing = this._committing;
+  this._committing = true;
+  fn();
+  this._committing = committing;
+};
+
+Object.defineProperties( Store.prototype, prototypeAccessors );
+
+function genericSubscribe (fn, subs) {
+  if (subs.indexOf(fn) < 0) {
+    subs.push(fn);
+  }
+  return function () {
+    var i = subs.indexOf(fn);
+    if (i > -1) {
+      subs.splice(i, 1);
+    }
+  }
+}
+
+function resetStore (store, hot) {
+  store._actions = Object.create(null);
+  store._mutations = Object.create(null);
+  store._wrappedGetters = Object.create(null);
+  store._modulesNamespaceMap = Object.create(null);
+  var state = store.state;
+  // init all modules
+  installModule(store, state, [], store._modules.root, true);
+  // reset vm
+  resetStoreVM(store, state, hot);
+}
+
+function resetStoreVM (store, state, hot) {
+  var oldVm = store._vm;
+
+  // bind store public getters
+  store.getters = {};
+  var wrappedGetters = store._wrappedGetters;
+  var computed = {};
+  forEachValue(wrappedGetters, function (fn, key) {
+    // use computed to leverage its lazy-caching mechanism
+    computed[key] = function () { return fn(store); };
+    Object.defineProperty(store.getters, key, {
+      get: function () { return store._vm[key]; },
+      enumerable: true // for local getters
+    });
+  });
+
+  // use a Vue instance to store the state tree
+  // suppress warnings just in case the user has added
+  // some funky global mixins
+  var silent = Vue.config.silent;
+  Vue.config.silent = true;
+  store._vm = new Vue({
+    data: {
+      $$state: state
+    },
+    computed: computed
+  });
+  Vue.config.silent = silent;
+
+  // enable strict mode for new vm
+  if (store.strict) {
+    enableStrictMode(store);
+  }
+
+  if (oldVm) {
+    if (hot) {
+      // dispatch changes in all subscribed watchers
+      // to force getter re-evaluation for hot reloading.
+      store._withCommit(function () {
+        oldVm._data.$$state = null;
+      });
+    }
+    Vue.nextTick(function () { return oldVm.$destroy(); });
+  }
+}
+
+function installModule (store, rootState, path, module, hot) {
+  var isRoot = !path.length;
+  var namespace = store._modules.getNamespace(path);
+
+  // register in namespace map
+  if (module.namespaced) {
+    store._modulesNamespaceMap[namespace] = module;
+  }
+
+  // set state
+  if (!isRoot && !hot) {
+    var parentState = getNestedState(rootState, path.slice(0, -1));
+    var moduleName = path[path.length - 1];
+    store._withCommit(function () {
+      Vue.set(parentState, moduleName, module.state);
+    });
+  }
+
+  var local = module.context = makeLocalContext(store, namespace, path);
+
+  module.forEachMutation(function (mutation, key) {
+    var namespacedType = namespace + key;
+    registerMutation(store, namespacedType, mutation, local);
+  });
+
+  module.forEachAction(function (action, key) {
+    var type = action.root ? key : namespace + key;
+    var handler = action.handler || action;
+    registerAction(store, type, handler, local);
+  });
+
+  module.forEachGetter(function (getter, key) {
+    var namespacedType = namespace + key;
+    registerGetter(store, namespacedType, getter, local);
+  });
+
+  module.forEachChild(function (child, key) {
+    installModule(store, rootState, path.concat(key), child, hot);
+  });
+}
+
+/**
+ * make localized dispatch, commit, getters and state
+ * if there is no namespace, just use root ones
+ */
+function makeLocalContext (store, namespace, path) {
+  var noNamespace = namespace === '';
+
+  var local = {
+    dispatch: noNamespace ? store.dispatch : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if (process.env.NODE_ENV !== 'production' && !store._actions[type]) {
+          console.error(("[vuex] unknown local action type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      return store.dispatch(type, payload)
+    },
+
+    commit: noNamespace ? store.commit : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if (process.env.NODE_ENV !== 'production' && !store._mutations[type]) {
+          console.error(("[vuex] unknown local mutation type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      store.commit(type, payload, options);
+    }
+  };
+
+  // getters and state object must be gotten lazily
+  // because they will be changed by vm update
+  Object.defineProperties(local, {
+    getters: {
+      get: noNamespace
+        ? function () { return store.getters; }
+        : function () { return makeLocalGetters(store, namespace); }
+    },
+    state: {
+      get: function () { return getNestedState(store.state, path); }
+    }
+  });
+
+  return local
+}
+
+function makeLocalGetters (store, namespace) {
+  var gettersProxy = {};
+
+  var splitPos = namespace.length;
+  Object.keys(store.getters).forEach(function (type) {
+    // skip if the target getter is not match this namespace
+    if (type.slice(0, splitPos) !== namespace) { return }
+
+    // extract local getter type
+    var localType = type.slice(splitPos);
+
+    // Add a port to the getters proxy.
+    // Define as getter property because
+    // we do not want to evaluate the getters in this time.
+    Object.defineProperty(gettersProxy, localType, {
+      get: function () { return store.getters[type]; },
+      enumerable: true
+    });
+  });
+
+  return gettersProxy
+}
+
+function registerMutation (store, type, handler, local) {
+  var entry = store._mutations[type] || (store._mutations[type] = []);
+  entry.push(function wrappedMutationHandler (payload) {
+    handler.call(store, local.state, payload);
+  });
+}
+
+function registerAction (store, type, handler, local) {
+  var entry = store._actions[type] || (store._actions[type] = []);
+  entry.push(function wrappedActionHandler (payload, cb) {
+    var res = handler.call(store, {
+      dispatch: local.dispatch,
+      commit: local.commit,
+      getters: local.getters,
+      state: local.state,
+      rootGetters: store.getters,
+      rootState: store.state
+    }, payload, cb);
+    if (!isPromise(res)) {
+      res = Promise.resolve(res);
+    }
+    if (store._devtoolHook) {
+      return res.catch(function (err) {
+        store._devtoolHook.emit('vuex:error', err);
+        throw err
+      })
+    } else {
+      return res
+    }
+  });
+}
+
+function registerGetter (store, type, rawGetter, local) {
+  if (store._wrappedGetters[type]) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] duplicate getter key: " + type));
+    }
+    return
+  }
+  store._wrappedGetters[type] = function wrappedGetter (store) {
+    return rawGetter(
+      local.state, // local state
+      local.getters, // local getters
+      store.state, // root state
+      store.getters // root getters
+    )
+  };
+}
+
+function enableStrictMode (store) {
+  store._vm.$watch(function () { return this._data.$$state }, function () {
+    if (process.env.NODE_ENV !== 'production') {
+      assert(store._committing, "Do not mutate vuex store state outside mutation handlers.");
+    }
+  }, { deep: true, sync: true });
+}
+
+function getNestedState (state, path) {
+  return path.length
+    ? path.reduce(function (state, key) { return state[key]; }, state)
+    : state
+}
+
+function unifyObjectStyle (type, payload, options) {
+  if (isObject(type) && type.type) {
+    options = payload;
+    payload = type;
+    type = type.type;
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(typeof type === 'string', ("Expects string as the type, but found " + (typeof type) + "."));
+  }
+
+  return { type: type, payload: payload, options: options }
+}
+
+function install (_Vue) {
+  if (Vue && _Vue === Vue) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(
+        '[vuex] already installed. Vue.use(Vuex) should be called only once.'
+      );
+    }
+    return
+  }
+  Vue = _Vue;
+  applyMixin(Vue);
+}
+
+var mapState = normalizeNamespace(function (namespace, states) {
+  var res = {};
+  normalizeMap(states).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedState () {
+      var state = this.$store.state;
+      var getters = this.$store.getters;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapState', namespace);
+        if (!module) {
+          return
+        }
+        state = module.context.state;
+        getters = module.context.getters;
+      }
+      return typeof val === 'function'
+        ? val.call(this, state, getters)
+        : state[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapMutations = normalizeNamespace(function (namespace, mutations) {
+  var res = {};
+  normalizeMap(mutations).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedMutation () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var commit = this.$store.commit;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapMutations', namespace);
+        if (!module) {
+          return
+        }
+        commit = module.context.commit;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [commit].concat(args))
+        : commit.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var mapGetters = normalizeNamespace(function (namespace, getters) {
+  var res = {};
+  normalizeMap(getters).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    val = namespace + val;
+    res[key] = function mappedGetter () {
+      if (namespace && !getModuleByNamespace(this.$store, 'mapGetters', namespace)) {
+        return
+      }
+      if (process.env.NODE_ENV !== 'production' && !(val in this.$store.getters)) {
+        console.error(("[vuex] unknown getter: " + val));
+        return
+      }
+      return this.$store.getters[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapActions = normalizeNamespace(function (namespace, actions) {
+  var res = {};
+  normalizeMap(actions).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedAction () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var dispatch = this.$store.dispatch;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapActions', namespace);
+        if (!module) {
+          return
+        }
+        dispatch = module.context.dispatch;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [dispatch].concat(args))
+        : dispatch.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var createNamespacedHelpers = function (namespace) { return ({
+  mapState: mapState.bind(null, namespace),
+  mapGetters: mapGetters.bind(null, namespace),
+  mapMutations: mapMutations.bind(null, namespace),
+  mapActions: mapActions.bind(null, namespace)
+}); };
+
+function normalizeMap (map) {
+  return Array.isArray(map)
+    ? map.map(function (key) { return ({ key: key, val: key }); })
+    : Object.keys(map).map(function (key) { return ({ key: key, val: map[key] }); })
+}
+
+function normalizeNamespace (fn) {
+  return function (namespace, map) {
+    if (typeof namespace !== 'string') {
+      map = namespace;
+      namespace = '';
+    } else if (namespace.charAt(namespace.length - 1) !== '/') {
+      namespace += '/';
+    }
+    return fn(namespace, map)
+  }
+}
+
+function getModuleByNamespace (store, helper, namespace) {
+  var module = store._modulesNamespaceMap[namespace];
+  if (process.env.NODE_ENV !== 'production' && !module) {
+    console.error(("[vuex] module namespace not found in " + helper + "(): " + namespace));
+  }
+  return module
+}
+
+var index = {
+  Store: Store,
+  install: install,
+  version: '3.0.1',
+  mapState: mapState,
+  mapMutations: mapMutations,
+  mapGetters: mapGetters,
+  mapActions: mapActions,
+  createNamespacedHelpers: createNamespacedHelpers
+};
+
+module.exports = index;
diff --git a/vuex/dist/vuex.esm.js b/vuex/dist/vuex.esm.js
new file mode 100644
index 0000000..bb1c596
--- /dev/null
+++ b/vuex/dist/vuex.esm.js
@@ -0,0 +1,931 @@
+/**
+ * vuex v3.0.1
+ * (c) 2017 Evan You
+ * @license MIT
+ */
+var applyMixin = function (Vue) {
+  var version = Number(Vue.version.split('.')[0]);
+
+  if (version >= 2) {
+    Vue.mixin({ beforeCreate: vuexInit });
+  } else {
+    // override init and inject vuex init procedure
+    // for 1.x backwards compatibility.
+    var _init = Vue.prototype._init;
+    Vue.prototype._init = function (options) {
+      if ( options === void 0 ) options = {};
+
+      options.init = options.init
+        ? [vuexInit].concat(options.init)
+        : vuexInit;
+      _init.call(this, options);
+    };
+  }
+
+  /**
+   * Vuex init hook, injected into each instances init hooks list.
+   */
+
+  function vuexInit () {
+    var options = this.$options;
+    // store injection
+    if (options.store) {
+      this.$store = typeof options.store === 'function'
+        ? options.store()
+        : options.store;
+    } else if (options.parent && options.parent.$store) {
+      this.$store = options.parent.$store;
+    }
+  }
+};
+
+var devtoolHook =
+  typeof window !== 'undefined' &&
+  window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
+
+function devtoolPlugin (store) {
+  if (!devtoolHook) { return }
+
+  store._devtoolHook = devtoolHook;
+
+  devtoolHook.emit('vuex:init', store);
+
+  devtoolHook.on('vuex:travel-to-state', function (targetState) {
+    store.replaceState(targetState);
+  });
+
+  store.subscribe(function (mutation, state) {
+    devtoolHook.emit('vuex:mutation', mutation, state);
+  });
+}
+
+/**
+ * Get the first item that pass the test
+ * by second argument function
+ *
+ * @param {Array} list
+ * @param {Function} f
+ * @return {*}
+ */
+/**
+ * Deep copy the given object considering circular structure.
+ * This function caches all nested objects and its copies.
+ * If it detects circular structure, use cached copy to avoid infinite loop.
+ *
+ * @param {*} obj
+ * @param {Array<Object>} cache
+ * @return {*}
+ */
+
+
+/**
+ * forEach for object
+ */
+function forEachValue (obj, fn) {
+  Object.keys(obj).forEach(function (key) { return fn(obj[key], key); });
+}
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isPromise (val) {
+  return val && typeof val.then === 'function'
+}
+
+function assert (condition, msg) {
+  if (!condition) { throw new Error(("[vuex] " + msg)) }
+}
+
+var Module = function Module (rawModule, runtime) {
+  this.runtime = runtime;
+  this._children = Object.create(null);
+  this._rawModule = rawModule;
+  var rawState = rawModule.state;
+  this.state = (typeof rawState === 'function' ? rawState() : rawState) || {};
+};
+
+var prototypeAccessors$1 = { namespaced: { configurable: true } };
+
+prototypeAccessors$1.namespaced.get = function () {
+  return !!this._rawModule.namespaced
+};
+
+Module.prototype.addChild = function addChild (key, module) {
+  this._children[key] = module;
+};
+
+Module.prototype.removeChild = function removeChild (key) {
+  delete this._children[key];
+};
+
+Module.prototype.getChild = function getChild (key) {
+  return this._children[key]
+};
+
+Module.prototype.update = function update (rawModule) {
+  this._rawModule.namespaced = rawModule.namespaced;
+  if (rawModule.actions) {
+    this._rawModule.actions = rawModule.actions;
+  }
+  if (rawModule.mutations) {
+    this._rawModule.mutations = rawModule.mutations;
+  }
+  if (rawModule.getters) {
+    this._rawModule.getters = rawModule.getters;
+  }
+};
+
+Module.prototype.forEachChild = function forEachChild (fn) {
+  forEachValue(this._children, fn);
+};
+
+Module.prototype.forEachGetter = function forEachGetter (fn) {
+  if (this._rawModule.getters) {
+    forEachValue(this._rawModule.getters, fn);
+  }
+};
+
+Module.prototype.forEachAction = function forEachAction (fn) {
+  if (this._rawModule.actions) {
+    forEachValue(this._rawModule.actions, fn);
+  }
+};
+
+Module.prototype.forEachMutation = function forEachMutation (fn) {
+  if (this._rawModule.mutations) {
+    forEachValue(this._rawModule.mutations, fn);
+  }
+};
+
+Object.defineProperties( Module.prototype, prototypeAccessors$1 );
+
+var ModuleCollection = function ModuleCollection (rawRootModule) {
+  // register root module (Vuex.Store options)
+  this.register([], rawRootModule, false);
+};
+
+ModuleCollection.prototype.get = function get (path) {
+  return path.reduce(function (module, key) {
+    return module.getChild(key)
+  }, this.root)
+};
+
+ModuleCollection.prototype.getNamespace = function getNamespace (path) {
+  var module = this.root;
+  return path.reduce(function (namespace, key) {
+    module = module.getChild(key);
+    return namespace + (module.namespaced ? key + '/' : '')
+  }, '')
+};
+
+ModuleCollection.prototype.update = function update$1 (rawRootModule) {
+  update([], this.root, rawRootModule);
+};
+
+ModuleCollection.prototype.register = function register (path, rawModule, runtime) {
+    var this$1 = this;
+    if ( runtime === void 0 ) runtime = true;
+
+  if (process.env.NODE_ENV !== 'production') {
+    assertRawModule(path, rawModule);
+  }
+
+  var newModule = new Module(rawModule, runtime);
+  if (path.length === 0) {
+    this.root = newModule;
+  } else {
+    var parent = this.get(path.slice(0, -1));
+    parent.addChild(path[path.length - 1], newModule);
+  }
+
+  // register nested modules
+  if (rawModule.modules) {
+    forEachValue(rawModule.modules, function (rawChildModule, key) {
+      this$1.register(path.concat(key), rawChildModule, runtime);
+    });
+  }
+};
+
+ModuleCollection.prototype.unregister = function unregister (path) {
+  var parent = this.get(path.slice(0, -1));
+  var key = path[path.length - 1];
+  if (!parent.getChild(key).runtime) { return }
+
+  parent.removeChild(key);
+};
+
+function update (path, targetModule, newModule) {
+  if (process.env.NODE_ENV !== 'production') {
+    assertRawModule(path, newModule);
+  }
+
+  // update target module
+  targetModule.update(newModule);
+
+  // update nested modules
+  if (newModule.modules) {
+    for (var key in newModule.modules) {
+      if (!targetModule.getChild(key)) {
+        if (process.env.NODE_ENV !== 'production') {
+          console.warn(
+            "[vuex] trying to add a new module '" + key + "' on hot reloading, " +
+            'manual reload is needed'
+          );
+        }
+        return
+      }
+      update(
+        path.concat(key),
+        targetModule.getChild(key),
+        newModule.modules[key]
+      );
+    }
+  }
+}
+
+var functionAssert = {
+  assert: function (value) { return typeof value === 'function'; },
+  expected: 'function'
+};
+
+var objectAssert = {
+  assert: function (value) { return typeof value === 'function' ||
+    (typeof value === 'object' && typeof value.handler === 'function'); },
+  expected: 'function or object with "handler" function'
+};
+
+var assertTypes = {
+  getters: functionAssert,
+  mutations: functionAssert,
+  actions: objectAssert
+};
+
+function assertRawModule (path, rawModule) {
+  Object.keys(assertTypes).forEach(function (key) {
+    if (!rawModule[key]) { return }
+
+    var assertOptions = assertTypes[key];
+
+    forEachValue(rawModule[key], function (value, type) {
+      assert(
+        assertOptions.assert(value),
+        makeAssertionMessage(path, key, type, value, assertOptions.expected)
+      );
+    });
+  });
+}
+
+function makeAssertionMessage (path, key, type, value, expected) {
+  var buf = key + " should be " + expected + " but \"" + key + "." + type + "\"";
+  if (path.length > 0) {
+    buf += " in module \"" + (path.join('.')) + "\"";
+  }
+  buf += " is " + (JSON.stringify(value)) + ".";
+  return buf
+}
+
+var Vue; // bind on install
+
+var Store = function Store (options) {
+  var this$1 = this;
+  if ( options === void 0 ) options = {};
+
+  // Auto install if it is not done yet and `window` has `Vue`.
+  // To allow users to avoid auto-installation in some cases,
+  // this code should be placed here. See #731
+  if (!Vue && typeof window !== 'undefined' && window.Vue) {
+    install(window.Vue);
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Vue, "must call Vue.use(Vuex) before creating a store instance.");
+    assert(typeof Promise !== 'undefined', "vuex requires a Promise polyfill in this browser.");
+    assert(this instanceof Store, "Store must be called with the new operator.");
+  }
+
+  var plugins = options.plugins; if ( plugins === void 0 ) plugins = [];
+  var strict = options.strict; if ( strict === void 0 ) strict = false;
+
+  var state = options.state; if ( state === void 0 ) state = {};
+  if (typeof state === 'function') {
+    state = state() || {};
+  }
+
+  // store internal state
+  this._committing = false;
+  this._actions = Object.create(null);
+  this._actionSubscribers = [];
+  this._mutations = Object.create(null);
+  this._wrappedGetters = Object.create(null);
+  this._modules = new ModuleCollection(options);
+  this._modulesNamespaceMap = Object.create(null);
+  this._subscribers = [];
+  this._watcherVM = new Vue();
+
+  // bind commit and dispatch to self
+  var store = this;
+  var ref = this;
+  var dispatch = ref.dispatch;
+  var commit = ref.commit;
+  this.dispatch = function boundDispatch (type, payload) {
+    return dispatch.call(store, type, payload)
+  };
+  this.commit = function boundCommit (type, payload, options) {
+    return commit.call(store, type, payload, options)
+  };
+
+  // strict mode
+  this.strict = strict;
+
+  // init root module.
+  // this also recursively registers all sub-modules
+  // and collects all module getters inside this._wrappedGetters
+  installModule(this, state, [], this._modules.root);
+
+  // initialize the store vm, which is responsible for the reactivity
+  // (also registers _wrappedGetters as computed properties)
+  resetStoreVM(this, state);
+
+  // apply plugins
+  plugins.forEach(function (plugin) { return plugin(this$1); });
+
+  if (Vue.config.devtools) {
+    devtoolPlugin(this);
+  }
+};
+
+var prototypeAccessors = { state: { configurable: true } };
+
+prototypeAccessors.state.get = function () {
+  return this._vm._data.$$state
+};
+
+prototypeAccessors.state.set = function (v) {
+  if (process.env.NODE_ENV !== 'production') {
+    assert(false, "Use store.replaceState() to explicit replace store state.");
+  }
+};
+
+Store.prototype.commit = function commit (_type, _payload, _options) {
+    var this$1 = this;
+
+  // check object-style commit
+  var ref = unifyObjectStyle(_type, _payload, _options);
+    var type = ref.type;
+    var payload = ref.payload;
+    var options = ref.options;
+
+  var mutation = { type: type, payload: payload };
+  var entry = this._mutations[type];
+  if (!entry) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] unknown mutation type: " + type));
+    }
+    return
+  }
+  this._withCommit(function () {
+    entry.forEach(function commitIterator (handler) {
+      handler(payload);
+    });
+  });
+  this._subscribers.forEach(function (sub) { return sub(mutation, this$1.state); });
+
+  if (
+    process.env.NODE_ENV !== 'production' &&
+    options && options.silent
+  ) {
+    console.warn(
+      "[vuex] mutation type: " + type + ". Silent option has been removed. " +
+      'Use the filter functionality in the vue-devtools'
+    );
+  }
+};
+
+Store.prototype.dispatch = function dispatch (_type, _payload) {
+    var this$1 = this;
+
+  // check object-style dispatch
+  var ref = unifyObjectStyle(_type, _payload);
+    var type = ref.type;
+    var payload = ref.payload;
+
+  var action = { type: type, payload: payload };
+  var entry = this._actions[type];
+  if (!entry) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] unknown action type: " + type));
+    }
+    return
+  }
+
+  this._actionSubscribers.forEach(function (sub) { return sub(action, this$1.state); });
+
+  return entry.length > 1
+    ? Promise.all(entry.map(function (handler) { return handler(payload); }))
+    : entry[0](payload)
+};
+
+Store.prototype.subscribe = function subscribe (fn) {
+  return genericSubscribe(fn, this._subscribers)
+};
+
+Store.prototype.subscribeAction = function subscribeAction (fn) {
+  return genericSubscribe(fn, this._actionSubscribers)
+};
+
+Store.prototype.watch = function watch (getter, cb, options) {
+    var this$1 = this;
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(typeof getter === 'function', "store.watch only accepts a function.");
+  }
+  return this._watcherVM.$watch(function () { return getter(this$1.state, this$1.getters); }, cb, options)
+};
+
+Store.prototype.replaceState = function replaceState (state) {
+    var this$1 = this;
+
+  this._withCommit(function () {
+    this$1._vm._data.$$state = state;
+  });
+};
+
+Store.prototype.registerModule = function registerModule (path, rawModule, options) {
+    if ( options === void 0 ) options = {};
+
+  if (typeof path === 'string') { path = [path]; }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+    assert(path.length > 0, 'cannot register the root module by using registerModule.');
+  }
+
+  this._modules.register(path, rawModule);
+  installModule(this, this.state, path, this._modules.get(path), options.preserveState);
+  // reset store to update getters...
+  resetStoreVM(this, this.state);
+};
+
+Store.prototype.unregisterModule = function unregisterModule (path) {
+    var this$1 = this;
+
+  if (typeof path === 'string') { path = [path]; }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+  }
+
+  this._modules.unregister(path);
+  this._withCommit(function () {
+    var parentState = getNestedState(this$1.state, path.slice(0, -1));
+    Vue.delete(parentState, path[path.length - 1]);
+  });
+  resetStore(this);
+};
+
+Store.prototype.hotUpdate = function hotUpdate (newOptions) {
+  this._modules.update(newOptions);
+  resetStore(this, true);
+};
+
+Store.prototype._withCommit = function _withCommit (fn) {
+  var committing = this._committing;
+  this._committing = true;
+  fn();
+  this._committing = committing;
+};
+
+Object.defineProperties( Store.prototype, prototypeAccessors );
+
+function genericSubscribe (fn, subs) {
+  if (subs.indexOf(fn) < 0) {
+    subs.push(fn);
+  }
+  return function () {
+    var i = subs.indexOf(fn);
+    if (i > -1) {
+      subs.splice(i, 1);
+    }
+  }
+}
+
+function resetStore (store, hot) {
+  store._actions = Object.create(null);
+  store._mutations = Object.create(null);
+  store._wrappedGetters = Object.create(null);
+  store._modulesNamespaceMap = Object.create(null);
+  var state = store.state;
+  // init all modules
+  installModule(store, state, [], store._modules.root, true);
+  // reset vm
+  resetStoreVM(store, state, hot);
+}
+
+function resetStoreVM (store, state, hot) {
+  var oldVm = store._vm;
+
+  // bind store public getters
+  store.getters = {};
+  var wrappedGetters = store._wrappedGetters;
+  var computed = {};
+  forEachValue(wrappedGetters, function (fn, key) {
+    // use computed to leverage its lazy-caching mechanism
+    computed[key] = function () { return fn(store); };
+    Object.defineProperty(store.getters, key, {
+      get: function () { return store._vm[key]; },
+      enumerable: true // for local getters
+    });
+  });
+
+  // use a Vue instance to store the state tree
+  // suppress warnings just in case the user has added
+  // some funky global mixins
+  var silent = Vue.config.silent;
+  Vue.config.silent = true;
+  store._vm = new Vue({
+    data: {
+      $$state: state
+    },
+    computed: computed
+  });
+  Vue.config.silent = silent;
+
+  // enable strict mode for new vm
+  if (store.strict) {
+    enableStrictMode(store);
+  }
+
+  if (oldVm) {
+    if (hot) {
+      // dispatch changes in all subscribed watchers
+      // to force getter re-evaluation for hot reloading.
+      store._withCommit(function () {
+        oldVm._data.$$state = null;
+      });
+    }
+    Vue.nextTick(function () { return oldVm.$destroy(); });
+  }
+}
+
+function installModule (store, rootState, path, module, hot) {
+  var isRoot = !path.length;
+  var namespace = store._modules.getNamespace(path);
+
+  // register in namespace map
+  if (module.namespaced) {
+    store._modulesNamespaceMap[namespace] = module;
+  }
+
+  // set state
+  if (!isRoot && !hot) {
+    var parentState = getNestedState(rootState, path.slice(0, -1));
+    var moduleName = path[path.length - 1];
+    store._withCommit(function () {
+      Vue.set(parentState, moduleName, module.state);
+    });
+  }
+
+  var local = module.context = makeLocalContext(store, namespace, path);
+
+  module.forEachMutation(function (mutation, key) {
+    var namespacedType = namespace + key;
+    registerMutation(store, namespacedType, mutation, local);
+  });
+
+  module.forEachAction(function (action, key) {
+    var type = action.root ? key : namespace + key;
+    var handler = action.handler || action;
+    registerAction(store, type, handler, local);
+  });
+
+  module.forEachGetter(function (getter, key) {
+    var namespacedType = namespace + key;
+    registerGetter(store, namespacedType, getter, local);
+  });
+
+  module.forEachChild(function (child, key) {
+    installModule(store, rootState, path.concat(key), child, hot);
+  });
+}
+
+/**
+ * make localized dispatch, commit, getters and state
+ * if there is no namespace, just use root ones
+ */
+function makeLocalContext (store, namespace, path) {
+  var noNamespace = namespace === '';
+
+  var local = {
+    dispatch: noNamespace ? store.dispatch : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if (process.env.NODE_ENV !== 'production' && !store._actions[type]) {
+          console.error(("[vuex] unknown local action type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      return store.dispatch(type, payload)
+    },
+
+    commit: noNamespace ? store.commit : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if (process.env.NODE_ENV !== 'production' && !store._mutations[type]) {
+          console.error(("[vuex] unknown local mutation type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      store.commit(type, payload, options);
+    }
+  };
+
+  // getters and state object must be gotten lazily
+  // because they will be changed by vm update
+  Object.defineProperties(local, {
+    getters: {
+      get: noNamespace
+        ? function () { return store.getters; }
+        : function () { return makeLocalGetters(store, namespace); }
+    },
+    state: {
+      get: function () { return getNestedState(store.state, path); }
+    }
+  });
+
+  return local
+}
+
+function makeLocalGetters (store, namespace) {
+  var gettersProxy = {};
+
+  var splitPos = namespace.length;
+  Object.keys(store.getters).forEach(function (type) {
+    // skip if the target getter is not match this namespace
+    if (type.slice(0, splitPos) !== namespace) { return }
+
+    // extract local getter type
+    var localType = type.slice(splitPos);
+
+    // Add a port to the getters proxy.
+    // Define as getter property because
+    // we do not want to evaluate the getters in this time.
+    Object.defineProperty(gettersProxy, localType, {
+      get: function () { return store.getters[type]; },
+      enumerable: true
+    });
+  });
+
+  return gettersProxy
+}
+
+function registerMutation (store, type, handler, local) {
+  var entry = store._mutations[type] || (store._mutations[type] = []);
+  entry.push(function wrappedMutationHandler (payload) {
+    handler.call(store, local.state, payload);
+  });
+}
+
+function registerAction (store, type, handler, local) {
+  var entry = store._actions[type] || (store._actions[type] = []);
+  entry.push(function wrappedActionHandler (payload, cb) {
+    var res = handler.call(store, {
+      dispatch: local.dispatch,
+      commit: local.commit,
+      getters: local.getters,
+      state: local.state,
+      rootGetters: store.getters,
+      rootState: store.state
+    }, payload, cb);
+    if (!isPromise(res)) {
+      res = Promise.resolve(res);
+    }
+    if (store._devtoolHook) {
+      return res.catch(function (err) {
+        store._devtoolHook.emit('vuex:error', err);
+        throw err
+      })
+    } else {
+      return res
+    }
+  });
+}
+
+function registerGetter (store, type, rawGetter, local) {
+  if (store._wrappedGetters[type]) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(("[vuex] duplicate getter key: " + type));
+    }
+    return
+  }
+  store._wrappedGetters[type] = function wrappedGetter (store) {
+    return rawGetter(
+      local.state, // local state
+      local.getters, // local getters
+      store.state, // root state
+      store.getters // root getters
+    )
+  };
+}
+
+function enableStrictMode (store) {
+  store._vm.$watch(function () { return this._data.$$state }, function () {
+    if (process.env.NODE_ENV !== 'production') {
+      assert(store._committing, "Do not mutate vuex store state outside mutation handlers.");
+    }
+  }, { deep: true, sync: true });
+}
+
+function getNestedState (state, path) {
+  return path.length
+    ? path.reduce(function (state, key) { return state[key]; }, state)
+    : state
+}
+
+function unifyObjectStyle (type, payload, options) {
+  if (isObject(type) && type.type) {
+    options = payload;
+    payload = type;
+    type = type.type;
+  }
+
+  if (process.env.NODE_ENV !== 'production') {
+    assert(typeof type === 'string', ("Expects string as the type, but found " + (typeof type) + "."));
+  }
+
+  return { type: type, payload: payload, options: options }
+}
+
+function install (_Vue) {
+  if (Vue && _Vue === Vue) {
+    if (process.env.NODE_ENV !== 'production') {
+      console.error(
+        '[vuex] already installed. Vue.use(Vuex) should be called only once.'
+      );
+    }
+    return
+  }
+  Vue = _Vue;
+  applyMixin(Vue);
+}
+
+var mapState = normalizeNamespace(function (namespace, states) {
+  var res = {};
+  normalizeMap(states).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedState () {
+      var state = this.$store.state;
+      var getters = this.$store.getters;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapState', namespace);
+        if (!module) {
+          return
+        }
+        state = module.context.state;
+        getters = module.context.getters;
+      }
+      return typeof val === 'function'
+        ? val.call(this, state, getters)
+        : state[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapMutations = normalizeNamespace(function (namespace, mutations) {
+  var res = {};
+  normalizeMap(mutations).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedMutation () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var commit = this.$store.commit;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapMutations', namespace);
+        if (!module) {
+          return
+        }
+        commit = module.context.commit;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [commit].concat(args))
+        : commit.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var mapGetters = normalizeNamespace(function (namespace, getters) {
+  var res = {};
+  normalizeMap(getters).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    val = namespace + val;
+    res[key] = function mappedGetter () {
+      if (namespace && !getModuleByNamespace(this.$store, 'mapGetters', namespace)) {
+        return
+      }
+      if (process.env.NODE_ENV !== 'production' && !(val in this.$store.getters)) {
+        console.error(("[vuex] unknown getter: " + val));
+        return
+      }
+      return this.$store.getters[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapActions = normalizeNamespace(function (namespace, actions) {
+  var res = {};
+  normalizeMap(actions).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedAction () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var dispatch = this.$store.dispatch;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapActions', namespace);
+        if (!module) {
+          return
+        }
+        dispatch = module.context.dispatch;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [dispatch].concat(args))
+        : dispatch.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var createNamespacedHelpers = function (namespace) { return ({
+  mapState: mapState.bind(null, namespace),
+  mapGetters: mapGetters.bind(null, namespace),
+  mapMutations: mapMutations.bind(null, namespace),
+  mapActions: mapActions.bind(null, namespace)
+}); };
+
+function normalizeMap (map) {
+  return Array.isArray(map)
+    ? map.map(function (key) { return ({ key: key, val: key }); })
+    : Object.keys(map).map(function (key) { return ({ key: key, val: map[key] }); })
+}
+
+function normalizeNamespace (fn) {
+  return function (namespace, map) {
+    if (typeof namespace !== 'string') {
+      map = namespace;
+      namespace = '';
+    } else if (namespace.charAt(namespace.length - 1) !== '/') {
+      namespace += '/';
+    }
+    return fn(namespace, map)
+  }
+}
+
+function getModuleByNamespace (store, helper, namespace) {
+  var module = store._modulesNamespaceMap[namespace];
+  if (process.env.NODE_ENV !== 'production' && !module) {
+    console.error(("[vuex] module namespace not found in " + helper + "(): " + namespace));
+  }
+  return module
+}
+
+var index_esm = {
+  Store: Store,
+  install: install,
+  version: '3.0.1',
+  mapState: mapState,
+  mapMutations: mapMutations,
+  mapGetters: mapGetters,
+  mapActions: mapActions,
+  createNamespacedHelpers: createNamespacedHelpers
+};
+
+export { Store, install, mapState, mapMutations, mapGetters, mapActions, createNamespacedHelpers };
+export default index_esm;
diff --git a/vuex/dist/vuex.js b/vuex/dist/vuex.js
new file mode 100644
index 0000000..26340c5
--- /dev/null
+++ b/vuex/dist/vuex.js
@@ -0,0 +1,938 @@
+/**
+ * vuex v3.0.1
+ * (c) 2017 Evan You
+ * @license MIT
+ */
+(function (global, factory) {
+	typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
+	typeof define === 'function' && define.amd ? define(factory) :
+	(global.Vuex = factory());
+}(this, (function () { 'use strict';
+
+var applyMixin = function (Vue) {
+  var version = Number(Vue.version.split('.')[0]);
+
+  if (version >= 2) {
+    Vue.mixin({ beforeCreate: vuexInit });
+  } else {
+    // override init and inject vuex init procedure
+    // for 1.x backwards compatibility.
+    var _init = Vue.prototype._init;
+    Vue.prototype._init = function (options) {
+      if ( options === void 0 ) options = {};
+
+      options.init = options.init
+        ? [vuexInit].concat(options.init)
+        : vuexInit;
+      _init.call(this, options);
+    };
+  }
+
+  /**
+   * Vuex init hook, injected into each instances init hooks list.
+   */
+
+  function vuexInit () {
+    var options = this.$options;
+    // store injection
+    if (options.store) {
+      this.$store = typeof options.store === 'function'
+        ? options.store()
+        : options.store;
+    } else if (options.parent && options.parent.$store) {
+      this.$store = options.parent.$store;
+    }
+  }
+};
+
+var devtoolHook =
+  typeof window !== 'undefined' &&
+  window.__VUE_DEVTOOLS_GLOBAL_HOOK__;
+
+function devtoolPlugin (store) {
+  if (!devtoolHook) { return }
+
+  store._devtoolHook = devtoolHook;
+
+  devtoolHook.emit('vuex:init', store);
+
+  devtoolHook.on('vuex:travel-to-state', function (targetState) {
+    store.replaceState(targetState);
+  });
+
+  store.subscribe(function (mutation, state) {
+    devtoolHook.emit('vuex:mutation', mutation, state);
+  });
+}
+
+/**
+ * Get the first item that pass the test
+ * by second argument function
+ *
+ * @param {Array} list
+ * @param {Function} f
+ * @return {*}
+ */
+/**
+ * Deep copy the given object considering circular structure.
+ * This function caches all nested objects and its copies.
+ * If it detects circular structure, use cached copy to avoid infinite loop.
+ *
+ * @param {*} obj
+ * @param {Array<Object>} cache
+ * @return {*}
+ */
+
+
+/**
+ * forEach for object
+ */
+function forEachValue (obj, fn) {
+  Object.keys(obj).forEach(function (key) { return fn(obj[key], key); });
+}
+
+function isObject (obj) {
+  return obj !== null && typeof obj === 'object'
+}
+
+function isPromise (val) {
+  return val && typeof val.then === 'function'
+}
+
+function assert (condition, msg) {
+  if (!condition) { throw new Error(("[vuex] " + msg)) }
+}
+
+var Module = function Module (rawModule, runtime) {
+  this.runtime = runtime;
+  this._children = Object.create(null);
+  this._rawModule = rawModule;
+  var rawState = rawModule.state;
+  this.state = (typeof rawState === 'function' ? rawState() : rawState) || {};
+};
+
+var prototypeAccessors$1 = { namespaced: { configurable: true } };
+
+prototypeAccessors$1.namespaced.get = function () {
+  return !!this._rawModule.namespaced
+};
+
+Module.prototype.addChild = function addChild (key, module) {
+  this._children[key] = module;
+};
+
+Module.prototype.removeChild = function removeChild (key) {
+  delete this._children[key];
+};
+
+Module.prototype.getChild = function getChild (key) {
+  return this._children[key]
+};
+
+Module.prototype.update = function update (rawModule) {
+  this._rawModule.namespaced = rawModule.namespaced;
+  if (rawModule.actions) {
+    this._rawModule.actions = rawModule.actions;
+  }
+  if (rawModule.mutations) {
+    this._rawModule.mutations = rawModule.mutations;
+  }
+  if (rawModule.getters) {
+    this._rawModule.getters = rawModule.getters;
+  }
+};
+
+Module.prototype.forEachChild = function forEachChild (fn) {
+  forEachValue(this._children, fn);
+};
+
+Module.prototype.forEachGetter = function forEachGetter (fn) {
+  if (this._rawModule.getters) {
+    forEachValue(this._rawModule.getters, fn);
+  }
+};
+
+Module.prototype.forEachAction = function forEachAction (fn) {
+  if (this._rawModule.actions) {
+    forEachValue(this._rawModule.actions, fn);
+  }
+};
+
+Module.prototype.forEachMutation = function forEachMutation (fn) {
+  if (this._rawModule.mutations) {
+    forEachValue(this._rawModule.mutations, fn);
+  }
+};
+
+Object.defineProperties( Module.prototype, prototypeAccessors$1 );
+
+var ModuleCollection = function ModuleCollection (rawRootModule) {
+  // register root module (Vuex.Store options)
+  this.register([], rawRootModule, false);
+};
+
+ModuleCollection.prototype.get = function get (path) {
+  return path.reduce(function (module, key) {
+    return module.getChild(key)
+  }, this.root)
+};
+
+ModuleCollection.prototype.getNamespace = function getNamespace (path) {
+  var module = this.root;
+  return path.reduce(function (namespace, key) {
+    module = module.getChild(key);
+    return namespace + (module.namespaced ? key + '/' : '')
+  }, '')
+};
+
+ModuleCollection.prototype.update = function update$1 (rawRootModule) {
+  update([], this.root, rawRootModule);
+};
+
+ModuleCollection.prototype.register = function register (path, rawModule, runtime) {
+    var this$1 = this;
+    if ( runtime === void 0 ) runtime = true;
+
+  {
+    assertRawModule(path, rawModule);
+  }
+
+  var newModule = new Module(rawModule, runtime);
+  if (path.length === 0) {
+    this.root = newModule;
+  } else {
+    var parent = this.get(path.slice(0, -1));
+    parent.addChild(path[path.length - 1], newModule);
+  }
+
+  // register nested modules
+  if (rawModule.modules) {
+    forEachValue(rawModule.modules, function (rawChildModule, key) {
+      this$1.register(path.concat(key), rawChildModule, runtime);
+    });
+  }
+};
+
+ModuleCollection.prototype.unregister = function unregister (path) {
+  var parent = this.get(path.slice(0, -1));
+  var key = path[path.length - 1];
+  if (!parent.getChild(key).runtime) { return }
+
+  parent.removeChild(key);
+};
+
+function update (path, targetModule, newModule) {
+  {
+    assertRawModule(path, newModule);
+  }
+
+  // update target module
+  targetModule.update(newModule);
+
+  // update nested modules
+  if (newModule.modules) {
+    for (var key in newModule.modules) {
+      if (!targetModule.getChild(key)) {
+        {
+          console.warn(
+            "[vuex] trying to add a new module '" + key + "' on hot reloading, " +
+            'manual reload is needed'
+          );
+        }
+        return
+      }
+      update(
+        path.concat(key),
+        targetModule.getChild(key),
+        newModule.modules[key]
+      );
+    }
+  }
+}
+
+var functionAssert = {
+  assert: function (value) { return typeof value === 'function'; },
+  expected: 'function'
+};
+
+var objectAssert = {
+  assert: function (value) { return typeof value === 'function' ||
+    (typeof value === 'object' && typeof value.handler === 'function'); },
+  expected: 'function or object with "handler" function'
+};
+
+var assertTypes = {
+  getters: functionAssert,
+  mutations: functionAssert,
+  actions: objectAssert
+};
+
+function assertRawModule (path, rawModule) {
+  Object.keys(assertTypes).forEach(function (key) {
+    if (!rawModule[key]) { return }
+
+    var assertOptions = assertTypes[key];
+
+    forEachValue(rawModule[key], function (value, type) {
+      assert(
+        assertOptions.assert(value),
+        makeAssertionMessage(path, key, type, value, assertOptions.expected)
+      );
+    });
+  });
+}
+
+function makeAssertionMessage (path, key, type, value, expected) {
+  var buf = key + " should be " + expected + " but \"" + key + "." + type + "\"";
+  if (path.length > 0) {
+    buf += " in module \"" + (path.join('.')) + "\"";
+  }
+  buf += " is " + (JSON.stringify(value)) + ".";
+  return buf
+}
+
+var Vue; // bind on install
+
+var Store = function Store (options) {
+  var this$1 = this;
+  if ( options === void 0 ) options = {};
+
+  // Auto install if it is not done yet and `window` has `Vue`.
+  // To allow users to avoid auto-installation in some cases,
+  // this code should be placed here. See #731
+  if (!Vue && typeof window !== 'undefined' && window.Vue) {
+    install(window.Vue);
+  }
+
+  {
+    assert(Vue, "must call Vue.use(Vuex) before creating a store instance.");
+    assert(typeof Promise !== 'undefined', "vuex requires a Promise polyfill in this browser.");
+    assert(this instanceof Store, "Store must be called with the new operator.");
+  }
+
+  var plugins = options.plugins; if ( plugins === void 0 ) plugins = [];
+  var strict = options.strict; if ( strict === void 0 ) strict = false;
+
+  var state = options.state; if ( state === void 0 ) state = {};
+  if (typeof state === 'function') {
+    state = state() || {};
+  }
+
+  // store internal state
+  this._committing = false;
+  this._actions = Object.create(null);
+  this._actionSubscribers = [];
+  this._mutations = Object.create(null);
+  this._wrappedGetters = Object.create(null);
+  this._modules = new ModuleCollection(options);
+  this._modulesNamespaceMap = Object.create(null);
+  this._subscribers = [];
+  this._watcherVM = new Vue();
+
+  // bind commit and dispatch to self
+  var store = this;
+  var ref = this;
+  var dispatch = ref.dispatch;
+  var commit = ref.commit;
+  this.dispatch = function boundDispatch (type, payload) {
+    return dispatch.call(store, type, payload)
+  };
+  this.commit = function boundCommit (type, payload, options) {
+    return commit.call(store, type, payload, options)
+  };
+
+  // strict mode
+  this.strict = strict;
+
+  // init root module.
+  // this also recursively registers all sub-modules
+  // and collects all module getters inside this._wrappedGetters
+  installModule(this, state, [], this._modules.root);
+
+  // initialize the store vm, which is responsible for the reactivity
+  // (also registers _wrappedGetters as computed properties)
+  resetStoreVM(this, state);
+
+  // apply plugins
+  plugins.forEach(function (plugin) { return plugin(this$1); });
+
+  if (Vue.config.devtools) {
+    devtoolPlugin(this);
+  }
+};
+
+var prototypeAccessors = { state: { configurable: true } };
+
+prototypeAccessors.state.get = function () {
+  return this._vm._data.$$state
+};
+
+prototypeAccessors.state.set = function (v) {
+  {
+    assert(false, "Use store.replaceState() to explicit replace store state.");
+  }
+};
+
+Store.prototype.commit = function commit (_type, _payload, _options) {
+    var this$1 = this;
+
+  // check object-style commit
+  var ref = unifyObjectStyle(_type, _payload, _options);
+    var type = ref.type;
+    var payload = ref.payload;
+    var options = ref.options;
+
+  var mutation = { type: type, payload: payload };
+  var entry = this._mutations[type];
+  if (!entry) {
+    {
+      console.error(("[vuex] unknown mutation type: " + type));
+    }
+    return
+  }
+  this._withCommit(function () {
+    entry.forEach(function commitIterator (handler) {
+      handler(payload);
+    });
+  });
+  this._subscribers.forEach(function (sub) { return sub(mutation, this$1.state); });
+
+  if (
+    "development" !== 'production' &&
+    options && options.silent
+  ) {
+    console.warn(
+      "[vuex] mutation type: " + type + ". Silent option has been removed. " +
+      'Use the filter functionality in the vue-devtools'
+    );
+  }
+};
+
+Store.prototype.dispatch = function dispatch (_type, _payload) {
+    var this$1 = this;
+
+  // check object-style dispatch
+  var ref = unifyObjectStyle(_type, _payload);
+    var type = ref.type;
+    var payload = ref.payload;
+
+  var action = { type: type, payload: payload };
+  var entry = this._actions[type];
+  if (!entry) {
+    {
+      console.error(("[vuex] unknown action type: " + type));
+    }
+    return
+  }
+
+  this._actionSubscribers.forEach(function (sub) { return sub(action, this$1.state); });
+
+  return entry.length > 1
+    ? Promise.all(entry.map(function (handler) { return handler(payload); }))
+    : entry[0](payload)
+};
+
+Store.prototype.subscribe = function subscribe (fn) {
+  return genericSubscribe(fn, this._subscribers)
+};
+
+Store.prototype.subscribeAction = function subscribeAction (fn) {
+  return genericSubscribe(fn, this._actionSubscribers)
+};
+
+Store.prototype.watch = function watch (getter, cb, options) {
+    var this$1 = this;
+
+  {
+    assert(typeof getter === 'function', "store.watch only accepts a function.");
+  }
+  return this._watcherVM.$watch(function () { return getter(this$1.state, this$1.getters); }, cb, options)
+};
+
+Store.prototype.replaceState = function replaceState (state) {
+    var this$1 = this;
+
+  this._withCommit(function () {
+    this$1._vm._data.$$state = state;
+  });
+};
+
+Store.prototype.registerModule = function registerModule (path, rawModule, options) {
+    if ( options === void 0 ) options = {};
+
+  if (typeof path === 'string') { path = [path]; }
+
+  {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+    assert(path.length > 0, 'cannot register the root module by using registerModule.');
+  }
+
+  this._modules.register(path, rawModule);
+  installModule(this, this.state, path, this._modules.get(path), options.preserveState);
+  // reset store to update getters...
+  resetStoreVM(this, this.state);
+};
+
+Store.prototype.unregisterModule = function unregisterModule (path) {
+    var this$1 = this;
+
+  if (typeof path === 'string') { path = [path]; }
+
+  {
+    assert(Array.isArray(path), "module path must be a string or an Array.");
+  }
+
+  this._modules.unregister(path);
+  this._withCommit(function () {
+    var parentState = getNestedState(this$1.state, path.slice(0, -1));
+    Vue.delete(parentState, path[path.length - 1]);
+  });
+  resetStore(this);
+};
+
+Store.prototype.hotUpdate = function hotUpdate (newOptions) {
+  this._modules.update(newOptions);
+  resetStore(this, true);
+};
+
+Store.prototype._withCommit = function _withCommit (fn) {
+  var committing = this._committing;
+  this._committing = true;
+  fn();
+  this._committing = committing;
+};
+
+Object.defineProperties( Store.prototype, prototypeAccessors );
+
+function genericSubscribe (fn, subs) {
+  if (subs.indexOf(fn) < 0) {
+    subs.push(fn);
+  }
+  return function () {
+    var i = subs.indexOf(fn);
+    if (i > -1) {
+      subs.splice(i, 1);
+    }
+  }
+}
+
+function resetStore (store, hot) {
+  store._actions = Object.create(null);
+  store._mutations = Object.create(null);
+  store._wrappedGetters = Object.create(null);
+  store._modulesNamespaceMap = Object.create(null);
+  var state = store.state;
+  // init all modules
+  installModule(store, state, [], store._modules.root, true);
+  // reset vm
+  resetStoreVM(store, state, hot);
+}
+
+function resetStoreVM (store, state, hot) {
+  var oldVm = store._vm;
+
+  // bind store public getters
+  store.getters = {};
+  var wrappedGetters = store._wrappedGetters;
+  var computed = {};
+  forEachValue(wrappedGetters, function (fn, key) {
+    // use computed to leverage its lazy-caching mechanism
+    computed[key] = function () { return fn(store); };
+    Object.defineProperty(store.getters, key, {
+      get: function () { return store._vm[key]; },
+      enumerable: true // for local getters
+    });
+  });
+
+  // use a Vue instance to store the state tree
+  // suppress warnings just in case the user has added
+  // some funky global mixins
+  var silent = Vue.config.silent;
+  Vue.config.silent = true;
+  store._vm = new Vue({
+    data: {
+      $$state: state
+    },
+    computed: computed
+  });
+  Vue.config.silent = silent;
+
+  // enable strict mode for new vm
+  if (store.strict) {
+    enableStrictMode(store);
+  }
+
+  if (oldVm) {
+    if (hot) {
+      // dispatch changes in all subscribed watchers
+      // to force getter re-evaluation for hot reloading.
+      store._withCommit(function () {
+        oldVm._data.$$state = null;
+      });
+    }
+    Vue.nextTick(function () { return oldVm.$destroy(); });
+  }
+}
+
+function installModule (store, rootState, path, module, hot) {
+  var isRoot = !path.length;
+  var namespace = store._modules.getNamespace(path);
+
+  // register in namespace map
+  if (module.namespaced) {
+    store._modulesNamespaceMap[namespace] = module;
+  }
+
+  // set state
+  if (!isRoot && !hot) {
+    var parentState = getNestedState(rootState, path.slice(0, -1));
+    var moduleName = path[path.length - 1];
+    store._withCommit(function () {
+      Vue.set(parentState, moduleName, module.state);
+    });
+  }
+
+  var local = module.context = makeLocalContext(store, namespace, path);
+
+  module.forEachMutation(function (mutation, key) {
+    var namespacedType = namespace + key;
+    registerMutation(store, namespacedType, mutation, local);
+  });
+
+  module.forEachAction(function (action, key) {
+    var type = action.root ? key : namespace + key;
+    var handler = action.handler || action;
+    registerAction(store, type, handler, local);
+  });
+
+  module.forEachGetter(function (getter, key) {
+    var namespacedType = namespace + key;
+    registerGetter(store, namespacedType, getter, local);
+  });
+
+  module.forEachChild(function (child, key) {
+    installModule(store, rootState, path.concat(key), child, hot);
+  });
+}
+
+/**
+ * make localized dispatch, commit, getters and state
+ * if there is no namespace, just use root ones
+ */
+function makeLocalContext (store, namespace, path) {
+  var noNamespace = namespace === '';
+
+  var local = {
+    dispatch: noNamespace ? store.dispatch : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if ("development" !== 'production' && !store._actions[type]) {
+          console.error(("[vuex] unknown local action type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      return store.dispatch(type, payload)
+    },
+
+    commit: noNamespace ? store.commit : function (_type, _payload, _options) {
+      var args = unifyObjectStyle(_type, _payload, _options);
+      var payload = args.payload;
+      var options = args.options;
+      var type = args.type;
+
+      if (!options || !options.root) {
+        type = namespace + type;
+        if ("development" !== 'production' && !store._mutations[type]) {
+          console.error(("[vuex] unknown local mutation type: " + (args.type) + ", global type: " + type));
+          return
+        }
+      }
+
+      store.commit(type, payload, options);
+    }
+  };
+
+  // getters and state object must be gotten lazily
+  // because they will be changed by vm update
+  Object.defineProperties(local, {
+    getters: {
+      get: noNamespace
+        ? function () { return store.getters; }
+        : function () { return makeLocalGetters(store, namespace); }
+    },
+    state: {
+      get: function () { return getNestedState(store.state, path); }
+    }
+  });
+
+  return local
+}
+
+function makeLocalGetters (store, namespace) {
+  var gettersProxy = {};
+
+  var splitPos = namespace.length;
+  Object.keys(store.getters).forEach(function (type) {
+    // skip if the target getter is not match this namespace
+    if (type.slice(0, splitPos) !== namespace) { return }
+
+    // extract local getter type
+    var localType = type.slice(splitPos);
+
+    // Add a port to the getters proxy.
+    // Define as getter property because
+    // we do not want to evaluate the getters in this time.
+    Object.defineProperty(gettersProxy, localType, {
+      get: function () { return store.getters[type]; },
+      enumerable: true
+    });
+  });
+
+  return gettersProxy
+}
+
+function registerMutation (store, type, handler, local) {
+  var entry = store._mutations[type] || (store._mutations[type] = []);
+  entry.push(function wrappedMutationHandler (payload) {
+    handler.call(store, local.state, payload);
+  });
+}
+
+function registerAction (store, type, handler, local) {
+  var entry = store._actions[type] || (store._actions[type] = []);
+  entry.push(function wrappedActionHandler (payload, cb) {
+    var res = handler.call(store, {
+      dispatch: local.dispatch,
+      commit: local.commit,
+      getters: local.getters,
+      state: local.state,
+      rootGetters: store.getters,
+      rootState: store.state
+    }, payload, cb);
+    if (!isPromise(res)) {
+      res = Promise.resolve(res);
+    }
+    if (store._devtoolHook) {
+      return res.catch(function (err) {
+        store._devtoolHook.emit('vuex:error', err);
+        throw err
+      })
+    } else {
+      return res
+    }
+  });
+}
+
+function registerGetter (store, type, rawGetter, local) {
+  if (store._wrappedGetters[type]) {
+    {
+      console.error(("[vuex] duplicate getter key: " + type));
+    }
+    return
+  }
+  store._wrappedGetters[type] = function wrappedGetter (store) {
+    return rawGetter(
+      local.state, // local state
+      local.getters, // local getters
+      store.state, // root state
+      store.getters // root getters
+    )
+  };
+}
+
+function enableStrictMode (store) {
+  store._vm.$watch(function () { return this._data.$$state }, function () {
+    {
+      assert(store._committing, "Do not mutate vuex store state outside mutation handlers.");
+    }
+  }, { deep: true, sync: true });
+}
+
+function getNestedState (state, path) {
+  return path.length
+    ? path.reduce(function (state, key) { return state[key]; }, state)
+    : state
+}
+
+function unifyObjectStyle (type, payload, options) {
+  if (isObject(type) && type.type) {
+    options = payload;
+    payload = type;
+    type = type.type;
+  }
+
+  {
+    assert(typeof type === 'string', ("Expects string as the type, but found " + (typeof type) + "."));
+  }
+
+  return { type: type, payload: payload, options: options }
+}
+
+function install (_Vue) {
+  if (Vue && _Vue === Vue) {
+    {
+      console.error(
+        '[vuex] already installed. Vue.use(Vuex) should be called only once.'
+      );
+    }
+    return
+  }
+  Vue = _Vue;
+  applyMixin(Vue);
+}
+
+var mapState = normalizeNamespace(function (namespace, states) {
+  var res = {};
+  normalizeMap(states).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedState () {
+      var state = this.$store.state;
+      var getters = this.$store.getters;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapState', namespace);
+        if (!module) {
+          return
+        }
+        state = module.context.state;
+        getters = module.context.getters;
+      }
+      return typeof val === 'function'
+        ? val.call(this, state, getters)
+        : state[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapMutations = normalizeNamespace(function (namespace, mutations) {
+  var res = {};
+  normalizeMap(mutations).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedMutation () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var commit = this.$store.commit;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapMutations', namespace);
+        if (!module) {
+          return
+        }
+        commit = module.context.commit;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [commit].concat(args))
+        : commit.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var mapGetters = normalizeNamespace(function (namespace, getters) {
+  var res = {};
+  normalizeMap(getters).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    val = namespace + val;
+    res[key] = function mappedGetter () {
+      if (namespace && !getModuleByNamespace(this.$store, 'mapGetters', namespace)) {
+        return
+      }
+      if ("development" !== 'production' && !(val in this.$store.getters)) {
+        console.error(("[vuex] unknown getter: " + val));
+        return
+      }
+      return this.$store.getters[val]
+    };
+    // mark vuex getter for devtools
+    res[key].vuex = true;
+  });
+  return res
+});
+
+var mapActions = normalizeNamespace(function (namespace, actions) {
+  var res = {};
+  normalizeMap(actions).forEach(function (ref) {
+    var key = ref.key;
+    var val = ref.val;
+
+    res[key] = function mappedAction () {
+      var args = [], len = arguments.length;
+      while ( len-- ) args[ len ] = arguments[ len ];
+
+      var dispatch = this.$store.dispatch;
+      if (namespace) {
+        var module = getModuleByNamespace(this.$store, 'mapActions', namespace);
+        if (!module) {
+          return
+        }
+        dispatch = module.context.dispatch;
+      }
+      return typeof val === 'function'
+        ? val.apply(this, [dispatch].concat(args))
+        : dispatch.apply(this.$store, [val].concat(args))
+    };
+  });
+  return res
+});
+
+var createNamespacedHelpers = function (namespace) { return ({
+  mapState: mapState.bind(null, namespace),
+  mapGetters: mapGetters.bind(null, namespace),
+  mapMutations: mapMutations.bind(null, namespace),
+  mapActions: mapActions.bind(null, namespace)
+}); };
+
+function normalizeMap (map) {
+  return Array.isArray(map)
+    ? map.map(function (key) { return ({ key: key, val: key }); })
+    : Object.keys(map).map(function (key) { return ({ key: key, val: map[key] }); })
+}
+
+function normalizeNamespace (fn) {
+  return function (namespace, map) {
+    if (typeof namespace !== 'string') {
+      map = namespace;
+      namespace = '';
+    } else if (namespace.charAt(namespace.length - 1) !== '/') {
+      namespace += '/';
+    }
+    return fn(namespace, map)
+  }
+}
+
+function getModuleByNamespace (store, helper, namespace) {
+  var module = store._modulesNamespaceMap[namespace];
+  if ("development" !== 'production' && !module) {
+    console.error(("[vuex] module namespace not found in " + helper + "(): " + namespace));
+  }
+  return module
+}
+
+var index = {
+  Store: Store,
+  install: install,
+  version: '3.0.1',
+  mapState: mapState,
+  mapMutations: mapMutations,
+  mapGetters: mapGetters,
+  mapActions: mapActions,
+  createNamespacedHelpers: createNamespacedHelpers
+};
+
+return index;
+
+})));
diff --git a/vuex/dist/vuex.min.js b/vuex/dist/vuex.min.js
new file mode 100644
index 0000000..5d05b52
--- /dev/null
+++ b/vuex/dist/vuex.min.js
@@ -0,0 +1,6 @@
+/**
+ * vuex v3.0.1
+ * (c) 2017 Evan You
+ * @license MIT
+ */
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e():"function"==typeof define&&define.amd?define(e):t.Vuex=e()}(this,function(){"use strict";function t(t){$&&(t._devtoolHook=$,$.emit("vuex:init",t),$.on("vuex:travel-to-state",function(e){t.replaceState(e)}),t.subscribe(function(t,e){$.emit("vuex:mutation",t,e)}))}function e(t,e){Object.keys(t).forEach(function(n){return e(t[n],n)})}function n(t){return null!==t&&"object"==typeof t}function o(t){return t&&"function"==typeof t.then}function i(t,e,n){if(e.update(n),n.modules)for(var o in n.modules){if(!e.getChild(o))return;i(t.concat(o),e.getChild(o),n.modules[o])}}function r(t,e){return e.indexOf(t)<0&&e.push(t),function(){var n=e.indexOf(t);n>-1&&e.splice(n,1)}}function s(t,e){t._actions=Object.create(null),t._mutations=Object.create(null),t._wrappedGetters=Object.create(null),t._modulesNamespaceMap=Object.create(null);var n=t.state;a(t,n,[],t._modules.root,!0),c(t,n,e)}function c(t,n,o){var i=t._vm;t.getters={};var r={};e(t._wrappedGetters,function(e,n){r[n]=function(){return e(t)},Object.defineProperty(t.getters,n,{get:function(){return t._vm[n]},enumerable:!0})});var s=j.config.silent;j.config.silent=!0,t._vm=new j({data:{$$state:n},computed:r}),j.config.silent=s,t.strict&&d(t),i&&(o&&t._withCommit(function(){i._data.$$state=null}),j.nextTick(function(){return i.$destroy()}))}function a(t,e,n,o,i){var r=!n.length,s=t._modules.getNamespace(n);if(o.namespaced&&(t._modulesNamespaceMap[s]=o),!r&&!i){var c=m(e,n.slice(0,-1)),f=n[n.length-1];t._withCommit(function(){j.set(c,f,o.state)})}var d=o.context=u(t,s,n);o.forEachMutation(function(e,n){p(t,s+n,e,d)}),o.forEachAction(function(e,n){var o=e.root?n:s+n,i=e.handler||e;h(t,o,i,d)}),o.forEachGetter(function(e,n){l(t,s+n,e,d)}),o.forEachChild(function(o,r){a(t,e,n.concat(r),o,i)})}function u(t,e,n){var o=""===e,i={dispatch:o?t.dispatch:function(n,o,i){var r=v(n,o,i),s=r.payload,c=r.options,a=r.type;return c&&c.root||(a=e+a),t.dispatch(a,s)},commit:o?t.commit:function(n,o,i){var r=v(n,o,i),s=r.payload,c=r.options,a=r.type;c&&c.root||(a=e+a),t.commit(a,s,c)}};return Object.defineProperties(i,{getters:{get:o?function(){return t.getters}:function(){return f(t,e)}},state:{get:function(){return m(t.state,n)}}}),i}function f(t,e){var n={},o=e.length;return Object.keys(t.getters).forEach(function(i){if(i.slice(0,o)===e){var r=i.slice(o);Object.defineProperty(n,r,{get:function(){return t.getters[i]},enumerable:!0})}}),n}function p(t,e,n,o){(t._mutations[e]||(t._mutations[e]=[])).push(function(e){n.call(t,o.state,e)})}function h(t,e,n,i){(t._actions[e]||(t._actions[e]=[])).push(function(e,r){var s=n.call(t,{dispatch:i.dispatch,commit:i.commit,getters:i.getters,state:i.state,rootGetters:t.getters,rootState:t.state},e,r);return o(s)||(s=Promise.resolve(s)),t._devtoolHook?s.catch(function(e){throw t._devtoolHook.emit("vuex:error",e),e}):s})}function l(t,e,n,o){t._wrappedGetters[e]||(t._wrappedGetters[e]=function(t){return n(o.state,o.getters,t.state,t.getters)})}function d(t){t._vm.$watch(function(){return this._data.$$state},function(){},{deep:!0,sync:!0})}function m(t,e){return e.length?e.reduce(function(t,e){return t[e]},t):t}function v(t,e,o){return n(t)&&t.type&&(o=e,e=t,t=t.type),{type:t,payload:e,options:o}}function _(t){j&&t===j||w(j=t)}function y(t){return Array.isArray(t)?t.map(function(t){return{key:t,val:t}}):Object.keys(t).map(function(e){return{key:e,val:t[e]}})}function g(t){return function(e,n){return"string"!=typeof e?(n=e,e=""):"/"!==e.charAt(e.length-1)&&(e+="/"),t(e,n)}}function b(t,e,n){var o=t._modulesNamespaceMap[n];return o}var w=function(t){function e(){var t=this.$options;t.store?this.$store="function"==typeof t.store?t.store():t.store:t.parent&&t.parent.$store&&(this.$store=t.parent.$store)}if(Number(t.version.split(".")[0])>=2)t.mixin({beforeCreate:e});else{var n=t.prototype._init;t.prototype._init=function(t){void 0===t&&(t={}),t.init=t.init?[e].concat(t.init):e,n.call(this,t)}}},$="undefined"!=typeof window&&window.__VUE_DEVTOOLS_GLOBAL_HOOK__,M=function(t,e){this.runtime=e,this._children=Object.create(null),this._rawModule=t;var n=t.state;this.state=("function"==typeof n?n():n)||{}},O={namespaced:{configurable:!0}};O.namespaced.get=function(){return!!this._rawModule.namespaced},M.prototype.addChild=function(t,e){this._children[t]=e},M.prototype.removeChild=function(t){delete this._children[t]},M.prototype.getChild=function(t){return this._children[t]},M.prototype.update=function(t){this._rawModule.namespaced=t.namespaced,t.actions&&(this._rawModule.actions=t.actions),t.mutations&&(this._rawModule.mutations=t.mutations),t.getters&&(this._rawModule.getters=t.getters)},M.prototype.forEachChild=function(t){e(this._children,t)},M.prototype.forEachGetter=function(t){this._rawModule.getters&&e(this._rawModule.getters,t)},M.prototype.forEachAction=function(t){this._rawModule.actions&&e(this._rawModule.actions,t)},M.prototype.forEachMutation=function(t){this._rawModule.mutations&&e(this._rawModule.mutations,t)},Object.defineProperties(M.prototype,O);var E=function(t){this.register([],t,!1)};E.prototype.get=function(t){return t.reduce(function(t,e){return t.getChild(e)},this.root)},E.prototype.getNamespace=function(t){var e=this.root;return t.reduce(function(t,n){return e=e.getChild(n),t+(e.namespaced?n+"/":"")},"")},E.prototype.update=function(t){i([],this.root,t)},E.prototype.register=function(t,n,o){var i=this;void 0===o&&(o=!0);var r=new M(n,o);0===t.length?this.root=r:this.get(t.slice(0,-1)).addChild(t[t.length-1],r),n.modules&&e(n.modules,function(e,n){i.register(t.concat(n),e,o)})},E.prototype.unregister=function(t){var e=this.get(t.slice(0,-1)),n=t[t.length-1];e.getChild(n).runtime&&e.removeChild(n)};var j,C=function(e){var n=this;void 0===e&&(e={}),!j&&"undefined"!=typeof window&&window.Vue&&_(window.Vue);var o=e.plugins;void 0===o&&(o=[]);var i=e.strict;void 0===i&&(i=!1);var r=e.state;void 0===r&&(r={}),"function"==typeof r&&(r=r()||{}),this._committing=!1,this._actions=Object.create(null),this._actionSubscribers=[],this._mutations=Object.create(null),this._wrappedGetters=Object.create(null),this._modules=new E(e),this._modulesNamespaceMap=Object.create(null),this._subscribers=[],this._watcherVM=new j;var s=this,u=this,f=u.dispatch,p=u.commit;this.dispatch=function(t,e){return f.call(s,t,e)},this.commit=function(t,e,n){return p.call(s,t,e,n)},this.strict=i,a(this,r,[],this._modules.root),c(this,r),o.forEach(function(t){return t(n)}),j.config.devtools&&t(this)},x={state:{configurable:!0}};x.state.get=function(){return this._vm._data.$$state},x.state.set=function(t){},C.prototype.commit=function(t,e,n){var o=this,i=v(t,e,n),r=i.type,s=i.payload,c=(i.options,{type:r,payload:s}),a=this._mutations[r];a&&(this._withCommit(function(){a.forEach(function(t){t(s)})}),this._subscribers.forEach(function(t){return t(c,o.state)}))},C.prototype.dispatch=function(t,e){var n=this,o=v(t,e),i=o.type,r=o.payload,s={type:i,payload:r},c=this._actions[i];if(c)return this._actionSubscribers.forEach(function(t){return t(s,n.state)}),c.length>1?Promise.all(c.map(function(t){return t(r)})):c[0](r)},C.prototype.subscribe=function(t){return r(t,this._subscribers)},C.prototype.subscribeAction=function(t){return r(t,this._actionSubscribers)},C.prototype.watch=function(t,e,n){var o=this;return this._watcherVM.$watch(function(){return t(o.state,o.getters)},e,n)},C.prototype.replaceState=function(t){var e=this;this._withCommit(function(){e._vm._data.$$state=t})},C.prototype.registerModule=function(t,e,n){void 0===n&&(n={}),"string"==typeof t&&(t=[t]),this._modules.register(t,e),a(this,this.state,t,this._modules.get(t),n.preserveState),c(this,this.state)},C.prototype.unregisterModule=function(t){var e=this;"string"==typeof t&&(t=[t]),this._modules.unregister(t),this._withCommit(function(){var n=m(e.state,t.slice(0,-1));j.delete(n,t[t.length-1])}),s(this)},C.prototype.hotUpdate=function(t){this._modules.update(t),s(this,!0)},C.prototype._withCommit=function(t){var e=this._committing;this._committing=!0,t(),this._committing=e},Object.defineProperties(C.prototype,x);var k=g(function(t,e){var n={};return y(e).forEach(function(e){var o=e.key,i=e.val;n[o]=function(){var e=this.$store.state,n=this.$store.getters;if(t){var o=b(this.$store,0,t);if(!o)return;e=o.context.state,n=o.context.getters}return"function"==typeof i?i.call(this,e,n):e[i]},n[o].vuex=!0}),n}),G=g(function(t,e){var n={};return y(e).forEach(function(e){var o=e.key,i=e.val;n[o]=function(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];var o=this.$store.commit;if(t){var r=b(this.$store,0,t);if(!r)return;o=r.context.commit}return"function"==typeof i?i.apply(this,[o].concat(e)):o.apply(this.$store,[i].concat(e))}}),n}),S=g(function(t,e){var n={};return y(e).forEach(function(e){var o=e.key,i=e.val;i=t+i,n[o]=function(){if(!t||b(this.$store,0,t))return this.$store.getters[i]},n[o].vuex=!0}),n}),A=g(function(t,e){var n={};return y(e).forEach(function(e){var o=e.key,i=e.val;n[o]=function(){for(var e=[],n=arguments.length;n--;)e[n]=arguments[n];var o=this.$store.dispatch;if(t){var r=b(this.$store,0,t);if(!r)return;o=r.context.dispatch}return"function"==typeof i?i.apply(this,[o].concat(e)):o.apply(this.$store,[i].concat(e))}}),n});return{Store:C,install:_,version:"3.0.1",mapState:k,mapMutations:G,mapGetters:S,mapActions:A,createNamespacedHelpers:function(t){return{mapState:k.bind(null,t),mapGetters:S.bind(null,t),mapMutations:G.bind(null,t),mapActions:A.bind(null,t)}}}});
\ No newline at end of file
diff --git a/vuex/package.json b/vuex/package.json
new file mode 100644
index 0000000..c8d64c9
--- /dev/null
+++ b/vuex/package.json
@@ -0,0 +1,105 @@
+{
+  "_from": "vuex@^3.0.1",
+  "_id": "vuex@3.0.1",
+  "_inBundle": false,
+  "_integrity": "sha1-52E1Lr4K9TfUu3Vam53Evj3379I=",
+  "_location": "/vuex",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "vuex@^3.0.1",
+    "name": "vuex",
+    "escapedName": "vuex",
+    "rawSpec": "^3.0.1",
+    "saveSpec": null,
+    "fetchSpec": "^3.0.1"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "http://registry.npm.taobao.org/vuex/download/vuex-3.0.1.tgz",
+  "_shasum": "e761352ebe0af537d4bb755a9b9dc4be3df7efd2",
+  "_spec": "vuex@^3.0.1",
+  "_where": "C:\\Users\\Administrator\\Desktop\\mv-project",
+  "author": {
+    "name": "Evan You"
+  },
+  "bugs": {
+    "url": "https://github.com/vuejs/vuex/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "state management for Vue.js",
+  "devDependencies": {
+    "babel-core": "^6.22.1",
+    "babel-loader": "^7.1.2",
+    "babel-plugin-transform-object-rest-spread": "^6.23.0",
+    "babel-polyfill": "^6.22.0",
+    "babel-preset-env": "^1.5.1",
+    "chromedriver": "^2.32.3",
+    "cross-spawn": "^5.0.1",
+    "css-loader": "^0.28.7",
+    "eslint": "^3.19.0",
+    "eslint-plugin-vue-libs": "^1.2.0",
+    "express": "^4.14.1",
+    "gitbook-plugin-edit-link": "^2.0.2",
+    "gitbook-plugin-github": "^3.0.0",
+    "gitbook-plugin-prism": "^2.3.0",
+    "gitbook-plugin-theme-vuejs": "^1.1.0",
+    "jasmine": "2.8.0",
+    "jasmine-core": "2.8.0",
+    "nightwatch": "^0.9.12",
+    "nightwatch-helpers": "^1.2.0",
+    "phantomjs-prebuilt": "^2.1.14",
+    "rollup": "^0.50.0",
+    "rollup-plugin-buble": "^0.16.0",
+    "rollup-plugin-replace": "^2.0.0",
+    "rollup-watch": "^4.3.1",
+    "selenium-server": "^2.53.1",
+    "todomvc-app-css": "^2.1.0",
+    "typescript": "^2.5.3",
+    "uglify-js": "^3.1.2",
+    "vue": "^2.5.0",
+    "vue-loader": "^13.3.0",
+    "vue-template-compiler": "^2.5.0",
+    "webpack": "^3.7.1",
+    "webpack-dev-middleware": "^1.10.0",
+    "webpack-hot-middleware": "^2.19.1"
+  },
+  "files": [
+    "dist",
+    "types/index.d.ts",
+    "types/helpers.d.ts",
+    "types/vue.d.ts"
+  ],
+  "homepage": "https://github.com/vuejs/vuex#readme",
+  "license": "MIT",
+  "main": "dist/vuex.common.js",
+  "module": "dist/vuex.esm.js",
+  "name": "vuex",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/vuejs/vuex.git"
+  },
+  "scripts": {
+    "build": "npm run build:main && npm run build:logger",
+    "build:logger": "rollup -c build/rollup.logger.config.js",
+    "build:main": "node build/build.main.js",
+    "dev": "node examples/server.js",
+    "dev:dist": "rollup -wm -c build/rollup.dev.config.js",
+    "docs": "cd docs && gitbook install && gitbook serve",
+    "docs:deploy": "cd docs && ./deploy.sh",
+    "lint": "eslint src test",
+    "release": "bash build/release.sh",
+    "test": "npm run lint && npm run test:types && npm run test:unit && npm run test:ssr && npm run test:e2e",
+    "test:e2e": "node test/e2e/runner.js",
+    "test:ssr": "rollup -c build/rollup.dev.config.js && VUE_ENV=server jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json",
+    "test:types": "tsc -p types/test",
+    "test:unit": "rollup -c build/rollup.dev.config.js && jasmine JASMINE_CONFIG_PATH=test/unit/jasmine.json"
+  },
+  "typings": "types/index.d.ts",
+  "unpkg": "dist/vuex.js",
+  "version": "3.0.1"
+}
diff --git a/vuex/types/README.md b/vuex/types/README.md
new file mode 100644
index 0000000..2e0d5d6
--- /dev/null
+++ b/vuex/types/README.md
@@ -0,0 +1,7 @@
+This is the TypeScript declaration of Vuex.
+
+## Testing
+
+```sh
+$ tsc -p test/tsconfig.json
+```
diff --git a/vuex/types/helpers.d.ts b/vuex/types/helpers.d.ts
new file mode 100644
index 0000000..e866504
--- /dev/null
+++ b/vuex/types/helpers.d.ts
@@ -0,0 +1,68 @@
+import Vue from 'vue';
+import { Dispatch, Commit } from './index';
+
+type Dictionary<T> = { [key: string]: T };
+type Computed = () => any;
+type MutationMethod = (...args: any[]) => void;
+type ActionMethod = (...args: any[]) => Promise<any>;
+
+interface Mapper<R> {
+  (map: string[]): Dictionary<R>;
+  (map: Dictionary<string>): Dictionary<R>;
+}
+
+interface MapperWithNamespace<R> {
+  (namespace: string, map: string[]): Dictionary<R>;
+  (namespace: string, map: Dictionary<string>): Dictionary<R>;
+}
+
+interface FunctionMapper<F, R> {
+  (map: Dictionary<(this: typeof Vue, fn: F, ...args: any[]) => any>): Dictionary<R>;
+}
+
+interface FunctionMapperWithNamespace<F, R> {
+  (
+    namespace: string,
+    map: Dictionary<(this: typeof Vue, fn: F, ...args: any[]) => any>
+  ): Dictionary<R>;
+}
+
+interface MapperForState {
+  <S>(
+    map: Dictionary<(this: typeof Vue, state: S, getters: any) => any>
+  ): Dictionary<Computed>;
+}
+
+interface MapperForStateWithNamespace {
+  <S>(
+    namespace: string,
+    map: Dictionary<(this: typeof Vue, state: S, getters: any) => any>
+  ): Dictionary<Computed>;
+}
+
+interface NamespacedMappers {
+  mapState: Mapper<Computed> & MapperForState;
+  mapMutations: Mapper<MutationMethod> & FunctionMapper<Commit, MutationMethod>;
+  mapGetters: Mapper<Computed>;
+  mapActions: Mapper<ActionMethod> & FunctionMapper<Dispatch, ActionMethod>;
+}
+
+export declare const mapState: Mapper<Computed>
+  & MapperWithNamespace<Computed>
+  & MapperForState
+  & MapperForStateWithNamespace;
+
+export declare const mapMutations: Mapper<MutationMethod>
+  & MapperWithNamespace<MutationMethod>
+  & FunctionMapper<Commit, MutationMethod>
+  & FunctionMapperWithNamespace<Commit, MutationMethod>;
+
+export declare const mapGetters: Mapper<Computed>
+  & MapperWithNamespace<Computed>;
+
+export declare const mapActions: Mapper<ActionMethod>
+  & MapperWithNamespace<ActionMethod>
+  & FunctionMapper<Dispatch, ActionMethod>
+  & FunctionMapperWithNamespace<Dispatch, ActionMethod>;
+
+export declare function createNamespacedHelpers(namespace: string): NamespacedMappers;
diff --git a/vuex/types/index.d.ts b/vuex/types/index.d.ts
new file mode 100644
index 0000000..a504790
--- /dev/null
+++ b/vuex/types/index.d.ts
@@ -0,0 +1,128 @@
+import _Vue, { WatchOptions } from "vue";
+
+// augment typings of Vue.js
+import "./vue";
+
+export * from "./helpers";
+
+export declare class Store<S> {
+  constructor(options: StoreOptions<S>);
+
+  readonly state: S;
+  readonly getters: any;
+
+  replaceState(state: S): void;
+
+  dispatch: Dispatch;
+  commit: Commit;
+
+  subscribe<P extends MutationPayload>(fn: (mutation: P, state: S) => any): () => void;
+  watch<T>(getter: (state: S) => T, cb: (value: T, oldValue: T) => void, options?: WatchOptions): () => void;
+
+  registerModule<T>(path: string, module: Module<T, S>, options?: ModuleOptions): void;
+  registerModule<T>(path: string[], module: Module<T, S>, options?: ModuleOptions): void;
+
+  unregisterModule(path: string): void;
+  unregisterModule(path: string[]): void;
+
+  hotUpdate(options: {
+    actions?: ActionTree<S, S>;
+    mutations?: MutationTree<S>;
+    getters?: GetterTree<S, S>;
+    modules?: ModuleTree<S>;
+  }): void;
+}
+
+export declare function install(Vue: typeof _Vue): void;
+
+export interface Dispatch {
+  (type: string, payload?: any, options?: DispatchOptions): Promise<any>;
+  <P extends Payload>(payloadWithType: P, options?: DispatchOptions): Promise<any>;
+}
+
+export interface Commit {
+  (type: string, payload?: any, options?: CommitOptions): void;
+  <P extends Payload>(payloadWithType: P, options?: CommitOptions): void;
+}
+
+export interface ActionContext<S, R> {
+  dispatch: Dispatch;
+  commit: Commit;
+  state: S;
+  getters: any;
+  rootState: R;
+  rootGetters: any;
+}
+
+export interface Payload {
+  type: string;
+}
+
+export interface MutationPayload extends Payload {
+  payload: any;
+}
+
+export interface DispatchOptions {
+  root?: boolean;
+}
+
+export interface CommitOptions {
+  silent?: boolean;
+  root?: boolean;
+}
+
+export interface StoreOptions<S> {
+  state?: S;
+  getters?: GetterTree<S, S>;
+  actions?: ActionTree<S, S>;
+  mutations?: MutationTree<S>;
+  modules?: ModuleTree<S>;
+  plugins?: Plugin<S>[];
+  strict?: boolean;
+}
+
+type ActionHandler<S, R> = (injectee: ActionContext<S, R>, payload: any) => any;
+interface ActionObject<S, R> {
+  root?: boolean;
+  handler: ActionHandler<S, R>;
+}
+
+export type Getter<S, R> = (state: S, getters: any, rootState: R, rootGetters: any) => any;
+export type Action<S, R> = ActionHandler<S, R> | ActionObject<S, R>;
+export type Mutation<S> = (state: S, payload: any) => any;
+export type Plugin<S> = (store: Store<S>) => any;
+
+export interface Module<S, R> {
+  namespaced?: boolean;
+  state?: S | (() => S);
+  getters?: GetterTree<S, R>;
+  actions?: ActionTree<S, R>;
+  mutations?: MutationTree<S>;
+  modules?: ModuleTree<R>;
+}
+
+export interface ModuleOptions{
+  preserveState?: boolean
+}
+
+export interface GetterTree<S, R> {
+  [key: string]: Getter<S, R>;
+}
+
+export interface ActionTree<S, R> {
+  [key: string]: Action<S, R>;
+}
+
+export interface MutationTree<S> {
+  [key: string]: Mutation<S>;
+}
+
+export interface ModuleTree<R> {
+  [key: string]: Module<any, R>;
+}
+
+declare const _default: {
+  Store: typeof Store;
+  install: typeof install;
+}
+export default _default;
diff --git a/vuex/types/vue.d.ts b/vuex/types/vue.d.ts
new file mode 100644
index 0000000..302fc4e
--- /dev/null
+++ b/vuex/types/vue.d.ts
@@ -0,0 +1,18 @@
+/**
+ * Extends interfaces in Vue.js
+ */
+
+import Vue, { ComponentOptions } from "vue";
+import { Store } from "./index";
+
+declare module "vue/types/options" {
+  interface ComponentOptions<V extends Vue> {
+    store?: Store<any>;
+  }
+}
+
+declare module "vue/types/vue" {
+  interface Vue {
+    $store: Store<any>;
+  }
+}