diff --git a/mallplusui-uniapp-app2/.gitignore b/mallplusui-uniapp-app2/.gitignore
new file mode 100644
index 0000000..61e358d
--- /dev/null
+++ b/mallplusui-uniapp-app2/.gitignore
@@ -0,0 +1,15 @@
+# Maven #
+target/
+
+# IDEA #
+.idea/
+*.iml
+*.zip
+# Eclipse #
+.settings/
+.classpath
+.project
+
+/vue
+/unpackage
+*/vue
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/.hbuilderx/launch.json b/mallplusui-uniapp-app2/.hbuilderx/launch.json
new file mode 100644
index 0000000..582561b
--- /dev/null
+++ b/mallplusui-uniapp-app2/.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": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/mallplusui-uniapp-app2/App.vue b/mallplusui-uniapp-app2/App.vue
new file mode 100644
index 0000000..8c9547a
--- /dev/null
+++ b/mallplusui-uniapp-app2/App.vue
@@ -0,0 +1,505 @@
+<script>
+	import Api from '@/common/api';
+	// #ifdef APP-PLUS
+	import APPUpdate from "plugins/APPUpdate/index.js";
+	// #endif
+	/**
+	 * vuex管理登陆状态，具体可以参考官方登陆模板示例
+	 */
+	import {
+		mapMutations
+	} from 'vuex';
+	export default {
+		methods: {
+			...mapMutations(['login'])  ,
+            // util.js
+        // 微信公众号授权
+            wxAuthorize() {
+                let link = window.location.href;
+                let params = this._getUrlParams(link);  // 地址解析
+
+                // 已经授权登录过的就不用再授权了
+                if (store.state.token) return;
+
+                // 如果拿到code，调用授权接口，没有拿到就跳转微信授权链接获取
+                if (params.code) {
+                    api.wxAuth(params.code); // 调用后台接口，授权
+                } else {
+                    let appid = 'wx8321531c6046c924';
+                    let uri = encodeURIComponent(link);
+                    let authURL = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${uri}&response_type=code&scope=snsapi_userinfo&state=123#wechat_redirect`;
+                    window.location.href = authURL;
+                }
+            },
+			async typeGoodsList() {
+				let params = {};
+				let list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
+				this.$db.set('categoryList', list)
+			},
+			async areaGoodsList() {
+				let params = {};
+				let list = await Api.apiCall('get', Api.goods.areaGoodsList, params);
+				this.$db.set('areaGoodsList', list)
+			},
+			async sysInfoMethod() {
+				let params = {};
+				let list = await Api.apiCall('get', Api.index.sysInfo, params);
+				this.$db.set('sysInfo', list)
+			},
+			
+		},
+		onLaunch: function() {
+			let userInfo = uni.getStorageSync('userInfo') || '';
+            let token = uni.getStorageSync('token') || '';
+			if(token){
+				//更新登陆状态
+				uni.getStorage({
+					key: 'userInfo',
+					success: (res) => {
+						this.login(res.data);
+					}
+				});
+			}
+
+            let isWeiXin = this.$common.isWeiXinBrowser()
+            if (isWeiXin) {
+                this.wxAuthorize()
+            }
+			this.typeGoodsList();
+			this.areaGoodsList();
+			this.sysInfoMethod();
+			// #ifdef APP-PLUS
+			APPUpdate();
+			// uni.showToast({
+			// 	title: "正式版本新版本哦2",
+			// 	icon: "none"
+			// });
+			// #endif
+		},
+		onShow: function() {
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		},
+	}
+</script>
+
+<style lang='scss'>
+	/*
+		全局公共样式和字体图标
+	*/
+	@font-face {
+		font-family: yticon;
+		font-weight: normal;
+		font-style: normal;
+		src: url('https://at.alicdn.com/t/font_1078604_w4kpxh0rafi.ttf') format('truetype');
+	}
+
+	.yticon {
+		font-family: "yticon" !important;
+		font-size: 16px;
+		font-style: normal;
+		-webkit-font-smoothing: antialiased;
+		-moz-osx-font-smoothing: grayscale;
+	}
+
+	.icon-yiguoqi1:before {
+		content: "\e700";
+	}
+
+	.icon-iconfontshanchu1:before {
+		content: "\e619";
+	}
+
+	.icon-iconfontweixin:before {
+		content: "\e611";
+	}
+
+	.icon-alipay:before {
+		content: "\e636";
+	}
+
+	.icon-shang:before {
+		content: "\e624";
+	}
+
+	.icon-shouye:before {
+		content: "\e626";
+	}
+
+	.icon-shanchu4:before {
+		content: "\e622";
+	}
+
+	.icon-xiaoxi:before {
+		content: "\e618";
+	}
+
+	.icon-jiantour-copy:before {
+		content: "\e600";
+	}
+
+	.icon-fenxiang2:before {
+		content: "\e61e";
+	}
+
+	.icon-pingjia:before {
+		content: "\e67b";
+	}
+
+	.icon-daifukuan:before {
+		content: "\e68f";
+	}
+
+	.icon-pinglun-copy:before {
+		content: "\e612";
+	}
+
+	.icon-dianhua-copy:before {
+		content: "\e621";
+	}
+
+	.icon-shoucang:before {
+		content: "\e645";
+	}
+
+	.icon-xuanzhong2:before {
+		content: "\e62f";
+	}
+
+	.icon-gouwuche_:before {
+		content: "\e630";
+	}
+
+	.icon-icon-test:before {
+		content: "\e60c";
+	}
+
+	.icon-icon-test1:before {
+		content: "\e632";
+	}
+
+	.icon-bianji:before {
+		content: "\e646";
+	}
+
+	.icon-jiazailoading-A:before {
+		content: "\e8fc";
+	}
+
+	.icon-zuoshang:before {
+		content: "\e613";
+	}
+
+	.icon-jia2:before {
+		content: "\e60a";
+	}
+
+	.icon-huifu:before {
+		content: "\e68b";
+	}
+
+	.icon-sousuo:before {
+		content: "\e7ce";
+	}
+
+	.icon-arrow-fine-up:before {
+		content: "\e601";
+	}
+
+	.icon-hot:before {
+		content: "\e60e";
+	}
+
+	.icon-lishijilu:before {
+		content: "\e6b9";
+	}
+
+	.icon-zhengxinchaxun-zhifubaoceping-:before {
+		content: "\e616";
+	}
+
+	.icon-naozhong:before {
+		content: "\e64a";
+	}
+
+	.icon-xiatubiao--copy:before {
+		content: "\e608";
+	}
+
+	.icon-shoucang_xuanzhongzhuangtai:before {
+		content: "\e6a9";
+	}
+
+	.icon-jia1:before {
+		content: "\e61c";
+	}
+
+	.icon-bangzhu1:before {
+		content: "\e63d";
+	}
+
+	.icon-arrow-left-bottom:before {
+		content: "\e602";
+	}
+
+	.icon-arrow-right-bottom:before {
+		content: "\e603";
+	}
+
+	.icon-arrow-left-top:before {
+		content: "\e604";
+	}
+
+	.icon-icon--:before {
+		content: "\e744";
+	}
+
+	.icon-zuojiantou-up:before {
+		content: "\e605";
+	}
+
+	.icon-xia:before {
+		content: "\e62d";
+	}
+
+	.icon--jianhao:before {
+		content: "\e60b";
+	}
+
+	.icon-weixinzhifu:before {
+		content: "\e61a";
+	}
+
+	.icon-comment:before {
+		content: "\e64f";
+	}
+
+	.icon-weixin:before {
+		content: "\e61f";
+	}
+
+	.icon-fenlei1:before {
+		content: "\e620";
+	}
+
+	.icon-erjiye-yucunkuan:before {
+		content: "\e623";
+	}
+
+	.icon-Group-:before {
+		content: "\e688";
+	}
+
+	.icon-you:before {
+		content: "\e606";
+	}
+
+	.icon-forward:before {
+		content: "\e607";
+	}
+
+	.icon-tuijian:before {
+		content: "\e610";
+	}
+
+	.icon-bangzhu:before {
+		content: "\e679";
+	}
+
+	.icon-share:before {
+		content: "\e656";
+	}
+
+	.icon-yiguoqi:before {
+		content: "\e997";
+	}
+
+	.icon-shezhi1:before {
+		content: "\e61d";
+	}
+
+	.icon-fork:before {
+		content: "\e61b";
+	}
+
+	.icon-kafei:before {
+		content: "\e66a";
+	}
+
+	.icon-iLinkapp-:before {
+		content: "\e654";
+	}
+
+	.icon-saomiao:before {
+		content: "\e60d";
+	}
+
+	.icon-shezhi:before {
+		content: "\e60f";
+	}
+
+	.icon-shouhoutuikuan:before {
+		content: "\e631";
+	}
+
+	.icon-gouwuche:before {
+		content: "\e609";
+	}
+
+	.icon-dizhi:before {
+		content: "\e614";
+	}
+
+	.icon-fenlei:before {
+		content: "\e706";
+	}
+
+	.icon-xingxing:before {
+		content: "\e70b";
+	}
+
+	.icon-tuandui:before {
+		content: "\e633";
+	}
+
+	.icon-zuanshi:before {
+		content: "\e615";
+	}
+
+	.icon-zuo:before {
+		content: "\e63c";
+	}
+
+	.icon-shoucang2:before {
+		content: "\e62e";
+	}
+
+	.icon-shouhuodizhi:before {
+		content: "\e712";
+	}
+
+	.icon-yishouhuo:before {
+		content: "\e71a";
+	}
+
+	.icon-dianzan-ash:before {
+		content: "\e617";
+	}
+
+
+
+
+
+	view,
+	scroll-view,
+	swiper,
+	swiper-item,
+	cover-view,
+	cover-image,
+	icon,
+	text,
+	rich-text,
+	progress,
+	button,
+	checkbox,
+	form,
+	input,
+	label,
+	radio,
+	slider,
+	switch,
+	textarea,
+	navigator,
+	audio,
+	camera,
+	image,
+	video {
+		box-sizing: border-box;
+	}
+	/* 骨架屏替代方案 */
+	.Skeleton {
+		background: #f3f3f3;
+		padding: 20upx 0;
+		border-radius: 8upx;
+	}
+
+	/* 图片载入替代方案 */
+	.image-wrapper {
+		font-size: 0;
+		background: #f3f3f3;
+		border-radius: 4px;
+
+		image {
+			width: 100%;
+			height: 100%;
+			transition: .6s;
+			opacity: 0;
+
+			&.loaded {
+				opacity: 1;
+			}
+		}
+	}
+
+	.clamp {
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: block;
+	}
+
+	.common-hover {
+		background: #f5f5f5;
+	}
+
+	/*边框*/
+	.b-b:after,
+	.b-t:after {
+		position: absolute;
+		z-index: 3;
+		left: 0;
+		right: 0;
+		height: 0;
+		content: '';
+		transform: scaleY(.5);
+		border-bottom: 1px solid $border-color-base;
+	}
+
+	.b-b:after {
+		bottom: 0;
+	}
+
+	.b-t:after {
+		top: 0;
+	}
+
+	/* button样式改写 */
+	uni-button,
+	button {
+		height: 80upx;
+		line-height: 80upx;
+		font-size: $font-lg + 2upx;
+		font-weight: normal;
+
+		&.no-border:before,
+		&.no-border:after {
+			border: 0;
+		}
+	}
+
+	uni-button[type=default],
+	button[type=default] {
+		color: $font-color-dark;
+	}
+
+	/* input 样式 */
+	.input-placeholder {
+		color: #999999;
+	}
+
+	.placeholder {
+		color: #999999;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/Json.js b/mallplusui-uniapp-app2/Json.js
new file mode 100644
index 0000000..fa2240a
--- /dev/null
+++ b/mallplusui-uniapp-app2/Json.js
@@ -0,0 +1,672 @@
+/* 用户 */
+const userInfo = {
+	status: 1,
+	data: {
+		id: 1,
+		mobile: 18888888888,
+		nickname: 'Leo yo',
+		portrait: 'http://img.61ef.cn/news/201409/28/2014092805595807.jpg'
+	},
+	msg: '提示'
+}
+/* 首页轮播图 */
+const carouselList = [{
+		src: "/static/temp/banner3.jpg",
+		background: "rgb(203, 87, 60)",
+	},
+	{
+		src: "/static/temp/banner2.jpg",
+		background: "rgb(205, 215, 218)",
+	},
+	{
+		src: "/static/temp/banner4.jpg",
+		background: "rgb(183, 73, 69)",
+	}
+]
+/* 商品列表 */
+const goodsList = [{
+		image: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553187020783&di=bac9dd78b36fd984502d404d231011c0&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201609%2F26%2F20160926173213_s5adi.jpeg",
+		image2: "http://pic.rmb.bdstatic.com/819a044daa66718c2c40a48c1ba971e6.jpeg",
+		image3: "http://img001.hc360.cn/y5/M00/1B/45/wKhQUVYFE0uEZ7zVAAAAAMj3H1w418.jpg",
+		title: "古黛妃 短袖t恤女夏装2019新款韩版宽松",
+		price: 179,
+		sales: 61,
+	},
+	{
+		image: "https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4031878334,2682695508&fm=11&gp=0.jpg",
+		image2: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1554013048&di=a3dc9fd1406dd7bad7fbb97b5489ec04&imgtype=jpg&er=1&src=http%3A%2F%2Fimg009.hc360.cn%2Fhb%2FnKo44ac2656F831c684507E3Da0E3a26841.jpg",
+		image3: "http://img.zcool.cn/community/017a4e58b4eab6a801219c77084373.jpg",
+		title: "潘歌针织连衣裙",
+		price: 78,
+		sales: 16,
+	},
+	{
+		image: "https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1620020012,789258862&fm=26&gp=0.jpg",
+		image2: "http://m.360buyimg.com/n12/jfs/t247/42/1078640382/162559/3628a0b/53f5ad09N0dd79894.jpg%21q70.jpg",
+		image3: "http://ikids.61kids.com.cn/upload/2018-12-29/1546070626796114.jpg",
+		title: "巧谷2019春夏季新品新款女装",
+		price: 108.8,
+		sales: 5,
+	}, {
+		image: "https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=756705744,3505936868&fm=11&gp=0.jpg",
+		image2: "http://images.jaadee.com/images/201702/goods_img/30150_d85aed83521.jpg",
+		image3: "http://img13.360buyimg.com/popWaterMark/jfs/t865/120/206320620/138889/dcc94caa/550acedcN613e2a9d.jpg",
+		title: "私萱连衣裙",
+		price: 265,
+		sales: 88,
+	}, {
+		image: "https://img13.360buyimg.com/n8/jfs/t1/30343/20/1029/481370/5c449438Ecb46a15b/2b2adccb6dc742fd.jpg",
+		image2: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553418265666&di=d4a7f7eb0ae3c859edeb921641ee1c3a&imgtype=0&src=http%3A%2F%2Fimg003.hc360.cn%2Fy3%2FM02%2FF8%2F9F%2FwKhQh1TuSkGELIlQAAAAAPuLl4M987.jpg",
+		image3: "http://img.ef43.com.cn/product/2016/8/05100204b0c.jpg",
+		title: "娇诗茹 ulzzang原宿风学生潮韩版春夏短",
+		price: 422,
+		sales: 137,
+	}, {
+		image: "https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553187020783&di=bac9dd78b36fd984502d404d231011c0&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201609%2F26%2F20160926173213_s5adi.jpeg",
+		image2: "http://image5.suning.cn/uimg/b2c/newcatentries/0070158827-000000000622091973_2_800x800.jpg",
+		image3: "http://img.61ef.cn/news/201903/20/2019032009251784.jpg",
+		title: "古黛妃 短袖t恤女夏装2019新款韩版宽松",
+		price: 179,
+		sales: 95,
+	},
+]
+
+/* 购物车 */
+const cartList = [{
+		id: 1,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553005139&di=3368549edf9eee769a9bcb3fbbed2504&imgtype=jpg&er=1&src=http%3A%2F%2Fimg002.hc360.cn%2Fy3%2FM01%2F5F%2FDB%2FwKhQh1T7iceEGRdWAAAAADQvqk8733.jpg',
+		attr_val: '春装款 L',
+		stock: 15,
+		title: 'OVBE 长袖风衣',
+		price: 278.00,
+		number: 1
+	},
+	{
+		id: 3,
+		image: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2319343996,1107396922&fm=26&gp=0.jpg',
+		attr_val: '激光导航 扫拖一体',
+		stock: 3,
+		title: '科沃斯 Ecovacs 扫地机器人',
+		price: 1348.00,
+		number: 5
+	},
+	{
+		id: 4,
+		image: 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2668268226,1765897385&fm=26&gp=0.jpg',
+		attr_val: 'XL',
+		stock: 55,
+		title: '朵绒菲小西装',
+		price: 175.88,
+		number: 1
+	},
+	{
+		id: 5,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1552410549432&di=06dd3758053fb6d6362516f30a42d055&imgtype=0&src=http%3A%2F%2Fimgcache.mysodao.com%2Fimg3%2FM0A%2F67%2F42%2FCgAPD1vNSsHNm-TnAAEy61txQb4543_400x400x2.JPG',
+		attr_val: '520 #粉红色',
+		stock: 15,
+		title: '迪奥（Dior）烈艳唇膏',
+		price: 1089.00,
+		number: 1
+	},
+	{
+		id: 6,
+		image: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1031875829,2994442603&fm=26&gp=0.jpg',
+		attr_val: '樱花味润手霜 30ml',
+		stock: 15,
+		title: "欧舒丹（L'OCCITANE）乳木果",
+		price: 128,
+		number: 1
+	},
+	{
+		id: 7,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553007107&di=390915aa8a022cf0b03c03340881b0e7&imgtype=jpg&er=1&src=http%3A%2F%2Fimg13.360buyimg.com%2Fn0%2Fjfs%2Ft646%2F285%2F736444951%2F480473%2Faa701c97%2F548176feN10c9ed7b.jpg',
+		attr_val: '特级 12个',
+		stock: 7,
+		title: '新疆阿克苏苹果 特级',
+		price: 58.8,
+		number: 10
+	},
+	{
+		id: 8,
+		image: 'https://ss2.bdstatic.com/70cFvnSh_Q1YnxGkpoWK1HF6hhy/it/u=2319343996,1107396922&fm=26&gp=0.jpg',
+		attr_val: '激光导航 扫拖一体',
+		stock: 15,
+		title: '科沃斯 Ecovacs 扫地机器人',
+		price: 1348.00,
+		number: 1
+	},
+	{
+		id: 9,
+		image: 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=2668268226,1765897385&fm=26&gp=0.jpg',
+		attr_val: 'XL',
+		stock: 55,
+		title: '朵绒菲小西装',
+		price: 175.88,
+		number: 1
+	},
+	{
+		id: 10,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1552410549432&di=06dd3758053fb6d6362516f30a42d055&imgtype=0&src=http%3A%2F%2Fimgcache.mysodao.com%2Fimg3%2FM0A%2F67%2F42%2FCgAPD1vNSsHNm-TnAAEy61txQb4543_400x400x2.JPG',
+		attr_val: '520 #粉红色',
+		stock: 15,
+		title: '迪奥（Dior）烈艳唇膏',
+		price: 1089.00,
+		number: 1
+	},
+	{
+		id: 11,
+		image: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1031875829,2994442603&fm=26&gp=0.jpg',
+		attr_val: '樱花味润手霜 30ml',
+		stock: 15,
+		title: "欧舒丹（L'OCCITANE）乳木果",
+		price: 128,
+		number: 1
+	},
+	{
+		id: 12,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553007107&di=390915aa8a022cf0b03c03340881b0e7&imgtype=jpg&er=1&src=http%3A%2F%2Fimg13.360buyimg.com%2Fn0%2Fjfs%2Ft646%2F285%2F736444951%2F480473%2Faa701c97%2F548176feN10c9ed7b.jpg',
+		attr_val: '特级 12个',
+		stock: 7,
+		title: '新疆阿克苏苹果 特级',
+		price: 58.8,
+		number: 10
+	},
+	{
+		id: 13,
+		image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1552405266625&di=a703f2b2cdb0fe7f3f05f62dd91307ab&imgtype=0&src=http%3A%2F%2Fwww.78.cn%2Fzixun%2Fnews%2Fupload%2F20190214%2F1550114706486250.jpg',
+		attr_val: '春装款/m',
+		stock: 15,
+		title: '女装2019春秋新款',
+		price: 420.00,
+		number: 1
+	}
+];
+//详情展示页面
+const detailData = {
+	title: '纯种金毛幼犬活体有血统证书',
+	title2: '拆家小能手 你值得拥有',
+	favorite: true,
+	imgList: [{
+			src: 'http://img0.imgtn.bdimg.com/it/u=2396068252,4277062836&fm=26&gp=0.jpg'
+		},
+		{
+			src: 'http://img.pconline.com.cn/images/upload/upc/tx/itbbs/1309/06/c4/25310541_1378426131583.jpg'
+		},
+		{
+			src: 'http://img.pconline.com.cn/images/upload/upc/tx/photoblog/1610/26/c4/28926240_1477451226577_mthumb.jpg'
+		},
+		{
+			src: 'http://picture.ik123.com/uploads/allimg/190219/12-1Z219105139.jpg'
+		},
+	],
+	episodeList: [
+		1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24
+	],
+	guessList: [{
+			src: 'http://img.52z.com/upload/news/image/20180530/20180530081619_31029.jpg',
+			title: '猫眼指甲油',
+			title2: '独树一帜的免照灯猫眼指甲'
+		},
+		{
+			src: 'http://m.china-7.net/uploads/14778449362891.jpg',
+			title: '创意屋',
+			title2: '创意屋形上下双层高低床'
+		},
+		{
+			src: 'http://www.k73.com/up/allimg/130415/22-130415093527.jpg',
+			title: 'MissCandy 指甲油',
+			title2: '十分适合喜欢素净的妹纸，尽显淡雅的气质'
+		},
+		{
+			src: 'http://img0.imgtn.bdimg.com/it/u=2108933440,2194129200&fm=214&gp=0.jpg	',
+			title: 'RMK 2017星空海蓝唇釉',
+			title2: '唇釉质地，上唇后很滋润。少女也会心动的蓝色，透明液体形状。'
+		}
+	],
+	evaList: [{
+			src: 'http://gss0.baidu.com/-fo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/77c6a7efce1b9d1663174705fbdeb48f8d546486.jpg',
+			nickname: 'Ranth Allngal',
+			time: '09-20 12:54',
+			zan: '54',
+			content: '评论不要太苛刻，不管什么产品都会有瑕疵，客服也说了可以退货并且商家承担运费，我觉得至少态度就可以给五星。'
+		},
+		{
+			src: 'http://img0.imgtn.bdimg.com/it/u=2396068252,4277062836&fm=26&gp=0.jpg',
+			nickname: 'Ranth Allngal',
+			time: '09-20 12:54',
+			zan: '54',
+			content: '楼上说的好有道理。'
+		}
+	]
+}
+const shareList = [{
+		type: 1,
+		icon: '/static/temp/share_wechat.png',
+		text: '微信好友',
+		provider: 'weixin',
+		scene: 'WXSceneSession',
+		typeIcon: 0
+	},
+	{
+		type: 2,
+		icon: '/static/temp/share_moment.png',
+		text: '朋友圈',
+		provider: 'weixin',
+		scene: 'WXSenceTimeline',
+		typeIcon: 0
+	},
+	{
+		type: 3,
+		icon: '/static/temp/share_qq.png',
+		text: 'QQ好友',
+		provider: 'qq',
+		scene: 'WXSceneSession',
+		typeIcon: 1
+	},
+	{
+		type: 4,
+		icon: '/static/temp/share_qqzone.png',
+		text: 'QQ空间',
+		provider: 'qq',
+		scene: 'WXSenceTimeline',
+		typeIcon: 1
+	}
+]
+const lazyLoadList = [{
+		src: 'http://img0.imgtn.bdimg.com/it/u=2396068252,4277062836&fm=26&gp=0.jpg'
+	},
+	{
+		src: 'http://img.pconline.com.cn/images/upload/upc/tx/itbbs/1309/06/c4/25310541_1378426131583.jpg'
+	},
+	{
+		src: 'http://img.pconline.com.cn/images/upload/upc/tx/photoblog/1610/26/c4/28926240_1477451226577_mthumb.jpg'
+	},
+	{
+		src: 'http://picture.ik123.com/uploads/allimg/190219/12-1Z219105139.jpg'
+	},
+	{
+		src: 'http://img5.imgtn.bdimg.com/it/u=2904900134,438461613&fm=26&gp=0.jpg'
+	},
+	{
+		src: 'http://img1.imgtn.bdimg.com/it/u=1690475408,2565370337&fm=26&gp=0.jpg'
+	},
+	{
+		src: 'http://img.99114.com/group1/M00/7F/99/wKgGS1kVrPGAe5LmAAU2KrJmb3Q923_600_600.jpg'
+	},
+	{
+		src: 'http://img4.imgtn.bdimg.com/it/u=261047209,372231813&fm=26&gp=0.jpg'
+	},
+	{
+		src: 'http://i2.17173cdn.com/i7mz64/YWxqaGBf/tu17173com/20150107/eMyVMObjlbcvDEv.jpg'
+	},
+	{
+		src: 'http://img008.hc360.cn/m4/M02/E7/87/wKhQ6FSrfU6EfUoyAAAAAITAfyc280.jpg'
+	},
+	{
+		src: 'http://pic1.win4000.com/wallpaper/d/5991569950166.jpg'
+	},
+	{
+		src: 'http://gss0.baidu.com/9fo3dSag_xI4khGko9WTAnF6hhy/zhidao/pic/item/6f061d950a7b0208f9fe945e60d9f2d3572cc85e.jpg'
+	},
+	{
+		src: 'http://pic41.nipic.com/20140429/18169759_125841756000_2.jpg'
+	},
+	{
+		src: 'http://www.k73.com/up/allimg/130415/22-130415093527.jpg'
+	},
+	{
+		src: 'http://img.52z.com/upload/news/image/20180530/20180530081619_31029.jpg'
+	},
+	{
+		src: 'http://b-ssl.duitang.com/uploads/item/201410/02/20141002111638_tXAzU.jpeg'
+	},
+	{
+		src: 'http://img2.ph.126.net/C4JW6f57QWSB21-8jh2UGQ==/1762596304262286698.jpg'
+	},
+	{
+		src: 'http://att.bbs.duowan.com/forum/201405/17/190257nzcvkkdg6w2e8226.jpg'
+	},
+	{
+		src: 'http://attach.bbs.miui.com/forum/201504/10/223644v3intigyvva0vgym.jpg'
+	},
+	{
+		src: 'http://pic1.win4000.com/mobile/3/57888a298d61d.jpg'
+	},
+]
+
+const orderList = [{
+		time: '2019-04-06 11:37',
+		state: 1,
+		goodsList: [{
+				image: 'https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1553187020783&di=bac9dd78b36fd984502d404d231011c0&imgtype=0&src=http%3A%2F%2Fb-ssl.duitang.com%2Fuploads%2Fitem%2F201609%2F26%2F20160926173213_s5adi.jpeg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4031878334,2682695508&fm=11&gp=0.jpg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1620020012,789258862&fm=26&gp=0.jpg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4031878334,2682695508&fm=11&gp=0.jpg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1620020012,789258862&fm=26&gp=0.jpg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFuHSh_Q1YnxGkpoWK1HF6hhy/it/u=4031878334,2682695508&fm=11&gp=0.jpg',
+			},
+			{
+				image: 'https://ss0.bdstatic.com/70cFvHSh_Q1YnxGkpoWK1HF6hhy/it/u=1620020012,789258862&fm=26&gp=0.jpg',
+			}
+		]
+	},
+	{
+		time: '2019-04-06 11:37',
+		state: 9,
+		goodsList: [{
+			title: '古黛妃 短袖t恤女 春夏装2019新款韩版宽松',
+			price: 179.5,
+			image: 'https://img13.360buyimg.com/n8/jfs/t1/30343/20/1029/481370/5c449438Ecb46a15b/2b2adccb6dc742fd.jpg',
+			number: 1,
+			attr: '珊瑚粉 M'
+		}]
+	},
+	{
+		time: '2019-04-06 11:37',
+		state: 1,
+		goodsList: [{
+				image: 'https://img.alicdn.com/imgextra/https://img.alicdn.com/imgextra/i2/2120460599/O1CN01LBPS4C1GINkwsOTXS_!!2120460599.jpg_430x430q90.jpg',
+			},
+			{
+				image: 'https://img.alicdn.com/imgextra/i2/1069876356/TB2ocTQG4WYBuNjy1zkXXXGGpXa_!!1069876356.jpg_430x430q90.jpg',
+			},
+			{
+				image: 'https://img.alicdn.com/imgextra/https://img.alicdn.com/imgextra/i4/2120460599/O1CN01YsmgwZ1GINkv38rkn_!!2120460599.jpg_430x430q90.jpg',
+			},
+		]
+	},
+	{
+		time: '2019-04-06 11:37',
+		state: 1,
+		goodsList: [{
+			title: '回力女鞋高帮帆布鞋女学生韩版鞋子女2019潮鞋女鞋新款春季板鞋女',
+			price: 69,
+			image: 'https://img.alicdn.com/imgextra/i3/2128794607/TB2gzzoc41YBuNjy1zcXXbNcXXa_!!2128794607.jpg_430x430q90.jpg',
+			number: 1,
+			attr: '白色-高帮 39'
+		}]
+	},
+	{
+		time: '2019-04-06 11:37',
+		state: 1,
+		goodsList: [{
+				image: 'https://img.alicdn.com/imgextra/https://img.alicdn.com/imgextra/i4/3358098495/O1CN01dhYyid2Ccl5MWLDok_!!3358098495.jpg_430x430q90.jpg',
+			},
+			{
+				image: 'https://img.alicdn.com/imgextra/https://img.alicdn.com/imgextra/i3/3358098495/O1CN01AWsnFA2Ccl5OzvqsL_!!3358098495.jpg_430x430q90.jpg',
+			},
+		]
+	},
+	{
+		time: '2019-04-06 11:37',
+		state: 1,
+		goodsList: [{
+				image: 'https://img.alicdn.com/imgextra/i4/3470687433/O1CN0124mMQOSERr18L1h_!!3470687433.jpg_430x430q90.jpg',
+			},
+			{
+				image: 'https://img.alicdn.com/imgextra/i3/2888462616/O1CN01ERra5J1VCAbZaKI5n_!!0-item_pic.jpg_430x430q90.jpg',
+			},
+			{
+				image: 'https://gd3.alicdn.com/imgextra/i3/819381730/O1CN01YV4mXj1OeNhQIhQlh_!!819381730.jpg_400x400.jpg',
+			},
+		]
+	}
+
+]
+const cateList = [{
+		id: 1,
+		name: '手机数码'
+	},
+	{
+		id: 2,
+		name: '礼品鲜花'
+	},
+	{
+		id: 3,
+		name: '男装女装'
+	},
+	{
+		id: 4,
+		name: '母婴用品'
+	},
+	{
+		id: 5,
+		pid: 1,
+		name: '手机通讯'
+	},
+	{
+		id: 6,
+		pid: 1,
+		name: '运营商'
+	},
+	{
+		id: 8,
+		pid: 5,
+		name: '全面屏手机',
+		picture: '/static/temp/cate2.jpg'
+	},
+	{
+		id: 9,
+		pid: 5,
+		name: '游戏手机',
+		picture: '/static/temp/cate3.jpg'
+	},
+	{
+		id: 10,
+		pid: 5,
+		name: '老人机',
+		picture: '/static/temp/cate1.jpg'
+	},
+	{
+		id: 11,
+		pid: 5,
+		name: '拍照手机',
+		picture: '/static/temp/cate4.jpg'
+	},
+	{
+		id: 12,
+		pid: 5,
+		name: '女性手机',
+		picture: '/static/temp/cate5.jpg'
+	},
+	{
+		id: 14,
+		pid: 6,
+		name: '合约机',
+		picture: '/static/temp/cate1.jpg'
+	},
+	{
+		id: 15,
+		pid: 6,
+		name: '选好卡',
+		picture: '/static/temp/cate4.jpg'
+	},
+	{
+		id: 16,
+		pid: 6,
+		name: '办套餐',
+		picture: '/static/temp/cate5.jpg'
+	},
+	{
+		id: 17,
+		pid: 2,
+		name: '礼品',
+	},
+	{
+		id: 18,
+		pid: 2,
+		name: '鲜花',
+	},
+	{
+		id: 19,
+		pid: 17,
+		name: '公益摆件',
+		picture: '/static/temp/cate7.jpg'
+	},
+	{
+		id: 20,
+		pid: 17,
+		name: '创意礼品',
+		picture: '/static/temp/cate8.jpg'
+	},
+	{
+		id: 21,
+		pid: 18,
+		name: '鲜花',
+		picture: '/static/temp/cate9.jpg'
+	},
+	{
+		id: 22,
+		pid: 18,
+		name: '每周一花',
+		picture: '/static/temp/cate10.jpg'
+	},
+	{
+		id: 23,
+		pid: 18,
+		name: '卡通花束',
+		picture: '/static/temp/cate11.jpg'
+	},
+	{
+		id: 24,
+		pid: 18,
+		name: '永生花',
+		picture: '/static/temp/cate12.jpg'
+	},
+	{
+		id: 25,
+		pid: 3,
+		name: '男装'
+	},
+	{
+		id: 26,
+		pid: 3,
+		name: '女装'
+	},
+	{
+		id: 27,
+		pid: 25,
+		name: '男士T恤',
+		picture: '/static/temp/cate13.jpg'
+	},
+	{
+		id: 28,
+		pid: 25,
+		name: '男士外套',
+		picture: '/static/temp/cate14.jpg'
+	},
+	{
+		id: 29,
+		pid: 26,
+		name: '裙装',
+		picture: '/static/temp/cate15.jpg'
+	},
+	{
+		id: 30,
+		pid: 26,
+		name: 'T恤',
+		picture: '/static/temp/cate16.jpg'
+	},
+	{
+		id: 31,
+		pid: 26,
+		name: '上装',
+		picture: '/static/temp/cate15.jpg'
+	},
+	{
+		id: 32,
+		pid: 26,
+		name: '下装',
+		picture: '/static/temp/cate16.jpg'
+	},
+	{
+		id: 33,
+		pid: 4,
+		name: '奶粉',
+	},
+	{
+		id: 34,
+		pid: 4,
+		name: '营养辅食',
+	},
+	{
+		id: 35,
+		pid: 4,
+		name: '童装',
+	},
+	{
+		id: 39,
+		pid: 4,
+		name: '喂养用品',
+	},
+	{
+		id: 36,
+		pid: 33,
+		name: '有机奶粉',
+		picture: '/static/temp/cate17.jpg'
+	},
+	{
+		id: 37,
+		pid: 34,
+		name: '果泥/果汁',
+		picture: '/static/temp/cate18.jpg'
+	},
+	{
+		id: 39,
+		pid: 34,
+		name: '面条/粥',
+		picture: '/static/temp/cate20.jpg'
+	},
+	{
+		id: 42,
+		pid: 35,
+		name: '婴童衣橱',
+		picture: '/static/temp/cate19.jpg'
+	},
+	{
+		id: 43,
+		pid: 39,
+		name: '吸奶器',
+		picture: '/static/temp/cate21.jpg'
+	},
+	{
+		id: 44,
+		pid: 39,
+		name: '儿童餐具',
+		picture: '/static/temp/cate22.jpg'
+	},
+	{
+		id: 45,
+		pid: 39,
+		name: '牙胶安抚',
+		picture: '/static/temp/cate23.jpg'
+	},
+	{
+		id: 46,
+		pid: 39,
+		name: '围兜',
+		picture: '/static/temp/cate24.jpg'
+	},
+]
+
+export default {
+	carouselList,
+	cartList,
+	detailData,
+	lazyLoadList,
+	userInfo,
+	shareList,
+	goodsList,
+	orderList,
+	cateList
+}
diff --git a/mallplusui-uniapp-app2/README.en.md b/mallplusui-uniapp-app2/README.en.md
new file mode 100644
index 0000000..7b402c0
--- /dev/null
+++ b/mallplusui-uniapp-app2/README.en.md
@@ -0,0 +1,38 @@
+# uniapp
+https://blog.csdn.net/weixin_34337265/article/details/86030756
+https://blog.csdn.net/Neil_1993/article/details/85691295
+https://blog.csdn.net/qq_15764943/article/details/85837552
+#### Description
+{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
+
+#### Software Architecture
+Software architecture description
+
+#### Installation
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### Instructions
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### Contribution
+
+1. Fork the repository
+2. Create Feat_xxx branch
+3. Commit your code
+4. Create Pull Request
+
+
+#### Gitee Feature
+
+1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
+2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
+3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
+4. The most valuable open source project [GVP](https://gitee.com/gvp)
+5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
+6. The most popular members  [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/README.md b/mallplusui-uniapp-app2/README.md
new file mode 100644
index 0000000..10c801d
--- /dev/null
+++ b/mallplusui-uniapp-app2/README.md
@@ -0,0 +1,75 @@
+<<<<<<< HEAD
+# uniapp
+=======
+# orangemall多租户商城后台uni-app前端
+>>>>>>> d3c4db497ff0a14620ac8c253d9b194cbc87afae
+
+#### 介绍
+{**以下是码云平台说明，您可以替换此简介**
+码云是 OSCHINA 推出的基于 Git 的代码托管平台（同时支持 SVN）。专为开发者提供稳定、高效、安全的云端软件开发协作平台
+无论是个人、团队、或是企业，都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
+
+#### 软件架构
+软件架构说明
+
+
+#### 安装教程
+<<<<<<< HEAD
+qq 951449465
+1. 根目录下执行 npm install jweixin-module --save 
+
+
+#### 使用说明
+
+1. xxxx
+2. xxxx
+3. xxxx
+
+#### 参与贡献
+
+1. Fork 本仓库
+2. 新建 Feat_xxx 分支
+3. 提交代码
+4. 新建 Pull Request
+
+=======
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 使用说明
+
+1.  xxxx
+2.  xxxx
+3.  xxxx
+
+#### 参与贡献
+
+1.  Fork 本仓库
+2.  新建 Feat_xxx 分支
+3.  提交代码
+4.  新建 Pull Request
+>>>>>>> d3c4db497ff0a14620ac8c253d9b194cbc87afae
+
+
+#### 码云特技
+
+<<<<<<< HEAD
+1. 使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+=======
+1.  使用 Readme\_XXX.md 来支持不同的语言，例如 Readme\_en.md, Readme\_zh.md
+2.  码云官方博客 [blog.gitee.com](https://blog.gitee.com)
+3.  你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
+4.  [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目，是码云综合评定出的优秀开源项目
+5.  码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
+6.  码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)
+>>>>>>> d3c4db497ff0a14620ac8c253d9b194cbc87afae
+
+
+现在的分销是 会员注册的时候 填写邀请码，然后我购买分销商品，并且支付成功后，给邀请码的用户反钱
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/common/api.js b/mallplusui-uniapp-app2/common/api.js
new file mode 100644
index 0000000..31f2988
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/api.js
@@ -0,0 +1,441 @@
+import store from '../store/index';
+export default {
+	// qq 237524947 wx15d4269d3210863d
+	BASEURI: 'http://mall.yyundong.com/portalapi/api/',
+	// BASEURI: 'http://www.yyundong.com:8083/api/',
+	ADMINURI: 'http://mall.yyundong.com/adminapi/',
+	ESURI: 'http://www.yyundong.com:8081/',
+	h5Appid: 'wxb4660f37187c0b8e', // h5微信登录的appId  暂时测试用
+	source: 1, //1 weixinApplet 2 h5Source 3 pcSource 4 android 5ios
+	es: {
+		simpleSearchList: 'esProduct/search/simple', //简单搜索
+		search: 'esProduct/search', //综合搜索、筛选、排序
+	},
+	/**
+	 * 接口名称
+	 */
+	index: {
+		sysInfo: 'single/home/sysInfo',
+		submitLocaltion: 'single/home/submitLocaltion',
+		getAppletOpenId: 'applet/getAppletOpenId', // 获取openId
+		getWxPhone: 'applet/getWxPhone', // 获取手机号
+		logout: 'single/home/logout',
+		appletLogin_by_weixin: 'applet/login_by_weixin1', // 登录(手机号:phone 密码:password)
+		login: 'single/home/login', // 登录(手机号:phone 密码:password)
+		appLogin: 'single/home/appLogin',
+		simpleReg: 'single/home/simpleReg', // 登录(手机号:phone 密码:password)
+		home: 'single/home/content', //首页展示
+		home1: 'single/home/content1', //首页展示
+		homeFlashPromotionList: 'single/home/homeFlashPromotionList', // 秒杀列表
+		bannerList: 'single/home/bannerList', // 首页banner
+		updatePassword: 'single/home/updatePassword', // 修改密码
+		loginByCode: 'single/home/loginByCode', // 手机和验证码登录
+		reg: 'single/home/reg', // 注册
+		sendCodes: 'single/home/sms/codes', // 获取验证码
+		acceptCoupon: 'single/sms/add', // 获取优惠券
+		listMemberCoupon: 'single/sms/listMemberCoupon', // 优惠券列表
+		couponList: 'single/home/couponList', //  优惠券
+		selectNotRecive: 'single/home/selectNotRecive', //  可领取的优惠券
+		userInfo: 'single/home/userInfo', //  用户信息
+		userSampleInfo: 'single/home/userSampleInfo', //  用户信息
+		groupActivityDetail: 'single/sms/group.activity.getdetial', // 查询团购详情信息
+		groupActivityList: 'single/sms/groupActivityList', // 查询商品团购列表
+		logs: 'single/home/logs', //  记录日志
+		diyDetail: 'single/sms/diyDetail',
+		homeNewProduct: 'single/sms/homeNewProduct/list', //首页新品推荐列表
+		homeBrand: 'single/sms/homeBrand/list', //首页品牌推荐列表
+		homeRecommendProduct: 'single/sms/homeRecommendProduct/list', //首页人气推荐列表
+		homeRecommendSubject: 'single/sms/homeRecommendSubject/list', //首页专题推荐列表
+		nearShopList: 'single/store/dis/shopList', //附近门店
+		nearStoreList: 'single/store/dis/storeList', // 附近商户
+		shoplist: 'single/store/shoplist', //查询门店管理
+		shopDetail: 'single/store/shopDetail', // 门店详情
+		storeClassList: 'single/store/storeClass/list', // 商户内部分类
+		storeCommentList: 'single/store/storeComment/list', // 商户评论
+		noticeList: 'single/home/notice/list',
+		noticeDetail: 'single/home/notice/detail',
+	},
+	member: {
+		applyMember: 'single/user/applyMember', // 会员升级等级
+		memberLevelList: 'single/user/memberLevel/list', // 查询会员等级列表
+		getInviteData: 'single/user/getInviteData',
+		inviteUser: 'single/user/inviteUser',
+		inviteMoney: 'single/user/inviteMoney',
+		currentMember: 'single/user/currentMember',
+		updateMember: 'single/user/updateMember',
+		resetPassword: 'single/user/resetPassword',
+		schoolList: 'single/user/school/list', // 查询学校列表
+		schoolDetail: 'single/user/schoolDetail', // 查询拼团商品详情信息
+		getAreaByPid: 'single/user/getAreaByPid', // 根据pid查询区域
+		bindSchool: 'single/user/bindSchool', // 会员绑定学校
+		bindArea: 'single/user/bindArea', // 会员绑定区域
+		applyStore: 'single/store/applyStore', // 商户入驻
+		storeDetail: 'single/store/detail', // 商户详情
+		storeDetail1: 'single/store/detail1', // 商户详情 带用户
+		store: 'single/store/home', // 商户主页
+		storeList: 'single/store/store/list', // 商户列表
+		memberTagList: 'single/user/memberTag/list', // 商户列表
+		addStoreComment: 'single/store/addStoreComment', // 商户addStoreComment
+		memberBlanceLogList: 'single/user/memberBlanceLog/list',
+	},
+	build: {
+		getBuildNoticeByPage: 'single/build/getBuildNoticeByPage', // 所有社区和房间
+		getBuildWuyeCompanyByPage: 'single/build/getBuildWuyeCompanyByPage', // 所有社区和房间
+		groupList: 'single/build/groupList', // 所有社区和房间
+		communityList: 'single/build/communityList', // 所有社区和房间
+		nearCommunityList: 'single/build/near/communityList', // 周边社区
+		floorList: 'single/build/floorList', // 所有社区和房间
+		allCommunity: 'single/build/allCommunity', // 所有社区和房间
+		bindCommunity: 'single/build/bindCommunity', // 绑定小区和房间
+		home: 'single/build/home', // 首页内容页信息展示
+		applyCommunity: 'single/build/applyCommunity', // 社区入驻
+
+
+	},
+	goods: {
+		tagGoodsList: 'single/pms/tag/goods', // 查询标签商品
+		goodsPromoto: 'single/sms/detail', // 单个商品的优惠详情
+		secskillDetail: 'single/pms/secskill/detail', // 查询秒杀商品详情信息
+		groupGoodsDetail: 'single/pms/goodsGroup/detail', // 查询拼团商品详情信息
+
+		groupHotGoodsList: 'single/pms/groupHotGoods/list', // 查询生效拼团商品列表
+		giftDetail: 'single/pms/gift/detail', // 查询商品详情信息
+		giftList: 'single/pms/gift/list', // 查询商品列表
+		paiMaiDetail: 'single/pms/paimai/detail', // 查询商品详情信息
+		updatePaiMai: 'single/pms/updatePaiMai', // 参与竞价
+		typeGiftList: 'single/pms/typeGiftList', //查询商品类型下的商品列表
+		addView: 'single/pms/addView', // 查询商品详情信息
+		viewList: 'single/pms/viewList', // 查询商品列表
+
+		goodsDetail: 'single/pms/goods/detail', // 查询商品详情信息
+		goodsList: 'single/pms/goods/list', // 查询商品列表
+		productAttrCategoryList: 'single/pms/productAttrCategory/list', // 查询商品属性分类列表
+		categoryList: 'single/pms/productCategory/list', // 查询商品分类列表
+		createGoods: 'single/pms/createGoods', //创建商品
+		brandList: 'single/pms/brand/list', // 根据条件查询所有品牌表列表
+		consultList: 'single/pms/consult/list', // 取某个商品的评价
+		categoryAndGoodsList: 'single/pms/categoryAndGoodsList/list', // 查询商品属性分类列表和商品
+		typeGoodsList: 'single/pms/typeGoodsList', //查询商品类型下的商品列表
+		typeGoodsList1: 'single/pms/typeGoodsList1', //查询商品类型下的商品列表
+		areaGoodsList: 'single/pms/areaGoodsList', //查询商品类型下的商品列表
+		typeList: 'single/pms/typeList', //查询商品类型下的商品列表
+
+		getGoodsTypes: 'single/pms/getGoodsTypes', // 查询分类
+
+		recommendBrand: 'single/pms/recommendBrand/list', // 查询首页推荐品牌
+		newProductList: 'single/pms/newProductList/list', //查询首页新品
+		hotProductList: 'single/pms/hotProductList/list', // 查询热销商品
+		listCollect: 'collection/listCollect', // 显示关注列表
+		deleteCollect: 'collection/delete', // 删除收藏中的某个商品
+		favoriteSave: 'collection/favoriteSave', // 添加/商品收藏
+		listAddress: 'address/list', // 显示所有收货地址
+		deleteAddress: 'address/delete', // 删除
+		addressSave: 'address/save', // 添加
+		setDefaultAddress: 'address/address-set-default', // 设为默认地址
+		getItemDefautl: 'address/getItemDefautl', // 显示默认收货地址
+
+	},
+	order: {
+		getRefundReason: 'single/oms/order/getRefundReason', // 查询售后原因
+		saveOmsOrderReturnApply: 'single/oms/saveOmsOrderReturnApply', // 添加售后
+		aftersaleslist: 'single/oms/order/aftersaleslist', // 查询售后列表
+		aftersalesinfo: 'single/oms/aftersalesinfo', // 查询售后详情
+		addGroup: 'single/oms/addGroup', // 发起拼团
+		acceptGroup: 'single/oms/acceptGroup', // 提交拼团
+		sampleOrderList: 'single/oms/sampleOrderList', // 查询订单列表
+		orderList: 'single/oms/order/list', // 查询订单列表
+		orderDetail: 'single/oms/detail', // 查询订单列表
+		preGroupActivityOrder: 'single/oms/preGroupActivityOrder', // 预览订单团购
+		preOrder: 'single/oms/submitPreview', // 预览订单
+		bookOrder: 'single/oms/generateOrder', //  生成订单
+		submitStorePreview: 'single/oms/submitStorePreview', // 预览订单
+		generateStoreOrder: 'single/oms/generateStoreOrder', //  生成订单
+		closeOrder: 'single/oms/closeOrder', // 关闭订单
+		confimDelivery: 'single/oms/confimDelivery', //确认收货
+		applyRefund: 'single/oms/applyRefund', // 申请退款
+		logisticbyapi: 'single/oms/logisticbyapi', // 查看物流
+		orderevaluate: 'single/oms/orderevaluate', //订单评价
+		addCart: 'cart/addCart', // 添加商品到购物车
+		cartList: 'cart/list', // 获取某个会员的购物车列表
+		promotionCartList: 'cart/list/promotion', // 获取某个会员的购物车列表,包括促销信息
+		updateQuantity: 'cart/update/quantity', //修改购物车中某个商品的数量
+		deleteCart: 'cart/delete', // 删除购物车中的某个商品
+		clearCart: 'cart/clear', // 清空购物车
+
+		paymentlist: 'pay/paymentlist', // 查询订单列表
+
+		jifenPay: 'pay/jifenPay', // 积分兑换
+		balancePay: 'pay/balancePay', // 余额支付
+		weixinAppletPay: 'pay/weixinAppletPay', // 微信小程序支付
+		//支付宝
+		aliAppPay: 'aliPay/appPay', // 支付宝app支付
+		aliWapPay: 'aliPay/wapPay', // 支付宝支付
+		wapPayNoSdk: 'aliPay/wapPayNoSdk', // 支付宝支付
+		pcPay: 'aliPay/pcPay', // 支付宝支付
+		aliPay: 'aliPay/tradePay', // 支付宝支付 String authCode,  String scene
+		aliPrecreatePay: 'aliPay/tradePrecreatePay', // 支付宝扫码支付
+		aliRefund: 'aliPay/tradePrecreatePay', // 支付宝退款
+		//微信
+		wapPay: 'wxPay/wapPay', //微信H5 支付 注意：必须再web页面中发起支付且域名已添加到开发配置中
+		webPay: 'wxPay/webPay', //公众号支付
+		scanCode1: 'wxPay/scanCode1', //扫码支付模式一 已测试
+		scanCode2: 'wxPay/scanCode2', //扫码支付模式二 已测试
+		appPay: 'wxPay/appPay', //微信APP支付
+		micropay: 'wxPay/micropay', //微信刷卡支付
+		miniAppPay: 'wxPay/miniAppPay', //微信小程序支付
+		refund: 'wxPay/refund', //微信退款 String transactionId,String outTradeNo
+		authCodeToOpenid: 'wxPay/authCodeToOpenid', //openId，采用 网页授权获取 access_token API：SnsAccessTokenApi获取
+
+		//银联支付
+		frontConsume: 'unionPay/frontConsume', //PC网关支付 B2C跟B2B查询区别就在于bizType的不同
+		frontConsume2: 'unionPay/frontConsume2', //B2B的网关支付 B2C跟B2B查询区别就在于bizType的不同
+		wapConsume: 'unionPay/wapConsume', //WAP支付 请在手机paymentlist端访问此action
+		appConsume: 'unionPay/appConsume', //APP支付获取tn
+		frontrefund: 'unionPay/refund', //
+
+		//京东
+		jdappPay: 'JDPay/appPay', //App 支付
+		saveOrder: 'JDPay/saveOrder', //String payType PC H5 支付
+		customerPay: 'JDPay/customerPay', //商户二维码支付
+		fkmPay: 'JDPay/fkmPay', //刷卡支付 String token, String amount
+		jdrefund: 'JDPay/refund', //微信APP支付
+
+
+	},
+	cms: {
+		subjectList: 'single/cms/subject/list', //  查询文章列表
+		subjectCategoryList: 'single/cms/subjectCategory/list', //  查询文章分类列表
+		subjectCommentList: 'single/cms/subjectComment/list', //  查询文章评论列表
+		recommendSubjectList: 'single/cms/recommendSubjectList/list', //查询首页推荐文章
+		topicList: 'single/cms/topic/list', //  查询专题列表
+		topicDetail: 'single/cms/topic/detail', // 专题详情
+		subjectDetail: 'single/cms/subject/detail', // 文章详情
+		createSubject: 'single/cms/createSubject', // 创建文章
+	},
+	/**
+	商户端后台接口
+	**/
+	admin: {
+
+		login: 'sys/sysUser/login', // 登录(手机号:phone 密码:password)
+		orderStatic: 'home/orderStatic', // 订单统计
+		goodsStatic: 'home/goodsStatic', // 商品统计
+		userStatic: 'home/userStatic', //会员统计
+		orderDayStatic: 'home/orderDayStatic', //订单日统计
+		dayStatic: 'home/dayStatic', //订单日统计
+
+		bannerList: 'sms/SmsHomeAdvertise/list', // 首页banner
+		memberList: 'ums/UmsMember/list', // 查询学校列表
+		storeDetail: 'sys/SysStore/storeDetail', // 查询拼团商品详情信息
+		schoolList: 'single/user/school/list', // 查询学校列表
+		schoolDetail: 'single/user/schoolDetail', // 查询拼团商品详情信息
+		getAreaByPid: 'single/user/getAreaByPid', // 根据pid查询区域
+		bindSchool: 'single/user/bindSchool', // 会员绑定学校
+		bindArea: 'single/user/bindArea', // 会员绑定区域
+		goodsDetail: 'single/pms/goods/detail', // 查询商品详情信息
+		goodsList: 'pms/PmsProduct/goods/list', // 查询商品列表
+		updatePublishStatus: 'pms/PmsProduct/publishStatus',
+		updateReComStatus: 'pms/PmsProduct/updateReComStatus',
+		delivery: 'oms/OmsOrder/delivery', // 订单发货
+		orderList: 'oms/OmsOrder/order/list', // 查询订单列表
+		orderDetail: 'single/oms/detail', // 查询订单列表
+		subjectList: 'single/cms/subject/list', //  查询文章列表
+	},
+	/**
+	 * 封装请求（async await 封装uni.request） 对应portal 项目
+	 * method	   post/get
+	 * endpoint    接口方法名
+	 * data		   所需传递参数
+	 * load		   是否需要loading
+	 */
+	async apiCall(method, endpoint, data, load) {
+		if (load) {
+			uni.showLoading({
+				title: '请稍候',
+				mask: true
+			});
+		}
+
+		let token = uni.getStorageSync('token') || '';
+		let fullurl = this.BASEURI + endpoint;
+			console.log("fullurl",fullurl);
+		var contentType = 'application/x-www-form-urlencoded';
+
+		data.authorization = token;
+		//console.log(endpoint);
+		let [error, res] = await uni.request({
+			url: fullurl,
+			data: data,
+			method: method,
+			header: {
+				//'Content-Type': 'application/x-www-form-urlencoded',
+				'content-type': contentType,
+				// 'authorization1': Authorization || ''
+			},
+		});
+		if (load) {
+			uni.hideLoading();
+		}
+
+		if (undefined == res || 'undefined' == res) {
+			console.log('index');
+			uni.navigateTo({
+				url: `/pages/public/login`
+			})
+		}
+		if (res.data.msg == 'User token expired!') {
+			console.log('User token expired');
+			uni.showToast({
+				title: '请先登录',
+				icon: 'none'
+			});
+			uni.navigateTo({
+				url: `/pages/public/login`
+			})
+		}
+		if (res.data.msg == '请先登录' || res.data.code == 100) {
+			console.log("100=" + res.data);
+			uni.showToast({
+				title: '请先登录',
+				icon: 'none'
+			});
+			uni.navigateTo({
+				url: `/pages/public/login`
+			})
+		}
+		console.log(res.data);
+		console.log(fullurl);
+		console.log(res.data.data);
+		if (res.data.code == 200) {
+			console.log("===>>>");
+			return res.data.data;
+		} else {
+			console.log(">>>>>=");
+			if (res.data) {
+				if (!res.data.msg) {
+					res.data.msg = res.data.data;
+				}
+				uni.showToast({
+					title: res.data.msg,
+					icon: 'none'
+				});
+				this.$api.msg(res.data.msg);
+			}
+
+		}
+	},
+	/**
+	 * 封装请求（async await 封装uni.request） 对应admin 项目
+	 * method	   post/get
+	 * endpoint    接口方法名
+	 * data		   所需传递参数
+	 * load		   是否需要loading
+	 */
+	async apiAdminCall(method, endpoint, data, load) {
+		if (load) {
+			uni.showLoading({
+				title: '请稍候',
+				mask: true
+			});
+		}
+
+		let token = uni.getStorageSync('adminToken') || '';
+		let fullurl = this.ADMINURI + endpoint;
+		var contentType = 'application/json';
+
+		data.Authorization = token;
+		//console.log(endpoint);
+		let [error, res] = await uni.request({
+			url: fullurl,
+			data: data,
+			method: method,
+			header: {
+				//'Content-Type': 'application/x-www-form-urlencoded',
+				'content-type': contentType,
+				// 'authorization1': Authorization || ''
+			},
+		});
+		if (load) {
+			uni.hideLoading();
+		}
+		console.log(res);
+
+		if (undefined == res || 'undefined' == res) {
+			console.log('index');
+			uni.navigateTo({
+				url: `/pages/index/index`
+			})
+		}
+		if (res.data.msg == 'User token expired!') {
+			console.log('User token expired');
+			uni.showToast({
+				title: '请先登录',
+				icon: 'none'
+			});
+			uni.navigateTo({
+				url: `/pages/public/login`
+			})
+		}
+		if (res.data.msg == '请先登录' || res.data.code == 100) {
+			console.log("100=" + res.data);
+			uni.showToast({
+				title: '请先登录',
+				icon: 'none'
+			});
+			uni.navigateTo({
+				url: `/pagesC/seller/login`
+			})
+		}
+
+		if (res.data.code == 200) {
+			console.log(res.data.data);
+			return res.data.data;
+		} else {
+			console.log(res.data);
+			if (res.data && res.data.msg) {
+
+				uni.showToast({
+					title: res.data.msg,
+					icon: 'none'
+				});
+				this.$api.msg(res.data.msg);
+			}
+
+		}
+	},
+	/**
+	 * 封装请求（async await 封装uni.request）  对应search 项目
+	 * method	   post/get
+	 * endpoint    接口方法名
+	 * data		   所需传递参数
+	 * load		   是否需要loading
+	 */
+	async apiEsCall(method, endpoint, data, load) {
+		if (!load) {
+			uni.showLoading({
+				title: '请稍候',
+				mask: true
+			});
+		}
+
+		let fullurl = this.ESURI + endpoint;
+		//let fullurl = 'http://localhost:8085/api/' + endpoint;
+		let Authorization = `${store.state.userInfo.tokenHead}${store.state.userInfo.token}`;
+		let [error, res] = await uni.request({
+			url: fullurl,
+			data: data,
+			method: method,
+			header: {
+				'Content-Type': 'application/x-www-form-urlencoded',
+				// 'content-type': 'application/json',
+				'Authorization': Authorization || ''
+			},
+		});
+		console.log(error);
+		if (!load) {
+			uni.hideLoading();
+		}
+		return res;
+
+	},
+}
diff --git a/mallplusui-uniapp-app2/common/checker.js b/mallplusui-uniapp-app2/common/checker.js
new file mode 100644
index 0000000..b7538d1
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/checker.js
@@ -0,0 +1,22 @@
+module.exports = {
+	error:'',
+	isJSON : function (str){
+		if (typeof str == 'string') {
+			try {
+				var obj=JSON.parse(str);
+				if(typeof obj == 'object' && obj ){
+					return true;
+				}else{
+					return false;
+				}
+			} catch(e) {
+				console.log('error：'+str+'!!!'+e);
+				return false;
+			}
+		}
+	},
+	isNumber : function (checkVal){
+		var reg = /^-?[1-9][0-9]?.?[0-9]*$/;
+		return reg.test(checkVal);
+	}
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/common/city.data.js b/mallplusui-uniapp-app2/common/city.data.js
new file mode 100644
index 0000000..0a23f0d
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/city.data.js
@@ -0,0 +1,1451 @@
+export default [{
+	"value": 110000,
+	"label": "北京市",
+	"children": [{
+		"value": 110101,
+		"label": "东城区"
+	}, {
+		"value": 110102,
+		"label": "西城区"
+	}, {
+		"value": 110105,
+		"label": "朝阳区"
+	}, {
+		"value": 110106,
+		"label": "丰台区"
+	}, {
+		"value": 110107,
+		"label": "石景山区"
+	}, {
+		"value": 110108,
+		"label": "海淀区"
+	}, {
+		"value": 110109,
+		"label": "门头沟区"
+	}, {
+		"value": 110111,
+		"label": "房山区"
+	}, {
+		"value": 110112,
+		"label": "通州区"
+	}, {
+		"value": 110113,
+		"label": "顺义区"
+	}, {
+		"value": 110114,
+		"label": "昌平区"
+	}, {
+		"value": 110115,
+		"label": "大兴区"
+	}, {
+		"value": 110116,
+		"label": "怀柔区"
+	}, {
+		"value": 110117,
+		"label": "平谷区"
+	}, {
+		"value": 110118,
+		"label": "密云区"
+	}, {
+		"value": 110119,
+		"label": "延庆区"
+	}]
+}, {
+	"value": 120000,
+	"label": "天津市",
+	"children": [{
+		"value": 120101,
+		"label": "和平区"
+	}, {
+		"value": 120102,
+		"label": "河东区"
+	}, {
+		"value": 120103,
+		"label": "河西区"
+	}, {
+		"value": 120104,
+		"label": "南开区"
+	}, {
+		"value": 120105,
+		"label": "河北区"
+	}, {
+		"value": 120106,
+		"label": "红桥区"
+	}, {
+		"value": 120110,
+		"label": "东丽区"
+	}, {
+		"value": 120111,
+		"label": "西青区"
+	}, {
+		"value": 120112,
+		"label": "津南区"
+	}, {
+		"value": 120113,
+		"label": "北辰区"
+	}, {
+		"value": 120114,
+		"label": "武清区"
+	}, {
+		"value": 120115,
+		"label": "宝坻区"
+	}, {
+		"value": 120116,
+		"label": "滨海新区"
+	}, {
+		"value": 120117,
+		"label": "宁河区"
+	}, {
+		"value": 120118,
+		"label": "静海区"
+	}, {
+		"value": 120119,
+		"label": "蓟州区"
+	}]
+}, {
+	"value": 130000,
+	"label": "河北省",
+	"children": [{
+		"value": 130100,
+		"label": "石家庄市"
+	}, {
+		"value": 130200,
+		"label": "唐山市"
+	}, {
+		"value": 130300,
+		"label": "秦皇岛市"
+	}, {
+		"value": 130400,
+		"label": "邯郸市"
+	}, {
+		"value": 130500,
+		"label": "邢台市"
+	}, {
+		"value": 130600,
+		"label": "保定市"
+	}, {
+		"value": 130700,
+		"label": "张家口市"
+	}, {
+		"value": 130800,
+		"label": "承德市"
+	}, {
+		"value": 130900,
+		"label": "沧州市"
+	}, {
+		"value": 131000,
+		"label": "廊坊市"
+	}, {
+		"value": 131100,
+		"label": "衡水市"
+	}, {
+		"value": 139000,
+		"label": "省直辖县级行政区划"
+	}]
+}, {
+	"value": 140000,
+	"label": "山西省",
+	"children": [{
+		"value": 140100,
+		"label": "太原市"
+	}, {
+		"value": 140200,
+		"label": "大同市"
+	}, {
+		"value": 140300,
+		"label": "阳泉市"
+	}, {
+		"value": 140400,
+		"label": "长治市"
+	}, {
+		"value": 140500,
+		"label": "晋城市"
+	}, {
+		"value": 140600,
+		"label": "朔州市"
+	}, {
+		"value": 140700,
+		"label": "晋中市"
+	}, {
+		"value": 140800,
+		"label": "运城市"
+	}, {
+		"value": 140900,
+		"label": "忻州市"
+	}, {
+		"value": 141000,
+		"label": "临汾市"
+	}, {
+		"value": 141100,
+		"label": "吕梁市"
+	}]
+}, {
+	"value": 150000,
+	"label": "内蒙古自治区",
+	"children": [{
+		"value": 150100,
+		"label": "呼和浩特市"
+	}, {
+		"value": 150200,
+		"label": "包头市"
+	}, {
+		"value": 150300,
+		"label": "乌海市"
+	}, {
+		"value": 150400,
+		"label": "赤峰市"
+	}, {
+		"value": 150500,
+		"label": "通辽市"
+	}, {
+		"value": 150600,
+		"label": "鄂尔多斯市"
+	}, {
+		"value": 150700,
+		"label": "呼伦贝尔市"
+	}, {
+		"value": 150800,
+		"label": "巴彦淖尔市"
+	}, {
+		"value": 150900,
+		"label": "乌兰察布市"
+	}, {
+		"value": 152200,
+		"label": "兴安盟"
+	}, {
+		"value": 152500,
+		"label": "锡林郭勒盟"
+	}, {
+		"value": 152900,
+		"label": "阿拉善盟"
+	}]
+}, {
+	"value": 210000,
+	"label": "辽宁省",
+	"children": [{
+		"value": 210100,
+		"label": "沈阳市"
+	}, {
+		"value": 210200,
+		"label": "大连市"
+	}, {
+		"value": 210300,
+		"label": "鞍山市"
+	}, {
+		"value": 210400,
+		"label": "抚顺市"
+	}, {
+		"value": 210500,
+		"label": "本溪市"
+	}, {
+		"value": 210600,
+		"label": "丹东市"
+	}, {
+		"value": 210700,
+		"label": "锦州市"
+	}, {
+		"value": 210800,
+		"label": "营口市"
+	}, {
+		"value": 210900,
+		"label": "阜新市"
+	}, {
+		"value": 211000,
+		"label": "辽阳市"
+	}, {
+		"value": 211100,
+		"label": "盘锦市"
+	}, {
+		"value": 211200,
+		"label": "铁岭市"
+	}, {
+		"value": 211300,
+		"label": "朝阳市"
+	}, {
+		"value": 211400,
+		"label": "葫芦岛市"
+	}]
+}, {
+	"value": 220000,
+	"label": "吉林省",
+	"children": [{
+		"value": 220100,
+		"label": "长春市"
+	}, {
+		"value": 220200,
+		"label": "吉林市"
+	}, {
+		"value": 220300,
+		"label": "四平市"
+	}, {
+		"value": 220400,
+		"label": "辽源市"
+	}, {
+		"value": 220500,
+		"label": "通化市"
+	}, {
+		"value": 220600,
+		"label": "白山市"
+	}, {
+		"value": 220700,
+		"label": "松原市"
+	}, {
+		"value": 220800,
+		"label": "白城市"
+	}, {
+		"value": 222400,
+		"label": "延边朝鲜族自治州"
+	}]
+}, {
+	"value": 230000,
+	"label": "黑龙江省",
+	"children": [{
+		"value": 230100,
+		"label": "哈尔滨市"
+	}, {
+		"value": 230200,
+		"label": "齐齐哈尔市"
+	}, {
+		"value": 230300,
+		"label": "鸡西市"
+	}, {
+		"value": 230400,
+		"label": "鹤岗市"
+	}, {
+		"value": 230500,
+		"label": "双鸭山市"
+	}, {
+		"value": 230600,
+		"label": "大庆市"
+	}, {
+		"value": 230700,
+		"label": "伊春市"
+	}, {
+		"value": 230800,
+		"label": "佳木斯市"
+	}, {
+		"value": 230900,
+		"label": "七台河市"
+	}, {
+		"value": 231000,
+		"label": "牡丹江市"
+	}, {
+		"value": 231100,
+		"label": "黑河市"
+	}, {
+		"value": 231200,
+		"label": "绥化市"
+	}, {
+		"value": 232700,
+		"label": "大兴安岭地区"
+	}]
+}, {
+	"value": 310000,
+	"label": "上海市",
+	"children": [{
+		"value": 310101,
+		"label": "黄浦区"
+	}, {
+		"value": 310104,
+		"label": "徐汇区"
+	}, {
+		"value": 310105,
+		"label": "长宁区"
+	}, {
+		"value": 310106,
+		"label": "静安区"
+	}, {
+		"value": 310107,
+		"label": "普陀区"
+	}, {
+		"value": 310109,
+		"label": "虹口区"
+	}, {
+		"value": 310110,
+		"label": "杨浦区"
+	}, {
+		"value": 310112,
+		"label": "闵行区"
+	}, {
+		"value": 310113,
+		"label": "宝山区"
+	}, {
+		"value": 310114,
+		"label": "嘉定区"
+	}, {
+		"value": 310115,
+		"label": "浦东新区"
+	}, {
+		"value": 310116,
+		"label": "金山区"
+	}, {
+		"value": 310117,
+		"label": "松江区"
+	}, {
+		"value": 310118,
+		"label": "青浦区"
+	}, {
+		"value": 310120,
+		"label": "奉贤区"
+	}, {
+		"value": 310151,
+		"label": "崇明区"
+	}]
+}, {
+	"value": 320000,
+	"label": "江苏省",
+	"children": [{
+		"value": 320100,
+		"label": "南京市"
+	}, {
+		"value": 320200,
+		"label": "无锡市"
+	}, {
+		"value": 320300,
+		"label": "徐州市"
+	}, {
+		"value": 320400,
+		"label": "常州市"
+	}, {
+		"value": 320500,
+		"label": "苏州市"
+	}, {
+		"value": 320600,
+		"label": "南通市"
+	}, {
+		"value": 320700,
+		"label": "连云港市"
+	}, {
+		"value": 320800,
+		"label": "淮安市"
+	}, {
+		"value": 320900,
+		"label": "盐城市"
+	}, {
+		"value": 321000,
+		"label": "扬州市"
+	}, {
+		"value": 321100,
+		"label": "镇江市"
+	}, {
+		"value": 321200,
+		"label": "泰州市"
+	}, {
+		"value": 321300,
+		"label": "宿迁市"
+	}]
+}, {
+	"value": 330000,
+	"label": "浙江省",
+	"children": [{
+		"value": 330100,
+		"label": "杭州市"
+	}, {
+		"value": 330200,
+		"label": "宁波市"
+	}, {
+		"value": 330300,
+		"label": "温州市"
+	}, {
+		"value": 330400,
+		"label": "嘉兴市"
+	}, {
+		"value": 330500,
+		"label": "湖州市"
+	}, {
+		"value": 330600,
+		"label": "绍兴市"
+	}, {
+		"value": 330700,
+		"label": "金华市"
+	}, {
+		"value": 330800,
+		"label": "衢州市"
+	}, {
+		"value": 330900,
+		"label": "舟山市"
+	}, {
+		"value": 331000,
+		"label": "台州市"
+	}, {
+		"value": 331100,
+		"label": "丽水市"
+	}]
+}, {
+	"value": 340000,
+	"label": "安徽省",
+	"children": [{
+		"value": 340100,
+		"label": "合肥市"
+	}, {
+		"value": 340200,
+		"label": "芜湖市"
+	}, {
+		"value": 340300,
+		"label": "蚌埠市"
+	}, {
+		"value": 340400,
+		"label": "淮南市"
+	}, {
+		"value": 340500,
+		"label": "马鞍山市"
+	}, {
+		"value": 340600,
+		"label": "淮北市"
+	}, {
+		"value": 340700,
+		"label": "铜陵市"
+	}, {
+		"value": 340800,
+		"label": "安庆市"
+	}, {
+		"value": 341000,
+		"label": "黄山市"
+	}, {
+		"value": 341100,
+		"label": "滁州市"
+	}, {
+		"value": 341200,
+		"label": "阜阳市"
+	}, {
+		"value": 341300,
+		"label": "宿州市"
+	}, {
+		"value": 341500,
+		"label": "六安市"
+	}, {
+		"value": 341600,
+		"label": "亳州市"
+	}, {
+		"value": 341700,
+		"label": "池州市"
+	}, {
+		"value": 341800,
+		"label": "宣城市"
+	}]
+}, {
+	"value": 350000,
+	"label": "福建省",
+	"children": [{
+		"value": 350100,
+		"label": "福州市"
+	}, {
+		"value": 350200,
+		"label": "厦门市"
+	}, {
+		"value": 350300,
+		"label": "莆田市"
+	}, {
+		"value": 350400,
+		"label": "三明市"
+	}, {
+		"value": 350500,
+		"label": "泉州市"
+	}, {
+		"value": 350600,
+		"label": "漳州市"
+	}, {
+		"value": 350700,
+		"label": "南平市"
+	}, {
+		"value": 350800,
+		"label": "龙岩市"
+	}, {
+		"value": 350900,
+		"label": "宁德市"
+	}]
+}, {
+	"value": 360000,
+	"label": "江西省",
+	"children": [{
+		"value": 360100,
+		"label": "南昌市"
+	}, {
+		"value": 360200,
+		"label": "景德镇市"
+	}, {
+		"value": 360300,
+		"label": "萍乡市"
+	}, {
+		"value": 360400,
+		"label": "九江市"
+	}, {
+		"value": 360500,
+		"label": "新余市"
+	}, {
+		"value": 360600,
+		"label": "鹰潭市"
+	}, {
+		"value": 360700,
+		"label": "赣州市"
+	}, {
+		"value": 360800,
+		"label": "吉安市"
+	}, {
+		"value": 360900,
+		"label": "宜春市"
+	}, {
+		"value": 361000,
+		"label": "抚州市"
+	}, {
+		"value": 361100,
+		"label": "上饶市"
+	}]
+}, {
+	"value": 370000,
+	"label": "山东省",
+	"children": [{
+		"value": 370100,
+		"label": "济南市"
+	}, {
+		"value": 370200,
+		"label": "青岛市"
+	}, {
+		"value": 370300,
+		"label": "淄博市"
+	}, {
+		"value": 370400,
+		"label": "枣庄市"
+	}, {
+		"value": 370500,
+		"label": "东营市"
+	}, {
+		"value": 370600,
+		"label": "烟台市"
+	}, {
+		"value": 370700,
+		"label": "潍坊市"
+	}, {
+		"value": 370800,
+		"label": "济宁市"
+	}, {
+		"value": 370900,
+		"label": "泰安市"
+	}, {
+		"value": 371000,
+		"label": "威海市"
+	}, {
+		"value": 371100,
+		"label": "日照市"
+	}, {
+		"value": 371200,
+		"label": "莱芜市"
+	}, {
+		"value": 371300,
+		"label": "临沂市"
+	}, {
+		"value": 371400,
+		"label": "德州市"
+	}, {
+		"value": 371500,
+		"label": "聊城市"
+	}, {
+		"value": 371600,
+		"label": "滨州市"
+	}, {
+		"value": 371700,
+		"label": "菏泽市"
+	}]
+}, {
+	"value": 410000,
+	"label": "河南省",
+	"children": [{
+		"value": 410100,
+		"label": "郑州市"
+	}, {
+		"value": 410200,
+		"label": "开封市"
+	}, {
+		"value": 410300,
+		"label": "洛阳市"
+	}, {
+		"value": 410400,
+		"label": "平顶山市"
+	}, {
+		"value": 410500,
+		"label": "安阳市"
+	}, {
+		"value": 410600,
+		"label": "鹤壁市"
+	}, {
+		"value": 410700,
+		"label": "新乡市"
+	}, {
+		"value": 410800,
+		"label": "焦作市"
+	}, {
+		"value": 410900,
+		"label": "濮阳市"
+	}, {
+		"value": 411000,
+		"label": "许昌市"
+	}, {
+		"value": 411100,
+		"label": "漯河市"
+	}, {
+		"value": 411200,
+		"label": "三门峡市"
+	}, {
+		"value": 411300,
+		"label": "南阳市"
+	}, {
+		"value": 411400,
+		"label": "商丘市"
+	}, {
+		"value": 411500,
+		"label": "信阳市"
+	}, {
+		"value": 411600,
+		"label": "周口市"
+	}, {
+		"value": 411700,
+		"label": "驻马店市"
+	}, {
+		"value": 419000,
+		"label": "省直辖县级行政区划"
+	}]
+}, {
+	"value": 420000,
+	"label": "湖北省",
+	"children": [{
+		"value": 420100,
+		"label": "武汉市"
+	}, {
+		"value": 420200,
+		"label": "黄石市"
+	}, {
+		"value": 420300,
+		"label": "十堰市"
+	}, {
+		"value": 420500,
+		"label": "宜昌市"
+	}, {
+		"value": 420600,
+		"label": "襄阳市"
+	}, {
+		"value": 420700,
+		"label": "鄂州市"
+	}, {
+		"value": 420800,
+		"label": "荆门市"
+	}, {
+		"value": 420900,
+		"label": "孝感市"
+	}, {
+		"value": 421000,
+		"label": "荆州市"
+	}, {
+		"value": 421100,
+		"label": "黄冈市"
+	}, {
+		"value": 421200,
+		"label": "咸宁市"
+	}, {
+		"value": 421300,
+		"label": "随州市"
+	}, {
+		"value": 422800,
+		"label": "恩施土家族苗族自治州"
+	}, {
+		"value": 429000,
+		"label": "省直辖县级行政区划"
+	}]
+}, {
+	"value": 430000,
+	"label": "湖南省",
+	"children": [{
+		"value": 430100,
+		"label": "长沙市"
+	}, {
+		"value": 430200,
+		"label": "株洲市"
+	}, {
+		"value": 430300,
+		"label": "湘潭市"
+	}, {
+		"value": 430400,
+		"label": "衡阳市"
+	}, {
+		"value": 430500,
+		"label": "邵阳市"
+	}, {
+		"value": 430600,
+		"label": "岳阳市"
+	}, {
+		"value": 430700,
+		"label": "常德市"
+	}, {
+		"value": 430800,
+		"label": "张家界市"
+	}, {
+		"value": 430900,
+		"label": "益阳市"
+	}, {
+		"value": 431000,
+		"label": "郴州市"
+	}, {
+		"value": 431100,
+		"label": "永州市"
+	}, {
+		"value": 431200,
+		"label": "怀化市"
+	}, {
+		"value": 431300,
+		"label": "娄底市"
+	}, {
+		"value": 433100,
+		"label": "湘西土家族苗族自治州"
+	}]
+}, {
+	"value": 440000,
+	"label": "广东省",
+	"children": [{
+		"value": 440100,
+		"label": "广州市"
+	}, {
+		"value": 440200,
+		"label": "韶关市"
+	}, {
+		"value": 440300,
+		"label": "深圳市"
+	}, {
+		"value": 440400,
+		"label": "珠海市"
+	}, {
+		"value": 440500,
+		"label": "汕头市"
+	}, {
+		"value": 440600,
+		"label": "佛山市"
+	}, {
+		"value": 440700,
+		"label": "江门市"
+	}, {
+		"value": 440800,
+		"label": "湛江市"
+	}, {
+		"value": 440900,
+		"label": "茂名市"
+	}, {
+		"value": 441200,
+		"label": "肇庆市"
+	}, {
+		"value": 441300,
+		"label": "惠州市"
+	}, {
+		"value": 441400,
+		"label": "梅州市"
+	}, {
+		"value": 441500,
+		"label": "汕尾市"
+	}, {
+		"value": 441600,
+		"label": "河源市"
+	}, {
+		"value": 441700,
+		"label": "阳江市"
+	}, {
+		"value": 441800,
+		"label": "清远市"
+	}, {
+		"value": 441900,
+		"label": "东莞市"
+	}, {
+		"value": 442000,
+		"label": "中山市"
+	}, {
+		"value": 445100,
+		"label": "潮州市"
+	}, {
+		"value": 445200,
+		"label": "揭阳市"
+	}, {
+		"value": 445300,
+		"label": "云浮市"
+	}]
+}, {
+	"value": 450000,
+	"label": "广西壮族自治区",
+	"children": [{
+		"value": 450100,
+		"label": "南宁市"
+	}, {
+		"value": 450200,
+		"label": "柳州市"
+	}, {
+		"value": 450300,
+		"label": "桂林市"
+	}, {
+		"value": 450400,
+		"label": "梧州市"
+	}, {
+		"value": 450500,
+		"label": "北海市"
+	}, {
+		"value": 450600,
+		"label": "防城港市"
+	}, {
+		"value": 450700,
+		"label": "钦州市"
+	}, {
+		"value": 450800,
+		"label": "贵港市"
+	}, {
+		"value": 450900,
+		"label": "玉林市"
+	}, {
+		"value": 451000,
+		"label": "百色市"
+	}, {
+		"value": 451100,
+		"label": "贺州市"
+	}, {
+		"value": 451200,
+		"label": "河池市"
+	}, {
+		"value": 451300,
+		"label": "来宾市"
+	}, {
+		"value": 451400,
+		"label": "崇左市"
+	}]
+}, {
+	"value": 460000,
+	"label": "海南省",
+	"children": [{
+		"value": 460100,
+		"label": "海口市"
+	}, {
+		"value": 460200,
+		"label": "三亚市"
+	}, {
+		"value": 460300,
+		"label": "三沙市"
+	}, {
+		"value": 460400,
+		"label": "儋州市"
+	}, {
+		"value": 469000,
+		"label": "省直辖县级行政区划"
+	}]
+}, {
+	"value": 500000,
+	"label": "重庆市",
+	"children": [{
+		"value": 500101,
+		"label": "万州区"
+	}, {
+		"value": 500102,
+		"label": "涪陵区"
+	}, {
+		"value": 500103,
+		"label": "渝中区"
+	}, {
+		"value": 500104,
+		"label": "大渡口区"
+	}, {
+		"value": 500105,
+		"label": "江北区"
+	}, {
+		"value": 500106,
+		"label": "沙坪坝区"
+	}, {
+		"value": 500107,
+		"label": "九龙坡区"
+	}, {
+		"value": 500108,
+		"label": "南岸区"
+	}, {
+		"value": 500109,
+		"label": "北碚区"
+	}, {
+		"value": 500110,
+		"label": "綦江区"
+	}, {
+		"value": 500111,
+		"label": "大足区"
+	}, {
+		"value": 500112,
+		"label": "渝北区"
+	}, {
+		"value": 500113,
+		"label": "巴南区"
+	}, {
+		"value": 500114,
+		"label": "黔江区"
+	}, {
+		"value": 500115,
+		"label": "长寿区"
+	}, {
+		"value": 500116,
+		"label": "江津区"
+	}, {
+		"value": 500117,
+		"label": "合川区"
+	}, {
+		"value": 500118,
+		"label": "永川区"
+	}, {
+		"value": 500119,
+		"label": "南川区"
+	}, {
+		"value": 500120,
+		"label": "璧山区"
+	}, {
+		"value": 500151,
+		"label": "铜梁区"
+	}, {
+		"value": 500152,
+		"label": "潼南区"
+	}, {
+		"value": 500153,
+		"label": "荣昌区"
+	}, {
+		"value": 500154,
+		"label": "开州区"
+	}]
+}, {
+	"value": 510000,
+	"label": "四川省",
+	"children": [{
+		"value": 510100,
+		"label": "成都市"
+	}, {
+		"value": 510300,
+		"label": "自贡市"
+	}, {
+		"value": 510400,
+		"label": "攀枝花市"
+	}, {
+		"value": 510500,
+		"label": "泸州市"
+	}, {
+		"value": 510600,
+		"label": "德阳市"
+	}, {
+		"value": 510700,
+		"label": "绵阳市"
+	}, {
+		"value": 510800,
+		"label": "广元市"
+	}, {
+		"value": 510900,
+		"label": "遂宁市"
+	}, {
+		"value": 511000,
+		"label": "内江市"
+	}, {
+		"value": 511100,
+		"label": "乐山市"
+	}, {
+		"value": 511300,
+		"label": "南充市"
+	}, {
+		"value": 511400,
+		"label": "眉山市"
+	}, {
+		"value": 511500,
+		"label": "宜宾市"
+	}, {
+		"value": 511600,
+		"label": "广安市"
+	}, {
+		"value": 511700,
+		"label": "达州市"
+	}, {
+		"value": 511800,
+		"label": "雅安市"
+	}, {
+		"value": 511900,
+		"label": "巴中市"
+	}, {
+		"value": 512000,
+		"label": "资阳市"
+	}, {
+		"value": 513200,
+		"label": "阿坝藏族羌族自治州"
+	}, {
+		"value": 513300,
+		"label": "甘孜藏族自治州"
+	}, {
+		"value": 513400,
+		"label": "凉山彝族自治州"
+	}]
+}, {
+	"value": 520000,
+	"label": "贵州省",
+	"children": [{
+		"value": 520100,
+		"label": "贵阳市"
+	}, {
+		"value": 520200,
+		"label": "六盘水市"
+	}, {
+		"value": 520300,
+		"label": "遵义市"
+	}, {
+		"value": 520400,
+		"label": "安顺市"
+	}, {
+		"value": 520500,
+		"label": "毕节市"
+	}, {
+		"value": 520600,
+		"label": "铜仁市"
+	}, {
+		"value": 522300,
+		"label": "黔西南布依族苗族自治州"
+	}, {
+		"value": 522600,
+		"label": "黔东南苗族侗族自治州"
+	}, {
+		"value": 522700,
+		"label": "黔南布依族苗族自治州"
+	}]
+}, {
+	"value": 530000,
+	"label": "云南省",
+	"children": [{
+		"value": 530100,
+		"label": "昆明市"
+	}, {
+		"value": 530300,
+		"label": "曲靖市"
+	}, {
+		"value": 530400,
+		"label": "玉溪市"
+	}, {
+		"value": 530500,
+		"label": "保山市"
+	}, {
+		"value": 530600,
+		"label": "昭通市"
+	}, {
+		"value": 530700,
+		"label": "丽江市"
+	}, {
+		"value": 530800,
+		"label": "普洱市"
+	}, {
+		"value": 530900,
+		"label": "临沧市"
+	}, {
+		"value": 532300,
+		"label": "楚雄彝族自治州"
+	}, {
+		"value": 532500,
+		"label": "红河哈尼族彝族自治州"
+	}, {
+		"value": 532600,
+		"label": "文山壮族苗族自治州"
+	}, {
+		"value": 532800,
+		"label": "西双版纳傣族自治州"
+	}, {
+		"value": 532900,
+		"label": "大理白族自治州"
+	}, {
+		"value": 533100,
+		"label": "德宏傣族景颇族自治州"
+	}, {
+		"value": 533300,
+		"label": "怒江傈僳族自治州"
+	}, {
+		"value": 533400,
+		"label": "迪庆藏族自治州"
+	}]
+}, {
+	"value": 540000,
+	"label": "西藏自治区",
+	"children": [{
+		"value": 540100,
+		"label": "拉萨市"
+	}, {
+		"value": 540200,
+		"label": "日喀则市"
+	}, {
+		"value": 540300,
+		"label": "昌都市"
+	}, {
+		"value": 540400,
+		"label": "林芝市"
+	}, {
+		"value": 540500,
+		"label": "山南市"
+	}, {
+		"value": 542400,
+		"label": "那曲地区"
+	}, {
+		"value": 542500,
+		"label": "阿里地区"
+	}]
+}, {
+	"value": 610000,
+	"label": "陕西省",
+	"children": [{
+		"value": 610100,
+		"label": "西安市"
+	}, {
+		"value": 610200,
+		"label": "铜川市"
+	}, {
+		"value": 610300,
+		"label": "宝鸡市"
+	}, {
+		"value": 610400,
+		"label": "咸阳市"
+	}, {
+		"value": 610500,
+		"label": "渭南市"
+	}, {
+		"value": 610600,
+		"label": "延安市"
+	}, {
+		"value": 610700,
+		"label": "汉中市"
+	}, {
+		"value": 610800,
+		"label": "榆林市"
+	}, {
+		"value": 610900,
+		"label": "安康市"
+	}, {
+		"value": 611000,
+		"label": "商洛市"
+	}]
+}, {
+	"value": 620000,
+	"label": "甘肃省",
+	"children": [{
+		"value": 620100,
+		"label": "兰州市"
+	}, {
+		"value": 620200,
+		"label": "嘉峪关市"
+	}, {
+		"value": 620300,
+		"label": "金昌市"
+	}, {
+		"value": 620400,
+		"label": "白银市"
+	}, {
+		"value": 620500,
+		"label": "天水市"
+	}, {
+		"value": 620600,
+		"label": "武威市"
+	}, {
+		"value": 620700,
+		"label": "张掖市"
+	}, {
+		"value": 620800,
+		"label": "平凉市"
+	}, {
+		"value": 620900,
+		"label": "酒泉市"
+	}, {
+		"value": 621000,
+		"label": "庆阳市"
+	}, {
+		"value": 621100,
+		"label": "定西市"
+	}, {
+		"value": 621200,
+		"label": "陇南市"
+	}, {
+		"value": 622900,
+		"label": "临夏回族自治州"
+	}, {
+		"value": 623000,
+		"label": "甘南藏族自治州"
+	}]
+}, {
+	"value": 630000,
+	"label": "青海省",
+	"children": [{
+		"value": 630100,
+		"label": "西宁市"
+	}, {
+		"value": 630200,
+		"label": "海东市"
+	}, {
+		"value": 632200,
+		"label": "海北藏族自治州"
+	}, {
+		"value": 632300,
+		"label": "黄南藏族自治州"
+	}, {
+		"value": 632500,
+		"label": "海南藏族自治州"
+	}, {
+		"value": 632600,
+		"label": "果洛藏族自治州"
+	}, {
+		"value": 632700,
+		"label": "玉树藏族自治州"
+	}, {
+		"value": 632800,
+		"label": "海西蒙古族藏族自治州"
+	}]
+}, {
+	"value": 640000,
+	"label": "宁夏回族自治区",
+	"children": [{
+		"value": 640100,
+		"label": "银川市"
+	}, {
+		"value": 640200,
+		"label": "石嘴山市"
+	}, {
+		"value": 640300,
+		"label": "吴忠市"
+	}, {
+		"value": 640400,
+		"label": "固原市"
+	}, {
+		"value": 640500,
+		"label": "中卫市"
+	}]
+}, {
+	"value": 650000,
+	"label": "新疆维吾尔自治区",
+	"children": [{
+		"value": 650100,
+		"label": "乌鲁木齐市"
+	}, {
+		"value": 650200,
+		"label": "克拉玛依市"
+	}, {
+		"value": 650400,
+		"label": "吐鲁番市"
+	}, {
+		"value": 650500,
+		"label": "哈密市"
+	}, {
+		"value": 652300,
+		"label": "昌吉回族自治州"
+	}, {
+		"value": 652700,
+		"label": "博尔塔拉蒙古自治州"
+	}, {
+		"value": 652800,
+		"label": "巴音郭楞蒙古自治州"
+	}, {
+		"value": 652900,
+		"label": "阿克苏地区"
+	}, {
+		"value": 653000,
+		"label": "克孜勒苏柯尔克孜自治州"
+	}, {
+		"value": 653100,
+		"label": "喀什地区"
+	}, {
+		"value": 653200,
+		"label": "和田地区"
+	}, {
+		"value": 654000,
+		"label": "伊犁哈萨克自治州"
+	}, {
+		"value": 654200,
+		"label": "塔城地区"
+	}, {
+		"value": 654300,
+		"label": "阿勒泰地区"
+	}, {
+		"value": 659000,
+		"label": "自治区直辖县级行政区划"
+	}]
+}, {
+	"value": 710000,
+	"label": "台湾省",
+	"children": [{
+		"value": "710100",
+		"label": "台北市"
+	}, {
+		"value": "710200",
+		"label": "高雄市"
+	}, {
+		"value": "710300",
+		"label": "台南市"
+	}, {
+		"value": "710400",
+		"label": "台中市"
+	}, {
+		"value": "710500",
+		"label": "金门县"
+	}, {
+		"value": "710600",
+		"label": "南投县"
+	}, {
+		"value": "710700",
+		"label": "基隆市"
+	}, {
+		"value": "710800",
+		"label": "新竹市"
+	}, {
+		"value": "710900",
+		"label": "嘉义市"
+	}, {
+		"value": "711100",
+		"label": "新北市"
+	}, {
+		"value": "711200",
+		"label": "宜兰县"
+	}, {
+		"value": "711300",
+		"label": "新竹县"
+	}, {
+		"value": "711400",
+		"label": "桃园县"
+	}, {
+		"value": "711500",
+		"label": "苗栗县"
+	}, {
+		"value": "711700",
+		"label": "彰化县"
+	}, {
+		"value": "711900",
+		"label": "嘉义县"
+	}, {
+		"value": "712100",
+		"label": "云林县"
+	}, {
+		"value": "712400",
+		"label": "屏东县"
+	}, {
+		"value": "712500",
+		"label": "台东县"
+	}, {
+		"value": "712600",
+		"label": "花莲县"
+	}, {
+		"value": "712700",
+		"label": "澎湖县"
+	}]
+}, {
+	"value": 810000,
+	"label": "香港特别行政区",
+	"children": [{
+		"value": "810100",
+		"label": "香港岛"
+	}, {
+		"value": "810200",
+		"label": "九龙"
+	}, {
+		"value": "810300",
+		"label": "新界"
+	}]
+}, {
+	"value": 820000,
+	"label": "澳门特别行政区",
+	"children": [{
+		"value": "820100",
+		"label": "澳门半岛"
+	}, {
+		"value": "820200",
+		"label": "氹仔岛"
+	}, {
+		"value": "820300",
+		"label": "路环岛"
+	}]
+}]
diff --git a/mallplusui-uniapp-app2/common/date.js b/mallplusui-uniapp-app2/common/date.js
new file mode 100644
index 0000000..74fb0c5
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/date.js
@@ -0,0 +1,43 @@
+// date.js
+export function formatDate(date, fmt) {
+  if (/(y+)/.test(fmt)) {
+    fmt = fmt.replace(RegExp.$1, (date.getFullYear() + '').substr(4 - RegExp.$1.length));
+  }
+  let o = {
+    'M+': date.getMonth() + 1,
+    'd+': date.getDate(),
+    'h+': date.getHours(),
+    'm+': date.getMinutes(),
+    's+': date.getSeconds()
+  };
+  for (let k in o) {
+    if (new RegExp(`(${k})`).test(fmt)) {
+      let str = o[k] + '';
+      fmt = fmt.replace(RegExp.$1, (RegExp.$1.length === 1) ? str : padLeftZero(str));
+    }
+  }
+  return fmt;
+}
+
+function padLeftZero(str) {
+  return ('00' + str).substr(str.length);
+}
+
+export function str2Date(dateStr, separator) {
+  if (!separator) {
+    separator = "-";
+  }
+  let dateArr = dateStr.split(separator);
+  let year = parseInt(dateArr[0]);
+  let month;
+  //处理月份为04这样的情况
+  if (dateArr[1].indexOf("0") == 0) {
+    month = parseInt(dateArr[1].substring(1));
+  } else {
+    month = parseInt(dateArr[1]);
+  }
+  let day = parseInt(dateArr[2]);
+  let date = new Date(year, month - 1, day);
+  return date;
+}
+
diff --git a/mallplusui-uniapp-app2/common/html-parser.js b/mallplusui-uniapp-app2/common/html-parser.js
new file mode 100644
index 0000000..20a89b2
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/html-parser.js
@@ -0,0 +1,352 @@
+/*
+ * HTML5 Parser By Sam Blowes
+ *
+ * Designed for HTML5 documents
+ *
+ * Original code by John Resig (ejohn.org)
+ * http://ejohn.org/blog/pure-javascript-html-parser/
+ * Original code by Erik Arvidsson, Mozilla Public License
+ * http://erik.eae.net/simplehtmlparser/simplehtmlparser.js
+ *
+ * ----------------------------------------------------------------------------
+ * License
+ * ----------------------------------------------------------------------------
+ *
+ * This code is triple licensed using Apache Software License 2.0,
+ * Mozilla Public License or GNU Public License
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License"); you may not
+ * use this file except in compliance with the License.  You may obtain a copy
+ * of the License at http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * The contents of this file are subject to the Mozilla Public License
+ * Version 1.1 (the "License"); you may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
+ * License for the specific language governing rights and limitations
+ * under the License.
+ *
+ * The Original Code is Simple HTML Parser.
+ *
+ * The Initial Developer of the Original Code is Erik Arvidsson.
+ * Portions created by Erik Arvidssson are Copyright (C) 2004. All Rights
+ * Reserved.
+ *
+ * ////////////////////////////////////////////////////////////////////////////
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * ----------------------------------------------------------------------------
+ * Usage
+ * ----------------------------------------------------------------------------
+ *
+ * // Use like so:
+ * HTMLParser(htmlString, {
+ *     start: function(tag, attrs, unary) {},
+ *     end: function(tag) {},
+ *     chars: function(text) {},
+ *     comment: function(text) {}
+ * });
+ *
+ * // or to get an XML string:
+ * HTMLtoXML(htmlString);
+ *
+ * // or to get an XML DOM Document
+ * HTMLtoDOM(htmlString);
+ *
+ * // or to inject into an existing document/DOM node
+ * HTMLtoDOM(htmlString, document);
+ * HTMLtoDOM(htmlString, document.body);
+ *
+ */
+// Regular Expressions for parsing tags and attributes
+var startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+var endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+var attr = /([a-zA-Z_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g; // Empty Elements - HTML 5
+
+var empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr'); // Block Elements - HTML 5
+// fixed by xxx 将 ins 标签从块级名单中移除
+
+var block = makeMap('a,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video'); // Inline Elements - HTML 5
+
+var inline = makeMap('abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,code,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var'); // Elements that you can, intentionally, leave open
+// (and which close themselves)
+
+var closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr'); // Attributes that have their values filled in disabled="disabled"
+
+var fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected'); // Special Elements (can contain anything)
+
+var special = makeMap('script,style');
+function HTMLParser(html, handler) {
+  var index;
+  var chars;
+  var match;
+  var stack = [];
+  var last = html;
+
+  stack.last = function () {
+    return this[this.length - 1];
+  };
+
+  while (html) {
+    chars = true; // Make sure we're not in a script or style element
+
+    if (!stack.last() || !special[stack.last()]) {
+      // Comment
+      if (html.indexOf('<!--') == 0) {
+        index = html.indexOf('-->');
+
+        if (index >= 0) {
+          if (handler.comment) {
+            handler.comment(html.substring(4, index));
+          }
+
+          html = html.substring(index + 3);
+          chars = false;
+        } // end tag
+
+      } else if (html.indexOf('</') == 0) {
+        match = html.match(endTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(endTag, parseEndTag);
+          chars = false;
+        } // start tag
+
+      } else if (html.indexOf('<') == 0) {
+        match = html.match(startTag);
+
+        if (match) {
+          html = html.substring(match[0].length);
+          match[0].replace(startTag, parseStartTag);
+          chars = false;
+        }
+      }
+
+      if (chars) {
+        index = html.indexOf('<');
+        var text = index < 0 ? html : html.substring(0, index);
+        html = index < 0 ? '' : html.substring(index);
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+      }
+    } else {
+      html = html.replace(new RegExp('([\\s\\S]*?)<\/' + stack.last() + '[^>]*>'), function (all, text) {
+        text = text.replace(/<!--([\s\S]*?)-->|<!\[CDATA\[([\s\S]*?)]]>/g, '$1$2');
+
+        if (handler.chars) {
+          handler.chars(text);
+        }
+
+        return '';
+      });
+      parseEndTag('', stack.last());
+    }
+
+    if (html == last) {
+      throw 'Parse Error: ' + html;
+    }
+
+    last = html;
+  } // Clean up any remaining tags
+
+
+  parseEndTag();
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() == tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) {
+      stack.push(tagName);
+    }
+
+    if (handler.start) {
+      var attrs = [];
+      rest.replace(attr, function (match, name) {
+        var value = arguments[2] ? arguments[2] : arguments[3] ? arguments[3] : arguments[4] ? arguments[4] : fillAttrs[name] ? name : '';
+        attrs.push({
+          name: name,
+          value: value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\\"') // "
+
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    if (!tagName) {
+      var pos = 0;
+    } // Find the closest opened tag of the same type
+    else {
+        for (var pos = stack.length - 1; pos >= 0; pos--) {
+          if (stack[pos] == tagName) {
+            break;
+          }
+        }
+      }
+
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (var i = stack.length - 1; i >= pos; i--) {
+        if (handler.end) {
+          handler.end(stack[i]);
+        }
+      } // Remove the open elements from the stack
+
+
+      stack.length = pos;
+    }
+  }
+}
+
+function makeMap(str) {
+  var obj = {};
+  var items = str.split(',');
+
+  for (var i = 0; i < items.length; i++) {
+    obj[items[i]] = true;
+  }
+
+  return obj;
+}
+
+function removeDOCTYPE(html) {
+  return html.replace(/<\?xml.*\?>\n/, '').replace(/<!doctype.*>\n/, '').replace(/<!DOCTYPE.*>\n/, '');
+}
+
+function parseAttrs(attrs) {
+  return attrs.reduce(function (pre, attr) {
+    var value = attr.value;
+    var name = attr.name;
+
+    if (pre[name]) {
+			pre[name] = pre[name] + " " + value;
+    } else {
+			pre[name] = value;
+    }
+
+    return pre;
+  }, {});
+}
+
+function parseHtml(html) {
+  html = removeDOCTYPE(html);
+  var stacks = [];
+  var results = {
+    node: 'root',
+    children: []
+  };
+  HTMLParser(html, {
+    start: function start(tag, attrs, unary) {
+      var node = {
+        name: tag
+      };
+
+      if (attrs.length !== 0) {
+        node.attrs = parseAttrs(attrs);
+      }
+
+      if (unary) {
+        var parent = stacks[0] || results;
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      } else {
+        stacks.unshift(node);
+      }
+    },
+    end: function end(tag) {
+      var node = stacks.shift();
+      if (node.name !== tag) console.error('invalid state: mismatch end tag');
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    chars: function chars(text) {
+      var node = {
+        type: 'text',
+        text: text
+      };
+
+      if (stacks.length === 0) {
+        results.children.push(node);
+      } else {
+        var parent = stacks[0];
+
+        if (!parent.children) {
+          parent.children = [];
+        }
+
+        parent.children.push(node);
+      }
+    },
+    comment: function comment(text) {
+      var node = {
+        node: 'comment',
+        text: text
+      };
+      var parent = stacks[0];
+
+      if (!parent.children) {
+        parent.children = [];
+      }
+
+      parent.children.push(node);
+    }
+  });
+  return results.children;
+}
+
+export default parseHtml;
diff --git a/mallplusui-uniapp-app2/common/list.js b/mallplusui-uniapp-app2/common/list.js
new file mode 100644
index 0000000..d09eba8
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/list.js
@@ -0,0 +1,32 @@
+const listData = [{
+	content: "好评",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_2.jpg",
+	user_name: "测试1",
+	rate:5,
+	imgs:[]
+},
+{
+	content: "中评",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_12.jpg",
+	user_name: "测试2",
+	rate:4,
+	imgs:[
+		'http://cs.zhangkaixing.com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+		'http://cs.zhangkaixing.com/face/face_14.jpg',
+		'http://cs.zhangkaixing.com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+	]
+},
+{
+	content: "",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_15.jpg",
+	user_name: "测试3",
+	rate:2,
+	imgs:[]
+}]
+
+export default listData
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/common/uni-H5Api.js b/mallplusui-uniapp-app2/common/uni-H5Api.js
new file mode 100644
index 0000000..ea5823d
--- /dev/null
+++ b/mallplusui-uniapp-app2/common/uni-H5Api.js
@@ -0,0 +1,71 @@
+//#ifdef H5
+/** clipboard.js v2.0.4**/
+!function(t,e){try{window.ClipboardJS=e();}catch(e){};"object"==typeof exports&&"object"==typeof module?module.exports=e():"function"==typeof define&&define.amd?define([],e):"object"==typeof exports?exports.ClipboardJS=e():t.ClipboardJS=e()}(this,function(){return function(n){var o={};function r(t){if(o[t])return o[t].exports;var e=o[t]={i:t,l:!1,exports:{}};return n[t].call(e.exports,e,e.exports,r),e.l=!0,e.exports}
+  return r.m=n,r.c=o,r.d=function(t,e,n){r.o(t,e)||Object.defineProperty(t,e,{enumerable:!0,get:n})},r.r=function(t){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(t,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(t,"__esModule",{value:!0})},r.t=function(e,t){if(1&t&&(e=r(e)),8&t)return e;if(4&t&&"object"==typeof e&&e&&e.__esModule)return e;var n=Object.create(null);if(r.r(n),Object.defineProperty(n,"default",{enumerable:!0,value:e}),2&t&&"string"!=typeof e)for(var o in e)r.d(n,o,function(t){return e[t]}.bind(null,o));return n},r.n=function(t){var e=t&&t.__esModule?function(){return t.default}:function(){return t};return r.d(e,"a",e),e},r.o=function(t,e){return Object.prototype.hasOwnProperty.call(t,e)},r.p="",r(r.s=0)}([function(t,e,n){"use strict";var r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}
+  return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=o(n(1)),c=o(n(3)),u=o(n(4));function o(t){return t&&t.__esModule?t:{default:t}}
+  var l=function(t){function o(t,e){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,o);var n=function(t,e){if(!t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!e||"object"!=typeof e&&"function"!=typeof e?t:e}(this,(o.__proto__||Object.getPrototypeOf(o)).call(this));return n.resolveOptions(e),n.listenClick(t),n}
+    return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function, not "+typeof e);t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,enumerable:!1,writable:!0,configurable:!0}}),e&&(Object.setPrototypeOf?Object.setPrototypeOf(t,e):t.__proto__=e)}(o,c.default),i(o,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action="function"==typeof t.action?t.action:this.defaultAction,this.target="function"==typeof t.target?t.target:this.defaultTarget,this.text="function"==typeof t.text?t.text:this.defaultText,this.container="object"===r(t.container)?t.container:document.body}},{key:"listenClick",value:function(t){var e=this;this.listener=(0,u.default)(t,"click",function(t){return e.onClick(t)})}},{key:"onClick",value:function(t){var e=t.delegateTarget||t.currentTarget;this.clipboardAction&&(this.clipboardAction=null),this.clipboardAction=new a.default({action:this.action(e),target:this.target(e),text:this.text(e),container:this.container,trigger:e,emitter:this})}},{key:"defaultAction",value:function(t){return s("action",t)||'copy'}},{key:"defaultTarget",value:function(t){var e=s("target",t);if(e){return document.querySelector(e)}}},{key:"defaultText",value:function(t){return s("text",t)||this.text}},{key:"destroy",value:function(){this.listener.destroy(),this.clipboardAction&&(this.clipboardAction.destroy(),this.clipboardAction=null)}}],[{key:"isSupported",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:["copy","cut"],e="string"==typeof t?[t]:t,n=!!document.queryCommandSupported;return e.forEach(function(t){n=n&&!!document.queryCommandSupported(t)}),n}}]),o}();function s(t,e){var n="data-clipboard-"+t;let isFun=e&&typeof e.hasAttribute==='function';if(isFun&&e.hasAttribute(n)){return e.getAttribute(n)}}
+  t.exports=l},function(t,e,n){"use strict";var o,r="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},i=function(){function o(t,e){for(var n=0;n<e.length;n++){var o=e[n];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(t,o.key,o)}}
+  return function(t,e,n){return e&&o(t.prototype,e),n&&o(t,n),t}}(),a=n(2),c=(o=a)&&o.__esModule?o:{default:o};var u=function(){function e(t){!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,e),this.resolveOptions(t),this.initSelection()}
+  return i(e,[{key:"resolveOptions",value:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:{};this.action=t.action,this.container=t.container,this.emitter=t.emitter,this.target=t.target,this.text=t.text,this.trigger=t.trigger,this.selectedText=""}},{key:"initSelection",value:function(){this.text?this.selectFake():this.target&&this.selectTarget()}},{key:"selectFake",value:function(){var t=this,e="rtl"==document.documentElement.getAttribute("dir");this.removeFake(),this.fakeHandlerCallback=function(){return t.removeFake()},this.fakeHandler=this.container.addEventListener("click",this.fakeHandlerCallback)||!0,this.fakeElem=document.createElement("textarea"),this.fakeElem.style.fontSize="12pt",this.fakeElem.style.border="0",this.fakeElem.style.padding="0",this.fakeElem.style.margin="0",this.fakeElem.style.position="absolute",this.fakeElem.style[e?"right":"left"]="-9999px";var n=window.pageYOffset||document.documentElement.scrollTop;this.fakeElem.style.top=n+"px",this.fakeElem.setAttribute("readonly",""),this.fakeElem.value=this.text,this.container.appendChild(this.fakeElem),this.selectedText=(0,c.default)(this.fakeElem),this.copyText()}},{key:"removeFake",value:function(){this.fakeHandler&&(this.container.removeEventListener("click",this.fakeHandlerCallback),this.fakeHandler=null,this.fakeHandlerCallback=null),this.fakeElem&&(this.container.removeChild(this.fakeElem),this.fakeElem=null)}},{key:"selectTarget",value:function(){this.selectedText=(0,c.default)(this.target),this.copyText()}},{key:"copyText",value:function(){var e=void 0;try{e=document.execCommand(this.action)}catch(t){e=!1}
+      this.handleResult(e)}},{key:"handleResult",value:function(t){this.emitter.emit(t?"success":"error",{action:this.action,text:this.selectedText,trigger:this.trigger,clearSelection:this.clearSelection.bind(this)})}},{key:"clearSelection",value:function(){this.trigger&&this.trigger.focus(),window.getSelection().removeAllRanges()}},{key:"destroy",value:function(){this.removeFake()}},{key:"action",set:function(){var t=0<arguments.length&&void 0!==arguments[0]?arguments[0]:"copy";if(this._action=t,"copy"!==this._action&&"cut"!==this._action)throw new Error('Invalid "action" value, use either "copy" or "cut"')},get:function(){return this._action}},{key:"target",set:function(t){if(void 0!==t){if(!t||"object"!==(void 0===t?"undefined":r(t))||1!==t.nodeType)throw new Error('Invalid "target" value, use a valid Element');if("copy"===this.action&&t.hasAttribute("disabled"))throw new Error('Invalid "target" attribute. Please use "readonly" instead of "disabled" attribute');if("cut"===this.action&&(t.hasAttribute("readonly")||t.hasAttribute("disabled")))throw new Error('Invalid "target" attribute. You can\'t cut text from elements with "readonly" or "disabled" attributes');this._target=t}},get:function(){return this._target}}]),e}();t.exports=u},function(t,e){t.exports=function(t){var e;if("SELECT"===t.nodeName)t.focus(),e=t.value;else if("INPUT"===t.nodeName||"TEXTAREA"===t.nodeName){var n=t.hasAttribute("readonly");n||t.setAttribute("readonly",""),t.select(),t.setSelectionRange(0,t.value.length),n||t.removeAttribute("readonly"),e=t.value}else{t.hasAttribute("contenteditable")&&t.focus();var o=window.getSelection(),r=document.createRange();r.selectNodeContents(t),o.removeAllRanges(),o.addRange(r),e=o.toString()}
+  return e}},function(t,e){function n(){}
+  n.prototype={on:function(t,e,n){var o=this.e||(this.e={});return(o[t]||(o[t]=[])).push({fn:e,ctx:n}),this},once:function(t,e,n){var o=this;function r(){o.off(t,r),e.apply(n,arguments)}
+      return r._=e,this.on(t,r,n)},emit:function(t){for(var e=[].slice.call(arguments,1),n=((this.e||(this.e={}))[t]||[]).slice(),o=0,r=n.length;o<r;o++)n[o].fn.apply(n[o].ctx,e);return this},off:function(t,e){var n=this.e||(this.e={}),o=n[t],r=[];if(o&&e)for(var i=0,a=o.length;i<a;i++)o[i].fn!==e&&o[i].fn._!==e&&r.push(o[i]);return r.length?n[t]=r:delete n[t],this}},t.exports=n},function(t,e,n){var d=n(5),h=n(6);t.exports=function(t,e,n){if(!t&&!e&&!n)throw new Error("Missing required arguments");if(!d.string(e))throw new TypeError("Second argument must be a String");if(!d.fn(n))throw new TypeError("Third argument must be a Function");if(d.node(t))return s=e,f=n,(l=t).addEventListener(s,f),{destroy:function(){l.removeEventListener(s,f)}};if(d.nodeList(t))return a=t,c=e,u=n,Array.prototype.forEach.call(a,function(t){t.addEventListener(c,u)}),{destroy:function(){Array.prototype.forEach.call(a,function(t){t.removeEventListener(c,u)})}};if(d.string(t))return o=t,r=e,i=n,h(document.body,o,r,i);throw new TypeError("First argument must be a String, HTMLElement, HTMLCollection, or NodeList");var o,r,i,a,c,u,l,s,f}},function(t,n){n.node=function(t){return void 0!==t&&t instanceof HTMLElement&&1===t.nodeType},n.nodeList=function(t){var e=Object.prototype.toString.call(t);return void 0!==t&&("[object NodeList]"===e||"[object HTMLCollection]"===e)&&"length"in t&&(0===t.length||n.node(t[0]))},n.string=function(t){return"string"==typeof t||t instanceof String},n.fn=function(t){return"[object Function]"===Object.prototype.toString.call(t)}},function(t,e,n){var a=n(7);function i(t,e,n,o,r){var i=function(e,n,t,o){return function(t){t.delegateTarget=a(t.target,n),t.delegateTarget&&o.call(e,t)}}.apply(this,arguments);return t.addEventListener(n,i,r),{destroy:function(){t.removeEventListener(n,i,r)}}}
+  t.exports=function(t,e,n,o,r){return"function"==typeof t.addEventListener?i.apply(null,arguments):"function"==typeof n?i.bind(null,document).apply(null,arguments):("string"==typeof t&&(t=document.querySelectorAll(t)),Array.prototype.map.call(t,function(t){return i(t,e,n,o,r)}))}},function(t,e){if("undefined"!=typeof Element&&!Element.prototype.matches){var n=Element.prototype;n.matches=n.matchesSelector||n.mozMatchesSelector||n.msMatchesSelector||n.oMatchesSelector||n.webkitMatchesSelector}
+  t.exports=function(t,e){for(;t&&9!==t.nodeType;){if("function"==typeof t.matches&&t.matches(e))return t;t=t.parentNode}}}])});let Types={isFunction:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object Function]'},isObject:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object Object]'},isString:function(obj){var type=Object.prototype.toString.call(obj)
+    return type=='[object String]'}}
+uni.setClipboardData=function(options){let emptyFun=function(){}
+  let config={data:null,event:null,success:emptyFun,fail:emptyFun,complete:emptyFun}
+  if(options&&Types.isObject(options)){config=Object.assign({},config,options)}
+  if(options&&Types.isString(options)){config=Object.assign({},config,{data:options})}
+  let data=config.data
+  let success=config.success||emptyFun
+  let fail=config.fail||emptyFun
+  let complete=config.complete||emptyFun
+  let e=config.event||window.event||{}
+  let cb=new ClipboardJS('.null',{text:()=>data})
+  cb.on('success',function(res){
+    window.__clipboard__=data;
+    success&&Types.isFunction(success)&&success({data:res.text})
+    complete&&Types.isFunction(complete)&&complete()
+    cb.off('error')
+    cb.off('success')
+    cb.destroy()})
+  cb.on('error',function(err){fail&&Types.isFunction(fail)&&fail(err)
+    complete&&Types.isFunction(complete)&&complete()
+    cb.off('error')
+    cb.off('success')
+    cb.destroy()})
+  cb.onClick(e)};
+uni.getClipboardData=function(options){let emptyFun=function(){}
+    let config={data:null,event:null,success:emptyFun,fail:emptyFun,complete:emptyFun}
+    if(options&&Types.isObject(options)){config=Object.assign({},config,options)}
+    let success=config.success||emptyFun
+    let fail=config.fail||emptyFun
+    let complete=config.complete||emptyFun
+    if(window.__clipboard__!==undefined){success&&Types.isFunction(success)&&success({data:window.__clipboard__})}else{fail&&Types.isFunction(fail)&&fail({data:null})}
+    complete&&Types.isFunction(complete)&&complete()};
+function fileDownLoad(data){var linkElement=document.createElement('a')
+  linkElement.setAttribute('href',data.blob)
+  linkElement.setAttribute('downLoad',data.name)
+  linkElement.click()}
+uni.saveImageToPhotosAlbum=uni.saveVideoToPhotosAlbum=function(options){let emptyFun=function(){}
+  let config={filePath:null,success:emptyFun,fail:emptyFun,complete:emptyFun}
+  if(options&&Types.isObject(options)){config=Object.assign({},config,options)}
+  if(options&&Types.isString(options)){config=Object.assign({},config,{filePath:options})}
+  let filePath=config.filePath
+  let success=config.success||emptyFun
+  let fail=config.fail||emptyFun
+  let complete=config.complete||emptyFun
+  if(!filePath){fail&&Types.isFunction(fail)&&fail({msg:'no File'})
+    complete&&Types.isFunction(complete)&&complete()
+    return}
+  let names=filePath.split('/')
+  let name=names[names.length-1]
+  uni.downloadFile({url:filePath,success:function(res){let tempFilePath=res.tempFilePath
+      fileDownLoad({name:name,blob:tempFilePath})
+      success&&Types.isFunction(success)&&success({filePath:filePath})},fail:function(err){fail&&Types.isFunction(fail)&&fail({msg:err})},complete:function(){complete&&Types.isFunction(complete)&&complete()}})}
+//#endif
diff --git a/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.css b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.css
new file mode 100644
index 0000000..1b83b24
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.css
@@ -0,0 +1,107 @@
+.lotus-address-picker {
+  font-size: 26rpx;
+  padding-top: 30rpx;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  display: -webkit-box;
+  -webkit-line-clamp: 1;
+  -webkit-box-orient: vertical;
+  line-height: normal;
+  padding-right: 30rpx;
+  box-sizing: border-box;
+}
+.lotus-address-picker-box {
+  /*display: -webkit-box;
+  display: -webkit-flex;*/
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  justify-content: flex-start;
+  padding-top: 10rpx;
+  padding-bottom: 10rpx;
+}
+.lotus-address-picker-box-item {
+  height: 600upx;
+  overflow-y: auto;
+  width: 33.333%;
+  padding-left: 20rpx;
+  padding-right: 20rpx;
+  box-sizing: border-box;
+}
+.lotus-address-picker2 {
+  color: #e93b3d;
+  position: relative;
+}
+.lotus-address-picker2:after {
+  content: '';
+  position: absolute;
+  right: 0;
+  top: 65%;
+  transform: translateY(-35%) rotate(-45deg);
+  width: 20rpx;
+  height: 10rpx;
+  border-left-width: 4rpx;
+  border-bottom-width: 4rpx;
+  border-left-style: solid;
+  border-bottom-style: solid;
+  border-left-color: #e93b3d;
+  border-bottom-color: #e93b3d;
+}
+.lotus-address-mask {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 999;
+  background: rgba(0, 0, 0, 0.5);
+}
+.lotus-address-box {
+  background: #fff;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: auto;
+}
+.lotus-address-action {
+  font-size: 30rpx;
+  /*display: -webkit-box;
+  display: -webkit-flex;*/
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  justify-content: space-between;
+  padding: 25rpx 30rpx;
+  position: relative;
+}
+.lotus-address-action:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 0;
+  transform: scaleY(0.5);
+}
+.lotus-address-action:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 100%;
+  transform: scaleY(0.5);
+}
+.lotus-address-action-cancel {
+  color: #969696;
+}
+.lotus-address-action-affirm {
+  color: #e93b3d;
+}
diff --git a/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.js b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.js
new file mode 100644
index 0000000..7ffd730
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.js
@@ -0,0 +1 @@
+export let lotusAddressJson=[{value:"110000",name:"北京"},{value:"120000",name:"天津"},{value:"130000",name:"河北省"},{value:"140000",name:"山西省"},{value:"150000",name:"内蒙古自治区"},{value:"210000",name:"辽宁省"},{value:"220000",name:"吉林省"},{value:"230000",name:"黑龙江省"},{value:"310000",name:"上海"},{value:"320000",name:"江苏省"},{value:"330000",name:"浙江省"},{value:"340000",name:"安徽省"},{value:"350000",name:"福建省"},{value:"360000",name:"江西省"},{value:"370000",name:"山东省"},{value:"410000",name:"河南省"},{value:"420000",name:"湖北省"},{value:"430000",name:"湖南省"},{value:"440000",name:"广东省"},{value:"450000",name:"广西壮族自治区"},{value:"460000",name:"海南省"},{value:"500000",name:"重庆"},{value:"510000",name:"四川省"},{value:"520000",name:"贵州省"},{value:"530000",name:"云南省"},{value:"540000",name:"西藏自治区"},{value:"610000",name:"陕西省"},{value:"620000",name:"甘肃省"},{value:"630000",name:"青海省"},{value:"640000",name:"宁夏回族自治区"},{value:"650000",name:"新疆维吾尔自治区"},{value:"710000",name:"台湾"},{value:"810000",name:"香港特别行政区"},{value:"820000",name:"澳门特别行政区"},{value:"990000",name:"海外"},{value:"110100",name:"北京市",parent:"110000"},{value:"120100",name:"天津市",parent:"120000"},{value:"130100",name:"石家庄市",parent:"130000"},{value:"130200",name:"唐山市",parent:"130000"},{value:"130300",name:"秦皇岛市",parent:"130000"},{value:"130400",name:"邯郸市",parent:"130000"},{value:"130500",name:"邢台市",parent:"130000"},{value:"130600",name:"保定市",parent:"130000"},{value:"130700",name:"张家口市",parent:"130000"},{value:"130800",name:"承德市",parent:"130000"},{value:"130900",name:"沧州市",parent:"130000"},{value:"131000",name:"廊坊市",parent:"130000"},{value:"131100",name:"衡水市",parent:"130000"},{value:"140100",name:"太原市",parent:"140000"},{value:"140200",name:"大同市",parent:"140000"},{value:"140300",name:"阳泉市",parent:"140000"},{value:"140400",name:"长治市",parent:"140000"},{value:"140500",name:"晋城市",parent:"140000"},{value:"140600",name:"朔州市",parent:"140000"},{value:"140700",name:"晋中市",parent:"140000"},{value:"140800",name:"运城市",parent:"140000"},{value:"140900",name:"忻州市",parent:"140000"},{value:"141000",name:"临汾市",parent:"140000"},{value:"141100",name:"吕梁市",parent:"140000"},{value:"150100",name:"呼和浩特市",parent:"150000"},{value:"150200",name:"包头市",parent:"150000"},{value:"150300",name:"乌海市",parent:"150000"},{value:"150400",name:"赤峰市",parent:"150000"},{value:"150500",name:"通辽市",parent:"150000"},{value:"150600",name:"鄂尔多斯市",parent:"150000"},{value:"150700",name:"呼伦贝尔市",parent:"150000"},{value:"150800",name:"巴彦淖尔市",parent:"150000"},{value:"150900",name:"乌兰察布市",parent:"150000"},{value:"152200",name:"兴安盟",parent:"150000"},{value:"152500",name:"锡林郭勒盟",parent:"150000"},{value:"152900",name:"阿拉善盟",parent:"150000"},{value:"210100",name:"沈阳市",parent:"210000"},{value:"210200",name:"大连市",parent:"210000"},{value:"210300",name:"鞍山市",parent:"210000"},{value:"210400",name:"抚顺市",parent:"210000"},{value:"210500",name:"本溪市",parent:"210000"},{value:"210600",name:"丹东市",parent:"210000"},{value:"210700",name:"锦州市",parent:"210000"},{value:"210800",name:"营口市",parent:"210000"},{value:"210900",name:"阜新市",parent:"210000"},{value:"211000",name:"辽阳市",parent:"210000"},{value:"211100",name:"盘锦市",parent:"210000"},{value:"211200",name:"铁岭市",parent:"210000"},{value:"211300",name:"朝阳市",parent:"210000"},{value:"211400",name:"葫芦岛市",parent:"210000"},{value:"220100",name:"长春市",parent:"220000"},{value:"220200",name:"吉林市",parent:"220000"},{value:"220300",name:"四平市",parent:"220000"},{value:"220400",name:"辽源市",parent:"220000"},{value:"220500",name:"通化市",parent:"220000"},{value:"220600",name:"白山市",parent:"220000"},{value:"220700",name:"松原市",parent:"220000"},{value:"220800",name:"白城市",parent:"220000"},{value:"222400",name:"延边朝鲜族自治州",parent:"220000"},{value:"230100",name:"哈尔滨市",parent:"230000"},{value:"230200",name:"齐齐哈尔市",parent:"230000"},{value:"230300",name:"鸡西市",parent:"230000"},{value:"230400",name:"鹤岗市",parent:"230000"},{value:"230500",name:"双鸭山市",parent:"230000"},{value:"230600",name:"大庆市",parent:"230000"},{value:"230700",name:"伊春市",parent:"230000"},{value:"230800",name:"佳木斯市",parent:"230000"},{value:"230900",name:"七台河市",parent:"230000"},{value:"231000",name:"牡丹江市",parent:"230000"},{value:"231100",name:"黑河市",parent:"230000"},{value:"231200",name:"绥化市",parent:"230000"},{value:"232700",name:"大兴安岭地区",parent:"230000"},{value:"310100",name:"上海市",parent:"310000"},{value:"320100",name:"南京市",parent:"320000"},{value:"320200",name:"无锡市",parent:"320000"},{value:"320300",name:"徐州市",parent:"320000"},{value:"320400",name:"常州市",parent:"320000"},{value:"320500",name:"苏州市",parent:"320000"},{value:"320600",name:"南通市",parent:"320000"},{value:"320700",name:"连云港市",parent:"320000"},{value:"320800",name:"淮安市",parent:"320000"},{value:"320900",name:"盐城市",parent:"320000"},{value:"321000",name:"扬州市",parent:"320000"},{value:"321100",name:"镇江市",parent:"320000"},{value:"321200",name:"泰州市",parent:"320000"},{value:"321300",name:"宿迁市",parent:"320000"},{value:"330100",name:"杭州市",parent:"330000"},{value:"330200",name:"宁波市",parent:"330000"},{value:"330300",name:"温州市",parent:"330000"},{value:"330400",name:"嘉兴市",parent:"330000"},{value:"330500",name:"湖州市",parent:"330000"},{value:"330600",name:"绍兴市",parent:"330000"},{value:"330700",name:"金华市",parent:"330000"},{value:"330800",name:"衢州市",parent:"330000"},{value:"330900",name:"舟山市",parent:"330000"},{value:"331000",name:"台州市",parent:"330000"},{value:"331100",name:"丽水市",parent:"330000"},{value:"340100",name:"合肥市",parent:"340000"},{value:"340200",name:"芜湖市",parent:"340000"},{value:"340300",name:"蚌埠市",parent:"340000"},{value:"340400",name:"淮南市",parent:"340000"},{value:"340500",name:"马鞍山市",parent:"340000"},{value:"340600",name:"淮北市",parent:"340000"},{value:"340700",name:"铜陵市",parent:"340000"},{value:"340800",name:"安庆市",parent:"340000"},{value:"341000",name:"黄山市",parent:"340000"},{value:"341100",name:"滁州市",parent:"340000"},{value:"341200",name:"阜阳市",parent:"340000"},{value:"341300",name:"宿州市",parent:"340000"},{value:"341500",name:"六安市",parent:"340000"},{value:"341600",name:"亳州市",parent:"340000"},{value:"341700",name:"池州市",parent:"340000"},{value:"341800",name:"宣城市",parent:"340000"},{value:"350100",name:"福州市",parent:"350000"},{value:"350200",name:"厦门市",parent:"350000"},{value:"350300",name:"莆田市",parent:"350000"},{value:"350400",name:"三明市",parent:"350000"},{value:"350500",name:"泉州市",parent:"350000"},{value:"350600",name:"漳州市",parent:"350000"},{value:"350700",name:"南平市",parent:"350000"},{value:"350800",name:"龙岩市",parent:"350000"},{value:"350900",name:"宁德市",parent:"350000"},{value:"360100",name:"南昌市",parent:"360000"},{value:"360200",name:"景德镇市",parent:"360000"},{value:"360300",name:"萍乡市",parent:"360000"},{value:"360400",name:"九江市",parent:"360000"},{value:"360500",name:"新余市",parent:"360000"},{value:"360600",name:"鹰潭市",parent:"360000"},{value:"360700",name:"赣州市",parent:"360000"},{value:"360800",name:"吉安市",parent:"360000"},{value:"360900",name:"宜春市",parent:"360000"},{value:"361000",name:"抚州市",parent:"360000"},{value:"361100",name:"上饶市",parent:"360000"},{value:"370100",name:"济南市",parent:"370000"},{value:"370200",name:"青岛市",parent:"370000"},{value:"370300",name:"淄博市",parent:"370000"},{value:"370400",name:"枣庄市",parent:"370000"},{value:"370500",name:"东营市",parent:"370000"},{value:"370600",name:"烟台市",parent:"370000"},{value:"370700",name:"潍坊市",parent:"370000"},{value:"370800",name:"济宁市",parent:"370000"},{value:"370900",name:"泰安市",parent:"370000"},{value:"371000",name:"威海市",parent:"370000"},{value:"371100",name:"日照市",parent:"370000"},{value:"371200",name:"莱芜市",parent:"370000"},{value:"371300",name:"临沂市",parent:"370000"},{value:"371400",name:"德州市",parent:"370000"},{value:"371500",name:"聊城市",parent:"370000"},{value:"371600",name:"滨州市",parent:"370000"},{value:"371700",name:"菏泽市",parent:"370000"},{value:"410100",name:"郑州市",parent:"410000"},{value:"410200",name:"开封市",parent:"410000"},{value:"410300",name:"洛阳市",parent:"410000"},{value:"410400",name:"平顶山市",parent:"410000"},{value:"410500",name:"安阳市",parent:"410000"},{value:"410600",name:"鹤壁市",parent:"410000"},{value:"410700",name:"新乡市",parent:"410000"},{value:"410800",name:"焦作市",parent:"410000"},{value:"410900",name:"濮阳市",parent:"410000"},{value:"411000",name:"许昌市",parent:"410000"},{value:"411100",name:"漯河市",parent:"410000"},{value:"411200",name:"三门峡市",parent:"410000"},{value:"411300",name:"南阳市",parent:"410000"},{value:"411400",name:"商丘市",parent:"410000"},{value:"411500",name:"信阳市",parent:"410000"},{value:"411600",name:"周口市",parent:"410000"},{value:"411700",name:"驻马店市",parent:"410000"},{value:"420100",name:"武汉市",parent:"420000"},{value:"420200",name:"黄石市",parent:"420000"},{value:"420300",name:"十堰市",parent:"420000"},{value:"420500",name:"宜昌市",parent:"420000"},{value:"420600",name:"襄阳市",parent:"420000"},{value:"420700",name:"鄂州市",parent:"420000"},{value:"420800",name:"荆门市",parent:"420000"},{value:"420900",name:"孝感市",parent:"420000"},{value:"421000",name:"荆州市",parent:"420000"},{value:"421100",name:"黄冈市",parent:"420000"},{value:"421200",name:"咸宁市",parent:"420000"},{value:"421300",name:"随州市",parent:"420000"},{value:"422800",name:"恩施土家族苗族自治州",parent:"420000"},{value:"430100",name:"长沙市",parent:"430000"},{value:"430200",name:"株洲市",parent:"430000"},{value:"430300",name:"湘潭市",parent:"430000"},{value:"430400",name:"衡阳市",parent:"430000"},{value:"430500",name:"邵阳市",parent:"430000"},{value:"430600",name:"岳阳市",parent:"430000"},{value:"430700",name:"常德市",parent:"430000"},{value:"430800",name:"张家界市",parent:"430000"},{value:"430900",name:"益阳市",parent:"430000"},{value:"431000",name:"郴州市",parent:"430000"},{value:"431100",name:"永州市",parent:"430000"},{value:"431200",name:"怀化市",parent:"430000"},{value:"431300",name:"娄底市",parent:"430000"},{value:"433100",name:"湘西土家族苗族自治州",parent:"430000"},{value:"440100",name:"广州市",parent:"440000"},{value:"440200",name:"韶关市",parent:"440000"},{value:"440300",name:"深圳市",parent:"440000"},{value:"440400",name:"珠海市",parent:"440000"},{value:"440500",name:"汕头市",parent:"440000"},{value:"440600",name:"佛山市",parent:"440000"},{value:"440700",name:"江门市",parent:"440000"},{value:"440800",name:"湛江市",parent:"440000"},{value:"440900",name:"茂名市",parent:"440000"},{value:"441200",name:"肇庆市",parent:"440000"},{value:"441300",name:"惠州市",parent:"440000"},{value:"441400",name:"梅州市",parent:"440000"},{value:"441500",name:"汕尾市",parent:"440000"},{value:"441600",name:"河源市",parent:"440000"},{value:"441700",name:"阳江市",parent:"440000"},{value:"441800",name:"清远市",parent:"440000"},{value:"441900",name:"东莞市",parent:"440000"},{value:"442000",name:"中山市",parent:"440000"},{value:"442101",name:"东沙群岛",parent:"440000"},{value:"445100",name:"潮州市",parent:"440000"},{value:"445200",name:"揭阳市",parent:"440000"},{value:"445300",name:"云浮市",parent:"440000"},{value:"450100",name:"南宁市",parent:"450000"},{value:"450200",name:"柳州市",parent:"450000"},{value:"450300",name:"桂林市",parent:"450000"},{value:"450400",name:"梧州市",parent:"450000"},{value:"450500",name:"北海市",parent:"450000"},{value:"450600",name:"防城港市",parent:"450000"},{value:"450700",name:"钦州市",parent:"450000"},{value:"450800",name:"贵港市",parent:"450000"},{value:"450900",name:"玉林市",parent:"450000"},{value:"451000",name:"百色市",parent:"450000"},{value:"451100",name:"贺州市",parent:"450000"},{value:"451200",name:"河池市",parent:"450000"},{value:"451300",name:"来宾市",parent:"450000"},{value:"451400",name:"崇左市",parent:"450000"},{value:"460100",name:"海口市",parent:"460000"},{value:"460200",name:"三亚市",parent:"460000"},{value:"460300",name:"三沙市",parent:"460000"},{value:"500100",name:"重庆市",parent:"500000"},{value:"510100",name:"成都市",parent:"510000"},{value:"510300",name:"自贡市",parent:"510000"},{value:"510400",name:"攀枝花市",parent:"510000"},{value:"510500",name:"泸州市",parent:"510000"},{value:"510600",name:"德阳市",parent:"510000"},{value:"510700",name:"绵阳市",parent:"510000"},{value:"510800",name:"广元市",parent:"510000"},{value:"510900",name:"遂宁市",parent:"510000"},{value:"511000",name:"内江市",parent:"510000"},{value:"511100",name:"乐山市",parent:"510000"},{value:"511300",name:"南充市",parent:"510000"},{value:"511400",name:"眉山市",parent:"510000"},{value:"511500",name:"宜宾市",parent:"510000"},{value:"511600",name:"广安市",parent:"510000"},{value:"511700",name:"达州市",parent:"510000"},{value:"511800",name:"雅安市",parent:"510000"},{value:"511900",name:"巴中市",parent:"510000"},{value:"512000",name:"资阳市",parent:"510000"},{value:"513200",name:"阿坝藏族羌族自治州",parent:"510000"},{value:"513300",name:"甘孜藏族自治州",parent:"510000"},{value:"513400",name:"凉山彝族自治州",parent:"510000"},{value:"520100",name:"贵阳市",parent:"520000"},{value:"520200",name:"六盘水市",parent:"520000"},{value:"520300",name:"遵义市",parent:"520000"},{value:"520400",name:"安顺市",parent:"520000"},{value:"522200",name:"铜仁市",parent:"520000"},{value:"522300",name:"黔西南布依族苗族自治州",parent:"520000"},{value:"522400",name:"毕节市",parent:"520000"},{value:"522600",name:"黔东南苗族侗族自治州",parent:"520000"},{value:"522700",name:"黔南布依族苗族自治州",parent:"520000"},{value:"530100",name:"昆明市",parent:"530000"},{value:"530300",name:"曲靖市",parent:"530000"},{value:"530400",name:"玉溪市",parent:"530000"},{value:"530500",name:"保山市",parent:"530000"},{value:"530600",name:"昭通市",parent:"530000"},{value:"530700",name:"丽江市",parent:"530000"},{value:"530800",name:"普洱市",parent:"530000"},{value:"530900",name:"临沧市",parent:"530000"},{value:"532300",name:"楚雄彝族自治州",parent:"530000"},{value:"532500",name:"红河哈尼族彝族自治州",parent:"530000"},{value:"532600",name:"文山壮族苗族自治州",parent:"530000"},{value:"532800",name:"西双版纳傣族自治州",parent:"530000"},{value:"532900",name:"大理白族自治州",parent:"530000"},{value:"533100",name:"德宏傣族景颇族自治州",parent:"530000"},{value:"533300",name:"怒江傈僳族自治州",parent:"530000"},{value:"533400",name:"迪庆藏族自治州",parent:"530000"},{value:"540100",name:"拉萨市",parent:"540000"},{value:"542100",name:"昌都市",parent:"540000"},{value:"542200",name:"山南地区",parent:"540000"},{value:"542300",name:"日喀则市",parent:"540000"},{value:"542400",name:"那曲地区",parent:"540000"},{value:"542500",name:"阿里地区",parent:"540000"},{value:"542600",name:"林芝市",parent:"540000"},{value:"610100",name:"西安市",parent:"610000"},{value:"610200",name:"铜川市",parent:"610000"},{value:"610300",name:"宝鸡市",parent:"610000"},{value:"610400",name:"咸阳市",parent:"610000"},{value:"610500",name:"渭南市",parent:"610000"},{value:"610600",name:"延安市",parent:"610000"},{value:"610700",name:"汉中市",parent:"610000"},{value:"610800",name:"榆林市",parent:"610000"},{value:"610900",name:"安康市",parent:"610000"},{value:"611000",name:"商洛市",parent:"610000"},{value:"620100",name:"兰州市",parent:"620000"},{value:"620200",name:"嘉峪关市",parent:"620000"},{value:"620300",name:"金昌市",parent:"620000"},{value:"620400",name:"白银市",parent:"620000"},{value:"620500",name:"天水市",parent:"620000"},{value:"620600",name:"武威市",parent:"620000"},{value:"620700",name:"张掖市",parent:"620000"},{value:"620800",name:"平凉市",parent:"620000"},{value:"620900",name:"酒泉市",parent:"620000"},{value:"621000",name:"庆阳市",parent:"620000"},{value:"621100",name:"定西市",parent:"620000"},{value:"621200",name:"陇南市",parent:"620000"},{value:"622900",name:"临夏回族自治州",parent:"620000"},{value:"623000",name:"甘南藏族自治州",parent:"620000"},{value:"630100",name:"西宁市",parent:"630000"},{value:"632100",name:"海东市",parent:"630000"},{value:"632200",name:"海北藏族自治州",parent:"630000"},{value:"632300",name:"黄南藏族自治州",parent:"630000"},{value:"632500",name:"海南藏族自治州",parent:"630000"},{value:"632600",name:"果洛藏族自治州",parent:"630000"},{value:"632700",name:"玉树藏族自治州",parent:"630000"},{value:"632800",name:"海西蒙古族藏族自治州",parent:"630000"},{value:"640100",name:"银川市",parent:"640000"},{value:"640200",name:"石嘴山市",parent:"640000"},{value:"640300",name:"吴忠市",parent:"640000"},{value:"640400",name:"固原市",parent:"640000"},{value:"640500",name:"中卫市",parent:"640000"},{value:"650100",name:"乌鲁木齐市",parent:"650000"},{value:"650200",name:"克拉玛依市",parent:"650000"},{value:"652100",name:"吐鲁番市",parent:"650000"},{value:"652200",name:"哈密地区",parent:"650000"},{value:"652300",name:"昌吉回族自治州",parent:"650000"},{value:"652700",name:"博尔塔拉蒙古自治州",parent:"650000"},{value:"652800",name:"巴音郭楞蒙古自治州",parent:"650000"},{value:"652900",name:"阿克苏地区",parent:"650000"},{value:"653000",name:"克孜勒苏柯尔克孜自治州",parent:"650000"},{value:"653100",name:"喀什地区",parent:"650000"},{value:"653200",name:"和田地区",parent:"650000"},{value:"654000",name:"伊犁哈萨克自治州",parent:"650000"},{value:"654200",name:"塔城地区",parent:"650000"},{value:"654300",name:"阿勒泰地区",parent:"650000"},{value:"659000",name:"可克达拉市",parent:"650000"},{value:"710100",name:"台北市",parent:"710000"},{value:"710200",name:"高雄市",parent:"710000"},{value:"710300",name:"台南市",parent:"710000"},{value:"710400",name:"台中市",parent:"710000"},{value:"710500",name:"金门县",parent:"710000"},{value:"710600",name:"南投县",parent:"710000"},{value:"710700",name:"基隆市",parent:"710000"},{value:"710800",name:"新竹市",parent:"710000"},{value:"710900",name:"嘉义市",parent:"710000"},{value:"711100",name:"新北市",parent:"710000"},{value:"711200",name:"宜兰县",parent:"710000"},{value:"711300",name:"新竹县",parent:"710000"},{value:"711400",name:"桃园县",parent:"710000"},{value:"711500",name:"苗栗县",parent:"710000"},{value:"711700",name:"彰化县",parent:"710000"},{value:"711900",name:"嘉义县",parent:"710000"},{value:"712100",name:"云林县",parent:"710000"},{value:"712400",name:"屏东县",parent:"710000"},{value:"712500",name:"台东县",parent:"710000"},{value:"712600",name:"花莲县",parent:"710000"},{value:"712700",name:"澎湖县",parent:"710000"},{value:"712800",name:"连江县",parent:"710000"},{value:"810100",name:"香港岛",parent:"810000"},{value:"810200",name:"九龙",parent:"810000"},{value:"810300",name:"新界",parent:"810000"},{value:"820100",name:"澳门半岛",parent:"820000"},{value:"820200",name:"离岛",parent:"820000"},{value:"990100",name:"海外",parent:"990000"},{value:"110101",name:"东城区",parent:"110100"},{value:"110102",name:"西城区",parent:"110100"},{value:"110103",name:"崇文区",parent:"110100"},{value:"110104",name:"宣武区",parent:"110100"},{value:"110105",name:"朝阳区",parent:"110100"},{value:"110106",name:"丰台区",parent:"110100"},{value:"110107",name:"石景山区",parent:"110100"},{value:"110108",name:"海淀区",parent:"110100"},{value:"110109",name:"门头沟区",parent:"110100"},{value:"110111",name:"房山区",parent:"110100"},{value:"110112",name:"通州区",parent:"110100"},{value:"110113",name:"顺义区",parent:"110100"},{value:"110114",name:"昌平区",parent:"110100"},{value:"110115",name:"大兴区",parent:"110100"},{value:"110116",name:"怀柔区",parent:"110100"},{value:"110117",name:"平谷区",parent:"110100"},{value:"110228",name:"密云县",parent:"110100"},{value:"110229",name:"延庆县",parent:"110100"},{value:"110230",name:"其它区",parent:"110100"},{value:"120101",name:"和平区",parent:"120100"},{value:"120102",name:"河东区",parent:"120100"},{value:"120103",name:"河西区",parent:"120100"},{value:"120104",name:"南开区",parent:"120100"},{value:"120105",name:"河北区",parent:"120100"},{value:"120106",name:"红桥区",parent:"120100"},{value:"120107",name:"塘沽区",parent:"120100"},{value:"120108",name:"汉沽区",parent:"120100"},{value:"120109",name:"大港区",parent:"120100"},{value:"120110",name:"东丽区",parent:"120100"},{value:"120111",name:"西青区",parent:"120100"},{value:"120112",name:"津南区",parent:"120100"},{value:"120113",name:"北辰区",parent:"120100"},{value:"120114",name:"武清区",parent:"120100"},{value:"120115",name:"宝坻区",parent:"120100"},{value:"120116",name:"滨海新区",parent:"120100"},{value:"120221",name:"宁河县",parent:"120100"},{value:"120223",name:"静海县",parent:"120100"},{value:"120225",name:"蓟县",parent:"120100"},{value:"120226",name:"其它区",parent:"120100"},{value:"130102",name:"长安区",parent:"130100"},{value:"130103",name:"桥东区",parent:"130100"},{value:"130104",name:"桥西区",parent:"130100"},{value:"130105",name:"新华区",parent:"130100"},{value:"130107",name:"井陉矿区",parent:"130100"},{value:"130108",name:"裕华区",parent:"130100"},{value:"130121",name:"井陉县",parent:"130100"},{value:"130123",name:"正定县",parent:"130100"},{value:"130124",name:"栾城区",parent:"130100"},{value:"130125",name:"行唐县",parent:"130100"},{value:"130126",name:"灵寿县",parent:"130100"},{value:"130127",name:"高邑县",parent:"130100"},{value:"130128",name:"深泽县",parent:"130100"},{value:"130129",name:"赞皇县",parent:"130100"},{value:"130130",name:"无极县",parent:"130100"},{value:"130131",name:"平山县",parent:"130100"},{value:"130132",name:"元氏县",parent:"130100"},{value:"130133",name:"赵县",parent:"130100"},{value:"130181",name:"辛集市",parent:"130100"},{value:"130182",name:"藁城区",parent:"130100"},{value:"130183",name:"晋州市",parent:"130100"},{value:"130184",name:"新乐市",parent:"130100"},{value:"130185",name:"鹿泉区",parent:"130100"},{value:"130186",name:"其它区",parent:"130100"},{value:"130202",name:"路南区",parent:"130200"},{value:"130203",name:"路北区",parent:"130200"},{value:"130204",name:"古冶区",parent:"130200"},{value:"130205",name:"开平区",parent:"130200"},{value:"130207",name:"丰南区",parent:"130200"},{value:"130208",name:"丰润区",parent:"130200"},{value:"130223",name:"滦县",parent:"130200"},{value:"130224",name:"滦南县",parent:"130200"},{value:"130225",name:"乐亭县",parent:"130200"},{value:"130227",name:"迁西县",parent:"130200"},{value:"130229",name:"玉田县",parent:"130200"},{value:"130230",name:"曹妃甸区",parent:"130200"},{value:"130281",name:"遵化市",parent:"130200"},{value:"130283",name:"迁安市",parent:"130200"},{value:"130284",name:"其它区",parent:"130200"},{value:"130302",name:"海港区",parent:"130300"},{value:"130303",name:"山海关区",parent:"130300"},{value:"130304",name:"北戴河区",parent:"130300"},{value:"130321",name:"青龙满族自治县",parent:"130300"},{value:"130322",name:"昌黎县",parent:"130300"},{value:"130323",name:"抚宁县",parent:"130300"},{value:"130324",name:"卢龙县",parent:"130300"},{value:"130398",name:"其它区",parent:"130300"},{value:"130399",name:"经济技术开发区",parent:"130300"},{value:"130402",name:"邯山区",parent:"130400"},{value:"130403",name:"丛台区",parent:"130400"},{value:"130404",name:"复兴区",parent:"130400"},{value:"130406",name:"峰峰矿区",parent:"130400"},{value:"130421",name:"邯郸县",parent:"130400"},{value:"130423",name:"临漳县",parent:"130400"},{value:"130424",name:"成安县",parent:"130400"},{value:"130425",name:"大名县",parent:"130400"},{value:"130426",name:"涉县",parent:"130400"},{value:"130427",name:"磁县",parent:"130400"},{value:"130428",name:"肥乡县",parent:"130400"},{value:"130429",name:"永年县",parent:"130400"},{value:"130430",name:"邱县",parent:"130400"},{value:"130431",name:"鸡泽县",parent:"130400"},{value:"130432",name:"广平县",parent:"130400"},{value:"130433",name:"馆陶县",parent:"130400"},{value:"130434",name:"魏县",parent:"130400"},{value:"130435",name:"曲周县",parent:"130400"},{value:"130481",name:"武安市",parent:"130400"},{value:"130482",name:"其它区",parent:"130400"},{value:"130502",name:"桥东区",parent:"130500"},{value:"130503",name:"桥西区",parent:"130500"},{value:"130521",name:"邢台县",parent:"130500"},{value:"130522",name:"临城县",parent:"130500"},{value:"130523",name:"内丘县",parent:"130500"},{value:"130524",name:"柏乡县",parent:"130500"},{value:"130525",name:"隆尧县",parent:"130500"},{value:"130526",name:"任县",parent:"130500"},{value:"130527",name:"南和县",parent:"130500"},{value:"130528",name:"宁晋县",parent:"130500"},{value:"130529",name:"巨鹿县",parent:"130500"},{value:"130530",name:"新河县",parent:"130500"},{value:"130531",name:"广宗县",parent:"130500"},{value:"130532",name:"平乡县",parent:"130500"},{value:"130533",name:"威县",parent:"130500"},{value:"130534",name:"清河县",parent:"130500"},{value:"130535",name:"临西县",parent:"130500"},{value:"130581",name:"南宫市",parent:"130500"},{value:"130582",name:"沙河市",parent:"130500"},{value:"130583",name:"其它区",parent:"130500"},{value:"130602",name:"新市区",parent:"130600"},{value:"130603",name:"北市区",parent:"130600"},{value:"130604",name:"南市区",parent:"130600"},{value:"130621",name:"满城县",parent:"130600"},{value:"130622",name:"清苑县",parent:"130600"},{value:"130623",name:"涞水县",parent:"130600"},{value:"130624",name:"阜平县",parent:"130600"},{value:"130625",name:"徐水县",parent:"130600"},{value:"130626",name:"定兴县",parent:"130600"},{value:"130627",name:"唐县",parent:"130600"},{value:"130628",name:"高阳县",parent:"130600"},{value:"130629",name:"容城县",parent:"130600"},{value:"130630",name:"涞源县",parent:"130600"},{value:"130631",name:"望都县",parent:"130600"},{value:"130632",name:"安新县",parent:"130600"},{value:"130633",name:"易县",parent:"130600"},{value:"130634",name:"曲阳县",parent:"130600"},{value:"130635",name:"蠡县",parent:"130600"},{value:"130636",name:"顺平县",parent:"130600"},{value:"130637",name:"博野县",parent:"130600"},{value:"130638",name:"雄县",parent:"130600"},{value:"130681",name:"涿州市",parent:"130600"},{value:"130682",name:"定州市",parent:"130600"},{value:"130683",name:"安国市",parent:"130600"},{value:"130684",name:"高碑店市",parent:"130600"},{value:"130698",name:"高开区",parent:"130600"},{value:"130699",name:"其它区",parent:"130600"},{value:"130702",name:"桥东区",parent:"130700"},{value:"130703",name:"桥西区",parent:"130700"},{value:"130705",name:"宣化区",parent:"130700"},{value:"130706",name:"下花园区",parent:"130700"},{value:"130721",name:"宣化县",parent:"130700"},{value:"130722",name:"张北县",parent:"130700"},{value:"130723",name:"康保县",parent:"130700"},{value:"130724",name:"沽源县",parent:"130700"},{value:"130725",name:"尚义县",parent:"130700"},{value:"130726",name:"蔚县",parent:"130700"},{value:"130727",name:"阳原县",parent:"130700"},{value:"130728",name:"怀安县",parent:"130700"},{value:"130729",name:"万全县",parent:"130700"},{value:"130730",name:"怀来县",parent:"130700"},{value:"130731",name:"涿鹿县",parent:"130700"},{value:"130732",name:"赤城县",parent:"130700"},{value:"130733",name:"崇礼县",parent:"130700"},{value:"130734",name:"其它区",parent:"130700"},{value:"130802",name:"双桥区",parent:"130800"},{value:"130803",name:"双滦区",parent:"130800"},{value:"130804",name:"鹰手营子矿区",parent:"130800"},{value:"130821",name:"承德县",parent:"130800"},{value:"130822",name:"兴隆县",parent:"130800"},{value:"130823",name:"平泉县",parent:"130800"},{value:"130824",name:"滦平县",parent:"130800"},{value:"130825",name:"隆化县",parent:"130800"},{value:"130826",name:"丰宁满族自治县",parent:"130800"},{value:"130827",name:"宽城满族自治县",parent:"130800"},{value:"130828",name:"围场满族蒙古族自治县",parent:"130800"},{value:"130829",name:"其它区",parent:"130800"},{value:"130902",name:"新华区",parent:"130900"},{value:"130903",name:"运河区",parent:"130900"},{value:"130921",name:"沧县",parent:"130900"},{value:"130922",name:"青县",parent:"130900"},{value:"130923",name:"东光县",parent:"130900"},{value:"130924",name:"海兴县",parent:"130900"},{value:"130925",name:"盐山县",parent:"130900"},{value:"130926",name:"肃宁县",parent:"130900"},{value:"130927",name:"南皮县",parent:"130900"},{value:"130928",name:"吴桥县",parent:"130900"},{value:"130929",name:"献县",parent:"130900"},{value:"130930",name:"孟村回族自治县",parent:"130900"},{value:"130981",name:"泊头市",parent:"130900"},{value:"130982",name:"任丘市",parent:"130900"},{value:"130983",name:"黄骅市",parent:"130900"},{value:"130984",name:"河间市",parent:"130900"},{value:"130985",name:"其它区",parent:"130900"},{value:"131002",name:"安次区",parent:"131000"},{value:"131003",name:"广阳区",parent:"131000"},{value:"131022",name:"固安县",parent:"131000"},{value:"131023",name:"永清县",parent:"131000"},{value:"131024",name:"香河县",parent:"131000"},{value:"131025",name:"大城县",parent:"131000"},{value:"131026",name:"文安县",parent:"131000"},{value:"131028",name:"大厂回族自治县",parent:"131000"},{value:"131051",name:"开发区",parent:"131000"},{value:"131052",name:"燕郊经济技术开发区",parent:"131000"},{value:"131081",name:"霸州市",parent:"131000"},{value:"131082",name:"三河市",parent:"131000"},{value:"131083",name:"其它区",parent:"131000"},{value:"131102",name:"桃城区",parent:"131100"},{value:"131121",name:"枣强县",parent:"131100"},{value:"131122",name:"武邑县",parent:"131100"},{value:"131123",name:"武强县",parent:"131100"},{value:"131124",name:"饶阳县",parent:"131100"},{value:"131125",name:"安平县",parent:"131100"},{value:"131126",name:"故城县",parent:"131100"},{value:"131127",name:"景县",parent:"131100"},{value:"131128",name:"阜城县",parent:"131100"},{value:"131181",name:"冀州市",parent:"131100"},{value:"131182",name:"深州市",parent:"131100"},{value:"131183",name:"其它区",parent:"131100"},{value:"140105",name:"小店区",parent:"140100"},{value:"140106",name:"迎泽区",parent:"140100"},{value:"140107",name:"杏花岭区",parent:"140100"},{value:"140108",name:"尖草坪区",parent:"140100"},{value:"140109",name:"万柏林区",parent:"140100"},{value:"140110",name:"晋源区",parent:"140100"},{value:"140121",name:"清徐县",parent:"140100"},{value:"140122",name:"阳曲县",parent:"140100"},{value:"140123",name:"娄烦县",parent:"140100"},{value:"140181",name:"古交市",parent:"140100"},{value:"140182",name:"其它区",parent:"140100"},{value:"140202",name:"城区",parent:"140200"},{value:"140203",name:"矿区",parent:"140200"},{value:"140211",name:"南郊区",parent:"140200"},{value:"140212",name:"新荣区",parent:"140200"},{value:"140221",name:"阳高县",parent:"140200"},{value:"140222",name:"天镇县",parent:"140200"},{value:"140223",name:"广灵县",parent:"140200"},{value:"140224",name:"灵丘县",parent:"140200"},{value:"140225",name:"浑源县",parent:"140200"},{value:"140226",name:"左云县",parent:"140200"},{value:"140227",name:"大同县",parent:"140200"},{value:"140228",name:"其它区",parent:"140200"},{value:"140302",name:"城区",parent:"140300"},{value:"140303",name:"矿区",parent:"140300"},{value:"140311",name:"郊区",parent:"140300"},{value:"140321",name:"平定县",parent:"140300"},{value:"140322",name:"盂县",parent:"140300"},{value:"140323",name:"其它区",parent:"140300"},{value:"140421",name:"长治县",parent:"140400"},{value:"140423",name:"襄垣县",parent:"140400"},{value:"140424",name:"屯留县",parent:"140400"},{value:"140425",name:"平顺县",parent:"140400"},{value:"140426",name:"黎城县",parent:"140400"},{value:"140427",name:"壶关县",parent:"140400"},{value:"140428",name:"长子县",parent:"140400"},{value:"140429",name:"武乡县",parent:"140400"},{value:"140430",name:"沁县",parent:"140400"},{value:"140431",name:"沁源县",parent:"140400"},{value:"140481",name:"潞城市",parent:"140400"},{value:"140482",name:"城区",parent:"140400"},{value:"140483",name:"郊区",parent:"140400"},{value:"140484",name:"高新区",parent:"140400"},{value:"140485",name:"其它区",parent:"140400"},{value:"140502",name:"城区",parent:"140500"},{value:"140521",name:"沁水县",parent:"140500"},{value:"140522",name:"阳城县",parent:"140500"},{value:"140524",name:"陵川县",parent:"140500"},{value:"140525",name:"泽州县",parent:"140500"},{value:"140581",name:"高平市",parent:"140500"},{value:"140582",name:"其它区",parent:"140500"},{value:"140602",name:"朔城区",parent:"140600"},{value:"140603",name:"平鲁区",parent:"140600"},{value:"140621",name:"山阴县",parent:"140600"},{value:"140622",name:"应县",parent:"140600"},{value:"140623",name:"右玉县",parent:"140600"},{value:"140624",name:"怀仁县",parent:"140600"},{value:"140625",name:"其它区",parent:"140600"},{value:"140702",name:"榆次区",parent:"140700"},{value:"140721",name:"榆社县",parent:"140700"},{value:"140722",name:"左权县",parent:"140700"},{value:"140723",name:"和顺县",parent:"140700"},{value:"140724",name:"昔阳县",parent:"140700"},{value:"140725",name:"寿阳县",parent:"140700"},{value:"140726",name:"太谷县",parent:"140700"},{value:"140727",name:"祁县",parent:"140700"},{value:"140728",name:"平遥县",parent:"140700"},{value:"140729",name:"灵石县",parent:"140700"},{value:"140781",name:"介休市",parent:"140700"},{value:"140782",name:"其它区",parent:"140700"},{value:"140802",name:"盐湖区",parent:"140800"},{value:"140821",name:"临猗县",parent:"140800"},{value:"140822",name:"万荣县",parent:"140800"},{value:"140823",name:"闻喜县",parent:"140800"},{value:"140824",name:"稷山县",parent:"140800"},{value:"140825",name:"新绛县",parent:"140800"},{value:"140826",name:"绛县",parent:"140800"},{value:"140827",name:"垣曲县",parent:"140800"},{value:"140828",name:"夏县",parent:"140800"},{value:"140829",name:"平陆县",parent:"140800"},{value:"140830",name:"芮城县",parent:"140800"},{value:"140881",name:"永济市",parent:"140800"},{value:"140882",name:"河津市",parent:"140800"},{value:"140883",name:"其它区",parent:"140800"},{value:"140902",name:"忻府区",parent:"140900"},{value:"140921",name:"定襄县",parent:"140900"},{value:"140922",name:"五台县",parent:"140900"},{value:"140923",name:"代县",parent:"140900"},{value:"140924",name:"繁峙县",parent:"140900"},{value:"140925",name:"宁武县",parent:"140900"},{value:"140926",name:"静乐县",parent:"140900"},{value:"140927",name:"神池县",parent:"140900"},{value:"140928",name:"五寨县",parent:"140900"},{value:"140929",name:"岢岚县",parent:"140900"},{value:"140930",name:"河曲县",parent:"140900"},{value:"140931",name:"保德县",parent:"140900"},{value:"140932",name:"偏关县",parent:"140900"},{value:"140981",name:"原平市",parent:"140900"},{value:"140982",name:"其它区",parent:"140900"},{value:"141002",name:"尧都区",parent:"141000"},{value:"141021",name:"曲沃县",parent:"141000"},{value:"141022",name:"翼城县",parent:"141000"},{value:"141023",name:"襄汾县",parent:"141000"},{value:"141024",name:"洪洞县",parent:"141000"},{value:"141025",name:"古县",parent:"141000"},{value:"141026",name:"安泽县",parent:"141000"},{value:"141027",name:"浮山县",parent:"141000"},{value:"141028",name:"吉县",parent:"141000"},{value:"141029",name:"乡宁县",parent:"141000"},{value:"141030",name:"大宁县",parent:"141000"},{value:"141031",name:"隰县",parent:"141000"},{value:"141032",name:"永和县",parent:"141000"},{value:"141033",name:"蒲县",parent:"141000"},{value:"141034",name:"汾西县",parent:"141000"},{value:"141081",name:"侯马市",parent:"141000"},{value:"141082",name:"霍州市",parent:"141000"},{value:"141083",name:"其它区",parent:"141000"},{value:"141102",name:"离石区",parent:"141100"},{value:"141121",name:"文水县",parent:"141100"},{value:"141122",name:"交城县",parent:"141100"},{value:"141123",name:"兴县",parent:"141100"},{value:"141124",name:"临县",parent:"141100"},{value:"141125",name:"柳林县",parent:"141100"},{value:"141126",name:"石楼县",parent:"141100"},{value:"141127",name:"岚县",parent:"141100"},{value:"141128",name:"方山县",parent:"141100"},{value:"141129",name:"中阳县",parent:"141100"},{value:"141130",name:"交口县",parent:"141100"},{value:"141181",name:"孝义市",parent:"141100"},{value:"141182",name:"汾阳市",parent:"141100"},{value:"141183",name:"其它区",parent:"141100"},{value:"150102",name:"新城区",parent:"150100"},{value:"150103",name:"回民区",parent:"150100"},{value:"150104",name:"玉泉区",parent:"150100"},{value:"150105",name:"赛罕区",parent:"150100"},{value:"150121",name:"土默特左旗",parent:"150100"},{value:"150122",name:"托克托县",parent:"150100"},{value:"150123",name:"和林格尔县",parent:"150100"},{value:"150124",name:"清水河县",parent:"150100"},{value:"150125",name:"武川县",parent:"150100"},{value:"150126",name:"其它区",parent:"150100"},{value:"150202",name:"东河区",parent:"150200"},{value:"150203",name:"昆都仑区",parent:"150200"},{value:"150204",name:"青山区",parent:"150200"},{value:"150205",name:"石拐区",parent:"150200"},{value:"150206",name:"白云鄂博矿区",parent:"150200"},{value:"150207",name:"九原区",parent:"150200"},{value:"150221",name:"土默特右旗",parent:"150200"},{value:"150222",name:"固阳县",parent:"150200"},{value:"150223",name:"达尔罕茂明安联合旗",parent:"150200"},{value:"150224",name:"其它区",parent:"150200"},{value:"150302",name:"海勃湾区",parent:"150300"},{value:"150303",name:"海南区",parent:"150300"},{value:"150304",name:"乌达区",parent:"150300"},{value:"150305",name:"其它区",parent:"150300"},{value:"150402",name:"红山区",parent:"150400"},{value:"150403",name:"元宝山区",parent:"150400"},{value:"150404",name:"松山区",parent:"150400"},{value:"150421",name:"阿鲁科尔沁旗",parent:"150400"},{value:"150422",name:"巴林左旗",parent:"150400"},{value:"150423",name:"巴林右旗",parent:"150400"},{value:"150424",name:"林西县",parent:"150400"},{value:"150425",name:"克什克腾旗",parent:"150400"},{value:"150426",name:"翁牛特旗",parent:"150400"},{value:"150428",name:"喀喇沁旗",parent:"150400"},{value:"150429",name:"宁城县",parent:"150400"},{value:"150430",name:"敖汉旗",parent:"150400"},{value:"150431",name:"其它区",parent:"150400"},{value:"150502",name:"科尔沁区",parent:"150500"},{value:"150521",name:"科尔沁左翼中旗",parent:"150500"},{value:"150522",name:"科尔沁左翼后旗",parent:"150500"},{value:"150523",name:"开鲁县",parent:"150500"},{value:"150524",name:"库伦旗",parent:"150500"},{value:"150525",name:"奈曼旗",parent:"150500"},{value:"150526",name:"扎鲁特旗",parent:"150500"},{value:"150581",name:"霍林郭勒市",parent:"150500"},{value:"150582",name:"其它区",parent:"150500"},{value:"150602",name:"东胜区",parent:"150600"},{value:"150621",name:"达拉特旗",parent:"150600"},{value:"150622",name:"准格尔旗",parent:"150600"},{value:"150623",name:"鄂托克前旗",parent:"150600"},{value:"150624",name:"鄂托克旗",parent:"150600"},{value:"150625",name:"杭锦旗",parent:"150600"},{value:"150626",name:"乌审旗",parent:"150600"},{value:"150627",name:"伊金霍洛旗",parent:"150600"},{value:"150628",name:"其它区",parent:"150600"},{value:"150702",name:"海拉尔区",parent:"150700"},{value:"150703",name:"扎赉诺尔区",parent:"150700"},{value:"150721",name:"阿荣旗",parent:"150700"},{value:"150722",name:"莫力达瓦达斡尔族自治旗",parent:"150700"},{value:"150723",name:"鄂伦春自治旗",parent:"150700"},{value:"150724",name:"鄂温克族自治旗",parent:"150700"},{value:"150725",name:"陈巴尔虎旗",parent:"150700"},{value:"150726",name:"新巴尔虎左旗",parent:"150700"},{value:"150727",name:"新巴尔虎右旗",parent:"150700"},{value:"150781",name:"满洲里市",parent:"150700"},{value:"150782",name:"牙克石市",parent:"150700"},{value:"150783",name:"扎兰屯市",parent:"150700"},{value:"150784",name:"额尔古纳市",parent:"150700"},{value:"150785",name:"根河市",parent:"150700"},{value:"150786",name:"其它区",parent:"150700"},{value:"150802",name:"临河区",parent:"150800"},{value:"150821",name:"五原县",parent:"150800"},{value:"150822",name:"磴口县",parent:"150800"},{value:"150823",name:"乌拉特前旗",parent:"150800"},{value:"150824",name:"乌拉特中旗",parent:"150800"},{value:"150825",name:"乌拉特后旗",parent:"150800"},{value:"150826",name:"杭锦后旗",parent:"150800"},{value:"150827",name:"其它区",parent:"150800"},{value:"150902",name:"集宁区",parent:"150900"},{value:"150921",name:"卓资县",parent:"150900"},{value:"150922",name:"化德县",parent:"150900"},{value:"150923",name:"商都县",parent:"150900"},{value:"150924",name:"兴和县",parent:"150900"},{value:"150925",name:"凉城县",parent:"150900"},{value:"150926",name:"察哈尔右翼前旗",parent:"150900"},{value:"150927",name:"察哈尔右翼中旗",parent:"150900"},{value:"150928",name:"察哈尔右翼后旗",parent:"150900"},{value:"150929",name:"四子王旗",parent:"150900"},{value:"150981",name:"丰镇市",parent:"150900"},{value:"150982",name:"其它区",parent:"150900"},{value:"152201",name:"乌兰浩特市",parent:"152200"},{value:"152202",name:"阿尔山市",parent:"152200"},{value:"152221",name:"科尔沁右翼前旗",parent:"152200"},{value:"152222",name:"科尔沁右翼中旗",parent:"152200"},{value:"152223",name:"扎赉特旗",parent:"152200"},{value:"152224",name:"突泉县",parent:"152200"},{value:"152225",name:"其它区",parent:"152200"},{value:"152501",name:"二连浩特市",parent:"152500"},{value:"152502",name:"锡林浩特市",parent:"152500"},{value:"152522",name:"阿巴嘎旗",parent:"152500"},{value:"152523",name:"苏尼特左旗",parent:"152500"},{value:"152524",name:"苏尼特右旗",parent:"152500"},{value:"152525",name:"东乌珠穆沁旗",parent:"152500"},{value:"152526",name:"西乌珠穆沁旗",parent:"152500"},{value:"152527",name:"太仆寺旗",parent:"152500"},{value:"152528",name:"镶黄旗",parent:"152500"},{value:"152529",name:"正镶白旗",parent:"152500"},{value:"152530",name:"正蓝旗",parent:"152500"},{value:"152531",name:"多伦县",parent:"152500"},{value:"152532",name:"其它区",parent:"152500"},{value:"152921",name:"阿拉善左旗",parent:"152900"},{value:"152922",name:"阿拉善右旗",parent:"152900"},{value:"152923",name:"额济纳旗",parent:"152900"},{value:"152924",name:"其它区",parent:"152900"},{value:"210102",name:"和平区",parent:"210100"},{value:"210103",name:"沈河区",parent:"210100"},{value:"210104",name:"大东区",parent:"210100"},{value:"210105",name:"皇姑区",parent:"210100"},{value:"210106",name:"铁西区",parent:"210100"},{value:"210111",name:"苏家屯区",parent:"210100"},{value:"210112",name:"浑南区",parent:"210100"},{value:"210113",name:"新城子区",parent:"210100"},{value:"210114",name:"于洪区",parent:"210100"},{value:"210122",name:"辽中县",parent:"210100"},{value:"210123",name:"康平县",parent:"210100"},{value:"210124",name:"法库县",parent:"210100"},{value:"210181",name:"新民市",parent:"210100"},{value:"210182",name:"浑南新区",parent:"210100"},{value:"210183",name:"张士开发区",parent:"210100"},{value:"210184",name:"沈北新区",parent:"210100"},{value:"210185",name:"其它区",parent:"210100"},{value:"210202",name:"中山区",parent:"210200"},{value:"210203",name:"西岗区",parent:"210200"},{value:"210204",name:"沙河口区",parent:"210200"},{value:"210211",name:"甘井子区",parent:"210200"},{value:"210212",name:"旅顺口区",parent:"210200"},{value:"210213",name:"金州区",parent:"210200"},{value:"210224",name:"长海县",parent:"210200"},{value:"210251",name:"开发区",parent:"210200"},{value:"210281",name:"瓦房店市",parent:"210200"},{value:"210282",name:"普兰店市",parent:"210200"},{value:"210283",name:"庄河市",parent:"210200"},{value:"210297",name:"岭前区",parent:"210200"},{value:"210298",name:"其它区",parent:"210200"},{value:"210302",name:"铁东区",parent:"210300"},{value:"210303",name:"铁西区",parent:"210300"},{value:"210304",name:"立山区",parent:"210300"},{value:"210311",name:"千山区",parent:"210300"},{value:"210321",name:"台安县",parent:"210300"},{value:"210323",name:"岫岩满族自治县",parent:"210300"},{value:"210351",name:"高新区",parent:"210300"},{value:"210381",name:"海城市",parent:"210300"},{value:"210382",name:"其它区",parent:"210300"},{value:"210402",name:"新抚区",parent:"210400"},{value:"210403",name:"东洲区",parent:"210400"},{value:"210404",name:"望花区",parent:"210400"},{value:"210411",name:"顺城区",parent:"210400"},{value:"210421",name:"抚顺县",parent:"210400"},{value:"210422",name:"新宾满族自治县",parent:"210400"},{value:"210423",name:"清原满族自治县",parent:"210400"},{value:"210424",name:"其它区",parent:"210400"},{value:"210502",name:"平山区",parent:"210500"},{value:"210503",name:"溪湖区",parent:"210500"},{value:"210504",name:"明山区",parent:"210500"},{value:"210505",name:"南芬区",parent:"210500"},{value:"210521",name:"本溪满族自治县",parent:"210500"},{value:"210522",name:"桓仁满族自治县",parent:"210500"},{value:"210523",name:"其它区",parent:"210500"},{value:"210602",name:"元宝区",parent:"210600"},{value:"210603",name:"振兴区",parent:"210600"},{value:"210604",name:"振安区",parent:"210600"},{value:"210624",name:"宽甸满族自治县",parent:"210600"},{value:"210681",name:"东港市",parent:"210600"},{value:"210682",name:"凤城市",parent:"210600"},{value:"210683",name:"其它区",parent:"210600"},{value:"210702",name:"古塔区",parent:"210700"},{value:"210703",name:"凌河区",parent:"210700"},{value:"210711",name:"太和区",parent:"210700"},{value:"210726",name:"黑山县",parent:"210700"},{value:"210727",name:"义县",parent:"210700"},{value:"210781",name:"凌海市",parent:"210700"},{value:"210782",name:"北镇市",parent:"210700"},{value:"210783",name:"其它区",parent:"210700"},{value:"210802",name:"站前区",parent:"210800"},{value:"210803",name:"西市区",parent:"210800"},{value:"210804",name:"鲅鱼圈区",parent:"210800"},{value:"210811",name:"老边区",parent:"210800"},{value:"210881",name:"盖州市",parent:"210800"},{value:"210882",name:"大石桥市",parent:"210800"},{value:"210883",name:"其它区",parent:"210800"},{value:"210902",name:"海州区",parent:"210900"},{value:"210903",name:"新邱区",parent:"210900"},{value:"210904",name:"太平区",parent:"210900"},{value:"210905",name:"清河门区",parent:"210900"},{value:"210911",name:"细河区",parent:"210900"},{value:"210921",name:"阜新蒙古族自治县",parent:"210900"},{value:"210922",name:"彰武县",parent:"210900"},{value:"210923",name:"其它区",parent:"210900"},{value:"211002",name:"白塔区",parent:"211000"},{value:"211003",name:"文圣区",parent:"211000"},{value:"211004",name:"宏伟区",parent:"211000"},{value:"211005",name:"弓长岭区",parent:"211000"},{value:"211011",name:"太子河区",parent:"211000"},{value:"211021",name:"辽阳县",parent:"211000"},{value:"211081",name:"灯塔市",parent:"211000"},{value:"211082",name:"其它区",parent:"211000"},{value:"211102",name:"双台子区",parent:"211100"},{value:"211103",name:"兴隆台区",parent:"211100"},{value:"211121",name:"大洼县",parent:"211100"},{value:"211122",name:"盘山县",parent:"211100"},{value:"211123",name:"其它区",parent:"211100"},{value:"211202",name:"银州区",parent:"211200"},{value:"211204",name:"清河区",parent:"211200"},{value:"211221",name:"铁岭县",parent:"211200"},{value:"211223",name:"西丰县",parent:"211200"},{value:"211224",name:"昌图县",parent:"211200"},{value:"211281",name:"调兵山市",parent:"211200"},{value:"211282",name:"开原市",parent:"211200"},{value:"211283",name:"其它区",parent:"211200"},{value:"211302",name:"双塔区",parent:"211300"},{value:"211303",name:"龙城区",parent:"211300"},{value:"211321",name:"朝阳县",parent:"211300"},{value:"211322",name:"建平县",parent:"211300"},{value:"211324",name:"喀喇沁左翼蒙古族自治县",parent:"211300"},{value:"211381",name:"北票市",parent:"211300"},{value:"211382",name:"凌源市",parent:"211300"},{value:"211383",name:"其它区",parent:"211300"},{value:"211402",name:"连山区",parent:"211400"},{value:"211403",name:"龙港区",parent:"211400"},{value:"211404",name:"南票区",parent:"211400"},{value:"211421",name:"绥中县",parent:"211400"},{value:"211422",name:"建昌县",parent:"211400"},{value:"211481",name:"兴城市",parent:"211400"},{value:"211482",name:"其它区",parent:"211400"},{value:"220102",name:"南关区",parent:"220100"},{value:"220103",name:"宽城区",parent:"220100"},{value:"220104",name:"朝阳区",parent:"220100"},{value:"220105",name:"二道区",parent:"220100"},{value:"220106",name:"绿园区",parent:"220100"},{value:"220112",name:"双阳区",parent:"220100"},{value:"220122",name:"农安县",parent:"220100"},{value:"220181",name:"九台区",parent:"220100"},{value:"220182",name:"榆树市",parent:"220100"},{value:"220183",name:"德惠市",parent:"220100"},{value:"220184",name:"高新技术产业开发区",parent:"220100"},{value:"220185",name:"汽车产业开发区",parent:"220100"},{value:"220186",name:"经济技术开发区",parent:"220100"},{value:"220187",name:"净月旅游开发区",parent:"220100"},{value:"220188",name:"其它区",parent:"220100"},{value:"220202",name:"昌邑区",parent:"220200"},{value:"220203",name:"龙潭区",parent:"220200"},{value:"220204",name:"船营区",parent:"220200"},{value:"220211",name:"丰满区",parent:"220200"},{value:"220221",name:"永吉县",parent:"220200"},{value:"220281",name:"蛟河市",parent:"220200"},{value:"220282",name:"桦甸市",parent:"220200"},{value:"220283",name:"舒兰市",parent:"220200"},{value:"220284",name:"磐石市",parent:"220200"},{value:"220285",name:"其它区",parent:"220200"},{value:"220302",name:"铁西区",parent:"220300"},{value:"220303",name:"铁东区",parent:"220300"},{value:"220322",name:"梨树县",parent:"220300"},{value:"220323",name:"伊通满族自治县",parent:"220300"},{value:"220381",name:"公主岭市",parent:"220300"},{value:"220382",name:"双辽市",parent:"220300"},{value:"220383",name:"其它区",parent:"220300"},{value:"220402",name:"龙山区",parent:"220400"},{value:"220403",name:"西安区",parent:"220400"},{value:"220421",name:"东丰县",parent:"220400"},{value:"220422",name:"东辽县",parent:"220400"},{value:"220423",name:"其它区",parent:"220400"},{value:"220502",name:"东昌区",parent:"220500"},{value:"220503",name:"二道江区",parent:"220500"},{value:"220521",name:"通化县",parent:"220500"},{value:"220523",name:"辉南县",parent:"220500"},{value:"220524",name:"柳河县",parent:"220500"},{value:"220581",name:"梅河口市",parent:"220500"},{value:"220582",name:"集安市",parent:"220500"},{value:"220583",name:"其它区",parent:"220500"},{value:"220602",name:"浑江区",parent:"220600"},{value:"220621",name:"抚松县",parent:"220600"},{value:"220622",name:"靖宇县",parent:"220600"},{value:"220623",name:"长白朝鲜族自治县",parent:"220600"},{value:"220625",name:"江源区",parent:"220600"},{value:"220681",name:"临江市",parent:"220600"},{value:"220682",name:"其它区",parent:"220600"},{value:"220702",name:"宁江区",parent:"220700"},{value:"220721",name:"前郭尔罗斯蒙古族自治县",parent:"220700"},{value:"220722",name:"长岭县",parent:"220700"},{value:"220723",name:"乾安县",parent:"220700"},{value:"220724",name:"扶余市",parent:"220700"},{value:"220725",name:"其它区",parent:"220700"},{value:"220802",name:"洮北区",parent:"220800"},{value:"220821",name:"镇赉县",parent:"220800"},{value:"220822",name:"通榆县",parent:"220800"},{value:"220881",name:"洮南市",parent:"220800"},{value:"220882",name:"大安市",parent:"220800"},{value:"220883",name:"其它区",parent:"220800"},{value:"222401",name:"延吉市",parent:"222400"},{value:"222402",name:"图们市",parent:"222400"},{value:"222403",name:"敦化市",parent:"222400"},{value:"222404",name:"珲春市",parent:"222400"},{value:"222405",name:"龙井市",parent:"222400"},{value:"222406",name:"和龙市",parent:"222400"},{value:"222424",name:"汪清县",parent:"222400"},{value:"222426",name:"安图县",parent:"222400"},{value:"222427",name:"其它区",parent:"222400"},{value:"230102",name:"道里区",parent:"230100"},{value:"230103",name:"南岗区",parent:"230100"},{value:"230104",name:"道外区",parent:"230100"},{value:"230106",name:"香坊区",parent:"230100"},{value:"230107",name:"动力区",parent:"230100"},{value:"230108",name:"平房区",parent:"230100"},{value:"230109",name:"松北区",parent:"230100"},{value:"230111",name:"呼兰区",parent:"230100"},{value:"230123",name:"依兰县",parent:"230100"},{value:"230124",name:"方正县",parent:"230100"},{value:"230125",name:"宾县",parent:"230100"},{value:"230126",name:"巴彦县",parent:"230100"},{value:"230127",name:"木兰县",parent:"230100"},{value:"230128",name:"通河县",parent:"230100"},{value:"230129",name:"延寿县",parent:"230100"},{value:"230181",name:"阿城区",parent:"230100"},{value:"230182",name:"双城区",parent:"230100"},{value:"230183",name:"尚志市",parent:"230100"},{value:"230184",name:"五常市",parent:"230100"},{value:"230185",name:"阿城市",parent:"230100"},{value:"230186",name:"其它区",parent:"230100"},{value:"230202",name:"龙沙区",parent:"230200"},{value:"230203",name:"建华区",parent:"230200"},{value:"230204",name:"铁锋区",parent:"230200"},{value:"230205",name:"昂昂溪区",parent:"230200"},{value:"230206",name:"富拉尔基区",parent:"230200"},{value:"230207",name:"碾子山区",parent:"230200"},{value:"230208",name:"梅里斯达斡尔族区",parent:"230200"},{value:"230221",name:"龙江县",parent:"230200"},{value:"230223",name:"依安县",parent:"230200"},{value:"230224",name:"泰来县",parent:"230200"},{value:"230225",name:"甘南县",parent:"230200"},{value:"230227",name:"富裕县",parent:"230200"},{value:"230229",name:"克山县",parent:"230200"},{value:"230230",name:"克东县",parent:"230200"},{value:"230231",name:"拜泉县",parent:"230200"},{value:"230281",name:"讷河市",parent:"230200"},{value:"230282",name:"其它区",parent:"230200"},{value:"230302",name:"鸡冠区",parent:"230300"},{value:"230303",name:"恒山区",parent:"230300"},{value:"230304",name:"滴道区",parent:"230300"},{value:"230305",name:"梨树区",parent:"230300"},{value:"230306",name:"城子河区",parent:"230300"},{value:"230307",name:"麻山区",parent:"230300"},{value:"230321",name:"鸡东县",parent:"230300"},{value:"230381",name:"虎林市",parent:"230300"},{value:"230382",name:"密山市",parent:"230300"},{value:"230383",name:"其它区",parent:"230300"},{value:"230402",name:"向阳区",parent:"230400"},{value:"230403",name:"工农区",parent:"230400"},{value:"230404",name:"南山区",parent:"230400"},{value:"230405",name:"兴安区",parent:"230400"},{value:"230406",name:"东山区",parent:"230400"},{value:"230407",name:"兴山区",parent:"230400"},{value:"230421",name:"萝北县",parent:"230400"},{value:"230422",name:"绥滨县",parent:"230400"},{value:"230423",name:"其它区",parent:"230400"},{value:"230502",name:"尖山区",parent:"230500"},{value:"230503",name:"岭东区",parent:"230500"},{value:"230505",name:"四方台区",parent:"230500"},{value:"230506",name:"宝山区",parent:"230500"},{value:"230521",name:"集贤县",parent:"230500"},{value:"230522",name:"友谊县",parent:"230500"},{value:"230523",name:"宝清县",parent:"230500"},{value:"230524",name:"饶河县",parent:"230500"},{value:"230525",name:"其它区",parent:"230500"},{value:"230602",name:"萨尔图区",parent:"230600"},{value:"230603",name:"龙凤区",parent:"230600"},{value:"230604",name:"让胡路区",parent:"230600"},{value:"230605",name:"红岗区",parent:"230600"},{value:"230606",name:"大同区",parent:"230600"},{value:"230621",name:"肇州县",parent:"230600"},{value:"230622",name:"肇源县",parent:"230600"},{value:"230623",name:"林甸县",parent:"230600"},{value:"230624",name:"杜尔伯特蒙古族自治县",parent:"230600"},{value:"230625",name:"其它区",parent:"230600"},{value:"230702",name:"伊春区",parent:"230700"},{value:"230703",name:"南岔区",parent:"230700"},{value:"230704",name:"友好区",parent:"230700"},{value:"230705",name:"西林区",parent:"230700"},{value:"230706",name:"翠峦区",parent:"230700"},{value:"230707",name:"新青区",parent:"230700"},{value:"230708",name:"美溪区",parent:"230700"},{value:"230709",name:"金山屯区",parent:"230700"},{value:"230710",name:"五营区",parent:"230700"},{value:"230711",name:"乌马河区",parent:"230700"},{value:"230712",name:"汤旺河区",parent:"230700"},{value:"230713",name:"带岭区",parent:"230700"},{value:"230714",name:"乌伊岭区",parent:"230700"},{value:"230715",name:"红星区",parent:"230700"},{value:"230716",name:"上甘岭区",parent:"230700"},{value:"230722",name:"嘉荫县",parent:"230700"},{value:"230781",name:"铁力市",parent:"230700"},{value:"230782",name:"其它区",parent:"230700"},{value:"230802",name:"永红区",parent:"230800"},{value:"230803",name:"向阳区",parent:"230800"},{value:"230804",name:"前进区",parent:"230800"},{value:"230805",name:"东风区",parent:"230800"},{value:"230811",name:"郊区",parent:"230800"},{value:"230822",name:"桦南县",parent:"230800"},{value:"230826",name:"桦川县",parent:"230800"},{value:"230828",name:"汤原县",parent:"230800"},{value:"230833",name:"抚远县",parent:"230800"},{value:"230881",name:"同江市",parent:"230800"},{value:"230882",name:"富锦市",parent:"230800"},{value:"230883",name:"其它区",parent:"230800"},{value:"230902",name:"新兴区",parent:"230900"},{value:"230903",name:"桃山区",parent:"230900"},{value:"230904",name:"茄子河区",parent:"230900"},{value:"230921",name:"勃利县",parent:"230900"},{value:"230922",name:"其它区",parent:"230900"},{value:"231002",name:"东安区",parent:"231000"},{value:"231003",name:"阳明区",parent:"231000"},{value:"231004",name:"爱民区",parent:"231000"},{value:"231005",name:"西安区",parent:"231000"},{value:"231024",name:"东宁县",parent:"231000"},{value:"231025",name:"林口县",parent:"231000"},{value:"231081",name:"绥芬河市",parent:"231000"},{value:"231083",name:"海林市",parent:"231000"},{value:"231084",name:"宁安市",parent:"231000"},{value:"231085",name:"穆棱市",parent:"231000"},{value:"231086",name:"其它区",parent:"231000"},{value:"231102",name:"爱辉区",parent:"231100"},{value:"231121",name:"嫩江县",parent:"231100"},{value:"231123",name:"逊克县",parent:"231100"},{value:"231124",name:"孙吴县",parent:"231100"},{value:"231181",name:"北安市",parent:"231100"},{value:"231182",name:"五大连池市",parent:"231100"},{value:"231183",name:"其它区",parent:"231100"},{value:"231202",name:"北林区",parent:"231200"},{value:"231221",name:"望奎县",parent:"231200"},{value:"231222",name:"兰西县",parent:"231200"},{value:"231223",name:"青冈县",parent:"231200"},{value:"231224",name:"庆安县",parent:"231200"},{value:"231225",name:"明水县",parent:"231200"},{value:"231226",name:"绥棱县",parent:"231200"},{value:"231281",name:"安达市",parent:"231200"},{value:"231282",name:"肇东市",parent:"231200"},{value:"231283",name:"海伦市",parent:"231200"},{value:"231284",name:"其它区",parent:"231200"},{value:"232702",name:"松岭区",parent:"232700"},{value:"232703",name:"新林区",parent:"232700"},{value:"232704",name:"呼中区",parent:"232700"},{value:"232721",name:"呼玛县",parent:"232700"},{value:"232722",name:"塔河县",parent:"232700"},{value:"232723",name:"漠河县",parent:"232700"},{value:"232724",name:"加格达奇区",parent:"232700"},{value:"232725",name:"其它区",parent:"232700"},{value:"310101",name:"黄浦区",parent:"310100"},{value:"310103",name:"卢湾区",parent:"310100"},{value:"310104",name:"徐汇区",parent:"310100"},{value:"310105",name:"长宁区",parent:"310100"},{value:"310106",name:"静安区",parent:"310100"},{value:"310107",name:"普陀区",parent:"310100"},{value:"310108",name:"闸北区",parent:"310100"},{value:"310109",name:"虹口区",parent:"310100"},{value:"310110",name:"杨浦区",parent:"310100"},{value:"310112",name:"闵行区",parent:"310100"},{value:"310113",name:"宝山区",parent:"310100"},{value:"310114",name:"嘉定区",parent:"310100"},{value:"310115",name:"浦东新区",parent:"310100"},{value:"310116",name:"金山区",parent:"310100"},{value:"310117",name:"松江区",parent:"310100"},{value:"310118",name:"青浦区",parent:"310100"},{value:"310119",name:"南汇区",parent:"310100"},{value:"310120",name:"奉贤区",parent:"310100"},{value:"310152",name:"川沙区",parent:"310100"},{value:"310230",name:"崇明县",parent:"310100"},{value:"310231",name:"其它区",parent:"310100"},{value:"320102",name:"玄武区",parent:"320100"},{value:"320103",name:"白下区",parent:"320100"},{value:"320104",name:"秦淮区",parent:"320100"},{value:"320105",name:"建邺区",parent:"320100"},{value:"320106",name:"鼓楼区",parent:"320100"},{value:"320107",name:"下关区",parent:"320100"},{value:"320111",name:"浦口区",parent:"320100"},{value:"320113",name:"栖霞区",parent:"320100"},{value:"320114",name:"雨花台区",parent:"320100"},{value:"320115",name:"江宁区",parent:"320100"},{value:"320116",name:"六合区",parent:"320100"},{value:"320124",name:"溧水区",parent:"320100"},{value:"320125",name:"高淳区",parent:"320100"},{value:"320126",name:"其它区",parent:"320100"},{value:"320202",name:"崇安区",parent:"320200"},{value:"320203",name:"南长区",parent:"320200"},{value:"320204",name:"北塘区",parent:"320200"},{value:"320205",name:"锡山区",parent:"320200"},{value:"320206",name:"惠山区",parent:"320200"},{value:"320211",name:"滨湖区",parent:"320200"},{value:"320213",name:"梁溪区",parent:"320200"},{value:"320214",name:"新吴区",parent:"320200"},{value:"320281",name:"江阴市",parent:"320200"},{value:"320282",name:"宜兴市",parent:"320200"},{value:"320296",name:"新区",parent:"320200"},{value:"320297",name:"其它区",parent:"320200"},{value:"320302",name:"鼓楼区",parent:"320300"},{value:"320303",name:"云龙区",parent:"320300"},{value:"320304",name:"九里区",parent:"320300"},{value:"320305",name:"贾汪区",parent:"320300"},{value:"320311",name:"泉山区",parent:"320300"},{value:"320321",name:"丰县",parent:"320300"},{value:"320322",name:"沛县",parent:"320300"},{value:"320323",name:"铜山区",parent:"320300"},{value:"320324",name:"睢宁县",parent:"320300"},{value:"320381",name:"新沂市",parent:"320300"},{value:"320382",name:"邳州市",parent:"320300"},{value:"320383",name:"其它区",parent:"320300"},{value:"320402",name:"天宁区",parent:"320400"},{value:"320404",name:"钟楼区",parent:"320400"},{value:"320405",name:"戚墅堰区",parent:"320400"},{value:"320411",name:"新北区",parent:"320400"},{value:"320412",name:"武进区",parent:"320400"},{value:"320481",name:"溧阳市",parent:"320400"},{value:"320482",name:"金坛市",parent:"320400"},{value:"320483",name:"其它区",parent:"320400"},{value:"320502",name:"沧浪区",parent:"320500"},{value:"320503",name:"平江区",parent:"320500"},{value:"320504",name:"金阊区",parent:"320500"},{value:"320505",name:"虎丘区",parent:"320500"},{value:"320506",name:"吴中区",parent:"320500"},{value:"320507",name:"相城区",parent:"320500"},{value:"320508",name:"姑苏区",parent:"320500"},{value:"320581",name:"常熟市",parent:"320500"},{value:"320582",name:"张家港市",parent:"320500"},{value:"320583",name:"昆山市",parent:"320500"},{value:"320584",name:"吴江区",parent:"320500"},{value:"320585",name:"太仓市",parent:"320500"},{value:"320594",name:"新区",parent:"320500"},{value:"320595",name:"园区",parent:"320500"},{value:"320596",name:"其它区",parent:"320500"},{value:"320602",name:"崇川区",parent:"320600"},{value:"320611",name:"港闸区",parent:"320600"},{value:"320612",name:"通州区",parent:"320600"},{value:"320621",name:"海安县",parent:"320600"},{value:"320623",name:"如东县",parent:"320600"},{value:"320681",name:"启东市",parent:"320600"},{value:"320682",name:"如皋市",parent:"320600"},{value:"320683",name:"通州市",parent:"320600"},{value:"320684",name:"海门市",parent:"320600"},{value:"320693",name:"开发区",parent:"320600"},{value:"320694",name:"其它区",parent:"320600"},{value:"320703",name:"连云区",parent:"320700"},{value:"320705",name:"新浦区",parent:"320700"},{value:"320706",name:"海州区",parent:"320700"},{value:"320721",name:"赣榆区",parent:"320700"},{value:"320722",name:"东海县",parent:"320700"},{value:"320723",name:"灌云县",parent:"320700"},{value:"320724",name:"灌南县",parent:"320700"},{value:"320725",name:"其它区",parent:"320700"},{value:"320802",name:"清河区",parent:"320800"},{value:"320803",name:"淮安区",parent:"320800"},{value:"320804",name:"淮阴区",parent:"320800"},{value:"320811",name:"清浦区",parent:"320800"},{value:"320826",name:"涟水县",parent:"320800"},{value:"320829",name:"洪泽县",parent:"320800"},{value:"320830",name:"盱眙县",parent:"320800"},{value:"320831",name:"金湖县",parent:"320800"},{value:"320832",name:"其它区",parent:"320800"},{value:"320902",name:"亭湖区",parent:"320900"},{value:"320903",name:"盐都区",parent:"320900"},{value:"320921",name:"响水县",parent:"320900"},{value:"320922",name:"滨海县",parent:"320900"},{value:"320923",name:"阜宁县",parent:"320900"},{value:"320924",name:"射阳县",parent:"320900"},{value:"320925",name:"建湖县",parent:"320900"},{value:"320981",name:"东台市",parent:"320900"},{value:"320982",name:"大丰市",parent:"320900"},{value:"320983",name:"其它区",parent:"320900"},{value:"321002",name:"广陵区",parent:"321000"},{value:"321003",name:"邗江区",parent:"321000"},{value:"321011",name:"维扬区",parent:"321000"},{value:"321023",name:"宝应县",parent:"321000"},{value:"321081",name:"仪征市",parent:"321000"},{value:"321084",name:"高邮市",parent:"321000"},{value:"321088",name:"江都区",parent:"321000"},{value:"321092",name:"经济开发区",parent:"321000"},{value:"321093",name:"其它区",parent:"321000"},{value:"321102",name:"京口区",parent:"321100"},{value:"321111",name:"润州区",parent:"321100"},{value:"321112",name:"丹徒区",parent:"321100"},{value:"321181",name:"丹阳市",parent:"321100"},{value:"321182",name:"扬中市",parent:"321100"},{value:"321183",name:"句容市",parent:"321100"},{value:"321184",name:"其它区",parent:"321100"},{value:"321202",name:"海陵区",parent:"321200"},{value:"321203",name:"高港区",parent:"321200"},{value:"321281",name:"兴化市",parent:"321200"},{value:"321282",name:"靖江市",parent:"321200"},{value:"321283",name:"泰兴市",parent:"321200"},{value:"321284",name:"姜堰区",parent:"321200"},{value:"321285",name:"其它区",parent:"321200"},{value:"321302",name:"宿城区",parent:"321300"},{value:"321311",name:"宿豫区",parent:"321300"},{value:"321322",name:"沭阳县",parent:"321300"},{value:"321323",name:"泗阳县",parent:"321300"},{value:"321324",name:"泗洪县",parent:"321300"},{value:"321325",name:"其它区",parent:"321300"},{value:"330102",name:"上城区",parent:"330100"},{value:"330103",name:"下城区",parent:"330100"},{value:"330104",name:"江干区",parent:"330100"},{value:"330105",name:"拱墅区",parent:"330100"},{value:"330106",name:"西湖区",parent:"330100"},{value:"330108",name:"滨江区",parent:"330100"},{value:"330109",name:"萧山区",parent:"330100"},{value:"330110",name:"余杭区",parent:"330100"},{value:"330122",name:"桐庐县",parent:"330100"},{value:"330127",name:"淳安县",parent:"330100"},{value:"330182",name:"建德市",parent:"330100"},{value:"330183",name:"富阳区",parent:"330100"},{value:"330185",name:"临安市",parent:"330100"},{value:"330186",name:"其它区",parent:"330100"},{value:"330203",name:"海曙区",parent:"330200"},{value:"330204",name:"江东区",parent:"330200"},{value:"330205",name:"江北区",parent:"330200"},{value:"330206",name:"北仑区",parent:"330200"},{value:"330211",name:"镇海区",parent:"330200"},{value:"330212",name:"鄞州区",parent:"330200"},{value:"330225",name:"象山县",parent:"330200"},{value:"330226",name:"宁海县",parent:"330200"},{value:"330281",name:"余姚市",parent:"330200"},{value:"330282",name:"慈溪市",parent:"330200"},{value:"330283",name:"奉化市",parent:"330200"},{value:"330284",name:"其它区",parent:"330200"},{value:"330302",name:"鹿城区",parent:"330300"},{value:"330303",name:"龙湾区",parent:"330300"},{value:"330304",name:"瓯海区",parent:"330300"},{value:"330322",name:"洞头县",parent:"330300"},{value:"330324",name:"永嘉县",parent:"330300"},{value:"330326",name:"平阳县",parent:"330300"},{value:"330327",name:"苍南县",parent:"330300"},{value:"330328",name:"文成县",parent:"330300"},{value:"330329",name:"泰顺县",parent:"330300"},{value:"330381",name:"瑞安市",parent:"330300"},{value:"330382",name:"乐清市",parent:"330300"},{value:"330383",name:"其它区",parent:"330300"},{value:"330402",name:"南湖区",parent:"330400"},{value:"330411",name:"秀洲区",parent:"330400"},{value:"330421",name:"嘉善县",parent:"330400"},{value:"330424",name:"海盐县",parent:"330400"},{value:"330481",name:"海宁市",parent:"330400"},{value:"330482",name:"平湖市",parent:"330400"},{value:"330483",name:"桐乡市",parent:"330400"},{value:"330484",name:"其它区",parent:"330400"},{value:"330502",name:"吴兴区",parent:"330500"},{value:"330503",name:"南浔区",parent:"330500"},{value:"330521",name:"德清县",parent:"330500"},{value:"330522",name:"长兴县",parent:"330500"},{value:"330523",name:"安吉县",parent:"330500"},{value:"330524",name:"其它区",parent:"330500"},{value:"330602",name:"越城区",parent:"330600"},{value:"330621",name:"柯桥区",parent:"330600"},{value:"330624",name:"新昌县",parent:"330600"},{value:"330681",name:"诸暨市",parent:"330600"},{value:"330682",name:"上虞区",parent:"330600"},{value:"330683",name:"嵊州市",parent:"330600"},{value:"330684",name:"其它区",parent:"330600"},{value:"330702",name:"婺城区",parent:"330700"},{value:"330703",name:"金东区",parent:"330700"},{value:"330723",name:"武义县",parent:"330700"},{value:"330726",name:"浦江县",parent:"330700"},{value:"330727",name:"磐安县",parent:"330700"},{value:"330781",name:"兰溪市",parent:"330700"},{value:"330782",name:"义乌市",parent:"330700"},{value:"330783",name:"东阳市",parent:"330700"},{value:"330784",name:"永康市",parent:"330700"},{value:"330785",name:"其它区",parent:"330700"},{value:"330802",name:"柯城区",parent:"330800"},{value:"330803",name:"衢江区",parent:"330800"},{value:"330822",name:"常山县",parent:"330800"},{value:"330824",name:"开化县",parent:"330800"},{value:"330825",name:"龙游县",parent:"330800"},{value:"330881",name:"江山市",parent:"330800"},{value:"330882",name:"其它区",parent:"330800"},{value:"330902",name:"定海区",parent:"330900"},{value:"330903",name:"普陀区",parent:"330900"},{value:"330921",name:"岱山县",parent:"330900"},{value:"330922",name:"嵊泗县",parent:"330900"},{value:"330923",name:"其它区",parent:"330900"},{value:"331002",name:"椒江区",parent:"331000"},{value:"331003",name:"黄岩区",parent:"331000"},{value:"331004",name:"路桥区",parent:"331000"},{value:"331021",name:"玉环县",parent:"331000"},{value:"331022",name:"三门县",parent:"331000"},{value:"331023",name:"天台县",parent:"331000"},{value:"331024",name:"仙居县",parent:"331000"},{value:"331081",name:"温岭市",parent:"331000"},{value:"331082",name:"临海市",parent:"331000"},{value:"331083",name:"其它区",parent:"331000"},{value:"331102",name:"莲都区",parent:"331100"},{value:"331121",name:"青田县",parent:"331100"},{value:"331122",name:"缙云县",parent:"331100"},{value:"331123",name:"遂昌县",parent:"331100"},{value:"331124",name:"松阳县",parent:"331100"},{value:"331125",name:"云和县",parent:"331100"},{value:"331126",name:"庆元县",parent:"331100"},{value:"331127",name:"景宁畲族自治县",parent:"331100"},{value:"331181",name:"龙泉市",parent:"331100"},{value:"331182",name:"其它区",parent:"331100"},{value:"340102",name:"瑶海区",parent:"340100"},{value:"340103",name:"庐阳区",parent:"340100"},{value:"340104",name:"蜀山区",parent:"340100"},{value:"340111",name:"包河区",parent:"340100"},{value:"340121",name:"长丰县",parent:"340100"},{value:"340122",name:"肥东县",parent:"340100"},{value:"340123",name:"肥西县",parent:"340100"},{value:"340151",name:"高新区",parent:"340100"},{value:"340191",name:"中区",parent:"340100"},{value:"340192",name:"其它区",parent:"340100"},{value:"340202",name:"镜湖区",parent:"340200"},{value:"340203",name:"弋江区",parent:"340200"},{value:"340207",name:"鸠江区",parent:"340200"},{value:"340208",name:"三山区",parent:"340200"},{value:"340221",name:"芜湖县",parent:"340200"},{value:"340222",name:"繁昌县",parent:"340200"},{value:"340223",name:"南陵县",parent:"340200"},{value:"340224",name:"其它区",parent:"340200"},{value:"340302",name:"龙子湖区",parent:"340300"},{value:"340303",name:"蚌山区",parent:"340300"},{value:"340304",name:"禹会区",parent:"340300"},{value:"340311",name:"淮上区",parent:"340300"},{value:"340321",name:"怀远县",parent:"340300"},{value:"340322",name:"五河县",parent:"340300"},{value:"340323",name:"固镇县",parent:"340300"},{value:"340324",name:"其它区",parent:"340300"},{value:"340402",name:"大通区",parent:"340400"},{value:"340403",name:"田家庵区",parent:"340400"},{value:"340404",name:"谢家集区",parent:"340400"},{value:"340405",name:"八公山区",parent:"340400"},{value:"340406",name:"潘集区",parent:"340400"},{value:"340421",name:"凤台县",parent:"340400"},{value:"340422",name:"其它区",parent:"340400"},{value:"340499",name:"寿县",parent:"340400"},{value:"340502",name:"金家庄区",parent:"340500"},{value:"340503",name:"花山区",parent:"340500"},{value:"340504",name:"雨山区",parent:"340500"},{value:"340506",name:"博望区",parent:"340500"},{value:"340521",name:"当涂县",parent:"340500"},{value:"340522",name:"其它区",parent:"340500"},{value:"340602",name:"杜集区",parent:"340600"},{value:"340603",name:"相山区",parent:"340600"},{value:"340604",name:"烈山区",parent:"340600"},{value:"340621",name:"濉溪县",parent:"340600"},{value:"340622",name:"其它区",parent:"340600"},{value:"340702",name:"铜官山区",parent:"340700"},{value:"340703",name:"狮子山区",parent:"340700"},{value:"340705",name:"铜官区",parent:"340700"},{value:"340711",name:"郊区",parent:"340700"},{value:"340721",name:"铜陵县",parent:"340700"},{value:"340722",name:"其它区",parent:"340700"},{value:"340799",name:"枞阳县",parent:"340700"},{value:"340802",name:"迎江区",parent:"340800"},{value:"340803",name:"大观区",parent:"340800"},{value:"340811",name:"宜秀区",parent:"340800"},{value:"340822",name:"怀宁县",parent:"340800"},{value:"340823",name:"枞阳县",parent:"340800"},{value:"340824",name:"潜山县",parent:"340800"},{value:"340825",name:"太湖县",parent:"340800"},{value:"340826",name:"宿松县",parent:"340800"},{value:"340827",name:"望江县",parent:"340800"},{value:"340828",name:"岳西县",parent:"340800"},{value:"340881",name:"桐城市",parent:"340800"},{value:"340882",name:"其它区",parent:"340800"},{value:"341002",name:"屯溪区",parent:"341000"},{value:"341003",name:"黄山区",parent:"341000"},{value:"341004",name:"徽州区",parent:"341000"},{value:"341021",name:"歙县",parent:"341000"},{value:"341022",name:"休宁县",parent:"341000"},{value:"341023",name:"黟县",parent:"341000"},{value:"341024",name:"祁门县",parent:"341000"},{value:"341025",name:"其它区",parent:"341000"},{value:"341102",name:"琅琊区",parent:"341100"},{value:"341103",name:"南谯区",parent:"341100"},{value:"341122",name:"来安县",parent:"341100"},{value:"341124",name:"全椒县",parent:"341100"},{value:"341125",name:"定远县",parent:"341100"},{value:"341126",name:"凤阳县",parent:"341100"},{value:"341181",name:"天长市",parent:"341100"},{value:"341182",name:"明光市",parent:"341100"},{value:"341183",name:"其它区",parent:"341100"},{value:"341202",name:"颍州区",parent:"341200"},{value:"341203",name:"颍东区",parent:"341200"},{value:"341204",name:"颍泉区",parent:"341200"},{value:"341221",name:"临泉县",parent:"341200"},{value:"341222",name:"太和县",parent:"341200"},{value:"341225",name:"阜南县",parent:"341200"},{value:"341226",name:"颍上县",parent:"341200"},{value:"341282",name:"界首市",parent:"341200"},{value:"341283",name:"其它区",parent:"341200"},{value:"341302",name:"埇桥区",parent:"341300"},{value:"341321",name:"砀山县",parent:"341300"},{value:"341322",name:"萧县",parent:"341300"},{value:"341323",name:"灵璧县",parent:"341300"},{value:"341324",name:"泗县",parent:"341300"},{value:"341325",name:"其它区",parent:"341300"},{value:"341400",name:"巢湖市",parent:"340100"},{value:"341402",name:"居巢区",parent:"340100"},{value:"341421",name:"庐江县",parent:"340100"},{value:"341422",name:"无为县",parent:"340200"},{value:"341423",name:"含山县",parent:"340500"},{value:"341424",name:"和县",parent:"340500"},{value:"341502",name:"金安区",parent:"341500"},{value:"341503",name:"裕安区",parent:"341500"},{value:"341504",name:"叶集区",parent:"341500"},{value:"341521",name:"寿县",parent:"341500"},{value:"341522",name:"霍邱县",parent:"341500"},{value:"341523",name:"舒城县",parent:"341500"},{value:"341524",name:"金寨县",parent:"341500"},{value:"341525",name:"霍山县",parent:"341500"},{value:"341526",name:"其它区",parent:"341500"},{value:"341602",name:"谯城区",parent:"341600"},{value:"341621",name:"涡阳县",parent:"341600"},{value:"341622",name:"蒙城县",parent:"341600"},{value:"341623",name:"利辛县",parent:"341600"},{value:"341624",name:"其它区",parent:"341600"},{value:"341702",name:"贵池区",parent:"341700"},{value:"341721",name:"东至县",parent:"341700"},{value:"341722",name:"石台县",parent:"341700"},{value:"341723",name:"青阳县",parent:"341700"},{value:"341724",name:"其它区",parent:"341700"},{value:"341802",name:"宣州区",parent:"341800"},{value:"341821",name:"郎溪县",parent:"341800"},{value:"341822",name:"广德县",parent:"341800"},{value:"341823",name:"泾县",parent:"341800"},{value:"341824",name:"绩溪县",parent:"341800"},{value:"341825",name:"旌德县",parent:"341800"},{value:"341881",name:"宁国市",parent:"341800"},{value:"341882",name:"其它区",parent:"341800"},{value:"350102",name:"鼓楼区",parent:"350100"},{value:"350103",name:"台江区",parent:"350100"},{value:"350104",name:"仓山区",parent:"350100"},{value:"350105",name:"马尾区",parent:"350100"},{value:"350111",name:"晋安区",parent:"350100"},{value:"350121",name:"闽侯县",parent:"350100"},{value:"350122",name:"连江县",parent:"350100"},{value:"350123",name:"罗源县",parent:"350100"},{value:"350124",name:"闽清县",parent:"350100"},{value:"350125",name:"永泰县",parent:"350100"},{value:"350128",name:"平潭县",parent:"350100"},{value:"350181",name:"福清市",parent:"350100"},{value:"350182",name:"长乐市",parent:"350100"},{value:"350183",name:"其它区",parent:"350100"},{value:"350203",name:"思明区",parent:"350200"},{value:"350205",name:"海沧区",parent:"350200"},{value:"350206",name:"湖里区",parent:"350200"},{value:"350211",name:"集美区",parent:"350200"},{value:"350212",name:"同安区",parent:"350200"},{value:"350213",name:"翔安区",parent:"350200"},{value:"350214",name:"其它区",parent:"350200"},{value:"350302",name:"城厢区",parent:"350300"},{value:"350303",name:"涵江区",parent:"350300"},{value:"350304",name:"荔城区",parent:"350300"},{value:"350305",name:"秀屿区",parent:"350300"},{value:"350322",name:"仙游县",parent:"350300"},{value:"350323",name:"其它区",parent:"350300"},{value:"350402",name:"梅列区",parent:"350400"},{value:"350403",name:"三元区",parent:"350400"},{value:"350421",name:"明溪县",parent:"350400"},{value:"350423",name:"清流县",parent:"350400"},{value:"350424",name:"宁化县",parent:"350400"},{value:"350425",name:"大田县",parent:"350400"},{value:"350426",name:"尤溪县",parent:"350400"},{value:"350427",name:"沙县",parent:"350400"},{value:"350428",name:"将乐县",parent:"350400"},{value:"350429",name:"泰宁县",parent:"350400"},{value:"350430",name:"建宁县",parent:"350400"},{value:"350481",name:"永安市",parent:"350400"},{value:"350482",name:"其它区",parent:"350400"},{value:"350502",name:"鲤城区",parent:"350500"},{value:"350503",name:"丰泽区",parent:"350500"},{value:"350504",name:"洛江区",parent:"350500"},{value:"350505",name:"泉港区",parent:"350500"},{value:"350521",name:"惠安县",parent:"350500"},{value:"350524",name:"安溪县",parent:"350500"},{value:"350525",name:"永春县",parent:"350500"},{value:"350526",name:"德化县",parent:"350500"},{value:"350527",name:"金门县",parent:"350500"},{value:"350581",name:"石狮市",parent:"350500"},{value:"350582",name:"晋江市",parent:"350500"},{value:"350583",name:"南安市",parent:"350500"},{value:"350584",name:"其它区",parent:"350500"},{value:"350602",name:"芗城区",parent:"350600"},{value:"350603",name:"龙文区",parent:"350600"},{value:"350622",name:"云霄县",parent:"350600"},{value:"350623",name:"漳浦县",parent:"350600"},{value:"350624",name:"诏安县",parent:"350600"},{value:"350625",name:"长泰县",parent:"350600"},{value:"350626",name:"东山县",parent:"350600"},{value:"350627",name:"南靖县",parent:"350600"},{value:"350628",name:"平和县",parent:"350600"},{value:"350629",name:"华安县",parent:"350600"},{value:"350681",name:"龙海市",parent:"350600"},{value:"350682",name:"其它区",parent:"350600"},{value:"350702",name:"延平区",parent:"350700"},{value:"350721",name:"顺昌县",parent:"350700"},{value:"350722",name:"浦城县",parent:"350700"},{value:"350723",name:"光泽县",parent:"350700"},{value:"350724",name:"松溪县",parent:"350700"},{value:"350725",name:"政和县",parent:"350700"},{value:"350781",name:"邵武市",parent:"350700"},{value:"350782",name:"武夷山市",parent:"350700"},{value:"350783",name:"建瓯市",parent:"350700"},{value:"350784",name:"建阳区",parent:"350700"},{value:"350785",name:"其它区",parent:"350700"},{value:"350802",name:"新罗区",parent:"350800"},{value:"350821",name:"长汀县",parent:"350800"},{value:"350822",name:"永定区",parent:"350800"},{value:"350823",name:"上杭县",parent:"350800"},{value:"350824",name:"武平县",parent:"350800"},{value:"350825",name:"连城县",parent:"350800"},{value:"350881",name:"漳平市",parent:"350800"},{value:"350882",name:"其它区",parent:"350800"},{value:"350902",name:"蕉城区",parent:"350900"},{value:"350921",name:"霞浦县",parent:"350900"},{value:"350922",name:"古田县",parent:"350900"},{value:"350923",name:"屏南县",parent:"350900"},{value:"350924",name:"寿宁县",parent:"350900"},{value:"350925",name:"周宁县",parent:"350900"},{value:"350926",name:"柘荣县",parent:"350900"},{value:"350981",name:"福安市",parent:"350900"},{value:"350982",name:"福鼎市",parent:"350900"},{value:"350983",name:"其它区",parent:"350900"},{value:"360102",name:"东湖区",parent:"360100"},{value:"360103",name:"西湖区",parent:"360100"},{value:"360104",name:"青云谱区",parent:"360100"},{value:"360105",name:"湾里区",parent:"360100"},{value:"360111",name:"青山湖区",parent:"360100"},{value:"360121",name:"南昌县",parent:"360100"},{value:"360122",name:"新建县",parent:"360100"},{value:"360123",name:"安义县",parent:"360100"},{value:"360124",name:"进贤县",parent:"360100"},{value:"360125",name:"红谷滩新区",parent:"360100"},{value:"360126",name:"经济技术开发区",parent:"360100"},{value:"360127",name:"昌北区",parent:"360100"},{value:"360128",name:"其它区",parent:"360100"},{value:"360202",name:"昌江区",parent:"360200"},{value:"360203",name:"珠山区",parent:"360200"},{value:"360222",name:"浮梁县",parent:"360200"},{value:"360281",name:"乐平市",parent:"360200"},{value:"360282",name:"其它区",parent:"360200"},{value:"360302",name:"安源区",parent:"360300"},{value:"360313",name:"湘东区",parent:"360300"},{value:"360321",name:"莲花县",parent:"360300"},{value:"360322",name:"上栗县",parent:"360300"},{value:"360323",name:"芦溪县",parent:"360300"},{value:"360324",name:"其它区",parent:"360300"},{value:"360402",name:"庐山区",parent:"360400"},{value:"360403",name:"浔阳区",parent:"360400"},{value:"360421",name:"九江县",parent:"360400"},{value:"360423",name:"武宁县",parent:"360400"},{value:"360424",name:"修水县",parent:"360400"},{value:"360425",name:"永修县",parent:"360400"},{value:"360426",name:"德安县",parent:"360400"},{value:"360427",name:"星子县",parent:"360400"},{value:"360428",name:"都昌县",parent:"360400"},{value:"360429",name:"湖口县",parent:"360400"},{value:"360430",name:"彭泽县",parent:"360400"},{value:"360481",name:"瑞昌市",parent:"360400"},{value:"360482",name:"其它区",parent:"360400"},{value:"360483",name:"共青城市",parent:"360400"},{value:"360502",name:"渝水区",parent:"360500"},{value:"360521",name:"分宜县",parent:"360500"},{value:"360522",name:"其它区",parent:"360500"},{value:"360602",name:"月湖区",parent:"360600"},{value:"360622",name:"余江县",parent:"360600"},{value:"360681",name:"贵溪市",parent:"360600"},{value:"360682",name:"其它区",parent:"360600"},{value:"360702",name:"章贡区",parent:"360700"},{value:"360721",name:"赣县",parent:"360700"},{value:"360722",name:"信丰县",parent:"360700"},{value:"360723",name:"大余县",parent:"360700"},{value:"360724",name:"上犹县",parent:"360700"},{value:"360725",name:"崇义县",parent:"360700"},{value:"360726",name:"安远县",parent:"360700"},{value:"360727",name:"龙南县",parent:"360700"},{value:"360728",name:"定南县",parent:"360700"},{value:"360729",name:"全南县",parent:"360700"},{value:"360730",name:"宁都县",parent:"360700"},{value:"360731",name:"于都县",parent:"360700"},{value:"360732",name:"兴国县",parent:"360700"},{value:"360733",name:"会昌县",parent:"360700"},{value:"360734",name:"寻乌县",parent:"360700"},{value:"360735",name:"石城县",parent:"360700"},{value:"360751",name:"黄金区",parent:"360700"},{value:"360781",name:"瑞金市",parent:"360700"},{value:"360782",name:"南康区",parent:"360700"},{value:"360783",name:"其它区",parent:"360700"},{value:"360802",name:"吉州区",parent:"360800"},{value:"360803",name:"青原区",parent:"360800"},{value:"360821",name:"吉安县",parent:"360800"},{value:"360822",name:"吉水县",parent:"360800"},{value:"360823",name:"峡江县",parent:"360800"},{value:"360824",name:"新干县",parent:"360800"},{value:"360825",name:"永丰县",parent:"360800"},{value:"360826",name:"泰和县",parent:"360800"},{value:"360827",name:"遂川县",parent:"360800"},{value:"360828",name:"万安县",parent:"360800"},{value:"360829",name:"安福县",parent:"360800"},{value:"360830",name:"永新县",parent:"360800"},{value:"360881",name:"井冈山市",parent:"360800"},{value:"360882",name:"其它区",parent:"360800"},{value:"360902",name:"袁州区",parent:"360900"},{value:"360921",name:"奉新县",parent:"360900"},{value:"360922",name:"万载县",parent:"360900"},{value:"360923",name:"上高县",parent:"360900"},{value:"360924",name:"宜丰县",parent:"360900"},{value:"360925",name:"靖安县",parent:"360900"},{value:"360926",name:"铜鼓县",parent:"360900"},{value:"360981",name:"丰城市",parent:"360900"},{value:"360982",name:"樟树市",parent:"360900"},{value:"360983",name:"高安市",parent:"360900"},{value:"360984",name:"其它区",parent:"360900"},{value:"361002",name:"临川区",parent:"361000"},{value:"361021",name:"南城县",parent:"361000"},{value:"361022",name:"黎川县",parent:"361000"},{value:"361023",name:"南丰县",parent:"361000"},{value:"361024",name:"崇仁县",parent:"361000"},{value:"361025",name:"乐安县",parent:"361000"},{value:"361026",name:"宜黄县",parent:"361000"},{value:"361027",name:"金溪县",parent:"361000"},{value:"361028",name:"资溪县",parent:"361000"},{value:"361029",name:"东乡县",parent:"361000"},{value:"361030",name:"广昌县",parent:"361000"},{value:"361031",name:"其它区",parent:"361000"},{value:"361102",name:"信州区",parent:"361100"},{value:"361121",name:"上饶县",parent:"361100"},{value:"361122",name:"广丰区",parent:"361100"},{value:"361123",name:"玉山县",parent:"361100"},{value:"361124",name:"铅山县",parent:"361100"},{value:"361125",name:"横峰县",parent:"361100"},{value:"361126",name:"弋阳县",parent:"361100"},{value:"361127",name:"余干县",parent:"361100"},{value:"361128",name:"鄱阳县",parent:"361100"},{value:"361129",name:"万年县",parent:"361100"},{value:"361130",name:"婺源县",parent:"361100"},{value:"361181",name:"德兴市",parent:"361100"},{value:"361182",name:"其它区",parent:"361100"},{value:"370102",name:"历下区",parent:"370100"},{value:"370103",name:"市中区",parent:"370100"},{value:"370104",name:"槐荫区",parent:"370100"},{value:"370105",name:"天桥区",parent:"370100"},{value:"370112",name:"历城区",parent:"370100"},{value:"370113",name:"长清区",parent:"370100"},{value:"370124",name:"平阴县",parent:"370100"},{value:"370125",name:"济阳县",parent:"370100"},{value:"370126",name:"商河县",parent:"370100"},{value:"370181",name:"章丘市",parent:"370100"},{value:"370182",name:"其它区",parent:"370100"},{value:"370202",name:"市南区",parent:"370200"},{value:"370203",name:"市北区",parent:"370200"},{value:"370205",name:"四方区",parent:"370200"},{value:"370211",name:"黄岛区",parent:"370200"},{value:"370212",name:"崂山区",parent:"370200"},{value:"370213",name:"李沧区",parent:"370200"},{value:"370214",name:"城阳区",parent:"370200"},{value:"370251",name:"开发区",parent:"370200"},{value:"370281",name:"胶州市",parent:"370200"},{value:"370282",name:"即墨市",parent:"370200"},{value:"370283",name:"平度市",parent:"370200"},{value:"370284",name:"胶南市",parent:"370200"},{value:"370285",name:"莱西市",parent:"370200"},{value:"370286",name:"其它区",parent:"370200"},{value:"370302",name:"淄川区",parent:"370300"},{value:"370303",name:"张店区",parent:"370300"},{value:"370304",name:"博山区",parent:"370300"},{value:"370305",name:"临淄区",parent:"370300"},{value:"370306",name:"周村区",parent:"370300"},{value:"370321",name:"桓台县",parent:"370300"},{value:"370322",name:"高青县",parent:"370300"},{value:"370323",name:"沂源县",parent:"370300"},{value:"370324",name:"其它区",parent:"370300"},{value:"370402",name:"市中区",parent:"370400"},{value:"370403",name:"薛城区",parent:"370400"},{value:"370404",name:"峄城区",parent:"370400"},{value:"370405",name:"台儿庄区",parent:"370400"},{value:"370406",name:"山亭区",parent:"370400"},{value:"370481",name:"滕州市",parent:"370400"},{value:"370482",name:"其它区",parent:"370400"},{value:"370502",name:"东营区",parent:"370500"},{value:"370503",name:"河口区",parent:"370500"},{value:"370521",name:"垦利县",parent:"370500"},{value:"370522",name:"利津县",parent:"370500"},{value:"370523",name:"广饶县",parent:"370500"},{value:"370589",name:"西城区",parent:"370500"},{value:"370590",name:"东城区",parent:"370500"},{value:"370591",name:"其它区",parent:"370500"},{value:"370602",name:"芝罘区",parent:"370600"},{value:"370611",name:"福山区",parent:"370600"},{value:"370612",name:"牟平区",parent:"370600"},{value:"370613",name:"莱山区",parent:"370600"},{value:"370634",name:"长岛县",parent:"370600"},{value:"370681",name:"龙口市",parent:"370600"},{value:"370682",name:"莱阳市",parent:"370600"},{value:"370683",name:"莱州市",parent:"370600"},{value:"370684",name:"蓬莱市",parent:"370600"},{value:"370685",name:"招远市",parent:"370600"},{value:"370686",name:"栖霞市",parent:"370600"},{value:"370687",name:"海阳市",parent:"370600"},{value:"370688",name:"其它区",parent:"370600"},{value:"370702",name:"潍城区",parent:"370700"},{value:"370703",name:"寒亭区",parent:"370700"},{value:"370704",name:"坊子区",parent:"370700"},{value:"370705",name:"奎文区",parent:"370700"},{value:"370724",name:"临朐县",parent:"370700"},{value:"370725",name:"昌乐县",parent:"370700"},{value:"370751",name:"开发区",parent:"370700"},{value:"370781",name:"青州市",parent:"370700"},{value:"370782",name:"诸城市",parent:"370700"},{value:"370783",name:"寿光市",parent:"370700"},{value:"370784",name:"安丘市",parent:"370700"},{value:"370785",name:"高密市",parent:"370700"},{value:"370786",name:"昌邑市",parent:"370700"},{value:"370787",name:"其它区",parent:"370700"},{value:"370802",name:"市中区",parent:"370800"},{value:"370811",name:"任城区",parent:"370800"},{value:"370826",name:"微山县",parent:"370800"},{value:"370827",name:"鱼台县",parent:"370800"},{value:"370828",name:"金乡县",parent:"370800"},{value:"370829",name:"嘉祥县",parent:"370800"},{value:"370830",name:"汶上县",parent:"370800"},{value:"370831",name:"泗水县",parent:"370800"},{value:"370832",name:"梁山县",parent:"370800"},{value:"370881",name:"曲阜市",parent:"370800"},{value:"370882",name:"兖州区",parent:"370800"},{value:"370883",name:"邹城市",parent:"370800"},{value:"370884",name:"其它区",parent:"370800"},{value:"370902",name:"泰山区",parent:"370900"},{value:"370903",name:"岱岳区",parent:"370900"},{value:"370921",name:"宁阳县",parent:"370900"},{value:"370923",name:"东平县",parent:"370900"},{value:"370982",name:"新泰市",parent:"370900"},{value:"370983",name:"肥城市",parent:"370900"},{value:"370984",name:"其它区",parent:"370900"},{value:"371002",name:"环翠区",parent:"371000"},{value:"371081",name:"文登区",parent:"371000"},{value:"371082",name:"荣成市",parent:"371000"},{value:"371083",name:"乳山市",parent:"371000"},{value:"371084",name:"其它区",parent:"371000"},{value:"371102",name:"东港区",parent:"371100"},{value:"371103",name:"岚山区",parent:"371100"},{value:"371121",name:"五莲县",parent:"371100"},{value:"371122",name:"莒县",parent:"371100"},{value:"371123",name:"其它区",parent:"371100"},{value:"371202",name:"莱城区",parent:"371200"},{value:"371203",name:"钢城区",parent:"371200"},{value:"371204",name:"其它区",parent:"371200"},{value:"371302",name:"兰山区",parent:"371300"},{value:"371311",name:"罗庄区",parent:"371300"},{value:"371312",name:"河东区",parent:"371300"},{value:"371321",name:"沂南县",parent:"371300"},{value:"371322",name:"郯城县",parent:"371300"},{value:"371323",name:"沂水县",parent:"371300"},{value:"371324",name:"兰陵县",parent:"371300"},{value:"371325",name:"费县",parent:"371300"},{value:"371326",name:"平邑县",parent:"371300"},{value:"371327",name:"莒南县",parent:"371300"},{value:"371328",name:"蒙阴县",parent:"371300"},{value:"371329",name:"临沭县",parent:"371300"},{value:"371330",name:"其它区",parent:"371300"},{value:"371402",name:"德城区",parent:"371400"},{value:"371421",name:"陵城区",parent:"371400"},{value:"371422",name:"宁津县",parent:"371400"},{value:"371423",name:"庆云县",parent:"371400"},{value:"371424",name:"临邑县",parent:"371400"},{value:"371425",name:"齐河县",parent:"371400"},{value:"371426",name:"平原县",parent:"371400"},{value:"371427",name:"夏津县",parent:"371400"},{value:"371428",name:"武城县",parent:"371400"},{value:"371451",name:"开发区",parent:"371400"},{value:"371481",name:"乐陵市",parent:"371400"},{value:"371482",name:"禹城市",parent:"371400"},{value:"371483",name:"其它区",parent:"371400"},{value:"371502",name:"东昌府区",parent:"371500"},{value:"371521",name:"阳谷县",parent:"371500"},{value:"371522",name:"莘县",parent:"371500"},{value:"371523",name:"茌平县",parent:"371500"},{value:"371524",name:"东阿县",parent:"371500"},{value:"371525",name:"冠县",parent:"371500"},{value:"371526",name:"高唐县",parent:"371500"},{value:"371581",name:"临清市",parent:"371500"},{value:"371582",name:"其它区",parent:"371500"},{value:"371602",name:"滨城区",parent:"371600"},{value:"371621",name:"惠民县",parent:"371600"},{value:"371622",name:"阳信县",parent:"371600"},{value:"371623",name:"无棣县",parent:"371600"},{value:"371624",name:"沾化区",parent:"371600"},{value:"371625",name:"博兴县",parent:"371600"},{value:"371626",name:"邹平县",parent:"371600"},{value:"371627",name:"其它区",parent:"371600"},{value:"371702",name:"牡丹区",parent:"371700"},{value:"371721",name:"曹县",parent:"371700"},{value:"371722",name:"单县",parent:"371700"},{value:"371723",name:"成武县",parent:"371700"},{value:"371724",name:"巨野县",parent:"371700"},{value:"371725",name:"郓城县",parent:"371700"},{value:"371726",name:"鄄城县",parent:"371700"},{value:"371727",name:"定陶县",parent:"371700"},{value:"371728",name:"东明县",parent:"371700"},{value:"371729",name:"其它区",parent:"371700"},{value:"410102",name:"中原区",parent:"410100"},{value:"410103",name:"二七区",parent:"410100"},{value:"410104",name:"管城回族区",parent:"410100"},{value:"410105",name:"金水区",parent:"410100"},{value:"410106",name:"上街区",parent:"410100"},{value:"410108",name:"惠济区",parent:"410100"},{value:"410122",name:"中牟县",parent:"410100"},{value:"410181",name:"巩义市",parent:"410100"},{value:"410182",name:"荥阳市",parent:"410100"},{value:"410183",name:"新密市",parent:"410100"},{value:"410184",name:"新郑市",parent:"410100"},{value:"410185",name:"登封市",parent:"410100"},{value:"410186",name:"郑东新区",parent:"410100"},{value:"410187",name:"高新区",parent:"410100"},{value:"410188",name:"其它区",parent:"410100"},{value:"410202",name:"龙亭区",parent:"410200"},{value:"410203",name:"顺河回族区",parent:"410200"},{value:"410204",name:"鼓楼区",parent:"410200"},{value:"410205",name:"禹王台区",parent:"410200"},{value:"410211",name:"金明区",parent:"410200"},{value:"410221",name:"杞县",parent:"410200"},{value:"410222",name:"通许县",parent:"410200"},{value:"410223",name:"尉氏县",parent:"410200"},{value:"410224",name:"祥符区",parent:"410200"},{value:"410225",name:"兰考县",parent:"410200"},{value:"410226",name:"其它区",parent:"410200"},{value:"410302",name:"老城区",parent:"410300"},{value:"410303",name:"西工区",parent:"410300"},{value:"410304",name:"瀍河回族区",parent:"410300"},{value:"410305",name:"涧西区",parent:"410300"},{value:"410306",name:"吉利区",parent:"410300"},{value:"410307",name:"洛龙区",parent:"410300"},{value:"410322",name:"孟津县",parent:"410300"},{value:"410323",name:"新安县",parent:"410300"},{value:"410324",name:"栾川县",parent:"410300"},{value:"410325",name:"嵩县",parent:"410300"},{value:"410326",name:"汝阳县",parent:"410300"},{value:"410327",name:"宜阳县",parent:"410300"},{value:"410328",name:"洛宁县",parent:"410300"},{value:"410329",name:"伊川县",parent:"410300"},{value:"410381",name:"偃师市",parent:"410300"},{value:"410402",name:"新华区",parent:"410400"},{value:"410403",name:"卫东区",parent:"410400"},{value:"410404",name:"石龙区",parent:"410400"},{value:"410411",name:"湛河区",parent:"410400"},{value:"410421",name:"宝丰县",parent:"410400"},{value:"410422",name:"叶县",parent:"410400"},{value:"410423",name:"鲁山县",parent:"410400"},{value:"410425",name:"郏县",parent:"410400"},{value:"410481",name:"舞钢市",parent:"410400"},{value:"410482",name:"汝州市",parent:"410400"},{value:"410483",name:"其它区",parent:"410400"},{value:"410502",name:"文峰区",parent:"410500"},{value:"410503",name:"北关区",parent:"410500"},{value:"410505",name:"殷都区",parent:"410500"},{value:"410506",name:"龙安区",parent:"410500"},{value:"410522",name:"安阳县",parent:"410500"},{value:"410523",name:"汤阴县",parent:"410500"},{value:"410526",name:"滑县",parent:"410500"},{value:"410527",name:"内黄县",parent:"410500"},{value:"410581",name:"林州市",parent:"410500"},{value:"410582",name:"其它区",parent:"410500"},{value:"410602",name:"鹤山区",parent:"410600"},{value:"410603",name:"山城区",parent:"410600"},{value:"410611",name:"淇滨区",parent:"410600"},{value:"410621",name:"浚县",parent:"410600"},{value:"410622",name:"淇县",parent:"410600"},{value:"410623",name:"其它区",parent:"410600"},{value:"410702",name:"红旗区",parent:"410700"},{value:"410703",name:"卫滨区",parent:"410700"},{value:"410704",name:"凤泉区",parent:"410700"},{value:"410711",name:"牧野区",parent:"410700"},{value:"410721",name:"新乡县",parent:"410700"},{value:"410724",name:"获嘉县",parent:"410700"},{value:"410725",name:"原阳县",parent:"410700"},{value:"410726",name:"延津县",parent:"410700"},{value:"410727",name:"封丘县",parent:"410700"},{value:"410728",name:"长垣县",parent:"410700"},{value:"410781",name:"卫辉市",parent:"410700"},{value:"410782",name:"辉县市",parent:"410700"},{value:"410783",name:"其它区",parent:"410700"},{value:"410802",name:"解放区",parent:"410800"},{value:"410803",name:"中站区",parent:"410800"},{value:"410804",name:"马村区",parent:"410800"},{value:"410811",name:"山阳区",parent:"410800"},{value:"410821",name:"修武县",parent:"410800"},{value:"410822",name:"博爱县",parent:"410800"},{value:"410823",name:"武陟县",parent:"410800"},{value:"410825",name:"温县",parent:"410800"},{value:"410881",name:"济源市",parent:"410000"},{value:"410882",name:"沁阳市",parent:"410800"},{value:"410883",name:"孟州市",parent:"410800"},{value:"410884",name:"其它区",parent:"410800"},{value:"410902",name:"华龙区",parent:"410900"},{value:"410922",name:"清丰县",parent:"410900"},{value:"410923",name:"南乐县",parent:"410900"},{value:"410926",name:"范县",parent:"410900"},{value:"410927",name:"台前县",parent:"410900"},{value:"410928",name:"濮阳县",parent:"410900"},{value:"410929",name:"其它区",parent:"410900"},{value:"411002",name:"魏都区",parent:"411000"},{value:"411023",name:"许昌县",parent:"411000"},{value:"411024",name:"鄢陵县",parent:"411000"},{value:"411025",name:"襄城县",parent:"411000"},{value:"411081",name:"禹州市",parent:"411000"},{value:"411082",name:"长葛市",parent:"411000"},{value:"411083",name:"其它区",parent:"411000"},{value:"411102",name:"源汇区",parent:"411100"},{value:"411103",name:"郾城区",parent:"411100"},{value:"411104",name:"召陵区",parent:"411100"},{value:"411121",name:"舞阳县",parent:"411100"},{value:"411122",name:"临颍县",parent:"411100"},{value:"411123",name:"其它区",parent:"411100"},{value:"411202",name:"湖滨区",parent:"411200"},{value:"411221",name:"渑池县",parent:"411200"},{value:"411222",name:"陕州区",parent:"411200"},{value:"411224",name:"卢氏县",parent:"411200"},{value:"411281",name:"义马市",parent:"411200"},{value:"411282",name:"灵宝市",parent:"411200"},{value:"411283",name:"其它区",parent:"411200"},{value:"411302",name:"宛城区",parent:"411300"},{value:"411303",name:"卧龙区",parent:"411300"},{value:"411321",name:"南召县",parent:"411300"},{value:"411322",name:"方城县",parent:"411300"},{value:"411323",name:"西峡县",parent:"411300"},{value:"411324",name:"镇平县",parent:"411300"},{value:"411325",name:"内乡县",parent:"411300"},{value:"411326",name:"淅川县",parent:"411300"},{value:"411327",name:"社旗县",parent:"411300"},{value:"411328",name:"唐河县",parent:"411300"},{value:"411329",name:"新野县",parent:"411300"},{value:"411330",name:"桐柏县",parent:"411300"},{value:"411381",name:"邓州市",parent:"411300"},{value:"411382",name:"其它区",parent:"411300"},{value:"411402",name:"梁园区",parent:"411400"},{value:"411403",name:"睢阳区",parent:"411400"},{value:"411421",name:"民权县",parent:"411400"},{value:"411422",name:"睢县",parent:"411400"},{value:"411423",name:"宁陵县",parent:"411400"},{value:"411424",name:"柘城县",parent:"411400"},{value:"411425",name:"虞城县",parent:"411400"},{value:"411426",name:"夏邑县",parent:"411400"},{value:"411481",name:"永城市",parent:"411400"},{value:"411482",name:"其它区",parent:"411400"},{value:"411502",name:"浉河区",parent:"411500"},{value:"411503",name:"平桥区",parent:"411500"},{value:"411521",name:"罗山县",parent:"411500"},{value:"411522",name:"光山县",parent:"411500"},{value:"411523",name:"新县",parent:"411500"},{value:"411524",name:"商城县",parent:"411500"},{value:"411525",name:"固始县",parent:"411500"},{value:"411526",name:"潢川县",parent:"411500"},{value:"411527",name:"淮滨县",parent:"411500"},{value:"411528",name:"息县",parent:"411500"},{value:"411529",name:"其它区",parent:"411500"},{value:"411602",name:"川汇区",parent:"411600"},{value:"411621",name:"扶沟县",parent:"411600"},{value:"411622",name:"西华县",parent:"411600"},{value:"411623",name:"商水县",parent:"411600"},{value:"411624",name:"沈丘县",parent:"411600"},{value:"411625",name:"郸城县",parent:"411600"},{value:"411626",name:"淮阳县",parent:"411600"},{value:"411627",name:"太康县",parent:"411600"},{value:"411628",name:"鹿邑县",parent:"411600"},{value:"411681",name:"项城市",parent:"411600"},{value:"411682",name:"其它区",parent:"411600"},{value:"411702",name:"驿城区",parent:"411700"},{value:"411721",name:"西平县",parent:"411700"},{value:"411722",name:"上蔡县",parent:"411700"},{value:"411723",name:"平舆县",parent:"411700"},{value:"411724",name:"正阳县",parent:"411700"},{value:"411725",name:"确山县",parent:"411700"},{value:"411726",name:"泌阳县",parent:"411700"},{value:"411727",name:"汝南县",parent:"411700"},{value:"411728",name:"遂平县",parent:"411700"},{value:"411729",name:"新蔡县",parent:"411700"},{value:"411730",name:"其它区",parent:"411700"},{value:"420102",name:"江岸区",parent:"420100"},{value:"420103",name:"江汉区",parent:"420100"},{value:"420104",name:"硚口区",parent:"420100"},{value:"420105",name:"汉阳区",parent:"420100"},{value:"420106",name:"武昌区",parent:"420100"},{value:"420107",name:"青山区",parent:"420100"},{value:"420111",name:"洪山区",parent:"420100"},{value:"420112",name:"东西湖区",parent:"420100"},{value:"420113",name:"汉南区",parent:"420100"},{value:"420114",name:"蔡甸区",parent:"420100"},{value:"420115",name:"江夏区",parent:"420100"},{value:"420116",name:"黄陂区",parent:"420100"},{value:"420117",name:"新洲区",parent:"420100"},{value:"420118",name:"其它区",parent:"420100"},{value:"420202",name:"黄石港区",parent:"420200"},{value:"420203",name:"西塞山区",parent:"420200"},{value:"420204",name:"下陆区",parent:"420200"},{value:"420205",name:"铁山区",parent:"420200"},{value:"420222",name:"阳新县",parent:"420200"},{value:"420281",name:"大冶市",parent:"420200"},{value:"420282",name:"其它区",parent:"420200"},{value:"420302",name:"茅箭区",parent:"420300"},{value:"420303",name:"张湾区",parent:"420300"},{value:"420321",name:"郧阳区",parent:"420300"},{value:"420322",name:"郧西县",parent:"420300"},{value:"420323",name:"竹山县",parent:"420300"},{value:"420324",name:"竹溪县",parent:"420300"},{value:"420325",name:"房县",parent:"420300"},{value:"420381",name:"丹江口市",parent:"420300"},{value:"420382",name:"城区",parent:"420300"},{value:"420383",name:"其它区",parent:"420300"},{value:"420502",name:"西陵区",parent:"420500"},{value:"420503",name:"伍家岗区",parent:"420500"},{value:"420504",name:"点军区",parent:"420500"},{value:"420505",name:"猇亭区",parent:"420500"},{value:"420506",name:"夷陵区",parent:"420500"},{value:"420525",name:"远安县",parent:"420500"},{value:"420526",name:"兴山县",parent:"420500"},{value:"420527",name:"秭归县",parent:"420500"},{value:"420528",name:"长阳土家族自治县",parent:"420500"},{value:"420529",name:"五峰土家族自治县",parent:"420500"},{value:"420551",name:"葛洲坝区",parent:"420500"},{value:"420552",name:"开发区",parent:"420500"},{value:"420581",name:"宜都市",parent:"420500"},{value:"420582",name:"当阳市",parent:"420500"},{value:"420583",name:"枝江市",parent:"420500"},{value:"420584",name:"其它区",parent:"420500"},{value:"420602",name:"襄城区",parent:"420600"},{value:"420606",name:"樊城区",parent:"420600"},{value:"420607",name:"襄州区",parent:"420600"},{value:"420624",name:"南漳县",parent:"420600"},{value:"420625",name:"谷城县",parent:"420600"},{value:"420626",name:"保康县",parent:"420600"},{value:"420682",name:"老河口市",parent:"420600"},{value:"420683",name:"枣阳市",parent:"420600"},{value:"420684",name:"宜城市",parent:"420600"},{value:"420685",name:"其它区",parent:"420600"},{value:"420702",name:"梁子湖区",parent:"420700"},{value:"420703",name:"华容区",parent:"420700"},{value:"420704",name:"鄂城区",parent:"420700"},{value:"420705",name:"其它区",parent:"420700"},{value:"420802",name:"东宝区",parent:"420800"},{value:"420804",name:"掇刀区",parent:"420800"},{value:"420821",name:"京山县",parent:"420800"},{value:"420822",name:"沙洋县",parent:"420800"},{value:"420881",name:"钟祥市",parent:"420800"},{value:"420882",name:"其它区",parent:"420800"},{value:"420902",name:"孝南区",parent:"420900"},{value:"420921",name:"孝昌县",parent:"420900"},{value:"420922",name:"大悟县",parent:"420900"},{value:"420923",name:"云梦县",parent:"420900"},{value:"420981",name:"应城市",parent:"420900"},{value:"420982",name:"安陆市",parent:"420900"},{value:"420984",name:"汉川市",parent:"420900"},{value:"420985",name:"其它区",parent:"420900"},{value:"421002",name:"沙市区",parent:"421000"},{value:"421003",name:"荆州区",parent:"421000"},{value:"421022",name:"公安县",parent:"421000"},{value:"421023",name:"监利县",parent:"421000"},{value:"421024",name:"江陵县",parent:"421000"},{value:"421081",name:"石首市",parent:"421000"},{value:"421083",name:"洪湖市",parent:"421000"},{value:"421087",name:"松滋市",parent:"421000"},{value:"421088",name:"其它区",parent:"421000"},{value:"421102",name:"黄州区",parent:"421100"},{value:"421121",name:"团风县",parent:"421100"},{value:"421122",name:"红安县",parent:"421100"},{value:"421123",name:"罗田县",parent:"421100"},{value:"421124",name:"英山县",parent:"421100"},{value:"421125",name:"浠水县",parent:"421100"},{value:"421126",name:"蕲春县",parent:"421100"},{value:"421127",name:"黄梅县",parent:"421100"},{value:"421181",name:"麻城市",parent:"421100"},{value:"421182",name:"武穴市",parent:"421100"},{value:"421183",name:"其它区",parent:"421100"},{value:"421202",name:"咸安区",parent:"421200"},{value:"421221",name:"嘉鱼县",parent:"421200"},{value:"421222",name:"通城县",parent:"421200"},{value:"421223",name:"崇阳县",parent:"421200"},{value:"421224",name:"通山县",parent:"421200"},{value:"421281",name:"赤壁市",parent:"421200"},{value:"421282",name:"温泉城区",parent:"421200"},{value:"421283",name:"其它区",parent:"421200"},{value:"421302",name:"曾都区",parent:"421300"},{value:"421321",name:"随县",parent:"421300"},{value:"421381",name:"广水市",parent:"421300"},{value:"421382",name:"其它区",parent:"421300"},{value:"422801",name:"恩施市",parent:"422800"},{value:"422802",name:"利川市",parent:"422800"},{value:"422822",name:"建始县",parent:"422800"},{value:"422823",name:"巴东县",parent:"422800"},{value:"422825",name:"宣恩县",parent:"422800"},{value:"422826",name:"咸丰县",parent:"422800"},{value:"422827",name:"来凤县",parent:"422800"},{value:"422828",name:"鹤峰县",parent:"422800"},{value:"422829",name:"其它区",parent:"422800"},{value:"429004",name:"仙桃市",parent:"420000"},{value:"429005",name:"潜江市",parent:"420000"},{value:"429006",name:"天门市",parent:"420000"},{value:"429021",name:"神农架林区",parent:"420000"},{value:"430102",name:"芙蓉区",parent:"430100"},{value:"430103",name:"天心区",parent:"430100"},{value:"430104",name:"岳麓区",parent:"430100"},{value:"430105",name:"开福区",parent:"430100"},{value:"430111",name:"雨花区",parent:"430100"},{value:"430121",name:"长沙县",parent:"430100"},{value:"430122",name:"望城区",parent:"430100"},{value:"430124",name:"宁乡县",parent:"430100"},{value:"430181",name:"浏阳市",parent:"430100"},{value:"430182",name:"其它区",parent:"430100"},{value:"430202",name:"荷塘区",parent:"430200"},{value:"430203",name:"芦淞区",parent:"430200"},{value:"430204",name:"石峰区",parent:"430200"},{value:"430211",name:"天元区",parent:"430200"},{value:"430221",name:"株洲县",parent:"430200"},{value:"430223",name:"攸县",parent:"430200"},{value:"430224",name:"茶陵县",parent:"430200"},{value:"430225",name:"炎陵县",parent:"430200"},{value:"430281",name:"醴陵市",parent:"430200"},{value:"430282",name:"其它区",parent:"430200"},{value:"430302",name:"雨湖区",parent:"430300"},{value:"430304",name:"岳塘区",parent:"430300"},{value:"430321",name:"湘潭县",parent:"430300"},{value:"430381",name:"湘乡市",parent:"430300"},{value:"430382",name:"韶山市",parent:"430300"},{value:"430383",name:"其它区",parent:"430300"},{value:"430405",name:"珠晖区",parent:"430400"},{value:"430406",name:"雁峰区",parent:"430400"},{value:"430407",name:"石鼓区",parent:"430400"},{value:"430408",name:"蒸湘区",parent:"430400"},{value:"430412",name:"南岳区",parent:"430400"},{value:"430421",name:"衡阳县",parent:"430400"},{value:"430422",name:"衡南县",parent:"430400"},{value:"430423",name:"衡山县",parent:"430400"},{value:"430424",name:"衡东县",parent:"430400"},{value:"430426",name:"祁东县",parent:"430400"},{value:"430481",name:"耒阳市",parent:"430400"},{value:"430482",name:"常宁市",parent:"430400"},{value:"430483",name:"其它区",parent:"430400"},{value:"430502",name:"双清区",parent:"430500"},{value:"430503",name:"大祥区",parent:"430500"},{value:"430511",name:"北塔区",parent:"430500"},{value:"430521",name:"邵东县",parent:"430500"},{value:"430522",name:"新邵县",parent:"430500"},{value:"430523",name:"邵阳县",parent:"430500"},{value:"430524",name:"隆回县",parent:"430500"},{value:"430525",name:"洞口县",parent:"430500"},{value:"430527",name:"绥宁县",parent:"430500"},{value:"430528",name:"新宁县",parent:"430500"},{value:"430529",name:"城步苗族自治县",parent:"430500"},{value:"430581",name:"武冈市",parent:"430500"},{value:"430582",name:"其它区",parent:"430500"},{value:"430602",name:"岳阳楼区",parent:"430600"},{value:"430603",name:"云溪区",parent:"430600"},{value:"430611",name:"君山区",parent:"430600"},{value:"430621",name:"岳阳县",parent:"430600"},{value:"430623",name:"华容县",parent:"430600"},{value:"430624",name:"湘阴县",parent:"430600"},{value:"430626",name:"平江县",parent:"430600"},{value:"430681",name:"汨罗市",parent:"430600"},{value:"430682",name:"临湘市",parent:"430600"},{value:"430683",name:"其它区",parent:"430600"},{value:"430702",name:"武陵区",parent:"430700"},{value:"430703",name:"鼎城区",parent:"430700"},{value:"430721",name:"安乡县",parent:"430700"},{value:"430722",name:"汉寿县",parent:"430700"},{value:"430723",name:"澧县",parent:"430700"},{value:"430724",name:"临澧县",parent:"430700"},{value:"430725",name:"桃源县",parent:"430700"},{value:"430726",name:"石门县",parent:"430700"},{value:"430781",name:"津市市",parent:"430700"},{value:"430782",name:"其它区",parent:"430700"},{value:"430802",name:"永定区",parent:"430800"},{value:"430811",name:"武陵源区",parent:"430800"},{value:"430821",name:"慈利县",parent:"430800"},{value:"430822",name:"桑植县",parent:"430800"},{value:"430823",name:"其它区",parent:"430800"},{value:"430902",name:"资阳区",parent:"430900"},{value:"430903",name:"赫山区",parent:"430900"},{value:"430921",name:"南县",parent:"430900"},{value:"430922",name:"桃江县",parent:"430900"},{value:"430923",name:"安化县",parent:"430900"},{value:"430981",name:"沅江市",parent:"430900"},{value:"430982",name:"其它区",parent:"430900"},{value:"431002",name:"北湖区",parent:"431000"},{value:"431003",name:"苏仙区",parent:"431000"},{value:"431021",name:"桂阳县",parent:"431000"},{value:"431022",name:"宜章县",parent:"431000"},{value:"431023",name:"永兴县",parent:"431000"},{value:"431024",name:"嘉禾县",parent:"431000"},{value:"431025",name:"临武县",parent:"431000"},{value:"431026",name:"汝城县",parent:"431000"},{value:"431027",name:"桂东县",parent:"431000"},{value:"431028",name:"安仁县",parent:"431000"},{value:"431081",name:"资兴市",parent:"431000"},{value:"431082",name:"其它区",parent:"431000"},{value:"431102",name:"零陵区",parent:"431100"},{value:"431103",name:"冷水滩区",parent:"431100"},{value:"431121",name:"祁阳县",parent:"431100"},{value:"431122",name:"东安县",parent:"431100"},{value:"431123",name:"双牌县",parent:"431100"},{value:"431124",name:"道县",parent:"431100"},{value:"431125",name:"江永县",parent:"431100"},{value:"431126",name:"宁远县",parent:"431100"},{value:"431127",name:"蓝山县",parent:"431100"},{value:"431128",name:"新田县",parent:"431100"},{value:"431129",name:"江华瑶族自治县",parent:"431100"},{value:"431130",name:"其它区",parent:"431100"},{value:"431202",name:"鹤城区",parent:"431200"},{value:"431221",name:"中方县",parent:"431200"},{value:"431222",name:"沅陵县",parent:"431200"},{value:"431223",name:"辰溪县",parent:"431200"},{value:"431224",name:"溆浦县",parent:"431200"},{value:"431225",name:"会同县",parent:"431200"},{value:"431226",name:"麻阳苗族自治县",parent:"431200"},{value:"431227",name:"新晃侗族自治县",parent:"431200"},{value:"431228",name:"芷江侗族自治县",parent:"431200"},{value:"431229",name:"靖州苗族侗族自治县",parent:"431200"},{value:"431230",name:"通道侗族自治县",parent:"431200"},{value:"431281",name:"洪江市",parent:"431200"},{value:"431282",name:"其它区",parent:"431200"},{value:"431302",name:"娄星区",parent:"431300"},{value:"431321",name:"双峰县",parent:"431300"},{value:"431322",name:"新化县",parent:"431300"},{value:"431381",name:"冷水江市",parent:"431300"},{value:"431382",name:"涟源市",parent:"431300"},{value:"431383",name:"其它区",parent:"431300"},{value:"433101",name:"吉首市",parent:"433100"},{value:"433122",name:"泸溪县",parent:"433100"},{value:"433123",name:"凤凰县",parent:"433100"},{value:"433124",name:"花垣县",parent:"433100"},{value:"433125",name:"保靖县",parent:"433100"},{value:"433126",name:"古丈县",parent:"433100"},{value:"433127",name:"永顺县",parent:"433100"},{value:"433130",name:"龙山县",parent:"433100"},{value:"433131",name:"其它区",parent:"433100"},{value:"440103",name:"荔湾区",parent:"440100"},{value:"440104",name:"越秀区",parent:"440100"},{value:"440105",name:"海珠区",parent:"440100"},{value:"440106",name:"天河区",parent:"440100"},{value:"440111",name:"白云区",parent:"440100"},{value:"440112",name:"黄埔区",parent:"440100"},{value:"440113",name:"番禺区",parent:"440100"},{value:"440114",name:"花都区",parent:"440100"},{value:"440115",name:"南沙区",parent:"440100"},{value:"440116",name:"萝岗区",parent:"440100"},{value:"440183",name:"增城区",parent:"440100"},{value:"440184",name:"从化区",parent:"440100"},{value:"440188",name:"东山区",parent:"440100"},{value:"440189",name:"其它区",parent:"440100"},{value:"440203",name:"武江区",parent:"440200"},{value:"440204",name:"浈江区",parent:"440200"},{value:"440205",name:"曲江区",parent:"440200"},{value:"440222",name:"始兴县",parent:"440200"},{value:"440224",name:"仁化县",parent:"440200"},{value:"440229",name:"翁源县",parent:"440200"},{value:"440232",name:"乳源瑶族自治县",parent:"440200"},{value:"440233",name:"新丰县",parent:"440200"},{value:"440281",name:"乐昌市",parent:"440200"},{value:"440282",name:"南雄市",parent:"440200"},{value:"440283",name:"其它区",parent:"440200"},{value:"440303",name:"罗湖区",parent:"440300"},{value:"440304",name:"福田区",parent:"440300"},{value:"440305",name:"南山区",parent:"440300"},{value:"440306",name:"宝安区",parent:"440300"},{value:"440307",name:"龙岗区",parent:"440300"},{value:"440308",name:"盐田区",parent:"440300"},{value:"440309",name:"其它区",parent:"440300"},{value:"440320",name:"光明新区",parent:"440300"},{value:"440321",name:"坪山新区",parent:"440300"},{value:"440322",name:"大鹏新区",parent:"440300"},{value:"440323",name:"龙华新区",parent:"440300"},{value:"440402",name:"香洲区",parent:"440400"},{value:"440403",name:"斗门区",parent:"440400"},{value:"440404",name:"金湾区",parent:"440400"},{value:"440486",name:"金唐区",parent:"440400"},{value:"440487",name:"南湾区",parent:"440400"},{value:"440488",name:"其它区",parent:"440400"},{value:"440507",name:"龙湖区",parent:"440500"},{value:"440511",name:"金平区",parent:"440500"},{value:"440512",name:"濠江区",parent:"440500"},{value:"440513",name:"潮阳区",parent:"440500"},{value:"440514",name:"潮南区",parent:"440500"},{value:"440515",name:"澄海区",parent:"440500"},{value:"440523",name:"南澳县",parent:"440500"},{value:"440524",name:"其它区",parent:"440500"},{value:"440604",name:"禅城区",parent:"440600"},{value:"440605",name:"南海区",parent:"440600"},{value:"440606",name:"顺德区",parent:"440600"},{value:"440607",name:"三水区",parent:"440600"},{value:"440608",name:"高明区",parent:"440600"},{value:"440609",name:"其它区",parent:"440600"},{value:"440703",name:"蓬江区",parent:"440700"},{value:"440704",name:"江海区",parent:"440700"},{value:"440705",name:"新会区",parent:"440700"},{value:"440781",name:"台山市",parent:"440700"},{value:"440783",name:"开平市",parent:"440700"},{value:"440784",name:"鹤山市",parent:"440700"},{value:"440785",name:"恩平市",parent:"440700"},{value:"440786",name:"其它区",parent:"440700"},{value:"440802",name:"赤坎区",parent:"440800"},{value:"440803",name:"霞山区",parent:"440800"},{value:"440804",name:"坡头区",parent:"440800"},{value:"440811",name:"麻章区",parent:"440800"},{value:"440823",name:"遂溪县",parent:"440800"},{value:"440825",name:"徐闻县",parent:"440800"},{value:"440881",name:"廉江市",parent:"440800"},{value:"440882",name:"雷州市",parent:"440800"},{value:"440883",name:"吴川市",parent:"440800"},{value:"440884",name:"其它区",parent:"440800"},{value:"440902",name:"茂南区",parent:"440900"},{value:"440903",name:"电白区",parent:"440900"},{value:"440923",name:"电白县",parent:"440900"},{value:"440981",name:"高州市",parent:"440900"},{value:"440982",name:"化州市",parent:"440900"},{value:"440983",name:"信宜市",parent:"440900"},{value:"440984",name:"其它区",parent:"440900"},{value:"441202",name:"端州区",parent:"441200"},{value:"441203",name:"鼎湖区",parent:"441200"},{value:"441223",name:"广宁县",parent:"441200"},{value:"441224",name:"怀集县",parent:"441200"},{value:"441225",name:"封开县",parent:"441200"},{value:"441226",name:"德庆县",parent:"441200"},{value:"441283",name:"高要市",parent:"441200"},{value:"441284",name:"四会市",parent:"441200"},{value:"441285",name:"其它区",parent:"441200"},{value:"441302",name:"惠城区",parent:"441300"},{value:"441303",name:"惠阳区",parent:"441300"},{value:"441322",name:"博罗县",parent:"441300"},{value:"441323",name:"惠东县",parent:"441300"},{value:"441324",name:"龙门县",parent:"441300"},{value:"441325",name:"其它区",parent:"441300"},{value:"441402",name:"梅江区",parent:"441400"},{value:"441421",name:"梅县区",parent:"441400"},{value:"441422",name:"大埔县",parent:"441400"},{value:"441423",name:"丰顺县",parent:"441400"},{value:"441424",name:"五华县",parent:"441400"},{value:"441426",name:"平远县",parent:"441400"},{value:"441427",name:"蕉岭县",parent:"441400"},{value:"441481",name:"兴宁市",parent:"441400"},{value:"441482",name:"其它区",parent:"441400"},{value:"441502",name:"城区",parent:"441500"},{value:"441521",name:"海丰县",parent:"441500"},{value:"441523",name:"陆河县",parent:"441500"},{value:"441581",name:"陆丰市",parent:"441500"},{value:"441582",name:"其它区",parent:"441500"},{value:"441602",name:"源城区",parent:"441600"},{value:"441621",name:"紫金县",parent:"441600"},{value:"441622",name:"龙川县",parent:"441600"},{value:"441623",name:"连平县",parent:"441600"},{value:"441624",name:"和平县",parent:"441600"},{value:"441625",name:"东源县",parent:"441600"},{value:"441626",name:"其它区",parent:"441600"},{value:"441702",name:"江城区",parent:"441700"},{value:"441721",name:"阳西县",parent:"441700"},{value:"441723",name:"阳东区",parent:"441700"},{value:"441781",name:"阳春市",parent:"441700"},{value:"441782",name:"其它区",parent:"441700"},{value:"441802",name:"清城区",parent:"441800"},{value:"441821",name:"佛冈县",parent:"441800"},{value:"441823",name:"阳山县",parent:"441800"},{value:"441825",name:"连山壮族瑶族自治县",parent:"441800"},{value:"441826",name:"连南瑶族自治县",parent:"441800"},{value:"441827",name:"清新区",parent:"441800"},{value:"441881",name:"英德市",parent:"441800"},{value:"441882",name:"连州市",parent:"441800"},{value:"441883",name:"其它区",parent:"441800"},{value:"445102",name:"湘桥区",parent:"445100"},{value:"445121",name:"潮安区",parent:"445100"},{value:"445122",name:"饶平县",parent:"445100"},{value:"445185",name:"枫溪区",parent:"445100"},{value:"445186",name:"其它区",parent:"445100"},{value:"445202",name:"榕城区",parent:"445200"},{value:"445221",name:"揭东区",parent:"445200"},{value:"445222",name:"揭西县",parent:"445200"},{value:"445224",name:"惠来县",parent:"445200"},{value:"445281",name:"普宁市",parent:"445200"},{value:"445284",name:"东山区",parent:"445200"},{value:"445285",name:"其它区",parent:"445200"},{value:"445302",name:"云城区",parent:"445300"},{value:"445321",name:"新兴县",parent:"445300"},{value:"445322",name:"郁南县",parent:"445300"},{value:"445323",name:"云安区",parent:"445300"},{value:"445381",name:"罗定市",parent:"445300"},{value:"445382",name:"其它区",parent:"445300"},{value:"450102",name:"兴宁区",parent:"450100"},{value:"450103",name:"青秀区",parent:"450100"},{value:"450105",name:"江南区",parent:"450100"},{value:"450107",name:"西乡塘区",parent:"450100"},{value:"450108",name:"良庆区",parent:"450100"},{value:"450109",name:"邕宁区",parent:"450100"},{value:"450122",name:"武鸣区",parent:"450100"},{value:"450123",name:"隆安县",parent:"450100"},{value:"450124",name:"马山县",parent:"450100"},{value:"450125",name:"上林县",parent:"450100"},{value:"450126",name:"宾阳县",parent:"450100"},{value:"450127",name:"横县",parent:"450100"},{value:"450128",name:"其它区",parent:"450100"},{value:"450202",name:"城中区",parent:"450200"},{value:"450203",name:"鱼峰区",parent:"450200"},{value:"450204",name:"柳南区",parent:"450200"},{value:"450205",name:"柳北区",parent:"450200"},{value:"450221",name:"柳江县",parent:"450200"},{value:"450222",name:"柳城县",parent:"450200"},{value:"450223",name:"鹿寨县",parent:"450200"},{value:"450224",name:"融安县",parent:"450200"},{value:"450225",name:"融水苗族自治县",parent:"450200"},{value:"450226",name:"三江侗族自治县",parent:"450200"},{value:"450227",name:"其它区",parent:"450200"},{value:"450302",name:"秀峰区",parent:"450300"},{value:"450303",name:"叠彩区",parent:"450300"},{value:"450304",name:"象山区",parent:"450300"},{value:"450305",name:"七星区",parent:"450300"},{value:"450311",name:"雁山区",parent:"450300"},{value:"450321",name:"阳朔县",parent:"450300"},{value:"450322",name:"临桂区",parent:"450300"},{value:"450323",name:"灵川县",parent:"450300"},{value:"450324",name:"全州县",parent:"450300"},{value:"450325",name:"兴安县",parent:"450300"},{value:"450326",name:"永福县",parent:"450300"},{value:"450327",name:"灌阳县",parent:"450300"},{value:"450328",name:"龙胜各族自治县",parent:"450300"},{value:"450329",name:"资源县",parent:"450300"},{value:"450330",name:"平乐县",parent:"450300"},{value:"450331",name:"荔浦县",parent:"450300"},{value:"450332",name:"恭城瑶族自治县",parent:"450300"},{value:"450333",name:"其它区",parent:"450300"},{value:"450403",name:"万秀区",parent:"450400"},{value:"450404",name:"蝶山区",parent:"450400"},{value:"450405",name:"长洲区",parent:"450400"},{value:"450406",name:"龙圩区",parent:"450400"},{value:"450421",name:"苍梧县",parent:"450400"},{value:"450422",name:"藤县",parent:"450400"},{value:"450423",name:"蒙山县",parent:"450400"},{value:"450481",name:"岑溪市",parent:"450400"},{value:"450482",name:"其它区",parent:"450400"},{value:"450502",name:"海城区",parent:"450500"},{value:"450503",name:"银海区",parent:"450500"},{value:"450512",name:"铁山港区",parent:"450500"},{value:"450521",name:"合浦县",parent:"450500"},{value:"450522",name:"其它区",parent:"450500"},{value:"450602",name:"港口区",parent:"450600"},{value:"450603",name:"防城区",parent:"450600"},{value:"450621",name:"上思县",parent:"450600"},{value:"450681",name:"东兴市",parent:"450600"},{value:"450682",name:"其它区",parent:"450600"},{value:"450702",name:"钦南区",parent:"450700"},{value:"450703",name:"钦北区",parent:"450700"},{value:"450721",name:"灵山县",parent:"450700"},{value:"450722",name:"浦北县",parent:"450700"},{value:"450723",name:"其它区",parent:"450700"},{value:"450802",name:"港北区",parent:"450800"},{value:"450803",name:"港南区",parent:"450800"},{value:"450804",name:"覃塘区",parent:"450800"},{value:"450821",name:"平南县",parent:"450800"},{value:"450881",name:"桂平市",parent:"450800"},{value:"450882",name:"其它区",parent:"450800"},{value:"450902",name:"玉州区",parent:"450900"},{value:"450903",name:"福绵区",parent:"450900"},{value:"450921",name:"容县",parent:"450900"},{value:"450922",name:"陆川县",parent:"450900"},{value:"450923",name:"博白县",parent:"450900"},{value:"450924",name:"兴业县",parent:"450900"},{value:"450981",name:"北流市",parent:"450900"},{value:"450982",name:"其它区",parent:"450900"},{value:"451002",name:"右江区",parent:"451000"},{value:"451021",name:"田阳县",parent:"451000"},{value:"451022",name:"田东县",parent:"451000"},{value:"451023",name:"平果县",parent:"451000"},{value:"451024",name:"德保县",parent:"451000"},{value:"451025",name:"靖西县",parent:"451000"},{value:"451026",name:"那坡县",parent:"451000"},{value:"451027",name:"凌云县",parent:"451000"},{value:"451028",name:"乐业县",parent:"451000"},{value:"451029",name:"田林县",parent:"451000"},{value:"451030",name:"西林县",parent:"451000"},{value:"451031",name:"隆林各族自治县",parent:"451000"},{value:"451032",name:"其它区",parent:"451000"},{value:"451102",name:"八步区",parent:"451100"},{value:"451119",name:"平桂管理区",parent:"451100"},{value:"451121",name:"昭平县",parent:"451100"},{value:"451122",name:"钟山县",parent:"451100"},{value:"451123",name:"富川瑶族自治县",parent:"451100"},{value:"451124",name:"其它区",parent:"451100"},{value:"451202",name:"金城江区",parent:"451200"},{value:"451221",name:"南丹县",parent:"451200"},{value:"451222",name:"天峨县",parent:"451200"},{value:"451223",name:"凤山县",parent:"451200"},{value:"451224",name:"东兰县",parent:"451200"},{value:"451225",name:"罗城仫佬族自治县",parent:"451200"},{value:"451226",name:"环江毛南族自治县",parent:"451200"},{value:"451227",name:"巴马瑶族自治县",parent:"451200"},{value:"451228",name:"都安瑶族自治县",parent:"451200"},{value:"451229",name:"大化瑶族自治县",parent:"451200"},{value:"451281",name:"宜州市",parent:"451200"},{value:"451282",name:"其它区",parent:"451200"},{value:"451302",name:"兴宾区",parent:"451300"},{value:"451321",name:"忻城县",parent:"451300"},{value:"451322",name:"象州县",parent:"451300"},{value:"451323",name:"武宣县",parent:"451300"},{value:"451324",name:"金秀瑶族自治县",parent:"451300"},{value:"451381",name:"合山市",parent:"451300"},{value:"451382",name:"其它区",parent:"451300"},{value:"451402",name:"江州区",parent:"451400"},{value:"451421",name:"扶绥县",parent:"451400"},{value:"451422",name:"宁明县",parent:"451400"},{value:"451423",name:"龙州县",parent:"451400"},{value:"451424",name:"大新县",parent:"451400"},{value:"451425",name:"天等县",parent:"451400"},{value:"451481",name:"凭祥市",parent:"451400"},{value:"451482",name:"其它区",parent:"451400"},{value:"460105",name:"秀英区",parent:"460100"},{value:"460106",name:"龙华区",parent:"460100"},{value:"460107",name:"琼山区",parent:"460100"},{value:"460108",name:"美兰区",parent:"460100"},{value:"460109",name:"其它区",parent:"460100"},{value:"460321",name:"西沙群岛",parent:"460300"},{value:"460322",name:"南沙群岛",parent:"460300"},{value:"460323",name:"中沙群岛的岛礁及其海域",parent:"460300"},{value:"469001",name:"五指山市",parent:"460000"},{value:"469002",name:"琼海市",parent:"460000"},{value:"469003",name:"儋州市",parent:"460000"},{value:"469005",name:"文昌市",parent:"460000"},{value:"469006",name:"万宁市",parent:"460000"},{value:"469007",name:"东方市",parent:"460000"},{value:"469025",name:"定安县",parent:"460000"},{value:"469026",name:"屯昌县",parent:"460000"},{value:"469027",name:"澄迈县",parent:"460000"},{value:"469028",name:"临高县",parent:"460000"},{value:"469030",name:"白沙黎族自治县",parent:"460000"},{value:"469031",name:"昌江黎族自治县",parent:"460000"},{value:"469033",name:"乐东黎族自治县",parent:"460000"},{value:"469034",name:"陵水黎族自治县",parent:"460000"},{value:"469035",name:"保亭黎族苗族自治县",parent:"460000"},{value:"469036",name:"琼中黎族苗族自治县",parent:"460000"},{value:"469037",name:"西沙群岛",parent:"460000"},{value:"469038",name:"南沙群岛",parent:"460000"},{value:"469039",name:"中沙群岛的岛礁及其海域",parent:"460000"},{value:"471004",name:"高新区",parent:"410300"},{value:"471005",name:"其它区",parent:"410300"},{value:"500101",name:"万州区",parent:"500100"},{value:"500102",name:"涪陵区",parent:"500100"},{value:"500103",name:"渝中区",parent:"500100"},{value:"500104",name:"大渡口区",parent:"500100"},{value:"500105",name:"江北区",parent:"500100"},{value:"500106",name:"沙坪坝区",parent:"500100"},{value:"500107",name:"九龙坡区",parent:"500100"},{value:"500108",name:"南岸区",parent:"500100"},{value:"500109",name:"北碚区",parent:"500100"},{value:"500110",name:"万盛区",parent:"500100"},{value:"500111",name:"双桥区",parent:"500100"},{value:"500112",name:"渝北区",parent:"500100"},{value:"500113",name:"巴南区",parent:"500100"},{value:"500114",name:"黔江区",parent:"500100"},{value:"500115",name:"长寿区",parent:"500100"},{value:"500222",name:"綦江区",parent:"500100"},{value:"500223",name:"潼南县",parent:"500100"},{value:"500224",name:"铜梁区",parent:"500100"},{value:"500225",name:"大足区",parent:"500100"},{value:"500226",name:"荣昌县",parent:"500100"},{value:"500227",name:"璧山区",parent:"500100"},{value:"500228",name:"梁平县",parent:"500100"},{value:"500229",name:"城口县",parent:"500100"},{value:"500230",name:"丰都县",parent:"500100"},{value:"500231",name:"垫江县",parent:"500100"},{value:"500232",name:"武隆县",parent:"500100"},{value:"500233",name:"忠县",parent:"500100"},{value:"500234",name:"开县",parent:"500100"},{value:"500235",name:"云阳县",parent:"500100"},{value:"500236",name:"奉节县",parent:"500100"},{value:"500237",name:"巫山县",parent:"500100"},{value:"500238",name:"巫溪县",parent:"500100"},{value:"500240",name:"石柱土家族自治县",parent:"500100"},{value:"500241",name:"秀山土家族苗族自治县",parent:"500100"},{value:"500242",name:"酉阳土家族苗族自治县",parent:"500100"},{value:"500243",name:"彭水苗族土家族自治县",parent:"500100"},{value:"500381",name:"江津区",parent:"500100"},{value:"500382",name:"合川区",parent:"500100"},{value:"500383",name:"永川区",parent:"500100"},{value:"500384",name:"南川区",parent:"500100"},{value:"500385",name:"其它区",parent:"500100"},{value:"510104",name:"锦江区",parent:"510100"},{value:"510105",name:"青羊区",parent:"510100"},{value:"510106",name:"金牛区",parent:"510100"},{value:"510107",name:"武侯区",parent:"510100"},{value:"510108",name:"成华区",parent:"510100"},{value:"510112",name:"龙泉驿区",parent:"510100"},{value:"510113",name:"青白江区",parent:"510100"},{value:"510114",name:"新都区",parent:"510100"},{value:"510115",name:"温江区",parent:"510100"},{value:"510121",name:"金堂县",parent:"510100"},{value:"510122",name:"双流县",parent:"510100"},{value:"510124",name:"郫县",parent:"510100"},{value:"510129",name:"大邑县",parent:"510100"},{value:"510131",name:"蒲江县",parent:"510100"},{value:"510132",name:"新津县",parent:"510100"},{value:"510181",name:"都江堰市",parent:"510100"},{value:"510182",name:"彭州市",parent:"510100"},{value:"510183",name:"邛崃市",parent:"510100"},{value:"510184",name:"崇州市",parent:"510100"},{value:"510185",name:"其它区",parent:"510100"},{value:"510302",name:"自流井区",parent:"510300"},{value:"510303",name:"贡井区",parent:"510300"},{value:"510304",name:"大安区",parent:"510300"},{value:"510311",name:"沿滩区",parent:"510300"},{value:"510321",name:"荣县",parent:"510300"},{value:"510322",name:"富顺县",parent:"510300"},{value:"510323",name:"其它区",parent:"510300"},{value:"510402",name:"东区",parent:"510400"},{value:"510403",name:"西区",parent:"510400"},{value:"510411",name:"仁和区",parent:"510400"},{value:"510421",name:"米易县",parent:"510400"},{value:"510422",name:"盐边县",parent:"510400"},{value:"510423",name:"其它区",parent:"510400"},{value:"510502",name:"江阳区",parent:"510500"},{value:"510503",name:"纳溪区",parent:"510500"},{value:"510504",name:"龙马潭区",parent:"510500"},{value:"510521",name:"泸县",parent:"510500"},{value:"510522",name:"合江县",parent:"510500"},{value:"510524",name:"叙永县",parent:"510500"},{value:"510525",name:"古蔺县",parent:"510500"},{value:"510526",name:"其它区",parent:"510500"},{value:"510603",name:"旌阳区",parent:"510600"},{value:"510623",name:"中江县",parent:"510600"},{value:"510626",name:"罗江县",parent:"510600"},{value:"510681",name:"广汉市",parent:"510600"},{value:"510682",name:"什邡市",parent:"510600"},{value:"510683",name:"绵竹市",parent:"510600"},{value:"510684",name:"其它区",parent:"510600"},{value:"510703",name:"涪城区",parent:"510700"},{value:"510704",name:"游仙区",parent:"510700"},{value:"510722",name:"三台县",parent:"510700"},{value:"510723",name:"盐亭县",parent:"510700"},{value:"510724",name:"安县",parent:"510700"},{value:"510725",name:"梓潼县",parent:"510700"},{value:"510726",name:"北川羌族自治县",parent:"510700"},{value:"510727",name:"平武县",parent:"510700"},{value:"510751",name:"高新区",parent:"510700"},{value:"510781",name:"江油市",parent:"510700"},{value:"510782",name:"其它区",parent:"510700"},{value:"510802",name:"利州区",parent:"510800"},{value:"510811",name:"昭化区",parent:"510800"},{value:"510812",name:"朝天区",parent:"510800"},{value:"510821",name:"旺苍县",parent:"510800"},{value:"510822",name:"青川县",parent:"510800"},{value:"510823",name:"剑阁县",parent:"510800"},{value:"510824",name:"苍溪县",parent:"510800"},{value:"510825",name:"其它区",parent:"510800"},{value:"510903",name:"船山区",parent:"510900"},{value:"510904",name:"安居区",parent:"510900"},{value:"510921",name:"蓬溪县",parent:"510900"},{value:"510922",name:"射洪县",parent:"510900"},{value:"510923",name:"大英县",parent:"510900"},{value:"510924",name:"其它区",parent:"510900"},{value:"511002",name:"市中区",parent:"511000"},{value:"511011",name:"东兴区",parent:"511000"},{value:"511024",name:"威远县",parent:"511000"},{value:"511025",name:"资中县",parent:"511000"},{value:"511028",name:"隆昌县",parent:"511000"},{value:"511029",name:"其它区",parent:"511000"},{value:"511102",name:"市中区",parent:"511100"},{value:"511111",name:"沙湾区",parent:"511100"},{value:"511112",name:"五通桥区",parent:"511100"},{value:"511113",name:"金口河区",parent:"511100"},{value:"511123",name:"犍为县",parent:"511100"},{value:"511124",name:"井研县",parent:"511100"},{value:"511126",name:"夹江县",parent:"511100"},{value:"511129",name:"沐川县",parent:"511100"},{value:"511132",name:"峨边彝族自治县",parent:"511100"},{value:"511133",name:"马边彝族自治县",parent:"511100"},{value:"511181",name:"峨眉山市",parent:"511100"},{value:"511182",name:"其它区",parent:"511100"},{value:"511302",name:"顺庆区",parent:"511300"},{value:"511303",name:"高坪区",parent:"511300"},{value:"511304",name:"嘉陵区",parent:"511300"},{value:"511321",name:"南部县",parent:"511300"},{value:"511322",name:"营山县",parent:"511300"},{value:"511323",name:"蓬安县",parent:"511300"},{value:"511324",name:"仪陇县",parent:"511300"},{value:"511325",name:"西充县",parent:"511300"},{value:"511381",name:"阆中市",parent:"511300"},{value:"511382",name:"其它区",parent:"511300"},{value:"511402",name:"东坡区",parent:"511400"},{value:"511421",name:"仁寿县",parent:"511400"},{value:"511422",name:"彭山区",parent:"511400"},{value:"511423",name:"洪雅县",parent:"511400"},{value:"511424",name:"丹棱县",parent:"511400"},{value:"511425",name:"青神县",parent:"511400"},{value:"511426",name:"其它区",parent:"511400"},{value:"511502",name:"翠屏区",parent:"511500"},{value:"511521",name:"宜宾县",parent:"511500"},{value:"511522",name:"南溪区",parent:"511500"},{value:"511523",name:"江安县",parent:"511500"},{value:"511524",name:"长宁县",parent:"511500"},{value:"511525",name:"高县",parent:"511500"},{value:"511526",name:"珙县",parent:"511500"},{value:"511527",name:"筠连县",parent:"511500"},{value:"511528",name:"兴文县",parent:"511500"},{value:"511529",name:"屏山县",parent:"511500"},{value:"511530",name:"其它区",parent:"511500"},{value:"511602",name:"广安区",parent:"511600"},{value:"511603",name:"前锋区",parent:"511600"},{value:"511621",name:"岳池县",parent:"511600"},{value:"511622",name:"武胜县",parent:"511600"},{value:"511623",name:"邻水县",parent:"511600"},{value:"511681",name:"华蓥市",parent:"511600"},{value:"511682",name:"市辖区",parent:"511600"},{value:"511683",name:"其它区",parent:"511600"},{value:"511702",name:"通川区",parent:"511700"},{value:"511721",name:"达川区",parent:"511700"},{value:"511722",name:"宣汉县",parent:"511700"},{value:"511723",name:"开江县",parent:"511700"},{value:"511724",name:"大竹县",parent:"511700"},{value:"511725",name:"渠县",parent:"511700"},{value:"511781",name:"万源市",parent:"511700"},{value:"511782",name:"其它区",parent:"511700"},{value:"511802",name:"雨城区",parent:"511800"},{value:"511821",name:"名山区",parent:"511800"},{value:"511822",name:"荥经县",parent:"511800"},{value:"511823",name:"汉源县",parent:"511800"},{value:"511824",name:"石棉县",parent:"511800"},{value:"511825",name:"天全县",parent:"511800"},{value:"511826",name:"芦山县",parent:"511800"},{value:"511827",name:"宝兴县",parent:"511800"},{value:"511828",name:"其它区",parent:"511800"},{value:"511902",name:"巴州区",parent:"511900"},{value:"511903",name:"恩阳区",parent:"511900"},{value:"511921",name:"通江县",parent:"511900"},{value:"511922",name:"南江县",parent:"511900"},{value:"511923",name:"平昌县",parent:"511900"},{value:"511924",name:"其它区",parent:"511900"},{value:"512002",name:"雁江区",parent:"512000"},{value:"512021",name:"安岳县",parent:"512000"},{value:"512022",name:"乐至县",parent:"512000"},{value:"512081",name:"简阳市",parent:"512000"},{value:"512082",name:"其它区",parent:"512000"},{value:"513221",name:"汶川县",parent:"513200"},{value:"513222",name:"理县",parent:"513200"},{value:"513223",name:"茂县",parent:"513200"},{value:"513224",name:"松潘县",parent:"513200"},{value:"513225",name:"九寨沟县",parent:"513200"},{value:"513226",name:"金川县",parent:"513200"},{value:"513227",name:"小金县",parent:"513200"},{value:"513228",name:"黑水县",parent:"513200"},{value:"513229",name:"马尔康县",parent:"513200"},{value:"513230",name:"壤塘县",parent:"513200"},{value:"513231",name:"阿坝县",parent:"513200"},{value:"513232",name:"若尔盖县",parent:"513200"},{value:"513233",name:"红原县",parent:"513200"},{value:"513234",name:"其它区",parent:"513200"},{value:"513321",name:"康定市",parent:"513300"},{value:"513322",name:"泸定县",parent:"513300"},{value:"513323",name:"丹巴县",parent:"513300"},{value:"513324",name:"九龙县",parent:"513300"},{value:"513325",name:"雅江县",parent:"513300"},{value:"513326",name:"道孚县",parent:"513300"},{value:"513327",name:"炉霍县",parent:"513300"},{value:"513328",name:"甘孜县",parent:"513300"},{value:"513329",name:"新龙县",parent:"513300"},{value:"513330",name:"德格县",parent:"513300"},{value:"513331",name:"白玉县",parent:"513300"},{value:"513332",name:"石渠县",parent:"513300"},{value:"513333",name:"色达县",parent:"513300"},{value:"513334",name:"理塘县",parent:"513300"},{value:"513335",name:"巴塘县",parent:"513300"},{value:"513336",name:"乡城县",parent:"513300"},{value:"513337",name:"稻城县",parent:"513300"},{value:"513338",name:"得荣县",parent:"513300"},{value:"513339",name:"其它区",parent:"513300"},{value:"513401",name:"西昌市",parent:"513400"},{value:"513422",name:"木里藏族自治县",parent:"513400"},{value:"513423",name:"盐源县",parent:"513400"},{value:"513424",name:"德昌县",parent:"513400"},{value:"513425",name:"会理县",parent:"513400"},{value:"513426",name:"会东县",parent:"513400"},{value:"513427",name:"宁南县",parent:"513400"},{value:"513428",name:"普格县",parent:"513400"},{value:"513429",name:"布拖县",parent:"513400"},{value:"513430",name:"金阳县",parent:"513400"},{value:"513431",name:"昭觉县",parent:"513400"},{value:"513432",name:"喜德县",parent:"513400"},{value:"513433",name:"冕宁县",parent:"513400"},{value:"513434",name:"越西县",parent:"513400"},{value:"513435",name:"甘洛县",parent:"513400"},{value:"513436",name:"美姑县",parent:"513400"},{value:"513437",name:"雷波县",parent:"513400"},{value:"513438",name:"其它区",parent:"513400"},{value:"520102",name:"南明区",parent:"520100"},{value:"520103",name:"云岩区",parent:"520100"},{value:"520111",name:"花溪区",parent:"520100"},{value:"520112",name:"乌当区",parent:"520100"},{value:"520113",name:"白云区",parent:"520100"},{value:"520114",name:"小河区",parent:"520100"},{value:"520121",name:"开阳县",parent:"520100"},{value:"520122",name:"息烽县",parent:"520100"},{value:"520123",name:"修文县",parent:"520100"},{value:"520151",name:"观山湖区",parent:"520100"},{value:"520181",name:"清镇市",parent:"520100"},{value:"520182",name:"其它区",parent:"520100"},{value:"520201",name:"钟山区",parent:"520200"},{value:"520203",name:"六枝特区",parent:"520200"},{value:"520221",name:"水城县",parent:"520200"},{value:"520222",name:"盘县",parent:"520200"},{value:"520223",name:"其它区",parent:"520200"},{value:"520302",name:"红花岗区",parent:"520300"},{value:"520303",name:"汇川区",parent:"520300"},{value:"520321",name:"遵义县",parent:"520300"},{value:"520322",name:"桐梓县",parent:"520300"},{value:"520323",name:"绥阳县",parent:"520300"},{value:"520324",name:"正安县",parent:"520300"},{value:"520325",name:"道真仡佬族苗族自治县",parent:"520300"},{value:"520326",name:"务川仡佬族苗族自治县",parent:"520300"},{value:"520327",name:"凤冈县",parent:"520300"},{value:"520328",name:"湄潭县",parent:"520300"},{value:"520329",name:"余庆县",parent:"520300"},{value:"520330",name:"习水县",parent:"520300"},{value:"520381",name:"赤水市",parent:"520300"},{value:"520382",name:"仁怀市",parent:"520300"},{value:"520383",name:"其它区",parent:"520300"},{value:"520402",name:"西秀区",parent:"520400"},{value:"520421",name:"平坝区",parent:"520400"},{value:"520422",name:"普定县",parent:"520400"},{value:"520423",name:"镇宁布依族苗族自治县",parent:"520400"},{value:"520424",name:"关岭布依族苗族自治县",parent:"520400"},{value:"520425",name:"紫云苗族布依族自治县",parent:"520400"},{value:"520426",name:"其它区",parent:"520400"},{value:"522201",name:"碧江区",parent:"522200"},{value:"522222",name:"江口县",parent:"522200"},{value:"522223",name:"玉屏侗族自治县",parent:"522200"},{value:"522224",name:"石阡县",parent:"522200"},{value:"522225",name:"思南县",parent:"522200"},{value:"522226",name:"印江土家族苗族自治县",parent:"522200"},{value:"522227",name:"德江县",parent:"522200"},{value:"522228",name:"沿河土家族自治县",parent:"522200"},{value:"522229",name:"松桃苗族自治县",parent:"522200"},{value:"522230",name:"万山区",parent:"522200"},{value:"522231",name:"其它区",parent:"522200"},{value:"522301",name:"兴义市",parent:"522300"},{value:"522322",name:"兴仁县",parent:"522300"},{value:"522323",name:"普安县",parent:"522300"},{value:"522324",name:"晴隆县",parent:"522300"},{value:"522325",name:"贞丰县",parent:"522300"},{value:"522326",name:"望谟县",parent:"522300"},{value:"522327",name:"册亨县",parent:"522300"},{value:"522328",name:"安龙县",parent:"522300"},{value:"522329",name:"其它区",parent:"522300"},{value:"522401",name:"七星关区",parent:"522400"},{value:"522422",name:"大方县",parent:"522400"},{value:"522423",name:"黔西县",parent:"522400"},{value:"522424",name:"金沙县",parent:"522400"},{value:"522425",name:"织金县",parent:"522400"},{value:"522426",name:"纳雍县",parent:"522400"},{value:"522427",name:"威宁彝族回族苗族自治县",parent:"522400"},{value:"522428",name:"赫章县",parent:"522400"},{value:"522429",name:"其它区",parent:"522400"},{value:"522601",name:"凯里市",parent:"522600"},{value:"522622",name:"黄平县",parent:"522600"},{value:"522623",name:"施秉县",parent:"522600"},{value:"522624",name:"三穗县",parent:"522600"},{value:"522625",name:"镇远县",parent:"522600"},{value:"522626",name:"岑巩县",parent:"522600"},{value:"522627",name:"天柱县",parent:"522600"},{value:"522628",name:"锦屏县",parent:"522600"},{value:"522629",name:"剑河县",parent:"522600"},{value:"522630",name:"台江县",parent:"522600"},{value:"522631",name:"黎平县",parent:"522600"},{value:"522632",name:"榕江县",parent:"522600"},{value:"522633",name:"从江县",parent:"522600"},{value:"522634",name:"雷山县",parent:"522600"},{value:"522635",name:"麻江县",parent:"522600"},{value:"522636",name:"丹寨县",parent:"522600"},{value:"522637",name:"其它区",parent:"522600"},{value:"522701",name:"都匀市",parent:"522700"},{value:"522702",name:"福泉市",parent:"522700"},{value:"522722",name:"荔波县",parent:"522700"},{value:"522723",name:"贵定县",parent:"522700"},{value:"522725",name:"瓮安县",parent:"522700"},{value:"522726",name:"独山县",parent:"522700"},{value:"522727",name:"平塘县",parent:"522700"},{value:"522728",name:"罗甸县",parent:"522700"},{value:"522729",name:"长顺县",parent:"522700"},{value:"522730",name:"龙里县",parent:"522700"},{value:"522731",name:"惠水县",parent:"522700"},{value:"522732",name:"三都水族自治县",parent:"522700"},{value:"522733",name:"其它区",parent:"522700"},{value:"530102",name:"五华区",parent:"530100"},{value:"530103",name:"盘龙区",parent:"530100"},{value:"530111",name:"官渡区",parent:"530100"},{value:"530112",name:"西山区",parent:"530100"},{value:"530113",name:"东川区",parent:"530100"},{value:"530121",name:"呈贡区",parent:"530100"},{value:"530122",name:"晋宁县",parent:"530100"},{value:"530124",name:"富民县",parent:"530100"},{value:"530125",name:"宜良县",parent:"530100"},{value:"530126",name:"石林彝族自治县",parent:"530100"},{value:"530127",name:"嵩明县",parent:"530100"},{value:"530128",name:"禄劝彝族苗族自治县",parent:"530100"},{value:"530129",name:"寻甸回族彝族自治县",parent:"530100"},{value:"530181",name:"安宁市",parent:"530100"},{value:"530182",name:"其它区",parent:"530100"},{value:"530302",name:"麒麟区",parent:"530300"},{value:"530321",name:"马龙县",parent:"530300"},{value:"530322",name:"陆良县",parent:"530300"},{value:"530323",name:"师宗县",parent:"530300"},{value:"530324",name:"罗平县",parent:"530300"},{value:"530325",name:"富源县",parent:"530300"},{value:"530326",name:"会泽县",parent:"530300"},{value:"530328",name:"沾益县",parent:"530300"},{value:"530381",name:"宣威市",parent:"530300"},{value:"530382",name:"其它区",parent:"530300"},{value:"530402",name:"红塔区",parent:"530400"},{value:"530421",name:"江川县",parent:"530400"},{value:"530422",name:"澄江县",parent:"530400"},{value:"530423",name:"通海县",parent:"530400"},{value:"530424",name:"华宁县",parent:"530400"},{value:"530425",name:"易门县",parent:"530400"},{value:"530426",name:"峨山彝族自治县",parent:"530400"},{value:"530427",name:"新平彝族傣族自治县",parent:"530400"},{value:"530428",name:"元江哈尼族彝族傣族自治县",parent:"530400"},{value:"530429",name:"其它区",parent:"530400"},{value:"530502",name:"隆阳区",parent:"530500"},{value:"530521",name:"施甸县",parent:"530500"},{value:"530522",name:"腾冲县",parent:"530500"},{value:"530523",name:"龙陵县",parent:"530500"},{value:"530524",name:"昌宁县",parent:"530500"},{value:"530525",name:"其它区",parent:"530500"},{value:"530602",name:"昭阳区",parent:"530600"},{value:"530621",name:"鲁甸县",parent:"530600"},{value:"530622",name:"巧家县",parent:"530600"},{value:"530623",name:"盐津县",parent:"530600"},{value:"530624",name:"大关县",parent:"530600"},{value:"530625",name:"永善县",parent:"530600"},{value:"530626",name:"绥江县",parent:"530600"},{value:"530627",name:"镇雄县",parent:"530600"},{value:"530628",name:"彝良县",parent:"530600"},{value:"530629",name:"威信县",parent:"530600"},{value:"530630",name:"水富县",parent:"530600"},{value:"530631",name:"其它区",parent:"530600"},{value:"530702",name:"古城区",parent:"530700"},{value:"530721",name:"玉龙纳西族自治县",parent:"530700"},{value:"530722",name:"永胜县",parent:"530700"},{value:"530723",name:"华坪县",parent:"530700"},{value:"530724",name:"宁蒗彝族自治县",parent:"530700"},{value:"530725",name:"其它区",parent:"530700"},{value:"530802",name:"思茅区",parent:"530800"},{value:"530821",name:"宁洱哈尼族彝族自治县",parent:"530800"},{value:"530822",name:"墨江哈尼族自治县",parent:"530800"},{value:"530823",name:"景东彝族自治县",parent:"530800"},{value:"530824",name:"景谷傣族彝族自治县",parent:"530800"},{value:"530825",name:"镇沅彝族哈尼族拉祜族自治县",parent:"530800"},{value:"530826",name:"江城哈尼族彝族自治县",parent:"530800"},{value:"530827",name:"孟连傣族拉祜族佤族自治县",parent:"530800"},{value:"530828",name:"澜沧拉祜族自治县",parent:"530800"},{value:"530829",name:"西盟佤族自治县",parent:"530800"},{value:"530830",name:"其它区",parent:"530800"},{value:"530902",name:"临翔区",parent:"530900"},{value:"530921",name:"凤庆县",parent:"530900"},{value:"530922",name:"云县",parent:"530900"},{value:"530923",name:"永德县",parent:"530900"},{value:"530924",name:"镇康县",parent:"530900"},{value:"530925",name:"双江拉祜族佤族布朗族傣族自治县",parent:"530900"},{value:"530926",name:"耿马傣族佤族自治县",parent:"530900"},{value:"530927",name:"沧源佤族自治县",parent:"530900"},{value:"530928",name:"其它区",parent:"530900"},{value:"532301",name:"楚雄市",parent:"532300"},{value:"532322",name:"双柏县",parent:"532300"},{value:"532323",name:"牟定县",parent:"532300"},{value:"532324",name:"南华县",parent:"532300"},{value:"532325",name:"姚安县",parent:"532300"},{value:"532326",name:"大姚县",parent:"532300"},{value:"532327",name:"永仁县",parent:"532300"},{value:"532328",name:"元谋县",parent:"532300"},{value:"532329",name:"武定县",parent:"532300"},{value:"532331",name:"禄丰县",parent:"532300"},{value:"532332",name:"其它区",parent:"532300"},{value:"532501",name:"个旧市",parent:"532500"},{value:"532502",name:"开远市",parent:"532500"},{value:"532522",name:"蒙自市",parent:"532500"},{value:"532523",name:"屏边苗族自治县",parent:"532500"},{value:"532524",name:"建水县",parent:"532500"},{value:"532525",name:"石屏县",parent:"532500"},{value:"532526",name:"弥勒市",parent:"532500"},{value:"532527",name:"泸西县",parent:"532500"},{value:"532528",name:"元阳县",parent:"532500"},{value:"532529",name:"红河县",parent:"532500"},{value:"532530",name:"金平苗族瑶族傣族自治县",parent:"532500"},{value:"532531",name:"绿春县",parent:"532500"},{value:"532532",name:"河口瑶族自治县",parent:"532500"},{value:"532533",name:"其它区",parent:"532500"},{value:"532621",name:"文山市",parent:"532600"},{value:"532622",name:"砚山县",parent:"532600"},{value:"532623",name:"西畴县",parent:"532600"},{value:"532624",name:"麻栗坡县",parent:"532600"},{value:"532625",name:"马关县",parent:"532600"},{value:"532626",name:"丘北县",parent:"532600"},{value:"532627",name:"广南县",parent:"532600"},{value:"532628",name:"富宁县",parent:"532600"},{value:"532629",name:"其它区",parent:"532600"},{value:"532801",name:"景洪市",parent:"532800"},{value:"532822",name:"勐海县",parent:"532800"},{value:"532823",name:"勐腊县",parent:"532800"},{value:"532824",name:"其它区",parent:"532800"},{value:"532901",name:"大理市",parent:"532900"},{value:"532922",name:"漾濞彝族自治县",parent:"532900"},{value:"532923",name:"祥云县",parent:"532900"},{value:"532924",name:"宾川县",parent:"532900"},{value:"532925",name:"弥渡县",parent:"532900"},{value:"532926",name:"南涧彝族自治县",parent:"532900"},{value:"532927",name:"巍山彝族回族自治县",parent:"532900"},{value:"532928",name:"永平县",parent:"532900"},{value:"532929",name:"云龙县",parent:"532900"},{value:"532930",name:"洱源县",parent:"532900"},{value:"532931",name:"剑川县",parent:"532900"},{value:"532932",name:"鹤庆县",parent:"532900"},{value:"532933",name:"其它区",parent:"532900"},{value:"533102",name:"瑞丽市",parent:"533100"},{value:"533103",name:"芒市",parent:"533100"},{value:"533122",name:"梁河县",parent:"533100"},{value:"533123",name:"盈江县",parent:"533100"},{value:"533124",name:"陇川县",parent:"533100"},{value:"533125",name:"其它区",parent:"533100"},{value:"533321",name:"泸水县",parent:"533300"},{value:"533323",name:"福贡县",parent:"533300"},{value:"533324",name:"贡山独龙族怒族自治县",parent:"533300"},{value:"533325",name:"兰坪白族普米族自治县",parent:"533300"},{value:"533326",name:"其它区",parent:"533300"},{value:"533421",name:"香格里拉市",parent:"533400"},{value:"533422",name:"德钦县",parent:"533400"},{value:"533423",name:"维西傈僳族自治县",parent:"533400"},{value:"533424",name:"其它区",parent:"533400"},{value:"540102",name:"城关区",parent:"540100"},{value:"540121",name:"林周县",parent:"540100"},{value:"540122",name:"当雄县",parent:"540100"},{value:"540123",name:"尼木县",parent:"540100"},{value:"540124",name:"曲水县",parent:"540100"},{value:"540125",name:"堆龙德庆县",parent:"540100"},{value:"540126",name:"达孜县",parent:"540100"},{value:"540127",name:"墨竹工卡县",parent:"540100"},{value:"540128",name:"其它区",parent:"540100"},{value:"542121",name:"卡若区",parent:"542100"},{value:"542122",name:"江达县",parent:"542100"},{value:"542123",name:"贡觉县",parent:"542100"},{value:"542124",name:"类乌齐县",parent:"542100"},{value:"542125",name:"丁青县",parent:"542100"},{value:"542126",name:"察雅县",parent:"542100"},{value:"542127",name:"八宿县",parent:"542100"},{value:"542128",name:"左贡县",parent:"542100"},{value:"542129",name:"芒康县",parent:"542100"},{value:"542132",name:"洛隆县",parent:"542100"},{value:"542133",name:"边坝县",parent:"542100"},{value:"542134",name:"其它区",parent:"542100"},{value:"542221",name:"乃东县",parent:"542200"},{value:"542222",name:"扎囊县",parent:"542200"},{value:"542223",name:"贡嘎县",parent:"542200"},{value:"542224",name:"桑日县",parent:"542200"},{value:"542225",name:"琼结县",parent:"542200"},{value:"542226",name:"曲松县",parent:"542200"},{value:"542227",name:"措美县",parent:"542200"},{value:"542228",name:"洛扎县",parent:"542200"},{value:"542229",name:"加查县",parent:"542200"},{value:"542231",name:"隆子县",parent:"542200"},{value:"542232",name:"错那县",parent:"542200"},{value:"542233",name:"浪卡子县",parent:"542200"},{value:"542234",name:"其它区",parent:"542200"},{value:"542301",name:"桑珠孜区",parent:"542300"},{value:"542322",name:"南木林县",parent:"542300"},{value:"542323",name:"江孜县",parent:"542300"},{value:"542324",name:"定日县",parent:"542300"},{value:"542325",name:"萨迦县",parent:"542300"},{value:"542326",name:"拉孜县",parent:"542300"},{value:"542327",name:"昂仁县",parent:"542300"},{value:"542328",name:"谢通门县",parent:"542300"},{value:"542329",name:"白朗县",parent:"542300"},{value:"542330",name:"仁布县",parent:"542300"},{value:"542331",name:"康马县",parent:"542300"},{value:"542332",name:"定结县",parent:"542300"},{value:"542333",name:"仲巴县",parent:"542300"},{value:"542334",name:"亚东县",parent:"542300"},{value:"542335",name:"吉隆县",parent:"542300"},{value:"542336",name:"聂拉木县",parent:"542300"},{value:"542337",name:"萨嘎县",parent:"542300"},{value:"542338",name:"岗巴县",parent:"542300"},{value:"542339",name:"其它区",parent:"542300"},{value:"542421",name:"那曲县",parent:"542400"},{value:"542422",name:"嘉黎县",parent:"542400"},{value:"542423",name:"比如县",parent:"542400"},{value:"542424",name:"聂荣县",parent:"542400"},{value:"542425",name:"安多县",parent:"542400"},{value:"542426",name:"申扎县",parent:"542400"},{value:"542427",name:"索县",parent:"542400"},{value:"542428",name:"班戈县",parent:"542400"},{value:"542429",name:"巴青县",parent:"542400"},{value:"542430",name:"尼玛县",parent:"542400"},{value:"542431",name:"其它区",parent:"542400"},{value:"542432",name:"双湖县",parent:"542400"},{value:"542521",name:"普兰县",parent:"542500"},{value:"542522",name:"札达县",parent:"542500"},{value:"542523",name:"噶尔县",parent:"542500"},{value:"542524",name:"日土县",parent:"542500"},{value:"542525",name:"革吉县",parent:"542500"},{value:"542526",name:"改则县",parent:"542500"},{value:"542527",name:"措勤县",parent:"542500"},{value:"542528",name:"其它区",parent:"542500"},{value:"542621",name:"巴宜区",parent:"542600"},{value:"542622",name:"工布江达县",parent:"542600"},{value:"542623",name:"米林县",parent:"542600"},{value:"542624",name:"墨脱县",parent:"542600"},{value:"542625",name:"波密县",parent:"542600"},{value:"542626",name:"察隅县",parent:"542600"},{value:"542627",name:"朗县",parent:"542600"},{value:"542628",name:"其它区",parent:"542600"},{value:"610102",name:"新城区",parent:"610100"},{value:"610103",name:"碑林区",parent:"610100"},{value:"610104",name:"莲湖区",parent:"610100"},{value:"610111",name:"灞桥区",parent:"610100"},{value:"610112",name:"未央区",parent:"610100"},{value:"610113",name:"雁塔区",parent:"610100"},{value:"610114",name:"阎良区",parent:"610100"},{value:"610115",name:"临潼区",parent:"610100"},{value:"610116",name:"长安区",parent:"610100"},{value:"610122",name:"蓝田县",parent:"610100"},{value:"610124",name:"周至县",parent:"610100"},{value:"610125",name:"户县",parent:"610100"},{value:"610126",name:"高陵区",parent:"610100"},{value:"610127",name:"其它区",parent:"610100"},{value:"610202",name:"王益区",parent:"610200"},{value:"610203",name:"印台区",parent:"610200"},{value:"610204",name:"耀州区",parent:"610200"},{value:"610222",name:"宜君县",parent:"610200"},{value:"610223",name:"其它区",parent:"610200"},{value:"610302",name:"渭滨区",parent:"610300"},{value:"610303",name:"金台区",parent:"610300"},{value:"610304",name:"陈仓区",parent:"610300"},{value:"610322",name:"凤翔县",parent:"610300"},{value:"610323",name:"岐山县",parent:"610300"},{value:"610324",name:"扶风县",parent:"610300"},{value:"610326",name:"眉县",parent:"610300"},{value:"610327",name:"陇县",parent:"610300"},{value:"610328",name:"千阳县",parent:"610300"},{value:"610329",name:"麟游县",parent:"610300"},{value:"610330",name:"凤县",parent:"610300"},{value:"610331",name:"太白县",parent:"610300"},{value:"610332",name:"其它区",parent:"610300"},{value:"610402",name:"秦都区",parent:"610400"},{value:"610403",name:"杨陵区",parent:"610400"},{value:"610404",name:"渭城区",parent:"610400"},{value:"610422",name:"三原县",parent:"610400"},{value:"610423",name:"泾阳县",parent:"610400"},{value:"610424",name:"乾县",parent:"610400"},{value:"610425",name:"礼泉县",parent:"610400"},{value:"610426",name:"永寿县",parent:"610400"},{value:"610427",name:"彬县",parent:"610400"},{value:"610428",name:"长武县",parent:"610400"},{value:"610429",name:"旬邑县",parent:"610400"},{value:"610430",name:"淳化县",parent:"610400"},{value:"610431",name:"武功县",parent:"610400"},{value:"610481",name:"兴平市",parent:"610400"},{value:"610482",name:"其它区",parent:"610400"},{value:"610502",name:"临渭区",parent:"610500"},{value:"610521",name:"华县",parent:"610500"},{value:"610522",name:"潼关县",parent:"610500"},{value:"610523",name:"大荔县",parent:"610500"},{value:"610524",name:"合阳县",parent:"610500"},{value:"610525",name:"澄城县",parent:"610500"},{value:"610526",name:"蒲城县",parent:"610500"},{value:"610527",name:"白水县",parent:"610500"},{value:"610528",name:"富平县",parent:"610500"},{value:"610581",name:"韩城市",parent:"610500"},{value:"610582",name:"华阴市",parent:"610500"},{value:"610583",name:"其它区",parent:"610500"},{value:"610602",name:"宝塔区",parent:"610600"},{value:"610621",name:"延长县",parent:"610600"},{value:"610622",name:"延川县",parent:"610600"},{value:"610623",name:"子长县",parent:"610600"},{value:"610624",name:"安塞县",parent:"610600"},{value:"610625",name:"志丹县",parent:"610600"},{value:"610626",name:"吴起县",parent:"610600"},{value:"610627",name:"甘泉县",parent:"610600"},{value:"610628",name:"富县",parent:"610600"},{value:"610629",name:"洛川县",parent:"610600"},{value:"610630",name:"宜川县",parent:"610600"},{value:"610631",name:"黄龙县",parent:"610600"},{value:"610632",name:"黄陵县",parent:"610600"},{value:"610633",name:"其它区",parent:"610600"},{value:"610702",name:"汉台区",parent:"610700"},{value:"610721",name:"南郑县",parent:"610700"},{value:"610722",name:"城固县",parent:"610700"},{value:"610723",name:"洋县",parent:"610700"},{value:"610724",name:"西乡县",parent:"610700"},{value:"610725",name:"勉县",parent:"610700"},{value:"610726",name:"宁强县",parent:"610700"},{value:"610727",name:"略阳县",parent:"610700"},{value:"610728",name:"镇巴县",parent:"610700"},{value:"610729",name:"留坝县",parent:"610700"},{value:"610730",name:"佛坪县",parent:"610700"},{value:"610731",name:"其它区",parent:"610700"},{value:"610802",name:"榆阳区",parent:"610800"},{value:"610821",name:"神木县",parent:"610800"},{value:"610822",name:"府谷县",parent:"610800"},{value:"610823",name:"横山县",parent:"610800"},{value:"610824",name:"靖边县",parent:"610800"},{value:"610825",name:"定边县",parent:"610800"},{value:"610826",name:"绥德县",parent:"610800"},{value:"610827",name:"米脂县",parent:"610800"},{value:"610828",name:"佳县",parent:"610800"},{value:"610829",name:"吴堡县",parent:"610800"},{value:"610830",name:"清涧县",parent:"610800"},{value:"610831",name:"子洲县",parent:"610800"},{value:"610832",name:"其它区",parent:"610800"},{value:"610902",name:"汉滨区",parent:"610900"},{value:"610921",name:"汉阴县",parent:"610900"},{value:"610922",name:"石泉县",parent:"610900"},{value:"610923",name:"宁陕县",parent:"610900"},{value:"610924",name:"紫阳县",parent:"610900"},{value:"610925",name:"岚皋县",parent:"610900"},{value:"610926",name:"平利县",parent:"610900"},{value:"610927",name:"镇坪县",parent:"610900"},{value:"610928",name:"旬阳县",parent:"610900"},{value:"610929",name:"白河县",parent:"610900"},{value:"610930",name:"其它区",parent:"610900"},{value:"611002",name:"商州区",parent:"611000"},{value:"611021",name:"洛南县",parent:"611000"},{value:"611022",name:"丹凤县",parent:"611000"},{value:"611023",name:"商南县",parent:"611000"},{value:"611024",name:"山阳县",parent:"611000"},{value:"611025",name:"镇安县",parent:"611000"},{value:"611026",name:"柞水县",parent:"611000"},{value:"611027",name:"其它区",parent:"611000"},{value:"620102",name:"城关区",parent:"620100"},{value:"620103",name:"七里河区",parent:"620100"},{value:"620104",name:"西固区",parent:"620100"},{value:"620105",name:"安宁区",parent:"620100"},{value:"620111",name:"红古区",parent:"620100"},{value:"620121",name:"永登县",parent:"620100"},{value:"620122",name:"皋兰县",parent:"620100"},{value:"620123",name:"榆中县",parent:"620100"},{value:"620124",name:"其它区",parent:"620100"},{value:"620302",name:"金川区",parent:"620300"},{value:"620321",name:"永昌县",parent:"620300"},{value:"620322",name:"其它区",parent:"620300"},{value:"620402",name:"白银区",parent:"620400"},{value:"620403",name:"平川区",parent:"620400"},{value:"620421",name:"靖远县",parent:"620400"},{value:"620422",name:"会宁县",parent:"620400"},{value:"620423",name:"景泰县",parent:"620400"},{value:"620424",name:"其它区",parent:"620400"},{value:"620502",name:"秦州区",parent:"620500"},{value:"620503",name:"麦积区",parent:"620500"},{value:"620521",name:"清水县",parent:"620500"},{value:"620522",name:"秦安县",parent:"620500"},{value:"620523",name:"甘谷县",parent:"620500"},{value:"620524",name:"武山县",parent:"620500"},{value:"620525",name:"张家川回族自治县",parent:"620500"},{value:"620526",name:"其它区",parent:"620500"},{value:"620602",name:"凉州区",parent:"620600"},{value:"620621",name:"民勤县",parent:"620600"},{value:"620622",name:"古浪县",parent:"620600"},{value:"620623",name:"天祝藏族自治县",parent:"620600"},{value:"620624",name:"其它区",parent:"620600"},{value:"620702",name:"甘州区",parent:"620700"},{value:"620721",name:"肃南裕固族自治县",parent:"620700"},{value:"620722",name:"民乐县",parent:"620700"},{value:"620723",name:"临泽县",parent:"620700"},{value:"620724",name:"高台县",parent:"620700"},{value:"620725",name:"山丹县",parent:"620700"},{value:"620726",name:"其它区",parent:"620700"},{value:"620802",name:"崆峒区",parent:"620800"},{value:"620821",name:"泾川县",parent:"620800"},{value:"620822",name:"灵台县",parent:"620800"},{value:"620823",name:"崇信县",parent:"620800"},{value:"620824",name:"华亭县",parent:"620800"},{value:"620825",name:"庄浪县",parent:"620800"},{value:"620826",name:"静宁县",parent:"620800"},{value:"620827",name:"其它区",parent:"620800"},{value:"620902",name:"肃州区",parent:"620900"},{value:"620921",name:"金塔县",parent:"620900"},{value:"620922",name:"瓜州县",parent:"620900"},{value:"620923",name:"肃北蒙古族自治县",parent:"620900"},{value:"620924",name:"阿克塞哈萨克族自治县",parent:"620900"},{value:"620981",name:"玉门市",parent:"620900"},{value:"620982",name:"敦煌市",parent:"620900"},{value:"620983",name:"其它区",parent:"620900"},{value:"621002",name:"西峰区",parent:"621000"},{value:"621021",name:"庆城县",parent:"621000"},{value:"621022",name:"环县",parent:"621000"},{value:"621023",name:"华池县",parent:"621000"},{value:"621024",name:"合水县",parent:"621000"},{value:"621025",name:"正宁县",parent:"621000"},{value:"621026",name:"宁县",parent:"621000"},{value:"621027",name:"镇原县",parent:"621000"},{value:"621028",name:"其它区",parent:"621000"},{value:"621102",name:"安定区",parent:"621100"},{value:"621121",name:"通渭县",parent:"621100"},{value:"621122",name:"陇西县",parent:"621100"},{value:"621123",name:"渭源县",parent:"621100"},{value:"621124",name:"临洮县",parent:"621100"},{value:"621125",name:"漳县",parent:"621100"},{value:"621126",name:"岷县",parent:"621100"},{value:"621127",name:"其它区",parent:"621100"},{value:"621202",name:"武都区",parent:"621200"},{value:"621221",name:"成县",parent:"621200"},{value:"621222",name:"文县",parent:"621200"},{value:"621223",name:"宕昌县",parent:"621200"},{value:"621224",name:"康县",parent:"621200"},{value:"621225",name:"西和县",parent:"621200"},{value:"621226",name:"礼县",parent:"621200"},{value:"621227",name:"徽县",parent:"621200"},{value:"621228",name:"两当县",parent:"621200"},{value:"621229",name:"其它区",parent:"621200"},{value:"622901",name:"临夏市",parent:"622900"},{value:"622921",name:"临夏县",parent:"622900"},{value:"622922",name:"康乐县",parent:"622900"},{value:"622923",name:"永靖县",parent:"622900"},{value:"622924",name:"广河县",parent:"622900"},{value:"622925",name:"和政县",parent:"622900"},{value:"622926",name:"东乡族自治县",parent:"622900"},{value:"622927",name:"积石山保安族东乡族撒拉族自治县",parent:"622900"},{value:"622928",name:"其它区",parent:"622900"},{value:"623001",name:"合作市",parent:"623000"},{value:"623021",name:"临潭县",parent:"623000"},{value:"623022",name:"卓尼县",parent:"623000"},{value:"623023",name:"舟曲县",parent:"623000"},{value:"623024",name:"迭部县",parent:"623000"},{value:"623025",name:"玛曲县",parent:"623000"},{value:"623026",name:"碌曲县",parent:"623000"},{value:"623027",name:"夏河县",parent:"623000"},{value:"623028",name:"其它区",parent:"623000"},{value:"630102",name:"城东区",parent:"630100"},{value:"630103",name:"城中区",parent:"630100"},{value:"630104",name:"城西区",parent:"630100"},{value:"630105",name:"城北区",parent:"630100"},{value:"630121",name:"大通回族土族自治县",parent:"630100"},{value:"630122",name:"湟中县",parent:"630100"},{value:"630123",name:"湟源县",parent:"630100"},{value:"630124",name:"其它区",parent:"630100"},{value:"632121",name:"平安区",parent:"632100"},{value:"632122",name:"民和回族土族自治县",parent:"632100"},{value:"632123",name:"乐都区",parent:"632100"},{value:"632126",name:"互助土族自治县",parent:"632100"},{value:"632127",name:"化隆回族自治县",parent:"632100"},{value:"632128",name:"循化撒拉族自治县",parent:"632100"},{value:"632129",name:"其它区",parent:"632100"},{value:"632221",name:"门源回族自治县",parent:"632200"},{value:"632222",name:"祁连县",parent:"632200"},{value:"632223",name:"海晏县",parent:"632200"},{value:"632224",name:"刚察县",parent:"632200"},{value:"632225",name:"其它区",parent:"632200"},{value:"632321",name:"同仁县",parent:"632300"},{value:"632322",name:"尖扎县",parent:"632300"},{value:"632323",name:"泽库县",parent:"632300"},{value:"632324",name:"河南蒙古族自治县",parent:"632300"},{value:"632325",name:"其它区",parent:"632300"},{value:"632521",name:"共和县",parent:"632500"},{value:"632522",name:"同德县",parent:"632500"},{value:"632523",name:"贵德县",parent:"632500"},{value:"632524",name:"兴海县",parent:"632500"},{value:"632525",name:"贵南县",parent:"632500"},{value:"632526",name:"其它区",parent:"632500"},{value:"632621",name:"玛沁县",parent:"632600"},{value:"632622",name:"班玛县",parent:"632600"},{value:"632623",name:"甘德县",parent:"632600"},{value:"632624",name:"达日县",parent:"632600"},{value:"632625",name:"久治县",parent:"632600"},{value:"632626",name:"玛多县",parent:"632600"},{value:"632627",name:"其它区",parent:"632600"},{value:"632721",name:"玉树市",parent:"632700"},{value:"632722",name:"杂多县",parent:"632700"},{value:"632723",name:"称多县",parent:"632700"},{value:"632724",name:"治多县",parent:"632700"},{value:"632725",name:"囊谦县",parent:"632700"},{value:"632726",name:"曲麻莱县",parent:"632700"},{value:"632727",name:"其它区",parent:"632700"},{value:"632801",name:"格尔木市",parent:"632800"},{value:"632802",name:"德令哈市",parent:"632800"},{value:"632821",name:"乌兰县",parent:"632800"},{value:"632822",name:"都兰县",parent:"632800"},{value:"632823",name:"天峻县",parent:"632800"},{value:"632824",name:"其它区",parent:"632800"},{value:"640104",name:"兴庆区",parent:"640100"},{value:"640105",name:"西夏区",parent:"640100"},{value:"640106",name:"金凤区",parent:"640100"},{value:"640121",name:"永宁县",parent:"640100"},{value:"640122",name:"贺兰县",parent:"640100"},{value:"640181",name:"灵武市",parent:"640100"},{value:"640182",name:"其它区",parent:"640100"},{value:"640202",name:"大武口区",parent:"640200"},{value:"640205",name:"惠农区",parent:"640200"},{value:"640221",name:"平罗县",parent:"640200"},{value:"640222",name:"其它区",parent:"640200"},{value:"640302",name:"利通区",parent:"640300"},{value:"640303",name:"红寺堡区",parent:"640300"},{value:"640323",name:"盐池县",parent:"640300"},{value:"640324",name:"同心县",parent:"640300"},{value:"640381",name:"青铜峡市",parent:"640300"},{value:"640382",name:"其它区",parent:"640300"},{value:"640402",name:"原州区",parent:"640400"},{value:"640422",name:"西吉县",parent:"640400"},{value:"640423",name:"隆德县",parent:"640400"},{value:"640424",name:"泾源县",parent:"640400"},{value:"640425",name:"彭阳县",parent:"640400"},{value:"640426",name:"其它区",parent:"640400"},{value:"640502",name:"沙坡头区",parent:"640500"},{value:"640521",name:"中宁县",parent:"640500"},{value:"640522",name:"海原县",parent:"640500"},{value:"640523",name:"其它区",parent:"640500"},{value:"650102",name:"天山区",parent:"650100"},{value:"650103",name:"沙依巴克区",parent:"650100"},{value:"650104",name:"新市区",parent:"650100"},{value:"650105",name:"水磨沟区",parent:"650100"},{value:"650106",name:"头屯河区",parent:"650100"},{value:"650107",name:"达坂城区",parent:"650100"},{value:"650108",name:"东山区",parent:"650100"},{value:"650109",name:"米东区",parent:"650100"},{value:"650121",name:"乌鲁木齐县",parent:"650100"},{value:"650122",name:"其它区",parent:"650100"},{value:"650202",name:"独山子区",parent:"650200"},{value:"650203",name:"克拉玛依区",parent:"650200"},{value:"650204",name:"白碱滩区",parent:"650200"},{value:"650205",name:"乌尔禾区",parent:"650200"},{value:"650206",name:"其它区",parent:"650200"},{value:"652101",name:"高昌区",parent:"652100"},{value:"652122",name:"鄯善县",parent:"652100"},{value:"652123",name:"托克逊县",parent:"652100"},{value:"652124",name:"其它区",parent:"652100"},{value:"652201",name:"哈密市",parent:"652200"},{value:"652222",name:"巴里坤哈萨克自治县",parent:"652200"},{value:"652223",name:"伊吾县",parent:"652200"},{value:"652224",name:"其它区",parent:"652200"},{value:"652301",name:"昌吉市",parent:"652300"},{value:"652302",name:"阜康市",parent:"652300"},{value:"652303",name:"米泉市",parent:"652300"},{value:"652323",name:"呼图壁县",parent:"652300"},{value:"652324",name:"玛纳斯县",parent:"652300"},{value:"652325",name:"奇台县",parent:"652300"},{value:"652327",name:"吉木萨尔县",parent:"652300"},{value:"652328",name:"木垒哈萨克自治县",parent:"652300"},{value:"652329",name:"其它区",parent:"652300"},{value:"652701",name:"博乐市",parent:"652700"},{value:"652702",name:"阿拉山口市",parent:"652700"},{value:"652722",name:"精河县",parent:"652700"},{value:"652723",name:"温泉县",parent:"652700"},{value:"652724",name:"其它区",parent:"652700"},{value:"652801",name:"库尔勒市",parent:"652800"},{value:"652822",name:"轮台县",parent:"652800"},{value:"652823",name:"尉犁县",parent:"652800"},{value:"652824",name:"若羌县",parent:"652800"},{value:"652825",name:"且末县",parent:"652800"},{value:"652826",name:"焉耆回族自治县",parent:"652800"},{value:"652827",name:"和静县",parent:"652800"},{value:"652828",name:"和硕县",parent:"652800"},{value:"652829",name:"博湖县",parent:"652800"},{value:"652830",name:"其它区",parent:"652800"},{value:"652901",name:"阿克苏市",parent:"652900"},{value:"652922",name:"温宿县",parent:"652900"},{value:"652923",name:"库车县",parent:"652900"},{value:"652924",name:"沙雅县",parent:"652900"},{value:"652925",name:"新和县",parent:"652900"},{value:"652926",name:"拜城县",parent:"652900"},{value:"652927",name:"乌什县",parent:"652900"},{value:"652928",name:"阿瓦提县",parent:"652900"},{value:"652929",name:"柯坪县",parent:"652900"},{value:"652930",name:"其它区",parent:"652900"},{value:"653001",name:"阿图什市",parent:"653000"},{value:"653022",name:"阿克陶县",parent:"653000"},{value:"653023",name:"阿合奇县",parent:"653000"},{value:"653024",name:"乌恰县",parent:"653000"},{value:"653025",name:"其它区",parent:"653000"},{value:"653101",name:"喀什市",parent:"653100"},{value:"653121",name:"疏附县",parent:"653100"},{value:"653122",name:"疏勒县",parent:"653100"},{value:"653123",name:"英吉沙县",parent:"653100"},{value:"653124",name:"泽普县",parent:"653100"},{value:"653125",name:"莎车县",parent:"653100"},{value:"653126",name:"叶城县",parent:"653100"},{value:"653127",name:"麦盖提县",parent:"653100"},{value:"653128",name:"岳普湖县",parent:"653100"},{value:"653129",name:"伽师县",parent:"653100"},{value:"653130",name:"巴楚县",parent:"653100"},{value:"653131",name:"塔什库尔干塔吉克自治县",parent:"653100"},{value:"653132",name:"其它区",parent:"653100"},{value:"653201",name:"和田市",parent:"653200"},{value:"653221",name:"和田县",parent:"653200"},{value:"653222",name:"墨玉县",parent:"653200"},{value:"653223",name:"皮山县",parent:"653200"},{value:"653224",name:"洛浦县",parent:"653200"},{value:"653225",name:"策勒县",parent:"653200"},{value:"653226",name:"于田县",parent:"653200"},{value:"653227",name:"民丰县",parent:"653200"},{value:"653228",name:"其它区",parent:"653200"},{value:"654002",name:"伊宁市",parent:"654000"},{value:"654003",name:"奎屯市",parent:"654000"},{value:"654004",name:"霍尔果斯市",parent:"654000"},{value:"654021",name:"伊宁县",parent:"654000"},{value:"654022",name:"察布查尔锡伯自治县",parent:"654000"},{value:"654023",name:"霍城县",parent:"654000"},{value:"654024",name:"巩留县",parent:"654000"},{value:"654025",name:"新源县",parent:"654000"},{value:"654026",name:"昭苏县",parent:"654000"},{value:"654027",name:"特克斯县",parent:"654000"},{value:"654028",name:"尼勒克县",parent:"654000"},{value:"654029",name:"其它区",parent:"654000"},{value:"654201",name:"塔城市",parent:"654200"},{value:"654202",name:"乌苏市",parent:"654200"},{value:"654221",name:"额敏县",parent:"654200"},{value:"654223",name:"沙湾县",parent:"654200"},{value:"654224",name:"托里县",parent:"654200"},{value:"654225",name:"裕民县",parent:"654200"},{value:"654226",name:"和布克赛尔蒙古自治县",parent:"654200"},{value:"654227",name:"其它区",parent:"654200"},{value:"654301",name:"阿勒泰市",parent:"654300"},{value:"654321",name:"布尔津县",parent:"654300"},{value:"654322",name:"富蕴县",parent:"654300"},{value:"654323",name:"福海县",parent:"654300"},{value:"654324",name:"哈巴河县",parent:"654300"},{value:"654325",name:"青河县",parent:"654300"},{value:"654326",name:"吉木乃县",parent:"654300"},{value:"654327",name:"其它区",parent:"654300"},{value:"659001",name:"石河子市",parent:"650000"},{value:"659002",name:"阿拉尔市",parent:"650000"},{value:"659003",name:"图木舒克市",parent:"650000"},{value:"659004",name:"五家渠市",parent:"650000"},{value:"659007",name:"双河市",parent:"659000"},{value:"659008",name:"可克达拉市",parent:"659000"},{value:"710101",name:"中正区",parent:"710100"},{value:"710102",name:"大同区",parent:"710100"},{value:"710103",name:"中山区",parent:"710100"},{value:"710104",name:"松山区",parent:"710100"},{value:"710105",name:"大安区",parent:"710100"},{value:"710106",name:"万华区",parent:"710100"},{value:"710107",name:"信义区",parent:"710100"},{value:"710108",name:"士林区",parent:"710100"},{value:"710109",name:"北投区",parent:"710100"},{value:"710110",name:"内湖区",parent:"710100"},{value:"710111",name:"南港区",parent:"710100"},{value:"710112",name:"文山区",parent:"710100"},{value:"710113",name:"其它区",parent:"710100"},{value:"710201",name:"新兴区",parent:"710200"},{value:"710202",name:"前金区",parent:"710200"},{value:"710203",name:"芩雅区",parent:"710200"},{value:"710204",name:"盐埕区",parent:"710200"},{value:"710205",name:"鼓山区",parent:"710200"},{value:"710206",name:"旗津区",parent:"710200"},{value:"710207",name:"前镇区",parent:"710200"},{value:"710208",name:"三民区",parent:"710200"},{value:"710209",name:"左营区",parent:"710200"},{value:"710210",name:"楠梓区",parent:"710200"},{value:"710211",name:"小港区",parent:"710200"},{value:"710212",name:"其它区",parent:"710200"},{value:"710241",name:"苓雅区",parent:"710200"},{value:"710242",name:"仁武区",parent:"710200"},{value:"710243",name:"大社区",parent:"710200"},{value:"710244",name:"冈山区",parent:"710200"},{value:"710245",name:"路竹区",parent:"710200"},{value:"710246",name:"阿莲区",parent:"710200"},{value:"710247",name:"田寮区",parent:"710200"},{value:"710248",name:"燕巢区",parent:"710200"},{value:"710249",name:"桥头区",parent:"710200"},{value:"710250",name:"梓官区",parent:"710200"},{value:"710251",name:"弥陀区",parent:"710200"},{value:"710252",name:"永安区",parent:"710200"},{value:"710253",name:"湖内区",parent:"710200"},{value:"710254",name:"凤山区",parent:"710200"},{value:"710255",name:"大寮区",parent:"710200"},{value:"710256",name:"林园区",parent:"710200"},{value:"710257",name:"鸟松区",parent:"710200"},{value:"710258",name:"大树区",parent:"710200"},{value:"710259",name:"旗山区",parent:"710200"},{value:"710260",name:"美浓区",parent:"710200"},{value:"710261",name:"六龟区",parent:"710200"},{value:"710262",name:"内门区",parent:"710200"},{value:"710263",name:"杉林区",parent:"710200"},{value:"710264",name:"甲仙区",parent:"710200"},{value:"710265",name:"桃源区",parent:"710200"},{value:"710266",name:"那玛夏区",parent:"710200"},{value:"710267",name:"茂林区",parent:"710200"},{value:"710268",name:"茄萣区",parent:"710200"},{value:"710301",name:"中西区",parent:"710300"},{value:"710302",name:"东区",parent:"710300"},{value:"710303",name:"南区",parent:"710300"},{value:"710304",name:"北区",parent:"710300"},{value:"710305",name:"安平区",parent:"710300"},{value:"710306",name:"安南区",parent:"710300"},{value:"710307",name:"其它区",parent:"710300"},{value:"710339",name:"永康区",parent:"710300"},{value:"710340",name:"归仁区",parent:"710300"},{value:"710341",name:"新化区",parent:"710300"},{value:"710342",name:"左镇区",parent:"710300"},{value:"710343",name:"玉井区",parent:"710300"},{value:"710344",name:"楠西区",parent:"710300"},{value:"710345",name:"南化区",parent:"710300"},{value:"710346",name:"仁德区",parent:"710300"},{value:"710347",name:"关庙区",parent:"710300"},{value:"710348",name:"龙崎区",parent:"710300"},{value:"710349",name:"官田区",parent:"710300"},{value:"710350",name:"麻豆区",parent:"710300"},{value:"710351",name:"佳里区",parent:"710300"},{value:"710352",name:"西港区",parent:"710300"},{value:"710353",name:"七股区",parent:"710300"},{value:"710354",name:"将军区",parent:"710300"},{value:"710355",name:"学甲区",parent:"710300"},{value:"710356",name:"北门区",parent:"710300"},{value:"710357",name:"新营区",parent:"710300"},{value:"710358",name:"后壁区",parent:"710300"},{value:"710359",name:"白河区",parent:"710300"},{value:"710360",name:"东山区",parent:"710300"},{value:"710361",name:"六甲区",parent:"710300"},{value:"710362",name:"下营区",parent:"710300"},{value:"710363",name:"柳营区",parent:"710300"},{value:"710364",name:"盐水区",parent:"710300"},{value:"710365",name:"善化区",parent:"710300"},{value:"710366",name:"大内区",parent:"710300"},{value:"710367",name:"山上区",parent:"710300"},{value:"710368",name:"新市区",parent:"710300"},{value:"710369",name:"安定区",parent:"710300"},{value:"710401",name:"中区",parent:"710400"},{value:"710402",name:"东区",parent:"710400"},{value:"710403",name:"南区",parent:"710400"},{value:"710404",name:"西区",parent:"710400"},{value:"710405",name:"北区",parent:"710400"},{value:"710406",name:"北屯区",parent:"710400"},{value:"710407",name:"西屯区",parent:"710400"},{value:"710408",name:"南屯区",parent:"710400"},{value:"710409",name:"其它区",parent:"710400"},{value:"710431",name:"太平区",parent:"710400"},{value:"710432",name:"大里区",parent:"710400"},{value:"710433",name:"雾峰区",parent:"710400"},{value:"710434",name:"乌日区",parent:"710400"},{value:"710435",name:"丰原区",parent:"710400"},{value:"710436",name:"后里区",parent:"710400"},{value:"710437",name:"石冈区",parent:"710400"},{value:"710438",name:"东势区",parent:"710400"},{value:"710439",name:"和平区",parent:"710400"},{value:"710440",name:"新社区",parent:"710400"},{value:"710441",name:"潭子区",parent:"710400"},{value:"710442",name:"大雅区",parent:"710400"},{value:"710443",name:"神冈区",parent:"710400"},{value:"710444",name:"大肚区",parent:"710400"},{value:"710445",name:"沙鹿区",parent:"710400"},{value:"710446",name:"龙井区",parent:"710400"},{value:"710447",name:"梧栖区",parent:"710400"},{value:"710448",name:"清水区",parent:"710400"},{value:"710449",name:"大甲区",parent:"710400"},{value:"710450",name:"外埔区",parent:"710400"},{value:"710451",name:"大安区",parent:"710400"},{value:"710507",name:"金沙镇",parent:"710500"},{value:"710508",name:"金湖镇",parent:"710500"},{value:"710509",name:"金宁乡",parent:"710500"},{value:"710510",name:"金城镇",parent:"710500"},{value:"710511",name:"烈屿乡",parent:"710500"},{value:"710512",name:"乌坵乡",parent:"710500"},{value:"710614",name:"南投市",parent:"710600"},{value:"710615",name:"中寮乡",parent:"710600"},{value:"710616",name:"草屯镇",parent:"710600"},{value:"710617",name:"国姓乡",parent:"710600"},{value:"710618",name:"埔里镇",parent:"710600"},{value:"710619",name:"仁爱乡",parent:"710600"},{value:"710620",name:"名间乡",parent:"710600"},{value:"710621",name:"集集镇",parent:"710600"},{value:"710622",name:"水里乡",parent:"710600"},{value:"710623",name:"鱼池乡",parent:"710600"},{value:"710624",name:"信义乡",parent:"710600"},{value:"710625",name:"竹山镇",parent:"710600"},{value:"710626",name:"鹿谷乡",parent:"710600"},{value:"710701",name:"仁爱区",parent:"710700"},{value:"710702",name:"信义区",parent:"710700"},{value:"710703",name:"中正区",parent:"710700"},{value:"710704",name:"中山区",parent:"710700"},{value:"710705",name:"安乐区",parent:"710700"},{value:"710706",name:"暖暖区",parent:"710700"},{value:"710707",name:"七堵区",parent:"710700"},{value:"710708",name:"其它区",parent:"710700"},{value:"710801",name:"东区",parent:"710800"},{value:"710802",name:"北区",parent:"710800"},{value:"710803",name:"香山区",parent:"710800"},{value:"710804",name:"其它区",parent:"710800"},{value:"710901",name:"东区",parent:"710900"},{value:"710902",name:"西区",parent:"710900"},{value:"710903",name:"其它区",parent:"710900"},{value:"711130",name:"万里区",parent:"711100"},{value:"711131",name:"金山区",parent:"711100"},{value:"711132",name:"板桥区",parent:"711100"},{value:"711133",name:"汐止区",parent:"711100"},{value:"711134",name:"深坑区",parent:"711100"},{value:"711135",name:"石碇区",parent:"711100"},{value:"711136",name:"瑞芳区",parent:"711100"},{value:"711137",name:"平溪区",parent:"711100"},{value:"711138",name:"双溪区",parent:"711100"},{value:"711139",name:"贡寮区",parent:"711100"},{value:"711140",name:"新店区",parent:"711100"},{value:"711141",name:"坪林区",parent:"711100"},{value:"711142",name:"乌来区",parent:"711100"},{value:"711143",name:"永和区",parent:"711100"},{value:"711144",name:"中和区",parent:"711100"},{value:"711145",name:"土城区",parent:"711100"},{value:"711146",name:"三峡区",parent:"711100"},{value:"711147",name:"树林区",parent:"711100"},{value:"711148",name:"莺歌区",parent:"711100"},{value:"711149",name:"三重区",parent:"711100"},{value:"711150",name:"新庄区",parent:"711100"},{value:"711151",name:"泰山区",parent:"711100"},{value:"711152",name:"林口区",parent:"711100"},{value:"711153",name:"芦洲区",parent:"711100"},{value:"711154",name:"五股区",parent:"711100"},{value:"711155",name:"八里区",parent:"711100"},{value:"711156",name:"淡水区",parent:"711100"},{value:"711157",name:"三芝区",parent:"711100"},{value:"711158",name:"石门区",parent:"711100"},{value:"711214",name:"宜兰市",parent:"711200"},{value:"711215",name:"头城镇",parent:"711200"},{value:"711216",name:"礁溪乡",parent:"711200"},{value:"711217",name:"壮围乡",parent:"711200"},{value:"711218",name:"员山乡",parent:"711200"},{value:"711219",name:"罗东镇",parent:"711200"},{value:"711220",name:"三星乡",parent:"711200"},{value:"711221",name:"大同乡",parent:"711200"},{value:"711222",name:"五结乡",parent:"711200"},{value:"711223",name:"冬山乡",parent:"711200"},{value:"711224",name:"苏澳镇",parent:"711200"},{value:"711225",name:"南澳乡",parent:"711200"},{value:"711226",name:"钓鱼台",parent:"711200"},{value:"711314",name:"竹北市",parent:"711300"},{value:"711315",name:"湖口乡",parent:"711300"},{value:"711316",name:"新丰乡",parent:"711300"},{value:"711317",name:"新埔镇",parent:"711300"},{value:"711318",name:"关西镇",parent:"711300"},{value:"711319",name:"芎林乡",parent:"711300"},{value:"711320",name:"宝山乡",parent:"711300"},{value:"711321",name:"竹东镇",parent:"711300"},{value:"711322",name:"五峰乡",parent:"711300"},{value:"711323",name:"横山乡",parent:"711300"},{value:"711324",name:"尖石乡",parent:"711300"},{value:"711325",name:"北埔乡",parent:"711300"},{value:"711326",name:"峨眉乡",parent:"711300"},{value:"711414",name:"中坜市",parent:"711400"},{value:"711415",name:"平镇市",parent:"711400"},{value:"711416",name:"龙潭乡",parent:"711400"},{value:"711417",name:"杨梅市",parent:"711400"},{value:"711418",name:"新屋乡",parent:"711400"},{value:"711419",name:"观音乡",parent:"711400"},{value:"711420",name:"桃园市",parent:"711400"},{value:"711421",name:"龟山乡",parent:"711400"},{value:"711422",name:"八德市",parent:"711400"},{value:"711423",name:"大溪镇",parent:"711400"},{value:"711424",name:"复兴乡",parent:"711400"},{value:"711425",name:"大园乡",parent:"711400"},{value:"711426",name:"芦竹乡",parent:"711400"},{value:"711519",name:"竹南镇",parent:"711500"},{value:"711520",name:"头份镇",parent:"711500"},{value:"711521",name:"三湾乡",parent:"711500"},{value:"711522",name:"南庄乡",parent:"711500"},{value:"711523",name:"狮潭乡",parent:"711500"},{value:"711524",name:"后龙镇",parent:"711500"},{value:"711525",name:"通霄镇",parent:"711500"},{value:"711526",name:"苑里镇",parent:"711500"},{value:"711527",name:"苗栗市",parent:"711500"},{value:"711528",name:"造桥乡",parent:"711500"},{value:"711529",name:"头屋乡",parent:"711500"},{value:"711530",name:"公馆乡",parent:"711500"},{value:"711531",name:"大湖乡",parent:"711500"},{value:"711532",name:"泰安乡",parent:"711500"},{value:"711533",name:"铜锣乡",parent:"711500"},{value:"711534",name:"三义乡",parent:"711500"},{value:"711535",name:"西湖乡",parent:"711500"},{value:"711536",name:"卓兰镇",parent:"711500"},{value:"711727",name:"彰化市",parent:"711700"},{value:"711728",name:"芬园乡",parent:"711700"},{value:"711729",name:"花坛乡",parent:"711700"},{value:"711730",name:"秀水乡",parent:"711700"},{value:"711731",name:"鹿港镇",parent:"711700"},{value:"711732",name:"福兴乡",parent:"711700"},{value:"711733",name:"线西乡",parent:"711700"},{value:"711734",name:"和美镇",parent:"711700"},{value:"711735",name:"伸港乡",parent:"711700"},{value:"711736",name:"员林镇",parent:"711700"},{value:"711737",name:"社头乡",parent:"711700"},{value:"711738",name:"永靖乡",parent:"711700"},{value:"711739",name:"埔心乡",parent:"711700"},{value:"711740",name:"溪湖镇",parent:"711700"},{value:"711741",name:"大村乡",parent:"711700"},{value:"711742",name:"埔盐乡",parent:"711700"},{value:"711743",name:"田中镇",parent:"711700"},{value:"711744",name:"北斗镇",parent:"711700"},{value:"711745",name:"田尾乡",parent:"711700"},{value:"711746",name:"埤头乡",parent:"711700"},{value:"711747",name:"溪州乡",parent:"711700"},{value:"711748",name:"竹塘乡",parent:"711700"},{value:"711749",name:"二林镇",parent:"711700"},{value:"711750",name:"大城乡",parent:"711700"},{value:"711751",name:"芳苑乡",parent:"711700"},{value:"711752",name:"二水乡",parent:"711700"},{value:"711919",name:"番路乡",parent:"711900"},{value:"711920",name:"梅山乡",parent:"711900"},{value:"711921",name:"竹崎乡",parent:"711900"},{value:"711922",name:"阿里山乡",parent:"711900"},{value:"711923",name:"中埔乡",parent:"711900"},{value:"711924",name:"大埔乡",parent:"711900"},{value:"711925",name:"水上乡",parent:"711900"},{value:"711926",name:"鹿草乡",parent:"711900"},{value:"711927",name:"太保市",parent:"711900"},{value:"711928",name:"朴子市",parent:"711900"},{value:"711929",name:"东石乡",parent:"711900"},{value:"711930",name:"六脚乡",parent:"711900"},{value:"711931",name:"新港乡",parent:"711900"},{value:"711932",name:"民雄乡",parent:"711900"},{value:"711933",name:"大林镇",parent:"711900"},{value:"711934",name:"溪口乡",parent:"711900"},{value:"711935",name:"义竹乡",parent:"711900"},{value:"711936",name:"布袋镇",parent:"711900"},{value:"712121",name:"斗南镇",parent:"712100"},{value:"712122",name:"大埤乡",parent:"712100"},{value:"712123",name:"虎尾镇",parent:"712100"},{value:"712124",name:"土库镇",parent:"712100"},{value:"712125",name:"褒忠乡",parent:"712100"},{value:"712126",name:"东势乡",parent:"712100"},{value:"712127",name:"台西乡",parent:"712100"},{value:"712128",name:"仑背乡",parent:"712100"},{value:"712129",name:"麦寮乡",parent:"712100"},{value:"712130",name:"斗六市",parent:"712100"},{value:"712131",name:"林内乡",parent:"712100"},{value:"712132",name:"古坑乡",parent:"712100"},{value:"712133",name:"莿桐乡",parent:"712100"},{value:"712134",name:"西螺镇",parent:"712100"},{value:"712135",name:"二仑乡",parent:"712100"},{value:"712136",name:"北港镇",parent:"712100"},{value:"712137",name:"水林乡",parent:"712100"},{value:"712138",name:"口湖乡",parent:"712100"},{value:"712139",name:"四湖乡",parent:"712100"},{value:"712140",name:"元长乡",parent:"712100"},{value:"712434",name:"屏东市",parent:"712400"},{value:"712435",name:"三地门乡",parent:"712400"},{value:"712436",name:"雾台乡",parent:"712400"},{value:"712437",name:"玛家乡",parent:"712400"},{value:"712438",name:"九如乡",parent:"712400"},{value:"712439",name:"里港乡",parent:"712400"},{value:"712440",name:"高树乡",parent:"712400"},{value:"712441",name:"盐埔乡",parent:"712400"},{value:"712442",name:"长治乡",parent:"712400"},{value:"712443",name:"麟洛乡",parent:"712400"},{value:"712444",name:"竹田乡",parent:"712400"},{value:"712445",name:"内埔乡",parent:"712400"},{value:"712446",name:"万丹乡",parent:"712400"},{value:"712447",name:"潮州镇",parent:"712400"},{value:"712448",name:"泰武乡",parent:"712400"},{value:"712449",name:"来义乡",parent:"712400"},{value:"712450",name:"万峦乡",parent:"712400"},{value:"712451",name:"崁顶乡",parent:"712400"},{value:"712452",name:"新埤乡",parent:"712400"},{value:"712453",name:"南州乡",parent:"712400"},{value:"712454",name:"林边乡",parent:"712400"},{value:"712455",name:"东港镇",parent:"712400"},{value:"712456",name:"琉球乡",parent:"712400"},{value:"712457",name:"佳冬乡",parent:"712400"},{value:"712458",name:"新园乡",parent:"712400"},{value:"712459",name:"枋寮乡",parent:"712400"},{value:"712460",name:"枋山乡",parent:"712400"},{value:"712461",name:"春日乡",parent:"712400"},{value:"712462",name:"狮子乡",parent:"712400"},{value:"712463",name:"车城乡",parent:"712400"},{value:"712464",name:"牡丹乡",parent:"712400"},{value:"712465",name:"恒春镇",parent:"712400"},{value:"712466",name:"满州乡",parent:"712400"},{value:"712517",name:"台东市",parent:"712500"},{value:"712518",name:"绿岛乡",parent:"712500"},{value:"712519",name:"兰屿乡",parent:"712500"},{value:"712520",name:"延平乡",parent:"712500"},{value:"712521",name:"卑南乡",parent:"712500"},{value:"712522",name:"鹿野乡",parent:"712500"},{value:"712523",name:"关山镇",parent:"712500"},{value:"712524",name:"海端乡",parent:"712500"},{value:"712525",name:"池上乡",parent:"712500"},{value:"712526",name:"东河乡",parent:"712500"},{value:"712527",name:"成功镇",parent:"712500"},{value:"712528",name:"长滨乡",parent:"712500"},{value:"712529",name:"金峰乡",parent:"712500"},{value:"712530",name:"大武乡",parent:"712500"},{value:"712531",name:"达仁乡",parent:"712500"},{value:"712532",name:"太麻里乡",parent:"712500"},{value:"712615",name:"花莲市",parent:"712600"},{value:"712616",name:"新城乡",parent:"712600"},{value:"712617",name:"太鲁阁",parent:"712600"},{value:"712618",name:"秀林乡",parent:"712600"},{value:"712619",name:"吉安乡",parent:"712600"},{value:"712620",name:"寿丰乡",parent:"712600"},{value:"712621",name:"凤林镇",parent:"712600"},{value:"712622",name:"光复乡",parent:"712600"},{value:"712623",name:"丰滨乡",parent:"712600"},{value:"712624",name:"瑞穗乡",parent:"712600"},{value:"712625",name:"万荣乡",parent:"712600"},{value:"712626",name:"玉里镇",parent:"712600"},{value:"712627",name:"卓溪乡",parent:"712600"},{value:"712628",name:"富里乡",parent:"712600"},{value:"712707",name:"马公市",parent:"712700"},{value:"712708",name:"西屿乡",parent:"712700"},{value:"712709",name:"望安乡",parent:"712700"},{value:"712710",name:"七美乡",parent:"712700"},{value:"712711",name:"白沙乡",parent:"712700"},{value:"712712",name:"湖西乡",parent:"712700"},{value:"712805",name:"南竿乡",parent:"712800"},{value:"712806",name:"北竿乡",parent:"712800"},{value:"712807",name:"莒光乡",parent:"712800"},{value:"712808",name:"东引乡",parent:"712800"},{value:"810101",name:"中西区",parent:"810100"},{value:"810102",name:"湾仔",parent:"810100"},{value:"810103",name:"东区",parent:"810100"},{value:"810104",name:"南区",parent:"810100"},{value:"810201",name:"九龙城区",parent:"810200"},{value:"810202",name:"油尖旺区",parent:"810200"},{value:"810203",name:"深水埗区",parent:"810200"},{value:"810204",name:"黄大仙区",parent:"810200"},{value:"810205",name:"观塘区",parent:"810200"},{value:"810301",name:"北区",parent:"810300"},{value:"810302",name:"大埔区",parent:"810300"},{value:"810303",name:"沙田区",parent:"810300"},{value:"810304",name:"西贡区",parent:"810300"},{value:"810305",name:"元朗区",parent:"810300"},{value:"810306",name:"屯门区",parent:"810300"},{value:"810307",name:"荃湾区",parent:"810300"},{value:"810308",name:"葵青区",parent:"810300"},{value:"810309",name:"离岛区",parent:"810300"},{value:"441901",parent:"441900",name:"莞城区"},{value:"441902",parent:"441900",name:"南城区"},{value:"441904",parent:"441900",name:"万江区"},{value:"441905",parent:"441900",name:"石碣镇"},{value:"441906",parent:"441900",name:"石龙镇"},{value:"441907",parent:"441900",name:"茶山镇"},{value:"441908",parent:"441900",name:"石排镇"},{value:"441909",parent:"441900",name:"企石镇"},{value:"441910",parent:"441900",name:"横沥镇"},{value:"441911",parent:"441900",name:"桥头镇"},{value:"441912",parent:"441900",name:"谢岗镇"},{value:"441913",parent:"441900",name:"东坑镇"},{value:"441914",parent:"441900",name:"常平镇"},{value:"441915",parent:"441900",name:"寮步镇"},{value:"441916",parent:"441900",name:"大朗镇"},{value:"441917",parent:"441900",name:"麻涌镇"},{value:"441918",parent:"441900",name:"中堂镇"},{value:"441919",parent:"441900",name:"高埗镇"},{value:"441920",parent:"441900",name:"樟木头镇"},{value:"441921",parent:"441900",name:"大岭山镇"},{value:"441922",parent:"441900",name:"望牛墩镇"},{value:"441923",parent:"441900",name:"黄江镇"},{value:"441924",parent:"441900",name:"洪梅镇"},{value:"441925",parent:"441900",name:"清溪镇"},{value:"441926",parent:"441900",name:"沙田镇"},{value:"441927",parent:"441900",name:"道滘镇"},{value:"441928",parent:"441900",name:"塘厦镇"},{value:"441929",parent:"441900",name:"虎门镇"},{value:"441930",parent:"441900",name:"厚街镇"},{value:"441931",parent:"441900",name:"凤岗镇"},{value:"441932",parent:"441900",name:"长安镇"},{value:"442001",parent:"442000",name:"石岐区"},{value:"442004",parent:"442000",name:"南区"},{value:"442005",parent:"442000",name:"五桂山区"},{value:"442006",parent:"442000",name:"火炬开发区"},{value:"442007",parent:"442000",name:"黄圃镇"},{value:"442008",parent:"442000",name:"南头镇"},{value:"442009",parent:"442000",name:"东凤镇"},{value:"442010",parent:"442000",name:"阜沙镇"},{value:"442011",parent:"442000",name:"小榄镇"},{value:"442012",parent:"442000",name:"东升镇"},{value:"442013",parent:"442000",name:"古镇镇"},{value:"442014",parent:"442000",name:"横栏镇"},{value:"442015",parent:"442000",name:"三角镇"},{value:"442016",parent:"442000",name:"民众镇"},{value:"442017",parent:"442000",name:"南朗镇"},{value:"442018",parent:"442000",name:"港口镇"},{value:"442019",parent:"442000",name:"大涌镇"},{value:"442020",parent:"442000",name:"沙溪镇"},{value:"442021",parent:"442000",name:"三乡镇"},{value:"442022",parent:"442000",name:"板芙镇"},{value:"442023",parent:"442000",name:"神湾镇"},{value:"442024",parent:"442000",name:"坦洲镇"}];
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue
new file mode 100644
index 0000000..b7ef500
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue
@@ -0,0 +1,216 @@
+<template>
+	<!--地址picker-->
+	<view :status="checkStatus" v-if="lotusAddressData.visible" class="lotus-address-mask">
+		<view class="lotus-address-box">
+			<view class="lotus-address-action">
+				<text @tap="cancelPicker" class="lotus-address-action-cancel">取消</text>
+				<text @tap="chosedVal" class="lotus-address-action-affirm">确认</text>
+			</view>
+			<view class="lotus-address-picker-box">
+				<!--省-->
+				<scroll-view scroll-y :scroll-into-view="'pid'+pChoseIndex" class="lotus-address-picker-box-item">
+					<view @tap="clickPicker(0,pIndex,pItem);" :id="'pid'+pIndex" :class="pIndex === pChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'"  v-for="(pItem,pIndex) in province" :key="pIndex">{{pItem}}</view>
+				</scroll-view>
+				<!--市-->
+				<scroll-view scroll-y :scroll-into-view="'cid'+cChoseIndex" class="lotus-address-picker-box-item">
+					<view @tap="clickPicker(1,cIndex,cItem);" :id="'cid'+cIndex" :class="cIndex === cChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'" v-for="(cItem,cIndex) in city" :key="cIndex">{{cItem}}</view>
+				</scroll-view>
+				<!--区-->
+				<scroll-view scroll-y :scroll-into-view="'tid'+tChoseIndex" class="lotus-address-picker-box-item">
+					<view @tap="clickPicker(2,tIndex,tItem);" :id="'tid'+tIndex" :class="tIndex === tChoseIndex?'lotus-address-picker lotus-address-picker2':'lotus-address-picker'" v-for="(tItem,tIndex) in town" :key="tIndex">{{tItem}}</view>
+				</scroll-view>
+				<!--区END-->
+			</view>
+		</view>
+	</view>
+	<!--地址picker END-->
+</template>
+
+<script>
+	import {lotusAddressJson} from  "./Winglau14-lotusAddress.js";
+	export default {
+		props:['lotusAddressData'],
+		data() {
+			return {
+				visible: false,
+				province:[],
+				city:[],
+				town:[],
+				provinceName:'',
+				cityName:'',
+				townName:'',
+				type:0,//0新增1编辑
+				pChoseIndex:-1,
+				cChoseIndex:-1,
+				tChoseIndex:-1,
+			};
+		},
+		methods:{
+			//取消
+			cancelPicker(){
+				const provinceCode = this.getTarId(this.provinceName);
+				const cityCode = this.getTarId(this.cityName);
+				const townCode = this.getTarId(this.townName);
+				this.$emit("choseVal",{
+					provice:this.provinceName,
+					provinceCode,
+					city:this.cityName,
+					cityCode,
+					town:this.townName,
+					townCode,
+					isChose:0,
+					visible:false
+				});
+			},
+			//获取最后选择的省市区的值
+			chosedVal() {
+				this.type = 1;
+				const provinceCode = this.getTarId(this.provinceName);
+				const cityCode = this.getTarId(this.cityName);
+				const townCode = this.getTarId(this.townName);
+				this.$emit("choseVal",{
+					provice:this.provinceName,
+					provinceCode,
+					city:this.cityName,
+					cityCode,
+					town:this.townName,
+					townCode,
+					isChose:1,
+					visible:false
+				});
+			},
+			//获取省市区value
+			getTarId(name,type){
+			    let id = 0;
+				const _this = this;
+			    lotusAddressJson.map((item,index)=>{
+			        if(item.name === name){
+			            id = item.value;
+			        }
+			    });
+			    return id;
+			},
+			//获取市数据
+			getCityArr(parentId){
+			    let city = [];
+				
+			    lotusAddressJson.map((item,index)=>{
+			        if(item.parent === parentId){
+			            city.push(item.name);
+			        }
+			    });
+			    return city;
+			},
+			//获取区数据
+			getTownArr(parentId){
+			    let town = [];
+			    lotusAddressJson.map((item,index)=>{
+			        if(index>34&&item.parent === parentId){
+			            town.push(item.name);
+			        }
+			    });
+			    return town;
+			},
+			//初始化数据
+			initFn(){
+				console.log(1);
+			    lotusAddressJson.map((item,index)=>{
+			        if(index<=34){
+			            this.province.push(item.name);
+			        }
+			    });
+				//已选择省市区，高亮显示对应选择省市区
+				const p = this._props.lotusAddressData.provinceName;
+				const c = this._props.lotusAddressData.cityName;
+				const t = this._props.lotusAddressData.townName;
+				if(p){
+					this.pChoseIndex = this.getTarIndex(this.province,p);
+				}
+				if(p&&c){
+					const pid = this.getTarId(p);
+					this.city = this.getCityArr(pid);
+					this.cChoseIndex = this.getTarIndex(this.city,c);
+				}
+				if(p&&c&&t){
+					const cid= this.getTarId(c);
+					this.town = this.getTownArr(cid);
+					this.tChoseIndex = this.getTarIndex(this.town,t);
+				}
+			},
+			//获取已选省市区
+			getChosedData(){
+				const pid = this.getTarId(this.provinceName,'provice');
+				this.city = this.getCityArr(pid);
+				const cid= this.getTarId(this.cityName,'city');
+				this.town = this.getTownArr(cid);
+				//已选省市区获取对应index
+				if(this.provinceName){
+					this.pChoseIndex = this.getTarIndex(this.province,this.provinceName);
+				}
+				if(this.cityName){
+					this.cChoseIndex = this.getTarIndex(this.city,this.cityName);
+				}
+				if(this.townName){
+					this.tChoseIndex = this.getTarIndex(this.town,this.townName);
+				}
+			},
+			//选择省市区交互
+			clickPicker(type,index,name){
+				//省
+				if(type === 0){
+					this.pChoseIndex = index;
+					this.provinceName = name;
+					this.cChoseIndex = -1;
+					this.tChoseIndex = -1;
+					this.cityName = '';
+					this.townName = '';
+				}
+				//市
+				if(type ===1){
+					this.cChoseIndex = index;
+					this.cityName = name;
+					this.tChoseIndex = -1;
+					this.townName = '';
+				}
+				//区
+				if(type === 2){
+					this.tChoseIndex = index;
+					this.townName = name;
+				}
+				//获取省市区数据
+				this.getChosedData();
+			},
+			//获取已选省市区index
+			getTarIndex(arr,tarName){
+			    let cIndex = 0;
+			    arr.map((item,index)=>{
+			        if(item === tarName){
+			            cIndex = index;
+			        }
+			    });
+			    return cIndex;
+			}
+		},
+		created() {
+			this.provinceName = this._props.lotusAddressData.provinceName;
+			this.cityName = this._props.lotusAddressData.cityName;
+			this.townName = this._props.lotusAddressData.townName;
+		},
+		computed:{
+			checkStatus(){
+				let t = null;
+				const _this = this;
+				if(!_this.visible){
+					_this.initFn();
+					_this.visible = _this._props.lotusAddressData.visible;
+					t = _this.visible;
+				}
+				return t;
+			}
+		}
+	}
+</script>
+
+<style lang="less">
+@import "./Winglau14-lotusAddress.css";
+</style>
diff --git a/mallplusui-uniapp-app2/components/circle-percent/circle-percent.vue b/mallplusui-uniapp-app2/components/circle-percent/circle-percent.vue
new file mode 100644
index 0000000..4e24218
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/circle-percent/circle-percent.vue
@@ -0,0 +1,125 @@
+<template>
+	<view class="box">
+		<view class="boxContent">
+            <view class="boxContent2">
+				<view class="before" :style="{top: (100-percent)+'%'}"></view>
+				<view class="jd" :style="{background: bg}"></view>
+				<view class="after" :style="{top: (100-percent)+'%'}"></view>
+			</view>
+			<view class="percent">{{percent}}%</view>
+		</view>
+		<view class="atitle">{{titleOne}}</view>
+		<view class="atitle">{{titleTwo}}</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "circle-percent",
+		props: {
+		  titleOne:{
+		    type:String,
+			default: '发卡'
+		  },
+          titleTwo:{
+            type:String,
+            default: '21'
+          },
+          bg: {
+            type:String,
+            default: 'red'
+		  },
+          percent: {
+            type:String,
+            default: "0"
+          }
+		},
+		computed: {
+		},
+		data() {
+		    return {
+
+		    }
+		},
+		methods: {
+		}
+	}
+</script>
+
+<style lang="scss">
+.box{
+		box-sizing: border-box;
+		width: 33%;
+		text-align:center;
+		margin: 20upx 0;
+		.boxContent{
+			position: relative;
+			width: 160upx;
+			height: 160upx;
+			border-radius: 50%;
+			margin: 0 auto;
+			border: 4upx solid #d9d9d9;
+			overflow: hidden;
+			.boxContent2{
+				width: 100%;
+				height: 100%;
+				border-radius: 50%;
+				border: 4upx solid #fff;
+				box-sizing: border-box;
+				overflow: hidden;
+				.before,
+				.after{
+					content: "";
+					position: absolute;
+					width: 200%;
+					height: 200%;
+					top: 0;
+					left: 50%;
+					background-color: rgba(255, 255, 255, .4);
+					border-radius: 45%;
+					transform: translate(-50%, -100%) rotate(0);
+					animation: rotate 6s linear infinite;
+					z-index: 10;
+				}
+
+				.after {
+					border-radius: 44%;
+					background-color: rgba(255, 255, 255, .9);
+					transform: translate(-50%, -100%) rotate(0);
+					animation: rotate 10s linear -5s infinite;
+					z-index: 20;
+				}
+
+				@keyframes rotate {
+					50% {
+						transform: translate(-50%, -103%) rotate(180deg);
+					} 100% {
+						  transform: translate(-50%, -100%) rotate(360deg);
+					  }
+				}
+
+				.jd{
+					width: 100%;
+					height: 100%;
+					bottom:0;
+				}
+			}
+
+			.percent{
+				font-size: 36upx;
+				font-weight: bold;
+				position: absolute;
+				top: 52upx;
+				width: 100%;
+				text-align: center;
+				z-index: 90;
+			}
+		}
+		.atitle{
+			margin-top: 0upx;
+			font-size: 20upx;
+			color: $uni-text-color-grey;
+			font-size: $uni-font-size-base;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/cmd-result-page/cmd-result-page.vue b/mallplusui-uniapp-app2/components/cmd-result-page/cmd-result-page.vue
new file mode 100644
index 0000000..a6725e4
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/cmd-result-page/cmd-result-page.vue
@@ -0,0 +1,212 @@
+<template>
+	<view class="cmd-result-page">
+		<image class="cmd-result-page-image" :src="setSrc" mode="aspectFit"></image>
+		<view class="cmd-result-page-text">{{setText}}</view>
+		<view class="cmd-result-page-subtext">{{setSubText}}</view>
+		<view v-if="defBtn || warnBtn || priBtn" class="cmd-result-page-buttons">
+			<button v-if="defBtn" @tap="$_defBtn" class="button" type="default" plain="true" size="mini">{{defBtn}}</button>
+			<button v-if="warnBtn" @tap="$_warnBtn" class="button" type="warn" plain="true" size="mini">{{warnBtn}}</button>
+			<button v-if="priBtn" @tap="$_priBtn" class="button" type="primary" plain="true" size="mini">{{priBtn}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * 结果页组件
+	 * @description 在整张页面中组织插画、图标、文字等内容，向用户反馈操作结果。
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=203
+	 * @property {String} src 图片资源地址 - 支持相对路径、绝对路径，支持 base64 码
+	 * @property {String} text 主文案
+	 * @property {String} subtext 副文案
+	 * @property {String} type 结果页 - 默认empty，支持 页面丢失-lost 网络异常-network 无信息-empty
+	 * @property {String} def-btn 显示普通按钮 - def-btn="普通按钮"
+	 * @property {String} warn-btn 显示警告按钮 - warn-btn="警告按钮"
+	 * @property {String} pri-btn 显示高亮按钮 - pri-btn="高亮按钮"
+	 * @event {Function} defBtn 普通按钮点击事件
+	 * @event {Function} warnBtn 警告按钮点击事件
+	 * @event {Function} priBtn 高亮按钮点击事件
+	 * @example <cmd-result-page type="empty"></cmd-result-page>
+	 */
+	export default {
+		name: 'cmd-result-page',
+
+		props: {
+			/**
+			 * 图片资源地址，支持相对路径、绝对路径，支持 base64 码
+			 */
+			src: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 主文案
+			 */
+			text: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 副文案
+			 */
+			subtext: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 结果页默认类型empty：页面丢失-lost 网络异常-network 无信息-empty
+			 */
+			type: {
+				type: String,
+				default: 'empty'
+			},
+			/**
+			 * 显示普通按钮
+			 */
+			defBtn:{
+				type: String,
+				default: ""
+			},
+			/**
+			 * 显示警告按钮
+			 */
+			warnBtn:{
+				type: String,
+				default: ""
+			},
+			/**
+			 * 显示高亮按钮
+			 */
+			priBtn:{
+				type: String,
+				default: ""
+			}
+		},
+
+		data() {
+			return {
+				/**
+				 * 默认类型图案
+				 */
+				typeSrc: {
+					network: 'data:image/png;base64,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',
+					lost: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAUAAAAFACAMAAAD6TlWYAAAAZlBMVEX////6+/38/f719/r3+fzv8vjt8ffs7/br7vXy9frU3evw9PnGzt7U2+jL0uHY3+zJ0eDQ2OXM1OLO1ePHz9/W3erS2ufP1+TDy9zFzd3a4e3Aydu+x9nc4+7i6PLe5fDo7fTl6vP6boofAAAk6UlEQVR42uzQsRGAMAwEsHzs/WcGKhqOXLoU0ggaAAAAAAAAAAAAAAAAAABnmUn6Vq9+JJmD/7laa48fkq4tbfFi3wyXYoVhKOwhcWeYff/3ve0mNDG3BdE6tuBZSBNY/3xzmqDuFhm7VcKnBbzdXUCD3J8TT1mP1m8wJL6lEYXeqofo6wzv5kN47xnIQ/35MGsBkVHrqVsgBBd6FLLv8byHDWETw4h1MiJfHqHu3R/awPw6+cI7mRte62BCVnxJl0V44teNs+jYO/CiCMPm7SX+34GXRIif6nptB/KFxgk6284813Ygv8DyJX4/ob6KqKIDWe9Kxm+zC3HYdrAjNx3ILFHrpMlb4dJ3cLC8ag60JWdFxFPvY3RtedxyYIEqwNSGheO0w2TpRu/IgYqvUFXvqWY1IaibuO1AG7sS+KNoXoLcG1zbgZooLkukmnMbL+TV34FaZz4SAjlb52yE6ALswIFciuA60qDJhI2Qqa88SEEW0MUtazUI05lw6YGr7cC4hY0WVRYCzTaNa/y6IbW2J1za1ivOwxYxB0H0M57nZn1PvaeZKnqOwE6YyIOg7vIdzwZuZGdy8ECQqNcwfCPESTYSD19EflFekSF8XbhZOYMH0dt8GoyW4ot1VqBV6MHC6B7ks/uy/RJmW9NzG7ctkC6IV6HZ6I8zfALfnricvB1ymnJdwQerpYK/CL0y6qfiOs7cTMuHpuKtgiyglHrsR+ozzuM967EfujW/yR3U4TGBtwWena9H/FM/n3Be3YHuFvtwLAgtPzxQ74uKEON5kD81TtnKg9HiZq3ldZxoINUFWqkgr9H6II5n7o4Dy6KQmbejiKyg0O589LgcNFsE6HCTBLvslGB0oKVqudoTshVgig4zY0VePijWcgIpjPWlExy2vR0H5iCr1V5mRxD8LTCoDFzQRjUitbdA/ZezoQhiB92uA41b7G/kljgs4sDVCnrYuzw/5FcRYyQPLrvszIGae2xmOTc6PMNINWBTqEEIKcx8kgrDUb7yVOPHrc+excanJA8ej2njEEYs44PN7DRuyi5Hk1aDjOKK9ZoOVFxySM0U560PkSuEGwVyJmiAZoD1PNaXFuAhHgfRmBrtHshSHdiOfN8zY9Grhi4em9SeobfaVtv2HcSDqP7vJzowOFOX6D2rzWFCrPLnArss0cBpEvpfdGBeBvgG7eLg7TpQgme0ru9Za1olXbV8pCMrJc/H+zNdX5/pTspSsqZ6Tcu6/Uyun+kgYeb2a1Hwoi9+/Xm6kGo60Cz3ihu/9aUMQDjk/JGOzO+Rk8Qnn/ImfZ+UKRbucj7zD5FZ0bssH00H/vomhvBpONDQcfz0Bf1j3sx224aBKFqnFqWC3VegQLf//8neOXNlsqzUpC1iecRtKPvl4A6HZOJEoYJBRZqjUoCF9FCYAKphyrwZxnwJWRYNAeICrz0Fgs6jAwnCz7avwP5CuUM4xY9thKJYThqVAguxK8zxXCjDyoLjfQ1uVYjlmLgXvh4Uz6hAzMNDd4N3iWRfgWbWQ7Shv9QYXdFTQ4SrurAKQxVP0eKgSH0p8AVwPnwewN2vwIODGFD7CkzHw2Fn51A0FecFAYSlSblPM+dcDWuSlWaDfIQxkfzUYnuQAtf+OIIE8KjAniPNzjVepozqtJHZIoow0NOCj9IkKdJFj77nCZGNiSqWT0dwzTYVeDDBOwhtKtCufQgOEJFd8W4laIGJHq9Omxm41mCNWGv0KE+PRiKI1EYFjol3fHfctcKYLGgpzA3URgUCTrUARjSCGZFsOhhUnYgrupwKCcOyLSIY9JL/+WEKPFMPl+BpvKInWfx+v7dtJZc70zIkehKEHotPFcA1mJZkGsSQbhAtdV0ry30KpKUfnEMkCLielh1zu8fgRXXUGlht20P6KuWp5kcDGapjXKt80EVX5f5RgSPEoyXYMu4YyeNl6D7A0pNSQY7wZHcXXhFCfHbaMNRENPLIzERzxvHTfQXadxn0d4QE71rOcCNfRvsAE5SwyQDlOlaZyB1ylUPw+oNBU+QClwVcospQ4LOtLNzD3LFjCHb5d/x/vQchNDcHLsQ0osEPotGSTySv0CK5VhHsFFMBGNojt8hGBTJ0g387AE/9IXdr2bsPpDOHzHnXVwdy4ynA8SK5qg7hJeHAp9nqbwmqAdo2k/AtSfD3+70R2N618imrhdcuBYIJbFAZUC3KoMcaF2/4fODVrBAmzgAcfM+jAl26mRsBeLL0AETB3wfX8NkuCxvxmyxrnkTysoC+qgdfZhdyCCeRNYIDY4Zv7RV43oR1QxJEeBuLHv4es1Pfr+kXcGJD1jU23/HxoqK7NVEHMtJyTMBOnir2bHrasA0pZLSDtzIn0KliAzw745U8tSG8iE9FkoKHT2gahtBiQq18mTzEyBf8GRWJk6JRUDQvd4NzSxLcTw8Q61GpQHCUo9c+Atm5ofpQwcmWWK7q8lWEahALh0URfGoykagEwvMur9uS4EmMXKh0NA3Svp34QKbbojKZHeKrzrYilkLz5YsM2cnDVasS4UwaNlToPXQRPFCCJjWELjLTsOfo6GWgjpl1I53niMsFfckEgZ7KOiWoJSMZSDEDSmbRpKZhSTppf/3Yw3cTEjxtLnWgMSR881NRTbr5lkoM+iaeeOWMpgJRNagyMcnjWOKVjq9OVMDpQZ4AvN+OlyDYRoTurcUBIo7J2WoGrjhBqpJe17sBMgTIwmGCsIUpw/gszmTIiPH8z9jcXUWCpwGYOQ3DAZhJ0lNyZ1KiBCcuDwhdueDSMFQZbZhvndGdZnFqEp3LpDoL49P/0h7NFSQ4aK/9Ns0Jl/nsqYY2dGIQHEgimW99FA4sPu6GsoApQ3a4MZ/xPMuPiTn4ya/n/xSg+g2A1xDgqVdZC1kGraXxPHGbkcmKhxKTlNxkBUs6VeEu8JLsZqZw5qA4e094/kd8FIZXkKBZWXlhdBad8a7sxq75RUbKKBP4CEPxyzB2mq30MCOyL/PIDvWFUhOrVPh3AKF11ztXieFd4dkf+/HffXzgZxGDVcQrGgNl3qGiNZvgwgmgXg3RnKoegjyEOE/T3y94BK4H5vnIACExnNJM0PuYge444RiHlrXDPZ+PxrlFblqTRO0H1RgIXtTCbB6NYyKevzu2ZWt0F4iyJ71dRYDGicIcvts/lGwbXeK2QkGQ0nKLF1CYjmCG4roOmjjy5EMVcPMM1ocBhFVjli0O8JDjk0e0O2NpBrMtxe3/v15EMRJTYZ9crUTZt0+vX7/5VgjZRMdGJRGVr29evn/zDdhMz5goBsZ794GQar0baj/5qBJ0kthIrQ0n7sCw/ysOhTvQZ7JgpMZb5RfPsQ/CgyAxOTCaPufbF1MVLjGGG5V2fmDcWmxq84lCgz0uwE5KtL15to3cdeFLh1VObxGK3iaz3/v63Pa14KuZ2dGw6l3efknBrfJbZtXAua9AZwu31qE7FyN93EWQCL6kXhXjGgTnFlwurljMi0n+JanGU7zofVwRvWHKyXiu9O3tp6nRm9TyVu4mQLA0aIYUPiMXV+wRAXbbuT739hRxjC5HOB07vMyxlytR/2Ht9Yrofd6XGlB+tr68vNXMvNoya4xIp+2IHdJsx40hje3RCY55YkSH7OxCikrLfKPY7vXYC8ajvAoeTOg8X51g5un95e0ij4cA16BQB9l1MvOcwTWO1Jy9AkAiuN/49RTx6QDVN5sKrCXv7PNMBqnaA8zTbUxqNKOxDqDQWZyiWEKFWgmn837kjkhbQ7mSBE9bNytjQl4hUWm2/rUxeOUdAgLLOjWATr9s9URQTZkbQOFjLmQqmMuyoMceXxvitKxLg99y7xUA7kTw/u9xXfrY7R0EWFAe51j8XoGpP2FxlMp6gOueGvUt3k8bWJMbT69Dz5gmdkWAd+OBzL2pGFyvu30FTo7hCN0oSLFTYJ1hV4jUPKr1AIP8skx6IDwtRe5iRjJDcs8DNHpaugMA7gjPunPPyN2OAhNbpSUSVUvtQniGHRQFkHEDWJa8ylqCLhosasq5j9+GkGJ8dszuygCHn0K2eB3OGgz3FYgb2vMhbdbIEXlB9F5k0BaNj7v9JmdhG6jUEdpzKC/n04iKxm2DxvAAgp30/BhhQ2RobrYU6MIGGmhT0DHPdyuid0gOBSpSjfDN+vYtghWyKaQnK4rlwn3geL9neH3qoDsCIBG893tcbF+BjaONNY81jvTrG9EvK6JXM6b34EuNtreTZou4Ib/gr0gOBbb7PUayi0+1HQTw9Kff41Las69Ae+jOibhWGMjKJwuwLBnDbJjDSBtv/HaJ/GGAQlwg7BvpFrhq6Lr7gmMJWnkGNv4e90FrID7my2TvVS62fHivJe6F5MQxg8+ASfoSxFev4+33EhP6CC+QqUwOuHjMcLRjAVpyWXsk/bgNe3Zp9mk4ooXNVZzQo5pQ3I8fE6LyIhioJjbKXOJ//aFWsMga8J14DdHzuA1kcCsA7/Z+j4vtzDSKw/Ekd36+TCFQA5468cDkywLazOxsKXr7xydIIWo1ySp5/jVeb0yBvs8DhWv/bM40iCN0k/EmL/UW3cIYbepVkCqWoWBdgnkJ2GoC3qwijKpLf2Gghu52CP5k7sy2nIaBIOpsQzLxNrGSSPE6//+TlKobyRj7sMQEynJbFrxwT7VaEmMgO2UQp8JfdiAVe3qKHJZ7NBh3vADmQZGNVGqu9YjQG/FAXBCRMuCFv74PxpPq8V86cFQaJrV3yYFsU8LHL2d6jxQhdr0Ai4B0i4Z3L3Qkx2k9ZLEShWP5/oU7l70msOj/S+HZz0iDJgMh1eftqan7zX0HsiEtP8AGaqID85apy0yVjCYyyWzP0UNXdM8ypIP105f1QG7FbRoWHKgDjPqubYpRPEZxFQcMACZHKz6HuUcjtTftMVulAjPLdQ/MByIX0isZEOiiNmsBDAwWHDgeWV4ijgAeBZ+cadFDkshgwWUJx2k8DBKdzIMESS+SHeDJAFJ4u4rIbXWE2zlq0/ku+E3jco2RYgtknOD0eBSXzHpHiix5KkN0CPSdlFxPjumrTkXjQnpV+6n2K9WQGQdGTTGG3ryACjrqQo/LQDhNGHEImawrFoYj3+k5/i5g1Zuo0dB9HmAyw++0DsHNbzlQn8vyhYN8ZBUjkxyzkTg8XLLyUpeBl7LSeS86UhY0TwNM6L8ZgqfN33VgHPxlMVs5Bx4EkMxvb/qXvDrpQf6FT7xzpmNas+4qXj+gC+mn4DHM//uuaxCc+4RUh5YzdlkE4DkBF8sDicoJINGEaQ+4hBoCG/BpRUagLbmsftaBiRpwJodPMOGaDpxi0/HfQggMmrckwTSWIiyZCSHKUjmgg/EwSmhKHfIAxZt/6MAk+C/ZzGcwED5twe2SA30L4ddFF4Xyiaj7ujfJaJZgJrGCQ8BwWDozb9V+CIzzVfjY9d3bz1MX9JYMCHzQ7mmAU1b7McjfltRbQGPx5V/Jhaw9yMqOFZelVkARNVHRl+pNcFSEc3PgoXj3euyX8SX+Yv7yzH2mgiA8b8Ht9OAv1o4/QsiSgYvoAqA3OV3WAsFaS0aelgwxfXX1gtcBT7x7DTMAB+Ir0PaL5osGTDbz/iO/85NLmUhpjtnvM0TxlaxFBBbJW4FFTOQk/uOQVlzBJmFoP8rG2ctH0XmOw49FpFN+UDceJy+NuHxj2O9mDXgiwN0KNWRm+ybx98WqCzhiOz2C4YKFPT3p896TvCZUYawQ+7ypnTWmsamxWYdfmADct8JPsngf2EWI6j1pEPhFhKfwIL/T8wDHFYQgn/koCCTCSR+PYWgsvsr+FtK668UyIWh14muttU1jXeNcamHEe3/8fi+8exQ0n+o0gqbo1HiMvGb8x0sIruFAZfe8tjQez+fFT+BGnwk/ZrKIBZjIJMNJEv6rG5c2TZo6V9dNg2Yu/RjgIaYvdYgGDJYLXdXsNu5MfGsApOueY7iVG9JFsjxIS+qFWo8EccloIOdZMw6mtnWdAhzc50mCp3HXXVy9TPihioSMnZLDiwTW4NlJEBifBbiSthplChQi6IvoRElUqR6CWNFxwTIgDkPXI39rB99Z6+dB9OrG1CbvYvng7BfUCjRmbigayjOIU2BEF/Cd0dYoIvsVIR4leTkLQrpeobjGUw/ylWKHBIfj5+eH8+xww3jGAGUKSzZlmVZ+rtv07yNl71lx3antouvGDtRf2czYTxAC4H49B+7/BNnkm4ywBgYtXFp3lRR74eQFfcE5gB46Q9d1F6ADNQeGqSldg4ROS5PmtrYdy8f3Kg5aQQKu0I8cQXiy/lOE5HferAHwydLLwLaF4/TkOS5PSIrAIBoymJKSgaGDTIMMbsgwNfRfbUtAzEvrrtf3WH8LhlPI2hkH6jgCJ8FpCqOd0U7Jc3qOmfa2EaFs0yQKJi78cInbAry42xUjdpQvvNYhiQ0KiUldbSBXW5D8UHZRj51s1QKqafkIb5sxPw3rGFABrvA9LoKPWmyJS87wxXrRaZzw0IYjM1fGh77r+r775CIQFNO0BkmbNiBna4Phaowu83Wk30Ri2lGKQaH/A0DRGQZ8NcDt4ve4DAetEJTk8xtHEHgR3zHAHPw1kB9TGPQgl9J1aCBZA6f90LSNFfhT01cvCRFjRMkyMjlECAQ3Lwaoflv+eb0DweiSRbFBb1p8ZXM73vgOGPvseqiD8pQAAQ3B1H5RWDuTp9mocEg8ksySA6eKBEENtywBmcCvAkg87Ehc+Hm9nfAiOLTJ1AdeWqNJDuXX/0rXtl3f0oOXhkL+OtiwhhONNaZSclHFmbQistiZFuRIMEqPEQ675AUAt7EXwszP6yHysSMsslN4pDlosYj8xIh47boW/mu9A/s74ClA61O3hg3T8n2+fEAMkw67yx6k+1bJX2r7C/Biro5LL+9oTHbowcNBT1lIDw0XhAEyVHHI15K+bR+9t6DHeGUVaWhA60q81fZG89F/msk9/+TLDlwmqAypnfJbGeDyUlnNtvTztXz/be1Ar3+0VAcvooA40KPqOk9z+xErhzAsruC06EDtLSM8oSm+vwlQxyeTnkJc7+f1zo/2ATGFSdChcDSeovVbYltWt/eJinvaJtCU4f6zaz/PP/9p0h204n+HvVlSzM+Ij3H5e9zf1+nh1QKf5+cL8R0EnW24lTOuSaV+jEtwbk3ZC7axAz8ly7snyKzoQHKLFGNAg+L7czq3LQ0Ido9elKXwnUUQF9qp/7LS5FVluqkPwjFDn7xWEeDy97jSODrhxtE/1ql44PKhhR49TQh0NdLYwYIoJHmsHNTN5O5yKatq+M5/u8d70Dl5rSK7+czFtfQ97tP+K+i+FhBbdMAPyn0Nqa21xn8fdmfeBop350x+cWXuzJck6jBaJRYvtuB2YXM7+z1uuNfQvrhevf8AkCZEMeZCxsF6LvV7YEyHF+7eCgX0Ya27VHl+uZi0jIvgL9/Nko/ktVJ08UZUu81+j7sawC67Xgt68OGf6MGGcKHjgUxjsI5umksEA36pBUFjygo+zO/f6kgX6ZF28lptIiN9xg+XZ77HXU1DceVVtPIAvrZF6G/Wn7+kIGhxZ5HNvSqdt2BpXVmlefkQfv0Inr+75LWKRmMv0IwIx+/rKMEEWFyzAtg8PcTWk6T6wi9kUlQStvwbwRvmPiSvcZVxtirRcb6Q7B9M7qjiLXmtiExRsWkIQ6uLBIEPGYyA3MUNhLgeHmB/r53Mgz6VTS4r6QoD1lnMfjBfblGKnatOydmbDooU++TFissTaFpxx9/jrgcP+pJlRXbNsnfAu4oJKYBs351teBRjU2Pq2piPO8wH67kctcWZ1F6qylV5dbkdY/HV52ObvFjqt6XzvZWVaAA8cEMa+zoMA4KiLycQSvE9resUhTj1JzKN4Zk0/5LTpWVZXcpLWlZ4mPxDqUWEPfi9WDTc5HtcklOea6NLfBiu1+sNHswycR/poee3JEBqeChtbQ01KUJZurwCtAocU5A0VZWnZSZ1Q5XxlPofKOL6e9MeRXZsm+J6+7jdsuyWXWHFB3Ayh3U58/iwBincwIa1sa52xoJhXpkc7C45qnFV5vdLNt3lFV+SlytaUAiOUa6ct7GTDLfsA+BYh7NM+HFX1/oHFtbGNa62PnfLuoYTbZrmtjQ2L1NTVvc7Qq5LbIRv/E7JP5GiUmYa1obHyzcGpC8Q+gCMBRpKCW5u6xBB1TbwX+oRopg4GNDluUENcc74VAbEsPQjP8THPvk3Gk96f0MAJo+AcPeVvbNRatuIorCAEKBZLfsj7yKowbz/S/Y7dwVyPTDGFGJ1nGNLIk2YTr6c+7N3ZVHjC71SyqqfliRQ5Go017Qyqr/EMAgDqw/KSGCONY7wY6u4gGx6o6l8HEkWt9+w1Ni+X8/QSS2CY+0x4Cpy9EXFpIUzAF/CmNH+CD0XKBghEL1D2+akD8SJvjfzbVfgx+54mtdtX6/t+/V0Mt1W/FdLrOY+nMhFDU0vG96a1j3+o5AMGm3hPU7KgSGNRK/fsR+67o6oryTXzZfOzg3epAbxR0Ux9jFSiynGamgQ/JQP/5o6Qq8EqAri7hATBOcDfsxhSLszat0jc0xZ6H4Zu5379drp9SVd9TnX2KNYRPFWDmzlhC8JYXxIIdGNgm5wsHvAfQGI5EDeaRefysdR9aX2M3Qv2OZj24LPudZSIFjiKpZY6GJ04L+WCflSS+Oi8CWIxS5A0oHQcwhavw2xP3T5u0CC3Xygbcvt/gKtwNfHnqP2wtiamYIL1UtL9wYx664OADpP/QiI6hHY5ZxllaTEdOgO5fIANkwvjBq1N9R+KyaYQS+WyrlaLgQj/KyYkASFkdlMUh9z1/bXh1GDfGiWOXpNpYZwYAleFMAJnB0NnNF898XSMcUcS86lcqkRhBFusSeOZUKLZQ1puLoHRx0xhKJ3N47J7SRA0mnO/YE94HIIGjW0xW2vfqWY7A3DWCjG8ONEIrSWUBEMRhsU9qNKsRmw1WI/hB5us/i3CKHWQxfBSwBozHYrLjrf8+qufEopJ+K4lswJUU3UzSD81yaFLRVG0qDghaA4tngut/MIkAxAWkylHriRtAiAEzuDhzi31179rLmkaMmv5NrXCEDrp6NhU0NIBdEVhOmB+gE5b22054sw2694Ajj47IP//zQy3e5o7wXeXgPaCV3F6D0WrDERwtCsqsQr8MWiOBY4Dl49BL066ZGTH0mBDu/W1/ANgUxQY/Ahbrqj6sB6204zFWn+ep82yRPAPsVSoMgptzoSYYisHiuMSXZyYqYJDLYZNwYZcHD5lZ9XJQ9Zs8HuuDqgV0Hbyc/Q7XXgdjt9TcQJYcY+FsuZQFRXSDRbe2gUrSnsVYsHbY3Qxgy6XTV5N2TvK6FbU828ogdgzv+XGG5/eLYc+ogDt39jE0JI9vfO4Es5kwmttQYerizQI3rFj56Qfqa08jF4R6xqJm13JgRaa/t+nwP/Fn7ZdbgF7HTdTnqz6ya94b1dqFc4x/7yOcaE/xL8iOJiS+MiF6oVLFrWcdDNFJKgH10YPRCJfS4hUVti8aRTieuxl3P7nTfP92YHztcZ2F7dqPf1taqSRDAqj1GSkWY0kSsmnJbH6B6YwUPOjXgwaR7toDck7BcAWLFyybHvjqyPdMo7d3I3ZG86EL3L8oyY8xTQrFyWipRj22KqSoG1gHGlzsbmW9pzKlkJcIQg6TB4YQxp8BmEwudR7o6sN9jtrHOlRnS/A+c/8oZqgkLAhRkX5lIT+GJptdg8aAN/ELK0Ez9qSc9U34+UYSASvQl8KFVeHoT8SyxtoNDNq4uJ2YcduDeOY/vbpwA/r+VwUUk2F5ZYV5GTmhrYtQmDcdSuprPgVdLEgmnQl/DORRUpX3TH0fsOnPnsfgb3fQd+SCtn+HxA2YoxUiXuARgrX4AuqrVWNpQUydWNDKTxnvN+QCErmL3cmktM5Vd3ZL3B7rV2zH7b48APIXwGIGOBDD+844laOakCQcvjisQMgnDsraGx4UJ0qXkwYb7ksV/I6igp5H3N+egA55S3A06/tdeB6MMULygiFFQRCBBIQoiH4BixYLZMaJFdFMNFDSFAOek7GBH6CnuV8ZS48h1in2+6Y2tyHdrKfLtT5XcceJjwUlA3hws99ZTs54GXSIV9ydkyYeWIYAMhBy7ktSrJvmPAerDkqCLIHy3p6EuR7Rr7L8O9iXnnvxyqe6d+BASYL6gFSRVcRDEX8OW25xTlyx6AEJxM+FfUCgSESp5qhvijbTybjt7GoNl80/WNxe2kGfNnHHgVArNlFQJFo/rBxItMWKyKpEpHKEWbcNm+CfRueyk7hTHGCxXp5G1BuO4WoBdyUoO3x4Gf1EVyIRGHRGQAgZWCbMUkJt7qArPoMZ+JQtg2PsWSfEhs40IDn8EH/aCx2M9uCTJ8cwF5z4HoP0Fce7UiCYYpK6dZHvQoRYvgvqiE4Dx1NNXGrNQTOdDmhJHvq5YA4F0BSPq87ZahOSDP3+Y0g/28bjyrsjvr6nDRAIRKLHsUNaBJCTzIUmK1FTJEJxv29+JoS2mUKqFvQX/RLUSz99524FeoBvskjcqwxgMyoNeJsBaUFKmroppLbxAjAA1hUSrUSxUGhlWrOEpxyptuGWqA3ncg+u8QN0H+I/JGnyCIKArJOkJ5MEkVgNowiXqX0oJYSVBv3cUKRkVxhF5J/WW3GM1Omy+TIb/q/+Cd7tTQPUPBt83ywbWWxFdh9CBJsc0KczYD8jKtesuEmvTf37fpf4krPr++QM0O/GKtAUYMhwA/P/rg2mhB9TgkGJIFQZi13dRr1o8Ba23NjJDRTguhFibatYPlc7coYbedHPi1FC+4XRz5Ufvl9IMOgEmzVd5aodl4AYxA1K4xHO3uhbb3jsSQLMihkEbX3TIFtG/Ro258dk7+G8iEiHLiyHyOmiIXeuuRU9WEpieYqxhCEnBx2vgsAtjbw9vWx58hvGnB78N42Z6mExTDbLZ5tTR+GAWRJNjGC9gwqs9LApez3lEzGhuxQg+IIFQ1WS+mfXmH5DeIj8DZ3UKO+L1Dg21YhuQ0HQDaYGkwJc+RbUyDA3vxk/9kQDZJ2qBwseXD0t53afWg51PaXc/t1kkfLAeywjWAYageaZEW+aVN+wEmgIAkD9q01e4K5gETJ6hrbtTQYxFASAhbygtBKVDFxIZUQ5u1QjXagKFyGEB8V4vlwqL7MRdWfn+Tfq0J4QcsSOQ+0AtaJhzUzTjXivEgO2JG3rXGJGUqsgZcGtMYQBWVZYwPfrMunm7v63gHw7/DoFKi51QqFXrf9s6pIvogSLZuBgO2W0By5UXYIo1P4wp+x59A/379eNRG+YqPEWLBwRHHd/AKdDP6JFyCYUjjAD5texDW0cKYQDYTclVRkREpJEsYQP9mnV/fIwhWZw8qtwdTKg0ihxc9R7vvxfOmooCvBlVkE9Rytj1MXPh0guXj8snw6RhHLDjKiEFTLYKYcgxAWI7Jp6CSTDXmmqpqdMuEUdNCq8flsTs5/XjWJzEbwtu/HsbXxwRSiqnH9jwTJUJHHCeXNF4AYfY1VVnRpjNFNVlV+Ko7Of0EnwEEHwhje7yYPVlCtiOQpVElGYSjy87zVfJmRa/Vic37ozy4WvLq43v0Q09XnBHCsP4t3blBTwvU3ZNqrL1z5EDHdRyI3uBSkAtDqCna+DlRjOv65NLf+c8naeInfNgwE76qI+OopppiYo/6HGXDkaznsJ/zPpsDc7SNdK/d4qN/oOG3i+zHw2UbwFeGECzwUxYURQc8Bz8aQNsr8RDUUGsgkDWbyW1cDcP16XUvl4/oSZoByoWP144Ytkimjgy3N481yH0sjkcxDD4nTbnUFAKQo/rb08t+Z5tHaZuh8Xu6IbTXTj+yRk/Iasa6BtRAMXaBkB695KyS8CaYTxBfd/H8POF73PYg+Npv1xHT3a3PXu26TrY6vkPApDxPNyH51fPpBS/NyzOaLTgxfLrcCvAans53mJcAu7bh5LXfNMT7zSLnft+ts2vw7RCE3+Z8f9253DzdFz2YbPV0fXOS8NDFBhnA5y2CjyeYyD6nS+MHQTTx43WSM7zPNc/XG9PztgdPM5V9Rmf6aQNNcx58PsUR6Of0o/2olUkTwZ8nt4b9tC6u0I4FN3+Kx4d1036g14wQhld/st9HdX5zCT8I2o+dmgAu7/6Lxer8F/wkRfFmMuEprsI+qbObSzQTFMA/1eMAfv+0d0cpCMNQEEWhjSBk//t1Gsam+OW8+CH0HrqCy0tSEZo++ukZy/h54PT4Xuv90T2C3gg5PbJ+ymcKqIfTI9DGfdHigOrHb4/o/JAj3wzI9pf0e9/XO/dBtr9o/hTQBeUh9Ev6zRtnHbDz9pf1Ew+h8vXO9pf3u84gP96yfm03F2T7i/q1j4C3/R+t2k/2syH9Qlsb9ol+cT+Zy5jXl3gBO6Ae5q9wLWJzQ9Zv9VK/dplC1m82f9YG9r9yPxdk/gp3Shr9cs7nGaRfyveWnuhXOICvBemXudzyP/D+VwroG2DpF9sm5q/ezwE3+hX7eQVzfixNIPMX08TR71cJWcD1hvRbmkDmbz0i/er8uXP6LWH+/vEToXdCQwAAAAAAAAAAAAAAgKoX6zqE4r/SviIAAAAASUVORK5CYII=',
+					empty: 'data:image/png;base64,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'
+				},
+				/**
+				 * 默认类型文案
+				 */
+				typeText: {
+					// 网络连接异常
+					network: '\u7f51\u7edc\u8fde\u63a5\u5f02\u5e38',
+					// 暂无信息
+					empty: '\u6682\u65e0\u4fe1\u606f'
+				},
+				/**
+				 * 默认类型副文案
+				 */
+				typeSubText: {
+					// 点击屏幕，重新加载
+					network: '\u70b9\u51fb\u5c4f\u5e55\uff0c\u91cd\u65b0\u52a0\u8f7d',
+					// 您要访问的页面已丢失
+					lost: '\u60a8\u8981\u8bbf\u95ee\u7684\u9875\u9762\u5df2\u4e22\u5931'
+				}
+			}
+		},
+
+		computed: {
+			/**
+			 * 设置图案
+			 */
+			setSrc() {
+				let src = this.typeSrc[this.type];
+				if (this.src) {
+					src = this.src;
+				}
+				return src;
+			},
+			/**
+			 * 设置文案
+			 */
+			setText() {
+				let text = this.typeText[this.type];
+				if (this.text) {
+					text = this.text;
+				}
+				return text;
+			},
+			/**
+			 * 设置副文案
+			 */
+			setSubText() {
+				let subText = this.typeSubText[this.type];
+				if (this.subtext) {
+					subText = this.subtext;
+				}
+				return subText;
+			}
+		},
+
+		methods:{
+			/**
+			 * 普通按钮点击事件
+			 */
+			$_defBtn(e){
+				this.$emit('defBtn', e)
+			},
+			/**
+			 * 警告按钮点击事件
+			 */
+			$_warnBtn(e){
+				this.$emit('warnBtn', e)
+			},
+			/**
+			 * 高亮按钮点击事件
+			 */
+			$_priBtn(e){
+				this.$emit('priBtn', e)
+			}
+		}
+	}
+</script>
+
+<style>
+	.cmd-result-page {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		width: 100%;
+		height: 100%;
+		text-align: center;
+		padding: 40upx 0;
+	}
+
+	.cmd-result-page-image {
+		width: 280upx;
+		height: 280upx;
+		margin-bottom: 80upx;
+	}
+
+	.cmd-result-page-text {
+		line-height: 1;
+		color: #111a34;
+		font-size: 36upx;
+	}
+
+	.cmd-result-page-subtext {
+		margin-top: 16upx;
+		color: #858b9c;
+		font-size: 32upx;
+	}
+
+	.cmd-result-page-buttons {
+		display: flex;
+		flex-direction: row;
+
+
+	}
+	.cmd-result-page-buttons .button {
+		margin: 10upx;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/coolc-coupon/coolc-coupon.vue b/mallplusui-uniapp-app2/components/coolc-coupon/coolc-coupon.vue
new file mode 100644
index 0000000..5b3fb74
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/coolc-coupon/coolc-coupon.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="coupon-item">
+		<view class="coupon-money">
+			<view class="nick">{{item.name}}</view>
+			<view class="layof" :style="{color:theme}">￥{{item.amount}}</view>
+			<view class="end_time">{{item.endTime | formatCreateTime}}前使用</view>
+			<view>
+				<view class="demand">满{{ item.minPoint }} 减 {{ item.amount }}</view>
+			</view>
+		</view>
+		<view class="get-btn" v-if="!types" :style="{color:color, borderColor:color, background:solid}"
+			@click="acceptCoupon(item)">立即领取</view>
+		<navigator class="get-btn" v-if="types" :style="{color:color, borderColor:color, background:solid}"
+			:url='item.url' @click="useCoupon(item)">立即使用</navigator>
+	</view>
+</template>
+
+<script>
+	import Api from '@/common/api';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import {
+		formatDate
+	} from '@/common/date';
+
+	export default {
+		components: {
+
+		},
+		data() {
+			return {
+				types: false
+			}
+		},
+		props: {
+			item: {
+				type: Object
+			},
+			theme: {
+				type: String,
+				default: '#ff9000'
+			},
+			solid: {
+				type: String,
+				default: '#ffffff'
+			},
+			color: {
+				type: String,
+				default: '#ff9000'
+			},
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
+		},
+		methods: {
+			async acceptCoupon(item) {
+				this.types =!this.types
+					uni.showLoading({
+						title: '请稍后'
+					});
+
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
+
+			},
+			async useCoupon(item){
+				uni.showLoading({
+					title: '请稍后'
+				});
+			}
+		}
+	}
+</script>
+
+<style lang='scss'>
+	.coupon-item {
+		width: 100%;
+		height: auto;
+		display: table;
+		border-radius: 10upx;
+		padding: 0 20upx;
+		margin-top: 22upx;
+		border: 1px solid #eeeeee;
+		position: relative;
+
+		.coupon-money {
+			width: 465upx;
+			height: auto;
+			display: table;
+			float: left;
+			padding: 26upx 0;
+			border-style: none dotted none none;
+			border-color: #eeeeee;
+
+			.nick {
+				width: 100%;
+				height: 50upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+
+			.tit {
+				width: 100%;
+				height: 50upx;
+				line-height: 50upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+
+			.demand {
+				width: 100%;
+				height: 30upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+
+			.layof {
+				width: 100%;
+				height: 48upx;
+				line-height: 30upx;
+				font-size: 44upx;
+				color: #ff9000;
+				font-weight: bold;
+			}
+
+			.end_time {
+				width: 100%;
+				height: 30upx;
+				line-height: 30upx;
+				font-size: $font-sm;
+				color: $font-color-999;
+			}
+		}
+
+		.get-btn {
+			width: 146upx;
+			height: 52upx;
+			line-height: 50upx;
+			position: absolute;
+			top: 50%;
+			right: 26upx;
+			margin-top: -26upx;
+			text-align: center;
+			border-radius: 60upx;
+			color: #ff9000;
+			border: 1px solid #ff9000;
+			font-size: $font-sm;
+			float: right;
+		}
+	}
+
+	.coupon-item:after {
+		width: 40upx;
+		height: 20upx;
+		position: absolute;
+		left: 460upx;
+		top: -1px;
+		border-radius: 0 0 40upx 40upx;
+		content: "";
+		display: block;
+		background: $bgcolor_white;
+		border: 1px solid #eeeeee;
+		border-top: 0px;
+	}
+
+	.coupon-item:before {
+		width: 40upx;
+		height: 20upx;
+		position: absolute;
+		left: 460upx;
+		bottom: -1px;
+		border-radius: 40upx 40upx 0 0;
+		content: "";
+		display: block;
+		background: $bgcolor_white;
+		border: 1px solid #eeeeee;
+		border-bottom: 0px;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/drag-ball/ball.js b/mallplusui-uniapp-app2/components/drag-ball/ball.js
new file mode 100644
index 0000000..070321b
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/drag-ball/ball.js
@@ -0,0 +1,85 @@
+import value from './ball.js';
+
+var list = []
+
+var boundary = [[],[]]
+
+function getDistance( x_1,  y_1,  x_2,  y_2){
+		
+		let x = (x_2 - x_1)*2;
+		let y = (y_2 - y_1)*2;
+		
+		let s = Math.pow((x * x + y * y), 0.5);
+
+		return s;
+}
+
+function sustained(that){
+	
+	let data 	= value.list;
+	let index_1 = 0;
+	let index_2 = 0;
+	
+	setInterval(function(){
+		
+		for (let number = 0; number < data.length; number++) {
+		
+			data[number].y	=  	data[number].y+( data[number].floating[1] ? 0.05 : -0.05)  ;
+			data[number].floating[0] < 15 ? data[number].floating[0] = data[number].floating[0]+1 : data[number].floating[0] = 1 ;
+			data[number].floating[0] == 1  ? data[number].floating[1] = !data[number].floating[1] : data[number].floating[1];
+			value.mapping(that);
+		
+		for (let i = 0; i < data.length; i++) {
+					
+			index_1	= getDistance(data[i].x,data[i].y,data[number].x,data[number].y);
+			index_2	= (data[i].radius*2) + (data[number].radius*2);
+			
+			if(i != number){
+			
+			if( index_1 <  index_2){
+				
+				data[i].x 	=  	data[i].x+(-(data[number].x-data[i].x)/100) ;
+				data[i].y	=  	data[i].y+(-(data[number].y-data[i].y)/100) ;
+
+			(data[i].x-data[i].radius) < 0 ? data[i].x = data[i].radius : data[i].x;
+			(data[i].y-data[i].radius) < 0 ? data[i].y = data[i].radius : data[i].y;
+			
+			(data[i].x+data[i].radius) > value.boundary[0] ? data[i].x = (value.boundary[0]-data[i].radius) : data[i].x;
+			(data[i].y+data[i].radius) > value.boundary[1] ? data[i].y = (value.boundary[1]-data[i].radius) : data[i].y;
+				
+			value.mapping(that);
+				
+			}
+		
+			}
+		}
+		}
+		},100);
+}
+
+function mapping(_this){
+	let data 	= value.list
+	let context = uni.createCanvasContext('canvas',_this);
+
+	for (let i = 0; i < data.length; i++) {
+	
+		context.beginPath();
+		context.arc(data[i].x, data[i].y, data[i].radius, 0, 2 * Math.PI, true);
+		context.setFillStyle(data[i].color[data[i].colse ? 1 : 0]);
+		context.fill();
+
+		context.setFillStyle('#FFFFFF');
+		context.setFontSize(data[i].size);
+		if(data[i].labelName.length < 6){
+			context.fillText(data[i].labelName,(data[i].x - (data[i].size*(0.5*data[i].labelName.length))), (data[i].y + data[i].size*(0.5)))
+		}else{
+			context.fillText(data[i].labelName.substring(0, 3),(data[i].x - (data[i].size*(0.5*(data[i].labelName.substring(0, 3)).length))), 
+			((data[i].y + data[i].size*(0.5))-data[i].size*(0.8)))
+			context.fillText(data[i].labelName.substring(3, 6),(data[i].x - (data[i].size*(0.5*(data[i].labelName.substring(3, 6)).length))), 
+			((data[i].y + data[i].size*(0.5))+data[i].size*(0.8)))
+		}
+	}	
+		context.draw();
+}
+
+export default {mapping,list,sustained,boundary}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/drag-ball/drag-ball.js b/mallplusui-uniapp-app2/components/drag-ball/drag-ball.js
new file mode 100644
index 0000000..1609522
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/drag-ball/drag-ball.js
@@ -0,0 +1,21 @@
+import value from '../../componets/drag-ball/drag-ball.js';
+
+var list = [{x:100,y:50,radius:25},{x:200,y:50,radius:25},{x:300,y:50,radius:25}]
+
+function mapping(_this){
+	
+	let data 	= value.list
+	
+	let context = uni.createCanvasContext('canvas',_this);
+
+	for (let i = 0; i < data.length; i++) {
+		context.beginPath();
+		context.arc(data[i].x, data[i].y, data[i].radius, 0, 2 * Math.PI, true);
+		context.setFillStyle('#AAAAAA');
+		context.fill();
+	}
+						
+		context.draw();
+}
+
+export default {mapping,list}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/drag-ball/drag-ball.vue b/mallplusui-uniapp-app2/components/drag-ball/drag-ball.vue
new file mode 100644
index 0000000..bc93814
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/drag-ball/drag-ball.vue
@@ -0,0 +1,135 @@
+<template>
+		<canvas 
+		:canvas-id="id"
+		id="canvas"
+		@touchstart="touchstart"
+		@touchend="touchend"
+		></canvas>
+		<!-- @touchmove.prevent="touchmove" -->
+</template>
+
+<script>
+	import dragBall from './ball.js';
+	
+	var data 	= [];
+	
+	function getDistance( x_1,  y_1,  x_2,  y_2){
+		
+		let x = (x_2 - x_1)*2;
+		let y = (y_2 - y_1)*2;
+		
+		let s = Math.pow((x * x + y * y), 0.5);
+
+		return s;
+	}
+	export default {
+		props:{
+			onInit: {
+			  type: Array,
+			  default: null
+			},
+			colse:{
+				type:Boolean
+			}
+		},
+		data() {
+			return {
+				index:'false',
+				touchstarte_x:0,
+				touchstarte_y:0,
+				id:'canvas',
+				number: 0
+			}
+		},
+		onReady() {
+			// colse(index) {
+			// 	!index ? index : this.trim();
+			// }
+			this.trim(); 
+		},
+		watch: {
+			onInit() {
+				this.trim();
+			}
+		},
+		methods: {
+			trim(){		
+				dragBall.boundary[0] = 320; //高
+				dragBall.boundary[1] = 500; // 宽
+				// var query	  = uni.createSelectorQuery();
+				// query.select('#canvas').boundingClientRect()
+				// query.exec((res) => {
+				//   dragBall.boundary[0]=res[0].width
+				//   dragBall.boundary[1]=res[0].height;
+				// })
+				dragBall.list = this.onInit;
+				dragBall.mapping(this);
+				data 	= dragBall.list;
+				dragBall.sustained(this);},
+			touchstart(e){
+				this.touchstarte_x	= e.mp.touches[0].x;
+				this.touchstarte_y	= e.mp.touches[0].y;
+				for (let i = 0; i < data.length; i++) {
+					if( getDistance(data[i].x,data[i].y,this.touchstarte_x,this.touchstarte_y) < (data[i].radius*2)){
+						this.index = i;
+						
+						if(this.number < 8){
+							data[i].colse =!data[i].colse;
+							data[i].colse ? this.number +=1 : this.number -=1;
+						} else {
+							if(data[i].colse){
+								data[i].colse =!data[i].colse;
+								this.number -=1;
+							}
+						}
+						this.$emit('click_',i)
+						dragBall.mapping(this);
+						// this.touchstarte_x	= this.touchstarte_x-data[i].x;
+						// this.touchstarte_y	= this.touchstarte_y-data[i].y;
+						}
+				}
+			},
+			// touchmove(e){
+			// 	if(this.index != 'false'){
+			// 		
+			// 		let index_1,index_2;
+			// 		let	 tag 	= 	e.touches[0];
+			// 		
+			// 		data[this.index].x 	=  	tag.x-this.touchstarte_x ;
+			// 		data[this.index].y	=  	tag.y-this.touchstarte_y ;
+			// 		
+			// 	for (let i = 0; i < data.length; i++) {
+			// 		
+			// 		index_1	= getDistance(data[i].x,data[i].y,data[this.index].x,data[this.index].y);
+			// 		index_2	= (data[i].radius*2) + (data[this.index].radius*2);
+			// 		if(i!= this.index){
+			// 			
+			// 		if( index_1 >  index_2){
+			// 			dragBall.mapping(this);
+			// 		}else{
+			// 			data[i].x 	=  	data[i].x+(-(data[this.index].x-data[i].x)/10) ;
+			// 			data[i].y	=  	data[i].y+(-(data[this.index].y-data[i].y)/10) ;
+			// 			
+			// 			(data[i].x-data[i].radius) < 0 ? data[i].x = data[i].radius : data[i].x;
+			// 			(data[i].y-data[i].radius) < 0 ? data[i].y = data[i].radius : data[i].y;
+			// 			
+			// 			
+			// 			(data[i].x+data[i].radius) > dragBall.boundary[0] ? data[i].x = (dragBall.boundary[0]-data[i].radius) : data[i].x;
+			// 			(data[i].y+data[i].radius) > dragBall.boundary[1] ? data[i].y = (dragBall.boundary[1]-data[i].radius) : data[i].y;
+			// 	
+			// 			dragBall.mapping(this);
+			// 			break;
+			// 		}
+			// 		}
+			// 	}
+			// 	}
+			// },
+			touchend(){this.index = 'false';}
+		}
+	}
+</script>
+
+<style>
+	page{width: 100%;height: 100%;}
+	canvas {width: 100%;height: 90%;}
+</style>
diff --git a/mallplusui-uniapp-app2/components/empty.vue b/mallplusui-uniapp-app2/components/empty.vue
new file mode 100644
index 0000000..4da4df0
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/empty.vue
@@ -0,0 +1,52 @@
+<template>
+	<view class="empty-content">
+		<image class="empty-content-image" :src="setSrc" mode="aspectFit"></image>
+	</view>
+</template>
+
+<script>
+	export default {
+		props: {
+			src: {
+				type: String,
+				default: 'empty'
+			},
+		},
+
+		data() {
+			return {
+				typeSrc: {
+					empty: 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMMAAACtCAYAAAANgcuAAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk5MjI3NjM1NUJGMTFFOThGRTZGQUIxMjY1ODk1QTkiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk5MjI3NjQ1NUJGMTFFOThGRTZGQUIxMjY1ODk1QTkiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTkyMjc2MTU1QkYxMUU5OEZFNkZBQjEyNjU4OTVBOSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTkyMjc2MjU1QkYxMUU5OEZFNkZBQjEyNjU4OTVBOSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PvBPHdgAAEY/SURBVHja7H3bkiTHcWVe+jIYALyAlyEl7Wofdt/WMF8h4iuIr4C+Yv9C/ApRXwG87T5ozWS7KwwpihcAw5nprswtz4oTeeKEe2Q2egaqGXaZtWVWZlZWdZWf8HPcPTz6eZ67c3l8/eeb/2HbwzQ/GYf+mW3tOfZty9free+e/Nromr2P6fj6IX2Gie7Fx/T8QJ95usP7z9P0M+z3w/BldG7Pw16P1/D+8pnm42fuy++Vzy3/w/E89vFcr+Hr9Ly+nu9hx6dpOn5vQ/repvS9DfS9lcfw/KcffdC/Tvvrzw0MR4P97Gi4bPCegRfn7Hl0nXd8w+DNgN3nU7qXPcdx3uqDj0fXbABCjXo5xltcp/v6Wu8+R0M0o8zbZJww1mKfz4lRu+dwXM8dDdmMOm+9Y1P67HpMXvfsxz94/LPXaX9Dd0YPb+Q2g4bxMwjYyHl/C0ibXwgZPhsvG7UHCD3Hr/FApsZu+54Bm+F6Ru+BpQUE73Uw2JZB8zm93gMQ/uyYHi+/56Ha12MKDj7+Jh5nBYYAIMvf1iiv3uIeVKgABhs9g0SNW72JHtN7q+Gy0XseAucZNOopPMDwPYoROhlrBADvvOdJ1AsoqG4Ph+UvA4M+G4xatx4A7O/2MNF9pyev29Yuzs34x6EPQdGiQN8WBFs0RumQN+LrsbvSIm9EV4NWALToFJ63jJZpUER/+LiO9npOadVy7fFzXIxjBoU3uusoz4DQ4xfj6i2OZ5+9056BBTJTIQ8gETXaM+IrCKIRnLdq3OoVIorkGSqP3uwRlMp4AFFq5YFHub4jjCtao5Qo4v0e5dGHGb5dY0AACMyAAQwe7fHHIODn5g2mxavhc5yAARH9TtOkaIT3DP4u1GgIAMPawANGdA9+ne5HI7ke07/IK0QeIdIPEW3xPEBEhSLwtEQygAIQ4HUARP4cgVdQ77BQl3HI2zelFc6WJnmjfvT8PpGiiProCN/yLnvpT4vLt+iSegG+1xZ10pFcBbACQylO61r2AMs1acQHNVIqxFGjlmAugDKfRmp4henoIewnwc/Codd31jNw9Mgz+PsIZI/qePQJx6Nw6Za3ieiPFzHCdQwUBU3r9ct3Qnw88g57nnsA8MKu2JoHsL9CPwgd0pBqyxPwNfrVwkMsIDkB7d2mSRZa1bDpHj1wlxF8uKO+4OiRdy4Sr1uURp97I78+jyI2bKyeEXsRJO98lROg6FFEb1gYrzz/sArdHaHR7BVIFxSepE/aYT7t/8WEVtX475MriAx77+v36IeW6I00wZ4cwBagRqImUVRHt9Ho3/IYfA1G/NV455PB270coKgo9nIMkX5YQDN3+Q+gUMC88wJ6rzeIQqFR+LMFlK17VGFL8QoaIYqMuOVB1CNE4VXOG2jI04v4bGkEV2zbyO7cA7oAfzl6RJEhjwZxdCgyfoz6RonsOlAjNgcGxDsPhrt4Ay/u713jZYu9vMCWh9gzumtSLAqBekm2SCCH/5sT2/cojnfcyywXFKvB7z1dwAYf5Q1OAOsKYCCZloXy3FXAURCwkH7nwXAXr6CCd0+dkOcpomPLCJzOmbGOF2Nl7BGtibyDZpK3sscel98KiXq1RXq/rbqiQg+QaDZjhTeI+HvkJbKOIP6fI0T9SoHMK8DomSopdXrnQ6t7w6N7+L1XP3QXsPRVJnQOC+a8kb1VQOd5DqY/d4kGeaUVe7yKd19OlCk4piAk6nmHPXkEGH7lBabyOV//JrzCWwWGqN4nMvqtcy3K5BmvJ3JbEaAo/r/Hk3jJLK80olVpuueeXDYBw8aIXwBjIyTaolNZIxymwohZF9zSOU8w8/ZNAuKtAYOCwCuj9ow8yhkoEJQu8WjvGT9THS6i80DgnWsBxSuI84zZE7f2+J//vOaj3nt01f35xatuPL7f1dVF9+rV7bLlBx+zfe+B+9jWHi9f3XTXV5fVFufsged8/c3tKeyKc/Yc4Hn83lV3OMzLsUfXp8/z4uXp8+A5jtnv9S//7w/5R7XzdhxbPsbX8OO//7ef9W+VZuA4vxr13tIJD0jR+0QeIgqjtkqmPU0QAcHLD3iiWIHgRZJgsLw9HN/PDN22ZtT2hwdAgv0ICPbAa2HMtuXnAAL2+bk9Li/GfG4cTyFZO2ZeBECAwatRs2FfXY6VkfNWj+k9+V5nDwYtk0ZUSEd+Hf09SoRjHo3iSFErzOmBw6M6XqnE1j08Lu8ZvjsvwCm0g+Hyd2IGDUMHSOw6AwGuZ6/A1x/of8Rr2eDtGAz/4mjYDBQPIDhnxg+vYkYLrwHAwJCf//lVYdBq6GrknqEzQPgebw1N8ipBPaOOwqbRHANEicwgD8cfIBrhVSS3aoeiCFJEnfS10cwy75juhzqBKCQM3gyXjd4M3SgUtnjg+shrgDJ5FGm8Gly6xJSKAQJg2ANUiUdvO6ZGHBm0R4c8IL1VniEy+Lu+PprG2YoAtcKmHm1qXbsllj2aEx2LaJUXXTID87ykGTFGehuBeaRnY8c1DATQLNtn6qT0yQzd3tPTDNjyOZw3r2BeAPv2+cx47ZjSG9UGbOzwDp7B4/hb5Rn2hET3zkHWc/AGyv29BNlWaXXLG7TyBVFEyIsAeTqBX6/3ZENjgzUDtu8C1IYpEkABg2dvwcIb4LDv1p7DQ7BnYW9kW3gBT2zzZ+V90xPmIU5ieSgEties2bgZKCqqPWF9tmDYM+94jzdpXRdNqI/0QEsj7Em4RSHOVjJMKVIVDg0oEu7JBud5VwUBU5+tgIRGnhRwHHHyKKt6DG9fI0/juBrwy1ensG1k1AwQPR+95q0IrapeiMKjChQYth1nT7CVJ/DyC3uoUwsUrQrRFgXaSo55HiN6nGjTdDSkQxUhgrdQb8LegikUnjMobN88A78Wwl0frCV0PxLd3CDgBI4+ewktD1dvwMbf0hrDOQNAaY5Gl1qv78llRzVAWhah10T5gZZeiCiRaoTIwFtTNVu1R0ie4fVKP8ygELbUiBNoE8KkDAKNJrF+sD97PesJ9TIaxsV7RkDwwrF2/JKiVHbedIQBAslCRIuULkXRpLP3DNpkq6UbWjSIo0XRaO8Zf0so7523EHmDSBB70aGtDHTO/jr/B0opIkNjI+TQ6JTnmw8hCJgiXSy5gXZAg0HAlAmhWPUCesze4zYB2IBsgLA/0CQDBOgU5ygQmo2Sb29NNEkzypxjaPHYVhsWHe23HpHhR4Dqqb7fG81bNKiVY/CAwAVzGRRdWR36nJJgSkfwXJNmJyrSLwaoIMA1TJN09PYGKADHtgoEe4574vPAsHFvAAHRJfYa+H/hHWD0dtyORaO/eo+zBYO1YvTqh6Ls8FbG2IsCteL+Lc/R0gbalMvbjzh/RKt0og57BC6mU868GMPxewMgYEQHCnV6VMT7PkFzVHR7wtujrhqBQvRJ7w8w4vMjcacBAH2OhFz+H4/ewV776uYkvM3o4SXYQ0S64azAwDSJcwRR9rgV2fHOedTGm4Os0aXIo7QE61a7Fs8b7AmzwujhGXRewVLWMNXCcqQQp4pZT7QyOMD/Ybxs1BxqhcHzvp0HcDj0qqDC51zE8XGfAcufj69jrzLQvcckskGdvJqls9cM8AxRi8eWB4gm1ERTJ71Ikieqo4ZcUXe5iOdHESIVwl7STV/PlaaddJXIoyBFfzA6gkKNVVRuKsBhxnSxcPObIoGHfdAXHuUv0nvg2Jg7YPSZdgFIOIfnfAzHIz0CzeBFoxCKtfPsRewYR57eiqQbPENLHGuSrJXw8jj+nsrSrfyAFyFqTbNsTbF05yUUXSKCHkZp7jGXXGcefTSkF2nENlAsAjNNp7U/MxQDxePE3+18nZOYKg/C4VjVIUp91LvASyD86mWxtcCQk3Za0gHDZy/Bn5lzFDe3peeMgPbWzHRrVXxulUrcpRlvVETnhTZbHSh08r1Xb+QBDk24JvJI+EOnOkyiuZUWMYjFM09mY0HnEXgHNSamShyG5REb18KgNI+gNU2olsVxlHPwMdxHK2pBjVnkM1hVA/H/oVrBztux5XtL1OmtBUNrUn1L5HqUpzU3efnBNvoQtXoJeY17NYzqCWQFS9SPVHuWeqO5eQXQpBdLLmBanuOYbZlze6FNr66IwcJGii1rC44mmVGzcXISD1vMuWBw8WcYkkfTc9Hn5GMIweI7s/2zF9DD0D/bAkRUOtHKHdwlfBpRk1b7lSg6pKXVXnfrYkql6ApuzaK9hxQkVRY2AYJBAepk2+cLBSk9ideIIaodaiU+ecSH/jBPowBgYECUQ19g64ViPbEf5Sxg/Dh+mbQQl4W/FUk3TyS3wqStfqR7aodaorjVTaIVLo1EsHs/DpGySHaoUNSca8nGJp3wgkq17RjriCUsSbrhaH7L/vMsgHu3RCLaZ57PDzZqBQyXk+sMO0ShkHyDwGaNwxWwXmJxBcZEVHFyQ7RnT5Na+QIOebZoULT6TUskR+sTRPphTwJN769837xARI283qTcsU6ve7Fw9frzwVMwKJ4vo/GqJR6T0Xqjr1dXBOPWQj8OzeoW4hmaojFAZtENSgZPFnktTTBCA9lxzJDzxP/ZgcHj+J5hb/UsvYuHYOrTWrzDS6a1ehI1Abe0S1nf12vTqM+93kQnIV026TIjv7K5AESTmCo9urpoGN861wGJuuciXhkQzN11emhLYDNwPPrkgUiP2+fQ/WiWHQS3R4/OkibtCXHuyQhH3kHXMlOaEmWQlT61kmOekIYmUMHLodHW+mVeN2vuT8rt2kHjX9mk+uQF1Bu8kJHYu47D26BPWtsUVZ+q0I5CqB6dijQF10sZbWKwKWXT0LxH7d4KMLSSa628wR7twGUTUWe5ZvZ3Bwj0/vl1yai1a3Vl3EGT3nC/r7tYs1C2Fi2qFTxAaLIO4Pjo+4+OBnSRjOm2+8NXL91iPy+rbQL7Bx9eL68fhg+PVOW2+9PXp1lrHk3hqBIA8MH71933Prg6eqqTwH7+4nYpt4iiTkjaetqhNdPu7MBgS7JqK/etNQq8rLEHgrloXDXvEsRRgiyKHBV0K1WVVokxEsaTY/RRtIiPc7+hDIg5W8NCkV68vGkaOT8YPDhn3uCvn3zvNCckeZvxaJCPHz/qnv32qyzAsV7GY5rQs3zGo2f6Tz//fnd5ebF8tnnJL1x1P/3RVfeb330tOYO5EM14/PRH7y/P8RsaqOz9nz9/0X31zU2eXacZa9wPXmJwggFnL6DTGsXN/MBdBLHmDLaa7d51zQKPXumobkBYxLFd31ikY82ODi4AAAK0YwQguDWjNuXFRPpFKNs84mT0ts9ewgPMz3/yQTem+6OxF97rxz98LwMGWy3+M0M+tX9ZG4TNS1nE1P34ow+KbDOiUZgqumSoL8dUWl4XTxogAB5uTMCVsWvNU1nTdipanM4fDLRwtxs9irRCq+fpnplkWwm2yENEFaUQumjQC4Hcaszb3N/RNZINFl5hGRXHU92/AcMok43kj64vM4XyHh88vl68gH6fMOylU14qdzhMc96yqL64SAWC46mvqnp7M3YuDbctst5myI8fXaTetqldzZFi8f6H719W3Tq0xAOfhXXFUtX66i2Y3GOe4bj5OEqoRTRpi9rsWZIpAs2e6ZZeZhj0aApyBC16xOe4MS+3YoR3wHG0bwRwzPjN4BfKdDg1T14AgQlTBz9bfbWULMzFvcbUGr4bVwM3Lr/MNht6t8HwJQz3EM//4PwET+QyYzbvY0YPegYQaC6CxTeaGGipONMkAwMXIZ69ZmhRoy1PEBlua+E+LxEWGX4knvOiHdFE/WDdgi7QDRjl0a906PzeptrJeqE71xRCXNqtXBYawkCBY4/SxJtXaVS27QWVTizUhgGRDPyPX/05zzx7nuuOZqptul0A4Wm2Qr8Rv2eKc3t7NOrHq34AIPD7P//Tixx5mvIaf2V7G+7aYeCAV4gaS5ylZ/CSbfMdli6KcgKaDGtNy4xoVNS5gr3DJImy1uqWoUagvEGxnpnoAq8xLxs+9s34YQRFh7pEl4xOIcpkxv31Ny8Wbg6acziU85uXRJ0Ibng9e71FjX70gwt3wpRdZ2DyEmTQACaQr518yJBsgQvtuPUNAAI9wVTKqF3U/eNsNUOUaHNHFidh5s0S21oDzcswRzVJmknmZZxaq9fwuajIrkiyzbSe2TRVRl+sfknnzPABgAUER4M2UBgQNMpkQDBPcZW8gT23v3//44ujQb3KOgGewUb8f/3tV0U2++Rdpgyk5fjLtSqVvYPd819/+3UVEuXE2LRkxKfu92n01wjb7/7wfDFs7tvEhs/7mKLKrTK1AvZsPcPxC/t4T9Z47yge5RCqKtGNNu/eWmmcSW4t3LfH8CsvMvvRKW8Zp0yp0r9vI795AWzVSxQh10SpAKB87Ggw//wvL7rvffjekiuwh+UYbtPE/CiJx9Gp//PsT4vHsApRE8TIEWjMn8vGr6/Kli//1+7x3lV+PTpwa2JOR3wWyRxlipJ+Z5t0a+UNWrRo7zTMrRyBl30GBeJV76f0vPBAumyTU0/E1CZTIAGBhjS98/y8AkgSpFkbiG5QQCi1smOvklH92+8PBa3SPAXrDgUGMtfP/zxmCnUSu30BBK9dJUBjAGJaZO9loERpOM+9sJGfjV37ykbgOVsBvbV+QSsStKc9y1biDbmB4otyMseaRNvKGsPo88J9nUSEaHE/NXoWzOwN9DiiJ56RF/dJESg2flwLWrXspxzFMA5Vko6jUAwAL4mHYyjt0Nl2Xz9/medpc4YYU0y5+lULAtFS5oJ6x3qNzzTT/VYk3ZQmRdxfaU4EAi8q5M1Cy88T9fG0AwOFR3+vbsijS2sybtUBOWRKVOiCjE/XM1ONoNQJWkGL0nDc/hQIfI0+kKOYaBWeyFPcpJooAAP/O5eNc/YaVbNI4Gmpx0G6ZfCkIvzZMZ6DzZoBcyW4A+BbJ6Atc4zscavLnDfqh8u5BpPueVqlUh6I47zVpZ4oH6BUiQ3cDYnOFDrt1+vza3tn1O/rKJJGl6AbzIgXD4Byh2W6400FAD5m2ysKraIpw8Lbk9Bmr1LnF8ayNsr539nwHzt0Jeqsx9EjPHQeBTcbYC+ADoB4eMA420I9T8huCei7hF6914EKcT1RXtVyrtuvRNWkmizLx1gjzF1h9Hn0d3INrfXMdC00ew6PAEDAuJdtMTe49AKgRtheXo5VeNYAtQAi0SEGjlf96lXI4n98XjQO8MEVNUADnULZNmgVR5QYENAS3jJeZ+kZPEoUdZ6OVrXxepnq9MsqfIpFvrFP6yDnZFpAf6LlXT3NwKO/t4JlK1KkGoK9Ap87OCM2wGFGbfvlSjhlwRxTKRtl+fwSxZEiQN5HzZNqCgjm6Jx5B7SPxMjPBr41HZXLxeEFvAcv4+VdM5yjR/Doj8f3o/KJaLK+S6FSWfXAJdZCeXL0aGOSzXr9FB6DN2AAeHRH8wiefuDX45jprOtwRZuyswWLZYRhQZmYOqHgDyCy50snO5tIRHVOXBjInsD+QJ8UEDzb7kUurzhlsuE5Hi+Z5Dlc9WddIGVdVyJa1w77nnc4zy7cwcJ+LcHsndeQqTfpPovlBASv/Uo08kfFdBcpawtNwPSoMHSuRepr+rMFDj7PHuPly9tsmDAA9gYQ19AHTJfgHRg8WrrAeQmlVJrd5j+tlOUmBfnexP11TranHRjYN1RKwl3GuSAw6gx+dprhaJRP9gLFm6HWatzVCouuq9a3k2dek1/s87rG3kNDqAtYDnUSzSu38L+HEyWahqHQFaBJxu3hITCSMzB0tGeQ8DF4DI04cfgWoACdweshtDUsG00yGlPeAMfgARCC5W6AOMdG7ekLFdxvVdJta7ZZiyp5GWcv8gMPwKHOCiiN5FkhkqmQzosCsUBG8myrJNvTE149EtcN9WnuwGIE1jTr6B2UFb9MiavrtE4aAMGA4UQdUyo9x+AAyBBh0pyF0iamS+wlit5K0sSMmxXw7+GtOe1N4GGgeF7hbAX01sSZ6FrNGGcaRKFRBoJ+sZoP0CI7b1LOFFbMdsU8ZRXBXjIt0g4aTcIkGexzRamBgo2etzB6Fr96DoV8SpVwzqtxGpfFQmoDXMrBqVQ8h2rTVFQvaafhV36+LID44lVx/UGqXqN9XfT+rQBDNX0yaOnYWgLWttno0a4RFMgpnfDmGGjYVPMHZT/Usow6CpNyCNQzeK0x8qgTziEhCe/A3sgM3P5ubg6Fsdu+jeIGFts3ng/gsDhe5kK8rKdlovSbAeWJdM1688y6paM6VcgyRSpBU3YBZBB4/Z0YHJ6XUDr1VnmGVoItSqjxOc4PRHML2AMUiTbyCt7Iv0y3HNayCf7j7HGLDmneQPMFeO1MtAqUyAAwJ/ChqpRDqi+5vNkm3yfjx75ec+0sPo6R/rB8H32Ru9ARFmJcM904lqNPzuKVoE4cTWq1svHOcb6Cp6B6be09DXHW0aSo8VboQUCDJDHG2eMoDLpn2mX2GDTic9kEb+0aDqNG9UMeCDQqBA/Ax3gaJYABD2F/dgzGbSM/vITSpZaWYCN/ubRvX0UyvMK6UPlN9hgAAIdlmW5lqiLlHBxm1SiUB4LnRTJtnW7Kv5l2wNBmAJ53OOuOeq21zXSa5a2UbmQqlc5F1KdKjDFdohFZJ9kUGWTKMHsRoQgQW8IZnsG7B9dwGQAOVNz3zfOXlbHrMRxngKCUAREljTgh2gTBvNQ4Jf3AIMKoD1DAc9hxC38aTUJfJ2Swi9cfpqoBmkajoCFwDU8s4uSdJ6CjdvoXZ2b81nj4SSufkIFB6xcUHiEV0blNu0Q0t/qWFiKYtAKHR1kveDkBjyZtzUUAAOABRgLgnNcxG7LH0PvZufcfX5+iSamocPEO3UVBjVhUKk06aYvTBBvWBwBIDp0eX88eAt7Ay0PAa9j1N+k8X6edPDxqxODAZCL1MOwJEKb1chRn7xmQZ4h0Q9GgF10oePEOyhV4VIfDoRo6RYLMo1JstFpi7f8f9TwDL5rE9+CRfXRyFTzbDMDAZ+JJUNAOBgQDhW0ZBPCgENA5YXVzKDzG7c3pdfASqhkQXVLxzJlsT1wzkAAW1iET5Sqi+iYv+gRP8ijPaJuL2ild9PGt6LXq5Q2qhT9kXTOmQK1WjOoNmObw4OEJY1Ak1gNeaUSL8rQ0A/coAu1h48YW4lkBBs2A0KoBwQxCAYHvTIU09AWLatYbXmhWBTU8B0Z7jPyasAO9KgeqE916lWgUysY5N6GegAGg5xGafZVWLdJQ7dl7BqNJXl1Rrg3i1WuoF1GkATRCpN6g0gFEdziTrFRIi+Ui+qOUybuWjZ8bbmnolD0OjF4jTgCQGbBphBdJaBog7Jh9X2zgrBk46sQeAjoCr1sW/nDyFgjJapYa9Kni/iTGmUIhN2Hagu8HHcFewBPZGprlRB3PpXh+7pN7tByD1zxmjwFA5HNBr1IvORZRJxibTsNU2tOqDdLiOU8s83HtKYRoEK5DxIg9AbwF9nEdd6HgKk8DBcSzfVfwBByA4GiShly5+xx7E9YPTKHseghm9QJcIu5pBg7RGm1DOFa1SiSqtRAQho9JRo/zqqO9K87fimiSt3QTJ9GikgqlTYUmIMM/db4bisZcnmErDdKq0yippnMQWCTDqAEE6AIGAd+Hz/OWQcUeAVsDBDwD0yXNNdzlAS/BIziKBJn7w5DN8A/TlCkRi2yc90K3RULv1e0a3bK5EdIMzdMTmGTE/Z28NevOrjZJm/Tih8uh06BbtdKhSiDT5BqdeKN5gYj6aLLMo0xRWFXPsUhmIOB81BmEr4uW9NIYvAHhkTXmOo628BKIONlz2//5Tz5cWkJa8y7vgXNoG4n98vr3nf330+s/vPO9sR9d/7OffP/vk954QhGyZziWllIuzuG5t2RaP8/z2QDhN//+9Rx1lagSYI1rtFkvd6LQ5wwSaIiJIjVRviCKInmlE2y4fA8e1XXEHyWLzd4DYNHGCQDE//rfv8newUDAnsIAcpvKNJaIy/Hcf/3bH6e28e16K28w2hqcIh3n3dd6MkGjoBMe7+v2r5/8oH+d9ndWNOnoAb7wXHhrTgE/d7tY92UzLi6gK1q6oyeRRGqimWWtGiMe0bnC1IsOsUhmmqT35qpUz2OwJ3lB4tD2HyWuDFFtXhb7f/XkBxUQonKVPWDREHaLqvKDgYAEoPZQLb3e9Prt78wo0tJAbOq6cAG/1g/AX77y9ILTyzwCzSB7QGol1BgAXhQIJdYY2Xl053btbPCtRViKvELqTq1Neovv9aZeP848g9X1//B7j4rXa7DBa4C2tbBKNIDhNYdlhdGLBQBLWPfiJNRbxj8Ob37cPrOlb4dnrfaMUULMG5EuyBg9isNGfntodezzK0o9MQ3jxmtmaQjMngDimZNtHvdnAJjBKi3Cd2UGzUb9iPsKUXLNjl+kdvBPsIbC7a3rBTwttkV1vCgdj/4wbEzR5P0towdg8Lp32jN4EaBotJmcxrzqGbhswhvho+xwlCzzBPVimOPgAqTTXMVcaghQotaKQ94DwBipy7WCiOmRageL5f/0R493fe9b1CjSc5E3hzbwqBDTH/UOrBfeBEU6vzzDND2JJtF4o1D2AMn4dZ5BAaS+HR3ycgdbeQYukTgcyvaPTIdAj/i1LIa1/EKX8+2DFX8MEPAWy3sS1WHjt+0Lqv//qycfLtQkWknIM+Bo1N+iUYOI4AgILJgjbcBe4U14hrOjSR4l8n6MQgDzJJt5mxZtUaCIFnmtWFj48ntwSbUaPwtpBpC3KAu8AO8DAEqNWp4BDwuhYiERpTJR9t7TD3vFsRm/x/+jUR+GrtEkft2b8gxnvdrn1g/B2WKuMNV5xxEt8nIEXm5AR/SIcmFhD5fvHsowKIOjFSGa0/8+k+FuCWYGBHuKj77/eIkcRTQmquD1hHTr90JkiF+z5QUYEB5gokjTO02T1DVzC0addpn357K2yEucRV5hq9T6IEV7PLLz2gUKGB7pMRmnKJk41KsRTWmLa83gJzo3JmoDwcsA4mMcNQIQvv/Be0vkqNUmv7W4YvW7OHmeQzoGIMArwHBZAOtxNnQFzHcRSTrbaFIRGWKaMlBibK6Xb2JvwdQmEsN7VsFRQ8cIr0atpRTlutPtZXs9Ue4JVoADwhlbHsHt2NXlxQKA3M7l6A2wQmdU3bvVMtMDTnRO8waRF9BRHwBR2uQ93vloknkG7SjBzzta9pXLKTrKEejayF7SjMOfHjigDUYBFhs5l1AwIBBeZR2hAGJARAKZ6ZDmEmYRsGyYy+o4N7fd1fGnte33jh7B1nPem7Xfk2FmT+CJ3EgEt0Z81Qd7vcY76xl0hPZKrXnuAbxDKzrUihJ5r2OP4OUHeBlY9ggjhVe5j5GGPbEIiy4Fq8c0OgRAQCOoVlCub0AwmmSRI++aVjTIo0kehVJj1iiPhk2V77Mn8PRBFDX6i9AMiCah+4RHFbhtu4Y9dfHuPS3dPcBoNwoOk3qagM8zHWMvAA0QrW3N/6uK4yFRIjsOrzA3GhmAJv2Xv/lh5u86AcqL/oRLaqXXsgFylEgN3AOHF0FqPSKD9wD2znoGeAINm7ouvG+vbOMBxCuj0NUsvUn4urg3H2cvksXwXBu8LjQO42YQqDfA/zvLiN473wsM3LzC3xyp0TVNlm99395MQC+Sp9Eer5DOM14Vy54X8ehPFGJ9U4+zDK1qP1IFgBp1tL5ZCwTK+yeEL6mGyDP05Udhg5Ykmlc/5JVYsKEv9EeoEa977I3WiB55ozmK71o0ak9SswhkUNlEVFHqcX8dxVkge7QoOhdpi3caDFkoD+XqMK0GvFEnOgUER4/YQNUrHOi45gNYIPMxDp/2lBcYJKRaFPORwQMUGj0aKNTaGtXZ0C2EGhm4Fwny7jOR0XIJhechWrkBNX5PU2yd92jS2XmGf/vD8y9T6O5Xj64vfnUc0b+4bzQJ8wq6aSpqi7yIT7Ea5hzrBK8aFcc5iaZJMKVG/J59MKL2TmkDj6pcV6Sj+5wAAQo1kLfw6oU8vbBHFCsgonoirixtCdlWQkz1RMT1o3BqVMH6ukDx6ubwi+Pf390bDDaBf7wYPz7M3WffvLh9crg9PLXjV5fjr78NOECLGBCeQXvZ5WhtAw6jgsbwZJtMRZzokU7K4d5FXpi08BRIkqXnI4FAQ6fYLkZIr2uFPVvFdK34f6vzOL8WAlkn1ahe8CbdePmE6F7eqK9lGV4u4ts8jjb18TTNP7Pty5vp72wNQZt3f7RjS/Z+8Tpp0i/H1KPmiDQDyBObYmdvaOA4/v2TbfeEN6PFv71IUESfuBGXdpxYvACBQGeQ6fTMJVqUzmmESHXA4Iz8Ghbl0d7j6XyuVRqx1QQh0gAR1fJi+1vJLu9aj+dHGefI23il2ncFgRn98e/p7e3E9viLjn5Lmkb25b2mff7+q5f/OAz9L9Yvdk6ufsz7xHe/SB/iy+vL4Z/Mayg4vvzd17OXMY5qirxMcrT4hybCuEMFi2TNJHcikJn7Mwg0UlRoEkmaDUKXVGfsFb6tbHGLUun15gVAibziuOjhjfxb4tm7vhU2bdUs/eeff9Sr8RvtuTnMHxtLMVs7Hv4F/y5Rgzqzz3uB4Y/fvPoH8wjrj35wubSVBaBbAkoEjtdW4PjTNy//YSnjbqxk06pMjbxGa3F1zihH13vzjUGDolFcqVBrhPa6gLcA4AlgDyCtjPOekukoihNFlLx7RAC5iwCP6NhPPvrwE6U84zg+8RKd3hIGp8Toobu8tOLF+df3BsPYd788IrEwfABDPYQuGMEGhmvtmpub2yLJ1oogaajUK6vQaMzeifXRQxNeCgrOIMNjqHeIKM1W36e9E29aFIoB5XH4LZ7vGWZUcr1Fpbben48NKeyNPlpFDuR4jNcNt/MjzaW3c3g+u4PW+KvXohl45B/NAGeIyBlv1DGVyovSDWO5zcY65mvGcc7IzrkHr7huKOkPh0ihEUaZCrpl7JFH4KK4kcKk2dCdbPLQiDJ5I/lme3yZdO9ljb0HqNCNgNITqHuFbiSK90SPIm9g28tUiHjqabU2mF5s6+bmOKJfZkM/UG8tjPwMANtGDMHs02jVvcCw9KAhIFwekXCYu4oSMRAAGHgT9SQKmuX8ESz98bm5M1yLf7pz+o4qvdGOFAeH/gBQ/IXpJPzCuwT0J6JIi+E6Brt3vnf0ur0UCUBocfmoA8VWVjgqudhTV8TvgZH/Oq2tkRecsfc4Gv5A9IeBwF6BvcHxYEGRmIXA3myb9j+/FxiOxv/FIlCOlgSPwCM/g8SM37bLj5L2bWvX2P4kXxzOAzDwPrbNSavlS7nIVOxEqw7FjDIvLOplhzXHoDVEPGkeIVAWwpM8Z6+gBrrV8rKlEbaA4N23JWj38naPukRTMiPq49Kei3WNhrzopCxyOSRuDwOH8TPtYQ1g+6eBdczn8kCbWAiAwPT9XmCwcBWP9IuxEzBgyHYue4C5K7a8P/YrrznMtWcJvFNhtJeLW52y55imei6yJ7C8Mgr2HmpwrAUK/RAksbZmkU0ODdszbyACUMTlvZG8Vf/TAsaeEZ8fj66vlkHpelxH/gtaT0N76vL/aufKmYJj7QlocGSKjtFfqRF0amIb96NJR+N9BkMGRaJzxw96OoZz9ofjPOovIBhW7wFwDQQs206ORoEH4X8M+2P6sq6v++w9uEeSVzPkJdRYH3h9ijgkivNDIyu8pyla5CE8j+B5BYAyKo/YygtEI3/L0+hze/+Tca6rrJoXWDzA8XleeJIXoUwjPGuCTIkhkHldDhLLJ++xagMAQT0B03LYkkU17+0ZFkM2sUJ6QEf+YhRPBp4FMhk7A0KBAPCo3mDKpUDR5yfP0RfRrMV7SCmGFyFiUDAgvLnJHj3y6EtUCrG3nKIFHBbLrdofL7McTcZpCWtQHp50hdHfrzZYV1syPXCTjB/JTADBjg/eoJXo0EJzUD5yebFEIhFChfGfyltWTZqMvwzmdK+rUI9c22K8yzxHOdZ3zWal7DUYAPAq/KHZC7Ee4fdhQKjXAtCOX3PhPewLsx/JvtCZNEA2oFQzFCW+Zqf4bU8SzXtN1EA5uofXiiWK13sRIc/YPaqF51dXV8loL4qZh0x7umEoWoXyPgNFDX4Z6TPtucw6wIsSFUnQox6oFsJMARjPG0g64Nm9aZJ5BTN8BsDBiV9GGqHSC3R8GFYjhtDm1y9UKHkRPJ9IcPP91QvdiOsaUzSJRTmiFbdJZzAl0nxBq/GZNz9gamSbo7XmtvRCK1sbFcxp6YMHGuwz518MPvP51QuwJ1j+R/p8AAMWnYQOgDiel7ksB9frcenESFEk6DymyawLOLjCngGAwL7Z8v1pUucDwMBhxwqDF48ReQcPLOwZGCwMCvYOeg+maOotllUoybsAeIsWOX7hnPcwr2Hg8DLPurB6qywiqkJt0aDWRPkoG9wStlHmeKB+saP8XFpJnBNgaSH6sjziUB2DV+gSIC4perRQHrEPeAX1BnaMk7WZ8gxjEVjhYxpwYZuyEo77e4bupBkyKBAtyhMHkufoE53qa5C0AKGgUH2iHsR7DaE/h3aZYnGkK3sEoWE4bp0mltdfXeZsOQR5FEpt1QV1DaE9BULXklGTk/iKQqdRgqxo3GUBAglHL7yfKgEqoKaRXEd7L0qE63gdPlAgzSBrNpl1QR7RQZkoSmSZnMUWqPqBB0zsezTJ1mu4Xwn3afGHk3GTIO7m5IaUAgEIci1Hmnhfqc1ioABW4oYGQg9AfEyjWS3Nwd5lHHtvBCn1CVGq4dFpxZqDrDut2uAuDblYC8DQWRh7XD9KggFIXCw4dmUXko5WMy2AwOvaNaibJ5g1bIoQuBca5byBllJg8DEaOwxcAbzSLAMEU6Zpmt1AzuXFutxXev7s/hnoPkWH+vKNF6NIYjoDA4bckZdgwZ08jAeImjLM5XH2QPIavhfvewIb3mEcy1CvRry0UpCFvv1QyxecIiLgwkukIxDLkTeAF4hKIzzuz9ddUnNinprK3Ud4ei2oEOah276FQ1/dHvK/zBTP8wSqEXKuBiJ4WvNAnDjTWiKABRFAAMHLGTAw7F/RpBrTpjyAM7M42vL9o0l5Vc66XmnIonbVCvnDABysI9I2L2I9z2WkqV+NXkFQeAyPjhG98rxHAZDB8RICCM6FcGKxSEDiPY4/6NXl8ce5vso/GDLlxbxmRwu0xHLE/ccU3+fFEocU79eOHqj9YYAaCJAVxqqqyA9kmiPCWPUBZ4MLwz8cigqCwvDFE6z1YKfvdp5KeqOimekRwqeePoBXYC1rz1/rHOjMz8C9+77iZ5m7TSUAOg6JJWN2DTfRLGgUgAAeJgNAdMlhR4VeFNny9lnAc9gYIGJKpSUonP0Ex0VItxU+Va5/SXMo3NooWhxFPULHTReoCduUOxbOGRQT5QXY6D0Q4NiB8gAWOlVRDC/AtUXI++Bc4UUS/Tn9lqs3KAIr9J2yTvRyUCO9DrZxb83ARg4qBBBUozdVmhYfjs/3fQWIy4FANDsUifRHRY92RLCqJKEj8r191jhe+Ja/g0FKTPhHu0qLidhobq97dVOCg0d+5vwKhHEcXCAxCDCdNtdIBWvawaOoKF7W3iZgqEi2LYQxssanAryxigiVZfVjBlAWweNYGLYmyfi4VxiqgxbobES1760ZsPIiC+asH/qaHvExN1M80z/eE8j6sgSj+jLSfT1KVdGgpHOUTrVyIKo7nMhada+K4jnJRY5k4ZqFUs1r5AoRHhthuWNHtAwuz9XgWXzIl0zUecTenhd+1A7mEL4cEeLyiiKRliJKQ4r06JwCDpXmkT/tI4GXhS+8wjAWxswlFUi0FbkiTqwmppBzVEShPTp+P5q0JFrmwlDd8BVGe0M9RYImpkp9H79estytUBm7v6xBREtkgAx95U1cKobQce9n1rN3YMrW19GxKPyr2gXXZZqVDOpyvMrvi7IDCFudutpTHyge9W9JIHuZ7QtUjOoaeV2dYQYgio4aySugZEJBgJxEzjdQWU2fEmT20SCUudR62U41KLQ0J39/aZDOkaN5DgMy431Dq2qgvHZvRnMyIIjoxSVfDJW6z/vc50gBkcA0Uf7A9T6qQdh4u5VuMTXjEd2LUjG3LLRIQJE8o+cQM/8wEf0qXLrcF6PoB++djNMW/rZRmPk5JjMhCjM57XcyNTpMVS2RZpC1rog9w0DZZBa/Os9gJIqUQ61OgozFsDed2Ms46++RQ+rTGqjB8yIx/DpKuLul2vDkHbDF6DvNq3HmxbPT9Zn6sMERwKZZPMTclZSpDPxUniYq1rsc+6K8l/WJRqrsvjdTV3oHyou0tIgabjHyD3XS0K3lGvpmWQtEO54bpVoAdByZrc4K2fJlQtEFssRrCBXhUl72V8OiXEzHdAgJMwOeR4VKET9WOQSUT3QU+rRIEVeYrp3J+5xMW0LeF2P9u6aRX58zU+DvEt8tg2Sxzft7htNonVeMPyAW3WcAeNGkYfEg6R+4nbIuyKM/jxbzqhugKdj4PcqkIIo0StY6ROEAmAIgc/llFoLfOedSJTHwIkKmdVpzrWO26BYXIS7HE0AWA7HvvD9IIiyealrQGKFDDAx4AQCHI0HqAcYEsDGN/Nj3pgdDROeq06mcSswDHOgQa4CtwImCxL6ze4HhaPxfFAa1jCh9NeKDGoFCsWEuXmUB0SxrM5dhWVyjI3+1KPk0FyP+FEwS0shEBlxABVmoF1NM9Qt3eGmRaOx8gy7o2FwKcr2P1n21ylqKCEoytpE6hINamYEPZOSaSUZ59ZSEOSpND4dD0ytw9riIEHVriQVqjFgLcN2RJs64ZL+oMCDKw/anXkETrhlg940mMQjspmawMNoFGPOcAZI9BcDRlwm3BQCkF/J9QLOSO7slT8I0KXuH3jF2hH9F6FfXaVhYdY3OtXaujyglG3mRyBvWyl8+rkCD4R+kforLWzwh7oEFc0bs7/Gjq6JBWp9Kr7nKFFpkoDnI3myzSiMkz8ElE7a/jOSpnPo0VXalSOuyXnOVeBsoIWp0iL/PIlE7rVvNKTA4MuPoXsN8BqU0g+Yd+lLUQlvwMUSk2EihP/LIngz/ZJiliGZtUiX+xHvwtXvi1CEoKBS8BAdEyLOXGmg6a0G5UH7ilJaAPlXUaygz7Kp5GCjVPamYUmlEzphTxxL7/NeI5NAEHDV4L3+wZrrXUCpGeBi+llXkCmQushvqRBoqkHP0TgRyppfpeLFlStmXTOL+YAiSIFUvVAJK0Tk7eYCTgJuL8GemVuk865AsxLuV84OCVQIfx/sSCAAK07ymtpA6+EpPODkUHSwKr0LlJ7gOEa/CmJl6zQKAztc1KsRxz0rzOPkQLmJcQJTyHtfXV6luayzas7iegXIHTH2WTifiCXItm3RIqYrrJDdT5JI4KDHVVJUBcUlBHNKWz15LOYYKZKlhc7OHOfrEo/LE2ev1AxfXJgPP9yUAQVewbsnCngBReAgHLAw2Pl55jnmuIlDq4SJKpmDSCt/MZSU/Um1FtxSJJEeHMM3arNFywslroOIiX2sZc02inYrfujpPIHOS+TvJq6PK4JODAjSR7MD1bUw3Oz9kfsDg3IdVEfsL9biJK45ZX0tG96WTzYiSaMgws+iuShXIu8A4swcpQNXVIGOAJG+SW8qTV5gSWLxU/1oCMjeBPQXzvas8SSCYveu2BLo3srOw5ChVFNHySuuraBcZXlQmj4z5FRUvsvFzSJTnJPdV4+W+igzmgUPq0TQixLqg+B+JJmFwyYNMX3rqTTC8eHX7SwLAZ8XvSZ0GTh96yChmKqKlwdU/2tV15zD86rq5K0ZtjO5Mp07nVwoGj4HaKaNWdk2SizlJyMIfr9MfikcreKHif6CRu6JbQQSJczKdUkkqf9fXaeZ9opGdiyGVcvF8EKZXyrE1+lUkGAUkOndkKUbs1wjWWnk6VdMvvcGTNYCGTQvBrMkznB8oDN9vD2RNmmSe4MXL21+mL/OzMdCW3jJNNjoc5qn8YeBGgygOKiWjyRhar9SiXtOh9CA5PKsgGfsiIsTiP9MnuH36sZZoFmkPBk1RsEgg8CgXl6MYQIuQMQm7nP/wWvGzQF+qOxPApkYpiUOfKoqhZfXiRbSMRbPqSr/wO5kX0W6KnB/J80n6mNp5EaKR+3IRdepmSco6lQlp0PXBYN7AOhtbU+GolkO9gyemlwzp8RNdEwBg9GrMSMzkojEdMcwYunbCjbUKRsYhWMgBwCkMiUZ9HuVh7Jj9hfO3RLG8OiwACsnIXBBGxY2R9vKy6oXH6fuiSrjoTN6XQMvfWVcL7UWbiOep6FNf0jQ3i97V4d4ieUgec6kg7+MKYkQPOVK0lVHWoALPp+HSoGjNj6MtfFzlGZ6/uPnMaBGAsDeSpPv8HAKVaVKZF+iruhc+dhpdSyBcjMNmDoGPe9Rd9UgO6dI9MsUiOmbnkCfJ9Iuy58U9U5Rr6LvCgzDAdP5HHq36rpgTUg8QQqOCjGumd71D06RQUktjxiDczJXBLGCZjh1oJD5MtaAv5rVLAIG9j1eWMibqVAUMiP5wwtVbIrm47kiTBvUIy1RO0QZ3AYX3pXnNiJe69b70CqcfrM/ewysNWBNyU9WDNQLoYrxj71Iv5Y/8r2Tjl38PNKkSssT/M0jIwHAMr+eFGZccSU9A6+L5u/yZWFvxD+/9Pnq/IuwrYVyA2wXYvApQzYXYsRyS7cVItcS+K5OLkbcYSUccWgEJGoh1wUtvAUzJP61gWKJFJ6F8ZyBwtadXhoDZRrfF6p1z2Vy277ORBxqmuPZUVzPn1+kxPlflDvrezSewgd0equ4JZYQpgQVA05EfQp5HcKYxw1DWWbEeyZ7I7udMikJykfVKMSD0K9XwgB+Fet3QsXoR+uz2lyOIs0Te6H/jTimZMvV9VWLiJgslm8xZZD1eeNrG6rDesYImJbF8JyB4hWRaFsDHPINkD1GN7M5xrokHfQJYUI7MgrxrlCADRG4ouO/C0dkFGCUPOYuukS7Om3CUKwOwX+lZFulzUQ92KnnJWmT1QLlMRb1c3/tUkcOMChoJJ1fCuncApetwk65AYpGTZJUo70ovUNChvh5sK6AkgB6muSqbYZBg8OKo3fHYaYFD5AvuSouW+bx9XCTmnWMR3dQJzv7iHYa42G41whUUpxr9qUziLE2s0KxgDumelyuIKKGK8UrAkTFOnphPxs2eiXMma+IQlG8tB1HRXglxScApl+Ywrve9uv9/QJ+qOSUEoklCs8WsM9Ya6h2k/KTZc2uoo2le3ooDLAML6LQO7md3AYJ+KC0zbmas51IAs3ZojebqNTQ0C6/BYMNzplOFZ6C/NQSbVosZ6tl3oGA4j2ND7wv3YsRFDmQuk4hsfLcpacWZcc2XeIEKO4fX8P1tC5BB9BejJr5HqSHTcHClWQa/QFGrhKP9Imsvv+049NXAwoWM2kZIQ8Oj9LnKn5u0Kb5n/E7mGQbTClvG74lTBUQ1S6zvw0K3NbrRV0k5pkGVpnBjxGUkqlrogr2KlAyo4a49Q6Xl+TRXoEROBNd7AA0FvVNVC+PjQkaIaqU3XOioczZgOPixQalwTEdozEWB99HKYUSqIOyrXIjYCf9vRS+tvuFho3IXEfnVNF6JiBWRKK4S7tZ2QeiOeCBdmH7/JxdWYuF5Ba8Ab0s7VEVjWv9RlRzMlejNfJ8mhmvJgoZoq7oY6tiMbaU5KDw7jDI31/MgArIi/EqtVfC8G/y6rSLqw6JXEn5Ftls8jSYXc94jUasCgAt4OtIuXZHoK6JdXARp4eBxSO+NBetnV/RXRi5apFX9y2DTOfGt94Hx58GC6CC6qRT1TF4Fb/oOFm1rNCmFUpuub1e9vheBmOfQq5yoQG30GjniUGoUgoXXmBozmzSM6+UpIm+TKdw0Vx4Kn4vBpZ8jA96heTzKVrRqqIUt5zHY8OEhboVMI8fBQAN1wnwT/FaIXnHmvUgOUtJPjZ5DwjlEPPZVhKugnKIbtI6NcwWeFyp+N4pm5bkuCMVSmHh0ImYjD0gKgjsZv1Ai5uCbvFEMpqBLPJKToRV6QKhWHumD91BD9rxBS9QrgABITgyCanl6Rz1glKwsWuwHCcahL+dzZ2Pr19dpfRULeC5DvxhLwwZQ8vx1RMX61cBxDABa8ieHuYja8CxFnWfiVQ0wNcuh594voyi0idNtBa/L+oOjYfNcNawYOc8wTXdbD7oQn/2+ZFxYFerQCXd0pPyBNwLDo7A+YEPSpY8iHaLnPOOOciXq1RTk+Eye99PvAYPC4n2msjyaPZxX8sxJQzfJJhwfwh7eJY/MVKeVRf/QFzMbtegPHqdIQHIFcF/Xd+k8j6qawKne1ariKoHqhYiD5OUCkG/jDaL6oHBEbmSHW0LdA0WVxR7qkRujs9Y5eZ5DS0Ja3sPzGHGeQnSHEyzw3lc/j1e/5QJ0Kr2Px7fd0mgR7wwieAGdGchRLx51F49CkSu9T+GpNNhAwj7fp1+LJYvM/Nw17U2DFK7Q19f2/b450BXPaxh5M6TqTAKKOHMrubXlxQqQ0mjtfTk5BzFrdCc2Yo9OtfRGVXZCYjuKgK0LgAyl2JdcihY1cha/8KZDSTdVh0TzvtlDFMlBuUfhKZLW4H2ENrPIT8K38Cykc7LWoVBwzsXMc1Xd65bIex5hLgfZcpCgfqlh7HgjmrQHBG7MPkBp6708+rR136GvJxgVeYdpLsQ864c1j9BX4l65fKRRPMAwqBgkTOE86sYRNaZJfD/1hFruUiQfu2But1PCwLrkwmvxSQWKRX0VN4GYy4lZg9Qv5TKSfs3H5IBBSjzmfMmwapaBM9xUnaoahYW8hJifHY9J82Ax3C13tCWSq2I4MbyKwzoVmlueqeV1vH5KEZA88GqOQbPnmd7k0anWE62oF79egdH6bjkXU7yveD3+zJwsxOo3occrRv2ha2lL/b64Y4oWzWnpBowfUa48S3GtGaqiariGy1KK+rKZQswy0aqoAqDvzKZ9mmf48vj87+8VTg1G6Nb5rYrKFi0qEncO2KLOzcVk/gaFC8PB7EXm2S1bYC3A+QcGkWf4midpRcG8+i4tQ/HqvDIdlFIXAOM2tZj0BgyAiMHEx3X0bX3HnFzURKJGrdgDVbckj8KVwKotiiz82Fe1XglEz4bjP/PFUr660wNs6QnPcD2BvAcU0fyECFTqsqsRq1G96VWnRvTQy557wGXj9EKkSolUP0TZ+Cj65Xkt1Sgc6s3vL8nDKMfDn41zKkw5W99tVEEKusRNGqq6r6EsIwFVyjSKChpzg4eZdA6m9qaoGELIhZdK/9jnx82nezxCGG4Uzhmn17d7E7WEedhpokGn9iQUlTdv5UYi8HpVtwwILyrkAaKVIIzCvlHBI+dDvM+Ba+AZqvdy/v91LYfVo7BniTxH1DXEG3CobqjQGVwYyU3roGVyh0Yp+eCO8dq/K89nMO/wbYRxK7scUZP7CPHIsD3PUfU42hHdUq/geZQtADYn5Ax9c0DgiBEbcEFftBYrKHn3vIeKd698Xj0DZ94L8CSPwR6CtVH1es2m92V43Cun9+wll8mLmGc94c3qgybRcpKiaJB+iNU77PhSPXfa4v17vMLreESCuTUvYcuLtM5H4eBWzqWKrPV9FVzIs/kIFHWUp3fLQJjS6HoI/Fz3W15FPVZrKVnNuHP9GScnXa+oc+MpPHwCsR+UYerVmuHIjem0RRGD4YsUWfo0ip1H8w2KHzoweOuK4IX8vgtgeF6iVa+v3sDLgWz1cvWA4XmtKNDAybMKBMUUz7kMFwvd4r+t6JZm5j0gVd9TI89SeDaJtGmZvZt4HPqizGVqFH26RYABXddVoZKW+Lif5Z/BRJ/jG/+jfgnRF1eMRO7E9d7A0FO5+OcpYfQUQLw9zdx4yp4qmgL6XT1UBzWnSAZGHoVpW2UqXv9X755u20snR8FeZk8+w9My0TWt13AUjc950TUODUfROr1vngdPx1vfZSvYctz/dHBG8F9buPX4Bp9EiZ/iw4trFiP59PihnwIInjZJQPgYQMA1CSje33f28ES3F6Ha4wm2Qsse5fIAFM1CY+/g/vBOqYdXcqKJuiiapZ5DxX+d+Z0rnePRPm00p4WNXhshDl+HU4idKuAKbIGQ+yLlHz6xP6VJUY0MIf2TBITPYewMhON+D6/AAIi2zn7/XYMjmkwf0a3ox2jVCG1FuSI6FmXgW6FqzWsUo7FDh/m351E9qtL1mEQ0310HVs3Oa+6EvUsk/rXc3p1PrwNT9OOb8cFLJFB86i1OJyPGpxDhj64ufqVGDVBgS16Bkf+x91mYhwq4nl4EzX3epDaJwq2et/BGpC1aFJZGBJl59UKtLH5l8M4xr6yDaY6O4qpFWl4kqhr2Zi1GQZvKg02zK+6ZkrW+/+WeWz/6YnRjV1CZdJOfpX/qiQnvBJpdYdqILkVeQR72yT/2aBa0B34k8T6fM9eMwHNfndKspGxk51uAaRUsevzX0zmtiJ+njbzJRt3UFVsOuTaz58tsvdJgtzRJVNOloNJcznJ8LDuo5M81rFs+lnTKs0pA3+Xh6YBIG6hXaN3TA433er1X5FX0OAn21wKA+wj0vTRrryjcI9D3nt8CnLag36omZiHfLEZsCPTNkP80V9W8nmh3ksGf3AsMr+vRAkgLXC0Kpq/VfYtoKRiCCNdZPbaiSnsTm1uhya3IVQTelpfywrLIQSiwQHG8sK3nWZpzPeZ5z3f66XAOPzCP3rxlA/cAshGd6iIPAq1hfxK16h3q1XE0K9In4qpfa/QrokyeII+6V7Q8T7SN8iIaHWs1UG7Wq7lt++dcZu7lTrwQbqsAUu+hCUVOap6FZ3idniWiTh5IWp5mw9t8zqE+R3c8pff7/LumW1vepJXbcNcwaHiFzbkQdzgfgmeOxX0OGgT1XS3vILrk03cCDHvpl3qaSMN4GiM6ztqDwPFU3mczgfhda5c9E7bC7G1DS+yhVBHgNj/zXE/CcgMCG8I80CGfDO+a8beiVlH+QikajjMVYwBxWNhokwDBe/+eZ6Z5tEteG9KsNxUu3jPt1iuR3wJSVBJxl6y8dkrxAORphr0V2On1T95pz/AmImRbwt3zOlyG0tWZ9ky74FUEpJ//R3uSrfKTlq6JBPqWBorKUbao2h4PoaUr6fm75RnehDfxPMlW2LjhkVzalUR8r0DBa8QbqPDv3rT32DNrsXXN1tTbqOQkKsHXYxHohr53PwO3A6Vk3Jd/8WBohXSjffUKTL8QBYtyHPreQrk8fVMZvryn99nfKKW6y5TerdL21jz7VjRsq6et14eL8xBVuNaSyA/EaBske/Y9Q3UoV+8Bjq9TYMmx3gOl6hCEhFsNzd4UOKIw7V7q1ar9ukvXlKpDyrDdSfxBM7xBrXFXPdIK6UbaJYp6UflJ34qCncujlejzwNOaE3JXTQPNcPFgxm+WbrWuuQs4PNG+A3BPG7kSN/NOj8+/S7G+d865GnlrjknrnEPfHjTDuQn5qJaq5R0CndJHACTKxmK8E/H/lM7fZVB4Y9pkz2jfEtlbCb8HmvSO0rKtGq0o8eiFiiX0u9tTON7nP5R2bdCxpw9geMsBcNcCxS16pYnHViWwlsyTRyno1hYQ3iRQWll0OfbJAxj+gsCzVV7/bQDIgpzrslTk63ySKNq1NefkDQLm6YNmeEe1h6cXWiO9ag9PtCs4tCyFRbjz+qegWkqf6DXF9nVrEA8ErDcePMPD47XOJ9nxHnPkIfSYhIXfdPXv04fQ6sOjGRbeolWt2YbefPeUOPyYvQB5rC/kHOuhLsqbvC6gPHiGh8drE/F3jWy1ggB7Il8KPgLvrHRryys8gOHh8UYBs+VBWsb9usDB4r1JkY73eADDw+M70R57hf+3fX3L62g0y5yAB5oHMDw83gpwfZt8SjSH3gOdXfMAhofHW+dN9r6mlXlnmoX9hzzDw+M/9HGf+SRb17bmrmuu5IEmPTz+Yr2OV/D44BkeHn8xXqdFkWz7/wUYAE5vjnCRyonIAAAAAElFTkSuQmCC'
+				},
+			}
+		},
+
+		computed: {
+			setSrc() {
+				return this.typeSrc[this.src];
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.empty-content {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		
+		position: fixed;
+		left: 0;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		background: $page-color-base;
+		padding-bottom: 120upx;
+
+		&-image {
+			width: 200upx;
+			height: 200upx;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/eonfox/eonfox.js b/mallplusui-uniapp-app2/components/eonfox/eonfox.js
new file mode 100644
index 0000000..9b0d082
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/eonfox.js
@@ -0,0 +1,453 @@
+var eonfox = function(config){
+	if( config ){
+		if( config.debug ){
+			eonfox.prototype.debug = true;
+		}
+		if( config.application ){
+			eonfox.prototype.application = config.application;
+		}
+		if( config.api_server_url ){
+			eonfox.prototype.api_server_url = config.api_server_url;
+		}
+	}
+	
+};
+eonfox.prototype = {
+		
+		constructor : eonfox,
+		
+		//是否开启调试模式
+		debug : false,
+		
+		
+		//文件服务器URL
+		file_server_url : 'http://img.eonfox.cc/',
+		
+		//接口地址 应用ID
+		api_server_url : 'http://server.test.eapie.com/',    
+		application : "test",
+		
+		//会话名称
+		session_name : 'Eonfox_API_Engine_Session',
+		
+		/* 
+		转换时间格式
+		*/
+		switchingTime: function(timestamp) {
+			var date = new Date(timestamp * 1000); //时间戳为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() < 10 ? '0' + date.getDate() : date.getDate()) + ' ';
+			var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':';
+			var m = (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':';
+			var s = (date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds());
+			return Y + M + D + h + m + s;
+		},
+		
+		
+		//提交的有效等待时间
+		submit_sleep_expire_time : 30,
+		
+		
+		//请求任务
+		submit_task : null,
+		
+		/**
+		 * 提交队列
+		 */
+		submit_queue : [],
+		
+		
+		
+		/**
+		 * 提交登记
+		 */
+		submit_register : function( config ){
+			config.time = ((new Date()).getTime()/1000);//赋值是 时间戳 （秒）,用于有效时间
+			eonfox.prototype.submit_queue.push(config);
+		},
+		
+	
+		
+		/**
+		 * 运行提交
+		 */
+		submit_run : function(){
+			if( eonfox.prototype.submit_queue.length < 1 ){
+				return false;//没有执行的提交
+			}
+			if( eonfox.prototype.submit_queue[0].runtime ){
+				return false;//正在执行
+			}
+			
+			//检查是否已经失效
+			if( (eonfox.prototype.submit_queue[0].time + eonfox.prototype.submit_sleep_expire_time) < ((new Date()).getTime()/1000) ){
+				//已经过了有效期
+				//删除第一个元素
+				eonfox.prototype.submit_queue.shift();
+				//再次提交
+				return eonfox.prototype.submit_run();
+			}
+			
+			eonfox.prototype.submit_queue[0].runtime = true;
+			var config = eonfox.prototype.submit_queue[0];
+			
+			//从本地缓存中同步获取指定 key 对应的内容。
+			var token = eonfox.prototype.token(function(e){
+				config.error(e);
+			});
+			
+			if( !(function(){try{ return token['session_right_token'];}catch(e){return false;}}()) ){
+				config.right_data.session = "start";
+				config.right_data.application = this.application;
+			}else{
+				config.right_data.token = token['session_right_token'];
+				config.left_data.token = token['session_left_token'];
+				config.left_data.session = "start";
+				config.left_data.application = this.application;
+			}
+			
+			var request = {
+				url : config.url,
+				method : "POST",
+				dataType : "json",
+				responseType : "text",
+				header: {"Content-Type":"application/x-www-form-urlencoded"},//跨域，防止请求options
+				complete : function(){
+					//当请求完成之后调用这个函数，无论成功或失败。执行时间比success晚
+					//删除第一个元素
+					eonfox.prototype.submit_queue.shift();
+					//再次提交
+					eonfox.prototype.submit_run();
+				},
+				success : function(){},
+				fail : function(err){
+					config.error(err);
+				}
+			}
+			
+			//右令牌
+			var right_token_post = function(){
+				request.data = config.right_data;
+				request.success = function(success_data_all){
+					//这里要注意，这里是包含了 data
+					if(typeof success_data_all != 'object'){
+						success_data_all = (function(){try{ return JSON.parse(success_data_all);}catch(e){return false;}}());
+					}
+					var success_data = success_data_all.data? success_data_all.data : null;
+					if(typeof success_data != 'object'){
+						console.warn("应用接口响应异常");
+						return config.callback(false, success_data_all);
+					}
+					
+					//如果存在请求令牌，直接返回数据
+					if( (function(){try{ return success_data['token'];}catch(e){return false;}}()) ){
+						//储存令牌
+						eonfox.prototype.storage_token(success_data);
+						//返回到回调函数
+						return config.callback(success_data, success_data_all);
+					}else{
+						//否则说明没有这个会话，再进行左令牌查询
+						return left_token_post();
+					}
+				};
+				if( eonfox.prototype.debug ){
+					console.log("post()：右令牌提交:", request);
+				}
+				
+				eonfox.prototype.submit_task = uni.request(request);
+			};
+			
+			
+			//左令牌
+			var left_token_post = function(){
+				request.data = config.left_data;
+				request.success = function(success_data_all){
+					//这里要注意，这里是包含了 data
+					if(typeof success_data_all != 'object'){
+						success_data_all = (function(){try{ return JSON.parse(success_data_all);}catch(e){return false;}}());
+					}
+					var success_data = success_data_all.data? success_data_all.data : null;
+					if(typeof success_data != 'object'){
+						console.warn("应用接口响应异常");
+						return config.callback(false, success_data_all);
+					}
+					
+					//如果没有报错
+					if( (function(){try{ return success_data['token'];}catch(e){return false;}}()) ){
+						//储存令牌
+						eonfox.prototype.storage_token(success_data);
+					}
+					
+					//返回到回调函数
+					return config.callback(success_data, success_data_all);
+				};
+				
+				if( eonfox.prototype.debug ){
+					console.log("post()：左令牌提交:", request);
+				}
+				
+				eonfox.prototype.submit_task = uni.request(request);
+			};
+			
+			
+			return right_token_post();
+		},
+		/**
+		 * 获取左token
+		 * 如果没用传入回调函数，那么则直接返回当前左令牌，但是有可能会出现左令牌失效
+		 * 正常操作是，传入一个回调函数，左令牌始终是保持最新的。
+		 * 
+		 * @param	{Function}	#fn
+		 */
+		websocketToken : function(fn){
+			if(typeof fn != "function"){
+				var storage_token = eonfox.prototype.token();
+				if( (function(){try{ return storage_token['session_websocket_token'];}catch(e){return false;}}()) ){
+					return storage_token['session_websocket_token'];
+					}else{
+						return '';
+					} 
+			}else{
+				eonfox.prototype.submit({
+					callback: function(){
+						//从本地缓存中同步获取指定 key 对应的内容。
+						var websocket_token = "";
+						var websocket_token = eonfox.prototype.token();
+						if( (function(){try{ return storage_token['session_websocket_token'];}catch(e){return false;}}()) ){
+							websocket_token = storage_token['session_websocket_token'];
+							}
+						fn(websocket_token);
+					}
+				});
+				return true;
+			}
+		},	
+		
+		
+		
+		/* 中断请求任务 */
+		abort : function(){
+			//清理等待的请求
+			eonfox.prototype.submit_queue = [];
+			//中断请求任务
+			if( eonfox.prototype.submit_task.abort ){
+				eonfox.prototype.submit_task.abort();
+			}
+		},
+		
+		
+		
+		/* 提交请求 
+		 * 暂时只支持 POST
+		 * {
+		 * 	url : this.api_server_url,默认接口地址
+		 * 	data : {},
+		 *  callback : 回调函数 第一个是单个 data，第二个是 全部的返回数据
+		 *  error : 错误回调函数
+		 * }
+		 * 
+		 */
+		submit : function(config){
+			if( eonfox.prototype.debug ){
+				console.log("submit()传入参数:", config);
+			}
+			
+			//回调函数
+			if( !config.callback || config.callback.constructor != Function ){
+				config.callback = function(){};
+			}
+			if( !config.error || config.error.constructor != Function ){
+				config.error = function(){};
+			}
+			
+			//路由
+			if(typeof config.url == 'undefined' || typeof config.url != 'string'){
+				config.url = this.api_server_url;
+			}
+			
+			config.right_data = {};
+			config.left_data = {};
+			//请求字符串
+			if( config.request ){
+				//如果是对象，则先转换为字符串
+				if(typeof config.request == "object"){
+					config.request = JSON.stringify(config.request)
+				}
+				if(typeof config.request == "string"){
+					config.right_data.data = config.request;
+					config.left_data.data = config.request;
+				}
+			}
+			
+			//用户传入的data数据
+			if( config.data && typeof config.data == "object" ){
+				for(var i in config.data){
+					config.right_data[i] = config.data[i];
+					config.left_data[i] = config.data[i];
+				}
+			}
+			
+			if( eonfox.prototype.debug ){
+				console.log("post()：right_data、left_data:", config.right_data, config.left_data);
+			}
+			
+			/*//是否强制提交
+			config.recursion = config.recursion? true : false;
+			//大于0，说明存在队列
+			if( this.submit_queue.length > 0 ){
+				//判断是否强制提交
+				if( config.recursion ){
+					//去登记注册
+					eonfox.prototype.submit_register(config);
+				}else{
+					//否则返回错误信息
+					console.warn("应用接口提交队列个数：", this.submit_queue.length);
+					return config.error("应用接口出现重复提交，前方正在提交队列个数：", this.submit_queue.length);
+				}
+			}else{
+				//去登记注册
+				eonfox.prototype.submit_register(config);
+			} */
+			
+			//去登记注册
+			eonfox.prototype.submit_register(config);
+			//并且调用执行
+			eonfox.prototype.submit_run();
+		},
+		
+		
+		
+		/**
+		 * 储存token
+		 * 
+		 * @param {Object} data
+		 */
+		storage_token : function(data){
+			if( !data ){
+				return false;
+			}
+			
+			var token_data = null;
+			var exist_right_token = false;
+			var exist_left_token = false;
+			
+			exist_right_token  = (function(){try{ return data['token']['session_right_token'];}catch(e){return false;}}());
+			exist_left_token  = (function(){try{ return data['token']['session_left_token'];}catch(e){return false;}}());
+			if(exist_right_token && exist_left_token){
+				token_data = data['token'];
+			}else{
+				//有可能是顶级关联对象
+				exist_right_token  = (function(){try{ return data['session_right_token'];}catch(e){return false;}}());
+				exist_left_token  = (function(){try{ return data['session_left_token'];}catch(e){return false;}}());
+				if(exist_right_token && exist_left_token){
+					token_data = data;
+				}
+			}
+			
+			if(!token_data){
+				return false;
+			}
+			
+			//从本地缓存中同步获取指定 key 对应的内容。
+			var storage_token = eonfox.prototype.token();
+			if( (function(){try{ return storage_token['session_right_token'];}catch(e){return false;}}()) && 
+			(function(){try{ return storage_token['session_left_token'];}catch(e){return false;}}()) ){
+				
+				if(storage_token['session_right_token'] == token_data['session_right_token'] || 
+				storage_token['session_left_token'] == token_data['session_left_token'] ){
+					if( eonfox.prototype.debug ){
+						console.log("需要对比旧token中的当前时间戳,为true则不需要更新token", storage_token['session_now_time'], token_data['session_now_time'], parseInt(storage_token['session_now_time']) > parseInt(token_data['session_now_time']));
+					}
+					if( parseInt(storage_token['session_now_time']) > parseInt(token_data['session_now_time']) ){
+						if( eonfox.prototype.debug ){
+							console.log("并发异步，不需要更新token" );
+						}
+						return false;
+					}
+					
+				}
+			}
+			
+			//console.log( uni.setStorageSync );
+			
+			try {
+				uni.setStorageSync(this.session_name +":"+ this.application, JSON.stringify(token_data));
+			} catch (e) {
+				console.warn(e);
+			    return false;
+			}
+			
+			return true;
+	},
+	
+	
+	
+	/**
+	 * 获取token
+	 * 
+	 * @param	{Function}	error_function
+	 */
+	token : function(error_function){
+		//异步可能存在覆盖的问题，所以对比已存在的token,如果右左有一个相同则比较当前时间，即最大的当前时间是最新的。
+		var storage_token = false;
+		try {
+			storage_token = uni.getStorageSync(this.session_name +":"+ this.application);
+			if( storage_token ){
+				storage_token = (function(){try{ return JSON.parse(storage_token);}catch(e){return false;}}());
+			}
+		} catch (e) {
+			console.warn(e);
+			if(error_function){
+				error_function(e);
+			}
+			return false;
+		}
+		
+		return storage_token;
+	},	
+		
+		
+	/**
+	 * 获取左token
+	 * 如果没用传入回调函数，那么则直接返回当前左令牌，但是有可能会出现左令牌失效
+	 * 正常操作是，传入一个回调函数，左令牌始终是保持最新的。
+	 * 
+	 * @param	{Function}	#fn
+	 */
+	left_token : function(fn){
+		if(typeof fn != "function"){
+			var storage_token = eonfox.prototype.token();
+			if( (function(){try{ return storage_token['session_left_token'];}catch(e){return false;}}()) ){
+				return storage_token['session_left_token'];
+				}else{
+					return '';
+				} 
+		}else{
+			eonfox.prototype.submit({
+				callback: function(){
+					//从本地缓存中同步获取指定 key 对应的内容。
+					var left_token = "";
+					var storage_token = eonfox.prototype.token();
+					if( (function(){try{ return storage_token['session_left_token'];}catch(e){return false;}}()) ){
+						left_token = storage_token['session_left_token'];
+						}
+					fn(left_token);
+				}
+			});
+			return true;
+		}
+	},	
+	/* 获取 websocket 数据 */
+	websocket_data : function(res){
+		console.log(res);
+		if( !res.data ){
+			
+			return false;
+		}
+		
+		return JSON.parse( res.data );
+	}
+	
+};
+export default eonfox;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/fns.js b/mallplusui-uniapp-app2/components/eonfox/fns.js
new file mode 100644
index 0000000..34164b6
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/fns.js
@@ -0,0 +1,285 @@
+var fns = {
+	//--------------
+	//api接口验证
+	checkError: function(data, ids, error){
+		if(typeof(error)!='function'){
+			error=function(){
+			}
+		}
+		if(data.errno){
+			error(data.errno, data.error);
+			return false;
+		}
+		if(!data.data){
+			error(1, "未知错误");
+			return false;
+		}
+		if(ids){
+			if(typeof ids =='object'){
+				for( var i in ids){
+					if(typeof ids[i] != "undefined"){
+						var id = ids[i];
+						if( data.data[id] && data.data[id].errno ){
+							error(data.data[id].errno, data.data[id].error);
+							return false;
+						}
+					}else{
+						error(1, "“"+ids[i]+"”目标，未知错误");
+						return false;
+					}
+				}
+			}else if(typeof ids =='string' || typeof ids == 'number'){
+				if(typeof data.data[ids] != "undefined" ){
+					if( data.data[ids].errno ){
+						error(data.data[ids].errno, data.data[ids].error);
+						return false;
+					}
+				}else{
+					error(1, "“"+ids+"”目标，未知错误");
+					return false;
+				}
+			}else{
+				error(1, "“"+ids+"”目标，未知错误");
+				return false;
+			}
+			
+		}
+		
+		var data_list = {};
+		
+		if(data.data){
+			for(var i in data.data){
+				if(typeof data.data[i].data != "undefined"){
+					data_list[i] = data.data[i].data;
+				}
+			}
+		}
+		return data_list;
+	},
+	//数据处理 ceil向上取整
+		number_pre:function(number,pre){
+			switch(pre){
+				case 'ceil':
+					return Math.ceil(number)
+				break;
+			}
+		},
+		//保留两位小数
+		number_floor_2:function(number){
+			var number = number * 100;
+			number = Math.floor(number)
+			number = number/100;
+			return number.toFixed(2);
+		},
+		//错误信息处理
+		err:function(title,data,_json,fun){
+			
+			if(data){
+				if(_json){
+					data=JSON.stringify(data)
+				}
+				console.log(title+' :',data)
+				uni.showToast({
+					title:title+' : '+data,
+					icon:'none',
+					duration:1500,
+					success() {
+						if(fun){
+							fun();
+						}
+					}
+				})
+			}else{
+				console.log(title)
+				uni.showToast({
+					title:title,
+					icon:'none',
+					duration:1500,
+					success() {
+						if(fun){
+							fun();
+						}
+					}
+				})
+			}
+			
+		},
+		//成功信息处理
+		success(title,fun){
+			if(fun){
+				fun();
+			}
+			uni.hideLoading();
+			/* uni.showToast({
+				title:title,
+				icon:'success',
+				success() {
+					if(fun){
+						fun();
+					}
+				}
+			}) */
+		},
+		//敬请期待
+		waiting:function(){
+			uni.showToast({
+				title:'敬请期待',
+				icon:'none'
+			})
+		},
+		//授权验证
+		oauth_:function(){
+			uni.setStorage({
+				key:'oauth',
+				data:true
+			})
+		},
+		noauth:function(){
+			uni.setStorage({
+				key:'oauth',
+				data:false
+			})
+		},
+		//绑定验证
+		unionid:function(){
+			uni.setStorage({
+				key:'unionid',
+				data:true
+			})
+		},
+		nunionid:function(){
+			uni.setStorage({
+				key:'unionid',
+				data:false
+			})
+		},
+		//绑定
+		bind:function(){
+			console.log('oauth');
+			uni.getStorage({
+				key:'oauth',
+				success(re) {
+					console.log('oauth',re);
+				}
+			})
+		},
+		//获取指定url参数
+		getUrlQuery:function (urlStr) {
+			// var urlStr = location.search.substr(1) ? location.search.substr(1) : "";
+			var urlArr = [];
+			for(var i = 0; i < urlStr.split("&").length; i++) {
+				urlArr.push(urlStr.split("&")[i].split("=")[0] ? urlStr.split("&")[i].split("=")[0] : "");
+				urlArr.push(urlStr.split("&")[i].split("=")[1] ? urlStr.split("&")[i].split("=")[1] : "onlyKey")
+			}
+			if(urlStr == "") {
+				return;
+			} else {
+				var urlObj = {}
+				for(var i = 0; i < urlArr.length; i += 2) {
+					if(urlArr[i] != "") {
+						urlObj[urlArr[i]] = decodeURIComponent(urlArr[i + 1]);
+					}
+				}
+				return urlObj;
+			}
+		}
+		,
+		// url参数解析
+		 getUrlkey:function(url) {
+		  var params = {};
+		  var urls = url.split("?");                  console.log('1_分割url:', urls)
+		  var arr = urls[1].split("&");               console.log('2_分割urls[1]:', arr)
+		  for (var i = 0, l = arr.length; i < l; i++) {
+			var a = arr[i].split("=");                console.log('3_遍历 arr 并分割后赋值给a:', a[0], a[1])
+			params[a[0]] = a[1];                      console.log('4_a给params对象赋值:', params)
+		  }                                           console.log('5_结果:', params)
+		  return params;
+		}
+		,
+		toast(tit,url,time){
+			if(!time){
+				time=1500
+			}
+			uni.showToast({
+				title:tit,
+				success() {
+					setTimeout(function(){
+						uni.reLaunch({
+							url:url
+						})
+					},time)
+				}
+			})
+		},
+		setSystemInfoSync(){
+					uni.getStorage({
+						key:'SystemInfoSync',
+						fail(err) {
+							console.log('设置缓存');
+							try {
+								console.log('star');
+								const res = uni.getSystemInfoSync();
+									console.log('config'+JSON.stringify(res));
+									uni.setStorage({
+										key:'SystemInfoSync',
+										data:res
+									})
+									console.log('ok');
+								} catch (e) {
+									console.log('catch+'+JSON.stringify(e));
+									// error
+								}	
+						},
+						
+					})		
+		},
+		getCompare(Version,newVersion,fun){
+			if(Version==newVersion){
+				console.log('没有更新');
+				return
+			}
+			console.log('接收到参数');
+			uni.getStorage({
+				key:'SystemInfoSync',
+				success(res) {
+						console.log('缓存:'+JSON.stringify(res));
+					if(res.data){
+						var SystemInfoSync=res.data;
+							console.log('json:'+JSON.stringify(SystemInfoSync));
+							console.log('设备:'+SystemInfoSync.platform);
+							if(SystemInfoSync.platform=='android'){
+								console.log('设备:安卓');
+								fun();
+							}
+					}else{
+						return this.setSystemInfo();
+					}
+				},
+				fail(err) {
+					console.log('缓存获取失败'+JSON.stringify(err));
+					const res = uni.getSystemInfoSync();
+						console.log('config'+JSON.stringify(res));
+						uni.setStorage({
+							key:'SystemInfoSync',
+							data:res,
+							success() {
+								if(res.platform=='android'){
+									console.log('设备:安卓');
+									fun();
+								}
+							}
+						})
+					
+				},
+				complete() {
+					console.log('获取缓存');
+				}
+			})
+			
+					
+			
+		}
+		//------------------------
+};
+
+export default fns;
diff --git a/mallplusui-uniapp-app2/components/eonfox/grouporder.js b/mallplusui-uniapp-app2/components/eonfox/grouporder.js
new file mode 100644
index 0000000..3107ea6
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/grouporder.js
@@ -0,0 +1,39 @@
+import eonfox from '@/components/eonfox/eonfox.js';
+var ef=new eonfox()
+import f from '@/components/eonfox/fns.js';
+var pay= {
+		shoppingCar:function(groupId,method,pass,fun){
+			ef.submit({
+				request:{
+					s:['SHOPGROUPGOODSSELFPAY',[{id:groupId,pay_method:method,pay_password:pass}]]
+				},
+				callback:function(data){
+				    const dataList=(data=f.checkError(data,'s',function(errno,error){
+						f.err(error)
+						
+					}))
+					console.log('da...',dataList)
+					if(dataList.s==true){
+						fun()
+					}
+					
+// 					var dataList=data.s
+// 					if(dataList.data){
+// 						if(dataList.data==true){
+// 							f.err('支付成功')
+// 						}else{
+// 							f.err('支付失败')
+// 						}
+// 						
+// 					}
+					
+					console.log('支付结果');
+				},
+				error(err){
+					f.err('',err,1)
+				}
+			})
+		}
+
+}
+export default pay;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/merchant.js b/mallplusui-uniapp-app2/components/eonfox/merchant.js
new file mode 100644
index 0000000..f638b4f
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/merchant.js
@@ -0,0 +1,12 @@
+/* 商家模块 */
+var merchant = function(){};
+merchant.prototype = {
+	
+	constructor : merchant,
+	
+	//收银员的订单列表是否需要刷新
+	cashierOrderListRefresh : false
+	
+};
+
+export default merchant;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/order.js b/mallplusui-uniapp-app2/components/eonfox/order.js
new file mode 100644
index 0000000..7f14103
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/order.js
@@ -0,0 +1,72 @@
+import eonfox from '@/components/eonfox/eonfox.js';
+var ef = new eonfox();
+
+var order = {
+	
+	/* 检查支付状态 
+		order_id  	要检查的订单ID
+		frequency	检查的次数，当等于0时，则返回回调
+		callback	回调。成功时：callback.success  失败时：callback.fail
+		因为有 frequency 次数，所以每次进来 -1 。如果不等于0，那么要继续递归
+		
+		order.checkPayState({
+			order_id: order_id,
+			frequency: 3,
+			success:function(){
+				
+			},
+			fail:function(){
+				
+			}
+		})
+	*/
+	checkPayState : function(data){
+		var _this = this;
+		if(typeof data.success != 'function') data.success = function(){};
+		if(typeof data.fail != 'function') data.fail = function(){};
+		if( typeof data.frequency != 'number') data.frequency = 3;
+		
+		if( !data.frequency || !data.order_id ){
+			return data.fail('参数不正确', data);
+		}
+		
+		
+		//如果不等于0，那么要继续递归
+		data.frequency --;
+		
+		//开始查询状态  0表示未支付；1表示支付成功。
+		ef.submit({
+			request:{
+				s:['APPLICATIONORDERSELFPAYSTATE',[{order_id: data.order_id}]]
+			},
+			callback: function(r){
+				console.log('order.checkPayState:::',r);
+				// console.log('支付查询回调成功',r.data.s.data) ;return r.data.s.data;
+				if( !r.errno && !r.data.s.errno && r.data.s.data){
+					console.log('支付成功');
+					//获取成功，无错误信息时
+					return data.success();
+				} else {
+					console.log('支付状态查询失败或者未支付');
+					if( !data.frequency ){
+						return data.fail();
+					}else{
+						setTimeout(function() {
+							return _this.checkPayState(data);
+						}, 2000);
+					}
+				}
+			},
+			error(err){
+				data.fail(err);
+			}
+		})
+		
+	}
+	
+	
+	
+	
+};
+
+export default order;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/pay.js b/mallplusui-uniapp-app2/components/eonfox/pay.js
new file mode 100644
index 0000000..0ff744e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/pay.js
@@ -0,0 +1,70 @@
+import eonfox from '@/components/eonfox/eonfox.js';
+var ef=new eonfox()
+import f from '@/components/eonfox/fns.js';
+var pay= {
+	set_password:function(pass,pass_confirm,fun){
+		ef.submit({
+			request:{
+				set_pass:['setpass',[{password:pass}]]
+			},
+			callback:function(data){
+				if(data=f.checkError(data,'set_pass',function(errno,error){
+					f.err(error)
+				})){
+					fun()
+				}else{
+					f.err('设置失败')
+				}
+				console.log('支付结果');
+			},
+			error(err){
+				f.err('',err,1)
+			}
+		})
+	},
+		shoppingCar:function(id,method,pass,fun){
+			ef.submit({
+				request:{
+					s:['SHOPORDERSELFPAYMENT',[{order_id:id,pay_method:method,pay_password:pass}]]
+				},
+				callback:function(data){
+				    const dataList=(data=f.checkError(data,'s',function(errno,error){
+						f.err(error)
+						
+					}))
+					console.log('da...',dataList)
+					if(dataList.s.order_id){
+						
+					f.err('支付成功')
+					return ok
+					}
+					
+					console.log('支付结果');
+				},
+				error(err){
+					f.err('',err,1)
+				}
+			})
+		},
+		//取消订单
+		cancel_order:function(id,fun){
+			ef.submit({
+				request:{
+					cancel_order:['SHOPORDERSELFCANCEL',[{id:id}]]
+				},
+				callback:function(data){
+					if(data=f.checkError(data,'cancel_order',function(errno,error){
+						f.err(error)
+					})){
+						fun()
+					}else{
+						f.err('订单取消失败')
+					}
+				},
+				error(err){
+					f.err('',err,1)
+				}
+			})
+		},
+}
+export default pay;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/polling.js b/mallplusui-uniapp-app2/components/eonfox/polling.js
new file mode 100644
index 0000000..3903355
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/polling.js
@@ -0,0 +1,61 @@
+var polling = {
+	
+	//定时器ID
+	_interval_id : null,
+	_switch : false,
+	
+	//关闭
+	close : function(){
+		clearInterval(this._interval_id);
+		this._interval_id = null;
+	},
+	
+	//暂停
+	stop : function(){
+		this._switch = false;
+	},
+	
+	//启动
+	start : function(){
+		this._switch = true;
+	},
+	
+	
+	/**
+	 * 开启
+	 * 
+	 * @param	{Time}		ms	毫秒数
+	 * @param	{Function}	fn	回调函数
+	 */
+	run : function(ms, fn){
+		if( !ms || typeof ms != 'number'){
+			ms = 3000;//默认3秒
+		}
+		if(!fn || typeof fn != 'function'){
+			fn = function(){};
+		}
+		
+		var _this = this;
+		//如果已经存在，则要关闭轮询
+		if( _this._interval_id ){
+			_this.start();
+			return true;
+		}
+		
+		var i = 0;
+		_this._switch = true;
+		_this._interval_id = setInterval(function(){
+			if( !_this._switch ){
+				return false;
+			}
+			
+			i ++;
+			fn(i);
+		}, ms);
+		
+		return true;
+	}
+	
+};
+
+export default polling;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/qqmap-wx-jssdk.js b/mallplusui-uniapp-app2/components/eonfox/qqmap-wx-jssdk.js
new file mode 100644
index 0000000..9724e31
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/qqmap-wx-jssdk.js
@@ -0,0 +1,1123 @@
+/**
+ * 微信小程序JavaScriptSDK
+ * 
+ * @version 1.2
+ * @date 2019-03-06
+ * @author v_ylyue@tencent.com
+ */
+
+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 = {
+  /**
+  * md5加密方法
+  * 版权所有©2011 Sebastian Tschan，https：//blueimp.net
+  */
+  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) {
+    /* append padding */
+    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);
+  },
+  /**
+   * 得到md5加密后的sig参数
+   * @param {Object} requestParam 接口参数
+   * @param {String} sk签名字符串
+   * @param {String} featrue 方法名
+   * @return 返回加密后的sig参数
+   */
+  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;
+  },
+    /**
+     * 得到终点query字符串
+     * @param {Array|String} 检索数据
+     */
+    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;
+    },  
+    /**
+     * 处理终点location数组
+     * @return 返回终点数组
+     */
+    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;
+    },
+
+    /**
+     * 计算两点间直线距离
+     * @param a 表示纬度差
+     * @param b 表示经度差
+     * @return 返回的是距离，单位m
+     */
+    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
+        });
+    },
+
+    /**
+     * 获取location参数
+     */
+    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 () { };
+    },
+
+    /**
+     * 验证param对应的key值是否为空
+     * 
+     * @param {Object} param 接口参数
+     * @param {String} key 对应参数的key
+     */
+    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;
+    },
+
+    /**
+     * 验证参数中是否存在检索词keyword
+     * 
+     * @param {Object} param 接口参数
+     */
+    checkKeyword(param){
+        return !this.checkParamKeyEmpty(param, 'keyword');
+    },
+
+    /**
+     * 验证location值
+     * 
+     * @param {Object} param 接口参数
+     */
+    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;
+    },
+
+    /**
+     * 构造错误数据结构
+     * @param {Number} errCode 错误码
+     * @param {Number} errMsg 错误描述
+     */
+    buildErrorConfig(errCode, errMsg) {
+        return {
+            status: errCode,
+            message: errMsg
+        };
+    },
+
+    /**
+     * 
+     * 数据处理函数
+     * 根据传入参数不同处理不同数据
+     * @param {String} feature 功能名称
+     * search 地点搜索
+     * suggest关键词提示
+     * reverseGeocoder逆地址解析
+     * geocoder地址解析
+     * getCityList获取城市列表：父集
+     * getDistrictByCityId获取区县列表：子集
+     * calculateDistance距离计算
+     * @param {Object} param 接口参数
+     * @param {Object} data 数据
+     */
+    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) {//判断是否返回周边poi
+          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);
+      }
+    },
+
+    /**
+     * 构造微信请求参数，公共属性处理
+     * 
+     * @param {Object} param 接口参数
+     * @param {Object} param 配置项
+     * @param {String} feature 方法名
+     */
+    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 {
+
+    /**
+     * 构造函数
+     * 
+     * @param {Object} options 接口参数,key 为必选参数
+     */
+    constructor(options) {
+        if (!options.key) {
+            throw Error('key值不能为空');
+        }
+        this.key = options.key;
+    };
+
+    /**
+     * POI周边检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * @see http://lbs.qq.com/webservice_v1/guide-search.html
+     */
+    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);
+    };
+
+    /**
+     * sug模糊检索
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 参数对象结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-suggestion.html
+     */
+    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"));      
+        }        
+    };
+
+    /**
+     * 逆地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-gcoder.html
+     */
+    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);
+    };
+
+    /**
+     * 地址解析
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-geocoder.html
+     */
+    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'));
+    };
+
+
+    /**
+     * 获取城市列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    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'));
+    };
+
+    /**
+     * 获取对应城市ID的区县列表
+     *
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-region.html
+     */
+    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'));
+    };
+
+    /**
+     * 用于单起点到多终点的路线距离(非直线距离)计算：
+     * 支持两种距离计算方式：步行和驾车。
+     * 起点到终点最大限制直线距离10公里。
+     *
+     * 新增直线距离计算。
+     * 
+     * @param {Object} options 接口参数对象
+     * 
+     * 请求参数结构可以参考
+     * http://lbs.qq.com/webservice_v1/guide-distance.html
+     */
+    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);
+        }      
+    };
+
+  /**
+   * 路线规划：
+   * 
+   * @param {Object} options 接口参数对象
+   * 
+   * 请求参数结构可以参考
+   * https://lbs.qq.com/webservice_v1/guide-road.html
+   */
+  direction(options) {
+    var that = this;
+    options = options || {};
+    Utils.polyfillParam(options);
+
+    if (Utils.checkParamKeyEmpty(options, 'to')) {
+      return;
+    }
+
+    var requestParam = {
+      output: 'json',
+      key: that.key
+    };
+
+    //to格式处理
+    if (typeof options.to == 'string') {
+      requestParam.to = options.to;
+    } else {
+      requestParam.to = options.to.latitude + ',' + options.to.longitude;
+    }
+    //初始化局部请求域名
+    var SET_URL_DIRECTION = null;
+    //设置默认mode属性
+    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/mallplusui-uniapp-app2/components/eonfox/version.js b/mallplusui-uniapp-app2/components/eonfox/version.js
new file mode 100644
index 0000000..b5d702c
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/version.js
@@ -0,0 +1,3 @@
+// 版本控制文件
+	var version='0.0.12';
+	export default  version;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/eonfox/websocket.js b/mallplusui-uniapp-app2/components/eonfox/websocket.js
new file mode 100644
index 0000000..90830e2
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/eonfox/websocket.js
@@ -0,0 +1,541 @@
+import eonfoxObject from '@/components/eonfox/eonfox.js';
+var eonfox = new eonfoxObject();
+var websocket_app = false;
+//#ifdef APP-PLUS
+websocket_app = true;
+//#endif
+
+var websocket = function(config){};
+websocket.prototype = {
+	
+	// url :'wss://developer.eapie.eonfox.com:9997',//测试版
+	url :'wss://eapie.eonfox.com:9999',//正式版
+	connect_type : 0,//连接类型。0是安卓，1是非安卓
+	debug: false,//是否调试
+	close_type : 0,//1是手动关闭，不会再尝试连接
+	token:'',//websocket令牌
+	open:false,//打开状态
+	client_id:'',//连接ID
+	server_time: 0,//websocket 服务器时间
+	messages:[],//接受的websocket消息的集合
+	message_max_number:10,//最大消息个数
+	messages_change:function(){},//变动时执行的函数
+	
+	heartbeat_interval_id: null,//心跳检测的定时器ID
+	heartbeat_ms: 15000,//心跳检测毫秒
+	heartbeat_messages:[],//心跳检测的信息集合
+	heartbeat_message_max_number:10,//最大消息个数
+	heartbeat_messages_change:function(){},//变动时执行的函数
+	
+	
+	connect_parameter: null,//连接websocket的参数
+	
+	
+	/* 调试信息 */
+	debug_message:function(message, fn){
+		if( !websocket.prototype.debug ){
+			return false;
+		}
+		
+		console.log(message);
+		
+		uni.showToast({
+			title: message,
+			icon: 'none',
+			duration: 3000
+		});
+		
+		if(typeof fn == 'function'){
+			fn();
+		}
+	},
+	
+	/* 获取 websocket 数据 */
+	get_data : function(res){
+		if( !res.data ){
+			return false;
+		}
+		return JSON.parse( res.data );
+	},
+	
+	
+	
+	/* 设置心跳检测的信息集合 */
+	set_heartbeat_messages: function(message){
+		if( this.heartbeat_messages.length >= this.heartbeat_message_max_number ){
+			this.heartbeat_messages.pop();//删除最后一个元素
+		}
+		
+		//往前面添加
+		this.heartbeat_messages.unshift(message);
+		if(typeof websocket.prototype.heartbeat_messages_change == 'function') websocket.prototype.heartbeat_messages_change();
+	},
+	
+	
+	/* 设置心跳检测的信息集合 */
+	set_messages: function(message){
+		if( this.messages.length >= this.message_max_number ){
+			this.messages.pop();//删除最后一个元素
+		}
+		
+		//往前面添加
+		this.messages.unshift(message);
+		if(typeof websocket.prototype.messages_change == 'function') websocket.prototype.messages_change();
+	},
+	
+	messages_change_function: function(fn){
+		websocket.prototype.messages_change = fn;
+	},
+	
+	heartbeat_messages_change_function: function(fn){
+		websocket.prototype.heartbeat_messages_change = fn;
+	},
+	
+	
+	/**
+	 * 获取左 websocket_token
+	 * 如果没用传入回调函数，那么则直接返回当前左令牌，但是有可能会出现左令牌失效
+	 * 正常操作是，传入一个回调函数，左令牌始终是保持最新的。
+	 * 
+	 * @param	{Function}	#fn
+	 */
+	session_websocket_token : function(fn){
+		if(typeof fn != "function"){
+			var storage_token = eonfox.token();
+			if( (function(){try{ return storage_token['session_websocket_token'];}catch(e){return false;}}()) ){
+				return storage_token['session_websocket_token'];
+				}else{
+					return '';
+				} 
+		}else{
+			eonfox.submit({
+				callback: function(){
+					//从本地缓存中同步获取指定 key 对应的内容。
+					var websocket_token = "";
+					var storage_token = eonfox.token();
+					if( (function(){try{ return storage_token['session_websocket_token'];}catch(e){return false;}}()) ){
+						websocket_token = storage_token['session_websocket_token'];
+						}
+					fn(websocket_token);
+				}
+			});
+			return true;
+		}
+	},		
+	
+	/* 
+	 * 获取 websocket 令牌
+	 * 传入一个回调函数
+	 */
+	get_token : function(fn){
+		var websocket_token  = websocket.prototype.session_websocket_token();
+		if( websocket_token ){
+			console.log('get_websocket_token 已存在', websocket_token);
+			fn(websocket_token);
+		}else{
+			console.log('get_websocket_token 不存在，异步获取');
+			websocket.prototype.session_websocket_token(function(websocket_token){
+				fn(websocket_token);
+			});
+		}
+	},	
+	
+	
+	
+	/*  连接 websocket */
+	connect: function(connectParameter){
+		websocket.prototype.connect_type = 1;//连接类型。0是安卓，1是非安卓
+		websocket.prototype.not_android_connect(connectParameter);
+		// if( websocket_app && plus.os.name == 'Android'){
+		// 	websocket.prototype.connect_type = 0;//连接类型。0是安卓，1是非安卓
+		// 	websocket.prototype.android_connect(connectParameter);
+		// }else{
+		// 	websocket.prototype.connect_type = 1;//连接类型。0是安卓，1是非安卓
+		// 	websocket.prototype.not_android_connect(connectParameter);
+		// }
+	},
+	
+	//安卓程序
+	android_connect: function(connectParameter){},
+	
+	
+	//非安卓程序
+	//data.onSocketOpen
+	not_android_connect: function(connectParameter){
+		var _this = this;
+		websocket.prototype.debug_message('websocket.connect 连接 websocket');
+		websocket.prototype.connect_parameter = connectParameter;
+		websocket.prototype.get_token(function(token){
+			if( !token ){
+				//这里弹出错误消息
+				websocket.prototype.debug_message('websocket.connect 连接失败！没有获取到 websocket token');
+			}
+			
+			//链接
+		    uni.connectSocket({
+				url: websocket.prototype.url,
+			    success(){
+					_this.set_messages({
+						state:true,
+						content:'连接webscoket成功',
+					});
+				    websocket.prototype.token = token;
+					websocket.prototype.debug_message(' uni.connectSocket 连接webscoket成功!token:'+token);
+			    },
+			    fail(){
+					_this.set_messages({
+						state:false,
+						content:'连接webscoket失败',
+					});
+					
+					websocket.prototype.debug_message(' uni.connectSocket 连接webscoket失败!token:'+token);
+			    }
+		   });
+		   
+		});
+		
+		//WebSocket连接打开监听
+		uni.onSocketOpen(function () {
+			websocket.prototype.close_type = 0;
+			websocket.prototype.open = true;
+			websocket.prototype.debug_message('uni.onSocketOpen WebSocket连接已经打开监听!');
+			if(connectParameter && typeof connectParameter.onSocketOpen == 'function'){
+				connectParameter.onSocketOpen();
+			}
+		});
+		
+		uni.onSocketClose(function (res) {
+			websocket.prototype.token = '';
+			websocket.prototype.open = false;
+			websocket.prototype.client_id = '';
+			//关闭心跳检测
+			if( websocket.prototype.heartbeat_interval_id ){
+				clearInterval( websocket.prototype.heartbeat_interval_id );
+			}
+			
+			if(connectParameter && typeof connectParameter.onSocketClose == 'function'){
+				connectParameter.onSocketClose(res);
+			}
+			
+			//开启心跳检测
+			if( websocket.prototype.close_type == 0){
+				websocket.prototype.debug_message('uni.onSocketClose 非手动关闭，开启心跳守护');
+				setTimeout(function(){
+					websocket.prototype.connect(connectParameter);
+				}, websocket.prototype.heartbeat_ms);
+				
+			}
+			websocket.prototype.debug_message('uni.onSocketClose WebSocket 已关闭！');
+		});
+		
+		//收到服务器内容
+		uni.onSocketMessage(function (res) {
+			console.log('onSocketMessage!!!!!!!!');
+			//给一个超时器
+			setTimeout(function(){
+				console.log('setTimeout!!!!!!!!');
+				websocket.prototype.debug_message('onSocketMessage 获取 websocket 数据:' + JSON.stringify(res));
+				var websocket_token  = eonfox.websocketToken();
+				var r = websocket.prototype.get_data(res);
+				//websocket 检查连接ID值(旧-新)
+				if( (r.data && r.data.client_id && websocket.prototype.client_id != r.data.client_id) || 
+				(r.data && r.data.server_time && websocket.prototype.server_time != r.data.server_time) || 
+				(websocket.prototype.token != websocket_token) ){
+					if(r.data && r.data.client_id && websocket.prototype.client_id != r.data.client_id){
+						websocket.prototype.debug_message('websocket 连接ID 不一致',function(){
+							console.log('websocket.prototype.client_id != r.data.client_id', websocket.prototype.client_id, r.data.client_id);
+						});
+					}
+					if(r.data && r.data.server_time && websocket.prototype.server_time != r.data.server_time){
+						websocket.prototype.debug_message('websocket 服务器时间 不一致',function(){
+							console.log('websocket.prototype.server_time != r.data.server_time', websocket.prototype.server_time, r.data.server_time);
+						});
+					}
+					if(websocket.prototype.token != websocket_token){
+						websocket.prototype.debug_message('websocket_token 不一致',function(){
+							console.log('websocket.prototype.token != websocket_token', websocket.prototype.token, websocket_token);
+						});
+					}
+					return websocket.prototype.init( r.data.client_id, r.data.server_time, websocket_token, connectParameter, function(){
+						if(typeof connectParameter.onSocketMessage == 'function'){
+							connectParameter.onSocketMessage(res);
+						}
+					});//初始化
+				}else{
+					if(connectParameter && typeof connectParameter.onSocketMessage == 'function'){
+						connectParameter.onSocketMessage(res);
+					}
+				}
+				
+			}, 0);
+			
+		});
+		
+		uni.onSocketError(function (res) {
+			//开启心跳检测
+			setTimeout(function(){
+				websocket.prototype.connect(connectParameter);
+			}, websocket.prototype.heartbeat_ms);
+			if(connectParameter && typeof connectParameter.onSocketError == 'function'){
+				connectParameter.onSocketError(res);
+			}
+			_this.set_messages({
+				state:false,
+				content:'连接webscoket失败',
+				error: res
+			});
+			
+			websocket.prototype.debug_message('uni.onSocketError WebSocket连接打开失败，请检查!error:'+res);
+		});
+	},
+	
+	
+		
+	/* 初始化 */
+	init : function( client_id, server_time, token, connectParameter, callback){
+		var errorData = {
+			open : websocket.prototype.open,
+			token : websocket.prototype.token,
+			client_id : client_id
+		};
+		
+		if( !websocket.prototype.open || !client_id ){
+			_this.set_messages({
+				state:false,
+				content:'websocket 初始化失败',
+				error: ''
+			});
+			websocket.prototype.debug_message('websocket 初始化失败！');
+		};
+		
+		eonfox.submit({
+			request: {
+				s: ['SESSIONWEBSOCKETSELFCLIENT', [{
+					client_id: client_id, //连接id
+					server_time: server_time // 服务器时间
+					}]]
+			},
+			callback: function(){
+				//必须是在初始化成功之后 才更新连接ID值
+				websocket.prototype.client_id = client_id;
+				websocket.prototype.server_time = server_time;
+				//再次重置 websoket 令牌
+				websocket.prototype.token = token;
+				//开启心跳检测
+				if( websocket.prototype.heartbeat_interval_id ){
+					clearInterval( websocket.prototype.heartbeat_interval_id );
+				}
+				websocket.prototype.heartbeat_interval_id = setInterval(function(){
+					websocket.prototype.debug_message('websocket init 心跳检测');
+					websocket.prototype.heartbeat(function(errorData){
+						websocket.prototype.debug_message('websocket init 心跳检测失败', function(){
+							console.log('websocket_init 心跳检测失败返回值：', errorData);
+						});
+						clearInterval( websocket.prototype.heartbeat_interval_id );
+						websocket.prototype.connect(connectParameter);
+					});
+				}, websocket.prototype.heartbeat_ms);
+				
+				if(typeof connectParameter.initSuccess != 'function') connectParameter.initSuccess = function(){};
+				connectParameter.initSuccess();
+				websocket.prototype.debug_message('websocket init 初始化成功');
+				websocket.prototype.set_heartbeat_messages({
+					state:true,
+					content:'websocket init 初始化成功！'
+				});
+				if(typeof callback != 'function') callback = function(){};
+				callback();
+			},
+			error : function(errorData){
+				websocket.prototype.debug_message('websocket init 初始化错误');
+				websocket.prototype.set_heartbeat_messages({
+					state:false,
+					content:'websocket init 初始化错误！',
+					error:errorData
+				});
+				return connectParameter.initError(errorData);
+			}
+		});
+	},
+	
+	
+	/* 发送心跳 */
+	heartbeat: function(errorFunction){
+		var errorData = {
+			open : websocket.prototype.open,
+			token : websocket.prototype.token,
+			client_id : websocket.prototype.client_id
+		};
+		if( !websocket.prototype.open || !websocket.prototype.token ){
+			if(typeof errorFunction != 'function') errorFunction = function(){};
+			websocket.prototype.debug_message('websocket heartbeat 初始化失败！');
+			websocket.prototype.set_heartbeat_messages({
+				state:false,
+				content:'websocket 初始化失败！'
+			});
+			return errorFunction(errorData);
+		};
+		
+		var heartbeat  = JSON.stringify({
+			module:'heartbeat',
+			application: eonfox.application,
+			token: websocket.prototype.token
+		});
+		
+		uni.sendSocketMessage({
+			data: heartbeat,
+			success: function(res){
+				websocket.prototype.debug_message('websocket heartbeat 保持心跳成功！');
+				websocket.prototype.set_heartbeat_messages({
+					state:true,
+					content:'websocket heartbeat 保持心跳成功！'
+				});
+			},
+			fail: function(data){
+				websocket.prototype.debug_message('websocket heartbeat 保持心跳失败！');
+				websocket.prototype.set_heartbeat_messages({
+					state:false,
+					content:'websocket heartbeat 保持心跳失败！',
+					error: data
+				});
+				return errorFunction(errorData);
+			}
+		});
+		
+	},
+	
+		
+	
+	//重启 websocket
+	restart : function(){
+		websocket.prototype.close();
+		//重启
+		websocket.prototype.connect(websocket.prototype.connect_parameter);
+		websocket.prototype.debug_message('重启 websocket');
+	},
+	
+	//关闭
+	close : function(){
+		//关闭
+		if( websocket.prototype.open ){
+			//连接类型。0是安卓，1是非安卓
+			if( websocket.prototype.connect_type == 1 ){
+				uni.closeSocket();
+			}else{
+				//
+			}
+		}
+		
+		websocket.prototype.close_type = 1;
+		websocket.prototype.token = '';
+		websocket.prototype.open = false;
+		websocket.prototype.client_id = '';
+		//关闭心跳检测
+		if( websocket.prototype.heartbeat_interval_id ){
+			clearInterval( websocket.prototype.heartbeat_interval_id );
+		}
+		
+	},
+	
+	
+	
+		
+	/* 用户向用户推送 */
+	user_push : function(user_id, message, errorFunction){
+		var data = {
+			open : websocket.prototype.open,
+			token : websocket.prototype.token
+		}
+		if( !websocket.prototype.open || !websocket.prototype.token ){
+			if(typeof errorFunction != 'function') errorFunction = function(){};
+			return errorFunction(data);
+		}
+		var user_push  = JSON.stringify({
+			module:'user_push',
+			application: eonfox.application,
+			token: websocket.prototype.token,
+			user_id:user_id,
+			message: message,
+		});
+		
+		uni.sendSocketMessage({
+			data: user_push,
+			success: function(res){
+				websocket.prototype.debug_message('websocket 消息推送成功！', function(){
+					 console.log('user_push', res)
+				});
+				websocket.prototype.set_messages({
+					state:true,
+					content:'websocket user_push 消息推送成功！',
+				});
+			},
+			fail: function(faildata){
+				websocket.prototype.debug_message('websocket 消息推送失败！', function(){
+					 console.log('user_push', faildata)
+				});
+				websocket.prototype.set_messages({
+					state:false,
+					content:'websocket user_push 消息推送失败！',
+					error:faildata
+				});
+			
+				return errorFunction(errorData);
+			}
+		});
+		
+	},
+	
+	
+	/* 用户向后台推送 */
+	admin_push : function(message, errorFunction){
+		var data = {
+			open : websocket.prototype.open,
+			token : websocket.prototype.token
+		}
+		if( !websocket.prototype.open || !websocket.prototype.token ){
+			if(typeof errorFunction != 'function') errorFunction = function(){};
+			return errorFunction(data);
+		}
+		var admin_push  = JSON.stringify({
+			module:'admin_push',
+			application: eonfox.application,
+			token: websocket.prototype.token,
+			message: message,
+		});
+		
+		uni.sendSocketMessage({
+			data: admin_push,
+			success: function(res){
+				websocket.prototype.debug_message('websocket 消息推送成功！', function(){
+					 console.log('admin_push', res)
+				});
+				websocket.prototype.set_messages({
+					state:true,
+					content:'websocket admin_push 消息推送成功！',
+				});
+				
+			},
+			fail: function(faildata){
+				websocket.prototype.debug_message('websocket 消息推送失败！', function(){
+					 console.log('admin_push', faildata)
+				});
+				websocket.prototype.set_messages({
+					state:false,
+					content:'websocket admin_push 消息推送失败！',
+					error:faildata
+				});
+			   
+				return errorFunction(errorData);
+			}
+		});
+	},
+	
+	
+	
+	
+	
+};
+
+export default websocket;
+
+
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseAudio.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseAudio.vue
new file mode 100644
index 0000000..b277717
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseAudio.vue
@@ -0,0 +1,28 @@
+<template>
+	<!-- '<audio/>' 组件不再维护，建议使用能力更强的 'uni.createInnerAudioContext' 接口 有时间再改-->
+  <!--增加audio标签支持-->
+  <audio
+    :id="node.attr.id"
+    :class="node.classStr"
+    :style="node.styleStr"
+    :src="node.attr.src"
+    :loop="node.attr.loop"
+    :poster="node.attr.poster"
+    :name="node.attr.name"
+    :author="node.attr.author"
+    controls></audio>
+</template>
+
+<script>
+export default {
+  name: 'wxParseAudio',
+  props: {
+    node: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+  },
+};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseImg.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseImg.vue
new file mode 100644
index 0000000..4762094
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseImg.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="">
+		<!-- #ifdef MP -->
+		<image
+			:lazy-load="node.attr.lazyLoad"
+			:data-src="node.attr.src"
+			:src="node.attr.src"
+			@tap="wxParseImgTap"
+			mode="widthFix"
+			class="nodeclassStr"
+		/>
+		<!-- #endif -->
+		<!-- #ifndef MP -->
+		<image
+			:lazy-load="node.attr.lazyLoad"
+			:data-src="node.attr.src"
+			:src="node.attr.src"
+			@tap="wxParseImgTap"
+			:mode="node.attr.mode"
+			:class="node.classStr"
+			:style="newStyleStr || node.styleStr"
+			@load="wxParseImgLoad"
+		/>
+		<!-- #endif -->
+		
+	</view>
+</template>
+
+<script>
+export default {
+	name: 'wxParseImg',
+	data() {
+		return {
+			newStyleStr: '',
+			preview: true
+		};
+	},
+	inject: ['parseWidth'],
+	mounted() {},
+	props: {
+		node: {
+			type: Object,
+			default() {
+				return {};
+			}
+		}
+	},
+	
+	methods: {
+		wxParseImgTap(e) {
+			if (!this.preview) return;
+			const { src } = e.currentTarget.dataset;
+			if (!src) return;
+			let parent = this.$parent;
+			while (!parent.preview || typeof parent.preview !== 'function') {
+				// TODO 遍历获取父节点执行方法
+				parent = parent.$parent;
+			}
+			parent.preview(src, e);
+		},
+		// 图片视觉宽高计算函数区
+		wxParseImgLoad(e) {
+			const { src } = e.currentTarget.dataset;
+			if (!src) return;
+			let { width, height } = e.mp.detail;
+
+			const recal = this.wxAutoImageCal(width, height);
+
+			const { imageheight, imageWidth } = recal;
+			const { padding, mode } = this.node.attr;//删除padding
+			// const { mode } = this.node.attr;
+
+			const { styleStr } = this.node;
+			// console.log(styleStr)
+			const imageHeightStyle = mode === 'widthFix' ? '' : `height: ${imageheight}px`;
+			// console.log(imageHeightStyle)
+			this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px; padding: 0 ${+padding}px;`;//删除padding
+			// this.newStyleStr = `${styleStr}; ${imageHeightStyle}; width: ${imageWidth}px;`;
+			// console.log(this.newStyleStr);
+		},
+		// 计算视觉优先的图片宽高
+		wxAutoImageCal(originalWidth, originalHeight) {
+			// 获取图片的原始长宽
+			const windowWidth = this.parseWidth.value;
+			const results = {};
+
+			if (originalWidth < 60 || originalHeight < 60) {
+				const { src } = this.node.attr;
+				let parent = this.$parent;
+				while (!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.removeImageUrl(src);
+				this.preview = false;
+			}
+
+			// 判断按照那种方式进行缩放
+			if (originalWidth > windowWidth) {
+				// 在图片width大于手机屏幕width时候
+				results.imageWidth = windowWidth;
+				results.imageheight = windowWidth * (originalHeight / originalWidth);
+			} else {
+				// 否则展示原来的数据
+				results.imageWidth = originalWidth;
+				results.imageheight = originalHeight;
+			}
+			return results;
+		}
+	}
+};
+</script>
+<style>
+	.nodeclassStr{
+		max-width: 100%;
+		float:left;
+		width: 750rpx; 
+		padding: 0 0px;
+	}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTable.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTable.vue
new file mode 100644
index 0000000..3a94b4e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTable.vue
@@ -0,0 +1,53 @@
+<template>
+	<rich-text :nodes="nodes" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+</template>
+<script>
+export default {
+	name: 'wxParseTable',
+	props: {
+		node: {
+			type: Object,
+			default() {
+				return {};
+			},
+		},
+	},
+	inject: ['parseSelect'],
+	data() {
+		return {
+			nodes:[]
+		};
+	},
+	mounted() {
+		this.nodes=this.loadNode([this.node]);
+	},
+	methods: {
+		loadNode(node) {
+			let obj = [];
+			for (let children of node) {
+				if (children.node=='element') {
+					let t = {
+						name:children.tag,
+						attrs: {
+							class: children.classStr,
+							// style: children.styleStr,
+						},
+						children: children.nodes?this.loadNode(children.nodes):[]
+					}
+					
+					obj.push(t)
+				} else if(children.node=='text'){
+					obj.push({
+						type: 'text',
+						text: children.text
+					})
+				}
+			}
+			return obj
+		}
+	}
+};
+</script>
+<style>
+	@import url("../parse.css");
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate0.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate0.vue
new file mode 100644
index 0000000..c306d47
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate0.vue
@@ -0,0 +1,98 @@
+<template>
+	<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+		
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node"/>
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	// #ifdef APP-PLUS | H5
+	import wxParseTemplate from './wxParseTemplate0';
+	// #endif
+	// #ifdef MP
+	import wxParseTemplate from './wxParseTemplate1';
+	// #endif
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		// #ifdef APP-PLUS | H5
+		name: 'wxParseTemplate',
+		// #endif
+		// #ifdef MP
+		name: 'wxParseTemplate0',
+		// #endif
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;// TODO currentTarget才有dataset
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {// TODO 遍历获取父节点执行方法
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate1.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate1.vue
new file mode 100644
index 0000000..7054e35
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate1.vue
@@ -0,0 +1,88 @@
+<template>
+	<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate2';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate1',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate10.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate10.vue
new file mode 100644
index 0000000..11c252c
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate10.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate11';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate10',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate11.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate11.vue
new file mode 100644
index 0000000..47b2163
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate11.vue
@@ -0,0 +1,86 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<rich-text :nodes="node" :class="node.classStr" :style="'user-select:' + parseSelect"></rich-text>
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate11',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate2.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate2.vue
new file mode 100644
index 0000000..f06782a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate2.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text'">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate3';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate2',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate3.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate3.vue
new file mode 100644
index 0000000..b0943f8
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate3.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate4';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate3',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate4.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate4.vue
new file mode 100644
index 0000000..8a43756
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate4.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate5';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate4',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate5.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate5.vue
new file mode 100644
index 0000000..0c0993e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate5.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate6';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate5',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate6.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate6.vue
new file mode 100644
index 0000000..0dca28a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate6.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate7';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate6',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate7.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate7.vue
new file mode 100644
index 0000000..b62acaf
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate7.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate8';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate7',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate8.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate8.vue
new file mode 100644
index 0000000..f6fa037
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate8.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate9';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate8',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate9.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate9.vue
new file mode 100644
index 0000000..47ac81a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseTemplate9.vue
@@ -0,0 +1,88 @@
+<template>
+		<!--判断是否是标签节点-->
+	<block v-if="node.node == 'element'">
+		<!--button类型-->
+		<button v-if="node.tag == 'button'" type="default" size="mini" :class="node.classStr" :style="node.styleStr">
+			<wx-parse-template :node="node" />
+		</button>
+		
+		<!--a类型-->
+		<view v-else-if="node.tag == 'a'" @click="wxParseATap(node.attr,$event)" :class="node.classStr" :data-href="node.attr.href" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--li类型-->
+		<view v-else-if="node.tag == 'li'" :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+		
+		<!--table类型-->
+		<wx-parse-table v-else-if="node.tag == 'table'" :class="node.classStr" :style="node.styleStr" :node="node" />
+		
+		<!--br类型-->
+		<!-- #ifndef H5 -->
+			<text v-else-if="node.tag == 'br'">\n</text>
+		<!-- #endif -->
+		<!-- #ifdef H5 -->
+			<br v-else-if="node.tag == 'br'">
+		<!-- #endif -->
+		
+		<!--video类型-->
+		<wx-parse-video :node="node" v-else-if="node.tag == 'video'"/>
+	
+		<!--audio类型-->
+		<wx-parse-audio :node="node" v-else-if="node.tag == 'audio'"/>
+	
+		<!--img类型-->
+		<wx-parse-img :node="node" v-else-if="node.tag == 'img'" :style="node.styleStr"/>
+	
+		<!--其他标签-->
+		<view v-else :class="node.classStr" :style="node.styleStr">
+			<block v-for="(node, index) of node.nodes" :key="index">
+				<wx-parse-template :node="node" />
+			</block>
+		</view>
+	</block>
+	
+	<!--判断是否是文本节点-->
+	<block v-else-if="node.node == 'text' ">{{node.text}}</block>
+</template>
+
+<script>
+	import wxParseTemplate from './wxParseTemplate10';
+	import wxParseImg from './wxParseImg';
+	import wxParseVideo from './wxParseVideo';
+	import wxParseAudio from './wxParseAudio';
+	import wxParseTable from './wxParseTable';
+	
+	export default {
+		name: 'wxParseTemplate9',
+		props: {
+			node: {},
+		},
+		components: {
+			wxParseTemplate,
+			wxParseImg,
+			wxParseVideo,
+			wxParseAudio,
+			wxParseTable
+		},
+		methods: {
+			wxParseATap(attr,e) {
+				const {
+					href
+				} = e.currentTarget.dataset;
+				if (!href) return;
+				let parent = this.$parent;
+				while(!parent.preview || typeof parent.preview !== 'function') {
+					parent = parent.$parent;
+				}
+				parent.navigate(href, e, attr);
+			}
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseVideo.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseVideo.vue
new file mode 100644
index 0000000..7d05285
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/components/wxParseVideo.vue
@@ -0,0 +1,15 @@
+<template>
+  <!--增加video标签支持，并循环添加-->
+  <view :class="node.classStr" :style="node.styleStr">
+    <video :class="node.classStr" :style="node.styleStr" class="video-video" :src="node.attr.src"></video>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'wxParseVideo',
+  props: {
+    node: {},
+  },
+};
+</script>
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/libs/html2json.js b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/html2json.js
new file mode 100644
index 0000000..f71a3e7
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/html2json.js
@@ -0,0 +1,262 @@
+/**
+ * html2Json 改造来自: https://github.com/Jxck/html2json
+ *
+ *
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+
+import wxDiscode from './wxDiscode';
+import HTMLParser from './htmlparser';
+
+function makeMap(str) {
+  const obj = {};
+  const items = str.split(',');
+  for (let i = 0; i < items.length; i += 1) obj[items[i]] = true;
+  return obj;
+}
+
+// Block Elements - HTML 5
+const block = makeMap('br,code,address,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video');
+
+// Inline Elements - HTML 5
+const inline = makeMap('a,abbr,acronym,applet,b,basefont,bdo,big,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var');
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+const closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
+
+function removeDOCTYPE(html) {
+  const isDocument = /<body.*>([^]*)<\/body>/.test(html);
+  return isDocument ? RegExp.$1 : html;
+}
+
+function trimHtml(html) {
+  return html
+    .replace(/<!--.*?-->/gi, '')
+    .replace(/\/\*.*?\*\//gi, '')
+    .replace(/[ ]+</gi, '<')
+    .replace(/<script[^]*<\/script>/gi, '')
+    .replace(/<style[^]*<\/style>/gi, '');
+}
+
+function getScreenInfo() {
+  const screen = {};
+  wx.getSystemInfo({
+    success: (res) => {
+      screen.width = res.windowWidth;
+      screen.height = res.windowHeight;
+    },
+  });
+  return screen;
+}
+
+function html2json(html, customHandler, imageProp, host) {
+  // 处理字符串
+  html = removeDOCTYPE(html);
+  html = trimHtml(html);
+  html = wxDiscode.strDiscode(html);
+  // 生成node节点
+  const bufArray = [];
+  const results = {
+    nodes: [],
+    imageUrls: [],
+  };
+
+	const screen = getScreenInfo();
+  function Node(tag) {
+    this.node = 'element';
+    this.tag = tag;
+		
+		this.$screen = screen;
+  }
+
+  HTMLParser(html, {
+    start(tag, attrs, unary) {
+      // node for this element
+      const node = new Node(tag);
+
+      if (bufArray.length !== 0) {
+        const parent = bufArray[0];
+        if (parent.nodes === undefined) {
+          parent.nodes = [];
+        }
+      }
+
+      if (block[tag]) {
+        node.tagType = 'block';
+      } else if (inline[tag]) {
+        node.tagType = 'inline';
+      } else if (closeSelf[tag]) {
+        node.tagType = 'closeSelf';
+      }
+
+      node.attr = attrs.reduce((pre, attr) => {
+        const { name } = attr;
+        let { value } = attr;
+        if (name === 'class') {
+          node.classStr = value;
+        }
+        // has multi attibutes
+        // make it array of attribute
+        if (name === 'style') {
+          node.styleStr = value;
+        }
+        if (value.match(/ /)) {
+          value = value.split(' ');
+        }
+
+        // if attr already exists
+        // merge it
+        if (pre[name]) {
+          if (Array.isArray(pre[name])) {
+            // already array, push to last
+            pre[name].push(value);
+          } else {
+            // single value, make it array
+            pre[name] = [pre[name], value];
+          }
+        } else {
+          // not exist, put it
+          pre[name] = value;
+        }
+
+        return pre;
+      }, {});
+
+      // 优化样式相关属性
+      if (node.classStr) {
+        node.classStr += ` ${node.tag}`;
+      } else {
+        node.classStr = node.tag;
+      }
+      if (node.tagType === 'inline') {
+        node.classStr += ' inline';
+      }
+
+      // 对img添加额外数据
+      if (node.tag === 'img') {
+        let imgUrl = node.attr.src;
+        imgUrl = wxDiscode.urlToHttpUrl(imgUrl, imageProp.domain);
+        Object.assign(node.attr, imageProp, {
+          src: imgUrl || '',
+        });
+        if (imgUrl) {
+          results.imageUrls.push(imgUrl);
+        }
+      }
+
+      // 处理a标签属性
+      if (node.tag === 'a') {
+        node.attr.href = node.attr.href || '';
+      }
+
+      // 处理font标签样式属性
+      if (node.tag === 'font') {
+        const fontSize = [
+          'x-small',
+          'small',
+          'medium',
+          'large',
+          'x-large',
+          'xx-large',
+          '-webkit-xxx-large',
+        ];
+        const styleAttrs = {
+          color: 'color',
+          face: 'font-family',
+          size: 'font-size',
+        };
+        if (!node.styleStr) node.styleStr = '';
+        Object.keys(styleAttrs).forEach((key) => {
+          if (node.attr[key]) {
+            const value = key === 'size' ? fontSize[node.attr[key] - 1] : node.attr[key];
+            node.styleStr += `${styleAttrs[key]}: ${value};`;
+          }
+        });
+      }
+
+      // 临时记录source资源
+      if (node.tag === 'source') {
+        results.source = node.attr.src;
+      }
+
+      if (customHandler.start) {
+        customHandler.start(node, results);
+      }
+
+      if (unary) {
+        // if this tag doesn't have end tag
+        // like <img src="hoge.png"/>
+        // add to parents
+        const parent = bufArray[0] || results;
+        if (parent.nodes === undefined) {
+          parent.nodes = [];
+        }
+        parent.nodes.push(node);
+      } else {
+        bufArray.unshift(node);
+      }
+    },
+    end(tag) {
+      // merge into parent tag
+      const node = bufArray.shift();
+      if (node.tag !== tag) {
+        console.error('invalid state: mismatch end tag');
+      }
+
+      // 当有缓存source资源时于于video补上src资源
+      if (node.tag === 'video' && results.source) {
+        node.attr.src = results.source;
+        delete results.source;
+      }
+
+      if (customHandler.end) {
+        customHandler.end(node, results);
+      }
+
+      if (bufArray.length === 0) {
+        results.nodes.push(node);
+      } else {
+        const parent = bufArray[0];
+        if (!parent.nodes) {
+          parent.nodes = [];
+        }
+        parent.nodes.push(node);
+      }
+    },
+    chars(text) {
+		// if (!text.trim()){
+		// 	return;
+		// }
+      const node = {
+        node: 'text',
+        text,
+      };
+
+      if (customHandler.chars) {
+        customHandler.chars(node, results);
+      }
+
+      if (bufArray.length === 0) {
+        results.nodes.push(node);
+      } else {
+        const parent = bufArray[0];
+        if (parent.nodes === undefined) {
+          parent.nodes = [];
+        }
+        parent.nodes.push(node);
+      }
+    },
+  });
+
+  return results;
+}
+
+export default html2json;
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/libs/htmlparser.js b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/htmlparser.js
new file mode 100644
index 0000000..2939da3
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/htmlparser.js
@@ -0,0 +1,156 @@
+/**
+ *
+ * htmlParser改造自: https://github.com/blowsie/Pure-JavaScript-HTML5-Parser
+ *
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *               垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+// Regular Expressions for parsing tags and attributes
+
+const startTag = /^<([-A-Za-z0-9_]+)((?:\s+[a-zA-Z0-9_:][-a-zA-Z0-9_:.]*(?:\s*=\s*(?:(?:"[^"]*")|(?:'[^']*')|[^>\s]+))?)*)\s*(\/?)>/;
+const endTag = /^<\/([-A-Za-z0-9_]+)[^>]*>/;
+const attr = /([a-zA-Z0-9_:][-a-zA-Z0-9_:.]*)(?:\s*=\s*(?:(?:"((?:\\.|[^"])*)")|(?:'((?:\\.|[^'])*)')|([^>\s]+)))?/g;
+
+function makeMap(str) {
+  const obj = {};
+  const items = str.split(',');
+  for (let i = 0; i < items.length; i += 1) obj[items[i]] = true;
+  return obj;
+}
+
+// Empty Elements - HTML 5
+const empty = makeMap('area,base,basefont,br,col,frame,hr,img,input,link,meta,param,embed,command,keygen,source,track,wbr');
+
+// Block Elements - HTML 5
+const block = makeMap('address,code,article,applet,aside,audio,blockquote,button,canvas,center,dd,del,dir,div,dl,dt,fieldset,figcaption,figure,footer,form,frameset,h1,h2,h3,h4,h5,h6,header,hgroup,hr,iframe,ins,isindex,li,map,menu,noframes,noscript,object,ol,output,p,pre,section,script,table,tbody,td,tfoot,th,thead,tr,ul,video');
+
+// Inline Elements - HTML 5
+const inline = makeMap('a,abbr,acronym,applet,b,basefont,bdo,big,br,button,cite,del,dfn,em,font,i,iframe,img,input,ins,kbd,label,map,object,q,s,samp,script,select,small,span,strike,strong,sub,sup,textarea,tt,u,var');
+
+// Elements that you can, intentionally, leave open
+// (and which close themselves)
+const closeSelf = makeMap('colgroup,dd,dt,li,options,p,td,tfoot,th,thead,tr');
+
+// Attributes that have their values filled in disabled="disabled"
+const fillAttrs = makeMap('checked,compact,declare,defer,disabled,ismap,multiple,nohref,noresize,noshade,nowrap,readonly,selected');
+
+function HTMLParser(html, handler) {
+  let index;
+  let chars;
+  let match;
+  let last = html;
+  const stack = [];
+
+  stack.last = () => stack[stack.length - 1];
+
+  function parseEndTag(tag, tagName) {
+    // If no tag name is provided, clean shop
+    let pos;
+    if (!tagName) {
+      pos = 0;
+    } else {
+      // Find the closest opened tag of the same type
+      tagName = tagName.toLowerCase();
+      for (pos = stack.length - 1; pos >= 0; pos -= 1) {
+        if (stack[pos] === tagName) break;
+      }
+    }
+    if (pos >= 0) {
+      // Close all the open elements, up the stack
+      for (let i = stack.length - 1; i >= pos; i -= 1) {
+        if (handler.end) handler.end(stack[i]);
+      }
+
+      // Remove the open elements from the stack
+      stack.length = pos;
+    }
+  }
+
+  function parseStartTag(tag, tagName, rest, unary) {
+    tagName = tagName.toLowerCase();
+
+    if (block[tagName]) {
+      while (stack.last() && inline[stack.last()]) {
+        parseEndTag('', stack.last());
+      }
+    }
+
+    if (closeSelf[tagName] && stack.last() === tagName) {
+      parseEndTag('', tagName);
+    }
+
+    unary = empty[tagName] || !!unary;
+
+    if (!unary) stack.push(tagName);
+
+    if (handler.start) {
+      const attrs = [];
+
+      rest.replace(attr, function genAttr(matches, name) {
+        const value = arguments[2] || arguments[3] || arguments[4] || (fillAttrs[name] ? name : '');
+
+        attrs.push({
+          name,
+          value,
+          escaped: value.replace(/(^|[^\\])"/g, '$1\\"'), // "
+        });
+      });
+
+      if (handler.start) {
+        handler.start(tagName, attrs, unary);
+      }
+    }
+  }
+
+  while (html) {
+    chars = true;
+
+    if (html.indexOf('</') === 0) {
+      match = html.match(endTag);
+
+      if (match) {
+        html = html.substring(match[0].length);
+        match[0].replace(endTag, parseEndTag);
+        chars = false;
+      }
+
+      // start tag
+    } else if (html.indexOf('<') === 0) {
+      match = html.match(startTag);
+
+      if (match) {
+        html = html.substring(match[0].length);
+        match[0].replace(startTag, parseStartTag);
+        chars = false;
+      }
+    }
+
+    if (chars) {
+      index = html.indexOf('<');
+      let text = '';
+      while (index === 0) {
+        text += '<';
+        html = html.substring(1);
+        index = html.indexOf('<');
+      }
+      text += index < 0 ? html : html.substring(0, index);
+      html = index < 0 ? '' : html.substring(index);
+
+      if (handler.chars) handler.chars(text);
+    }
+
+    if (html === last) throw new Error(`Parse Error: ${html}`);
+    last = html;
+  }
+
+  // Clean up any remaining tags
+  parseEndTag();
+}
+
+export default HTMLParser;
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/libs/wxDiscode.js b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/wxDiscode.js
new file mode 100644
index 0000000..0795f51
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/libs/wxDiscode.js
@@ -0,0 +1,195 @@
+// HTML 支持的数学符号
+function strNumDiscode(str) {
+  str = str.replace(/&forall;/g, '∀');
+  str = str.replace(/&part;/g, '∂');
+  str = str.replace(/&exist;/g, '∃');
+  str = str.replace(/&empty;/g, '∅');
+  str = str.replace(/&nabla;/g, '∇');
+  str = str.replace(/&isin;/g, '∈');
+  str = str.replace(/&notin;/g, '∉');
+  str = str.replace(/&ni;/g, '∋');
+  str = str.replace(/&prod;/g, '∏');
+  str = str.replace(/&sum;/g, '∑');
+  str = str.replace(/&minus;/g, '−');
+  str = str.replace(/&lowast;/g, '∗');
+  str = str.replace(/&radic;/g, '√');
+  str = str.replace(/&prop;/g, '∝');
+  str = str.replace(/&infin;/g, '∞');
+  str = str.replace(/&ang;/g, '∠');
+  str = str.replace(/&and;/g, '∧');
+  str = str.replace(/&or;/g, '∨');
+  str = str.replace(/&cap;/g, '∩');
+  str = str.replace(/&cup;/g, '∪');
+  str = str.replace(/&int;/g, '∫');
+  str = str.replace(/&there4;/g, '∴');
+  str = str.replace(/&sim;/g, '∼');
+  str = str.replace(/&cong;/g, '≅');
+  str = str.replace(/&asymp;/g, '≈');
+  str = str.replace(/&ne;/g, '≠');
+  str = str.replace(/&le;/g, '≤');
+  str = str.replace(/&ge;/g, '≥');
+  str = str.replace(/&sub;/g, '⊂');
+  str = str.replace(/&sup;/g, '⊃');
+  str = str.replace(/&nsub;/g, '⊄');
+  str = str.replace(/&sube;/g, '⊆');
+  str = str.replace(/&supe;/g, '⊇');
+  str = str.replace(/&oplus;/g, '⊕');
+  str = str.replace(/&otimes;/g, '⊗');
+  str = str.replace(/&perp;/g, '⊥');
+  str = str.replace(/&sdot;/g, '⋅');
+  return str;
+}
+
+// HTML 支持的希腊字母
+function strGreeceDiscode(str) {
+  str = str.replace(/&Alpha;/g, 'Α');
+  str = str.replace(/&Beta;/g, 'Β');
+  str = str.replace(/&Gamma;/g, 'Γ');
+  str = str.replace(/&Delta;/g, 'Δ');
+  str = str.replace(/&Epsilon;/g, 'Ε');
+  str = str.replace(/&Zeta;/g, 'Ζ');
+  str = str.replace(/&Eta;/g, 'Η');
+  str = str.replace(/&Theta;/g, 'Θ');
+  str = str.replace(/&Iota;/g, 'Ι');
+  str = str.replace(/&Kappa;/g, 'Κ');
+  str = str.replace(/&Lambda;/g, 'Λ');
+  str = str.replace(/&Mu;/g, 'Μ');
+  str = str.replace(/&Nu;/g, 'Ν');
+  str = str.replace(/&Xi;/g, 'Ν');
+  str = str.replace(/&Omicron;/g, 'Ο');
+  str = str.replace(/&Pi;/g, 'Π');
+  str = str.replace(/&Rho;/g, 'Ρ');
+  str = str.replace(/&Sigma;/g, 'Σ');
+  str = str.replace(/&Tau;/g, 'Τ');
+  str = str.replace(/&Upsilon;/g, 'Υ');
+  str = str.replace(/&Phi;/g, 'Φ');
+  str = str.replace(/&Chi;/g, 'Χ');
+  str = str.replace(/&Psi;/g, 'Ψ');
+  str = str.replace(/&Omega;/g, 'Ω');
+
+  str = str.replace(/&alpha;/g, 'α');
+  str = str.replace(/&beta;/g, 'β');
+  str = str.replace(/&gamma;/g, 'γ');
+  str = str.replace(/&delta;/g, 'δ');
+  str = str.replace(/&epsilon;/g, 'ε');
+  str = str.replace(/&zeta;/g, 'ζ');
+  str = str.replace(/&eta;/g, 'η');
+  str = str.replace(/&theta;/g, 'θ');
+  str = str.replace(/&iota;/g, 'ι');
+  str = str.replace(/&kappa;/g, 'κ');
+  str = str.replace(/&lambda;/g, 'λ');
+  str = str.replace(/&mu;/g, 'μ');
+  str = str.replace(/&nu;/g, 'ν');
+  str = str.replace(/&xi;/g, 'ξ');
+  str = str.replace(/&omicron;/g, 'ο');
+  str = str.replace(/&pi;/g, 'π');
+  str = str.replace(/&rho;/g, 'ρ');
+  str = str.replace(/&sigmaf;/g, 'ς');
+  str = str.replace(/&sigma;/g, 'σ');
+  str = str.replace(/&tau;/g, 'τ');
+  str = str.replace(/&upsilon;/g, 'υ');
+  str = str.replace(/&phi;/g, 'φ');
+  str = str.replace(/&chi;/g, 'χ');
+  str = str.replace(/&psi;/g, 'ψ');
+  str = str.replace(/&omega;/g, 'ω');
+  str = str.replace(/&thetasym;/g, 'ϑ');
+  str = str.replace(/&upsih;/g, 'ϒ');
+  str = str.replace(/&piv;/g, 'ϖ');
+  str = str.replace(/&middot;/g, '·');
+  return str;
+}
+
+function strcharacterDiscode(str) {
+  // 加入常用解析
+  
+  str = str.replace(/&nbsp;/g, "<span class='spaceshow'> </span>");
+  str = str.replace(/&ensp;/g, ' ');
+  str = str.replace(/&emsp;/g, '　');
+  str = str.replace(/&quot;/g, "'");
+  str = str.replace(/&amp;/g, '&');
+  str = str.replace(/&lt;/g, '<');
+  str = str.replace(/&gt;/g, '>');
+  str = str.replace(/&#8226;/g, '•');
+  return str;
+}
+
+// HTML 支持的其他实体
+function strOtherDiscode(str) {
+  str = str.replace(/&OElig;/g, 'Œ');
+  str = str.replace(/&oelig;/g, 'œ');
+  str = str.replace(/&Scaron;/g, 'Š');
+  str = str.replace(/&scaron;/g, 'š');
+  str = str.replace(/&Yuml;/g, 'Ÿ');
+  str = str.replace(/&fnof;/g, 'ƒ');
+  str = str.replace(/&circ;/g, 'ˆ');
+  str = str.replace(/&tilde;/g, '˜');
+  str = str.replace(/&ensp;/g, '');
+  str = str.replace(/&emsp;/g, '');
+  str = str.replace(/&thinsp;/g, '');
+  str = str.replace(/&zwnj;/g, '');
+  str = str.replace(/&zwj;/g, '');
+  str = str.replace(/&lrm;/g, '');
+  str = str.replace(/&rlm;/g, '');
+  str = str.replace(/&ndash;/g, '–');
+  str = str.replace(/&mdash;/g, '—');
+  str = str.replace(/&lsquo;/g, '‘');
+  str = str.replace(/&rsquo;/g, '’');
+  str = str.replace(/&sbquo;/g, '‚');
+  str = str.replace(/&ldquo;/g, '“');
+  str = str.replace(/&rdquo;/g, '”');
+  str = str.replace(/&bdquo;/g, '„');
+  str = str.replace(/&dagger;/g, '†');
+  str = str.replace(/&Dagger;/g, '‡');
+  str = str.replace(/&bull;/g, '•');
+  str = str.replace(/&hellip;/g, '…');
+  str = str.replace(/&permil;/g, '‰');
+  str = str.replace(/&prime;/g, '′');
+  str = str.replace(/&Prime;/g, '″');
+  str = str.replace(/&lsaquo;/g, '‹');
+  str = str.replace(/&rsaquo;/g, '›');
+  str = str.replace(/&oline;/g, '‾');
+  str = str.replace(/&euro;/g, '€');
+  str = str.replace(/&trade;/g, '™');
+
+  str = str.replace(/&larr;/g, '←');
+  str = str.replace(/&uarr;/g, '↑');
+  str = str.replace(/&rarr;/g, '→');
+  str = str.replace(/&darr;/g, '↓');
+  str = str.replace(/&harr;/g, '↔');
+  str = str.replace(/&crarr;/g, '↵');
+  str = str.replace(/&lceil;/g, '⌈');
+  str = str.replace(/&rceil;/g, '⌉');
+
+  str = str.replace(/&lfloor;/g, '⌊');
+  str = str.replace(/&rfloor;/g, '⌋');
+  str = str.replace(/&loz;/g, '◊');
+  str = str.replace(/&spades;/g, '♠');
+  str = str.replace(/&clubs;/g, '♣');
+  str = str.replace(/&hearts;/g, '♥');
+
+  str = str.replace(/&diams;/g, '♦');
+  str = str.replace(/&#39;/g, "'");
+  return str;
+}
+
+function strDiscode(str) {
+  str = strNumDiscode(str);
+  str = strGreeceDiscode(str);
+  str = strcharacterDiscode(str);
+  str = strOtherDiscode(str);
+  return str;
+}
+
+function urlToHttpUrl(url, domain) {
+  if (/^\/\//.test(url)) {
+    return `https:${url}`;
+  } else if (/^\//.test(url)) {
+    return `https://${domain}${url}`;
+  }
+  return url;
+}
+
+export default {
+  strDiscode,
+  urlToHttpUrl,
+};
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/parse.css b/mallplusui-uniapp-app2/components/gaoyia-parse/parse.css
new file mode 100644
index 0000000..a9d8c34
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/parse.css
@@ -0,0 +1,248 @@
+/**
+ * author: Di (微信小程序开发工程师)
+ * organization: WeAppDev(微信小程序开发论坛)(http://weappdev.com)
+ *         垂直微信小程序开发交流社区
+ *
+ * github地址: https://github.com/icindy/wxParse
+ *
+ * for: 微信小程序富文本解析
+ * detail : http://weappdev.com/t/wxparse-alpha0-1-html-markdown/184
+ */
+/**
+ * 请在全局下引入该文件，@import '/static/wxParse.css';
+ */
+.wxParse {
+	user-select:none;
+	width: 100%;
+	font-family: Helvetica, "PingFangSC", 'Microsoft Yahei', '微软雅黑', Arial, sans-serif;
+	color: #333;
+	line-height: 1.5;
+	font-size: 1em;
+	text-align:justify;/* //左右两端对齐 */
+}
+.wxParse view ,.wxParse uni-view{
+	word-break: break-word;
+}
+.wxParse .p {
+	padding-bottom: 0;
+	clear: both;
+	/* letter-spacing: 0;//字间距 */
+}
+.wxParse .inline {
+  display: inline;
+  margin: 0;
+  padding: 0;
+}
+
+.wxParse .div {
+  margin: 0;
+  padding: 0;
+  display: block;
+}
+
+.wxParse .h1{
+  font-size: 2em;
+  line-height: 1.2em;
+  margin: 0.67em 0;
+}
+.wxParse .h2{
+  font-size: 1.5em;
+  margin: 0.83em 0;
+}
+.wxParse .h3{
+  font-size: 1.17em;
+  margin: 1em 0;
+}
+.wxParse .h4{
+  margin: 1.33em 0;
+}
+.wxParse .h5{
+  font-size: 0.83em;
+  margin: 1.67em 0;
+}
+.wxParse .h6{
+  font-size: 0.83em;
+  margin: 1.67em 0;
+}
+
+.wxParse .h1,
+.wxParse .h2,
+.wxParse .h3,
+.wxParse .h4,
+.wxParse .h5,
+.wxParse .h6,
+.wxParse .b,
+.wxParse .strong{
+  font-weight: bolder;
+}
+
+.wxParse .i,
+.wxParse .cite,
+.wxParse .em,
+.wxParse .var,
+.wxParse .address {
+  font-style: italic;
+}
+.wxParse .spaceshow{
+	  white-space: pre;
+}
+.wxParse .pre,
+.wxParse .tt,
+.wxParse .code,
+.wxParse .kbd,
+.wxParse .samp {
+  font-family: monospace;
+}
+.wxParse .pre {
+  overflow: auto;
+  background: #f5f5f5;
+  padding: 16upx;
+  white-space: pre;
+  margin: 1em 0upx;
+  font-size: 24upx;
+}
+.wxParse .code {
+	overflow: auto;
+	padding: 16upx;
+	white-space: pre;
+	margin: 1em 0upx;
+	background: #f5f5f5;
+	font-size: 24upx;
+}
+
+.wxParse .big {
+  font-size: 1.17em;
+}
+
+.wxParse .small,
+.wxParse .sub,
+.wxParse .sup {
+  font-size: 0.83em;
+}
+
+.wxParse .sub {
+  vertical-align: sub;
+}
+.wxParse .sup {
+  vertical-align: super;
+}
+
+.wxParse .s,
+.wxParse .strike,
+.wxParse .del {
+  text-decoration: line-through;
+}
+
+.wxParse .strong,
+.wxParse .s {
+  display: inline;
+}
+
+.wxParse .a {
+  color: deepskyblue;
+}
+
+.wxParse .video {
+  text-align: center;
+  margin: 22upx 0;
+}
+
+.wxParse .video-video {
+  width: 100%;
+}
+.wxParse .uni-image{
+	max-width: 100%;
+}
+.wxParse .img {
+  display: block;
+  max-width: 100%;
+  margin-bottom: 0em;/* //与p标签底部padding同时修改 */
+  overflow: hidden;
+}
+
+.wxParse .blockquote {
+  margin: 10upx 0;
+  padding: 22upx 0 22upx 22upx;
+  font-family: Courier, Calibri, "宋体";
+  background: #f5f5f5;
+  border-left: 6upx solid #dbdbdb;
+}
+.wxParse .blockquote .p {
+  margin: 0;
+}
+.wxParse .ul, .wxParse .ol {
+  display: block;
+  margin: 1em 0;
+  padding-left: 2em;
+}
+.wxParse .ol {
+  list-style-type: disc;
+}
+.wxParse .ol {
+  list-style-type: decimal;
+}
+.wxParse .ol>weixin-parse-template,.wxParse .ul>weixin-parse-template {
+  display: list-item;
+  align-items: baseline;
+  text-align: match-parent;
+}
+
+.wxParse .ol>.li,.wxParse .ul>.li {
+  display: list-item;
+  align-items: baseline;
+  text-align: match-parent;
+}
+.wxParse .ul .ul, .wxParse .ol .ul {
+  list-style-type: circle;
+}
+.wxParse .ol .ol .ul, .wxParse .ol .ul .ul, .wxParse .ul .ol .ul, .wxParse .ul .ul .ul {
+    list-style-type: square;
+}
+
+.wxParse .u {
+  text-decoration: underline;
+}
+.wxParse .hide {
+  display: none;
+}
+.wxParse .del {
+  display: inline;
+}
+.wxParse .figure {
+  overflow: hidden;
+}
+.wxParse .table .table{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* 内边框 */
+	border: 1px solid #dadada;
+	width: 100%;
+}
+.wxParse .tbody{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* 内边框 */
+	border: 1px solid #dadada;
+}
+.wxParse .thead, .wxParse .tfoot, .wxParse .th{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	background: #ececec;
+	font-weight: 40;
+}
+.wxParse .tr {
+	border-collapse:collapse;
+	box-sizing: border-box;
+	/* border: 2px solid #F0AD4E; */
+	overflow:auto;
+}
+.wxParse .th,
+.wxParse .td{
+	border-collapse:collapse;
+	box-sizing: border-box;
+	border: 2upx solid #dadada;
+	overflow:auto;
+}
+.wxParse .audio, .wxParse .uni-audio-default{
+	display: block;
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/gaoyia-parse/parse.vue b/mallplusui-uniapp-app2/components/gaoyia-parse/parse.vue
new file mode 100644
index 0000000..61a80bb
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/gaoyia-parse/parse.vue
@@ -0,0 +1,223 @@
+<!--**
+ * forked from：https://github.com/F-loat/mpvue-wxParse
+ *
+ * github地址: https://github.com/dcloudio/uParse
+ *
+ * for: uni-app框架下 富文本解析
+ * 
+ * 优化 by gaoyia@qq.com  https://github.com/gaoyia/parse
+ */-->
+
+<template>
+	
+	<!--基础元素-->
+	<div class="wxParse" :class="className" :style="'user-select:' + userSelect">
+		<block v-for="(node, index) of nodes" :key="index" v-if="!loading">
+			<wxParseTemplate :node="node" />
+		</block>
+	</div>
+</template>
+
+<script>
+	import HtmlToJson from './libs/html2json';
+	import wxParseTemplate from './components/wxParseTemplate0';
+
+	export default {
+		name: 'wxParse',
+		props: {
+			// user-select:none;
+			userSelect: {
+				type: String,
+				default: 'text' //none |text| all | element
+			},
+			imgOptions: {
+				type: [Object, Boolean],
+				default: function() {
+					return {
+						loop: false,
+						indicator: 'number',
+						longPressActions: false
+						// longPressActions: {
+						// 	 itemList: ['发送给朋友', '保存图片', '收藏'],
+						// 		success: function (res) {
+						// 			console.log('选中了第' + (res.tapIndex + 1) + '个按钮');
+						// 		},
+						// 		fail: function (res) {
+						// 			console.log(res.errMsg);
+						// 		}    
+						// 	}
+						// }
+					}
+				}
+			},
+			loading: {
+				type: Boolean,
+				default: false
+			},
+			className: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			noData: {
+				type: String,
+				default: '<div style="color: red;">数据不能为空</div>'
+			},
+			startHandler: {
+				type: Function,
+				default () {
+					return node => {
+						node.attr.class = null;
+						node.attr.style = null;
+					};
+				}
+			},
+			endHandler: {
+				type: Function,
+				default: null
+			},
+			charsHandler: {
+				type: Function,
+				default: null
+			},
+			imageProp: {
+				type: Object,
+				default () {
+					return {
+						mode: 'aspectFit',
+						padding: 0,
+						lazyLoad: false,
+						domain: ''
+					};
+				}
+			}
+		},
+		components: {
+			wxParseTemplate
+		},
+		data() {
+			return {
+				nodes: {},
+				imageUrls: [],
+				wxParseWidth: {
+					value: 0
+				}
+			};
+		},
+		computed: {},
+		mounted() {
+			let that = this
+			this.getWidth().then(function(data) {
+				that.wxParseWidth.value = data;
+			})
+			this.setHtml()
+		},
+		methods: {
+			setHtml() {
+				// this.getWidth().then((data) => {
+				// 	this.wxParseWidth.value = data;
+				// })
+				let {
+					content,
+					noData,
+					imageProp,
+					startHandler,
+					endHandler,
+					charsHandler
+				} = this;
+				let parseData = content || noData;
+				let customHandler = {
+					start: startHandler,
+					end: endHandler,
+					chars: charsHandler
+				};
+				let results = HtmlToJson(parseData, customHandler, imageProp, this);
+				this.imageUrls = results.imageUrls;
+				// this.nodes = results.nodes;
+				this.nodes = [];
+				results.nodes.forEach((item) => {
+					setTimeout(() => {
+						this.nodes.push(item)
+					}, 0);
+				})
+			},
+			getWidth() {
+				return new Promise((res, rej) => {
+					// #ifndef MP-ALIPAY || MP-BAIDU
+					uni.createSelectorQuery()
+						.in(this)
+						.select('.wxParse')
+						.fields({
+								size: true,
+								scrollOffset: true
+							},
+							data => {
+								res(data.width);
+							}
+						).exec();
+					// #endif
+					// #ifdef MP-BAIDU
+					swan.createSelectorQuery().select('.wxParse').boundingClientRect(function(rect) {
+						rect[0].width
+					}).exec()
+					// #endif
+					// #ifdef MP-ALIPAY
+					my.createSelectorQuery()
+						.select('.wxParse')
+						.boundingClientRect().exec((ret) => {
+							res(ret[0].width);
+						});
+					// #endif
+				});
+			},
+			navigate(href, $event, attr) {
+				console.log(href, attr);
+				this.$emit('navigate', href, $event);
+			},
+			preview(src, $event) {
+				if (!this.imageUrls.length || typeof this.imgOptions === 'boolean') {
+
+				} else {
+					uni.previewImage({
+						current: src,
+						urls: this.imageUrls,
+						loop: this.imgOptions.loop,
+						indicator: this.imgOptions.indicator,
+						longPressActions: this.imgOptions.longPressActions
+					});
+				}
+				this.$emit('preview', src, $event);
+			},
+			removeImageUrl(src) {
+				const {
+					imageUrls
+				} = this;
+				imageUrls.splice(imageUrls.indexOf(src), 1);
+			}
+		},
+		// 父组件中提供
+		provide() {
+			return {
+				parseWidth: this.wxParseWidth,
+				parseSelect: this.userSelect
+				// 提示：provide 和 inject 绑定并不是可响应的。这是刻意为之的。然而，如果你传入了一个可监听的对象，那么其对象的属性还是可响应的。
+			};
+		},
+		watch: {
+			content(){
+				this.setHtml()
+			}
+			// content: {
+			// 	handler: function(newVal, oldVal) {
+			// 		if (newVal !== oldVal) {
+			// 			
+			// 		}
+			// 	},
+			// 	deep: true
+			// }
+		}
+	};
+</script>
diff --git a/mallplusui-uniapp-app2/components/jihai-lable.vue b/mallplusui-uniapp-app2/components/jihai-lable.vue
new file mode 100644
index 0000000..cacbb02
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jihai-lable.vue
@@ -0,0 +1,50 @@
+<template>
+	<view>
+		<radio-group class="uni-list" @change="radioChange">
+			<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in type_list" :key="index">
+				<view class="invoice-type-icon">
+					<radio class="a-radio" :id="item.name" :value="item.value" :checked="item.checked" :disabled="item.disabled"></radio>
+				</view>
+				<view class="invoice-type-c">
+					<label class="label-2-text" :for="item.name">
+						<text>{{item.name}}</text>
+					</label>
+				</view>
+			</label>
+		</radio-group>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type_list: [
+					{ value: '1', name: '仅退款', checked: true, disabled: false },
+					{ value: '2', name: '退货退款', checked: false, disabled:false },
+				],
+			};
+		},
+		methods:{
+			radioChange: function(evt) {
+				this.type_list.forEach(item => {
+					if (item.value === evt.target.value) {
+						item.checked = true;
+						this.aftersale_type = evt.target.value;
+					}else{
+						item.checked = false;
+					}
+				});
+				if(this.type_list[0].checked){
+					this.refund_input_noedit = true;
+				}else{
+					this.refund_input_noedit = false;
+				}
+			},
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/image/trumpet.png b/mallplusui-uniapp-app2/components/jshop/image/trumpet.png
new file mode 100644
index 0000000..ad77ac0
Binary files /dev/null and b/mallplusui-uniapp-app2/components/jshop/image/trumpet.png differ
diff --git a/mallplusui-uniapp-app2/components/jshop/image/zoom.png b/mallplusui-uniapp-app2/components/jshop/image/zoom.png
new file mode 100644
index 0000000..d7aded9
Binary files /dev/null and b/mallplusui-uniapp-app2/components/jshop/image/zoom.png differ
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-adpop.vue b/mallplusui-uniapp-app2/components/jshop/jshop-adpop.vue
new file mode 100644
index 0000000..c1ec38f
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-adpop.vue
@@ -0,0 +1,192 @@
+<template>
+	<!-- 单图 -->
+	<view class="jshop-adpop" v-if="jdata.options.colorGroup && jdata.options.colorGroup.length > 0">
+		<view class="adpop" v-if="closeAd">
+			<view class="adpop-c">
+				<view class="adpop-img">
+					<!-- #ifdef MP-WEIXIN -->
+					<view @click="navToTabPage(jdata.options.colorGroup[0].adLink)">
+						<image class="ad-img" :src="jdata.options.colorGroup[0].adImg" mode="widthFix" ></image>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<image class="ad-img" :src="jdata.options.colorGroup[0].adImg" mode="widthFix" @click="navToTabPage(jdata.options.colorGroup[0].adLink)"></image>
+					<!-- #endif -->
+				</view>
+				<image class="close-btn" src="/static/image/close-pink.png" mode="" @click="closePop"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "jshopadpop",
+		props: {
+			jdata: {
+				// type: Object,
+				required: true,
+			}
+		},
+		data(){
+			return{
+				closeAd: true
+			}
+		},
+		computed: {
+			count() {  
+				// console.log(jdata)
+				return (this.jdata.options.colorGroup.length > 0)
+			}
+			
+		},
+		methods: {
+			closePop(){
+				this.closeAd = false
+			},
+			navToTabPage(url) {
+            			uni.navigateTo({
+            				url: url
+            			});
+            		},
+			showSliderInfo(type, val) {
+				console.log(type);
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if(val.indexOf('/pages/coupon/coupon')>-1){
+							var id = val.replace('/pages/coupon/coupon?id=',"");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			goodsDetail: function(id) {
+				// let ins = encodeURIComponent('id='+id);
+				let url = '/pages/goods/index/index?id=' + id;
+				this.$common.navigateTo(url);
+			},
+			// 用户领取优惠券
+			receiveCoupon(couponId) {
+				let data = {
+					promotion_id: couponId
+				}
+				this.$api.getCoupon(data, res => {
+					if (res.status) {
+						this.$common.successToShow(res.msg)
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+			// #ifdef MP-WEIXIN
+			showSliderInfo2:function(e){
+				let type = e.currentTarget.dataset.type;
+				let val = e.currentTarget.dataset.val;
+				console.log(type);
+				console.log(val)
+				console.log(type);
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if(val.indexOf('/pages/coupon/coupon')>-1){
+							var id = val.replace('/pages/coupon/coupon?id=',"");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			}
+			// #endif
+		},
+	}
+</script>
+
+<style>
+.adpop{
+	position: fixed;
+	background: rgba(0,0,0,.5);
+	width: 100%;
+	height: 100vh;
+	z-index: 999;
+	top: 0;
+	left: 0;
+}
+.adpop-c{
+	position: absolute;
+	left: 50%;
+	top: 50%;
+	transform: translate(-50%,-50%);
+	width: 70%;
+	text-align: center;
+}
+.adpop-img{
+	width: 100%;
+	max-height: 1000rpx;
+	margin-bottom: 50rpx;
+}
+.ad-img{
+	width: 100%;
+	max-height: 1000rpx;
+}
+.close-btn{
+	width: 80rpx;
+	height: 80rpx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-article.vue b/mallplusui-uniapp-app2/components/jshop/jshop-article.vue
new file mode 100644
index 0000000..a3a7716
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-article.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class='index-article cell-group bottom-cell-group' v-if="jdata.options.colorGroup && count">
+		<view class='cell-item'
+		v-for="item in jdata.options.colorGroup"
+		:key="item.id"
+		@click="articleDetail(item.id)"
+		>
+			
+			<view class="cell-item-bd">
+				<view class="article-title ">
+					{{ item.title }}
+				</view>
+				<view class="article-time">
+					{{ item.ctime }}
+				</view>
+			</view>
+			<view class="cell-title-img">
+				<image :src="item.cover" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "jshoparticle",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+		// 查看文章详情
+		articleDetail (articleId) {
+			this.$common.navigateTo('/pages/article/index?id=' + articleId+'&id_type=1')
+		}
+	}
+}
+</script>
+
+<style>
+.index-article .cell-title-img{
+	width: 160upx;
+	height: 160upx;
+	float: right;
+}
+.index-article .cell-title-img image{
+	width: 100%;
+	height: 100%;
+}
+.index-article .cell-item-bd{
+	padding-right: 0;
+	vertical-align: top;
+	position: relative;
+}
+.index-article .article-title{
+	font-size: 28upx;
+	color: #333;
+	width: 100%;
+	min-height: 80upx;
+	display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+.index-article .article-time{
+	font-size: 24upx;
+	color: #999;
+	display: inline-block;
+	min-width: 220upx;
+	min-height: 32upx;
+	position: absolute;
+	bottom: 0;
+}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-articleClassify.vue b/mallplusui-uniapp-app2/components/jshop/jshop-articleClassify.vue
new file mode 100644
index 0000000..a8b4e25
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-articleClassify.vue
@@ -0,0 +1,82 @@
+<template>
+	<view class='index-article cell-group bottom-cell-group' v-if="jdata.options.colorGroup && count">
+		<view class='cell-item'
+		v-for="item in jdata.options.colorGroup"
+		:key="item.id"
+		@click="articleDetail(item.id)"
+		>
+			<view class="cell-item-bd">
+				<view class="article-title ">
+					{{ item.title }}
+				</view>
+				<view class="article-time">
+					{{ item.ctime }}
+				</view>
+			</view>
+		
+			<view class="cell-title-img">
+				<image :src="item.cover" mode="aspectFill"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "jshoparticleclassify",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+		// 查看文章详情
+		articleDetail (articleId) {
+			this.$common.navigateTo('/pages/article/index?id=' + articleId+'&id_type=1')
+		}
+	}
+}
+</script>
+
+<style>
+.index-article .cell-title-img{
+	width: 160upx;
+	height: 160upx;
+	float: right;
+}
+.index-article .cell-title-img image{
+	width: 100%;
+	height: 100%;
+}
+.index-article .cell-item-bd{
+	padding-right: 0;
+	vertical-align: top;
+	position: relative;
+}
+.index-article .article-title{
+	font-size: 28upx;
+	color: #333;
+	width: 100%;
+	min-height: 80upx;
+	display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 2;
+    overflow: hidden;
+}
+.index-article .article-time{
+	font-size: 24upx;
+	color: #999;
+	display: inline-block;
+	min-width: 220upx;
+	min-height: 32upx;
+	position: absolute;
+	bottom: 0;
+}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-blank.vue b/mallplusui-uniapp-app2/components/jshop/jshop-blank.vue
new file mode 100644
index 0000000..d396c32
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-blank.vue
@@ -0,0 +1,21 @@
+<template>
+	<view class="blank" :style="{background:jdata.options.search_bg,height:jdata.options.udPadding*2+'rpx'}"></view>
+</template>
+
+<script>
+export default {
+	name: "jshopblank",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	methods: {
+		
+	}
+}
+</script>
+
+<style>
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-content.vue b/mallplusui-uniapp-app2/components/jshop/jshop-content.vue
new file mode 100644
index 0000000..252b277
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-content.vue
@@ -0,0 +1,27 @@
+<template>
+	<view class="content">
+		<u-parse :content="content" @preview="preview" @navigate="navigate" style="background-color: #fff;"/>
+	</view>
+</template>
+<script>
+	//视频和文本解析组件
+	import uParse from '@/components/gaoyia-parse/parse.vue'
+	export default {
+		name: 'jshop-content',
+		components: {
+			uParse
+		},
+		props: {
+			content: {}
+		},
+		created() {},
+		methods: {
+			preview(src, e) {
+				// do something
+			},
+			navigate(href, e) {
+				// do something
+			}
+		}
+	}
+</script>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-coupon.vue b/mallplusui-uniapp-app2/components/jshop/jshop-coupon.vue
new file mode 100644
index 0000000..de585f8
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-coupon.vue
@@ -0,0 +1,101 @@
+<template>
+	<view class="coupon bottom-cell-group" v-if="count">
+		<view class="coupon-item" v-for="item in jdata.options.colorGroup" :key="item.id" @click="receiveCoupon(item.id)">
+			<view class="coupon-i-l">
+				<view class="coupon-i-l-t">
+					<image class="icon" src="/static/image/element-ic.png" mode=""></image>
+					<text>{{ item.name }}</text>
+				</view>
+				<view class="coupon-i-l-b">
+					{{ item.expression1 + item.expression2 }}
+				</view>
+			</view>
+			<view class="coupon-i-r">
+				<image class="coupon-logo" src="/static/image/coupon-element.png" mode=""></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "jshopcoupon",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+		// 用户领取优惠券
+		receiveCoupon(couponId) {
+			let jdata = {
+				promotion_id: couponId
+			}
+			this.$api.getCoupon(jdata, res => {
+				if (res.status) {
+					this.$common.successToShow(res.msg)
+				} else {
+					this.$common.errorToShow(res.msg)
+				}
+			})
+		},
+	}
+}	
+</script>
+
+<style>
+.coupon {
+	padding: 0 26upx;
+	background-color: #f8f8f8;
+}
+
+.coupon-item {
+	padding: 20upx;
+	margin-bottom: 20upx;
+	background-color: #fff;
+}
+
+.coupon-i-l {
+	width: 400upx;
+	display: inline-block;
+}
+
+.coupon-i-l-t {
+	font-size: 32upx;
+	position: relative;
+	margin-bottom: 10upx;
+}
+
+.coupon-i-l-t .icon {
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+}
+
+.coupon-i-l-t text {
+	margin-left: 60upx;
+}
+
+.coupon-i-l-b {
+	font-size: 24upx;
+	color: #999;
+}
+
+.coupon-i-r {
+	width: 258upx;
+	display: inline-block;
+	text-align: center;
+}
+
+.coupon-logo {
+	width: 130upx;
+	height: 100upx;
+}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-goods.vue b/mallplusui-uniapp-app2/components/jshop/jshop-goods.vue
new file mode 100644
index 0000000..f999cde
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-goods.vue
@@ -0,0 +1,604 @@
+<template>
+	<view class="container">
+
+		<!-- 新品上市 -->
+		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+			<image src="/static/temp/h1.png" ></image>
+			<view class="tit-box">
+				<text class="tit">新品上市</text>
+				<text class="tit2">Guess You Like It</text>
+			</view>
+			<text class="yticon icon-you"></text>
+		</view>
+
+		<view class="guess-section">
+			<view v-for="(item, index) in jdata.options.colorGroup" :key="index" class="guess-item" @click="goodsDetail(item.id)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.title }}</text>
+				<text class="price">￥{{ item.price }}</text>
+
+			</view>
+
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+import {goods} from '@/config/mixins.js'
+export default {
+	filters:{
+		substr(val) {
+			if (val.length == 0 || val == undefined) {
+				return false;
+			} else if (val.length > 13) {
+				return val.substring(0, 13) + "...";
+			} else {
+				return val;
+			}
+		}
+	},
+	mixins: [goods],
+	name: "jshopgoods",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+	navToTabPage(url) {
+            			uni.navigateTo({
+            				url: url
+            			});
+            		},
+		//跳转到商品详情页面
+		goodsDetail: function(id) {
+			let url = '../../pagesA/product/product?id=' + id;
+
+			this.$common.navigateTo(url);
+		},
+		
+	},
+}
+</script>
+
+<style lang="scss">
+.MP-search{
+	background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;position: fixed;width: 100%;z-index: 999;
+}
+.MP-search-input{
+	font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;
+}
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 20upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 0upx 20upx 20upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			// margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 150upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 150upx;
+			height: 150upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 0upx 20upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 20upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 20upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		// margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+	.coupon_box {
+    	width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx;
+    }
+
+    .other_type {
+    	width:100%; height:90upx; padding-top:50upx;
+
+    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
+    	.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; }
+    }
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-groupPurchase.vue b/mallplusui-uniapp-app2/components/jshop/jshop-groupPurchase.vue
new file mode 100644
index 0000000..4eb18fb
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-groupPurchase.vue
@@ -0,0 +1,132 @@
+<template>
+	<!-- 团购秒杀 -->
+	<view class="img-list bottom-cell-group group-buying" v-if="jdata.options.colorGroup && count">
+		<view class='cell-item right-img'>
+			<view class='cell-item-hd group-title'>
+				{{jdata.params.title}}
+				<!-- <view class='cell-hd-title'></view> -->
+			</view>
+		</view>
+		<view class='swiper-grids'>
+			<scroll-view class='swiper-list' scroll-x="true">
+				<view class="img-list-item" v-if="item.goods !== 'undefined' && item.goods" v-for="(item, key) in jdata.options.colorGroup"
+				 :key="key">
+					<image class="img-list-item-l medium-img have-none" :src="item.goods.image_url" mode='aspectFill' @click="groupDetail(item.goods.id, item.goods.group_id)"></image>
+					<view class="img-list-item-r medium-right">
+						<view class="goods-name list-goods-name" @click="groupDetail(item.goods.id, item.goods.group_id)">{{item.goods.name}}</view>
+						<view class="goods-item-c">
+							<view class="goods-price red-price">￥{{item.goods.product.price}}</view>
+							<view class="goods-buy">
+								<view class="goods-salesvolume red-price" v-if="(item.goods.lasttime != '已经结束' || item.goods.lasttime != '即将开始') && item.goods.lasttime">剩余：<uni-countdown
+									 :show-day="false" :hour="item.goods.lasttime.hour" :minute="item.goods.lasttime.minute" :second="item.goods.lasttime.second"></uni-countdown>
+								</view>
+								<view class="goods-salesvolume red-price" v-if="item.goods.lasttime == '已经结束'">已结束</view>
+								<view class="goods-salesvolume red-price" v-if="item.goods.lasttime == '即将开始'">即将开始</view>
+								<image class="goods-cart" src="/static/image/ic-car.png" @click="groupDetail(item.goods.id, item.goods.group_id)"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
+	import {
+		goods
+	} from '@/config/mixins.js'
+	export default {
+		mixins: [goods],
+		components: {
+			uniCountdown
+		},
+		name: "jshopgrouppurchase",
+		props: {
+			jdata: {
+				// type: Array,
+				required: false,
+			}
+		},
+		computed: {
+			count() {  
+				return (this.jdata.options.colorGroup.length > 0)
+			}
+		},
+		methods: {
+			showSliderInfo(type, val) {
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val +'&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			// goodsDetail: function(id) {
+			// 	let url = '/pages/goods/index/index?id=' + id;
+			// 	this.$common.navigateTo(url);
+			// },
+		},
+	}
+</script>
+
+<style>
+	.img-list,
+	.img-grids {
+		background-color: #fff;
+	}
+
+	.cell-item {
+		border: none;
+	}
+
+	.group-buying .img-list-item {
+		min-height: 236upx;
+		padding: 20upx;
+		margin-left: 26upx;
+		margin-bottom: 26upx;
+		display: inline-table;
+		background-color: #f9f9f9;
+	}
+
+	.swiper-grids .img-list-item:last-child {
+		margin-right: 26upx;
+	}
+
+	/* .group-buying .goods-name{
+	min-height: 74upx;
+} */
+	.group-buying .group-title {
+		width: 100%;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-imgSingle.vue b/mallplusui-uniapp-app2/components/jshop/jshop-imgSingle.vue
new file mode 100644
index 0000000..d2a0a6d
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-imgSingle.vue
@@ -0,0 +1,189 @@
+<template>
+	<!-- 单图 -->
+	<view class="ad jshop-imgsingle" v-if="jdata.options.colorGroup && jdata.options.colorGroup.length > 0">
+		<view class="" v-for="item in jdata.options.colorGroup" :key="item.id">
+			<!-- #ifdef MP-WEIXIN -->
+			<view @click="showSliderInfo2" :data-type="item.linkType" :data-val="item.linkValue">
+				<image class="ad-img" :src="item.adImg" mode="widthFix" ></image>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef MP-WEIXIN -->
+			<image class="ad-img" :src="item.adImg" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)"></image>
+			<!-- #endif -->
+			<view class="imgup-btn" v-if="item.buttonText != ''" @click="showSliderInfo(item.linkType, item.linkValue)">
+				<button class="btn btn-fillet" :style="{background:item.buttonColor,color:item.textColor}">{{item.buttonText}}</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "jshopimgsingle",
+		props: {
+			jdata: {
+				// type: Object,
+				required: true,
+			}
+		},
+		computed: {
+			count() {  
+				// console.log(jdata)
+				return (this.jdata.options.colorGroup.length > 0)
+			}
+			
+		},
+		methods: {
+			showSliderInfo(type, val) {
+				console.log(type);
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if(val.indexOf('/pages/coupon/coupon')>-1){
+							var id = val.replace('/pages/coupon/coupon?id=',"");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			goodsDetail: function(id) {
+				// let ins = encodeURIComponent('id='+id);
+				let url = '/pages/goods/index/index?id=' + id;
+				this.$common.navigateTo(url);
+			},
+			// 用户领取优惠券
+			receiveCoupon(couponId) {
+				let data = {
+					promotion_id: couponId
+				}
+				this.$api.getCoupon(data, res => {
+					if (res.status) {
+						this.$common.successToShow(res.msg)
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+			// #ifdef MP-WEIXIN
+			showSliderInfo2:function(e){
+				let type = e.currentTarget.dataset.type;
+				let val = e.currentTarget.dataset.val;
+				console.log(type);
+				console.log(val)
+				console.log(type);
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if(val.indexOf('/pages/coupon/coupon')>-1){
+							var id = val.replace('/pages/coupon/coupon?id=',"");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			}
+			// #endif
+		},
+	}
+</script>
+
+<style>
+	/* .ad {
+	width: 100%;
+	overflow: hidden;
+}
+.ad-img{
+	width: 100%;
+	float: left;
+	margin-bottom: 20upx;
+}
+.ad-img:last-child{
+	margin-bottom: 0;
+} */
+	.jshop-imgsingle.ad {
+		width: 100%;
+		overflow: hidden;
+		position: relative;
+	}
+
+	.jshop-imgsingle .ad-img {
+		width: 100%;
+		float: left;
+		position: relative;
+		z-index: 667;
+		/* margin-bottom: 20upx; */
+	}
+
+	.jshop-imgsingle .ad-img:last-child {
+		margin-bottom: 0;
+	}
+
+	.jshop-imgsingle .imgup-btn {
+		position: absolute;
+		z-index: 668;
+		bottom: 80upx;
+		left: 40upx;
+	}
+
+	.jshop-imgsingle .imgup-btn .btn {
+		line-height: 2;
+		font-size: 28upx;
+		padding: 0 50upx;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-imgSlide.vue b/mallplusui-uniapp-app2/components/jshop/jshop-imgSlide.vue
new file mode 100644
index 0000000..ebe3a00
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-imgSlide.vue
@@ -0,0 +1,667 @@
+<template>
+
+		<!-- 头部轮播 -->
+    		<!-- #ifdef MP -->
+    		<view class="carousel-section" style="margin-top: 80upx;">
+    		<!-- #endif -->
+    		<!-- #ifndef MP -->
+    		<view class="carousel-section">
+    		<!-- #endif -->
+    			<!-- 标题栏和状态栏占位符 -->
+    			<view class="titleNview-placing"></view>
+    			<!-- 背景色区域 -->
+    			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+    			<swiper class="carousel" circular @change="swiperChange">
+    				<swiper-item v-for="(item, index) in jdata.options.colorGroup" :key="index" class="carousel-item" @click="navToTabPage(item.adLink)">
+    					<image :src="item.adImg" />
+    				</swiper-item>
+    			</swiper>
+    			<!-- 自定义swiper指示器 -->
+    			<view class="swiper-dots">
+    				<text class="num">{{ swiperCurrent + 1 }}</text>
+    				<text class="sign">/</text>
+    				<text class="num">{{ jdata.options.colorGroup.length }}</text>
+    			</view>
+    		</view>
+
+</template>
+
+<script>
+	export default {
+		name: "jshopimgSlide",
+		props: {
+			jdata: {
+				// type: Object,
+				required: true,
+			}
+		},
+		data() {
+			return {
+			swiperCurrent: 0,
+			titleNViewBackground: '',
+			swiperLength: 0,
+				swiper: {
+					indicatorDots: true,
+					autoplay: true,
+					 interval: 2000,
+					duration: 500,
+				},
+			};
+		},
+		computed: {
+			count() {  
+				return (this.jdata.options.colorGroup.length > 0)
+			}
+		},
+		created() {},
+		watch: {},
+		methods: {
+		navToTabPage(url) {
+        			uni.navigateTo({
+        				url: url
+        			});
+        		},
+		//轮播图切换修改背景色
+        		swiperChange(e) {
+        			const index = e.detail.current;
+        			this.swiperCurrent = index;
+        		//	this.titleNViewBackground = this.jdata.options.colorGroup[index].background;
+        		},
+			// 广告点击查看详情
+			showSliderInfo(type, val) {
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if (val.indexOf('/pages/coupon/coupon') > -1) {
+							var id = val.replace('/pages/coupon/coupon?id=', "");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			goodsDetail: function(id) {
+				let url = '/pages/goods/index/index?id=' + id;
+				this.$common.navigateTo(url);
+			},
+			// 用户领取优惠券
+			receiveCoupon(couponId) {
+				let data = {
+					promotion_id: couponId
+				}
+				this.$api.getCoupon(data, res => {
+					if (res.status) {
+						this.$common.successToShow(res.msg)
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+.MP-search{
+	background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;position: fixed;width: 100%;z-index: 999;
+}
+.MP-search-input{
+	font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;
+}
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 20upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 0upx 20upx 20upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			// margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 150upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 150upx;
+			height: 150upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 0upx 20upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 20upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 20upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		// margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+	.coupon_box {
+    	width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx;
+    }
+
+    .other_type {
+    	width:100%; height:90upx; padding-top:50upx;
+
+    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
+    	.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; }
+    }
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
+
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-imgWindow.vue b/mallplusui-uniapp-app2/components/jshop/jshop-imgWindow.vue
new file mode 100644
index 0000000..561984a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-imgWindow.vue
@@ -0,0 +1,207 @@
+<template>
+	<view class="imgwindow">
+		<view class="imgwindow-list" v-if="jdata.id == '3' "
+		 v-bind:class="'row'+jdata.id" :style="{margin:-jdata.id+'px'}">
+				<image v-for="(item, index) in jdata.options.colorGroup" :key="index" :src="item.adImg" mode="widthFix" @click="showSliderInfo(item.linkType, item.linkValue)"></image>
+		</view>
+		<view class="imgwindow-list" v-if="jdata.id == '4'" v-bind:class="'row'+jdata.id" :style="{margin:-jdata.id+'px'}">
+			<view class="imgwindow-item" ref="imgwitem" :style="{height:height+'px',padding:jdata.id+'px'}" v-for="(item, index) in jdata.options.colorGroup"
+			 :key="index" v-if="index == 0">
+				<image :src="item.adImg" mode="aspectFill" @click="showSliderInfo(item.linkType, item.linkValue)"></image>
+			</view>
+			<view class="imgwindow-item" ref="imgwitem" :style="{height:height1+'px',padding:jdata.id+'px'}" v-for="(item, index) in jdata.options.colorGroup"
+			 :key="index" v-if="index !== 0">
+				<image :src="item.adImg" mode="aspectFill" @click="showSliderInfo(item.linkType, item.linkValue)"></image>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "jshopimgwindow",
+		props: {
+			jdata: {
+				// type: Object,
+				required: true,
+			}
+		},
+		data() {
+			return {
+				height: '',
+				height1: '',
+				padding: '3'
+			}
+		},
+		mounted() {
+			// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE
+			var view = uni.createSelectorQuery().in(this).select(".imgwindow-item");
+			view.boundingClientRect(data => {
+				this.height = 50;
+				// 橱窗小图高度
+				this.height1 = 50 / 2;
+			}).exec();
+			// #endif
+
+			// #ifdef MP-ALIPAY
+			var view = uni.createSelectorQuery().in(this).select(".content").boundingClientRect().exec(data => {
+				this.height1 = data[0].width / 4;
+				if (this.data.params.style == '3') {
+					this.height = data[0].width / 3;
+				} else if (this.data.params.style == '2') {
+					this.height = data[0].width / 2;
+				} else if (this.data.params.style == '4') {
+					this.height = data[0].width / 4;
+				} else if (this.data.params.style == '0') {
+					this.height = data[0].width / 2;
+				}
+			});
+			// #endif
+
+			// #ifdef MP-WEIXIN
+
+			var view = uni.createSelectorQuery().select(".content");
+
+			view.boundingClientRect(jdata => {
+
+				this.height1 = jdata.width / 4;
+				if (this.jdata.params.style == '3') {
+					this.height = jdata.width / 3;
+				} else if (this.jdata.params.style == '2') {
+					this.height = jdata.width / 2;
+				} else if (this.jdata.params.style == '4') {
+					this.height = jdata.width / 4;
+				} else if (this.jdata.params.style == '0') {
+					this.height = jdata.width / 2;
+				}
+			}).exec();
+			// #endif
+		},
+		methods: {
+			showSliderInfo(type, val) {
+				if (!val) {
+					return;
+				}
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val ==
+							'/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else if(val.indexOf('/pages/coupon/coupon')>-1){
+							var id = val.replace('/pages/coupon/coupon?id=',"");
+							this.receiveCoupon(id)
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			goodsDetail: function(id) {
+				let url = '/pages/goods/index/index?id=' + id;
+				this.$common.navigateTo(url);
+			},
+			// 用户领取优惠券
+			receiveCoupon(couponId) {
+				let data = {
+					promotion_id: couponId
+				}
+				this.$api.getCoupon(data, res => {
+					if (res.status) {
+						this.$common.successToShow(res.msg)
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.imgwindow {
+		width: 100%;
+	}
+
+	.imgwindow-list {
+		/* overflow: hidden; */
+		/* margin: -16upx; */
+		display: flex;
+	}
+
+	/* 堆积两列 */
+	.imgwindow-list .imgwindow-item {
+		height: auto;
+		flex: 1;
+		/* float: left; */
+		/* padding: 8upx; */
+	}
+
+	.imgwindow-list .imgwindow-item image {
+		width: 100%;
+		/* height: 100%; */
+	}
+	
+	.imgwindow-list.row0{
+		overflow: hidden;
+		display: block;
+	}
+	.imgwindow-list.row0 .imgwindow-item {
+		height: auto;
+		flex: auto;
+		float: left;
+		/* padding: 8upx; */
+	}
+	.imgwindow-list.row0 .imgwindow-item image {
+		width: 100%;
+		height: 100%;
+	}
+	
+	.imgwindow-list.row0 .imgwindow-item:first-child {
+		width: 50%;
+	}
+
+	.imgwindow-list.row0 .imgwindow-item:nth-child(2) {
+		width: 50%;
+	}
+
+	.imgwindow-list.row0 .imgwindow-item:nth-child(3),
+	.imgwindow-list.row0 .imgwindow-item:nth-child(4) {
+		width: 25%;
+
+	}
+
+	/* .imgwindow-list.row2 .imgwindow-item {
+		width: 50%;
+	}
+
+	.imgwindow-list.row3 .imgwindow-item {
+		width: 33.3%;
+	}
+
+	.imgwindow-list.row4 .imgwindow-item {
+		width: 25%;
+	} */
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-navBar.vue b/mallplusui-uniapp-app2/components/jshop/jshop-navBar.vue
new file mode 100644
index 0000000..7de5d13
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-navBar.vue
@@ -0,0 +1,616 @@
+<template>
+	<view class="container">
+		<view class="cate-section">
+        			<view class="cate-item"  v-for="(item, index) in jdata.options.colorGroup" @click="navToTabPage(item.tabContent[0].tabLink)">
+        				<image :src="item.tabContent[0].tabImg"></image>
+        				<text>{{item.tabs}}</text>
+        			</view>
+
+        		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "jshopnavbar",
+		props: {
+			jdata: {
+				// type: Object,
+				required: true,
+			}
+		},
+		data() {
+			return {
+				height: '',
+				height1: ''
+			}
+		},
+		onLoad() {
+
+		},
+		mounted() {
+
+		},
+		methods: {
+			showSliderInfo(type, val) {
+				console.log(val)
+				if (!val) {
+					return;
+				}
+				console.log("11")
+				if (type == 1) {
+					if (val.indexOf('http') != -1) {
+						// #ifdef H5 
+						window.location.href = val
+						// #endif
+					} else {
+						// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+						if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+							uni.switchTab({
+								url: val
+							});
+							return;
+						} else {
+							this.$common.navigateTo(val);
+							return;
+						}
+						// #endif
+					}
+				} else if (type == 2) {
+					// 商品详情
+					this.goodsDetail(val)
+				} else if (type == 3) {
+					// 文章详情
+					this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+				} else if (type == 4) {
+					// console.log("11")
+					// 文章列表
+					this.$common.navigateTo('/pages/article/list?cid=' + val)
+				} else if (type == 5) {
+					//智能表单 
+					this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+				}
+			},
+			//跳转到商品详情页面
+			goodsDetail: function(id) {
+				let url = '/pages/goods/index/index?id=' + id;
+				this.$common.navigateTo(url);
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+.MP-search{
+	background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;position: fixed;width: 100%;z-index: 999;
+}
+.MP-search-input{
+	font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;
+}
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 20upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 0upx 20upx 20upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			// margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 150upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 150upx;
+			height: 150upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 0upx 20upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 20upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 20upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		// margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+	.coupon_box {
+    	width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx;
+    }
+
+    .other_type {
+    	width:100%; height:90upx; padding-top:50upx;
+
+    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
+    	.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; }
+    }
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-notice.vue b/mallplusui-uniapp-app2/components/jshop/jshop-notice.vue
new file mode 100644
index 0000000..20031a6
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-notice.vue
@@ -0,0 +1,69 @@
+<template>
+	<view class="notice bottom-cell-group" v-if="jdata.options.colorGroup && count">
+		<view class="notice-icon">
+			<image class="icon news-icon" src="/static/image/news.png" mode=""></image>
+		</view>
+		<swiper class="notice-c" :indicator-dots="false" :autoplay="true" :interval="3000" :duration="1000" :vertical="true" :circular="true">
+			<swiper-item v-for="item in jdata.options.colorGroup" :key="item.id">
+				<view class="swiper-item" @click="goNotice(item.id)">{{ item.title }}</view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "jshopnotice",
+		props: {
+			jdata:{
+				// type: Object,
+				required: true,
+			}
+		},
+		computed: {
+			count() {  
+				return (this.jdata.options.colorGroup.length > 0)
+			}
+		},
+		methods: {
+			// 点击公告
+			goNotice(id) {
+				// 文章详情
+				this.$common.navigateTo('/pages/article/index?id=' + id+'&id_type=2')
+			},
+		},
+	}
+</script>
+
+<style>
+.notice {
+	padding: 6upx 26upx 6upx 60upx;
+	position: relative;
+	overflow: hidden;
+	background-color: #fff;
+	color: #333;
+}
+.notice-icon {
+	display: inline-block;
+	height: 40upx;
+	position: absolute;
+	top: 59%;
+	left: 26upx;
+	transform: translateY(-50%);
+	overflow: hidden;
+}
+.news-icon {
+	width: 30upx;
+	height: 30upx;
+	float: left;
+}
+.notice-c {
+	margin-left: 10upx;
+	height: 50upx;
+	line-height: 50upx;
+	width: 630upx;
+	display: inline-block;
+	font-size: 28upx;
+	float: left;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-onegoods.vue b/mallplusui-uniapp-app2/components/jshop/jshop-onegoods.vue
new file mode 100644
index 0000000..a0c8e47
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-onegoods.vue
@@ -0,0 +1,150 @@
+<template>
+	<view class="index-goods">
+
+
+		<!-- 列表平铺单列 -->
+		<view class="img-list bottom-cell-group"  >
+			<view class='cell-item right-img' v-if="jdata.name != ''">
+				<view class='cell-item-hd'>
+					<view class='cell-hd-title'>{{jdata.name}}</view>
+				</view>
+				<view class='cell-item-bd'>
+				</view>
+				<view class='cell-item-ft' >
+					<text class='cell-ft-text' @click="goodsList({cat_id: jdata.params.classifyId,brand_id:jdata.params.brandId})">查看更多</text>
+					<image class='cell-ft-next icon' src='/static/image/right.png'></image>
+				</view>
+			</view>
+			<view v-if="count">
+				<view class="img-list-item" v-for="(item, index) in jdata.options.colorGroup" :key="index" @click="goodsDetail(item.id)">
+					<image class="img-list-item-l have-none" :src="item.pic" mode='aspectFill'></image>
+					<view class="img-list-item-r">
+						<view class="goods-name list-goods-name">
+							{{item.title}}
+						</view>
+						<view class="goods-item-c">
+							<view class="goods-price red-price">￥{{item.price}}</view>
+							<view class="goods-buy">
+								<view class="goods-salesvolume" v-if="item.comments_count > 0">{{item.comments_count}}条评论</view>
+								<view class="goods-salesvolume" v-else-if="item.comments_count <= 0">暂无评论</view>
+								<image class="goods-cart" src="/static/image/ic-car.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="order-none" v-else>
+				<image class="order-none-img" src="/static/image/order.png" mode=""></image>
+			</view>
+		</view>
+		
+
+		</view>
+	</view>
+</template>
+
+<script>
+import {goods} from '@/config/mixins.js'
+export default {
+	filters:{
+		substr(val) {
+			if (val.length == 0 || val == undefined) {
+				return false;
+			} else if (val.length > 13) {
+				return val.substring(0, 13) + "...";
+			} else {
+				return val;
+			}
+		}
+	},
+	mixins: [goods],
+	name: "jshoponegoods",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+		//跳转到商品详情页面
+		goodsDetail: function(id) {
+			let url = '/pages/goods/index/index?id=' + id;
+			this.$common.navigateTo(url);
+		},
+		
+	},
+}
+</script>
+
+<style>
+.cell-item {
+	border: none;
+	/* padding-bottom: 0; */
+}
+.cell-ft-text {
+	font-size: 22upx;
+	color: #999;
+}
+.img-grids,.img-list{
+	/* margin-top: 20upx; */
+	background-color: #fff;
+}
+.img-grids-item{
+	display: inline-table;
+	margin-top: 0;
+	margin-bottom: 14upx;
+}
+.column3 .img-grids-item{
+	width: 230upx;
+	height: 364rpx !important;
+	margin: 15upx;
+	margin-right: 0;
+	margin-top: 0;
+	margin-bottom: 6upx;
+}
+.column3 .img-grids-item:nth-child(3n){
+	margin-right: 15upx;
+}
+.column3 .img-grids-item-t{
+	width: 230upx;
+	height: 230upx;
+}
+.column3 .grids-goods-name{
+	font-size: 24upx;
+	/* height: 68upx; */
+	/* min-height: 54rpx; */
+}
+.column3 .img-grids-item-b{
+	padding: 0 8upx 8upx;
+}
+.column3 .goods-price{
+	font-size: 26upx;
+}
+.slide3 .img-grids-item{
+	width: 200upx;
+}
+.slide3 .img-grids-item-t{
+	width: 200upx;
+	height: 200upx;
+}
+.slide3 .grids-goods-name{
+	font-size: 24rpx;
+	height: 66rpx;
+}
+.index-goods .img-grids-item{
+	display: inline-block;
+	margin-top: 0;
+}
+.index-goods .img-list-item{
+	padding: 0upx 26upx;
+	margin-bottom: 14upx;
+}
+.index-goods .img-list{
+	padding-bottom: 10upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-pintuan.vue b/mallplusui-uniapp-app2/components/jshop/jshop-pintuan.vue
new file mode 100644
index 0000000..539d2c5
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-pintuan.vue
@@ -0,0 +1,83 @@
+<template>
+	<!-- 拼团 -->
+	<view class="img-list bottom-cell-group group-buying" v-if="jdata.options.colorGroup && count">
+		<view class='cell-item right-img'>
+			<view class='cell-item-hd group-title'>
+				{{jdata.params.title}}
+			</view>
+		</view>
+		<view class='swiper-grids' >
+			<scroll-view class='swiper-list' scroll-x="true">
+				<view class="img-list-item" v-if="item.goods_id !== 'undefined' && item.goods_id" v-for="(item, key) in jdata.options.colorGroup" :key="key">
+					<image class="img-list-item-l medium-img have-none" :src="item.goods_image" mode='aspectFill' @click="pintuanDetail(item.goods_id)"></image>
+					<view class="img-list-item-r medium-right">
+						<view class="goods-name list-goods-name" @click="pintuanDetail(item.goods_id)">{{item.goods_name}}</view>
+						<view class="goods-item-c">
+							<view class="goods-price red-price">￥{{item.pintuan_price}}</view>
+							<view class="goods-buy">
+								<view class="goods-salesvolume red-price" v-if="(item.pintuan_start_status == 1) && item.lasttime">剩余：<uni-countdown :day="item.lasttime.day" :hour="item.lasttime.hour" :minute="item.lasttime.minute" :second="item.lasttime.second"></uni-countdown></view>
+								<view class="goods-salesvolume red-price" v-if="item.pintuan_start_status == 3">已结束</view>
+								<view class="goods-salesvolume red-price" v-if="item.pintuan_start_status == 2">即将开团</view>
+								
+								<image class="goods-cart" src="/static/image/ic-car.png" @click="pintuanDetail(item.goods_id)"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
+import {goods} from '@/config/mixins.js'
+export default {
+	mixins: [goods],
+	components:{uniCountdown},
+	name: "jshoppintuan",
+	props: {
+		jdata:{
+			// type: Array,
+			required: false,
+		}
+	},
+	computed: {  
+		count() {  
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+	},
+}
+</script>
+
+<style>
+.img-list, .img-grids {
+	background-color: #fff;
+}
+.cell-item{
+	border: none;
+}
+.group-buying .img-list-item{
+	min-height: 236upx;
+	padding: 20upx;
+	margin-left: 26upx;
+	margin-bottom: 26upx;
+	display: inline-table;
+	background-color: #f9f9f9;
+}
+.swiper-grids .img-list-item:last-child{
+	margin-right: 26upx;
+}
+
+/* .group-buying .goods-name{
+	min-height: 74upx;
+} */
+.group-buying .group-title{
+	width: 100%;
+	overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-record.vue b/mallplusui-uniapp-app2/components/jshop/jshop-record.vue
new file mode 100644
index 0000000..c4b9cd8
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-record.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="adbrathing" 
+	v-show="adbshow" 
+	v-bind:class="['adbrathing'+jdata.params.style.align,!hideanimation?'pc':hideanimation?'hc':'']" 
+	:style="{top:jdata.params.style.top+'%'}" >
+		<view class="adbrathing-c">
+			<view class="adbrathing-l">
+				<image class="user-head-img" :src="log.avatar" mode="aspectFill"></image>
+				<view class="user-name">
+					{{log.nickname}}
+				</view>
+			</view>
+			<view class="adbrathing-r">
+				 {{log.ctime}}{{log.desc}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import { apiBaseUrl } from '@/config/config.js';
+export default {
+	name: "jshoprecord",
+	props: {
+		jdata:{
+			// type: Object,
+			required: true,
+		},
+		//记录显示的位置类型
+		ltype:{
+			type: String,
+			required: false,
+			default:'home',
+		},
+		//记录显示的位置的值
+		lvalue:{
+			type: String,
+			required: false,
+			default:'0',
+		}
+	},
+    data() {
+        return { 
+			adbshow:false,
+			hideanimation: true,
+			log:{
+				avatar:'/static/demo-img/user-head.jpg',
+				nickname:'',
+				desc:'',
+				ctime:'',
+			},
+			times:{},//定时器
+		};
+    },
+	methods:{
+		//隐藏
+		hideLog(){
+			var _this = this;	
+			_this.times = setInterval(function(){
+				_this.adbshow = !_this.adbshow;
+				_this.hideanimation = !_this.hideanimation;
+				clearInterval(_this.times);
+				_this.times = setInterval(function(){
+					_this.getRecod();
+				},5000);
+			},3000)
+		},
+		//获取日志
+		getRecod(){
+			var _this = this;
+			if(_this.times !={}){
+				clearInterval(_this.times);
+			}
+			var data = {
+				type:_this.ltype,
+				value:_this.lvalue,
+				method:'pages.getrecod',
+			};
+			uni.request({
+				url: apiBaseUrl+'api.html',
+				data: data,
+				header: {
+					'Accept': 'application/json',
+					'Content-Type': 'application/json',
+				},
+				method: 'POST',
+				success: (response) => {
+					var res = response.data;
+					if(res.status == true){
+						if(res.data){
+							_this.log = res.data;
+							_this.adbshow = true;
+							_this.hideanimation = false;
+							_this.hideLog();
+						}
+					}
+				}
+			});
+		}
+	},
+	mounted() {
+		this.getRecod();
+	}
+}
+</script>
+
+<style lang="scss">
+.adbrathing{
+	position: fixed;
+	// top: 100px;
+	// right: 30upx;
+	// max-width: 400upx;
+	height: 70upx;
+	background-color: rgba(0,0,0,.5);
+	border-radius: 10upx;
+	padding: 10upx;
+	z-index: 666;
+	.adbrathing-c{
+		width: 100%;
+		height: 100%;
+		overflow: hidden;
+		color: #fff;
+		font-size: 24upx;
+		
+		.adbrathing-l{
+			display: inline-block;
+			height: 100%;
+			float: left;
+			overflow: hidden;
+			.user-head-img{
+				width: 50upx;
+				height: 50upx;
+				border-radius: 50%;
+				float: left;
+				
+			}
+			.user-name{
+				float: left;
+				display: inline-block;
+				height: 100%;
+				line-height: 50upx;
+				margin: 0 4upx 0 10upx;
+				max-width: 120upx;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				white-space: nowrap;
+			}
+		}
+		
+		.adbrathing-r{
+			float: left;
+			height: 100%;
+			display: inline-block;
+			line-height: 50upx;
+		}
+	}
+	
+}
+.adbrathingleft{
+	left: 30upx
+}
+.adbrathingright{
+	right: 30upx
+}
+.pc{
+	animation: showcenter .55s;
+}
+.hc{
+	animation: hidecenter .55s;
+}
+@keyframes showcenter{
+	0% {
+		opacity: 0;
+	}
+	100% {
+		opacity: 1;
+	}
+}
+@keyframes hidecenter{
+	0% {
+		opacity: 1;
+	}
+	100% {
+		opacity: 0;
+	}
+}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-search.vue b/mallplusui-uniapp-app2/components/jshop/jshop-search.vue
new file mode 100644
index 0000000..5de1b84
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-search.vue
@@ -0,0 +1,118 @@
+<template>
+	<view class="" >
+		<!-- 搜索框 -->
+		<view class="search" ref="searchBar" id="search">
+			<view class='search-c round' @click='goSearch()'>
+				<view class='search-input search-input-p'>
+					<view class="search-input-p-c">
+						{{jdata.options.search_tips}}
+					</view>
+				</view>
+				<image class='icon search-icon' src='/static/image/zoom.png'></image>
+			</view>
+		</view>
+		<!-- 搜索框 -->
+		<view class="search search-fixed" v-show="searchFixed">
+			<view class='search-c round' @click='goSearch()' >
+				<view class='search-input search-input-p'>
+					<view class="search-input-p-c">
+						{{jdata.options.search_tips}}
+					</view>
+				</view>
+				<image class='icon search-icon' src='/static/image/zoom.png'></image>
+			</view>
+		</view>	
+	</view>
+</template>
+<script>
+	export default {
+		name: "jshopsearch",
+		props: {
+			jdata:{
+				// type: Object,
+				required: true,
+			}
+		},
+		data() {
+			return {
+				keyword:'',
+				searchTop: 0,
+				scrollTop: 0,
+				searchFixed: this.$store.state.searchFixed||false
+			};
+		},
+		
+		created() {
+			//#ifdef H5
+			this.$nextTick(() => {
+				this.searchTop = this.$refs.searchBar.$el.offsetTop;
+			})
+			// #endif
+			this.searchStyle()
+		},
+
+		mounted() {
+			// #ifdef H5
+			window.addEventListener('scroll', this.handleScroll)
+			// #endif
+		},
+
+
+		methods: {
+			searchStyle (){
+
+			},
+			goSearch() {
+				uni.navigateTo({
+					url: '/pages/index/search'
+				});
+			},
+			handleScroll() {
+				this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+				this.scrollTop >= this.searchTop? this.searchFixed = true : this.searchFixed = false;
+			},
+		},
+		/*
+		 //失效
+		 onPageScroll(){
+			var _this = this;
+			// #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+			const query = uni.createSelectorQuery().in(this)
+			  query.select('.search').boundingClientRect(function(res){
+				if(res.top<0){
+					_this.searchFixed = true ;
+				}else{
+					_this.searchFixed = false;
+				}
+			  }).exec()
+			// #endif
+		} */
+	}
+</script>
+
+<style>
+.search-input-p {
+	color: #888;
+}
+.square{
+	border-radius: 0;
+}
+.radius{
+	border-radius: 12upx;
+}
+.search-fixed{
+	position: fixed;
+	top: 0;
+	/* background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, 0)); */
+	transition: all .5s;
+}
+/* .isOpacity {
+		background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, 0));
+		transition: all .5s;
+	}
+
+.isOpacity .search-input {
+	background-color: rgba(255, 255, 255, .5);
+	transition: all .5s;
+} */
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-slidegoods.vue b/mallplusui-uniapp-app2/components/jshop/jshop-slidegoods.vue
new file mode 100644
index 0000000..09a2c8e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-slidegoods.vue
@@ -0,0 +1,614 @@
+<template>
+	<view class="container">
+
+		<!-- 团购楼层 -->
+        		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')" v-if="jdata.options.colorGroup.length > 0">
+        			<image src="/static/temp/h1.png"></image>
+        			<view class="tit-box">
+        				<text class="tit" >精品团购</text>
+        				<text class="tit2">Boutique Group Buying</text>
+        			</view>
+        			<text class="yticon icon-you"></text>
+        		</view>
+        		<view class="group-section">
+        			<swiper class="g-swiper" :duration="500">
+        				<swiper-item class="g-swiper-item" v-for="(item, index) in jdata.options.colorGroup" :key="index"  @click="goodsDetail(item.id)">
+        					<view class="g-item left">
+        						<image :src="item.pic" mode="aspectFill"></image>
+        						<view class="t-box">
+        							<text class="title clamp">{{ item.title }}</text>
+        							<view class="price-box">
+        								<text class="price">{{ item.price }}</text>
+        								<text class="m-price">￥{{ item.price }}</text>
+        							</view>
+        							<view class="pro-box">
+        								<view class="progress-box"><progress percent="72" activeColor="#fa436a" active stroke-width="6" /></view>
+        								<text>{{ item.maxPeople }}人成团</text>
+        							</view>
+        						</view>
+        					</view>
+        				</swiper-item>
+        			</swiper>
+        		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+import {goods} from '@/config/mixins.js'
+export default {
+	filters:{
+		substr(val) {
+			if (val.length == 0 || val == undefined) {
+				return false;
+			} else if (val.length > 13) {
+				return val.substring(0, 13) + "...";
+			} else {
+				return val;
+			}
+		}
+	},
+	mixins: [goods],
+	name: "jshopgoods",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {
+			return (this.jdata.options.colorGroup.length > 0)
+		}
+	},
+	methods: {
+	navToTabPage(url) {
+            			uni.navigateTo({
+            				url: url
+            			});
+            		},
+		//跳转到商品详情页面
+		goodsDetail: function(id) {
+			let url = '../../pagesA/product/product?id=' + id;
+
+			this.$common.navigateTo(url);
+		},
+
+	},
+}
+</script>
+
+<style lang="scss">
+.MP-search{
+	background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;position: fixed;width: 100%;z-index: 999;
+}
+.MP-search-input{
+	font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;
+}
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 20upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 0upx 20upx 20upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			// margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 150upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 150upx;
+			height: 150upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 0upx 20upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 20upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 20upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		// margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+	.coupon_box {
+    	width:100%; height:auto; display:table; padding:6upx 26upx 26upx 26upx;
+    }
+
+    .other_type {
+    	width:100%; height:90upx; padding-top:50upx;
+
+    	.text { width:100%; border-top:1px solid #eeeeee; display:block; text-align:center; position:relative; }
+    	.text span { width:180upx; height:40upx; line-height:40upx; color:#999999; display:block; background:#ffffff; position:absolute; left:50%; top:50%; margin-left:-90upx; margin-top:-20upx; font-size:$font-base; }
+    }
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-tabbar.vue b/mallplusui-uniapp-app2/components/jshop/jshop-tabbar.vue
new file mode 100644
index 0000000..50a3080
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-tabbar.vue
@@ -0,0 +1,163 @@
+<template>
+	<view class="">
+		<view class="jshop-tabbar bottom-cell-group" ref="tabBar">
+			<scroll-view scroll-x='true' class="tabbar-list">
+				<view class="tabbar-item" v-for="(item, index) in jdata.options.colorGroup" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
+					{{item.text}}
+					<view class="active-tabbar"></view>
+				</view>
+			</scroll-view>
+		</view>
+		<!-- <view class="jshop-tabbar bottom-cell-group tabbar-fixed" v-show="tabbarFixed">
+			<scroll-view scroll-x='true' class="tabbar-list">
+				<view class="tabbar-item" v-for="(item, index) in jdata.options.colorGroup" :key="index" @click="showSliderInfo(item.linkType, item.linkValue)">
+					{{item.text}}
+					<view class="active-tabbar"></view>
+				</view>
+			</scroll-view>
+		</view> -->
+	</view>
+	
+</template>
+
+<script>
+export default {
+	name: "jshopTabbar",
+	props: {
+		jdata:{
+			// type: Object,
+			required: true,
+		}
+	},
+	data() {
+		return {
+			searchTop: 0,
+			scrollTop: 0,
+			tabbarFixed: false
+		};
+	},
+	created() {
+		//#ifdef H5
+		this.$nextTick(() => {
+			this.searchTop = this.$refs.tabBar.$el.offsetTop - 52;
+		})
+		// #endif
+		this.searchStyle()
+	},
+
+	mounted() {
+		// #ifdef H5
+		window.addEventListener('scroll', this.handleScroll)
+		// #endif
+		
+			
+	},
+	methods: {
+		searchStyle (){
+			this.$store.commit('searchStyle',this.jdata.params.style)
+			// console.log(this.data.params.style)
+		},
+		handleScroll() {
+			this.scrollTop = window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop;
+			this.scrollTop >= this.searchTop? this.tabbarFixed = true : this.tabbarFixed = false;
+		},
+		goClassify(){
+			uni.switchTab({
+			    url: '/pages/classify/classify'
+			});
+			// this.$common.navigateTo('/pages/classify/classify')
+		},
+		showSliderInfo(type, val) {
+			console.log(val)
+			if (!val) {
+				return;
+			}
+			console.log("11")
+			if (type == 1) {
+				if (val.indexOf('http') != -1) {
+					// #ifdef H5 
+					window.location.href = val
+					// #endif
+				} else {
+					// #ifdef H5 || APP-PLUS || APP-PLUS-NVUE || MP
+					if (val == '/pages/index/index' || val == '/pages/classify/classify' || val == '/pages/cart/index/index' || val == '/pages/member/index/index') {
+						uni.switchTab({
+							url: val
+						});
+						return;
+					} else {
+						this.$common.navigateTo(val);
+						return;
+					}
+					// #endif
+				}
+			} else if (type == 2) {
+				// 商品详情
+				this.goodsDetail(val)
+			} else if (type == 3) {
+				// 文章详情
+				this.$common.navigateTo('/pages/article/index?id=' + val + '&id_type=1')
+			} else if (type == 4) {
+				// console.log("11")
+				// 文章列表
+				this.$common.navigateTo('/pages/article/list?cid=' + val)
+			} else if (type == 5) {
+				//智能表单 
+				this.$common.navigateTo('/pages/form/detail/form?id=' + val)
+			}
+		},
+		//跳转到商品详情页面
+		goodsDetail: function(id) {
+			let url = '/pages/goods/index/index?id=' + id;
+			this.$common.navigateTo(url);
+		},
+	},
+	onPageScroll(){
+		var _this = this;
+		// #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+		const query = uni.createSelectorQuery().in(this)
+		  query.select('.search').boundingClientRect(function(res){
+			if(res.top<0){
+				_this.tabbarFixed = true ;
+			}else{
+				_this.tabbarFixed = false;
+			}
+		  }).exec()
+		// #endif
+	}
+}
+</script>
+
+<style>
+.tabbar-list{
+	padding: 10rpx 0;
+	background-color: #fff;
+	white-space: nowrap;
+	width: 100%;
+}
+.tabbar-item{
+	display: inline-block;
+	padding: 10rpx 20rpx;
+}
+.tabbar-item:first-of-type{
+	color: #FF7159;
+}
+.active-tabbar{
+	display: none;
+}
+.tabbar-item:first-of-type .active-tabbar{
+	display: block;
+	width: 100%;
+	height: 4rpx;
+	margin: 10rpx auto 0;
+	background-color: #FF7159;
+}
+.tabbar-fixed{
+	position: fixed;
+	top: 104rpx;
+	transition: all .5s;
+	z-index: 999;
+	background-color: #fff;
+	width: 100%;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-textarea.vue b/mallplusui-uniapp-app2/components/jshop/jshop-textarea.vue
new file mode 100644
index 0000000..d161d11
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-textarea.vue
@@ -0,0 +1,59 @@
+<template>
+	<view class="clearfix">
+		<view class="textarea bottom-cell-group" >
+			<jshopContent :content="jdata.params" v-if="jdata.params"></jshopContent>
+		</view>
+	</view>
+</template>
+
+<script>
+import htmlParser from '@/common/html-parser'
+import jshopContent from '@/components/jshop/jshop-content.vue'//视频和文本解析组件
+
+export default {
+	components: {
+		jshopContent
+	},
+	name: "jshoptextarea",
+	props: {
+		jdata:{
+			// type: Object,
+			required: true,
+		}
+	},
+	created() {
+		//this.jdata.params = htmlParser(this.jdata.params)
+	},
+	onLoad() {
+		
+	},
+	methods: {
+		
+	}
+}
+</script>
+
+<style>
+.textarea{
+	width: 100%;
+	background-color: #fff;
+	padding: 10upx 26upx;
+	/* height: 40upx; */
+}
+.textarea p img{
+	width: 100% !important;
+}
+.textarea div{
+	background-color: #000;
+}
+.textarea p {
+	background-color: #000;
+}
+.clearfix:after {
+  content: ".";
+  display: block;
+  height: 0;
+  clear: both;
+  visibility: hidden;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop-video.vue b/mallplusui-uniapp-app2/components/jshop/jshop-video.vue
new file mode 100644
index 0000000..0e8f70e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop-video.vue
@@ -0,0 +1,30 @@
+<template>
+	<view class="video bottom-cell-group" >
+		<video :src="jdata.options.video_link" :poster="jdata.options.video_img" controls></video>
+	</view>
+</template>
+
+<script>
+export default {
+	name: "jshopvideo",
+	props: {
+		jdata:{
+			type: Object,
+			required: true,
+		}
+	},
+	onLoad(){
+		
+	},
+	methods: {
+		
+	}
+}
+</script>
+
+<style>
+.video video{
+	width: 100%;
+	min-height: 200upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/jshop/jshop.vue b/mallplusui-uniapp-app2/components/jshop/jshop.vue
new file mode 100644
index 0000000..cb536b6
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/jshop.vue
@@ -0,0 +1,88 @@
+<template>
+  <view>
+    <block v-for="(item,index) in jdata" :key="index">
+      <jshopsearch :jdata="item" v-if="item.components=='search' "></jshopsearch>
+	  <jshoptabbar :jdata="item" v-if="item.components=='tabBar' "></jshoptabbar>
+      <jshopnotice :jdata="item" v-if="item.components=='notice' "></jshopnotice>
+      <jshopimgSlide :jdata="item" v-if="item.components=='banner' "></jshopimgSlide>
+      <jshopcoupon :jdata="item" v-if="item.components=='coupon' "></jshopcoupon>
+      <jshopblank :jdata="item" v-if="item.components=='blank' "></jshopblank>
+      <jshoptextarea :jdata="item" v-if="item.components=='textarea' "></jshoptextarea>
+      <jshopvideo :jdata="item" v-if="item.components=='video' "></jshopvideo>
+      <jshopimgWindow :jdata="item" v-if="item.components=='imgWin' "></jshopimgWindow>
+      <jshopimgSingle :jdata="item" v-if="item.components=='imgImgSlide' "></jshopimgSingle>
+      <jshopgoods :jdata="item" v-if="item.components=='shuanglieshangpin' "></jshopgoods>
+       <jshopslidegoods :jdata="item" v-if="item.components=='danlieshangpin' "></jshopslidegoods>
+
+      <jshoparticle :jdata="item" v-if="item.components=='article' "></jshoparticle>
+      <jshoparticleClassify :jdata="item" v-if="item.components=='articleClassify' "></jshoparticleClassify>
+      <jshopnavBar :jdata="item" v-if="item.components=='xuanxiangqia' "></jshopnavBar>
+      <jshopgroupPurchase :jdata="item" v-if="item.components=='groupPurchase' "></jshopgroupPurchase>
+      <jshoprecord :jdata="item" v-if="item.components=='record' "></jshoprecord>
+	  <jshoppintuan :jdata="item" v-if="item.components=='pintuan' "></jshoppintuan>
+	  <jshopadpop :jdata="item" v-if="item.components=='imgGroup' "></jshopadpop>
+    </block>
+  </view>
+</template>
+
+<script>
+/**
+ * 吉海科技jshop小程序插件集合。
+ * author:novice
+ * date:2019:05:20
+ */
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue'
+import jshopimgSlide from '@/components/jshop/jshop-imgSlide.vue'
+import jshopsearch from '@/components/jshop/jshop-search.vue'
+import jshopnotice from '@/components/jshop/jshop-notice.vue'
+import jshopcoupon from '@/components/jshop/jshop-coupon.vue'
+import jshopblank from '@/components/jshop/jshop-blank.vue'
+import jshoptextarea from '@/components/jshop/jshop-textarea.vue'
+import jshopvideo from '@/components/jshop/jshop-video.vue'
+import jshopimgWindow from '@/components/jshop/jshop-imgWindow.vue'
+import jshopimgSingle from '@/components/jshop/jshop-imgSingle.vue'
+import jshopgoods from '@/components/jshop/jshop-goods.vue'
+import jshoponegoods from '@/components/jshop/jshop-onegoods.vue'
+import jshopslidegoods from '@/components/jshop/jshop-slidegoods.vue'
+import jshoparticle from '@/components/jshop/jshop-article.vue'
+import jshoparticleClassify from '@/components/jshop/jshop-articleClassify.vue'
+import jshopnavBar from '@/components/jshop/jshop-navBar.vue'
+import jshopgroupPurchase from '@/components/jshop/jshop-groupPurchase.vue'
+import jshoprecord from '@/components/jshop/jshop-record.vue'
+import jshoppintuan from '@/components/jshop/jshop-pintuan.vue'
+import jshoptabbar from '@/components/jshop/jshop-tabbar.vue'
+import jshopadpop from '@/components/jshop/jshop-adpop.vue'
+
+export default {
+  name: 'jshop',
+  components: {
+    jshopimgSlide,
+    jshopsearch,
+    jshopnotice,
+    jshoponegoods,
+    jshopslidegoods,
+    jshopcoupon,
+    jshopblank,
+    jshoptextarea,
+    jshopvideo,
+    jshopimgWindow,
+    jshopimgSingle,
+    jshopgoods,
+    jshoparticle,
+    jshoparticleClassify,
+    jshopnavBar,
+    jshopgroupPurchase,
+    jshoprecord,
+	jshoppintuan,
+	jshoptabbar,
+	jshopadpop
+  },
+  props: {
+    jdata: {
+      default: function() {
+        return []
+      }
+    }
+  }
+}
+</script>
diff --git a/mallplusui-uniapp-app2/components/jshop/test b/mallplusui-uniapp-app2/components/jshop/test
new file mode 100644
index 0000000..f9d611c
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/jshop/test
@@ -0,0 +1,284 @@
+<template>
+	<view class="index-goods">
+		<!-- 列表平铺两列三列 -->
+		<view class='img-grids bottom-cell-group'
+		v-if="jdata.params.column == '2' && jdata.params.display == 'list' || jdata.params.column == '3' && jdata.params.display == 'list'"
+		v-bind:class="'column'+jdata.params.column">
+			<view class='cell-item right-img' v-if="jdata.params.title != ''">
+				<view class='cell-item-hd'>
+					<view class='cell-hd-title'>{{jdata.params.title}}</view>
+				</view>
+				<view class='cell-item-bd'>
+				</view>
+				<view class='cell-item-ft' v-if="jdata.params.lookMore == 'true'">
+
+					<text class='cell-ft-text' @click="goodsList({cat_id: jdata.params.classifyId,brand_id:jdata.params.brandId})">查看更多</text>
+					<image class='cell-ft-next icon' src='/static/image/right.png'></image>
+				</view>
+			</view>
+			<!-- <view class='img-grids'> -->
+				<view class="" v-if="count">
+					<view class="img-grids-item" v-for="item in jdata.params.list" :key="item.id" @click="goodsDetail(item.id)">
+						<image
+							class="img-grids-item-t have-none"
+							:src="item.image_url"
+							mode='aspectFill'
+						></image>
+						<view class="img-grids-item-b">
+							<view class="goods-name grids-goods-name">
+								{{item.name}}
+							</view>
+							<view class="goods-item-c">
+								<view class="goods-price red-price">￥{{item.price}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view v-else-if="!count && !jdata.params.listAjax">
+					<view class='img-grids-item'>
+						<image class='img-grids-item-t have-none' src='' mode=''></image>
+						<view class='img-grids-item-b'>
+							<view class='goods-name grids-goods-name have-none'></view>
+							<view class='goods-item-c'>
+								<view class='goods-price red-price have-none'></view>
+							</view>
+						</view>
+					</view>
+					<view class='img-grids-item'>
+						<image class='img-grids-item-t have-none' src='' mode=''></image>
+						<view class='img-grids-item-b'>
+							<view class='goods-name grids-goods-name have-none'></view>
+							<view class='goods-item-c'>
+								<view class='goods-price red-price have-none'></view>
+							</view>
+						</view>
+					</view>
+					<view class='img-grids-item'>
+						<image class='img-grids-item-t have-none' src='' mode=''></image>
+						<view class='img-grids-item-b'>
+							<view class='goods-name grids-goods-name have-none'></view>
+							<view class='goods-item-c'>
+								<view class='goods-price red-price have-none'></view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- <view v-else="">
+					<scroll-view class='swiper-list' scroll-x="true"></scroll-view>
+				</view> -->
+			<!-- </view> -->
+		</view>
+
+		<!-- 列表平铺单列 -->
+		<view class="img-list bottom-cell-group"
+		v-if="jdata.params.column == '1' && jdata.params.display == 'list'" >
+			<view class='cell-item right-img' v-if="jdata.params.title != ''">
+				<view class='cell-item-hd'>
+					<view class='cell-hd-title'>{{jdata.params.title}}</view>
+				</view>
+				<view class='cell-item-bd'>
+				</view>
+				<view class='cell-item-ft' v-if="jdata.params.lookMore == 'true'">
+
+					<text class='cell-ft-text' @click="goodsList({cat_id: jdata.params.classifyId,brand_id:jdata.params.brandId})">查看更多</text>
+					<image class='cell-ft-next icon' src='/static/image/right.png'></image>
+				</view>
+			</view>
+			<view v-if="count">
+				<view class="img-list-item" v-for="(item, index) in jdata.params.list" :key="index" @click="goodsDetail(item.id)">
+					<image class="img-list-item-l have-none" :src="item.image_url" mode='aspectFill'></image>
+					<view class="img-list-item-r">
+						<view class="goods-name list-goods-name">
+							{{item.name}}
+						</view>
+						<view class="goods-item-c">
+							<view class="goods-price red-price">￥{{item.price}}</view>
+							<view class="goods-buy">
+								<view class="goods-salesvolume" v-if="item.comments_count > 0">{{item.comments_count}}条评论</view>
+								<view class="goods-salesvolume" v-else-if="item.comments_count <= 0">暂无评论</view>
+								<image class="goods-cart" src="/static/image/ic-car.png"></image>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="order-none" v-else>
+				<image class="order-none-img" src="/static/image/order.png" mode=""></image>
+			</view>
+		</view>
+
+		<!-- 横向滚动 -->
+		<view class='img-grids bottom-cell-group'
+		v-if="jdata.params.column == '2' && jdata.params.display == 'slide' || jdata.params.column == '3' && jdata.params.display == 'slide'"
+		v-bind:class="'slide'+jdata.params.column">
+			<view class='cell-item right-img' v-if="jdata.params.title != ''">
+				<view class='cell-item-hd'>
+					<view class='cell-hd-title'>{{jdata.params.title}}</view>
+				</view>
+				<view class='cell-item-bd'>
+				</view>
+				<view class='cell-item-ft' v-if="jdata.params.lookMore == 'true'">
+
+					<text class='cell-ft-text' @click="goodsList({cat_id: jdata.params.classifyId,brand_id:jdata.params.brandId})">查看更多</text>
+					<image class='cell-ft-next icon' src='/static/image/right.png'></image>
+				</view>
+			</view>
+			<view class='swiper-grids'>
+				<scroll-view class='swiper-list' scroll-x="true" v-if="count">
+					<view class='img-grids-item' v-for="item in jdata.params.list" :key="item.id" @click="goodsDetail(item.id)">
+						<image class='img-grids-item-t have-none' :src='item.image_url' mode='aspectFill'></image>
+						<view class='img-grids-item-b'>
+							<view class='goods-name grids-goods-name' >
+								{{ item.name|substr }}
+							</view>
+							<view class='goods-item-c'>
+								<view class='goods-price red-price'>￥{{ item.price }}</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else-if="!goodsListOfHotAjax && !goodsListOfHot.length">
+					<scroll-view class='swiper-list' scroll-x="true">
+						<view class='img-grids-item'>
+							<image class='img-grids-item-t have-none' src='' mode='aspectFill'></image>
+							<view class='img-grids-item-b'>
+								<view class='goods-name grids-goods-name have-none'></view>
+								<view class='goods-item-c'>
+									<view class='goods-price red-price have-none'></view>
+								</view>
+							</view>
+						</view>
+						<view class='img-grids-item'>
+							<image class='img-grids-item-t have-none' src='' mode='aspectFill'></image>
+							<view class='img-grids-item-b'>
+								<view class='goods-name grids-goods-name have-none'></view>
+								<view class='goods-item-c'>
+									<view class='goods-price red-price have-none'></view>
+								</view>
+							</view>
+						</view>
+						<view class='img-grids-item'>
+							<image class='img-grids-item-t have-none' src='' mode=''></image>
+							<view class='img-grids-item-b'>
+								<view class='goods-name grids-goods-name have-none'></view>
+								<view class='goods-item-c'>
+									<view class='goods-price red-price have-none'></view>
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+				<view v-else="">
+					<scroll-view class='swiper-list' scroll-x="true"></scroll-view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import {goods} from '@/config/mixins.js'
+export default {
+	filters:{
+		substr(val) {
+			if (val.length == 0 || val == undefined) {
+				return false;
+			} else if (val.length > 13) {
+				return val.substring(0, 13) + "...";
+			} else {
+				return val;
+			}
+		}
+	},
+	mixins: [goods],
+	name: "jshopgoods",
+	props: {
+		jdata:{
+			// type: Array,
+			required: true,
+		}
+	},
+	computed: {
+		count() {
+			return (this.jdata.params.list.length > 0)
+		}
+	},
+	methods: {
+		//跳转到商品详情页面
+		goodsDetail: function(id) {
+			let url = '/pages/goods/index/index?id=' + id;
+			this.$common.navigateTo(url);
+		},
+
+	},
+}
+</script>
+
+<style>
+.cell-item {
+	border: none;
+	/* padding-bottom: 0; */
+}
+.cell-ft-text {
+	font-size: 22upx;
+	color: #999;
+}
+.img-grids,.img-list{
+	/* margin-top: 20upx; */
+	background-color: #fff;
+}
+.img-grids-item{
+	display: inline-table;
+	margin-top: 0;
+	margin-bottom: 14upx;
+}
+.column3 .img-grids-item{
+	width: 230upx;
+	height: 364rpx !important;
+	margin: 15upx;
+	margin-right: 0;
+	margin-top: 0;
+	margin-bottom: 6upx;
+}
+.column3 .img-grids-item:nth-child(3n){
+	margin-right: 15upx;
+}
+.column3 .img-grids-item-t{
+	width: 230upx;
+	height: 230upx;
+}
+.column3 .grids-goods-name{
+	font-size: 24upx;
+	/* height: 68upx; */
+	/* min-height: 54rpx; */
+}
+.column3 .img-grids-item-b{
+	padding: 0 8upx 8upx;
+}
+.column3 .goods-price{
+	font-size: 26upx;
+}
+.slide3 .img-grids-item{
+	width: 200upx;
+}
+.slide3 .img-grids-item-t{
+	width: 200upx;
+	height: 200upx;
+}
+.slide3 .grids-goods-name{
+	font-size: 24rpx;
+	height: 66rpx;
+}
+.index-goods .img-grids-item{
+	display: inline-block;
+	margin-top: 0;
+}
+.index-goods .img-list-item{
+	padding: 0upx 26upx;
+	margin-bottom: 14upx;
+}
+.index-goods .img-list{
+	padding-bottom: 10upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/likes/likes.vue b/mallplusui-uniapp-app2/components/likes/likes.vue
new file mode 100644
index 0000000..3b35e05
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/likes/likes.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="icons" @click.stop="likeTab">
+		<uni-icons size="20" color="#f07373" :type="like?'heart-filled':'heart'" ></uni-icons>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			item:{
+				type:Object,
+				default(){
+					return {}
+				}
+			},
+			types:{
+				type:String,
+				default:''
+			}
+		},
+		watch:{
+			item(newVal){
+				this.like = this.item.is_like
+			}
+		},
+		created() {
+			this.like = this.item.is_like
+		},
+		data() {
+			return {
+				like:false
+			};
+		},
+		methods:{
+			likeTab(){
+				this.like = !this.like;
+				this.updateLikes();
+			},
+			updateLikes(){
+				uni.showLoading(); 
+				this.$api.update_likes({
+					user_id:'5f3d11c03d11c60001141e5f',
+					article_id:this.item._id
+				}).then(res=>{
+					uni.hideLoading();
+					console.log(res);
+					uni.showToast({
+						title:this.like?"收藏成功":"取消收藏",
+						icon:'none'
+					})
+					uni.$emit('update_article',this.types)
+				}).catch(()=>{
+					uni.hideLoading();
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.icons {
+		position: absolute;
+		right: 0;
+		top: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 20px;
+		height: 20px;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/mall-copyright/mallplusCopyright.vue b/mallplusui-uniapp-app2/components/mall-copyright/mallplusCopyright.vue
new file mode 100644
index 0000000..667d793
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mall-copyright/mallplusCopyright.vue
@@ -0,0 +1,36 @@
+<template>
+	<view class="cpr">
+		<view class="color-9">
+			{{sysInfo.company}} © {{sysInfo.subdomain}} 版权所有
+		</view>
+		<view class="color-9 beian">
+			<view v-if="sysInfo.code"><a href="http://www.beian.miit.gov.cn/publish/query/indexFirst.action" target="_blank">冀ICP备10002647号-11</a></view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			sysInfo : this.$db.get('sysInfo')
+		}
+	}
+}
+</script>
+
+<style>
+.cpr{
+	width: 100%;
+	position: absolute;
+	bottom: 0;
+	justify-self: center;
+	text-align: center;
+	font-size: 24upx;
+	margin: 20upx 0;
+}
+.beian a{
+	text-decoration: none;
+	color: #999 !important;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/mehaotian-search-revision/mehaotian-search-revision.vue b/mallplusui-uniapp-app2/components/mehaotian-search-revision/mehaotian-search-revision.vue
new file mode 100644
index 0000000..39b22f9
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mehaotian-search-revision/mehaotian-search-revision.vue
@@ -0,0 +1,223 @@
+<template>
+	<view class="serach">
+		<view class="content" :style="{'border-radius':radius+'px'}">
+			<!-- HM修改 增加进入输入状态的点击范围 -->
+			<view class="content-box" :class="{'center':mode === 2}" @click="getFocus">
+				<text class="icon icon-serach"></text>
+				<!-- HM修改 增加placeholder input confirm-type confirm-->
+				<input  :placeholder="placeholder" @input="inputChange" confirm-type="search" @confirm="triggerConfirm" class="input" :class="{'center':!active && mode === 2}" :focus="isFocus" v-model="inputVal" @focus="focus" @blur="blur"/>
+				<!-- <view v-if="!active && mode === 2" class="input sub" @click="getFocus">请输入搜索内容</view> -->
+				<!-- HM修改 @click换成@click.stop阻止冒泡 -->
+				<text v-if="isDelShow" class="icon icon-del"  @click.stop="clear"></text>
+			</view>
+			<view v-show="(active&&show&&button === 'inside')||(isDelShow && button === 'inside')" class="serachBtn" @click="search">
+				搜索
+			</view>
+		</view>
+		<view  v-if="button === 'outside'" class="button" :class="{'active':show||active}" @click="search">
+			<view class="button-item">{{!show?searchName:'搜索'}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+	props: {
+		mode: {
+			value: Number,
+			default: 1
+		},
+		//HM修改 定义默认搜索关键词(水印文字)
+		placeholder:{
+			value: String,
+			default: '请输入搜索内容'
+		},
+		value: {
+			type: String,
+			default:false
+		},
+		button: {
+			value: String,
+			default: 'outside'
+		},
+		show: {
+			value: Boolean,
+			default: true
+		},
+		radius: {
+			value: String,
+			default: 60
+		}
+	},
+	data() {
+		return {
+			active: false,
+			inputVal: '',
+			searchName: '取消',
+			isDelShow: false,
+			isFocus: false
+		};
+	},
+	methods: {
+		//HM修改 触发组件confirm事件
+		triggerConfirm(){
+			this.$emit('confirm', false);
+		},
+		//HM修改 触发组件input事件
+		inputChange(event){
+			var keyword = event.detail.value;
+			this.$emit('input', keyword);
+			if (this.inputVal) {
+				this.isDelShow = true;
+			}
+		},
+		focus() {
+			this.active = true;
+			//HM修改 增加获取焦点判断
+			if (this.inputVal) {
+				this.isDelShow = true;
+			}
+		},
+		blur() {
+			this.isFocus = false;
+			if (!this.inputVal) {
+				this.active = false;
+			}
+		},
+		clear() {
+			//HM修改 收起键盘
+			uni.hideKeyboard();
+			this.isFocus = false;
+			this.inputVal = '';
+			this.active = false;
+			//HM修改 清空内容时候触发组件input
+			this.$emit('input', '');
+			//this.$emit('search', '');//HM修改 清空内容时候不进行搜索
+			
+		},
+		getFocus() {
+			this.isFocus = true;
+		},
+		search() {
+			//HM修改 增加点击取消时候退出输入状态，内容为空时，输入默认关键字
+			if (!this.inputVal) {
+				if(!this.show&&this.searchName == '取消'){
+					uni.hideKeyboard();
+					this.isFocus = false;
+					this.active = false;
+					return;
+				}
+			}
+			console.log(this.inputVal); 
+			this.$emit('search', this.inputVal?this.inputVal:this.placeholder);
+		}
+	},
+	watch: {
+		inputVal(newVal) {
+			if (newVal) {
+				this.searchName = '搜索';
+				//this.isDelShow = true; //HM修改 直接点击页面预设关键字样式异常，注销
+			} else {
+				this.searchName = '取消';
+				this.isDelShow = false;
+			}
+		},
+		//HM修改 双向绑定
+		value(val) {
+			this.inputVal = val;
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+.serach {
+	display: flex;
+	width: 100%;
+	//border-bottom: 1px #f5f5f5 solid; //HM修改 去掉边框
+	box-sizing: border-box;
+	font-size: $uni-font-size-base;
+	.content {
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 60upx;
+		//border: 1px #ccc solid; //HM修改 去掉边框
+		background: #fff;
+		overflow: hidden;
+		transition: all 0.2s linear;
+		border-radius: 30px;
+
+		.content-box {
+			width: 100%;
+			display: flex;
+			align-items: center;
+			&.center {
+				justify-content: center;
+			}
+			.icon {
+				padding: 0 15upx;
+				&.icon-del {
+					font-size: 38upx;
+					&:before {content:"\e644";}
+				}
+				&.icon-serach:before {content:"\e61c";}
+			}
+			.input {
+				width: 100%;
+				max-width: 100%;
+				line-height: 60upx;
+				height: 60upx;
+				transition: all 0.2s linear;
+				&.center {
+					width: 200upx;
+				}
+				&.sub {
+					// position: absolute;
+					width: auto;
+					color: grey;
+				}
+			}
+		}
+		.serachBtn {
+			height: 100%;
+			flex-shrink: 0;
+			padding: 0 30upx;
+			//HM修改 按钮背景色
+			background:linear-gradient(to right,#ff9801,#ff570a);
+			//background: $uni-color-success;
+			line-height: 60upx;
+			color: #fff;
+			//border-left: 1px #ccc solid; //HM修改 去掉边框
+			transition: all 0.3s;
+		}
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: relative;
+		flex-shrink: 0;
+		width: 0;
+		transition: all 0.2s linear;
+		white-space: nowrap;
+		overflow: hidden;
+		&.active {
+			padding-left: 15upx;
+			width: 100upx;
+		}
+	}
+}
+//HM修改 把字体改成本地加载
+@font-face {font-family:"iconfont";src:url('data:application/x-font-woff;charset=utf-8;base64,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');}
+
+
+.icon {
+	font-family: iconfont;
+	font-size: 32upx;
+	font-style: normal;
+	color: #999;
+	
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/mix-list-cell.vue b/mallplusui-uniapp-app2/components/mix-list-cell.vue
new file mode 100644
index 0000000..a60259c
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mix-list-cell.vue
@@ -0,0 +1,119 @@
+<template>
+	<view class="content">
+		
+		<view class="mix-list-cell" :class="border" @click="eventClick" hover-class="cell-hover"  :hover-stay-time="50">
+			<text
+				v-if="icon"
+				class="cell-icon yticon"
+				:style="[{
+					color: iconColor,
+				}]"
+				:class="icon"
+			></text>
+			<text class="cell-tit clamp">{{title}}</text>
+			<text v-if="tips" class="cell-tip">{{tips}}</text>
+			<text class="cell-more yticon"
+				:class="typeList[navigateType]"
+			></text>
+		</view>
+
+	</view>
+</template>
+ 
+<script>
+	/**
+	 *  简单封装了下， 应用范围比较狭窄，可以在此基础上进行扩展使用
+	 *  比如加入image， iconSize可控等
+	 */
+	export default {
+		data() {
+			return {
+				typeList: {
+					left: 'icon-zuo',
+					right: 'icon-you',
+					up: 'icon-shang',
+					down: 'icon-xia'
+				},
+			}
+		},
+		props: {
+			icon: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: '标题'
+			},
+			tips: {
+				type: String,
+				default: ''
+			},
+			navigateType: {
+				type: String,
+				default: 'right'
+			},
+			border: {
+				type: String,
+				default: 'b-b'
+			},
+			hoverClass: {
+				type: String,
+				default: 'cell-hover'
+			},
+			iconColor: {
+				type: String,
+				default: '#333'
+			}
+		},
+		methods: {
+			eventClick(){
+				this.$emit('eventClick');
+			}
+		},
+	}
+</script>
+
+<style lang='scss'>
+
+	.icon .mix-list-cell.b-b:after{
+		left: 90upx;
+	}
+	.mix-list-cell{
+		display:flex;
+		align-items:baseline;
+		padding: 20upx $page-row-spacing;
+		line-height:60upx;
+		position:relative;
+		
+		&.cell-hover{
+			background:#fafafa;
+		}
+		&.b-b:after{
+			left: 30upx;
+		}
+
+		.cell-icon{
+			align-self:center;
+			width:56upx;
+			max-height:60upx;
+			font-size:38upx;
+		}
+		.cell-more{
+			align-self: center;
+			font-size:30upx;
+			color:$font-color-base;
+			margin-left:$uni-spacing-row-sm;
+		}
+		.cell-tit{
+			flex: 1;
+			font-size: $font-base;
+			color: $font-color-dark;
+			margin-right:10upx;
+		}
+		.cell-tip{
+			font-size: $font-sm+2upx;
+			color: $font-color-light;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/mix-loading/mix-loading.vue b/mallplusui-uniapp-app2/components/mix-loading/mix-loading.vue
new file mode 100644
index 0000000..3c38afe
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mix-loading/mix-loading.vue
@@ -0,0 +1,68 @@
+<template>
+	<!-- loading 加载 -->
+	<view class="mix-loading-content">
+		<view class="mix-loading-wrapper">
+			<image 
+				class="mix-loading-icon" 
+				src="data:image/png;base64,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">
+			</image>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		
+		props: {
+			top: {
+				//距离顶部距离，单位upx
+				type: Number,
+				default: 0
+			},
+		},
+		data() {
+			return {
+
+			};
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	.mix-loading-content{
+		display:flex;
+		justify-content: center;
+		align-items: center;
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		background-color: transparent;
+	}
+	.mix-loading-wrapper{
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		animation: loading .5s ease-in infinite both alternate;
+	}
+	
+	.mix-loading-icon{
+		width: 80upx;
+		height: 80upx;
+		transition: .3s;
+	}
+	
+	@keyframes loading {
+		0% {
+			transform: translateY(-20upx) scaleX(1);
+		}
+		100% {
+			transform: translateY(4upx)  scaleX(1.3);
+		}
+	}
+	
+</style>
diff --git a/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/area.js b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/area.js
new file mode 100644
index 0000000..92dfc30
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/area.js
@@ -0,0 +1,12542 @@
+/* eslint-disable */
+var areaData = [
+  [
+    [{
+        "label": "东城区",
+        "value": "110101"
+      },
+      {
+        "label": "西城区",
+        "value": "110102"
+      },
+      {
+        "label": "朝阳区",
+        "value": "110105"
+      },
+      {
+        "label": "丰台区",
+        "value": "110106"
+      },
+      {
+        "label": "石景山区",
+        "value": "110107"
+      },
+      {
+        "label": "海淀区",
+        "value": "110108"
+      },
+      {
+        "label": "门头沟区",
+        "value": "110109"
+      },
+      {
+        "label": "房山区",
+        "value": "110111"
+      },
+      {
+        "label": "通州区",
+        "value": "110112"
+      },
+      {
+        "label": "顺义区",
+        "value": "110113"
+      },
+      {
+        "label": "昌平区",
+        "value": "110114"
+      },
+      {
+        "label": "大兴区",
+        "value": "110115"
+      },
+      {
+        "label": "怀柔区",
+        "value": "110116"
+      },
+      {
+        "label": "平谷区",
+        "value": "110117"
+      },
+      {
+        "label": "密云区",
+        "value": "110118"
+      },
+      {
+        "label": "延庆区",
+        "value": "110119"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "和平区",
+        "value": "120101"
+      },
+      {
+        "label": "河东区",
+        "value": "120102"
+      },
+      {
+        "label": "河西区",
+        "value": "120103"
+      },
+      {
+        "label": "南开区",
+        "value": "120104"
+      },
+      {
+        "label": "河北区",
+        "value": "120105"
+      },
+      {
+        "label": "红桥区",
+        "value": "120106"
+      },
+      {
+        "label": "东丽区",
+        "value": "120110"
+      },
+      {
+        "label": "西青区",
+        "value": "120111"
+      },
+      {
+        "label": "津南区",
+        "value": "120112"
+      },
+      {
+        "label": "北辰区",
+        "value": "120113"
+      },
+      {
+        "label": "武清区",
+        "value": "120114"
+      },
+      {
+        "label": "宝坻区",
+        "value": "120115"
+      },
+      {
+        "label": "滨海新区",
+        "value": "120116"
+      },
+      {
+        "label": "宁河区",
+        "value": "120117"
+      },
+      {
+        "label": "静海区",
+        "value": "120118"
+      },
+      {
+        "label": "蓟州区",
+        "value": "120119"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "长安区",
+        "value": "130102"
+      },
+      {
+        "label": "桥西区",
+        "value": "130104"
+      },
+      {
+        "label": "新华区",
+        "value": "130105"
+      },
+      {
+        "label": "井陉矿区",
+        "value": "130107"
+      },
+      {
+        "label": "裕华区",
+        "value": "130108"
+      },
+      {
+        "label": "藁城区",
+        "value": "130109"
+      },
+      {
+        "label": "鹿泉区",
+        "value": "130110"
+      },
+      {
+        "label": "栾城区",
+        "value": "130111"
+      },
+      {
+        "label": "井陉县",
+        "value": "130121"
+      },
+      {
+        "label": "正定县",
+        "value": "130123"
+      },
+      {
+        "label": "行唐县",
+        "value": "130125"
+      },
+      {
+        "label": "灵寿县",
+        "value": "130126"
+      },
+      {
+        "label": "高邑县",
+        "value": "130127"
+      },
+      {
+        "label": "深泽县",
+        "value": "130128"
+      },
+      {
+        "label": "赞皇县",
+        "value": "130129"
+      },
+      {
+        "label": "无极县",
+        "value": "130130"
+      },
+      {
+        "label": "平山县",
+        "value": "130131"
+      },
+      {
+        "label": "元氏县",
+        "value": "130132"
+      },
+      {
+        "label": "赵县",
+        "value": "130133"
+      },
+      {
+        "label": "石家庄高新技术产业开发区",
+        "value": "130171"
+      },
+      {
+        "label": "石家庄循环化工园区",
+        "value": "130172"
+      },
+      {
+        "label": "辛集市",
+        "value": "130181"
+      },
+      {
+        "label": "晋州市",
+        "value": "130183"
+      },
+      {
+        "label": "新乐市",
+        "value": "130184"
+      }
+    ],
+    [{
+        "label": "路南区",
+        "value": "130202"
+      },
+      {
+        "label": "路北区",
+        "value": "130203"
+      },
+      {
+        "label": "古冶区",
+        "value": "130204"
+      },
+      {
+        "label": "开平区",
+        "value": "130205"
+      },
+      {
+        "label": "丰南区",
+        "value": "130207"
+      },
+      {
+        "label": "丰润区",
+        "value": "130208"
+      },
+      {
+        "label": "曹妃甸区",
+        "value": "130209"
+      },
+      {
+        "label": "滦县",
+        "value": "130223"
+      },
+      {
+        "label": "滦南县",
+        "value": "130224"
+      },
+      {
+        "label": "乐亭县",
+        "value": "130225"
+      },
+      {
+        "label": "迁西县",
+        "value": "130227"
+      },
+      {
+        "label": "玉田县",
+        "value": "130229"
+      },
+      {
+        "label": "唐山市芦台经济技术开发区",
+        "value": "130271"
+      },
+      {
+        "label": "唐山市汉沽管理区",
+        "value": "130272"
+      },
+      {
+        "label": "唐山高新技术产业开发区",
+        "value": "130273"
+      },
+      {
+        "label": "河北唐山海港经济开发区",
+        "value": "130274"
+      },
+      {
+        "label": "遵化市",
+        "value": "130281"
+      },
+      {
+        "label": "迁安市",
+        "value": "130283"
+      }
+    ],
+    [{
+        "label": "海港区",
+        "value": "130302"
+      },
+      {
+        "label": "山海关区",
+        "value": "130303"
+      },
+      {
+        "label": "北戴河区",
+        "value": "130304"
+      },
+      {
+        "label": "抚宁区",
+        "value": "130306"
+      },
+      {
+        "label": "青龙满族自治县",
+        "value": "130321"
+      },
+      {
+        "label": "昌黎县",
+        "value": "130322"
+      },
+      {
+        "label": "卢龙县",
+        "value": "130324"
+      },
+      {
+        "label": "秦皇岛市经济技术开发区",
+        "value": "130371"
+      },
+      {
+        "label": "北戴河新区",
+        "value": "130372"
+      }
+    ],
+    [{
+        "label": "邯山区",
+        "value": "130402"
+      },
+      {
+        "label": "丛台区",
+        "value": "130403"
+      },
+      {
+        "label": "复兴区",
+        "value": "130404"
+      },
+      {
+        "label": "峰峰矿区",
+        "value": "130406"
+      },
+      {
+        "label": "肥乡区",
+        "value": "130407"
+      },
+      {
+        "label": "永年区",
+        "value": "130408"
+      },
+      {
+        "label": "临漳县",
+        "value": "130423"
+      },
+      {
+        "label": "成安县",
+        "value": "130424"
+      },
+      {
+        "label": "大名县",
+        "value": "130425"
+      },
+      {
+        "label": "涉县",
+        "value": "130426"
+      },
+      {
+        "label": "磁县",
+        "value": "130427"
+      },
+      {
+        "label": "邱县",
+        "value": "130430"
+      },
+      {
+        "label": "鸡泽县",
+        "value": "130431"
+      },
+      {
+        "label": "广平县",
+        "value": "130432"
+      },
+      {
+        "label": "馆陶县",
+        "value": "130433"
+      },
+      {
+        "label": "魏县",
+        "value": "130434"
+      },
+      {
+        "label": "曲周县",
+        "value": "130435"
+      },
+      {
+        "label": "邯郸经济技术开发区",
+        "value": "130471"
+      },
+      {
+        "label": "邯郸冀南新区",
+        "value": "130473"
+      },
+      {
+        "label": "武安市",
+        "value": "130481"
+      }
+    ],
+    [{
+        "label": "桥东区",
+        "value": "130502"
+      },
+      {
+        "label": "桥西区",
+        "value": "130503"
+      },
+      {
+        "label": "邢台县",
+        "value": "130521"
+      },
+      {
+        "label": "临城县",
+        "value": "130522"
+      },
+      {
+        "label": "内丘县",
+        "value": "130523"
+      },
+      {
+        "label": "柏乡县",
+        "value": "130524"
+      },
+      {
+        "label": "隆尧县",
+        "value": "130525"
+      },
+      {
+        "label": "任县",
+        "value": "130526"
+      },
+      {
+        "label": "南和县",
+        "value": "130527"
+      },
+      {
+        "label": "宁晋县",
+        "value": "130528"
+      },
+      {
+        "label": "巨鹿县",
+        "value": "130529"
+      },
+      {
+        "label": "新河县",
+        "value": "130530"
+      },
+      {
+        "label": "广宗县",
+        "value": "130531"
+      },
+      {
+        "label": "平乡县",
+        "value": "130532"
+      },
+      {
+        "label": "威县",
+        "value": "130533"
+      },
+      {
+        "label": "清河县",
+        "value": "130534"
+      },
+      {
+        "label": "临西县",
+        "value": "130535"
+      },
+      {
+        "label": "河北邢台经济开发区",
+        "value": "130571"
+      },
+      {
+        "label": "南宫市",
+        "value": "130581"
+      },
+      {
+        "label": "沙河市",
+        "value": "130582"
+      }
+    ],
+    [{
+        "label": "竞秀区",
+        "value": "130602"
+      },
+      {
+        "label": "莲池区",
+        "value": "130606"
+      },
+      {
+        "label": "满城区",
+        "value": "130607"
+      },
+      {
+        "label": "清苑区",
+        "value": "130608"
+      },
+      {
+        "label": "徐水区",
+        "value": "130609"
+      },
+      {
+        "label": "涞水县",
+        "value": "130623"
+      },
+      {
+        "label": "阜平县",
+        "value": "130624"
+      },
+      {
+        "label": "定兴县",
+        "value": "130626"
+      },
+      {
+        "label": "唐县",
+        "value": "130627"
+      },
+      {
+        "label": "高阳县",
+        "value": "130628"
+      },
+      {
+        "label": "容城县",
+        "value": "130629"
+      },
+      {
+        "label": "涞源县",
+        "value": "130630"
+      },
+      {
+        "label": "望都县",
+        "value": "130631"
+      },
+      {
+        "label": "安新县",
+        "value": "130632"
+      },
+      {
+        "label": "易县",
+        "value": "130633"
+      },
+      {
+        "label": "曲阳县",
+        "value": "130634"
+      },
+      {
+        "label": "蠡县",
+        "value": "130635"
+      },
+      {
+        "label": "顺平县",
+        "value": "130636"
+      },
+      {
+        "label": "博野县",
+        "value": "130637"
+      },
+      {
+        "label": "雄县",
+        "value": "130638"
+      },
+      {
+        "label": "保定高新技术产业开发区",
+        "value": "130671"
+      },
+      {
+        "label": "保定白沟新城",
+        "value": "130672"
+      },
+      {
+        "label": "涿州市",
+        "value": "130681"
+      },
+      {
+        "label": "定州市",
+        "value": "130682"
+      },
+      {
+        "label": "安国市",
+        "value": "130683"
+      },
+      {
+        "label": "高碑店市",
+        "value": "130684"
+      }
+    ],
+    [{
+        "label": "桥东区",
+        "value": "130702"
+      },
+      {
+        "label": "桥西区",
+        "value": "130703"
+      },
+      {
+        "label": "宣化区",
+        "value": "130705"
+      },
+      {
+        "label": "下花园区",
+        "value": "130706"
+      },
+      {
+        "label": "万全区",
+        "value": "130708"
+      },
+      {
+        "label": "崇礼区",
+        "value": "130709"
+      },
+      {
+        "label": "张北县",
+        "value": "130722"
+      },
+      {
+        "label": "康保县",
+        "value": "130723"
+      },
+      {
+        "label": "沽源县",
+        "value": "130724"
+      },
+      {
+        "label": "尚义县",
+        "value": "130725"
+      },
+      {
+        "label": "蔚县",
+        "value": "130726"
+      },
+      {
+        "label": "阳原县",
+        "value": "130727"
+      },
+      {
+        "label": "怀安县",
+        "value": "130728"
+      },
+      {
+        "label": "怀来县",
+        "value": "130730"
+      },
+      {
+        "label": "涿鹿县",
+        "value": "130731"
+      },
+      {
+        "label": "赤城县",
+        "value": "130732"
+      },
+      {
+        "label": "张家口市高新技术产业开发区",
+        "value": "130771"
+      },
+      {
+        "label": "张家口市察北管理区",
+        "value": "130772"
+      },
+      {
+        "label": "张家口市塞北管理区",
+        "value": "130773"
+      }
+    ],
+    [{
+        "label": "双桥区",
+        "value": "130802"
+      },
+      {
+        "label": "双滦区",
+        "value": "130803"
+      },
+      {
+        "label": "鹰手营子矿区",
+        "value": "130804"
+      },
+      {
+        "label": "承德县",
+        "value": "130821"
+      },
+      {
+        "label": "兴隆县",
+        "value": "130822"
+      },
+      {
+        "label": "滦平县",
+        "value": "130824"
+      },
+      {
+        "label": "隆化县",
+        "value": "130825"
+      },
+      {
+        "label": "丰宁满族自治县",
+        "value": "130826"
+      },
+      {
+        "label": "宽城满族自治县",
+        "value": "130827"
+      },
+      {
+        "label": "围场满族蒙古族自治县",
+        "value": "130828"
+      },
+      {
+        "label": "承德高新技术产业开发区",
+        "value": "130871"
+      },
+      {
+        "label": "平泉市",
+        "value": "130881"
+      }
+    ],
+    [{
+        "label": "新华区",
+        "value": "130902"
+      },
+      {
+        "label": "运河区",
+        "value": "130903"
+      },
+      {
+        "label": "沧县",
+        "value": "130921"
+      },
+      {
+        "label": "青县",
+        "value": "130922"
+      },
+      {
+        "label": "东光县",
+        "value": "130923"
+      },
+      {
+        "label": "海兴县",
+        "value": "130924"
+      },
+      {
+        "label": "盐山县",
+        "value": "130925"
+      },
+      {
+        "label": "肃宁县",
+        "value": "130926"
+      },
+      {
+        "label": "南皮县",
+        "value": "130927"
+      },
+      {
+        "label": "吴桥县",
+        "value": "130928"
+      },
+      {
+        "label": "献县",
+        "value": "130929"
+      },
+      {
+        "label": "孟村回族自治县",
+        "value": "130930"
+      },
+      {
+        "label": "河北沧州经济开发区",
+        "value": "130971"
+      },
+      {
+        "label": "沧州高新技术产业开发区",
+        "value": "130972"
+      },
+      {
+        "label": "沧州渤海新区",
+        "value": "130973"
+      },
+      {
+        "label": "泊头市",
+        "value": "130981"
+      },
+      {
+        "label": "任丘市",
+        "value": "130982"
+      },
+      {
+        "label": "黄骅市",
+        "value": "130983"
+      },
+      {
+        "label": "河间市",
+        "value": "130984"
+      }
+    ],
+    [{
+        "label": "安次区",
+        "value": "131002"
+      },
+      {
+        "label": "广阳区",
+        "value": "131003"
+      },
+      {
+        "label": "固安县",
+        "value": "131022"
+      },
+      {
+        "label": "永清县",
+        "value": "131023"
+      },
+      {
+        "label": "香河县",
+        "value": "131024"
+      },
+      {
+        "label": "大城县",
+        "value": "131025"
+      },
+      {
+        "label": "文安县",
+        "value": "131026"
+      },
+      {
+        "label": "大厂回族自治县",
+        "value": "131028"
+      },
+      {
+        "label": "廊坊经济技术开发区",
+        "value": "131071"
+      },
+      {
+        "label": "霸州市",
+        "value": "131081"
+      },
+      {
+        "label": "三河市",
+        "value": "131082"
+      }
+    ],
+    [{
+        "label": "桃城区",
+        "value": "131102"
+      },
+      {
+        "label": "冀州区",
+        "value": "131103"
+      },
+      {
+        "label": "枣强县",
+        "value": "131121"
+      },
+      {
+        "label": "武邑县",
+        "value": "131122"
+      },
+      {
+        "label": "武强县",
+        "value": "131123"
+      },
+      {
+        "label": "饶阳县",
+        "value": "131124"
+      },
+      {
+        "label": "安平县",
+        "value": "131125"
+      },
+      {
+        "label": "故城县",
+        "value": "131126"
+      },
+      {
+        "label": "景县",
+        "value": "131127"
+      },
+      {
+        "label": "阜城县",
+        "value": "131128"
+      },
+      {
+        "label": "河北衡水经济开发区",
+        "value": "131171"
+      },
+      {
+        "label": "衡水滨湖新区",
+        "value": "131172"
+      },
+      {
+        "label": "深州市",
+        "value": "131182"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "小店区",
+        "value": "140105"
+      },
+      {
+        "label": "迎泽区",
+        "value": "140106"
+      },
+      {
+        "label": "杏花岭区",
+        "value": "140107"
+      },
+      {
+        "label": "尖草坪区",
+        "value": "140108"
+      },
+      {
+        "label": "万柏林区",
+        "value": "140109"
+      },
+      {
+        "label": "晋源区",
+        "value": "140110"
+      },
+      {
+        "label": "清徐县",
+        "value": "140121"
+      },
+      {
+        "label": "阳曲县",
+        "value": "140122"
+      },
+      {
+        "label": "娄烦县",
+        "value": "140123"
+      },
+      {
+        "label": "山西转型综合改革示范区",
+        "value": "140171"
+      },
+      {
+        "label": "古交市",
+        "value": "140181"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140202"
+      },
+      {
+        "label": "矿区",
+        "value": "140203"
+      },
+      {
+        "label": "南郊区",
+        "value": "140211"
+      },
+      {
+        "label": "新荣区",
+        "value": "140212"
+      },
+      {
+        "label": "阳高县",
+        "value": "140221"
+      },
+      {
+        "label": "天镇县",
+        "value": "140222"
+      },
+      {
+        "label": "广灵县",
+        "value": "140223"
+      },
+      {
+        "label": "灵丘县",
+        "value": "140224"
+      },
+      {
+        "label": "浑源县",
+        "value": "140225"
+      },
+      {
+        "label": "左云县",
+        "value": "140226"
+      },
+      {
+        "label": "大同县",
+        "value": "140227"
+      },
+      {
+        "label": "山西大同经济开发区",
+        "value": "140271"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140302"
+      },
+      {
+        "label": "矿区",
+        "value": "140303"
+      },
+      {
+        "label": "郊区",
+        "value": "140311"
+      },
+      {
+        "label": "平定县",
+        "value": "140321"
+      },
+      {
+        "label": "盂县",
+        "value": "140322"
+      },
+      {
+        "label": "山西阳泉经济开发区",
+        "value": "140371"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140402"
+      },
+      {
+        "label": "郊区",
+        "value": "140411"
+      },
+      {
+        "label": "长治县",
+        "value": "140421"
+      },
+      {
+        "label": "襄垣县",
+        "value": "140423"
+      },
+      {
+        "label": "屯留县",
+        "value": "140424"
+      },
+      {
+        "label": "平顺县",
+        "value": "140425"
+      },
+      {
+        "label": "黎城县",
+        "value": "140426"
+      },
+      {
+        "label": "壶关县",
+        "value": "140427"
+      },
+      {
+        "label": "长子县",
+        "value": "140428"
+      },
+      {
+        "label": "武乡县",
+        "value": "140429"
+      },
+      {
+        "label": "沁县",
+        "value": "140430"
+      },
+      {
+        "label": "沁源县",
+        "value": "140431"
+      },
+      {
+        "label": "山西长治高新技术产业园区",
+        "value": "140471"
+      },
+      {
+        "label": "潞城市",
+        "value": "140481"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "140502"
+      },
+      {
+        "label": "沁水县",
+        "value": "140521"
+      },
+      {
+        "label": "阳城县",
+        "value": "140522"
+      },
+      {
+        "label": "陵川县",
+        "value": "140524"
+      },
+      {
+        "label": "泽州县",
+        "value": "140525"
+      },
+      {
+        "label": "高平市",
+        "value": "140581"
+      }
+    ],
+    [{
+        "label": "朔城区",
+        "value": "140602"
+      },
+      {
+        "label": "平鲁区",
+        "value": "140603"
+      },
+      {
+        "label": "山阴县",
+        "value": "140621"
+      },
+      {
+        "label": "应县",
+        "value": "140622"
+      },
+      {
+        "label": "右玉县",
+        "value": "140623"
+      },
+      {
+        "label": "怀仁县",
+        "value": "140624"
+      },
+      {
+        "label": "山西朔州经济开发区",
+        "value": "140671"
+      }
+    ],
+    [{
+        "label": "榆次区",
+        "value": "140702"
+      },
+      {
+        "label": "榆社县",
+        "value": "140721"
+      },
+      {
+        "label": "左权县",
+        "value": "140722"
+      },
+      {
+        "label": "和顺县",
+        "value": "140723"
+      },
+      {
+        "label": "昔阳县",
+        "value": "140724"
+      },
+      {
+        "label": "寿阳县",
+        "value": "140725"
+      },
+      {
+        "label": "太谷县",
+        "value": "140726"
+      },
+      {
+        "label": "祁县",
+        "value": "140727"
+      },
+      {
+        "label": "平遥县",
+        "value": "140728"
+      },
+      {
+        "label": "灵石县",
+        "value": "140729"
+      },
+      {
+        "label": "介休市",
+        "value": "140781"
+      }
+    ],
+    [{
+        "label": "盐湖区",
+        "value": "140802"
+      },
+      {
+        "label": "临猗县",
+        "value": "140821"
+      },
+      {
+        "label": "万荣县",
+        "value": "140822"
+      },
+      {
+        "label": "闻喜县",
+        "value": "140823"
+      },
+      {
+        "label": "稷山县",
+        "value": "140824"
+      },
+      {
+        "label": "新绛县",
+        "value": "140825"
+      },
+      {
+        "label": "绛县",
+        "value": "140826"
+      },
+      {
+        "label": "垣曲县",
+        "value": "140827"
+      },
+      {
+        "label": "夏县",
+        "value": "140828"
+      },
+      {
+        "label": "平陆县",
+        "value": "140829"
+      },
+      {
+        "label": "芮城县",
+        "value": "140830"
+      },
+      {
+        "label": "永济市",
+        "value": "140881"
+      },
+      {
+        "label": "河津市",
+        "value": "140882"
+      }
+    ],
+    [{
+        "label": "忻府区",
+        "value": "140902"
+      },
+      {
+        "label": "定襄县",
+        "value": "140921"
+      },
+      {
+        "label": "五台县",
+        "value": "140922"
+      },
+      {
+        "label": "代县",
+        "value": "140923"
+      },
+      {
+        "label": "繁峙县",
+        "value": "140924"
+      },
+      {
+        "label": "宁武县",
+        "value": "140925"
+      },
+      {
+        "label": "静乐县",
+        "value": "140926"
+      },
+      {
+        "label": "神池县",
+        "value": "140927"
+      },
+      {
+        "label": "五寨县",
+        "value": "140928"
+      },
+      {
+        "label": "岢岚县",
+        "value": "140929"
+      },
+      {
+        "label": "河曲县",
+        "value": "140930"
+      },
+      {
+        "label": "保德县",
+        "value": "140931"
+      },
+      {
+        "label": "偏关县",
+        "value": "140932"
+      },
+      {
+        "label": "五台山风景名胜区",
+        "value": "140971"
+      },
+      {
+        "label": "原平市",
+        "value": "140981"
+      }
+    ],
+    [{
+        "label": "尧都区",
+        "value": "141002"
+      },
+      {
+        "label": "曲沃县",
+        "value": "141021"
+      },
+      {
+        "label": "翼城县",
+        "value": "141022"
+      },
+      {
+        "label": "襄汾县",
+        "value": "141023"
+      },
+      {
+        "label": "洪洞县",
+        "value": "141024"
+      },
+      {
+        "label": "古县",
+        "value": "141025"
+      },
+      {
+        "label": "安泽县",
+        "value": "141026"
+      },
+      {
+        "label": "浮山县",
+        "value": "141027"
+      },
+      {
+        "label": "吉县",
+        "value": "141028"
+      },
+      {
+        "label": "乡宁县",
+        "value": "141029"
+      },
+      {
+        "label": "大宁县",
+        "value": "141030"
+      },
+      {
+        "label": "隰县",
+        "value": "141031"
+      },
+      {
+        "label": "永和县",
+        "value": "141032"
+      },
+      {
+        "label": "蒲县",
+        "value": "141033"
+      },
+      {
+        "label": "汾西县",
+        "value": "141034"
+      },
+      {
+        "label": "侯马市",
+        "value": "141081"
+      },
+      {
+        "label": "霍州市",
+        "value": "141082"
+      }
+    ],
+    [{
+        "label": "离石区",
+        "value": "141102"
+      },
+      {
+        "label": "文水县",
+        "value": "141121"
+      },
+      {
+        "label": "交城县",
+        "value": "141122"
+      },
+      {
+        "label": "兴县",
+        "value": "141123"
+      },
+      {
+        "label": "临县",
+        "value": "141124"
+      },
+      {
+        "label": "柳林县",
+        "value": "141125"
+      },
+      {
+        "label": "石楼县",
+        "value": "141126"
+      },
+      {
+        "label": "岚县",
+        "value": "141127"
+      },
+      {
+        "label": "方山县",
+        "value": "141128"
+      },
+      {
+        "label": "中阳县",
+        "value": "141129"
+      },
+      {
+        "label": "交口县",
+        "value": "141130"
+      },
+      {
+        "label": "孝义市",
+        "value": "141181"
+      },
+      {
+        "label": "汾阳市",
+        "value": "141182"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "新城区",
+        "value": "150102"
+      },
+      {
+        "label": "回民区",
+        "value": "150103"
+      },
+      {
+        "label": "玉泉区",
+        "value": "150104"
+      },
+      {
+        "label": "赛罕区",
+        "value": "150105"
+      },
+      {
+        "label": "土默特左旗",
+        "value": "150121"
+      },
+      {
+        "label": "托克托县",
+        "value": "150122"
+      },
+      {
+        "label": "和林格尔县",
+        "value": "150123"
+      },
+      {
+        "label": "清水河县",
+        "value": "150124"
+      },
+      {
+        "label": "武川县",
+        "value": "150125"
+      },
+      {
+        "label": "呼和浩特金海工业园区",
+        "value": "150171"
+      },
+      {
+        "label": "呼和浩特经济技术开发区",
+        "value": "150172"
+      }
+    ],
+    [{
+        "label": "东河区",
+        "value": "150202"
+      },
+      {
+        "label": "昆都仑区",
+        "value": "150203"
+      },
+      {
+        "label": "青山区",
+        "value": "150204"
+      },
+      {
+        "label": "石拐区",
+        "value": "150205"
+      },
+      {
+        "label": "白云鄂博矿区",
+        "value": "150206"
+      },
+      {
+        "label": "九原区",
+        "value": "150207"
+      },
+      {
+        "label": "土默特右旗",
+        "value": "150221"
+      },
+      {
+        "label": "固阳县",
+        "value": "150222"
+      },
+      {
+        "label": "达尔罕茂明安联合旗",
+        "value": "150223"
+      },
+      {
+        "label": "包头稀土高新技术产业开发区",
+        "value": "150271"
+      }
+    ],
+    [{
+        "label": "海勃湾区",
+        "value": "150302"
+      },
+      {
+        "label": "海南区",
+        "value": "150303"
+      },
+      {
+        "label": "乌达区",
+        "value": "150304"
+      }
+    ],
+    [{
+        "label": "红山区",
+        "value": "150402"
+      },
+      {
+        "label": "元宝山区",
+        "value": "150403"
+      },
+      {
+        "label": "松山区",
+        "value": "150404"
+      },
+      {
+        "label": "阿鲁科尔沁旗",
+        "value": "150421"
+      },
+      {
+        "label": "巴林左旗",
+        "value": "150422"
+      },
+      {
+        "label": "巴林右旗",
+        "value": "150423"
+      },
+      {
+        "label": "林西县",
+        "value": "150424"
+      },
+      {
+        "label": "克什克腾旗",
+        "value": "150425"
+      },
+      {
+        "label": "翁牛特旗",
+        "value": "150426"
+      },
+      {
+        "label": "喀喇沁旗",
+        "value": "150428"
+      },
+      {
+        "label": "宁城县",
+        "value": "150429"
+      },
+      {
+        "label": "敖汉旗",
+        "value": "150430"
+      }
+    ],
+    [{
+        "label": "科尔沁区",
+        "value": "150502"
+      },
+      {
+        "label": "科尔沁左翼中旗",
+        "value": "150521"
+      },
+      {
+        "label": "科尔沁左翼后旗",
+        "value": "150522"
+      },
+      {
+        "label": "开鲁县",
+        "value": "150523"
+      },
+      {
+        "label": "库伦旗",
+        "value": "150524"
+      },
+      {
+        "label": "奈曼旗",
+        "value": "150525"
+      },
+      {
+        "label": "扎鲁特旗",
+        "value": "150526"
+      },
+      {
+        "label": "通辽经济技术开发区",
+        "value": "150571"
+      },
+      {
+        "label": "霍林郭勒市",
+        "value": "150581"
+      }
+    ],
+    [{
+        "label": "东胜区",
+        "value": "150602"
+      },
+      {
+        "label": "康巴什区",
+        "value": "150603"
+      },
+      {
+        "label": "达拉特旗",
+        "value": "150621"
+      },
+      {
+        "label": "准格尔旗",
+        "value": "150622"
+      },
+      {
+        "label": "鄂托克前旗",
+        "value": "150623"
+      },
+      {
+        "label": "鄂托克旗",
+        "value": "150624"
+      },
+      {
+        "label": "杭锦旗",
+        "value": "150625"
+      },
+      {
+        "label": "乌审旗",
+        "value": "150626"
+      },
+      {
+        "label": "伊金霍洛旗",
+        "value": "150627"
+      }
+    ],
+    [{
+        "label": "海拉尔区",
+        "value": "150702"
+      },
+      {
+        "label": "扎赉诺尔区",
+        "value": "150703"
+      },
+      {
+        "label": "阿荣旗",
+        "value": "150721"
+      },
+      {
+        "label": "莫力达瓦达斡尔族自治旗",
+        "value": "150722"
+      },
+      {
+        "label": "鄂伦春自治旗",
+        "value": "150723"
+      },
+      {
+        "label": "鄂温克族自治旗",
+        "value": "150724"
+      },
+      {
+        "label": "陈巴尔虎旗",
+        "value": "150725"
+      },
+      {
+        "label": "新巴尔虎左旗",
+        "value": "150726"
+      },
+      {
+        "label": "新巴尔虎右旗",
+        "value": "150727"
+      },
+      {
+        "label": "满洲里市",
+        "value": "150781"
+      },
+      {
+        "label": "牙克石市",
+        "value": "150782"
+      },
+      {
+        "label": "扎兰屯市",
+        "value": "150783"
+      },
+      {
+        "label": "额尔古纳市",
+        "value": "150784"
+      },
+      {
+        "label": "根河市",
+        "value": "150785"
+      }
+    ],
+    [{
+        "label": "临河区",
+        "value": "150802"
+      },
+      {
+        "label": "五原县",
+        "value": "150821"
+      },
+      {
+        "label": "磴口县",
+        "value": "150822"
+      },
+      {
+        "label": "乌拉特前旗",
+        "value": "150823"
+      },
+      {
+        "label": "乌拉特中旗",
+        "value": "150824"
+      },
+      {
+        "label": "乌拉特后旗",
+        "value": "150825"
+      },
+      {
+        "label": "杭锦后旗",
+        "value": "150826"
+      }
+    ],
+    [{
+        "label": "集宁区",
+        "value": "150902"
+      },
+      {
+        "label": "卓资县",
+        "value": "150921"
+      },
+      {
+        "label": "化德县",
+        "value": "150922"
+      },
+      {
+        "label": "商都县",
+        "value": "150923"
+      },
+      {
+        "label": "兴和县",
+        "value": "150924"
+      },
+      {
+        "label": "凉城县",
+        "value": "150925"
+      },
+      {
+        "label": "察哈尔右翼前旗",
+        "value": "150926"
+      },
+      {
+        "label": "察哈尔右翼中旗",
+        "value": "150927"
+      },
+      {
+        "label": "察哈尔右翼后旗",
+        "value": "150928"
+      },
+      {
+        "label": "四子王旗",
+        "value": "150929"
+      },
+      {
+        "label": "丰镇市",
+        "value": "150981"
+      }
+    ],
+    [{
+        "label": "乌兰浩特市",
+        "value": "152201"
+      },
+      {
+        "label": "阿尔山市",
+        "value": "152202"
+      },
+      {
+        "label": "科尔沁右翼前旗",
+        "value": "152221"
+      },
+      {
+        "label": "科尔沁右翼中旗",
+        "value": "152222"
+      },
+      {
+        "label": "扎赉特旗",
+        "value": "152223"
+      },
+      {
+        "label": "突泉县",
+        "value": "152224"
+      }
+    ],
+    [{
+        "label": "二连浩特市",
+        "value": "152501"
+      },
+      {
+        "label": "锡林浩特市",
+        "value": "152502"
+      },
+      {
+        "label": "阿巴嘎旗",
+        "value": "152522"
+      },
+      {
+        "label": "苏尼特左旗",
+        "value": "152523"
+      },
+      {
+        "label": "苏尼特右旗",
+        "value": "152524"
+      },
+      {
+        "label": "东乌珠穆沁旗",
+        "value": "152525"
+      },
+      {
+        "label": "西乌珠穆沁旗",
+        "value": "152526"
+      },
+      {
+        "label": "太仆寺旗",
+        "value": "152527"
+      },
+      {
+        "label": "镶黄旗",
+        "value": "152528"
+      },
+      {
+        "label": "正镶白旗",
+        "value": "152529"
+      },
+      {
+        "label": "正蓝旗",
+        "value": "152530"
+      },
+      {
+        "label": "多伦县",
+        "value": "152531"
+      },
+      {
+        "label": "乌拉盖管委会",
+        "value": "152571"
+      }
+    ],
+    [{
+        "label": "阿拉善左旗",
+        "value": "152921"
+      },
+      {
+        "label": "阿拉善右旗",
+        "value": "152922"
+      },
+      {
+        "label": "额济纳旗",
+        "value": "152923"
+      },
+      {
+        "label": "内蒙古阿拉善经济开发区",
+        "value": "152971"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "和平区",
+        "value": "210102"
+      },
+      {
+        "label": "沈河区",
+        "value": "210103"
+      },
+      {
+        "label": "大东区",
+        "value": "210104"
+      },
+      {
+        "label": "皇姑区",
+        "value": "210105"
+      },
+      {
+        "label": "铁西区",
+        "value": "210106"
+      },
+      {
+        "label": "苏家屯区",
+        "value": "210111"
+      },
+      {
+        "label": "浑南区",
+        "value": "210112"
+      },
+      {
+        "label": "沈北新区",
+        "value": "210113"
+      },
+      {
+        "label": "于洪区",
+        "value": "210114"
+      },
+      {
+        "label": "辽中区",
+        "value": "210115"
+      },
+      {
+        "label": "康平县",
+        "value": "210123"
+      },
+      {
+        "label": "法库县",
+        "value": "210124"
+      },
+      {
+        "label": "新民市",
+        "value": "210181"
+      }
+    ],
+    [{
+        "label": "中山区",
+        "value": "210202"
+      },
+      {
+        "label": "西岗区",
+        "value": "210203"
+      },
+      {
+        "label": "沙河口区",
+        "value": "210204"
+      },
+      {
+        "label": "甘井子区",
+        "value": "210211"
+      },
+      {
+        "label": "旅顺口区",
+        "value": "210212"
+      },
+      {
+        "label": "金州区",
+        "value": "210213"
+      },
+      {
+        "label": "普兰店区",
+        "value": "210214"
+      },
+      {
+        "label": "长海县",
+        "value": "210224"
+      },
+      {
+        "label": "瓦房店市",
+        "value": "210281"
+      },
+      {
+        "label": "庄河市",
+        "value": "210283"
+      }
+    ],
+    [{
+        "label": "铁东区",
+        "value": "210302"
+      },
+      {
+        "label": "铁西区",
+        "value": "210303"
+      },
+      {
+        "label": "立山区",
+        "value": "210304"
+      },
+      {
+        "label": "千山区",
+        "value": "210311"
+      },
+      {
+        "label": "台安县",
+        "value": "210321"
+      },
+      {
+        "label": "岫岩满族自治县",
+        "value": "210323"
+      },
+      {
+        "label": "海城市",
+        "value": "210381"
+      }
+    ],
+    [{
+        "label": "新抚区",
+        "value": "210402"
+      },
+      {
+        "label": "东洲区",
+        "value": "210403"
+      },
+      {
+        "label": "望花区",
+        "value": "210404"
+      },
+      {
+        "label": "顺城区",
+        "value": "210411"
+      },
+      {
+        "label": "抚顺县",
+        "value": "210421"
+      },
+      {
+        "label": "新宾满族自治县",
+        "value": "210422"
+      },
+      {
+        "label": "清原满族自治县",
+        "value": "210423"
+      }
+    ],
+    [{
+        "label": "平山区",
+        "value": "210502"
+      },
+      {
+        "label": "溪湖区",
+        "value": "210503"
+      },
+      {
+        "label": "明山区",
+        "value": "210504"
+      },
+      {
+        "label": "南芬区",
+        "value": "210505"
+      },
+      {
+        "label": "本溪满族自治县",
+        "value": "210521"
+      },
+      {
+        "label": "桓仁满族自治县",
+        "value": "210522"
+      }
+    ],
+    [{
+        "label": "元宝区",
+        "value": "210602"
+      },
+      {
+        "label": "振兴区",
+        "value": "210603"
+      },
+      {
+        "label": "振安区",
+        "value": "210604"
+      },
+      {
+        "label": "宽甸满族自治县",
+        "value": "210624"
+      },
+      {
+        "label": "东港市",
+        "value": "210681"
+      },
+      {
+        "label": "凤城市",
+        "value": "210682"
+      }
+    ],
+    [{
+        "label": "古塔区",
+        "value": "210702"
+      },
+      {
+        "label": "凌河区",
+        "value": "210703"
+      },
+      {
+        "label": "太和区",
+        "value": "210711"
+      },
+      {
+        "label": "黑山县",
+        "value": "210726"
+      },
+      {
+        "label": "义县",
+        "value": "210727"
+      },
+      {
+        "label": "凌海市",
+        "value": "210781"
+      },
+      {
+        "label": "北镇市",
+        "value": "210782"
+      }
+    ],
+    [{
+        "label": "站前区",
+        "value": "210802"
+      },
+      {
+        "label": "西市区",
+        "value": "210803"
+      },
+      {
+        "label": "鲅鱼圈区",
+        "value": "210804"
+      },
+      {
+        "label": "老边区",
+        "value": "210811"
+      },
+      {
+        "label": "盖州市",
+        "value": "210881"
+      },
+      {
+        "label": "大石桥市",
+        "value": "210882"
+      }
+    ],
+    [{
+        "label": "海州区",
+        "value": "210902"
+      },
+      {
+        "label": "新邱区",
+        "value": "210903"
+      },
+      {
+        "label": "太平区",
+        "value": "210904"
+      },
+      {
+        "label": "清河门区",
+        "value": "210905"
+      },
+      {
+        "label": "细河区",
+        "value": "210911"
+      },
+      {
+        "label": "阜新蒙古族自治县",
+        "value": "210921"
+      },
+      {
+        "label": "彰武县",
+        "value": "210922"
+      }
+    ],
+    [{
+        "label": "白塔区",
+        "value": "211002"
+      },
+      {
+        "label": "文圣区",
+        "value": "211003"
+      },
+      {
+        "label": "宏伟区",
+        "value": "211004"
+      },
+      {
+        "label": "弓长岭区",
+        "value": "211005"
+      },
+      {
+        "label": "太子河区",
+        "value": "211011"
+      },
+      {
+        "label": "辽阳县",
+        "value": "211021"
+      },
+      {
+        "label": "灯塔市",
+        "value": "211081"
+      }
+    ],
+    [{
+        "label": "双台子区",
+        "value": "211102"
+      },
+      {
+        "label": "兴隆台区",
+        "value": "211103"
+      },
+      {
+        "label": "大洼区",
+        "value": "211104"
+      },
+      {
+        "label": "盘山县",
+        "value": "211122"
+      }
+    ],
+    [{
+        "label": "银州区",
+        "value": "211202"
+      },
+      {
+        "label": "清河区",
+        "value": "211204"
+      },
+      {
+        "label": "铁岭县",
+        "value": "211221"
+      },
+      {
+        "label": "西丰县",
+        "value": "211223"
+      },
+      {
+        "label": "昌图县",
+        "value": "211224"
+      },
+      {
+        "label": "调兵山市",
+        "value": "211281"
+      },
+      {
+        "label": "开原市",
+        "value": "211282"
+      }
+    ],
+    [{
+        "label": "双塔区",
+        "value": "211302"
+      },
+      {
+        "label": "龙城区",
+        "value": "211303"
+      },
+      {
+        "label": "朝阳县",
+        "value": "211321"
+      },
+      {
+        "label": "建平县",
+        "value": "211322"
+      },
+      {
+        "label": "喀喇沁左翼蒙古族自治县",
+        "value": "211324"
+      },
+      {
+        "label": "北票市",
+        "value": "211381"
+      },
+      {
+        "label": "凌源市",
+        "value": "211382"
+      }
+    ],
+    [{
+        "label": "连山区",
+        "value": "211402"
+      },
+      {
+        "label": "龙港区",
+        "value": "211403"
+      },
+      {
+        "label": "南票区",
+        "value": "211404"
+      },
+      {
+        "label": "绥中县",
+        "value": "211421"
+      },
+      {
+        "label": "建昌县",
+        "value": "211422"
+      },
+      {
+        "label": "兴城市",
+        "value": "211481"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "南关区",
+        "value": "220102"
+      },
+      {
+        "label": "宽城区",
+        "value": "220103"
+      },
+      {
+        "label": "朝阳区",
+        "value": "220104"
+      },
+      {
+        "label": "二道区",
+        "value": "220105"
+      },
+      {
+        "label": "绿园区",
+        "value": "220106"
+      },
+      {
+        "label": "双阳区",
+        "value": "220112"
+      },
+      {
+        "label": "九台区",
+        "value": "220113"
+      },
+      {
+        "label": "农安县",
+        "value": "220122"
+      },
+      {
+        "label": "长春经济技术开发区",
+        "value": "220171"
+      },
+      {
+        "label": "长春净月高新技术产业开发区",
+        "value": "220172"
+      },
+      {
+        "label": "长春高新技术产业开发区",
+        "value": "220173"
+      },
+      {
+        "label": "长春汽车经济技术开发区",
+        "value": "220174"
+      },
+      {
+        "label": "榆树市",
+        "value": "220182"
+      },
+      {
+        "label": "德惠市",
+        "value": "220183"
+      }
+    ],
+    [{
+        "label": "昌邑区",
+        "value": "220202"
+      },
+      {
+        "label": "龙潭区",
+        "value": "220203"
+      },
+      {
+        "label": "船营区",
+        "value": "220204"
+      },
+      {
+        "label": "丰满区",
+        "value": "220211"
+      },
+      {
+        "label": "永吉县",
+        "value": "220221"
+      },
+      {
+        "label": "吉林经济开发区",
+        "value": "220271"
+      },
+      {
+        "label": "吉林高新技术产业开发区",
+        "value": "220272"
+      },
+      {
+        "label": "吉林中国新加坡食品区",
+        "value": "220273"
+      },
+      {
+        "label": "蛟河市",
+        "value": "220281"
+      },
+      {
+        "label": "桦甸市",
+        "value": "220282"
+      },
+      {
+        "label": "舒兰市",
+        "value": "220283"
+      },
+      {
+        "label": "磐石市",
+        "value": "220284"
+      }
+    ],
+    [{
+        "label": "铁西区",
+        "value": "220302"
+      },
+      {
+        "label": "铁东区",
+        "value": "220303"
+      },
+      {
+        "label": "梨树县",
+        "value": "220322"
+      },
+      {
+        "label": "伊通满族自治县",
+        "value": "220323"
+      },
+      {
+        "label": "公主岭市",
+        "value": "220381"
+      },
+      {
+        "label": "双辽市",
+        "value": "220382"
+      }
+    ],
+    [{
+        "label": "龙山区",
+        "value": "220402"
+      },
+      {
+        "label": "西安区",
+        "value": "220403"
+      },
+      {
+        "label": "东丰县",
+        "value": "220421"
+      },
+      {
+        "label": "东辽县",
+        "value": "220422"
+      }
+    ],
+    [{
+        "label": "东昌区",
+        "value": "220502"
+      },
+      {
+        "label": "二道江区",
+        "value": "220503"
+      },
+      {
+        "label": "通化县",
+        "value": "220521"
+      },
+      {
+        "label": "辉南县",
+        "value": "220523"
+      },
+      {
+        "label": "柳河县",
+        "value": "220524"
+      },
+      {
+        "label": "梅河口市",
+        "value": "220581"
+      },
+      {
+        "label": "集安市",
+        "value": "220582"
+      }
+    ],
+    [{
+        "label": "浑江区",
+        "value": "220602"
+      },
+      {
+        "label": "江源区",
+        "value": "220605"
+      },
+      {
+        "label": "抚松县",
+        "value": "220621"
+      },
+      {
+        "label": "靖宇县",
+        "value": "220622"
+      },
+      {
+        "label": "长白朝鲜族自治县",
+        "value": "220623"
+      },
+      {
+        "label": "临江市",
+        "value": "220681"
+      }
+    ],
+    [{
+        "label": "宁江区",
+        "value": "220702"
+      },
+      {
+        "label": "前郭尔罗斯蒙古族自治县",
+        "value": "220721"
+      },
+      {
+        "label": "长岭县",
+        "value": "220722"
+      },
+      {
+        "label": "乾安县",
+        "value": "220723"
+      },
+      {
+        "label": "吉林松原经济开发区",
+        "value": "220771"
+      },
+      {
+        "label": "扶余市",
+        "value": "220781"
+      }
+    ],
+    [{
+        "label": "洮北区",
+        "value": "220802"
+      },
+      {
+        "label": "镇赉县",
+        "value": "220821"
+      },
+      {
+        "label": "通榆县",
+        "value": "220822"
+      },
+      {
+        "label": "吉林白城经济开发区",
+        "value": "220871"
+      },
+      {
+        "label": "洮南市",
+        "value": "220881"
+      },
+      {
+        "label": "大安市",
+        "value": "220882"
+      }
+    ],
+    [{
+        "label": "延吉市",
+        "value": "222401"
+      },
+      {
+        "label": "图们市",
+        "value": "222402"
+      },
+      {
+        "label": "敦化市",
+        "value": "222403"
+      },
+      {
+        "label": "珲春市",
+        "value": "222404"
+      },
+      {
+        "label": "龙井市",
+        "value": "222405"
+      },
+      {
+        "label": "和龙市",
+        "value": "222406"
+      },
+      {
+        "label": "汪清县",
+        "value": "222424"
+      },
+      {
+        "label": "安图县",
+        "value": "222426"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "道里区",
+        "value": "230102"
+      },
+      {
+        "label": "南岗区",
+        "value": "230103"
+      },
+      {
+        "label": "道外区",
+        "value": "230104"
+      },
+      {
+        "label": "平房区",
+        "value": "230108"
+      },
+      {
+        "label": "松北区",
+        "value": "230109"
+      },
+      {
+        "label": "香坊区",
+        "value": "230110"
+      },
+      {
+        "label": "呼兰区",
+        "value": "230111"
+      },
+      {
+        "label": "阿城区",
+        "value": "230112"
+      },
+      {
+        "label": "双城区",
+        "value": "230113"
+      },
+      {
+        "label": "依兰县",
+        "value": "230123"
+      },
+      {
+        "label": "方正县",
+        "value": "230124"
+      },
+      {
+        "label": "宾县",
+        "value": "230125"
+      },
+      {
+        "label": "巴彦县",
+        "value": "230126"
+      },
+      {
+        "label": "木兰县",
+        "value": "230127"
+      },
+      {
+        "label": "通河县",
+        "value": "230128"
+      },
+      {
+        "label": "延寿县",
+        "value": "230129"
+      },
+      {
+        "label": "尚志市",
+        "value": "230183"
+      },
+      {
+        "label": "五常市",
+        "value": "230184"
+      }
+    ],
+    [{
+        "label": "龙沙区",
+        "value": "230202"
+      },
+      {
+        "label": "建华区",
+        "value": "230203"
+      },
+      {
+        "label": "铁锋区",
+        "value": "230204"
+      },
+      {
+        "label": "昂昂溪区",
+        "value": "230205"
+      },
+      {
+        "label": "富拉尔基区",
+        "value": "230206"
+      },
+      {
+        "label": "碾子山区",
+        "value": "230207"
+      },
+      {
+        "label": "梅里斯达斡尔族区",
+        "value": "230208"
+      },
+      {
+        "label": "龙江县",
+        "value": "230221"
+      },
+      {
+        "label": "依安县",
+        "value": "230223"
+      },
+      {
+        "label": "泰来县",
+        "value": "230224"
+      },
+      {
+        "label": "甘南县",
+        "value": "230225"
+      },
+      {
+        "label": "富裕县",
+        "value": "230227"
+      },
+      {
+        "label": "克山县",
+        "value": "230229"
+      },
+      {
+        "label": "克东县",
+        "value": "230230"
+      },
+      {
+        "label": "拜泉县",
+        "value": "230231"
+      },
+      {
+        "label": "讷河市",
+        "value": "230281"
+      }
+    ],
+    [{
+        "label": "鸡冠区",
+        "value": "230302"
+      },
+      {
+        "label": "恒山区",
+        "value": "230303"
+      },
+      {
+        "label": "滴道区",
+        "value": "230304"
+      },
+      {
+        "label": "梨树区",
+        "value": "230305"
+      },
+      {
+        "label": "城子河区",
+        "value": "230306"
+      },
+      {
+        "label": "麻山区",
+        "value": "230307"
+      },
+      {
+        "label": "鸡东县",
+        "value": "230321"
+      },
+      {
+        "label": "虎林市",
+        "value": "230381"
+      },
+      {
+        "label": "密山市",
+        "value": "230382"
+      }
+    ],
+    [{
+        "label": "向阳区",
+        "value": "230402"
+      },
+      {
+        "label": "工农区",
+        "value": "230403"
+      },
+      {
+        "label": "南山区",
+        "value": "230404"
+      },
+      {
+        "label": "兴安区",
+        "value": "230405"
+      },
+      {
+        "label": "东山区",
+        "value": "230406"
+      },
+      {
+        "label": "兴山区",
+        "value": "230407"
+      },
+      {
+        "label": "萝北县",
+        "value": "230421"
+      },
+      {
+        "label": "绥滨县",
+        "value": "230422"
+      }
+    ],
+    [{
+        "label": "尖山区",
+        "value": "230502"
+      },
+      {
+        "label": "岭东区",
+        "value": "230503"
+      },
+      {
+        "label": "四方台区",
+        "value": "230505"
+      },
+      {
+        "label": "宝山区",
+        "value": "230506"
+      },
+      {
+        "label": "集贤县",
+        "value": "230521"
+      },
+      {
+        "label": "友谊县",
+        "value": "230522"
+      },
+      {
+        "label": "宝清县",
+        "value": "230523"
+      },
+      {
+        "label": "饶河县",
+        "value": "230524"
+      }
+    ],
+    [{
+        "label": "萨尔图区",
+        "value": "230602"
+      },
+      {
+        "label": "龙凤区",
+        "value": "230603"
+      },
+      {
+        "label": "让胡路区",
+        "value": "230604"
+      },
+      {
+        "label": "红岗区",
+        "value": "230605"
+      },
+      {
+        "label": "大同区",
+        "value": "230606"
+      },
+      {
+        "label": "肇州县",
+        "value": "230621"
+      },
+      {
+        "label": "肇源县",
+        "value": "230622"
+      },
+      {
+        "label": "林甸县",
+        "value": "230623"
+      },
+      {
+        "label": "杜尔伯特蒙古族自治县",
+        "value": "230624"
+      },
+      {
+        "label": "大庆高新技术产业开发区",
+        "value": "230671"
+      }
+    ],
+    [{
+        "label": "伊春区",
+        "value": "230702"
+      },
+      {
+        "label": "南岔区",
+        "value": "230703"
+      },
+      {
+        "label": "友好区",
+        "value": "230704"
+      },
+      {
+        "label": "西林区",
+        "value": "230705"
+      },
+      {
+        "label": "翠峦区",
+        "value": "230706"
+      },
+      {
+        "label": "新青区",
+        "value": "230707"
+      },
+      {
+        "label": "美溪区",
+        "value": "230708"
+      },
+      {
+        "label": "金山屯区",
+        "value": "230709"
+      },
+      {
+        "label": "五营区",
+        "value": "230710"
+      },
+      {
+        "label": "乌马河区",
+        "value": "230711"
+      },
+      {
+        "label": "汤旺河区",
+        "value": "230712"
+      },
+      {
+        "label": "带岭区",
+        "value": "230713"
+      },
+      {
+        "label": "乌伊岭区",
+        "value": "230714"
+      },
+      {
+        "label": "红星区",
+        "value": "230715"
+      },
+      {
+        "label": "上甘岭区",
+        "value": "230716"
+      },
+      {
+        "label": "嘉荫县",
+        "value": "230722"
+      },
+      {
+        "label": "铁力市",
+        "value": "230781"
+      }
+    ],
+    [{
+        "label": "向阳区",
+        "value": "230803"
+      },
+      {
+        "label": "前进区",
+        "value": "230804"
+      },
+      {
+        "label": "东风区",
+        "value": "230805"
+      },
+      {
+        "label": "郊区",
+        "value": "230811"
+      },
+      {
+        "label": "桦南县",
+        "value": "230822"
+      },
+      {
+        "label": "桦川县",
+        "value": "230826"
+      },
+      {
+        "label": "汤原县",
+        "value": "230828"
+      },
+      {
+        "label": "同江市",
+        "value": "230881"
+      },
+      {
+        "label": "富锦市",
+        "value": "230882"
+      },
+      {
+        "label": "抚远市",
+        "value": "230883"
+      }
+    ],
+    [{
+        "label": "新兴区",
+        "value": "230902"
+      },
+      {
+        "label": "桃山区",
+        "value": "230903"
+      },
+      {
+        "label": "茄子河区",
+        "value": "230904"
+      },
+      {
+        "label": "勃利县",
+        "value": "230921"
+      }
+    ],
+    [{
+        "label": "东安区",
+        "value": "231002"
+      },
+      {
+        "label": "阳明区",
+        "value": "231003"
+      },
+      {
+        "label": "爱民区",
+        "value": "231004"
+      },
+      {
+        "label": "西安区",
+        "value": "231005"
+      },
+      {
+        "label": "林口县",
+        "value": "231025"
+      },
+      {
+        "label": "牡丹江经济技术开发区",
+        "value": "231071"
+      },
+      {
+        "label": "绥芬河市",
+        "value": "231081"
+      },
+      {
+        "label": "海林市",
+        "value": "231083"
+      },
+      {
+        "label": "宁安市",
+        "value": "231084"
+      },
+      {
+        "label": "穆棱市",
+        "value": "231085"
+      },
+      {
+        "label": "东宁市",
+        "value": "231086"
+      }
+    ],
+    [{
+        "label": "爱辉区",
+        "value": "231102"
+      },
+      {
+        "label": "嫩江县",
+        "value": "231121"
+      },
+      {
+        "label": "逊克县",
+        "value": "231123"
+      },
+      {
+        "label": "孙吴县",
+        "value": "231124"
+      },
+      {
+        "label": "北安市",
+        "value": "231181"
+      },
+      {
+        "label": "五大连池市",
+        "value": "231182"
+      }
+    ],
+    [{
+        "label": "北林区",
+        "value": "231202"
+      },
+      {
+        "label": "望奎县",
+        "value": "231221"
+      },
+      {
+        "label": "兰西县",
+        "value": "231222"
+      },
+      {
+        "label": "青冈县",
+        "value": "231223"
+      },
+      {
+        "label": "庆安县",
+        "value": "231224"
+      },
+      {
+        "label": "明水县",
+        "value": "231225"
+      },
+      {
+        "label": "绥棱县",
+        "value": "231226"
+      },
+      {
+        "label": "安达市",
+        "value": "231281"
+      },
+      {
+        "label": "肇东市",
+        "value": "231282"
+      },
+      {
+        "label": "海伦市",
+        "value": "231283"
+      }
+    ],
+    [{
+        "label": "加格达奇区",
+        "value": "232701"
+      },
+      {
+        "label": "松岭区",
+        "value": "232702"
+      },
+      {
+        "label": "新林区",
+        "value": "232703"
+      },
+      {
+        "label": "呼中区",
+        "value": "232704"
+      },
+      {
+        "label": "呼玛县",
+        "value": "232721"
+      },
+      {
+        "label": "塔河县",
+        "value": "232722"
+      },
+      {
+        "label": "漠河县",
+        "value": "232723"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "黄浦区",
+        "value": "310101"
+      },
+      {
+        "label": "徐汇区",
+        "value": "310104"
+      },
+      {
+        "label": "长宁区",
+        "value": "310105"
+      },
+      {
+        "label": "静安区",
+        "value": "310106"
+      },
+      {
+        "label": "普陀区",
+        "value": "310107"
+      },
+      {
+        "label": "虹口区",
+        "value": "310109"
+      },
+      {
+        "label": "杨浦区",
+        "value": "310110"
+      },
+      {
+        "label": "闵行区",
+        "value": "310112"
+      },
+      {
+        "label": "宝山区",
+        "value": "310113"
+      },
+      {
+        "label": "嘉定区",
+        "value": "310114"
+      },
+      {
+        "label": "浦东新区",
+        "value": "310115"
+      },
+      {
+        "label": "金山区",
+        "value": "310116"
+      },
+      {
+        "label": "松江区",
+        "value": "310117"
+      },
+      {
+        "label": "青浦区",
+        "value": "310118"
+      },
+      {
+        "label": "奉贤区",
+        "value": "310120"
+      },
+      {
+        "label": "崇明区",
+        "value": "310151"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "玄武区",
+        "value": "320102"
+      },
+      {
+        "label": "秦淮区",
+        "value": "320104"
+      },
+      {
+        "label": "建邺区",
+        "value": "320105"
+      },
+      {
+        "label": "鼓楼区",
+        "value": "320106"
+      },
+      {
+        "label": "浦口区",
+        "value": "320111"
+      },
+      {
+        "label": "栖霞区",
+        "value": "320113"
+      },
+      {
+        "label": "雨花台区",
+        "value": "320114"
+      },
+      {
+        "label": "江宁区",
+        "value": "320115"
+      },
+      {
+        "label": "六合区",
+        "value": "320116"
+      },
+      {
+        "label": "溧水区",
+        "value": "320117"
+      },
+      {
+        "label": "高淳区",
+        "value": "320118"
+      }
+    ],
+    [{
+        "label": "锡山区",
+        "value": "320205"
+      },
+      {
+        "label": "惠山区",
+        "value": "320206"
+      },
+      {
+        "label": "滨湖区",
+        "value": "320211"
+      },
+      {
+        "label": "梁溪区",
+        "value": "320213"
+      },
+      {
+        "label": "新吴区",
+        "value": "320214"
+      },
+      {
+        "label": "江阴市",
+        "value": "320281"
+      },
+      {
+        "label": "宜兴市",
+        "value": "320282"
+      }
+    ],
+    [{
+        "label": "鼓楼区",
+        "value": "320302"
+      },
+      {
+        "label": "云龙区",
+        "value": "320303"
+      },
+      {
+        "label": "贾汪区",
+        "value": "320305"
+      },
+      {
+        "label": "泉山区",
+        "value": "320311"
+      },
+      {
+        "label": "铜山区",
+        "value": "320312"
+      },
+      {
+        "label": "丰县",
+        "value": "320321"
+      },
+      {
+        "label": "沛县",
+        "value": "320322"
+      },
+      {
+        "label": "睢宁县",
+        "value": "320324"
+      },
+      {
+        "label": "徐州经济技术开发区",
+        "value": "320371"
+      },
+      {
+        "label": "新沂市",
+        "value": "320381"
+      },
+      {
+        "label": "邳州市",
+        "value": "320382"
+      }
+    ],
+    [{
+        "label": "天宁区",
+        "value": "320402"
+      },
+      {
+        "label": "钟楼区",
+        "value": "320404"
+      },
+      {
+        "label": "新北区",
+        "value": "320411"
+      },
+      {
+        "label": "武进区",
+        "value": "320412"
+      },
+      {
+        "label": "金坛区",
+        "value": "320413"
+      },
+      {
+        "label": "溧阳市",
+        "value": "320481"
+      }
+    ],
+    [{
+        "label": "虎丘区",
+        "value": "320505"
+      },
+      {
+        "label": "吴中区",
+        "value": "320506"
+      },
+      {
+        "label": "相城区",
+        "value": "320507"
+      },
+      {
+        "label": "姑苏区",
+        "value": "320508"
+      },
+      {
+        "label": "吴江区",
+        "value": "320509"
+      },
+      {
+        "label": "苏州工业园区",
+        "value": "320571"
+      },
+      {
+        "label": "常熟市",
+        "value": "320581"
+      },
+      {
+        "label": "张家港市",
+        "value": "320582"
+      },
+      {
+        "label": "昆山市",
+        "value": "320583"
+      },
+      {
+        "label": "太仓市",
+        "value": "320585"
+      }
+    ],
+    [{
+        "label": "崇川区",
+        "value": "320602"
+      },
+      {
+        "label": "港闸区",
+        "value": "320611"
+      },
+      {
+        "label": "通州区",
+        "value": "320612"
+      },
+      {
+        "label": "海安县",
+        "value": "320621"
+      },
+      {
+        "label": "如东县",
+        "value": "320623"
+      },
+      {
+        "label": "南通经济技术开发区",
+        "value": "320671"
+      },
+      {
+        "label": "启东市",
+        "value": "320681"
+      },
+      {
+        "label": "如皋市",
+        "value": "320682"
+      },
+      {
+        "label": "海门市",
+        "value": "320684"
+      }
+    ],
+    [{
+        "label": "连云区",
+        "value": "320703"
+      },
+      {
+        "label": "海州区",
+        "value": "320706"
+      },
+      {
+        "label": "赣榆区",
+        "value": "320707"
+      },
+      {
+        "label": "东海县",
+        "value": "320722"
+      },
+      {
+        "label": "灌云县",
+        "value": "320723"
+      },
+      {
+        "label": "灌南县",
+        "value": "320724"
+      },
+      {
+        "label": "连云港经济技术开发区",
+        "value": "320771"
+      },
+      {
+        "label": "连云港高新技术产业开发区",
+        "value": "320772"
+      }
+    ],
+    [{
+        "label": "淮安区",
+        "value": "320803"
+      },
+      {
+        "label": "淮阴区",
+        "value": "320804"
+      },
+      {
+        "label": "清江浦区",
+        "value": "320812"
+      },
+      {
+        "label": "洪泽区",
+        "value": "320813"
+      },
+      {
+        "label": "涟水县",
+        "value": "320826"
+      },
+      {
+        "label": "盱眙县",
+        "value": "320830"
+      },
+      {
+        "label": "金湖县",
+        "value": "320831"
+      },
+      {
+        "label": "淮安经济技术开发区",
+        "value": "320871"
+      }
+    ],
+    [{
+        "label": "亭湖区",
+        "value": "320902"
+      },
+      {
+        "label": "盐都区",
+        "value": "320903"
+      },
+      {
+        "label": "大丰区",
+        "value": "320904"
+      },
+      {
+        "label": "响水县",
+        "value": "320921"
+      },
+      {
+        "label": "滨海县",
+        "value": "320922"
+      },
+      {
+        "label": "阜宁县",
+        "value": "320923"
+      },
+      {
+        "label": "射阳县",
+        "value": "320924"
+      },
+      {
+        "label": "建湖县",
+        "value": "320925"
+      },
+      {
+        "label": "盐城经济技术开发区",
+        "value": "320971"
+      },
+      {
+        "label": "东台市",
+        "value": "320981"
+      }
+    ],
+    [{
+        "label": "广陵区",
+        "value": "321002"
+      },
+      {
+        "label": "邗江区",
+        "value": "321003"
+      },
+      {
+        "label": "江都区",
+        "value": "321012"
+      },
+      {
+        "label": "宝应县",
+        "value": "321023"
+      },
+      {
+        "label": "扬州经济技术开发区",
+        "value": "321071"
+      },
+      {
+        "label": "仪征市",
+        "value": "321081"
+      },
+      {
+        "label": "高邮市",
+        "value": "321084"
+      }
+    ],
+    [{
+        "label": "京口区",
+        "value": "321102"
+      },
+      {
+        "label": "润州区",
+        "value": "321111"
+      },
+      {
+        "label": "丹徒区",
+        "value": "321112"
+      },
+      {
+        "label": "镇江新区",
+        "value": "321171"
+      },
+      {
+        "label": "丹阳市",
+        "value": "321181"
+      },
+      {
+        "label": "扬中市",
+        "value": "321182"
+      },
+      {
+        "label": "句容市",
+        "value": "321183"
+      }
+    ],
+    [{
+        "label": "海陵区",
+        "value": "321202"
+      },
+      {
+        "label": "高港区",
+        "value": "321203"
+      },
+      {
+        "label": "姜堰区",
+        "value": "321204"
+      },
+      {
+        "label": "泰州医药高新技术产业开发区",
+        "value": "321271"
+      },
+      {
+        "label": "兴化市",
+        "value": "321281"
+      },
+      {
+        "label": "靖江市",
+        "value": "321282"
+      },
+      {
+        "label": "泰兴市",
+        "value": "321283"
+      }
+    ],
+    [{
+        "label": "宿城区",
+        "value": "321302"
+      },
+      {
+        "label": "宿豫区",
+        "value": "321311"
+      },
+      {
+        "label": "沭阳县",
+        "value": "321322"
+      },
+      {
+        "label": "泗阳县",
+        "value": "321323"
+      },
+      {
+        "label": "泗洪县",
+        "value": "321324"
+      },
+      {
+        "label": "宿迁经济技术开发区",
+        "value": "321371"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "上城区",
+        "value": "330102"
+      },
+      {
+        "label": "下城区",
+        "value": "330103"
+      },
+      {
+        "label": "江干区",
+        "value": "330104"
+      },
+      {
+        "label": "拱墅区",
+        "value": "330105"
+      },
+      {
+        "label": "西湖区",
+        "value": "330106"
+      },
+      {
+        "label": "滨江区",
+        "value": "330108"
+      },
+      {
+        "label": "萧山区",
+        "value": "330109"
+      },
+      {
+        "label": "余杭区",
+        "value": "330110"
+      },
+      {
+        "label": "富阳区",
+        "value": "330111"
+      },
+      {
+        "label": "临安区",
+        "value": "330112"
+      },
+      {
+        "label": "桐庐县",
+        "value": "330122"
+      },
+      {
+        "label": "淳安县",
+        "value": "330127"
+      },
+      {
+        "label": "建德市",
+        "value": "330182"
+      }
+    ],
+    [{
+        "label": "海曙区",
+        "value": "330203"
+      },
+      {
+        "label": "江北区",
+        "value": "330205"
+      },
+      {
+        "label": "北仑区",
+        "value": "330206"
+      },
+      {
+        "label": "镇海区",
+        "value": "330211"
+      },
+      {
+        "label": "鄞州区",
+        "value": "330212"
+      },
+      {
+        "label": "奉化区",
+        "value": "330213"
+      },
+      {
+        "label": "象山县",
+        "value": "330225"
+      },
+      {
+        "label": "宁海县",
+        "value": "330226"
+      },
+      {
+        "label": "余姚市",
+        "value": "330281"
+      },
+      {
+        "label": "慈溪市",
+        "value": "330282"
+      }
+    ],
+    [{
+        "label": "鹿城区",
+        "value": "330302"
+      },
+      {
+        "label": "龙湾区",
+        "value": "330303"
+      },
+      {
+        "label": "瓯海区",
+        "value": "330304"
+      },
+      {
+        "label": "洞头区",
+        "value": "330305"
+      },
+      {
+        "label": "永嘉县",
+        "value": "330324"
+      },
+      {
+        "label": "平阳县",
+        "value": "330326"
+      },
+      {
+        "label": "苍南县",
+        "value": "330327"
+      },
+      {
+        "label": "文成县",
+        "value": "330328"
+      },
+      {
+        "label": "泰顺县",
+        "value": "330329"
+      },
+      {
+        "label": "温州经济技术开发区",
+        "value": "330371"
+      },
+      {
+        "label": "瑞安市",
+        "value": "330381"
+      },
+      {
+        "label": "乐清市",
+        "value": "330382"
+      }
+    ],
+    [{
+        "label": "南湖区",
+        "value": "330402"
+      },
+      {
+        "label": "秀洲区",
+        "value": "330411"
+      },
+      {
+        "label": "嘉善县",
+        "value": "330421"
+      },
+      {
+        "label": "海盐县",
+        "value": "330424"
+      },
+      {
+        "label": "海宁市",
+        "value": "330481"
+      },
+      {
+        "label": "平湖市",
+        "value": "330482"
+      },
+      {
+        "label": "桐乡市",
+        "value": "330483"
+      }
+    ],
+    [{
+        "label": "吴兴区",
+        "value": "330502"
+      },
+      {
+        "label": "南浔区",
+        "value": "330503"
+      },
+      {
+        "label": "德清县",
+        "value": "330521"
+      },
+      {
+        "label": "长兴县",
+        "value": "330522"
+      },
+      {
+        "label": "安吉县",
+        "value": "330523"
+      }
+    ],
+    [{
+        "label": "越城区",
+        "value": "330602"
+      },
+      {
+        "label": "柯桥区",
+        "value": "330603"
+      },
+      {
+        "label": "上虞区",
+        "value": "330604"
+      },
+      {
+        "label": "新昌县",
+        "value": "330624"
+      },
+      {
+        "label": "诸暨市",
+        "value": "330681"
+      },
+      {
+        "label": "嵊州市",
+        "value": "330683"
+      }
+    ],
+    [{
+        "label": "婺城区",
+        "value": "330702"
+      },
+      {
+        "label": "金东区",
+        "value": "330703"
+      },
+      {
+        "label": "武义县",
+        "value": "330723"
+      },
+      {
+        "label": "浦江县",
+        "value": "330726"
+      },
+      {
+        "label": "磐安县",
+        "value": "330727"
+      },
+      {
+        "label": "兰溪市",
+        "value": "330781"
+      },
+      {
+        "label": "义乌市",
+        "value": "330782"
+      },
+      {
+        "label": "东阳市",
+        "value": "330783"
+      },
+      {
+        "label": "永康市",
+        "value": "330784"
+      }
+    ],
+    [{
+        "label": "柯城区",
+        "value": "330802"
+      },
+      {
+        "label": "衢江区",
+        "value": "330803"
+      },
+      {
+        "label": "常山县",
+        "value": "330822"
+      },
+      {
+        "label": "开化县",
+        "value": "330824"
+      },
+      {
+        "label": "龙游县",
+        "value": "330825"
+      },
+      {
+        "label": "江山市",
+        "value": "330881"
+      }
+    ],
+    [{
+        "label": "定海区",
+        "value": "330902"
+      },
+      {
+        "label": "普陀区",
+        "value": "330903"
+      },
+      {
+        "label": "岱山县",
+        "value": "330921"
+      },
+      {
+        "label": "嵊泗县",
+        "value": "330922"
+      }
+    ],
+    [{
+        "label": "椒江区",
+        "value": "331002"
+      },
+      {
+        "label": "黄岩区",
+        "value": "331003"
+      },
+      {
+        "label": "路桥区",
+        "value": "331004"
+      },
+      {
+        "label": "三门县",
+        "value": "331022"
+      },
+      {
+        "label": "天台县",
+        "value": "331023"
+      },
+      {
+        "label": "仙居县",
+        "value": "331024"
+      },
+      {
+        "label": "温岭市",
+        "value": "331081"
+      },
+      {
+        "label": "临海市",
+        "value": "331082"
+      },
+      {
+        "label": "玉环市",
+        "value": "331083"
+      }
+    ],
+    [{
+        "label": "莲都区",
+        "value": "331102"
+      },
+      {
+        "label": "青田县",
+        "value": "331121"
+      },
+      {
+        "label": "缙云县",
+        "value": "331122"
+      },
+      {
+        "label": "遂昌县",
+        "value": "331123"
+      },
+      {
+        "label": "松阳县",
+        "value": "331124"
+      },
+      {
+        "label": "云和县",
+        "value": "331125"
+      },
+      {
+        "label": "庆元县",
+        "value": "331126"
+      },
+      {
+        "label": "景宁畲族自治县",
+        "value": "331127"
+      },
+      {
+        "label": "龙泉市",
+        "value": "331181"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "瑶海区",
+        "value": "340102"
+      },
+      {
+        "label": "庐阳区",
+        "value": "340103"
+      },
+      {
+        "label": "蜀山区",
+        "value": "340104"
+      },
+      {
+        "label": "包河区",
+        "value": "340111"
+      },
+      {
+        "label": "长丰县",
+        "value": "340121"
+      },
+      {
+        "label": "肥东县",
+        "value": "340122"
+      },
+      {
+        "label": "肥西县",
+        "value": "340123"
+      },
+      {
+        "label": "庐江县",
+        "value": "340124"
+      },
+      {
+        "label": "合肥高新技术产业开发区",
+        "value": "340171"
+      },
+      {
+        "label": "合肥经济技术开发区",
+        "value": "340172"
+      },
+      {
+        "label": "合肥新站高新技术产业开发区",
+        "value": "340173"
+      },
+      {
+        "label": "巢湖市",
+        "value": "340181"
+      }
+    ],
+    [{
+        "label": "镜湖区",
+        "value": "340202"
+      },
+      {
+        "label": "弋江区",
+        "value": "340203"
+      },
+      {
+        "label": "鸠江区",
+        "value": "340207"
+      },
+      {
+        "label": "三山区",
+        "value": "340208"
+      },
+      {
+        "label": "芜湖县",
+        "value": "340221"
+      },
+      {
+        "label": "繁昌县",
+        "value": "340222"
+      },
+      {
+        "label": "南陵县",
+        "value": "340223"
+      },
+      {
+        "label": "无为县",
+        "value": "340225"
+      },
+      {
+        "label": "芜湖经济技术开发区",
+        "value": "340271"
+      },
+      {
+        "label": "安徽芜湖长江大桥经济开发区",
+        "value": "340272"
+      }
+    ],
+    [{
+        "label": "龙子湖区",
+        "value": "340302"
+      },
+      {
+        "label": "蚌山区",
+        "value": "340303"
+      },
+      {
+        "label": "禹会区",
+        "value": "340304"
+      },
+      {
+        "label": "淮上区",
+        "value": "340311"
+      },
+      {
+        "label": "怀远县",
+        "value": "340321"
+      },
+      {
+        "label": "五河县",
+        "value": "340322"
+      },
+      {
+        "label": "固镇县",
+        "value": "340323"
+      },
+      {
+        "label": "蚌埠市高新技术开发区",
+        "value": "340371"
+      },
+      {
+        "label": "蚌埠市经济开发区",
+        "value": "340372"
+      }
+    ],
+    [{
+        "label": "大通区",
+        "value": "340402"
+      },
+      {
+        "label": "田家庵区",
+        "value": "340403"
+      },
+      {
+        "label": "谢家集区",
+        "value": "340404"
+      },
+      {
+        "label": "八公山区",
+        "value": "340405"
+      },
+      {
+        "label": "潘集区",
+        "value": "340406"
+      },
+      {
+        "label": "凤台县",
+        "value": "340421"
+      },
+      {
+        "label": "寿县",
+        "value": "340422"
+      }
+    ],
+    [{
+        "label": "花山区",
+        "value": "340503"
+      },
+      {
+        "label": "雨山区",
+        "value": "340504"
+      },
+      {
+        "label": "博望区",
+        "value": "340506"
+      },
+      {
+        "label": "当涂县",
+        "value": "340521"
+      },
+      {
+        "label": "含山县",
+        "value": "340522"
+      },
+      {
+        "label": "和县",
+        "value": "340523"
+      }
+    ],
+    [{
+        "label": "杜集区",
+        "value": "340602"
+      },
+      {
+        "label": "相山区",
+        "value": "340603"
+      },
+      {
+        "label": "烈山区",
+        "value": "340604"
+      },
+      {
+        "label": "濉溪县",
+        "value": "340621"
+      }
+    ],
+    [{
+        "label": "铜官区",
+        "value": "340705"
+      },
+      {
+        "label": "义安区",
+        "value": "340706"
+      },
+      {
+        "label": "郊区",
+        "value": "340711"
+      },
+      {
+        "label": "枞阳县",
+        "value": "340722"
+      }
+    ],
+    [{
+        "label": "迎江区",
+        "value": "340802"
+      },
+      {
+        "label": "大观区",
+        "value": "340803"
+      },
+      {
+        "label": "宜秀区",
+        "value": "340811"
+      },
+      {
+        "label": "怀宁县",
+        "value": "340822"
+      },
+      {
+        "label": "潜山县",
+        "value": "340824"
+      },
+      {
+        "label": "太湖县",
+        "value": "340825"
+      },
+      {
+        "label": "宿松县",
+        "value": "340826"
+      },
+      {
+        "label": "望江县",
+        "value": "340827"
+      },
+      {
+        "label": "岳西县",
+        "value": "340828"
+      },
+      {
+        "label": "安徽安庆经济开发区",
+        "value": "340871"
+      },
+      {
+        "label": "桐城市",
+        "value": "340881"
+      }
+    ],
+    [{
+        "label": "屯溪区",
+        "value": "341002"
+      },
+      {
+        "label": "黄山区",
+        "value": "341003"
+      },
+      {
+        "label": "徽州区",
+        "value": "341004"
+      },
+      {
+        "label": "歙县",
+        "value": "341021"
+      },
+      {
+        "label": "休宁县",
+        "value": "341022"
+      },
+      {
+        "label": "黟县",
+        "value": "341023"
+      },
+      {
+        "label": "祁门县",
+        "value": "341024"
+      }
+    ],
+    [{
+        "label": "琅琊区",
+        "value": "341102"
+      },
+      {
+        "label": "南谯区",
+        "value": "341103"
+      },
+      {
+        "label": "来安县",
+        "value": "341122"
+      },
+      {
+        "label": "全椒县",
+        "value": "341124"
+      },
+      {
+        "label": "定远县",
+        "value": "341125"
+      },
+      {
+        "label": "凤阳县",
+        "value": "341126"
+      },
+      {
+        "label": "苏滁现代产业园",
+        "value": "341171"
+      },
+      {
+        "label": "滁州经济技术开发区",
+        "value": "341172"
+      },
+      {
+        "label": "天长市",
+        "value": "341181"
+      },
+      {
+        "label": "明光市",
+        "value": "341182"
+      }
+    ],
+    [{
+        "label": "颍州区",
+        "value": "341202"
+      },
+      {
+        "label": "颍东区",
+        "value": "341203"
+      },
+      {
+        "label": "颍泉区",
+        "value": "341204"
+      },
+      {
+        "label": "临泉县",
+        "value": "341221"
+      },
+      {
+        "label": "太和县",
+        "value": "341222"
+      },
+      {
+        "label": "阜南县",
+        "value": "341225"
+      },
+      {
+        "label": "颍上县",
+        "value": "341226"
+      },
+      {
+        "label": "阜阳合肥现代产业园区",
+        "value": "341271"
+      },
+      {
+        "label": "阜阳经济技术开发区",
+        "value": "341272"
+      },
+      {
+        "label": "界首市",
+        "value": "341282"
+      }
+    ],
+    [{
+        "label": "埇桥区",
+        "value": "341302"
+      },
+      {
+        "label": "砀山县",
+        "value": "341321"
+      },
+      {
+        "label": "萧县",
+        "value": "341322"
+      },
+      {
+        "label": "灵璧县",
+        "value": "341323"
+      },
+      {
+        "label": "泗县",
+        "value": "341324"
+      },
+      {
+        "label": "宿州马鞍山现代产业园区",
+        "value": "341371"
+      },
+      {
+        "label": "宿州经济技术开发区",
+        "value": "341372"
+      }
+    ],
+    [{
+        "label": "金安区",
+        "value": "341502"
+      },
+      {
+        "label": "裕安区",
+        "value": "341503"
+      },
+      {
+        "label": "叶集区",
+        "value": "341504"
+      },
+      {
+        "label": "霍邱县",
+        "value": "341522"
+      },
+      {
+        "label": "舒城县",
+        "value": "341523"
+      },
+      {
+        "label": "金寨县",
+        "value": "341524"
+      },
+      {
+        "label": "霍山县",
+        "value": "341525"
+      }
+    ],
+    [{
+        "label": "谯城区",
+        "value": "341602"
+      },
+      {
+        "label": "涡阳县",
+        "value": "341621"
+      },
+      {
+        "label": "蒙城县",
+        "value": "341622"
+      },
+      {
+        "label": "利辛县",
+        "value": "341623"
+      }
+    ],
+    [{
+        "label": "贵池区",
+        "value": "341702"
+      },
+      {
+        "label": "东至县",
+        "value": "341721"
+      },
+      {
+        "label": "石台县",
+        "value": "341722"
+      },
+      {
+        "label": "青阳县",
+        "value": "341723"
+      }
+    ],
+    [{
+        "label": "宣州区",
+        "value": "341802"
+      },
+      {
+        "label": "郎溪县",
+        "value": "341821"
+      },
+      {
+        "label": "广德县",
+        "value": "341822"
+      },
+      {
+        "label": "泾县",
+        "value": "341823"
+      },
+      {
+        "label": "绩溪县",
+        "value": "341824"
+      },
+      {
+        "label": "旌德县",
+        "value": "341825"
+      },
+      {
+        "label": "宣城市经济开发区",
+        "value": "341871"
+      },
+      {
+        "label": "宁国市",
+        "value": "341881"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "鼓楼区",
+        "value": "350102"
+      },
+      {
+        "label": "台江区",
+        "value": "350103"
+      },
+      {
+        "label": "仓山区",
+        "value": "350104"
+      },
+      {
+        "label": "马尾区",
+        "value": "350105"
+      },
+      {
+        "label": "晋安区",
+        "value": "350111"
+      },
+      {
+        "label": "闽侯县",
+        "value": "350121"
+      },
+      {
+        "label": "连江县",
+        "value": "350122"
+      },
+      {
+        "label": "罗源县",
+        "value": "350123"
+      },
+      {
+        "label": "闽清县",
+        "value": "350124"
+      },
+      {
+        "label": "永泰县",
+        "value": "350125"
+      },
+      {
+        "label": "平潭县",
+        "value": "350128"
+      },
+      {
+        "label": "福清市",
+        "value": "350181"
+      },
+      {
+        "label": "长乐市",
+        "value": "350182"
+      }
+    ],
+    [{
+        "label": "思明区",
+        "value": "350203"
+      },
+      {
+        "label": "海沧区",
+        "value": "350205"
+      },
+      {
+        "label": "湖里区",
+        "value": "350206"
+      },
+      {
+        "label": "集美区",
+        "value": "350211"
+      },
+      {
+        "label": "同安区",
+        "value": "350212"
+      },
+      {
+        "label": "翔安区",
+        "value": "350213"
+      }
+    ],
+    [{
+        "label": "城厢区",
+        "value": "350302"
+      },
+      {
+        "label": "涵江区",
+        "value": "350303"
+      },
+      {
+        "label": "荔城区",
+        "value": "350304"
+      },
+      {
+        "label": "秀屿区",
+        "value": "350305"
+      },
+      {
+        "label": "仙游县",
+        "value": "350322"
+      }
+    ],
+    [{
+        "label": "梅列区",
+        "value": "350402"
+      },
+      {
+        "label": "三元区",
+        "value": "350403"
+      },
+      {
+        "label": "明溪县",
+        "value": "350421"
+      },
+      {
+        "label": "清流县",
+        "value": "350423"
+      },
+      {
+        "label": "宁化县",
+        "value": "350424"
+      },
+      {
+        "label": "大田县",
+        "value": "350425"
+      },
+      {
+        "label": "尤溪县",
+        "value": "350426"
+      },
+      {
+        "label": "沙县",
+        "value": "350427"
+      },
+      {
+        "label": "将乐县",
+        "value": "350428"
+      },
+      {
+        "label": "泰宁县",
+        "value": "350429"
+      },
+      {
+        "label": "建宁县",
+        "value": "350430"
+      },
+      {
+        "label": "永安市",
+        "value": "350481"
+      }
+    ],
+    [{
+        "label": "鲤城区",
+        "value": "350502"
+      },
+      {
+        "label": "丰泽区",
+        "value": "350503"
+      },
+      {
+        "label": "洛江区",
+        "value": "350504"
+      },
+      {
+        "label": "泉港区",
+        "value": "350505"
+      },
+      {
+        "label": "惠安县",
+        "value": "350521"
+      },
+      {
+        "label": "安溪县",
+        "value": "350524"
+      },
+      {
+        "label": "永春县",
+        "value": "350525"
+      },
+      {
+        "label": "德化县",
+        "value": "350526"
+      },
+      {
+        "label": "金门县",
+        "value": "350527"
+      },
+      {
+        "label": "石狮市",
+        "value": "350581"
+      },
+      {
+        "label": "晋江市",
+        "value": "350582"
+      },
+      {
+        "label": "南安市",
+        "value": "350583"
+      }
+    ],
+    [{
+        "label": "芗城区",
+        "value": "350602"
+      },
+      {
+        "label": "龙文区",
+        "value": "350603"
+      },
+      {
+        "label": "云霄县",
+        "value": "350622"
+      },
+      {
+        "label": "漳浦县",
+        "value": "350623"
+      },
+      {
+        "label": "诏安县",
+        "value": "350624"
+      },
+      {
+        "label": "长泰县",
+        "value": "350625"
+      },
+      {
+        "label": "东山县",
+        "value": "350626"
+      },
+      {
+        "label": "南靖县",
+        "value": "350627"
+      },
+      {
+        "label": "平和县",
+        "value": "350628"
+      },
+      {
+        "label": "华安县",
+        "value": "350629"
+      },
+      {
+        "label": "龙海市",
+        "value": "350681"
+      }
+    ],
+    [{
+        "label": "延平区",
+        "value": "350702"
+      },
+      {
+        "label": "建阳区",
+        "value": "350703"
+      },
+      {
+        "label": "顺昌县",
+        "value": "350721"
+      },
+      {
+        "label": "浦城县",
+        "value": "350722"
+      },
+      {
+        "label": "光泽县",
+        "value": "350723"
+      },
+      {
+        "label": "松溪县",
+        "value": "350724"
+      },
+      {
+        "label": "政和县",
+        "value": "350725"
+      },
+      {
+        "label": "邵武市",
+        "value": "350781"
+      },
+      {
+        "label": "武夷山市",
+        "value": "350782"
+      },
+      {
+        "label": "建瓯市",
+        "value": "350783"
+      }
+    ],
+    [{
+        "label": "新罗区",
+        "value": "350802"
+      },
+      {
+        "label": "永定区",
+        "value": "350803"
+      },
+      {
+        "label": "长汀县",
+        "value": "350821"
+      },
+      {
+        "label": "上杭县",
+        "value": "350823"
+      },
+      {
+        "label": "武平县",
+        "value": "350824"
+      },
+      {
+        "label": "连城县",
+        "value": "350825"
+      },
+      {
+        "label": "漳平市",
+        "value": "350881"
+      }
+    ],
+    [{
+        "label": "蕉城区",
+        "value": "350902"
+      },
+      {
+        "label": "霞浦县",
+        "value": "350921"
+      },
+      {
+        "label": "古田县",
+        "value": "350922"
+      },
+      {
+        "label": "屏南县",
+        "value": "350923"
+      },
+      {
+        "label": "寿宁县",
+        "value": "350924"
+      },
+      {
+        "label": "周宁县",
+        "value": "350925"
+      },
+      {
+        "label": "柘荣县",
+        "value": "350926"
+      },
+      {
+        "label": "福安市",
+        "value": "350981"
+      },
+      {
+        "label": "福鼎市",
+        "value": "350982"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "东湖区",
+        "value": "360102"
+      },
+      {
+        "label": "西湖区",
+        "value": "360103"
+      },
+      {
+        "label": "青云谱区",
+        "value": "360104"
+      },
+      {
+        "label": "湾里区",
+        "value": "360105"
+      },
+      {
+        "label": "青山湖区",
+        "value": "360111"
+      },
+      {
+        "label": "新建区",
+        "value": "360112"
+      },
+      {
+        "label": "南昌县",
+        "value": "360121"
+      },
+      {
+        "label": "安义县",
+        "value": "360123"
+      },
+      {
+        "label": "进贤县",
+        "value": "360124"
+      }
+    ],
+    [{
+        "label": "昌江区",
+        "value": "360202"
+      },
+      {
+        "label": "珠山区",
+        "value": "360203"
+      },
+      {
+        "label": "浮梁县",
+        "value": "360222"
+      },
+      {
+        "label": "乐平市",
+        "value": "360281"
+      }
+    ],
+    [{
+        "label": "安源区",
+        "value": "360302"
+      },
+      {
+        "label": "湘东区",
+        "value": "360313"
+      },
+      {
+        "label": "莲花县",
+        "value": "360321"
+      },
+      {
+        "label": "上栗县",
+        "value": "360322"
+      },
+      {
+        "label": "芦溪县",
+        "value": "360323"
+      }
+    ],
+    [{
+        "label": "濂溪区",
+        "value": "360402"
+      },
+      {
+        "label": "浔阳区",
+        "value": "360403"
+      },
+      {
+        "label": "柴桑区",
+        "value": "360404"
+      },
+      {
+        "label": "武宁县",
+        "value": "360423"
+      },
+      {
+        "label": "修水县",
+        "value": "360424"
+      },
+      {
+        "label": "永修县",
+        "value": "360425"
+      },
+      {
+        "label": "德安县",
+        "value": "360426"
+      },
+      {
+        "label": "都昌县",
+        "value": "360428"
+      },
+      {
+        "label": "湖口县",
+        "value": "360429"
+      },
+      {
+        "label": "彭泽县",
+        "value": "360430"
+      },
+      {
+        "label": "瑞昌市",
+        "value": "360481"
+      },
+      {
+        "label": "共青城市",
+        "value": "360482"
+      },
+      {
+        "label": "庐山市",
+        "value": "360483"
+      }
+    ],
+    [{
+        "label": "渝水区",
+        "value": "360502"
+      },
+      {
+        "label": "分宜县",
+        "value": "360521"
+      }
+    ],
+    [{
+        "label": "月湖区",
+        "value": "360602"
+      },
+      {
+        "label": "余江县",
+        "value": "360622"
+      },
+      {
+        "label": "贵溪市",
+        "value": "360681"
+      }
+    ],
+    [{
+        "label": "章贡区",
+        "value": "360702"
+      },
+      {
+        "label": "南康区",
+        "value": "360703"
+      },
+      {
+        "label": "赣县区",
+        "value": "360704"
+      },
+      {
+        "label": "信丰县",
+        "value": "360722"
+      },
+      {
+        "label": "大余县",
+        "value": "360723"
+      },
+      {
+        "label": "上犹县",
+        "value": "360724"
+      },
+      {
+        "label": "崇义县",
+        "value": "360725"
+      },
+      {
+        "label": "安远县",
+        "value": "360726"
+      },
+      {
+        "label": "龙南县",
+        "value": "360727"
+      },
+      {
+        "label": "定南县",
+        "value": "360728"
+      },
+      {
+        "label": "全南县",
+        "value": "360729"
+      },
+      {
+        "label": "宁都县",
+        "value": "360730"
+      },
+      {
+        "label": "于都县",
+        "value": "360731"
+      },
+      {
+        "label": "兴国县",
+        "value": "360732"
+      },
+      {
+        "label": "会昌县",
+        "value": "360733"
+      },
+      {
+        "label": "寻乌县",
+        "value": "360734"
+      },
+      {
+        "label": "石城县",
+        "value": "360735"
+      },
+      {
+        "label": "瑞金市",
+        "value": "360781"
+      }
+    ],
+    [{
+        "label": "吉州区",
+        "value": "360802"
+      },
+      {
+        "label": "青原区",
+        "value": "360803"
+      },
+      {
+        "label": "吉安县",
+        "value": "360821"
+      },
+      {
+        "label": "吉水县",
+        "value": "360822"
+      },
+      {
+        "label": "峡江县",
+        "value": "360823"
+      },
+      {
+        "label": "新干县",
+        "value": "360824"
+      },
+      {
+        "label": "永丰县",
+        "value": "360825"
+      },
+      {
+        "label": "泰和县",
+        "value": "360826"
+      },
+      {
+        "label": "遂川县",
+        "value": "360827"
+      },
+      {
+        "label": "万安县",
+        "value": "360828"
+      },
+      {
+        "label": "安福县",
+        "value": "360829"
+      },
+      {
+        "label": "永新县",
+        "value": "360830"
+      },
+      {
+        "label": "井冈山市",
+        "value": "360881"
+      }
+    ],
+    [{
+        "label": "袁州区",
+        "value": "360902"
+      },
+      {
+        "label": "奉新县",
+        "value": "360921"
+      },
+      {
+        "label": "万载县",
+        "value": "360922"
+      },
+      {
+        "label": "上高县",
+        "value": "360923"
+      },
+      {
+        "label": "宜丰县",
+        "value": "360924"
+      },
+      {
+        "label": "靖安县",
+        "value": "360925"
+      },
+      {
+        "label": "铜鼓县",
+        "value": "360926"
+      },
+      {
+        "label": "丰城市",
+        "value": "360981"
+      },
+      {
+        "label": "樟树市",
+        "value": "360982"
+      },
+      {
+        "label": "高安市",
+        "value": "360983"
+      }
+    ],
+    [{
+        "label": "临川区",
+        "value": "361002"
+      },
+      {
+        "label": "东乡区",
+        "value": "361003"
+      },
+      {
+        "label": "南城县",
+        "value": "361021"
+      },
+      {
+        "label": "黎川县",
+        "value": "361022"
+      },
+      {
+        "label": "南丰县",
+        "value": "361023"
+      },
+      {
+        "label": "崇仁县",
+        "value": "361024"
+      },
+      {
+        "label": "乐安县",
+        "value": "361025"
+      },
+      {
+        "label": "宜黄县",
+        "value": "361026"
+      },
+      {
+        "label": "金溪县",
+        "value": "361027"
+      },
+      {
+        "label": "资溪县",
+        "value": "361028"
+      },
+      {
+        "label": "广昌县",
+        "value": "361030"
+      }
+    ],
+    [{
+        "label": "信州区",
+        "value": "361102"
+      },
+      {
+        "label": "广丰区",
+        "value": "361103"
+      },
+      {
+        "label": "上饶县",
+        "value": "361121"
+      },
+      {
+        "label": "玉山县",
+        "value": "361123"
+      },
+      {
+        "label": "铅山县",
+        "value": "361124"
+      },
+      {
+        "label": "横峰县",
+        "value": "361125"
+      },
+      {
+        "label": "弋阳县",
+        "value": "361126"
+      },
+      {
+        "label": "余干县",
+        "value": "361127"
+      },
+      {
+        "label": "鄱阳县",
+        "value": "361128"
+      },
+      {
+        "label": "万年县",
+        "value": "361129"
+      },
+      {
+        "label": "婺源县",
+        "value": "361130"
+      },
+      {
+        "label": "德兴市",
+        "value": "361181"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "历下区",
+        "value": "370102"
+      },
+      {
+        "label": "市中区",
+        "value": "370103"
+      },
+      {
+        "label": "槐荫区",
+        "value": "370104"
+      },
+      {
+        "label": "天桥区",
+        "value": "370105"
+      },
+      {
+        "label": "历城区",
+        "value": "370112"
+      },
+      {
+        "label": "长清区",
+        "value": "370113"
+      },
+      {
+        "label": "章丘区",
+        "value": "370114"
+      },
+      {
+        "label": "平阴县",
+        "value": "370124"
+      },
+      {
+        "label": "济阳县",
+        "value": "370125"
+      },
+      {
+        "label": "商河县",
+        "value": "370126"
+      },
+      {
+        "label": "济南高新技术产业开发区",
+        "value": "370171"
+      }
+    ],
+    [{
+        "label": "市南区",
+        "value": "370202"
+      },
+      {
+        "label": "市北区",
+        "value": "370203"
+      },
+      {
+        "label": "黄岛区",
+        "value": "370211"
+      },
+      {
+        "label": "崂山区",
+        "value": "370212"
+      },
+      {
+        "label": "李沧区",
+        "value": "370213"
+      },
+      {
+        "label": "城阳区",
+        "value": "370214"
+      },
+      {
+        "label": "即墨区",
+        "value": "370215"
+      },
+      {
+        "label": "青岛高新技术产业开发区",
+        "value": "370271"
+      },
+      {
+        "label": "胶州市",
+        "value": "370281"
+      },
+      {
+        "label": "平度市",
+        "value": "370283"
+      },
+      {
+        "label": "莱西市",
+        "value": "370285"
+      }
+    ],
+    [{
+        "label": "淄川区",
+        "value": "370302"
+      },
+      {
+        "label": "张店区",
+        "value": "370303"
+      },
+      {
+        "label": "博山区",
+        "value": "370304"
+      },
+      {
+        "label": "临淄区",
+        "value": "370305"
+      },
+      {
+        "label": "周村区",
+        "value": "370306"
+      },
+      {
+        "label": "桓台县",
+        "value": "370321"
+      },
+      {
+        "label": "高青县",
+        "value": "370322"
+      },
+      {
+        "label": "沂源县",
+        "value": "370323"
+      }
+    ],
+    [{
+        "label": "市中区",
+        "value": "370402"
+      },
+      {
+        "label": "薛城区",
+        "value": "370403"
+      },
+      {
+        "label": "峄城区",
+        "value": "370404"
+      },
+      {
+        "label": "台儿庄区",
+        "value": "370405"
+      },
+      {
+        "label": "山亭区",
+        "value": "370406"
+      },
+      {
+        "label": "滕州市",
+        "value": "370481"
+      }
+    ],
+    [{
+        "label": "东营区",
+        "value": "370502"
+      },
+      {
+        "label": "河口区",
+        "value": "370503"
+      },
+      {
+        "label": "垦利区",
+        "value": "370505"
+      },
+      {
+        "label": "利津县",
+        "value": "370522"
+      },
+      {
+        "label": "广饶县",
+        "value": "370523"
+      },
+      {
+        "label": "东营经济技术开发区",
+        "value": "370571"
+      },
+      {
+        "label": "东营港经济开发区",
+        "value": "370572"
+      }
+    ],
+    [{
+        "label": "芝罘区",
+        "value": "370602"
+      },
+      {
+        "label": "福山区",
+        "value": "370611"
+      },
+      {
+        "label": "牟平区",
+        "value": "370612"
+      },
+      {
+        "label": "莱山区",
+        "value": "370613"
+      },
+      {
+        "label": "长岛县",
+        "value": "370634"
+      },
+      {
+        "label": "烟台高新技术产业开发区",
+        "value": "370671"
+      },
+      {
+        "label": "烟台经济技术开发区",
+        "value": "370672"
+      },
+      {
+        "label": "龙口市",
+        "value": "370681"
+      },
+      {
+        "label": "莱阳市",
+        "value": "370682"
+      },
+      {
+        "label": "莱州市",
+        "value": "370683"
+      },
+      {
+        "label": "蓬莱市",
+        "value": "370684"
+      },
+      {
+        "label": "招远市",
+        "value": "370685"
+      },
+      {
+        "label": "栖霞市",
+        "value": "370686"
+      },
+      {
+        "label": "海阳市",
+        "value": "370687"
+      }
+    ],
+    [{
+        "label": "潍城区",
+        "value": "370702"
+      },
+      {
+        "label": "寒亭区",
+        "value": "370703"
+      },
+      {
+        "label": "坊子区",
+        "value": "370704"
+      },
+      {
+        "label": "奎文区",
+        "value": "370705"
+      },
+      {
+        "label": "临朐县",
+        "value": "370724"
+      },
+      {
+        "label": "昌乐县",
+        "value": "370725"
+      },
+      {
+        "label": "潍坊滨海经济技术开发区",
+        "value": "370772"
+      },
+      {
+        "label": "青州市",
+        "value": "370781"
+      },
+      {
+        "label": "诸城市",
+        "value": "370782"
+      },
+      {
+        "label": "寿光市",
+        "value": "370783"
+      },
+      {
+        "label": "安丘市",
+        "value": "370784"
+      },
+      {
+        "label": "高密市",
+        "value": "370785"
+      },
+      {
+        "label": "昌邑市",
+        "value": "370786"
+      }
+    ],
+    [{
+        "label": "任城区",
+        "value": "370811"
+      },
+      {
+        "label": "兖州区",
+        "value": "370812"
+      },
+      {
+        "label": "微山县",
+        "value": "370826"
+      },
+      {
+        "label": "鱼台县",
+        "value": "370827"
+      },
+      {
+        "label": "金乡县",
+        "value": "370828"
+      },
+      {
+        "label": "嘉祥县",
+        "value": "370829"
+      },
+      {
+        "label": "汶上县",
+        "value": "370830"
+      },
+      {
+        "label": "泗水县",
+        "value": "370831"
+      },
+      {
+        "label": "梁山县",
+        "value": "370832"
+      },
+      {
+        "label": "济宁高新技术产业开发区",
+        "value": "370871"
+      },
+      {
+        "label": "曲阜市",
+        "value": "370881"
+      },
+      {
+        "label": "邹城市",
+        "value": "370883"
+      }
+    ],
+    [{
+        "label": "泰山区",
+        "value": "370902"
+      },
+      {
+        "label": "岱岳区",
+        "value": "370911"
+      },
+      {
+        "label": "宁阳县",
+        "value": "370921"
+      },
+      {
+        "label": "东平县",
+        "value": "370923"
+      },
+      {
+        "label": "新泰市",
+        "value": "370982"
+      },
+      {
+        "label": "肥城市",
+        "value": "370983"
+      }
+    ],
+    [{
+        "label": "环翠区",
+        "value": "371002"
+      },
+      {
+        "label": "文登区",
+        "value": "371003"
+      },
+      {
+        "label": "威海火炬高技术产业开发区",
+        "value": "371071"
+      },
+      {
+        "label": "威海经济技术开发区",
+        "value": "371072"
+      },
+      {
+        "label": "威海临港经济技术开发区",
+        "value": "371073"
+      },
+      {
+        "label": "荣成市",
+        "value": "371082"
+      },
+      {
+        "label": "乳山市",
+        "value": "371083"
+      }
+    ],
+    [{
+        "label": "东港区",
+        "value": "371102"
+      },
+      {
+        "label": "岚山区",
+        "value": "371103"
+      },
+      {
+        "label": "五莲县",
+        "value": "371121"
+      },
+      {
+        "label": "莒县",
+        "value": "371122"
+      },
+      {
+        "label": "日照经济技术开发区",
+        "value": "371171"
+      },
+      {
+        "label": "日照国际海洋城",
+        "value": "371172"
+      }
+    ],
+    [{
+        "label": "莱城区",
+        "value": "371202"
+      },
+      {
+        "label": "钢城区",
+        "value": "371203"
+      }
+    ],
+    [{
+        "label": "兰山区",
+        "value": "371302"
+      },
+      {
+        "label": "罗庄区",
+        "value": "371311"
+      },
+      {
+        "label": "河东区",
+        "value": "371312"
+      },
+      {
+        "label": "沂南县",
+        "value": "371321"
+      },
+      {
+        "label": "郯城县",
+        "value": "371322"
+      },
+      {
+        "label": "沂水县",
+        "value": "371323"
+      },
+      {
+        "label": "兰陵县",
+        "value": "371324"
+      },
+      {
+        "label": "费县",
+        "value": "371325"
+      },
+      {
+        "label": "平邑县",
+        "value": "371326"
+      },
+      {
+        "label": "莒南县",
+        "value": "371327"
+      },
+      {
+        "label": "蒙阴县",
+        "value": "371328"
+      },
+      {
+        "label": "临沭县",
+        "value": "371329"
+      },
+      {
+        "label": "临沂高新技术产业开发区",
+        "value": "371371"
+      },
+      {
+        "label": "临沂经济技术开发区",
+        "value": "371372"
+      },
+      {
+        "label": "临沂临港经济开发区",
+        "value": "371373"
+      }
+    ],
+    [{
+        "label": "德城区",
+        "value": "371402"
+      },
+      {
+        "label": "陵城区",
+        "value": "371403"
+      },
+      {
+        "label": "宁津县",
+        "value": "371422"
+      },
+      {
+        "label": "庆云县",
+        "value": "371423"
+      },
+      {
+        "label": "临邑县",
+        "value": "371424"
+      },
+      {
+        "label": "齐河县",
+        "value": "371425"
+      },
+      {
+        "label": "平原县",
+        "value": "371426"
+      },
+      {
+        "label": "夏津县",
+        "value": "371427"
+      },
+      {
+        "label": "武城县",
+        "value": "371428"
+      },
+      {
+        "label": "德州经济技术开发区",
+        "value": "371471"
+      },
+      {
+        "label": "德州运河经济开发区",
+        "value": "371472"
+      },
+      {
+        "label": "乐陵市",
+        "value": "371481"
+      },
+      {
+        "label": "禹城市",
+        "value": "371482"
+      }
+    ],
+    [{
+        "label": "东昌府区",
+        "value": "371502"
+      },
+      {
+        "label": "阳谷县",
+        "value": "371521"
+      },
+      {
+        "label": "莘县",
+        "value": "371522"
+      },
+      {
+        "label": "茌平县",
+        "value": "371523"
+      },
+      {
+        "label": "东阿县",
+        "value": "371524"
+      },
+      {
+        "label": "冠县",
+        "value": "371525"
+      },
+      {
+        "label": "高唐县",
+        "value": "371526"
+      },
+      {
+        "label": "临清市",
+        "value": "371581"
+      }
+    ],
+    [{
+        "label": "滨城区",
+        "value": "371602"
+      },
+      {
+        "label": "沾化区",
+        "value": "371603"
+      },
+      {
+        "label": "惠民县",
+        "value": "371621"
+      },
+      {
+        "label": "阳信县",
+        "value": "371622"
+      },
+      {
+        "label": "无棣县",
+        "value": "371623"
+      },
+      {
+        "label": "博兴县",
+        "value": "371625"
+      },
+      {
+        "label": "邹平县",
+        "value": "371626"
+      }
+    ],
+    [{
+        "label": "牡丹区",
+        "value": "371702"
+      },
+      {
+        "label": "定陶区",
+        "value": "371703"
+      },
+      {
+        "label": "曹县",
+        "value": "371721"
+      },
+      {
+        "label": "单县",
+        "value": "371722"
+      },
+      {
+        "label": "成武县",
+        "value": "371723"
+      },
+      {
+        "label": "巨野县",
+        "value": "371724"
+      },
+      {
+        "label": "郓城县",
+        "value": "371725"
+      },
+      {
+        "label": "鄄城县",
+        "value": "371726"
+      },
+      {
+        "label": "东明县",
+        "value": "371728"
+      },
+      {
+        "label": "菏泽经济技术开发区",
+        "value": "371771"
+      },
+      {
+        "label": "菏泽高新技术开发区",
+        "value": "371772"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "中原区",
+        "value": "410102"
+      },
+      {
+        "label": "二七区",
+        "value": "410103"
+      },
+      {
+        "label": "管城回族区",
+        "value": "410104"
+      },
+      {
+        "label": "金水区",
+        "value": "410105"
+      },
+      {
+        "label": "上街区",
+        "value": "410106"
+      },
+      {
+        "label": "惠济区",
+        "value": "410108"
+      },
+      {
+        "label": "中牟县",
+        "value": "410122"
+      },
+      {
+        "label": "郑州经济技术开发区",
+        "value": "410171"
+      },
+      {
+        "label": "郑州高新技术产业开发区",
+        "value": "410172"
+      },
+      {
+        "label": "郑州航空港经济综合实验区",
+        "value": "410173"
+      },
+      {
+        "label": "巩义市",
+        "value": "410181"
+      },
+      {
+        "label": "荥阳市",
+        "value": "410182"
+      },
+      {
+        "label": "新密市",
+        "value": "410183"
+      },
+      {
+        "label": "新郑市",
+        "value": "410184"
+      },
+      {
+        "label": "登封市",
+        "value": "410185"
+      }
+    ],
+    [{
+        "label": "龙亭区",
+        "value": "410202"
+      },
+      {
+        "label": "顺河回族区",
+        "value": "410203"
+      },
+      {
+        "label": "鼓楼区",
+        "value": "410204"
+      },
+      {
+        "label": "禹王台区",
+        "value": "410205"
+      },
+      {
+        "label": "祥符区",
+        "value": "410212"
+      },
+      {
+        "label": "杞县",
+        "value": "410221"
+      },
+      {
+        "label": "通许县",
+        "value": "410222"
+      },
+      {
+        "label": "尉氏县",
+        "value": "410223"
+      },
+      {
+        "label": "兰考县",
+        "value": "410225"
+      }
+    ],
+    [{
+        "label": "老城区",
+        "value": "410302"
+      },
+      {
+        "label": "西工区",
+        "value": "410303"
+      },
+      {
+        "label": "瀍河回族区",
+        "value": "410304"
+      },
+      {
+        "label": "涧西区",
+        "value": "410305"
+      },
+      {
+        "label": "吉利区",
+        "value": "410306"
+      },
+      {
+        "label": "洛龙区",
+        "value": "410311"
+      },
+      {
+        "label": "孟津县",
+        "value": "410322"
+      },
+      {
+        "label": "新安县",
+        "value": "410323"
+      },
+      {
+        "label": "栾川县",
+        "value": "410324"
+      },
+      {
+        "label": "嵩县",
+        "value": "410325"
+      },
+      {
+        "label": "汝阳县",
+        "value": "410326"
+      },
+      {
+        "label": "宜阳县",
+        "value": "410327"
+      },
+      {
+        "label": "洛宁县",
+        "value": "410328"
+      },
+      {
+        "label": "伊川县",
+        "value": "410329"
+      },
+      {
+        "label": "洛阳高新技术产业开发区",
+        "value": "410371"
+      },
+      {
+        "label": "偃师市",
+        "value": "410381"
+      }
+    ],
+    [{
+        "label": "新华区",
+        "value": "410402"
+      },
+      {
+        "label": "卫东区",
+        "value": "410403"
+      },
+      {
+        "label": "石龙区",
+        "value": "410404"
+      },
+      {
+        "label": "湛河区",
+        "value": "410411"
+      },
+      {
+        "label": "宝丰县",
+        "value": "410421"
+      },
+      {
+        "label": "叶县",
+        "value": "410422"
+      },
+      {
+        "label": "鲁山县",
+        "value": "410423"
+      },
+      {
+        "label": "郏县",
+        "value": "410425"
+      },
+      {
+        "label": "平顶山高新技术产业开发区",
+        "value": "410471"
+      },
+      {
+        "label": "平顶山市新城区",
+        "value": "410472"
+      },
+      {
+        "label": "舞钢市",
+        "value": "410481"
+      },
+      {
+        "label": "汝州市",
+        "value": "410482"
+      }
+    ],
+    [{
+        "label": "文峰区",
+        "value": "410502"
+      },
+      {
+        "label": "北关区",
+        "value": "410503"
+      },
+      {
+        "label": "殷都区",
+        "value": "410505"
+      },
+      {
+        "label": "龙安区",
+        "value": "410506"
+      },
+      {
+        "label": "安阳县",
+        "value": "410522"
+      },
+      {
+        "label": "汤阴县",
+        "value": "410523"
+      },
+      {
+        "label": "滑县",
+        "value": "410526"
+      },
+      {
+        "label": "内黄县",
+        "value": "410527"
+      },
+      {
+        "label": "安阳高新技术产业开发区",
+        "value": "410571"
+      },
+      {
+        "label": "林州市",
+        "value": "410581"
+      }
+    ],
+    [{
+        "label": "鹤山区",
+        "value": "410602"
+      },
+      {
+        "label": "山城区",
+        "value": "410603"
+      },
+      {
+        "label": "淇滨区",
+        "value": "410611"
+      },
+      {
+        "label": "浚县",
+        "value": "410621"
+      },
+      {
+        "label": "淇县",
+        "value": "410622"
+      },
+      {
+        "label": "鹤壁经济技术开发区",
+        "value": "410671"
+      }
+    ],
+    [{
+        "label": "红旗区",
+        "value": "410702"
+      },
+      {
+        "label": "卫滨区",
+        "value": "410703"
+      },
+      {
+        "label": "凤泉区",
+        "value": "410704"
+      },
+      {
+        "label": "牧野区",
+        "value": "410711"
+      },
+      {
+        "label": "新乡县",
+        "value": "410721"
+      },
+      {
+        "label": "获嘉县",
+        "value": "410724"
+      },
+      {
+        "label": "原阳县",
+        "value": "410725"
+      },
+      {
+        "label": "延津县",
+        "value": "410726"
+      },
+      {
+        "label": "封丘县",
+        "value": "410727"
+      },
+      {
+        "label": "长垣县",
+        "value": "410728"
+      },
+      {
+        "label": "新乡高新技术产业开发区",
+        "value": "410771"
+      },
+      {
+        "label": "新乡经济技术开发区",
+        "value": "410772"
+      },
+      {
+        "label": "新乡市平原城乡一体化示范区",
+        "value": "410773"
+      },
+      {
+        "label": "卫辉市",
+        "value": "410781"
+      },
+      {
+        "label": "辉县市",
+        "value": "410782"
+      }
+    ],
+    [{
+        "label": "解放区",
+        "value": "410802"
+      },
+      {
+        "label": "中站区",
+        "value": "410803"
+      },
+      {
+        "label": "马村区",
+        "value": "410804"
+      },
+      {
+        "label": "山阳区",
+        "value": "410811"
+      },
+      {
+        "label": "修武县",
+        "value": "410821"
+      },
+      {
+        "label": "博爱县",
+        "value": "410822"
+      },
+      {
+        "label": "武陟县",
+        "value": "410823"
+      },
+      {
+        "label": "温县",
+        "value": "410825"
+      },
+      {
+        "label": "焦作城乡一体化示范区",
+        "value": "410871"
+      },
+      {
+        "label": "沁阳市",
+        "value": "410882"
+      },
+      {
+        "label": "孟州市",
+        "value": "410883"
+      }
+    ],
+    [{
+        "label": "华龙区",
+        "value": "410902"
+      },
+      {
+        "label": "清丰县",
+        "value": "410922"
+      },
+      {
+        "label": "南乐县",
+        "value": "410923"
+      },
+      {
+        "label": "范县",
+        "value": "410926"
+      },
+      {
+        "label": "台前县",
+        "value": "410927"
+      },
+      {
+        "label": "濮阳县",
+        "value": "410928"
+      },
+      {
+        "label": "河南濮阳工业园区",
+        "value": "410971"
+      },
+      {
+        "label": "濮阳经济技术开发区",
+        "value": "410972"
+      }
+    ],
+    [{
+        "label": "魏都区",
+        "value": "411002"
+      },
+      {
+        "label": "建安区",
+        "value": "411003"
+      },
+      {
+        "label": "鄢陵县",
+        "value": "411024"
+      },
+      {
+        "label": "襄城县",
+        "value": "411025"
+      },
+      {
+        "label": "许昌经济技术开发区",
+        "value": "411071"
+      },
+      {
+        "label": "禹州市",
+        "value": "411081"
+      },
+      {
+        "label": "长葛市",
+        "value": "411082"
+      }
+    ],
+    [{
+        "label": "源汇区",
+        "value": "411102"
+      },
+      {
+        "label": "郾城区",
+        "value": "411103"
+      },
+      {
+        "label": "召陵区",
+        "value": "411104"
+      },
+      {
+        "label": "舞阳县",
+        "value": "411121"
+      },
+      {
+        "label": "临颍县",
+        "value": "411122"
+      },
+      {
+        "label": "漯河经济技术开发区",
+        "value": "411171"
+      }
+    ],
+    [{
+        "label": "湖滨区",
+        "value": "411202"
+      },
+      {
+        "label": "陕州区",
+        "value": "411203"
+      },
+      {
+        "label": "渑池县",
+        "value": "411221"
+      },
+      {
+        "label": "卢氏县",
+        "value": "411224"
+      },
+      {
+        "label": "河南三门峡经济开发区",
+        "value": "411271"
+      },
+      {
+        "label": "义马市",
+        "value": "411281"
+      },
+      {
+        "label": "灵宝市",
+        "value": "411282"
+      }
+    ],
+    [{
+        "label": "宛城区",
+        "value": "411302"
+      },
+      {
+        "label": "卧龙区",
+        "value": "411303"
+      },
+      {
+        "label": "南召县",
+        "value": "411321"
+      },
+      {
+        "label": "方城县",
+        "value": "411322"
+      },
+      {
+        "label": "西峡县",
+        "value": "411323"
+      },
+      {
+        "label": "镇平县",
+        "value": "411324"
+      },
+      {
+        "label": "内乡县",
+        "value": "411325"
+      },
+      {
+        "label": "淅川县",
+        "value": "411326"
+      },
+      {
+        "label": "社旗县",
+        "value": "411327"
+      },
+      {
+        "label": "唐河县",
+        "value": "411328"
+      },
+      {
+        "label": "新野县",
+        "value": "411329"
+      },
+      {
+        "label": "桐柏县",
+        "value": "411330"
+      },
+      {
+        "label": "南阳高新技术产业开发区",
+        "value": "411371"
+      },
+      {
+        "label": "南阳市城乡一体化示范区",
+        "value": "411372"
+      },
+      {
+        "label": "邓州市",
+        "value": "411381"
+      }
+    ],
+    [{
+        "label": "梁园区",
+        "value": "411402"
+      },
+      {
+        "label": "睢阳区",
+        "value": "411403"
+      },
+      {
+        "label": "民权县",
+        "value": "411421"
+      },
+      {
+        "label": "睢县",
+        "value": "411422"
+      },
+      {
+        "label": "宁陵县",
+        "value": "411423"
+      },
+      {
+        "label": "柘城县",
+        "value": "411424"
+      },
+      {
+        "label": "虞城县",
+        "value": "411425"
+      },
+      {
+        "label": "夏邑县",
+        "value": "411426"
+      },
+      {
+        "label": "豫东综合物流产业聚集区",
+        "value": "411471"
+      },
+      {
+        "label": "河南商丘经济开发区",
+        "value": "411472"
+      },
+      {
+        "label": "永城市",
+        "value": "411481"
+      }
+    ],
+    [{
+        "label": "浉河区",
+        "value": "411502"
+      },
+      {
+        "label": "平桥区",
+        "value": "411503"
+      },
+      {
+        "label": "罗山县",
+        "value": "411521"
+      },
+      {
+        "label": "光山县",
+        "value": "411522"
+      },
+      {
+        "label": "新县",
+        "value": "411523"
+      },
+      {
+        "label": "商城县",
+        "value": "411524"
+      },
+      {
+        "label": "固始县",
+        "value": "411525"
+      },
+      {
+        "label": "潢川县",
+        "value": "411526"
+      },
+      {
+        "label": "淮滨县",
+        "value": "411527"
+      },
+      {
+        "label": "息县",
+        "value": "411528"
+      },
+      {
+        "label": "信阳高新技术产业开发区",
+        "value": "411571"
+      }
+    ],
+    [{
+        "label": "川汇区",
+        "value": "411602"
+      },
+      {
+        "label": "扶沟县",
+        "value": "411621"
+      },
+      {
+        "label": "西华县",
+        "value": "411622"
+      },
+      {
+        "label": "商水县",
+        "value": "411623"
+      },
+      {
+        "label": "沈丘县",
+        "value": "411624"
+      },
+      {
+        "label": "郸城县",
+        "value": "411625"
+      },
+      {
+        "label": "淮阳县",
+        "value": "411626"
+      },
+      {
+        "label": "太康县",
+        "value": "411627"
+      },
+      {
+        "label": "鹿邑县",
+        "value": "411628"
+      },
+      {
+        "label": "河南周口经济开发区",
+        "value": "411671"
+      },
+      {
+        "label": "项城市",
+        "value": "411681"
+      }
+    ],
+    [{
+        "label": "驿城区",
+        "value": "411702"
+      },
+      {
+        "label": "西平县",
+        "value": "411721"
+      },
+      {
+        "label": "上蔡县",
+        "value": "411722"
+      },
+      {
+        "label": "平舆县",
+        "value": "411723"
+      },
+      {
+        "label": "正阳县",
+        "value": "411724"
+      },
+      {
+        "label": "确山县",
+        "value": "411725"
+      },
+      {
+        "label": "泌阳县",
+        "value": "411726"
+      },
+      {
+        "label": "汝南县",
+        "value": "411727"
+      },
+      {
+        "label": "遂平县",
+        "value": "411728"
+      },
+      {
+        "label": "新蔡县",
+        "value": "411729"
+      },
+      {
+        "label": "河南驻马店经济开发区",
+        "value": "411771"
+      }
+    ],
+    [{
+      "label": "济源市",
+      "value": "419001"
+    }]
+  ],
+  [
+    [{
+        "label": "江岸区",
+        "value": "420102"
+      },
+      {
+        "label": "江汉区",
+        "value": "420103"
+      },
+      {
+        "label": "硚口区",
+        "value": "420104"
+      },
+      {
+        "label": "汉阳区",
+        "value": "420105"
+      },
+      {
+        "label": "武昌区",
+        "value": "420106"
+      },
+      {
+        "label": "青山区",
+        "value": "420107"
+      },
+      {
+        "label": "洪山区",
+        "value": "420111"
+      },
+      {
+        "label": "东西湖区",
+        "value": "420112"
+      },
+      {
+        "label": "汉南区",
+        "value": "420113"
+      },
+      {
+        "label": "蔡甸区",
+        "value": "420114"
+      },
+      {
+        "label": "江夏区",
+        "value": "420115"
+      },
+      {
+        "label": "黄陂区",
+        "value": "420116"
+      },
+      {
+        "label": "新洲区",
+        "value": "420117"
+      }
+    ],
+    [{
+        "label": "黄石港区",
+        "value": "420202"
+      },
+      {
+        "label": "西塞山区",
+        "value": "420203"
+      },
+      {
+        "label": "下陆区",
+        "value": "420204"
+      },
+      {
+        "label": "铁山区",
+        "value": "420205"
+      },
+      {
+        "label": "阳新县",
+        "value": "420222"
+      },
+      {
+        "label": "大冶市",
+        "value": "420281"
+      }
+    ],
+    [{
+        "label": "茅箭区",
+        "value": "420302"
+      },
+      {
+        "label": "张湾区",
+        "value": "420303"
+      },
+      {
+        "label": "郧阳区",
+        "value": "420304"
+      },
+      {
+        "label": "郧西县",
+        "value": "420322"
+      },
+      {
+        "label": "竹山县",
+        "value": "420323"
+      },
+      {
+        "label": "竹溪县",
+        "value": "420324"
+      },
+      {
+        "label": "房县",
+        "value": "420325"
+      },
+      {
+        "label": "丹江口市",
+        "value": "420381"
+      }
+    ],
+    [{
+        "label": "西陵区",
+        "value": "420502"
+      },
+      {
+        "label": "伍家岗区",
+        "value": "420503"
+      },
+      {
+        "label": "点军区",
+        "value": "420504"
+      },
+      {
+        "label": "猇亭区",
+        "value": "420505"
+      },
+      {
+        "label": "夷陵区",
+        "value": "420506"
+      },
+      {
+        "label": "远安县",
+        "value": "420525"
+      },
+      {
+        "label": "兴山县",
+        "value": "420526"
+      },
+      {
+        "label": "秭归县",
+        "value": "420527"
+      },
+      {
+        "label": "长阳土家族自治县",
+        "value": "420528"
+      },
+      {
+        "label": "五峰土家族自治县",
+        "value": "420529"
+      },
+      {
+        "label": "宜都市",
+        "value": "420581"
+      },
+      {
+        "label": "当阳市",
+        "value": "420582"
+      },
+      {
+        "label": "枝江市",
+        "value": "420583"
+      }
+    ],
+    [{
+        "label": "襄城区",
+        "value": "420602"
+      },
+      {
+        "label": "樊城区",
+        "value": "420606"
+      },
+      {
+        "label": "襄州区",
+        "value": "420607"
+      },
+      {
+        "label": "南漳县",
+        "value": "420624"
+      },
+      {
+        "label": "谷城县",
+        "value": "420625"
+      },
+      {
+        "label": "保康县",
+        "value": "420626"
+      },
+      {
+        "label": "老河口市",
+        "value": "420682"
+      },
+      {
+        "label": "枣阳市",
+        "value": "420683"
+      },
+      {
+        "label": "宜城市",
+        "value": "420684"
+      }
+    ],
+    [{
+        "label": "梁子湖区",
+        "value": "420702"
+      },
+      {
+        "label": "华容区",
+        "value": "420703"
+      },
+      {
+        "label": "鄂城区",
+        "value": "420704"
+      }
+    ],
+    [{
+        "label": "东宝区",
+        "value": "420802"
+      },
+      {
+        "label": "掇刀区",
+        "value": "420804"
+      },
+      {
+        "label": "京山县",
+        "value": "420821"
+      },
+      {
+        "label": "沙洋县",
+        "value": "420822"
+      },
+      {
+        "label": "钟祥市",
+        "value": "420881"
+      }
+    ],
+    [{
+        "label": "孝南区",
+        "value": "420902"
+      },
+      {
+        "label": "孝昌县",
+        "value": "420921"
+      },
+      {
+        "label": "大悟县",
+        "value": "420922"
+      },
+      {
+        "label": "云梦县",
+        "value": "420923"
+      },
+      {
+        "label": "应城市",
+        "value": "420981"
+      },
+      {
+        "label": "安陆市",
+        "value": "420982"
+      },
+      {
+        "label": "汉川市",
+        "value": "420984"
+      }
+    ],
+    [{
+        "label": "沙市区",
+        "value": "421002"
+      },
+      {
+        "label": "荆州区",
+        "value": "421003"
+      },
+      {
+        "label": "公安县",
+        "value": "421022"
+      },
+      {
+        "label": "监利县",
+        "value": "421023"
+      },
+      {
+        "label": "江陵县",
+        "value": "421024"
+      },
+      {
+        "label": "荆州经济技术开发区",
+        "value": "421071"
+      },
+      {
+        "label": "石首市",
+        "value": "421081"
+      },
+      {
+        "label": "洪湖市",
+        "value": "421083"
+      },
+      {
+        "label": "松滋市",
+        "value": "421087"
+      }
+    ],
+    [{
+        "label": "黄州区",
+        "value": "421102"
+      },
+      {
+        "label": "团风县",
+        "value": "421121"
+      },
+      {
+        "label": "红安县",
+        "value": "421122"
+      },
+      {
+        "label": "罗田县",
+        "value": "421123"
+      },
+      {
+        "label": "英山县",
+        "value": "421124"
+      },
+      {
+        "label": "浠水县",
+        "value": "421125"
+      },
+      {
+        "label": "蕲春县",
+        "value": "421126"
+      },
+      {
+        "label": "黄梅县",
+        "value": "421127"
+      },
+      {
+        "label": "龙感湖管理区",
+        "value": "421171"
+      },
+      {
+        "label": "麻城市",
+        "value": "421181"
+      },
+      {
+        "label": "武穴市",
+        "value": "421182"
+      }
+    ],
+    [{
+        "label": "咸安区",
+        "value": "421202"
+      },
+      {
+        "label": "嘉鱼县",
+        "value": "421221"
+      },
+      {
+        "label": "通城县",
+        "value": "421222"
+      },
+      {
+        "label": "崇阳县",
+        "value": "421223"
+      },
+      {
+        "label": "通山县",
+        "value": "421224"
+      },
+      {
+        "label": "赤壁市",
+        "value": "421281"
+      }
+    ],
+    [{
+        "label": "曾都区",
+        "value": "421303"
+      },
+      {
+        "label": "随县",
+        "value": "421321"
+      },
+      {
+        "label": "广水市",
+        "value": "421381"
+      }
+    ],
+    [{
+        "label": "恩施市",
+        "value": "422801"
+      },
+      {
+        "label": "利川市",
+        "value": "422802"
+      },
+      {
+        "label": "建始县",
+        "value": "422822"
+      },
+      {
+        "label": "巴东县",
+        "value": "422823"
+      },
+      {
+        "label": "宣恩县",
+        "value": "422825"
+      },
+      {
+        "label": "咸丰县",
+        "value": "422826"
+      },
+      {
+        "label": "来凤县",
+        "value": "422827"
+      },
+      {
+        "label": "鹤峰县",
+        "value": "422828"
+      }
+    ],
+    [{
+        "label": "仙桃市",
+        "value": "429004"
+      },
+      {
+        "label": "潜江市",
+        "value": "429005"
+      },
+      {
+        "label": "天门市",
+        "value": "429006"
+      },
+      {
+        "label": "神农架林区",
+        "value": "429021"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "芙蓉区",
+        "value": "430102"
+      },
+      {
+        "label": "天心区",
+        "value": "430103"
+      },
+      {
+        "label": "岳麓区",
+        "value": "430104"
+      },
+      {
+        "label": "开福区",
+        "value": "430105"
+      },
+      {
+        "label": "雨花区",
+        "value": "430111"
+      },
+      {
+        "label": "望城区",
+        "value": "430112"
+      },
+      {
+        "label": "长沙县",
+        "value": "430121"
+      },
+      {
+        "label": "浏阳市",
+        "value": "430181"
+      },
+      {
+        "label": "宁乡市",
+        "value": "430182"
+      }
+    ],
+    [{
+        "label": "荷塘区",
+        "value": "430202"
+      },
+      {
+        "label": "芦淞区",
+        "value": "430203"
+      },
+      {
+        "label": "石峰区",
+        "value": "430204"
+      },
+      {
+        "label": "天元区",
+        "value": "430211"
+      },
+      {
+        "label": "株洲县",
+        "value": "430221"
+      },
+      {
+        "label": "攸县",
+        "value": "430223"
+      },
+      {
+        "label": "茶陵县",
+        "value": "430224"
+      },
+      {
+        "label": "炎陵县",
+        "value": "430225"
+      },
+      {
+        "label": "云龙示范区",
+        "value": "430271"
+      },
+      {
+        "label": "醴陵市",
+        "value": "430281"
+      }
+    ],
+    [{
+        "label": "雨湖区",
+        "value": "430302"
+      },
+      {
+        "label": "岳塘区",
+        "value": "430304"
+      },
+      {
+        "label": "湘潭县",
+        "value": "430321"
+      },
+      {
+        "label": "湖南湘潭高新技术产业园区",
+        "value": "430371"
+      },
+      {
+        "label": "湘潭昭山示范区",
+        "value": "430372"
+      },
+      {
+        "label": "湘潭九华示范区",
+        "value": "430373"
+      },
+      {
+        "label": "湘乡市",
+        "value": "430381"
+      },
+      {
+        "label": "韶山市",
+        "value": "430382"
+      }
+    ],
+    [{
+        "label": "珠晖区",
+        "value": "430405"
+      },
+      {
+        "label": "雁峰区",
+        "value": "430406"
+      },
+      {
+        "label": "石鼓区",
+        "value": "430407"
+      },
+      {
+        "label": "蒸湘区",
+        "value": "430408"
+      },
+      {
+        "label": "南岳区",
+        "value": "430412"
+      },
+      {
+        "label": "衡阳县",
+        "value": "430421"
+      },
+      {
+        "label": "衡南县",
+        "value": "430422"
+      },
+      {
+        "label": "衡山县",
+        "value": "430423"
+      },
+      {
+        "label": "衡东县",
+        "value": "430424"
+      },
+      {
+        "label": "祁东县",
+        "value": "430426"
+      },
+      {
+        "label": "衡阳综合保税区",
+        "value": "430471"
+      },
+      {
+        "label": "湖南衡阳高新技术产业园区",
+        "value": "430472"
+      },
+      {
+        "label": "湖南衡阳松木经济开发区",
+        "value": "430473"
+      },
+      {
+        "label": "耒阳市",
+        "value": "430481"
+      },
+      {
+        "label": "常宁市",
+        "value": "430482"
+      }
+    ],
+    [{
+        "label": "双清区",
+        "value": "430502"
+      },
+      {
+        "label": "大祥区",
+        "value": "430503"
+      },
+      {
+        "label": "北塔区",
+        "value": "430511"
+      },
+      {
+        "label": "邵东县",
+        "value": "430521"
+      },
+      {
+        "label": "新邵县",
+        "value": "430522"
+      },
+      {
+        "label": "邵阳县",
+        "value": "430523"
+      },
+      {
+        "label": "隆回县",
+        "value": "430524"
+      },
+      {
+        "label": "洞口县",
+        "value": "430525"
+      },
+      {
+        "label": "绥宁县",
+        "value": "430527"
+      },
+      {
+        "label": "新宁县",
+        "value": "430528"
+      },
+      {
+        "label": "城步苗族自治县",
+        "value": "430529"
+      },
+      {
+        "label": "武冈市",
+        "value": "430581"
+      }
+    ],
+    [{
+        "label": "岳阳楼区",
+        "value": "430602"
+      },
+      {
+        "label": "云溪区",
+        "value": "430603"
+      },
+      {
+        "label": "君山区",
+        "value": "430611"
+      },
+      {
+        "label": "岳阳县",
+        "value": "430621"
+      },
+      {
+        "label": "华容县",
+        "value": "430623"
+      },
+      {
+        "label": "湘阴县",
+        "value": "430624"
+      },
+      {
+        "label": "平江县",
+        "value": "430626"
+      },
+      {
+        "label": "岳阳市屈原管理区",
+        "value": "430671"
+      },
+      {
+        "label": "汨罗市",
+        "value": "430681"
+      },
+      {
+        "label": "临湘市",
+        "value": "430682"
+      }
+    ],
+    [{
+        "label": "武陵区",
+        "value": "430702"
+      },
+      {
+        "label": "鼎城区",
+        "value": "430703"
+      },
+      {
+        "label": "安乡县",
+        "value": "430721"
+      },
+      {
+        "label": "汉寿县",
+        "value": "430722"
+      },
+      {
+        "label": "澧县",
+        "value": "430723"
+      },
+      {
+        "label": "临澧县",
+        "value": "430724"
+      },
+      {
+        "label": "桃源县",
+        "value": "430725"
+      },
+      {
+        "label": "石门县",
+        "value": "430726"
+      },
+      {
+        "label": "常德市西洞庭管理区",
+        "value": "430771"
+      },
+      {
+        "label": "津市市",
+        "value": "430781"
+      }
+    ],
+    [{
+        "label": "永定区",
+        "value": "430802"
+      },
+      {
+        "label": "武陵源区",
+        "value": "430811"
+      },
+      {
+        "label": "慈利县",
+        "value": "430821"
+      },
+      {
+        "label": "桑植县",
+        "value": "430822"
+      }
+    ],
+    [{
+        "label": "资阳区",
+        "value": "430902"
+      },
+      {
+        "label": "赫山区",
+        "value": "430903"
+      },
+      {
+        "label": "南县",
+        "value": "430921"
+      },
+      {
+        "label": "桃江县",
+        "value": "430922"
+      },
+      {
+        "label": "安化县",
+        "value": "430923"
+      },
+      {
+        "label": "益阳市大通湖管理区",
+        "value": "430971"
+      },
+      {
+        "label": "湖南益阳高新技术产业园区",
+        "value": "430972"
+      },
+      {
+        "label": "沅江市",
+        "value": "430981"
+      }
+    ],
+    [{
+        "label": "北湖区",
+        "value": "431002"
+      },
+      {
+        "label": "苏仙区",
+        "value": "431003"
+      },
+      {
+        "label": "桂阳县",
+        "value": "431021"
+      },
+      {
+        "label": "宜章县",
+        "value": "431022"
+      },
+      {
+        "label": "永兴县",
+        "value": "431023"
+      },
+      {
+        "label": "嘉禾县",
+        "value": "431024"
+      },
+      {
+        "label": "临武县",
+        "value": "431025"
+      },
+      {
+        "label": "汝城县",
+        "value": "431026"
+      },
+      {
+        "label": "桂东县",
+        "value": "431027"
+      },
+      {
+        "label": "安仁县",
+        "value": "431028"
+      },
+      {
+        "label": "资兴市",
+        "value": "431081"
+      }
+    ],
+    [{
+        "label": "零陵区",
+        "value": "431102"
+      },
+      {
+        "label": "冷水滩区",
+        "value": "431103"
+      },
+      {
+        "label": "祁阳县",
+        "value": "431121"
+      },
+      {
+        "label": "东安县",
+        "value": "431122"
+      },
+      {
+        "label": "双牌县",
+        "value": "431123"
+      },
+      {
+        "label": "道县",
+        "value": "431124"
+      },
+      {
+        "label": "江永县",
+        "value": "431125"
+      },
+      {
+        "label": "宁远县",
+        "value": "431126"
+      },
+      {
+        "label": "蓝山县",
+        "value": "431127"
+      },
+      {
+        "label": "新田县",
+        "value": "431128"
+      },
+      {
+        "label": "江华瑶族自治县",
+        "value": "431129"
+      },
+      {
+        "label": "永州经济技术开发区",
+        "value": "431171"
+      },
+      {
+        "label": "永州市金洞管理区",
+        "value": "431172"
+      },
+      {
+        "label": "永州市回龙圩管理区",
+        "value": "431173"
+      }
+    ],
+    [{
+        "label": "鹤城区",
+        "value": "431202"
+      },
+      {
+        "label": "中方县",
+        "value": "431221"
+      },
+      {
+        "label": "沅陵县",
+        "value": "431222"
+      },
+      {
+        "label": "辰溪县",
+        "value": "431223"
+      },
+      {
+        "label": "溆浦县",
+        "value": "431224"
+      },
+      {
+        "label": "会同县",
+        "value": "431225"
+      },
+      {
+        "label": "麻阳苗族自治县",
+        "value": "431226"
+      },
+      {
+        "label": "新晃侗族自治县",
+        "value": "431227"
+      },
+      {
+        "label": "芷江侗族自治县",
+        "value": "431228"
+      },
+      {
+        "label": "靖州苗族侗族自治县",
+        "value": "431229"
+      },
+      {
+        "label": "通道侗族自治县",
+        "value": "431230"
+      },
+      {
+        "label": "怀化市洪江管理区",
+        "value": "431271"
+      },
+      {
+        "label": "洪江市",
+        "value": "431281"
+      }
+    ],
+    [{
+        "label": "娄星区",
+        "value": "431302"
+      },
+      {
+        "label": "双峰县",
+        "value": "431321"
+      },
+      {
+        "label": "新化县",
+        "value": "431322"
+      },
+      {
+        "label": "冷水江市",
+        "value": "431381"
+      },
+      {
+        "label": "涟源市",
+        "value": "431382"
+      }
+    ],
+    [{
+        "label": "吉首市",
+        "value": "433101"
+      },
+      {
+        "label": "泸溪县",
+        "value": "433122"
+      },
+      {
+        "label": "凤凰县",
+        "value": "433123"
+      },
+      {
+        "label": "花垣县",
+        "value": "433124"
+      },
+      {
+        "label": "保靖县",
+        "value": "433125"
+      },
+      {
+        "label": "古丈县",
+        "value": "433126"
+      },
+      {
+        "label": "永顺县",
+        "value": "433127"
+      },
+      {
+        "label": "龙山县",
+        "value": "433130"
+      },
+      {
+        "label": "湖南吉首经济开发区",
+        "value": "433172"
+      },
+      {
+        "label": "湖南永顺经济开发区",
+        "value": "433173"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "荔湾区",
+        "value": "440103"
+      },
+      {
+        "label": "越秀区",
+        "value": "440104"
+      },
+      {
+        "label": "海珠区",
+        "value": "440105"
+      },
+      {
+        "label": "天河区",
+        "value": "440106"
+      },
+      {
+        "label": "白云区",
+        "value": "440111"
+      },
+      {
+        "label": "黄埔区",
+        "value": "440112"
+      },
+      {
+        "label": "番禺区",
+        "value": "440113"
+      },
+      {
+        "label": "花都区",
+        "value": "440114"
+      },
+      {
+        "label": "南沙区",
+        "value": "440115"
+      },
+      {
+        "label": "从化区",
+        "value": "440117"
+      },
+      {
+        "label": "增城区",
+        "value": "440118"
+      }
+    ],
+    [{
+        "label": "武江区",
+        "value": "440203"
+      },
+      {
+        "label": "浈江区",
+        "value": "440204"
+      },
+      {
+        "label": "曲江区",
+        "value": "440205"
+      },
+      {
+        "label": "始兴县",
+        "value": "440222"
+      },
+      {
+        "label": "仁化县",
+        "value": "440224"
+      },
+      {
+        "label": "翁源县",
+        "value": "440229"
+      },
+      {
+        "label": "乳源瑶族自治县",
+        "value": "440232"
+      },
+      {
+        "label": "新丰县",
+        "value": "440233"
+      },
+      {
+        "label": "乐昌市",
+        "value": "440281"
+      },
+      {
+        "label": "南雄市",
+        "value": "440282"
+      }
+    ],
+    [{
+        "label": "罗湖区",
+        "value": "440303"
+      },
+      {
+        "label": "福田区",
+        "value": "440304"
+      },
+      {
+        "label": "南山区",
+        "value": "440305"
+      },
+      {
+        "label": "宝安区",
+        "value": "440306"
+      },
+      {
+        "label": "龙岗区",
+        "value": "440307"
+      },
+      {
+        "label": "盐田区",
+        "value": "440308"
+      },
+      {
+        "label": "龙华区",
+        "value": "440309"
+      },
+      {
+        "label": "坪山区",
+        "value": "440310"
+      }
+    ],
+    [{
+        "label": "香洲区",
+        "value": "440402"
+      },
+      {
+        "label": "斗门区",
+        "value": "440403"
+      },
+      {
+        "label": "金湾区",
+        "value": "440404"
+      }
+    ],
+    [{
+        "label": "龙湖区",
+        "value": "440507"
+      },
+      {
+        "label": "金平区",
+        "value": "440511"
+      },
+      {
+        "label": "濠江区",
+        "value": "440512"
+      },
+      {
+        "label": "潮阳区",
+        "value": "440513"
+      },
+      {
+        "label": "潮南区",
+        "value": "440514"
+      },
+      {
+        "label": "澄海区",
+        "value": "440515"
+      },
+      {
+        "label": "南澳县",
+        "value": "440523"
+      }
+    ],
+    [{
+        "label": "禅城区",
+        "value": "440604"
+      },
+      {
+        "label": "南海区",
+        "value": "440605"
+      },
+      {
+        "label": "顺德区",
+        "value": "440606"
+      },
+      {
+        "label": "三水区",
+        "value": "440607"
+      },
+      {
+        "label": "高明区",
+        "value": "440608"
+      }
+    ],
+    [{
+        "label": "蓬江区",
+        "value": "440703"
+      },
+      {
+        "label": "江海区",
+        "value": "440704"
+      },
+      {
+        "label": "新会区",
+        "value": "440705"
+      },
+      {
+        "label": "台山市",
+        "value": "440781"
+      },
+      {
+        "label": "开平市",
+        "value": "440783"
+      },
+      {
+        "label": "鹤山市",
+        "value": "440784"
+      },
+      {
+        "label": "恩平市",
+        "value": "440785"
+      }
+    ],
+    [{
+        "label": "赤坎区",
+        "value": "440802"
+      },
+      {
+        "label": "霞山区",
+        "value": "440803"
+      },
+      {
+        "label": "坡头区",
+        "value": "440804"
+      },
+      {
+        "label": "麻章区",
+        "value": "440811"
+      },
+      {
+        "label": "遂溪县",
+        "value": "440823"
+      },
+      {
+        "label": "徐闻县",
+        "value": "440825"
+      },
+      {
+        "label": "廉江市",
+        "value": "440881"
+      },
+      {
+        "label": "雷州市",
+        "value": "440882"
+      },
+      {
+        "label": "吴川市",
+        "value": "440883"
+      }
+    ],
+    [{
+        "label": "茂南区",
+        "value": "440902"
+      },
+      {
+        "label": "电白区",
+        "value": "440904"
+      },
+      {
+        "label": "高州市",
+        "value": "440981"
+      },
+      {
+        "label": "化州市",
+        "value": "440982"
+      },
+      {
+        "label": "信宜市",
+        "value": "440983"
+      }
+    ],
+    [{
+        "label": "端州区",
+        "value": "441202"
+      },
+      {
+        "label": "鼎湖区",
+        "value": "441203"
+      },
+      {
+        "label": "高要区",
+        "value": "441204"
+      },
+      {
+        "label": "广宁县",
+        "value": "441223"
+      },
+      {
+        "label": "怀集县",
+        "value": "441224"
+      },
+      {
+        "label": "封开县",
+        "value": "441225"
+      },
+      {
+        "label": "德庆县",
+        "value": "441226"
+      },
+      {
+        "label": "四会市",
+        "value": "441284"
+      }
+    ],
+    [{
+        "label": "惠城区",
+        "value": "441302"
+      },
+      {
+        "label": "惠阳区",
+        "value": "441303"
+      },
+      {
+        "label": "博罗县",
+        "value": "441322"
+      },
+      {
+        "label": "惠东县",
+        "value": "441323"
+      },
+      {
+        "label": "龙门县",
+        "value": "441324"
+      }
+    ],
+    [{
+        "label": "梅江区",
+        "value": "441402"
+      },
+      {
+        "label": "梅县区",
+        "value": "441403"
+      },
+      {
+        "label": "大埔县",
+        "value": "441422"
+      },
+      {
+        "label": "丰顺县",
+        "value": "441423"
+      },
+      {
+        "label": "五华县",
+        "value": "441424"
+      },
+      {
+        "label": "平远县",
+        "value": "441426"
+      },
+      {
+        "label": "蕉岭县",
+        "value": "441427"
+      },
+      {
+        "label": "兴宁市",
+        "value": "441481"
+      }
+    ],
+    [{
+        "label": "城区",
+        "value": "441502"
+      },
+      {
+        "label": "海丰县",
+        "value": "441521"
+      },
+      {
+        "label": "陆河县",
+        "value": "441523"
+      },
+      {
+        "label": "陆丰市",
+        "value": "441581"
+      }
+    ],
+    [{
+        "label": "源城区",
+        "value": "441602"
+      },
+      {
+        "label": "紫金县",
+        "value": "441621"
+      },
+      {
+        "label": "龙川县",
+        "value": "441622"
+      },
+      {
+        "label": "连平县",
+        "value": "441623"
+      },
+      {
+        "label": "和平县",
+        "value": "441624"
+      },
+      {
+        "label": "东源县",
+        "value": "441625"
+      }
+    ],
+    [{
+        "label": "江城区",
+        "value": "441702"
+      },
+      {
+        "label": "阳东区",
+        "value": "441704"
+      },
+      {
+        "label": "阳西县",
+        "value": "441721"
+      },
+      {
+        "label": "阳春市",
+        "value": "441781"
+      }
+    ],
+    [{
+        "label": "清城区",
+        "value": "441802"
+      },
+      {
+        "label": "清新区",
+        "value": "441803"
+      },
+      {
+        "label": "佛冈县",
+        "value": "441821"
+      },
+      {
+        "label": "阳山县",
+        "value": "441823"
+      },
+      {
+        "label": "连山壮族瑶族自治县",
+        "value": "441825"
+      },
+      {
+        "label": "连南瑶族自治县",
+        "value": "441826"
+      },
+      {
+        "label": "英德市",
+        "value": "441881"
+      },
+      {
+        "label": "连州市",
+        "value": "441882"
+      }
+    ],
+    [{
+      "label": "东莞市",
+      "value": "441900"
+    }],
+    [{
+      "label": "中山市",
+      "value": "442000"
+    }],
+    [{
+        "label": "湘桥区",
+        "value": "445102"
+      },
+      {
+        "label": "潮安区",
+        "value": "445103"
+      },
+      {
+        "label": "饶平县",
+        "value": "445122"
+      }
+    ],
+    [{
+        "label": "榕城区",
+        "value": "445202"
+      },
+      {
+        "label": "揭东区",
+        "value": "445203"
+      },
+      {
+        "label": "揭西县",
+        "value": "445222"
+      },
+      {
+        "label": "惠来县",
+        "value": "445224"
+      },
+      {
+        "label": "普宁市",
+        "value": "445281"
+      }
+    ],
+    [{
+        "label": "云城区",
+        "value": "445302"
+      },
+      {
+        "label": "云安区",
+        "value": "445303"
+      },
+      {
+        "label": "新兴县",
+        "value": "445321"
+      },
+      {
+        "label": "郁南县",
+        "value": "445322"
+      },
+      {
+        "label": "罗定市",
+        "value": "445381"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "兴宁区",
+        "value": "450102"
+      },
+      {
+        "label": "青秀区",
+        "value": "450103"
+      },
+      {
+        "label": "江南区",
+        "value": "450105"
+      },
+      {
+        "label": "西乡塘区",
+        "value": "450107"
+      },
+      {
+        "label": "良庆区",
+        "value": "450108"
+      },
+      {
+        "label": "邕宁区",
+        "value": "450109"
+      },
+      {
+        "label": "武鸣区",
+        "value": "450110"
+      },
+      {
+        "label": "隆安县",
+        "value": "450123"
+      },
+      {
+        "label": "马山县",
+        "value": "450124"
+      },
+      {
+        "label": "上林县",
+        "value": "450125"
+      },
+      {
+        "label": "宾阳县",
+        "value": "450126"
+      },
+      {
+        "label": "横县",
+        "value": "450127"
+      }
+    ],
+    [{
+        "label": "城中区",
+        "value": "450202"
+      },
+      {
+        "label": "鱼峰区",
+        "value": "450203"
+      },
+      {
+        "label": "柳南区",
+        "value": "450204"
+      },
+      {
+        "label": "柳北区",
+        "value": "450205"
+      },
+      {
+        "label": "柳江区",
+        "value": "450206"
+      },
+      {
+        "label": "柳城县",
+        "value": "450222"
+      },
+      {
+        "label": "鹿寨县",
+        "value": "450223"
+      },
+      {
+        "label": "融安县",
+        "value": "450224"
+      },
+      {
+        "label": "融水苗族自治县",
+        "value": "450225"
+      },
+      {
+        "label": "三江侗族自治县",
+        "value": "450226"
+      }
+    ],
+    [{
+        "label": "秀峰区",
+        "value": "450302"
+      },
+      {
+        "label": "叠彩区",
+        "value": "450303"
+      },
+      {
+        "label": "象山区",
+        "value": "450304"
+      },
+      {
+        "label": "七星区",
+        "value": "450305"
+      },
+      {
+        "label": "雁山区",
+        "value": "450311"
+      },
+      {
+        "label": "临桂区",
+        "value": "450312"
+      },
+      {
+        "label": "阳朔县",
+        "value": "450321"
+      },
+      {
+        "label": "灵川县",
+        "value": "450323"
+      },
+      {
+        "label": "全州县",
+        "value": "450324"
+      },
+      {
+        "label": "兴安县",
+        "value": "450325"
+      },
+      {
+        "label": "永福县",
+        "value": "450326"
+      },
+      {
+        "label": "灌阳县",
+        "value": "450327"
+      },
+      {
+        "label": "龙胜各族自治县",
+        "value": "450328"
+      },
+      {
+        "label": "资源县",
+        "value": "450329"
+      },
+      {
+        "label": "平乐县",
+        "value": "450330"
+      },
+      {
+        "label": "荔浦县",
+        "value": "450331"
+      },
+      {
+        "label": "恭城瑶族自治县",
+        "value": "450332"
+      }
+    ],
+    [{
+        "label": "万秀区",
+        "value": "450403"
+      },
+      {
+        "label": "长洲区",
+        "value": "450405"
+      },
+      {
+        "label": "龙圩区",
+        "value": "450406"
+      },
+      {
+        "label": "苍梧县",
+        "value": "450421"
+      },
+      {
+        "label": "藤县",
+        "value": "450422"
+      },
+      {
+        "label": "蒙山县",
+        "value": "450423"
+      },
+      {
+        "label": "岑溪市",
+        "value": "450481"
+      }
+    ],
+    [{
+        "label": "海城区",
+        "value": "450502"
+      },
+      {
+        "label": "银海区",
+        "value": "450503"
+      },
+      {
+        "label": "铁山港区",
+        "value": "450512"
+      },
+      {
+        "label": "合浦县",
+        "value": "450521"
+      }
+    ],
+    [{
+        "label": "港口区",
+        "value": "450602"
+      },
+      {
+        "label": "防城区",
+        "value": "450603"
+      },
+      {
+        "label": "上思县",
+        "value": "450621"
+      },
+      {
+        "label": "东兴市",
+        "value": "450681"
+      }
+    ],
+    [{
+        "label": "钦南区",
+        "value": "450702"
+      },
+      {
+        "label": "钦北区",
+        "value": "450703"
+      },
+      {
+        "label": "灵山县",
+        "value": "450721"
+      },
+      {
+        "label": "浦北县",
+        "value": "450722"
+      }
+    ],
+    [{
+        "label": "港北区",
+        "value": "450802"
+      },
+      {
+        "label": "港南区",
+        "value": "450803"
+      },
+      {
+        "label": "覃塘区",
+        "value": "450804"
+      },
+      {
+        "label": "平南县",
+        "value": "450821"
+      },
+      {
+        "label": "桂平市",
+        "value": "450881"
+      }
+    ],
+    [{
+        "label": "玉州区",
+        "value": "450902"
+      },
+      {
+        "label": "福绵区",
+        "value": "450903"
+      },
+      {
+        "label": "容县",
+        "value": "450921"
+      },
+      {
+        "label": "陆川县",
+        "value": "450922"
+      },
+      {
+        "label": "博白县",
+        "value": "450923"
+      },
+      {
+        "label": "兴业县",
+        "value": "450924"
+      },
+      {
+        "label": "北流市",
+        "value": "450981"
+      }
+    ],
+    [{
+        "label": "右江区",
+        "value": "451002"
+      },
+      {
+        "label": "田阳县",
+        "value": "451021"
+      },
+      {
+        "label": "田东县",
+        "value": "451022"
+      },
+      {
+        "label": "平果县",
+        "value": "451023"
+      },
+      {
+        "label": "德保县",
+        "value": "451024"
+      },
+      {
+        "label": "那坡县",
+        "value": "451026"
+      },
+      {
+        "label": "凌云县",
+        "value": "451027"
+      },
+      {
+        "label": "乐业县",
+        "value": "451028"
+      },
+      {
+        "label": "田林县",
+        "value": "451029"
+      },
+      {
+        "label": "西林县",
+        "value": "451030"
+      },
+      {
+        "label": "隆林各族自治县",
+        "value": "451031"
+      },
+      {
+        "label": "靖西市",
+        "value": "451081"
+      }
+    ],
+    [{
+        "label": "八步区",
+        "value": "451102"
+      },
+      {
+        "label": "平桂区",
+        "value": "451103"
+      },
+      {
+        "label": "昭平县",
+        "value": "451121"
+      },
+      {
+        "label": "钟山县",
+        "value": "451122"
+      },
+      {
+        "label": "富川瑶族自治县",
+        "value": "451123"
+      }
+    ],
+    [{
+        "label": "金城江区",
+        "value": "451202"
+      },
+      {
+        "label": "宜州区",
+        "value": "451203"
+      },
+      {
+        "label": "南丹县",
+        "value": "451221"
+      },
+      {
+        "label": "天峨县",
+        "value": "451222"
+      },
+      {
+        "label": "凤山县",
+        "value": "451223"
+      },
+      {
+        "label": "东兰县",
+        "value": "451224"
+      },
+      {
+        "label": "罗城仫佬族自治县",
+        "value": "451225"
+      },
+      {
+        "label": "环江毛南族自治县",
+        "value": "451226"
+      },
+      {
+        "label": "巴马瑶族自治县",
+        "value": "451227"
+      },
+      {
+        "label": "都安瑶族自治县",
+        "value": "451228"
+      },
+      {
+        "label": "大化瑶族自治县",
+        "value": "451229"
+      }
+    ],
+    [{
+        "label": "兴宾区",
+        "value": "451302"
+      },
+      {
+        "label": "忻城县",
+        "value": "451321"
+      },
+      {
+        "label": "象州县",
+        "value": "451322"
+      },
+      {
+        "label": "武宣县",
+        "value": "451323"
+      },
+      {
+        "label": "金秀瑶族自治县",
+        "value": "451324"
+      },
+      {
+        "label": "合山市",
+        "value": "451381"
+      }
+    ],
+    [{
+        "label": "江州区",
+        "value": "451402"
+      },
+      {
+        "label": "扶绥县",
+        "value": "451421"
+      },
+      {
+        "label": "宁明县",
+        "value": "451422"
+      },
+      {
+        "label": "龙州县",
+        "value": "451423"
+      },
+      {
+        "label": "大新县",
+        "value": "451424"
+      },
+      {
+        "label": "天等县",
+        "value": "451425"
+      },
+      {
+        "label": "凭祥市",
+        "value": "451481"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "秀英区",
+        "value": "460105"
+      },
+      {
+        "label": "龙华区",
+        "value": "460106"
+      },
+      {
+        "label": "琼山区",
+        "value": "460107"
+      },
+      {
+        "label": "美兰区",
+        "value": "460108"
+      }
+    ],
+    [{
+        "label": "海棠区",
+        "value": "460202"
+      },
+      {
+        "label": "吉阳区",
+        "value": "460203"
+      },
+      {
+        "label": "天涯区",
+        "value": "460204"
+      },
+      {
+        "label": "崖州区",
+        "value": "460205"
+      }
+    ],
+    [{
+        "label": "西沙群岛",
+        "value": "460321"
+      },
+      {
+        "label": "南沙群岛",
+        "value": "460322"
+      },
+      {
+        "label": "中沙群岛的岛礁及其海域",
+        "value": "460323"
+      }
+    ],
+    [{
+      "label": "儋州市",
+      "value": "460400"
+    }],
+    [{
+        "label": "五指山市",
+        "value": "469001"
+      },
+      {
+        "label": "琼海市",
+        "value": "469002"
+      },
+      {
+        "label": "文昌市",
+        "value": "469005"
+      },
+      {
+        "label": "万宁市",
+        "value": "469006"
+      },
+      {
+        "label": "东方市",
+        "value": "469007"
+      },
+      {
+        "label": "定安县",
+        "value": "469021"
+      },
+      {
+        "label": "屯昌县",
+        "value": "469022"
+      },
+      {
+        "label": "澄迈县",
+        "value": "469023"
+      },
+      {
+        "label": "临高县",
+        "value": "469024"
+      },
+      {
+        "label": "白沙黎族自治县",
+        "value": "469025"
+      },
+      {
+        "label": "昌江黎族自治县",
+        "value": "469026"
+      },
+      {
+        "label": "乐东黎族自治县",
+        "value": "469027"
+      },
+      {
+        "label": "陵水黎族自治县",
+        "value": "469028"
+      },
+      {
+        "label": "保亭黎族苗族自治县",
+        "value": "469029"
+      },
+      {
+        "label": "琼中黎族苗族自治县",
+        "value": "469030"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "万州区",
+        "value": "500101"
+      },
+      {
+        "label": "涪陵区",
+        "value": "500102"
+      },
+      {
+        "label": "渝中区",
+        "value": "500103"
+      },
+      {
+        "label": "大渡口区",
+        "value": "500104"
+      },
+      {
+        "label": "江北区",
+        "value": "500105"
+      },
+      {
+        "label": "沙坪坝区",
+        "value": "500106"
+      },
+      {
+        "label": "九龙坡区",
+        "value": "500107"
+      },
+      {
+        "label": "南岸区",
+        "value": "500108"
+      },
+      {
+        "label": "北碚区",
+        "value": "500109"
+      },
+      {
+        "label": "綦江区",
+        "value": "500110"
+      },
+      {
+        "label": "大足区",
+        "value": "500111"
+      },
+      {
+        "label": "渝北区",
+        "value": "500112"
+      },
+      {
+        "label": "巴南区",
+        "value": "500113"
+      },
+      {
+        "label": "黔江区",
+        "value": "500114"
+      },
+      {
+        "label": "长寿区",
+        "value": "500115"
+      },
+      {
+        "label": "江津区",
+        "value": "500116"
+      },
+      {
+        "label": "合川区",
+        "value": "500117"
+      },
+      {
+        "label": "永川区",
+        "value": "500118"
+      },
+      {
+        "label": "南川区",
+        "value": "500119"
+      },
+      {
+        "label": "璧山区",
+        "value": "500120"
+      },
+      {
+        "label": "铜梁区",
+        "value": "500151"
+      },
+      {
+        "label": "潼南区",
+        "value": "500152"
+      },
+      {
+        "label": "荣昌区",
+        "value": "500153"
+      },
+      {
+        "label": "开州区",
+        "value": "500154"
+      },
+      {
+        "label": "梁平区",
+        "value": "500155"
+      },
+      {
+        "label": "武隆区",
+        "value": "500156"
+      }
+    ],
+    [{
+        "label": "城口县",
+        "value": "500229"
+      },
+      {
+        "label": "丰都县",
+        "value": "500230"
+      },
+      {
+        "label": "垫江县",
+        "value": "500231"
+      },
+      {
+        "label": "忠县",
+        "value": "500233"
+      },
+      {
+        "label": "云阳县",
+        "value": "500235"
+      },
+      {
+        "label": "奉节县",
+        "value": "500236"
+      },
+      {
+        "label": "巫山县",
+        "value": "500237"
+      },
+      {
+        "label": "巫溪县",
+        "value": "500238"
+      },
+      {
+        "label": "石柱土家族自治县",
+        "value": "500240"
+      },
+      {
+        "label": "秀山土家族苗族自治县",
+        "value": "500241"
+      },
+      {
+        "label": "酉阳土家族苗族自治县",
+        "value": "500242"
+      },
+      {
+        "label": "彭水苗族土家族自治县",
+        "value": "500243"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "锦江区",
+        "value": "510104"
+      },
+      {
+        "label": "青羊区",
+        "value": "510105"
+      },
+      {
+        "label": "金牛区",
+        "value": "510106"
+      },
+      {
+        "label": "武侯区",
+        "value": "510107"
+      },
+      {
+        "label": "成华区",
+        "value": "510108"
+      },
+      {
+        "label": "龙泉驿区",
+        "value": "510112"
+      },
+      {
+        "label": "青白江区",
+        "value": "510113"
+      },
+      {
+        "label": "新都区",
+        "value": "510114"
+      },
+      {
+        "label": "温江区",
+        "value": "510115"
+      },
+      {
+        "label": "双流区",
+        "value": "510116"
+      },
+      {
+        "label": "郫都区",
+        "value": "510117"
+      },
+      {
+        "label": "金堂县",
+        "value": "510121"
+      },
+      {
+        "label": "大邑县",
+        "value": "510129"
+      },
+      {
+        "label": "蒲江县",
+        "value": "510131"
+      },
+      {
+        "label": "新津县",
+        "value": "510132"
+      },
+      {
+        "label": "都江堰市",
+        "value": "510181"
+      },
+      {
+        "label": "彭州市",
+        "value": "510182"
+      },
+      {
+        "label": "邛崃市",
+        "value": "510183"
+      },
+      {
+        "label": "崇州市",
+        "value": "510184"
+      },
+      {
+        "label": "简阳市",
+        "value": "510185"
+      }
+    ],
+    [{
+        "label": "自流井区",
+        "value": "510302"
+      },
+      {
+        "label": "贡井区",
+        "value": "510303"
+      },
+      {
+        "label": "大安区",
+        "value": "510304"
+      },
+      {
+        "label": "沿滩区",
+        "value": "510311"
+      },
+      {
+        "label": "荣县",
+        "value": "510321"
+      },
+      {
+        "label": "富顺县",
+        "value": "510322"
+      }
+    ],
+    [{
+        "label": "东区",
+        "value": "510402"
+      },
+      {
+        "label": "西区",
+        "value": "510403"
+      },
+      {
+        "label": "仁和区",
+        "value": "510411"
+      },
+      {
+        "label": "米易县",
+        "value": "510421"
+      },
+      {
+        "label": "盐边县",
+        "value": "510422"
+      }
+    ],
+    [{
+        "label": "江阳区",
+        "value": "510502"
+      },
+      {
+        "label": "纳溪区",
+        "value": "510503"
+      },
+      {
+        "label": "龙马潭区",
+        "value": "510504"
+      },
+      {
+        "label": "泸县",
+        "value": "510521"
+      },
+      {
+        "label": "合江县",
+        "value": "510522"
+      },
+      {
+        "label": "叙永县",
+        "value": "510524"
+      },
+      {
+        "label": "古蔺县",
+        "value": "510525"
+      }
+    ],
+    [{
+        "label": "旌阳区",
+        "value": "510603"
+      },
+      {
+        "label": "罗江区",
+        "value": "510604"
+      },
+      {
+        "label": "中江县",
+        "value": "510623"
+      },
+      {
+        "label": "广汉市",
+        "value": "510681"
+      },
+      {
+        "label": "什邡市",
+        "value": "510682"
+      },
+      {
+        "label": "绵竹市",
+        "value": "510683"
+      }
+    ],
+    [{
+        "label": "涪城区",
+        "value": "510703"
+      },
+      {
+        "label": "游仙区",
+        "value": "510704"
+      },
+      {
+        "label": "安州区",
+        "value": "510705"
+      },
+      {
+        "label": "三台县",
+        "value": "510722"
+      },
+      {
+        "label": "盐亭县",
+        "value": "510723"
+      },
+      {
+        "label": "梓潼县",
+        "value": "510725"
+      },
+      {
+        "label": "北川羌族自治县",
+        "value": "510726"
+      },
+      {
+        "label": "平武县",
+        "value": "510727"
+      },
+      {
+        "label": "江油市",
+        "value": "510781"
+      }
+    ],
+    [{
+        "label": "利州区",
+        "value": "510802"
+      },
+      {
+        "label": "昭化区",
+        "value": "510811"
+      },
+      {
+        "label": "朝天区",
+        "value": "510812"
+      },
+      {
+        "label": "旺苍县",
+        "value": "510821"
+      },
+      {
+        "label": "青川县",
+        "value": "510822"
+      },
+      {
+        "label": "剑阁县",
+        "value": "510823"
+      },
+      {
+        "label": "苍溪县",
+        "value": "510824"
+      }
+    ],
+    [{
+        "label": "船山区",
+        "value": "510903"
+      },
+      {
+        "label": "安居区",
+        "value": "510904"
+      },
+      {
+        "label": "蓬溪县",
+        "value": "510921"
+      },
+      {
+        "label": "射洪县",
+        "value": "510922"
+      },
+      {
+        "label": "大英县",
+        "value": "510923"
+      }
+    ],
+    [{
+        "label": "市中区",
+        "value": "511002"
+      },
+      {
+        "label": "东兴区",
+        "value": "511011"
+      },
+      {
+        "label": "威远县",
+        "value": "511024"
+      },
+      {
+        "label": "资中县",
+        "value": "511025"
+      },
+      {
+        "label": "内江经济开发区",
+        "value": "511071"
+      },
+      {
+        "label": "隆昌市",
+        "value": "511083"
+      }
+    ],
+    [{
+        "label": "市中区",
+        "value": "511102"
+      },
+      {
+        "label": "沙湾区",
+        "value": "511111"
+      },
+      {
+        "label": "五通桥区",
+        "value": "511112"
+      },
+      {
+        "label": "金口河区",
+        "value": "511113"
+      },
+      {
+        "label": "犍为县",
+        "value": "511123"
+      },
+      {
+        "label": "井研县",
+        "value": "511124"
+      },
+      {
+        "label": "夹江县",
+        "value": "511126"
+      },
+      {
+        "label": "沐川县",
+        "value": "511129"
+      },
+      {
+        "label": "峨边彝族自治县",
+        "value": "511132"
+      },
+      {
+        "label": "马边彝族自治县",
+        "value": "511133"
+      },
+      {
+        "label": "峨眉山市",
+        "value": "511181"
+      }
+    ],
+    [{
+        "label": "顺庆区",
+        "value": "511302"
+      },
+      {
+        "label": "高坪区",
+        "value": "511303"
+      },
+      {
+        "label": "嘉陵区",
+        "value": "511304"
+      },
+      {
+        "label": "南部县",
+        "value": "511321"
+      },
+      {
+        "label": "营山县",
+        "value": "511322"
+      },
+      {
+        "label": "蓬安县",
+        "value": "511323"
+      },
+      {
+        "label": "仪陇县",
+        "value": "511324"
+      },
+      {
+        "label": "西充县",
+        "value": "511325"
+      },
+      {
+        "label": "阆中市",
+        "value": "511381"
+      }
+    ],
+    [{
+        "label": "东坡区",
+        "value": "511402"
+      },
+      {
+        "label": "彭山区",
+        "value": "511403"
+      },
+      {
+        "label": "仁寿县",
+        "value": "511421"
+      },
+      {
+        "label": "洪雅县",
+        "value": "511423"
+      },
+      {
+        "label": "丹棱县",
+        "value": "511424"
+      },
+      {
+        "label": "青神县",
+        "value": "511425"
+      }
+    ],
+    [{
+        "label": "翠屏区",
+        "value": "511502"
+      },
+      {
+        "label": "南溪区",
+        "value": "511503"
+      },
+      {
+        "label": "宜宾县",
+        "value": "511521"
+      },
+      {
+        "label": "江安县",
+        "value": "511523"
+      },
+      {
+        "label": "长宁县",
+        "value": "511524"
+      },
+      {
+        "label": "高县",
+        "value": "511525"
+      },
+      {
+        "label": "珙县",
+        "value": "511526"
+      },
+      {
+        "label": "筠连县",
+        "value": "511527"
+      },
+      {
+        "label": "兴文县",
+        "value": "511528"
+      },
+      {
+        "label": "屏山县",
+        "value": "511529"
+      }
+    ],
+    [{
+        "label": "广安区",
+        "value": "511602"
+      },
+      {
+        "label": "前锋区",
+        "value": "511603"
+      },
+      {
+        "label": "岳池县",
+        "value": "511621"
+      },
+      {
+        "label": "武胜县",
+        "value": "511622"
+      },
+      {
+        "label": "邻水县",
+        "value": "511623"
+      },
+      {
+        "label": "华蓥市",
+        "value": "511681"
+      }
+    ],
+    [{
+        "label": "通川区",
+        "value": "511702"
+      },
+      {
+        "label": "达川区",
+        "value": "511703"
+      },
+      {
+        "label": "宣汉县",
+        "value": "511722"
+      },
+      {
+        "label": "开江县",
+        "value": "511723"
+      },
+      {
+        "label": "大竹县",
+        "value": "511724"
+      },
+      {
+        "label": "渠县",
+        "value": "511725"
+      },
+      {
+        "label": "达州经济开发区",
+        "value": "511771"
+      },
+      {
+        "label": "万源市",
+        "value": "511781"
+      }
+    ],
+    [{
+        "label": "雨城区",
+        "value": "511802"
+      },
+      {
+        "label": "名山区",
+        "value": "511803"
+      },
+      {
+        "label": "荥经县",
+        "value": "511822"
+      },
+      {
+        "label": "汉源县",
+        "value": "511823"
+      },
+      {
+        "label": "石棉县",
+        "value": "511824"
+      },
+      {
+        "label": "天全县",
+        "value": "511825"
+      },
+      {
+        "label": "芦山县",
+        "value": "511826"
+      },
+      {
+        "label": "宝兴县",
+        "value": "511827"
+      }
+    ],
+    [{
+        "label": "巴州区",
+        "value": "511902"
+      },
+      {
+        "label": "恩阳区",
+        "value": "511903"
+      },
+      {
+        "label": "通江县",
+        "value": "511921"
+      },
+      {
+        "label": "南江县",
+        "value": "511922"
+      },
+      {
+        "label": "平昌县",
+        "value": "511923"
+      },
+      {
+        "label": "巴中经济开发区",
+        "value": "511971"
+      }
+    ],
+    [{
+        "label": "雁江区",
+        "value": "512002"
+      },
+      {
+        "label": "安岳县",
+        "value": "512021"
+      },
+      {
+        "label": "乐至县",
+        "value": "512022"
+      }
+    ],
+    [{
+        "label": "马尔康市",
+        "value": "513201"
+      },
+      {
+        "label": "汶川县",
+        "value": "513221"
+      },
+      {
+        "label": "理县",
+        "value": "513222"
+      },
+      {
+        "label": "茂县",
+        "value": "513223"
+      },
+      {
+        "label": "松潘县",
+        "value": "513224"
+      },
+      {
+        "label": "九寨沟县",
+        "value": "513225"
+      },
+      {
+        "label": "金川县",
+        "value": "513226"
+      },
+      {
+        "label": "小金县",
+        "value": "513227"
+      },
+      {
+        "label": "黑水县",
+        "value": "513228"
+      },
+      {
+        "label": "壤塘县",
+        "value": "513230"
+      },
+      {
+        "label": "阿坝县",
+        "value": "513231"
+      },
+      {
+        "label": "若尔盖县",
+        "value": "513232"
+      },
+      {
+        "label": "红原县",
+        "value": "513233"
+      }
+    ],
+    [{
+        "label": "康定市",
+        "value": "513301"
+      },
+      {
+        "label": "泸定县",
+        "value": "513322"
+      },
+      {
+        "label": "丹巴县",
+        "value": "513323"
+      },
+      {
+        "label": "九龙县",
+        "value": "513324"
+      },
+      {
+        "label": "雅江县",
+        "value": "513325"
+      },
+      {
+        "label": "道孚县",
+        "value": "513326"
+      },
+      {
+        "label": "炉霍县",
+        "value": "513327"
+      },
+      {
+        "label": "甘孜县",
+        "value": "513328"
+      },
+      {
+        "label": "新龙县",
+        "value": "513329"
+      },
+      {
+        "label": "德格县",
+        "value": "513330"
+      },
+      {
+        "label": "白玉县",
+        "value": "513331"
+      },
+      {
+        "label": "石渠县",
+        "value": "513332"
+      },
+      {
+        "label": "色达县",
+        "value": "513333"
+      },
+      {
+        "label": "理塘县",
+        "value": "513334"
+      },
+      {
+        "label": "巴塘县",
+        "value": "513335"
+      },
+      {
+        "label": "乡城县",
+        "value": "513336"
+      },
+      {
+        "label": "稻城县",
+        "value": "513337"
+      },
+      {
+        "label": "得荣县",
+        "value": "513338"
+      }
+    ],
+    [{
+        "label": "西昌市",
+        "value": "513401"
+      },
+      {
+        "label": "木里藏族自治县",
+        "value": "513422"
+      },
+      {
+        "label": "盐源县",
+        "value": "513423"
+      },
+      {
+        "label": "德昌县",
+        "value": "513424"
+      },
+      {
+        "label": "会理县",
+        "value": "513425"
+      },
+      {
+        "label": "会东县",
+        "value": "513426"
+      },
+      {
+        "label": "宁南县",
+        "value": "513427"
+      },
+      {
+        "label": "普格县",
+        "value": "513428"
+      },
+      {
+        "label": "布拖县",
+        "value": "513429"
+      },
+      {
+        "label": "金阳县",
+        "value": "513430"
+      },
+      {
+        "label": "昭觉县",
+        "value": "513431"
+      },
+      {
+        "label": "喜德县",
+        "value": "513432"
+      },
+      {
+        "label": "冕宁县",
+        "value": "513433"
+      },
+      {
+        "label": "越西县",
+        "value": "513434"
+      },
+      {
+        "label": "甘洛县",
+        "value": "513435"
+      },
+      {
+        "label": "美姑县",
+        "value": "513436"
+      },
+      {
+        "label": "雷波县",
+        "value": "513437"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "南明区",
+        "value": "520102"
+      },
+      {
+        "label": "云岩区",
+        "value": "520103"
+      },
+      {
+        "label": "花溪区",
+        "value": "520111"
+      },
+      {
+        "label": "乌当区",
+        "value": "520112"
+      },
+      {
+        "label": "白云区",
+        "value": "520113"
+      },
+      {
+        "label": "观山湖区",
+        "value": "520115"
+      },
+      {
+        "label": "开阳县",
+        "value": "520121"
+      },
+      {
+        "label": "息烽县",
+        "value": "520122"
+      },
+      {
+        "label": "修文县",
+        "value": "520123"
+      },
+      {
+        "label": "清镇市",
+        "value": "520181"
+      }
+    ],
+    [{
+        "label": "钟山区",
+        "value": "520201"
+      },
+      {
+        "label": "六枝特区",
+        "value": "520203"
+      },
+      {
+        "label": "水城县",
+        "value": "520221"
+      },
+      {
+        "label": "盘州市",
+        "value": "520281"
+      }
+    ],
+    [{
+        "label": "红花岗区",
+        "value": "520302"
+      },
+      {
+        "label": "汇川区",
+        "value": "520303"
+      },
+      {
+        "label": "播州区",
+        "value": "520304"
+      },
+      {
+        "label": "桐梓县",
+        "value": "520322"
+      },
+      {
+        "label": "绥阳县",
+        "value": "520323"
+      },
+      {
+        "label": "正安县",
+        "value": "520324"
+      },
+      {
+        "label": "道真仡佬族苗族自治县",
+        "value": "520325"
+      },
+      {
+        "label": "务川仡佬族苗族自治县",
+        "value": "520326"
+      },
+      {
+        "label": "凤冈县",
+        "value": "520327"
+      },
+      {
+        "label": "湄潭县",
+        "value": "520328"
+      },
+      {
+        "label": "余庆县",
+        "value": "520329"
+      },
+      {
+        "label": "习水县",
+        "value": "520330"
+      },
+      {
+        "label": "赤水市",
+        "value": "520381"
+      },
+      {
+        "label": "仁怀市",
+        "value": "520382"
+      }
+    ],
+    [{
+        "label": "西秀区",
+        "value": "520402"
+      },
+      {
+        "label": "平坝区",
+        "value": "520403"
+      },
+      {
+        "label": "普定县",
+        "value": "520422"
+      },
+      {
+        "label": "镇宁布依族苗族自治县",
+        "value": "520423"
+      },
+      {
+        "label": "关岭布依族苗族自治县",
+        "value": "520424"
+      },
+      {
+        "label": "紫云苗族布依族自治县",
+        "value": "520425"
+      }
+    ],
+    [{
+        "label": "七星关区",
+        "value": "520502"
+      },
+      {
+        "label": "大方县",
+        "value": "520521"
+      },
+      {
+        "label": "黔西县",
+        "value": "520522"
+      },
+      {
+        "label": "金沙县",
+        "value": "520523"
+      },
+      {
+        "label": "织金县",
+        "value": "520524"
+      },
+      {
+        "label": "纳雍县",
+        "value": "520525"
+      },
+      {
+        "label": "威宁彝族回族苗族自治县",
+        "value": "520526"
+      },
+      {
+        "label": "赫章县",
+        "value": "520527"
+      }
+    ],
+    [{
+        "label": "碧江区",
+        "value": "520602"
+      },
+      {
+        "label": "万山区",
+        "value": "520603"
+      },
+      {
+        "label": "江口县",
+        "value": "520621"
+      },
+      {
+        "label": "玉屏侗族自治县",
+        "value": "520622"
+      },
+      {
+        "label": "石阡县",
+        "value": "520623"
+      },
+      {
+        "label": "思南县",
+        "value": "520624"
+      },
+      {
+        "label": "印江土家族苗族自治县",
+        "value": "520625"
+      },
+      {
+        "label": "德江县",
+        "value": "520626"
+      },
+      {
+        "label": "沿河土家族自治县",
+        "value": "520627"
+      },
+      {
+        "label": "松桃苗族自治县",
+        "value": "520628"
+      }
+    ],
+    [{
+        "label": "兴义市",
+        "value": "522301"
+      },
+      {
+        "label": "兴仁县",
+        "value": "522322"
+      },
+      {
+        "label": "普安县",
+        "value": "522323"
+      },
+      {
+        "label": "晴隆县",
+        "value": "522324"
+      },
+      {
+        "label": "贞丰县",
+        "value": "522325"
+      },
+      {
+        "label": "望谟县",
+        "value": "522326"
+      },
+      {
+        "label": "册亨县",
+        "value": "522327"
+      },
+      {
+        "label": "安龙县",
+        "value": "522328"
+      }
+    ],
+    [{
+        "label": "凯里市",
+        "value": "522601"
+      },
+      {
+        "label": "黄平县",
+        "value": "522622"
+      },
+      {
+        "label": "施秉县",
+        "value": "522623"
+      },
+      {
+        "label": "三穗县",
+        "value": "522624"
+      },
+      {
+        "label": "镇远县",
+        "value": "522625"
+      },
+      {
+        "label": "岑巩县",
+        "value": "522626"
+      },
+      {
+        "label": "天柱县",
+        "value": "522627"
+      },
+      {
+        "label": "锦屏县",
+        "value": "522628"
+      },
+      {
+        "label": "剑河县",
+        "value": "522629"
+      },
+      {
+        "label": "台江县",
+        "value": "522630"
+      },
+      {
+        "label": "黎平县",
+        "value": "522631"
+      },
+      {
+        "label": "榕江县",
+        "value": "522632"
+      },
+      {
+        "label": "从江县",
+        "value": "522633"
+      },
+      {
+        "label": "雷山县",
+        "value": "522634"
+      },
+      {
+        "label": "麻江县",
+        "value": "522635"
+      },
+      {
+        "label": "丹寨县",
+        "value": "522636"
+      }
+    ],
+    [{
+        "label": "都匀市",
+        "value": "522701"
+      },
+      {
+        "label": "福泉市",
+        "value": "522702"
+      },
+      {
+        "label": "荔波县",
+        "value": "522722"
+      },
+      {
+        "label": "贵定县",
+        "value": "522723"
+      },
+      {
+        "label": "瓮安县",
+        "value": "522725"
+      },
+      {
+        "label": "独山县",
+        "value": "522726"
+      },
+      {
+        "label": "平塘县",
+        "value": "522727"
+      },
+      {
+        "label": "罗甸县",
+        "value": "522728"
+      },
+      {
+        "label": "长顺县",
+        "value": "522729"
+      },
+      {
+        "label": "龙里县",
+        "value": "522730"
+      },
+      {
+        "label": "惠水县",
+        "value": "522731"
+      },
+      {
+        "label": "三都水族自治县",
+        "value": "522732"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "五华区",
+        "value": "530102"
+      },
+      {
+        "label": "盘龙区",
+        "value": "530103"
+      },
+      {
+        "label": "官渡区",
+        "value": "530111"
+      },
+      {
+        "label": "西山区",
+        "value": "530112"
+      },
+      {
+        "label": "东川区",
+        "value": "530113"
+      },
+      {
+        "label": "呈贡区",
+        "value": "530114"
+      },
+      {
+        "label": "晋宁区",
+        "value": "530115"
+      },
+      {
+        "label": "富民县",
+        "value": "530124"
+      },
+      {
+        "label": "宜良县",
+        "value": "530125"
+      },
+      {
+        "label": "石林彝族自治县",
+        "value": "530126"
+      },
+      {
+        "label": "嵩明县",
+        "value": "530127"
+      },
+      {
+        "label": "禄劝彝族苗族自治县",
+        "value": "530128"
+      },
+      {
+        "label": "寻甸回族彝族自治县",
+        "value": "530129"
+      },
+      {
+        "label": "安宁市",
+        "value": "530181"
+      }
+    ],
+    [{
+        "label": "麒麟区",
+        "value": "530302"
+      },
+      {
+        "label": "沾益区",
+        "value": "530303"
+      },
+      {
+        "label": "马龙县",
+        "value": "530321"
+      },
+      {
+        "label": "陆良县",
+        "value": "530322"
+      },
+      {
+        "label": "师宗县",
+        "value": "530323"
+      },
+      {
+        "label": "罗平县",
+        "value": "530324"
+      },
+      {
+        "label": "富源县",
+        "value": "530325"
+      },
+      {
+        "label": "会泽县",
+        "value": "530326"
+      },
+      {
+        "label": "宣威市",
+        "value": "530381"
+      }
+    ],
+    [{
+        "label": "红塔区",
+        "value": "530402"
+      },
+      {
+        "label": "江川区",
+        "value": "530403"
+      },
+      {
+        "label": "澄江县",
+        "value": "530422"
+      },
+      {
+        "label": "通海县",
+        "value": "530423"
+      },
+      {
+        "label": "华宁县",
+        "value": "530424"
+      },
+      {
+        "label": "易门县",
+        "value": "530425"
+      },
+      {
+        "label": "峨山彝族自治县",
+        "value": "530426"
+      },
+      {
+        "label": "新平彝族傣族自治县",
+        "value": "530427"
+      },
+      {
+        "label": "元江哈尼族彝族傣族自治县",
+        "value": "530428"
+      }
+    ],
+    [{
+        "label": "隆阳区",
+        "value": "530502"
+      },
+      {
+        "label": "施甸县",
+        "value": "530521"
+      },
+      {
+        "label": "龙陵县",
+        "value": "530523"
+      },
+      {
+        "label": "昌宁县",
+        "value": "530524"
+      },
+      {
+        "label": "腾冲市",
+        "value": "530581"
+      }
+    ],
+    [{
+        "label": "昭阳区",
+        "value": "530602"
+      },
+      {
+        "label": "鲁甸县",
+        "value": "530621"
+      },
+      {
+        "label": "巧家县",
+        "value": "530622"
+      },
+      {
+        "label": "盐津县",
+        "value": "530623"
+      },
+      {
+        "label": "大关县",
+        "value": "530624"
+      },
+      {
+        "label": "永善县",
+        "value": "530625"
+      },
+      {
+        "label": "绥江县",
+        "value": "530626"
+      },
+      {
+        "label": "镇雄县",
+        "value": "530627"
+      },
+      {
+        "label": "彝良县",
+        "value": "530628"
+      },
+      {
+        "label": "威信县",
+        "value": "530629"
+      },
+      {
+        "label": "水富县",
+        "value": "530630"
+      }
+    ],
+    [{
+        "label": "古城区",
+        "value": "530702"
+      },
+      {
+        "label": "玉龙纳西族自治县",
+        "value": "530721"
+      },
+      {
+        "label": "永胜县",
+        "value": "530722"
+      },
+      {
+        "label": "华坪县",
+        "value": "530723"
+      },
+      {
+        "label": "宁蒗彝族自治县",
+        "value": "530724"
+      }
+    ],
+    [{
+        "label": "思茅区",
+        "value": "530802"
+      },
+      {
+        "label": "宁洱哈尼族彝族自治县",
+        "value": "530821"
+      },
+      {
+        "label": "墨江哈尼族自治县",
+        "value": "530822"
+      },
+      {
+        "label": "景东彝族自治县",
+        "value": "530823"
+      },
+      {
+        "label": "景谷傣族彝族自治县",
+        "value": "530824"
+      },
+      {
+        "label": "镇沅彝族哈尼族拉祜族自治县",
+        "value": "530825"
+      },
+      {
+        "label": "江城哈尼族彝族自治县",
+        "value": "530826"
+      },
+      {
+        "label": "孟连傣族拉祜族佤族自治县",
+        "value": "530827"
+      },
+      {
+        "label": "澜沧拉祜族自治县",
+        "value": "530828"
+      },
+      {
+        "label": "西盟佤族自治县",
+        "value": "530829"
+      }
+    ],
+    [{
+        "label": "临翔区",
+        "value": "530902"
+      },
+      {
+        "label": "凤庆县",
+        "value": "530921"
+      },
+      {
+        "label": "云县",
+        "value": "530922"
+      },
+      {
+        "label": "永德县",
+        "value": "530923"
+      },
+      {
+        "label": "镇康县",
+        "value": "530924"
+      },
+      {
+        "label": "双江拉祜族佤族布朗族傣族自治县",
+        "value": "530925"
+      },
+      {
+        "label": "耿马傣族佤族自治县",
+        "value": "530926"
+      },
+      {
+        "label": "沧源佤族自治县",
+        "value": "530927"
+      }
+    ],
+    [{
+        "label": "楚雄市",
+        "value": "532301"
+      },
+      {
+        "label": "双柏县",
+        "value": "532322"
+      },
+      {
+        "label": "牟定县",
+        "value": "532323"
+      },
+      {
+        "label": "南华县",
+        "value": "532324"
+      },
+      {
+        "label": "姚安县",
+        "value": "532325"
+      },
+      {
+        "label": "大姚县",
+        "value": "532326"
+      },
+      {
+        "label": "永仁县",
+        "value": "532327"
+      },
+      {
+        "label": "元谋县",
+        "value": "532328"
+      },
+      {
+        "label": "武定县",
+        "value": "532329"
+      },
+      {
+        "label": "禄丰县",
+        "value": "532331"
+      }
+    ],
+    [{
+        "label": "个旧市",
+        "value": "532501"
+      },
+      {
+        "label": "开远市",
+        "value": "532502"
+      },
+      {
+        "label": "蒙自市",
+        "value": "532503"
+      },
+      {
+        "label": "弥勒市",
+        "value": "532504"
+      },
+      {
+        "label": "屏边苗族自治县",
+        "value": "532523"
+      },
+      {
+        "label": "建水县",
+        "value": "532524"
+      },
+      {
+        "label": "石屏县",
+        "value": "532525"
+      },
+      {
+        "label": "泸西县",
+        "value": "532527"
+      },
+      {
+        "label": "元阳县",
+        "value": "532528"
+      },
+      {
+        "label": "红河县",
+        "value": "532529"
+      },
+      {
+        "label": "金平苗族瑶族傣族自治县",
+        "value": "532530"
+      },
+      {
+        "label": "绿春县",
+        "value": "532531"
+      },
+      {
+        "label": "河口瑶族自治县",
+        "value": "532532"
+      }
+    ],
+    [{
+        "label": "文山市",
+        "value": "532601"
+      },
+      {
+        "label": "砚山县",
+        "value": "532622"
+      },
+      {
+        "label": "西畴县",
+        "value": "532623"
+      },
+      {
+        "label": "麻栗坡县",
+        "value": "532624"
+      },
+      {
+        "label": "马关县",
+        "value": "532625"
+      },
+      {
+        "label": "丘北县",
+        "value": "532626"
+      },
+      {
+        "label": "广南县",
+        "value": "532627"
+      },
+      {
+        "label": "富宁县",
+        "value": "532628"
+      }
+    ],
+    [{
+        "label": "景洪市",
+        "value": "532801"
+      },
+      {
+        "label": "勐海县",
+        "value": "532822"
+      },
+      {
+        "label": "勐腊县",
+        "value": "532823"
+      }
+    ],
+    [{
+        "label": "大理市",
+        "value": "532901"
+      },
+      {
+        "label": "漾濞彝族自治县",
+        "value": "532922"
+      },
+      {
+        "label": "祥云县",
+        "value": "532923"
+      },
+      {
+        "label": "宾川县",
+        "value": "532924"
+      },
+      {
+        "label": "弥渡县",
+        "value": "532925"
+      },
+      {
+        "label": "南涧彝族自治县",
+        "value": "532926"
+      },
+      {
+        "label": "巍山彝族回族自治县",
+        "value": "532927"
+      },
+      {
+        "label": "永平县",
+        "value": "532928"
+      },
+      {
+        "label": "云龙县",
+        "value": "532929"
+      },
+      {
+        "label": "洱源县",
+        "value": "532930"
+      },
+      {
+        "label": "剑川县",
+        "value": "532931"
+      },
+      {
+        "label": "鹤庆县",
+        "value": "532932"
+      }
+    ],
+    [{
+        "label": "瑞丽市",
+        "value": "533102"
+      },
+      {
+        "label": "芒市",
+        "value": "533103"
+      },
+      {
+        "label": "梁河县",
+        "value": "533122"
+      },
+      {
+        "label": "盈江县",
+        "value": "533123"
+      },
+      {
+        "label": "陇川县",
+        "value": "533124"
+      }
+    ],
+    [{
+        "label": "泸水市",
+        "value": "533301"
+      },
+      {
+        "label": "福贡县",
+        "value": "533323"
+      },
+      {
+        "label": "贡山独龙族怒族自治县",
+        "value": "533324"
+      },
+      {
+        "label": "兰坪白族普米族自治县",
+        "value": "533325"
+      }
+    ],
+    [{
+        "label": "香格里拉市",
+        "value": "533401"
+      },
+      {
+        "label": "德钦县",
+        "value": "533422"
+      },
+      {
+        "label": "维西傈僳族自治县",
+        "value": "533423"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "城关区",
+        "value": "540102"
+      },
+      {
+        "label": "堆龙德庆区",
+        "value": "540103"
+      },
+      {
+        "label": "林周县",
+        "value": "540121"
+      },
+      {
+        "label": "当雄县",
+        "value": "540122"
+      },
+      {
+        "label": "尼木县",
+        "value": "540123"
+      },
+      {
+        "label": "曲水县",
+        "value": "540124"
+      },
+      {
+        "label": "达孜县",
+        "value": "540126"
+      },
+      {
+        "label": "墨竹工卡县",
+        "value": "540127"
+      },
+      {
+        "label": "格尔木藏青工业园区",
+        "value": "540171"
+      },
+      {
+        "label": "拉萨经济技术开发区",
+        "value": "540172"
+      },
+      {
+        "label": "西藏文化旅游创意园区",
+        "value": "540173"
+      },
+      {
+        "label": "达孜工业园区",
+        "value": "540174"
+      }
+    ],
+    [{
+        "label": "桑珠孜区",
+        "value": "540202"
+      },
+      {
+        "label": "南木林县",
+        "value": "540221"
+      },
+      {
+        "label": "江孜县",
+        "value": "540222"
+      },
+      {
+        "label": "定日县",
+        "value": "540223"
+      },
+      {
+        "label": "萨迦县",
+        "value": "540224"
+      },
+      {
+        "label": "拉孜县",
+        "value": "540225"
+      },
+      {
+        "label": "昂仁县",
+        "value": "540226"
+      },
+      {
+        "label": "谢通门县",
+        "value": "540227"
+      },
+      {
+        "label": "白朗县",
+        "value": "540228"
+      },
+      {
+        "label": "仁布县",
+        "value": "540229"
+      },
+      {
+        "label": "康马县",
+        "value": "540230"
+      },
+      {
+        "label": "定结县",
+        "value": "540231"
+      },
+      {
+        "label": "仲巴县",
+        "value": "540232"
+      },
+      {
+        "label": "亚东县",
+        "value": "540233"
+      },
+      {
+        "label": "吉隆县",
+        "value": "540234"
+      },
+      {
+        "label": "聂拉木县",
+        "value": "540235"
+      },
+      {
+        "label": "萨嘎县",
+        "value": "540236"
+      },
+      {
+        "label": "岗巴县",
+        "value": "540237"
+      }
+    ],
+    [{
+        "label": "卡若区",
+        "value": "540302"
+      },
+      {
+        "label": "江达县",
+        "value": "540321"
+      },
+      {
+        "label": "贡觉县",
+        "value": "540322"
+      },
+      {
+        "label": "类乌齐县",
+        "value": "540323"
+      },
+      {
+        "label": "丁青县",
+        "value": "540324"
+      },
+      {
+        "label": "察雅县",
+        "value": "540325"
+      },
+      {
+        "label": "八宿县",
+        "value": "540326"
+      },
+      {
+        "label": "左贡县",
+        "value": "540327"
+      },
+      {
+        "label": "芒康县",
+        "value": "540328"
+      },
+      {
+        "label": "洛隆县",
+        "value": "540329"
+      },
+      {
+        "label": "边坝县",
+        "value": "540330"
+      }
+    ],
+    [{
+        "label": "巴宜区",
+        "value": "540402"
+      },
+      {
+        "label": "工布江达县",
+        "value": "540421"
+      },
+      {
+        "label": "米林县",
+        "value": "540422"
+      },
+      {
+        "label": "墨脱县",
+        "value": "540423"
+      },
+      {
+        "label": "波密县",
+        "value": "540424"
+      },
+      {
+        "label": "察隅县",
+        "value": "540425"
+      },
+      {
+        "label": "朗县",
+        "value": "540426"
+      }
+    ],
+    [{
+        "label": "乃东区",
+        "value": "540502"
+      },
+      {
+        "label": "扎囊县",
+        "value": "540521"
+      },
+      {
+        "label": "贡嘎县",
+        "value": "540522"
+      },
+      {
+        "label": "桑日县",
+        "value": "540523"
+      },
+      {
+        "label": "琼结县",
+        "value": "540524"
+      },
+      {
+        "label": "曲松县",
+        "value": "540525"
+      },
+      {
+        "label": "措美县",
+        "value": "540526"
+      },
+      {
+        "label": "洛扎县",
+        "value": "540527"
+      },
+      {
+        "label": "加查县",
+        "value": "540528"
+      },
+      {
+        "label": "隆子县",
+        "value": "540529"
+      },
+      {
+        "label": "错那县",
+        "value": "540530"
+      },
+      {
+        "label": "浪卡子县",
+        "value": "540531"
+      }
+    ],
+    [{
+        "label": "那曲县",
+        "value": "542421"
+      },
+      {
+        "label": "嘉黎县",
+        "value": "542422"
+      },
+      {
+        "label": "比如县",
+        "value": "542423"
+      },
+      {
+        "label": "聂荣县",
+        "value": "542424"
+      },
+      {
+        "label": "安多县",
+        "value": "542425"
+      },
+      {
+        "label": "申扎县",
+        "value": "542426"
+      },
+      {
+        "label": "索县",
+        "value": "542427"
+      },
+      {
+        "label": "班戈县",
+        "value": "542428"
+      },
+      {
+        "label": "巴青县",
+        "value": "542429"
+      },
+      {
+        "label": "尼玛县",
+        "value": "542430"
+      },
+      {
+        "label": "双湖县",
+        "value": "542431"
+      }
+    ],
+    [{
+        "label": "普兰县",
+        "value": "542521"
+      },
+      {
+        "label": "札达县",
+        "value": "542522"
+      },
+      {
+        "label": "噶尔县",
+        "value": "542523"
+      },
+      {
+        "label": "日土县",
+        "value": "542524"
+      },
+      {
+        "label": "革吉县",
+        "value": "542525"
+      },
+      {
+        "label": "改则县",
+        "value": "542526"
+      },
+      {
+        "label": "措勤县",
+        "value": "542527"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "新城区",
+        "value": "610102"
+      },
+      {
+        "label": "碑林区",
+        "value": "610103"
+      },
+      {
+        "label": "莲湖区",
+        "value": "610104"
+      },
+      {
+        "label": "灞桥区",
+        "value": "610111"
+      },
+      {
+        "label": "未央区",
+        "value": "610112"
+      },
+      {
+        "label": "雁塔区",
+        "value": "610113"
+      },
+      {
+        "label": "阎良区",
+        "value": "610114"
+      },
+      {
+        "label": "临潼区",
+        "value": "610115"
+      },
+      {
+        "label": "长安区",
+        "value": "610116"
+      },
+      {
+        "label": "高陵区",
+        "value": "610117"
+      },
+      {
+        "label": "鄠邑区",
+        "value": "610118"
+      },
+      {
+        "label": "蓝田县",
+        "value": "610122"
+      },
+      {
+        "label": "周至县",
+        "value": "610124"
+      }
+    ],
+    [{
+        "label": "王益区",
+        "value": "610202"
+      },
+      {
+        "label": "印台区",
+        "value": "610203"
+      },
+      {
+        "label": "耀州区",
+        "value": "610204"
+      },
+      {
+        "label": "宜君县",
+        "value": "610222"
+      }
+    ],
+    [{
+        "label": "渭滨区",
+        "value": "610302"
+      },
+      {
+        "label": "金台区",
+        "value": "610303"
+      },
+      {
+        "label": "陈仓区",
+        "value": "610304"
+      },
+      {
+        "label": "凤翔县",
+        "value": "610322"
+      },
+      {
+        "label": "岐山县",
+        "value": "610323"
+      },
+      {
+        "label": "扶风县",
+        "value": "610324"
+      },
+      {
+        "label": "眉县",
+        "value": "610326"
+      },
+      {
+        "label": "陇县",
+        "value": "610327"
+      },
+      {
+        "label": "千阳县",
+        "value": "610328"
+      },
+      {
+        "label": "麟游县",
+        "value": "610329"
+      },
+      {
+        "label": "凤县",
+        "value": "610330"
+      },
+      {
+        "label": "太白县",
+        "value": "610331"
+      }
+    ],
+    [{
+        "label": "秦都区",
+        "value": "610402"
+      },
+      {
+        "label": "杨陵区",
+        "value": "610403"
+      },
+      {
+        "label": "渭城区",
+        "value": "610404"
+      },
+      {
+        "label": "三原县",
+        "value": "610422"
+      },
+      {
+        "label": "泾阳县",
+        "value": "610423"
+      },
+      {
+        "label": "乾县",
+        "value": "610424"
+      },
+      {
+        "label": "礼泉县",
+        "value": "610425"
+      },
+      {
+        "label": "永寿县",
+        "value": "610426"
+      },
+      {
+        "label": "彬县",
+        "value": "610427"
+      },
+      {
+        "label": "长武县",
+        "value": "610428"
+      },
+      {
+        "label": "旬邑县",
+        "value": "610429"
+      },
+      {
+        "label": "淳化县",
+        "value": "610430"
+      },
+      {
+        "label": "武功县",
+        "value": "610431"
+      },
+      {
+        "label": "兴平市",
+        "value": "610481"
+      }
+    ],
+    [{
+        "label": "临渭区",
+        "value": "610502"
+      },
+      {
+        "label": "华州区",
+        "value": "610503"
+      },
+      {
+        "label": "潼关县",
+        "value": "610522"
+      },
+      {
+        "label": "大荔县",
+        "value": "610523"
+      },
+      {
+        "label": "合阳县",
+        "value": "610524"
+      },
+      {
+        "label": "澄城县",
+        "value": "610525"
+      },
+      {
+        "label": "蒲城县",
+        "value": "610526"
+      },
+      {
+        "label": "白水县",
+        "value": "610527"
+      },
+      {
+        "label": "富平县",
+        "value": "610528"
+      },
+      {
+        "label": "韩城市",
+        "value": "610581"
+      },
+      {
+        "label": "华阴市",
+        "value": "610582"
+      }
+    ],
+    [{
+        "label": "宝塔区",
+        "value": "610602"
+      },
+      {
+        "label": "安塞区",
+        "value": "610603"
+      },
+      {
+        "label": "延长县",
+        "value": "610621"
+      },
+      {
+        "label": "延川县",
+        "value": "610622"
+      },
+      {
+        "label": "子长县",
+        "value": "610623"
+      },
+      {
+        "label": "志丹县",
+        "value": "610625"
+      },
+      {
+        "label": "吴起县",
+        "value": "610626"
+      },
+      {
+        "label": "甘泉县",
+        "value": "610627"
+      },
+      {
+        "label": "富县",
+        "value": "610628"
+      },
+      {
+        "label": "洛川县",
+        "value": "610629"
+      },
+      {
+        "label": "宜川县",
+        "value": "610630"
+      },
+      {
+        "label": "黄龙县",
+        "value": "610631"
+      },
+      {
+        "label": "黄陵县",
+        "value": "610632"
+      }
+    ],
+    [{
+        "label": "汉台区",
+        "value": "610702"
+      },
+      {
+        "label": "南郑区",
+        "value": "610703"
+      },
+      {
+        "label": "城固县",
+        "value": "610722"
+      },
+      {
+        "label": "洋县",
+        "value": "610723"
+      },
+      {
+        "label": "西乡县",
+        "value": "610724"
+      },
+      {
+        "label": "勉县",
+        "value": "610725"
+      },
+      {
+        "label": "宁强县",
+        "value": "610726"
+      },
+      {
+        "label": "略阳县",
+        "value": "610727"
+      },
+      {
+        "label": "镇巴县",
+        "value": "610728"
+      },
+      {
+        "label": "留坝县",
+        "value": "610729"
+      },
+      {
+        "label": "佛坪县",
+        "value": "610730"
+      }
+    ],
+    [{
+        "label": "榆阳区",
+        "value": "610802"
+      },
+      {
+        "label": "横山区",
+        "value": "610803"
+      },
+      {
+        "label": "府谷县",
+        "value": "610822"
+      },
+      {
+        "label": "靖边县",
+        "value": "610824"
+      },
+      {
+        "label": "定边县",
+        "value": "610825"
+      },
+      {
+        "label": "绥德县",
+        "value": "610826"
+      },
+      {
+        "label": "米脂县",
+        "value": "610827"
+      },
+      {
+        "label": "佳县",
+        "value": "610828"
+      },
+      {
+        "label": "吴堡县",
+        "value": "610829"
+      },
+      {
+        "label": "清涧县",
+        "value": "610830"
+      },
+      {
+        "label": "子洲县",
+        "value": "610831"
+      },
+      {
+        "label": "神木市",
+        "value": "610881"
+      }
+    ],
+    [{
+        "label": "汉滨区",
+        "value": "610902"
+      },
+      {
+        "label": "汉阴县",
+        "value": "610921"
+      },
+      {
+        "label": "石泉县",
+        "value": "610922"
+      },
+      {
+        "label": "宁陕县",
+        "value": "610923"
+      },
+      {
+        "label": "紫阳县",
+        "value": "610924"
+      },
+      {
+        "label": "岚皋县",
+        "value": "610925"
+      },
+      {
+        "label": "平利县",
+        "value": "610926"
+      },
+      {
+        "label": "镇坪县",
+        "value": "610927"
+      },
+      {
+        "label": "旬阳县",
+        "value": "610928"
+      },
+      {
+        "label": "白河县",
+        "value": "610929"
+      }
+    ],
+    [{
+        "label": "商州区",
+        "value": "611002"
+      },
+      {
+        "label": "洛南县",
+        "value": "611021"
+      },
+      {
+        "label": "丹凤县",
+        "value": "611022"
+      },
+      {
+        "label": "商南县",
+        "value": "611023"
+      },
+      {
+        "label": "山阳县",
+        "value": "611024"
+      },
+      {
+        "label": "镇安县",
+        "value": "611025"
+      },
+      {
+        "label": "柞水县",
+        "value": "611026"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "城关区",
+        "value": "620102"
+      },
+      {
+        "label": "七里河区",
+        "value": "620103"
+      },
+      {
+        "label": "西固区",
+        "value": "620104"
+      },
+      {
+        "label": "安宁区",
+        "value": "620105"
+      },
+      {
+        "label": "红古区",
+        "value": "620111"
+      },
+      {
+        "label": "永登县",
+        "value": "620121"
+      },
+      {
+        "label": "皋兰县",
+        "value": "620122"
+      },
+      {
+        "label": "榆中县",
+        "value": "620123"
+      },
+      {
+        "label": "兰州新区",
+        "value": "620171"
+      }
+    ],
+    [{
+      "label": "嘉峪关市",
+      "value": "620201"
+    }],
+    [{
+        "label": "金川区",
+        "value": "620302"
+      },
+      {
+        "label": "永昌县",
+        "value": "620321"
+      }
+    ],
+    [{
+        "label": "白银区",
+        "value": "620402"
+      },
+      {
+        "label": "平川区",
+        "value": "620403"
+      },
+      {
+        "label": "靖远县",
+        "value": "620421"
+      },
+      {
+        "label": "会宁县",
+        "value": "620422"
+      },
+      {
+        "label": "景泰县",
+        "value": "620423"
+      }
+    ],
+    [{
+        "label": "秦州区",
+        "value": "620502"
+      },
+      {
+        "label": "麦积区",
+        "value": "620503"
+      },
+      {
+        "label": "清水县",
+        "value": "620521"
+      },
+      {
+        "label": "秦安县",
+        "value": "620522"
+      },
+      {
+        "label": "甘谷县",
+        "value": "620523"
+      },
+      {
+        "label": "武山县",
+        "value": "620524"
+      },
+      {
+        "label": "张家川回族自治县",
+        "value": "620525"
+      }
+    ],
+    [{
+        "label": "凉州区",
+        "value": "620602"
+      },
+      {
+        "label": "民勤县",
+        "value": "620621"
+      },
+      {
+        "label": "古浪县",
+        "value": "620622"
+      },
+      {
+        "label": "天祝藏族自治县",
+        "value": "620623"
+      }
+    ],
+    [{
+        "label": "甘州区",
+        "value": "620702"
+      },
+      {
+        "label": "肃南裕固族自治县",
+        "value": "620721"
+      },
+      {
+        "label": "民乐县",
+        "value": "620722"
+      },
+      {
+        "label": "临泽县",
+        "value": "620723"
+      },
+      {
+        "label": "高台县",
+        "value": "620724"
+      },
+      {
+        "label": "山丹县",
+        "value": "620725"
+      }
+    ],
+    [{
+        "label": "崆峒区",
+        "value": "620802"
+      },
+      {
+        "label": "泾川县",
+        "value": "620821"
+      },
+      {
+        "label": "灵台县",
+        "value": "620822"
+      },
+      {
+        "label": "崇信县",
+        "value": "620823"
+      },
+      {
+        "label": "华亭县",
+        "value": "620824"
+      },
+      {
+        "label": "庄浪县",
+        "value": "620825"
+      },
+      {
+        "label": "静宁县",
+        "value": "620826"
+      },
+      {
+        "label": "平凉工业园区",
+        "value": "620871"
+      }
+    ],
+    [{
+        "label": "肃州区",
+        "value": "620902"
+      },
+      {
+        "label": "金塔县",
+        "value": "620921"
+      },
+      {
+        "label": "瓜州县",
+        "value": "620922"
+      },
+      {
+        "label": "肃北蒙古族自治县",
+        "value": "620923"
+      },
+      {
+        "label": "阿克塞哈萨克族自治县",
+        "value": "620924"
+      },
+      {
+        "label": "玉门市",
+        "value": "620981"
+      },
+      {
+        "label": "敦煌市",
+        "value": "620982"
+      }
+    ],
+    [{
+        "label": "西峰区",
+        "value": "621002"
+      },
+      {
+        "label": "庆城县",
+        "value": "621021"
+      },
+      {
+        "label": "环县",
+        "value": "621022"
+      },
+      {
+        "label": "华池县",
+        "value": "621023"
+      },
+      {
+        "label": "合水县",
+        "value": "621024"
+      },
+      {
+        "label": "正宁县",
+        "value": "621025"
+      },
+      {
+        "label": "宁县",
+        "value": "621026"
+      },
+      {
+        "label": "镇原县",
+        "value": "621027"
+      }
+    ],
+    [{
+        "label": "安定区",
+        "value": "621102"
+      },
+      {
+        "label": "通渭县",
+        "value": "621121"
+      },
+      {
+        "label": "陇西县",
+        "value": "621122"
+      },
+      {
+        "label": "渭源县",
+        "value": "621123"
+      },
+      {
+        "label": "临洮县",
+        "value": "621124"
+      },
+      {
+        "label": "漳县",
+        "value": "621125"
+      },
+      {
+        "label": "岷县",
+        "value": "621126"
+      }
+    ],
+    [{
+        "label": "武都区",
+        "value": "621202"
+      },
+      {
+        "label": "成县",
+        "value": "621221"
+      },
+      {
+        "label": "文县",
+        "value": "621222"
+      },
+      {
+        "label": "宕昌县",
+        "value": "621223"
+      },
+      {
+        "label": "康县",
+        "value": "621224"
+      },
+      {
+        "label": "西和县",
+        "value": "621225"
+      },
+      {
+        "label": "礼县",
+        "value": "621226"
+      },
+      {
+        "label": "徽县",
+        "value": "621227"
+      },
+      {
+        "label": "两当县",
+        "value": "621228"
+      }
+    ],
+    [{
+        "label": "临夏市",
+        "value": "622901"
+      },
+      {
+        "label": "临夏县",
+        "value": "622921"
+      },
+      {
+        "label": "康乐县",
+        "value": "622922"
+      },
+      {
+        "label": "永靖县",
+        "value": "622923"
+      },
+      {
+        "label": "广河县",
+        "value": "622924"
+      },
+      {
+        "label": "和政县",
+        "value": "622925"
+      },
+      {
+        "label": "东乡族自治县",
+        "value": "622926"
+      },
+      {
+        "label": "积石山保安族东乡族撒拉族自治县",
+        "value": "622927"
+      }
+    ],
+    [{
+        "label": "合作市",
+        "value": "623001"
+      },
+      {
+        "label": "临潭县",
+        "value": "623021"
+      },
+      {
+        "label": "卓尼县",
+        "value": "623022"
+      },
+      {
+        "label": "舟曲县",
+        "value": "623023"
+      },
+      {
+        "label": "迭部县",
+        "value": "623024"
+      },
+      {
+        "label": "玛曲县",
+        "value": "623025"
+      },
+      {
+        "label": "碌曲县",
+        "value": "623026"
+      },
+      {
+        "label": "夏河县",
+        "value": "623027"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "城东区",
+        "value": "630102"
+      },
+      {
+        "label": "城中区",
+        "value": "630103"
+      },
+      {
+        "label": "城西区",
+        "value": "630104"
+      },
+      {
+        "label": "城北区",
+        "value": "630105"
+      },
+      {
+        "label": "大通回族土族自治县",
+        "value": "630121"
+      },
+      {
+        "label": "湟中县",
+        "value": "630122"
+      },
+      {
+        "label": "湟源县",
+        "value": "630123"
+      }
+    ],
+    [{
+        "label": "乐都区",
+        "value": "630202"
+      },
+      {
+        "label": "平安区",
+        "value": "630203"
+      },
+      {
+        "label": "民和回族土族自治县",
+        "value": "630222"
+      },
+      {
+        "label": "互助土族自治县",
+        "value": "630223"
+      },
+      {
+        "label": "化隆回族自治县",
+        "value": "630224"
+      },
+      {
+        "label": "循化撒拉族自治县",
+        "value": "630225"
+      }
+    ],
+    [{
+        "label": "门源回族自治县",
+        "value": "632221"
+      },
+      {
+        "label": "祁连县",
+        "value": "632222"
+      },
+      {
+        "label": "海晏县",
+        "value": "632223"
+      },
+      {
+        "label": "刚察县",
+        "value": "632224"
+      }
+    ],
+    [{
+        "label": "同仁县",
+        "value": "632321"
+      },
+      {
+        "label": "尖扎县",
+        "value": "632322"
+      },
+      {
+        "label": "泽库县",
+        "value": "632323"
+      },
+      {
+        "label": "河南蒙古族自治县",
+        "value": "632324"
+      }
+    ],
+    [{
+        "label": "共和县",
+        "value": "632521"
+      },
+      {
+        "label": "同德县",
+        "value": "632522"
+      },
+      {
+        "label": "贵德县",
+        "value": "632523"
+      },
+      {
+        "label": "兴海县",
+        "value": "632524"
+      },
+      {
+        "label": "贵南县",
+        "value": "632525"
+      }
+    ],
+    [{
+        "label": "玛沁县",
+        "value": "632621"
+      },
+      {
+        "label": "班玛县",
+        "value": "632622"
+      },
+      {
+        "label": "甘德县",
+        "value": "632623"
+      },
+      {
+        "label": "达日县",
+        "value": "632624"
+      },
+      {
+        "label": "久治县",
+        "value": "632625"
+      },
+      {
+        "label": "玛多县",
+        "value": "632626"
+      }
+    ],
+    [{
+        "label": "玉树市",
+        "value": "632701"
+      },
+      {
+        "label": "杂多县",
+        "value": "632722"
+      },
+      {
+        "label": "称多县",
+        "value": "632723"
+      },
+      {
+        "label": "治多县",
+        "value": "632724"
+      },
+      {
+        "label": "囊谦县",
+        "value": "632725"
+      },
+      {
+        "label": "曲麻莱县",
+        "value": "632726"
+      }
+    ],
+    [{
+        "label": "格尔木市",
+        "value": "632801"
+      },
+      {
+        "label": "德令哈市",
+        "value": "632802"
+      },
+      {
+        "label": "乌兰县",
+        "value": "632821"
+      },
+      {
+        "label": "都兰县",
+        "value": "632822"
+      },
+      {
+        "label": "天峻县",
+        "value": "632823"
+      },
+      {
+        "label": "大柴旦行政委员会",
+        "value": "632857"
+      },
+      {
+        "label": "冷湖行政委员会",
+        "value": "632858"
+      },
+      {
+        "label": "茫崖行政委员会",
+        "value": "632859"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "兴庆区",
+        "value": "640104"
+      },
+      {
+        "label": "西夏区",
+        "value": "640105"
+      },
+      {
+        "label": "金凤区",
+        "value": "640106"
+      },
+      {
+        "label": "永宁县",
+        "value": "640121"
+      },
+      {
+        "label": "贺兰县",
+        "value": "640122"
+      },
+      {
+        "label": "灵武市",
+        "value": "640181"
+      }
+    ],
+    [{
+        "label": "大武口区",
+        "value": "640202"
+      },
+      {
+        "label": "惠农区",
+        "value": "640205"
+      },
+      {
+        "label": "平罗县",
+        "value": "640221"
+      }
+    ],
+    [{
+        "label": "利通区",
+        "value": "640302"
+      },
+      {
+        "label": "红寺堡区",
+        "value": "640303"
+      },
+      {
+        "label": "盐池县",
+        "value": "640323"
+      },
+      {
+        "label": "同心县",
+        "value": "640324"
+      },
+      {
+        "label": "青铜峡市",
+        "value": "640381"
+      }
+    ],
+    [{
+        "label": "原州区",
+        "value": "640402"
+      },
+      {
+        "label": "西吉县",
+        "value": "640422"
+      },
+      {
+        "label": "隆德县",
+        "value": "640423"
+      },
+      {
+        "label": "泾源县",
+        "value": "640424"
+      },
+      {
+        "label": "彭阳县",
+        "value": "640425"
+      }
+    ],
+    [{
+        "label": "沙坡头区",
+        "value": "640502"
+      },
+      {
+        "label": "中宁县",
+        "value": "640521"
+      },
+      {
+        "label": "海原县",
+        "value": "640522"
+      }
+    ]
+  ],
+  [
+    [{
+        "label": "天山区",
+        "value": "650102"
+      },
+      {
+        "label": "沙依巴克区",
+        "value": "650103"
+      },
+      {
+        "label": "新市区",
+        "value": "650104"
+      },
+      {
+        "label": "水磨沟区",
+        "value": "650105"
+      },
+      {
+        "label": "头屯河区",
+        "value": "650106"
+      },
+      {
+        "label": "达坂城区",
+        "value": "650107"
+      },
+      {
+        "label": "米东区",
+        "value": "650109"
+      },
+      {
+        "label": "乌鲁木齐县",
+        "value": "650121"
+      },
+      {
+        "label": "乌鲁木齐经济技术开发区",
+        "value": "650171"
+      },
+      {
+        "label": "乌鲁木齐高新技术产业开发区",
+        "value": "650172"
+      }
+    ],
+    [{
+        "label": "独山子区",
+        "value": "650202"
+      },
+      {
+        "label": "克拉玛依区",
+        "value": "650203"
+      },
+      {
+        "label": "白碱滩区",
+        "value": "650204"
+      },
+      {
+        "label": "乌尔禾区",
+        "value": "650205"
+      }
+    ],
+    [{
+        "label": "高昌区",
+        "value": "650402"
+      },
+      {
+        "label": "鄯善县",
+        "value": "650421"
+      },
+      {
+        "label": "托克逊县",
+        "value": "650422"
+      }
+    ],
+    [{
+        "label": "伊州区",
+        "value": "650502"
+      },
+      {
+        "label": "巴里坤哈萨克自治县",
+        "value": "650521"
+      },
+      {
+        "label": "伊吾县",
+        "value": "650522"
+      }
+    ],
+    [{
+        "label": "昌吉市",
+        "value": "652301"
+      },
+      {
+        "label": "阜康市",
+        "value": "652302"
+      },
+      {
+        "label": "呼图壁县",
+        "value": "652323"
+      },
+      {
+        "label": "玛纳斯县",
+        "value": "652324"
+      },
+      {
+        "label": "奇台县",
+        "value": "652325"
+      },
+      {
+        "label": "吉木萨尔县",
+        "value": "652327"
+      },
+      {
+        "label": "木垒哈萨克自治县",
+        "value": "652328"
+      }
+    ],
+    [{
+        "label": "博乐市",
+        "value": "652701"
+      },
+      {
+        "label": "阿拉山口市",
+        "value": "652702"
+      },
+      {
+        "label": "精河县",
+        "value": "652722"
+      },
+      {
+        "label": "温泉县",
+        "value": "652723"
+      }
+    ],
+    [{
+        "label": "库尔勒市",
+        "value": "652801"
+      },
+      {
+        "label": "轮台县",
+        "value": "652822"
+      },
+      {
+        "label": "尉犁县",
+        "value": "652823"
+      },
+      {
+        "label": "若羌县",
+        "value": "652824"
+      },
+      {
+        "label": "且末县",
+        "value": "652825"
+      },
+      {
+        "label": "焉耆回族自治县",
+        "value": "652826"
+      },
+      {
+        "label": "和静县",
+        "value": "652827"
+      },
+      {
+        "label": "和硕县",
+        "value": "652828"
+      },
+      {
+        "label": "博湖县",
+        "value": "652829"
+      },
+      {
+        "label": "库尔勒经济技术开发区",
+        "value": "652871"
+      }
+    ],
+    [{
+        "label": "阿克苏市",
+        "value": "652901"
+      },
+      {
+        "label": "温宿县",
+        "value": "652922"
+      },
+      {
+        "label": "库车县",
+        "value": "652923"
+      },
+      {
+        "label": "沙雅县",
+        "value": "652924"
+      },
+      {
+        "label": "新和县",
+        "value": "652925"
+      },
+      {
+        "label": "拜城县",
+        "value": "652926"
+      },
+      {
+        "label": "乌什县",
+        "value": "652927"
+      },
+      {
+        "label": "阿瓦提县",
+        "value": "652928"
+      },
+      {
+        "label": "柯坪县",
+        "value": "652929"
+      }
+    ],
+    [{
+        "label": "阿图什市",
+        "value": "653001"
+      },
+      {
+        "label": "阿克陶县",
+        "value": "653022"
+      },
+      {
+        "label": "阿合奇县",
+        "value": "653023"
+      },
+      {
+        "label": "乌恰县",
+        "value": "653024"
+      }
+    ],
+    [{
+        "label": "喀什市",
+        "value": "653101"
+      },
+      {
+        "label": "疏附县",
+        "value": "653121"
+      },
+      {
+        "label": "疏勒县",
+        "value": "653122"
+      },
+      {
+        "label": "英吉沙县",
+        "value": "653123"
+      },
+      {
+        "label": "泽普县",
+        "value": "653124"
+      },
+      {
+        "label": "莎车县",
+        "value": "653125"
+      },
+      {
+        "label": "叶城县",
+        "value": "653126"
+      },
+      {
+        "label": "麦盖提县",
+        "value": "653127"
+      },
+      {
+        "label": "岳普湖县",
+        "value": "653128"
+      },
+      {
+        "label": "伽师县",
+        "value": "653129"
+      },
+      {
+        "label": "巴楚县",
+        "value": "653130"
+      },
+      {
+        "label": "塔什库尔干塔吉克自治县",
+        "value": "653131"
+      }
+    ],
+    [{
+        "label": "和田市",
+        "value": "653201"
+      },
+      {
+        "label": "和田县",
+        "value": "653221"
+      },
+      {
+        "label": "墨玉县",
+        "value": "653222"
+      },
+      {
+        "label": "皮山县",
+        "value": "653223"
+      },
+      {
+        "label": "洛浦县",
+        "value": "653224"
+      },
+      {
+        "label": "策勒县",
+        "value": "653225"
+      },
+      {
+        "label": "于田县",
+        "value": "653226"
+      },
+      {
+        "label": "民丰县",
+        "value": "653227"
+      }
+    ],
+    [{
+        "label": "伊宁市",
+        "value": "654002"
+      },
+      {
+        "label": "奎屯市",
+        "value": "654003"
+      },
+      {
+        "label": "霍尔果斯市",
+        "value": "654004"
+      },
+      {
+        "label": "伊宁县",
+        "value": "654021"
+      },
+      {
+        "label": "察布查尔锡伯自治县",
+        "value": "654022"
+      },
+      {
+        "label": "霍城县",
+        "value": "654023"
+      },
+      {
+        "label": "巩留县",
+        "value": "654024"
+      },
+      {
+        "label": "新源县",
+        "value": "654025"
+      },
+      {
+        "label": "昭苏县",
+        "value": "654026"
+      },
+      {
+        "label": "特克斯县",
+        "value": "654027"
+      },
+      {
+        "label": "尼勒克县",
+        "value": "654028"
+      }
+    ],
+    [{
+        "label": "塔城市",
+        "value": "654201"
+      },
+      {
+        "label": "乌苏市",
+        "value": "654202"
+      },
+      {
+        "label": "额敏县",
+        "value": "654221"
+      },
+      {
+        "label": "沙湾县",
+        "value": "654223"
+      },
+      {
+        "label": "托里县",
+        "value": "654224"
+      },
+      {
+        "label": "裕民县",
+        "value": "654225"
+      },
+      {
+        "label": "和布克赛尔蒙古自治县",
+        "value": "654226"
+      }
+    ],
+    [{
+        "label": "阿勒泰市",
+        "value": "654301"
+      },
+      {
+        "label": "布尔津县",
+        "value": "654321"
+      },
+      {
+        "label": "富蕴县",
+        "value": "654322"
+      },
+      {
+        "label": "福海县",
+        "value": "654323"
+      },
+      {
+        "label": "哈巴河县",
+        "value": "654324"
+      },
+      {
+        "label": "青河县",
+        "value": "654325"
+      },
+      {
+        "label": "吉木乃县",
+        "value": "654326"
+      }
+    ],
+    [{
+        "label": "石河子市",
+        "value": "659001"
+      },
+      {
+        "label": "阿拉尔市",
+        "value": "659002"
+      },
+      {
+        "label": "图木舒克市",
+        "value": "659003"
+      },
+      {
+        "label": "五家渠市",
+        "value": "659004"
+      },
+      {
+        "label": "铁门关市",
+        "value": "659006"
+      }
+    ]
+  ],
+  [
+    [{
+      "label": "台北",
+      "value": "660101"
+    }],
+    [{
+      "label": "高雄",
+      "value": "660201"
+    }],
+    [{
+      "label": "基隆",
+      "value": "660301"
+    }],
+    [{
+      "label": "台中",
+      "value": "660401"
+    }],
+    [{
+      "label": "台南",
+      "value": "660501"
+    }],
+    [{
+      "label": "新竹",
+      "value": "660601"
+    }],
+    [{
+      "label": "嘉义",
+      "value": "660701"
+    }],
+    [{
+      "label": "宜兰",
+      "value": "660801"
+    }],
+    [{
+      "label": "桃园",
+      "value": "660901"
+    }],
+    [{
+      "label": "苗栗",
+      "value": "661001"
+    }],
+    [{
+      "label": "彰化",
+      "value": "661101"
+    }],
+    [{
+      "label": "南投",
+      "value": "661201"
+    }],
+    [{
+      "label": "云林",
+      "value": "661301"
+    }],
+    [{
+      "label": "屏东",
+      "value": "661401"
+    }],
+    [{
+      "label": "台东",
+      "value": "661501"
+    }],
+    [{
+      "label": "花莲",
+      "value": "661601"
+    }],
+    [{
+      "label": "澎湖",
+      "value": "661701"
+    }]
+  ],
+  [
+    [{
+      "label": "香港岛",
+      "value": "670101"
+    }],
+    [{
+      "label": "九龙",
+      "value": "670201"
+    }],
+    [{
+      "label": "新界",
+      "value": "670301"
+    }]
+  ],
+  [
+    [{
+      "label": "澳门半岛",
+      "value": "680101"
+    }],
+    [{
+      "label": "氹仔岛",
+      "value": "680201"
+    }],
+    [{
+      "label": "路环岛",
+      "value": "680301"
+    }],
+    [{
+      "label": "路氹城",
+      "value": "680401"
+    }]
+  ]
+]
+export default areaData;
diff --git a/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/city.js b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/city.js
new file mode 100644
index 0000000..8c1dc26
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/city.js
@@ -0,0 +1,1503 @@
+/* eslint-disable */
+var cityData = [
+  [{
+    "label": "市辖区",
+    "value": "1101"
+  }],
+  [{
+    "label": "市辖区",
+    "value": "1201"
+  }],
+  [{
+      "label": "石家庄市",
+      "value": "1301"
+    },
+    {
+      "label": "唐山市",
+      "value": "1302"
+    },
+    {
+      "label": "秦皇岛市",
+      "value": "1303"
+    },
+    {
+      "label": "邯郸市",
+      "value": "1304"
+    },
+    {
+      "label": "邢台市",
+      "value": "1305"
+    },
+    {
+      "label": "保定市",
+      "value": "1306"
+    },
+    {
+      "label": "张家口市",
+      "value": "1307"
+    },
+    {
+      "label": "承德市",
+      "value": "1308"
+    },
+    {
+      "label": "沧州市",
+      "value": "1309"
+    },
+    {
+      "label": "廊坊市",
+      "value": "1310"
+    },
+    {
+      "label": "衡水市",
+      "value": "1311"
+    }
+  ],
+  [{
+      "label": "太原市",
+      "value": "1401"
+    },
+    {
+      "label": "大同市",
+      "value": "1402"
+    },
+    {
+      "label": "阳泉市",
+      "value": "1403"
+    },
+    {
+      "label": "长治市",
+      "value": "1404"
+    },
+    {
+      "label": "晋城市",
+      "value": "1405"
+    },
+    {
+      "label": "朔州市",
+      "value": "1406"
+    },
+    {
+      "label": "晋中市",
+      "value": "1407"
+    },
+    {
+      "label": "运城市",
+      "value": "1408"
+    },
+    {
+      "label": "忻州市",
+      "value": "1409"
+    },
+    {
+      "label": "临汾市",
+      "value": "1410"
+    },
+    {
+      "label": "吕梁市",
+      "value": "1411"
+    }
+  ],
+  [{
+      "label": "呼和浩特市",
+      "value": "1501"
+    },
+    {
+      "label": "包头市",
+      "value": "1502"
+    },
+    {
+      "label": "乌海市",
+      "value": "1503"
+    },
+    {
+      "label": "赤峰市",
+      "value": "1504"
+    },
+    {
+      "label": "通辽市",
+      "value": "1505"
+    },
+    {
+      "label": "鄂尔多斯市",
+      "value": "1506"
+    },
+    {
+      "label": "呼伦贝尔市",
+      "value": "1507"
+    },
+    {
+      "label": "巴彦淖尔市",
+      "value": "1508"
+    },
+    {
+      "label": "乌兰察布市",
+      "value": "1509"
+    },
+    {
+      "label": "兴安盟",
+      "value": "1522"
+    },
+    {
+      "label": "锡林郭勒盟",
+      "value": "1525"
+    },
+    {
+      "label": "阿拉善盟",
+      "value": "1529"
+    }
+  ],
+  [{
+      "label": "沈阳市",
+      "value": "2101"
+    },
+    {
+      "label": "大连市",
+      "value": "2102"
+    },
+    {
+      "label": "鞍山市",
+      "value": "2103"
+    },
+    {
+      "label": "抚顺市",
+      "value": "2104"
+    },
+    {
+      "label": "本溪市",
+      "value": "2105"
+    },
+    {
+      "label": "丹东市",
+      "value": "2106"
+    },
+    {
+      "label": "锦州市",
+      "value": "2107"
+    },
+    {
+      "label": "营口市",
+      "value": "2108"
+    },
+    {
+      "label": "阜新市",
+      "value": "2109"
+    },
+    {
+      "label": "辽阳市",
+      "value": "2110"
+    },
+    {
+      "label": "盘锦市",
+      "value": "2111"
+    },
+    {
+      "label": "铁岭市",
+      "value": "2112"
+    },
+    {
+      "label": "朝阳市",
+      "value": "2113"
+    },
+    {
+      "label": "葫芦岛市",
+      "value": "2114"
+    }
+  ],
+  [{
+      "label": "长春市",
+      "value": "2201"
+    },
+    {
+      "label": "吉林市",
+      "value": "2202"
+    },
+    {
+      "label": "四平市",
+      "value": "2203"
+    },
+    {
+      "label": "辽源市",
+      "value": "2204"
+    },
+    {
+      "label": "通化市",
+      "value": "2205"
+    },
+    {
+      "label": "白山市",
+      "value": "2206"
+    },
+    {
+      "label": "松原市",
+      "value": "2207"
+    },
+    {
+      "label": "白城市",
+      "value": "2208"
+    },
+    {
+      "label": "延边朝鲜族自治州",
+      "value": "2224"
+    }
+  ],
+  [{
+      "label": "哈尔滨市",
+      "value": "2301"
+    },
+    {
+      "label": "齐齐哈尔市",
+      "value": "2302"
+    },
+    {
+      "label": "鸡西市",
+      "value": "2303"
+    },
+    {
+      "label": "鹤岗市",
+      "value": "2304"
+    },
+    {
+      "label": "双鸭山市",
+      "value": "2305"
+    },
+    {
+      "label": "大庆市",
+      "value": "2306"
+    },
+    {
+      "label": "伊春市",
+      "value": "2307"
+    },
+    {
+      "label": "佳木斯市",
+      "value": "2308"
+    },
+    {
+      "label": "七台河市",
+      "value": "2309"
+    },
+    {
+      "label": "牡丹江市",
+      "value": "2310"
+    },
+    {
+      "label": "黑河市",
+      "value": "2311"
+    },
+    {
+      "label": "绥化市",
+      "value": "2312"
+    },
+    {
+      "label": "大兴安岭地区",
+      "value": "2327"
+    }
+  ],
+  [{
+    "label": "市辖区",
+    "value": "3101"
+  }],
+  [{
+      "label": "南京市",
+      "value": "3201"
+    },
+    {
+      "label": "无锡市",
+      "value": "3202"
+    },
+    {
+      "label": "徐州市",
+      "value": "3203"
+    },
+    {
+      "label": "常州市",
+      "value": "3204"
+    },
+    {
+      "label": "苏州市",
+      "value": "3205"
+    },
+    {
+      "label": "南通市",
+      "value": "3206"
+    },
+    {
+      "label": "连云港市",
+      "value": "3207"
+    },
+    {
+      "label": "淮安市",
+      "value": "3208"
+    },
+    {
+      "label": "盐城市",
+      "value": "3209"
+    },
+    {
+      "label": "扬州市",
+      "value": "3210"
+    },
+    {
+      "label": "镇江市",
+      "value": "3211"
+    },
+    {
+      "label": "泰州市",
+      "value": "3212"
+    },
+    {
+      "label": "宿迁市",
+      "value": "3213"
+    }
+  ],
+  [{
+      "label": "杭州市",
+      "value": "3301"
+    },
+    {
+      "label": "宁波市",
+      "value": "3302"
+    },
+    {
+      "label": "温州市",
+      "value": "3303"
+    },
+    {
+      "label": "嘉兴市",
+      "value": "3304"
+    },
+    {
+      "label": "湖州市",
+      "value": "3305"
+    },
+    {
+      "label": "绍兴市",
+      "value": "3306"
+    },
+    {
+      "label": "金华市",
+      "value": "3307"
+    },
+    {
+      "label": "衢州市",
+      "value": "3308"
+    },
+    {
+      "label": "舟山市",
+      "value": "3309"
+    },
+    {
+      "label": "台州市",
+      "value": "3310"
+    },
+    {
+      "label": "丽水市",
+      "value": "3311"
+    }
+  ],
+  [{
+      "label": "合肥市",
+      "value": "3401"
+    },
+    {
+      "label": "芜湖市",
+      "value": "3402"
+    },
+    {
+      "label": "蚌埠市",
+      "value": "3403"
+    },
+    {
+      "label": "淮南市",
+      "value": "3404"
+    },
+    {
+      "label": "马鞍山市",
+      "value": "3405"
+    },
+    {
+      "label": "淮北市",
+      "value": "3406"
+    },
+    {
+      "label": "铜陵市",
+      "value": "3407"
+    },
+    {
+      "label": "安庆市",
+      "value": "3408"
+    },
+    {
+      "label": "黄山市",
+      "value": "3410"
+    },
+    {
+      "label": "滁州市",
+      "value": "3411"
+    },
+    {
+      "label": "阜阳市",
+      "value": "3412"
+    },
+    {
+      "label": "宿州市",
+      "value": "3413"
+    },
+    {
+      "label": "六安市",
+      "value": "3415"
+    },
+    {
+      "label": "亳州市",
+      "value": "3416"
+    },
+    {
+      "label": "池州市",
+      "value": "3417"
+    },
+    {
+      "label": "宣城市",
+      "value": "3418"
+    }
+  ],
+  [{
+      "label": "福州市",
+      "value": "3501"
+    },
+    {
+      "label": "厦门市",
+      "value": "3502"
+    },
+    {
+      "label": "莆田市",
+      "value": "3503"
+    },
+    {
+      "label": "三明市",
+      "value": "3504"
+    },
+    {
+      "label": "泉州市",
+      "value": "3505"
+    },
+    {
+      "label": "漳州市",
+      "value": "3506"
+    },
+    {
+      "label": "南平市",
+      "value": "3507"
+    },
+    {
+      "label": "龙岩市",
+      "value": "3508"
+    },
+    {
+      "label": "宁德市",
+      "value": "3509"
+    }
+  ],
+  [{
+      "label": "南昌市",
+      "value": "3601"
+    },
+    {
+      "label": "景德镇市",
+      "value": "3602"
+    },
+    {
+      "label": "萍乡市",
+      "value": "3603"
+    },
+    {
+      "label": "九江市",
+      "value": "3604"
+    },
+    {
+      "label": "新余市",
+      "value": "3605"
+    },
+    {
+      "label": "鹰潭市",
+      "value": "3606"
+    },
+    {
+      "label": "赣州市",
+      "value": "3607"
+    },
+    {
+      "label": "吉安市",
+      "value": "3608"
+    },
+    {
+      "label": "宜春市",
+      "value": "3609"
+    },
+    {
+      "label": "抚州市",
+      "value": "3610"
+    },
+    {
+      "label": "上饶市",
+      "value": "3611"
+    }
+  ],
+  [{
+      "label": "济南市",
+      "value": "3701"
+    },
+    {
+      "label": "青岛市",
+      "value": "3702"
+    },
+    {
+      "label": "淄博市",
+      "value": "3703"
+    },
+    {
+      "label": "枣庄市",
+      "value": "3704"
+    },
+    {
+      "label": "东营市",
+      "value": "3705"
+    },
+    {
+      "label": "烟台市",
+      "value": "3706"
+    },
+    {
+      "label": "潍坊市",
+      "value": "3707"
+    },
+    {
+      "label": "济宁市",
+      "value": "3708"
+    },
+    {
+      "label": "泰安市",
+      "value": "3709"
+    },
+    {
+      "label": "威海市",
+      "value": "3710"
+    },
+    {
+      "label": "日照市",
+      "value": "3711"
+    },
+    {
+      "label": "莱芜市",
+      "value": "3712"
+    },
+    {
+      "label": "临沂市",
+      "value": "3713"
+    },
+    {
+      "label": "德州市",
+      "value": "3714"
+    },
+    {
+      "label": "聊城市",
+      "value": "3715"
+    },
+    {
+      "label": "滨州市",
+      "value": "3716"
+    },
+    {
+      "label": "菏泽市",
+      "value": "3717"
+    }
+  ],
+  [{
+      "label": "郑州市",
+      "value": "4101"
+    },
+    {
+      "label": "开封市",
+      "value": "4102"
+    },
+    {
+      "label": "洛阳市",
+      "value": "4103"
+    },
+    {
+      "label": "平顶山市",
+      "value": "4104"
+    },
+    {
+      "label": "安阳市",
+      "value": "4105"
+    },
+    {
+      "label": "鹤壁市",
+      "value": "4106"
+    },
+    {
+      "label": "新乡市",
+      "value": "4107"
+    },
+    {
+      "label": "焦作市",
+      "value": "4108"
+    },
+    {
+      "label": "濮阳市",
+      "value": "4109"
+    },
+    {
+      "label": "许昌市",
+      "value": "4110"
+    },
+    {
+      "label": "漯河市",
+      "value": "4111"
+    },
+    {
+      "label": "三门峡市",
+      "value": "4112"
+    },
+    {
+      "label": "南阳市",
+      "value": "4113"
+    },
+    {
+      "label": "商丘市",
+      "value": "4114"
+    },
+    {
+      "label": "信阳市",
+      "value": "4115"
+    },
+    {
+      "label": "周口市",
+      "value": "4116"
+    },
+    {
+      "label": "驻马店市",
+      "value": "4117"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4190"
+    }
+  ],
+  [{
+      "label": "武汉市",
+      "value": "4201"
+    },
+    {
+      "label": "黄石市",
+      "value": "4202"
+    },
+    {
+      "label": "十堰市",
+      "value": "4203"
+    },
+    {
+      "label": "宜昌市",
+      "value": "4205"
+    },
+    {
+      "label": "襄阳市",
+      "value": "4206"
+    },
+    {
+      "label": "鄂州市",
+      "value": "4207"
+    },
+    {
+      "label": "荆门市",
+      "value": "4208"
+    },
+    {
+      "label": "孝感市",
+      "value": "4209"
+    },
+    {
+      "label": "荆州市",
+      "value": "4210"
+    },
+    {
+      "label": "黄冈市",
+      "value": "4211"
+    },
+    {
+      "label": "咸宁市",
+      "value": "4212"
+    },
+    {
+      "label": "随州市",
+      "value": "4213"
+    },
+    {
+      "label": "恩施土家族苗族自治州",
+      "value": "4228"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4290"
+    }
+  ],
+  [{
+      "label": "长沙市",
+      "value": "4301"
+    },
+    {
+      "label": "株洲市",
+      "value": "4302"
+    },
+    {
+      "label": "湘潭市",
+      "value": "4303"
+    },
+    {
+      "label": "衡阳市",
+      "value": "4304"
+    },
+    {
+      "label": "邵阳市",
+      "value": "4305"
+    },
+    {
+      "label": "岳阳市",
+      "value": "4306"
+    },
+    {
+      "label": "常德市",
+      "value": "4307"
+    },
+    {
+      "label": "张家界市",
+      "value": "4308"
+    },
+    {
+      "label": "益阳市",
+      "value": "4309"
+    },
+    {
+      "label": "郴州市",
+      "value": "4310"
+    },
+    {
+      "label": "永州市",
+      "value": "4311"
+    },
+    {
+      "label": "怀化市",
+      "value": "4312"
+    },
+    {
+      "label": "娄底市",
+      "value": "4313"
+    },
+    {
+      "label": "湘西土家族苗族自治州",
+      "value": "4331"
+    }
+  ],
+  [{
+      "label": "广州市",
+      "value": "4401"
+    },
+    {
+      "label": "韶关市",
+      "value": "4402"
+    },
+    {
+      "label": "深圳市",
+      "value": "4403"
+    },
+    {
+      "label": "珠海市",
+      "value": "4404"
+    },
+    {
+      "label": "汕头市",
+      "value": "4405"
+    },
+    {
+      "label": "佛山市",
+      "value": "4406"
+    },
+    {
+      "label": "江门市",
+      "value": "4407"
+    },
+    {
+      "label": "湛江市",
+      "value": "4408"
+    },
+    {
+      "label": "茂名市",
+      "value": "4409"
+    },
+    {
+      "label": "肇庆市",
+      "value": "4412"
+    },
+    {
+      "label": "惠州市",
+      "value": "4413"
+    },
+    {
+      "label": "梅州市",
+      "value": "4414"
+    },
+    {
+      "label": "汕尾市",
+      "value": "4415"
+    },
+    {
+      "label": "河源市",
+      "value": "4416"
+    },
+    {
+      "label": "阳江市",
+      "value": "4417"
+    },
+    {
+      "label": "清远市",
+      "value": "4418"
+    },
+    {
+      "label": "东莞市",
+      "value": "4419"
+    },
+    {
+      "label": "中山市",
+      "value": "4420"
+    },
+    {
+      "label": "潮州市",
+      "value": "4451"
+    },
+    {
+      "label": "揭阳市",
+      "value": "4452"
+    },
+    {
+      "label": "云浮市",
+      "value": "4453"
+    }
+  ],
+  [{
+      "label": "南宁市",
+      "value": "4501"
+    },
+    {
+      "label": "柳州市",
+      "value": "4502"
+    },
+    {
+      "label": "桂林市",
+      "value": "4503"
+    },
+    {
+      "label": "梧州市",
+      "value": "4504"
+    },
+    {
+      "label": "北海市",
+      "value": "4505"
+    },
+    {
+      "label": "防城港市",
+      "value": "4506"
+    },
+    {
+      "label": "钦州市",
+      "value": "4507"
+    },
+    {
+      "label": "贵港市",
+      "value": "4508"
+    },
+    {
+      "label": "玉林市",
+      "value": "4509"
+    },
+    {
+      "label": "百色市",
+      "value": "4510"
+    },
+    {
+      "label": "贺州市",
+      "value": "4511"
+    },
+    {
+      "label": "河池市",
+      "value": "4512"
+    },
+    {
+      "label": "来宾市",
+      "value": "4513"
+    },
+    {
+      "label": "崇左市",
+      "value": "4514"
+    }
+  ],
+  [{
+      "label": "海口市",
+      "value": "4601"
+    },
+    {
+      "label": "三亚市",
+      "value": "4602"
+    },
+    {
+      "label": "三沙市",
+      "value": "4603"
+    },
+    {
+      "label": "儋州市",
+      "value": "4604"
+    },
+    {
+      "label": "省直辖县级行政区划",
+      "value": "4690"
+    }
+  ],
+  [{
+      "label": "市辖区",
+      "value": "5001"
+    },
+    {
+      "label": "县",
+      "value": "5002"
+    }
+  ],
+  [{
+      "label": "成都市",
+      "value": "5101"
+    },
+    {
+      "label": "自贡市",
+      "value": "5103"
+    },
+    {
+      "label": "攀枝花市",
+      "value": "5104"
+    },
+    {
+      "label": "泸州市",
+      "value": "5105"
+    },
+    {
+      "label": "德阳市",
+      "value": "5106"
+    },
+    {
+      "label": "绵阳市",
+      "value": "5107"
+    },
+    {
+      "label": "广元市",
+      "value": "5108"
+    },
+    {
+      "label": "遂宁市",
+      "value": "5109"
+    },
+    {
+      "label": "内江市",
+      "value": "5110"
+    },
+    {
+      "label": "乐山市",
+      "value": "5111"
+    },
+    {
+      "label": "南充市",
+      "value": "5113"
+    },
+    {
+      "label": "眉山市",
+      "value": "5114"
+    },
+    {
+      "label": "宜宾市",
+      "value": "5115"
+    },
+    {
+      "label": "广安市",
+      "value": "5116"
+    },
+    {
+      "label": "达州市",
+      "value": "5117"
+    },
+    {
+      "label": "雅安市",
+      "value": "5118"
+    },
+    {
+      "label": "巴中市",
+      "value": "5119"
+    },
+    {
+      "label": "资阳市",
+      "value": "5120"
+    },
+    {
+      "label": "阿坝藏族羌族自治州",
+      "value": "5132"
+    },
+    {
+      "label": "甘孜藏族自治州",
+      "value": "5133"
+    },
+    {
+      "label": "凉山彝族自治州",
+      "value": "5134"
+    }
+  ],
+  [{
+      "label": "贵阳市",
+      "value": "5201"
+    },
+    {
+      "label": "六盘水市",
+      "value": "5202"
+    },
+    {
+      "label": "遵义市",
+      "value": "5203"
+    },
+    {
+      "label": "安顺市",
+      "value": "5204"
+    },
+    {
+      "label": "毕节市",
+      "value": "5205"
+    },
+    {
+      "label": "铜仁市",
+      "value": "5206"
+    },
+    {
+      "label": "黔西南布依族苗族自治州",
+      "value": "5223"
+    },
+    {
+      "label": "黔东南苗族侗族自治州",
+      "value": "5226"
+    },
+    {
+      "label": "黔南布依族苗族自治州",
+      "value": "5227"
+    }
+  ],
+  [{
+      "label": "昆明市",
+      "value": "5301"
+    },
+    {
+      "label": "曲靖市",
+      "value": "5303"
+    },
+    {
+      "label": "玉溪市",
+      "value": "5304"
+    },
+    {
+      "label": "保山市",
+      "value": "5305"
+    },
+    {
+      "label": "昭通市",
+      "value": "5306"
+    },
+    {
+      "label": "丽江市",
+      "value": "5307"
+    },
+    {
+      "label": "普洱市",
+      "value": "5308"
+    },
+    {
+      "label": "临沧市",
+      "value": "5309"
+    },
+    {
+      "label": "楚雄彝族自治州",
+      "value": "5323"
+    },
+    {
+      "label": "红河哈尼族彝族自治州",
+      "value": "5325"
+    },
+    {
+      "label": "文山壮族苗族自治州",
+      "value": "5326"
+    },
+    {
+      "label": "西双版纳傣族自治州",
+      "value": "5328"
+    },
+    {
+      "label": "大理白族自治州",
+      "value": "5329"
+    },
+    {
+      "label": "德宏傣族景颇族自治州",
+      "value": "5331"
+    },
+    {
+      "label": "怒江傈僳族自治州",
+      "value": "5333"
+    },
+    {
+      "label": "迪庆藏族自治州",
+      "value": "5334"
+    }
+  ],
+  [{
+      "label": "拉萨市",
+      "value": "5401"
+    },
+    {
+      "label": "日喀则市",
+      "value": "5402"
+    },
+    {
+      "label": "昌都市",
+      "value": "5403"
+    },
+    {
+      "label": "林芝市",
+      "value": "5404"
+    },
+    {
+      "label": "山南市",
+      "value": "5405"
+    },
+    {
+      "label": "那曲地区",
+      "value": "5424"
+    },
+    {
+      "label": "阿里地区",
+      "value": "5425"
+    }
+  ],
+  [{
+      "label": "西安市",
+      "value": "6101"
+    },
+    {
+      "label": "铜川市",
+      "value": "6102"
+    },
+    {
+      "label": "宝鸡市",
+      "value": "6103"
+    },
+    {
+      "label": "咸阳市",
+      "value": "6104"
+    },
+    {
+      "label": "渭南市",
+      "value": "6105"
+    },
+    {
+      "label": "延安市",
+      "value": "6106"
+    },
+    {
+      "label": "汉中市",
+      "value": "6107"
+    },
+    {
+      "label": "榆林市",
+      "value": "6108"
+    },
+    {
+      "label": "安康市",
+      "value": "6109"
+    },
+    {
+      "label": "商洛市",
+      "value": "6110"
+    }
+  ],
+  [{
+      "label": "兰州市",
+      "value": "6201"
+    },
+    {
+      "label": "嘉峪关市",
+      "value": "6202"
+    },
+    {
+      "label": "金昌市",
+      "value": "6203"
+    },
+    {
+      "label": "白银市",
+      "value": "6204"
+    },
+    {
+      "label": "天水市",
+      "value": "6205"
+    },
+    {
+      "label": "武威市",
+      "value": "6206"
+    },
+    {
+      "label": "张掖市",
+      "value": "6207"
+    },
+    {
+      "label": "平凉市",
+      "value": "6208"
+    },
+    {
+      "label": "酒泉市",
+      "value": "6209"
+    },
+    {
+      "label": "庆阳市",
+      "value": "6210"
+    },
+    {
+      "label": "定西市",
+      "value": "6211"
+    },
+    {
+      "label": "陇南市",
+      "value": "6212"
+    },
+    {
+      "label": "临夏回族自治州",
+      "value": "6229"
+    },
+    {
+      "label": "甘南藏族自治州",
+      "value": "6230"
+    }
+  ],
+  [{
+      "label": "西宁市",
+      "value": "6301"
+    },
+    {
+      "label": "海东市",
+      "value": "6302"
+    },
+    {
+      "label": "海北藏族自治州",
+      "value": "6322"
+    },
+    {
+      "label": "黄南藏族自治州",
+      "value": "6323"
+    },
+    {
+      "label": "海南藏族自治州",
+      "value": "6325"
+    },
+    {
+      "label": "果洛藏族自治州",
+      "value": "6326"
+    },
+    {
+      "label": "玉树藏族自治州",
+      "value": "6327"
+    },
+    {
+      "label": "海西蒙古族藏族自治州",
+      "value": "6328"
+    }
+  ],
+  [{
+      "label": "银川市",
+      "value": "6401"
+    },
+    {
+      "label": "石嘴山市",
+      "value": "6402"
+    },
+    {
+      "label": "吴忠市",
+      "value": "6403"
+    },
+    {
+      "label": "固原市",
+      "value": "6404"
+    },
+    {
+      "label": "中卫市",
+      "value": "6405"
+    }
+  ],
+  [{
+      "label": "乌鲁木齐市",
+      "value": "6501"
+    },
+    {
+      "label": "克拉玛依市",
+      "value": "6502"
+    },
+    {
+      "label": "吐鲁番市",
+      "value": "6504"
+    },
+    {
+      "label": "哈密市",
+      "value": "6505"
+    },
+    {
+      "label": "昌吉回族自治州",
+      "value": "6523"
+    },
+    {
+      "label": "博尔塔拉蒙古自治州",
+      "value": "6527"
+    },
+    {
+      "label": "巴音郭楞蒙古自治州",
+      "value": "6528"
+    },
+    {
+      "label": "阿克苏地区",
+      "value": "6529"
+    },
+    {
+      "label": "克孜勒苏柯尔克孜自治州",
+      "value": "6530"
+    },
+    {
+      "label": "喀什地区",
+      "value": "6531"
+    },
+    {
+      "label": "和田地区",
+      "value": "6532"
+    },
+    {
+      "label": "伊犁哈萨克自治州",
+      "value": "6540"
+    },
+    {
+      "label": "塔城地区",
+      "value": "6542"
+    },
+    {
+      "label": "阿勒泰地区",
+      "value": "6543"
+    },
+    {
+      "label": "自治区直辖县级行政区划",
+      "value": "6590"
+    }
+  ],
+  [{
+      "label": "台北",
+      "value": "6601"
+    },
+    {
+      "label": "高雄",
+      "value": "6602"
+    },
+    {
+      "label": "基隆",
+      "value": "6603"
+    },
+    {
+      "label": "台中",
+      "value": "6604"
+    },
+    {
+      "label": "台南",
+      "value": "6605"
+    },
+    {
+      "label": "新竹",
+      "value": "6606"
+    },
+    {
+      "label": "嘉义",
+      "value": "6607"
+    },
+    {
+      "label": "宜兰",
+      "value": "6608"
+    },
+    {
+      "label": "桃园",
+      "value": "6609"
+    },
+    {
+      "label": "苗栗",
+      "value": "6610"
+    },
+    {
+      "label": "彰化",
+      "value": "6611"
+    },
+    {
+      "label": "南投",
+      "value": "6612"
+    },
+    {
+      "label": "云林",
+      "value": "6613"
+    },
+    {
+      "label": "屏东",
+      "value": "6614"
+    },
+    {
+      "label": "台东",
+      "value": "6615"
+    },
+    {
+      "label": "花莲",
+      "value": "6616"
+    },
+    {
+      "label": "澎湖",
+      "value": "6617"
+    }
+  ],
+  [{
+      "label": "香港岛",
+      "value": "6701"
+    },
+    {
+      "label": "九龙",
+      "value": "6702"
+    },
+    {
+      "label": "新界",
+      "value": "6703"
+    }
+  ],
+  [{
+      "label": "澳门半岛",
+      "value": "6801"
+    },
+    {
+      "label": "氹仔岛",
+      "value": "6802"
+    },
+    {
+      "label": "路环岛",
+      "value": "6803"
+    },
+    {
+      "label": "路氹城",
+      "value": "6804"
+    }
+  ]
+]
+export default cityData;
diff --git a/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/province.js b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/province.js
new file mode 100644
index 0000000..1bd680e
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mpvue-citypicker/city-data/province.js
@@ -0,0 +1,139 @@
+/* eslint-disable */
+var provinceData = [{
+    "label": "北京市",
+    "value": "11"
+  },
+  {
+    "label": "天津市",
+    "value": "12"
+  },
+  {
+    "label": "河北省",
+    "value": "13"
+  },
+  {
+    "label": "山西省",
+    "value": "14"
+  },
+  {
+    "label": "内蒙古自治区",
+    "value": "15"
+  },
+  {
+    "label": "辽宁省",
+    "value": "21"
+  },
+  {
+    "label": "吉林省",
+    "value": "22"
+  },
+  {
+    "label": "黑龙江省",
+    "value": "23"
+  },
+  {
+    "label": "上海市",
+    "value": "31"
+  },
+  {
+    "label": "江苏省",
+    "value": "32"
+  },
+  {
+    "label": "浙江省",
+    "value": "33"
+  },
+  {
+    "label": "安徽省",
+    "value": "34"
+  },
+  {
+    "label": "福建省",
+    "value": "35"
+  },
+  {
+    "label": "江西省",
+    "value": "36"
+  },
+  {
+    "label": "山东省",
+    "value": "37"
+  },
+  {
+    "label": "河南省",
+    "value": "41"
+  },
+  {
+    "label": "湖北省",
+    "value": "42"
+  },
+  {
+    "label": "湖南省",
+    "value": "43"
+  },
+  {
+    "label": "广东省",
+    "value": "44"
+  },
+  {
+    "label": "广西壮族自治区",
+    "value": "45"
+  },
+  {
+    "label": "海南省",
+    "value": "46"
+  },
+  {
+    "label": "重庆市",
+    "value": "50"
+  },
+  {
+    "label": "四川省",
+    "value": "51"
+  },
+  {
+    "label": "贵州省",
+    "value": "52"
+  },
+  {
+    "label": "云南省",
+    "value": "53"
+  },
+  {
+    "label": "西藏自治区",
+    "value": "54"
+  },
+  {
+    "label": "陕西省",
+    "value": "61"
+  },
+  {
+    "label": "甘肃省",
+    "value": "62"
+  },
+  {
+    "label": "青海省",
+    "value": "63"
+  },
+  {
+    "label": "宁夏回族自治区",
+    "value": "64"
+  },
+  {
+    "label": "新疆维吾尔自治区",
+    "value": "65"
+  },
+  {
+    "label": "台湾",
+    "value": "66"
+  },
+  {
+    "label": "香港",
+    "value": "67"
+  },
+  {
+    "label": "澳门",
+    "value": "68"
+  }
+]
+export default provinceData;
diff --git a/mallplusui-uniapp-app2/components/mpvue-citypicker/mpvueCityPicker.vue b/mallplusui-uniapp-app2/components/mpvue-citypicker/mpvueCityPicker.vue
new file mode 100644
index 0000000..2a0416c
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mpvue-citypicker/mpvueCityPicker.vue
@@ -0,0 +1,210 @@
+<template>
+  <div class="mpvue-picker">
+    <div :class="{'pickerMask':showPicker}" @click="maskClick" catchtouchmove="true"></div>
+    <div class="mpvue-picker-content " :class="{'mpvue-picker-view-show':showPicker}">
+      <div class="mpvue-picker__hd" catchtouchmove="true">
+        <div class="mpvue-picker__action" @click="pickerCancel">取消</div>
+        <div class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</div>
+      </div>
+      <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange">
+        <block>
+          <picker-view-column>
+            <div class="picker-item" v-for="(item,index) in provinceDataList" :key="index">{{item.label}}</div>
+          </picker-view-column>
+          <picker-view-column>
+            <div class="picker-item" v-for="(item,index) in cityDataList" :key="index">{{item.label}}</div>
+          </picker-view-column>
+          <picker-view-column>
+            <div class="picker-item" v-for="(item,index) in areaDataList" :key="index">{{item.label}}</div>
+          </picker-view-column>
+        </block>
+      </picker-view>
+    </div>
+  </div>
+</template>
+
+<script>
+import provinceData from './city-data/province.js';
+import cityData from './city-data/city.js';
+import areaData from './city-data/area.js';
+export default {
+  data() {
+    return {
+      pickerValue: [0, 0, 0],
+      provinceDataList: [],
+      cityDataList: [],
+      areaDataList: [],
+			/* 是否显示控件 */
+			showPicker: false,
+    };
+  },
+  created() {
+    this.init()
+  },
+  props: {
+    /* 默认值 */
+    pickerValueDefault: {
+      type: Array,
+      default(){
+				return [0, 0, 0]
+			}
+    },
+    /* 主题色 */
+    themeColor: String
+  },
+	watch:{
+		pickerValueDefault(){
+			this.init();
+		}
+	},
+  methods: {
+		init() {
+			this.handPickValueDefault(); // 对 pickerValueDefault 做兼容处理
+			this.provinceDataList = provinceData;
+			this.cityDataList = cityData[this.pickerValueDefault[0]];
+			this.areaDataList = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]];
+			this.pickerValue = this.pickerValueDefault;
+		},
+    show() {
+      setTimeout(() => {
+        this.showPicker = true;
+      }, 0);
+    },
+    maskClick() {
+      this.pickerCancel();
+    },
+    pickerCancel() {
+      this.showPicker = false;
+      this._$emit('onCancel');
+    },
+    pickerConfirm(e) {
+      this.showPicker = false;
+      this._$emit('onConfirm');
+    },
+    showPickerView() {
+      this.showPicker = true;
+    },
+    handPickValueDefault() {
+      if (this.pickerValueDefault !== [0, 0, 0]) {
+        if (this.pickerValueDefault[0] > provinceData.length - 1) {
+          this.pickerValueDefault[0] = provinceData.length - 1;
+        }
+        if (this.pickerValueDefault[1] > cityData[this.pickerValueDefault[0]].length - 1) {
+          this.pickerValueDefault[1] = cityData[this.pickerValueDefault[0]].length - 1;
+        }
+        if (this.pickerValueDefault[2] > areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]].length - 1) {
+          this.pickerValueDefault[2] = areaData[this.pickerValueDefault[0]][this.pickerValueDefault[1]].length - 1;
+        }
+      }
+    },
+    pickerChange(e) {
+      let changePickerValue = e.mp.detail.value;
+      if (this.pickerValue[0] !== changePickerValue[0]) {
+        // 第一级发生滚动
+        this.cityDataList = cityData[changePickerValue[0]];
+        this.areaDataList = areaData[changePickerValue[0]][0];
+        changePickerValue[1] = 0;
+        changePickerValue[2] = 0;
+      } else if (this.pickerValue[1] !== changePickerValue[1]) {
+        // 第二级滚动
+        this.areaDataList =
+          areaData[changePickerValue[0]][changePickerValue[1]];
+        changePickerValue[2] = 0;
+      }
+      this.pickerValue = changePickerValue;
+      this._$emit('onChange');
+    },
+    _$emit(emitName) {
+      let pickObj = {
+        label: this._getLabel(),
+        value: this.pickerValue,
+        cityCode: this._getCityCode()
+      };
+      this.$emit(emitName, pickObj);
+    },
+    _getLabel() {
+      let pcikerLabel =
+        this.provinceDataList[this.pickerValue[0]].label +
+        '-' +
+        this.cityDataList[this.pickerValue[1]].label +
+        '-' +
+        this.areaDataList[this.pickerValue[2]].label;
+      return pcikerLabel;
+    },
+    _getCityCode() {
+      return this.areaDataList[this.pickerValue[2]].value;
+    }
+  }
+};
+</script>
+
+<style>
+.pickerMask {
+  position: fixed;
+  z-index: 1000;
+  top: 0;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.6);
+}
+.mpvue-picker-content {
+  position: fixed;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  transition: all 0.3s ease;
+  transform: translateY(100%);
+  z-index: 3000;
+}
+.mpvue-picker-view-show {
+  transform: translateY(0);
+}
+.mpvue-picker__hd {
+  display: flex;
+  padding: 9px 15px;
+  background-color: #fff;
+  position: relative;
+  text-align: center;
+  font-size: 17px;
+}
+.mpvue-picker__hd:after {
+  content: ' ';
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1px solid #e5e5e5;
+  color: #e5e5e5;
+  transform-origin: 0 100%;
+  transform: scaleY(0.5);
+}
+.mpvue-picker__action {
+  display: block;
+  flex: 1;
+  color: #1aad19;
+}
+.mpvue-picker__action:first-child {
+  text-align: left;
+  color: #888;
+}
+.mpvue-picker__action:last-child {
+  text-align: right;
+}
+.picker-item {
+  text-align: center;
+  line-height: 40px;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 16px;
+}
+.mpvue-picker-view {
+  position: relative;
+  bottom: 0;
+  left: 0;
+  width: 100%;
+  height: 238px;
+  background-color: rgba(255, 255, 255, 1);
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/mpvue-picker/mpvuePicker.vue b/mallplusui-uniapp-app2/components/mpvue-picker/mpvuePicker.vue
new file mode 100644
index 0000000..dbd2009
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/mpvue-picker/mpvuePicker.vue
@@ -0,0 +1,463 @@
+<template>
+    <view class="mpvue-picker">
+        <view :class="{'pickerMask':showPicker}" @click="maskClick" catchtouchmove="true"></view>
+        <view class="mpvue-picker-content " :class="{'mpvue-picker-view-show':showPicker}">
+            <view class="mpvue-picker__hd" catchtouchmove="true">
+                <view class="mpvue-picker__action" @click="pickerCancel">取消</view>
+                <view class="mpvue-picker__action" :style="{color:themeColor}" @click="pickerConfirm">确定</view>
+            </view>
+            <!-- 单列 -->
+            <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange" v-if="mode==='selector' && pickerValueSingleArray.length > 0">
+                <block>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueSingleArray" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                </block>
+            </picker-view>
+            <!-- 时间选择器 -->
+            <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange" v-if="mode==='timeSelector'">
+                <block>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueHour" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMinute" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                </block>
+            </picker-view>
+            <!-- 多列选择 -->
+            <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChange" v-if="mode==='multiSelector'">
+                <block v-for="(n,index) in pickerValueMulArray.length" :key="index">
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index1) in pickerValueMulArray[n]" :key="index1">{{item.label}}</view>
+                    </picker-view-column>
+                </block>
+            </picker-view>
+            <!-- 二级联动 -->
+            <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChangeMul" v-if="mode==='multiLinkageSelector' && deepLength===2">
+                <block>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMulTwoOne" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMulTwoTwo" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                </block>
+            </picker-view>
+            <!-- 三级联动 -->
+            <picker-view indicator-style="height: 40px;" class="mpvue-picker-view" :value="pickerValue" @change="pickerChangeMul" v-if="mode==='multiLinkageSelector' && deepLength===3">
+                <block>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMulThreeOne" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMulThreeTwo" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                    <picker-view-column>
+                        <view class="picker-item" v-for="(item,index) in pickerValueMulThreeThree" :key="index">{{item.label}}</view>
+                    </picker-view-column>
+                </block>
+            </picker-view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        data() {
+            return {
+                pickerChangeValue: [],
+                pickerValue: [],
+                pickerValueArrayChange: true,
+                modeChange: false,
+                pickerValueSingleArray: [],
+                pickerValueHour: [],
+                pickerValueMinute: [],
+                pickerValueMulArray: [],
+                pickerValueMulTwoOne: [],
+                pickerValueMulTwoTwo: [],
+                pickerValueMulThreeOne: [],
+                pickerValueMulThreeTwo: [],
+                pickerValueMulThreeThree: [],
+				/* 是否显示控件 */
+				showPicker: false,
+            };
+        },
+        props: {
+            /* mode */
+            mode: {
+                type: String,
+                default: 'selector'
+            },
+            /* picker 数值 */
+            pickerValueArray: {
+                type: Array,
+                default(){
+					return []
+				}
+            },
+            /* 默认值 */
+            pickerValueDefault: {
+                type: Array,
+                default(){
+                	return []
+                }
+            },
+            /* 几级联动 */
+            deepLength: {
+                type: Number,
+                default: 2
+            },
+            /* 主题色 */
+            themeColor: String
+        },
+        watch: {
+            pickerValueArray(oldVal, newVal) {
+                this.pickerValueArrayChange = true;
+            },
+            mode(oldVal, newVal) {
+                this.modeChange = true;
+            },
+			pickerValueArray(val){
+				this.initPicker(val);
+			}
+        },
+        methods: {
+            initPicker(valueArray) {
+                let pickerValueArray = valueArray;
+                this.pickerValue = this.pickerValueDefault;
+                // 初始化多级联动
+                if (this.mode === 'selector') {
+                    this.pickerValueSingleArray = valueArray;
+                } else if (this.mode === 'timeSelector') {
+                    this.modeChange = false;
+                    let hourArray = [];
+                    let minuteArray = [];
+                    for (let i = 0; i < 24; i++) {
+                        hourArray.push({
+                            value: i,
+                            label: i > 9 ? `${i} 时` : `0${i} 时`
+                        });
+                    }
+                    for (let i = 0; i < 60; i++) {
+                        minuteArray.push({
+                            value: i,
+                            label: i > 9 ? `${i} 分` : `0${i} 分`
+                        });
+                    }
+                    this.pickerValueHour = hourArray;
+                    this.pickerValueMinute = minuteArray;
+                } else if (this.mode === 'multiSelector') {
+                    this.pickerValueMulArray = valueArray;
+                } else if (this.mode === 'multiLinkageSelector' && this.deepLength === 2) {
+                    // 两级联动
+                    let pickerValueMulTwoOne = [];
+                    let pickerValueMulTwoTwo = [];
+                    // 第一列
+                    for (let i = 0, length = pickerValueArray.length; i < length; i++) {
+                        pickerValueMulTwoOne.push(pickerValueArray[i]);
+                    }
+                    // 渲染第二列
+                    // 如果有设定的默认值
+                    if (this.pickerValueDefault.length === 2) {
+                        let num = this.pickerValueDefault[0];
+                        for (
+                            let i = 0, length = pickerValueArray[num].children.length; i < length; i++
+                        ) {
+                            pickerValueMulTwoTwo.push(pickerValueArray[num].children[i]);
+                        }
+                    } else {
+                        for (
+                            let i = 0, length = pickerValueArray[0].children.length; i < length; i++
+                        ) {
+                            pickerValueMulTwoTwo.push(pickerValueArray[0].children[i]);
+                        }
+                    }
+                    this.pickerValueMulTwoOne = pickerValueMulTwoOne;
+                    this.pickerValueMulTwoTwo = pickerValueMulTwoTwo;
+                } else if (
+                    this.mode === 'multiLinkageSelector' &&
+                    this.deepLength === 3
+                ) {
+                    let pickerValueMulThreeOne = [];
+                    let pickerValueMulThreeTwo = [];
+                    let pickerValueMulThreeThree = [];
+                    // 第一列
+                    for (let i = 0, length = pickerValueArray.length; i < length; i++) {
+                        pickerValueMulThreeOne.push(pickerValueArray[i]);
+                    }
+                    // 渲染第二列
+                    this.pickerValueDefault =
+                        this.pickerValueDefault.length === 3 ?
+                        this.pickerValueDefault :
+                        [0, 0, 0];
+                    if (this.pickerValueDefault.length === 3) {
+                        let num = this.pickerValueDefault[0];
+                        for (
+                            let i = 0, length = pickerValueArray[num].children.length; i < length; i++
+                        ) {
+                            pickerValueMulThreeTwo.push(pickerValueArray[num].children[i]);
+                        }
+                        // 第三列
+                        let numSecond = this.pickerValueDefault[1];
+                        for (let i = 0, length = pickerValueArray[num].children[numSecond].children.length; i < length; i++) {
+                            pickerValueMulThreeThree.push(
+                                pickerValueArray[num].children[numSecond].children[i]
+                            );
+                        }
+                    }
+                    this.pickerValueMulThreeOne = pickerValueMulThreeOne;
+                    this.pickerValueMulThreeTwo = pickerValueMulThreeTwo;
+                    this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+                }
+            },
+            show() {
+                setTimeout(() => {
+                    if (this.pickerValueArrayChange || this.modeChange) {
+                        this.initPicker(this.pickerValueArray);
+                        this.showPicker = true;
+                        this.pickerValueArrayChange = false;
+                        this.modeChange = false;
+                    } else {
+                        this.showPicker = true;
+                    }
+                }, 0);
+            },
+            maskClick() {
+                this.pickerCancel();
+            },
+            pickerCancel() {
+                this.showPicker = false;
+                this._initPickerVale();
+                let pickObj = {
+                    index: this.pickerValue,
+                    value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+                    label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+                };
+                this.$emit('onCancel', pickObj);
+            },
+            pickerConfirm(e) {
+                this.showPicker = false;
+                this._initPickerVale();
+                let pickObj = {
+                    index: this.pickerValue,
+                    value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+                    label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+                };
+                this.$emit('onConfirm', pickObj);
+            },
+            showPickerView() {
+                this.showPicker = true;
+            },
+            pickerChange(e) {
+                this.pickerValue = e.mp.detail.value;
+                let pickObj = {
+                    index: this.pickerValue,
+                    value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+                    label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+                };
+                this.$emit('onChange', pickObj);
+            },
+            pickerChangeMul(e) {
+                if (this.deepLength === 2) {
+                    let pickerValueArray = this.pickerValueArray;
+                    let changeValue = e.mp.detail.value;
+                    // 处理第一列滚动
+                    if (changeValue[0] !== this.pickerValue[0]) {
+                        let pickerValueMulTwoTwo = [];
+                        // 第一列滚动第二列数据更新
+                        for (let i = 0, length = pickerValueArray[changeValue[0]].children.length; i < length; i++) {
+                            pickerValueMulTwoTwo.push(pickerValueArray[changeValue[0]].children[i]);
+                        }
+                        this.pickerValueMulTwoTwo = pickerValueMulTwoTwo;
+                        // 第二列初始化为 0
+                        changeValue[1] = 0;
+                    }
+                    this.pickerValue = changeValue;
+                } else if (this.deepLength === 3) {
+                    let pickerValueArray = this.pickerValueArray;
+                    let changeValue = e.mp.detail.value;
+                    let pickerValueMulThreeTwo = [];
+                    let pickerValueMulThreeThree = [];
+                    // 重新渲染第二列
+                    // 如果是第一列滚动
+                    if (changeValue[0] !== this.pickerValue[0]) {
+                        this.pickerValueMulThreeTwo = [];
+                        for (let i = 0, length = pickerValueArray[changeValue[0]].children.length; i < length; i++) {
+                            pickerValueMulThreeTwo.push(pickerValueArray[changeValue[0]].children[i]);
+                        }
+                        // 重新渲染第三列
+                        for (let i = 0, length = pickerValueArray[changeValue[0]].children[0].children.length; i <
+                            length; i++) {
+                            pickerValueMulThreeThree.push(pickerValueArray[changeValue[0]].children[0].children[i]);
+                        }
+                        changeValue[1] = 0;
+                        changeValue[2] = 0;
+                        this.pickerValueMulThreeTwo = pickerValueMulThreeTwo;
+                        this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+                    } else if (changeValue[1] !== this.pickerValue[1]) {
+                        // 第二列滚动
+                        // 重新渲染第三列
+                        this.pickerValueMulThreeThree = [];
+                        pickerValueMulThreeTwo = this.pickerValueMulThreeTwo;
+                        for (let i = 0, length = pickerValueArray[changeValue[0]].children[changeValue[1]].children.length; i <
+                            length; i++) {
+                            pickerValueMulThreeThree.push(pickerValueArray[changeValue[0]].children[changeValue[1]].children[
+                                i]);
+                        }
+                        changeValue[2] = 0;
+                        this.pickerValueMulThreeThree = pickerValueMulThreeThree;
+                    }
+                    this.pickerValue = changeValue;
+                }
+                let pickObj = {
+                    index: this.pickerValue,
+                    value: this._getPickerLabelAndValue(this.pickerValue, this.mode).value,
+                    label: this._getPickerLabelAndValue(this.pickerValue, this.mode).label
+                };
+                this.$emit('onChange', pickObj);
+            },
+            // 获取 pxikerLabel
+            _getPickerLabelAndValue(value, mode) {
+                let pickerLable;
+                let pickerGetValue = [];
+                // selector
+                if (mode === 'selector') {
+                    pickerLable = this.pickerValueSingleArray[value].label;
+                    pickerGetValue.push(this.pickerValueSingleArray[value].value);
+                } else if (mode === 'timeSelector') {
+                    pickerLable = `${this.pickerValueHour[value[0]].label}-${this.pickerValueMinute[value[1]].label}`;
+                    pickerGetValue.push(this.pickerValueHour[value[0]].value);
+                    pickerGetValue.push(this.pickerValueHour[value[1]].value);
+                } else if (mode === 'multiSelector') {
+                    for (let i = 0; i < value.length; i++) {
+                        if (i > 0) {
+                            pickerLable += this.pickerValueMulArray[i][value[i]].label + (i === value.length - 1 ? '' :
+                                '-');
+                        } else {
+                            pickerLable = this.pickerValueMulArray[i][value[i]].label + '-';
+                        }
+                        pickerGetValue.push(this.pickerValueMulArray[i][value[i]].value);
+                    }
+                } else if (mode === 'multiLinkageSelector') {
+                    /* eslint-disable indent */
+                    pickerLable =
+                        this.deepLength === 2 ?
+                        `${this.pickerValueMulTwoOne[value[0]].label}-${this.pickerValueMulTwoTwo[value[1]].label}` :
+                        `${this.pickerValueMulThreeOne[value[0]].label}-${this.pickerValueMulThreeTwo[value[1]].label}-${this.pickerValueMulThreeThree[value[2]].label}`;
+                    if (this.deepLength === 2) {
+                        pickerGetValue.push(this.pickerValueMulTwoOne[value[0]].value);
+                        pickerGetValue.push(this.pickerValueMulTwoTwo[value[1]].value);
+                    } else {
+                        pickerGetValue.push(this.pickerValueMulThreeOne[value[0]].value);
+                        pickerGetValue.push(this.pickerValueMulThreeTwo[value[1]].value);
+                        pickerGetValue.push(this.pickerValueMulThreeThree[value[2]].value);
+                    }
+                    /* eslint-enable indent */
+                }
+                return {
+                    label: pickerLable,
+                    value: pickerGetValue
+                };
+            },
+            // 初始化 pickerValue 默认值
+            _initPickerVale() {
+                if (this.pickerValue.length === 0) {
+                    if (this.mode === 'selector') {
+                        this.pickerValue = [0];
+                    } else if (this.mode === 'multiSelector') {
+                        this.pickerValue = new Int8Array(this.pickerValueArray.length);
+                    } else if (
+                        this.mode === 'multiLinkageSelector' &&
+                        this.deepLength === 2
+                    ) {
+                        this.pickerValue = [0, 0];
+                    } else if (
+                        this.mode === 'multiLinkageSelector' &&
+                        this.deepLength === 3
+                    ) {
+                        this.pickerValue = [0, 0, 0];
+                    }
+                }
+            }
+        }
+    };
+</script>
+
+<style>
+    .pickerMask {
+        position: fixed;
+        z-index: 1000;
+        top: 0;
+        right: 0;
+        left: 0;
+        bottom: 0;
+        background: rgba(0, 0, 0, 0.6);
+    }
+
+    .mpvue-picker-content {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        transition: all 0.3s ease;
+        transform: translateY(100%);
+        z-index: 3000;
+    }
+
+    .mpvue-picker-view-show {
+        transform: translateY(0);
+    }
+
+    .mpvue-picker__hd {
+        display: flex;
+        padding: 9px 15px;
+        background-color: #fff;
+        position: relative;
+        text-align: center;
+        font-size: 17px;
+    }
+
+    .mpvue-picker__hd:after {
+        content: ' ';
+        position: absolute;
+        left: 0;
+        bottom: 0;
+        right: 0;
+        height: 1px;
+        border-bottom: 1px solid #e5e5e5;
+        color: #e5e5e5;
+        transform-origin: 0 100%;
+        transform: scaleY(0.5);
+    }
+
+    .mpvue-picker__action {
+        display: block;
+        flex: 1;
+        color: #1aad19;
+    }
+
+    .mpvue-picker__action:first-child {
+        text-align: left;
+        color: #888;
+    }
+
+    .mpvue-picker__action:last-child {
+        text-align: right;
+    }
+
+    .picker-item {
+        text-align: center;
+        line-height: 40px;
+        font-size: 16px;
+    }
+
+    .mpvue-picker-view {
+        position: relative;
+        bottom: 0;
+        left: 0;
+        width: 100%;
+        height: 238px;
+        background-color: rgba(255, 255, 255, 1);
+    }
+</style>
diff --git a/mallplusui-uniapp-app2/components/neil-modal.vue b/mallplusui-uniapp-app2/components/neil-modal.vue
new file mode 100644
index 0000000..d84f9c8
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/neil-modal.vue
@@ -0,0 +1,260 @@
+<template>
+    <view class="neil-modal" @touchmove.stop.prevent="bindTouchmove" :class="{'neil-modal--show':isOpen}">
+        <view class="neil-modal__mask" @click="clickMask"></view>
+        <view class="neil-modal__container">
+            <view class="neil-modal__header" v-if="title.length > 0">{{title}}</view>
+            <view class="neil-modal__content" :class="content ? 'neil-modal--padding' : ''" :style="{textAlign:align}">
+                <template v-if="content">
+                    <text class="modal-content">{{content}}</text>
+                </template>
+                <template v-else>
+                    <slot />
+                </template>
+            </view>
+            <view class="neil-modal__footer">
+                <view v-if="showCancel" class="neil-modal__footer-left" @click="clickLeft" :style="{color:cancelColor}"
+                    hover-class="neil-modal__footer-hover" :hover-start-time="20" :hover-stay-time="70">
+                    {{cancelText}}
+                </view>
+                <view class="neil-modal__footer-right" @click="clickRight" :style="{color:confirmColor}" hover-class="neil-modal__footer-hover"
+                    :hover-start-time="20" :hover-stay-time="70">
+                    {{confirmText}}
+                </view>
+            </view>
+        </view>
+    </view>
+</template>
+
+<script>
+    export default {
+        name: 'neil-modal',
+        props: {
+            title: { //标题
+                type: String,
+                default: ''
+            },
+            content: String, //提示的内容
+            align: { //content 的对齐方式left/center/right
+                type: String,
+                default: 'left'
+            },
+            cancelText: { //取消按钮的文字，默认为"取消"
+                type: String,
+                default: '取消'
+            },
+            cancelColor: { //取消按钮颜色
+                type: String,
+                default: '#333333'
+            },
+            confirmText: { //确定按钮的文字，默认为"确定"
+                type: String,
+                default: '确定'
+            },
+            confirmColor: { //确认按钮颜色
+                type: String,
+                default: '#007aff'
+            },
+            showCancel: { //是否显示取消按钮，默认为 true
+                type: [Boolean, String],
+                default: true
+            },
+            show: { //是否显示模态框
+                type: [Boolean, String],
+                default: false
+            },
+            autoClose: { //点击遮罩是否自动关闭弹窗
+                type: [Boolean, String],
+                default: true
+            }
+        },
+        data() {
+            return {
+                isOpen: false
+            }
+        },
+        watch: {
+            show(val) {
+				this.isOpen = val
+            }
+        },
+        created() {
+        	this.isOpen = this.show
+        },
+        methods: {
+            bindTouchmove() {},
+            clickLeft() {
+                setTimeout(() => {
+                	this.$emit('cancel')
+                }, 200)
+                this.closeModal()
+            },
+            clickRight() {
+                setTimeout(() => {
+                	this.$emit('confirm')
+                }, 200)
+                this.closeModal()
+            },
+			clickMask(){
+				if(this.autoClose){
+					this.closeModal()
+				}
+			},
+            closeModal() {
+                this.showAnimation = false
+				this.isOpen = false
+				this.$emit('close')
+            }
+        }
+    }
+</script>
+
+<style lang="scss">
+    $bg-color-mask:rgba(0, 0, 0, 0.5); //遮罩颜色
+    $bg-color-hover:#f1f1f1; //点击状态颜色
+
+    .neil-modal {
+        position: fixed;
+		visibility: hidden;
+        width: 100%;
+        height: 100%;
+        top: 0;
+        left: 0;
+        z-index: 1000;
+		transition:visibility 200ms ease-in;
+
+		&.neil-modal--show{
+			visibility: visible;
+		}
+
+        &__header {
+            position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            padding: 18upx 24upx;
+            line-height: 1.5;
+            color: #333;
+            font-size: 32upx;
+            text-align: center;
+
+            &::after {
+                content: " ";
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                right: 0;
+                height: 1px;
+                border-top: 1px solid #e5e5e5;
+                transform-origin: 0 0;
+                transform: scaleY(.5);
+            }
+        }
+
+        &__container {
+            position: absolute;
+			z-index: 999;
+            top: 50%;
+            left: 50%;
+            transform: translate(-50%, -50%) ;
+            transition: transform 0.3s;
+            width: 540upx;
+            border-radius: 20upx;
+            background-color: #fff;
+            overflow: hidden;
+            opacity: 0;
+            transition: opacity 200ms ease-in;
+        }
+
+        &__content {
+            position: relative;
+            color: #333;
+            font-size: 28upx;
+            box-sizing: border-box;
+            line-height: 1.5;
+
+            &::after {
+                content: " ";
+                position: absolute;
+                left: 0;
+                bottom: -1px;
+                right: 0;
+                height: 1px;
+                border-bottom: 1px solid #e5e5e5;
+                transform-origin: 0 0;
+                transform: scaleY(.5);
+            }
+        }
+
+        &__footer {
+            position: relative;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            color: #333;
+            font-size: 32upx;
+            display: flex;
+            flex-direction: row;
+
+            &-left,
+            &-right {
+                position: relative;
+                flex: 1;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
+                height: 88upx;
+                font-size: 28upx;
+                line-height: 88upx;
+                text-align: center;
+                background-color: #fff;
+                color: #333;
+            }
+
+            &-right {
+                color: #007aff;
+            }
+
+            &-left::after {
+                content: " ";
+                position: absolute;
+                right: -1px;
+                top: 0;
+                width: 1px;
+                bottom: 0;
+                border-right: 1px solid #e5e5e5;
+                transform-origin: 0 0;
+                transform: scaleX(.5);
+            }
+
+            &-hover {
+                background-color: $bg-color-hover;
+            }
+        }
+
+        &__mask {
+            display: block;
+            position: absolute;
+			z-index: 998;
+            top: 0;
+            left: 0;
+            width: 100%;
+            height: 100%;
+            background: $bg-color-mask;
+            opacity: 0;
+            transition: opacity 200ms ease-in;
+			&.neil-modal--show{
+				opacity: 1;
+			}
+        }
+
+        &--padding {
+            padding: 32upx 24upx;
+            min-height: 90upx;
+        }
+		&--show {
+		    .neil-modal__container,.neil-modal__mask{
+				opacity: 1;
+			}
+		}
+    }
+</style>
diff --git a/mallplusui-uniapp-app2/components/payments/paymentsByAli.vue b/mallplusui-uniapp-app2/components/payments/paymentsByAli.vue
new file mode 100644
index 0000000..c55d11f
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/payments/paymentsByAli.vue
@@ -0,0 +1,246 @@
+<template>
+	<view class="pay-type-list">
+
+		<view class="type-item b-b" v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)"
+			  v-if="!(type == 2 && item.code == 'balancepay')">
+			<text v-if=" item.code == 'wechatpay'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if=" item.code == 'alipay'" class="icon yticon icon-alipay"></text>
+			<text v-if=" item.code == 'offline'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if=" item.code == 'balancepay'" class="icon yticon icon-erjiye-yucunkuan"></text>
+
+			<view class="con">
+				<text class="tit">{{ item.name }}</text>
+				<text>{{ item.memo }}</text>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+import { apiBaseUrl } from '@/config/config.js';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	props: {
+		// 如果是商品订单此参数必须
+		orderId: {
+			type: String,
+			default () {
+				return '';
+			}
+		},
+		// 如果是充值订单此参数必须
+		recharge: {
+			type: Number,
+			default () {
+				return 0;
+			}
+		},
+		// 用户id
+		uid: {
+			type: Number,
+			default () {
+				return 0;
+			}
+		},
+		// 订单类型
+		type: {
+			type: Number,
+			default () {
+				return 1;
+			}
+		}
+	},
+	data () {
+		return {
+			payments: []
+		}
+	},
+	mounted () {
+		this.getPayments();
+	},
+	methods: {
+		// 获取可用支付方式列表
+		async getPayments () {
+
+			let params = {};
+			this.orderInfo = await Api.apiCall('get',Api.order.paymentlist,params);
+			this.payments = this.formatPayments(this.orderInfo)
+
+		},
+		// 支付方式处理
+		formatPayments (payments) {
+			payments = payments.filter(item => item.code !== 'wechatpay');
+
+
+			// 如果是充值订单 过滤余额支付 过滤非线上支付方式
+			if (this.type === 2) {
+				payments = payments.filter(item => item.code !== 'balancepay' || item.is_online === 1)
+			}
+
+			// 设置logo图片
+			payments.forEach(item => {
+				this.$set(item, 'icon', '/static/image/' + item.code + '.png');
+			});
+
+			return payments;
+		},
+		// 用户点击支付方式处理
+		async toPayHandler (code) {
+			let params = {'orderId':this.orderId};
+			let data = {
+				payment_code: code,
+				payment_type: this.type
+			}
+			data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
+
+			// 判断订单支付类型
+			if (this.type == 2 && this.recharge) {
+				data['params'] = {
+					money: this.recharge,
+					trade_type: 'JSAPI'
+				}
+			} else if ((this.type == 5 || this.type == 6) && this.recharge) {
+				data['params'] = {
+					trade_type: 'JSAPI',
+					formid: this.orderId
+				}
+			}else {
+				data['params'] = {
+					trade_type: 'JSAPI'
+				}
+			}
+
+
+			let _this = this;
+			switch (code) {
+				case 'alipay':
+					let res = await Api.apiCall('get',Api.order.webPay,params);
+					console.log(res);
+					if (res) {
+
+							uni.requestPayment({
+								provider: 'alipay',
+								tradeNO:res.data.trade_no,
+								success: function (e) {
+									if (e.errMsg === 'requestPayment:ok') {
+										_this.$common.successToShow(res.msg, () => {
+											_this.$common.redirectTo('/pages/order/payment/result?id=' + res.data.id);
+										});
+									}
+								}
+							});
+						} else {
+							this.$common.errorToShow(res.msg);
+
+					}
+					break
+				case 'balancepay':
+					//用户余额支付
+					let params1 = {'orderId':this.orderId};
+					let data1 = await Api.apiCall('post',Api.order.balancePay,params1);
+					console.log(data1)
+					if (data1) {
+						uni.redirectTo({
+							url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
+						})
+					}else {
+						this.$api.msg('余额支付失败');
+					}
+					break;
+				case 'offline':
+					//线下支付
+					this.$common.modelShow('线下支付说明', '请联系客服进行线下支付',() => {}, false, '取消', '确定')
+					break;
+			}
+
+		}
+	}
+
+}
+</script>
+
+<style lang='scss'>
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
+
+		.price{
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+			&:before{
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
+
+		.type-item{
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position:relative;
+		}
+
+		.icon{
+			width: 100upx;
+			font-size: 52upx;
+		}
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+		.icon-alipay {
+			color: #01aaef;
+		}
+		.tit{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+		.con{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+	.mix-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/payments/paymentsByApp.vue b/mallplusui-uniapp-app2/components/payments/paymentsByApp.vue
new file mode 100644
index 0000000..ce53a88
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/payments/paymentsByApp.vue
@@ -0,0 +1,287 @@
+<template>
+	<view class="pay-type-list">
+		<view class="type-item b-b" v-for="item in paymentss" :key="item.code" @click="toPayHandler(item.code)" v-if="!(type == 2 && item.code == 'balancepay')">
+			<text v-if="item.code == 'wechatpay'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if="item.code == 'alipay'" class="icon yticon icon-alipay"></text>
+			<text v-if="item.code == 'offline'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if="item.code == 'balancepay'" class="icon yticon icon-erjiye-yucunkuan"></text>
+
+			<view class="con">
+				<text class="tit">{{ item.name }}</text>
+				<text>{{ item.memo }}</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	props: {
+		// 如果是商品订单此参数必须
+		orderId: {
+			type: String,
+			default() {
+				return '';
+			}
+		},
+		// 如果是充值订单此参数必须
+		recharge: {
+			type: Number,
+			default() {
+				return 0;
+			}
+		},
+		// 用户id
+		uid: {
+			type: Number,
+			default() {
+				return 0;
+			}
+		},
+		// 订单类型
+		type: {
+			type: Number,
+			default() {
+				return 1;
+			}
+		}
+	},
+	data() {
+		return {
+			paymentss: []
+		};
+	},
+	mounted() {
+		this.getPayment();
+	},
+	methods: {
+		// 获取可用支付方式列表
+		async getPayment() {
+			console.log('getPayments');
+			let params = {};
+			this.orderInfo = await Api.apiCall('get', Api.order.paymentlist, params);
+			this.paymentss = this.formatPayments(this.orderInfo);
+		},
+		// 支付方式处理
+		formatPayments(payments) {
+			// 如果是充值订单 过滤余额支付 过滤非线上支付方式
+			if (this.type === 2) {
+				payments = payments.filter(item => item.code !== 'balancepay' || item.is_online === 1);
+			}
+
+			// 设置logo图片
+			payments.forEach(item => {
+				this.$set(item, 'icon', '/static/image/' + item.code + '.png');
+			});
+			return payments;
+		},
+		// 用户点击支付方式处理
+		async toPayHandler(code) {
+			let _this = this;
+			let params = { orderId: this.orderId };
+			let data = {
+				payment_code: code,
+				payment_type: _this.type
+			};
+
+			data['ids'] = this.type == 1 || this.type == 5 || this.type == 6 ? this.orderId : this.uid;
+			if ((this.type == 5 || this.type == 6) && this.recharge) {
+				data['params'] = {
+					trade_type: 'APP',
+					formid: this.orderId
+				};
+			}
+			switch (code) {
+				case 'alipay':
+					/**
+					 * 支付宝支付需要模拟GET提交数据
+					 */
+					if (_this.type == 1 && _this.orderId) {
+						data['params'] = {
+							trade_type: 'APP'
+						};
+					} else if (_this.type == 2 && _this.recharge) {
+						data['params'] = {
+							trade_type: 'APP',
+							money: _this.recharge
+						};
+					}
+
+					let res = await Api.apiCall('get', Api.order.aliAppPay, params);
+					if (res) {
+						console.log(res);
+						uni.requestPayment({
+							provider: 'alipay',
+							orderInfo: res,
+							success: function(data) {
+								let rawdataResult = JSON.parse(data.rawdata).result;
+								let r = rawdataResult.split(';')[0];
+								let r1 = rawdataResult.split(';')[0].length - 1;
+								let r2 = rawdataResult.split(';')[0].length - 2;
+								let alipayTradeAppPayResponse = JSON.parse(r.substr(0, r1)).alipay_trade_app_pay_response;
+								let out_trade_no = alipayTradeAppPayResponse.out_trade_no;
+								_this.$common.successToShow('支付成功', () => {
+									//_this.redirectHandler(res.data.payment_id)
+									_this.redirectHandler(out_trade_no);
+								});
+							}
+						});
+					} else {
+						_this.$comon.errorToShow(res.msg);
+					}
+
+					break;
+				case 'wechatpay':
+					// 微信 H5支付
+					if (_this.type == 1 && _this.orderId) {
+						data['params'] = {
+							trade_type: 'APP'
+						};
+					} else if (_this.type == 2 && _this.recharge) {
+						data['params'] = {
+							trade_type: 'APP',
+							money: _this.recharge
+						};
+					}
+
+					// 微信app支付
+					let res1 = await Api.apiCall('get', Api.order.appPay, params);
+					debugger
+					console.log(res1)
+					console.log(data)
+					if (res1) {
+						// 调用微信支付
+						uni.requestPayment({
+							provider: 'wxpay',
+							orderInfo: res1,
+							success: function(data) {
+								console.log(res1)
+								console.log(data)
+								_this.$common.successToShow('支付成功', () => {
+									_this.redirectHandler(data);
+								});
+							},
+							fail: function(res) {
+								console.log(JSON.stringify(res));
+							}
+						});
+					} else {
+						_this.$common.errorToShow(res.msg);
+					}
+
+					break;
+				case 'balancepay':
+					/**
+					 *  用户余额支付
+					 *
+					 */
+					let params1 = { orderId: this.orderId };
+					let data1 = await Api.apiCall('post', Api.order.balancePay, params1);
+					console.log(data1);
+					if (data1) {
+						uni.redirectTo({
+							url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
+						});
+					} else {
+						this.$api.msg(data1.data);
+					}
+					break;
+				case 'offline':
+					/**
+					 * 线下支付
+					 */
+					_this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => {}, false, '取消', '确定');
+					break;
+			}
+		},
+		// 支付成功后跳转操作
+		redirectHandler(paymentId) {
+			this.$common.redirectTo('/pages/order/payment/result?id=' + paymentId);
+		}
+	}
+};
+</script>
+<style lang="scss">
+.app {
+	width: 100%;
+}
+
+.price-box {
+	background-color: #fff;
+	height: 265upx;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	font-size: 28upx;
+	color: #909399;
+
+	.price {
+		font-size: 50upx;
+		color: #303133;
+		margin-top: 12upx;
+		&:before {
+			content: '￥';
+			font-size: 40upx;
+		}
+	}
+}
+
+.pay-type-list {
+	margin-top: 20upx;
+	background-color: #fff;
+	padding-left: 60upx;
+
+	.type-item {
+		height: 120upx;
+		padding: 20upx 0;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		padding-right: 60upx;
+		font-size: 30upx;
+		position: relative;
+	}
+
+	.icon {
+		width: 100upx;
+		font-size: 52upx;
+	}
+	.icon-erjiye-yucunkuan {
+		color: #fe8e2e;
+	}
+	.icon-weixinzhifu {
+		color: #36cb59;
+	}
+	.icon-alipay {
+		color: #01aaef;
+	}
+	.tit {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		margin-bottom: 4upx;
+	}
+	.con {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+}
+.mix-btn {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 630upx;
+	height: 80upx;
+	margin: 80upx auto 30upx;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/payments/paymentsByH5.vue b/mallplusui-uniapp-app2/components/payments/paymentsByH5.vue
new file mode 100644
index 0000000..74ac3c2
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/payments/paymentsByH5.vue
@@ -0,0 +1,412 @@
+<template>
+	<view class="pay-type-list">
+
+		<view class="type-item b-b" v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)"
+			  v-if="!(type == 2 && item.code == 'balancepay')">
+			<text v-if=" item.code == 'wechatpay'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if=" item.code == 'alipay'" class="icon yticon icon-alipay"></text>
+			<text v-if=" item.code == 'offline'" class="icon yticon icon-weixinzhifu"></text>
+			<text v-if=" item.code == 'balancepay'" class="icon yticon icon-erjiye-yucunkuan"></text>
+			<view class="con">
+				<text class="tit">{{ item.name }}</text>
+				<text>{{ item.memo }}</text>
+			</view>
+		</view>
+	</view>
+	<!--<view class='cell-group payment-method'>
+		<view class='cell-item add-title-item' v-for="item in payments" :key="item.code" @click="toPayHandler(item.code)"
+		 v-if="!(type == 2 && item.code == 'balancepay')">
+			<view class='cell-item-hd'>
+				<image class='cell-hd-icon' :src='item.icon'></image>
+			</view>
+			<view class='cell-item-bd'>
+				<view class="cell-bd-view">
+					<text class="cell-bd-text">{{ item.name }}</text>
+				</view>
+				<view class="cell-bd-view">
+					<text class="cell-bd-text address">{{ item.memo }}</text>
+				</view>
+			</view>
+			<view class='cell-item-ft'>
+				<image class='cell-ft-next icon' src='../../../static/image/right.png'></image>
+			</view>
+		</view>
+	</view>-->
+</template>
+
+<script>
+	import {
+		baseUrl
+	} from '@/config/config.js'
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	export default {
+		props: {
+			// 如果是商品订单此参数必须
+			orderId: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			// 如果是充值订单此参数必须
+			recharge: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			// 用户id
+			uid: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			// 订单类型
+			type: {
+				type: Number,
+				default () {
+					return 1
+				}
+			}
+		},
+		data() {
+			return {
+				payments: [],
+				openid: ''
+			}
+		},
+		mounted() {
+			this.getPayments()
+		},
+		methods: {
+			// 获取可用支付方式列表
+			async	getPayments() {
+				let params = {};
+				this.orderInfo = await Api.apiCall('get',Api.order.paymentlist,params);
+				this.payments = this.formatPayments(this.orderInfo)
+			},
+			// 支付方式处理
+			formatPayments(payments) {
+				// h5支付并且是在微信浏览器内 过滤支付宝支付
+				if (this.$common.isWeiXinBrowser()) {
+					payments = payments.filter(item => item.code !== 'alipay')
+				}
+
+				// 如果是充值订单 过滤余额支付 过滤非线上支付方式
+				if (this.type === 2) {
+					payments = payments.filter(
+						item => item.code !== 'balancepay' || item.is_online === 1
+					)
+				}
+
+				// 设置logo图片
+				payments.forEach(item => {
+					this.$set(item, 'icon', '/static/image/' + item.code + '.png')
+				})
+				console.log(payments)
+				return payments
+			},
+			checkWXJSBridge(data) {
+				let that = this
+				let interval = setInterval(() => {
+					if (typeof window.WeixinJSBridge != 'undefined') {
+						clearTimeout(interval)
+						that.onBridgeReady(data)
+					}
+				}, 200)
+			},
+			onBridgeReady(data) {
+				var _this = this
+				window.WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						appId: data.appId, // 公众号名称，由商户传入
+						timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
+						nonceStr: data.nonceStr, // 随机串
+						package: data.package,
+						signType: data.signType, // 微信签名方式：
+						paySign: data.paySign // 微信签名
+					},
+					function(res) {
+						if (res.err_msg === 'get_brand_wcpay_request:ok') {
+							_this.$common.successToShow('支付成功')
+						} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
+							_this.$common.errorToShow('取消支付')
+						} else {
+							_this.$common.errorToShow('支付失败')
+						}
+						setTimeout(() => {
+							_this.$common.redirectTo(
+								'/pages/order/payment/result?id=' + data.payment_id
+							)
+						}, 1000)
+					}
+				)
+			},
+			// 用户点击支付方式处理
+			async toPayHandler(code) {
+				let params = {'orderId':this.orderId};
+				let data = {
+					payment_code: code,
+					payment_type: this.type
+				}
+				data['orderId'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
+				switch (code) {
+					case 'alipay':
+
+						let res = await Api.apiCall('get',Api.order.aliWapPay,params);
+						console.log('============================')
+						console.log(res);
+						console.log('success:' + JSON.stringify(res));
+						if (res) {
+
+							document.body.appendChild(JSON.stringify(res))
+							let testForm = document.getElementsByName('punchout_form')
+								// 模拟GET提交
+								/*
+									const url = res.data.url
+								const data = res.data.data
+								let tempForm = document.createElement('form')
+								tempForm.id = 'aliPay'
+								tempForm.methods = 'post'
+								tempForm.action = url
+								tempForm.target = '_self'
+								let input = []
+								for (let k in data) {
+									input[k] = document.createElement('input')
+									input[k].type = 'hidden'
+									input[k].name = k
+									input[k].value = data[k]
+									tempForm.appendChild(input[k])
+								}
+								tempForm.addEventListener('submit', function() {}, false)
+								document.body.appendChild(tempForm)*/
+							testForm.dispatchEvent(new Event('submit'))
+							    console.log(tempForm);
+							testForm.submit()
+								document.body.removeChild(testForm)
+
+						}
+						break
+					case 'wechatpay':
+
+						/**
+						 * 微信支付有两种
+						 * 判断是否在微信浏览器
+						 * 	微信jsapi支付
+						 */
+						let isWeiXin = this.$common.isWeiXinBrowser()
+
+						if (isWeiXin) {
+							var transitUrl =
+								baseUrl +
+								'wap/#/pages/order/payment/auth?order_id=' +
+								this.orderId +
+								'&type=' +
+								this.type;
+
+							if (this.type == 1 && this.orderId) {
+								// 微信jsapi支付
+								// if (this.openid) {
+								//   data['params'] = {
+								//     trade_type: 'JSAPI_OFFICIAL',
+								//     openid: this.openid
+								//   }
+								// } else {
+								//   data['params'] = {
+								//     trade_type: 'JSAPI_OFFICIAL',
+								//     url: window.location.href
+								//   }
+								// }
+								data['params'] = {
+									trade_type: 'JSAPI_OFFICIAL',
+									url: transitUrl
+								}
+							} else if (this.type == 2 && this.recharge) {
+								data['params'] = {
+									trade_type: 'JSAPI_OFFICIAL',
+									money: this.recharge,
+									url: transitUrl + '&uid=' + this.uid + '&money=' + this.recharge
+								}
+								// if (this.openid) {
+								//   data['params'] = {
+								//     money: this.recharge,
+								//     openid: this.openid
+								//   }
+								// } else {
+								//   data['params'] = {
+								//     money: this.recharge,
+								//     url: window.location.href
+								//   }
+								// }
+							} else if ((this.type == 5 || this.type == 6) && this.recharge) {
+								data['params'] = {
+									orderId: this.orderId
+								}
+							}
+							let res = await Api.apiCall('get',Api.order.webPay,params);
+							console.log(res);
+							if (res) {
+								this.checkWXJSBridge(res)
+							}else{
+									window.location.href = res.msg
+									return;
+							}
+						} else {
+							// 微信 H5支付
+							if (this.type == 1 && this.orderId) {
+								data['params'] = {
+									trade_type: 'MWEB',
+									return_url: baseUrl +
+										'wap/#/pages/order/payment/result'
+								}
+							} else if (this.type == 2 && this.recharge) {
+								data['params'] = {
+									trade_type: 'MWEB',
+									money: this.recharge,
+									return_url: baseUrl + 'wap/#/pages/order/payment/result'
+								}
+							} else if ((this.type == 5 || this.type == 6) && this.recharge) {
+								data['params'] = {
+									orderId: this.orderId
+								}
+							}
+							console.log(data);
+							// 微信h5支付
+							let res = await Api.apiCall('get',Api.order.wapPay,params);
+							console.log(res);
+							if (res) {
+
+								if (res) {
+									location.href = res
+								} else {
+									this.$common.errorToShow(res)
+								}
+							}
+						}
+						break
+					case 'balancepay':
+						/**
+						 *  用户余额支付
+						 *
+						 */
+						if ((this.type == 5 || this.type == 6) && this.recharge) {
+							data['params'] = {
+								orderId: this.orderId
+							}
+						}
+						let params1 = {'orderId':this.orderId};
+						let data1 = await Api.apiCall('post',Api.order.balancePay,params1);
+						console.log(data1)
+						if (data1) {
+							uni.redirectTo({
+								url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
+							})
+						}else {
+							this.$api.msg(data1.data);
+						}
+
+						break
+					case 'offline':
+						/**
+						 * 线下支付
+						 */
+						this.$common.modelShow(
+							'线下支付说明',
+							'请联系客服进行线下支付qq:951449465',
+							() => {},
+							false,
+							'取消',
+							'确定'
+						)
+						break
+				}
+			}
+		}
+	}
+</script>
+
+<style lang='scss'>
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
+
+		.price{
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+			&:before{
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
+
+		.type-item{
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position:relative;
+		}
+
+		.icon{
+			width: 100upx;
+			font-size: 52upx;
+		}
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+		.icon-alipay {
+			color: #01aaef;
+		}
+		.tit{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+		.con{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+	.mix-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/payments/paymentsByWx.vue b/mallplusui-uniapp-app2/components/payments/paymentsByWx.vue
new file mode 100644
index 0000000..0ef409a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/payments/paymentsByWx.vue
@@ -0,0 +1,249 @@
+<template>
+	<view class="pay-type-list">
+
+		<view class="type-item b-b" v-for="item in payments" :key="item.code"
+			  report-submit="true" @click="toPayHandler(item.code)"
+			  v-if="!(type == 2 && item.code == 'balancepay')">
+			<!-- <text class="icon yticon icon-weixinzhifu"></text> -->
+			<image :src="item.img" style="width: 80upx;height: 80upx;margin-right: 20upx;"></image>
+			<view class="con">
+				<text class="tit">{{ item.name }}</text>
+				<text>{{ item.memo }}</text>
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+import { apiBaseUrl } from '@/config/config.js'
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	props: {
+		// 如果是商品订单此参数必须
+		orderId: {
+			type: String,
+			default () {
+				return ''
+			}
+		},
+		// 如果是充值订单此参数必须
+		recharge: {
+			type: Number,
+			default () {
+				return 0
+			}
+		},
+		// 用户id
+		uid: {
+			type: Number,
+			default () {
+				return 0
+			}
+		},
+		// 订单类型
+		type: {
+			type: Number,
+			default () {
+				return 1
+			}
+		}
+	},
+	data () {
+		return {
+			payments: [],
+			imgList: [
+				'/static/image/wechatpay.png','/static/image/balancepay.png','/static/image/payment_balance.png',
+			]
+		}
+	},
+	mounted () {
+		this.getPayments()
+	},
+	methods: {
+		// 获取可用支付方式列表
+		async getPayments () {
+
+			let params = {};
+			this.orderInfo = await Api.apiCall('get',Api.order.paymentlist,params);
+			this.payments = this.formatPayments(this.orderInfo)
+			for(var i = 0;i < this.payments.length;i++){
+				this.payments[i].img = this.imgList[i]
+			}
+			console.log('------',this.payments)
+		},
+
+		// 支付方式处理
+		formatPayments (payments) {
+			// 过滤支付宝支付
+			payments = payments.filter(item => item.code !== 'alipay')
+
+			// 如果是充值订单 过滤余额支付 过滤非线上支付方式
+			if (this.type === 2) {
+				payments = payments.filter(item => item.code !== 'balancepay' || item.is_online === 1)
+			}
+
+			// 设置logo图片
+			payments.forEach(item => {
+				this.$set(item, 'icon', '/static/image/' + item.code + '.png')
+			})
+
+			return payments
+		},
+		// 用户点击支付方式处理
+		async toPayHandler (code) {
+
+			let params = {'orderId':this.orderId,
+				payment_type: this.type};
+
+
+			// 判断订单支付类型
+			if (this.type == 2 && this.recharge) {
+
+			}else if ((this.type == 5 || this.type == 6) && this.recharge) {
+
+			}
+			let _this = this
+			switch (code) {
+				case 'wechatpay':
+
+					let res = await Api.apiCall('post',Api.order.weixinAppletPay,params);
+					console.log(res);
+					if (res) {
+
+						uni.requestPayment({
+							provider: 'wxpay',
+							timeStamp: res.timeStamp,
+							nonceStr: res.nonceStr,
+							package: res.package,
+							signType: res.signType,
+							paySign: res.paySign,
+							success: function (e) {
+								if (e.errMsg === 'requestPayment:ok') {
+									_this.$common.successToShow(res.msg, () => {
+										_this.$common.redirectTo('/pages/order/payment/result?id=' + res.id)
+									})
+								}else{
+                                    this.$common.errorToShow(res.msg)
+								}
+							}
+						});
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+
+				break
+				case 'balancepay':
+				/**
+				 *  用户余额支付
+				 *
+				 */
+				let params1 = {'orderId':this.orderId};
+					let data1 = await Api.apiCall('post',Api.order.balancePay,params1);
+					console.log(data1)
+					if (data1) {
+						uni.redirectTo({
+							url: '/pages/order/payment/result?order=' + JSON.stringify(data1)
+						})
+					}else {
+						this.$api.msg(data1.data);
+					}
+				break
+				case 'offline':
+				/**
+				 * 线下支付
+				 */
+				this.$common.modelShow('线下支付说明', '请联系客服进行线下支付', () => {},false, '取消', '确定')
+				break
+			}
+
+		}
+	}
+
+}
+</script>
+
+<style lang='scss'>
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
+
+		.price{
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+			&:before{
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
+
+		.type-item{
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position:relative;
+		}
+
+		.icon{
+			width: 100upx;
+			font-size: 52upx;
+		}
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+		.icon-alipay {
+			color: #01aaef;
+		}
+		.tit{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+		.con{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+	.mix-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/raffle-wheel/raffle-wheel.vue b/mallplusui-uniapp-app2/components/raffle-wheel/raffle-wheel.vue
new file mode 100644
index 0000000..e69de29
diff --git a/mallplusui-uniapp-app2/components/red-bag/index.vue b/mallplusui-uniapp-app2/components/red-bag/index.vue
new file mode 100644
index 0000000..66ed499
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/red-bag/index.vue
@@ -0,0 +1,79 @@
+<template>
+  <view class="wrapper" v-show="redBagShow">
+    <view class="modal-bg" >
+    </view>
+    <view class="rb-wrapper">
+      <view class="rb-content" @click="handleBtn">
+
+      </view>
+      <view class="close" @click="handleClose">
+        <image src='/static/image/close.png' class="img"></image>
+      </view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'redBag',
+  components: {},
+  props: {
+    
+  },
+  data() {
+    return {
+      redBagShow: true
+    }
+  },
+  watch: {},
+  computed: {},
+  methods: {
+    handleClose() {
+      this.redBagShow=false
+    },
+    handleBtn() {
+      this.$emit('click')
+      this.redBagShow=false
+    }
+  },
+  created() {},
+  mounted() {}
+}
+</script>
+<style lang="scss" scoped>
+.modal-bg {
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  top: 0;
+  left: 0;
+  background: rgba(0, 0, 0, 0.4);
+}
+.rb-wrapper {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  width: 60%;
+  height: 600upx;
+  transform: translate3d(-50%, -50%, 0);
+  background: red;
+  padding: 40upx;
+  .rb-content{
+    height: 100%;
+  }
+  .close {
+    position: absolute;
+    bottom: -120upx;
+    left: 50%;
+    margin-left: -30upx;
+    width: 60upx;
+    height: 60upx;
+    border-radius: 50%;
+    background: #ddd;
+    .img {
+      width: 100%;
+      height: 100%;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/reserve-date/reserve-date.vue b/mallplusui-uniapp-app2/components/reserve-date/reserve-date.vue
new file mode 100644
index 0000000..1c3e934
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/reserve-date/reserve-date.vue
@@ -0,0 +1,496 @@
+<template>
+	<view class="content">
+		<view class="body">
+			<view class="head-body">
+				<text class="date-head">{{swiperData.year}}年{{swiperData.month}}月</text>
+				<view>
+					<view class='pr40' style="display: inline-block;"><uni-icon type="arrowup" size='26' color='#fff' @click='prevDeta'/></view>
+					<view style="display: inline-block;"><uni-icon type="arrowdown" size='26' color='#fff' @click='nextDate' /></view>
+				</view>
+			</view>
+			<view class="mian-body">
+				<!-- 星期 -->
+				<view  class="mian-bolck"> <text>日</text> </view>
+				<view  class="mian-bolck"> <text>一</text> </view>
+				<view  class="mian-bolck"> <text>二</text> </view>
+				<view  class="mian-bolck"> <text>三</text> </view>
+				<view  class="mian-bolck"> <text>四</text> </view>
+				<view  class="mian-bolck"> <text>五</text> </view>
+				<view  class="mian-bolck"> <text>六</text> </view>
+				<!-- 日 -->
+				<view v-for="(val, index) in swiperData.dateDay"  class="mian-bolck" :class="val.disable == true ? 'disable' : val.Choice == true ? 'Choice' : ''"
+				 @click="ChoiceDate(index, val.disable)" :key='index'>
+					<view class="border">
+						<text class="day">{{val.day}}</text>
+						<text class="price" v-show="val.priceType">{{val.price == undefined ? '' : val.price}}￥</text>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniIcon from './uni-icon.vue';
+	export default {
+		data() {
+			return {
+				swiperData: {},
+				year: '',
+				month: '',
+				day: '',
+				storageDate: []
+			}
+		},
+		props: {
+			// 当前日期
+			date: {
+				type: String,
+				default: () => {
+					let _dateData = new Date(),
+						_date = `${_dateData.getFullYear()}-${_dateData.getMonth() + 1}-${_dateData.getDate()}`
+					return _date
+				}
+			},
+			// 禁用开始之前日期
+			startDate: {
+				type: String,
+				default: ''
+			},
+			// 禁用开始之后日期
+			endDate: {
+				type: String,
+				default: ''
+			},
+			// 是否禁用今天之前的日期
+			disableBefore: {
+				type: Boolean,
+				default: false
+			},
+			// 价格
+			price: {
+				type: Object,
+				default: () => {
+					return {type: false, data: []}
+				}
+			},
+			// 是否选择默认日期
+			isNowDate: {
+				type: Boolean,
+				default: true
+			},
+			// 单选或多选
+			singleElection: {
+				type: Boolean,
+				default: true
+			}
+		},
+		computed: {
+			PriceData: {
+				get() {
+					return this.price.data
+				}
+			}
+		},
+		created() {
+			let dateArr = this.date.split('-')
+			if (this.date != '' && dateArr.length == 3) {
+				// 初始化年月日
+				this.year = Number(dateArr[0])
+				this.month = Number(dateArr[1])
+				this.day = Number(dateArr[2])
+				this.InitializationHomeDate(true).then((val) => {
+					this.Preprocessing(dateArr)
+				})
+			} else {
+				console.error('error 请检查传入日期是否正确,如: 2019-5-12')
+			}
+		},
+		methods: {
+			// 是否添加初始化日期
+			InitializationHomeDate(type) {
+				// 指定日期
+				let ThisDate = this.compareDate(this.date)
+				// 禁用开始时间
+				let startDate = this.compareDate(this.startDate)
+				// 禁用结束时间
+				let endDate = this.compareDate(this.endDate)
+				// 当前日期
+				let _date = new Date()
+				let currDate = this.compareDate(`${_date.getFullYear()}-${_date.getMonth() + 1}-${_date.getDate()}`)
+				return new Promise((resolve, reject) => {
+					let judge = (this.disableBefore == false && this.startDate == '' && this.endDate == '') || // 没有任何禁止
+											(this.disableBefore == true && ThisDate >= currDate) || // 是否禁用今天之前的日期
+											(ThisDate >= startDate && this.disableBefore == false && this.startDate != '') || // 禁用只有开始时间，没有结束时间
+											(ThisDate <= endDate && this.disableBefore == false && this.endDate != '') || // 禁用只有结束时间，没有开始时间
+											(ThisDate <= endDate && this.disableBefore == false && ThisDate >= startDate && this.startDate != '' &&this.endDate != '') // 禁用结束时间，开始时间
+					if (this.isNowDate == false) {
+						resolve(true)
+						return false
+					} else if (judge && type) {
+						this.storageDate.push({date: this.date})
+					}
+					resolve(true)
+				})
+			},
+			// 时间转换为时间戳
+			compareDate(s1) {
+				let curTime = new Date();
+				//把字符串格式转化为日期类
+				return s1 ? new Date(s1).valueOf() : false
+			},
+			// 上一个月
+			prevDeta() {
+				let dateLen = new Date(this.year, this.month - 1, 0).getDate()
+				this.month = Number(this.month) - 1
+				if (this.month == 0) {
+					this.month = 12
+					this.year = Number(this.year) - 1
+				}
+				if (this.month<10){
+					this.month='0'+this.month;
+				}
+				this.Preprocessing([this.year, this.month, this.day])
+				if (this.price.type) {
+					this.$emit('changeMonth', [this.year, this.month, dateLen])
+				}
+			},
+			// 下一个月
+			nextDate() {
+				let dateLen = new Date(this.year, this.month - 1, 0).getDate()
+				this.month = 1 + Number(this.month)
+				if (this.month == 13) {
+					this.month = 1
+					this.year = 1 + Number(this.year)
+				}
+				if (this.month<10){
+					this.month='0'+this.month;
+				}
+				this.Preprocessing([this.year, this.month, this.day])
+				if (this.price.type) {
+					this.$emit('changeMonth', [this.year, this.month, dateLen])
+				}
+			},
+			// 数据发布
+			ChoiceDate(index, disable) {
+				let day = this.swiperData.dateDay[index].day
+				let _Choice = this.swiperData.dateDay[index].Choice
+				let _date = {}
+				if (this.price.type == true) {
+					_date = {date: `${this.swiperData.year}-${this.swiperData.month}-${day}`, price:  this.swiperData.dateDay[index].price}
+				} else {
+					_date = {date: `${this.swiperData.year}-${this.swiperData.month}-${day}`}
+				}
+				if (disable != true) {
+					// 添加数据
+					if (JSON.stringify(this.storageDate).indexOf(_date.date) == -1) {
+						// 单选还是多选
+						if (this.singleElection == true) {
+							this.storageDate = []
+							this.swiperData.dateDay.forEach((val, inde) => {
+								val.Choice = false
+							})
+						// 多选
+						}
+						this.storageDate.push(_date)
+					// 删除数据
+					} else {
+						this.storageDate = this.storageDate.filter((val, index) => {
+							if (val.date != _date.date) {
+								return val
+							}
+						})
+					}
+					this.swiperData.dateDay[index].Choice = !_Choice
+					this.$emit('changeDay', this.storageDate)
+				}
+			},
+			// 日期初始化
+			Preprocessing(arr) {
+				let swiperData = {}
+				this.getDay(`${arr[0]}-${arr[1]}-${arr[2]}`).then((val) => {
+					swiperData = val
+					this.$emit('changeDay', this.storageDate)
+					this.$set(this, 'swiperData', swiperData)
+				})
+			},
+			// 判断当前是 安卓还是ios ，传入不容的日期格式
+			judgeDate(dateData) {
+				if (typeof dateData !== 'object') {
+					dateData = dateData.replace(/-/g, '/')
+				}
+				return dateData
+			},
+			// 循环上个月末尾几天添加到数组
+			getDay(dateData) {
+				dateData = this.judgeDate(dateData)
+				// 获取年，月，日，星期
+				let _date = new Date(dateData),
+					year = _date.getFullYear(),
+					month = _date.getMonth() + 1,
+					date = _date.getDate(),
+					day = _date.getDay()
+
+				return new Promise((resolve, reject) => {
+					//获取上个月末尾几天
+					let prevDayArr = [],
+						prevDayLength = new Date(year, month - 1, 1).getDay()
+					for (let i = prevDayLength; i > 0; i--) {
+						let prevDay = new Date(year, month - 1, -i + 1).getDate()
+						prevDayArr.push({
+							day: prevDay,
+							disable: true,
+							Choice: false
+						})
+					}
+
+					// 获取本月
+					let thisDayArr = [],
+						thisDaylength = new Date(year, month - 1, 0).getDate()
+					for (let i = 1; i <= new Date(year, month, 0).getDate(); i++) {
+						thisDayArr.push({
+							day: i,
+							disable: false,
+							Choice: false,
+							price: this.price.data[i-1],
+							priceType: this.price.type
+						})
+						// 重绘已选择日期
+						this.storageDate.forEach((val, index) => {
+							let valArr = val.date.split('-');
+							if (year == valArr[0] && month == valArr[1] && i == valArr[2]) {
+								thisDayArr[i - 1].Choice = true
+								val.price = this.price.data[i-1]
+							}
+						})
+					}
+
+
+					// 获取下个月开始几天
+					let nextDayArr = [],
+						nextDaylength = 42 - (prevDayArr.length + thisDayArr.length)
+					for (let i = 1; i < nextDaylength + 1; i++) {
+						nextDayArr.push({
+							day: i,
+							disable: true,
+							Choice: false
+						})
+					}
+
+					// 数据合并
+					let dateShow = []
+					dateShow = dateShow.concat(prevDayArr, thisDayArr, nextDayArr)
+
+					// 禁用今天之前的日期
+					if (this.disableBefore) {
+						let __beForeDeta = new Date(),
+							dDate = `${__beForeDeta.getFullYear()}-${__beForeDeta.getMonth() + 1}-${__beForeDeta.getDate()}`
+						this.disableDatePrevFn(dateShow, dDate.split('-'), year, month).then((val) => {
+							resolve({
+								dateDay: val,
+								year: year,
+								month: month
+							})
+						})
+						// 禁用双向指定范围可用
+					} else if (this.startDate != '' && this.endDate != '') {
+						let startDateArr = this.startDate.split('-')
+						let endDateArr = this.endDate.split('-')
+						if (startDateArr.length == 3 && endDateArr.length == 3) {
+							this.disableDatePrevFn(dateShow, startDateArr, year, month).then((val) => {
+								return this.disableDateNextFn(val, endDateArr, year, month)
+							}).then((val) => {
+								resolve({
+									dateDay: val,
+									year: year,
+									month: month
+								})
+							})
+						} else if (endDateArr.length != 3) {
+							console.error('error 日期选择范围-结束日期错误,如: 2019-5-12')
+							if (startDateArr.length != 3) {
+								console.error('error 日期选择范围-开始日期错误,如: 2019-5-12')
+							}
+						}
+						// 禁用开始日期之前
+					} else if (this.startDate != '') {
+						let startDateArr = this.startDate.split('-')
+						if (startDateArr.length == 3) {
+							this.disableDatePrevFn(dateShow, startDateArr, year, month).then((val) => {
+								resolve({
+									dateDay: val,
+									year: year,
+									month: month
+								})
+							})
+						} else {
+							console.error('error 日期选择范围-开始日期错误,如: 2019-5-12')
+						}
+						// 禁用结束日期之前
+					} else if (this.endDate != '') {
+						let endDateArr = this.endDate.split('-')
+						if (endDateArr.length == 3) {
+							this.disableDateNextFn(dateShow, endDateArr, year, month).then((val) => {
+								resolve({
+									dateDay: val,
+									year: year,
+									month: month
+								})
+							})
+						} else {
+							console.error('error 日期选择范围-结束日期错误,如: 2019-5-12')
+						}
+						// 不禁用
+					} else {
+						this.disableDatePrevFn(dateShow, new Array(3), year, month).then((val) => {
+							resolve({
+								dateDay: val,
+								year: year,
+								month: month
+							})
+						})
+					}
+				})
+			},
+			// 禁用指定日期之前的日期
+			disableDatePrevFn() {
+				let DateObj = arguments,
+					dateShow = DateObj[0],
+					dDate = DateObj[1],
+					year = DateObj[2],
+					month = DateObj[3]
+				return new Promise((resolve, reject) => {
+					dateShow = dateShow.map((val, index) => {
+						if (dDate[0] > year) {
+							val.disable = true
+						} else if (dDate[1] > month && dDate[0] >= year) {
+							val.disable = true
+						} else if (dDate[0] >= year && dDate[2] > val.day && dDate[1] >= month) {
+							val.disable = true
+						}
+						return val
+					})
+					resolve(dateShow)
+				})
+			},
+			// 禁用指定日期之后的日期
+			disableDateNextFn() {
+				let DateObj = arguments,
+					dateShow = DateObj[0],
+					dDate = DateObj[1],
+					year = DateObj[2],
+					month = DateObj[3]
+				return new Promise((resolve, reject) => {
+					dateShow = dateShow.map((val, index) => {
+						if (dDate[0] < year) {
+							val.disable = true
+						} else if (dDate[0] <= year && dDate[1] < month) {
+							val.disable = true
+						} else if (dDate[0] <= year && dDate[1] <= month && dDate[2] < val.day) {
+							val.disable = true
+						}
+						return val
+					})
+					resolve(dateShow)
+				})
+			},
+
+		},
+		components: {
+			uniIcon
+		},
+		watch: {
+			'PriceData': {
+				handler(newData, oldData) {
+					this.InitializationHomeDate(false).then((val) => {
+						this.Preprocessing([this.year, this.month, this.day])
+					})
+				},
+				immediate: false,
+				deep: true
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content {
+		.body {
+			width: 100%;
+			background: #000;
+			.head-body {
+				display: flex;
+				flex-direction: row;
+				height: 41px;
+				box-sizing: border-box;
+				padding: 5px 30upx 10px 30upx;
+				justify-content: space-between;
+
+				.date-head {
+					font-size: 36upx;
+					color: #fff;
+					line-height: 26px;
+					letter-spacing: 1px;
+					text{
+						font-size: 36upx;
+					}
+				}
+				.pr40 {
+					padding-right: 40upx;
+				}
+			}
+
+			.mian-body {
+				width: 100%;
+				height: calc(100% - 46px);
+				color: #fff;
+				display: flex;
+				flex-flow: row wrap;
+				justify-content: center;
+				align-items: center;
+				.mian-bolck {
+					width: calc(100% / 7 - 10upx);
+					padding: 8upx 0;
+					min-height: calc(750upx / 7 - 26upx);
+					box-sizing: border-box;
+					font-size: 34upx;
+					display: flex;
+					flex-flow: row wrap;
+					justify-content: center;
+					align-items: center;
+					margin: 5upx;
+					cursor: pointer;
+					.border {
+						width: 100%;
+						height: 100%;
+						display: flex;
+						flex-flow: row wrap;
+						justify-content: center;
+						align-items: center;
+						text-align: center;
+						.price{
+							font-size: 24upx;
+						}
+						.day{
+							width: 100%;
+						}
+						text{
+							font-size: 36upx;
+						}
+					}
+				}
+				.disable {
+					color: #939393;
+				}
+				.Choice {
+					display: flex;
+					flex-flow: row wrap;
+					justify-content: center;
+					align-items: center;
+					box-sizing: border-box;
+					background: #0078d7;
+				}
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/reserve-date/uni-icon.vue b/mallplusui-uniapp-app2/components/reserve-date/uni-icon.vue
new file mode 100644
index 0000000..5955046
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/reserve-date/uni-icon.vue
@@ -0,0 +1,419 @@
+<template>
+	<view :class="'uni-icon-' + type" :style="{ color: color, 'font-size': size + 'px' }" class="uni-icon" @click="_onClick" />
+</template>
+
+<script>
+	export default {
+		name: 'UniIcon',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style>
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url(data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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AVkBWgFbAVwBXQd1bmlFMTAwB3VuaUUxMDEHdW5pRTEwMgd1bmlFMTMwB3VuaUUxMzEHdW5pRTEzMgd1bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvBEV1cm8AAQAB//8ADwABAAAADAAAABYAAAACAAEAAQBfAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANJrTZkAAAAA2DhhuQ==) format('truetype');
+	}
+
+	uni-icon {
+		line-height: 1;
+	}
+
+	.uni-icon {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		line-height: 1;
+		display: inline-block;
+		text-decoration: none;
+		-webkit-font-smoothing: antialiased;
+	}
+
+	.uni-icon.uni-active {
+		color: #007aff;
+	}
+
+	.uni-icon-contact:before {
+		content: '\e100';
+	}
+
+	.uni-icon-person:before {
+		content: '\e101';
+	}
+
+	.uni-icon-personadd:before {
+		content: '\e102';
+	}
+
+	.uni-icon-contact-filled:before {
+		content: '\e130';
+	}
+
+	.uni-icon-person-filled:before {
+		content: '\e131';
+	}
+
+	.uni-icon-personadd-filled:before {
+		content: '\e132';
+	}
+
+	.uni-icon-phone:before {
+		content: '\e200';
+	}
+
+	.uni-icon-email:before {
+		content: '\e201';
+	}
+
+	.uni-icon-chatbubble:before {
+		content: '\e202';
+	}
+
+	.uni-icon-chatboxes:before {
+		content: '\e203';
+	}
+
+	.uni-icon-phone-filled:before {
+		content: '\e230';
+	}
+
+	.uni-icon-email-filled:before {
+		content: '\e231';
+	}
+
+	.uni-icon-chatbubble-filled:before {
+		content: '\e232';
+	}
+
+	.uni-icon-chatboxes-filled:before {
+		content: '\e233';
+	}
+
+	.uni-icon-weibo:before {
+		content: '\e260';
+	}
+
+	.uni-icon-weixin:before {
+		content: '\e261';
+	}
+
+	.uni-icon-pengyouquan:before {
+		content: '\e262';
+	}
+
+	.uni-icon-chat:before {
+		content: '\e263';
+	}
+
+	.uni-icon-qq:before {
+		content: '\e264';
+	}
+
+	.uni-icon-videocam:before {
+		content: '\e300';
+	}
+
+	.uni-icon-camera:before {
+		content: '\e301';
+	}
+
+	.uni-icon-mic:before {
+		content: '\e302';
+	}
+
+	.uni-icon-location:before {
+		content: '\e303';
+	}
+
+	.uni-icon-mic-filled:before,
+	.uni-icon-speech:before {
+		content: '\e332';
+	}
+
+	.uni-icon-location-filled:before {
+		content: '\e333';
+	}
+
+	.uni-icon-micoff:before {
+		content: '\e360';
+	}
+
+	.uni-icon-image:before {
+		content: '\e363';
+	}
+
+	.uni-icon-map:before {
+		content: '\e364';
+	}
+
+	.uni-icon-compose:before {
+		content: '\e400';
+	}
+
+	.uni-icon-trash:before {
+		content: '\e401';
+	}
+
+	.uni-icon-upload:before {
+		content: '\e402';
+	}
+
+	.uni-icon-download:before {
+		content: '\e403';
+	}
+
+	.uni-icon-close:before {
+		content: '\e404';
+	}
+
+	.uni-icon-redo:before {
+		content: '\e405';
+	}
+
+	.uni-icon-undo:before {
+		content: '\e406';
+	}
+
+	.uni-icon-refresh:before {
+		content: '\e407';
+	}
+
+	.uni-icon-star:before {
+		content: '\e408';
+	}
+
+	.uni-icon-plus:before {
+		content: '\e409';
+	}
+
+	.uni-icon-minus:before {
+		content: '\e410';
+	}
+
+	.uni-icon-circle:before,
+	.uni-icon-checkbox:before {
+		content: '\e411';
+	}
+
+	.uni-icon-close-filled:before,
+	.uni-icon-clear:before {
+		content: '\e434';
+	}
+
+	.uni-icon-refresh-filled:before {
+		content: '\e437';
+	}
+
+	.uni-icon-star-filled:before {
+		content: '\e438';
+	}
+
+	.uni-icon-plus-filled:before {
+		content: '\e439';
+	}
+
+	.uni-icon-minus-filled:before {
+		content: '\e440';
+	}
+
+	.uni-icon-circle-filled:before {
+		content: '\e441';
+	}
+
+	.uni-icon-checkbox-filled:before {
+		content: '\e442';
+	}
+
+	.uni-icon-closeempty:before {
+		content: '\e460';
+	}
+
+	.uni-icon-refreshempty:before {
+		content: '\e461';
+	}
+
+	.uni-icon-reload:before {
+		content: '\e462';
+	}
+
+	.uni-icon-starhalf:before {
+		content: '\e463';
+	}
+
+	.uni-icon-spinner:before {
+		content: '\e464';
+	}
+
+	.uni-icon-spinner-cycle:before {
+		content: '\e465';
+	}
+
+	.uni-icon-search:before {
+		content: '\e466';
+	}
+
+	.uni-icon-plusempty:before {
+		content: '\e468';
+	}
+
+	.uni-icon-forward:before {
+		content: '\e470';
+	}
+
+	.uni-icon-back:before,
+	.uni-icon-left-nav:before {
+		content: '\e471';
+	}
+
+	.uni-icon-checkmarkempty:before {
+		content: '\e472';
+	}
+
+	.uni-icon-home:before {
+		content: '\e500';
+	}
+
+	.uni-icon-navigate:before {
+		content: '\e501';
+	}
+
+	.uni-icon-gear:before {
+		content: '\e502';
+	}
+
+	.uni-icon-paperplane:before {
+		content: '\e503';
+	}
+
+	.uni-icon-info:before {
+		content: '\e504';
+	}
+
+	.uni-icon-help:before {
+		content: '\e505';
+	}
+
+	.uni-icon-locked:before {
+		content: '\e506';
+	}
+
+	.uni-icon-more:before {
+		content: '\e507';
+	}
+
+	.uni-icon-flag:before {
+		content: '\e508';
+	}
+
+	.uni-icon-home-filled:before {
+		content: '\e530';
+	}
+
+	.uni-icon-gear-filled:before {
+		content: '\e532';
+	}
+
+	.uni-icon-info-filled:before {
+		content: '\e534';
+	}
+
+	.uni-icon-help-filled:before {
+		content: '\e535';
+	}
+
+	.uni-icon-more-filled:before {
+		content: '\e537';
+	}
+
+	.uni-icon-settings:before {
+		content: '\e560';
+	}
+
+	.uni-icon-list:before {
+		content: '\e562';
+	}
+
+	.uni-icon-bars:before {
+		content: '\e563';
+	}
+
+	.uni-icon-loop:before {
+		content: '\e565';
+	}
+
+	.uni-icon-paperclip:before {
+		content: '\e567';
+	}
+
+	.uni-icon-eye:before {
+		content: '\e568';
+	}
+
+	.uni-icon-arrowup:before {
+		content: '\e580';
+	}
+
+	.uni-icon-arrowdown:before {
+		content: '\e581';
+	}
+
+	.uni-icon-arrowleft:before {
+		content: '\e582';
+	}
+
+	.uni-icon-arrowright:before {
+		content: '\e583';
+	}
+
+	.uni-icon-arrowthinup:before {
+		content: '\e584';
+	}
+
+	.uni-icon-arrowthindown:before {
+		content: '\e585';
+	}
+
+	.uni-icon-arrowthinleft:before {
+		content: '\e586';
+	}
+
+	.uni-icon-arrowthinright:before {
+		content: '\e587';
+	}
+
+	.uni-icon-pulldown:before {
+		content: '\e588';
+	}
+
+	.uni-icon-closefill:before {
+		content: '\e589';
+	}
+
+	.uni-icon-sound:before {
+		content: '\e590';
+	}
+
+	.uni-icon-scan:before {
+		content: '\e612';
+	}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/share.vue b/mallplusui-uniapp-app2/components/share.vue
new file mode 100644
index 0000000..e9b2634
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/share.vue
@@ -0,0 +1,238 @@
+<template>
+	<view v-if="show" class="mask" @click="toggleMask" @touchmove.stop.prevent="stopPrevent" :style="{ backgroundColor: backgroundColor }">
+		<view
+			class="mask-content"
+			@click.stop.prevent="stopPrevent"
+			:style="[
+				{
+					height: config.height,
+					transform: transform
+				}
+			]"
+		>
+			<scroll-view class="view-content" show-scrollbar="false" scroll-y>
+				<view class="share-header">分享到</view>
+				<view class="share-list">
+					<view v-for="(item, index) in shareList" :key="index" class="share-item" @click="shareToFriend(item.typeIcon, item.scene, item.provider)">
+						<image :src="item.icon" mode=""></image>
+						<text>{{ item.text }}</text>
+					</view>
+				</view>
+			</scroll-view>
+			<view class="bottom b-t" @click="toggleMask">取消</view>
+		</view>
+	</view>
+</template>
+
+<script>
+var href = null;
+var title = null;
+var imgUrl = null;
+export default {
+	data() {
+		return {
+			transform: 'translateY(50vh)',
+			timer: 0,
+			backgroundColor: 'rgba(0,0,0,0)',
+			show: false,
+			config: {}
+		};
+	},
+	props: {
+		contentHeight: {
+			type: Number,
+			default: 0
+		},
+		//是否是tabbar页面
+		hasTabbar: {
+			type: Boolean,
+			default: false
+		},
+		shareList: {
+			type: Array,
+			default: function() {
+				return [];
+			}
+		}
+	},
+	created() {
+		const height = uni.upx2px(this.contentHeight) + 'px';
+		this.config = {
+			height: height,
+			transform: `translateY(${height})`,
+			backgroundColor: 'rgba(0,0,0,.4)'
+		};
+		this.transform = this.config.transform;
+	},
+	methods: {
+		toggleMask(title, imgUrl, href) {
+			this.title = title;
+			this.imgUrl = imgUrl;
+			this.href = href;
+			//防止高频点击
+			if (this.timer == 1) {
+				return;
+			}
+			this.timer = 1;
+			setTimeout(() => {
+				this.timer = 0;
+			}, 500);
+
+			if (this.show) {
+				this.transform = this.config.transform;
+				this.backgroundColor = 'rgba(0,0,0,0)';
+				setTimeout(() => {
+					this.show = false;
+					this.hasTabbar && uni.showTabBar();
+				}, 200);
+				return;
+			}
+
+			this.show = true;
+			//等待mask重绘完成执行
+			if (this.hasTabbar) {
+				uni.hideTabBar({
+					success: () => {
+						setTimeout(() => {
+							this.backgroundColor = this.config.backgroundColor;
+							this.transform = 'translateY(0px)';
+						}, 10);
+					}
+				});
+			} else {
+				setTimeout(() => {
+					this.backgroundColor = this.config.backgroundColor;
+					this.transform = 'translateY(0px)';
+				}, 10);
+			}
+		},
+		//防止冒泡和滚动穿透
+		stopPrevent() {},
+		//分享操作
+		shareToFriend(type, scene, provider) {
+			// this.$api.msg(`分享给${type}`);
+			// this.toggleMask();
+			var url = this.href;
+			var title = this.title;
+			var imgUrl = this.imgUrl;
+			uni.share({
+				provider: provider,
+				scene: scene,
+				type: type,
+				href: url,
+				title: title,
+				imageUrl: imgUrl,
+				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({
+							success: function(res) {
+								if (res.confirm) {
+									console.log('用户点击确定');
+								} else if (res.cancel) {
+									console.log('用户点击取消');
+								}
+							}
+						});
+					}
+				}
+			});
+			this.toggleMask();
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.mask {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	display: flex;
+	justify-content: center;
+	align-items: flex-end;
+	z-index: 998;
+	transition: 0.3s;
+	.bottom {
+		position: absolute;
+		left: 0;
+		bottom: 0;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		width: 100%;
+		height: 90upx;
+		background: #fff;
+		z-index: 9;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+	}
+}
+
+.mask-content {
+	width: 100%;
+	height: 580upx;
+	transition: 0.3s;
+	background: #fff;
+	&.has-bottom {
+		padding-bottom: 90upx;
+	}
+	.view-content {
+		height: 100%;
+		background: #ffffff;
+	}
+}
+.share-header {
+	height: 110upx;
+	font-size: $font-base + 2upx;
+	color: font-color-dark;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	padding-top: 10upx;
+	&:before,
+	&:after {
+		content: '';
+		width: 240upx;
+		heighg: 0;
+		border-top: 1px solid $border-color-base;
+		transform: scaleY(0.5);
+		margin-right: 30upx;
+	}
+	&:after {
+		margin-left: 30upx;
+		margin-right: 0;
+	}
+}
+.share-list {
+	display: flex;
+	flex-wrap: wrap;
+}
+.share-item {
+	min-width: 33.33%;
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+	height: 180upx;
+	image {
+		width: 80upx;
+		height: 80upx;
+		margin-bottom: 16upx;
+	}
+	text {
+		font-size: $font-base;
+		color: $font-color-base;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/time-filter/time-filter.vue b/mallplusui-uniapp-app2/components/time-filter/time-filter.vue
new file mode 100644
index 0000000..6691974
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/time-filter/time-filter.vue
@@ -0,0 +1,205 @@
+<template>
+    <view class="dateContent">
+        <view class="line"></view>
+        <view  v-for="(item,key) in dateList" :class="{'item':true, 'item-checked': key==nowIndex, 'item-close': !item.isActive}" :key="key" @click="choseTime(item,key)">
+            <!--<view class="value">{{item.value}}</view>-->
+            <view class="circle"></view>
+            <view class="week">{{item.name}}</view>
+        </view>
+    </view>
+</template>
+
+<script>
+  export default {
+    props: {
+      type: {
+        type: String,
+        default: 'month'
+      }
+    },
+    computed: {
+      dateList() {
+        var arr = this.getArr(this.type)
+        return arr
+      }
+    },
+    data() {
+      return {
+        nowIndex: 6
+      }
+    },
+    methods: {
+      getArr(type) {
+        var timeArr = []
+        if(type == 'month'){
+          timeArr = [
+            {
+               name: '6月前',
+              isActive: true,
+              checked: false,
+              value: -6
+            },
+            {
+              name: '5月前',
+              isActive: true,
+              checked: false,
+              value: -5
+            },
+            {
+              name: '4月前',
+              isActive: true,
+              checked: false,
+              value: -4
+            },
+            {
+              name: '3月前',
+              isActive: true,
+              checked: false,
+              value: -3
+            },
+            {
+              name: '2月前',
+              isActive: true,
+              checked: false,
+              value: -2
+            },
+            {
+              name: '上月',
+              isActive: true,
+              checked: false,
+              value: -1
+            },
+            {
+              name: '本月',
+              isActive: true,
+              checked: true,
+              value: 0
+            }
+          ]
+        }
+        if(type == 'day'){
+          timeArr = [
+            {
+              name: '6天前',
+              isActive: true,
+              checked: false,
+              value: -6
+            },
+            {
+              name: '5天前',
+              isActive: true,
+              checked: false,
+              value: -5
+            },
+            {
+              name: '4天前',
+              isActive: true,
+              checked: false,
+              value: -4
+            },
+            {
+              name: '3天前',
+              isActive: true,
+              checked: false,
+              value: -3
+            },
+            {
+              name: '2天前',
+              isActive: true,
+              checked: false,
+              value: -2
+            },
+            {
+              name: '昨天',
+              isActive: true,
+              checked: false,
+              value: -1
+            },
+            {
+              name: '今天',
+              isActive: true,
+              checked: true,
+              value: 0
+            }
+          ]
+        }
+        return timeArr;
+      },
+      getMonth(month) {
+        var time = new Date();
+        time.setMonth(time.getMonth() + month);//设置month月后的时间
+        var y = time.getFullYear();
+        var m = time.getMonth() + 1;//获取当前月份
+        var d = time.getDate();
+        if(m<10){
+          m = "0"+m
+        }
+        return y + "-" + m ;
+      },
+      addDate(days) {
+        var d = new Date();
+        d.setDate(d.getDate() + days);
+        var m = d.getMonth() + 1;
+        if(m < 10){
+          m='0'+m
+        }
+        var day = d.getDate()
+        if(day < 10){
+          day='0'+day
+        }
+        return d.getFullYear() + '-' + m + '-' + day;
+      },
+      choseTime(item, index) {
+          this.$emit('chooseTime', item)
+        this.nowIndex = index
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .dateContent{
+      background: $uni-bg-color;
+      display: flex;
+      flex-direction: row;
+      padding: 18upx 6upx 4upx 6upx;
+      .item{
+          z-index: 9;
+          color: $uni-text-color-grey;
+          flex: 1;
+          text-align: center;
+          padding-bottom: 12upx;
+          &-checked{
+              color: #3FC0A2;
+              font-weight: bolder;
+              .circle{
+                  background-color: #3FC0A2!important;
+              }
+          }
+          &-close{
+              color: $uni-text-color-grey;
+          }
+          .week{
+              margin-top: 4upx;
+              font-size: $uni-font-size-base;
+          }
+          .circle{
+              width: 18upx;
+              height: 18upx;
+              border-radius: 50%;
+              border:1px solid #ebedf0;
+              margin: 20upx auto ;
+              background-color: $uni-bg-color;
+          }
+      }
+      .line{
+          position: absolute;
+          top: 47upx;
+          width: 94%;
+          left: 3%;
+          height: 4upx;
+          background-color: #ebedf0;
+      }
+  }
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/u-charts/component.vue b/mallplusui-uniapp-app2/components/u-charts/component.vue
new file mode 100644
index 0000000..413c360
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/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.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/mallplusui-uniapp-app2/components/u-charts/u-charts.js b/mallplusui-uniapp-app2/components/u-charts/u-charts.js
new file mode 100644
index 0000000..1785ec4
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/u-charts/u-charts.js
@@ -0,0 +1,5633 @@
+/*
+ * uCharts v1.9.3.20190922
+ * uni-app平台高性能跨全端图表，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）
+ * Copyright (c) 2019 QIUN秋云 https://www.ucharts.cn All rights reserved.
+ * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
+ * 
+ * uCharts官方网站
+ * https://www.uCharts.cn
+ * 
+ * 开源地址:
+ * https://gitee.com/uCharts/uCharts
+ * 
+ * uni-app插件市场地址：
+ * http://ext.dcloud.net.cn/plugin?id=271
+ * 
+ */
+
+'use strict';
+
+var config = {
+  yAxisWidth: 15,
+  yAxisSplit: 5,
+  xAxisHeight: 15,
+  xAxisLineHeight: 15,
+  legendHeight: 15,
+  yAxisTitleWidth: 15,
+  padding: [10, 10, 10, 10],
+  pixelRatio: 1,
+  rotate: false,
+  columePadding: 3,
+  fontSize: 13,
+  //dataPointShape: ['diamond', 'circle', 'triangle', 'rect'],
+  dataPointShape: ['circle', 'circle', 'circle', 'circle'],
+  colors: ['#1890ff', '#2fc25b', '#facc14', '#f04864', '#8543e0', '#90ed7d'],
+  pieChartLinePadding: 15,
+  pieChartTextPadding: 5,
+  xAxisTextPadding: 3,
+  titleColor: '#333333',
+  titleFontSize: 20,
+  subtitleColor: '#999999',
+  subtitleFontSize: 15,
+  toolTipPadding: 3,
+  toolTipBackground: '#000000',
+  toolTipOpacity: 0.7,
+  toolTipLineHeight: 20,
+  radarLabelTextMargin: 15,
+  gaugeLabelTextMargin: 15
+};
+
+let assign = function (target, ...varArgs) {
+    if (target == null) {
+        throw new TypeError('Cannot convert undefined or null to object');
+    }
+    if (!varArgs || varArgs.length <= 0) {
+        return target;
+    }
+    // 深度合并对象
+    function deepAssign(obj1, obj2) {
+        for (let key in obj2) {
+            obj1[key] = obj1[key] && obj1[key].toString() === "[object Object]" ?
+                deepAssign(obj1[key], obj2[key]) : obj1[key] = obj2[key];
+        }
+        return obj1;
+    }
+
+    varArgs.forEach(val => {
+        target = deepAssign(target, val);
+    });
+    return target;
+};
+
+var util = {
+  toFixed: function toFixed(num, limit) {
+    limit = limit || 2;
+    if (this.isFloat(num)) {
+      num = num.toFixed(limit);
+    }
+    return num;
+  },
+  isFloat: function isFloat(num) {
+    return num % 1 !== 0;
+  },
+  approximatelyEqual: function approximatelyEqual(num1, num2) {
+    return Math.abs(num1 - num2) < 1e-10;
+  },
+  isSameSign: function isSameSign(num1, num2) {
+    return Math.abs(num1) === num1 && Math.abs(num2) === num2 || Math.abs(num1) !== num1 && Math.abs(num2) !== num2;
+  },
+  isSameXCoordinateArea: function isSameXCoordinateArea(p1, p2) {
+    return this.isSameSign(p1.x, p2.x);
+  },
+  isCollision: function isCollision(obj1, obj2) {
+    obj1.end = {};
+    obj1.end.x = obj1.start.x + obj1.width;
+    obj1.end.y = obj1.start.y - obj1.height;
+    obj2.end = {};
+    obj2.end.x = obj2.start.x + obj2.width;
+    obj2.end.y = obj2.start.y - obj2.height;
+    var flag = obj2.start.x > obj1.end.x || obj2.end.x < obj1.start.x || obj2.end.y > obj1.start.y || obj2.start.y < obj1.end.y;
+    return !flag;
+  }
+};
+
+//兼容H5点击事件
+function getH5Offset(e) {
+  e.mp = {
+    changedTouches: []
+  };
+  e.mp.changedTouches.push({
+    x: e.offsetX,
+    y: e.offsetY
+  });
+  return e;
+}
+
+// hex 转 rgba
+function hexToRgb(hexValue, opc) {
+  var rgx = /^#?([a-f\d])([a-f\d])([a-f\d])$/i;
+  var hex = hexValue.replace(rgx, function(m, r, g, b) {
+    return r + r + g + g + b + b;
+  });
+  var rgb = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
+  var r = parseInt(rgb[1], 16);
+  var g = parseInt(rgb[2], 16);
+  var b = parseInt(rgb[3], 16);
+  return 'rgba(' + r + ',' + g + ',' + b + ',' + opc + ')';
+}
+
+function findRange(num, type, limit) {
+  if (isNaN(num)) {
+    throw new Error('[uCharts] unvalid series data!');
+  }
+  limit = limit || 10;
+  type = type ? type : 'upper';
+  var multiple = 1;
+  while (limit < 1) {
+    limit *= 10;
+    multiple *= 10;
+  }
+  if (type === 'upper') {
+    num = Math.ceil(num * multiple);
+  } else {
+    num = Math.floor(num * multiple);
+  }
+  while (num % limit !== 0) {
+    if (type === 'upper') {
+      num++;
+    } else {
+      num--;
+    }
+  }
+  return num / multiple;
+}
+
+function calCandleMA(dayArr, nameArr, colorArr, kdata) {
+  let seriesTemp = [];
+  for (let k = 0; k < dayArr.length; k++) {
+    let seriesItem = {
+      data: [],
+      name: nameArr[k],
+      color: colorArr[k]
+    };
+    for (let i = 0, len = kdata.length; i < len; i++) {
+      if (i < dayArr[k]) {
+        seriesItem.data.push(null);
+        continue;
+      }
+      let sum = 0;
+      for (let j = 0; j < dayArr[k]; j++) {
+        sum += kdata[i - j][1];
+      }
+      seriesItem.data.push(+(sum / dayArr[k]).toFixed(3));
+    }
+    seriesTemp.push(seriesItem);
+  }
+  return seriesTemp;
+}
+
+function calValidDistance(self,distance, chartData, config, opts) {
+  var dataChartAreaWidth = opts.width - opts.area[1] - opts.area[3];
+  var dataChartWidth = chartData.eachSpacing * (opts.chartData.xAxisData.xAxisPoints.length-1);
+  var validDistance = distance;
+  if (distance >= 0) {
+    validDistance = 0;
+		self.event.trigger('scrollLeft');
+  } else if (Math.abs(distance) >= dataChartWidth - dataChartAreaWidth) {
+    validDistance = dataChartAreaWidth - dataChartWidth;
+		self.event.trigger('scrollRight');
+  }
+  return validDistance;
+}
+
+function isInAngleRange(angle, startAngle, endAngle) {
+  function adjust(angle) {
+    while (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+    while (angle > 2 * Math.PI) {
+      angle -= 2 * Math.PI;
+    }
+    return angle;
+  }
+  angle = adjust(angle);
+  startAngle = adjust(startAngle);
+  endAngle = adjust(endAngle);
+  if (startAngle > endAngle) {
+    endAngle += 2 * Math.PI;
+    if (angle < startAngle) {
+      angle += 2 * Math.PI;
+    }
+  }
+  return angle >= startAngle && angle <= endAngle;
+}
+
+function calRotateTranslate(x, y, h) {
+  var xv = x;
+  var yv = h - y;
+  var transX = xv + (h - yv - xv) / Math.sqrt(2);
+  transX *= -1;
+  var transY = (h - yv) * (Math.sqrt(2) - 1) - (h - yv - xv) / Math.sqrt(2);
+  return {
+    transX: transX,
+    transY: transY
+  };
+}
+
+function createCurveControlPoints(points, i) {
+
+  function isNotMiddlePoint(points, i) {
+    if (points[i - 1] && points[i + 1]) {
+      return points[i].y >= Math.max(points[i - 1].y, points[i + 1].y) || points[i].y <= Math.min(points[i - 1].y,
+        points[
+          i + 1].y);
+    } else {
+      return false;
+    }
+  }
+  var a = 0.2;
+  var b = 0.2;
+  var pAx = null;
+  var pAy = null;
+  var pBx = null;
+  var pBy = null;
+  if (i < 1) {
+    pAx = points[0].x + (points[1].x - points[0].x) * a;
+    pAy = points[0].y + (points[1].y - points[0].y) * a;
+  } else {
+    pAx = points[i].x + (points[i + 1].x - points[i - 1].x) * a;
+    pAy = points[i].y + (points[i + 1].y - points[i - 1].y) * a;
+  }
+
+  if (i > points.length - 3) {
+    var last = points.length - 1;
+    pBx = points[last].x - (points[last].x - points[last - 1].x) * b;
+    pBy = points[last].y - (points[last].y - points[last - 1].y) * b;
+  } else {
+    pBx = points[i + 1].x - (points[i + 2].x - points[i].x) * b;
+    pBy = points[i + 1].y - (points[i + 2].y - points[i].y) * b;
+  }
+  if (isNotMiddlePoint(points, i + 1)) {
+    pBy = points[i + 1].y;
+  }
+  if (isNotMiddlePoint(points, i)) {
+    pAy = points[i].y;
+  }
+	if (pAy >= Math.max(points[i].y, points[i + 1].y) || pAy <= Math.min(points[i].y, points[i + 1].y)) {
+	pAy = points[i].y;
+	}
+	if (pBy >= Math.max(points[i].y, points[i + 1].y) || pBy <= Math.min(points[i].y, points[i + 1].y)) {
+	pBy = points[i + 1].y;
+	}
+  return {
+    ctrA: {
+      x: pAx,
+      y: pAy
+    },
+    ctrB: {
+      x: pBx,
+      y: pBy
+    }
+  };
+}
+
+function convertCoordinateOrigin(x, y, center) {
+  return {
+    x: center.x + x,
+    y: center.y - y
+  };
+}
+
+function avoidCollision(obj, target) {
+  if (target) {
+    // is collision test
+    while (util.isCollision(obj, target)) {
+      if (obj.start.x > 0) {
+        obj.start.y--;
+      } else if (obj.start.x < 0) {
+        obj.start.y++;
+      } else {
+        if (obj.start.y > 0) {
+          obj.start.y++;
+        } else {
+          obj.start.y--;
+        }
+      }
+    }
+  }
+  return obj;
+}
+
+function fillSeries(series, opts, config) {
+  var index = 0;
+  return series.map(function(item) {
+    if (!item.color) {
+      item.color = config.colors[index];
+      index = (index + 1) % config.colors.length;
+    }
+    if (!item.index) {
+      item.index = 0;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (typeof item.show == "undefined") {
+      item.show = true;
+    }
+    if (!item.type) {
+      item.type = opts.type;
+    }
+    if (!item.pointShape) {
+      item.pointShape = "circle";
+    }
+    if (!item.legendShape) {
+      switch (item.type) {
+        case 'line':
+          item.legendShape = "line";
+          break;
+        case 'column':
+          item.legendShape = "rect";
+          break;
+        case 'area':
+          item.legendShape = "triangle";
+          break;
+        default:
+          item.legendShape = "circle";
+      }
+    }
+    return item;
+  });
+}
+
+function getDataRange(minData, maxData) {
+  var limit = 0;
+  var range = maxData - minData;
+  if (range >= 10000) {
+    limit = 1000;
+  } else if (range >= 1000) {
+    limit = 100;
+  } else if (range >= 100) {
+    limit = 10;
+  } else if (range >= 10) {
+    limit = 5;
+  } else if (range >= 1) {
+    limit = 1;
+  } else if (range >= 0.1) {
+    limit = 0.1;
+  } else if (range >= 0.01) {
+    limit = 0.01;
+  } else if (range >= 0.001) {
+    limit = 0.001;
+  } else if (range >= 0.0001) {
+    limit = 0.0001;
+  } else if (range >= 0.00001) {
+    limit = 0.00001;
+  } else {
+    limit = 0.000001;
+  }
+  return {
+    minRange: findRange(minData, 'lower', limit),
+    maxRange: findRange(maxData, 'upper', limit)
+  };
+}
+
+function measureText(text) {
+  var fontSize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : config.fontSize;
+  text = String(text);
+  var text = text.split('');
+  var width = 0;
+  for (let i = 0; i < text.length; i++) {
+    let item = text[i];
+    if (/[a-zA-Z]/.test(item)) {
+      width += 7;
+    } else if (/[0-9]/.test(item)) {
+      width += 5.5;
+    } else if (/\./.test(item)) {
+      width += 2.7;
+    } else if (/-/.test(item)) {
+      width += 3.25;
+    } else if (/[\u4e00-\u9fa5]/.test(item)) {
+      width += 10;
+    } else if (/\(|\)/.test(item)) {
+      width += 3.73;
+    } else if (/\s/.test(item)) {
+      width += 2.5;
+    } else if (/%/.test(item)) {
+      width += 8;
+    } else {
+      width += 10;
+    }
+  }
+  return width * fontSize / 10;
+}
+
+function dataCombine(series) {
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data);
+  }, []);
+}
+
+function dataCombineStack(series, len) {
+  var sum = new Array(len);
+  for (var j = 0; j < sum.length; j++) {
+    sum[j] = 0;
+  }
+  for (var i = 0; i < series.length; i++) {
+    for (var j = 0; j < sum.length; j++) {
+      sum[j] += series[i].data[j];
+    }
+  }
+  return series.reduce(function(a, b) {
+    return (a.data ? a.data : a).concat(b.data).concat(sum);
+  }, []);
+}
+
+function getTouches(touches, opts, e) {
+  let x, y;
+  if (touches.clientX) {
+    if (opts.rotate) {
+      y = opts.height - touches.clientX * opts.pixelRatio;
+      x = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pixelRatio / 2) * (opts.pixelRatio - 1)) *
+        opts.pixelRatio;
+    } else {
+      x = touches.clientX * opts.pixelRatio;
+      y = (touches.pageY - e.currentTarget.offsetTop - (opts.height / opts.pixelRatio / 2) * (opts.pixelRatio - 1)) *
+        opts.pixelRatio;
+    }
+  } else {
+    if (opts.rotate) {
+      y = opts.height - touches.x * opts.pixelRatio;
+      x = touches.y * opts.pixelRatio;
+    } else {
+      x = touches.x * opts.pixelRatio;
+      y = touches.y * opts.pixelRatio;
+    }
+  }
+  return {
+    x: x,
+    y: y
+  }
+}
+
+function getSeriesDataItem(series, index) {
+  var data = [];
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    if (item.data[index] !== null && typeof item.data[index] !== 'undefined' && item.show) {
+      let seriesItem = {};
+      seriesItem.color = item.color;
+      seriesItem.type = item.type;
+      seriesItem.style = item.style;
+      seriesItem.pointShape = item.pointShape;
+      seriesItem.disableLegend = item.disableLegend;
+      seriesItem.name = item.name;
+      seriesItem.show = item.show;
+      seriesItem.data = item.format ? item.format(item.data[index]) : item.data[index];
+      data.push(seriesItem);
+    }
+  }
+  return data;
+}
+
+function getMaxTextListLength(list) {
+  var lengthList = list.map(function(item) {
+    return measureText(item);
+  });
+  return Math.max.apply(null, lengthList);
+}
+
+function getRadarCoordinateSeries(length) {
+  var eachAngle = 2 * Math.PI / length;
+  var CoordinateSeries = [];
+  for (var i = 0; i < length; i++) {
+    CoordinateSeries.push(eachAngle * i);
+  }
+
+  return CoordinateSeries.map(function(item) {
+    return -1 * item + Math.PI / 2;
+  });
+}
+
+function getToolTipData(seriesData, calPoints, index, categories) {
+  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+
+  var textList = seriesData.map(function(item) {
+		let titleText=[];
+		if(categories){
+			titleText=categories;
+		}else{
+			titleText=item.data;
+		}
+    return {
+      text: option.format ? option.format(item, titleText[index]) : item.name + ': ' + item.data,
+      color: item.color
+    };
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  for (let i = 0; i < validCalPoints.length; i++) {
+    let item = validCalPoints[i];
+    offset.x = Math.round(item.x);
+    offset.y += item.y;
+  }
+  offset.y /= validCalPoints.length;
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getMixToolTipData(seriesData, calPoints, index, categories) {
+  var option = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : {};
+  var textList = seriesData.map(function(item) {
+    return {
+      text: option.format ? option.format(item, categories[index]) : item.name + ': ' + item.data,
+      color: item.color,
+      disableLegend: item.disableLegend ? true : false
+    };
+  });
+  textList = textList.filter(function(item) {
+    if (item.disableLegend !== true) {
+      return item;
+    }
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  for (let i = 0; i < validCalPoints.length; i++) {
+    let item = validCalPoints[i];
+    offset.x = Math.round(item.x);
+    offset.y += item.y;
+  }
+  offset.y /= validCalPoints.length;
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function getCandleToolTipData(series, seriesData, calPoints, index, categories, extra) {
+  var option = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : {};
+  let upColor = extra.color.upFill;
+  let downColor = extra.color.downFill;
+  //颜色顺序为开盘，收盘，最低，最高
+  let color = [upColor, upColor, downColor, upColor];
+  var textList = [];
+  let text0 = {
+    text: categories[index],
+    color: null
+  };
+  textList.push(text0);
+  seriesData.map(function(item) {
+    if (index == 0 && item.data[1] - item.data[0] < 0) {
+      color[1] = downColor;
+    } else {
+      if (item.data[0] < series[index - 1][1]) {
+        color[0] = downColor;
+      }
+      if (item.data[1] < item.data[0]) {
+        color[1] = downColor;
+      }
+      if (item.data[2] > series[index - 1][1]) {
+        color[2] = upColor;
+      }
+      if (item.data[3] < series[index - 1][1]) {
+        color[3] = downColor;
+      }
+    }
+    let text1 = {
+      text: '开盘：' + item.data[0],
+      color: color[0]
+    };
+    let text2 = {
+      text: '收盘：' + item.data[1],
+      color: color[1]
+    };
+    let text3 = {
+      text: '最低：' + item.data[2],
+      color: color[2]
+    };
+    let text4 = {
+      text: '最高：' + item.data[3],
+      color: color[3]
+    };
+    textList.push(text1, text2, text3, text4);
+  });
+  var validCalPoints = [];
+  var offset = {
+    x: 0,
+    y: 0
+  };
+  for (let i = 0; i < calPoints.length; i++) {
+    let points = calPoints[i];
+    if (typeof points[index] !== 'undefined' && points[index] !== null) {
+      validCalPoints.push(points[index]);
+    }
+  }
+  offset.x = Math.round(validCalPoints[0][0].x);
+  return {
+    textList: textList,
+    offset: offset
+  };
+}
+
+function filterSeries(series) {
+  let tempSeries = [];
+  for (let i = 0; i < series.length; i++) {
+    if (series[i].show == true) {
+      tempSeries.push(series[i])
+    }
+  }
+  return tempSeries;
+}
+
+function findCurrentIndex(currentPoints, calPoints, opts, config) {
+  var offset = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 0;
+  var currentIndex = -1;
+  var spacing = 0;
+	let xAxisPoints=[];
+	for(let i=0;i<calPoints[0].length;i++){
+		xAxisPoints.push(calPoints[0][i].x)
+	}
+  if((opts.type=='line' || opts.type=='area') && opts.xAxis.boundaryGap=='justify'){
+    spacing = opts.chartData.eachSpacing/2;
+  }
+	if(!opts.categories){
+		spacing=0
+	}
+  if (isInExactChartArea(currentPoints, opts, config)) {
+    xAxisPoints.forEach(function(item, index) {
+      if (currentPoints.x + offset + spacing > item) {
+        currentIndex = index;
+      }
+    });
+  }
+  return currentIndex;
+}
+
+function findLegendIndex(currentPoints, legendData, opts) {
+  let currentIndex = -1;
+  if (isInExactLegendArea(currentPoints, legendData.area)) {
+    let points = legendData.points;
+    let index = -1;
+    for (let i = 0, len = points.length; i < len; i++) {
+      let item = points[i];
+      for (let j = 0; j < item.length; j++) {
+        index += 1;
+        let area = item[j]['area'];
+        if (currentPoints.x > area[0] && currentPoints.x < area[2] && currentPoints.y > area[1] && currentPoints.y < area[3]) {
+          currentIndex = index;
+          break;
+        }
+      }
+    }
+    return currentIndex;
+  }
+  return currentIndex;
+}
+
+function isInExactLegendArea(currentPoints, area) {
+  return currentPoints.x > area.start.x && currentPoints.x < area.end.x && currentPoints.y > area.start.y &&
+    currentPoints.y < area.end.y;
+}
+
+function isInExactChartArea(currentPoints, opts, config) {
+  return currentPoints.x <= opts.width - opts.area[1] + 10 && currentPoints.x >= opts.area[3] -10 && currentPoints.y >= opts.area[0] && currentPoints.y <= opts.height - opts.area[2];
+}
+
+function findRadarChartCurrentIndex(currentPoints, radarData, count) {
+  var eachAngleArea = 2 * Math.PI / count;
+  var currentIndex = -1;
+  if (isInExactPieChartArea(currentPoints, radarData.center, radarData.radius)) {
+    var fixAngle = function fixAngle(angle) {
+      if (angle < 0) {
+        angle += 2 * Math.PI;
+      }
+      if (angle > 2 * Math.PI) {
+        angle -= 2 * Math.PI;
+      }
+      return angle;
+    };
+
+    var angle = Math.atan2(radarData.center.y - currentPoints.y, currentPoints.x - radarData.center.x);
+    angle = -1 * angle;
+    if (angle < 0) {
+      angle += 2 * Math.PI;
+    }
+
+    var angleList = radarData.angleList.map(function(item) {
+      item = fixAngle(-1 * item);
+
+      return item;
+    });
+
+    angleList.forEach(function(item, index) {
+      var rangeStart = fixAngle(item - eachAngleArea / 2);
+      var rangeEnd = fixAngle(item + eachAngleArea / 2);
+      if (rangeEnd < rangeStart) {
+        rangeEnd += 2 * Math.PI;
+      }
+      if (angle >= rangeStart && angle <= rangeEnd || angle + 2 * Math.PI >= rangeStart && angle + 2 * Math.PI <=
+        rangeEnd) {
+        currentIndex = index;
+      }
+    });
+  }
+
+  return currentIndex;
+}
+
+function findFunnelChartCurrentIndex(currentPoints, funnelData) {
+  var currentIndex = -1;
+  for (var i = 0, len = funnelData.series.length; i < len; i++) {
+    var item = funnelData.series[i];
+    if (currentPoints.x > item.funnelArea[0] && currentPoints.x < item.funnelArea[2] && currentPoints.y > item.funnelArea[1] && currentPoints.y < item.funnelArea[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findWordChartCurrentIndex(currentPoints, wordData) {
+  var currentIndex = -1;
+  for (var i = 0, len = wordData.length; i < len; i++) {
+    var item = wordData[i];
+    if (currentPoints.x > item.area[0] && currentPoints.x < item.area[2] && currentPoints.y > item.area[1] && currentPoints.y < item.area[3]) {
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findMapChartCurrentIndex(currentPoints, opts) {
+  var currentIndex = -1;
+  var cData=opts.chartData.mapData;
+  var data=opts.series;
+  var tmp=pointToCoordinate(currentPoints.y, currentPoints.x,cData.bounds,cData.scale,cData.xoffset,cData.yoffset);
+  var poi=[tmp.x, tmp.y];
+  for (var i = 0, len = data.length; i < len; i++) {
+    var item = data[i].geometry.coordinates;
+    if(isPoiWithinPoly(poi,item)){
+      currentIndex = i;
+      break;
+    }
+  }
+  return currentIndex;
+}
+
+function findPieChartCurrentIndex(currentPoints, pieData) {
+  var currentIndex = -1;
+  if (isInExactPieChartArea(currentPoints, pieData.center, pieData.radius)) {
+    var angle = Math.atan2(pieData.center.y - currentPoints.y, currentPoints.x - pieData.center.x);
+    angle = -angle;
+    for (var i = 0, len = pieData.series.length; i < len; i++) {
+      var item = pieData.series[i];
+      if (isInAngleRange(angle, item._start_, item._start_ + item._proportion_ * 2 * Math.PI)) {
+        currentIndex = i;
+        break;
+      }
+    }
+  }
+
+  return currentIndex;
+}
+
+function isInExactPieChartArea(currentPoints, center, radius) {
+  return Math.pow(currentPoints.x - center.x, 2) + Math.pow(currentPoints.y - center.y, 2) <= Math.pow(radius, 2);
+}
+
+function splitPoints(points) {
+  var newPoints = [];
+  var items = [];
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      items.push(item);
+    } else {
+      if (items.length) {
+        newPoints.push(items);
+      }
+      items = [];
+    }
+  });
+  if (items.length) {
+    newPoints.push(items);
+  }
+
+  return newPoints;
+}
+
+function calLegendData(series, opts, config, chartData) {
+  let legendData = {
+    area: {
+      start: {
+        x: 0,
+        y: 0
+      },
+      end: {
+        x: 0,
+        y: 0
+      },
+      width: 0,
+      height: 0,
+      wholeWidth: 0,
+      wholeHeight: 0
+    },
+    points: [],
+    widthArr: [],
+    heightArr: []
+  };
+  if (opts.legend.show === false) {
+    chartData.legendData = legendData;
+    return legendData;
+  }
+
+  let padding = opts.legend.padding;
+  let margin = opts.legend.margin;
+  let fontSize = opts.legend.fontSize;
+  let shapeWidth = 15 * opts.pixelRatio;
+  let shapeRight = 5 * opts.pixelRatio;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pixelRatio, fontSize);
+  if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+    let legendList = [];
+    let widthCount = 0;
+    let widthCountArr = [];
+    let currentRow = [];
+    for (let i = 0; i < series.length; i++) {
+      let item = series[i];
+      let itemWidth = shapeWidth + shapeRight + measureText(item.name || 'undefined', fontSize) + opts.legend.itemGap;
+      if (widthCount + itemWidth > opts.width - opts.padding[1] - opts.padding[3]) {
+        legendList.push(currentRow);
+        widthCountArr.push(widthCount - opts.legend.itemGap);
+        widthCount = itemWidth;
+        currentRow = [item];
+      } else {
+        widthCount += itemWidth;
+        currentRow.push(item);
+      }
+    }
+    if (currentRow.length) {
+      legendList.push(currentRow);
+      widthCountArr.push(widthCount - opts.legend.itemGap);
+      legendData.widthArr = widthCountArr;
+      let legendWidth = Math.max.apply(null, widthCountArr);
+      switch (opts.legend.float) {
+        case 'left':
+          legendData.area.start.x = opts.padding[3];
+          legendData.area.end.x = opts.padding[3] + 2 * padding;
+          break;
+        case 'right':
+          legendData.area.start.x = opts.width - opts.padding[1] - legendWidth - 2 * padding;
+          legendData.area.end.x = opts.width - opts.padding[1];
+          break;
+        default:
+          legendData.area.start.x = (opts.width - legendWidth) / 2 - padding;
+          legendData.area.end.x = (opts.width + legendWidth) / 2 + padding;
+      }
+      legendData.area.width = legendWidth + 2 * padding;
+      legendData.area.wholeWidth = legendWidth + 2 * padding;
+      legendData.area.height = legendList.length * lineHeight + 2 * padding;
+      legendData.area.wholeHeight = legendList.length * lineHeight + 2 * padding + 2 * margin;
+      legendData.points = legendList;
+    }
+  } else {
+    let len = series.length;
+    let maxHeight = opts.height - opts.padding[0] - opts.padding[2] - 2 * margin - 2 * padding;
+    let maxLength = Math.min(Math.floor(maxHeight / lineHeight), len);
+    legendData.area.height = maxLength * lineHeight + padding * 2;
+    legendData.area.wholeHeight = maxLength * lineHeight + padding * 2;
+    switch (opts.legend.float) {
+      case 'top':
+        legendData.area.start.y = opts.padding[0] + margin;
+        legendData.area.end.y = opts.padding[0] + margin + legendData.area.height;
+        break;
+      case 'bottom':
+        legendData.area.start.y = opts.height - opts.padding[2] - margin - legendData.area.height;
+        legendData.area.end.y = opts.height - opts.padding[2] - margin;
+        break;
+      default:
+        legendData.area.start.y = (opts.height - legendData.area.height) / 2;
+        legendData.area.end.y = (opts.height + legendData.area.height) / 2;
+    }
+    let lineNum = len % maxLength === 0 ? len / maxLength : Math.floor((len / maxLength) + 1);
+    let currentRow = [];
+    for (let i = 0; i < lineNum; i++) {
+      let temp = series.slice(i * maxLength, i * maxLength + maxLength);
+      currentRow.push(temp);
+    }
+
+    legendData.points = currentRow;
+
+    if (currentRow.length) {
+      for (let i = 0; i < currentRow.length; i++) {
+        let item = currentRow[i];
+        let maxWidth = 0;
+        for (let j = 0; j < item.length; j++) {
+          let itemWidth = shapeWidth + shapeRight + measureText(item[j].name || 'undefined', fontSize) + opts.legend.itemGap;
+          if (itemWidth > maxWidth) {
+            maxWidth = itemWidth;
+          }
+        }
+        legendData.widthArr.push(maxWidth);
+        legendData.heightArr.push(item.length * lineHeight + padding * 2);
+      }
+      let legendWidth = 0
+      for (let i = 0; i < legendData.widthArr.length; i++) {
+        legendWidth += legendData.widthArr[i];
+      }
+      legendData.area.width = legendWidth - opts.legend.itemGap + 2 * padding;
+      legendData.area.wholeWidth = legendData.area.width + padding;
+    }
+  }
+
+  switch (opts.legend.position) {
+    case 'top':
+      legendData.area.start.y = opts.padding[0] + margin;
+      legendData.area.end.y = opts.padding[0] + margin + legendData.area.height;
+      break;
+    case 'bottom':
+      legendData.area.start.y = opts.height - opts.padding[2] - legendData.area.height - margin;
+      legendData.area.end.y = opts.height - opts.padding[2] - margin;
+      break;
+    case 'left':
+      legendData.area.start.x = opts.padding[3];
+      legendData.area.end.x = opts.padding[3] + legendData.area.width;
+      break;
+    case 'right':
+      legendData.area.start.x = opts.width - opts.padding[1] - legendData.area.width;
+      legendData.area.end.x = opts.width - opts.padding[1];
+      break;
+  }
+  chartData.legendData = legendData;
+  return legendData;
+}
+
+function calCategoriesData(categories, opts, config, eachSpacing) {
+  var result = {
+    angle: 0,
+    xAxisHeight: config.xAxisHeight
+  };
+  var categoriesTextLenth = categories.map(function(item) {
+    return measureText(item,opts.xAxis.fontSize||config.fontSize);
+  });
+  var maxTextLength = Math.max.apply(this, categoriesTextLenth);
+
+  if (opts.xAxis.rotateLabel == true && maxTextLength + 2 * config.xAxisTextPadding > eachSpacing) {
+    result.angle = 45 * Math.PI / 180;
+    result.xAxisHeight = 2 * config.xAxisTextPadding + maxTextLength * Math.sin(result.angle);
+  }
+  return result;
+}
+
+function getXAxisTextList(series, opts, config) {
+  var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+  var data = dataCombine(series);
+  var sorted = [];
+  // remove null from data
+  data = data.filter(function(item) {
+    //return item !== null;
+    if (typeof item === 'object' && item !== null) {
+      if (item.constructor == Array) {
+        return item !== null;
+      } else {
+        return item.value !== null;
+      }
+    } else {
+      return item !== null;
+    }
+  });
+  data.map(function(item) {
+    if (typeof item === 'object') {
+      if (item.constructor == Array) {
+				if(opts.type=='candle'){
+					item.map(function(subitem) {
+					  sorted.push(subitem);
+					})
+				}else{
+					sorted.push(item[0]);
+				}
+      } else {
+        sorted.push(item.value);
+      }
+    } else {
+      sorted.push(item);
+    }
+  })
+	
+  var minData = 0;
+  var maxData = 0;
+  if (sorted.length > 0) {
+    minData = Math.min.apply(this, sorted);
+    maxData = Math.max.apply(this, sorted);
+  }
+  //为了兼容v1.9.0之前的项目
+  if(index>-1){
+    if (typeof opts.xAxis.data[index].min === 'number') {
+      minData = Math.min(opts.xAxis.data[index].min, minData);
+    }
+    if (typeof opts.xAxis.data[index].max === 'number') {
+      maxData = Math.max(opts.xAxis.data[index].max, maxData);
+    }
+  }else{
+    if (typeof opts.xAxis.min === 'number') {
+      minData = Math.min(opts.xAxis.min, minData);
+    }
+    if (typeof opts.xAxis.max === 'number') {
+      maxData = Math.max(opts.xAxis.max, maxData);
+    }
+  }
+  
+
+  if (minData === maxData) {
+    var rangeSpan = maxData || 10;
+    maxData += rangeSpan;
+  }
+
+  var dataRange = getDataRange(minData, maxData);
+  var minRange = dataRange.minRange;
+  var maxRange = dataRange.maxRange;
+
+  var range = [];
+  var eachRange = (maxRange - minRange) / opts.xAxis.splitNumber;
+
+  for (var i = 0; i <= opts.xAxis.splitNumber; i++) {
+    range.push(minRange + eachRange * i);
+  }
+  return range;
+}
+
+function calXAxisData(series, opts, config){
+    var result = {
+        angle: 0,
+        xAxisHeight: config.xAxisHeight
+    };
+
+    result.ranges = getXAxisTextList(series, opts, config);
+    result.rangesFormat = result.ranges.map(function(item){
+        item = opts.xAxis.format? opts.xAxis.format(item):util.toFixed(item, 2);
+        return item;
+    });
+    var xAxisScaleValues = result.ranges.map(function (item) {
+        // 如果刻度值是浮点数,则保留两位小数
+        item = util.toFixed(item, 2);
+        // 若有自定义格式则调用自定义的格式化函数
+        item = opts.xAxis.format ? opts.xAxis.format(Number(item)) : item;
+        return item;
+    });
+
+    result = Object.assign(result,getXAxisPoints(xAxisScaleValues, opts, config));
+    // 计算X轴刻度的属性譬如每个刻度的间隔,刻度的起始点\结束点以及总长
+    var eachSpacing = result.eachSpacing;
+
+    var textLength = xAxisScaleValues.map(function (item) {
+        return measureText(item);
+    });
+    
+    // get max length of categories text
+    var maxTextLength = Math.max.apply(this, textLength);
+
+    // 如果刻度值文本内容过长,则将其逆时针旋转45°
+    if (maxTextLength + 2 * config.xAxisTextPadding > eachSpacing) {
+        result.angle = 45 * Math.PI / 180;
+        result.xAxisHeight = 2 * config.xAxisTextPadding + maxTextLength * Math.sin(result.angle);
+    }
+
+    if (opts.xAxis.disabled === true) {
+        result.xAxisHeight = 0;
+    }
+
+    return result;
+}
+
+function getRadarDataPoints(angleList, center, radius, series, opts) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+
+  var radarOption = opts.extra.radar || {};
+  radarOption.max = radarOption.max || 0;
+  var maxData = Math.max(radarOption.max, Math.max.apply(null, dataCombine(series)));
+
+  var data = [];
+  for (let i = 0; i < series.length; i++) {
+    let each = series[i];
+    let listItem = {};
+    listItem.color = each.color;
+		listItem.legendShape = each.legendShape;
+		listItem.pointShape = each.pointShape;
+    listItem.data = [];
+    each.data.forEach(function(item, index) {
+      let tmp = {};
+      tmp.angle = angleList[index];
+
+      tmp.proportion = item / maxData;
+      tmp.position = convertCoordinateOrigin(radius * tmp.proportion * process * Math.cos(tmp.angle), radius * tmp.proportion *
+        process * Math.sin(tmp.angle), center);
+      listItem.data.push(tmp);
+    });
+
+    data.push(listItem);
+  }
+
+  return data;
+}
+
+function getPieDataPoints(series, radius) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+
+  var count = 0;
+  var _start_ = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0) {
+      item._proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+    }
+    item._radius_ = radius;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._proportion_ * Math.PI;
+  }
+
+  return series;
+}
+
+function getFunnelDataPoints(series, radius) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  series = series.sort(function(a,b){return parseInt(b.data)-parseInt(a.data);});
+  for (let i = 0; i < series.length; i++) {
+    series[i].radius = series[i].data/series[0].data*radius*process;
+    series[i]._proportion_ = series[i].data/series[0].data;
+  }
+  return series.reverse();
+}
+
+function getRoseDataPoints(series, type, minRadius, radius) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var count = 0;
+  var _start_ = 0;
+
+  var dataArr = [];
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    count += item.data;
+    dataArr.push(item.data);
+  }
+  
+  var minData = Math.min.apply(null, dataArr);
+  var maxData = Math.max.apply(null, dataArr);
+  var radiusLength = radius - minRadius;
+  
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (count === 0 || type == 'area') {
+      item._proportion_ = item.data / count * process;
+      item._rose_proportion_ = 1 / series.length * process;
+    } else {
+      item._proportion_ = item.data / count * process;
+      item._rose_proportion_ = item.data / count * process;
+    }
+    item._radius_ = minRadius + radiusLength * ((item.data - minData) / (maxData - minData));
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item._start_ = _start_;
+    _start_ += 2 * item._rose_proportion_ * Math.PI;
+  }
+
+  return series;
+}
+
+function getArcbarDataPoints(series, arcbarOption) {
+  var process = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  if (process == 1) {
+    process = 0.999999;
+  }
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    let totalAngle;
+    if (arcbarOption.type == 'circle') {
+      totalAngle = 2;
+    } else {
+			if (arcbarOption.endAngle < arcbarOption.startAngle) {
+			  totalAngle = 2 + arcbarOption.endAngle - arcbarOption.startAngle;
+			} else{
+			  totalAngle = arcbarOption.startAngle - arcbarOption.endAngle;
+			}
+    }
+    item._proportion_ = totalAngle * item.data * process + arcbarOption.startAngle;
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getGaugeAxisPoints(categories, startAngle, endAngle) {
+  let totalAngle = startAngle - endAngle + 1;
+  let tempStartAngle = startAngle;
+  for (let i = 0; i < categories.length; i++) {
+    categories[i].value = categories[i].value === null ? 0 : categories[i].value;
+    categories[i]._startAngle_ = tempStartAngle;
+    categories[i]._endAngle_ = totalAngle * categories[i].value + startAngle;
+    if (categories[i]._endAngle_ >= 2) {
+      categories[i]._endAngle_ = categories[i]._endAngle_ % 2;
+    }
+    tempStartAngle = categories[i]._endAngle_;
+  }
+  return categories;
+}
+
+function getGaugeDataPoints(series, categories, gaugeOption) {
+  let process = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : 1;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    item.data = item.data === null ? 0 : item.data;
+    if (gaugeOption.pointer.color == 'auto') {
+      for (let i = 0; i < categories.length; i++) {
+        if (item.data <= categories[i].value) {
+          item.color = categories[i].color;
+          break;
+        }
+      }
+    } else {
+      item.color = gaugeOption.pointer.color;
+    }
+    let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+    item._endAngle_ = totalAngle * item.data + gaugeOption.startAngle;
+    item._oldAngle_ = gaugeOption.oldAngle;
+    if (gaugeOption.oldAngle < gaugeOption.endAngle) {
+      item._oldAngle_ += 2;
+    }
+    if (item.data >= gaugeOption.oldData) {
+      item._proportion_ = (item._endAngle_ - item._oldAngle_) * process + gaugeOption.oldAngle;
+    } else {
+      item._proportion_ = item._oldAngle_ - (item._oldAngle_ - item._endAngle_) * process;
+    }
+    if (item._proportion_ >= 2) {
+      item._proportion_ = item._proportion_ % 2;
+    }
+  }
+  return series;
+}
+
+function getPieTextMaxLength(series) {
+  series = getPieDataPoints(series);
+  let maxLength = 0;
+  for (let i = 0; i < series.length; i++) {
+    let item = series[i];
+    let text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) + '%';
+    maxLength = Math.max(maxLength, measureText(text));
+  }
+
+  return maxLength;
+}
+
+function fixColumeData(points, eachSpacing, columnLen, index, config, opts) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / columnLen);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+    if (item.width <= 0) {
+      item.width = 1;
+    }
+    item.x += (index + 0.5 - columnLen / 2) * item.width;
+    return item;
+  });
+}
+
+function fixColumeMeterData(points, eachSpacing, columnLen, index, config, opts, border) {
+  return points.map(function(item) {
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / 2);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+
+    if (index > 0) {
+      item.width -= 2 * border;
+    }
+    return item;
+  });
+}
+
+function fixColumeStackData(points, eachSpacing, columnLen, index, config, opts, series) {
+
+  return points.map(function(item, indexn) {
+
+    if (item === null) {
+      return null;
+    }
+    item.width = Math.ceil((eachSpacing - 2 * config.columePadding) / 2);
+
+    if (opts.extra.column && opts.extra.column.width && +opts.extra.column.width > 0) {
+      item.width = Math.min(item.width, +opts.extra.column.width);
+    }
+    return item;
+  });
+}
+
+function getXAxisPoints(categories, opts, config) {
+  var spacingValid = opts.width - opts.area[1] - opts.area[3];
+  var dataCount = opts.enableScroll ? Math.min(opts.xAxis.itemCount, categories.length) : categories.length;
+  if((opts.type=='line' || opts.type=='area') && dataCount>1 && opts.xAxis.boundaryGap=='justify'){
+    dataCount -=1;
+  }
+  var eachSpacing = spacingValid / dataCount;
+
+  var xAxisPoints = [];
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  categories.forEach(function(item, index) {
+    xAxisPoints.push(startX + index * eachSpacing);
+  });
+  if(opts.xAxis.boundaryGap !=='justify'){
+    if (opts.enableScroll === true) {
+      xAxisPoints.push(startX + categories.length * eachSpacing);
+    } else {
+      xAxisPoints.push(endX);
+    }
+  }
+  return {
+    xAxisPoints: xAxisPoints,
+    startX: startX,
+    endX: endX,
+    eachSpacing: eachSpacing
+  };
+}
+
+function getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var cPoints = [];
+      item.forEach(function(items, indexs) {
+        var point = {};
+        point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+        var value = items.value || items;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        height *= process;
+        point.y = opts.height - Math.round(height) - opts.area[2];
+        cPoints.push(point);
+      });
+      points.push(cPoints);
+    }
+  });
+
+  return points;
+}
+
+function getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config) {
+  var process = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : 1;
+  var boundaryGap='center';
+  if (opts.type == 'line'||opts.type == 'area'){
+    boundaryGap=opts.xAxis.boundaryGap;
+  }
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+	var validWidth = opts.width - opts.area[1] - opts.area[3];
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index];
+      var value = item;
+      if (typeof item === 'object' && item !== null) {
+				if (item.constructor == Array) {
+					let xranges,xminRange,xmaxRange;
+					xranges = [].concat(opts.chartData.xAxisData.ranges);
+					
+					xminRange = xranges.shift();
+					xmaxRange = xranges.pop();
+				  value = item[1];
+					point.x = opts.area[3]+ validWidth * (item[0] - xminRange) / (xmaxRange - xminRange);
+				} else {
+				  value = item.value;
+				}
+      }
+			if(boundaryGap=='center'){
+			  point.x += Math.round(eachSpacing / 2);
+			}
+      var height = validHeight * (value - minRange) / (maxRange - minRange);
+      height *= process;
+      point.y = opts.height - Math.round(height) - opts.area[2];
+      points.push(point);
+    }
+  });
+
+  return points;
+}
+
+function getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, stackSeries) {
+  var process = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : 1;
+  var points = [];
+  var validHeight = opts.height - opts.area[0] - opts.area[2];
+
+  data.forEach(function(item, index) {
+    if (item === null) {
+      points.push(null);
+    } else {
+      var point = {};
+      point.color = item.color;
+      point.x = xAxisPoints[index] + Math.round(eachSpacing / 2);
+
+      if (seriesIndex > 0) {
+        var value = 0;
+        for (let i = 0; i <= seriesIndex; i++) {
+          value += stackSeries[i].data[index];
+        }
+        var value0 = value - item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = validHeight * (value0 - minRange) / (maxRange - minRange);
+      } else {
+        var value = item;
+        var height = validHeight * (value - minRange) / (maxRange - minRange);
+        var height0 = 0;
+      }
+      var heightc = height0;
+      height *= process;
+      heightc *= process;
+      point.y = opts.height - Math.round(height) - opts.area[2];
+      point.y0 = opts.height - Math.round(heightc) - opts.area[2];
+      points.push(point);
+    }
+  });
+
+  return points;
+}
+
+function getYAxisTextList(series, opts, config, stack) {
+  var index = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : -1;
+  var data;
+  if (stack == 'stack') {
+    data = dataCombineStack(series, opts.categories.length);
+  } else {
+    data = dataCombine(series);
+  }
+  var sorted = [];
+  // remove null from data
+  data = data.filter(function(item) {
+    //return item !== null;
+    if (typeof item === 'object' && item !== null) {
+      if (item.constructor == Array) {
+        return item !== null;
+      } else {
+        return item.value !== null;
+      }
+    } else {
+      return item !== null;
+    }
+  });
+  data.map(function(item) {
+    if (typeof item === 'object') {
+      if (item.constructor == Array) {
+				if(opts.type=='candle'){
+					item.map(function(subitem) {
+					  sorted.push(subitem);
+					})
+				}else{
+					sorted.push(item[1]);
+				}
+      } else {
+        sorted.push(item.value);
+      }
+    } else {
+      sorted.push(item);
+    }
+  })
+	
+  var minData = 0;
+  var maxData = 0;
+  if (sorted.length > 0) {
+    minData = Math.min.apply(this, sorted);
+    maxData = Math.max.apply(this, sorted);
+  }
+  //为了兼容v1.9.0之前的项目
+  if(index>-1){
+    if (typeof opts.yAxis.data[index].min === 'number') {
+      minData = Math.min(opts.yAxis.data[index].min, minData);
+    }
+    if (typeof opts.yAxis.data[index].max === 'number') {
+      maxData = Math.max(opts.yAxis.data[index].max, maxData);
+    }
+  }else{
+    if (typeof opts.yAxis.min === 'number') {
+      minData = Math.min(opts.yAxis.min, minData);
+    }
+    if (typeof opts.yAxis.max === 'number') {
+      maxData = Math.max(opts.yAxis.max, maxData);
+    }
+  }
+  
+
+  if (minData === maxData) {
+    var rangeSpan = maxData || 10;
+    maxData += rangeSpan;
+  }
+
+  var dataRange = getDataRange(minData, maxData);
+  var minRange = dataRange.minRange;
+  var maxRange = dataRange.maxRange;
+
+  var range = [];
+  var eachRange = (maxRange - minRange) / opts.yAxis.splitNumber;
+
+  for (var i = 0; i <= opts.yAxis.splitNumber; i++) {
+    range.push(minRange + eachRange * i);
+  }
+  return range.reverse();
+}
+
+function calYAxisData(series, opts, config) {
+  //堆叠图重算Y轴
+  var columnstyle = assign({}, {
+    type: ""
+  }, opts.extra.column);
+  //如果是多Y轴，重新计算
+  var YLength = opts.yAxis.data.length;
+  var newSeries=new Array(YLength);
+  if(YLength>0){
+    for(let i=0;i<YLength;i++){
+      newSeries[i]=[];
+      for(let j=0;j<series.length;j++){
+        if(series[j].index == i){
+          newSeries[i].push(series[j]);
+        }
+      }
+    }
+    var rangesArr =new Array(YLength);
+    var rangesFormatArr = new Array(YLength);
+    var yAxisWidthArr =new Array(YLength);
+		
+    for(let i=0;i<YLength;i++){
+      let yData = opts.yAxis.data[i];
+			//如果总开关不显示，强制每个Y轴为不显示
+			if(opts.yAxis.disabled == true){
+				yData.disabled = true;
+			}
+			rangesArr[i]=getYAxisTextList(newSeries[i], opts, config, columnstyle.type,i);
+			let yAxisFontSizes = yData.fontSize || config.fontSize;
+			yAxisWidthArr[i] = {position:yData.position?yData.position:'left',width:0};
+			rangesFormatArr[i]= rangesArr[i].map(function(items) {
+				items = util.toFixed(items, 6);
+				items = yData.format ? yData.format(Number(items)) : items;
+				yAxisWidthArr[i].width = Math.max(yAxisWidthArr[i].width, measureText(items, yAxisFontSizes) + 5);
+				return items;
+			});
+			let calibration= yData.calibration? 4*opts.pixelRatio : 0 ;
+			yAxisWidthArr[i].width += calibration +3*opts.pixelRatio;
+      if (yData.disabled === true) {
+        yAxisWidthArr[i].width=0;
+      }
+    }
+    
+  }else{
+    var rangesArr =new Array(1);
+    var rangesFormatArr = new Array(1);
+    var yAxisWidthArr =new Array(1);
+		rangesArr[0] = getYAxisTextList(series, opts, config, columnstyle.type);
+		yAxisWidthArr[0] = {position:'left',width:0};
+		var yAxisFontSize = opts.yAxis.fontSize || config.fontSize;
+		rangesFormatArr[0] = rangesArr[0].map(function(item) {
+			item = util.toFixed(item, 6);
+			item = opts.yAxis.format ? opts.yAxis.format(Number(item)) : item;
+			yAxisWidthArr[0].width = Math.max(yAxisWidthArr[0].width, measureText(item, yAxisFontSize) + 5);
+			return item;
+		});
+		yAxisWidthArr[0].width += 3*opts.pixelRatio;
+		if (opts.yAxis.disabled === true) {
+		  yAxisWidthArr[0] = {position:'left',width:0};
+		  opts.yAxis.data[0]={disabled:true};
+		}else{
+			opts.yAxis.data[0]={disabled:false,position:'left',max:opts.yAxis.max,min:opts.yAxis.min,format:opts.yAxis.format};
+		}
+    
+  }
+
+  return {
+    rangesFormat: rangesFormatArr,
+    ranges: rangesArr,
+    yAxisWidth: yAxisWidthArr
+  };
+  
+}
+
+function calTooltipYAxisData(point, series, opts, config, eachSpacing) {
+  let ranges = [].concat(opts.chartData.yAxisData.ranges);
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let minAxis = opts.area[0];
+  let items=[];
+  for(let i=0;i<ranges.length;i++){
+    let maxVal = ranges[i].shift();
+    let minVal = ranges[i].pop();
+    let item = maxVal - (maxVal - minVal) * (point - minAxis) / spacingValid;
+    item = opts.yAxis.data[i].format ? opts.yAxis.data[i].format(Number(item)) : item.toFixed(0);
+    items.push(String(item))
+  }
+  return items;
+}
+
+function calMarkLineData(points, opts) {
+  let minRange, maxRange;
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  for (let i = 0; i < points.length; i++) {
+    points[i].yAxisIndex = points[i].yAxisIndex ? points[i].yAxisIndex:0;
+    let range = [].concat(opts.chartData.yAxisData.ranges[points[i].yAxisIndex]);
+    minRange = range.pop();
+    maxRange = range.shift();
+    let height = spacingValid * (points[i].value - minRange) / (maxRange - minRange);
+    points[i].y = opts.height - Math.round(height) - opts.area[2];
+  }
+  return points;
+}
+
+function contextRotate(context, opts) {
+  if (opts.rotateLock !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+  } else if (opts._rotate_ !== true) {
+    context.translate(opts.height, 0);
+    context.rotate(90 * Math.PI / 180);
+    opts._rotate_ = true;
+  }
+}
+
+function drawPointShape(points, color, shape, context, opts) {
+  context.beginPath();
+	if(opts.dataPointShapeType == 'hollow'){
+		context.setStrokeStyle(color);
+		context.setFillStyle(opts.background);
+		context.setLineWidth(2 * opts.pixelRatio);
+	}else{
+		context.setStrokeStyle("#ffffff");
+		context.setFillStyle(color);
+		context.setLineWidth(1 * opts.pixelRatio);
+	}
+  if (shape === 'diamond') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y);
+        context.lineTo(item.x, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  } else if (shape === 'circle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x + 2.5 * opts.pixelRatio, item.y);
+        context.arc(item.x, item.y, 3 * opts.pixelRatio, 0, 2 * Math.PI, false);
+      }
+    });
+  } else if (shape === 'rect') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x - 3.5, item.y - 3.5);
+        context.rect(item.x - 3.5, item.y - 3.5, 7, 7);
+      }
+    });
+  } else if (shape === 'triangle') {
+    points.forEach(function(item, index) {
+      if (item !== null) {
+        context.moveTo(item.x, item.y - 4.5);
+        context.lineTo(item.x - 4.5, item.y + 4.5);
+        context.lineTo(item.x + 4.5, item.y + 4.5);
+        context.lineTo(item.x, item.y - 4.5);
+      }
+    });
+  }
+  context.closePath();
+  context.fill();
+  context.stroke();
+}
+
+function drawRingTitle(opts, config, context, center) {
+  var titlefontSize = opts.title.fontSize || config.titleFontSize;
+  var subtitlefontSize = opts.subtitle.fontSize || config.subtitleFontSize;
+  var title = opts.title.name || '';
+  var subtitle = opts.subtitle.name || '';
+  var titleFontColor = opts.title.color || config.titleColor;
+  var subtitleFontColor = opts.subtitle.color || config.subtitleColor;
+  var titleHeight = title ? titlefontSize : 0;
+  var subtitleHeight = subtitle ? subtitlefontSize : 0;
+  var margin = 5;
+
+  if (subtitle) {
+    var textWidth = measureText(subtitle, subtitlefontSize);
+    var startX = center.x - textWidth / 2 + (opts.subtitle.offsetX || 0);
+    var startY = center.y + subtitlefontSize / 2 + (opts.subtitle.offsetY || 0);
+    if (title) {
+      startY += (titleHeight + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(subtitlefontSize);
+    context.setFillStyle(subtitleFontColor);
+    context.fillText(subtitle, startX, startY);
+    context.closePath();
+    context.stroke();
+  }
+  if (title) {
+    var _textWidth = measureText(title, titlefontSize);
+    var _startX = center.x - _textWidth / 2 + (opts.title.offsetX || 0);
+    var _startY = center.y + titlefontSize / 2 + (opts.title.offsetY || 0);
+    if (subtitle) {
+      _startY -= (subtitleHeight + margin) / 2;
+    }
+    context.beginPath();
+    context.setFontSize(titlefontSize);
+    context.setFillStyle(titleFontColor);
+    context.fillText(title, _startX, _startY);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawPointText(points, series, config, context) {
+  // 绘制数据文案
+  var data = series.data;
+  points.forEach(function(item, index) {
+    if (item !== null) {
+      //var formatVal = series.format ? series.format(data[index]) : data[index];
+      context.beginPath();
+      context.setFontSize(series.textSize || config.fontSize);
+      context.setFillStyle(series.textColor || '#666666');
+      var value = data[index]
+      if (typeof data[index] === 'object' && data[index] !== null) {
+				if (data[index].constructor == Array) {
+					value = data[index][1];
+				}else{
+					value = data[index].value
+				}
+      }
+      var formatVal = series.format ? series.format(value) : value;
+      context.fillText(String(formatVal), item.x - measureText(formatVal, series.textSize || config.fontSize) / 2, item.y -4);
+      context.closePath();
+      context.stroke();
+    }
+  });
+
+}
+
+function drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context) {
+  radius -= gaugeOption.width / 2 + config.gaugeLabelTextMargin;
+
+  let totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+  let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+  let totalNumber = gaugeOption.endNumber - gaugeOption.startNumber;
+  let splitNumber = totalNumber / gaugeOption.splitLine.splitNumber;
+  let nowAngle = gaugeOption.startAngle;
+  let nowNumber = gaugeOption.startNumber;
+  for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+    var pos = {
+      x: radius * Math.cos(nowAngle * Math.PI),
+      y: radius * Math.sin(nowAngle * Math.PI)
+    };
+    var labelText = gaugeOption.labelFormat ? gaugeOption.labelFormat(nowNumber) : nowNumber;
+    pos.x += centerPosition.x - measureText(labelText) / 2;
+    pos.y += centerPosition.y;
+    var startX = pos.x;
+    var startY = pos.y;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(gaugeOption.labelColor || '#666666');
+    context.fillText(labelText, startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+
+    nowAngle += splitAngle;
+    if (nowAngle >= 2) {
+      nowAngle = nowAngle % 2;
+    }
+    nowNumber += splitNumber;
+  }
+
+}
+
+function drawRadarLabel(angleList, radius, centerPosition, opts, config, context) {
+  var radarOption = opts.extra.radar || {};
+  radius += config.radarLabelTextMargin;
+
+  angleList.forEach(function(angle, index) {
+    var pos = {
+      x: radius * Math.cos(angle),
+      y: radius * Math.sin(angle)
+    };
+    var posRelativeCanvas = convertCoordinateOrigin(pos.x, pos.y, centerPosition);
+    var startX = posRelativeCanvas.x;
+    var startY = posRelativeCanvas.y;
+    if (util.approximatelyEqual(pos.x, 0)) {
+      startX -= measureText(opts.categories[index] || '') / 2;
+    } else if (pos.x < 0) {
+      startX -= measureText(opts.categories[index] || '');
+    }
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(radarOption.labelColor || '#666666');
+    context.fillText(opts.categories[index] || '', startX, startY + config.fontSize / 2);
+    context.closePath();
+    context.stroke();
+  });
+
+}
+
+function drawPieText(series, opts, config, context, radius, center) {
+  var lineRadius = config.pieChartLinePadding;
+  var textObjectCollection = [];
+  var lastTextObject = null;
+
+  var seriesConvert = series.map(function(item) {
+    var text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_.toFixed(4) * 100) +'%';
+    if(item._rose_proportion_) item._proportion_=item._rose_proportion_;
+    var arc = 2 * Math.PI - (item._start_ + 2 * Math.PI * item._proportion_ / 2);
+    var color = item.color;
+    var radius = item._radius_;
+    return {
+      arc: arc,
+      text: text,
+      color: color,
+      radius: radius,
+      textColor: item.textColor,
+      textSize: item.textSize,
+    };
+  });
+  for (let i = 0; i < seriesConvert.length; i++) {
+    let item = seriesConvert[i];
+    // line end
+    let orginX1 = Math.cos(item.arc) * (item.radius + lineRadius);
+    let orginY1 = Math.sin(item.arc) * (item.radius + lineRadius);
+
+    // line start
+    let orginX2 = Math.cos(item.arc) * item.radius;
+    let orginY2 = Math.sin(item.arc) * item.radius;
+
+    // text start
+    let orginX3 = orginX1 >= 0 ? orginX1 + config.pieChartTextPadding : orginX1 - config.pieChartTextPadding;
+    let orginY3 = orginY1;
+    let textWidth = measureText(item.text,item.textSize||config.fontSize);
+    let startY = orginY3;
+
+    if (lastTextObject && util.isSameXCoordinateArea(lastTextObject.start, {
+        x: orginX3
+      })) {
+      if (orginX3 > 0) {
+        startY = Math.min(orginY3, lastTextObject.start.y);
+      } else if (orginX1 < 0) {
+        startY = Math.max(orginY3, lastTextObject.start.y);
+      } else {
+        if (orginY3 > 0) {
+          startY = Math.max(orginY3, lastTextObject.start.y);
+        } else {
+          startY = Math.min(orginY3, lastTextObject.start.y);
+        }
+      }
+    }
+    if (orginX3 < 0) {
+      orginX3 -= textWidth;
+    }
+
+    let textObject = {
+      lineStart: {
+        x: orginX2,
+        y: orginY2
+      },
+      lineEnd: {
+        x: orginX1,
+        y: orginY1
+      },
+      start: {
+        x: orginX3,
+        y: startY
+      },
+      width: textWidth,
+      height: config.fontSize,
+      text: item.text,
+      color: item.color,
+      textColor: item.textColor,
+      textSize: item.textSize
+    };
+    lastTextObject = avoidCollision(textObject, lastTextObject);
+    textObjectCollection.push(lastTextObject);
+  }
+
+  for (let i = 0; i < textObjectCollection.length; i++) {
+    let item = textObjectCollection[i];
+    let lineStartPoistion = convertCoordinateOrigin(item.lineStart.x, item.lineStart.y, center);
+    let lineEndPoistion = convertCoordinateOrigin(item.lineEnd.x, item.lineEnd.y, center);
+    let textPosition = convertCoordinateOrigin(item.start.x, item.start.y, center);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.setFontSize(config.fontSize);
+    context.beginPath();
+    context.setStrokeStyle(item.color);
+    context.setFillStyle(item.color);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    let curveStartX = item.start.x < 0 ? textPosition.x + item.width : textPosition.x;
+    let textStartX = item.start.x < 0 ? textPosition.x - 5 : textPosition.x + 5;
+    context.quadraticCurveTo(lineEndPoistion.x, lineEndPoistion.y, curveStartX, textPosition.y);
+    context.moveTo(lineStartPoistion.x, lineStartPoistion.y);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.moveTo(textPosition.x + item.width, textPosition.y);
+    context.arc(curveStartX, textPosition.y, 2, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+    context.beginPath();
+    context.setFontSize(item.textSize || config.fontSize);
+    context.setFillStyle(item.textColor || '#666666');
+    context.fillText(item.text, textStartX, textPosition.y + 3);
+    context.closePath();
+    context.stroke();
+    context.closePath();
+  }
+}
+
+function drawToolTipSplitLine(offsetX, opts, config, context) {
+  var toolTipOption = opts.extra.tooltip || {};
+  toolTipOption.gridType = toolTipOption.gridType == undefined ? 'solid' : toolTipOption.gridType;
+  toolTipOption.dashLength = toolTipOption.dashLength == undefined ? 4 : toolTipOption.dashLength;
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.beginPath();
+  context.moveTo(offsetX, startY);
+  context.lineTo(offsetX, endY);
+  context.stroke();
+  context.setLineDash([]);
+
+  if (toolTipOption.xAxisLabel) {
+    let labelText = opts.categories[opts.tooltip.index];
+    context.setFontSize(config.fontSize);
+    let textWidth = measureText(labelText, config.fontSize);
+
+    let textX = offsetX - 0.5 * textWidth;
+    let textY = endY;
+    context.beginPath();
+    context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+    context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.rect(textX - config.toolTipPadding, textY, textWidth + 2 * config.toolTipPadding, config.fontSize + 2 * config.toolTipPadding);
+    context.closePath();
+    context.stroke();
+    context.fill();
+
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.labelFontColor || config.fontColor);
+    context.fillText(String(labelText), textX, textY + config.toolTipPadding + config.fontSize);
+    context.closePath();
+    context.stroke();
+  }
+}
+
+function drawMarkLine(opts, config, context) {
+  let markLineOption = assign({}, {
+    type: 'solid',
+    dashLength: 4,
+    data: []
+  }, opts.extra.markLine);
+  let startX = opts.area[3];
+  let endX = opts.width - opts.area[1];
+  let points = calMarkLineData(markLineOption.data, opts);
+
+  for (let i = 0; i < points.length; i++) {
+    let item = assign({}, {
+      lineColor: '#DE4A42',
+      showLabel: false,
+      labelFontColor: '#666666',
+      labelBgColor: '#DFE8FF',
+      labelBgOpacity: 0.8,
+      yAxisIndex: 0
+    }, points[i]);
+
+    if (markLineOption.type == 'dash') {
+      context.setLineDash([markLineOption.dashLength, markLineOption.dashLength]);
+    }
+    context.setStrokeStyle(item.lineColor);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.beginPath();
+    context.moveTo(startX, item.y);
+    context.lineTo(endX, item.y);
+    context.stroke();
+    context.setLineDash([]);
+    if (item.showLabel) {
+      let labelText = opts.yAxis.format ? opts.yAxis.format(Number(item.value)) : item.value;
+      context.setFontSize(config.fontSize);
+      let textWidth = measureText(labelText, config.fontSize);
+      let bgStartX = opts.padding[3] + config.yAxisTitleWidth - config.toolTipPadding;
+      let bgEndX = Math.max(opts.area[3], textWidth + config.toolTipPadding * 2);
+      let bgWidth = bgEndX - bgStartX;
+
+      let textX = bgStartX + (bgWidth - textWidth) / 2;
+      let textY = item.y;
+      context.setFillStyle(hexToRgb(item.labelBgColor, item.labelBgOpacity));
+      context.setStrokeStyle(item.labelBgColor);
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.beginPath();
+      context.rect(bgStartX, textY - 0.5 * config.fontSize - config.toolTipPadding, bgWidth, config.fontSize + 2 * config.toolTipPadding);
+      context.closePath();
+      context.stroke();
+      context.fill();
+
+      context.beginPath();
+      context.setFontSize(config.fontSize);
+      context.setFillStyle(item.labelFontColor);
+      context.fillText(String(labelText), textX, textY + 0.5 * config.fontSize);
+      context.stroke();
+    }
+  }
+}
+
+function drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+    gridType: 'solid',
+    dashLength: 4
+  }, opts.extra.tooltip);
+
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+
+  if (toolTipOption.gridType == 'dash') {
+    context.setLineDash([toolTipOption.dashLength, toolTipOption.dashLength]);
+  }
+  context.setStrokeStyle(toolTipOption.gridColor || '#cccccc');
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.beginPath();
+  context.moveTo(startX, opts.tooltip.offset.y);
+  context.lineTo(endX, opts.tooltip.offset.y);
+  context.stroke();
+  context.setLineDash([]);
+
+  if (toolTipOption.yAxisLabel) {
+    let labelText = calTooltipYAxisData(opts.tooltip.offset.y, opts.series, opts, config, eachSpacing);
+    let widthArr = opts.chartData.yAxisData.yAxisWidth;
+    let tStartLeft=opts.area[3];
+    let tStartRight=opts.width-opts.area[1];
+    for(let i=0;i<labelText.length;i++){
+      context.setFontSize(config.fontSize);
+      let textWidth = measureText(labelText[i], config.fontSize);
+      let bgStartX,bgEndX,bgWidth;
+      if(widthArr[i].position == 'left'){
+        bgStartX = tStartLeft - widthArr[i].width;
+        bgEndX = Math.max(bgStartX, bgStartX + textWidth + config.toolTipPadding * 2);
+      }else{
+        bgStartX = tStartRight;
+        bgEndX = Math.max(bgStartX + widthArr[i].width, bgStartX + textWidth + config.toolTipPadding * 2);
+      }
+      bgWidth = bgEndX - bgStartX;
+      
+      let textX = bgStartX + (bgWidth - textWidth) / 2;
+      let textY = opts.tooltip.offset.y;
+      context.beginPath();
+      context.setFillStyle(hexToRgb(toolTipOption.labelBgColor || config.toolTipBackground, toolTipOption.labelBgOpacity || config.toolTipOpacity));
+      context.setStrokeStyle(toolTipOption.labelBgColor || config.toolTipBackground);
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.rect(bgStartX, textY - 0.5 * config.fontSize - config.toolTipPadding, bgWidth, config.fontSize + 2 * config.toolTipPadding);
+      context.closePath();
+      context.stroke();
+      context.fill();
+      
+      context.beginPath();
+      context.setFontSize(config.fontSize);
+      context.setFillStyle(toolTipOption.labelFontColor || config.fontColor);
+      context.fillText(labelText[i], textX, textY + 0.5 * config.fontSize);
+      context.closePath();
+      context.stroke();
+      if(widthArr[i].position == 'left'){
+        tStartLeft -=(widthArr[i].width + opts.yAxis.padding);
+      }else{
+        tStartRight +=widthArr[i].width+ opts.yAxis.padding;
+      }
+    }
+  }
+}
+
+function drawToolTipSplitArea(offsetX, opts, config, context, eachSpacing) {
+  var toolTipOption = assign({}, {
+    activeBgColor: '#000000',
+    activeBgOpacity: 0.08
+  }, opts.extra.tooltip);
+  var startY = opts.area[0];
+  var endY = opts.height - opts.area[2];
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.activeBgColor, toolTipOption.activeBgOpacity));
+  context.rect(offsetX - eachSpacing / 2, startY, eachSpacing, endY - startY);
+  context.closePath();
+  context.fill();
+}
+
+function drawToolTip(textList, offset, opts, config, context, eachSpacing, xAxisPoints) {
+  var toolTipOption = assign({}, {
+		showBox:true,
+    bgColor: '#000000',
+    bgOpacity: 0.7,
+    fontColor: '#FFFFFF'
+  }, opts.extra.tooltip);
+  var legendWidth = 4 * opts.pixelRatio;
+  var legendMarginRight = 5 * opts.pixelRatio;
+  var arrowWidth = 8 * opts.pixelRatio;
+  var isOverRightBorder = false;
+  if (opts.type == 'line' || opts.type == 'area' || opts.type == 'candle' || opts.type == 'mix') {
+    drawToolTipSplitLine(opts.tooltip.offset.x, opts, config, context);
+  }
+
+  offset = assign({
+    x: 0,
+    y: 0
+  }, offset);
+  offset.y -= 8 * opts.pixelRatio;
+  var textWidth = textList.map(function(item) {
+    return measureText(item.text, config.fontSize);
+  });
+  var toolTipWidth = legendWidth + legendMarginRight + 4 * config.toolTipPadding + Math.max.apply(null, textWidth);
+  var toolTipHeight = 2 * config.toolTipPadding + textList.length * config.toolTipLineHeight;
+
+	if(toolTipOption.showBox == false){ return }
+  // if beyond the right border
+  if (offset.x - Math.abs(opts._scrollDistance_) + arrowWidth + toolTipWidth > opts.width) {
+    isOverRightBorder = true;
+  }
+  if (toolTipHeight + offset.y > opts.height) {
+    offset.y = opts.height - toolTipHeight;
+  }
+  // draw background rect
+  context.beginPath();
+  context.setFillStyle(hexToRgb(toolTipOption.bgColor || config.toolTipBackground, toolTipOption.bgOpacity || config.toolTipOpacity));
+  if (isOverRightBorder) {
+    context.moveTo(offset.x, offset.y + 10 * opts.pixelRatio);
+    context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pixelRatio - 5 * opts.pixelRatio);
+    context.lineTo(offset.x - arrowWidth, offset.y);
+    context.lineTo(offset.x - arrowWidth - Math.round(toolTipWidth), offset.y);
+    context.lineTo(offset.x - arrowWidth - Math.round(toolTipWidth), offset.y + toolTipHeight);
+    context.lineTo(offset.x - arrowWidth, offset.y + toolTipHeight);
+    context.lineTo(offset.x - arrowWidth, offset.y + 10 * opts.pixelRatio + 5 * opts.pixelRatio);
+    context.lineTo(offset.x, offset.y + 10 * opts.pixelRatio);
+  } else {
+    context.moveTo(offset.x, offset.y + 10 * opts.pixelRatio);
+    context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pixelRatio - 5 * opts.pixelRatio);
+    context.lineTo(offset.x + arrowWidth, offset.y);
+    context.lineTo(offset.x + arrowWidth + Math.round(toolTipWidth), offset.y);
+    context.lineTo(offset.x + arrowWidth + Math.round(toolTipWidth), offset.y + toolTipHeight);
+    context.lineTo(offset.x + arrowWidth, offset.y + toolTipHeight);
+    context.lineTo(offset.x + arrowWidth, offset.y + 10 * opts.pixelRatio + 5 * opts.pixelRatio);
+    context.lineTo(offset.x, offset.y + 10 * opts.pixelRatio);
+  }
+
+  context.closePath();
+  context.fill();
+
+  // draw legend
+  textList.forEach(function(item, index) {
+    if (item.color !== null) {
+      context.beginPath();
+      context.setFillStyle(item.color);
+      var startX = offset.x + arrowWidth + 2 * config.toolTipPadding;
+      var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index +
+        config.toolTipPadding + 1;
+      if (isOverRightBorder) {
+        startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding;
+      }
+      context.fillRect(startX, startY, legendWidth, config.fontSize);
+      context.closePath();
+    }
+  });
+
+  // draw text list
+
+  textList.forEach(function(item, index) {
+    var startX = offset.x + arrowWidth + 2 * config.toolTipPadding + legendWidth + legendMarginRight;
+    if (isOverRightBorder) {
+      startX = offset.x - toolTipWidth - arrowWidth + 2 * config.toolTipPadding + +legendWidth + legendMarginRight;
+    }
+    var startY = offset.y + (config.toolTipLineHeight - config.fontSize) / 2 + config.toolTipLineHeight * index +
+      config.toolTipPadding;
+    context.beginPath();
+    context.setFontSize(config.fontSize);
+    context.setFillStyle(toolTipOption.fontColor);
+    context.fillText(item.text, startX, startY + config.fontSize);
+    context.closePath();
+    context.stroke();
+  });
+}
+
+function drawYAxisTitle(title, opts, config, context) {
+  var startX = config.xAxisHeight + (opts.height - config.xAxisHeight - measureText(title)) / 2;
+  context.save();
+  context.beginPath();
+  context.setFontSize(config.fontSize);
+  context.setFillStyle(opts.yAxis.titleFontColor || '#333333');
+  context.translate(0, opts.height);
+  context.rotate(-90 * Math.PI / 180);
+  context.fillText(title, startX, opts.padding[3] + 0.5 * config.fontSize);
+  context.closePath();
+  context.stroke();
+  context.restore();
+}
+
+function drawColumnDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  let columnOption = assign({}, {
+    type: 'group',
+    width: eachSpacing / 2,
+    meter: {
+      border: 4,
+      fillColor: '#FFFFFF'
+    }
+  }, opts.extra.column);
+  
+  let calPoints = [];
+  context.save();
+	
+	let leftNum=-2;
+	let rightNum=xAxisPoints.length+2;
+	
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+		leftNum=Math.floor(-opts._scrollDistance_/eachSpacing)-2;
+		rightNum=leftNum+opts.xAxis.itemCount+4;
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTipSplitArea(opts.tooltip.offset.x, opts, config, context, eachSpacing);
+  }
+	
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges,minRange,maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    
+    var data = eachSeries.data;
+    switch (columnOption.type) {
+      case 'group':
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        var tooltipPoints = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(tooltipPoints);
+        points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+				for(let i=0;i<points.length;i++){
+					let item=points[i];
+          if (item !== null && i>leftNum && i<rightNum) {
+            context.beginPath();
+            context.setStrokeStyle(item.color || eachSeries.color);
+            context.setLineWidth(1)
+            context.setFillStyle(item.color || eachSeries.color);
+            var startX = item.x - item.width / 2;
+            var height = opts.height - item.y - opts.area[2];
+            context.moveTo(startX-1, item.y);
+            context.lineTo(startX+item.width-2,item.y);
+            context.lineTo(startX+item.width-2,opts.height - opts.area[2]);
+            context.lineTo(startX,opts.height - opts.area[2]);
+            context.lineTo(startX,item.y);
+            context.closePath();
+            context.stroke();
+            context.fill();
+          }
+        };
+        break;
+      case 'stack':
+        // 绘制堆叠数据图
+        var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+        calPoints.push(points);
+        points = fixColumeStackData(points, eachSpacing, series.length, seriesIndex, config, opts, series);
+
+        for(let i=0;i<points.length;i++){
+        	let item=points[i];
+          if (item !== null && i>leftNum && i<rightNum) {
+            context.beginPath();
+            context.setFillStyle(item.color || eachSeries.color);
+            var startX = item.x - item.width / 2 + 1;
+            var height = opts.height - item.y - opts.area[2];
+            var height0 = opts.height - item.y0 - opts.area[2];
+            if (seriesIndex > 0) {
+              height -= height0;
+            }
+            context.moveTo(startX, item.y);
+            context.fillRect(startX, item.y, item.width - 2, height);
+            context.closePath();
+            context.fill();
+          }
+        };
+        break;
+      case 'meter':
+        // 绘制温度计数据图
+        var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+        calPoints.push(points);
+        points = fixColumeMeterData(points, eachSpacing, series.length, seriesIndex, config, opts, columnOption.meter.border);
+        if (seriesIndex == 0) {
+          for(let i=0;i<points.length;i++){
+          	let item=points[i];
+            if (item !== null && i>leftNum && i<rightNum) {
+              //画背景颜色
+              context.beginPath();
+              context.setFillStyle(columnOption.meter.fillColor);
+              var startX = item.x - item.width / 2;
+              var height = opts.height - item.y - opts.area[2];
+              context.moveTo(startX, item.y);
+              context.fillRect(startX, item.y, item.width, height);
+              context.closePath();
+              context.fill();
+              //画边框线
+              if (columnOption.meter.border > 0) {
+                context.beginPath();
+                context.setStrokeStyle(eachSeries.color);
+                context.setLineWidth(columnOption.meter.border * opts.pixelRatio);
+                context.moveTo(startX + columnOption.meter.border * 0.5, item.y + height);
+                context.lineTo(startX + columnOption.meter.border * 0.5, item.y + columnOption.meter.border * 0.5);
+                context.lineTo(startX + item.width - columnOption.meter.border * 0.5, item.y + columnOption.meter.border * 0.5);
+                context.lineTo(startX + item.width - columnOption.meter.border * 0.5, item.y + height);
+                context.stroke();
+              }
+            }
+          };
+        } else {
+          for(let i=0;i<points.length;i++){
+          	let item=points[i];
+            if (item !== null && i>leftNum && i<rightNum) {
+              context.beginPath();
+              context.setFillStyle(item.color || eachSeries.color);
+              var startX = item.x - item.width / 2;
+              var height = opts.height - item.y - opts.area[2];
+              context.moveTo(startX, item.y);
+              context.fillRect(startX, item.y, item.width, height);
+              context.closePath();
+              context.fill();
+            }
+          };
+        }
+        break;
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges,minRange,maxRange;
+        ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+        minRange = ranges.pop();
+        maxRange = ranges.shift();
+      var data = eachSeries.data;
+      switch (columnOption.type) {
+        case 'group':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          points = fixColumeData(points, eachSpacing, series.length, seriesIndex, config, opts);
+          drawPointText(points, eachSeries, config, context);
+          break;
+        case 'stack':
+          var points = getStackDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, seriesIndex, series, process);
+          drawPointText(points, eachSeries, config, context);
+          break;
+        case 'meter':
+          var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+          drawPointText(points, eachSeries, config, context);
+          break;
+      }
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawCandleDataPoints(series, seriesMA, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var candleOption = assign({}, {
+    color: {},
+    average: {}
+  }, opts.extra.candle);
+  candleOption.color = assign({}, {
+    upLine: '#f04864',
+    upFill: '#f04864',
+    downLine: '#2fc25b',
+    downFill: '#2fc25b'
+  }, candleOption.color);
+  candleOption.average = assign({}, {
+    show: false,
+    name: [],
+    day: [],
+    color: config.colors
+  }, candleOption.average);
+  opts.extra.candle = candleOption;
+
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let calPoints = [];
+
+  context.save();
+	
+	let leftNum=-2;
+	let rightNum=xAxisPoints.length+2;
+	let leftSpace=0;
+	let rightSpace=opts.width+eachSpacing;
+	
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+		leftNum=Math.floor(-opts._scrollDistance_/eachSpacing)-2;
+		rightNum=leftNum+opts.xAxis.itemCount+4;
+		leftSpace=-opts._scrollDistance_-eachSpacing+opts.area[3];
+		rightSpace=leftSpace+(opts.xAxis.itemCount+4)*eachSpacing;
+  }
+
+  //画均线
+  if (candleOption.average.show) {
+    seriesMA.forEach(function(eachSeries, seriesIndex) {
+      let ranges,minRange,maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      var splitPointList = splitPoints(points);
+			
+			for(let i=0;i<splitPointList.length;i++){
+				let points=splitPointList[i];
+				context.beginPath();
+				context.setStrokeStyle(eachSeries.color);
+				context.setLineWidth(1);
+				if (points.length === 1) {
+					context.moveTo(points[0].x, points[0].y);
+					context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+				} else {
+					context.moveTo(points[0].x, points[0].y);
+					let startPoint=0;
+					for(let j=0;j<points.length;j++){
+						let item=points[j];
+						if(startPoint==0 && item.x > leftSpace){
+							context.moveTo(item.x, item.y);
+							startPoint=1;
+						}
+						if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+							var ctrlPoint = createCurveControlPoints(points, j - 1);
+							context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x, item.y);
+						}
+					}
+					context.moveTo(points[0].x, points[0].y);
+				}
+				context.closePath();
+				context.stroke();
+      }
+    });
+  }
+  //画K线
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges,minRange,maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getCandleDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points);
+
+		for(let i=0;i<splitPointList[0].length;i++){
+			if(i>leftNum && i<rightNum){
+				let item=splitPointList[0][i];
+				context.beginPath();
+				//如果上涨
+				if (data[i][1] - data[i][0] > 0) {
+					context.setStrokeStyle(candleOption.color.upLine);
+					context.setFillStyle(candleOption.color.upFill);
+					context.setLineWidth(1 * opts.pixelRatio);
+					context.moveTo(item[3].x, item[3].y); //顶点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+					context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[2].x, item[2].y); //底点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+					context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.moveTo(item[3].x, item[3].y); //顶点
+				} else {
+					context.setStrokeStyle(candleOption.color.downLine);
+					context.setFillStyle(candleOption.color.downFill);
+					context.setLineWidth(1 * opts.pixelRatio);
+					context.moveTo(item[3].x, item[3].y); //顶点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.lineTo(item[0].x - eachSpacing / 4, item[0].y); //开盘左侧点
+					context.lineTo(item[1].x - eachSpacing / 4, item[1].y); //收盘左侧点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[2].x, item[2].y); //底点
+					context.lineTo(item[1].x, item[1].y); //收盘中间点
+					context.lineTo(item[1].x + eachSpacing / 4, item[1].y); //收盘右侧点
+					context.lineTo(item[0].x + eachSpacing / 4, item[0].y); //开盘右侧点
+					context.lineTo(item[0].x, item[0].y); //开盘中间点
+					context.moveTo(item[3].x, item[3].y); //顶点
+				}
+				context.closePath();
+				context.fill();
+				context.stroke();
+			}
+    }
+  });
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawAreaDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var areaOption = assign({},{
+    type: 'straight',
+    opacity: 0.2,
+    addLine: false,
+    width: 2,
+		gradient:false
+  },opts.extra.area);
+
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+
+  context.save();
+	let leftSpace=0;
+	let rightSpace=opts.width+eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+		leftSpace=-opts._scrollDistance_-eachSpacing+opts.area[3];
+		rightSpace=leftSpace+(opts.xAxis.itemCount+4)*eachSpacing;
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges,minRange,maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    let data = eachSeries.data;
+    let points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+
+    let splitPointList = splitPoints(points);
+    for (let i = 0; i < splitPointList.length; i++) {
+      let points = splitPointList[i];
+      // 绘制区域数
+      context.beginPath();
+      context.setStrokeStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+			if(areaOption.gradient){
+				let gradient = context.createLinearGradient(0, opts.area[0], 0, opts.height-opts.area[2]);
+				gradient.addColorStop('0', hexToRgb(eachSeries.color, areaOption.opacity));
+				gradient.addColorStop('1.0',hexToRgb("#FFFFFF", 0.1));
+				context.setFillStyle(gradient);
+			}else{
+				context.setFillStyle(hexToRgb(eachSeries.color, areaOption.opacity));
+			}
+      context.setLineWidth(areaOption.width * opts.pixelRatio);
+      if (points.length > 1) {
+        let firstPoint = points[0];
+        let lastPoint = points[points.length - 1];
+        context.moveTo(firstPoint.x, firstPoint.y);
+				let startPoint=0;
+        if (areaOption.type === 'curve') {
+					for(let j=0;j<points.length;j++){
+						let item=points[j];
+						if(startPoint==0 && item.x > leftSpace){
+							context.moveTo(item.x, item.y);
+							startPoint=1;
+						}
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              let ctrlPoint = createCurveControlPoints(points, j - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x, item.y);
+            }
+          };
+        } else {
+					for(let j=0;j<points.length;j++){
+						let item=points[j];
+						if(startPoint==0 && item.x > leftSpace){
+							context.moveTo(item.x, item.y);
+							startPoint=1;
+						}
+					  if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+
+        context.lineTo(lastPoint.x, endY);
+        context.lineTo(firstPoint.x, endY);
+        context.lineTo(firstPoint.x, firstPoint.y);
+      } else {
+        let item = points[0];
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, item.y);
+        context.lineTo(item.x + eachSpacing / 2, endY);
+        context.lineTo(item.x - eachSpacing / 2, endY);
+        context.moveTo(item.x - eachSpacing / 2, item.y);
+      }
+      context.closePath();
+      context.fill();
+
+      //画连线
+      if (areaOption.addLine) {
+				if (eachSeries.lineType == 'dash') {
+					let dashLength = eachSeries.dashLength?eachSeries.dashLength:8;
+					dashLength *= opts.pixelRatio;
+				  context.setLineDash([dashLength, dashLength]);
+				}
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(areaOption.width * opts.pixelRatio);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+					let startPoint=0;
+          if (areaOption.type === 'curve') {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                let ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x,item.y);
+              }
+            };
+          } else {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            };
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.stroke();
+				context.setLineDash([]);
+      }
+    }
+
+    //画点
+    if (opts.dataPointShape !== false) {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges,minRange,maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context);
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawLineDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var lineOption = assign({},{
+		type: 'straight',
+		width: 2
+	},opts.extra.line);
+	lineOption.width *=opts.pixelRatio;
+	
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+  var calPoints = [];
+
+  context.save();
+	let leftSpace=0;
+	let rightSpace=opts.width+eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+		leftSpace=-opts._scrollDistance_-eachSpacing+opts.area[3];
+		rightSpace=leftSpace+(opts.xAxis.itemCount+4)*eachSpacing;
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges,minRange,maxRange;
+    ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+    minRange = ranges.pop();
+    maxRange = ranges.shift();
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+    var splitPointList = splitPoints(points);
+		
+		if (eachSeries.lineType == 'dash') {
+			let dashLength = eachSeries.dashLength?eachSeries.dashLength:8;
+			dashLength *= opts.pixelRatio;
+		  context.setLineDash([dashLength, dashLength]);
+		}
+		context.beginPath();
+		context.setStrokeStyle(eachSeries.color);
+		context.setLineWidth(lineOption.width);
+		
+    splitPointList.forEach(function(points, index) {
+			
+      if (points.length === 1) {
+        context.moveTo(points[0].x, points[0].y);
+        context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+      } else {
+        context.moveTo(points[0].x, points[0].y);
+				let startPoint=0;
+        if (lineOption.type === 'curve') {
+          for(let j=0;j<points.length;j++){
+          	let item=points[j];
+          	if(startPoint==0 && item.x > leftSpace){
+          		context.moveTo(item.x, item.y);
+          		startPoint=1;
+          	}
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              var ctrlPoint = createCurveControlPoints(points, j - 1);
+              context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x, item.y);
+            }
+          };
+        } else {
+          for(let j=0;j<points.length;j++){
+          	let item=points[j];
+          	if(startPoint==0 && item.x > leftSpace){
+          		context.moveTo(item.x, item.y);
+          		startPoint=1;
+          	}
+            if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+              context.lineTo(item.x, item.y);
+            }
+          };
+        }
+        context.moveTo(points[0].x, points[0].y);
+      }
+      
+    });
+		
+		context.stroke();
+		context.setLineDash([]);
+		
+    if (opts.dataPointShape !== false) {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges,minRange,maxRange;
+      ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+      minRange = ranges.pop();
+      maxRange = ranges.shift();
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      drawPointText(points, eachSeries, config, context);
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing
+  };
+}
+
+function drawMixDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    eachSpacing = xAxisData.eachSpacing;
+
+  let endY = opts.height - opts.area[2];
+  let calPoints = [];
+
+  var columnIndex = 0;
+  var columnLength = 0;
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (eachSeries.type == 'column') {
+      columnLength += 1;
+    }
+  });
+  context.save();
+	let leftNum=-2;
+	let rightNum=xAxisPoints.length+2;
+	let leftSpace=0;
+	let rightSpace=opts.width+eachSpacing;
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+		leftNum=Math.floor(-opts._scrollDistance_/eachSpacing)-2;
+		rightNum=leftNum+opts.xAxis.itemCount+4;
+		leftSpace=-opts._scrollDistance_-eachSpacing+opts.area[3];
+		rightSpace=leftSpace+(opts.xAxis.itemCount+4)*eachSpacing;
+  }
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    let ranges,minRange,maxRange;
+    
+		ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+		minRange = ranges.pop();
+		maxRange = ranges.shift();
+
+    var data = eachSeries.data;
+    var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+    calPoints.push(points);
+
+    // 绘制柱状数据图
+    if (eachSeries.type == 'column') {
+      points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+      for(let i=0;i<points.length;i++){
+      	let item=points[i];
+        if (item !== null && i>leftNum && i<rightNum) {
+          context.beginPath();
+          context.setStrokeStyle(item.color || eachSeries.color);
+          context.setLineWidth(1)
+          context.setFillStyle(item.color || eachSeries.color);
+          var startX = item.x - item.width / 2;
+          var height = opts.height - item.y - opts.area[2];
+          context.moveTo(startX, item.y);
+          context.moveTo(startX-1, item.y);
+          context.lineTo(startX+item.width-2,item.y);
+          context.lineTo(startX+item.width-2,opts.height - opts.area[2]);
+          context.lineTo(startX,opts.height - opts.area[2]);
+          context.lineTo(startX,item.y);
+          context.closePath();
+          context.stroke();
+          context.fill();
+          context.closePath();
+          context.fill();
+        }
+      }
+      columnIndex += 1;
+    }
+
+    //绘制区域图数据
+
+    if (eachSeries.type == 'area') {
+      let splitPointList = splitPoints(points);
+      for (let i = 0; i < splitPointList.length; i++) {
+        let points = splitPointList[i];
+        // 绘制区域数据
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setFillStyle(hexToRgb(eachSeries.color, 0.2));
+        context.setLineWidth(2 * opts.pixelRatio);
+        if (points.length > 1) {
+          var firstPoint = points[0];
+          let lastPoint = points[points.length - 1];
+          context.moveTo(firstPoint.x, firstPoint.y);
+					let startPoint=0;
+          if (eachSeries.style === 'curve') {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                var ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y, item.x, item.y);
+              }
+            };
+          } else {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            };
+          }
+          context.lineTo(lastPoint.x, endY);
+          context.lineTo(firstPoint.x, endY);
+          context.lineTo(firstPoint.x, firstPoint.y);
+        } else {
+          let item = points[0];
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, item.y);
+          context.lineTo(item.x + eachSpacing / 2, endY);
+          context.lineTo(item.x - eachSpacing / 2, endY);
+          context.moveTo(item.x - eachSpacing / 2, item.y);
+        }
+        context.closePath();
+        context.fill();
+      }
+    }
+
+    // 绘制折线数据图
+    if (eachSeries.type == 'line') {
+      var splitPointList = splitPoints(points);
+      splitPointList.forEach(function(points, index) {
+				if (eachSeries.lineType == 'dash') {
+					let dashLength = eachSeries.dashLength?eachSeries.dashLength:8;
+					dashLength *= opts.pixelRatio;
+				  context.setLineDash([dashLength, dashLength]);
+				}
+        context.beginPath();
+        context.setStrokeStyle(eachSeries.color);
+        context.setLineWidth(2 * opts.pixelRatio);
+        if (points.length === 1) {
+          context.moveTo(points[0].x, points[0].y);
+          context.arc(points[0].x, points[0].y, 1, 0, 2 * Math.PI);
+        } else {
+          context.moveTo(points[0].x, points[0].y);
+					let startPoint=0;
+          if (eachSeries.style == 'curve') {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                var ctrlPoint = createCurveControlPoints(points, j - 1);
+                context.bezierCurveTo(ctrlPoint.ctrA.x, ctrlPoint.ctrA.y, ctrlPoint.ctrB.x, ctrlPoint.ctrB.y,item.x,item.y);
+              }
+            }
+          } else {
+            for(let j=0;j<points.length;j++){
+            	let item=points[j];
+            	if(startPoint==0 && item.x > leftSpace){
+            		context.moveTo(item.x, item.y);
+            		startPoint=1;
+            	}
+              if (j > 0 && item.x > leftSpace && item.x < rightSpace) {
+                context.lineTo(item.x, item.y);
+              }
+            }
+          }
+          context.moveTo(points[0].x, points[0].y);
+        }
+        context.stroke();
+				context.setLineDash([]);
+      });
+    }
+
+    // 绘制点数据图
+    if (eachSeries.type == 'point') {
+			eachSeries.addPoint = true;
+    }
+
+    if (eachSeries.addPoint == true && eachSeries.type !== 'column' ) {
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+  if (opts.dataLabel !== false && process === 1) {
+    var columnIndex = 0;
+    series.forEach(function(eachSeries, seriesIndex) {
+      let ranges,minRange,maxRange;
+      
+			ranges = [].concat(opts.chartData.yAxisData.ranges[eachSeries.index]);
+			minRange = ranges.pop();
+			maxRange = ranges.shift();
+				
+      var data = eachSeries.data;
+      var points = getDataPoints(data, minRange, maxRange, xAxisPoints, eachSpacing, opts, config, process);
+      if (eachSeries.type !== 'column') {
+        drawPointText(points, eachSeries, config, context);
+      } else {
+        points = fixColumeData(points, eachSpacing, columnLength, columnIndex, config, opts);
+        drawPointText(points, eachSeries, config, context);
+        columnIndex += 1;
+      }
+
+    });
+  }
+
+  context.restore();
+
+  return {
+    xAxisPoints: xAxisPoints,
+    calPoints: calPoints,
+    eachSpacing: eachSpacing,
+  }
+}
+
+function drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints) {
+  var toolTipOption = opts.extra.tooltip || {};
+  if (toolTipOption.horizentalLine && opts.tooltip && process === 1 && (opts.type == 'line' || opts.type == 'area' || opts.type == 'column' || opts.type == 'candle' || opts.type == 'mix')) {
+    drawToolTipHorizentalLine(opts, config, context, eachSpacing, xAxisPoints)
+  }
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0 && opts.enableScroll === true) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+  if (opts.tooltip && opts.tooltip.textList && opts.tooltip.textList.length && process === 1) {
+    drawToolTip(opts.tooltip.textList, opts.tooltip.offset, opts, config, context, eachSpacing, xAxisPoints);
+  }
+  context.restore();
+
+}
+
+function drawXAxis(categories, opts, config, context) {
+
+  let xAxisData = opts.chartData.xAxisData,
+    xAxisPoints = xAxisData.xAxisPoints,
+    startX = xAxisData.startX,
+    endX = xAxisData.endX,
+    eachSpacing = xAxisData.eachSpacing;
+  var boundaryGap='center';
+  if (opts.type == 'line'||opts.type == 'area'){
+    boundaryGap=opts.xAxis.boundaryGap;
+  }
+  var startY = opts.height - opts.area[2];
+  var endY = opts.area[0];
+
+  //绘制滚动条
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    var scrollY = opts.height - opts.area[2] + config.xAxisHeight;
+    var scrollScreenWidth = endX - startX;
+    var scrollTotalWidth = eachSpacing * (xAxisPoints.length - 1);
+    var scrollWidth = scrollScreenWidth * scrollScreenWidth / scrollTotalWidth;
+    var scrollLeft = 0;
+    if (opts._scrollDistance_) {
+      scrollLeft = -opts._scrollDistance_ * (scrollScreenWidth) / scrollTotalWidth;
+    }
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pixelRatio);
+    context.setStrokeStyle(opts.xAxis.scrollBackgroundColor || "#EFEBEF");
+    context.moveTo(startX, scrollY);
+    context.lineTo(endX, scrollY);
+    context.stroke();
+    context.closePath();
+    context.beginPath();
+    context.setLineCap('round');
+    context.setLineWidth(6 * opts.pixelRatio);
+    context.setStrokeStyle(opts.xAxis.scrollColor || "#A6A6A6");
+    context.moveTo(startX + scrollLeft, scrollY);
+    context.lineTo(startX + scrollLeft + scrollWidth, scrollY);
+    context.stroke();
+    context.closePath();
+    context.setLineCap('butt');
+  }
+
+  context.save();
+
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+	
+	//绘制X轴刻度线
+	if (opts.xAxis.calibration === true) {
+		context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+		context.setLineCap('butt');
+		context.setLineWidth(1 * opts.pixelRatio);
+	  xAxisPoints.forEach(function(item, index) {
+	    if (index > 0) {
+	      context.beginPath();
+	      context.moveTo(item - eachSpacing / 2, startY);
+	      context.lineTo(item - eachSpacing / 2, startY + 3 * opts.pixelRatio);
+	      context.closePath();
+	      context.stroke();
+	    }
+	  });
+	}
+	//绘制X轴网格
+  if (opts.xAxis.disableGrid !== true) {
+    context.setStrokeStyle(opts.xAxis.gridColor || "#cccccc");
+    context.setLineCap('butt');
+    context.setLineWidth(1 * opts.pixelRatio);
+    if (opts.xAxis.gridType == 'dash') {
+      context.setLineDash([opts.xAxis.dashLength, opts.xAxis.dashLength]);
+    }
+		opts.xAxis.gridEval = opts.xAxis.gridEval || 1;
+		xAxisPoints.forEach(function(item, index) {
+			if (index % opts.xAxis.gridEval == 0) {
+				context.beginPath();
+				context.moveTo(item, startY);
+				context.lineTo(item, endY);
+				context.stroke();
+			}
+		});
+    context.setLineDash([]);
+  }
+  
+
+  //绘制X轴文案
+  if (opts.xAxis.disabled !== true) {
+    // 对X轴列表做抽稀处理
+    //默认全部显示X轴标签
+    let maxXAxisListLength = categories.length;
+    //如果设置了X轴单屏数量
+    if (opts.xAxis.labelCount) {
+      //如果设置X轴密度
+      if (opts.xAxis.itemCount) {
+        maxXAxisListLength = Math.ceil(categories.length / opts.xAxis.itemCount * opts.xAxis.labelCount);
+      } else {
+        maxXAxisListLength = opts.xAxis.labelCount;
+      }
+      maxXAxisListLength -= 1;
+    }
+
+    let ratio = Math.ceil(categories.length / maxXAxisListLength);
+
+    let newCategories = [];
+    let cgLength = categories.length;
+    for (let i = 0; i < cgLength; i++) {
+      if (i % ratio !== 0) {
+        newCategories.push("");
+      } else {
+        newCategories.push(categories[i]);
+      }
+    }
+    newCategories[cgLength - 1] = categories[cgLength - 1];
+
+    var xAxisFontSize = opts.xAxis.fontSize || config.fontSize;
+    if (config._xAxisTextAngle_ === 0) {
+      newCategories.forEach(function(item, index) {
+        var offset = - measureText(String(item), xAxisFontSize) / 2;
+        if(boundaryGap == 'center'){
+          offset+=eachSpacing / 2;
+        }
+        var scrollHeight=0;
+        if(opts.xAxis.scrollShow){
+          scrollHeight=6*opts.pixelRatio;
+        }
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || '#666666');
+        context.fillText(String(item), xAxisPoints[index] + offset, startY + xAxisFontSize + (config.xAxisHeight - scrollHeight - xAxisFontSize) / 2);
+        context.closePath();
+        context.stroke();
+      });
+
+    } else {
+      newCategories.forEach(function(item, index) {
+        context.save();
+        context.beginPath();
+        context.setFontSize(xAxisFontSize);
+        context.setFillStyle(opts.xAxis.fontColor || '#666666');
+        var textWidth = measureText(String(item),xAxisFontSize);
+        var offset = - textWidth;
+        if(boundaryGap == 'center'){
+          offset+=eachSpacing / 2;
+        }
+        var _calRotateTranslate = calRotateTranslate(xAxisPoints[index] + eachSpacing / 2, startY + xAxisFontSize / 2 + 5, opts.height),
+          transX = _calRotateTranslate.transX,
+          transY = _calRotateTranslate.transY;
+
+        context.rotate(-1 * config._xAxisTextAngle_);
+        context.translate(transX, transY);
+        context.fillText(String(item), xAxisPoints[index] + offset, startY + xAxisFontSize + 5);
+        context.closePath();
+        context.stroke();
+        context.restore();
+      });
+    }
+  }
+  context.restore();
+	
+	//绘制X轴轴线
+  if(opts.xAxis.axisLine){
+    context.beginPath();
+    context.setStrokeStyle(opts.xAxis.axisLineColor);
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.moveTo(startX,opts.height-opts.area[2]);
+    context.lineTo(endX,opts.height-opts.area[2]);
+    context.stroke();
+  }
+}
+
+function drawYAxisGrid(categories, opts, config, context) {
+  if (opts.yAxis.disableGrid === true) {
+    return;
+  }
+  let spacingValid = opts.height - opts.area[0] - opts.area[2];
+  let eachSpacing = spacingValid / opts.yAxis.splitNumber;
+  let startX = opts.area[3];
+  let xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+    xAxiseachSpacing = opts.chartData.xAxisData.eachSpacing;
+  let TotalWidth = xAxiseachSpacing * (xAxisPoints.length - 1);
+  let endX = startX + TotalWidth;
+
+  let points = [];
+  for (let i = 0; i < opts.yAxis.splitNumber + 1; i++) {
+    points.push(opts.height - opts.area[2] - eachSpacing * i);
+  }
+
+  context.save();
+  if (opts._scrollDistance_ && opts._scrollDistance_ !== 0) {
+    context.translate(opts._scrollDistance_, 0);
+  }
+
+  if (opts.yAxis.gridType == 'dash') {
+    context.setLineDash([opts.yAxis.dashLength, opts.yAxis.dashLength]);
+  }
+  context.setStrokeStyle(opts.yAxis.gridColor);
+  context.setLineWidth(1 * opts.pixelRatio);
+  points.forEach(function(item, index) {
+    context.beginPath();
+    context.moveTo(startX, item);
+    context.lineTo(endX, item);
+    context.stroke();
+  });
+  context.setLineDash([]);
+
+  context.restore();
+}
+
+function drawYAxis(series, opts, config, context) {
+  if (opts.yAxis.disabled === true) {
+    return;
+  }
+  var spacingValid = opts.height - opts.area[0] - opts.area[2];
+  var eachSpacing = spacingValid / opts.yAxis.splitNumber;
+  var startX = opts.area[3];
+  var endX = opts.width - opts.area[1];
+  var endY = opts.height - opts.area[2];
+  var fillEndY = endY + config.xAxisHeight;
+  if (opts.xAxis.scrollShow) {
+    fillEndY -= 3 * opts.pixelRatio;
+  }
+	if (opts.xAxis.rotateLabel){
+		fillEndY = opts.height - opts.area[2]+3;
+	}
+  // set YAxis background
+  context.beginPath();
+  context.setFillStyle(opts.background || '#ffffff');
+  if (opts._scrollDistance_ < 0) {
+    context.fillRect(0, 0, startX, fillEndY);
+  }
+  if(opts.enableScroll == true){
+    context.fillRect(endX, 0, opts.width, fillEndY);
+  }
+  context.closePath();
+  context.stroke();
+
+  var points = [];
+  for (let i = 0; i <= opts.yAxis.splitNumber; i++) {
+    points.push(opts.area[0] + eachSpacing * i);
+  }
+
+  let tStartLeft=opts.area[3];
+  let tStartRight=opts.width-opts.area[1];
+
+  for (let i = 0; i < opts.yAxis.data.length; i++) {
+    let yData = opts.yAxis.data[i];
+    if(yData.disabled !== true){
+      let rangesFormat = opts.chartData.yAxisData.rangesFormat[i];
+      let yAxisFontSize = yData.fontSize || config.fontSize;
+      let yAxisWidth = opts.chartData.yAxisData.yAxisWidth[i];
+      //画Y轴刻度及文案
+      rangesFormat.forEach(function(item, index) {
+        var pos = points[index] ? points[index] : endY;
+        context.beginPath();
+        context.setFontSize(yAxisFontSize);
+        context.setLineWidth(1*opts.pixelRatio);
+        context.setStrokeStyle(yData.axisLineColor||'#cccccc');
+        context.setFillStyle(yData.fontColor|| '#666666');
+        if(yAxisWidth.position=='left'){
+          context.fillText(String(item), tStartLeft - yAxisWidth.width , pos + yAxisFontSize / 2);
+          //画刻度线
+          if(yData.calibration==true){
+            context.moveTo(tStartLeft,pos);
+            context.lineTo(tStartLeft - 3*opts.pixelRatio,pos);
+          }
+        }else{
+          context.fillText(String(item), tStartRight + 4*opts.pixelRatio, pos + yAxisFontSize / 2);
+          //画刻度线
+          if(yData.calibration==true){
+            context.moveTo(tStartRight,pos);
+            context.lineTo(tStartRight + 3*opts.pixelRatio,pos);
+          }
+        }
+        context.closePath();
+        context.stroke();
+      });
+      //画Y轴轴线
+      if (yData.axisLine!==false) {
+        context.beginPath();
+        context.setStrokeStyle(yData.axisLineColor||'#cccccc');
+        context.setLineWidth(1 * opts.pixelRatio);
+        if(yAxisWidth.position=='left'){
+          context.moveTo(tStartLeft,opts.height-opts.area[2]);
+          context.lineTo(tStartLeft,opts.area[0]);
+        }else{
+          context.moveTo(tStartRight,opts.height-opts.area[2]);
+          context.lineTo(tStartRight,opts.area[0]);
+        }
+        context.stroke();
+      }
+			
+      //画Y轴标题
+      if (opts.yAxis.showTitle) {
+				
+        let titleFontSize = yData.titleFontSize || config.fontSize;
+        let title = yData.title;
+        context.beginPath();
+        context.setFontSize(titleFontSize);
+        context.setFillStyle(yData.titleFontColor || '#666666');
+        if(yAxisWidth.position=='left'){
+          context.fillText(title, tStartLeft - measureText(title,titleFontSize)/2, opts.area[0]-10*opts.pixelRatio);
+        }else{
+          context.fillText(title,tStartRight - measureText(title,titleFontSize)/2, opts.area[0]-10*opts.pixelRatio);
+        }
+        context.closePath();
+        context.stroke();
+      }
+      if(yAxisWidth.position=='left'){
+        tStartLeft -=(yAxisWidth.width + opts.yAxis.padding);
+      }else{
+        tStartRight +=yAxisWidth.width+ opts.yAxis.padding;
+      }
+    }
+  }
+}
+
+function drawLegend(series, opts, config, context, chartData) {
+  if (opts.legend.show === false) {
+    return;
+  }
+  let legendData = chartData.legendData;
+  let legendList = legendData.points;
+  let legendArea = legendData.area;
+  let padding = opts.legend.padding;
+  let fontSize = opts.legend.fontSize;
+  let shapeWidth = 15 * opts.pixelRatio;
+  let shapeRight = 5 * opts.pixelRatio;
+  let itemGap = opts.legend.itemGap;
+  let lineHeight = Math.max(opts.legend.lineHeight * opts.pixelRatio, fontSize);
+
+  //画背景及边框
+  context.beginPath();
+  context.setLineWidth(opts.legend.borderWidth);
+  context.setStrokeStyle(opts.legend.borderColor);
+  context.setFillStyle(opts.legend.backgroundColor);
+  context.moveTo(legendArea.start.x, legendArea.start.y);
+  context.rect(legendArea.start.x, legendArea.start.y, legendArea.width, legendArea.height);
+  context.closePath();
+  context.fill();
+  context.stroke();
+
+  legendList.forEach(function(itemList, listIndex) {
+    let width = 0;
+    let height = 0;
+    width = legendData.widthArr[listIndex];
+    height = legendData.heightArr[listIndex];
+    let startX = 0;
+    let startY = 0;
+    if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+      startX = legendArea.start.x + (legendArea.width - width) / 2;
+      startY = legendArea.start.y + padding + listIndex * lineHeight;
+    } else {
+      if (listIndex == 0) {
+        width = 0;
+      } else {
+        width = legendData.widthArr[listIndex - 1];
+      }
+      startX = legendArea.start.x + padding + width;
+      startY = legendArea.start.y + padding + (legendArea.height - height) / 2;
+    }
+
+    context.setFontSize(config.fontSize);
+    for (let i = 0; i < itemList.length; i++) {
+      let item = itemList[i];
+      item.area = [0, 0, 0, 0];
+      item.area[0] = startX;
+      item.area[1] = startY;
+      item.area[3] = startY + lineHeight;
+      context.beginPath();
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.show ? item.color : opts.legend.hiddenColor);
+      context.setFillStyle(item.show ? item.color : opts.legend.hiddenColor);
+      switch (item.legendShape) {
+        case 'line':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 2 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 2 * opts.pixelRatio, 15 * opts.pixelRatio, 4 * opts.pixelRatio);
+          break;
+        case 'triangle':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.lineTo(startX + 2.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 12.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          break;
+        case 'diamond':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.lineTo(startX + 2.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight + 5 * opts.pixelRatio);
+          context.lineTo(startX + 12.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.lineTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          break;
+        case 'circle':
+          context.moveTo(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight);
+          context.arc(startX + 7.5 * opts.pixelRatio, startY + 0.5 * lineHeight, 5 * opts.pixelRatio, 0, 2 * Math.PI);
+          break;
+        case 'rect':
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio, 15 * opts.pixelRatio, 10 * opts.pixelRatio);
+          break;
+        default:
+          context.moveTo(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio);
+          context.fillRect(startX, startY + 0.5 * lineHeight - 5 * opts.pixelRatio, 15 * opts.pixelRatio, 10 * opts.pixelRatio);
+      }
+      context.closePath();
+      context.fill();
+      context.stroke();
+
+      startX += shapeWidth + shapeRight;
+      let fontTrans = 0.5 * lineHeight + 0.5 * fontSize - 2;
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.show ? opts.legend.fontColor : opts.legend.hiddenColor);
+      context.fillText(item.name, startX, startY + fontTrans);
+      context.closePath();
+      context.stroke();
+      if (opts.legend.position == 'top' || opts.legend.position == 'bottom') {
+        startX += measureText(item.name, fontSize) + itemGap;
+        item.area[2] = startX;
+      } else {
+        item.area[2] = startX + measureText(item.name, fontSize) + itemGap;;
+        startX -= shapeWidth + shapeRight;
+        startY += lineHeight;
+      }
+    }
+  });
+}
+
+function drawPieDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var pieOption = assign({}, {
+    activeOpacity: 0.5,
+    activeRadius: 10 * opts.pixelRatio,
+    offsetAngle: 0,
+    labelWidth: 15 * opts.pixelRatio,
+    ringWidth: 0,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF'
+  }, opts.extra.pie);
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = pieOption.activeRadius;
+  }
+
+  var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+
+  series = getPieDataPoints(series, radius, process);
+
+  var activeRadius = pieOption.activeRadius;
+
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (pieOption.offsetAngle) * Math.PI / 180;
+    return eachSeries;
+  });
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, opts.extra.pie.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_ + activeRadius, eachSeries._start_,
+          eachSeries._start_ + 2 *
+          eachSeries._proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(pieOption.borderWidth * opts.pixelRatio);
+    context.lineJoin = "round";
+    context.setStrokeStyle(pieOption.borderColor);
+    context.setFillStyle(eachSeries.color);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 * eachSeries._proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (pieOption.border == true) {
+      context.stroke();
+    }
+  });
+
+  if (opts.type === 'ring') {
+    var innerPieWidth = radius * 0.6;
+    if (typeof opts.extra.pie.ringWidth === 'number' && opts.extra.pie.ringWidth > 0) {
+      innerPieWidth = Math.max(0, radius - opts.extra.pie.ringWidth);
+    }
+    context.beginPath();
+    context.setFillStyle(opts.background || '#ffffff');
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, innerPieWidth, 0, 2 * Math.PI);
+    context.closePath();
+    context.fill();
+  }
+
+  if (opts.dataLabel !== false && process === 1) {
+    var valid = false;
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (series[i].data > 0) {
+        valid = true;
+        break;
+      }
+    }
+
+    if (valid) {
+      drawPieText(series, opts, config, context, radius, centerPosition);
+    }
+  }
+
+  if (process === 1 && opts.type === 'ring') {
+    drawRingTitle(opts, config, context, centerPosition);
+  }
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawRoseDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var roseOption = assign({}, {
+    type: 'area',
+    activeOpacity: 0.5,
+    activeRadius: 10 * opts.pixelRatio,
+    offsetAngle: 0,
+    labelWidth: 15 * opts.pixelRatio,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF'
+  }, opts.extra.rose);
+  if (config.pieChartLinePadding == 0) {
+    config.pieChartLinePadding = roseOption.activeRadius;
+  }
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+   var radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding - config._pieTextMaxLength_, (opts.height - opts.area[0] - opts.area[2]) / 2 - config.pieChartLinePadding - config.pieChartTextPadding);
+  var minRadius = roseOption.minRadius || radius * 0.5;
+
+  series = getRoseDataPoints(series, roseOption.type, minRadius, radius, process);
+
+  var activeRadius = roseOption.activeRadius;
+
+  series = series.map(function(eachSeries) {
+    eachSeries._start_ += (roseOption.offsetAngle || 0) * Math.PI / 180;
+    return eachSeries;
+  });
+
+  series.forEach(function(eachSeries, seriesIndex) {
+    if (opts.tooltip) {
+      if (opts.tooltip.index == seriesIndex) {
+        context.beginPath();
+        context.setFillStyle(hexToRgb(eachSeries.color, roseOption.activeOpacity || 0.5));
+        context.moveTo(centerPosition.x, centerPosition.y);
+        context.arc(centerPosition.x, centerPosition.y, activeRadius + eachSeries._radius_, eachSeries._start_,
+          eachSeries._start_ + 2 * eachSeries._rose_proportion_ * Math.PI);
+        context.closePath();
+        context.fill();
+      }
+    }
+    context.beginPath();
+    context.setLineWidth(roseOption.borderWidth * opts.pixelRatio);
+    context.lineJoin = "round";
+    context.setStrokeStyle(roseOption.borderColor);
+    context.setFillStyle(eachSeries.color);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.arc(centerPosition.x, centerPosition.y, eachSeries._radius_, eachSeries._start_, eachSeries._start_ + 2 *
+      eachSeries._rose_proportion_ * Math.PI);
+    context.closePath();
+    context.fill();
+    if (roseOption.border == true) {
+      context.stroke();
+    }
+  });
+
+  if (opts.dataLabel !== false && process === 1) {
+    var valid = false;
+    for (var i = 0, len = series.length; i < len; i++) {
+      if (series[i].data > 0) {
+        valid = true;
+        break;
+      }
+    }
+
+    if (valid) {
+      drawPieText(series, opts, config, context, radius, centerPosition);
+    }
+  }
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawArcbarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var arcbarOption = assign({}, {
+    startAngle: 0.75,
+    endAngle: 0.25,
+    type: 'default',
+    width: 12 * opts.pixelRatio,
+		gap:2 * opts.pixelRatio
+  }, opts.extra.arcbar);
+
+  series = getArcbarDataPoints(series, arcbarOption, process);
+	
+  var centerPosition;
+	if(arcbarOption.center){
+		centerPosition=arcbarOption.center;
+	}else{
+		centerPosition= {
+		  x: opts.width / 2,
+		  y: opts.height / 2
+		};
+	}
+	
+  var radius;
+	if(arcbarOption.radius){
+		radius=arcbarOption.radius;
+	}else{
+		radius = Math.min(centerPosition.x, centerPosition.y);
+		radius -= 5 * opts.pixelRatio;
+		radius -= arcbarOption.width / 2;
+	}
+	
+  for (let i = 0; i < series.length; i++) {
+    let eachSeries = series[i];
+		//背景颜色
+		context.setLineWidth(arcbarOption.width);
+		context.setStrokeStyle(arcbarOption.backgroundColor || '#E9E9E9');
+		context.setLineCap('round');
+		context.beginPath();
+		if (arcbarOption.type == 'default') {
+		  context.arc(centerPosition.x, centerPosition.y, radius-(arcbarOption.width+arcbarOption.gap)*i, arcbarOption.startAngle * Math.PI, arcbarOption.endAngle * Math.PI, false);
+		} else {
+		  context.arc(centerPosition.x, centerPosition.y, radius-(arcbarOption.width+arcbarOption.gap)*i, 0, 2 * Math.PI, false);
+		}
+		context.stroke();
+		//进度条
+    context.setLineWidth(arcbarOption.width);
+    context.setStrokeStyle(eachSeries.color);
+    context.setLineCap('round');
+    context.beginPath();
+    context.arc(centerPosition.x, centerPosition.y, radius-(arcbarOption.width+arcbarOption.gap)*i, arcbarOption.startAngle * Math.PI, eachSeries._proportion_ * Math.PI, false);
+    context.stroke();
+  }
+
+  drawRingTitle(opts, config, context, centerPosition);
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawGaugeDataPoints(categories, series, opts, config, context) {
+  var process = arguments.length > 5 && arguments[5] !== undefined ? arguments[5] : 1;
+  var gaugeOption = assign({}, {
+		type:'default',
+    startAngle: 0.75,
+    endAngle: 0.25,
+    width: 15,
+    splitLine: {
+      fixRadius: 0,
+      splitNumber: 10,
+      width: 15,
+      color: '#FFFFFF',
+      childNumber: 5,
+      childWidth: 5
+    },
+    pointer: {
+      width: 15,
+      color: 'auto'
+    }
+  }, opts.extra.gauge);
+
+  if (gaugeOption.oldAngle == undefined) {
+    gaugeOption.oldAngle = gaugeOption.startAngle;
+  }
+  if (gaugeOption.oldData == undefined) {
+    gaugeOption.oldData = 0;
+  }
+  categories = getGaugeAxisPoints(categories, gaugeOption.startAngle, gaugeOption.endAngle);
+
+  var centerPosition = {
+    x: opts.width / 2,
+    y: opts.height / 2
+  };
+  var radius = Math.min(centerPosition.x, centerPosition.y);
+  radius -= 5 * opts.pixelRatio;
+  radius -= gaugeOption.width / 2;
+  var innerRadius = radius - gaugeOption.width;
+	var totalAngle=0;
+	
+	//判断仪表盘的样式：default百度样式，progress新样式
+	if(gaugeOption.type == 'progress'){
+		
+		//## 第一步画中心圆形背景和进度条背景
+		//中心圆形背景
+		var pieRadius = radius - gaugeOption.width*3;
+		context.beginPath();
+		let gradient = context.createLinearGradient(centerPosition.x, centerPosition.y-pieRadius, centerPosition.x , centerPosition.y+pieRadius);
+		//配置渐变填充（起点：中心点向上减半径；结束点中心点向下加半径）
+		gradient.addColorStop('0', hexToRgb(series[0].color, 0.3));
+		gradient.addColorStop('1.0',hexToRgb("#FFFFFF", 0.1));
+		context.setFillStyle(gradient);
+		context.arc(centerPosition.x, centerPosition.y, pieRadius, 0, 2*Math.PI, false);
+		context.fill();
+		//画进度条背景
+		context.setLineWidth(gaugeOption.width);
+		context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+		context.setLineCap('round');
+		context.beginPath();
+		context.arc(centerPosition.x, centerPosition.y, innerRadius , gaugeOption.startAngle * Math.PI, gaugeOption.endAngle *Math.PI, false);
+		context.stroke();
+		
+		//## 第二步画刻度线
+		totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+		let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+		let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+		let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+		let endX = -radius - gaugeOption.width - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		let len = gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1;
+		let proc = series[0].data * process;
+		for (let i = 0; i < len; i++) {
+		  context.beginPath();
+			//刻度线随进度变色
+			if(proc>(i/len)){
+				context.setStrokeStyle(hexToRgb(series[0].color, 1));
+			}else{
+				context.setStrokeStyle(hexToRgb(series[0].color, 0.3));
+			}
+		  context.setLineWidth(3 * opts.pixelRatio);
+		  context.moveTo(startX, 0);
+		  context.lineTo(endX, 0);
+		  context.stroke();
+		  context.rotate(childAngle * Math.PI);
+		}
+		context.restore();
+		
+		//## 第三步画进度条
+		series = getArcbarDataPoints(series, gaugeOption, process);
+		context.setLineWidth(gaugeOption.width);
+		context.setStrokeStyle(series[0].color);
+		context.setLineCap('round');
+		context.beginPath();
+		context.arc(centerPosition.x, centerPosition.y, innerRadius , gaugeOption.startAngle * Math.PI, series[0]._proportion_ *Math.PI, false);
+		context.stroke();
+		
+		//## 第四步画指针
+		let pointerRadius = radius - gaugeOption.width*2.5;
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((series[0]._proportion_ - 1) * Math.PI);
+		context.beginPath();
+		context.setLineWidth(gaugeOption.width/3);
+		let gradient3 = context.createLinearGradient(0, -pointerRadius*0.6, 0 , pointerRadius*0.6);
+		gradient3.addColorStop('0', hexToRgb('#FFFFFF', 0));
+		gradient3.addColorStop('0.5', hexToRgb(series[0].color, 1));
+		gradient3.addColorStop('1.0', hexToRgb('#FFFFFF', 0));
+		context.setStrokeStyle(gradient3);
+		context.arc(0, 0, pointerRadius , 0.85* Math.PI, 1.15 * Math.PI, false);
+		context.stroke();
+		context.beginPath();
+		context.setLineWidth(1);
+		context.setStrokeStyle(series[0].color);
+		context.setFillStyle(series[0].color);
+		context.moveTo(-pointerRadius-gaugeOption.width/3/2,-4);
+		context.lineTo(-pointerRadius-gaugeOption.width/3/2-4,0);
+		context.lineTo(-pointerRadius-gaugeOption.width/3/2,4);
+		context.lineTo(-pointerRadius-gaugeOption.width/3/2,-4);
+		context.stroke();
+		context.fill();
+		context.restore();
+		
+	//default百度样式
+	}else{
+		//画背景
+		context.setLineWidth(gaugeOption.width);
+		context.setLineCap('butt');
+		for (let i = 0; i < categories.length; i++) {
+		  let eachCategories = categories[i];
+		  context.beginPath();
+		  context.setStrokeStyle(eachCategories.color);
+		  context.arc(centerPosition.x, centerPosition.y, radius, eachCategories._startAngle_ * Math.PI, eachCategories._endAngle_ *Math.PI, false);
+		  context.stroke();
+		}
+		context.save();
+		
+		//画刻度线
+		totalAngle = gaugeOption.startAngle - gaugeOption.endAngle + 1;
+		let splitAngle = totalAngle / gaugeOption.splitLine.splitNumber;
+		let childAngle = totalAngle / gaugeOption.splitLine.splitNumber / gaugeOption.splitLine.childNumber;
+		let startX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius;
+		let endX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.width;
+		let childendX = -radius - gaugeOption.width * 0.5 - gaugeOption.splitLine.fixRadius + gaugeOption.splitLine.childWidth;
+		
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		
+		for (let i = 0; i < gaugeOption.splitLine.splitNumber + 1; i++) {
+		  context.beginPath();
+		  context.setStrokeStyle(gaugeOption.splitLine.color);
+		  context.setLineWidth(2 * opts.pixelRatio);
+		  context.moveTo(startX, 0);
+		  context.lineTo(endX, 0);
+		  context.stroke();
+		  context.rotate(splitAngle * Math.PI);
+		}
+		context.restore();
+		
+		context.save();
+		context.translate(centerPosition.x, centerPosition.y);
+		context.rotate((gaugeOption.startAngle - 1) * Math.PI);
+		
+		for (let i = 0; i < gaugeOption.splitLine.splitNumber * gaugeOption.splitLine.childNumber + 1; i++) {
+		  context.beginPath();
+		  context.setStrokeStyle(gaugeOption.splitLine.color);
+		  context.setLineWidth(1 * opts.pixelRatio);
+		  context.moveTo(startX, 0);
+		  context.lineTo(childendX, 0);
+		  context.stroke();
+		  context.rotate(childAngle * Math.PI);
+		}
+		context.restore();
+		
+		//画指针
+		series = getGaugeDataPoints(series, categories, gaugeOption, process);
+		
+		for (let i = 0; i < series.length; i++) {
+		  let eachSeries = series[i];
+		  context.save();
+		  context.translate(centerPosition.x, centerPosition.y);
+		  context.rotate((eachSeries._proportion_ - 1) * Math.PI);
+		  context.beginPath();
+		  context.setFillStyle(eachSeries.color);
+		  context.moveTo(gaugeOption.pointer.width, 0);
+		  context.lineTo(0, -gaugeOption.pointer.width / 2);
+		  context.lineTo(-innerRadius, 0);
+		  context.lineTo(0, gaugeOption.pointer.width / 2);
+		  context.lineTo(gaugeOption.pointer.width, 0);
+		  context.closePath();
+		  context.fill();
+		  context.beginPath();
+		  context.setFillStyle('#FFFFFF');
+		  context.arc(0, 0, gaugeOption.pointer.width / 6, 0, 2 * Math.PI, false);
+		  context.fill();
+		  context.restore();
+		}
+		
+		if (opts.dataLabel !== false) {
+		  drawGaugeLabel(gaugeOption, radius, centerPosition, opts, config, context);
+		}
+	}
+	
+	//画仪表盘标题，副标题
+  drawRingTitle(opts, config, context, centerPosition);
+
+  if (process === 1 && opts.type === 'gauge') {
+    opts.extra.gauge.oldAngle = series[0]._proportion_;
+    opts.extra.gauge.oldData = series[0].data;
+  }
+  return {
+    center: centerPosition,
+    radius: radius,
+    innerRadius: innerRadius,
+    categories: categories,
+    totalAngle: totalAngle
+  };
+}
+
+function drawRadarDataPoints(series, opts, config, context) {
+  var process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  var radarOption = assign({},{
+    gridColor: '#cccccc',
+    labelColor: '#666666',
+    opacity: 0.2,
+		gridCount:3
+  },opts.extra.radar);
+  
+  var coordinateAngle = getRadarCoordinateSeries(opts.categories.length);
+  
+  var centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.area[0] + (opts.height - opts.area[0] - opts.area[2]) / 2
+  };
+
+  var radius = Math.min(centerPosition.x - (getMaxTextListLength(opts.categories) + config.radarLabelTextMargin),
+    centerPosition.y - config.radarLabelTextMargin);
+  //TODO逻辑不对
+  radius -= opts.padding[1];
+
+  // draw grid
+  context.beginPath();
+  context.setLineWidth(1 * opts.pixelRatio);
+  context.setStrokeStyle(radarOption.gridColor);
+  coordinateAngle.forEach(function(angle) {
+    var pos = convertCoordinateOrigin(radius * Math.cos(angle), radius * Math.sin(angle), centerPosition);
+    context.moveTo(centerPosition.x, centerPosition.y);
+    context.lineTo(pos.x, pos.y);
+  });
+  context.stroke();
+  context.closePath();
+  // draw split line grid
+
+  var _loop = function _loop(i) {
+    var startPos = {};
+    context.beginPath();
+    context.setLineWidth(1 * opts.pixelRatio);
+    context.setStrokeStyle(radarOption.gridColor);
+    coordinateAngle.forEach(function(angle, index) {
+      var pos = convertCoordinateOrigin(radius / radarOption.gridCount * i * Math.cos(angle), radius / radarOption.gridCount * i * Math.sin(angle), centerPosition);
+      if (index === 0) {
+        startPos = pos;
+        context.moveTo(pos.x, pos.y);
+      } else {
+        context.lineTo(pos.x, pos.y);
+      }
+    });
+    context.lineTo(startPos.x, startPos.y);
+    context.stroke();
+    context.closePath();
+  };
+
+  for (var i = 1; i <= radarOption.gridCount; i++) {
+    _loop(i);
+  }
+
+  var radarDataPoints = getRadarDataPoints(coordinateAngle, centerPosition, radius, series, opts, process);
+
+  radarDataPoints.forEach(function(eachSeries, seriesIndex) {
+    // 绘制区域数据
+    context.beginPath();
+    context.setFillStyle(hexToRgb(eachSeries.color, radarOption.opacity));
+    eachSeries.data.forEach(function(item, index) {
+      if (index === 0) {
+        context.moveTo(item.position.x, item.position.y);
+      } else {
+        context.lineTo(item.position.x, item.position.y);
+      }
+    });
+    context.closePath();
+    context.fill();
+
+    if (opts.dataPointShape !== false) {
+      var points = eachSeries.data.map(function(item) {
+        return item.position;
+      });
+      drawPointShape(points, eachSeries.color, eachSeries.pointShape, context, opts);
+    }
+  });
+  // draw label text
+  drawRadarLabel(coordinateAngle, radius, centerPosition, opts, config, context);
+
+  return {
+    center: centerPosition,
+    radius: radius,
+    angleList: coordinateAngle
+  };
+}
+
+function normalInt(min, max, iter) {
+    iter = iter==0?1:iter;
+    var arr = [];
+    for (var i = 0; i < iter; i++) {
+        arr[i] = Math.random();
+    };
+    return  Math.floor(arr.reduce(function(i,j){return i+j})/iter*(max-min))+min;  
+};
+
+function collisionNew(area,points,width,height){
+    var isIn=false;
+    for(let i=0;i<points.length;i++){
+      if(points[i].area){
+        if(area[3]<points[i].area[1]||area[0]>points[i].area[2]||area[1]>points[i].area[3]||area[2]<points[i].area[0]){
+          if(area[0]<0 || area[1]<0 || area[2]>width || area[3]>height){
+            isIn=true;
+            break;
+          }else{
+            isIn=false;
+          }
+        }else{
+          isIn=true;
+          break;
+        }
+      }
+    }
+    return isIn;
+};
+
+function getBoundingBox(data) {
+  var bounds = {}, coords;
+  bounds.xMin = 180;
+  bounds.xMax = 0;
+  bounds.yMin = 90;
+  bounds.yMax = 0
+  for (var i = 0; i < data.length; i++) {
+      var coorda = data[i].geometry.coordinates
+      for (var k = 0; k < coorda.length; k++) {
+          coords = coorda[k];
+          if (coords.length == 1) {
+              coords = coords[0]
+          }
+          for (var j = 0; j < coords.length; j++) {
+              var longitude = coords[j][0];
+              var latitude = coords[j][1];
+              var point = {
+                  x: longitude, 
+                  y: latitude 
+              }
+              bounds.xMin = bounds.xMin < point.x ? bounds.xMin : point.x;
+              bounds.xMax = bounds.xMax > point.x ? bounds.xMax : point.x;
+              bounds.yMin = bounds.yMin < point.y ? bounds.yMin : point.y;
+              bounds.yMax = bounds.yMax > point.y ? bounds.yMax : point.y;
+          }
+      }
+  }
+  return bounds;
+}
+
+function coordinateToPoint(latitude, longitude,bounds,scale,xoffset,yoffset) {
+  return {
+      x: (longitude - bounds.xMin) * scale+xoffset,
+      y: (bounds.yMax - latitude) * scale+yoffset
+  };
+}
+
+function pointToCoordinate(pointY, pointX,bounds,scale,xoffset,yoffset) {
+  return {
+      x: (pointX-xoffset)/scale+bounds.xMin,
+      y: bounds.yMax - (pointY-yoffset)/scale
+  };
+}
+
+function isRayIntersectsSegment(poi,s_poi,e_poi){
+      if (s_poi[1]==e_poi[1]){return false;} 
+      if (s_poi[1]>poi[1] && e_poi[1]>poi[1]){return false;}
+      if (s_poi[1]<poi[1] && e_poi[1]<poi[1]){return false;}
+      if (s_poi[1]==poi[1] && e_poi[1]>poi[1]){return false;}
+      if (e_poi[1]==poi[1] && s_poi[1]>poi[1]){return false;}
+      if (s_poi[0]<poi[0] && e_poi[1]<poi[1]){return false;}
+      let xseg=e_poi[0]-(e_poi[0]-s_poi[0])*(e_poi[1]-poi[1])/(e_poi[1]-s_poi[1]); 
+      if (xseg<poi[0]){
+        return false;
+      }else{
+        return true;
+      }
+} 
+
+function isPoiWithinPoly(poi,poly){
+  let sinsc=0;
+  for (let i=0;i<poly.length;i++){
+    let epoly=poly[i][0];
+    if (poly.length == 1) {
+      epoly = poly[i][0]
+    }
+    for(let j=0;j<epoly.length-1;j++){
+      let s_poi=epoly[j];
+      let e_poi=epoly[j+1];
+      if (isRayIntersectsSegment(poi,s_poi,e_poi)){
+        sinsc+=1;
+      }
+    }
+  }
+  
+  if(sinsc%2==1){
+    return true;
+  }else{
+    return false;
+  }
+}
+
+
+function drawMapDataPoints(series, opts, config, context) {
+  var mapOption=assign({},{
+    border:true,
+    borderWidth:1,
+    borderColor:'#666666',
+    fillOpacity:0.6,
+    activeBorderColor:'#f04864',
+    activeFillColor:'#facc14',
+    activeFillOpacity:1
+  },opts.extra.map);
+  var coords, point;
+  var data = series;
+  var bounds= getBoundingBox(data);
+  var xScale = opts.width / Math.abs(bounds.xMax - bounds.xMin);
+  var yScale = opts.height / Math.abs(bounds.yMax - bounds.yMin);
+  var scale = xScale < yScale ? xScale : yScale;
+  var xoffset=opts.width/2-Math.abs(bounds.xMax - bounds.xMin)/2*scale;
+  var yoffset=opts.height/2-Math.abs(bounds.yMax - bounds.yMin)/2*scale;
+  context.beginPath();
+  context.clearRect(0, 0, opts.width, opts.height);
+  context.setFillStyle(opts.background||'#FFFFFF');
+  context.rect(0,0,opts.width,opts.height);
+  context.fill();
+  for (var i = 0; i < data.length; i++) {
+    context.beginPath();
+    context.setLineWidth(mapOption.borderWidth * opts.pixelRatio);
+    context.setStrokeStyle(mapOption.borderColor);
+    context.setFillStyle(hexToRgb(series[i].color, mapOption.fillOpacity));
+    if (opts.tooltip) {
+      if (opts.tooltip.index == i ) {
+        context.setStrokeStyle(mapOption.activeBorderColor);
+        context.setFillStyle(hexToRgb(mapOption.activeFillColor, mapOption.activeFillOpacity));
+      }
+    }
+    var coorda = data[i].geometry.coordinates
+    for (var k = 0; k < coorda.length; k++) {
+      coords = coorda[k];
+      if (coords.length == 1) {
+        coords = coords[0]
+      }
+      for (var j = 0; j < coords.length; j++) {
+        point = coordinateToPoint(coords[j][1], coords[j][0],bounds,scale,xoffset,yoffset)
+        if (j === 0) {
+          context.beginPath();
+          context.moveTo(point.x, point.y);
+        } else {
+          context.lineTo(point.x, point.y);
+        }
+      }
+      context.fill();
+      if(mapOption.border == true){
+        context.stroke();
+      }
+    }
+    if(opts.dataLabel == true){
+      var centerPoint = data[i].properties.centroid;
+      if(centerPoint){
+        point = coordinateToPoint(centerPoint[1], centerPoint[0],bounds,scale,xoffset,yoffset);
+        let fontSize=data[i].textSize||config.fontSize;
+        let text=data[i].properties.name;
+        context.beginPath();
+        context.setFontSize(fontSize)
+        context.setFillStyle(data[i].textColor||'#666666')
+        context.fillText(text, point.x-measureText(text,fontSize)/2, point.y+fontSize/2);
+        context.closePath();
+        context.stroke();
+      }
+    }
+  }
+  opts.chartData.mapData={
+    bounds:bounds,
+    scale:scale,
+    xoffset:xoffset,
+    yoffset:yoffset
+  }
+  drawToolTipBridge(opts, config, context,1);
+  context.draw();
+}
+
+function getWordCloudPoint(opts,type){
+  let points = opts.series.sort(function(a,b){return parseInt(b.textSize)-parseInt(a.textSize);});
+  switch (type) {
+    case 'normal':
+      for (let i = 0; i < points.length; i++) {
+        let text = points[i].name;
+        let tHeight = points[i].textSize;
+        let tWidth = measureText(text,tHeight);
+        let x,y;
+        let area;
+        let breaknum=0;
+        while(true) {
+            breaknum++;
+            x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+            y = normalInt(-opts.height/2, opts.height/2,5) + tHeight/2;
+            area=[x-5+opts.width/2,y-5-tHeight+opts.height/2,x+tWidth+5+opts.width/2,y+5+opts.height/2];
+            let isCollision = collisionNew(area,points,opts.width,opts.height);
+            if (!isCollision) break;
+            if (breaknum==1000){
+              area=[-100,-100,-100,-100];
+              break;
+            }
+        };
+        points[i].area=area;
+      }
+    break;
+    case 'vertical':
+      function Spin(){
+        //获取均匀随机值，是否旋转，旋转的概率为（1-0.5）
+        if (Math.random()>0.7) {
+            return true;
+        }else {return false};
+      };
+      for (let i = 0; i < points.length; i++) { 
+        let text = points[i].name;
+        let tHeight = points[i].textSize;
+        let tWidth = measureText(text,tHeight);
+        let isSpin = Spin(); 
+        let x,y,area,areav;
+        let breaknum=0;
+        while(true) {
+          breaknum++;
+          let isCollision;
+          if (isSpin) {
+              x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+              y = normalInt(-opts.height/2, opts.height/2,5)+tHeight/2;
+              area=[y-5-tWidth+opts.width/2,(-x-5+opts.height/2),y+5+opts.width/2,(-x+tHeight+5+opts.height/2)];
+              areav=[opts.width-(opts.width/2-opts.height/2)-(-x+tHeight+5+opts.height/2)-5,(opts.height/2-opts.width/2)+(y-5-tWidth+opts.width/2)-5,opts.width-(opts.width/2-opts.height/2)-(-x+tHeight+5+opts.height/2)+tHeight,(opts.height/2-opts.width/2)+(y-5-tWidth+opts.width/2)+tWidth+5];
+              isCollision = collisionNew(areav,points,opts.height,opts.width);
+          }else{
+            x = normalInt(-opts.width/2, opts.width/2,5) - tWidth/2;
+            y = normalInt(-opts.height/2, opts.height/2,5)+tHeight/2;
+            area=[x-5+opts.width/2,y-5-tHeight+opts.height/2,x+tWidth+5+opts.width/2,y+5+opts.height/2];
+            isCollision = collisionNew(area,points,opts.width,opts.height);
+          } 
+          if (!isCollision) break;
+          if (breaknum==1000){
+            area=[-1000,-1000,-1000,-1000];
+            break;
+          }
+        };
+        if (isSpin) {
+          points[i].area=areav;
+          points[i].areav=area;
+        }else{
+          points[i].area=area;
+        }
+        points[i].rotate=isSpin;
+      };
+    break;
+  }
+  return points;
+}
+
+
+function drawWordCloudDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let wordOption = assign({},{
+    type: 'normal',
+    autoColors: true
+  },opts.extra.word);
+  
+  context.beginPath();
+  context.setFillStyle(opts.background||'#FFFFFF');
+  context.rect(0,0,opts.width,opts.height);
+  context.fill();
+  context.save();
+  let points = opts.chartData.wordCloudData;
+  context.translate(opts.width/2,opts.height/2);
+  
+  for(let i=0;i<points.length;i++){
+      context.save();
+      if(points[i].rotate){
+        context.rotate(90 * Math.PI / 180);
+      }
+      let text = points[i].name;
+      let tHeight = points[i].textSize;
+      let tWidth = measureText(text,tHeight);
+      context.beginPath();
+      context.setStrokeStyle(points[i].color);
+      context.setFillStyle(points[i].color);
+      context.setFontSize(tHeight);
+      if(points[i].rotate){
+        if(points[i].areav[0]>0){
+          if (opts.tooltip) {
+            if (opts.tooltip.index == i) {
+              context.strokeText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+              }else{
+                context.fillText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+              }
+          }else{
+            context.fillText(text,(points[i].areav[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].areav[1]+5+tHeight-opts.height/2)*process);
+          } 
+        }
+      }else{
+        if(points[i].area[0]>0){
+          if (opts.tooltip) {
+            if (opts.tooltip.index == i) {
+              context.strokeText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+            }else{
+              context.fillText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+            }
+          }else{
+            context.fillText(text,(points[i].area[0]+5-opts.width/2)*process-tWidth*(1-process)/2,(points[i].area[1]+5+tHeight-opts.height/2)*process);
+          }
+            
+        }
+      }
+      
+      context.stroke();
+      context.restore();
+  }
+  context.restore();
+}
+
+function drawFunnelDataPoints(series, opts, config, context) {
+  let process = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : 1;
+  let funnelOption = assign({},{
+    activeWidth:10,
+    activeOpacity:0.3,
+    border:false,
+    borderWidth:2,
+    borderColor:'#FFFFFF',
+    fillOpacity:1,
+    labelAlign:'right'
+  },opts.extra.funnel);
+  let eachSpacing = (opts.height - opts.area[0] - opts.area[2])/series.length;
+  let centerPosition = {
+    x: opts.area[3] + (opts.width - opts.area[1] - opts.area[3]) / 2,
+    y: opts.height-opts.area[2]
+  };
+  let activeWidth = funnelOption.activeWidth;
+  let radius = Math.min((opts.width - opts.area[1] - opts.area[3]) / 2 - activeWidth, (opts.height - opts.area[0] - opts.area[2]) / 2 - activeWidth);
+  series = getFunnelDataPoints(series, radius, process);
+  context.save();
+  context.translate(centerPosition.x,centerPosition.y);
+  for(let i=0;i<series.length;i++){
+    if(i==0){
+      if (opts.tooltip) {
+        if (opts.tooltip.index == i) {
+          context.beginPath();
+          context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+          context.moveTo(-activeWidth, 0);
+          context.lineTo(-series[i].radius-activeWidth, -eachSpacing);
+          context.lineTo(series[i].radius+activeWidth, -eachSpacing);
+          context.lineTo(activeWidth, 0);
+          context.lineTo(-activeWidth, 0);
+          context.closePath();
+          context.fill();
+        }
+      }
+      series[i].funnelArea=[centerPosition.x-series[i].radius,centerPosition.y-eachSpacing,centerPosition.x+series[i].radius,centerPosition.y];
+      context.beginPath();
+      context.setLineWidth(funnelOption.borderWidth * opts.pixelRatio);
+      context.setStrokeStyle(funnelOption.borderColor);
+      context.setFillStyle(hexToRgb(series[i].color, funnelOption.fillOpacity));
+      context.moveTo(0, 0);
+      context.lineTo(-series[i].radius, -eachSpacing);
+      context.lineTo(series[i].radius, -eachSpacing);
+      context.lineTo(0, 0);
+      context.closePath();
+      context.fill();
+      if(funnelOption.border == true){
+        context.stroke();
+      }
+    }else{
+      if (opts.tooltip) {
+        if (opts.tooltip.index == i) {
+          context.beginPath();
+          context.setFillStyle(hexToRgb(series[i].color, funnelOption.activeOpacity));
+          context.moveTo(0, 0);
+          context.lineTo(-series[i-1].radius-activeWidth, 0);
+          context.lineTo(-series[i].radius-activeWidth, -eachSpacing);
+          context.lineTo(series[i].radius+activeWidth, -eachSpacing);
+          context.lineTo(series[i-1].radius+activeWidth, 0);
+          context.lineTo(0, 0);
+          context.closePath();
+          context.fill();
+        }
+      }
+      series[i].funnelArea=[centerPosition.x-series[i].radius,centerPosition.y-eachSpacing*(i+1),centerPosition.x+series[i].radius,centerPosition.y-eachSpacing*i];
+      context.beginPath();
+      context.setLineWidth(funnelOption.borderWidth * opts.pixelRatio);
+      context.setStrokeStyle(funnelOption.borderColor);
+      context.setFillStyle(hexToRgb(series[i].color, funnelOption.fillOpacity));
+      context.moveTo(0, 0);
+      context.lineTo(-series[i-1].radius, 0);
+      context.lineTo(-series[i].radius, -eachSpacing);
+      context.lineTo(series[i].radius, -eachSpacing);
+      context.lineTo(series[i-1].radius, 0);
+      context.lineTo(0, 0);
+      context.closePath();
+      context.fill();
+      if(funnelOption.border == true){
+        context.stroke();
+      }
+    }
+    context.translate(0,-eachSpacing)
+  }
+  context.restore();
+  
+  if (opts.dataLabel !== false && process === 1) {
+    drawFunnelText(series, opts, context, eachSpacing, funnelOption.labelAlign, activeWidth, centerPosition);
+  }
+  
+  return {
+    center: centerPosition,
+    radius: radius,
+    series: series
+  };
+}
+
+function drawFunnelText(series, opts, context, eachSpacing, labelAlign,activeWidth, centerPosition){
+  for(let i=0;i<series.length;i++){
+    let item = series[i];
+    let startX,endX,startY,fontSize;
+    let text = item.format ? item.format(+item._proportion_.toFixed(2)) : util.toFixed(item._proportion_ * 100) +'%';
+    if(labelAlign == 'right'){
+      if(i==0){
+        startX=(item.funnelArea[2]+centerPosition.x)/2;
+      }else{
+        startX=(item.funnelArea[2]+series[i-1].funnelArea[2])/2;
+      }
+      endX=startX+activeWidth*2;
+      startY=item.funnelArea[1]+eachSpacing/2;
+      fontSize = item.textSize || opts.fontSize;
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX,startY );
+      context.lineTo(endX,startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || '#666666');
+      context.fillText(text, endX+5, startY + fontSize/2 -2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    }else{
+      if(i==0){
+        startX=(item.funnelArea[0]+centerPosition.x)/2;
+      }else{
+        startX=(item.funnelArea[0]+series[i-1].funnelArea[0])/2;
+      }
+      endX=startX-activeWidth*2;
+      startY=item.funnelArea[1]+eachSpacing/2;
+      fontSize = item.textSize || opts.fontSize;
+      context.setLineWidth(1 * opts.pixelRatio);
+      context.setStrokeStyle(item.color);
+      context.setFillStyle(item.color);
+      context.beginPath();
+      context.moveTo(startX,startY );
+      context.lineTo(endX,startY);
+      context.stroke();
+      context.closePath();
+      context.beginPath();
+      context.moveTo(endX, startY);
+      context.arc(endX, startY, 2, 0, 2 * Math.PI);
+      context.closePath();
+      context.fill();
+      context.beginPath();
+      context.setFontSize(fontSize);
+      context.setFillStyle(item.textColor || '#666666');
+      context.fillText(text, endX-5-measureText(text), startY + fontSize/2 -2);
+      context.closePath();
+      context.stroke();
+      context.closePath();
+    }
+    
+  }
+}
+
+
+function drawCanvas(opts, context) {
+  context.draw();
+}
+
+var Timing = {
+  easeIn: function easeIn(pos) {
+    return Math.pow(pos, 3);
+  },
+  easeOut: function easeOut(pos) {
+    return Math.pow(pos - 1, 3) + 1;
+  },
+  easeInOut: function easeInOut(pos) {
+    if ((pos /= 0.5) < 1) {
+      return 0.5 * Math.pow(pos, 3);
+    } else {
+      return 0.5 * (Math.pow(pos - 2, 3) + 2);
+    }
+  },
+  linear: function linear(pos) {
+    return pos;
+  }
+};
+
+function Animation(opts) {
+  this.isStop = false;
+  opts.duration = typeof opts.duration === 'undefined' ? 1000 : opts.duration;
+  opts.timing = opts.timing || 'linear';
+  var delay = 17;
+
+  function createAnimationFrame() {
+    if (typeof setTimeout !== 'undefined') {
+      return function(step, delay) {
+        setTimeout(function() {
+          var timeStamp = +new Date();
+          step(timeStamp);
+        }, delay);
+      };
+    } else if (typeof requestAnimationFrame !== 'undefined') {
+      return requestAnimationFrame;
+    } else {
+      return function(step) {
+        step(null);
+      };
+    }
+  };
+  var animationFrame = createAnimationFrame();
+  var startTimeStamp = null;
+  var _step = function step(timestamp) {
+    if (timestamp === null || this.isStop === true) {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+      return;
+    }
+    if (startTimeStamp === null) {
+      startTimeStamp = timestamp;
+    }
+    if (timestamp - startTimeStamp < opts.duration) {
+      var process = (timestamp - startTimeStamp) / opts.duration;
+      var timingFunction = Timing[opts.timing];
+      process = timingFunction(process);
+
+      opts.onProcess && opts.onProcess(process);
+      animationFrame(_step, delay);
+    } else {
+      opts.onProcess && opts.onProcess(1);
+      opts.onAnimationFinish && opts.onAnimationFinish();
+    }
+  };
+  _step = _step.bind(this);
+  animationFrame(_step, delay);
+}
+
+// stop animation immediately
+// and tigger onAnimationFinish
+Animation.prototype.stop = function() {
+  this.isStop = true;
+};
+
+function drawCharts(type, opts, config, context) {
+  var _this = this;
+  var series = opts.series;
+  var categories = opts.categories;
+  series = fillSeries(series, opts, config);
+  var duration = opts.animation ? opts.duration : 0;
+  _this.animationInstance && _this.animationInstance.stop();
+  var seriesMA = null;
+  if (type == 'candle') {
+    let average = assign({}, opts.extra.candle.average);
+    if (average.show) {
+      seriesMA = calCandleMA(average.day, average.name, average.color, series[0].data);
+      seriesMA = fillSeries(seriesMA, opts, config);
+      opts.seriesMA = seriesMA;
+    } else if (opts.seriesMA) {
+      seriesMA = opts.seriesMA = fillSeries(opts.seriesMA, opts, config);
+    } else {
+      seriesMA = series;
+    }
+  } else {
+    seriesMA = series;
+  }
+
+  /* 过滤掉show=false的series */
+  opts._series_ = series = filterSeries(series);
+
+  //重新计算图表区域
+
+  opts.area = new Array(4);
+  //复位绘图区域
+  for (let j = 0; j < 4; j++) {
+    opts.area[j] = opts.padding[j];
+  }
+
+  //通过计算三大区域：图例、X轴、Y轴的大小，确定绘图区域
+  var _calLegendData = calLegendData(seriesMA, opts, config, opts.chartData),
+    legendHeight = _calLegendData.area.wholeHeight,
+    legendWidth = _calLegendData.area.wholeWidth;
+    
+  switch (opts.legend.position) {
+    case 'top':
+      opts.area[0] += legendHeight;
+      break;
+    case 'bottom':
+      opts.area[2] += legendHeight;
+      break;
+    case 'left':
+      opts.area[3] += legendWidth;
+      break;
+    case 'right':
+      opts.area[1] += legendWidth;
+      break;
+  }
+
+  let _calYAxisData = {},yAxisWidth = 0;
+  if (opts.type === 'line' || opts.type === 'column' || opts.type === 'area' || opts.type === 'mix' || opts.type === 'candle') {
+    _calYAxisData = calYAxisData(series, opts, config);
+    yAxisWidth = _calYAxisData.yAxisWidth;
+    //如果显示Y轴标题
+    if(opts.yAxis.showTitle){
+      let maxTitleHeight=0;
+      for(let i=0;i<opts.yAxis.data.length;i++){
+        maxTitleHeight = Math.max(maxTitleHeight,opts.yAxis.data[i].titleFontSize?opts.yAxis.data[i].titleFontSize:config.fontSize)
+      }
+      opts.area[0] += (maxTitleHeight+6)*opts.pixelRatio;
+    }
+    let rightIndex=0,leftIndex=0;
+    //计算主绘图区域左右位置
+    for(let i=0;i<yAxisWidth.length;i++){
+      if(yAxisWidth[i].position=='left'){
+        if(leftIndex>0){
+          opts.area[3] += yAxisWidth[i].width + opts.yAxis.padding;
+        }else{
+          opts.area[3] += yAxisWidth[i].width;
+        }
+        leftIndex +=1;
+      }else{
+        if(rightIndex>0){
+          opts.area[1] += yAxisWidth[i].width + opts.yAxis.padding;
+        }else{
+          opts.area[1] += yAxisWidth[i].width;
+        }
+        rightIndex +=1;
+      }
+    }
+  }else{
+    config.yAxisWidth = yAxisWidth;
+  }
+  opts.chartData.yAxisData = _calYAxisData;
+
+  if (opts.categories && opts.categories.length) {
+    opts.chartData.xAxisData = getXAxisPoints(opts.categories, opts, config);
+    let _calCategoriesData = calCategoriesData(opts.categories, opts, config, opts.chartData.xAxisData.eachSpacing),
+      xAxisHeight = _calCategoriesData.xAxisHeight,
+      angle = _calCategoriesData.angle;
+    config.xAxisHeight = xAxisHeight;
+    config._xAxisTextAngle_ = angle;
+    opts.area[2] += xAxisHeight;
+    opts.chartData.categoriesData = _calCategoriesData;
+  }else{
+		if (opts.type === 'line' || opts.type === 'area' || opts.type === 'points') {
+			opts.chartData.xAxisData = calXAxisData(series, opts, config);
+			categories=opts.chartData.xAxisData.rangesFormat;
+			let _calCategoriesData = calCategoriesData(categories, opts, config, opts.chartData.xAxisData.eachSpacing),
+			  xAxisHeight = _calCategoriesData.xAxisHeight,
+			  angle = _calCategoriesData.angle;
+			config.xAxisHeight = xAxisHeight;
+			config._xAxisTextAngle_ = angle;
+			opts.area[2] += xAxisHeight;
+			opts.chartData.categoriesData = _calCategoriesData;
+		}else{
+			opts.chartData.xAxisData={
+				xAxisPoints: []
+			};
+		}
+	}
+  //计算右对齐偏移距离
+  if (opts.enableScroll && opts.xAxis.scrollAlign == 'right' && opts._scrollDistance_ === undefined) {
+    let offsetLeft = 0,
+      xAxisPoints = opts.chartData.xAxisData.xAxisPoints,
+      startX = opts.chartData.xAxisData.startX,
+      endX = opts.chartData.xAxisData.endX,
+      eachSpacing = opts.chartData.xAxisData.eachSpacing;
+    let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+    let screenWidth = endX - startX;
+    offsetLeft = screenWidth - totalWidth;
+    _this.scrollOption = {
+      currentOffset: offsetLeft,
+      startTouchX: offsetLeft,
+      distance: 0,
+      lastMoveTime: 0
+    };
+    opts._scrollDistance_ = offsetLeft;
+  }
+
+  if (type === 'pie' || type === 'ring' || type === 'rose') {
+    config._pieTextMaxLength_ = opts.dataLabel === false ? 0 : getPieTextMaxLength(seriesMA);
+  }
+
+  switch (type) {
+    case 'word':
+      let wordOption = assign({},{
+        type: 'normal',
+        autoColors: true
+      },opts.extra.word);
+      if(opts.updateData==true || opts.updateData==undefined){
+        opts.chartData.wordCloudData=getWordCloudPoint(opts,wordOption.type);
+      }
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawWordCloudDataPoints(series, opts, config, context,process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+    break;
+    case 'map':
+      context.clearRect(0, 0, opts.width, opts.height);
+      drawMapDataPoints(series, opts, config, context);
+    break;
+    case 'funnel':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.funnelData = drawFunnelDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+    break;
+    case 'line':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawLineDataPoints = drawLineDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawLineDataPoints.xAxisPoints,
+            calPoints = _drawLineDataPoints.calPoints,
+            eachSpacing = _drawLineDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'mix':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawMixDataPoints = drawMixDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawMixDataPoints.xAxisPoints,
+            calPoints = _drawMixDataPoints.calPoints,
+            eachSpacing = _drawMixDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'column':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawColumnDataPoints = drawColumnDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawColumnDataPoints.xAxisPoints,
+            calPoints = _drawColumnDataPoints.calPoints,
+            eachSpacing = _drawColumnDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'area':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawAreaDataPoints = drawAreaDataPoints(series, opts, config, context, process),
+            xAxisPoints = _drawAreaDataPoints.xAxisPoints,
+            calPoints = _drawAreaDataPoints.calPoints,
+            eachSpacing = _drawAreaDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'ring':
+    case 'pie':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawPieDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'rose':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.pieData = drawRoseDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'radar':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.radarData = drawRadarDataPoints(series, opts, config, context, process);
+          drawLegend(opts.series, opts, config, context, opts.chartData);
+          drawToolTipBridge(opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'arcbar':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.arcbarData = drawArcbarDataPoints(series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'gauge':
+      this.animationInstance = new Animation({
+        timing: 'easeInOut',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          opts.chartData.gaugeData = drawGaugeDataPoints(categories, series, opts, config, context, process);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+    case 'candle':
+      this.animationInstance = new Animation({
+        timing: 'easeIn',
+        duration: duration,
+        onProcess: function onProcess(process) {
+          context.clearRect(0, 0, opts.width, opts.height);
+          if (opts.rotate) {
+            contextRotate(context, opts);
+          }
+          drawYAxisGrid(categories, opts, config, context);
+          drawXAxis(categories, opts, config, context);
+          var _drawCandleDataPoints = drawCandleDataPoints(series, seriesMA, opts, config, context, process),
+            xAxisPoints = _drawCandleDataPoints.xAxisPoints,
+            calPoints = _drawCandleDataPoints.calPoints,
+            eachSpacing = _drawCandleDataPoints.eachSpacing;
+          opts.chartData.xAxisPoints = xAxisPoints;
+          opts.chartData.calPoints = calPoints;
+          opts.chartData.eachSpacing = eachSpacing;
+          drawYAxis(series, opts, config, context);
+          if (opts.enableMarkLine !== false && process === 1) {
+            drawMarkLine(opts, config, context);
+          }
+          if (seriesMA) {
+            drawLegend(seriesMA, opts, config, context, opts.chartData);
+          } else {
+            drawLegend(opts.series, opts, config, context, opts.chartData);
+          }
+          drawToolTipBridge(opts, config, context, process, eachSpacing, xAxisPoints);
+          drawCanvas(opts, context);
+        },
+        onAnimationFinish: function onAnimationFinish() {
+          _this.event.trigger('renderComplete');
+        }
+      });
+      break;
+  }
+}
+
+// simple event implement
+
+function Event() {
+  this.events = {};
+}
+
+Event.prototype.addEventListener = function(type, listener) {
+  this.events[type] = this.events[type] || [];
+  this.events[type].push(listener);
+};
+
+Event.prototype.trigger = function() {
+  for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+    args[_key] = arguments[_key];
+  }
+
+  var type = args[0];
+  var params = args.slice(1);
+  if (!!this.events[type]) {
+    this.events[type].forEach(function(listener) {
+      try {
+        listener.apply(null, params);
+      } catch (e) {
+        console.error(e);
+      }
+    });
+  }
+};
+
+var Charts = function Charts(opts) {
+  opts.pixelRatio = opts.pixelRatio ? opts.pixelRatio : 1;
+  opts.fontSize = opts.fontSize ? opts.fontSize * opts.pixelRatio : 13 * opts.pixelRatio;
+  opts.title = assign({}, opts.title);
+  opts.subtitle = assign({}, opts.subtitle);
+  opts.duration = opts.duration ? opts.duration : 1000;
+  opts.yAxis = assign({}, {
+    data:[],
+    showTitle:false,
+    disabled:false,
+    disableGrid:false,
+    splitNumber:5,
+    gridType: 'solid',
+    dashLength: 4 * opts.pixelRatio,
+    gridColor:'#cccccc',
+    padding:10,
+    fontColor:'#666666'
+  }, opts.yAxis);
+  opts.yAxis.dashLength *= opts.pixelRatio;
+  opts.yAxis.padding *= opts.pixelRatio;
+  opts.xAxis = assign({}, {
+    rotateLabel: false,
+    type: 'calibration',
+    gridType: 'solid',
+    dashLength: 4,
+    scrollAlign: 'left',
+    boundaryGap:'center',
+    axisLine:true,
+    axisLineColor:'#cccccc'
+  }, opts.xAxis);
+  opts.xAxis.dashLength *= opts.pixelRatio;
+  opts.legend = assign({}, {
+    show: true,
+    position: 'bottom',
+    float: 'center',
+    backgroundColor: 'rgba(0,0,0,0)',
+    borderColor: 'rgba(0,0,0,0)',
+    borderWidth: 0,
+    padding: 5,
+    margin: 5,
+    itemGap: 10,
+    fontSize: opts.fontSize,
+    lineHeight: opts.fontSize,
+    fontColor: '#333333',
+    format: {},
+    hiddenColor: '#CECECE'
+  }, opts.legend);
+  opts.legend.borderWidth = opts.legend.borderWidth * opts.pixelRatio;
+  opts.legend.itemGap = opts.legend.itemGap * opts.pixelRatio;
+  opts.legend.padding = opts.legend.padding * opts.pixelRatio;
+  opts.legend.margin = opts.legend.margin * opts.pixelRatio;
+  opts.extra = assign({}, opts.extra);
+  opts.rotate = opts.rotate ? true : false;
+  opts.animation = opts.animation ? true : false;
+	opts.rotate = opts.rotate ? true : false;
+
+  let config$$1 = JSON.parse(JSON.stringify(config));
+  config$$1.colors = opts.colors ? opts.colors : config$$1.colors;
+  config$$1.yAxisTitleWidth = opts.yAxis.disabled !== true && opts.yAxis.title ? config$$1.yAxisTitleWidth : 0;
+  if (opts.type == 'pie' || opts.type == 'ring') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.pie.labelWidth * opts.pixelRatio || config$$1.pieChartLinePadding * opts.pixelRatio;
+  }
+  if (opts.type == 'rose') {
+    config$$1.pieChartLinePadding = opts.dataLabel === false ? 0 : opts.extra.rose.labelWidth * opts.pixelRatio || config$$1.pieChartLinePadding * opts.pixelRatio;
+  }
+  config$$1.pieChartTextPadding = opts.dataLabel === false ? 0 : config$$1.pieChartTextPadding * opts.pixelRatio;
+  config$$1.yAxisSplit = opts.yAxis.splitNumber ? opts.yAxis.splitNumber : config.yAxisSplit;
+
+  //屏幕旋转
+  config$$1.rotate = opts.rotate;
+  if (opts.rotate) {
+    let tempWidth = opts.width;
+    let tempHeight = opts.height;
+    opts.width = tempHeight;
+    opts.height = tempWidth;
+  }
+
+  //适配高分屏
+  opts.padding = opts.padding ? opts.padding : config$$1.padding;
+  for (let i = 0; i < 4; i++) {
+    opts.padding[i] *= opts.pixelRatio;
+  }
+  config$$1.yAxisWidth = config.yAxisWidth * opts.pixelRatio;
+  config$$1.xAxisHeight = config.xAxisHeight * opts.pixelRatio;
+  if (opts.enableScroll && opts.xAxis.scrollShow) {
+    config$$1.xAxisHeight += 6 * opts.pixelRatio;
+  }
+  config$$1.xAxisLineHeight = config.xAxisLineHeight * opts.pixelRatio;
+  config$$1.fontSize = opts.fontSize;
+  config$$1.titleFontSize = config.titleFontSize * opts.pixelRatio;
+  config$$1.subtitleFontSize = config.subtitleFontSize * opts.pixelRatio;
+  config$$1.toolTipPadding = config.toolTipPadding * opts.pixelRatio;
+  config$$1.toolTipLineHeight = config.toolTipLineHeight * opts.pixelRatio;
+  config$$1.columePadding = config.columePadding * opts.pixelRatio;
+  opts.$this = opts.$this ? opts.$this : this;
+  
+  this.context = uni.createCanvasContext(opts.canvasId, opts.$this);
+  /* 兼容原生H5
+  this.context = document.getElementById(opts.canvasId).getContext("2d");
+  this.context.setStrokeStyle = function(e){ return this.strokeStyle=e; }
+  this.context.setLineWidth = function(e){ return this.lineWidth=e; }
+  this.context.setLineCap = function(e){ return this.lineCap=e; }
+  this.context.setFontSize = function(e){ return this.font=e+"px sans-serif"; }
+  this.context.setFillStyle = function(e){ return this.fillStyle=e; }
+  this.context.draw = function(){ }
+  */
+
+  opts.chartData = {};
+  this.event = new Event();
+  this.scrollOption = {
+    currentOffset: 0,
+    startTouchX: 0,
+    distance: 0,
+    lastMoveTime: 0
+  };
+
+  this.opts = opts;
+  this.config = config$$1;
+
+  drawCharts.call(this, opts.type, opts, config$$1, this.context);
+};
+
+Charts.prototype.updateData = function() {
+  let data = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  this.opts = assign({}, this.opts, data);
+  this.opts.updateData = true;
+  let scrollPosition = data.scrollPosition || 'current';
+  switch (scrollPosition) {
+    case 'current':
+      this.opts._scrollDistance_ = this.scrollOption.currentOffset;
+      break;
+    case 'left':
+      this.opts._scrollDistance_ = 0;
+      this.scrollOption = {
+        currentOffset: 0,
+        startTouchX: 0,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      break;
+    case 'right':
+      let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config),
+        yAxisWidth = _calYAxisData.yAxisWidth;
+      this.config.yAxisWidth = yAxisWidth;
+      let offsetLeft = 0;
+      let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+        xAxisPoints = _getXAxisPoints0.xAxisPoints,
+        startX = _getXAxisPoints0.startX,
+        endX = _getXAxisPoints0.endX,
+        eachSpacing = _getXAxisPoints0.eachSpacing;
+      let totalWidth = eachSpacing * (xAxisPoints.length - 1);
+      let screenWidth = endX - startX;
+      offsetLeft = screenWidth - totalWidth;
+      this.scrollOption = {
+        currentOffset: offsetLeft,
+        startTouchX: offsetLeft,
+        distance: 0,
+        lastMoveTime: 0
+      };
+      this.opts._scrollDistance_ = offsetLeft;
+      break;
+  }
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+Charts.prototype.zoom = function() {
+  var val = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : this.opts.xAxis.itemCount;
+  if (this.opts.enableScroll !== true) {
+    console.log('请启用滚动条后使用！')
+    return;
+  }
+  //当前屏幕中间点
+  let centerPoint = Math.round(Math.abs(this.scrollOption.currentOffset) / this.opts.chartData.eachSpacing) + Math.round(
+    this.opts.xAxis.itemCount / 2);
+  this.opts.animation = false;
+  this.opts.xAxis.itemCount = val.itemCount;
+  //重新计算x轴偏移距离
+  let _calYAxisData = calYAxisData(this.opts.series, this.opts, this.config),
+    yAxisWidth = _calYAxisData.yAxisWidth;
+  this.config.yAxisWidth = yAxisWidth;
+  let offsetLeft = 0;
+  let _getXAxisPoints0 = getXAxisPoints(this.opts.categories, this.opts, this.config),
+    xAxisPoints = _getXAxisPoints0.xAxisPoints,
+    startX = _getXAxisPoints0.startX,
+    endX = _getXAxisPoints0.endX,
+    eachSpacing = _getXAxisPoints0.eachSpacing;
+  let centerLeft = eachSpacing * centerPoint;
+  let screenWidth = endX - startX;
+  let MaxLeft = screenWidth - eachSpacing * (xAxisPoints.length - 1);
+  offsetLeft = screenWidth / 2 - centerLeft;
+  if (offsetLeft > 0) {
+    offsetLeft = 0;
+  }
+  if (offsetLeft < MaxLeft) {
+    offsetLeft = MaxLeft;
+  }
+  this.scrollOption = {
+    currentOffset: offsetLeft,
+    startTouchX: offsetLeft,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  this.opts._scrollDistance_ = offsetLeft;
+  drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+};
+
+Charts.prototype.stopAnimation = function() {
+  this.animationInstance && this.animationInstance.stop();
+};
+
+Charts.prototype.addEventListener = function(type, listener) {
+  this.event.addEventListener(type, listener);
+};
+
+Charts.prototype.getCurrentDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose') {
+      return findPieChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.pieData);
+    } else if (this.opts.type === 'radar') {
+      return findRadarChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.radarData, this.opts.categories.length);
+    } else if (this.opts.type === 'funnel') {
+      return findFunnelChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.funnelData);
+    } else if (this.opts.type === 'map') {
+      return findMapChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts);
+    }else if (this.opts.type === 'word') {
+      return findWordChartCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.wordCloudData);
+    } else {
+      return findCurrentIndex({
+        x: _touches$.x,
+        y: _touches$.y
+      }, this.opts.chartData.calPoints, this.opts, this.config, Math.abs(this.scrollOption.currentOffset));
+    }
+  }
+  return -1;
+};
+
+Charts.prototype.getLegendDataIndex = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    let _touches$ = getTouches(touches, this.opts, e);
+    return findLegendIndex({
+      x: _touches$.x,
+      y: _touches$.y
+    }, this.opts.chartData.legendData);
+  }
+  return -1;
+};
+
+Charts.prototype.touchLegend = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var index = this.getLegendDataIndex(e);
+    if (index >= 0) {
+      this.opts.series[index].show = !this.opts.series[index].show;
+      this.opts.animation = option.animation ? true : false;
+			this.opts._scrollDistance_= this.scrollOption.currentOffset;
+      drawCharts.call(this, this.opts.type, this.opts, this.config, this.context);
+    }
+  }
+
+};
+
+Charts.prototype.showToolTip = function(e) {
+  var option = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (!touches) {
+    console.log("touchError");
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  var currentOffset = this.scrollOption.currentOffset;
+  var opts = assign({}, this.opts, {
+    _scrollDistance_: currentOffset,
+    animation: false
+  });
+  if (this.opts.type === 'line' || this.opts.type === 'area' || this.opts.type === 'column') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getToolTipData(seriesData, this.opts.chartData.calPoints, index, this.opts.categories,option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'mix') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getMixToolTipData = getMixToolTipData(seriesData, this.opts.chartData.calPoints, index, this.opts.categories,option),
+          textList = _getMixToolTipData.textList,
+          offset = _getMixToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'candle') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var _getToolTipData = getCandleToolTipData(this.opts.series[0].data, seriesData, this.opts.chartData.calPoints,
+            index, this.opts.categories, this.opts.extra.candle, option),
+          textList = _getToolTipData.textList,
+          offset = _getToolTipData.offset;
+        offset.y = _touches$.y;
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'pie' || this.opts.type === 'ring' || this.opts.type === 'rose'||this.opts.type === 'funnel' ) {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = this.opts._series_[index];
+      var textList = [{
+        text: option.format ? option.format(seriesData) : seriesData.name + ': ' + seriesData.data,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: textList,
+        offset: offset,
+        option: option,
+        index: index
+      };
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'map'||this.opts.type === 'word') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = this.opts._series_[index];
+      var textList = [{
+        text: option.format ? option.format(seriesData) : seriesData.properties.name ,
+        color: seriesData.color
+      }];
+      var offset = {
+        x: _touches$.x,
+        y: _touches$.y
+      };
+      opts.tooltip = {
+        textList: textList,
+        offset: offset,
+        option: option,
+        index: index
+      };
+    }
+    opts.updateData = false;
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+  if (this.opts.type === 'radar') {
+    var index = this.getCurrentDataIndex(e);
+    if (index > -1) {
+      var currentOffset = this.scrollOption.currentOffset;
+      var opts = assign({}, this.opts, {
+        _scrollDistance_: currentOffset,
+        animation: false
+      });
+      var seriesData = getSeriesDataItem(this.opts.series, index);
+      if (seriesData.length !== 0) {
+        var textList = seriesData.map(function(item) {
+          return {
+            text: option.format ? option.format(item) : item.name + ': ' + item.data,
+            color: item.color
+          };
+        });
+        var offset = {
+          x: _touches$.x,
+          y: _touches$.y
+        };
+        opts.tooltip = {
+          textList: textList,
+          offset: offset,
+          option: option,
+          index: index
+        };
+      }
+    }
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+  }
+};
+
+Charts.prototype.translate = function(distance) {
+  this.scrollOption = {
+    currentOffset: distance,
+    startTouchX: distance,
+    distance: 0,
+    lastMoveTime: 0
+  };
+  let opts = assign({}, this.opts, {
+    _scrollDistance_: distance,
+    animation: false
+  });
+  drawCharts.call(this, this.opts.type, opts, this.config, this.context);
+};
+
+Charts.prototype.scrollStart = function(e) {
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  var _touches$ = getTouches(touches, this.opts, e);
+  if (touches && this.opts.enableScroll === true) {
+    this.scrollOption.startTouchX = _touches$.x;
+  }
+};
+
+Charts.prototype.scroll = function(e) {
+  if (this.scrollOption.lastMoveTime === 0) {
+    this.scrollOption.lastMoveTime = Date.now();
+  }
+  let Limit = this.opts.extra.touchMoveLimit || 20;
+  let currMoveTime = Date.now();
+  let duration = currMoveTime - this.scrollOption.lastMoveTime;
+  if (duration < Math.floor(1000 / Limit)) return;
+  this.scrollOption.lastMoveTime = currMoveTime;
+  var touches = null;
+  if (e.changedTouches) {
+    touches = e.changedTouches[0];
+  } else {
+    touches = e.mp.changedTouches[0];
+  }
+  if (touches && this.opts.enableScroll === true) {
+    var _touches$ = getTouches(touches, this.opts, e);
+    var _distance;
+    _distance = _touches$.x - this.scrollOption.startTouchX;
+    var currentOffset = this.scrollOption.currentOffset;
+    var validDistance = calValidDistance(this,currentOffset + _distance, this.opts.chartData, this.config, this.opts);
+    this.scrollOption.distance = _distance = validDistance - currentOffset;
+    var opts = assign({}, this.opts, {
+      _scrollDistance_: currentOffset + _distance,
+      animation: false
+    });
+    drawCharts.call(this, opts.type, opts, this.config, this.context);
+    return currentOffset + _distance;
+  }
+};
+
+Charts.prototype.scrollEnd = function(e) {
+  if (this.opts.enableScroll === true) {
+    var _scrollOption = this.scrollOption,
+      currentOffset = _scrollOption.currentOffset,
+      distance = _scrollOption.distance;
+    this.scrollOption.currentOffset = currentOffset + distance;
+    this.scrollOption.distance = 0;
+  }
+};
+if (typeof module === "object" && typeof module.exports === "object") {
+  module.exports = Charts;
+  //export default Charts;//建议使用nodejs的module导出方式，如报错请使用export方式导出
+}
diff --git a/mallplusui-uniapp-app2/components/u-charts/u-charts.min.js b/mallplusui-uniapp-app2/components/u-charts/u-charts.min.js
new file mode 100644
index 0000000..ba10de5
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/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/mallplusui-uniapp-app2/components/uni-badge/uni-badge.vue b/mallplusui-uniapp-app2/components/uni-badge/uni-badge.vue
new file mode 100644
index 0000000..0f7b430
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-badge/uni-badge.vue
@@ -0,0 +1,101 @@
+<template>
+  <text v-if="text" :class="inverted ? 'uni-badge-' + type + ' uni-badge--' + size + ' uni-badge-inverted' : 'uni-badge-' + type + ' uni-badge--' + size"
+    class="uni-badge" @click="onClick()">{{ text }}</text>
+</template>
+
+<script>
+  export default {
+    name: 'UniBadge',
+    props: {
+      type: {
+        type: String,
+        default: 'default'
+      },
+      inverted: {
+        type: Boolean,
+        default: false
+      },
+      text: {
+        type: String,
+        default: ''
+      },
+      size: { // small.normal
+        type: String,
+        default: 'normal'
+      }
+    },
+    methods: {
+      onClick() {
+        this.$emit('click')
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  $bage-size:12px;
+  $bage-small:scale(0.8);
+
+  .uni-badge {
+    font-family: 'Helvetica Neue', Helvetica, sans-serif;
+    box-sizing: border-box;
+    font-size: $bage-size;
+    line-height: 1;
+    display: inline-block;
+    padding: 3px 6px;
+    color: $uni-text-color;
+    border-radius: 100px;
+    background-color: $uni-bg-color-hover;
+
+    &.uni-badge-inverted {
+      padding: 0 5px 0 0;
+      color: $uni-text-color-grey;
+      background-color: transparent;
+    }
+
+    &-primary {
+      color: $uni-text-color-inverse;
+      background-color: $uni-color-primary;
+
+      &.uni-badge-inverted {
+        color: $uni-color-primary;
+        background-color: transparent
+      }
+    }
+
+    &-success {
+      color: $uni-text-color-inverse;
+      background-color: $uni-color-success;
+
+      &.uni-badge-inverted {
+        color: $uni-color-success;
+        background-color: transparent
+      }
+    }
+
+    &-warning {
+      color: $uni-text-color-inverse;
+      background-color: $uni-color-warning;
+
+      &.uni-badge-inverted {
+        color: $uni-color-warning;
+        background-color: transparent
+      }
+    }
+
+    &-error {
+      color: $uni-text-color-inverse;
+      background-color: $uni-color-error;
+
+      &.uni-badge-inverted {
+        color: $uni-color-error;
+        background-color: transparent
+      }
+    }
+
+    &--small {
+      transform: $bage-small;
+      transform-origin: center center;
+    }
+  }
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-countdown/readme.md b/mallplusui-uniapp-app2/components/uni-countdown/readme.md
new file mode 100644
index 0000000..b879097
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-countdown/readme.md
@@ -0,0 +1,73 @@
+### CountDown 倒计时
+
+倒计时组件，组件名：``uni-countdown``，代码块： uCountDown。
+
+**使用方式：**
+
+在 ``script`` 中引用组件 
+
+```javascript
+import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
+export default {
+    components: {uniCountdown}
+}
+```
+
+一般用法
+
+```html
+<uni-countdown 
+    :day="1" 
+    :hour="1" 
+    :minute="12" 
+    :second="40">
+</uni-countdown>
+```
+
+不显示天数
+
+```html
+<uni-countdown 
+    :show-day="false" 
+    :hour="12" 
+    :minute="12" 
+    :second="12">
+</uni-countdown>
+```
+
+修改颜色
+
+```html
+<uni-countdown 
+    color="#FFFFFF" 
+    background-color="#00B26A" 
+    border-color="#00B26A" 
+    :day="1" 
+    :hour="2" 
+    :minute="30" 
+    :second="0">
+</uni-countdown>
+```
+
+实际效果参考：[https://github.com/dcloudio/uni-ui](https://github.com/dcloudio/uni-ui)
+
+**uniCountDown 属性说明：**
+
+|属性名|类型|默认值	|说明|
+|---|----|---|---|
+|background-color|String|#FFFFFF|背景色|
+|border-color|String|#000000|边框颜色|
+|color	|String	|#000000|文字颜色|
+|splitor-color|String|#000000|割符号颜色|
+|day|Number|0|天数|
+|hour|Number|0|小时|
+|minute|Number|0|分钟|
+|second|Number|0|秒|
+|show-day|Boolean|true|是否显示天数|
+|show-colon|Boolean|true|是否以冒号为分隔符|
+
+**uniCountDown 事件说明：**
+
+|事件称名|说明|返回参数|
+|---|----|---|
+|timeup|倒计时时间到触发事件|-|
diff --git a/mallplusui-uniapp-app2/components/uni-countdown/uni-countdown.vue b/mallplusui-uniapp-app2/components/uni-countdown/uni-countdown.vue
new file mode 100644
index 0000000..d2ce202
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-countdown/uni-countdown.vue
@@ -0,0 +1,156 @@
+<template>
+	<view class="uni-countdown">
+		<view v-if="showDay && d!=0" class="uni-countdown__number" :style="{borderColor:borderColor, color:color, background:backgroundColor}">{{d}}</view>
+		<view v-if="showDay  && d!=0" class="uni-countdown__splitor" :style="{color:textColor}">天</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color, background:backgroundColor}">{{h}}</view>
+		<view class="uni-countdown__splitor" :style="{color:textColor}">{{showColon ? ':' : '时'}}</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color, background:backgroundColor}">{{i}}</view>
+		<view class="uni-countdown__splitor" :style="{color:textColor}">{{showColon ? ':' : '分'}}</view>
+		<view class="uni-countdown__number" :style="{borderColor:borderColor, color:color, background:backgroundColor}">{{s}}</view>
+		<view v-if="!showColon" class="uni-countdown__splitor" :style="{color:textColor}">秒</view>
+	</view>
+</template>
+<script>
+    export default {
+        name: "uni-countdown",
+        props: {
+            showDay: {
+                type: Boolean,
+                default: true
+            },
+            showColon: {
+                type: Boolean,
+                default: true
+            },
+            backgroundColor: {
+                type: String,
+                default: "#FFFFFF"
+            },
+            borderColor: {
+                type: String,
+                default: "#000000"
+            },
+            color: {
+                type: String,
+                // value: "#000000"
+            },
+			textColor: {
+				type: String,
+				default: "#000000"
+			},
+            splitorColor: {
+                type: String,
+                default: "#000"
+            },
+            day: {
+                type: Number,
+                default: 0
+            },
+            hour: {
+                type: Number,
+                default: 0
+            },
+            minute: {
+                type: Number,
+                default: 0
+            },
+            second: {
+                type: Number,
+                default: 0
+            }
+        },
+        data() {
+            return {
+                timer: null,
+                d: '00',
+                h: '00',
+                i: '00',
+                s: '00',
+                leftTime: 0,
+                seconds: 0
+            }
+        },
+        created: function(e) {
+            this.seconds = this.toSeconds(this.day, this.hour, this.minute, this.second)
+            this.countDown()
+            this.timer = setInterval(() => {
+                this.seconds--
+                if (this.seconds < 0) {
+                    this.timeUp()
+                    return
+                }
+                this.countDown()
+            }, 1000)
+        },
+        beforeDestroy() {
+            clearInterval(this.timer)
+        },
+        methods: {
+            toSeconds(day, hours, minutes, seconds) {
+                return (day * 60 * 60 * 24) + (hours * 60 * 60) + (minutes * 60) + seconds
+            },
+            timeUp() {
+                clearInterval(this.timer)
+                this.$emit('timeup')
+            },
+            countDown() {
+                let seconds = this.seconds
+                let [day, hour, minute, second] = [0, 0, 0, 0]
+                if (seconds > 0) {
+                    day = Math.floor(seconds / (60 * 60 * 24))
+                    hour = Math.floor(seconds / (60 * 60)) - (day * 24)
+                    minute = Math.floor(seconds / 60) - (day * 24 * 60) - (hour * 60)
+                    second = Math.floor(seconds) - (day * 24 * 60 * 60) - (hour * 60 * 60) - (minute * 60)
+                } else {
+                    this.timeUp()
+                }
+                if (day < 10) {
+                    day = '0' + day
+                }
+                if (hour < 10) {
+                    hour = '0' + hour
+                }
+                if (minute < 10) {
+                    minute = '0' + minute
+                }
+                if (second < 10) {
+                    second = '0' + second
+                }
+                this.d = day
+                this.h = hour
+                this.i = minute
+                this.s = second
+            }
+        }
+    }
+</script>
+<style lang="scss">
+	$countdown-height:44upx;
+
+	.uni-countdown {
+		padding: 2upx 0;
+		display: inline-flex;
+		flex-wrap: nowrap;
+		justify-content: center;
+
+		&__splitor {
+			justify-content: center;
+			line-height: $countdown-height;
+			padding: 0 5upx;
+			font-size: 24upx;
+			// color: #d0d0d0;
+		}
+
+		&__number {
+			line-height: $countdown-height;
+			justify-content: center;
+			height: $countdown-height;
+			border-radius: $uni-border-radius-base;
+			// margin: 0 5upx;
+			font-size:  24upx;
+			// border: 1px solid #000000;
+			font-size: $uni-font-size-sm;
+			// padding: 0 10upx;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-grid-item/uni-grid-item.vue b/mallplusui-uniapp-app2/components/uni-grid-item/uni-grid-item.vue
new file mode 100644
index 0000000..a705055
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-grid-item/uni-grid-item.vue
@@ -0,0 +1,239 @@
+<template>
+  <view
+    v-if="width"
+    :style="{ width: width }"
+    class="uni-grid-item">
+    <view
+      :class="{ border: showBorder, 'uni-grid-item__box-square': square, 'border-top': showBorder && index < column, 'uni-highlight': highlight }"
+      :style="{ 'border-color': borderColor }"
+      class="uni-grid-item__box"
+      @click="_onClick"
+    >
+      <view
+        v-if="marker === 'dot'"
+        :style="{ left: top + 'px', top: left + 'px' }"
+        class="uni-grid-item__box-dot" />
+      <view
+        v-if="marker === 'badge'"
+        :style="{ left: top + 'px', top: left + 'px' }"
+        class="uni-grid-item__box-badge">
+        <uni-badge
+          :text="text"
+          :type="type"
+          :size="size"
+          :inverted="inverted" />
+      </view>
+      <view
+        v-if="marker === 'image'"
+        :style="{ left: top + 'px', top: left + 'px' }"
+        class="uni-grid-item__box-image">
+        <image
+          :style="{ width: imgWidth + 'px' }"
+          :src="src"
+          class="box-image"
+          mode="widthFix" />
+      </view>
+      <view class="uni-grid-item__box-item"><slot /></view>
+    </view>
+  </view>
+</template>
+
+<script>
+import uniBadge from '@/components/uni-badge/uni-badge.vue'
+
+export default {
+  name: 'UniGridItem',
+  components: { uniBadge },
+  props: {
+    // 类型：可选值，dot：圆点；badge：角标；image：图片
+    marker: {
+      type: String,
+      default: ''
+    },
+    // 水平方向
+    hor: {
+      type: Number,
+      default: 0
+    },
+    // 垂直方向
+    ver: {
+      type: Number,
+      default: 0
+    },
+    // badge 下颜色类型，可选值：default（灰色）、primary（蓝色）、success（绿色）、warning(黄色)、error(红色)
+    type: {
+      type: String,
+      default: ''
+    },
+    // badge 下显示内容，汉字最多为1个
+    text: {
+      type: String,
+      default: ''
+    },
+    // badge 下 Badge 大小
+    size: {
+      type: String,
+      default: 'normal'
+    },
+    // badge 下 是否无需背景颜色
+    inverted: {
+      type: Boolean,
+      default: false
+    },
+    // image 下图片路径
+    src: {
+      type: String,
+      default: ''
+    },
+    // image 下图片宽度 ，最大 为 100 。 默认为 30
+    imgWidth: {
+      type: Number,
+      default: 30
+    }
+  },
+  inject: ['grid'],
+  data () {
+    return {
+      column: 0,
+      showBorder: true,
+      square: true,
+      highlight: true,
+      left: 0,
+      top: 0,
+      index: 0,
+      openNum: 2,
+      width: 0,
+      borderColor: '#d0dee5'
+    }
+  },
+  created () {
+    this.column = this.grid.column
+    this.showBorder = this.grid.showBorder
+    this.square = this.grid.square
+    this.highlight = this.grid.highlight
+    this.top = this.hor === 0 ? this.grid.hor : this.hor
+    this.left = this.ver === 0 ? this.grid.ver : this.ver
+    this.borderColor = this.grid.borderColor
+    this.index = this.grid.index++
+  },
+  // #ifdef H5
+  mounted () {
+    this.grid._getSize(width => {
+      this.width = width
+    })
+  },
+  // #endif
+  // #ifndef H5
+  onReady () {
+    this.grid._getSize(width => {
+      this.width = width
+    })
+  },
+  // #endif
+  methods: {
+    _onClick () {
+      // console.log('点击', this.index);
+      this.grid.change({ detail: { index: this.index } })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.uni-grid-item {
+	box-sizing: border-box;
+	&__box {
+		position: relative;
+		width: 100%;
+		// overflow: hidden;
+		&-item {
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			width: 100%;
+			height: 100%;
+			font-size: 32upx;
+			color: #666;
+			padding: 20upx 0;
+			box-sizing: border-box;
+			.image {
+				width: 50upx;
+				height: 50upx;
+			}
+			.text {
+				font-size: 26upx;
+				margin-top: 10upx;
+			}
+		}
+		&.uni-grid-item__box-square {
+			height: 0;
+			padding-top: 100%;
+			& .uni-grid-item__box-item {
+				position: absolute;
+				top: 0;
+			}
+		}
+		&.border {
+			position: relative;
+			box-sizing: border-box;
+			// box-shadow: 0 0 0 1px #d0dee5;
+			// border-left: 1px #d0dee5 solid;
+			border-bottom: 1px #d0dee5 solid;
+			border-right: 1px #d0dee5 solid;
+			// &::after {
+			// 	content: '';
+			// 	position: absolute;
+			// 	top: 0%;
+			// 	bottom: 0%;
+			// 	left: 0%;
+			// 	right: 0%;
+			// 	border-right: 1px #d0dee5 solid;
+			// 	border-bottom: 1px #d0dee5 solid;
+			// }
+		}
+		&.border-top {
+			border-top: 1px #d0dee5 solid;
+		}
+		&.uni-highlight:active {
+			background-color: #eee;
+		}
+		&-dot,
+		&-badge,
+		&-image {
+			position: absolute;
+			top: 0;
+			right: 0;
+			left: 0;
+			bottom: 0;
+			margin: auto;
+			z-index: 10;
+		}
+		&-dot {
+			width: 20upx;
+			height: 20upx;
+			background: #ff5a5f;
+			border-radius: 50%;
+		}
+		&-badge {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 0;
+			height: 0;
+		}
+		&-image {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			width: 100upx;
+			height: 100upx;
+			overflow: hidden;
+			.box-image {
+				width: 90upx;
+				// height: 100upx;
+			}
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-grid/uni-grid.vue b/mallplusui-uniapp-app2/components/uni-grid/uni-grid.vue
new file mode 100644
index 0000000..7f7fa55
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-grid/uni-grid.vue
@@ -0,0 +1,96 @@
+<template>
+  <view>
+    <view
+      :id="elId"
+      :class="{ border: showBorder }"
+      :style="{ 'border-left': showBorder ? '1px ' + borderColor + ' solid' : 'none' }"
+      class="uni-grid"><slot /></view>
+  </view>
+</template>
+
+<script>
+export default {
+  name: 'UniGrid',
+  props: {
+    // 每列显示个数
+    column: {
+      type: Number,
+      default: 3
+    },
+    // 是否显示边框
+    showBorder: {
+      type: Boolean,
+      default: true
+    },
+    // 是否显示边框
+    borderColor: {
+      type: String,
+      default: '#d0dee5'
+    },
+    // 全局标记水平方向移动距离 ，起点为中心，负数为左移动，正数为右移动
+    hor: {
+      type: Number,
+      default: 0
+    },
+    // 全局标记垂直方向移动距离 ，起点为中心，负数为上移动，正数为下移动
+    ver: {
+      type: Number,
+      default: 0
+    },
+    // 是否正方形显示,默认为 true
+    square: {
+      type: Boolean,
+      default: true
+    },
+    highlight: {
+      type: Boolean,
+      default: true
+    }
+  },
+  provide () {
+    return {
+      grid: this
+    }
+  },
+  data () {
+    const elId = `Uni_${Math.ceil(Math.random() * 10e5).toString(36)}`
+    return {
+      index: 0,
+      elId
+    }
+  },
+  created () {
+    this.index = 0
+    this.childrens = []
+    this.pIndex = this.pIndex ? this.pIndex++ : 0
+  },
+  methods: {
+    change (e) {
+      this.$emit('change', e)
+    },
+    _getSize (fn) {
+      uni.createSelectorQuery()
+        .in(this)
+        .select(`#${this.elId}`)
+        .boundingClientRect()
+        .exec(ret => {
+          if (!ret[0]) {
+            setTimeout(this._getSize(fn))
+            return
+          }
+          let width = parseInt(ret[0].width / this.column) - 1 + 'px'
+          typeof fn === 'function' && fn(width)
+        })
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.uni-grid {
+	display: flex;
+	flex-wrap: wrap;
+	box-sizing: border-box;
+	border-left: 1px #d0dee5 solid;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-icon/readme.md b/mallplusui-uniapp-app2/components/uni-icon/readme.md
new file mode 100644
index 0000000..2ae276a
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-icon/readme.md
@@ -0,0 +1,127 @@
+### Icon 图标
+
+用于展示 icon，组件名：``uni-icon``，代码块： uIcon。
+
+**使用方式：**
+
+在 ``script`` 中引用组件 
+
+```javascript
+import uniIcon from "@/components/uni-icon/uni-icon.vue"
+export default {
+    components: {uniIcon}
+}
+```
+
+在 ``template`` 中使用组件
+
+```html
+<uni-icon type="contact" size="30"></uni-icon>
+```
+
+实际效果参考：[https://github.com/dcloudio/uni-ui](https://github.com/dcloudio/uni-ui)
+
+**Icon 属性说明：**
+
+|属性名		|类型|默认值	|说明|
+|---|----|---|---|
+|type	|String	|-|图标图案，参考下表|
+|color	|String	|-|图标颜色	|
+|size	|Number	|24|图标大小|
+|@click	|EventHandle|-|点击 Icon 触发事件|
+
+**type 类型：**
+
+<div>
+  <link rel="stylesheet" type="text/css" href="https://img-cdn-qiniu.dcloud.net.cn/uniapp/doc/icon1.1.css"/>
+  <ul class="icon-group">
+  	<li class="icon-item"><span class="uni-icon uni-icon-contact"></span><span>contact</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-person"></span><span>person</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-personadd"></span><span>personadd</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-contact-filled"></span><span>contact-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-person-filled"></span><span>person-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-personadd-filled"></span><span>personadd-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-phone"></span><span>phone</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-email"></span><span>email</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-chatbubble"></span><span>chatbubble</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-chatboxes"></span><span>chatboxes</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-phone-filled"></span><span>phone-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-email-filled"></span><span>email-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-chatbubble-filled"></span><span>chatbubble-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-chatboxes-filled"></span><span>chatboxes-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-weibo"></span><span>weibo</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-weixin"></span><span>weixin</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-pengyouquan"></span><span>pengyouquan</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-chat"></span><span>chat</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-qq"></span><span>qq</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-videocam"></span><span>videocam</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-camera"></span><span>camera</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-mic"></span><span>mic</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-location"></span><span>location</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-mic-filled"></span><span>mic-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-location-filled"></span><span>location-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-micoff"></span><span>micoff</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-image"></span><span>image</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-map"></span><span>map</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-compose"></span><span>compose</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-trash"></span><span>trash</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-upload"></span><span>upload</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-download"></span><span>download</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-close"></span><span>close</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-redo"></span><span>redo</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-undo"></span><span>undo</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-refresh"></span><span>refresh</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-star"></span><span>star</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-plus"></span><span>plus</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-minus"></span><span>minus</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-circle"></span><span>circle</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-clear"></span><span>clear</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-refresh-filled"></span><span>refresh-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-star-filled"></span><span>star-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-plus-filled"></span><span>plus-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-minus-filled"></span><span>minus-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-circle-filled"></span><span>circle-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-checkbox-filled"></span><span>checkbox-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-closeempty"></span><span>closeempty</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-refreshempty"></span><span>refreshempty</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-reload"></span><span>reload</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-starhalf"></span><span>starhalf</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-spinner"></span><span>spinner</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-spinner-cycle"></span><span>spinner-cycle</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-search"></span><span>search</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-plusempty"></span><span>plusempty</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-forward"></span><span>forward</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-back"></span><span>back</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-checkmarkempty"></span><span>checkmarkempty</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-home"></span><span>home</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-navigate"></span><span>navigate</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-gear"></span><span>gear</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-paperplane"></span><span>paperplane</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-info"></span><span>info</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-help"></span><span>help</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-locked"></span><span>locked</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-more"></span><span>more</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-flag"></span><span>flag</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-home-filled"></span><span>home-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-gear-filled"></span><span>gear-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-info-filled"></span><span>info-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-help-filled"></span><span>help-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-more-filled"></span><span>more-filled</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-settings"></span><span>settings</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-list"></span><span>list</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-bars"></span><span>bars</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-loop"></span><span>loop</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-paperclip"></span><span>paperclip</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-eye"></span><span>eye</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowup"></span><span>arrowup</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowdown"></span><span>arrowdown</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowleft"></span><span>arrowleft</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowright"></span><span>arrowright</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowthinup"></span><span>arrowthinup</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowthindown"></span><span>arrowthindown</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowthinleft"></span><span>arrowthinleft</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-arrowthinright"></span><span>arrowthinright</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-pulldown"></span><span>pulldown</span></li>
+  	<li class="icon-item"><span class="uni-icon uni-icon-scan"></span><span>scan</span></li>
+  </ul>
+</div>
diff --git a/mallplusui-uniapp-app2/components/uni-icon/uni-icon.vue b/mallplusui-uniapp-app2/components/uni-icon/uni-icon.vue
new file mode 100644
index 0000000..53883c4
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-icon/uni-icon.vue
@@ -0,0 +1,421 @@
+<template>
+	<view class="uni-icon" :class="['uni-icon-'+type]" :style="{color:color,'font-size':fontSize}" @click="onClick()"></view>
+</template>
+
+<script>
+	export default {
+		name: 'uni-icon',
+		props: {
+			/**
+			 * 图标类型
+			 */
+			type: String,
+			/**
+			 * 图标颜色
+			 */
+			color: String,
+			/**
+			 * 图标大小
+			 */
+			size: [Number, String]
+		},
+		computed: {
+			fontSize() {
+				return `${this.size}px`
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style>
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+		src: url(data:font/truetype;charset=utf-8;base64,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PDgtsDEssAAWILAJI0IgICBGI0ewACsjYTgtsDIssAAWsAMlsAIlRyNHI2GwAFRYLiA8IyEbsAIlsAIlRyNHI2EgsAUlsAQlRyNHI2GwBiWwBSVJsAIlYbABRWMjIFhiGyFZY7ABRWJgIy4jICA8ijgjIVktsDMssAAWILAJQyAuRyNHI2EgYLAgYGawgGIjICA8ijgtsDQsIyAuRrACJUZSWCA8WS6xJAEUKy2wNSwjIC5GsAIlRlBYIDxZLrEkARQrLbA2LCMgLkawAiVGUlggPFkjIC5GsAIlRlBYIDxZLrEkARQrLbA3LLAuKyMgLkawAiVGUlggPFkusSQBFCstsDgssC8riiAgPLAEI0KKOCMgLkawAiVGUlggPFkusSQBFCuwBEMusCQrLbA5LLAAFrAEJbAEJiAuRyNHI2GwBkUrIyA8IC4jOLEkARQrLbA6LLEJBCVCsAAWsAQlsAQlIC5HI0cjYSCwBCNCsAZFKyCwYFBYILBAUVizAiADIBuzAiYDGllCQiMgR7AEQ7CAYmAgsAArIIqKYSCwAkNgZCOwA0NhZFBYsAJDYRuwA0NgWbADJbCAYmGwAiVGYTgjIDwjOBshICBGI0ewACsjYTghWbEkARQrLbA7LLAuKy6xJAEUKy2wPCywLyshIyAgPLAEI0IjOLEkARQrsARDLrAkKy2wPSywABUgR7AAI0KyAAEBFRQTLrAqKi2wPiywABUgR7AAI0KyAAEBFRQTLrAqKi2wPyyxAAEUE7ArKi2wQCywLSotsEEssAAWRSMgLiBGiiNhOLEkARQrLbBCLLAJI0KwQSstsEMssgAAOistsEQssgABOistsEUssgEAOistsEYssgEBOistsEcssgAAOystsEgssgABOystsEkssgEAOystsEossgEBOystsEsssgAANystsEwssgABNystsE0ssgEANystsE4ssgEBNystsE8ssgAAOSstsFAssgABOSstsFEssgEAOSstsFIssgEBOSstsFMssgAAPCstsFQssgABPCstsFUssgEAPCstsFYssgEBPCstsFcssgAAOCstsFgssgABOCstsFkssgEAOCstsFossgEBOCstsFsssDArLrEkARQrLbBcLLAwK7A0Ky2wXSywMCuwNSstsF4ssAAWsDArsDYrLbBfLLAxKy6xJAEUKy2wYCywMSuw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AVkBWgFbAVwBXQd1bmlFMTAwB3VuaUUxMDEHdW5pRTEwMgd1bmlFMTMwB3VuaUUxMzEHdW5pRTEzMgd1bmlFMjAwB3VuaUUyMDEHdW5pRTIwMgd1bmlFMjAzB3VuaUUyMzAHdW5pRTIzMQd1bmlFMjMyB3VuaUUyMzMHdW5pRTI2MAd1bmlFMjYxB3VuaUUyNjIHdW5pRTI2Mwd1bmlFMjY0B3VuaUUzMDAHdW5pRTMwMQd1bmlFMzAyB3VuaUUzMDMHdW5pRTMzMgd1bmlFMzMzB3VuaUUzNjAHdW5pRTM2Mwd1bmlFMzY0B3VuaUU0MDAHdW5pRTQwMQd1bmlFNDAyB3VuaUU0MDMHdW5pRTQwNAd1bmlFNDA1B3VuaUU0MDYHdW5pRTQwNwd1bmlFNDA4B3VuaUU0MDkHdW5pRTQxMAd1bmlFNDExB3VuaUU0MTMHdW5pRTQzNAd1bmlFNDM3B3VuaUU0MzgHdW5pRTQzOQd1bmlFNDQwB3VuaUU0NDEHdW5pRTQ0Mgd1bmlFNDQzB3VuaUU0NjAHdW5pRTQ2MQd1bmlFNDYyB3VuaUU0NjMHdW5pRTQ2NAd1bmlFNDY1B3VuaUU0NjYHdW5pRTQ2OAd1bmlFNDcwB3VuaUU0NzEHdW5pRTQ3Mgd1bmlFNTAwB3VuaUU1MDEHdW5pRTUwMgd1bmlFNTAzB3VuaUU1MDQHdW5pRTUwNQd1bmlFNTA2B3VuaUU1MDcHdW5pRTUwOAd1bmlFNTMwB3VuaUU1MzIHdW5pRTUzNAd1bmlFNTM1B3VuaUU1MzcHdW5pRTU2MAd1bmlFNTYyB3VuaUU1NjMHdW5pRTU2NQd1bmlFNTY3B3VuaUU1NjgHdW5pRTU4MAd1bmlFNTgxB3VuaUU1ODIHdW5pRTU4Mwd1bmlFNTg0B3VuaUU1ODUHdW5pRTU4Ngd1bmlFNTg3B3VuaUU1ODgHdW5pRTU4OQRFdXJvBEV1cm8AAQAB//8ADwABAAAADAAAABYAAAACAAEAAQBfAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANJrTZkAAAAA2DhhuQ==) format('truetype');
+	}
+
+	.uni-icon {
+		font-family: uniicons;
+		font-size: 24px;
+		font-weight: normal;
+		font-style: normal;
+		line-height: 1;
+		display: inline-block;
+		text-decoration: none;
+		-webkit-font-smoothing: antialiased;
+	}
+
+	.uni-icon.uni-active {
+		color: #007aff;
+	}
+
+	.uni-icon-contact:before {
+		content: '\e100';
+	}
+
+	.uni-icon-person:before {
+		content: '\e101';
+	}
+
+	.uni-icon-personadd:before {
+		content: '\e102';
+	}
+
+	.uni-icon-contact-filled:before {
+		content: '\e130';
+	}
+
+	.uni-icon-person-filled:before {
+		content: '\e131';
+	}
+
+	.uni-icon-personadd-filled:before {
+		content: '\e132';
+	}
+
+	.uni-icon-phone:before {
+		content: '\e200';
+	}
+
+	.uni-icon-email:before {
+		content: '\e201';
+	}
+
+	.uni-icon-chatbubble:before {
+		content: '\e202';
+	}
+
+	.uni-icon-chatboxes:before {
+		content: '\e203';
+	}
+
+	.uni-icon-phone-filled:before {
+		content: '\e230';
+	}
+
+	.uni-icon-email-filled:before {
+		content: '\e231';
+	}
+
+	.uni-icon-chatbubble-filled:before {
+		content: '\e232';
+	}
+
+	.uni-icon-chatboxes-filled:before {
+		content: '\e233';
+	}
+
+	.uni-icon-weibo:before {
+		content: '\e260';
+	}
+
+	.uni-icon-weixin:before {
+		content: '\e261';
+	}
+
+	.uni-icon-pengyouquan:before {
+		content: '\e262';
+	}
+
+	.uni-icon-chat:before {
+		content: '\e263';
+	}
+
+	.uni-icon-qq:before {
+		content: '\e264';
+	}
+
+	.uni-icon-videocam:before {
+		content: '\e300';
+	}
+
+	.uni-icon-camera:before {
+		content: '\e301';
+	}
+
+	.uni-icon-mic:before {
+		content: '\e302';
+	}
+
+	.uni-icon-location:before {
+		content: '\e303';
+	}
+
+	.uni-icon-mic-filled:before,
+	.uni-icon-speech:before {
+		content: '\e332';
+	}
+
+	.uni-icon-location-filled:before {
+		content: '\e333';
+	}
+
+	.uni-icon-micoff:before {
+		content: '\e360';
+	}
+
+	.uni-icon-image:before {
+		content: '\e363';
+	}
+
+	.uni-icon-map:before {
+		content: '\e364';
+	}
+
+	.uni-icon-compose:before {
+		content: '\e400';
+	}
+
+	.uni-icon-trash:before {
+		content: '\e401';
+	}
+
+	.uni-icon-upload:before {
+		content: '\e402';
+	}
+
+	.uni-icon-download:before {
+		content: '\e403';
+	}
+
+	.uni-icon-close:before {
+		content: '\e404';
+	}
+
+	.uni-icon-redo:before {
+		content: '\e405';
+	}
+
+	.uni-icon-undo:before {
+		content: '\e406';
+	}
+
+	.uni-icon-refresh:before {
+		content: '\e407';
+	}
+
+	.uni-icon-star:before {
+		content: '\e408';
+	}
+
+	.uni-icon-plus:before {
+		content: '\e409';
+	}
+
+	.uni-icon-minus:before {
+		content: '\e410';
+	}
+
+	.uni-icon-circle:before,
+	.uni-icon-checkbox:before {
+		content: '\e411';
+	}
+
+	.uni-icon-close-filled:before,
+	.uni-icon-clear:before {
+		content: '\e434';
+	}
+
+	.uni-icon-refresh-filled:before {
+		content: '\e437';
+	}
+
+	.uni-icon-star-filled:before {
+		content: '\e438';
+	}
+
+	.uni-icon-plus-filled:before {
+		content: '\e439';
+	}
+
+	.uni-icon-minus-filled:before {
+		content: '\e440';
+	}
+
+	.uni-icon-circle-filled:before {
+		content: '\e441';
+	}
+
+	.uni-icon-checkbox-filled:before {
+		content: '\e442';
+	}
+
+	.uni-icon-closeempty:before {
+		content: '\e460';
+	}
+
+	.uni-icon-refreshempty:before {
+		content: '\e461';
+	}
+
+	.uni-icon-reload:before {
+		content: '\e462';
+	}
+
+	.uni-icon-starhalf:before {
+		content: '\e463';
+	}
+
+	.uni-icon-spinner:before {
+		content: '\e464';
+	}
+
+	.uni-icon-spinner-cycle:before {
+		content: '\e465';
+	}
+
+	.uni-icon-search:before {
+		content: '\e466';
+	}
+
+	.uni-icon-plusempty:before {
+		content: '\e468';
+	}
+
+	.uni-icon-forward:before {
+		content: '\e470';
+	}
+
+	.uni-icon-back:before,
+	.uni-icon-left-nav:before {
+		content: '\e471';
+	}
+
+	.uni-icon-checkmarkempty:before {
+		content: '\e472';
+	}
+
+	.uni-icon-home:before {
+		content: '\e500';
+	}
+
+	.uni-icon-navigate:before {
+		content: '\e501';
+	}
+
+	.uni-icon-gear:before {
+		content: '\e502';
+	}
+
+	.uni-icon-paperplane:before {
+		content: '\e503';
+	}
+
+	.uni-icon-info:before {
+		content: '\e504';
+	}
+
+	.uni-icon-help:before {
+		content: '\e505';
+	}
+
+	.uni-icon-locked:before {
+		content: '\e506';
+	}
+
+	.uni-icon-more:before {
+		content: '\e507';
+	}
+
+	.uni-icon-flag:before {
+		content: '\e508';
+	}
+
+	.uni-icon-home-filled:before {
+		content: '\e530';
+	}
+
+	.uni-icon-gear-filled:before {
+		content: '\e532';
+	}
+
+	.uni-icon-info-filled:before {
+		content: '\e534';
+	}
+
+	.uni-icon-help-filled:before {
+		content: '\e535';
+	}
+
+	.uni-icon-more-filled:before {
+		content: '\e537';
+	}
+
+	.uni-icon-settings:before {
+		content: '\e560';
+	}
+
+	.uni-icon-list:before {
+		content: '\e562';
+	}
+
+	.uni-icon-bars:before {
+		content: '\e563';
+	}
+
+	.uni-icon-loop:before {
+		content: '\e565';
+	}
+
+	.uni-icon-paperclip:before {
+		content: '\e567';
+	}
+
+	.uni-icon-eye:before {
+		content: '\e568';
+	}
+
+	.uni-icon-arrowup:before {
+		content: '\e580';
+	}
+
+	.uni-icon-arrowdown:before {
+		content: '\e581';
+	}
+
+	.uni-icon-arrowleft:before {
+		content: '\e582';
+	}
+
+	.uni-icon-arrowright:before {
+		content: '\e583';
+	}
+
+	.uni-icon-arrowthinup:before {
+		content: '\e584';
+	}
+
+	.uni-icon-arrowthindown:before {
+		content: '\e585';
+	}
+
+	.uni-icon-arrowthinleft:before {
+		content: '\e586';
+	}
+
+	.uni-icon-arrowthinright:before {
+		content: '\e587';
+	}
+
+	.uni-icon-pulldown:before {
+		content: '\e588';
+	}
+
+	.uni-icon-closefill:before {
+		content: '\e589';
+	}
+
+	.uni-icon-sound:before {
+		content: "\e590";
+	}
+
+	.uni-icon-scan:before {
+		content: "\e612";
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-load-more/uni-load-more.vue b/mallplusui-uniapp-app2/components/uni-load-more/uni-load-more.vue
new file mode 100644
index 0000000..6c43365
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-load-more/uni-load-more.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="uni-load-more">
+		<view class="uni-load-more__img" v-show="status === 'loading' && showIcon">
+			<view class="load1">
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+			</view>
+			<view class="load2">
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+			</view>
+			<view class="load3">
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+				<view :style="{background:color}"></view>
+			</view>
+		</view>
+		<text class="uni-load-more__text" :style="{color:color}">{{status === 'more' ? contentText.contentdown : (status === 'loading' ? contentText.contentrefresh : contentText.contentnomore)}}</text>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "uni-load-more",
+		props: {
+			status: {
+				//上拉的状态：more-loading前；loading-loading中；noMore-没有更多了
+				type: String,
+				default: 'more'
+			},
+			showIcon: {
+				type: Boolean,
+				default: true
+			},
+			color: {
+				type: String,
+				default: "#777777"
+			},
+			contentText: {
+				type: Object,
+				default () {
+					return {
+						contentdown: "上拉显示更多",
+						contentrefresh: "正在加载...",
+						contentnomore: "没有更多数据了"
+					};
+				}
+			}
+		},
+		data() {
+			return {}
+		}
+	}
+</script>
+
+<style>
+	@charset "UTF-8";
+
+	.uni-load-more {
+		display: flex;
+		flex-direction: row;
+		height: 80upx;
+		align-items: center;
+		justify-content: center
+	}
+
+	.uni-load-more__text {
+		font-size: 28upx;
+		color: #999
+	}
+
+	.uni-load-more__img {
+		height: 24px;
+		width: 24px;
+		margin-right: 10px
+	}
+
+	.uni-load-more__img>view {
+		position: absolute
+	}
+
+	.uni-load-more__img>view view {
+		width: 6px;
+		height: 2px;
+		border-top-left-radius: 1px;
+		border-bottom-left-radius: 1px;
+		background: #999;
+		position: absolute;
+		opacity: .2;
+		transform-origin: 50%;
+		animation: load 1.56s ease infinite
+	}
+
+	.uni-load-more__img>view view:nth-child(1) {
+		transform: rotate(90deg);
+		top: 2px;
+		left: 9px
+	}
+
+	.uni-load-more__img>view view:nth-child(2) {
+		transform: rotate(180deg);
+		top: 11px;
+		right: 0
+	}
+
+	.uni-load-more__img>view view:nth-child(3) {
+		transform: rotate(270deg);
+		bottom: 2px;
+		left: 9px
+	}
+
+	.uni-load-more__img>view view:nth-child(4) {
+		top: 11px;
+		left: 0
+	}
+
+	.load1,
+	.load2,
+	.load3 {
+		height: 24px;
+		width: 24px
+	}
+
+	.load2 {
+		transform: rotate(30deg)
+	}
+
+	.load3 {
+		transform: rotate(60deg)
+	}
+
+	.load1 view:nth-child(1) {
+		animation-delay: 0s
+	}
+
+	.load2 view:nth-child(1) {
+		animation-delay: .13s
+	}
+
+	.load3 view:nth-child(1) {
+		animation-delay: .26s
+	}
+
+	.load1 view:nth-child(2) {
+		animation-delay: .39s
+	}
+
+	.load2 view:nth-child(2) {
+		animation-delay: .52s
+	}
+
+	.load3 view:nth-child(2) {
+		animation-delay: .65s
+	}
+
+	.load1 view:nth-child(3) {
+		animation-delay: .78s
+	}
+
+	.load2 view:nth-child(3) {
+		animation-delay: .91s
+	}
+
+	.load3 view:nth-child(3) {
+		animation-delay: 1.04s
+	}
+
+	.load1 view:nth-child(4) {
+		animation-delay: 1.17s
+	}
+
+	.load2 view:nth-child(4) {
+		animation-delay: 1.3s
+	}
+
+	.load3 view:nth-child(4) {
+		animation-delay: 1.43s
+	}
+
+	@-webkit-keyframes load {
+		0% {
+			opacity: 1
+		}
+
+		100% {
+			opacity: .2
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/uni-number-box.vue b/mallplusui-uniapp-app2/components/uni-number-box.vue
new file mode 100644
index 0000000..8f626ac
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-number-box.vue
@@ -0,0 +1,199 @@
+<template>
+	<view class="uni-numbox">
+		<view class="uni-numbox-minus" 
+			@click="_calcValue('subtract')"
+		>
+			<text class="yticon icon--jianhao" :class="minDisabled?'uni-numbox-disabled': ''" ></text>
+		</view>
+		<input 
+			class="uni-numbox-value" 
+			type="number" 
+			:disabled="disabled"
+			:value="inputValue" 
+			
+			@blur="_onBlur"
+		>
+		<view 
+			class="uni-numbox-plus" 
+			@click="_calcValue('add')"
+		>
+			<text class="yticon icon-jia2" :class="maxDisabled?'uni-numbox-disabled': ''" ></text>
+		</view>
+	</view>
+</template>
+<script>
+	export default {
+		name: 'uni-number-box',
+		props: {
+			isMax: {
+				type: Boolean,
+				default: false
+			},
+			isMin: {
+				type: Boolean,
+				default: false
+			},
+			index: {
+				type: Number,
+				default: 0
+			},
+			value: {
+				type: Number,
+				default: 0
+			},
+			min: {
+				type: Number,
+				default: -Infinity
+			},
+			max: {
+				type: Number,
+				default: Infinity
+			},
+			step: {
+				type: Number,
+				default: 1
+			},
+			disabled: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				inputValue: this.value,
+				minDisabled: false,
+				maxDisabled: false
+			}
+		},
+		created(){
+			this.maxDisabled = this.isMax;
+			this.minDisabled = this.isMin;
+		},
+		computed: {
+
+		},
+		watch: {
+			inputValue(number) {
+				const data = {
+					number: number,
+					index: this.index
+				}
+				this.$emit('eventChange', data);
+			}
+		},
+		methods: {
+			_calcValue(type) {
+				const scale = this._getDecimalScale();
+				let value = this.inputValue * scale;
+				let newValue = 0;
+				let step = this.step * scale;
+				
+				if(type === 'subtract'){
+					newValue = value - step;
+					if (newValue <= this.min){
+						this.minDisabled = true;
+					}
+					if(newValue < this.min){
+						newValue = this.min
+					}
+					if(newValue < this.max && this.maxDisabled === true){
+						this.maxDisabled = false;
+					}
+				}else if(type === 'add'){
+					newValue = value + step;
+					if (newValue >= this.max){
+						this.maxDisabled = true;
+					}
+					if(newValue > this.max){
+						newValue = this.max
+					}
+					if(newValue > this.min && this.minDisabled === true){
+						this.minDisabled = false;
+					}
+				}
+				if(newValue === value){
+					return;
+				}
+				this.inputValue = newValue / scale;
+			},
+			_getDecimalScale() {
+				let scale = 1;
+				// 浮点型
+				if (~~this.step !== this.step) {
+					scale = Math.pow(10, (this.step + '').split('.')[1].length);
+				}
+				return scale;
+			},
+			_onBlur(event) {
+				let value = event.detail.value;
+				if (!value) {
+					this.inputValue = 0;
+					return
+				}
+				value = +value;
+				if (value > this.max) {
+					value = this.max;
+				} else if (value < this.min) {
+					value = this.min
+				}
+
+				this.inputValue = value
+			}
+		}
+	}
+</script>
+<style>
+	.uni-numbox {
+		position:absolute;
+		left: 30upx;
+		bottom: 0;
+		display: flex;
+		justify-content: flex-start;
+		align-items: center;
+		width:230upx;
+		height: 70upx;
+		background:#f5f5f5;
+	}
+
+	.uni-numbox-minus,
+	.uni-numbox-plus {
+		margin: 0;
+		background-color: #f5f5f5;
+		width: 70upx;
+		height: 100%;
+		line-height: 70upx;
+		text-align: center;
+		position: relative;
+	}
+	.uni-numbox-minus .yticon,
+	.uni-numbox-plus .yticon{
+		font-size: 36upx;
+		color: #555;
+	}
+
+	.uni-numbox-minus {
+		border-right: none;
+		border-top-left-radius: 6upx;
+		border-bottom-left-radius: 6upx;
+	}
+
+	.uni-numbox-plus {
+		border-left: none;
+		border-top-right-radius: 6upx;
+		border-bottom-right-radius: 6upx;
+	}
+
+	.uni-numbox-value {
+		position: relative;
+		background-color: #f5f5f5;
+		width: 90upx;
+		height: 50upx;
+		text-align: center;
+		padding: 0;
+		font-size: 30upx;
+	}
+
+	.uni-numbox-disabled.yticon {
+		color: #d6d6d6;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-rate/readme.md b/mallplusui-uniapp-app2/components/uni-rate/readme.md
new file mode 100644
index 0000000..e0138b3
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-rate/readme.md
@@ -0,0 +1,59 @@
+### Rate 评分
+
+评分组件，组件名：``uni-rate``，代码块： uRate。
+
+**使用方式：**
+
+在 ``script`` 中引用组件 
+
+```javascript
+import uniRate from "@/components/uni-rate/uni-rate.vue"
+export default {
+    components: {uniRate}
+}
+```
+
+基本用法
+
+```html
+<uni-rate value="2"></uni-rate>
+```
+
+自定义星星大小
+
+```html
+<uni-rate size="18" value="5"></uni-rate>
+```
+
+设置评分数
+
+```html
+<uni-rate max="10" value="5"></uni-rate>
+```
+
+不可点击状态
+
+```html
+<uni-rate disabled="true" value="3.5"></uni-rate>
+```
+
+实际效果参考：[https://github.com/dcloudio/uni-ui](https://github.com/dcloudio/uni-ui)
+
+**属性说明：**
+
+|属性名|类型|默认值	|说明|
+|---|----|---|---|
+|value|Number|0|当前评分|
+|max|Number|5|最大的评分|
+|size|Number|24|星星的大小|
+|margin|Number|0|星星的间距|
+|color|String|#ececec|星星的颜色|
+|active-color|String|#ffca3e|选中状态的星星的颜色|
+|is-fill|Boolean|true|星星的类型，是否为实心类型|
+|disabled|Boolean|false|是否为不可点击状态|
+
+**事件说明：**
+
+|事件称名|说明|返回参数|
+|---|----|---|
+|change|Rate 的 value 改变时触发事件，返回参数为Rate的value|{value:Number}|
diff --git a/mallplusui-uniapp-app2/components/uni-rate/uni-rate.vue b/mallplusui-uniapp-app2/components/uni-rate/uni-rate.vue
new file mode 100644
index 0000000..5a12b63
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-rate/uni-rate.vue
@@ -0,0 +1,125 @@
+<template>
+	<view class="uni-rate">
+		<view class="uni-rate-icon" v-for="(star,index) in stars" :key="index" :style="{marginLeft:margin+'px'}" @click="onClick(index)">
+			<uni-icon :size="size" :color="color" :type="isFill === false || isFill === 'false' ? 'star' : 'star-filled'"></uni-icon>
+			<view class="uni-rate-icon-on" :style="{width:star.activeWitch}">
+				<uni-icon :size="size" :color="activeColor" type="star-filled"></uni-icon>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniIcon from '../uni-icon/uni-icon.vue'
+	export default {
+		name: "uni-rate",
+		components: {
+			uniIcon
+		},
+		props: {
+			isFill: { //星星的类型，是否镂空
+				type: [Boolean, String],
+				default: true
+			},
+			color: { //星星的颜色
+				type: String,
+				default: '#ececec'
+			},
+			activeColor: { //星星选中状态颜色
+				type: String,
+				default: '#ffca3e'
+			},
+			size: { //星星的大小
+				type: [Number, String],
+				default: 24
+			},
+			value: { //当前评分
+				type: [Number, String],
+				default: 0
+			},
+			max: { //最大评分
+				type: [Number, String],
+				default: 5
+			},
+			margin: { //星星的间距
+				type: [Number, String],
+				default: 0
+			},
+			disabled: { //是否可点击
+				type: [Boolean, String],
+				default: false
+			},
+			id: {
+				type: [Number, String],
+				default: 1
+			}
+		},
+		data() {
+			// console.log('data')
+			return {
+				maxSync: this.max,
+				valueSync: this.value
+			}
+		},
+		computed: {
+			stars() {
+				const max = Number(this.maxSync) ? Number(this.maxSync) : 5
+				const value = Number(this.valueSync) ? Number(this.valueSync) : 0
+				const starList = []
+				const floorValue = Math.floor(value)
+				const ceilValue = Math.ceil(value)
+				for (let i = 0; i < max; i++) {
+					if (floorValue > i) {
+						starList.push({
+							activeWitch: '100%'
+						})
+					} else if (ceilValue - 1 === i) {
+						starList.push({
+							activeWitch: (value - floorValue) * 100 + '%'
+						})
+					} else {
+						starList.push({
+							activeWitch: '0'
+						})
+					}
+				}
+				return starList
+			}
+		},
+		methods: {
+			onClick(index) {
+				if (this.disabled === true || this.disabled === 'true') {
+					return
+				}
+				this.valueSync = index + 1
+				this.$emit('change', {
+					id: this.id,
+					value: this.valueSync
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-rate {
+		line-height: 0;
+		font-size: 0;
+		display: flex;
+		flex-direction: row;
+
+		&-icon {
+			position: relative;
+			line-height: 0;
+			font-size: 0;
+			display: inline-block;
+
+			&-on {
+				position: absolute;
+				top: 0;
+				left: 0;
+				overflow: hidden;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-section/uni-section.vue b/mallplusui-uniapp-app2/components/uni-section/uni-section.vue
new file mode 100644
index 0000000..7591bd1
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-section/uni-section.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="uni-section" nvue>
+		<view v-if="type" class="uni-section__head">
+			<view :class="type" class="uni-section__head-tag" />
+		</view>
+		<view class="uni-section__content">
+			<text :class="{'distraction':!subTitle}" class="uni-section__content-title">{{ title }}</text>
+			<text v-if="subTitle" class="uni-section__content-sub">{{ subTitle }}</text>
+		</view>
+		<slot />
+	</view>
+</template>
+
+<script>
+
+	/**
+	 * Section 标题栏
+	 * @description 标题栏
+	 * @property {String} type = [line|circle] 标题装饰类型
+	 * 	@value line 竖线
+	 * 	@value circle 圆形
+	 * @property {String} title 主标题
+	 * @property {String} subTitle 副标题
+	 */
+
+	export default {
+		name: 'UniTitle',
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			subTitle: {
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {}
+		},
+		watch: {
+			title(newVal) {
+				if (uni.report && newVal !== '') {
+					uni.report('title', newVal)
+				}
+			}
+		},
+		methods: {
+			onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+<style lang="scss" scoped>
+	.uni-section {
+		position: relative;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		margin-top: 10px;
+		flex-direction: row;
+		align-items: center;
+		padding: 0 10px;
+		height: 50px;
+		background-color: $uni-bg-color-grey;
+		/* #ifdef APP-NVUE */
+		border-bottom-color: $uni-border-color;
+		border-bottom-style: solid;
+		border-bottom-width: 0.5px;
+		/* #endif */
+		font-weight: normal;
+	}
+	/* #ifndef APP-NVUE */
+	.uni-section:after {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		left: 0;
+		height: 1px;
+		content: '';
+		-webkit-transform: scaleY(.5);
+		transform: scaleY(.5);
+		background-color: $uni-border-color;
+	}
+	/* #endif */
+
+	.uni-section__head {
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		margin-right: 10px;
+	}
+
+	.line {
+		height: 15px;
+		background-color: $uni-text-color-disable;
+		border-radius: 5px;
+		width: 3px;
+	}
+
+	.circle {
+		width: 8px;
+		height: 8px;
+		border-top-right-radius: 50px;
+		border-top-left-radius: 50px;
+		border-bottom-left-radius: 50px;
+		border-bottom-right-radius: 50px;
+		background-color: $uni-text-color-disable;
+	}
+
+	.uni-section__content {
+		flex: 1;
+		color: $uni-text-color;
+	}
+
+	.uni-section__content-title {
+		font-size: $uni-font-size-base;
+		color: $uni-text-color;
+	}
+
+	.distraction {
+		flex-direction: row;
+		align-items: center;
+	}
+
+	.uni-section__content-sub {
+		font-size: $uni-font-size-sm;
+		color: $uni-text-color-grey;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/uni-tag/uni-tag.vue b/mallplusui-uniapp-app2/components/uni-tag/uni-tag.vue
new file mode 100644
index 0000000..a9e7087
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/uni-tag/uni-tag.vue
@@ -0,0 +1,230 @@
+<template>
+	<view :class="[
+      'uni-tag--' + type,
+      disabled === true || disabled === 'true' ? 'uni-tag--disabled' : '',
+      inverted === true || inverted === 'true' ? type + '-uni-tag--inverted' : '',
+      circle === true || circle === 'true' ? 'uni-tag--circle' : '',
+      mark === true || mark === 'true' ? 'uni-tag--mark' : '',
+      'uni-tag--' + size
+    ]"
+	 @click="onClick()" class="uni-tag" v-if="text">
+		<text :class="[type === 'default' ? 'uni-tag--default':'uni-tag-text',inverted === true || inverted === 'true' ? 'uni-tag-text--'+type : '',size === 'small' ? 'uni-tag-text--small':'' ]">{{ text }}</text>
+	</view>
+</template>
+
+<script>
+	/**
+	 * Tag 标签
+	 * @description 用于展示1个或多个文字标签，可点击切换选中、不选中的状态
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=35
+	 * @property {String} text 标签内容
+	 * @property {String} size = [normal|small] 大小尺寸
+	 * 	@value normal 正常
+	 * 	@value small 小尺寸
+	 * @property {String} type = [default|primary|success｜warning｜error｜royal]  颜色类型
+	 * 	@value default 灰色
+	 * 	@value primary 蓝色
+	 * 	@value success 绿色
+	 * 	@value warning 黄色
+	 * 	@value error 红色
+	 * 	@value royal 紫色
+	 * @property {Boolean} disabled = [true|false] 是否为禁用状态
+	 * @property {Boolean} inverted = [true|false] 是否无需背景颜色（空心标签）
+	 * @property {Boolean} circle = [true|false] 是否为圆角
+	 * @event {Function} click 点击 Tag 触发事件
+	 */
+
+	export default {
+		name: "UniTag",
+		props: {
+			type: {
+				// 标签类型default、primary、success、warning、error、royal
+				type: String,
+				default: "default"
+			},
+			size: {
+				// 标签大小 normal, small
+				type: String,
+				default: "normal"
+			},
+			// 标签内容
+			text: {
+				type: String,
+				default: ""
+			},
+			disabled: {
+				// 是否为禁用状态
+				type: [Boolean, String],
+				default: false
+			},
+			inverted: {
+				// 是否为空心
+				type: [Boolean, String],
+				default: false
+			},
+			circle: {
+				// 是否为圆角样式
+				type: [Boolean, String],
+				default: false
+			},
+			mark: {
+				// 是否为标记样式
+				type: [Boolean, String],
+				default: false
+			}
+		},
+		methods: {
+			onClick() {
+				if (this.disabled === true || this.disabled === "true") {
+					return;
+				}
+				this.$emit("click");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$tag-pd: 0px 16px;
+	$tag-small-pd: 0px 8px;
+
+	.uni-tag {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: $tag-pd;
+		height: 30px;
+		line-height: 30px;
+		justify-content: center;
+		color: $uni-text-color;
+		border-radius: $uni-border-radius-base;
+		background-color: $uni-bg-color-grey;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-bg-color-grey;
+	}
+
+	.uni-tag--circle {
+		border-radius: 15px;
+	}
+
+	.uni-tag--mark {
+		border-top-left-radius: 0;
+		border-bottom-left-radius: 0;
+		border-top-right-radius: 15px;
+		border-bottom-right-radius: 15px;
+	}
+
+	.uni-tag--disabled {
+		opacity: 0.5;
+	}
+
+	.uni-tag--small {
+		height: 20px;
+		padding: $tag-small-pd;
+		line-height: 20px;
+		font-size: $uni-font-size-sm;
+	}
+
+	.uni-tag--default {
+		color: $uni-text-color;
+		font-size: $uni-font-size-base;
+	}
+
+	.uni-tag-text--small {
+		font-size: $uni-font-size-sm !important;
+	}
+
+	.uni-tag-text {
+		color: $uni-text-color-inverse;
+		font-size: $uni-font-size-base;
+	}
+
+	.uni-tag-text--primary {
+		color: $uni-color-primary !important;
+	}
+
+	.uni-tag-text--success {
+		color: $uni-color-success !important;
+	}
+
+	.uni-tag-text--warning {
+		color: $uni-color-warning !important;
+	}
+
+	.uni-tag-text--error {
+		color: $uni-color-error !important;
+	}
+
+	.uni-tag--primary {
+		color: $uni-text-color-inverse;
+		background-color: $uni-color-primary;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-primary;
+	}
+
+	.primary-uni-tag--inverted {
+		color: $uni-color-primary;
+		background-color: $uni-bg-color;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-primary;
+	}
+
+	.uni-tag--success {
+		color: $uni-text-color-inverse;
+		background-color: $uni-color-success;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-success;
+	}
+
+	.success-uni-tag--inverted {
+		color: $uni-color-success;
+		background-color: $uni-bg-color;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-success;
+	}
+
+	.uni-tag--warning {
+		color: $uni-text-color-inverse;
+		background-color: $uni-color-warning;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-warning;
+	}
+
+	.warning-uni-tag--inverted {
+		color: $uni-color-warning;
+		background-color: $uni-bg-color;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-warning;
+	}
+
+	.uni-tag--error {
+		color: $uni-text-color-inverse;
+		background-color: $uni-color-error;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-error;
+	}
+
+	.error-uni-tag--inverted {
+		color: $uni-color-error;
+		background-color: $uni-bg-color;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-color-error;
+	}
+
+	.uni-tag--inverted {
+		color: $uni-text-color;
+		background-color: $uni-bg-color;
+		border-width: 1rpx;
+		border-style: solid;
+		border-color: $uni-bg-color-grey;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/components/upload-images.vue b/mallplusui-uniapp-app2/components/upload-images.vue
new file mode 100644
index 0000000..71bb4a3
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/upload-images.vue
@@ -0,0 +1,226 @@
+<template>
+	<view class="upload-content">
+		<block v-for="(item, index) in imageList" :key="index">
+			<view class="upload-item">
+				<image class="upload-img" :src="item.filePath" mode="aspectFill" @click="previewImage(index)"></image>
+				<image class="upload-del-btn" 
+					@click="delImage(index)" 
+					src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACYAAAAmCAYAAACoPemuAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RjNBODgzQjUwNDM5MTFFOUJDMjlGN0UwRTJGMjVCNjQiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RjNBODgzQjYwNDM5MTFFOUJDMjlGN0UwRTJGMjVCNjQiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGM0E4ODNCMzA0MzkxMUU5QkMyOUY3RTBFMkYyNUI2NCIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGM0E4ODNCNDA0MzkxMUU5QkMyOUY3RTBFMkYyNUI2NCIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PuYQTIAAAAHNSURBVHjazJgxasMwFIbjnsD4BDmCLxDQDZrNQ5bcILlBvXvpDRLIWmiHFkyH2t0LyVbwEkPpbE/eYlUCGYQax096UuIffkIgij7ryU/vyZuYy2e+Z56K70R8lsJcOfPn5AriMCvmZ2YKdMW8EQ/hRA9iEorwXlpZtObMRySQ6kysvrFWloHUEIcmUBuHUDLccmxQskErt7wyVLdy00tQ4Q2g5De2V9kNwWjffiNDA33f/42i6E13Qj5uNptlwJD+SyODuaqqqi/KVBTFOxSKA7VtW/NxSZI8AcbE2nuraZpvKgSBk6G4drsdBOwogz1CwAghH/JEl+BUKJ1VltPHHjoIAoeE4l53YFqb+RKcBSgqyqXhtxEKZwkKB3YOThYCqjPuCDoHZwGK3mGLtdPp5LmqTI1Dqe4p26EkNqA4iE6eg2z+iQ0okyQMATvYgLIIt9Y6knTyFBIudHqIq3BpmkL60VJ9O0sXZY8MBwSLtdNGEAQ/i8XiVXcz83EcEPDbuq/fzMdYWt+6GTmMsX2rh9q3TtsxNrzXhKt1rwg6rR1Dhdjqo7QMlWOvoWTF4imxQMRF7eaL8L5ohmwrLgDB8pCQc8DlcG7y538CDABJNGPqfaJgfgAAAABJRU5ErkJggg==" 
+					mode="scaleToFill">
+				</image>
+				<view class="upload-progress" v-if="item.progress < 100">{{item.progress}}%</view>
+			</view>
+		</block>
+		<view class="upload-add-btn" v-if="rduLength > 0" @click="chooseImage"></view>
+	</view>
+</template>
+
+<script>
+export default {
+	data() {
+		return {
+			imageList: []
+		};
+	},
+	props: {
+		url: {
+			type: String,
+			value: '' //上传接口地址
+		},
+		count: {
+			type: Number,
+			value: 4 //单次可选择的图片数量
+		},
+		length: {
+			type: Number,
+			value: 50 //可上传总数量
+		}
+	},
+	computed: {
+		rduLength(){
+			return this.length - this.imageList.length;
+		}
+	},
+	methods: {
+		//选择图片
+		chooseImage: function(){
+			uni.chooseImage({
+				count: this.rduLength < this.count ? this.rduLength : this.count, //最多可以选择的图片张数，默认9
+				sizeType: ['original', 'compressed'], //original 原图，compressed 压缩图，默认二者都有
+				sourceType: ['album'], //album 从相册选图，camera 使用相机，默认二者都有
+				success: (res)=> {
+					const images = res.tempFilePaths;
+					this.uploadFiles(images);
+				}
+			});
+		},
+		//上传图片
+		async uploadFiles(images){
+			this.imageList.push({
+				filePath: images[0],
+				progress: 0
+			});
+			uni.showLoading({
+				title: '请稍后..',
+				mask: true,
+			})
+			try{
+				const uploadUrl = await this.uploadImage(images[0]);
+			}catch(err){
+				console.log(err);
+				return;
+			}
+			
+			if(uploadUrl !== false){
+				images.splice(0, 1);
+				this.imageList[this.imageList.length - 1].src = uploadUrl;
+
+				//判断是否需要继续上传
+				if(images.length > 0 && this.rduLength > 0){
+					this.uploadFiles(images);
+				}else{
+					uni.hideLoading();
+				}
+			}else{
+				//上传失败处理
+				this.imageList.pop();
+				uni.hideLoading();
+				uni.showToast({
+					title: '上传中出现问题，已终止上传',
+					icon: 'none',
+					mask: true,
+					duration: 2000
+				});
+			}
+		},
+		uploadImage: function(file){
+			return new Promise((resolve, reject)=> {
+				//发送给后端的附加参数
+				const formData = {
+					thumb_mode: 1,  
+				};
+				this.uploadTask = uni.uploadFile({
+					url: this.url, 
+					filePath: file,
+					name: 'file',
+					formData: formData,
+					success(uploadFileResult){
+						const uploadFileRes = JSON.parse(uploadFileResult.data) || {};
+						if(uploadFileRes.status === 1 && uploadFileRes.data){
+							resolve(uploadFileRes.data);
+						}else{
+							reject('接口返回错误');
+						}
+					}, 
+					fail(){
+						reject('网络链接错误');
+					}
+				});
+				//上传进度
+				this.uploadTask.onProgressUpdate((progressRes)=> {
+					this.imageList[this.imageList.length - 1].progress = progressRes.progress;
+				});
+			});
+		},
+		//删除图片
+		delImage: function(index){
+			uni.showModal({
+				content: '确定要放弃这张图片么？',
+				success: (confirmRes)=> {
+					if (confirmRes.confirm) {
+						this.imageList.splice(index, 1);
+					} 
+				}
+			});
+		},
+		//预览图片
+		previewImage: function(index){
+			const urls = [];
+			this.imageList.forEach((item)=> {
+				urls.push(item.filePath);
+			})
+			uni.previewImage({
+				current: urls[index],
+				urls: urls,
+				indicator: "number"
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss">
+	.upload-content{
+		padding:24upx 0 0 28upx;
+		background-color: #fff;
+		overflow:hidden;
+	}
+	.upload-item{
+		position: relative;
+		float:left;
+		width:150upx;
+		height:150upx;
+		margin-right:30upx;
+		margin-bottom:30upx;
+		&:nth-child(4n){
+			margin-right:0;
+		}
+		.upload-img{
+			width:100%;
+			height:100%;
+			border-radius:8upx;
+		}
+		.upload-del-btn{
+			position: absolute;
+			right:-16upx;
+			top:-14upx;
+			width:36upx;
+			height:36upx;
+			border: 4upx solid #fff;
+			border-radius: 100px;
+		}
+		.upload-progress{
+			position: absolute;
+			left:0;
+			top:0;
+			display:flex;
+			align-items:center;
+			justify-content: center;
+			width:100%;
+			height:100%;
+			background-color: rgba(0,0,0,.4);
+			color:#fff;
+			font-size:24upx;
+			border-radius:8upx;
+		}
+	}
+	.upload-add-btn {
+		position: relative;
+		float:left;
+		width: 150upx;
+		height: 150upx;
+		z-index: 99;
+		border-radius:8upx;
+		background:#f9f9f9;
+		&:before,
+		&:after {
+			content: " ";
+			position: absolute;
+			top: 50%;
+			left: 50%;
+			-webkit-transform: translate(-50%, -50%);
+			transform: translate(-50%, -50%);
+			width: 4upx;
+			height: 60upx;
+			background-color: #d6d6d6;
+		}
+		&:after {
+			width: 60upx;
+			height: 4upx;
+		}
+		&:active {
+			background-color: #f7f7f7;
+		}
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/components/xiujun-evaluate/Readme.md b/mallplusui-uniapp-app2/components/xiujun-evaluate/Readme.md
new file mode 100644
index 0000000..cb5f559
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/xiujun-evaluate/Readme.md
@@ -0,0 +1,40 @@
+### 评价 列表
+
+评价列表组件，组件名：``uni-evaluate``，可预览图片
+
+**使用方式：**
+
+下载组件，在 ``script`` 中引用组件 
+
+```javascript
+import uniEvaluate from '../../components/xiujun-evaluate/uni-evaluate.vue';
+export default {
+    components: {uniEvaluate}
+}
+```
+
+用法
+
+```html
+<uni-evaluate :list-data="列表数据" :rate="总评分"/>
+```
+
+**组件属性说明：**	
+
+|属性名|类型|默认值	|说明|
+|---|----|---|---|
+|listData|Array|-|评价列表数据|
+|rate|Number|-|总评分|
+|isShowTotal|Boolean|true|是否显示总评价数量|
+|isShowIcon|Boolean|true|是否显示评价头图标|
+
+**listData属性说明：**
+
+|属性名|类型|默认值|说明|
+|---|----|---|---|
+|header_img|String|-|用户头像|
+|user_name|String| -      |用户名|
+|rate|Number|-|评分|
+|create_time|String|-|发表评论时间|
+|content|String|-|评价内容文本|
+|imgs|Array|-|评价内容图片格式['图片地址1','图片地址2']|
diff --git a/mallplusui-uniapp-app2/components/xiujun-evaluate/iconfont.css b/mallplusui-uniapp-app2/components/xiujun-evaluate/iconfont.css
new file mode 100644
index 0000000..c373fd4
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/xiujun-evaluate/iconfont.css
@@ -0,0 +1,26 @@
+@font-face {
+	font-family: 'iconfont';  /* project id 1237225 */
+  src: url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.eot');
+  src: url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.eot?#iefix') format('embedded-opentype'),
+  url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.woff2') format('woff2'),
+  url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.woff') format('woff'),
+  url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.ttf') format('truetype'),
+  url('https://at.alicdn.com/t/font_1237225_y90nldmnpij.svg#iconfont') format('svg');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-pingjia-copy:before {
+  content: "\e640";
+}
+
+.icon-xingxing:before {
+  content: "\e870";
+}
+
diff --git a/mallplusui-uniapp-app2/components/xiujun-evaluate/list.js b/mallplusui-uniapp-app2/components/xiujun-evaluate/list.js
new file mode 100644
index 0000000..584e604
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/xiujun-evaluate/list.js
@@ -0,0 +1,62 @@
+//测试数据
+const listData = [{
+	header_img: "http://cs.zhangkaixing.com/face/face_2.jpg",
+	user_name: "测试1",
+	rate:5,
+	create_time: "2019-04-12",
+	content: "好评",
+	imgs:[
+		'/com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+		'http://cs.zhangkaixing.com/face/face_14.jpg',
+		'http://cs.zhangkaixing.com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+	]
+},
+{
+	content: "中评",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_12.jpg",
+	user_name: "测试2",
+	rate:4,
+	// imgs:[]
+},
+{
+	content: "",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_15.jpg",
+	user_name: "测试3",
+	rate:2,
+	// imgs:[]
+},{
+	content: "好评",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_2.jpg",
+	user_name: "测试1",
+	rate:5,
+	imgs:[
+		'http://cs.zhangkaixing.com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+		'http://cs.zhangkaixing.com/face/face_14.jpg',
+		'http://cs.zhangkaixing.com/face/face.jpg',
+		'http://cs.zhangkaixing.com/face/p10.jpg',
+	]
+},
+{
+	content: "中评",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_12.jpg",
+	user_name: "测试2",
+	rate:3.5,
+	// imgs:[]
+},
+{
+	content: "",
+	create_time: "2019-04-12",
+	header_img: "http://cs.zhangkaixing.com/face/face_15.jpg",
+	user_name: "测试3",
+	rate:2.3,
+	// imgs:[]
+}]
+
+export default listData
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/components/xiujun-evaluate/uni-evaluate.vue b/mallplusui-uniapp-app2/components/xiujun-evaluate/uni-evaluate.vue
new file mode 100644
index 0000000..fe778e3
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/xiujun-evaluate/uni-evaluate.vue
@@ -0,0 +1,236 @@
+<!-- components/evaluate-components/index.wxml -->
+<template>
+	<view class="evaluateBox">
+		<view class="evaluate-header">
+			<view class="title">
+				<text v-if="isShowIcon" class="iconfont" style="color:#999">&#xe640;</text>
+				<text v-if="isShowTotal" style="margin-left: 10upx;">评价 ({{ listData.length }})</text>
+			</view>
+			<view class="total">
+				<view class="stars">
+					<view class="stars-normal">
+						<view class="box">
+							<block v-for="i in 5" :key="i"><text class="iconfont">&#xe870;</text></block>
+						</view>
+					</view>
+					<view class="stars-selected" :style="{ width: (rate / 5) * 100 + '%' }">
+						<view class="box">
+							<block v-for="j in 5" :key="j"><text class="iconfont">&#xe870;</text></block>
+						</view>
+					</view>
+				</view>
+				<text>{{ rate }}{{ (rate * 10) % 10 == 0 ? '.0' : '' }}</text>
+			</view>
+		</view>
+
+		<view class="lists" v-if="listData.length > 0">
+			<block v-for="(item, index_) in listData" :key="index_">
+				<view class="item">
+					<view class="icon"><image :src="item.header_img" mode="widthFix" style="width:100%" /></view>
+					<view class="info">
+						<view class="name-time">
+							<text class="name">{{ item.user_name }}</text>
+							<text class="time">{{ item.create_time }}</text>
+						</view>
+						<view class="stars">
+							<view class="stars-normal">
+								<view class="box">
+									<block v-for="i_ in 5" :key="i_"><text class="iconfont">&#xe870;</text></block>
+								</view>
+							</view>
+							<view class="stars-selected" :style="{ width: (item.rate / 5) * 100 + '%' }">
+								<view class="box">
+									<block v-for="j_ in 5" :key="j_"><text class="iconfont">&#xe870;</text></block>
+								</view>
+							</view>
+						</view>
+						<view class="evaluate-content">
+							<text>{{ item.content || '用户暂未评价' }}</text>
+							<view class="imgs" v-if="item.imgs">
+								<block v-for="(imgurl, index) in item.imgs" :key="index">
+									<view class="imgs-box"><image :src="imgurl" mode="widthFix" style="width: 100%;" @click="previewImg(imgurl,item.imgs)"></image></view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="no-lists" v-else>暂无评论</view>
+	</view>
+</template>
+
+<script>
+//数据模拟
+import data from './list.js';
+export default {
+	props: {
+		//评价列表数据
+		listData: {
+			type: Array,
+			default: data
+		},
+		//是否显示总评价数量
+		isShowTotal: {
+			type: Boolean,
+			default: true
+		},
+		//是否显示评价前面的图标
+		isShowIcon: {
+			type: Boolean,
+			default: true
+		},
+		//总评分
+		rate: {
+			type: Number,
+			default: 4.6
+		}
+	},
+	data() {
+		return {}
+	},
+	methods: {
+		previewImg(src,urls){
+			uni.previewImage({
+				current:src,
+				urls
+			})
+		}
+	}
+};
+</script>
+<style scoped>
+@import './iconfont.css';
+.evaluateBox {
+	width: 100%;
+	margin-bottom: 120upx;
+}
+
+.evaluate-header {
+	width: 100%;
+	height: 80upx;
+	display: flex;
+	justify-content: space-between;
+	padding: 20upx;
+	align-items: center;
+	margin-bottom: 12upx;
+	box-sizing: border-box;
+	border-bottom: 1upx solid #e5e5e5;
+}
+
+.evaluateBox .title {
+	display: flex;
+	align-items: center;
+	color: #000000;
+	font-size: 30upx;
+}
+
+.total {
+	/* flex: 1; */
+	height: 100%;
+	font-size: 30upx;
+	color: #d76d9d;
+	display: flex;
+	align-items: center;
+	justify-content: flex-end;
+}
+
+.stars {
+	width: 180upx;
+	height: 36upx;
+	position: relative;
+}
+.stars .box {
+	width: 180upx;
+}
+.stars-normal {
+	width: 100%;
+	position: absolute;
+	left: 0;
+	top: 0;
+	color: #ccc;
+}
+.stars-selected {
+	position: absolute;
+	left: 0;
+	top: 0;
+	z-index: 1;
+	color: #fde16d;
+	overflow: hidden;
+}
+.stars-selected .iconfont,
+.stars-normal .iconfont {
+	font-size: 36upx;
+}
+
+.lists .item {
+	padding: 20upx;
+	display: flex;
+	/* height: auto; */
+	/* align-items: center; */
+	font-size: 22upx;
+	color: #999;
+}
+
+.lists .item .icon {
+	width: 60upx;
+	height: 60upx;
+	border-radius: 50%;
+	overflow: hidden;
+	margin-right: 26upx;
+	/* align-self: flex-start; */
+}
+
+.lists .item .info {
+	flex: 1;
+	font-size: 26upx;
+	color: #666;
+}
+
+.info .name-time {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding-bottom: 6upx;
+}
+.lists .info .stars {
+	width: 140upx;
+}
+
+.info .stars-normal .iconfont,
+.info .stars-selected .iconfont {
+	font-size: 28upx;
+}
+
+.info .stars .box {
+	width: 140upx;
+}
+.lists .info .evaluate-content {
+	color: #000;
+	font-size: 28upx;
+	text-align: left;
+	padding-top: 6upx;
+}
+.info .evaluate-content .imgs {
+	display: flex;
+	flex-wrap: wrap;
+	padding-top: 6upx;
+}
+.evaluate-content .imgs .imgs-box {
+	width: 25%;
+	padding-right: 10upx;
+	box-sizing: border-box;
+}
+/* .evaluate-content .imgs .imgs-box:nth-child(4n+1){
+	padding-left: 0;
+}
+.evaluate-content .imgs .imgs-box:nth-child(4n){
+	padding-right: 0;
+} */
+.no-lists {
+	padding: 20upx 0;
+	text-align: center;
+	font-size: 24upx;
+	color: #666;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/zhouWei-navBar/index.vue b/mallplusui-uniapp-app2/components/zhouWei-navBar/index.vue
new file mode 100644
index 0000000..c5a2638
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/zhouWei-navBar/index.vue
@@ -0,0 +1,430 @@
+<template>
+	<view>
+		<view
+			class="header"
+			:class="{ fixed: navFixed, absolute: type == 'transparent', line: navLine, colorWhite: isWhite, themeBgColor: themeBgColor }"
+			:style="{ paddingTop: statusBarHeight + 'px', backgroundImage: navBgColor, color: navFontColor, opacity: transparentValue }"
+		>
+			<view class="left_box">
+				<slot name="left">
+					<view class="left_info" :class="{ btnMongol: isTwoBtn }" v-if="back || $slots.left || home">
+						<view class="back" v-if="back && !firstPage" @click="onBackPage"></view>
+						<text v-if="isTwoBtn"></text>
+						<view class="home" v-if="(firstPage && back) || home" @click="onBackHome"></view>
+					</view>
+				</slot>
+				<view class="title" :class="{ center: titleCenter, color: navFontColor }" v-if="$slots.default || navTitle">
+					<slot>{{ navTitle }}</slot>
+				</view>
+			</view>
+			<view class="right_info"><slot name="right"></slot></view>
+		</view>
+		<view
+			class="header transparentFixed fixed"
+			:class="{ colorWhite: isWhite }"
+			v-if="type == 'transparentFixed'"
+			:style="{ paddingTop: statusBarHeight + 'px', color: navTransparentFixedFontColor, opacity: 1 - transparentValue, zIndex: transparentValue < 0.3 ? 100 : 90 }"
+		>
+			<view class="left_box">
+				<slot name="transparentFixedLeft">
+					<view class="left_info" v-if="back || $slots.left || home">
+						<view class="back" v-if="back && !firstPage" @click="onBackPage"></view>
+						<text v-if="isTwoBtn"></text>
+						<view class="home" v-if="(firstPage && back) || home" @click="onBackHome"></view>
+					</view>
+				</slot>
+				<view class="title" :class="{ center: titleCenter }" v-if="$slots.default || navTitle">
+					<slot name="transparentFixed">{{ navTitle }}</slot>
+				</view>
+			</view>
+			<view class="right_info"><slot name="transparentFixedRight"></slot></view>
+		</view>
+		<view v-if="type == 'fixed'" class="station" :style="{ paddingTop: statusBarHeight + 'px' }"></view>
+	</view>
+</template>
+<script>
+// 主页页面的页面路径
+// 关联功能：打开的页面只有一个的时候右上角自动显示返回首页按钮，下面这个数组是排除显示返回首页的页面。
+// 主页使用场景：小程序分享出去的页面，用户点击开是分享页面，很多情况下是没有返回首页按钮的
+const mainPagePath = ['pages/navList'];
+//返回首页的地址
+const homePath = '/pages/navList';
+//白色表达值
+const whiteList = ['#FFF', '#FFFFFF', 'white', 'rgb(255,255,255)', 'rgba(255,255,255,1)'];
+export default {
+	props: {
+		//是否显示返回按钮
+		// 1000 显示返回按钮
+		// 2000 不显示返回按钮
+		// 3000 自定义返回按钮方法，点击返回箭头后会发送一个backClick事件
+		// 默认不显示返回按钮
+		backState: {
+			default: function() {
+				return 2000;
+			}
+		},
+		//是否显示返回首页按钮
+		home: {
+			type: Boolean,
+			default: function() {
+				return false;
+			}
+		},
+		//导航背景色，支持渐变
+		bgColor: {
+			type: [String, Array],
+			default: function() {
+				return '#FFF';
+			}
+		},
+		// 导航背景色渐变角度
+		bgColorAngle: {
+			type: [String, Number],
+			default: function() {
+				return 90;
+			}
+		},
+		//导航字体颜色，字体颜色为白色的时候会把手机状态栏设置为白色，否则为黑色
+		fontColor: {
+			type: String,
+			default: function() {
+				return '#000';
+			}
+		},
+		//标题是否居中
+		titleCenter: {
+			type: Boolean,
+			default: function() {
+				return true;
+			}
+		},
+		//标题
+		title: {
+			type: String,
+			default: function() {
+				return '';
+			}
+		},
+		//类型 fixed为固定 默认
+		// ordinary 普通的 不固定
+		// transparent 透明不固定的
+		//transparentFixed  透明固定的
+		type: {
+			type: String,
+			default: function() {
+				return 'fixed';
+			}
+		},
+		//透明固定的时候字体颜色
+		transparentFixedFontColor: {
+			type: String,
+			default: function() {
+				return '#000';
+			}
+		}
+		
+	},
+	data() {
+		return {
+			//当前页面是否是第一个页面
+			firstPage: false,
+			//透明度值
+			transparentValue: 1,
+			//标题
+			navTitle: '',
+			//字体色
+			navFontColor: '#000',
+			//背景色
+			navBgColor: 'linear-gradient(90deg, #FFF 0%, #FFF 100%)',
+			//透明底字体色
+			navTransparentFixedFontColor: '#000',
+			// 是否使用
+			themeBgColor: false,
+			// 导航栏高度
+			statusBarHeight: 0
+		};
+	},
+	computed: {
+		back() {
+			return this.backState == 1000 || this.backState == 3000;
+		},
+		//导航固定
+		navFixed() {
+			if (this.type == 'transparentFixed' || this.type == 'fixed') {
+				return true;
+			} else {
+				return false;
+			}
+		},
+		//导航底部线是否显示
+		navLine() {
+			return this.type !== 'transparent' && whiteList.includes(this.navBgColor);
+		},
+		//导航字体是否是白色颜色
+		isWhite() {
+			return whiteList.includes(this.navFontColor);
+		},
+		//右上角是否有两个按钮
+		isTwoBtn() {
+			return (this.backState == 1000 || this.backState == 3000) && this.home && !this.firstPage;
+		}
+	},
+	watch: {
+		title(val) {
+			this.navTitle = val;
+		},
+		fontColor(val) {
+			this.navFontColor = val;
+			this.settingColor();
+		},
+		bgColor(val) {
+			this.getNavBgColor(val);
+		},
+		transparentFixedFontColor(val) {
+			this.navTransparentFixedFontColor = val;
+		}
+	},
+	//第一次加载
+	created() {
+		this.navTitle = this.title;
+		this.navFontColor = this.fontColor;
+		this.getNavBgColor(this.bgColor);
+		this.navTransparentFixedFontColor = this.transparentFixedFontColor;
+		//获取手机状态栏高度
+		this.statusBarHeight = uni.getSystemInfoSync()['statusBarHeight'];
+		const _this = this;
+		if (this.type == 'transparentFixed') {
+			this.transparentValue = 0;
+		}
+		this.settingColor();
+		//获取所有页面
+		let currentPages = getCurrentPages();
+		let pageLen = currentPages.length;
+		//判断是否是第一个页面，如果是有设置back为true的页面，将不显示返回箭头，而现实返回首页按钮
+		if (pageLen == 1 && !mainPagePath.includes(currentPages[0].route)) {
+			this.firstPage = true;
+		}
+		//监听页面滚动，type为transparentFixed的时候页面向下滚动的时候导航逐渐变白
+		if (this.type == 'transparentFixed') {
+			// #ifndef H5
+			currentPages[pageLen - 1].onPageScroll = function(e) {
+				_this.$emit('scroll', e);
+				if (e.scrollTop > 180) {
+					_this.transparentValue = 1;
+				} else {
+					_this.transparentValue = e.scrollTop / 180;
+				}
+			};
+			// #endif
+			// #ifdef H5
+			window.onscroll = function(e) {
+				let scrollTop = document.documentElement.scrollTop || document.body.scrollTop;
+				_this.$emit('scroll', { scrollTop: scrollTop });
+				if (scrollTop > 180) {
+					_this.transparentValue = 1;
+				} else {
+					_this.transparentValue = scrollTop / 180;
+				}
+			};
+			// #endif
+		}
+	},
+	//方法
+	methods: {
+		//返回上一页面
+		onBackPage() {
+			if (this.backState == 3000) {
+				this.$emit('backClick');
+			} else {
+				uni.navigateBack();
+			}
+		},
+		//返回首页
+		onBackHome() {
+			uni.switchTab({
+				url: homePath
+			});
+		},
+		// 获取导航背景颜色
+		getNavBgColor(val) {
+			if (val == 'themeBgColor') {
+				this.themeBgColor = true;
+				this.navBgColor = '';
+			} else {
+				if (typeof val == 'string') {
+					this.navBgColor = 'linear-gradient(90deg, ' + val + ' 0%, ' + val + ' 100%)';
+				} else if (val instanceof Array && val.length >= 2) {
+					let navBgColor = 'linear-gradient(' + this.bgColorAngle + 'deg';
+					val.forEach(item => {
+						if (typeof item == 'string') {
+							navBgColor += ',' + item;
+						} else if (typeof item == 'object') {
+							navBgColor += ',' + item.color + ' ' + item.scale;
+						}
+					});
+					navBgColor += ')';
+					this.navBgColor = navBgColor;
+				}
+			}
+		},
+		//设置手机状态栏颜色
+		settingColor() {
+			//判断导航栏颜色
+			if (whiteList.includes(this.navFontColor)) {
+				// 改变手机状态栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#ffffff',
+					backgroundColor: this.navBgColor
+				});
+			} else {
+				// 改变手机状态栏颜色
+				uni.setNavigationBarColor({
+					frontColor: '#000000',
+					backgroundColor: this.navBgColor
+				});
+			}
+		}
+	}
+};
+</script>
+<style lang="scss" scoped>
+.station {
+	box-sizing: content-box;
+	height: 88upx;
+}
+.header {
+	display: flex;
+	align-items: flex-end;
+	position: relative;
+	justify-content: space-between;
+	box-sizing: content-box;
+	height: 88upx;
+	/* #ifdef MP */
+	padding-right: 190upx;
+	/* #endif */
+	&.fixed {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+	}
+	&.absolute {
+		position: absolute;
+		top: 0;
+		left: 0;
+		right: 0;
+		z-index: 99;
+		background-color: transparent !important;
+	}
+	&.line {
+		//需要显示线条的在这打开
+		// border-bottom: 2upx solid #f5f5f5;
+		box-shadow: 0 0 6upx 0 #ddd;
+	}
+	&.transparentFixed {
+		border-bottom: 0;
+		background-color: initial;
+		background-image: initial;
+		.left_info {
+			border: 2upx solid rgba(0, 0, 0, 0.1);
+			background-color: rgba(255, 255, 255, 0.7);
+			border-radius: 33upx;
+			box-sizing: border-box;
+		}
+		&.colorWhite .left_info {
+			border: 2upx solid rgba(255, 255, 255, 0.3);
+			background-color: rgba(0, 0, 0, 0.2);
+		}
+	}
+	//颜色白色
+	&.colorWhite {
+		.left_info {
+			&.btnMongol {
+				border: 2upx solid rgba(255, 255, 255, 0.3);
+				background-color: rgba(0, 0, 0, 0.2);
+			}
+			.back {
+				background-image: url('../../static/zhouWei-navBar/icon_back_white.png');
+			}
+			text {
+				background-color: rgba(255, 255, 255, 0.3);
+			}
+			.home {
+				background-image: url('../../static/zhouWei-navBar/icon_home_white.png');
+			}
+		}
+	}
+	.left_box {
+		display: flex;
+		align-items: center;
+		height: 100%;
+	}
+	$height: 56upx;
+	.left_info {
+		margin-right: 30upx;
+		display: flex;
+		align-items: center;
+		height: $height;
+		transition: all 0.6s;
+		margin-left: 16upx;
+		&.btnMongol {
+			border-radius: 33upx;
+			border: 2upx solid rgba(0, 0, 0, 0.1);
+			background-color: rgba(255, 255, 255, 0.7);
+			box-sizing: border-box;
+			.back,
+			.home {
+				width: 70upx;
+			}
+		}
+		.back {
+			background-image: url('../../static/zhouWei-navBar/icon_back_black.png');
+			background-position: center center;
+			background-repeat: no-repeat;
+			background-size: auto 55%;
+			width: $height;
+			height: 100%;
+		}
+		text {
+			height: 30upx;
+			width: 2upx;
+			background-color: rgba(255, 255, 255, 0.4);
+		}
+		.home {
+			background-image: url('../../static/zhouWei-navBar/icon_home_black.png');
+			background-position: center center;
+			background-repeat: no-repeat;
+			background-size: auto 55%;
+			width: $height;
+			height: 100%;
+		}
+	}
+	.title {
+		height: 88upx;
+		font-size: 32upx;
+		padding-left: 30upx;
+		padding-right: 30upx;
+		font-weight: 700;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		display: flex;
+		align-items: center;
+		/* #ifndef APP-PLUS||H5 */
+		max-width: 60vw;
+		/* #endif */
+		&.center {
+			position: absolute;
+			bottom: 0;
+			left: 50%;
+			transform: translateX(-50%);
+		}
+	}
+	.right_info {
+		height: 100%;
+		display: flex;
+		align-items: center;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/components/zhouWei-navBar/zhouWei-navBar.md b/mallplusui-uniapp-app2/components/zhouWei-navBar/zhouWei-navBar.md
new file mode 100644
index 0000000..68f5886
--- /dev/null
+++ b/mallplusui-uniapp-app2/components/zhouWei-navBar/zhouWei-navBar.md
@@ -0,0 +1,132 @@
+# zhouWei-navBar 适用于 uni-app 项目的头部导航组件
+
+导航栏组件，主要用于头部导航，组件名：zhouWei-navBar
+
+本组件目前兼容微信小程序、H5、5+APP。其他平台没试过
+
+本组件支持模式：
+1. 普通固定顶部导航  
+2. 透明导航  
+3. 透明固定顶部导航 
+4. 不固定普通导航 
+5. 颜色渐变导航
+
+本组件内置特殊功能：
+1. fontColor字体颜色为白色的时候手机状态栏会自动显示白色，否则显示灰色
+2. 页面为第一个页面时左上角自动显示返回主页的图标(具体看组件：zhouWei-navBar/index.vue =>页面script)
+
+### 本组件全局配置（位置：zhouWei-navBar/index.vue =>页面script）
+1. 主页页面的页面路径
+2. 首页页面路径
+
+```
+// 主页页面的页面路径
+// 关联功能：打开的页面只有一个的时候右上角自动显示返回首页按钮，下面这个数组是排除显示返回首页的页面。
+// 主页使用场景：小程序分享出去的页面，用户点击开是分享页面，很多情况下是没有返回首页按钮的
+const mainPagePath = ["pages/navList"];
+//返回首页的地址
+const homePath = "/pages/navList";
+```
+
+### 在main.js引入组件，并注册全局组件
+```
+import zhouWeiNavBar from "@/components/zhouWei-navBar";
+Vue.component("nav-bar", zhouWeiNavBar);
+```
+
+### 或者在页面script中引入组件，并注册组件
+```
+import navBar from "@/components/zhouWei-navBar";
+export default {
+    components: {navBar}
+}
+```
+
+### 案例一
+默认特性：左上角有返回箭头，nav-bar导航固定在顶部、标题居中
+```
+<nav-bar>我的</nav-bar>
+```
+
+### 案例二
+特性：无返回箭头、字体色为白色、标题左对齐、nav-bar导航透明并不固定在顶部、右边插槽有按钮
+```
+<nav-bar backState="2000" fontColor="#FFF" :titleCenter="false" type="transparent" title="我的">
+	<view class="icon_setUp" slot="right">设置</view>
+</nav-bar>
+```
+
+### 案例三：颜色渐变导航
+特性：颜色渐变导航
+```
+<nav-bar home :bgColor="['#f37402','#0f0']" bgColorAngle="90" fontColor="#FFF" title="颜色渐变导航"></nav-bar>
+```
+
+### 案例四：颜色渐变导航
+特性：颜色渐变导航
+```
+<nav-bar :bgColor="bgColorList" bgColorAngle="45" fontColor="#FFF" title="颜色渐变导航"></nav-bar>
+<!-- bgColor值 -->
+bgColorList:[
+	{color:"#f37402",scale:"0%"},
+	{color:"#0f0",scale:"20%"},
+	{color:"#f00",scale:"80%"},
+	{color:"#00f",scale:"100%"}
+]
+```
+
+### 案例五：滑动透明导航
+特性：有返回箭头、nav-bar导航透明并固定在顶部、透明状态字体为白色、页面想下滑动nav-bar导航条逐渐变白色、右边插槽有按钮
+```
+<nav-bar transparentFixedFontColor="#FFF" type="transparentFixed" title="我的简历">
+	<view class="transparent_fixed_preview" slot="transparentFixedRight" @click="onPreview">预览</view> //透明状态下的按钮
+	<view class="preview" slot="right" @click="onPreview">预览</view> //不状态下的按钮
+</nav-bar>
+```
+
+### 案例六：搜索框|地区选择
+特性：无返回箭头、nav-bar导航固定在顶部、地区选择、搜索框
+```
+<nav-bar backState="2000">
+	<view slot="left" class="address_select">深圳市</view>
+	<view slot="right" class="search_box" @click="onPageJump('/pages/home/search')">
+		<text class="icon_search"></text>
+		<text class="tips">搜索目的地/职位等</text>
+	</view>
+</nav-bar>
+```
+
+### 属性
+| 名称                        | 类型          | 默认值          | 描述                                               |
+| ----------------------------|--------------- | ------------- | ---------------------------------------------------|
+| backState                   | String         | 1000          | 返回上一页面按钮,1000 显示返回按钮,2000 不显示返回按钮,3000自定义返回按钮方法，点击返回箭头后会发送一个backClick事件|
+| home                        | Boolean        | true          | 返回首页按钮（首页地址在源文件里配置）                |
+| bgColor                     | String|Array   | #FFF          | 导航背景颜色，值为数组的时候显示渐变颜色（只支持2个颜色渐变），bgColor="themeBgColor"的时候会调用全局class="themeBgColor"的样式|
+| bgColorAngle                | String|Number  | 90            | 导航背景颜色渐变角度（bgColor为数组生效）              |
+| fontColor                   | String         | #000          | 导航字体颜色，（当颜色为白色的时候导航状态栏和图片为白色的）|
+| titleCenter                 | Boolean        | true          | 标题title居中                                       |
+| title                       | String         | --            | 标题title值                                         |
+| transparentFixedFontColor   | String         | #000          | 导航type类型为transparentFixed时透明状态下的字体颜色  |
+| type                        | String         | fixed         | 导航类型，可选：1.fixed固定导航 2.ordinary不固定导航 3.transparent透明不固定导航 4.transparentFixed透明固定导航|
+
+### bgColor数组值为JSON的参数
+| 名称                        | 类型            | 默认值         | 描述                                               |
+| ----------------------------|--------------- | ------------- | ---------------------------------------------------|
+| color                       | String         | --            | 渐变颜色值                                          |
+| scale                       | String         | --            | 渐变比例（百分比%）                                  |
+
+### 插槽
+| 名称                  | 描述                                                               |
+| ----------------------|-------------------------------------------------------------------|   
+| left                  | 左插槽                                                             |
+| default               | 中间标题插槽（type类型为transparentFixed时插槽只会穿透到实色背景下）   |
+| right                 | 右插槽                                                             |
+| transparentFixed      | 导航type类型为transparentFixed时透明状态下中间插槽                   |
+| transparentFixedRight | 导航type类型为transparentFixed时透明状态下右插槽                     |
+| transparentFixedRight | 导航type类型为transparentFixed时透明状态下右插槽                     |
+
+### 事件（type类型为transparentFixed时可用）
+| 名称             | 参数              | 描述                      |
+| -----------------|------------------| --------------------------|
+| scroll           | 滚动条到顶部距离   | 代替页面的onPageScroll函数 |
+| backClick        | 返回上一页按钮方法 | backState=3000时生效       |
diff --git a/mallplusui-uniapp-app2/config/api.js b/mallplusui-uniapp-app2/config/api.js
new file mode 100644
index 0000000..04081d4
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/api.js
@@ -0,0 +1,408 @@
+import {
+	apiBaseUrl
+} from './config.js';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import * as common from './common.js' //引入common
+import * as db from './db.js' //引入common
+// 需要登陆的，都写到这里，否则就是不需要登陆的接口
+const methodsToken = [
+	'user.info',
+	'user.editinfo',
+	'user.changeavatar',
+	'user.logout',
+	'user.addgoodsbrowsing',
+	'user.delgoodsbrowsing',
+	'user.goodsbrowsing',
+	'user.goodscollection',
+	'user.goodscollectionlist',
+	'user.vuesaveusership',
+	'user.saveusership',
+	'user.getshipdetail',
+	'user.setdefship',
+	'user.editship',
+	'user.removeship',
+	'user.getusership',
+	'user.pay',
+	'user.orderevaluate',
+	'user.getuserdefaultship',
+	'user.issign',
+	'user.sign',
+	'user.mypoint',
+	'user.userpointlog',
+	'user.getbankcardlist',
+	'user.getdefaultbankcard',
+	'user.addbankcard',
+	'user.removebankcard',
+	'user.setdefaultbankcard',
+	'user.getbankcardinfo',
+	'user.editpwd',
+	'user.forgotpwd',
+	'user.recommend',
+	'user.balancelist',
+	'user.sharecode',
+	'user.cash',
+	'user.cashlist',
+	'user.myinvite',
+	'user.activationinvite',
+	'coupon.getcoupon',
+	'coupon.usercoupon',
+	'cart.add',
+	'cart.del',
+	'cart.getlist',
+	'cart.setnums',
+	'cart.getnumber',
+	'order.cancel',
+	'order.del',
+	'order.details',
+	'order.confirm',
+	'order.getlist',
+	'order.create',
+	'order.getship',
+	'order.getorderlist',
+	'order.getorderstatusnum',
+	'order.aftersaleslist',
+	'order.aftersalesinfo',
+	'order.aftersalesstatus',
+	'order.addaftersales',
+	'order.sendreship',
+	'order.iscomment',
+	'payments.getinfo',
+	'user.getuserpoint',
+	'coupon.getcouponkey',
+	'store.isclerk',
+	'store.storeladinglist',
+	'store.ladinginfo',
+	'store.lading',
+	'store.ladingdel',
+	'distribution_center-api-info',
+	'distribution_center-api-applydistribution',
+	'distribution_center-api-setstore',
+	'distribution_center-api-myorder',
+	'pintuan.pintuanteam',
+	'lottery-api-getLotteryConfig',
+	'lottery-api-lottery',
+	'lottery-api-lotteryLog'
+];
+
+const post = (method, data, callback) => {
+	uni.showLoading({
+		title: '加载中'
+	});
+
+	// 判断token是否存在
+	if (methodsToken.indexOf(method) >= 0) {
+		// 获取用户token
+		let userToken = db.get("userToken");
+		if (!userToken) {
+			common.jumpToLogin();
+			return false;
+		} else {
+			data.token = userToken;
+		}
+	}
+
+	data.method = method;
+
+	uni.request({
+		url: apiBaseUrl + 'api.html',
+		data: data,
+		header: {
+			'Accept': 'application/json',
+			'Content-Type': 'application/json',
+			// 'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+		},
+		method: 'POST',
+		success: (response) => {
+			uni.hideLoading();
+			const result = response.data
+			if (!result.status) {
+				// 登录信息过期或者未登录
+				if (result.data === 14007 || result.data === 14006) {
+					db.del("userToken");
+					uni.showToast({
+						title: result.msg,
+						icon: 'none',
+						duration: 1000,
+						complete: function() {
+							setTimeout(function() {
+								uni.hideToast();
+								// #ifdef H5 || APP-PLUS
+								uni.navigateTo({
+									url: '/pages/login/login/index1'
+								})
+								// #endif
+								// #ifdef MP-WEIXIN || MP-ALIPAY
+								uni.navigateTo({
+									url: '/pages/login/choose/index',
+									animationType: 'pop-in',
+									animationDuration: 200
+								});
+								// #endif
+							}, 1000)
+						}
+					});
+				}
+			}
+			callback(result);
+		},
+		complete: () => {
+			uni.hideLoading();
+		},
+		fail: (error) => {
+			uni.hideLoading();
+			if (error && error.response) {
+				showError(error.response);
+			}
+		},
+	});
+
+}
+
+//插件post
+const pluginsPost = (method, data, callback) => {
+	uni.showLoading({
+		title: '加载中'
+	});
+
+	// 判断token是否存在
+	if (methodsToken.indexOf(method) >= 0) {
+		// 获取用户token
+		let userToken = db.get("userToken");
+		if (!userToken) {
+			common.jumpToLogin();
+			return false;
+		} else {
+			data.token = userToken;
+		}
+	}
+	uni.request({
+		url: apiBaseUrl + 'plugins/' + method + '.html',
+		data: data,
+		header: {
+			'Accept': 'application/json',
+			'Content-Type': 'application/json',
+			// 'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+		},
+		method: 'POST',
+		success: (response) => {
+			uni.hideLoading();
+			const result = response.data
+			if (!result.status) {
+				// 登录信息过期或者未登录
+				if (result.data === 14007 || result.data === 14006) {
+					db.del("userToken");
+					uni.showToast({
+						title: result.msg,
+						icon: 'none',
+						duration: 1000,
+						complete: function() {
+							setTimeout(function() {
+								uni.hideToast();
+								// #ifdef H5 || APP-PLUS
+								uni.navigateTo({
+									url: '/pages/login/login/index1'
+								})
+								// #endif
+								// #ifdef MP-WEIXIN || MP-ALIPAY
+								uni.navigateTo({
+									url: '/pages/login/choose/index',
+									animationType: 'pop-in',
+									animationDuration: 200
+								});
+								// #endif
+							}, 1000);
+						}
+					});
+				}
+			}
+			callback(result);
+		},
+		fail: (error) => {
+			uni.hideLoading();
+			if (error && error.response) {
+				showError(error.response);
+			}
+		},
+		complete: () => {
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 250);
+		}
+	});
+
+}
+
+const get = (url, callback) => {
+	uni.showLoading({
+		title: '加载中'
+	});
+	uni.request({
+		url: url,
+		header: {
+			'Accept': 'application/json',
+			'Content-Type': 'application/x-www-form-urlencoded', //自定义请求头信息
+		},
+		method: 'GET',
+		success: (response) => {
+			uni.hideLoading();
+			callback(response.data);
+		},
+		fail: (error) => {
+			uni.hideLoading();
+			if (error && error.response) {
+				showError(error.response);
+			}
+		},
+		complete: () => {
+			setTimeout(function() {
+				uni.hideLoading();
+			}, 250);
+		}
+	});
+}
+
+const showError = error => {
+	let errorMsg = ''
+	switch (error.status) {
+		case 400:
+			errorMsg = '请求参数错误'
+			break
+		case 401:
+			errorMsg = '未授权，请登录'
+			break
+		case 403:
+			errorMsg = '跨域拒绝访问'
+			break
+		case 404:
+			errorMsg = `请求地址出错: ${error.config.url}`
+			break
+		case 408:
+			errorMsg = '请求超时'
+			break
+		case 500:
+			errorMsg = '服务器内部错误'
+			break
+		case 501:
+			errorMsg = '服务未实现'
+			break
+		case 502:
+			errorMsg = '网关错误'
+			break
+		case 503:
+			errorMsg = '服务不可用'
+			break
+		case 504:
+			errorMsg = '网关超时'
+			break
+		case 505:
+			errorMsg = 'HTTP版本不受支持'
+			break
+		default:
+			errorMsg = error.msg
+			break
+	}
+
+	uni.showToast({
+		title: errorMsg,
+		icon: 'none',
+		duration: 1000,
+		complete: function() {
+			setTimeout(function() {
+				uni.hideToast();
+			}, 1000);
+		}
+	});
+}
+
+// 文件上传
+export const uploadFiles = (callback) => {
+	uni.chooseImage({
+		success: (chooseImageRes) => {
+			uni.showLoading({
+				title: '上传中...'
+			});
+			const tempFilePaths = chooseImageRes.tempFilePaths;
+			const uploadTask = uni.uploadFile({
+				url:  Api.BASEURI +'upload', //仅为示例，非真实的接口地址
+				filePath: tempFilePaths[0],
+				fileType: 'image',
+				name: 'file',
+				headers: {
+					'Accept': 'application/json',
+					'Content-Type': 'multipart/form-data',
+				},
+				formData: {
+					'method': 'images.upload',
+					'upfile': tempFilePaths[0]
+				},
+				success: (uploadFileRes) => {
+					callback(JSON.parse(uploadFileRes.data));
+				},
+				fail: (error) => {
+					if (error && error.response) {
+						showError(error.response);
+					}
+				},
+				complete: () => {
+					setTimeout(function() {
+						uni.hideLoading();
+					}, 250);
+				}
+			});
+			// 					uploadTask.onProgressUpdate((res) => {
+			//             console.log('上传进度' + res.progress);
+			//             console.log('已经上传的数据长度' + res.totalBytesSent);
+			//             console.log('预期需要上传的数据总长度' + res.totalBytesExpectedToSend);
+			//
+			//             // 测试条件，取消上传任务。
+			//             if (res.progress > 50) {
+			//                 uploadTask.abort();
+			//             }
+			// 					});
+		}
+	});
+}
+
+// 上传图片
+export const uploadImage = (num, callback) => {
+	uni.chooseImage({
+		count: num,
+		success: (res) => {
+			uni.showLoading({
+				title: '上传中...'
+			});
+			let tempFilePaths = res.tempFilePaths
+			for (var i = 0; i < tempFilePaths.length; i++) {
+				uni.uploadFile({
+					url: apiBaseUrl + 'api.html',
+					filePath: tempFilePaths[i],
+					fileType: 'image',
+					name: 'file',
+					headers: {
+						'Accept': 'application/json',
+						'Content-Type': 'multipart/form-data',
+					},
+					formData: {
+						'method': 'images.upload',
+						'upfile': tempFilePaths[i]
+					},
+					success: (uploadFileRes) => {
+						callback(JSON.parse(uploadFileRes.data));
+					},
+					fail: (error) => {
+						if (error && error.response) {
+							showError(error.response);
+						}
+					},
+					complete: () => {
+						setTimeout(function() {
+							uni.hideLoading();
+						}, 250);
+					},
+				});
+			}
+		}
+	});
+}
+
diff --git a/mallplusui-uniapp-app2/config/baseUrl.js b/mallplusui-uniapp-app2/config/baseUrl.js
new file mode 100644
index 0000000..45a2dda
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/baseUrl.js
@@ -0,0 +1,51 @@
+let baseUrl = "";
+let socketUrl = "";
+if (process.env.NODE_ENV === 'development') {
+	// 开发环境
+	// baseUrl = "http://localhost:7001/";
+	// socketUrl = "ws://localhost:8001/";
+	// baseUrl = "http://26077a35f5.wicp.vip:43609/";
+	baseUrl = "http://www.yyundong.com:8083/";
+	socketUrl = "ws://8192.168.43.195:8083/";
+} else if (process.env.NODE_ENV === 'production') {
+	// 生产环境
+	baseUrl = "http://www.yyundong.com:8083/";
+	// baseUrl = "http://192.168.43.195:8083/";
+	socketUrl = "ws://192.168.43.195:8083/";
+}
+const courtConfig = {
+	//微信公众号APPID
+	publicAppId: "",
+	//请求接口
+	baseUrl: baseUrl,
+	//webSocket地址
+	socketUrl: socketUrl,
+	//平台名称
+	platformName: "uniApp-案例",
+	//项目logo
+	logoUrl: "https://qn.kemean.cn/upload/201906/19/3f3b4751f3ed4a97be804450c3ec4c79",
+	//页面分享配置
+	share: {
+		title: 'uniApp-案例',
+		// #ifdef MP-WEIXIN
+		path: '/pages/home/home', //小程序分享路径
+		// #endif
+		// #ifdef H5 || APP-PLUS
+		//公众号||APP分享
+		desc: "uniApp-案例", // 分享描述
+		link: "https://www.kemean.com/sameCity/18031201/index.html", // 分享链接，该链接域名或路径必须与当前页面对应的公众号JS安全域名一致
+		imgUrl: "http://qn.kemean.cn/upload/201901/28/23bedfc34597482292ecd6dc107f6342", // 分享图标
+		// #endif
+	}
+};
+//手机号验证正则表达式
+const phoneRegular = /^1\d{10}$/;
+//邮箱验证正则表达式
+const mailRegular = /^\w+@\w+(\.[a-zA-Z]{2,3}){1,2}$/;
+//密码验证正则表达式
+const passwordRegular = /^[a-zA-Z0-9]{4,10}$/;
+export default Object.assign({
+	phoneRegular,
+	mailRegular,
+	passwordRegular
+}, courtConfig);
diff --git a/mallplusui-uniapp-app2/config/common.js b/mallplusui-uniapp-app2/config/common.js
new file mode 100644
index 0000000..751fe66
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/common.js
@@ -0,0 +1,485 @@
+import * as db from './db.js' //引入common
+import store from './../store'
+//把obj对象里的值覆盖到newobj里面
+function deepCopy(newobj, obj) {
+  if (typeof obj != 'object') {
+    return obj
+  }
+  for (var attr in obj) {
+    var a = {}
+    if (newobj[attr]) {
+      a = newobj[attr]
+    }
+    newobj[attr] = deepCopy(a, obj[attr])
+  }
+  return newobj
+}
+
+//跳转到登陆页面
+function jumpToLogin(method) {
+  var now_time = Date.parse(new Date())
+  var value = db.get('jump_to_login')
+  if (!value) {
+    value = 0
+  }
+  if (now_time - value > 3000) {
+    //db.set('jump_to_login',now_time); //暂时屏蔽登录时间查询
+    // 将当前页面route存vuex中 登录注册后跳转
+    let pages = getCurrentPages()
+    let page = pages[pages.length - 1]
+    // 获取页面参数信息
+    let pagePath = ''
+    // #ifdef H5 || MP-WEIXIN || APP-PLUS	 || APP-PLUS-NVUE
+    if (page.route.indexOf('pages/goods/index/index') !== -1) {
+		//商品详情页
+		if(page.goodsId) {
+			pagePath = '/' + page.route + '?id=' + page.goodsId;
+		}else{
+			pagePath = '/pages/index/index';
+		}
+    }
+	if (page.route.indexOf('pages/goods/index/group') !== -1) {
+		//团购秒杀详情页
+		if(page.goodsId && page.groupId) {
+			pagePath = '/' + page.route + '?id=' + page.goodsId + '&group_id' + page.groupId;
+		}else{
+			pagePath = '/pages/index/index';
+		}
+	}
+    // #endif
+
+    // #ifdef MP-ALIPAY
+    if (page.__proto__.route.indexOf('pages/goods/index/index') !== -1)
+	{
+		//商品详情页
+		if(page.rootVM.goodsId) {
+			pagePath = '/' + page.__proto__.route + '?id=' + page.rootVM.goodsId;
+		}else{
+			pagePath = '/pages/index/index';
+		}
+    }
+	if (page.__proto__.route.indexOf('pages/goods/index/group') !== -1) {
+		//团购秒杀详情页
+		if(page.rootVM.goodsId && page.rootVM.groupId) {
+			pagePath = '/' + page.__proto__.route + '?id=' + page.rootVM.goodsId + '&group_id' + page.rootVM.groupId;
+		}else{
+			pagePath = '/pages/index/index';
+		}
+	}
+    // #endif
+	if(pagePath){
+		store.commit({
+			type: 'redirect',
+			page: pagePath
+		})
+	}
+    uni.showToast({
+      title: '请先登录!',
+      icon: 'none',
+      duration: 1000,
+      success: function(res) {
+        // #ifdef H5 || APP-PLUS
+        setTimeout(() => {
+			uni.hideToast();
+			uni.navigateTo({
+				url: '/pages/public/index1'
+			})
+        }, 1000)
+        // #endif
+        // #ifdef MP-WEIXIN || MP-ALIPAY
+        setTimeout(() => {
+			uni.hideToast();
+			uni.navigateTo({
+				url: '/pages/public/choose/index',
+				animationType: 'pop-in',
+				animationDuration: 200
+			})
+        }, 500)
+        // #endif
+      }
+    })
+  }
+}
+
+//当出错的时候，显示错误信息，并且跳转 弃用
+/* function errorToBack(msg = '出错了，请重试',delta=1){
+  uni.showToast({
+    title: msg,
+    icon: 'none',
+    duration: 2000,
+  });
+  if(delta > 0){
+    setTimeout(function () {
+      uni.navigateBack({
+        delta: delta
+      })
+    }, 1000);
+  }
+} */
+//操作成功后，的提示信息
+function successToShow(msg = '保存成功', callback = function() {}) {
+  uni.showToast({
+    title: msg,
+    icon: 'success',
+    duration: 1000
+  })
+  setTimeout(function() {
+    callback()
+  }, 500)
+}
+
+//操作失败的提示信息
+function errorToShow(msg = '操作失败', callback = function() {}) {
+  uni.showToast({
+    title: msg,
+    icon: 'none',
+    duration: 1500
+  })
+  setTimeout(function() {
+    callback()
+  }, 1500)
+}
+
+//加载显示
+function loadToShow(msg = '加载中') {
+  uni.showToast({
+    title: msg,
+    icon: 'loading'
+  })
+}
+
+//加载隐藏
+function loadToHide() {
+  uni.hideToast()
+}
+
+// 提示框
+function modelShow(
+  title = '提示',
+  content = '确认执行此操作吗?',
+  callback = () => {},
+  showCancel = true,
+  cancelText = '取消',
+  confirmText = '确定'
+) {
+  uni.showModal({
+    title: title,
+    content: content,
+    showCancel: showCancel,
+    cancelText: cancelText,
+    confirmText: confirmText,
+    cancelText: cancelText,
+    success: function(res) {
+      if (res.confirm) {
+        // 用户点击确定操作
+        setTimeout(() => {
+          callback()
+        }, 500)
+      } else if (res.cancel) {
+        // 用户取消操作
+      }
+    }
+  })
+}
+
+//时间戳转时间格式
+function timeToDate(date, flag = false) {
+  var date = new Date(date * 1000) //如果date为13位不需要乘1000
+  var Y = date.getFullYear() + '-'
+  var M =
+    (date.getMonth() + 1 < 10
+      ? '0' + (date.getMonth() + 1)
+      : date.getMonth() + 1) + '-'
+  var D = (date.getDate() < 10 ? '0' + date.getDate() : date.getDate()) + ' '
+  var h = (date.getHours() < 10 ? '0' + date.getHours() : date.getHours()) + ':'
+  var m =
+    (date.getMinutes() < 10 ? '0' + date.getMinutes() : date.getMinutes()) + ':'
+  var s = date.getSeconds() < 10 ? '0' + date.getSeconds() : date.getSeconds()
+  if(flag)
+  {
+	  return Y + M + D
+  }
+  else
+  {
+	  return Y + M + D + h + m + s
+  }
+}
+
+function time2date(micro_second) {
+  var time = {}
+  // 总秒数
+  var second = Math.floor(micro_second)
+  // 天数
+  time.day = PrefixInteger(Math.floor(second / 3600 / 24), 2)
+  // 小时
+  time.hour = PrefixInteger(Math.floor((second / 3600) % 24), 2)
+  // 分钟
+  time.minute = PrefixInteger(Math.floor((second / 60) % 60), 2)
+  // 秒
+  time.second = PrefixInteger(Math.floor(second % 60), 2)
+
+  var newtime = ''
+  if (time.day > 0) {
+    newtime =
+      time.day +
+      '天' +
+      time.hour +
+      '小时' +
+      time.minute +
+      '分' +
+      time.second +
+      '秒'
+  } else {
+    if (time.hour != 0) {
+      newtime = time.hour + '小时' + time.minute + '分' + time.second + '秒'
+    } else {
+      newtime = time.minute + '分' + time.second + '秒'
+    }
+  }
+  return newtime
+}
+
+function timeToDateObj(micro_second) {
+  var time = {}
+  // 总秒数
+  var second = Math.floor(micro_second)
+  // 天数
+  time.day = Math.floor(second / 3600 / 24)
+  // 小时
+  time.hour = Math.floor((second / 3600) % 24)
+  // 分钟
+  time.minute = Math.floor((second / 60) % 60)
+  // 秒
+  time.second = Math.floor(second % 60)
+
+  return time
+
+}
+
+//货币格式化
+function formatMoney(number, places, symbol, thousand, decimal) {
+  number = number || 0
+  places = !isNaN((places = Math.abs(places))) ? places : 2
+  symbol = symbol !== undefined ? symbol : '￥'
+  thousand = thousand || ','
+  decimal = decimal || '.'
+  var negative = number < 0 ? '-' : '',
+    i = parseInt((number = Math.abs(+number || 0).toFixed(places)), 10) + '',
+    j = (j = i.length) > 3 ? j % 3 : 0
+  return (
+    symbol +
+    negative +
+    (j ? i.substr(0, j) + thousand : '') +
+    i.substr(j).replace(/(\d{3})(?=\d)/g, '$1' + thousand) +
+    (places
+      ? decimal +
+        Math.abs(number - i)
+          .toFixed(places)
+          .slice(2)
+      : '')
+  )
+}
+function throttle(fn, context, delay) {
+  clearTimeout(fn.timeoutId)
+  fn.timeoutId = setTimeout(function() {
+    fn.call(context)
+  }, delay)
+}
+
+// 时间格式化输出，如11:03 25:19 每1s都会调用一次
+function dateformat(micro_second) {
+  var time = {}
+  // 总秒数
+  var second = Math.floor(micro_second / 1000) // 天数
+  time.day = PrefixInteger(Math.floor(second / 3600 / 24), 2) // 小时
+  time.hour = PrefixInteger(Math.floor((second / 3600) % 24), 2) // 分钟
+  time.minute = PrefixInteger(Math.floor((second / 60) % 60), 2) // 秒
+  time.second = PrefixInteger(Math.floor(second % 60), 2)
+  return time
+}
+
+//不足位数前面补0
+function PrefixInteger(num, length) {
+  return (Array(length).join('0') + num).slice(-length)
+}
+
+//验证是否是手机号
+function isPhoneNumber(str) {
+  var myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/
+  if (!myreg.test(str)) {
+    return false
+  } else {
+    return true
+  }
+}
+
+/**
+ *
+ * 对象参数转为url参数
+ *
+ */
+function builderUrlParams(url, data) {
+  if (typeof url == 'undefined' || url == null || url == '') {
+    return ''
+  }
+  if (typeof data == 'undefined' || data == null || typeof data != 'object') {
+    return ''
+  }
+  url += url.indexOf('?') != -1 ? '' : '?'
+  for (var k in data) {
+    url += (url.indexOf('=') != -1 ? '&' : '') + k + '=' + encodeURI(data[k])
+  }
+  return url
+}
+
+/**
+ * 使用循环的方式判断一个元素是否存在于一个数组中
+ * @param {Object} arr 数组
+ * @param {Object} value 元素值
+ */
+function isInArray(arr, value) {
+  for (var i = 0; i < arr.length; i++) {
+    if (value === arr[i]) {
+      return true
+    }
+  }
+  return false
+}
+/**
+ * 统一跳转
+ */
+function navigateTo(url) {
+  uni.navigateTo({
+    url: url,
+    animationType: 'pop-in',
+    animationDuration: 300
+  })
+}
+
+/**
+ *  关闭当前页面并跳转
+ */
+function redirectTo(url) {
+  uni.redirectTo({
+    url: url,
+    animationType: 'pop-in',
+    animationDuration: 300
+  })
+}
+
+/**
+ * 获取url参数
+ *
+ * @param {*} name
+ * @param {*} [url=window.location.serach]
+ * @returns
+ */
+function getQueryString(name, url) {
+  var url = url || window.location.href
+  var reg = new RegExp('(^|&|/?)' + name + '=([^&|/?]*)(&|/?|$)', 'i')
+  var r = url.substr(1).match(reg)
+  if (r != null) {
+    return r[2]
+  }
+  return null
+}
+
+/**
+ *
+ *  判断是否在微信浏览器 true是
+ */
+function isWeiXinBrowser() {
+  // #ifdef H5
+  // window.navigator.userAgent属性包含了浏览器类型、版本、操作系统类型、浏览器引擎类型等信息，这个属性可以用来判断浏览器类型
+  let ua = window.navigator.userAgent.toLowerCase()
+  // 通过正则表达式匹配ua中是否含有MicroMessenger字符串
+  if (ua.match(/MicroMessenger/i) == 'micromessenger') {
+    return true
+  } else {
+    return false
+  }
+  // #endif
+
+  return false
+}
+
+/**
+ * 金额相加
+ * @param {Object} value1
+ * @param {Object} value2
+ */
+function moneySum(value1,value2){
+	return (parseFloat(value1)+parseFloat(value2)).toFixed(2);
+}
+/**
+ * 金额相减
+ * @param {Object} value1
+ * @param {Object} value2
+ */
+function moneySub(value1,value2){
+	let res = (parseFloat(value1)-parseFloat(value2)).toFixed(2);
+	return res>0?res:0;
+}
+
+
+/**
+ * 分享URL解压缩
+ * @param {Object} url
+ */
+function shareParameterEncode(url){
+	let urlArray = url.split('-');
+    let newUrl = 'type=' + urlArray[0] + '&invite=' + urlArray[1] + '&id=' + urlArray[2] + '&team_id=' + urlArray[3] + '&id_type=' + urlArray[4] + '&page_code=' + urlArray[5] + '&group_id=' + urlArray[6];
+    return newUrl;
+}
+
+
+/**
+ * 分享URL压缩
+ * @param {Object} url
+ */
+function shareParameterDecode(url){
+	var urlArray = url.split('&');
+	var allParameter = {
+		'type': '',
+		'invite': '',
+		'id': '',
+		'team_id': '',
+		'id_type': '',
+		'page_code': '',
+		'group_id': '',
+	};
+	for(var i = 0; i < urlArray.length; i++) {
+		var parameter = urlArray[i].split('=');
+		allParameter[parameter[0]] = parameter[1];
+	}
+	var newUrl = allParameter.type + '-' + allParameter.invite + '-' + allParameter.id + '-' + allParameter.team_id + '-' + allParameter.id_type + '-' + allParameter.page_code + '-' + allParameter.group_id;
+	return newUrl;
+}
+
+export {
+  deepCopy,
+  jumpToLogin,
+  timeToDate,
+  formatMoney,
+  /* errorToBack, */
+  successToShow,
+  throttle,
+  errorToShow,
+  time2date,
+  isPhoneNumber,
+  isInArray,
+  loadToShow,
+  loadToHide,
+  navigateTo,
+  redirectTo,
+  modelShow,
+  builderUrlParams,
+  isWeiXinBrowser,
+  dateformat,
+  getQueryString,
+  timeToDateObj,
+  moneySum,
+  moneySub,
+  shareParameterEncode,
+  shareParameterDecode
+}
diff --git a/mallplusui-uniapp-app2/config/config.js b/mallplusui-uniapp-app2/config/config.js
new file mode 100644
index 0000000..91b81d5
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/config.js
@@ -0,0 +1,14 @@
+// // export const apiBaseUrl = 'http://www.b2c.com/'
+// export const apiBaseUrl = 'http://192.168.43.195:8081/'
+export const apiBaseUrl = 'http://www.yyundong.com:8081/'
+//export const apiBaseUrl = 'https://demo.jihainet.com/'
+// #ifdef H5
+export const baseUrl=process.env.NODE_ENV === 'development'?window.location.origin+'/':apiBaseUrl
+// #endif
+export const paymentType = {
+  //支付单类型
+  order: 1, //订单
+  recharge: 2, //充值
+  form_order: 5, //表单付款码
+  form_pay: 6 //表单订单
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/config/db.js b/mallplusui-uniapp-app2/config/db.js
new file mode 100644
index 0000000..4a74ea7
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/db.js
@@ -0,0 +1,84 @@
+import * as common from './common.js' //引入common
+
+//取值
+function get(key,sync = true) {
+    try {
+		if(sync){
+			return uni.getStorageSync(key);
+		}else{
+			let data = '';
+			uni.getStorage({
+				key:key,
+				success: function (res) {
+					data = res.data;
+				}
+			});
+			return data;
+		}
+    } catch (e) {
+        return false;
+    }
+}
+
+//赋值
+function set(key, value, sync = true) {
+    try {
+        if (sync) {
+            return uni.setStorageSync(key, value);
+        } else {
+            uni.setStorage({
+                key: key,
+                data: value
+            });
+        }
+    } catch (e) {
+
+    }
+}
+
+//移除
+function del(key, sync = true){
+    try {
+        if (sync) {
+            return uni.removeStorageSync(key);
+        } else {
+            uni.removeStorage({
+                key: key
+            });
+        }
+    } catch (e) {
+        return false;
+    }
+}
+
+//清空
+function clear(sync = true){
+    try {
+        if (sync) {
+            return uni.clearStorageSync();
+        } else {
+            uni.clearStorage();
+        }
+    } catch (e) {
+        return false;
+    }
+}
+
+//获取用户token，如果缓存有，直接返回，如果没有，就先微信登陆，然后服务器登陆，最后返回token
+function userToken(callback) {
+    var token = get('userToken');
+    if (token){
+        callback(token);
+    }else{
+        //如果没有登陆，就去登陆
+        common.jumpToLogin();
+    }
+}
+
+export {
+    get,
+    set,
+    del,
+    clear,
+    userToken
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/config/mixins.js b/mallplusui-uniapp-app2/config/mixins.js
new file mode 100644
index 0000000..4f1bca0
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/mixins.js
@@ -0,0 +1,176 @@
+export const orders = {
+  mounted() {},
+  methods: {
+    // 查看订单详情
+    orderDetail(orderId) {
+      this.$common.navigateTo(
+        '/pages/member/order/orderdetail?order_id=' + orderId
+      )
+    },
+    // 取消订单
+
+    // 去支付
+    toPay(orderId) {
+      this.$common.navigateTo(
+        '/pages/order/payment/index?order_id=' + orderId + '&type=1'
+      )
+    },
+    // 确认收货
+
+    // 去评价
+    toEvaluate(orderId) {
+      this.$common.navigateTo(
+        '/pages/member/order/evaluate?order_id=' + orderId
+      )
+    },
+    // 申请售后
+
+    // 查看物流信息
+    showExpress(code, no, address = '') {
+      let params = encodeURIComponent(
+        'code=' + code + '&no=' + no + '&add=' + address
+      )
+
+      this.$common.navigateTo(
+        '/pages/member/order/express_delivery?params=' + params
+      )
+    }
+  }
+}
+
+/**
+ *  商品接口信息
+ *
+ */
+export const goods = {
+  mounted() {},
+  methods: {
+    // 查看商品详情
+    goodsDetail(goodsId) {
+      this.$common.navigateTo('/pages/goods/index/index?id=' + goodsId)
+    },
+    // 跳转商品列表页
+    goodsList(obj = {}) {
+      let url = '/pages/classify/index'
+      if (Object.keys(obj).length) {
+        url = this.$common.builderUrlParams(url, obj)
+      }
+      this.$common.navigateTo(url)
+    },
+    // 团购秒杀详情
+    groupDetail(id, group_id) {
+      this.$common.navigateTo(
+        '/pages/goods/index/group?id=' + id + '&group_id=' + group_id
+      )
+    },
+    //拼团详情页
+    pintuanDetail(id, team_id) {
+      if (team_id) {
+        this.$common.navigateTo(
+          '/pages/goods/index/pintuan?id=' + id + '&team_id=' + team_id
+        )
+      } else {
+        this.$common.navigateTo('/pages/goods/index/pintuan?id=' + id)
+      }
+    }
+  }
+}
+
+/**
+ *
+ *  返回操作处理
+ *
+ */
+export const goBack = {
+  onBackPress(options) {
+    if (options.from === 'navigateBack') {
+      return false
+    }
+    let loginPages = ['/pages/cart/index/index', '/pages/member/index/index']
+    let backPage = this.$store.state.redirectPage
+    if (loginPages.indexOf(backPage) > -1) {
+      this.$store.commit({
+        type: 'redirect',
+        page: ''
+      })
+      uni.switchTab({
+        url: '/pages/index/index'
+      })
+      return true
+    }
+  }
+}
+
+/* Function Info
+ * Author:      zhf
+ * CreateTime:  2019/7/12 下午12:10:00
+ * LastEditor:  zhf
+ * ModifyTime:  2019/7/12 下午12:10:00
+ * Description: 登录成功统一跳转处理
+ */
+
+export const jumpBackPage = {
+  methods: {
+    handleBack() {
+      let redirect = this.$store.state.redirectPage
+      this.$store.commit({
+        type: 'redirect',
+        page: ''
+      })
+      let switchTabs = ['/pages/index/index', '/pages/member/index/index']
+      if (switchTabs.indexOf(redirect) > -1) {
+        uni.switchTab({
+          url: redirect
+        })
+      } else if (redirect) {
+        uni.redirectTo({
+          url: redirect
+        })
+      } else {
+        uni.switchTab({
+          url: '/pages/index/index'
+        })
+      }
+    }
+  }
+}
+
+/* Function Info
+ * Author:      zhf
+ * CreateTime:  2019/7/12 下午12:10:28
+ * LastEditor:  zhf
+ * ModifyTime:  2019/7/12 下午12:10:28
+ * Description: 操作判断登录处理
+ */
+
+export const checkLogin = {
+  methods: {
+    checkIsLogin() {
+      uni.showToast({
+        title: '请先登录!',
+        icon: 'none',
+        duration: 800,
+        success: function(res) {
+          // #ifdef H5 || APP-PLUS
+          setTimeout(() => {
+            uni.hideToast()
+            uni.navigateTo({
+              url: '/pages/public/index1'
+            })
+          }, 800)
+          // #endif
+          // #ifdef MP-WEIXIN || MP-ALIPAY
+          setTimeout(() => {
+            uni.hideToast()
+            uni.navigateTo({
+              url: '/pages/public/choose/index',
+              animationType: 'pop-in',
+              animationDuration: 200
+            })
+          }, 500)
+          // #endif
+        }
+      })
+    }
+  }
+}
diff --git a/mallplusui-uniapp-app2/config/requestConfig.js b/mallplusui-uniapp-app2/config/requestConfig.js
new file mode 100644
index 0000000..8271668
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/requestConfig.js
@@ -0,0 +1,211 @@
+import request from "@/plugins/request";
+import store from '@/config/store';
+import base from '@/config/baseUrl';
+// #ifdef H5
+import {
+	h5Login
+} from '@/config/html5Utils';
+// #endif
+// #ifdef MP-WEIXIN
+import {
+	onLogin
+} from '@/config/login';
+// #endif
+let version_code = '';
+// #ifdef APP-PLUS
+import { getCurrentNo } from '@/plugins/APPUpdate';
+setTimeout(() => {
+	getCurrentNo(function(res){
+		console.log("版本号",res);
+		version_code = res.versionCode;
+	});
+},200);
+// #endif
+
+//可以new多个request来支持多个域名请求
+let $http = new request({
+	//接口请求地址
+	baseUrl: base.baseUrl,
+	//服务器本地上传文件地址
+	fileUrl: base.baseUrl,
+	//设置请求头（如果使用报错跨域问题，可能是content-type请求类型和后台那边设置的不一致）
+	header: {
+		'Content-Type': 'application/json;charset=UTF-8',
+		'project_token': base.projectToken, //项目token（可删除）
+	}
+});
+// 添加获取七牛云token的方法
+$http.getQnToken = function(callback){
+	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
+	$http.get("api/common/v1/qn_upload").then(data => {
+		/*
+		 *接口返回参数：
+		 *visitPrefix:访问文件的域名
+		 *token:七牛云上传token
+		 *folderPath:上传的文件夹
+		 *region: 地区 默认为：SCN
+		 */
+		callback({
+			visitPrefix: data.visitPrefix,
+			token: data.token,
+			folderPath: data.folderPath
+		});
+	});
+}
+//请求开始拦截器
+$http.requestStart = function(options) {
+	console.log("请求开始", options);
+	if (options.load) {
+		//打开加载动画
+		store.commit("setLoadingShow", true);
+	}
+	// 图片上传大小限制
+	if (options.method == "FILE" && options.maxSize) {
+		// 文件最大字节: options.maxSize 可以在调用方法的时候加入参数
+		maxSize = options.maxSize;
+		for (let item of options.files) {
+			if (item.size > maxSize) {
+				setTimeout(() => {
+					uni.showToast({
+						title: "图片过大，请重新上传",
+						icon: "none"
+					});
+				}, 500);
+				return false;
+			}
+		}
+	}
+	// #ifdef APP-PLUS
+	// 添加当前版本号
+	if(version_code){
+		options.header['version_code'] = version_code;
+	}
+	// #endif
+	//请求前加入token
+	if (store.state.userInfo.token) {
+		options.header['user_token'] = store.state.userInfo.token;
+	};
+	return options;
+}
+//请求结束
+$http.requestEnd = function(options, resolve) {
+	//判断当前接口是否需要加载动画
+	if (options.load) {
+		// 关闭加载动画
+		store.commit("setLoadingShow", false);
+	}
+	if (resolve.errMsg && resolve.statusCode && resolve.statusCode > 300) {
+		setTimeout(() => {
+			uni.showToast({
+				title: "网络错误，请检查一下网络",
+				icon: "none"
+			});
+		}, 500);
+	}
+}
+let loginPopupNum = 0;
+//所有接口数据处理（此方法需要开发者根据各自的接口返回类型修改，以下只是模板）
+$http.dataFactory = function(res) {
+	console.log("接口请求数据", {
+		url: res.url,
+		resolve: res.response,
+		header: res.header,
+		data: res.data,
+		method: res.method,
+	});
+	if (res.response.statusCode && res.response.statusCode == 200) {
+		let httpData = res.response.data;
+
+		/*********以下只是模板(及共参考)，需要开发者根据各自的接口返回类型修改*********/
+
+		//判断数据是否请求成功
+		if (httpData.success || httpData.code == 200) {
+			// 返回正确的结果(then接受数据)
+			res.resolve(httpData.data);
+		} else if (httpData.code == "1000" || httpData.code == "1001" || httpData.code == 1100) {
+			// 失败重发
+			// $http.request({
+			// 	url: res.url,
+			// 	data: res.data,
+			// 	method: res.method,
+			// 	header: res.header,
+			// 	isPrompt: res.isPrompt,//（默认 true 说明：本接口抛出的错误是否提示）
+			// 	load: res.load,//（默认 true 说明：本接口是否提示加载动画）
+			// 	isFactory: res.isFactory, //（默认 true 说明：本接口是否调用公共的数据处理方法，设置false后isPrompt参数将失去作用）
+			// }).then(data => {
+			// 	res.resolve(data);
+			// });
+			store.commit("emptyUserInfo");
+			// #ifdef MP-WEIXIN
+			onLogin();
+			// #endif
+			// #ifdef H5
+			h5Login("force");
+			// #endif
+			// #ifdef APP-PLUS
+			var content = '此时此刻需要您登录喔~';
+			if (httpData.code == "1000") {
+				content = '此时此刻需要您登录喔';
+			}
+			if (loginPopupNum <= 0) {
+				loginPopupNum++;
+				uni.showModal({
+					title: '温馨提示',
+					content: content,
+					confirmText: "去登录",
+					cancelText: "再逛会",
+					success: function(res) {
+						loginPopupNum--;
+						if (res.confirm) {
+							uni.navigateTo({
+								url: "/pages/user/login"
+							});
+						}
+					}
+				});
+			}
+			// #endif
+			// 返回错误的结果(catch接受数据)
+			res.reject(res.response);
+		} else if (httpData.code == "1004") {
+			if (loginPopupNum <= 0) {
+				loginPopupNum++;
+				uni.showModal({
+					title: "提示",
+					content: "您还未绑定手机号，请先绑定~",
+					confirmText: "去绑定",
+					cancelText: "再逛会",
+					success: (res) => {
+						loginPopupNum--;
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/user/bindPhone'
+							});
+						}
+					}
+				});
+			}
+			// 返回错误的结果(catch接受数据)
+			res.reject(res.response);
+		} else { //其他错误提示
+			if (res.isPrompt) {
+				setTimeout(function() {
+					uni.showToast({
+						title: httpData.info || httpData.msg,
+						icon: "none",
+						duration: 3000
+					});
+				}, 500);
+			}
+			// 返回错误的结果(catch接受数据)
+			res.reject(res.response);
+		}
+
+		/*********以上只是模板(及共参考)，需要开发者根据各自的接口返回类型修改*********/
+
+	} else {
+		// 返回错误的结果(catch接受数据)
+		res.reject(res.response);
+	}
+};
+export default $http;
diff --git a/mallplusui-uniapp-app2/config/store.js b/mallplusui-uniapp-app2/config/store.js
new file mode 100644
index 0000000..e549b60
--- /dev/null
+++ b/mallplusui-uniapp-app2/config/store.js
@@ -0,0 +1,124 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+Vue.use(Vuex);
+//变量
+const state = {
+	//用户数据
+	userInfo: {},
+	//webView地址
+	webViewUrl: "",
+	loadingShow: false,
+	//微信场景参数
+	chatScenesInfo: {},
+	//登录弹窗状态
+	loginPopupShow: false,
+	//当前位置
+	currentAddress: {
+		areaName: "请选择",
+		areaId: ''
+	},
+};
+//缓存浏览器的数据名称
+const cacheNameList = ["userInfo"];
+let clearTime;
+const mutations = {
+	//取出缓存数据（打开APP就取出）
+	setCacheData(state) {
+		for (let name of cacheNameList) {
+			// #ifndef H5
+			let data = uni.getStorageSync(name);
+			// #endif
+			// #ifdef H5
+			let data = sessionStorage.getItem(name) || localStorage.getItem(name);
+			// #endif
+			if (data) {
+				// #ifdef H5
+				try {
+					data = JSON.parse(data);
+				} catch (e) {
+				}
+				// #endif
+				state[name] = data;
+			}
+		}
+	},
+	//储存用户信息
+	setUserInfo(state, data) {
+		if (data) {
+			state.userInfo =  Object.assign(state.userInfo,data);
+			// #ifdef H5
+			window.sessionStorage.setItem('userInfo', JSON.stringify(state.userInfo));
+			// #endif
+			// #ifndef H5
+			uni.setStorageSync('userInfo', state.userInfo);
+			// #endif
+		}
+	},
+	// 退出APP
+	emptyUserInfo(state) {
+		state.userInfo = {};
+		// #ifdef H5
+		window.sessionStorage.removeItem("userInfo");
+		// #endif
+		// #ifndef H5
+		uni.removeStorageSync("userInfo");
+		// #endif
+	},
+	//WebView地址
+	setWebViewUrl(state, data) {
+		if (data) {
+			state.webViewUrl = data;
+			// #ifdef H5
+			window.sessionStorage.setItem('webViewUrl', data);
+			// #endif
+		}
+	},
+	//数据加载状态
+	setLoadingShow(state, data) {
+		if(state.loadingShow){
+			clearTime && clearTimeout(clearTime);
+			clearTime = setTimeout(function(){
+				state.loadingShow = data;
+			},300);
+		} else {
+			state.loadingShow = data;
+		}
+	},
+	//微信场景参数
+	setChatScenesInfo(state, data) {
+		if (data) {
+			state.chatScenesInfo = data;
+		}
+	},
+	//登录弹窗状态
+	setLoginPopupShow(state, data) {
+		state.loginPopupShow = data;
+	},
+	//当前地址
+	setCurrentAddress(state, data) {
+		if (data) {
+			state.currentAddress = Object.assign(state.currentAddress, data);
+			let addressInfo = {
+				"provinceId": state.currentAddress.provinceId,
+				"provinceName": state.currentAddress.provinceName,
+				"cityId": state.currentAddress.cityId,
+				"cityName": state.currentAddress.cityName,
+				"areaId": state.currentAddress.areaId,
+				"areaName": state.currentAddress.areaName,
+			};
+			// #ifdef H5
+			window.sessionStorage.setItem('currentAddress', JSON.stringify(addressInfo));
+			// #endif
+			// #ifndef H5
+			uni.setStorageSync('currentAddress', addressInfo);
+			// #endif
+		}
+	}
+};
+//异步处理
+const actions = {};
+export default new Vuex.Store({
+	state,
+	mutations,
+	actions
+});
diff --git a/mallplusui-uniapp-app2/main.js b/mallplusui-uniapp-app2/main.js
new file mode 100644
index 0000000..d85e0d5
--- /dev/null
+++ b/mallplusui-uniapp-app2/main.js
@@ -0,0 +1,62 @@
+import Vue from 'vue'
+import store from './store'
+import App from './App'
+import * as otherApi from './config/api.js'
+
+
+import * as Common from './config/common.js'
+import * as Db from './config/db.js'
+import * as Config from './config/config.js'
+import Json from './Json' //测试用数据
+/**
+ *  因工具函数属于公司资产, 所以直接在Vue实例挂载几个常用的函数
+ *  所有测试用数据均存放于根目录json.js
+ *
+ *  css部分使用了App.vue下的全局样式和iconfont图标，有需要图标库的可以留言。
+ *  示例使用了uni.scss下的变量, 除变量外已尽量移除特有语法,可直接替换为其他预处理器使用
+ */
+const msg = (title, duration=1500, mask=false, icon='none')=>{
+	//统一提示方便全局修改
+	if(Boolean(title) === false){
+		return;
+	}
+	uni.showToast({
+		title,
+		duration,
+		mask,
+		icon
+	});
+}
+const json = type=>{
+	//模拟异步请求数据
+	return new Promise(resolve=>{
+		setTimeout(()=>{
+			resolve(Json[type]);
+		}, 500)
+	})
+}
+
+const prePage = ()=>{
+	let pages = getCurrentPages();
+	let prePage = pages[pages.length - 2];
+    // #ifdef H5
+    return prePage;
+    // #endif
+
+	return prePage.$vm;
+}
+Vue.prototype.$otherApi = otherApi;
+Vue.prototype.$common = Common;
+Vue.prototype.$db = Db;
+Vue.prototype.$config = Config;
+Vue.config.productionTip = false
+Vue.prototype.$fire = new Vue();
+Vue.prototype.$store = store;
+Vue.prototype.$api = {msg, json, prePage};
+
+App.mpType = 'app'
+
+const app = new Vue({
+    ...App
+})
+app.$mount()
diff --git a/mallplusui-uniapp-app2/mallplus.keystore b/mallplusui-uniapp-app2/mallplus.keystore
new file mode 100644
index 0000000..70098af
Binary files /dev/null and b/mallplusui-uniapp-app2/mallplus.keystore differ
diff --git a/mallplusui-uniapp-app2/manifest.json b/mallplusui-uniapp-app2/manifest.json
new file mode 100644
index 0000000..7a98152
--- /dev/null
+++ b/mallplusui-uniapp-app2/manifest.json
@@ -0,0 +1,172 @@
+{
+    "name" : "汇融云链2",
+    "appid" : "__UNI__557CCCF",
+    "description" : "",
+    "versionName" : "4.0.0.0",
+    "versionCode" : 4000,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : false,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "OAuth" : {},
+            "Payment" : {},
+            "Share" : {},
+            "Contacts" : {},
+            "iBeacon" : {},
+            "Maps" : {}
+        },
+        "distribute" : {
+            "android" : {
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<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.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>",
+                    "<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.GET_ACCOUNTS\"/>",
+                    "<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>",
+                    "<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_CONTACTS\"/>",
+                    "<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.REQUEST_INSTALL_PACKAGES\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH\"/>",
+                    "<uses-permission android:name=\"android.permission.BLUETOOTH_ADMIN\"/>"
+                ]
+            },
+            "ios" : {
+                "dSYMs" : false
+            },
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wx04b09a8148e4875c",
+                        "appsecret" : "3526ec2107c123f59b5c1cb7ff23a252",
+                        "UniversalLinks" : ""
+                    },
+                    "qq" : {
+                        "appid" : "101390373"
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "appid" : "wx04b09a8148e4875c",
+                        "UniversalLinks" : "",
+                        "__platform__" : [ "android" ]
+                    },
+                    "alipay" : {}
+                },
+                "push" : {},
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "8f3a475e0c7c2136efe071f94efb1cae",
+                        "appkey_android" : "6c0a5f6f649f14b4ec575612761f867c"
+                    }
+                },
+                "ad" : {},
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wx04b09a8148e4875c",
+                        "UniversalLinks" : ""
+                    },
+                    "qq" : {
+                        "appid" : "101390373"
+                    }
+                }
+            },
+            "icons" : {
+                "ios" : {
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    },
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    }
+                },
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                }
+            },
+            "splashscreen" : {
+                "android" : {
+                    "hdpi" : "",
+                    "xhdpi" : "",
+                    "xxhdpi" : ""
+                }
+            }
+        }
+    },
+    "quickapp" : {},
+    "mp-weixin" : {
+        "usingComponents" : true,
+        "appid" : "wx15d4269d3210863d",
+        "setting" : {
+            "urlCheck" : false
+        },
+        "permission" : {}
+    },
+    "h5" : {
+        "title" : "宇运动商城",
+        "domain" : "https://www.yyundong.com:8088/h5",
+        "router" : {
+            "base" : ""
+        },
+        "devServer" : {
+            "https" : false,
+            "port" : 8088
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "RLHBZ-WMPRP-Q3JDS-V2IQA-JNRFH-EJBHL"
+                }
+            }
+        }
+    },
+    "mp-qq" : {
+        "appid" : "1109850600"
+    },
+    "quickapp-webview" : {
+        "icon" : "static/logo.png"
+    }
+}
diff --git a/mallplusui-uniapp-app2/node_modules/jweixin-module/README.md b/mallplusui-uniapp-app2/node_modules/jweixin-module/README.md
new file mode 100644
index 0000000..7c91d7b
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/mallplusui-uniapp-app2/node_modules/jweixin-module/lib/index.js b/mallplusui-uniapp-app2/node_modules/jweixin-module/lib/index.js
new file mode 100644
index 0000000..1b5014b
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/jweixin-module/lib/index.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/node_modules/jweixin-module/package.json b/mallplusui-uniapp-app2/node_modules/jweixin-module/package.json
new file mode 100644
index 0000000..464741d
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/jweixin-module/package.json
@@ -0,0 +1,54 @@
+{
+  "_from": "jweixin-module@^1.6.0",
+  "_id": "jweixin-module@1.6.0",
+  "_inBundle": false,
+  "_integrity": "sha1-Sn6mFAg+PJw/SeL9wruILPpY380=",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "range",
+    "registry": true,
+    "raw": "jweixin-module@^1.6.0",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "^1.6.0",
+    "saveSpec": null,
+    "fetchSpec": "^1.6.0"
+  },
+  "_requiredBy": [
+    "#USER",
+    "/"
+  ],
+  "_resolved": "https://registry.npm.taobao.org/jweixin-module/download/jweixin-module-1.6.0.tgz",
+  "_shasum": "4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd",
+  "_spec": "jweixin-module@^1.6.0",
+  "_where": "E:\\shenzhuan\\web\\uniapp",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {},
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "lib/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {},
+  "version": "1.6.0"
+}
diff --git a/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/README.md b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/README.md
new file mode 100644
index 0000000..6c35efd
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/README.md
@@ -0,0 +1,21 @@
+微信官方 js-sdk
+----
+
+说明: 仅将官方 js-sdk 发布到 npm，支持 CommonJS，便于 browserify, webpack 等直接使用
+
+js源码: https://res.wx.qq.com/open/js/jweixin-1.3.2.js
+
+官方使用说明: https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115
+
+安装:
+    
+    npm install weixin-js-sdk
+    
+使用:
+    
+    var wx = require('weixin-js-sdk');
+
+### Old versions
+
+* [1.0.0](https://github.com/yanxi-me/weixin-js-sdk/tree/1.0.0)
+* [1.2.0](https://github.com/yanxi-me/weixin-js-sdk/tree/1.2.0)
diff --git a/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.js b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.js
new file mode 100644
index 0000000..d156394
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.js
@@ -0,0 +1,819 @@
+! function (e, n) {
+  module.exports = n(e)
+}(window, function (e, n) {
+  function i(n, i, t) {
+    e.WeixinJSBridge ? WeixinJSBridge.invoke(n, o(i),
+    function(e) {
+      c(n, e, t)
+    }) : u(n, t)
+  }
+  function t(n, i, t) {
+    e.WeixinJSBridge ? WeixinJSBridge.on(n,
+    function(e) {
+      t && t.trigger && t.trigger(e),
+      c(n, e, i)
+    }) : t ? u(n, t) : u(n, i)
+  }
+  function o(e) {
+    return e = e || {},
+    e.appId = C.appId,
+    e.verifyAppId = C.appId,
+    e.verifySignType = "sha1",
+    e.verifyTimestamp = C.timestamp + "",
+    e.verifyNonceStr = C.nonceStr,
+    e.verifySignature = C.signature,
+    e
+  }
+  function r(e) {
+    return {
+      timeStamp: e.timestamp + "",
+      nonceStr: e.nonceStr,
+      package: e.package,
+      paySign: e.paySign,
+      signType: e.signType || "SHA1"
+    }
+  }
+  function a(e) {
+    return e.postalCode = e.addressPostalCode,
+    delete e.addressPostalCode,
+    e.provinceName = e.proviceFirstStageName,
+    delete e.proviceFirstStageName,
+    e.cityName = e.addressCitySecondStageName,
+    delete e.addressCitySecondStageName,
+    e.countryName = e.addressCountiesThirdStageName,
+    delete e.addressCountiesThirdStageName,
+    e.detailInfo = e.addressDetailInfo,
+    delete e.addressDetailInfo,
+    e
+  }
+  function c(e, n, i) {
+    "openEnterpriseChat" == e && (n.errCode = n.err_code),
+    delete n.err_code,
+    delete n.err_desc,
+    delete n.err_detail;
+    var t = n.errMsg;
+    t || (t = n.err_msg, delete n.err_msg, t = s(e, t), n.errMsg = t),
+    (i = i || {})._complete && (i._complete(n), delete i._complete),
+    t = n.errMsg || "",
+    C.debug && !i.isInnerInvoke && alert(JSON.stringify(n));
+    var o = t.indexOf(":");
+    switch (t.substring(o + 1)) {
+    case "ok":
+      i.success && i.success(n);
+      break;
+    case "cancel":
+      i.cancel && i.cancel(n);
+      break;
+    default:
+      i.fail && i.fail(n)
+    }
+    i.complete && i.complete(n)
+  }
+  function s(e, n) {
+    var i = e,
+    t = v[i];
+    t && (i = t);
+    var o = "ok";
+    if (n) {
+      var r = n.indexOf(":");
+      "confirm" == (o = n.substring(r + 1)) && (o = "ok"),
+      "failed" == o && (o = "fail"),
+      -1 != o.indexOf("failed_") && (o = o.substring(7)),
+      -1 != o.indexOf("fail_") && (o = o.substring(5)),
+      "access denied" != (o = (o = o.replace(/_/g, " ")).toLowerCase()) && "no permission to execute" != o || (o = "permission denied"),
+      "config" == i && "function not exist" == o && (o = "ok"),
+      "" == o && (o = "fail")
+    }
+    return n = i + ":" + o
+  }
+  function d(e) {
+    if (e) {
+      for (var n = 0,
+      i = e.length; n < i; ++n) {
+        var t = e[n],
+        o = h[t];
+        o && (e[n] = o)
+      }
+      return e
+    }
+  }
+  function u(e, n) {
+    if (! (!C.debug || n && n.isInnerInvoke)) {
+      var i = v[e];
+      i && (e = i),
+      n && n._complete && delete n._complete,
+      console.log('"' + e + '",', n || "")
+    }
+  }
+  function l(e) {
+    if (! (k || w || C.debug || x < "6.0.2" || V.systemType < 0)) {
+      var n = new Image;
+      V.appId = C.appId,
+      V.initTime = A.initEndTime - A.initStartTime,
+      V.preVerifyTime = A.preVerifyEndTime - A.preVerifyStartTime,
+      N.getNetworkType({
+        isInnerInvoke: !0,
+        success: function(e) {
+          V.networkType = e.networkType;
+          var i = "https://open.weixin.qq.com/sdk/report?v=" + V.version + "&o=" + V.isPreVerifyOk + "&s=" + V.systemType + "&c=" + V.clientVersion + "&a=" + V.appId + "&n=" + V.networkType + "&i=" + V.initTime + "&p=" + V.preVerifyTime + "&u=" + V.url;
+          n.src = i
+        }
+      })
+    }
+  }
+  function p() {
+    return (new Date).getTime()
+  }
+  function f(n) {
+    T && (e.WeixinJSBridge ? n() : S.addEventListener && S.addEventListener("WeixinJSBridgeReady", n, !1))
+  }
+  function m() {
+    N.invoke || (N.invoke = function(n, i, t) {
+      e.WeixinJSBridge && WeixinJSBridge.invoke(n, o(i), t)
+    },
+    N.on = function(n, i) {
+      e.WeixinJSBridge && WeixinJSBridge.on(n, i)
+    })
+  }
+  function g(e) {
+    if ("string" == typeof e && e.length > 0) {
+      var n = e.split("?")[0],
+      i = e.split("?")[1];
+      return n += ".html",
+      void 0 !== i ? n + "?" + i: n
+    }
+  }
+  if (!e.jWeixin) {
+    var h = {
+      config: "preVerifyJSAPI",
+      onMenuShareTimeline: "menu:share:timeline",
+      onMenuShareAppMessage: "menu:share:appmessage",
+      onMenuShareQQ: "menu:share:qq",
+      onMenuShareWeibo: "menu:share:weiboApp",
+      onMenuShareQZone: "menu:share:QZone",
+      previewImage: "imagePreview",
+      getLocation: "geoLocation",
+      openProductSpecificView: "openProductViewWithPid",
+      addCard: "batchAddCard",
+      openCard: "batchViewCard",
+      chooseWXPay: "getBrandWCPayRequest",
+      openEnterpriseRedPacket: "getRecevieBizHongBaoRequest",
+      startSearchBeacons: "startMonitoringBeacons",
+      stopSearchBeacons: "stopMonitoringBeacons",
+      onSearchBeacons: "onBeaconsInRange",
+      consumeAndShareCard: "consumedShareCard",
+      openAddress: "editAddress"
+    },
+    v = function() {
+      var e = {};
+      for (var n in h) e[h[n]] = n;
+      return e
+    } (),
+    S = e.document,
+    I = S.title,
+    y = navigator.userAgent.toLowerCase(),
+    _ = navigator.platform.toLowerCase(),
+    k = !(!_.match("mac") && !_.match("win")),
+    w = -1 != y.indexOf("wxdebugger"),
+    T = -1 != y.indexOf("micromessenger"),
+    M = -1 != y.indexOf("android"),
+    P = -1 != y.indexOf("iphone") || -1 != y.indexOf("ipad"),
+    x = function() {
+      var e = y.match(/micromessenger\/(\d+\.\d+\.\d+)/) || y.match(/micromessenger\/(\d+\.\d+)/);
+      return e ? e[1] : ""
+    } (),
+    A = {
+      initStartTime: p(),
+      initEndTime: 0,
+      preVerifyStartTime: 0,
+      preVerifyEndTime: 0
+    },
+    V = {
+      version: 1,
+      appId: "",
+      initTime: 0,
+      preVerifyTime: 0,
+      networkType: "",
+      isPreVerifyOk: 1,
+      systemType: P ? 1 : M ? 2 : -1,
+      clientVersion: x,
+      url: encodeURIComponent(location.href)
+    },
+    C = {},
+    L = {
+      _completes: []
+    },
+    B = {
+      state: 0,
+      data: {}
+    };
+    f(function() {
+      A.initEndTime = p()
+    });
+    var O = !1,
+    E = [],
+    N = {
+      config: function(e) {
+        C = e,
+        u("config", e);
+        var n = !1 !== C.check;
+        f(function() {
+          if (n) i(h.config, {
+            verifyJsApiList: d(C.jsApiList)
+          },
+          function() {
+            L._complete = function(e) {
+              A.preVerifyEndTime = p(),
+              B.state = 1,
+              B.data = e
+            },
+            L.success = function(e) {
+              V.isPreVerifyOk = 0
+            },
+            L.fail = function(e) {
+              L._fail ? L._fail(e) : B.state = -1
+            };
+            var e = L._completes;
+            return e.push(function() {
+              l()
+            }),
+            L.complete = function(n) {
+              for (var i = 0,
+              t = e.length; i < t; ++i) e[i]();
+              L._completes = []
+            },
+            L
+          } ()),
+          A.preVerifyStartTime = p();
+          else {
+            B.state = 1;
+            for (var e = L._completes,
+            t = 0,
+            o = e.length; t < o; ++t) e[t]();
+            L._completes = []
+          }
+        }),
+        m()
+      },
+      ready: function(e) {
+        0 != B.state ? e() : (L._completes.push(e), !T && C.debug && e())
+      },
+      error: function(e) {
+        x < "6.0.2" || ( - 1 == B.state ? e(B.data) : L._fail = e)
+      },
+      checkJsApi: function(e) {
+        var n = function(e) {
+          var n = e.checkResult;
+          for (var i in n) {
+            var t = v[i];
+            t && (n[t] = n[i], delete n[i])
+          }
+          return e
+        };
+        i("checkJsApi", {
+          jsApiList: d(e.jsApiList)
+        },
+        (e._complete = function(e) {
+          if (M) {
+            var i = e.checkResult;
+            i && (e.checkResult = JSON.parse(i))
+          }
+          e = n(e)
+        },
+        e))
+      },
+      onMenuShareTimeline: function(e) {
+        t(h.onMenuShareTimeline, {
+          complete: function() {
+            i("shareTimeline", {
+              title: e.title || I,
+              desc: e.title || I,
+              img_url: e.imgUrl || "",
+              link: e.link || location.href,
+              type: e.type || "link",
+              data_url: e.dataUrl || ""
+            },
+            e)
+          }
+        },
+        e)
+      },
+      onMenuShareAppMessage: function(e) {
+        t(h.onMenuShareAppMessage, {
+          complete: function(n) {
+            "favorite" === n.scene ? i("sendAppMessage", {
+              title: e.title || I,
+              desc: e.desc || "",
+              link: e.link || location.href,
+              img_url: e.imgUrl || "",
+              type: e.type || "link",
+              data_url: e.dataUrl || ""
+            }) : i("sendAppMessage", {
+              title: e.title || I,
+              desc: e.desc || "",
+              link: e.link || location.href,
+              img_url: e.imgUrl || "",
+              type: e.type || "link",
+              data_url: e.dataUrl || ""
+            },
+            e)
+          }
+        },
+        e)
+      },
+      onMenuShareQQ: function(e) {
+        t(h.onMenuShareQQ, {
+          complete: function() {
+            i("shareQQ", {
+              title: e.title || I,
+              desc: e.desc || "",
+              img_url: e.imgUrl || "",
+              link: e.link || location.href
+            },
+            e)
+          }
+        },
+        e)
+      },
+      onMenuShareWeibo: function(e) {
+        t(h.onMenuShareWeibo, {
+          complete: function() {
+            i("shareWeiboApp", {
+              title: e.title || I,
+              desc: e.desc || "",
+              img_url: e.imgUrl || "",
+              link: e.link || location.href
+            },
+            e)
+          }
+        },
+        e)
+      },
+      onMenuShareQZone: function(e) {
+        t(h.onMenuShareQZone, {
+          complete: function() {
+            i("shareQZone", {
+              title: e.title || I,
+              desc: e.desc || "",
+              img_url: e.imgUrl || "",
+              link: e.link || location.href
+            },
+            e)
+          }
+        },
+        e)
+      },
+      updateTimelineShareData: function(e) {
+        i("updateTimelineShareData", {
+          title: e.title,
+          link: e.link,
+          imgUrl: e.imgUrl
+        },
+        e)
+      },
+      updateAppMessageShareData: function(e) {
+        i("updateAppMessageShareData", {
+          title: e.title,
+          desc: e.desc,
+          link: e.link,
+          imgUrl: e.imgUrl
+        },
+        e)
+      },
+      startRecord: function(e) {
+        i("startRecord", {},
+        e)
+      },
+      stopRecord: function(e) {
+        i("stopRecord", {},
+        e)
+      },
+      onVoiceRecordEnd: function(e) {
+        t("onVoiceRecordEnd", e)
+      },
+      playVoice: function(e) {
+        i("playVoice", {
+          localId: e.localId
+        },
+        e)
+      },
+      pauseVoice: function(e) {
+        i("pauseVoice", {
+          localId: e.localId
+        },
+        e)
+      },
+      stopVoice: function(e) {
+        i("stopVoice", {
+          localId: e.localId
+        },
+        e)
+      },
+      onVoicePlayEnd: function(e) {
+        t("onVoicePlayEnd", e)
+      },
+      uploadVoice: function(e) {
+        i("uploadVoice", {
+          localId: e.localId,
+          isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1
+        },
+        e)
+      },
+      downloadVoice: function(e) {
+        i("downloadVoice", {
+          serverId: e.serverId,
+          isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1
+        },
+        e)
+      },
+      translateVoice: function(e) {
+        i("translateVoice", {
+          localId: e.localId,
+          isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1
+        },
+        e)
+      },
+      chooseImage: function(e) {
+        i("chooseImage", {
+          scene: "1|2",
+          count: e.count || 9,
+          sizeType: e.sizeType || ["original", "compressed"],
+          sourceType: e.sourceType || ["album", "camera"]
+        },
+        (e._complete = function(e) {
+          if (M) {
+            var n = e.localIds;
+            try {
+              n && (e.localIds = JSON.parse(n))
+            } catch(e) {}
+          }
+        },
+        e))
+      },
+      getLocation: function(e) {},
+      previewImage: function(e) {
+        i(h.previewImage, {
+          current: e.current,
+          urls: e.urls
+        },
+        e)
+      },
+      uploadImage: function(e) {
+        i("uploadImage", {
+          localId: e.localId,
+          isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1
+        },
+        e)
+      },
+      downloadImage: function(e) {
+        i("downloadImage", {
+          serverId: e.serverId,
+          isShowProgressTips: 0 == e.isShowProgressTips ? 0 : 1
+        },
+        e)
+      },
+      getLocalImgData: function(e) { ! 1 === O ? (O = !0, i("getLocalImgData", {
+          localId: e.localId
+        },
+        (e._complete = function(e) {
+          if (O = !1, E.length > 0) {
+            var n = E.shift();
+            wx.getLocalImgData(n)
+          }
+        },
+        e))) : E.push(e)
+      },
+      getNetworkType: function(e) {
+        var n = function(e) {
+          var n = e.errMsg;
+          e.errMsg = "getNetworkType:ok";
+          var i = e.subtype;
+          if (delete e.subtype, i) e.networkType = i;
+          else {
+            var t = n.indexOf(":"),
+            o = n.substring(t + 1);
+            switch (o) {
+            case "wifi":
+            case "edge":
+            case "wwan":
+              e.networkType = o;
+              break;
+            default:
+              e.errMsg = "getNetworkType:fail"
+            }
+          }
+          return e
+        };
+        i("getNetworkType", {},
+        (e._complete = function(e) {
+          e = n(e)
+        },
+        e))
+      },
+      openLocation: function(e) {
+        i("openLocation", {
+          latitude: e.latitude,
+          longitude: e.longitude,
+          name: e.name || "",
+          address: e.address || "",
+          scale: e.scale || 28,
+          infoUrl: e.infoUrl || ""
+        },
+        e)
+      },
+      getLocation: function(e) {
+        e = e || {},
+        i(h.getLocation, {
+          type: e.type || "wgs84"
+        },
+        (e._complete = function(e) {
+          delete e.type
+        },
+        e))
+      },
+      hideOptionMenu: function(e) {
+        i("hideOptionMenu", {},
+        e)
+      },
+      showOptionMenu: function(e) {
+        i("showOptionMenu", {},
+        e)
+      },
+      closeWindow: function(e) {
+        i("closeWindow", {},
+        e = e || {})
+      },
+      hideMenuItems: function(e) {
+        i("hideMenuItems", {
+          menuList: e.menuList
+        },
+        e)
+      },
+      showMenuItems: function(e) {
+        i("showMenuItems", {
+          menuList: e.menuList
+        },
+        e)
+      },
+      hideAllNonBaseMenuItem: function(e) {
+        i("hideAllNonBaseMenuItem", {},
+        e)
+      },
+      showAllNonBaseMenuItem: function(e) {
+        i("showAllNonBaseMenuItem", {},
+        e)
+      },
+      scanQRCode: function(e) {
+        i("scanQRCode", {
+          needResult: (e = e || {}).needResult || 0,
+          scanType: e.scanType || ["qrCode", "barCode"]
+        },
+        (e._complete = function(e) {
+          if (P) {
+            var n = e.resultStr;
+            if (n) {
+              var i = JSON.parse(n);
+              e.resultStr = i && i.scan_code && i.scan_code.scan_result
+            }
+          }
+        },
+        e))
+      },
+      openAddress: function(e) {
+        i(h.openAddress, {},
+        (e._complete = function(e) {
+          e = a(e)
+        },
+        e))
+      },
+      openProductSpecificView: function(e) {
+        i(h.openProductSpecificView, {
+          pid: e.productId,
+          view_type: e.viewType || 0,
+          ext_info: e.extInfo
+        },
+        e)
+      },
+      addCard: function(e) {
+        for (var n = e.cardList,
+        t = [], o = 0, r = n.length; o < r; ++o) {
+          var a = n[o],
+          c = {
+            card_id: a.cardId,
+            card_ext: a.cardExt
+          };
+          t.push(c)
+        }
+        i(h.addCard, {
+          card_list: t
+        },
+        (e._complete = function(e) {
+          var n = e.card_list;
+          if (n) {
+            for (var i = 0,
+            t = (n = JSON.parse(n)).length; i < t; ++i) {
+              var o = n[i];
+              o.cardId = o.card_id,
+              o.cardExt = o.card_ext,
+              o.isSuccess = !!o.is_succ,
+              delete o.card_id,
+              delete o.card_ext,
+              delete o.is_succ
+            }
+            e.cardList = n,
+            delete e.card_list
+          }
+        },
+        e))
+      },
+      chooseCard: function(e) {
+        i("chooseCard", {
+          app_id: C.appId,
+          location_id: e.shopId || "",
+          sign_type: e.signType || "SHA1",
+          card_id: e.cardId || "",
+          card_type: e.cardType || "",
+          card_sign: e.cardSign,
+          time_stamp: e.timestamp + "",
+          nonce_str: e.nonceStr
+        },
+        (e._complete = function(e) {
+          e.cardList = e.choose_card_info,
+          delete e.choose_card_info
+        },
+        e))
+      },
+      openCard: function(e) {
+        for (var n = e.cardList,
+        t = [], o = 0, r = n.length; o < r; ++o) {
+          var a = n[o],
+          c = {
+            card_id: a.cardId,
+            code: a.code
+          };
+          t.push(c)
+        }
+        i(h.openCard, {
+          card_list: t
+        },
+        e)
+      },
+      consumeAndShareCard: function(e) {
+        i(h.consumeAndShareCard, {
+          consumedCardId: e.cardId,
+          consumedCode: e.code
+        },
+        e)
+      },
+      chooseWXPay: function(e) {
+        i(h.chooseWXPay, r(e), e)
+      },
+      openEnterpriseRedPacket: function(e) {
+        i(h.openEnterpriseRedPacket, r(e), e)
+      },
+      startSearchBeacons: function(e) {
+        i(h.startSearchBeacons, {
+          ticket: e.ticket
+        },
+        e)
+      },
+      stopSearchBeacons: function(e) {
+        i(h.stopSearchBeacons, {},
+        e)
+      },
+      onSearchBeacons: function(e) {
+        t(h.onSearchBeacons, e)
+      },
+      openEnterpriseChat: function(e) {
+        i("openEnterpriseChat", {
+          useridlist: e.userIds,
+          chatname: e.groupName
+        },
+        e)
+      },
+      launchMiniProgram: function(e) {
+        i("launchMiniProgram", {
+          targetAppId: e.targetAppId,
+          path: g(e.path),
+          envVersion: e.envVersion
+        },
+        e)
+      },
+      miniProgram: {
+        navigateBack: function(e) {
+          e = e || {},
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "navigateBack",
+              arg: {
+                delta: e.delta || 1
+              }
+            },
+            e)
+          })
+        },
+        navigateTo: function(e) {
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "navigateTo",
+              arg: {
+                url: e.url
+              }
+            },
+            e)
+          })
+        },
+        redirectTo: function(e) {
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "redirectTo",
+              arg: {
+                url: e.url
+              }
+            },
+            e)
+          })
+        },
+        switchTab: function(e) {
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "switchTab",
+              arg: {
+                url: e.url
+              }
+            },
+            e)
+          })
+        },
+        reLaunch: function(e) {
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "reLaunch",
+              arg: {
+                url: e.url
+              }
+            },
+            e)
+          })
+        },
+        postMessage: function(e) {
+          f(function() {
+            i("invokeMiniProgramAPI", {
+              name: "postMessage",
+              arg: e.data || {}
+            },
+            e)
+          })
+        },
+        getEnv: function(n) {
+          f(function() {
+            n({
+              miniprogram: "miniprogram" === e.__wxjs_environment
+            })
+          })
+        }
+      }
+    },
+    b = 1,
+    R = {};
+    return S.addEventListener("error",
+    function(e) {
+      if (!M) {
+        var n = e.target,
+        i = n.tagName,
+        t = n.src;
+        if (("IMG" == i || "VIDEO" == i || "AUDIO" == i || "SOURCE" == i) && -1 != t.indexOf("wxlocalresource://")) {
+          e.preventDefault(),
+          e.stopPropagation();
+          var o = n["wx-id"];
+          if (o || (o = b++, n["wx-id"] = o), R[o]) return;
+          R[o] = !0,
+          wx.ready(function() {
+            wx.getLocalImgData({
+              localId: t,
+              success: function(e) {
+                n.src = e.localData
+              }
+            })
+          })
+        }
+      }
+    },
+    !0),
+    S.addEventListener("load",
+    function(e) {
+      if (!M) {
+        var n = e.target,
+        i = n.tagName;
+        n.src;
+        if ("IMG" == i || "VIDEO" == i || "AUDIO" == i || "SOURCE" == i) {
+          var t = n["wx-id"];
+          t && (R[t] = !1)
+        }
+      }
+    },
+    !0),
+    n && (e.wx = e.jWeixin = N),
+    N
+  }
+});
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.original.js b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.original.js
new file mode 100644
index 0000000..9d66191
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/index.original.js
@@ -0,0 +1,2 @@
+// from http://res.wx.qq.com/open/js/jweixin-1.4.0.js
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(this,function(e,n){function i(n,i,t){e.WeixinJSBridge?WeixinJSBridge.invoke(n,o(i),function(e){c(n,e,t)}):u(n,t)}function t(n,i,t){e.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),c(n,e,i)}):t?u(n,t):u(n,i)}function o(e){return e=e||{},e.appId=C.appId,e.verifyAppId=C.appId,e.verifySignType="sha1",e.verifyTimestamp=C.timestamp+"",e.verifyNonceStr=C.nonceStr,e.verifySignature=C.signature,e}function r(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function a(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}function c(e,n,i){"openEnterpriseChat"==e&&(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=s(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",C.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function s(e,n){var i=e,t=v[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}function d(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=h[t];o&&(e[n]=o)}return e}}function u(e,n){if(!(!C.debug||n&&n.isInnerInvoke)){var i=v[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function l(e){if(!(k||w||C.debug||x<"6.0.2"||V.systemType<0)){var n=new Image;V.appId=C.appId,V.initTime=A.initEndTime-A.initStartTime,V.preVerifyTime=A.preVerifyEndTime-A.preVerifyStartTime,N.getNetworkType({isInnerInvoke:!0,success:function(e){V.networkType=e.networkType;var i="https://open.weixin.qq.com/sdk/report?v="+V.version+"&o="+V.isPreVerifyOk+"&s="+V.systemType+"&c="+V.clientVersion+"&a="+V.appId+"&n="+V.networkType+"&i="+V.initTime+"&p="+V.preVerifyTime+"&u="+V.url;n.src=i}})}}function p(){return(new Date).getTime()}function f(n){T&&(e.WeixinJSBridge?n():S.addEventListener&&S.addEventListener("WeixinJSBridgeReady",n,!1))}function m(){N.invoke||(N.invoke=function(n,i,t){e.WeixinJSBridge&&WeixinJSBridge.invoke(n,o(i),t)},N.on=function(n,i){e.WeixinJSBridge&&WeixinJSBridge.on(n,i)})}function g(e){if("string"==typeof e&&e.length>0){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}if(!e.jWeixin){var h={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},v=function(){var e={};for(var n in h)e[h[n]]=n;return e}(),S=e.document,I=S.title,y=navigator.userAgent.toLowerCase(),_=navigator.platform.toLowerCase(),k=!(!_.match("mac")&&!_.match("win")),w=-1!=y.indexOf("wxdebugger"),T=-1!=y.indexOf("micromessenger"),M=-1!=y.indexOf("android"),P=-1!=y.indexOf("iphone")||-1!=y.indexOf("ipad"),x=function(){var e=y.match(/micromessenger\/(\d+\.\d+\.\d+)/)||y.match(/micromessenger\/(\d+\.\d+)/);return e?e[1]:""}(),A={initStartTime:p(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},V={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:P?1:M?2:-1,clientVersion:x,url:encodeURIComponent(location.href)},C={},L={_completes:[]},B={state:0,data:{}};f(function(){A.initEndTime=p()});var O=!1,E=[],N={config:function(e){C=e,u("config",e);var n=!1!==C.check;f(function(){if(n)i(h.config,{verifyJsApiList:d(C.jsApiList)},function(){L._complete=function(e){A.preVerifyEndTime=p(),B.state=1,B.data=e},L.success=function(e){V.isPreVerifyOk=0},L.fail=function(e){L._fail?L._fail(e):B.state=-1};var e=L._completes;return e.push(function(){l()}),L.complete=function(n){for(var i=0,t=e.length;i<t;++i)e[i]();L._completes=[]},L}()),A.preVerifyStartTime=p();else{B.state=1;for(var e=L._completes,t=0,o=e.length;t<o;++t)e[t]();L._completes=[]}}),m()},ready:function(e){0!=B.state?e():(L._completes.push(e),!T&&C.debug&&e())},error:function(e){x<"6.0.2"||(-1==B.state?e(B.data):L._fail=e)},checkJsApi:function(e){var n=function(e){var n=e.checkResult;for(var i in n){var t=v[i];t&&(n[t]=n[i],delete n[i])}return e};i("checkJsApi",{jsApiList:d(e.jsApiList)},(e._complete=function(e){if(M){var i=e.checkResult;i&&(e.checkResult=JSON.parse(i))}e=n(e)},e))},onMenuShareTimeline:function(e){t(h.onMenuShareTimeline,{complete:function(){i("shareTimeline",{title:e.title||I,desc:e.title||I,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(e){t(h.onMenuShareAppMessage,{complete:function(n){"favorite"===n.scene?i("sendAppMessage",{title:e.title||I,desc:e.desc||"",link:e.link||location.href,img_url:e.imgUrl||"",type:e.type||"link",data_url:e.dataUrl||""}):i("sendAppMessage",{title:e.title||I,desc:e.desc||"",link:e.link||location.href,img_url:e.imgUrl||"",type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareQQ:function(e){t(h.onMenuShareQQ,{complete:function(){i("shareQQ",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){t(h.onMenuShareWeibo,{complete:function(){i("shareWeiboApp",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){t(h.onMenuShareQZone,{complete:function(){i("shareQZone",{title:e.title||I,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){i("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){i("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){i("startRecord",{},e)},stopRecord:function(e){i("stopRecord",{},e)},onVoiceRecordEnd:function(e){t("onVoiceRecordEnd",e)},playVoice:function(e){i("playVoice",{localId:e.localId},e)},pauseVoice:function(e){i("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){i("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){t("onVoicePlayEnd",e)},uploadVoice:function(e){i("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){i("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){i("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){i("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(M){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){i(h.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){i("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){i("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===O?(O=!0,i("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(O=!1,E.length>0){var n=E.shift();wx.getLocalImgData(n)}},e))):E.push(e)},getNetworkType:function(e){var n=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e};i("getNetworkType",{},(e._complete=function(e){e=n(e)},e))},openLocation:function(e){i("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){e=e||{},i(h.getLocation,{type:e.type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){i("hideOptionMenu",{},e)},showOptionMenu:function(e){i("showOptionMenu",{},e)},closeWindow:function(e){i("closeWindow",{},e=e||{})},hideMenuItems:function(e){i("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){i("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){i("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){i("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){i("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(P){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){i(h.openAddress,{},(e._complete=function(e){e=a(e)},e))},openProductSpecificView:function(e){i(h.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,t=[],o=0,r=n.length;o<r;++o){var a=n[o],c={card_id:a.cardId,card_ext:a.cardExt};t.push(c)}i(h.addCard,{card_list:t},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){i("chooseCard",{app_id:C.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,t=[],o=0,r=n.length;o<r;++o){var a=n[o],c={card_id:a.cardId,code:a.code};t.push(c)}i(h.openCard,{card_list:t},e)},consumeAndShareCard:function(e){i(h.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){i(h.chooseWXPay,r(e),e)},openEnterpriseRedPacket:function(e){i(h.openEnterpriseRedPacket,r(e),e)},startSearchBeacons:function(e){i(h.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){i(h.stopSearchBeacons,{},e)},onSearchBeacons:function(e){t(h.onSearchBeacons,e)},openEnterpriseChat:function(e){i("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){i("launchMiniProgram",{targetAppId:e.targetAppId,path:g(e.path),envVersion:e.envVersion},e)},miniProgram:{navigateBack:function(e){e=e||{},f(function(){i("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){f(function(){i("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){f(function(){i("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){f(function(){i("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){f(function(){i("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){f(function(){i("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(n){f(function(){n({miniprogram:"miniprogram"===e.__wxjs_environment})})}}},b=1,R={};return S.addEventListener("error",function(e){if(!M){var n=e.target,i=n.tagName,t=n.src;if(("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)&&-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=b++,n["wx-id"]=o),R[o])return;R[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),S.addEventListener("load",function(e){if(!M){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(R[t]=!1)}}},!0),n&&(e.wx=e.jWeixin=N),N}});
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/package.json b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/package.json
new file mode 100644
index 0000000..de956ee
--- /dev/null
+++ b/mallplusui-uniapp-app2/node_modules/weixin-js-sdk/package.json
@@ -0,0 +1,42 @@
+{
+  "_args": [
+    [
+      "weixin-js-sdk@1.4.0-test",
+      "E:\\shenzhuan\\web\\uniapp"
+    ]
+  ],
+  "_from": "weixin-js-sdk@1.4.0-test",
+  "_id": "weixin-js-sdk@1.4.0-test",
+  "_inBundle": false,
+  "_integrity": "sha1-YSu6/Ml62E9a/m3IRwFTTMWfw8o=",
+  "_location": "/weixin-js-sdk",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "version",
+    "registry": true,
+    "raw": "weixin-js-sdk@1.4.0-test",
+    "name": "weixin-js-sdk",
+    "escapedName": "weixin-js-sdk",
+    "rawSpec": "1.4.0-test",
+    "saveSpec": null,
+    "fetchSpec": "1.4.0-test"
+  },
+  "_requiredBy": [
+    "/"
+  ],
+  "_resolved": "https://registry.npm.taobao.org/weixin-js-sdk/download/weixin-js-sdk-1.4.0-test.tgz",
+  "_spec": "1.4.0-test",
+  "_where": "E:\\shenzhuan\\web\\uniapp",
+  "bugs": {
+    "url": "https://github.com/yanxi-com/weixin-js-sdk/issues"
+  },
+  "description": "微信官方 js-sdk CommonJS 版",
+  "homepage": "https://github.com/yanxi-com/weixin-js-sdk#readme",
+  "main": "index.js",
+  "name": "weixin-js-sdk",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/yanxi-com/weixin-js-sdk.git"
+  },
+  "version": "1.4.0-test"
+}
diff --git a/mallplusui-uniapp-app2/package-lock.json b/mallplusui-uniapp-app2/package-lock.json
new file mode 100644
index 0000000..f8879a4
--- /dev/null
+++ b/mallplusui-uniapp-app2/package-lock.json
@@ -0,0 +1,18 @@
+{
+  "name": "uniapp",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npm.taobao.org/jweixin-module/download/jweixin-module-1.6.0.tgz",
+      "integrity": "sha1-Sn6mFAg+PJw/SeL9wruILPpY380="
+    },
+    "weixin-js-sdk": {
+      "version": "1.4.0-test",
+      "resolved": "https://registry.npm.taobao.org/weixin-js-sdk/download/weixin-js-sdk-1.4.0-test.tgz",
+      "integrity": "sha1-YSu6/Ml62E9a/m3IRwFTTMWfw8o="
+    }
+  }
+}
diff --git a/mallplusui-uniapp-app2/package.json b/mallplusui-uniapp-app2/package.json
new file mode 100644
index 0000000..29ff417
--- /dev/null
+++ b/mallplusui-uniapp-app2/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "uniapp",
+  "version": "1.0.0",
+  "description": "汇融云链2",
+  "main": "main.js",
+  "dependencies": {
+    "amap-js": "^1.2.1",
+    "jweixin-module": "^1.6.0",
+    "weixin-js-sdk": "^1.4.0-test"
+  },
+  "devDependencies": {},
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/mallplusui-uniapp-app2/pages.json b/mallplusui-uniapp-app2/pages.json
new file mode 100644
index 0000000..4be3ec2
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages.json
@@ -0,0 +1,843 @@
+{
+	"pages": [{
+			"path": "pages/index/index",
+			"style": {
+				"enablePullDownRefresh": true,
+				// #ifdef MP
+				"navigationBarTitleText": "汇融云链",
+				"navigationStyle": "custom",
+
+				// #endif
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent",
+						"searchInput": {
+							"backgroundColor": "rgba(231, 231, 231,.7)",
+							"borderRadius": "16px",
+							"placeholder": "请输入要查询的信息",
+							"disabled": true,
+							"placeholderColor": "#606266"
+						},
+						"buttons": [{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue60d",
+								"fontSize": "26",
+								"color": "#303133",
+								"float": "left",
+								"background": "rgba(0,0,0,0)"
+							},
+							{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue744",
+								"fontSize": "27",
+								"color": "#303133",
+								"background": "rgba(0,0,0,0)",
+								"redDot": true
+							}
+						]
+					}
+				}
+			}
+		}, {
+			"path": "pages/search/search",
+			"style": {
+				"navigationBarTitleText": "搜索",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+
+		{
+			"path": "pages/index/secskill",
+			"style": {
+				"navigationBarTitleText": "秒杀列表",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, 	{
+			"path": "pages/index/lease",
+			"style": {
+				"navigationBarTitleText": "农机租赁"
+				// "app-plus": {
+				// 	"titleNView": {
+				// 		"type": "transparent"
+				// 	}
+				// }
+			}
+		}, {
+			"path": "pages/order/orderDetail",
+			"style": {
+				"navigationBarTitleText": "详情展示",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		}, {
+			"path": "pages/order/logistics",
+			"style": {
+				"navigationBarTitleText": "物流详情",
+				"app-plus": {
+					"titleNView": {
+						"type": "transparent"
+					}
+				}
+			}
+		},
+		{
+			"path": "pages/set/set",
+			"style": {
+				"navigationBarTitleText": "设置"
+			}
+		},
+		{
+			"path": "pages/set/certification",
+			"style": {
+				"navigationBarTitleText": "身份认"
+			}
+		},
+		{
+			"path": "pages/index/nearbyBusiness",
+			"style": {
+				"navigationBarTitleText": "附近商家"
+					// #ifdef MP-WEIXIN
+					,
+				"navigationStyle": "custom"
+				// #endif
+			}
+		},
+		{
+			"path": "pages/cart/cart",
+			"style": {
+				"navigationBarTitleText": "购物车"
+					// #ifdef MP-WEIXIN
+					,
+				"navigationStyle": "custom"
+				// #endif
+			}
+		}, {
+			"path": "pages/public/login",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom"
+				}
+			}
+		}, {
+			"path": "pages/public/index",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom"
+				}
+			}
+		}, {
+			"path": "pages/public/reg",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom"
+				}
+			}
+		}, {
+			"path": "pages/index/user",
+			"style": {
+				"navigationBarTitleText": "我的",
+				// #ifdef MP
+				"navigationStyle": "custom",
+				// #endif
+
+				"app-plus": {
+					"bounce": "none",
+					"titleNView": {
+						"type": "transparent",
+						"buttons": [{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue60f",
+								"fontSize": "24",
+								"color": "#303133",
+								"width": "46px",
+								"background": "rgba(0,0,0,0)"
+							},
+							{
+								"fontSrc": "/static/yticon.ttf",
+								"text": "\ue744",
+								"fontSize": "28",
+								"color": "#303133",
+								"background": "rgba(0,0,0,0)",
+								"redDot": true
+							}
+						]
+					}
+				}
+			}
+		}, {
+			"path": "pages/order/order",
+			"style": {
+				"navigationBarTitleText": "我的订单",
+				"enablePullDownRefresh": true,
+				"onReachBottomDistance": 126, //距离底部多远时触发 单位px
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/order/createOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单"
+			}
+		}, {
+			"path": "pages/order/createStoreOrder",
+			"style": {
+				"navigationBarTitleText": "创建订单"
+			}
+		}, {
+			"path": "pages/order/evaluate",
+			"style": {
+				"navigationBarTitleText": "订单评价"
+			}
+		}, {
+			"path": "pages/money/pay",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/money/paySuccess",
+			"style": {
+				"navigationBarTitleText": "支付成功"
+			}
+		}, {
+			"path": "pages/category/category",
+			"style": {
+				"navigationBarTitleText": "分类",
+				// #ifdef MP-WEIXIN
+				"navigationStyle": "custom",
+				// #endif
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		}, {
+			"path": "pages/category/areaGoods",
+			"style": {
+				"navigationBarTitleText": "区域商品",
+				// #ifdef MP-WEIXIN
+				"navigationStyle": "custom",
+				// #endif
+				"app-plus": {
+					"bounce": "none"
+				}
+			}
+		},
+		{
+			"path": "pages/order/payment/index",
+			"style": {
+				"navigationBarTitleText": "支付"
+			}
+		},
+		{
+			"path": "pages/order/payment/auth",
+			"style": {
+				"navigationBarTitleText": "等待支付"
+			}
+		},
+		{
+			"path": "pages/order/payment/result",
+			"style": {
+				"navigationBarTitleText": "支付结果"
+			}
+		}, {
+			"path": "pages/integral/home/home",
+			"style": {
+				"navigationBarTitleText": "我的积分"
+			}
+		}, {
+			"path": "pages/public/loginCode",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"app-plus": {
+					"titleNView": false,
+					"animationType": "slide-in-bottom"
+				}
+			}
+		}
+	],
+	"subPackages": [{
+			"root": "pagesC",
+			"pages": [{
+					"path": "store/list",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商铺列表"
+					}
+				}, {
+					"path": "store/index",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商铺详情"
+					}
+				},
+
+				{
+					"path": "store/applyBusiness",
+					"style": {
+
+						"navigationBarTitleText": "商户入驻"
+
+					}
+				}, {
+					"path": "store/businessDetails",
+					"style": {
+						"navigationBarTitleText": "店铺详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "store/school",
+					"style": {
+						"navigationBarTitleText": "学校详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "store/store",
+					"style": {
+						"navigationBarTitleText": "店铺详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "store/storeResult",
+					"style": {
+						"navigationBarTitleText": "店铺申请",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "store/storeList",
+					"style": {
+						"navigationBarTitleText": "店铺列表",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				},
+				{
+					"path": "seller/index",
+					"style": {
+						"navigationBarTitleText": "卖家中心"
+						// "navigationStyle": "custom"
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
+					}
+				},
+				{
+					"path": "seller/login",
+					"style": {
+						"navigationBarTitleText": "卖家登录",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				},
+				{
+					"path": "seller/orderDetail",
+					"style": {
+						"navigationBarTitleText": "订单详情",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "seller/store",
+					"style": {
+						"navigationBarTitleText": "店铺详情",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "seller/order",
+					"style": {
+						"navigationBarTitleText": "订单管理",
+						"enablePullDownRefresh": true,
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "seller/goods",
+					"style": {
+						"navigationBarTitleText": "商品管理",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "seller/stack",
+					"style": {
+						"navigationBarTitleText": "商品统计",
+						"enablePullDownRefresh": true,
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				},
+				{
+					"path": "seller/caldar",
+					"style": {
+						"navigationBarTitleText": "统计"
+					}
+				},
+
+				{
+					"path": "seller/evaluate",
+					"style": {
+						"navigationBarTitleText": "订单评价"
+					}
+				},
+				{
+					"path": "seller/dayStatisc",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商户日统计"
+					}
+				}, {
+					"path": "seller/monthStatisc",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商户月统计"
+					}
+				}, {
+					"path": "seller/member",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "会员管理"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesA",
+			"pages": [{
+					"path": "product/categoryAttr",
+					"style": {
+						"navigationBarTitleText": "类型商品",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				},
+				{
+					"path": "product/tagGoodslist",
+					"style": {
+						"navigationBarTitleText": "标签商品",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				},
+				{
+					"path": "product/tag",
+					"style": {
+						"navigationBarTitleText": "精选标签"
+						// "app-plus": {
+						// 	"titleNView": {
+						// 		"type": "transparent"
+						// 	}
+						// }
+					}
+				},
+				{
+					"path": "product/giftProduct",
+					"style": {
+						"navigationBarTitleText": "积分详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				},
+				{
+					"path": "product/groupProduct",
+					"style": {
+						"navigationBarTitleText": "团购详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "product/product",
+					"style": {
+						"navigationBarTitleText": "详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "product/groupList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "团购商品列表"
+					}
+				}, {
+					"path": "product/giftList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "积分商品列表"
+					}
+				}, {
+					"path": "product/groupActivityDetail",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "套餐商品详情"
+					}
+				}, {
+					"path": "product/groupActivityList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "套餐商品列表"
+					}
+				}, {
+					"path": "product/paiMaiDetail",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商品拍卖详情"
+					}
+				}, {
+					"path": "product/secskillDetail",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商品秒杀详情"
+					}
+				}, {
+					"path": "product/paiMaiList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商品拍卖列表"
+					}
+				}
+
+				, {
+					"path": "product/discountList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "折扣列表"
+					}
+				}, {
+					"path": "product/list",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "商品列表"
+					}
+				},
+
+
+				{
+					"path": "build/repairOrder/repairOrder",
+					"style": {
+						"navigationBarTitleText": "维修录单"
+					}
+				},
+				{
+					"path": "build/community",
+					"style": {
+						"navigationBarTitleText": "社区主页"
+					}
+				}, {
+					"path": "build/applyCommunity",
+					"style": {
+						"navigationBarTitleText": "社区入驻"
+					}
+				}, {
+					"path": "build/bindCommunity",
+					"style": {
+						"navigationBarTitleText": "绑定社区"
+					}
+				}, {
+					"path": "build/communityList",
+					"style": {
+						"navigationBarTitleText": "农村社区列表"
+					}
+				},
+				{
+					"path": "build/floorList",
+					"style": {
+						"navigationBarTitleText": "楼房列表"
+					}
+				},
+				{
+					"path": "build/groupProduct",
+					"style": {
+						"navigationBarTitleText": "团购详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "build/groupList",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "团购商品列表"
+					}
+				}, {
+					"path": "build/notice",
+					"style": {
+						"navigationBarTitleText": "通知"
+					}
+				},
+
+				{
+					"path": "after_sale/index",
+					"style": {
+						"navigationBarTitleText": "申请售后"
+					}
+				},
+				{
+					"path": "after_sale/list",
+					"style": {
+						"navigationBarTitleText": "售后列表"
+					}
+				},
+				{
+					"path": "after_sale/detail",
+					"style": {
+						"navigationBarTitleText": "售后详情"
+					}
+				}
+			]
+		},
+		{
+			"root": "pagesU",
+			"pages": [
+
+
+				{
+					"path": "user/invite",
+					"style": {
+						"navigationBarTitleText": "邀请好友"
+					}
+				}, {
+					"path": "user/inviteList",
+					"style": {
+						"navigationBarTitleText": "邀请好友"
+
+					}
+				}, {
+					"path": "user/inviteMoney",
+					"style": {
+						"navigationBarTitleText": "邀请好友佣金"
+
+					}
+				}, {
+					"path": "user/balance",
+					"style": {
+						"navigationBarTitleText": "我的钱包"
+					}
+				}, {
+					"path": "user/collect",
+					"style": {
+						"navigationBarTitleText": "我的收藏",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/deposit",
+					"style": {
+						"navigationBarTitleText": "余额冲",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/coupon",
+					"style": {
+						"navigationBarTitleText": "我的优惠券",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/myPurse",
+					"style": {
+						"navigationBarTitleText": "我的提",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/reset_password",
+					"style": {
+						"navigationBarTitleText": "忘记密码",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/forget",
+					"style": {
+						"navigationBarTitleText": "忘记密码",
+						"app-plus": {
+							"bounce": "none"
+						}
+					}
+				}, {
+					"path": "user/profile",
+					"style": {
+						"enablePullDownRefresh": true,
+						"navigationBarTitleText": "个人信息"
+					}
+				}, {
+					"path": "user/applyMember",
+					"style": {
+						"navigationBarTitleText": "升级会员",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "notice/notice",
+					"style": {
+						"navigationBarTitleText": "通知"
+					}
+				}, {
+					"path": "notice/subjectList",
+					"style": {
+						"navigationBarTitleText": "秒杀列表",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "notice/subjectDetail",
+					"style": {
+						"navigationBarTitleText": "详情展示",
+						"app-plus": {
+							"titleNView": {
+								"type": "transparent"
+							}
+						}
+					}
+				}, {
+					"path": "address/address",
+					"style": {
+						"navigationBarTitleText": "收货地址"
+					}
+				}, {
+					"path": "address/addressManage",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}
+			]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "black",
+		"navigationBarTitleText": "宇运动商城",
+		"navigationBarBackgroundColor": "#FFFFFF",
+		"backgroundColor": "#f8f8f8"
+	},
+	"tabBar": {
+		"color": "#C0C4CC",
+		"selectedColor": "#fa436a",
+		"borderStyle": "black",
+		"backgroundColor": "#ffffff",
+		"list": [{
+				"pagePath": "pages/index/index",
+				"iconPath": "static/tab-home.png",
+				"selectedIconPath": "static/tab-home-current.png",
+				"text": "首页"
+			},
+			{
+				"pagePath": "pages/category/category",
+				"iconPath": "static/tab-cate.png",
+				"selectedIconPath": "static/tab-cate-current.png",
+				"text": "分类"
+			},
+			{
+				"pagePath": "pages/index/nearbyBusiness",
+				"iconPath": "static/fujin.png",
+				"selectedIconPath": "static/fujin_.png",
+				"text": "附近商家"
+			},
+			{
+				"pagePath": "pages/cart/cart",
+				"iconPath": "static/tab-cart.png",
+				"selectedIconPath": "static/tab-cart-current.png",
+				"text": "购物车"
+			},
+			{
+				"pagePath": "pages/index/user",
+				"iconPath": "static/tab-my.png",
+				"selectedIconPath": "static/tab-my-current.png",
+				"text": "我的"
+			}
+		]
+	},
+	"condition": {
+		//模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
+	}
+}
diff --git a/mallplusui-uniapp-app2/pages/cart/cart.vue b/mallplusui-uniapp-app2/pages/cart/cart.vue
new file mode 100644
index 0000000..d04cad2
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/cart/cart.vue
@@ -0,0 +1,449 @@
+<template>
+	<view class="container">
+		<!-- #ifdef MP-WEIXIN -->
+		<nav-bar>购物车</nav-bar>
+		<!-- #endif -->
+		<!-- 空白页 -->
+		<view v-if="!hasLogin || empty === true" class="empty">
+			<image src="/static/emptyCart.jpg" mode="aspectFit"></image>
+			<view v-if="hasLogin" class="empty-tips">
+				空空如也
+				<navigator class="navigator" v-if="hasLogin" url="../index/index" open-type="switchTab">随便逛逛>
+				</navigator>
+			</view>
+			<view v-else class="empty-tips">
+				空空如也
+				<view class="navigator" @click="navToLogin">去登陆></view>
+			</view>
+		</view>
+		<view v-else>
+			<!-- 列表 -->
+			<view class="cart-list">
+				<block v-for="(item, index) in cartList" :key="item.id">
+					<view class="cart-item" :class="{ 'b-b': index !== cartList.length - 1 }">
+						<view class="image-wrapper">
+							<image :src="item.productPic" class="loaded" mode="aspectFill" lazy-load
+								@load="onImageLoad('cartList', index)" @error="onImageError('cartList', index)"></image>
+							<view class="yticon icon-xuanzhong2 checkbox"
+								:class="{ checked: item.checked === '1' || item.checked }"
+								@click="check('item', index)"></view>
+						</view>
+						<view class="item-right">
+							<text class="clamp title">{{ item.productName }}</text>
+							<text class="attr">{{ item.productAttr }}</text>
+							<text class="price">¥{{ item.price }}</text>
+							<uni-number-box class="step" :min="1" :value="item.quantity" :isMin="item.quantity === 1"
+								:index="index" @eventChange="numberChange"></uni-number-box>
+						</view>
+						<text class="del-btn yticon icon-fork" @click="deleteCartItem(index)"></text>
+					</view>
+				</block>
+			</view>
+
+			<!-- 底部菜单栏 -->
+			<view class="action-section">
+				<view class="checkbox">
+					<image :src="allChecked ? '/static/selected.png' : '/static/select.png'" mode="aspectFit"
+						@click="check('all')"></image>
+					<view class="clear-btn" :class="{ show: allChecked }" @click="clearCart">清空</view>
+				</view>
+				<view class="total-box">
+					<text class="price">¥{{ total }}</text>
+					<text class="coupon">
+						已优惠
+						<text>{{ promoteAmount }}</text>
+						元
+					</text>
+				</view>
+				<button type="primary" class="no-border confirm-btn" @click="createOrder">去结算</button>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import {
+		mapState
+	} from 'vuex';
+	import uniNumberBox from '@/components/uni-number-box.vue';
+	import navBar from '@/components/zhouWei-navBar';
+	export default {
+		components: {
+			uniNumberBox,
+			navBar,
+			mallplusCopyright
+		},
+		data() {
+			return {
+				total: 0, //总价格
+				allChecked: false, //全选状态  true|false
+				empty: false, //空白页现实  true|false
+				promoteAmount: 0,
+				cartList: [],
+
+				statusBarHeight: ''
+			};
+		},
+
+		async onShow() {
+			if (this.hasLogin) {
+				this.loadData();
+			}
+		},
+		async onLoad() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+		},
+		watch: {
+			//显示空白页
+			cartList(e) {
+				let empty = e.length === 0 ? true : false;
+				if (this.empty !== empty) {
+					this.empty = empty;
+				}
+			}
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+			//请求数据
+			async loadData() {
+				let params = {};
+				let list = await Api.apiCall('get', Api.order.cartList, params);
+				// let list = await this.$api.json('cartList');
+				let cartList = list.cartItemList.map(item => {
+					item.checked = '1';
+					return item;
+				});
+				this.cartList = cartList;
+				this.promoteAmount = list.promoteAmount;
+				this.calcTotal(); //计算总价
+			},
+			//监听image加载完成
+			onImageLoad(key, index) {
+				this.$set(this[key][index], 'loaded', 'loaded');
+			},
+			//监听image加载失败
+			onImageError(key, index) {
+				this[key][index].image = '/static/errorImage.jpg';
+			},
+			navToLogin() {
+				uni.navigateTo({
+					url: '/pages/public/login'
+				});
+			},
+			//选中状态处理
+			check(type, index) {
+				if (type === 'item') {
+					this.cartList[index].checked = !this.cartList[index].checked;
+				} else {
+					const checked = !this.allChecked;
+					const list = this.cartList;
+					list.forEach(item => {
+						item.checked = checked;
+					});
+					this.allChecked = checked;
+				}
+				this.calcTotal(type);
+			},
+			//数量
+			numberChange(data) {
+				this.cartList[data.index].quantity = data.number;
+				let params = {
+					id: this.cartList[data.index].id,
+					quantity: data.number
+				};
+				data = Api.apiCall('get', Api.order.updateQuantity, params);
+				this.calcTotal();
+			},
+			//删除
+			deleteCartItem(index) {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定将此商品移出购物车吗',
+					success: res => {
+						if (res.confirm) {
+							let list = that.cartList;
+							let row = list[index];
+							let id = row.id;
+							let params = {
+								cart_id_list: id
+							};
+							Api.apiCall('post', Api.order.deleteCart, params);
+							that.cartList.splice(index, 1);
+							that.calcTotal();
+							uni.hideLoading();
+						}
+					},
+				});
+			},
+			//清空
+			clearCart() {
+				var that = this;
+				uni.showModal({
+					title: '提示',
+					content: '确定将购物车清空吗',
+					success: res => {
+						if (res.confirm) {
+							let params = {};
+							Api.apiCall('post', Api.order.clearCart, params);
+							this.cartList = [];
+						}
+					}
+				});
+			},
+			//计算总价
+			calcTotal() {
+				let list = this.cartList;
+				if (list.length === 0) {
+					this.empty = true;
+					return;
+				}
+				let total = 0;
+				let checked = true;
+				list.forEach(item => {
+					if (item.checked === true || item.checked === '1') {
+						total += item.price * item.quantity;
+					} else if (checked === true) {
+						checked = false;
+					}
+				});
+				total = total - this.promoteAmount;
+				this.allChecked = checked;
+				this.total = Number(total.toFixed(2));
+			},
+			//创建订单
+			createOrder() {
+				let list = this.cartList;
+				var ids = '';
+				list.forEach(item => {
+					if (item.checked === true || item.checked === '1') {
+						ids = item.id + ',' + ids;
+					}
+				});
+				let cartIds = ids.substr(0, ids.length - 1);
+				let dataJson = {};
+
+				dataJson.type = 2;
+				dataJson.cartIds = cartIds;
+				let url = '/pages/order/createStoreOrder?dataJson=' + JSON.stringify(dataJson)
+
+				uni.navigateTo({
+					url: url
+				});
+
+
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.container {
+		padding-bottom: 134upx;
+
+		/* 空白页 */
+		.empty {
+			position: fixed;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100vh;
+			padding-bottom: 100upx;
+			display: flex;
+			justify-content: center;
+			flex-direction: column;
+			align-items: center;
+			background: #fff;
+
+			image {
+				width: 240upx;
+				height: 160upx;
+				margin-bottom: 30upx;
+			}
+
+			.empty-tips {
+				display: flex;
+				font-size: $font-sm + 2upx;
+				color: $font-color-disabled;
+
+				.navigator {
+					color: $uni-color-primary;
+					margin-left: 16upx;
+				}
+			}
+		}
+	}
+
+	/* 购物车列表项 */
+	.cart-item {
+		display: flex;
+		position: relative;
+		padding: 30upx 40upx;
+
+		.image-wrapper {
+			width: 230upx;
+			height: 230upx;
+			flex-shrink: 0;
+			position: relative;
+
+			image {
+				border-radius: 8upx;
+			}
+		}
+
+		.checkbox {
+			position: absolute;
+			left: -16upx;
+			top: -16upx;
+			z-index: 8;
+			font-size: 44upx;
+			line-height: 1;
+			padding: 4upx;
+			color: $font-color-disabled;
+			background: #fff;
+			border-radius: 50px;
+		}
+
+		.item-right {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			overflow: hidden;
+			position: relative;
+			padding-left: 30upx;
+
+			.title,
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				height: 40upx;
+				line-height: 40upx;
+			}
+
+			.attr {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				height: 50upx;
+				line-height: 50upx;
+			}
+
+			.price {
+				height: 50upx;
+				line-height: 50upx;
+			}
+		}
+
+		.del-btn {
+			padding: 4upx 10upx;
+			font-size: 34upx;
+			height: 50upx;
+			color: $font-color-light;
+		}
+	}
+
+	/* 底部栏 */
+	.action-section {
+		/* #ifdef H5 */
+		margin-bottom: 100upx;
+		/* #endif */
+		position: fixed;
+		left: 30upx;
+		bottom: 30upx;
+		z-index: 95;
+		display: flex;
+		align-items: center;
+		width: 690upx;
+		height: 100upx;
+		padding: 0 30upx;
+		background: rgba(255, 255, 255, 0.9);
+		box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+		border-radius: 16upx;
+
+		.checkbox {
+			height: 52upx;
+			position: relative;
+
+			image {
+				width: 52upx;
+				height: 100%;
+				position: relative;
+				z-index: 5;
+			}
+		}
+
+		.clear-btn {
+			position: absolute;
+			left: 26upx;
+			top: 0;
+			z-index: 4;
+			width: 0;
+			height: 52upx;
+			line-height: 52upx;
+			padding-left: 38upx;
+			font-size: $font-base;
+			color: #fff;
+			background: $font-color-disabled;
+			border-radius: 0 50px 50px 0;
+			opacity: 0;
+			transition: 0.2s;
+
+			&.show {
+				opacity: 1;
+				width: 120upx;
+			}
+		}
+
+		.total-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			text-align: right;
+			padding-right: 40upx;
+
+			.price {
+				font-size: $font-lg;
+				color: $font-color-dark;
+			}
+
+			.coupon {
+				font-size: $font-sm;
+				color: $font-color-light;
+
+				text {
+					color: $font-color-dark;
+				}
+			}
+		}
+
+		.confirm-btn {
+			padding: 0 38upx;
+			margin: 0;
+			border-radius: 100px;
+			height: 76upx;
+			line-height: 76upx;
+			font-size: $font-base + 2upx;
+			background: $uni-color-primary;
+			box-shadow: 1px 2px 5px rgba(217, 60, 93, 0.72);
+		}
+	}
+
+	/* 复选框选中状态 */
+	.action-section .checkbox.checked,
+	.cart-item .checkbox.checked {
+		color: $uni-color-primary;
+	}
+
+	.getPosition {
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/category/areaGoods.vue b/mallplusui-uniapp-app2/pages/category/areaGoods.vue
new file mode 100644
index 0000000..ea8616e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/category/areaGoods.vue
@@ -0,0 +1,231 @@
+<template>
+	<view class="content" style="display: flex;flex-direction: column;">
+		<!-- #ifdef MP-WEIXIN -->
+		<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;" :style="{'height':statusBarHeight+'px' }"></view>
+		<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%" :style="{'top':statusBarHeight+'px' }">
+			<text>分类</text>
+		</view>
+		<view class="" @click="search()" style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;" :style="[{'margin-top': statusBarHeight+45+'px'}]">
+			<input class="" type="text" value="" placeholder="输入关键字搜索" style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
+		</view>
+		<!-- 占位 -->
+		<!-- <view class="" :style="[{'height': statusBarHeight+45+'px'}]"></view> -->
+		<!-- #endif -->
+
+		<!-- <view class="" style="background: #FFFFFF;height: 80upx;display: flex;align-items: center;justify-content: center;">
+			<view style="display: flex;align-items: center;justify-content: center; height:60upx;width: 90%;background: #F5F5F5;border-radius: 50upx;">
+				<input type="text" value="" placeholder="输入关键字搜索" class="input" style="font-size: 28upx;text-align: center;"/>
+			</view>
+		</view> -->
+		<view class="" :style="{height: height + 'px'}" style="display: flex;flex-direction: row;">
+			<scroll-view scroll-y class="left-aside">
+				<view v-for="item in flist" :key="item.id" class="f-item b-b" :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.name }}</text>
+					<view class="t-list">
+						<view @click="navToList(item.id, titem.id)" v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
+							<image :src="titem.pic"></image>
+
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+export default {
+    components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			sizeCalcState: false,
+			tabScrollTop: 0,
+			currentId: 1,
+			flist: [],
+			slist: [],
+			tlist: [],
+
+			height: '',
+			statusBarHeight: '',
+		};
+	},
+	onLoad() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+		this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight+80)
+
+		this.loadData();
+	},
+	methods: {
+		async loadData() {
+			let list = this.$db.get('areaGoodsList' )
+			if(!list){
+			 let params = {};
+                             list = await Api.apiCall('get', Api.goods.areaGoodsList, params);
+                             this.$db.set('areaGoodsList', list)
+			}
+			if(list){
+			list.forEach(item => {
+            					if (item.level==0) {
+            						this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
+            					} else if (item.level==1) {
+            						this.slist.push(item); //没有价格的是2级分类
+            					} else {
+            						this.tlist.push(item); //3级分类
+            					}
+            				});
+			}
+		},
+		//一级分类点击
+		tabtap(item) {
+			if (!this.sizeCalcState) {
+				this.calcSize();
+			}
+
+			this.currentId = item.id;
+			console.log(item.id);
+			let index = this.slist.findIndex(sitem => sitem.pid === item.id);
+			if(index>=0){
+			 this.tabScrollTop = this.slist[index].top;
+			}
+
+		},
+		//右侧栏滚动
+		asideScroll(e) {
+			if (!this.sizeCalcState) {
+				this.calcSize();
+			}
+			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 h = 0;
+			this.slist.forEach(item => {
+				let view = uni.createSelectorQuery().select('#main-' + item.id);
+				view.fields(
+					{
+						size: true
+					},
+					data => {
+						item.top = h;
+						h += data.height;
+						item.bottom = h;
+					}
+				).exec();
+			});
+			this.sizeCalcState = true;
+		},
+		navToList(sid, tid) {
+			uni.navigateTo({
+				url: `../../pagesA/product/list?fid=${this.currentId}&sid=${sid}&tid=${tid}`
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	background-color: #f8f8f8;
+}
+
+.content {
+	display: flex;
+}
+.left-aside {
+	flex-shrink: 0;
+	width: 200upx;
+	height: 100%;
+	background-color: #fff;
+}
+.f-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100upx;
+	font-size: 28upx;
+	color: $font-color-base;
+	position: relative;
+	&.active {
+		color: $base-color;
+		background: #f8f8f8;
+		&:before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			height: 36upx;
+			width: 8upx;
+			background-color: $base-color;
+			border-radius: 0 4px 4px 0;
+			opacity: 0.8;
+		}
+	}
+}
+
+.right-aside {
+	flex: 1;
+	overflow: hidden;
+	padding-left: 20upx;
+}
+.s-item {
+	display: flex;
+	align-items: center;
+	height: 70upx;
+	padding-top: 8upx;
+	font-size: 28upx;
+	color: $font-color-dark;
+}
+.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: 20upx;
+
+	image {
+		width: 140upx;
+		height: 140upx;
+	}
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/category/category.vue b/mallplusui-uniapp-app2/pages/category/category.vue
new file mode 100644
index 0000000..2056265
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/category/category.vue
@@ -0,0 +1,243 @@
+<template>
+	<view class="content" style="display: flex;flex-direction: column;">
+		<!-- #ifdef MP-WEIXIN -->
+		<view style="width: 100%;position: fixed;top: 0;z-index: 99;background: #FFFFFF;" :style="{'height':statusBarHeight+'px' }"></view>
+		<view class="getPosition" style="height: 90upx;position: fixed;z-index: 99;width: 100%" :style="{'top':statusBarHeight+'px' }">
+			<text>分类</text>
+		</view>
+		<view class="" @click="search()" style="background: #FFFFFF;height: 80upx;display: flex;justify-content: center;align-items: center;" :style="[{'margin-top': statusBarHeight+45+'px'}]">
+			<input class="" type="text" value="" placeholder="输入关键字搜索" style="font-size: 28upx;background: #F5F5F5;height: 60upx;width: 90%;border-radius: 50upx;text-align: center;" />
+		</view>
+		<!-- 占位 -->
+		<!-- <view class="" :style="[{'height': statusBarHeight+45+'px'}]"></view> -->
+		<!-- #endif -->
+
+		<!-- <view class="" style="background: #FFFFFF;height: 80upx;display: flex;align-items: center;justify-content: center;">
+			<view style="display: flex;align-items: center;justify-content: center; height:60upx;width: 90%;background: #F5F5F5;border-radius: 50upx;">
+				<input type="text" value="" placeholder="输入关键字搜索" class="input" style="font-size: 28upx;text-align: center;"/>
+			</view>
+		</view> -->
+		<view class="" :style="{height: height + 'px'}" style="display: flex;flex-direction: row;">
+			<scroll-view scroll-y class="left-aside">
+				<view v-for="item in flist" :key="item.id" class="f-item b-b" :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.name }}</text>
+										<view class="t-list" > 
+											<view  v-if="titem.pid === item.id" class="t-item" v-for="titem in tlist" :key="titem.id">
+												<image :src="titem.pic" @click="navToDetailPage(titem)"></image>
+												<text @click="navToDetailPage(titem)">{{titem.name}}</text>
+											</view>
+										</view>
+				</view>
+			</scroll-view>
+		</view>
+
+	</view>
+
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+    components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			sizeCalcState: false,
+			tabScrollTop: 0,
+			currentId: 1,
+			flist: [],
+			slist: [],
+			tlist: [],
+
+			height: '',
+			statusBarHeight: '',
+		};
+	},
+	onLoad() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+		this.height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight+80)
+
+		this.loadData();
+	},
+	methods: {
+		async loadData() {
+			
+			let list = this.$db.get('categoryList' )
+			if(!list){
+            			 let params = {};
+                                         list = await Api.apiCall('get', Api.goods.typeGoodsList, params);
+                                         this.$db.set('categoryList', list)
+            			}
+
+			if(list){
+				list.forEach(item => {
+				
+					if (item.level==0) {
+						this.flist.push(item); //pid为父级id, 没有pid或者pid=0是一级分类
+					} else if (item.level==1) {
+						this.slist.push(item); //没有价格的是2级分类
+					} else {
+						this.tlist.push(item); //3级分类
+					}
+				});
+			}
+			
+		},
+		//一级分类点击
+		tabtap(item) {
+			if (!this.sizeCalcState) {
+				this.calcSize();
+			}
+
+			this.currentId = item.id;
+			console.log(item.id);
+			let index = this.slist.findIndex(sitem => sitem.pid === item.id);
+			if(index>=0){
+			 this.tabScrollTop = this.slist[index].top;
+			}
+
+		},
+		//右侧栏滚动
+		asideScroll(e) {
+			if (!this.sizeCalcState) {
+				this.calcSize();
+			}
+			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 h = 0;
+			this.slist.forEach(item => {
+				let view = uni.createSelectorQuery().select('#main-' + item.id);
+				view.fields(
+					{
+						size: true
+					},
+					data => {
+						item.top = h;
+						h += data.height;
+						item.bottom = h;
+					}
+				).exec();
+			});
+			this.sizeCalcState = true;
+		},
+		navToList(sid) {
+			uni.navigateTo({
+				url: `../../pagesA/product/list?sid=${sid}`
+			});
+		},
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	height: 100%;
+	background-color: #f8f8f8;
+}
+
+.content {
+	display: flex;
+}
+.left-aside {
+	flex-shrink: 0;
+	width: 200upx;
+	height: 100%;
+	background-color: #fff;
+}
+.f-item {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 100%;
+	height: 100upx;
+	font-size: 28upx;
+	color: $font-color-base;
+	position: relative;
+	&.active {
+		color: $base-color;
+		background: #f8f8f8;
+		&:before {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			height: 36upx;
+			width: 8upx;
+			background-color: $base-color;
+			border-radius: 0 4px 4px 0;
+			opacity: 0.8;
+		}
+	}
+}
+
+.right-aside {
+	flex: 1;
+	overflow: hidden;
+	padding-left: 20upx;
+}
+.s-item {
+	display: flex;
+	align-items: center;
+	height: 70upx;
+	padding-top: 8upx;
+	font-size: 28upx;
+	color: $font-color-dark;
+}
+.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: 20upx;
+
+	image {
+		width: 140upx;
+		height: 140upx;
+	}
+}
+.getPosition{
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #FFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/index/index.vue b/mallplusui-uniapp-app2/pages/index/index.vue
new file mode 100644
index 0000000..7faee05
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/index/index.vue
@@ -0,0 +1,1424 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<nav-bar>汇融云链</nav-bar>
+		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
+				placeholder="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+		<!-- #ifdef MP -->
+		<view class="carousel-section" style="margin-top: 80upx;">
+			<!-- #endif -->
+			<!-- #ifndef MP -->
+			<view class="carousel-section">
+				<!-- #endif -->
+				<!-- 标题栏和状态栏占位符 -->
+				<view class="titleNview-placing"></view>
+				<!-- 背景色区域 -->
+				<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+				<swiper class="carousel" circular @change="swiperChange">
+					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+						@click="navToTabPage(item.url)">
+						<image :src="item.pic" />
+					</swiper-item>
+				</swiper>
+				<!-- 自定义swiper指示器 -->
+				<view class="swiper-dots">
+					<text class="num">{{ swiperCurrent + 1 }}</text>
+					<text class="sign">/</text>
+					<text class="num">{{ swiperLength }}</text>
+				</view>
+			</view>
+			<!-- 分类 -->
+			<view class="cate-section">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupActivityList')">
+					<image src="/static/temp//antFill-gift.png"></image>
+					<text>惠农套餐</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+					<image src="/static/temp/fasfausers.png"></image>
+					<text>拼团特价</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/giftList')">
+					<image src="/static/temp/fabfa-dropbox.png"></image>
+					<text>税分兑换</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('/pages/index/secskill')">
+					<image src="/static/temp/fasfa-history.png"></image>
+					<text>限时抢购</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/build/communityList')">
+					<image src="/static/temp/antFill-home.png"></image>
+					<text>农村社区</text>
+				</view>
+			</view>
+			<view class="cate-section">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isFenxiao=1')">
+					<image src="/static/temp/fasfa-sitemap.png"></image>
+					<text>分销商品</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/list?isVip=1')">
+					<image src="/static/temp/fasfa-archive.png"></image>
+					<text>会员商品</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('/pages/category/areaGoods')">
+					<image src="/static/temp/fasfa-truck.png"></image>
+					<text>区域商品</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/tag')">
+					<image src="/static/temp/fasfa-shopping.png"></image>
+					<text>精选标签</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesC/seller/index')">
+					<image src="/static/temp/fasfa-street.png"></image>
+					<text>卖家中心</text>
+				</view>
+			</view>
+
+			<!-- 秒杀楼层 https://s.click.taobao.com/Wds7c1w -->
+			<view class="seckill-section m-t"
+				v-if="homeFlashPromotion.flashSessionInfoList && homeFlashPromotion.flashSessionInfoList.length > 0">
+				<view class="s-header">
+					<view class="" style="width: 80%;display: flex;flex-direction: row;align-items: center;">
+						<image class="s-img" src="/static/temp/secskill-img.jpg" mode="widthFix"
+							@click="navToDetailPageL('https://s.click.taobao.com/Wds7c1w')"></image>
+						<text class="tip" style="margin-left: 20upx;">{{ homeFlashPromotion.flashName }}</text>
+						<view class="s-header" style="width:35%;margin-left: 20upx;">
+							<text class="tip">{{ homeFlashPromotion.startTime || '18:00' }}</text>
+							<text class="tip">~</text>
+							<text class="tip">{{ homeFlashPromotion.endTime || '24:00' }}</text>
+						</view>
+					</view>
+					<text class="yticon icon-you" @click="navToTabPage('/pages/index/secskill')"></text>
+				</view>
+				<view v-if="item2.productList && item2.productList.length > 0"
+					v-for="(item2, index2) in homeFlashPromotion.flashSessionInfoList" :key="index2">
+					<scroll-view class="floor-list" scroll-x>
+						<view class="scoll-wrapper">
+							<view v-for="(item, index) in item2.productList" :key="index" class="floor-item"
+								@click="navToSkillDetailPage(item)">
+								<image :src="item.productImg" mode="aspectFill"></image>
+								<text class="title clamp">{{ item.productName }}</text>
+								<text class="price">￥{{ item.flashPromotionPrice }}</text>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+			</view>
+			<!-- <view class="f-header m-t" @click="navToTabPage('../../pagesC/store/storeList')">
+				<image src="/static/temp/nav1.png"></image>
+				<view class="tit-box">
+					<text class="tit">农店推荐</text>
+					<text class="tit2">Guess You Like It</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="cate-section">
+				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in storeList"
+					:key="index">
+					<image v-if="item1.logo" :src="item1.logo"></image>
+					<image v-else src="/static/missing-face.png"></image>
+					<text>{{ item1.name |formatLongText }}</text>
+				</view>
+			</view> -->
+
+			<!-- 优惠券  https://s.click.taobao.com/OPh3c1w -->
+			<coupon v-for="(item, index) in couponList" :key="index" v-bind:item="item" theme="#ff0000"></coupon>
+
+			<!-- 团购楼层 -->
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')"
+				v-if="groupHotGoodsList.length > 0">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">精品团购</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="group-section" v-if="groupHotGoodsList.length > 0">
+				<swiper class="g-swiper" :duration="500">
+					<swiper-item class="g-swiper-item" v-for="(item, index) in groupHotGoodsList" :key="index"
+						v-if="index % 2 === 0" @click="navToGroupDetailPage(item)">
+						<view class="g-item left">
+							<image :src="item.goods.pic" mode="aspectFill"></image>
+							<view class="t-box">
+								<text class="title clamp">{{ item.goods.title }}</text>
+								<view class="price-box">
+									<text class="price">{{ item.groupPrice }}</text>
+									<text class="m-price">￥{{ item.goods.price }}</text>
+								</view>
+								<view class="pro-box">
+									<view class="progress-box"><progress percent="72" activeColor="#fa436a" active
+											stroke-width="6" /></view>
+									<text>{{ item.maxPeople }}人成团</text>
+								</view>
+							</view>
+						</view>
+					</swiper-item>
+				</swiper>
+			</view>
+
+			<!-- 分类推荐楼层 -->
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')" v-if="false">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">分类精选</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="hot-floor" v-if="item1.goodsList.length > 0" v-for="(item1, index) in cat_list" :key="index">
+				<view class="floor-img-box">
+					<image class="floor-img" :src="item1.pic" mode="scaleToFill"></image>
+				</view>
+				<scroll-view class="floor-list" scroll-x>
+					<view class="scoll-wrapper">
+						<view v-for="(item, index) in item1.goodsList" :key="index" class="floor-item"
+							@click="navToDetailPage(item)">
+							<image :src="item.pic" mode="aspectFill"></image>
+							<text class="title clamp">{{ item.name }}</text>
+							<text class="price">￥{{ item.price }}</text>
+						</view>
+						<view class="more" @click="navToList()">
+							<text>查看全部</text>
+							<text>More+</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+
+			<!-- 新品推荐 -->
+			<view v-if='homeNewProductList && homeNewProductList.length>0' class="f-header m-t"
+				@click="navToTabPage('../../pagesA/product/list')">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">新品推荐</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="guess-section">
+				<view v-for="(item, index) in homeNewProductList" :key="index" class="guess-item"
+					@click="navToDetailPage1(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<text class="title clamp">{{ item.productName }}</text>
+					<text class="price">￥{{ item.price }}</text>
+
+				</view>
+
+			</view>
+			<!-- 人气推荐 -->
+			<view v-if='homeRecommendProductList && homeRecommendProductList.length>0' class="f-header m-t"
+				@click="navToTabPage('../../pagesA/product/list')">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">人气推荐</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="guess-section">
+				<view v-for="(item, index) in homeRecommendProductList" :key="index" class="guess-item"
+					@click="navToDetailPage1(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<text class="title clamp">{{ item.name }}</text>
+					<text class="price">￥{{ item.price }}</text>
+
+				</view>
+
+			</view>
+			<!-- 新品上市 -->
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+				<image src="/static/temp/h1.png"></image>
+				<view class="tit-box">
+					<text class="tit">新品上市</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="guess-section">
+				<view v-for="(item, index) in newProductList" :key="index" class="guess-item"
+					@click="navToDetailPage(item)">
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<text class="title clamp">{{ item.name }}</text>
+					<text class="price">￥{{ item.price }}</text>
+					<text>【{{ item.storeName }}】</text>
+				</view>
+				<uni-load-more :status="loadingType"></uni-load-more>
+			</view>
+			<!-- <mallplusCopyright></mallplusCopyright> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import {
+		mapState
+	} from 'vuex';
+	import navBar from '@/components/zhouWei-navBar';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			coupon,
+			mallplusCopyright,
+			uniLoadMore,
+			navBar
+		},
+		data() {
+			return {
+				keyword: '',
+				pageNum: 1,
+				loadingType: 'more', //加载更多状态
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				swiperLength: 0,
+				homeNewProductList: [],
+				homeRecommendProductList: [],
+				carouselList: [],
+				hotProductList: [],
+				brandList: [], // 推荐品牌
+				homeFlashPromotion: [], // 当前秒杀场次
+				subjectList: [], //推荐专题
+				cat_list: [],
+				groupHotGoodsList: [],
+				couponList: [],
+				storeList: [],
+				newProductList: []
+			};
+		},
+
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+
+			this.getNewProductList();
+		},
+		onPullDownRefresh() {
+			console.log("onPullDownRefresh")
+			this.pageNum = this.pageNum + 1;
+			this.getNewProductList('refresh');
+
+			this.loadData();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
+		},
+		onShareAppMessage() {},
+		onLoad(ops) {
+			
+			let isWeiXin = this.$common.isWeiXinBrowser();
+			this.getNewProductList('refresh');
+			if (ops.invitecode) {
+				this.$db.set('invitecode', ops.invitecode);
+			}
+			this.loadData();
+			this.sysInfoMethod();
+		},
+		filters: {
+			formatCreateTime(time) {
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+			},
+			formatNull(value) {
+				if (value === undefined || value === null || value === '') {
+					return '暂无';
+				} else {
+					return value;
+				}
+			},
+			formatLongText(value) {
+				if (value === undefined || value === null || value === '') {
+					return '暂无';
+				} else if (value.length > 4) {
+					return value.substr(0, 4) + '...';
+				} else {
+					return value;
+				}
+			},
+			formatPayType(value) {
+				if (value === 2) {
+					return '支付宝';
+				} else if (value === 1) {
+					return '微信小程序';
+				} else if (value === 3) {
+					return '余额支付';
+				} else if (value === 5) {
+					return '积分兑换';
+				}
+			},
+		},
+		methods: {
+			async sysInfoMethod() {
+				let params = {};
+				let list = this.$db.get('sysInfo')
+				if (!list) {
+					list = await Api.apiCall('get', Api.index.sysInfo, params);
+					this.$db.set('sysInfo', list)
+				}
+
+			},
+			getCode() {
+				var code = this.$common.getQueryString('code');
+				code && this.getOpenId(code);
+			},
+			async getOpenId(code) {
+				console.log(code);
+				let params = {
+					code: code,
+					scope: 2,
+					state: this.state
+				};
+				//模拟接口
+				let res = await Api.apiCall('get', Api.order.authCodeToOpenid, params);
+				console.log(res);
+				if (res) {
+					this.login(data);
+					console.log(data);
+					this.$db.set('userInfos', data.userInfo);
+					this.$db.set('token', data.tokenHead + data.token);
+					uni.switchTab({
+						url: '/pages/index/index'
+					});
+
+					//this.openid = res.data
+					//  this.toPayHandler('wechatpay')
+				} else {
+					this.$common.errorToShow(res);
+				}
+			},
+			checkWXJSBridge(data) {
+				let that = this;
+				let interval = setInterval(() => {
+					if (typeof window.WeixinJSBridge != 'undefined') {
+						clearTimeout(interval);
+						that.onBridgeReady(data);
+					}
+				}, 200);
+			},
+			onBridgeReady(data) {
+				var _this = this;
+				window.WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', {
+						appId: data.appid, // 公众号名称，由商户传入
+						timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
+						nonceStr: data.nonceStr, // 随机串
+						package: data.package,
+						signType: data.signType, // 微信签名方式：
+						paySign: data.paySign // 微信签名
+					},
+					function(res) {
+						if (res.err_msg === 'get_brand_wcpay_request:ok') {
+							_this.$common.successToShow('支付成功');
+						} else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
+							_this.$common.errorToShow('取消支付');
+						} else {
+							_this.$common.errorToShow('支付失败');
+						}
+						setTimeout(() => {
+							_this.$common.redirectTo('/pages/order/payment/result?id=' + data.id);
+						}, 1000);
+					}
+				);
+			},
+
+			/**
+			 *
+			 * 加载首页数据
+			 */
+			async loadData() {
+				this.getBanner();
+				this.getHotGoodsList();
+				//this.getFlashPromotion();
+				this.getCouponList();
+				this.getStoreList();
+				this.homeNewProduct();
+				this.homeRecommendProduct();
+			},
+
+			/**
+			 * 获取新品推荐
+			 */
+			async homeNewProduct() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeNewProduct, params);
+				console.log(groupHotGoodsList)
+				if (groupHotGoodsList) {
+					this.homeNewProductList = groupHotGoodsList.records;
+				}
+
+
+			},
+			/**
+			 * 获取人气推荐
+			 */
+			async homeRecommendProduct() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.index.homeRecommendProduct, params);
+				this.homeRecommendProductList = groupHotGoodsList.records;
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getBanner() {
+				let params = {
+					storeId: 1
+				};
+				console.log(uni.getSystemInfoSync().platform);
+				switch (uni.getSystemInfoSync().platform) {
+					case 'android':
+						params.type = 2;
+						break;
+					case 'ios':
+						params.type = 3;
+						break;
+					default:
+						params.type = 5;
+						break;
+				}
+				let data = await Api.apiCall('get', Api.index.bannerList, params);
+				console.log("1111111", data)
+				if (data) {
+						console.log("122》》》》》》》》》》》》》》》》》》》》", data)
+					this.carouselList = data || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+				}
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getCouponList() {
+				let params = {
+					pageSize: 3
+				};
+				let data = await Api.apiCall('get', Api.index.selectNotRecive, params);
+				if (data) {
+					console.log("优惠券")
+					console.log("优惠券",data)
+					this.couponList = data || [];
+				}
+			},
+			/**
+			 * 获取新品上市信息
+			 */
+			async getNewProductList(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params = {
+					pageNum: this.pageNum
+				};
+				let list = await Api.apiCall('get', Api.goods.goodsList, params);
+
+				let goodsList = list.records;
+
+				if (type === 'refresh') {
+					this.newProductList = [];
+				}
+
+				this.newProductList = this.newProductList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+			/**
+			 * 获取团购信息
+			 */
+			async getStoreList() {
+				let params = {
+					pageSize: 5,
+					isBoutique: 1,
+					sort: 2
+				};
+				let groupHotGoodsList = await Api.apiCall('get', Api.member.storeList, params);
+				this.storeList = groupHotGoodsList.records;
+			},
+			/**
+			 * 获取团购信息
+			 */
+			async getHotGoodsList() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+			},
+
+			/**
+			 * 获取秒杀列表信息
+			 */
+			async getFlashPromotion() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+				if (data) {
+					let homeFlashPromotion = data;
+					if (homeFlashPromotion.length > 0) {
+						this.homeFlashPromotion = homeFlashPromotion[0];
+					}
+				}
+			},
+
+			/**
+			 * 获取分类精选列表信息
+			 */
+			async getCatList() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.goods.newProductList, params);
+				if (data) {
+					let cat_list = data;
+					this.cat_list = cat_list || [];
+				}
+			},
+
+			/**
+			 * 请求静态数据只是为了代码不那么乱
+			 * 分次请求未作整合
+			 */
+			async loadData2() {
+				this.logining = true;
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.home, params);
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+				this.logining = false;
+				console.log("22222", data)
+				if (data) {
+					console.log("》》》》》》》》》》》》》》》》》》》》", data)
+					this.carouselList = data.advertiseList || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+					let brandList = data.brandList;
+					this.brandList = brandList || [];
+					let cat_list = data.cat_list;
+					this.cat_list = cat_list || [];
+					let homeFlashPromotion = data.homeFlashPromotion;
+					this.homeFlashPromotion = homeFlashPromotion || [];
+
+					let data1 = await Api.apiCall('get', Api.index.home1, params);
+					let newProductList = data1.newProductList;
+					this.newProductList = newProductList || [];
+
+					let hotProductList = data1.hotProductList;
+					this.hotProductList = hotProductList || [];
+
+					this.couponList = data1.couponList || [];
+					this.orderList = this.couponList.filter(item => {
+						item.createTime = this.dateFormat(item.createTime);
+						return item;
+					});
+				}
+				var userInfo = this.$db.get('userInfos');
+				if (userInfo) {
+					/*uni.getLocation({
+					type: 'wgs84',
+					success: function(res) {
+						console.log(res);
+						let params = { longitude: res.longitude, latitude: res.latitude, memberId: userInfo.id, userName: userInfo.username, pic: userInfo.icon};
+						Api.apiCall('post', Api.index.submitLocaltion, params);
+
+					}
+				});
+*/
+				}
+			},
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			navToTabPageStore(item) {
+				//url: `../../pagesC/store/store?id=${id}`
+				// url: `../../pagesC/store/businessDetails?id=${id}`
+				let id = item;
+				uni.navigateTo({
+					url: `../../pagesC/store/businessDetails?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPage1(item) {
+				//测试数据没有写id，用title代替
+				let id = item.productId;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPageL(url) {
+				window.location.href = url;
+			},
+			//详情页
+			navToCouponDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				});
+			},
+			async acceptCoupon(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
+			},
+			navToSkillDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+
+				uni.navigateTo({
+					url: `../../pagesA/product/secskillDetail?id=${id}`
+				});
+			},
+
+			navToGroupDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.goodsId;
+				let groupId = item.groupId;
+				uni.navigateTo({
+					url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+				});
+			},
+			navToList() {
+				uni.navigateTo({
+					url: `../../pagesA/product/list`
+				});
+			},
+			search() {
+				uni.navigateTo({
+					url: '/pages/search/search'
+				});
+			}
+		},
+
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.MP-search {
+		background: #ffffff;
+		height: 80upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		width: 100%;
+		z-index: 999;
+	}
+
+	.MP-search-input {
+		font-size: 28upx;
+		background: #f5f5f5;
+		height: 60upx;
+		width: 90%;
+		border-radius: 50upx;
+		text-align: center;
+	}
+
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
+	}
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
+		}
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
+			}
+		}
+	}
+
+	page {
+		background: #f5f5f5;
+	}
+
+	.m-t {
+		margin-top: 20upx;
+	}
+
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
+	}
+
+	.carousel {
+		width: 100%;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
+	}
+
+	.swiper-dots {
+		display: flex;
+		position: absolute;
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
+	}
+
+	/* 分类 */
+	.cate-section {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
+	}
+
+	.ad-1 {
+		width: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 0upx 20upx 20upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				// margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+	}
+
+	.f-header {
+		display: flex;
+		align-items: center;
+		height: 140upx;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
+		}
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: $font-lg + 2upx;
+			color: $font-color-light;
+		}
+	}
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 20upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 20upx;
+			display: flex;
+		}
+
+		image {
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
+		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+
+			// margin-right: 24upx;
+			.t-box {
+				padding-top: 20upx;
+			}
+		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
+		}
+
+		.price {
+			color: $uni-color-primary;
+		}
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
+		}
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
+		}
+	}
+
+	/* 分类推荐楼层 */
+	.hot-floor {
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
+			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 180upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
+		}
+	}
+
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+
+		&:after {
+			border-radius: 100px;
+		}
+
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+	/* 猜你喜欢 */
+	.guess-section {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+		}
+
+		.coupon_box {
+			width: 100%;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
+		}
+
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.getPosition {
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/index/lease.vue b/mallplusui-uniapp-app2/pages/index/lease.vue
new file mode 100644
index 0000000..33a6994
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/index/lease.vue
@@ -0,0 +1,268 @@
+<template>
+	<view class="home">
+		<view class="home-list">
+
+			<view v-for="(item,index) in tableList" :key="item._id" :item="item">
+				<view @click="open">
+					<!-- 基础卡片 -->
+					<view v-if="item.mode==='base'" class="listcard">
+						<view class="listcard-image">
+							<image :src="item.cover[0]" mode="aspectFill"></image>
+						</view>
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 多图模式 -->
+					<view v-if="item.mode==='column'" class="listcard  mode-column">
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+							<view class="listcard-image">
+								<view v-if="index<3" v-for="(item,index) in item.cover" :key="index"
+									class="listcard-image_item">
+									<image :src="item" mode="aspectFill"></image>
+								</view>
+							</view>
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+					<!-- 大图模式 -->
+					<view v-if="item.mode==='image'" class="listcard  mode-image">
+						<view class="listcard-image">
+							<image :src="item.cover[0]" mode="aspectFill"></image>
+						</view>
+						<view class="listcard-content">
+							<view class="listcard-content_title">
+								<text>{{item.title}}</text>
+								<likes :types="types" :item="item"></likes>
+							</view>
+
+							<view class="listcard-content_des">
+								<view class="listcard-content_des-label">
+									<view class="listcard-content_des-label-item">{{item.classify}}</view>
+								</view>
+								<view class="listcard-content_des-browe">{{item.browse_count}}浏览</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				types:"",
+				tableList: [{
+						_id: 1,
+						title: "出租2015年东方红LX954轮式拖拉机",
+						mode: 'base',
+						cover: [
+							"https://tse4-mm.cn.bing.net/th/id/OIP-C.oXIOhfs0Tp6ePMdc6d7YUAHaJ3?w=132&h=180&c=7&r=0&o=5&pid=1.7"
+						],
+						classify: "面议",
+						browse_count: 111
+					},
+					{
+						_id: 2,
+						title: "出租2015年雷沃GE60小麦收割机",
+						mode: 'column',
+						cover: [
+							"https://b.img.s105.cn/wxappup/202008/11172406_4943.jpg!w600h400.jpg",
+							"https://tse4-mm.cn.bing.net/th/id/OIP-C.yNPwdLsNcAWkFqmNGjUQYAHaJ4?w=142&h=190&c=7&r=0&o=5&pid=1.7",
+							"https://tse1-mm.cn.bing.net/th/id/OIP-C.-VK9NHoU9KzavFK7fAsyLAHaNK?w=115&h=190&c=7&r=0&o=5&pid=1.7"
+						],
+						classify: "￥15263.11",
+						browse_count: 222
+					},
+					{
+						_id: 3,
+						title: "出租久保田888半喂入联合收割机",
+						mode: 'image',
+						cover: [
+							"https://b.img.s105.cn/wxappup/201908/21084758_8856.jpg?x-oss-process=image/resize,m_fill,h_343,w_410,limit_0"
+						],
+						classify: "￥110012.00",
+						browse_count: 333
+					},
+				],
+			};
+		},
+		methods: {
+			open() {
+
+			}
+
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		height: 100%;
+		display: flex;
+	}
+
+	.home {
+		display: flex;
+		flex-direction: column;
+		flex: 1;
+		overflow: hidden;
+
+		.home-list {
+			flex: 1;
+			box-sizing: border-box;
+		}
+	}
+	.listcard {
+		display: flex;
+		padding: 15px;
+		margin: 20px;
+		border-radius: 5px;
+		box-shadow: 0 0 5px 1px rgba($color:#000000, $alpha:0.1);
+		box-sizing: border-box;
+	
+		.listcard-image {
+			flex-shrink: 0;
+			width: 80px;
+			height: 80px;
+			border-radius: 8px;
+			overflow: hidden;
+	
+			image {
+				width: 100%;
+				height: 100%;
+			}
+	
+		}
+	
+		.listcard-content {
+			display: flex;
+			flex-direction: column;
+			padding-left: 10px;
+			width: 100%;
+			justify-content: space-between;
+	
+			.listcard-content_title {
+				padding-right: 30px;
+				font-size: 14px;
+				color: #333;
+				font-weight: 400;
+				line-height: 1.2;
+				position: relative;
+	
+				text {
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+	
+				
+			}
+	
+			.listcard-content_des {
+				display: flex;
+				justify-content: space-between;
+				font-size: 12px;
+	
+				.listcard-content_des-label {
+					display: flex;
+	
+					.listcard-content_des-label-item {
+						padding: 0 5px;
+						margin-right: 5px;
+						border-radius: 15px;
+						color: #f00;
+						border: 1px  #f00 solid;
+					}
+				}
+	
+				.listcard-content_des-browe {
+					color: #999;
+					line-height: 1.5;
+				}
+			}
+		}
+	
+		&.mode-column {
+			.list-content {
+				width: 100%;
+				padding-left: 0;
+			}
+	
+			.listcard-image {
+				display: flex;
+				margin-top: 10px;
+				width: 100%;
+				height: 80px;
+	
+				.listcard-image_item {
+					margin-left: 10px;
+					width: 100%;
+					border-radius: 5px;
+					overflow: hidden;
+	
+					&:first-child {
+						margin-left: 0;
+					}
+	
+					image {
+						width: 100%;
+						height: 100%;
+					}
+	
+				}
+			}
+	
+			.listcard-content_des {
+				margin-top: 10px;
+			}
+		}
+	
+		&.mode-image {
+			flex-direction: column;
+	
+			.listcard-image {
+				width: 100%;
+				height: 100px;
+			}
+	
+			.listcard-content {
+				padding-left: 0;
+				margin-top: 10px;
+	
+				.listcard-content_des {
+					display: flex;
+					align-items: center;
+					margin-top: 10px;
+				}
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/index/nearbyBusiness.vue b/mallplusui-uniapp-app2/pages/index/nearbyBusiness.vue
new file mode 100644
index 0000000..c6abf5f
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/index/nearbyBusiness.vue
@@ -0,0 +1,561 @@
+<template>
+	<view class="content">
+
+		<!-- 顶部搜索 -->
+		<view class="getPosition">
+			<image src="/static/position.png" @click="openMap()" style="width: 50upx;height: 50upx;" mode=""></image>
+
+			<text @click="toAddressList()" >{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}</text>
+		</view>
+		<!-- 头部 -->
+		<view class="title-box">
+			<view @click="scanCode()" class="scan"><image src="http://rs.eonfox.cc/clzy/static/scan-ico.png" mode="" style="width:40upx; height:40upx;  "></image></view>
+			<view class="input-box" @click="openSearch">
+				<view style="float: left;">
+					<image src="/static/search.png" mode="" style="width:40upx; height:40upx; margin-left: 10upx; margin-right: 10upx; margin-top: 10upx; "></image>
+				</view>
+				<view style=" float:left; height:100%;"><input type="text" value="" placeholder="输入关键字搜索" class="input" /></view>
+			</view>
+		</view>
+
+
+		 <view class="topTitle">
+				<image src="http://rs.eonfox.cc/clzy/static/star-ico.png" mode="" style="width:68upx;height:68upx;float:left;margin-right: -10upx;"></image>
+			    <text class="topText">全部商家</text>
+		</view>
+		<view class="checkGroup">
+			<radio-group>
+			 	 <label class="radio" v-for="(item,index) in disType" :key='index'><radio  value="r1"  class="radio" @click="gain(item.id)"/>{{item.name}}</label>
+			 	</radio-group>
+		</view>
+		 	<view class="classification">
+			<view class="allClassification typeList" @click="gosort">
+				<uni-icon type="bars" size="22" class="bars" color="8e8e8e"></uni-icon>
+				<text>全部分类</text>
+			</view>
+			<view class="city typeList" @click="load">
+				<uni-icon type="refreshempty" size="25" color="8e8e8e"></uni-icon>
+				<text>加载全部</text>
+			</view>
+
+		</view>
+
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="shop-box" style="margin-top: 80upx;">
+		<!-- #endif -->
+		<!-- #ifndef MP-WEIXIN -->
+		<view class="shop-box">
+		<!-- #endif -->
+			<view v-if="!storeList" style="text-align: center; color:#5C5C5C; font-size: 30upx;">暂无商家记录</view>
+			<view class="shop" v-for="(item, index) in storeList" @click="gobrand" :data-Businessid="item.id" :key="index">
+				<image :src="item.logo" mode="" class="image" width="100%" height="100%"></image>
+				<view class="shopText">
+					<text class="name">{{ item.name }}</text>
+					<view class="evaluate">
+						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+						 <text class="garde" style="margin-right:10upx; color:#666666; ">收藏 {{ item.collect }}</text>
+					</view>
+					<view class="bottomInformation">
+						<text v-if="item.addressDetail" class="crux" style="margin-top: 30upx; color:#666666; overflow: hidden; display: inline-block; height: 40upx; text-overflow:ellipsis;">
+							{{ item.addressDetail }}
+						</text>
+						<text v-else class="crux" style="margin-top: 30upx; color:#666666; overflow: hidden; display: inline-block; height: 40upx; text-overflow:ellipsis;">
+                        							{{ item.addressProvince }}-{{ item.addressCity }}
+                        						</text>
+						<text class="distance" style=" color:#666666;">{{ item.distance.toFixed(4) }}</text>
+					</view>
+				</view>
+			</view>
+			<!--<uni-load-more :loadingType="loadingType"  :contentText="contentrefresh"></uni-load-more>-->
+		</view>
+		<view class="mask" v-show="display" @click="Colse"></view>
+		<view class="sortBox" v-show="display">
+			<view class="sortBox-title">
+				<view>请选择商家类别</view>
+				<view @click="Colse"><uni-icon type="closeempty" size="30"></uni-icon></view>
+			</view>
+			<view class="sortBoxBox" v-for="(items, index1) in Parent" :key="index1">
+				<view class="sortRight">
+					<text v-for="(item, index2) in items.son" :key="index2" @click="sublevel(item.type_id)">{{ item.name }}</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import uniIcon from '@/components/uni-icon/uni-icon.vue';
+import eonfox from '@/components/eonfox/eonfox.js';
+import fns from '@/components/eonfox/fns.js';
+import QQMapWX from '@/components/eonfox/qqmap-wx-jssdk.js';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import navBar from "@/components/zhouWei-navBar";
+var qqmapsdk = new QQMapWX({
+	key: '5XABZ-AQ764-SMHUQ-DABAC-R7E4H-37FM2'
+});
+// #ifdef H5
+let jweixin = require('jweixin-module');
+// #endif
+var ef = new eonfox();
+export default {
+components: {
+		mallplusCopyright,uniIcon
+	},
+
+	data() {
+		return {
+			sjnumber: [],
+			storeList: [],
+			name: '',
+			address: '',
+			page: 10,
+			
+			merchant: [],
+			distance:20,
+			loadingType: 0,
+			contentText: {
+				contentdown: '上拉显示更多',
+				contentrefresh: '正在加载...',
+				contentnomore: '没有更多数据了'
+			},
+			disType:[
+            						{
+            					id: 5,
+            					name: "5km",
+            				     },
+            					{
+            						id: 10,
+            						name: "10km",
+            					},
+            					{
+            						id: 20,
+            						name: "20km",
+            					},
+            					{
+            						id: 40,
+            						name: "40km",
+            					},
+            				],
+			Parent: [],
+			display: false,
+			addressData: {
+			longitude:0.0,
+			latitude:0.0,
+			}, //默认收货地址
+			addressId: '', //地址id
+
+			statusBarHeight: ''
+		};
+	},
+	components: {
+		uniIcon,
+		uniLoadMore,
+		navBar
+	},
+	onShow: function() {
+
+		(this.latitude = ''), (this.longitude = '');
+		this.load();
+	},
+	async onLoad(options) {
+	    this.load();
+	},
+	onReachBottom() {
+
+	},
+	methods: {
+		openSearch(){
+			console.log('搜索')
+		},
+		Colse() {
+			this.display = !this.display;
+		},
+		toAddressList() {
+			var type = '1'; //不知道这个type有什么值，取大一点
+			uni.navigateTo({
+				url: '../../pagesU/address/address?source=' + type
+			});
+		},
+		gobrand: function(e) {
+			console.log(e);
+			// return
+			var sjid = e.currentTarget.dataset.businessid;
+			console.log('目标', sjid);
+			uni.navigateTo({
+				url: '../../pagesC/store/businessDetails?id=' + sjid
+				+'&lon='+this.addressData.longitude
+                +'&lat='+this.addressData.latitude
+				// 参数的传递 newsid
+			});
+		},
+		gosort() {
+			this.display = !this.display;
+		},
+		openMap() {
+        			var _this = this;
+        			uni.chooseLocation({
+
+        				success: function(res) {
+        			console.log('res', res);
+                    _this.addressData.longitude=res.longitude;
+                    _this.addressData.latitude=res.latitude;
+                    _this.addressId = 1 ;
+        					_this.addressData.province = res.address ;
+        					_this.addressData.name =  res.name;
+        					console.log('经度：' + res.longitude);
+        					console.log('详细地址：' + res.address);
+        					console.log('纬度：' + res.latitude);
+        					_this.storeList = {};
+        				}
+        			});
+
+        		},
+		async load() {
+			var that = this;
+			let params = {};
+			if(!that.addressId){
+			    that.addressData = await Api.apiCall('get', Api.goods.getItemDefautl, params);
+
+			}
+
+            console.log(that.addressData);
+             if(that.addressData.longitude){
+                     params = { geohash: that.addressData.latitude+','+ that.addressData.longitude, pageSize: that.page,distance:this.distance };
+                            				console.log(params);
+                            				let list = await Api.apiCall('get', Api.index.nearStoreList, params);
+                    	                	that.storeList = list;
+                    }
+                      console.log('that.addressId：' + that.addressId);
+		},
+		gain(id){
+        				this.distance=id ;
+        				this.load();
+
+        			},
+		//点击查询商家分类
+		sublevel(id) {
+			var that = this;
+			that.display = !that.display;
+			ef.submit({
+				request: {
+					s: ['MERCHANTLIST', [{ lon: that.longitude, lat: that.latitude, search: { type_id: id } }]] //子级
+				},
+				callback: function(data) {
+					var res = fns.checkError(data, 's', function(errno, error) {
+						fns.err(error);
+					});
+
+					that.sjnumber = data.data.s.data.data;
+
+					console.log('分类', data);
+				},
+				error: function(err) {
+					fns.err('加载失败', err, 1);
+				}
+			});
+		},
+
+
+
+		//二维码
+		scanCode() {
+			var _this = this;
+			uni.showToast({
+				// #ifdef APP-PLUS
+				title: '这是APP',
+				icon: 'none',
+				// #endif
+				// #ifdef H5
+				title: '这是H5',
+				icon: 'none',
+				// #endif
+				// #ifdef MP-WEIXIN
+				title: '这是小程序',
+				icon: 'none',
+				// #endif
+				success() {
+					setTimeout(function() {}, 1500);
+				}
+			});
+			uni.scanCode({
+				onlyFromCamera: true,
+				success: function(res) {
+					if (res.result) {
+						var data = JSON.parse(res.result);
+						console.log('res:', data);
+						if (!data.errno) {
+							if (data.type != 'merchant_money_plus') {
+								uni.showToast({
+									title: '该二维码非收款二维码'
+								});
+							} else if (data.data.merchant_id) {
+								_this.merchant_id = data.data.merchant_id;
+
+								if (data.data && data.data.user_id) {
+									var user_id = data.data.user_id;
+								} else {
+									var user_id = '';
+								}
+								uni.navigateTo({
+									url: '../../pagesB/payUser/payUser?mch_id=' + data.data.merchant_id + '&user_id=' + data.data.user_id
+								});
+							} else {
+								uni.showToast({
+									title: '扫码失败',
+									icon: 'none'
+								});
+							}
+						} else {
+							uni.showToast({
+								title: data.error,
+								icon: 'none'
+							});
+						}
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="stylus" ref="stylesheet/stylus">
+.content
+	width 100%
+	overflow hidden
+	.title-box
+		display flex
+		justify-content center // 水平居中
+		align-items center // 垂直居中
+		flex-direction row // 左到右
+		width 750upx
+		padding 0 20upx
+		height 100upx
+		.scan
+			width 40upx
+			height 40upx
+		.input-box
+			// margin-left 20upx
+			width 700upx
+			height 58upx
+			// border 1upx solid #d3d3d3
+			border-radius 50upx
+			.search
+				display inline-block
+				position absolute
+				top 0
+				left 0
+			.input
+				width 80%
+				display inline-block
+				font-size 28upx
+				text-align center
+				// text-align left
+				line-height 100%
+				height 100%
+		.chat
+			flex 1
+	.topTitle
+		width 100%
+		height 80upx
+		display flex
+		align-items center // 垂直居中
+		flex-direction row
+		padding 0 20upx
+		color #333
+		font-size 30upx
+		.topText{
+			margin-left 10upx
+		}
+		.leftBox
+			width 300upx
+			text-align right
+	.checkGroup{
+		padding-left 26upx
+		margin-bottom 10upx
+		font-size 30upx
+		.uni-label-pointer {
+			margin-right 16upx
+		}
+	}
+	.classification
+		height 80upx
+		display flex
+		align-items center
+		justify-content center // 垂直居中
+		flex-direction row
+		font-size 28upx
+		.typeList
+			text-align center
+			line-height 80upx
+			border 1px solid #d3d3d3
+			width 50%
+			height 100%
+			position relative
+		.typeList:before
+			content ""
+			position absolute
+			top 34upx
+			right 66upx
+			width: 0px;
+			height: 0px;
+			border-left: 12upx solid transparent;
+			border-right: 12upx solid transparent;
+			border-top: 12upx solid #bfbfbf;
+		.allClassification{
+			border-left 0
+		}
+		.city{
+			border-right 0
+		}
+	.place
+		font-size 30upx
+		height 100upx
+		text-align left
+		line-height 100upx
+		border-bottom 1px solid #d3d3d3
+		padding-left 20px
+	.shop-box, width 100%
+		height auto
+	.shop
+		height 200upx
+		border-bottom 1px solid #eee
+		display flex
+		align-items center
+		justify-content flex-start
+		flex-direction row
+		.image
+			width 160upx
+			height 160upx
+			margin-left 25upx
+			border-radius 50%
+		.shopText
+			width 500upx
+			height 220upx
+			margin-left 25upx
+			padding-top 25upx
+			.name
+				color #333
+				font-weight 600
+				font-size 30upx
+				width 100%
+				height 30px
+			.evaluate
+				font-size 20upx
+				margin-top 20upx
+			.bottomInformation
+				align-items center
+				justify-content space-between
+				flex-direction row
+				width 100%
+				color #333
+				font-size 28upx
+				.crux
+					width 240upx
+					display inline-block
+				.distance
+					width calc(100% - 250upx)
+					float right
+					text-align right
+					margin-top 30upx
+			.icoimg
+				width 48upx
+				height 48upx
+</style>
+<style>
+.search-weixin-input {
+	font-size: 28upx;
+	background: #f5f5f5;
+	height: 60upx;
+	width: 90%;
+	border-radius: 50upx;
+	text-align: center;
+}
+.search-weixin {
+	background: #ffffff;
+	height: 80upx;
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border-bottom: 1upx solid #eeeeee;
+	position: fixed;
+}
+.sortBox {
+	position: fixed;
+	width: 650upx;
+	height: auto;
+	padding-top: 20upx;
+	padding-bottom: 40upx;
+	top: 25vh;
+	background-color: #ffffff;
+	margin-left: 50upx;
+	font-size: 28upx;
+	border: #e3e3e3 solid 3upx;
+	border-radius: 25upx;
+	z-index: 1000;
+}
+.sortBox-title {
+	width: 610upx;
+	padding: 20upx 20upx;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.mask {
+	position: fixed;
+	top: 0;
+	left: 0;
+	z-index: 4;
+	width: 100%;
+	height: 100vh;
+	background: rgba(0, 0, 0, 0.4);
+}
+.sortBoxBox {
+	width: 610upx;
+	padding: 20upx 20upx;
+	display: flex;
+	flex-wrap: wrap;
+}
+.sortRight {
+	width: auto;
+	padding-bottom: 20upx;
+	height: auto;
+}
+.sortRight text {
+	padding: 10upx;
+	border: #cccccc solid 1upx;
+	border-radius: 10upx;
+	color: #dd524d;
+	margin-left: 20upx;
+	float: left;
+	margin-bottom: 10upx;
+}
+.getPosition {
+	height: 100upx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 32upx;
+	background-color: #fff;
+}
+.getPosition-weixin {
+	height: 90upx;
+	position: fixed;
+	z-index: 99;
+	width: 100%;
+}
+.getPosition-top {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	z-index: 99;
+	background: #ffffff;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/index/secskill.vue b/mallplusui-uniapp-app2/pages/index/secskill.vue
new file mode 100644
index 0000000..33cdfdf
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/index/secskill.vue
@@ -0,0 +1,581 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<view class="mp-search-box" @click="search()"><input class="ser-input" type="text" value="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+		<view class="carousel-section">
+			<!-- 标题栏和状态栏占位符 -->
+			<view class="titleNview-placing"></view>
+			<!-- 背景色区域 -->
+			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+			<swiper class="carousel" circular @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPage({ title: '轮播广告' })">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper>
+			<!-- 自定义swiper指示器 -->
+			<view class="swiper-dots">
+				<text class="num">{{ swiperCurrent + 1 }}</text>
+				<text class="sign">/</text>
+				<text class="num">{{ swiperLength }}</text>
+			</view>
+		</view>
+
+		<view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view>
+
+		<!-- 秒杀楼层 -->
+		<view class="seckill-section m-t" v-if="item1.flashSessionInfoList.length > 0" v-for="(item1, index1) in groupHotGoodsList" :key="index1">
+			<view class="s-header">
+				<image class="s-img" src="/static/temp/secskill-img.jpg" mode="widthFix"></image>
+				<text class="tip">{{ item1.flashName }}</text>
+			</view>
+			<view v-if="item2.productList.length > 0" v-for="(item2, index2) in item1.flashSessionInfoList"  :key="index1">
+				<view class="s-header">
+					<text class="tip">{{ item2.startTime }}</text>
+					<text class="tip">～</text>
+					<text class="tip">{{ item2.endTime }}</text>
+				</view>
+				<scroll-view class="floor-list" scroll-x>
+					<view class="scoll-wrapper">
+						<view v-for="(item4, index3) in item2.productList" :key="index3" class="floor-item" @click="navToDetailPage(item4)" >
+							<image :src="item4.productImg" mode="aspectFill" ></image>
+							<text class="title clamp">{{ item4.productName }}</text>
+							<text class="price clamp">秒杀价 ￥{{ item4.flashPromotionPrice }}</text>
+							<text class="price clamp">原价 ￥{{ item4.productPrice }}</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import { formatDate } from '@/common/date';
+
+export default {
+	components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			keyword: '',
+			titleNViewBackground: '',
+			swiperCurrent: 0,
+			swiperLength: 0,
+			carouselList: [],
+			hotProductList: [],
+			brandList: [], // 推荐品牌
+			homeFlashPromotion: [], // 当前秒杀场次
+			subjectList: [], //推荐专题
+			cat_list: [],
+			homeFlashPromotion: [],
+			groupHotGoodsList: [],
+			newProductList: []
+		};
+	},
+
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		/**
+		 * 请求静态数据只是为了代码不那么乱
+		 * 分次请求未作整合
+		 */
+		async loadData() {
+			this.logining = true;
+			let params = {};
+			let groupHotGoodsList = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+			this.groupHotGoodsList = groupHotGoodsList;
+
+			let advertiseList = await Api.apiCall('get', Api.index.bannerList, params);
+			console.log(advertiseList);
+			this.carouselList = advertiseList || [];
+			this.swiperLength = this.carouselList.length;
+			this.logining = false;
+		},
+		//轮播图切换修改背景色
+		swiperChange(e) {
+			const index = e.detail.current;
+			this.swiperCurrent = index;
+			this.titleNViewBackground = this.carouselList[index].background;
+		},
+		navToTabPage(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		//详情页
+		navToDetailPage(id) {
+			console.log(id);
+
+			uni.navigateTo({
+				url: `../../pagesA/product/secskillDetail?id=${id}`
+			});
+		},
+		navToList() {
+			uni.navigateTo({
+				url: `../../pagesA/product/list`
+			});
+		}
+	},
+
+	search() {
+		uni.navigateTo({
+			url: '/pages/search/search'
+		});
+	},
+
+	// 标题栏input搜索框点击
+	onNavigationBarSearchInputClicked: async function(e) {
+		uni.navigateTo({
+			url: '/pages/search/search'
+		});
+	},
+	//点击导航栏 buttons 时触发
+	onNavigationBarButtonTap(e) {
+		const index = e.index;
+		if (index === 0) {
+			//	this.$api.msg('点击了扫描');
+		} else if (index === 1) {
+			// #ifdef APP-PLUS
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1];
+			const currentWebview = page.$getAppWebview();
+			currentWebview.hideTitleNViewButtonRedDot({
+				index
+			});
+			// #endif
+			uni.navigateTo({
+				url: '../../pagesU/notice/notice'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 56upx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 16upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 4upx 30upx 24upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 92upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 250upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 250upx;
+			height: 250upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 6upx 30upx 8upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 30upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 30upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/index/user.vue b/mallplusui-uniapp-app2/pages/index/user.vue
new file mode 100644
index 0000000..b1709b6
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/index/user.vue
@@ -0,0 +1,770 @@
+<template>
+	<view class="container">
+		<view class="user-section">
+			<image class="bg" src="/static/user-bg.jpg"></image>
+			<view class="user-info-box">
+				<view class="member-top-c">
+					<template v-if="userDetailInfo && userDetailInfo.id">
+						<view class="" style="display: flex;align-items: center;">
+							<image class="portrait" mode="aspectFill" :src="userDetailInfo.icon" @click="toUserInfo"></image>
+							<view class="user-name" style="margin-left: 10upx;color: #FFFFFF;" @click="toUserInfo">{{ userDetailInfo.nickname || userDetailInfo.username }}</view>
+							<view v-if="userDetailInfo.storeId" class="vip-card-box1" @click="toNav('../../pagesC/seller/index')"><view class="b-btn">卖家中心</view></view>
+						</view>
+					</template>
+					<template v-else>
+						<!-- #ifdef H5 || APP-PLUS -->
+						<image class="portrait" mode="aspectFill" src="/static/missing-face.png" @click="toLogin"></image>
+						<!-- #endif -->
+						<!-- #ifdef MP-WEIXIN -->
+						<image class="portrait" mode="aspectFill" src="/static/missing-face.png" @click="toWeChatLogin"></image>
+						<!-- #endif -->
+						<!-- #ifdef MP-ALIPAY -->
+						<view class="portrait"></view>
+						<view><button class="login-btn" open-type="getAuthorize" @click="getALICode" hover-class="btn-hover">授权登录</button></view>
+						<!-- #endif -->
+					</template>
+				</view>
+			</view>
+			<view class="vip-card-box" @click="toNav('../../pagesU/user/applyMember')">
+				<image class="card-bg" src="/static/vip-card-bg.png" mode=""></image>
+				<view class="b-btn">立即升级</view>
+				<view class="tit" v-if="userDetailInfo">
+					<text class="yticon icon-iLinkapp-"></text>
+					{{ userDetailInfo.memberLevelName || '开通会员' }}
+				</view>
+				<text class="e-m">汇融云链</text>
+				<text class="e-b">升级会员享受更多折扣 一测就上线</text>
+			</view>
+		</view>
+
+		<view
+			class="cover-container"
+			:style="[
+				{
+					transform: coverTransform,
+					transition: coverTransition
+				}
+			]"
+			@touchstart="coverTouchstart"
+			@touchmove="coverTouchmove"
+			@touchend="coverTouchend"
+		>
+			<image class="arc" src="/static/arc.png"></image>
+
+			<view class="tj-sction">
+				<view class="tj-item" @click="toNav('../../pagesU/user/deposit')">
+					<text class="num">{{ userDetailInfo.blance || 0 }}</text>
+					<text>余额</text>
+				</view>
+				<view class="tj-item" @click="toNav('../../pagesU/user/coupon')">
+					<text class="num">{{ couponList.length || 0 }}</text>
+					<text>优惠券</text>
+				</view>
+				<view class="tj-item" @click="toNav('/pages/integral/home/home')">
+					<text class="num">{{ userDetailInfo.integration || 0 }}</text>
+					<text>积分</text>
+				</view>
+			</view>
+			<!-- 订单 -->
+			<view class="order-section">
+				<view class="order-item" @click="navTo('/pages/order/order?status=0')" hover-class="common-hover" :hover-stay-time="50">
+					<text class="yticon icon-shouye"></text>
+					<text>全部订单</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?status=2')" hover-class="common-hover" :hover-stay-time="50">
+					<text class="yticon icon-daifukuan"></text>
+					<text>待付款</text>
+				</view>
+				<view class="order-item" @click="navTo('/pages/order/order?status=3')" hover-class="common-hover" :hover-stay-time="50">
+					<text class="yticon icon-yishouhuo"></text>
+					<text>待收货</text>
+				</view>
+
+				<view class="order-item" @click="navTo('../../pagesA/after_sale/list')" hover-class="common-hover" :hover-stay-time="50">
+					<text class="yticon icon-shouhoutuikuan"></text>
+					<text>退款/售后</text>
+				</view>
+			</view>
+			<!-- 浏览历史 -->
+			<view class="history-section icon">
+				<view class="sec-header" v-if="viewList && viewList.length > 0">
+					<text class="yticon icon-lishijilu"></text>
+					<text>浏览历史</text>
+				</view>
+				<scroll-view scroll-x class="h-list" v-if="viewList && viewList.length > 0">
+					<image v-for="(item, index) in viewList" :key="index" @click="navToDetailPage(item)" :src="item.pic" mode="aspectFill"></image>
+				</scroll-view>
+				<!--<list-cell icon="icon-iconfontweixin" iconColor="#e07472" title="我的钱包" tips="您的会员还有3天过期"></list-cell>-->
+				<list-cell icon="icon-dizhi" iconColor="#5fcda2" title="地址管理" @eventClick="navTo('../../pagesU/address/address')"></list-cell>
+				<list-cell icon="icon-tuandui" iconColor="#EE82EE" title="个人资料" @eventClick="navTo('../../pagesU/user/profile')"></list-cell>
+				<!--<list-cell icon="icon-share" iconColor="#9789f7" title="分享" tips="邀请好友赢10万大礼"></list-cell>
+				<list-cell icon="icon-pinglun-copy" iconColor="#ee883b" title="晒单" tips="晒单抢红包"></list-cell>-->
+				<list-cell icon="icon-shoucang_xuanzhongzhuangtai" iconColor="#54b4ef" title="我的收藏" @eventClick="navTo('../../pagesU/user/collect')"></list-cell>
+				<list-cell
+					icon="icon-share cgtt"
+					iconColor="#0e68d7"
+					v-if="!userDetailInfo.storeId"
+					title="商户入驻"
+					@eventClick="navTo('../../pagesC/store/applyBusiness')"
+				></list-cell>
+				<list-cell
+					icon="icon-share cgtt"
+					iconColor="#0e68d7"
+					v-if="userDetailInfo.storeId"
+					title="商户主页"
+					@eventClick="navTo(`../../pagesC/store/businessDetails?id=${userDetailInfo.storeId}`)"
+				></list-cell>
+
+				<list-cell
+					icon="icon-shoucang_xuanzhongzhuangtai cgtt"
+					iconColor="#0e68d7"
+					v-if="!userDetailInfo.roomNums"
+					title="绑定社区"
+					@eventClick="navTo('../../pagesA/build/bindCommunity')"
+				></list-cell>
+				<list-cell
+					icon="icon-shoucang_xuanzhongzhuangtai cgtt"
+					iconColor="#0e68d7"
+					v-if="userDetailInfo.roomNums"
+					title="社区主页"
+					@eventClick="navTo('../../pagesA/build/community')"
+				></list-cell>
+				<!-- <list-cell
+					icon="icon-pinglun-copy"
+					iconColor="#0e68d7"
+					title="我的邀请码"
+					:tips="userDetailInfo.id + ''"
+					@eventClick="navTo('../../pagesU/user/invite')"
+				></list-cell> -->
+				<!-- <list-cell icon="icon-pinglun-copy" iconColor="#0e68d7" v-if="!userDetailInfo.invitecode" title="推荐邀请码" @eventClick="inputShowModal('invitecode')"></list-cell> -->
+				<list-cell icon="icon-shezhi1" iconColor="#e07472" title="系统设置" border="" @eventClick="navTo('/pages/set/set')"></list-cell>
+				<!-- <list-cell icon="icon-shezhi1" iconColor="#e07472" title="test" border="" @eventClick="navTo('/pages/search/test')"></list-cell> -->
+			</view>
+		</view>
+		<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
+			<input v-model="inputContent" style="margin:20upx" placeholder="请输入..." />
+		</neil-modal>
+	</view>
+</template>
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import listCell from '@/components/mix-list-cell';
+import neilModal from '@/components/neil-modal.vue';
+import { mapState, mapMutations } from 'vuex';
+let startY = 0,
+	moveY = 0,
+	pageAtTop = true;
+export default {
+	components: {
+		mallplusCopyright,
+		listCell,
+		neilModal
+	},
+	data() {
+		return {
+			inputShow: false,
+			feild: undefined,
+			inputContent: '',
+			coverTransform: 'translateY(0px)',
+			coverTransition: '0s',
+			moving: false,
+			userDetailInfo: {
+				blance: 0,
+				integration: 0
+			},
+
+			couponList: [],
+			viewList: []
+		};
+	},
+
+	async onLoad() {
+		this.getData();
+	},
+	async onShow() {
+		this.getData();
+	},
+
+	// #ifndef MP
+	onNavigationBarButtonTap(e) {
+		const index = e.index;
+		if (index === 0) {
+			this.navTo('/pages/set/set');
+		} else if (index === 1) {
+			// #ifdef APP-PLUS
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1];
+			const currentWebview = page.$getAppWebview();
+			currentWebview.hideTitleNViewButtonRedDot({
+				index
+			});
+			// #endif
+			uni.navigateTo({
+				url: '../../pagesU/notice/notice'
+			});
+		}
+	},
+	// #endif
+
+	computed: {
+		...mapState(['hasLogin', 'userInfo']),
+		// 获取店铺联系人手机号
+		kfmobile() {
+			return '13146587722' || 0;
+		}
+	},
+	methods: {
+		...mapMutations(['logout']),
+
+		inputShowModal(feild) {
+			this.feild = feild;
+			this.inputShow = true;
+			this.inputContent = '';
+		},
+		cancel() {
+			this.inputShow = false;
+		},
+
+		confirm() {
+			const that = this;
+			if (!that.inputContent) {
+				that.$api.msg('输入不能为空');
+				return;
+			}
+			let obj = { id: this.userDetailInfo.id };
+			obj[that.feild] = that.inputContent;
+			Api.apiCall('post', Api.member.updateMember, obj);
+			that.$api.msg('修改成功');
+			that.userInfos[that.feild] = that.inputContent;
+		},
+		async getData() {
+			this.getuserinfo();
+			this.getHistory();
+		},
+		// 获取用户信息
+		async getuserinfo() {
+			let params = {};
+			let data1 = await Api.apiCall('get', Api.index.userInfo, params);
+			if (!data1) {
+				this.userDetailInfo = {};
+			}
+			this.userDetailInfo = data1.member;
+			if (!data1.member) {
+				this.logout();
+			} else {
+				uni.setStorageSync('userInfos', data1.member);
+				console.log(this.userDetailInfo);
+				let couponList = data1.histories;
+				this.couponList = couponList;
+			}
+		},
+		// 获取浏览历史
+		async getHistory() {
+			if (this.hasLogin) {
+				let params = {};
+				let data = await Api.apiCall('get', Api.goods.viewList, params);
+				this.viewList = data.result;
+			}
+		},
+
+		toNav(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		toUserInfo() {
+			uni.navigateTo({
+				url: '../../pagesU/user/profile'
+			});
+		},
+
+		toWeChatLogin() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			});
+		},
+
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		/**
+		 * 统一跳转接口,拦截未登录路由
+		 * navigator标签现在默认没有转场动画，所以用view
+		 */
+		navTo(url) {
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+			}
+			uni.navigateTo({
+				url: url
+			});
+		},
+
+		/**
+		 *  会员卡下拉和回弹
+		 *  1.关闭bounce避免ios端下拉冲突
+		 *  2.由于touchmove事件的缺陷（以前做小程序就遇到，比如20跳到40，h5反而好很多），下拉的时候会有掉帧的感觉
+		 *    transition设置0.1秒延迟，让css来过渡这段空窗期
+		 *  3.回弹效果可修改曲线值来调整效果，推荐一个好用的bezier生成工具 http://cubic-bezier.com/
+		 */
+		coverTouchstart(e) {
+			if (pageAtTop === false) {
+				return;
+			}
+			this.coverTransition = 'transform .1s linear';
+			startY = e.touches[0].clientY;
+		},
+		coverTouchmove(e) {
+			moveY = e.touches[0].clientY;
+			let moveDistance = moveY - startY;
+			if (moveDistance < 0) {
+				this.moving = false;
+				return;
+			}
+			this.moving = true;
+			if (moveDistance >= 80 && moveDistance < 100) {
+				moveDistance = 80;
+			}
+
+			if (moveDistance > 0 && moveDistance <= 80) {
+				this.coverTransform = `translateY(${moveDistance}px)`;
+			}
+		},
+		coverTouchend() {
+			if (this.moving === false) {
+				return;
+			}
+			this.moving = false;
+			this.coverTransition = 'transform 0.3s cubic-bezier(.21,1.93,.53,.64)';
+			this.coverTransform = 'translateY(0px)';
+		},
+		getUserInfo(e) {
+			let _this = this;
+			//return false;
+			console.log('eeeee', e);
+			if (e.detail.errMsg == 'getUserInfo:fail auth deny') {
+				_this.$common.errorToShow('未授权');
+			} else {
+				var data = {
+					open_id: _this.open_id,
+					iv: e.detail.iv,
+					edata: e.detail.encryptedData,
+					signature: e.detail.signature
+				};
+				//有推荐码的话，带上
+				var invitecode = _this.$db.get('invitecode');
+				if (invitecode) {
+					data.invitecode = invitecode;
+				}
+				_this.toWxLogin(data);
+			}
+		},
+		getALICode() {
+			let that = this;
+			uni.login({
+				scopes: 'auth_user',
+				success: res => {
+					if (res.authCode) {
+						uni.getUserInfo({
+							provider: 'alipay',
+							success: function(infoRes) {
+								if (infoRes.errMsg == 'getUserInfo:ok') {
+									let user_info = {
+										nickname: infoRes.nickName,
+										avatar: infoRes.avatar
+									};
+									that.aLiLoginStep1(res.authCode, user_info);
+								}
+							},
+							fail: function(errorRes) {
+								this.$common.errorToShow('未取得用户昵称头像信息');
+							}
+						});
+					} else {
+						this.$common.errorToShow('未取得code');
+					}
+				},
+				fail: function(res) {
+					this.$common.errorToShow('用户授权失败my.login');
+				}
+			});
+		},
+		getWxCode(e) {
+			console.log('-------', e);
+			let that = this;
+			uni.login({
+				provider: 'weixin',
+				success: function(res) {
+					if (res.code) {
+						console.log(res.code);
+						that.wxLoginStep1(res.code);
+					} else {
+						this.$common.errorToShow('未取得code');
+					}
+				},
+				fail: function(res) {
+					this.$common.errorToShow('用户授权失败wx.login');
+				}
+			});
+		},
+		wxLoginStep1(code) {
+			var data = {
+				code: code
+			};
+			this.$api.login1(data, res => {
+				if (res.status) {
+					this.open_id = res.data;
+
+					this.getUserInfo();
+				} else {
+					this.$common.errorToShow(res.msg, function() {
+						uni.navigateBack({
+							delta: 1
+						});
+					});
+				}
+			});
+		},
+		aLiLoginStep1(code, user_info) {
+			let data = {
+				code: code,
+				user_info: user_info
+			};
+			this.$api.alilogin1(data, res => {
+				this.alipayNoLogin = false;
+				if (res.status) {
+					this.open_id = res.data.user_wx_id;
+					//判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面
+					if (!res.data.hasOwnProperty('token')) {
+						this.$common.redirectTo('/pages/public/index?user_wx_id=' + res.data.user_wx_id);
+					} else {
+						this.$db.set('userToken', res.data.token);
+						this.initData();
+					}
+				} else {
+					this.$common.errorToShow(res.msg);
+				}
+			});
+		},
+		toWxLogin(data) {
+			console.log('----------data---------', data);
+			let _this = this;
+			_this.$api.login2(data, function(res) {
+				if (res.status) {
+					//判断是否返回了token，如果没有，就说明没有绑定账号，跳转到绑定页面
+					if (typeof res.data.token == 'undefined') {
+						uni.redirectTo({
+							url: '/pages/public/index?user_wx_id=' + res.data.user_wx_id
+						});
+					} else {
+						_this.$db.set('userToken', res.data.token);
+						_this.initData();
+					}
+				} else {
+					_this.$common.errorToShow('登录失败，请重试');
+				}
+			});
+		},
+		toLogin() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			});
+		}, //在线客服,只有手机号的，请自己替换为手机号
+		showChat() {
+			// #ifdef H5
+			let _this = this;
+			window._AIHECONG('ini', {
+				entId: this.config.ent_id,
+				button: false,
+				appearance: {
+					panelMobile: {
+						tone: '#FF7159',
+						sideMargin: 30,
+						ratio: 'part',
+						headHeight: 50
+					}
+				}
+			});
+			//传递客户信息
+			window._AIHECONG('customer', {
+				head: _this.userInfo.avatar,
+				名称: _this.userInfo.nickname,
+				手机: _this.userInfo.mobile
+			});
+			window._AIHECONG('showChat');
+			// #endif
+
+			// 拨打电话
+			// #ifdef APP-PLUS
+			if (this.kfmobile) {
+				uni.makePhoneCall({
+					phoneNumber: '' + this.kfmobile,
+					success: () => {
+						// console.log("成功拨打电话")
+					}
+				});
+			} else {
+				this.$common.errorToShow('商户未设置客服手机号');
+			}
+			// #endif
+		}
+	}
+};
+</script>
+<style lang="scss">
+@font-face {
+	font-family: cgtt;
+	font-weight: normal;
+	font-style: normal;
+	src: url('//at.alicdn.com/t/font_1475801_5innv59qqcr.ttf') format('truetype');
+}
+page {
+	background: #f3f3f3;
+}
+.cgtt {
+	font-family: 'cgtt' !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-userShare:before {
+	content: '\c600';
+}
+
+.icon-userJoin:before {
+	content: '\c601';
+}
+
+%flex-center {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+%section {
+	display: flex;
+	justify-content: space-around;
+	align-content: center;
+	background: #fff;
+	border-radius: 10upx;
+}
+
+.user-section {
+	height: 520upx;
+	padding: 100upx 30upx 0;
+	position: relative;
+	.bg {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		filter: blur(1px);
+		// opacity: 0.7;
+	}
+}
+.user-info-box {
+	height: 180upx;
+	display: flex;
+	align-items: center;
+	position: relative;
+	z-index: 1;
+	.portrait {
+		width: 130upx;
+		height: 130upx;
+		border: 5upx solid #fff;
+		border-radius: 50%;
+	}
+	.username {
+		font-size: $font-lg + 6upx;
+		color: $font-color-dark;
+		margin-left: 20upx;
+	}
+}
+.login-btn {
+	color: #fff;
+	width: 180upx;
+	height: 50upx;
+	line-height: 50upx;
+	border-radius: 25upx;
+	background: #ff7159;
+	font-size: 12px;
+}
+.vip-card-box {
+	display: flex;
+	flex-direction: column;
+	color: #f7d680;
+	height: 240upx;
+	background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
+	border-radius: 16upx 16upx 0 0;
+	overflow: hidden;
+	position: relative;
+	padding: 20upx 24upx;
+	.card-bg {
+		position: absolute;
+		top: 20upx;
+		right: 0;
+		width: 380upx;
+		height: 260upx;
+	}
+	.b-btn {
+		position: absolute;
+		right: 20upx;
+		top: 16upx;
+		width: 132upx;
+		height: 40upx;
+		text-align: center;
+		line-height: 40upx;
+		font-size: 22upx;
+		color: #36343c;
+		border-radius: 20px;
+		background: linear-gradient(left, #f9e6af, #ffd465);
+		z-index: 1;
+	}
+	.tit {
+		font-size: $font-base + 2upx;
+		color: #f7d680;
+		margin-bottom: 28upx;
+		.yticon {
+			color: #f6e5a3;
+			margin-right: 16upx;
+		}
+	}
+	.e-b {
+		font-size: $font-sm;
+		color: #d8cba9;
+		margin-top: 10upx;
+	}
+}
+.vip-card-box1 {
+	display: flex;
+	flex-direction: column;
+	color: #f7d680;
+	height: 60upx;
+	width: 160upx;
+	background: linear-gradient(left, rgba(0, 0, 0, 0.7), rgba(0, 0, 0, 0.8));
+	border-radius: 16upx 16upx 0 0;
+	overflow: hidden;
+	position: relative;
+	padding: 20upx 24upx;
+
+	.b-btn {
+		position: absolute;
+		right: 10upx;
+		top: 10upx;
+		width: 132upx;
+		height: 40upx;
+		text-align: center;
+		line-height: 40upx;
+		font-size: 22upx;
+		color: #36343c;
+		border-radius: 20px;
+		background: linear-gradient(left, #f9e6af, #ffd465);
+		z-index: 1;
+	}
+	.tit {
+		font-size: $font-base + 2upx;
+		color: #f7d680;
+		margin-bottom: 28upx;
+		.yticon {
+			color: #f6e5a3;
+			margin-right: 16upx;
+		}
+	}
+	.e-b {
+		font-size: $font-sm;
+		color: #d8cba9;
+		margin-top: 10upx;
+	}
+}
+.cover-container {
+	background: $page-color-base;
+	margin-top: -150upx;
+	padding: 0 20upx;
+	position: relative;
+	background: #f5f5f5;
+	padding-bottom: 20upx;
+	.arc {
+		position: absolute;
+		left: 0;
+		top: -34upx;
+		width: 100%;
+		height: 36upx;
+	}
+}
+.tj-sction {
+	@extend %section;
+	.tj-item {
+		@extend %flex-center;
+		flex-direction: column;
+		height: 140upx;
+		font-size: $font-sm;
+		color: #75787d;
+	}
+	.num {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		margin-bottom: 8upx;
+	}
+}
+.order-section {
+	@extend %section;
+	padding: 28upx 0;
+	margin-top: 20upx;
+	.order-item {
+		@extend %flex-center;
+		width: 120upx;
+		height: 120upx;
+		border-radius: 10upx;
+		font-size: $font-sm;
+		color: $font-color-dark;
+	}
+	.yticon {
+		font-size: 48upx;
+		margin-bottom: 18upx;
+		color: #fa436a;
+	}
+	.icon-shouhoutuikuan {
+		font-size: 44upx;
+	}
+}
+.history-section {
+	padding: 30upx 0 0;
+	margin-top: 20upx;
+	background: #fff;
+	border-radius: 10upx;
+	.sec-header {
+		display: flex;
+		align-items: center;
+		font-size: $font-base;
+		color: $font-color-dark;
+		line-height: 40upx;
+		margin-left: 30upx;
+		.yticon {
+			font-size: 44upx;
+			color: #5eba8f;
+			margin-right: 16upx;
+			line-height: 40upx;
+		}
+	}
+	.h-list {
+		white-space: nowrap;
+		padding: 30upx 30upx 0;
+		image {
+			display: inline-block;
+			width: 160upx;
+			height: 160upx;
+			margin-right: 20upx;
+			border-radius: 10upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/integral/home/home.css b/mallplusui-uniapp-app2/pages/integral/home/home.css
new file mode 100644
index 0000000..7b028b4
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/integral/home/home.css
@@ -0,0 +1,115 @@
+.top {}
+
+.top-integral {
+	font-size: 60upx;
+}
+
+.top-bot {
+	height: 100upx;
+	margin-top: 40upx;
+	background: rgba(255,255,255,0.12);
+}
+
+.top-warn{
+	width: 50upx;
+	height: 50upx;
+	position: relative;
+	left: 400upx;
+	bottom: 100upx;
+}
+
+.level{
+	border: 1px solid #FFCC00;
+	border-radius: 20upx;
+}
+
+.bill {
+	width: 33%;
+	height: 100upx;
+}
+
+.content-title{
+	width: 100%;
+	height: 100upx;
+}
+
+
+.hot-goods-content {
+	width: 100%;
+	/* padding: 0 1.5% 25upx 1.5%; */
+	padding: 0 1.5%;
+	display: flex;
+	flex-direction: row;
+	flex-wrap: wrap;
+	align-items: center;
+	padding-bottom: 20upx;
+	/* justify-content: center; */
+}
+
+.hot-goods-item {
+	margin: 20upx 2% 0 2%;
+	padding: 5upx 0;
+	width: 46%;
+	/* height: 430upx; */
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+	background: #ffffff;
+	border-bottom-right-radius: 8upx;
+	border-bottom-left-radius: 8upx;
+	box-shadow: 0upx 0px 15upx #FFEFDB;
+}
+
+.hot-goods-item2 {
+	margin: 20upx 2% 0 2%;
+	width: 46%;
+	padding: 5upx 0;
+	/* height: 430upx; */
+	height: 500upx;
+	display: flex;
+	flex-direction: column;
+	box-sizing: border-box;
+	background: #ffffff;
+	border-bottom-right-radius: 8upx;
+	border-bottom-left-radius: 8upx;
+	/* box-shadow: 0upx 0px 15upx #FFEFDB; */
+}
+
+.hot-goods-item:nth-child(2n-1) {
+	margin-right: auto;
+
+}
+
+.hot-goods-image {
+	width: 290upx;
+	height: 290upx;
+	margin-top: 3upx;
+}
+
+.hot-goods-image-more {
+	width: 150upx;
+	height: 150upx;
+}
+
+.hot-goods-name {
+	margin-top: 10upx;
+	font-size: 30upx;
+	width: 94%;
+	text-align: left;
+	/* height: 100upx; */
+}
+
+.hot-goods-more {
+	margin-top: 5upx;
+	margin-left: 10upx;
+	font-size: 30upx;
+	width: 94%;
+	text-align: center;
+}
+
+.hot-goods-price {
+	margin: 20upx 10upx 0 0;
+	font-size: 30upx;
+	width: 100%;
+	text-align: left;
+}
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/pages/integral/home/home.vue b/mallplusui-uniapp-app2/pages/integral/home/home.vue
new file mode 100644
index 0000000..3c39b18
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/integral/home/home.vue
@@ -0,0 +1,166 @@
+<template>
+	<view class="content column">
+		<view class="top bg-green column with-100 align-height">
+			<text class="font-bold top-integral text-while">{{integrals || 0}}</text>
+			<view class="text-size-below-normal center-algin" style="margin-left: -40upx;">
+				<image class="top-warn" src="/static/images/icon_sigh.png"></image>
+				<text class="text-while">兑换余额</text>
+			</view>
+			<view class="top-bot row with-100">
+				<view class="bill center-algin">
+					<text class="text-while">积分明细</text>
+				</view>
+				<view class="bill center-algin">
+					<text class="text-while">积分订单</text>
+				</view>
+				<view class="bill center-algin">
+					<text class="text-while">积分等级</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="with-100 margin-top-20 column">
+			<view class="content-title padding-width-20 bg-white center-algin">
+				<text class="">积分兑换商品</text>
+			</view>
+		</view>
+		<view class="hot-goods-content bg-white">
+			<view class="hot-goods-item" hover-class="hot-goods-item-hover" v-for="(item,index) in newProductList" :key="index"
+			 :class="index % 2 === 2 ? 'no-border-right' : ''" @click="toGoods(item)" >
+				<view class="items column padding-20">
+					<view class="center-algin item-images">
+						<image class="hot-goods-image"  :src="item.orderSn"></image>
+					</view>
+					<view class="hot-goods-name ellipsis-oneline">{{item.goodsName}}</view>
+					<view class="row align-height hot-goods-price space-between-algin">
+						<text class="text-grey text-size-mim">{{item.totalAmount}}积分</text>
+						<text class="level text-size-24 text-green padding-width-15">{{item.levelName}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+	components: {
+		mallplusCopyright,
+    			uniLoadMore,
+
+    		},
+		data(){
+			return{
+				pageNum: 1,
+                        				loadingType: 'more', //加载更多状态
+			integrals:0,
+				newProductList: [],
+
+
+			}
+		},
+			//加载更多
+                	onReachBottom() {
+                		this.pageNum = this.pageNum + 1;
+                		this.getNewProductList();
+                	},
+            	onPullDownRefresh() {
+            	this.pageNum = this.pageNum + 1;
+            	this.getNewProductList('refresh');
+
+
+            		setTimeout(function () {
+            			uni.stopPullDownRefresh();
+            		}, 2000);
+            	},
+
+		async onShow() {
+		this.getNewProductList('refresh');
+		 let params = {orderType:5  };
+
+
+                                     				let data1 = await Api.apiCall('get', Api.member.currentMember, params);
+                         					this.integrals = data1.integration;
+		},
+		onPullDownRefresh() {
+			
+		},
+		methods:{
+		/**
+            		     * 获取新品上市信息
+            		     */
+            		    async getNewProductList(type = 'add', loading){
+            		    //没有更多直接返回
+                        			if (type === 'add') {
+                        				if (this.loadingType === 'nomore') {
+                        					return;
+                        				}
+                        				this.loadingType = 'loading';
+                        			} else {
+                        				this.loadingType = 'more';
+                        			}
+            		      let params = { pageNum: this.pageNum,orderType:5};
+            		      let list = await Api.apiCall('get', Api.order.sampleOrderList, params);
+
+
+            		        let goodsList = list.records;
+
+                            			if (type === 'refresh') {
+                            				this.newProductList = [];
+                            			}
+
+                	this.newProductList = this.newProductList.concat(goodsList);
+
+                            			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+                            			this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+                            			if (type === 'refresh') {
+                            				if (loading == 1) {
+                            					uni.hideLoading();
+                            				} else {
+                            					uni.stopPullDownRefresh();
+                            				}
+                            			}
+
+            		    },
+			toGoods(item){
+            			let id = item.goodsId;
+                        			uni.navigateTo({
+                        				url: `../../pagesA/product/giftProduct?id=${id}`
+                        			});
+            		}
+		}
+	}
+</script>
+
+<style>
+@import url("./home.css");
+page{background-color: #F3F3F3;}
+view {font-size: 30upx;line-height: 1.8;display: flex;}
+.with-100{width: 100%;}
+.row{flex-direction: row;}
+.column {flex-direction: column;}
+.text-size-max{font-size: 80upx;}
+.center-algin{justify-content: center;align-items: center;}
+.justify-center{justify-content: center;}
+.justify-between{justify-content: space-between;}
+.align-height{align-items: center;}
+.bg-white{background: #FFFFFF;}
+.bg-green {background: #F44142;}
+.text-size-24 {font-size: 24upx;}
+.text-size-mim {font-size: 26upx;}
+.text-grey {color: #9B9B9B;}
+.text-while{color: #FFFFFF;}
+.font-bold{font-weight: bold;}
+.text-size-below-normal {font-size: 28upx;}
+.bottom-line{border-bottom: #EEEEEE solid 1upx}
+.margin-bottom-20{margin-bottom: 20upx;}
+.margin-top-20{margin-top: 20upx;}
+.margin-width-20{margin:0 20upx;}
+.padding-width-20{padding: 0 20upx;}
+.content{width: 100%;}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/money/pay.vue b/mallplusui-uniapp-app2/pages/money/pay.vue
new file mode 100644
index 0000000..f0cd4a5
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/money/pay.vue
@@ -0,0 +1,229 @@
+<template>
+	<view class="app">
+		<view class="price-box">
+			<text>支付金额</text>
+			<text class="price">{{orderInfo.payAmount}}</text>
+		</view>
+
+		<view class="pay-type-list">
+
+			<view class="type-item b-b" @click="changePayType(2)">
+				<text class="icon yticon icon-weixinzhifu"></text>
+				<view class="con">
+					<text class="tit">微信支付</text>
+					<text>推荐使用微信支付</text>
+				</view>
+				<label class="radio">
+					<radio value="" color="#fa436a" :checked='payType == 2' />
+
+				</label>
+			</view>
+			<view class="type-item b-b" @click="changePayType(1)">
+				<text class="icon yticon icon-alipay"></text>
+				<view class="con">
+					<text class="tit">支付宝支付</text>
+				</view>
+				<label class="radio">
+					<radio value="" color="#fa436a" :checked='payType == 1' />
+
+				</label>
+			</view>
+			<view class="type-item" @click="changePayType(3)">
+				<text class="icon yticon icon-erjiye-yucunkuan"></text>
+				<view class="con">
+					<text class="tit">预存款支付</text>
+					<text>可用余额 ¥{{orderInfo.blance}}</text>
+				</view>
+				<label class="radio">
+					<radio value="" color="#fa436a" :checked='payType == 3' />
+
+				</label>
+			</view>
+		</view>
+
+		<text class="mix-btn" @click="confirm">确认支付</text>
+	</view>
+</template>
+
+<script>
+    import { mapState } from 'vuex';
+    import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	export default {
+	components: {
+    		mallplusCopyright
+    	},
+		data() {
+			return {
+				payType: 1,
+				orderInfo: {}
+			};
+		},
+        computed: {
+            ...mapState(['hasLogin','userInfo'])
+    },
+        async onLoad(options) {
+            let params = {'id':options.id};
+            this.orderInfo = await Api.apiCall('get',Api.order.orderDetail,params);
+		},
+        computed: {
+            ...mapState(['hasLogin','userInfo'])
+   		 },
+		methods: {
+			//选择支付方式
+			changePayType(type) {
+				this.payType = type;
+			},
+			//确认支付
+            async  confirm() {
+
+                if (this.payType ==2){
+                     let params = {'orderId':this.orderInfo.id};
+
+// #ifdef APP-PLUS
+			let appRes = await Api.apiCall('get',Api.order.appPay,params);
+                                                            console.log(appRes);
+			// #endif
+                            // #ifdef H5
+                            //微信h5支付调用
+
+                    		 let h5Res = await Api.apiCall('get',Api.order.wapPay,params);
+                                                console.log(h5Res);
+                                                if (h5Res) {
+
+                                                }
+                                                 let webPay = await Api.apiCall('get',Api.order.webPay,params);
+                                                  console.log('webPay');
+                                                                                                console.log(webPay);
+                                                                                                if (webPay) {
+
+                                                                                                }
+                    		// #endif
+
+                    // #ifdef MP-WEIXIN
+                    // 小程序支付调用
+
+                    let res = await Api.apiCall('post',Api.order.weixinAppletPay,params);
+                    console.log(res);
+                    if (res) {
+                        uni.requestPayment({
+                            timeStamp: res.timeStamp,
+                            nonceStr: res.nonceStr,
+                            package: res.package,
+                            signType: res.signType,
+                            paySign: res.paySign,
+                            success(datas) {
+                                console.log(datas);
+                                uni.redirectTo({
+                                    url: '/pages/money/paySuccess'
+                                })
+                            },
+                            fail(err) {
+                                fail(JSON.stringify(err))
+                            }
+                        });
+
+                    }else {
+                        this.$api.msg('微信小程序失败');
+                    }
+                    // #endif
+                }else if (this.payType ==3){
+                    let params1 = {'payAmount':this.orderInfo.payAmount,'balance':this.userInfo.userInfo.blance,'orderId':this.orderInfo.id};
+                    let data1 = await Api.apiCall('post',Api.order.balancePay,params1);
+                    if (data1) {
+                        uni.redirectTo({
+                            url: '/pages/money/paySuccess'
+                        })
+                    }else {
+                        this.$api.msg('余额支付失败');
+                    }
+                }
+
+			},
+		}
+	}
+</script>
+
+<style lang='scss'>
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
+
+		.price{
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+			&:before{
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
+
+		.type-item{
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position:relative;
+		}
+
+		.icon{
+			width: 100upx;
+			font-size: 52upx;
+		}
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+		.icon-alipay {
+			color: #01aaef;
+		}
+		.tit{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+		.con{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+	.mix-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/pages/money/paySuccess.vue b/mallplusui-uniapp-app2/pages/money/paySuccess.vue
new file mode 100644
index 0000000..d93d14e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/money/paySuccess.vue
@@ -0,0 +1,78 @@
+<template>
+	<view class="content">
+		<text class="success-icon yticon icon-xuanzhong2"></text>
+		<text class="tit">支付成功</text>
+		<view class="result-mid red-price">
+			{{ paymentInfo.payAmount }}
+		</view>
+		<view class="btn-group">
+			<navigator url="/pages/order/order?status=0" open-type="redirect" class="mix-btn">查看订单</navigator>
+			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			paymentId: 0,
+			paymentInfo: {}, // 支付单详情
+			orderId: 0,
+			status: false
+		}
+	},
+	onLoad(options) {
+		if (options.order) {
+			let order  = JSON.parse(options.order)
+			this.orderId = order.id
+			this.paymentInfo = order
+		}
+
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+.content {
+	display: flex;
+	flex-direction: column;
+	justify-content: center;
+	align-items: center;
+}
+.success-icon {
+	font-size: 160upx;
+	color: #fa436a;
+	margin-top: 100upx;
+}
+.tit {
+	font-size: 38upx;
+	color: #303133;
+}
+.btn-group {
+	padding-top: 100upx;
+}
+.mix-btn {
+	margin-top: 30upx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 600upx;
+	height: 80upx;
+	font-size: $font-lg;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	&.hollow {
+		background: #fff;
+		color: #303133;
+		border: 1px solid #ccc;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/createOrder.vue b/mallplusui-uniapp-app2/pages/order/createOrder.vue
new file mode 100644
index 0000000..818a963
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/createOrder.vue
@@ -0,0 +1,870 @@
+<template>
+    <view>
+        <!-- 地址 -->
+        <navigator url="../../pagesU/address/address?source=1" class="address-section">
+            <view class="order-content">
+                <text class="yticon icon-shouhuodizhi"></text>
+                <view class="cen" v-if="addressData">
+                    <view class="top">
+                        <text class="name">{{ addressData.name }}</text>
+                        <text class="mobile">{{ addressData.phoneNumber }}</text>
+                    </view>
+                    <text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
+                </view>
+				<view class="cen" v-else>
+					<text>请设置收货地址</text>
+				   <!-- <view class="top">
+				        <text class="name">{{ addressData.name }}</text>
+				        <text class="mobile">{{ addressData.phoneNumber }}</text>
+				    </view>
+				    <text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text> -->
+				</view>
+                <text class="yticon icon-you"></text>
+            </view>
+
+            <image
+                    class="a-bg"
+                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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"
+            ></image>
+        </navigator>
+
+        <view class="goods-section">
+            <view class="g-header b-b">
+                <text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
+            </view>
+            <!-- 商品列表 -->
+            <view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
+                <image :src="item.productPic"></image>
+                <view class="right">
+                    <text class="title clamp">{{ item.productName }}</text>
+                    <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
+                    <view class="price-box">
+                        <text class="price">￥{{ item.price }}</text>
+                        <text class="number">x {{ item.quantity }}</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+        <view class="hot-floor" v-if="item1.giftsList && item1.giftsList.length > 0" v-for="(item1, index1) in basicGiftsList" :key="index1">
+            <view class="floor-img-box"> <text class="name">{{ item1.name }}</text></view>
+
+            <scroll-view class="floor-list" scroll-x>
+                <view class="scoll-wrapper">
+                    <view v-for="(item, index) in item1.giftsList" :key="index" class="floor-item" >
+                        <image :src="item.pic" mode="aspectFill"></image>
+                        <text class="title clamp">{{ item.name }}</text>
+                        <text class="price" v-if="item.rule">￥{{ item.price }}</text>
+                    </view>
+                </view>
+            </scroll-view>
+        </view>
+        <!-- 优惠明细 -->
+        <view class="yt-list">
+            <view class="yt-list-cell b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
+                <view class="cell-icon">券</view>
+                <text class="cell-tit clamp">优惠券</text>
+                <text class="cell-tip active">选择优惠券</text>
+                <text class="cell-more wanjia wanjia-gengduo-d"></text>
+            </view>
+            <view class="yt-list-cell b-b" v-if="coupon">
+                <text class="cell-tit clamp">商家促销</text>
+                <view class="cell-tip hb" v-if="coupon.minPoint">满{{coupon.minPoint}}减{{coupon.amount}}</view>
+                <text class="cell-tip disabled"  v-if="!coupon">暂无可用优惠</text>
+            </view>
+        </view>
+        <!-- 金额明细 -->
+        <view class="yt-list">
+            <view class="yt-list-cell b-b">
+                <text class="cell-tit clamp">商品金额</text>
+                <text class="cell-tip">￥{{ calcAmount.totalAmount }}</text>
+            </view>
+            <view class="yt-list-cell b-b" v-if="groupActivity">
+                <text class="cell-tit clamp">活动金额</text>
+                <text class="cell-tip">￥{{ groupActivity.price }}</text>
+            </view>
+            <view class="yt-list-cell b-b" v-if="calcAmount.promotionAmount>0">
+                <text class="cell-tit clamp">优惠金额</text>
+                <text class="cell-tip red">-￥{{ calcAmount.promotionAmount }}</text>
+            </view>
+             <view class="yt-list-cell b-b" v-if="coupon.amount>0">
+                            <text class="cell-tit clamp">优惠券抵扣</text>
+                            <text class="cell-tip red">-￥{{ coupon.amount }}</text>
+                        </view>
+                        <!-- <view class="yt-list-cell b-b" v-if="memberIntegration>0">
+                                                    <text class="cell-tit clamp">积分抵扣</text>
+                                                    <text class="cell-tip red">-￥{{ memberIntegration }}</text>
+                                                </view>-->
+            <view class="yt-list-cell b-b">
+                <text class="cell-tit clamp">运费</text>
+                <text class="cell-tip">{{calcAmount.freightAmount}}</text>
+            </view>
+            <view class="yt-list-cell desc-cell">
+                <text class="cell-tit clamp">备注</text>
+                <input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder" />
+            </view>
+        </view>
+
+        <!-- 底部 -->
+        <view class="footer">
+            <view class="price-content">
+                <text>实付款</text>
+                <text class="price-tip">￥</text>
+                <text class="price">{{ calcAmount.payAmount-coupon.amount }}</text>
+            </view>
+            <text class="submit" @click="submit">提交订单</text>
+        </view>
+
+        <!-- 优惠券面板 -->
+        <view class="mask" :class="maskState === 0 ? 'none' : maskState === 1 ? 'show' : ''" @click="toggleMask">
+            <view class="mask-content" @click.stop.prevent="stopPrevent">
+                <!-- 优惠券页面，仿mt -->
+                <view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index">
+                    <view class="con" @click="selectCoupon(item)">
+                        <view class="left">
+                            <text class="title">{{ item.coupon.name }}</text>
+                            <text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
+                        </view>
+                        <view class="right">
+                            <text class="price">{{ item.coupon.amount }}</text>
+                            <text>满{{item.coupon.minPoint}}可用</text>
+                        </view>
+
+                        <view class="circle l"></view>
+                        <view class="circle r"></view>
+                    </view>
+                    <text class="tips">限新用户使用</text>
+                </view>
+            </view>
+        </view>
+
+    </view>
+</template>
+
+<script>
+    import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+    import { mapState } from 'vuex';
+    	import { formatDate } from '@/common/date';
+
+    export default {
+    components: {
+    		mallplusCopyright
+    	},
+        data() {
+            return {
+                maskState: 0, //优惠券面板显示状态
+                desc: '', //备注
+                payType: 1, //1微信 2支付宝
+                type: 1,
+                groupType: '',
+               /* memberIntegration:0, */
+                groupActivityId:'',
+                basicGiftsVar:'',
+                skillId:0,
+                goodsId: 0,
+                skuId:0,
+                mgId: 0,
+                cartId: '',
+                cartIds: '',
+                addressId: '',
+                couponId: '',
+                memberCouponId:'',
+                coupon:{
+                    amount:0,
+                    coupon:{
+                        amount:0
+                    }
+                },
+                groupActivity:null,
+                memberReceiveAddressList: [],
+                basicGiftsList:[],
+                cartPromotionItemList: [],
+                calcAmount: {
+                    totalAmount: 0,
+                    freightAmount: 0,
+                    promotionAmount: 0,
+                    payAmount: 0
+                },
+                couponList: [],
+                addressData: {
+                    name: null,
+                    phoneNumber: '',
+                    detailAddress: '',
+                    region: ''
+                }
+            };
+        },
+        async onLoad(opt) {
+            let option = JSON.parse(opt.dataJson);
+            console.log(option)
+            this.skuId = option.skuId==undefined?'':option.skuId;
+             this.goodsId = option.goodsId;
+
+            let data;
+            this.type = option.type;
+            if (option.groupActivityId) { // 团购
+                let params = { groupId: option.groupActivityId };
+                data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
+                this.groupActivityId=option.groupActivityId;
+                this.groupActivity=data.groupActivity;
+                this.type = 1;
+            }else{
+                if (option.groupType) { // 拼团
+                    this.groupType = option.groupType;
+                    this.goodsId = option.id;
+                    this.mgId = option.mgid;
+
+                    this.groupId = option.groupId;
+                    if (this.skuId) {
+                        let params = { orderType:2, groupId: option.groupId, goodsId: option.id, skuId: this.skuId };
+                        data = await Api.apiCall('post', Api.order.addGroup, params);
+                    } else {
+                        let params = { orderType:2, groupId: option.groupId, goodsId: option.id };
+                        data = await Api.apiCall('post', Api.order.addGroup, params);
+                    }
+                } else {
+                    if (option.type == 1) { // 详情
+                        this.cartId = option.id;
+                        let params = { goodsId: option.goodsId,skuId: this.skuId, type: option.type };
+                        data = await Api.apiCall('get', Api.order.preOrder, params);
+                    } else if (option.type == 2) { // 购物车
+                        let params = { cartIds: option.cartIds, type: option.type };
+                        data = await Api.apiCall('get', Api.order.preOrder, params);
+                        this.cartIds = option.cartIds;
+                    }else if (option.type == 6) { // 秒杀
+                        let params = { skillId: option.skillId, type: option.type };
+                        data = await Api.apiCall('get', Api.order.preOrder, params);
+                        this.skillId = option.skillId;
+                    }
+                }
+
+            }
+           /* if (!data || !data.cartPromotionItemList){
+                uni.switchTab({
+                    url: '/pages/index/index'
+                });
+            } */
+          /*  this.memberIntegration=data.memberIntegration; */
+            /* this.basicGiftsList = data.basicGiftsList; */
+
+            if (this.basicGiftsList) {
+                let basicGiftsVar ='';
+                let basicGiftsVar1 ='';
+                this.basicGiftsList.forEach(item => {
+                    basicGiftsVar1=basicGiftsVar1+item.id+':';
+                    console.log('1='+item.giftsList);
+                    if (item.giftsList ) {
+                        item.giftsList.forEach(item1 => {
+                            basicGiftsVar1 = basicGiftsVar1 + item1.id + ',';
+                        });
+                    }
+                    basicGiftsVar=basicGiftsVar+basicGiftsVar1.substr(0, basicGiftsVar1.length - 1)+'@';
+                    basicGiftsVar1='';
+                });
+                this.basicGiftsVar=basicGiftsVar.substr(0, basicGiftsVar.length - 1);
+                console.log(this.basicGiftsVar);
+            }
+            /* this.cartPromotionItemList = data.cartPromotionItemList; */
+            this.calcAmount = data.calcAmount;
+            this.addressData = data.address;
+            if (this.addressData) {
+                this.addressId = this.addressData.id;
+            }
+				  console.log("优惠券",data.couponHistoryDetailList);
+            this.couponList = data.couponHistoryDetailList;
+            this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
+
+        },
+        computed: {
+            ...mapState(['hasLogin', 'userInfo'])
+        },
+        filters: {
+                      formatCreateTime(time) {
+                        let date = new Date(time);
+                        return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+                      },
+                    },
+        methods: {
+        getSource(){
+                  let source =Api.source;
+                 return source;
+        },
+            selectCoupon(item){
+                this.coupon=item.coupon;
+                this.couponId= item.couponId;
+                this.memberCouponId=item.id;
+                console.log(this.coupon);
+                this.toggleMask();
+            },
+            //显示优惠券面板
+            toggleMask(type) {
+                let timer = type === 'show' ? 10 : 300;
+                let state = type === 'show' ? 1 : 0;
+                this.maskState = 2;
+                setTimeout(() => {
+                    this.maskState = state;
+                }, timer);
+            },
+            numberChange(data) {
+                this.number = data.number;
+            },
+            changePayType(type) {
+                this.payType = type;
+            },
+            async submit() {
+                console.log('dubmit')
+                let data;
+                if (!this.addressId) {
+                    this.$api.msg('请选择收货地址');
+                    return;
+                }
+                let params = {};
+
+                // 拼团
+                if (this.groupType) {
+                    if (!this.mgId) {
+                        this.mgId = 1;
+                    }
+
+                     params = {
+                        mgId: this.mgId,
+                        groupType: this.groupType,
+                        type: 1,
+                        orderType:2,
+                          skuId: this.skuId,
+                        goodsId: this.goodsId,
+                        groupId: this.groupId,
+                        addressId: this.addressId,
+                        couponId: this.couponId,
+                        memberCouponId: this.memberCouponId,
+                        content: this.desc
+                    };
+                     params.source = this.getSource();
+                    data = await Api.apiCall('post', Api.order.acceptGroup, params);
+                } else {
+                    // detail
+                    if (this.type == 1) {
+                         params = {basicGiftsVar:this.basicGiftsVar,orderType:1, type: 1, goodsId: this.goodsId,skuId: this.skuId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
+                        if (this.groupActivityId) {
+                            params = {groupActivityId:this.groupActivityId,orderType:3, type: 1, goodsId: this.goodsId,skuId: this.skuId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
+                        }
+                        params.source = this.getSource();
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+                    // 购物车
+                    if (this.type == 2) {
+                         params = {orderType:1, type: 2, cartIds: this.cartIds, addressId: this.addressId, couponId: this.couponId, content: this.desc };
+                        params.source = this.getSource();
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+
+                    // 秒杀
+                    if (this.type == 6) {
+                         params = { type: 6, skillId: this.skillId, addressId: this.addressId, couponId: this.couponId, content: this.desc ,orderType:6};
+                        params.source = this.getSource();
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+                }
+
+                if (data && data.order) {
+                    let id = data.order.id;
+                   // let url = `/pages/money/pay?id=${id}`;
+                    let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1' ;
+
+                    uni.navigateTo({
+                        url: url
+                    });
+                } else {
+                    this.$api.msg(data);
+                }
+            },
+            stopPrevent() {}
+        }
+    };
+</script>
+
+<style lang="scss">
+    page {
+        background: $page-color-base;
+        padding-bottom: 100upx;
+    }
+
+    .address-section {
+        padding: 30upx 0;
+        background: #fff;
+        position: relative;
+
+        .order-content {
+            display: flex;
+            align-items: center;
+        }
+
+        .icon-shouhuodizhi {
+            flex-shrink: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 90upx;
+            color: #888;
+            font-size: 44upx;
+        }
+
+        .cen {
+            display: flex;
+            flex-direction: column;
+            flex: 1;
+            font-size: 28upx;
+            color: $font-color-dark;
+        }
+
+        .name {
+            font-size: 34upx;
+            margin-right: 24upx;
+        }
+
+        .address {
+            margin-top: 16upx;
+            margin-right: 20upx;
+            color: $font-color-light;
+        }
+
+        .icon-you {
+            font-size: 32upx;
+            color: $font-color-light;
+            margin-right: 30upx;
+        }
+
+        .a-bg {
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            display: block;
+            width: 100%;
+            height: 5upx;
+        }
+    }
+
+    .goods-section {
+        margin-top: 16upx;
+        background: #fff;
+        padding-bottom: 1px;
+
+        .g-header {
+            display: flex;
+            align-items: center;
+            height: 84upx;
+            padding: 0 30upx;
+            position: relative;
+        }
+
+        .logo {
+            display: block;
+            width: 50upx;
+            height: 50upx;
+            border-radius: 100px;
+        }
+
+        .name {
+            font-size: 30upx;
+            color: $font-color-base;
+            margin-left: 24upx;
+        }
+
+        .g-item {
+            display: flex;
+            margin: 20upx 30upx;
+
+            image {
+                flex-shrink: 0;
+                display: block;
+                width: 140upx;
+                height: 140upx;
+                border-radius: 4upx;
+            }
+
+            .right {
+                flex: 1;
+                padding-left: 24upx;
+                overflow: hidden;
+            }
+
+            .title {
+                font-size: 30upx;
+                color: $font-color-dark;
+            }
+
+            .spec {
+                font-size: 26upx;
+                color: $font-color-light;
+            }
+
+            .price-box {
+                display: flex;
+                align-items: center;
+                font-size: 32upx;
+                color: $font-color-dark;
+                padding-top: 10upx;
+
+                .price {
+                    margin-bottom: 4upx;
+                }
+                .number {
+                    font-size: 26upx;
+                    color: $font-color-base;
+                    margin-left: 20upx;
+                }
+            }
+
+            .step-box {
+                position: relative;
+            }
+        }
+    }
+    .yt-list {
+        margin-top: 16upx;
+        background: #fff;
+    }
+
+    .yt-list-cell {
+        display: flex;
+        align-items: center;
+        padding: 10upx 30upx 10upx 40upx;
+        line-height: 70upx;
+        position: relative;
+
+        &.cell-hover {
+            background: #fafafa;
+        }
+
+        &.b-b:after {
+            left: 30upx;
+        }
+
+        .cell-icon {
+            height: 32upx;
+            width: 32upx;
+            font-size: 22upx;
+            color: #fff;
+            text-align: center;
+            line-height: 32upx;
+            background: #f85e52;
+            border-radius: 4upx;
+            margin-right: 12upx;
+
+            &.hb {
+                background: #ffaa0e;
+            }
+
+            &.lpk {
+                background: #3ab54a;
+            }
+        }
+
+        .cell-more {
+            align-self: center;
+            font-size: 24upx;
+            color: $font-color-light;
+            margin-left: 8upx;
+            margin-right: -10upx;
+        }
+
+        .cell-tit {
+            flex: 1;
+            font-size: 26upx;
+            color: $font-color-light;
+            margin-right: 10upx;
+        }
+
+        .cell-tip {
+            font-size: 26upx;
+            color: $font-color-dark;
+
+            &.disabled {
+                color: $font-color-light;
+            }
+
+            &.active {
+                color: $base-color;
+            }
+            &.red {
+                color: $base-color;
+            }
+        }
+
+        &.desc-cell {
+            .cell-tit {
+                max-width: 90upx;
+            }
+        }
+
+        .desc {
+            flex: 1;
+            font-size: $font-base;
+            color: $font-color-dark;
+        }
+    }
+
+    /* 支付列表 */
+    .pay-list {
+        padding-left: 40upx;
+        margin-top: 16upx;
+        background: #fff;
+        .pay-item {
+            display: flex;
+            align-items: center;
+            padding-right: 20upx;
+            line-height: 1;
+            height: 110upx;
+            position: relative;
+        }
+        .icon-weixinzhifu {
+            width: 80upx;
+            font-size: 40upx;
+            color: #6bcc03;
+        }
+        .icon-alipay {
+            width: 80upx;
+            font-size: 40upx;
+            color: #06b4fd;
+        }
+        .icon-xuanzhong2 {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 60upx;
+            height: 60upx;
+            font-size: 40upx;
+            color: $base-color;
+        }
+        .tit {
+            font-size: 32upx;
+            color: $font-color-dark;
+            flex: 1;
+        }
+    }
+
+    .footer {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        z-index: 995;
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 90upx;
+        justify-content: space-between;
+        font-size: 30upx;
+        background-color: #fff;
+        z-index: 998;
+        color: $font-color-base;
+        box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+        .price-content {
+            padding-left: 30upx;
+        }
+        .price-tip {
+            color: $base-color;
+            margin-left: 8upx;
+        }
+        .price {
+            font-size: 36upx;
+            color: $base-color;
+        }
+        .submit {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 280upx;
+            height: 100%;
+            color: #fff;
+            font-size: 32upx;
+            background-color: $base-color;
+        }
+    }
+
+    /* 优惠券面板 */
+    .mask {
+        display: flex;
+        align-items: flex-end;
+        position: fixed;
+        left: 0;
+        top: var(--window-top);
+        bottom: 0;
+        width: 100%;
+        background: rgba(0, 0, 0, 0);
+        z-index: 9995;
+        transition: 0.3s;
+
+        .mask-content {
+            width: 100%;
+            background: #f3f3f3;
+            transform: translateY(100%);
+            transition: 0.3s;
+            overflow-y: scroll;
+        }
+        &.none {
+            display: none;
+        }
+        &.show {
+            background: rgba(0, 0, 0, 0.4);
+
+            .mask-content {
+                transform: translateY(0);
+            }
+        }
+    }
+
+    /* 优惠券列表 */
+    .coupon-item {
+        display: flex;
+        flex-direction: column;
+        margin: 20upx 24upx;
+        background: #fff;
+        .con {
+            display: flex;
+            align-items: center;
+            position: relative;
+            height: 120upx;
+            padding: 0 30upx;
+            &:after {
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                content: '';
+                width: 100%;
+                height: 0;
+                border-bottom: 1px dashed #f3f3f3;
+                transform: scaleY(50%);
+            }
+        }
+        .left {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            flex: 1;
+            overflow: hidden;
+            height: 100upx;
+        }
+        .title {
+            font-size: 32upx;
+            color: $font-color-dark;
+            margin-bottom: 10upx;
+        }
+        .time {
+            font-size: 24upx;
+            color: $font-color-light;
+        }
+        .right {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            font-size: 26upx;
+            color: $font-color-base;
+            height: 100upx;
+        }
+        .price {
+            font-size: 44upx;
+            color: $base-color;
+            &:before {
+                content: '￥';
+                font-size: 34upx;
+            }
+        }
+        .tips {
+            font-size: 24upx;
+            color: $font-color-light;
+            line-height: 60upx;
+            padding-left: 30upx;
+        }
+        .circle {
+            position: absolute;
+            left: -6upx;
+            bottom: -10upx;
+            z-index: 10;
+            width: 20upx;
+            height: 20upx;
+            background: #f3f3f3;
+            border-radius: 100px;
+            &.r {
+                left: auto;
+                right: -6upx;
+            }
+        }
+    }
+    /* 分类推荐楼层 */
+    .hot-floor {
+        width: 100%;
+        overflow: hidden;
+        margin-bottom: 20upx;
+        .floor-img-box {
+            width: 100%;
+            height: 220upx;
+            position: relative;
+            display: flex;
+            &:after {
+                padding: 10 30upx;
+                content: '';
+                position: absolute;
+                width: 100%;
+                height: 100%;
+                background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+            }
+        }
+        .name {
+            font-size: 30upx;
+            color: $font-color-base;
+            margin-left: 24upx;
+        }
+        .floor-img {
+            width: 100%;
+            height: 100%;
+        }
+        .floor-list {
+            white-space: nowrap;
+            padding: 20upx;
+            padding-right: 50upx;
+            border-radius: 6upx;
+            margin-top: -140upx;
+            margin-left: 30upx;
+            background: #fff;
+            box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+            position: relative;
+            z-index: 1;
+        }
+        .scoll-wrapper {
+            display: flex;
+            align-items: flex-start;
+        }
+        .floor-item {
+            width: 180upx;
+            margin-right: 20upx;
+            font-size: $font-sm + 2upx;
+            color: $font-color-dark;
+            line-height: 1.8;
+            image {
+                width: 180upx;
+                height: 180upx;
+                border-radius: 6upx;
+            }
+            .price {
+                color: $uni-color-primary;
+            }
+        }
+        .more {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            flex-direction: column;
+            flex-shrink: 0;
+            width: 180upx;
+            height: 180upx;
+            border-radius: 6upx;
+            background: #f3f3f3;
+            font-size: $font-base;
+            color: $font-color-light;
+            text:first-child {
+                margin-bottom: 4upx;
+            }
+        }
+    }
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/createOrder1.vue b/mallplusui-uniapp-app2/pages/order/createOrder1.vue
new file mode 100644
index 0000000..53222e1
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/createOrder1.vue
@@ -0,0 +1,771 @@
+<template>
+    <view>
+        <!-- 地址 -->
+        <navigator url="../../pagesU/address/address?source=1" class="address-section">
+            <view class="order-content">
+                <text class="yticon icon-shouhuodizhi"></text>
+                <view class="cen" v-if="addressData">
+                    <view class="top">
+                        <text class="name">{{ addressData.name }}</text>
+                        <text class="mobile">{{ addressData.phoneNumber }}</text>
+                    </view>
+                    <text class="address">{{ addressData.detailAddress }} {{ addressData.region }}</text>
+                </view>
+                <text class="yticon icon-you"></text>
+            </view>
+
+            <image
+                    class="a-bg"
+                    src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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"
+            ></image>
+        </navigator>
+
+        <view class="goods-section">
+            <view class="g-header b-b">
+                <image class="logo"
+                       src="http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg"></image>
+                <text class="name">mallplus多租户商城</text>
+                <text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
+            </view>
+            <!-- 商品列表 -->
+            <view class="g-item" v-for="(item, index) in cartPromotionItemList" :key="index">
+                <image :src="item.productPic"></image>
+                <view class="right">
+                    <text class="title clamp">{{ item.productName }}</text>
+                    <text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
+                    <view class="price-box">
+                        <text class="price">￥{{ item.price }}</text>
+                        <text class="number">x {{ item.quantity }}</text>
+                    </view>
+                </view>
+            </view>
+        </view>
+
+        <!-- 优惠明细 -->
+        <view class="yt-list">
+            <view class="yt-list-cell b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
+                <view class="cell-icon">券</view>
+                <text class="cell-tit clamp">优惠券</text>
+                <text class="cell-tip active">选择优惠券</text>
+                <text class="cell-more wanjia wanjia-gengduo-d"></text>
+            </view>
+            <view class="yt-list-cell b-b" v-if="coupon">
+                <text class="cell-tit clamp">商家促销</text>
+                <view class="cell-tip hb" v-if="coupon.minPoint">满{{coupon.minPoint}}减{{coupon.amount}}</view>
+                <text class="cell-tip disabled" v-if="!coupon">暂无可用优惠</text>
+            </view>
+        </view>
+        <!-- 金额明细 -->
+        <view class="yt-list">
+            <view class="yt-list-cell b-b">
+                <text class="cell-tit clamp">商品金额</text>
+                <text class="cell-tip">￥{{ calcAmount.totalAmount }}</text>
+            </view>
+            <view class="yt-list-cell b-b" v-if="groupActivity">
+                <text class="cell-tit clamp">活动金额</text>
+                <text class="cell-tip">￥{{ groupActivity.price }}</text>
+            </view>
+            <view class="yt-list-cell b-b">
+                <text class="cell-tit clamp">优惠金额</text>
+                <text class="cell-tip red">-￥{{ calcAmount.promotionAmount }}</text>
+            </view>
+            <view class="yt-list-cell b-b">
+                <text class="cell-tit clamp">运费</text>
+                <text class="cell-tip">{{calcAmount.freightAmount}}</text>
+            </view>
+            <view class="yt-list-cell desc-cell">
+                <text class="cell-tit clamp">备注</text>
+                <input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder"/>
+            </view>
+        </view>
+
+        <!-- 底部 -->
+        <view class="footer">
+            <view class="price-content">
+                <text>实付款</text>
+                <text class="price-tip">￥</text>
+                <text class="price">{{ calcAmount.payAmount-coupon.amount }}</text>
+            </view>
+            <text class="submit" @click="submit">提交订单</text>
+        </view>
+
+        <!-- 优惠券面板 -->
+        <view class="mask" :class="maskState === 0 ? 'none' : maskState === 1 ? 'show' : ''" @click="toggleMask">
+            <view class="mask-content" @click.stop.prevent="stopPrevent">
+                <!-- 优惠券页面，仿mt -->
+                <view class="coupon-item" v-if="couponList.length > 0" v-for="(item, index) in couponList" :key="index">
+                    <view class="con" @click="selectCoupon(item)">
+                        <view class="left">
+                            <text class="title">{{ item.name }}</text>
+                            <text class="time">有效期至{{item.coupon.endTime | formatCreateTime}}</text>
+                        </view>
+                        <view class="right">
+                            <text class="price">{{ item.coupon.amount }}</text>
+                            <text>满{{item.coupon.minPoint}}可用</text>
+                        </view>
+
+                        <view class="circle l"></view>
+                        <view class="circle r"></view>
+                    </view>
+                    <text class="tips">限新用户使用</text>
+                </view>
+            </view>
+        </view>
+
+    </view>
+</template>
+
+<script>
+    import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+    import {mapState} from 'vuex';
+
+    export default {
+    components: {
+    		mallplusCopyright
+    	},
+        data() {
+            return {
+                maskState: 0, //优惠券面板显示状态
+                desc: '', //备注
+                payType: 1, //1微信 2支付宝
+                type: 1,
+                groupType: '',
+                groupActivityId: '',
+                goodsId: 0,
+                mgId: 1,
+                cartId: '',
+                cartIds: '',
+                addressId: '',
+                couponId: '',
+                memberCouponId: '',
+                coupon: {
+                    amount: 0,
+
+                },
+                groupActivity: null,
+                memberReceiveAddressList: [],
+                cartPromotionItemList: [],
+                calcAmount: {
+                    totalAmount: 0,
+                    freightAmount: 0,
+                    promotionAmount: 0,
+                    payAmount: 0
+                },
+                couponList: [],
+                addressData: {
+                    name: null,
+                    phoneNumber: '',
+                    detailAddress: '',
+                    region: ''
+                }
+            };
+        },
+        async onLoad(option) {
+            let data;
+            this.type = option.type;
+            if (option.groupActivityId) {
+                let params = {groupId: option.groupActivityId};
+                data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
+                this.groupActivityId = option.groupActivityId;
+                this.groupActivity = data.groupActivity;
+            } else {
+                if (option.groupType) {
+                    this.groupType = option.groupType;
+                    this.goodsId = option.id;
+                    this.mgId = option.mgid;
+
+                    if (option.skuId) {
+                        let params = {
+                            groupId: option.groupId,
+                            goodsId: option.id,
+                            skuId: option.skuId
+                        };
+                        data = await Api.apiCall('post', Api.order.addGroup, params);
+                    } else {
+                        let params = {groupId: option.groupId, goodsId: option.id};
+                        data = await Api.apiCall('post', Api.order.addGroup, params);
+                    }
+                } else {
+                    if (option.type == 1) {
+                        this.cartId = option.id;
+                        let params = {cartId: option.id, type: option.type};
+                        data = await Api.apiCall('get', Api.order.preOrder, params);
+                    } else if (option.type == 2) {
+                        let params = {cartIds: option.cartIds, type: option.type};
+                        data = await Api.apiCall('get', Api.order.preOrder, params);
+                        this.cartIds = option.cartIds;
+                    }
+                }
+
+            }
+
+            this.cartPromotionItemList = data.cartPromotionItemList;
+            this.calcAmount = data.calcAmount;
+            this.addressData = data.address;
+            if (this.addressData) {
+                this.addressId = this.addressData.id;
+            }
+
+            this.couponList = data.couponHistoryDetailList;
+            this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
+
+        },
+        computed: {
+            ...mapState(['hasLogin', 'userInfo'])
+        },
+        methods: {
+            selectCoupon(item) {
+                this.coupon = item.coupon;
+                this.couponId = item.couponId;
+                this.memberCouponId = item.id;
+                console.log(this.coupon);
+                this.toggleMask();
+            },
+            //显示优惠券面板
+            toggleMask(type) {
+                let timer = type === 'show' ? 10 : 300;
+                let state = type === 'show' ? 1 : 0;
+                this.maskState = 2;
+                setTimeout(() => {
+                    this.maskState = state;
+                }, timer);
+            },
+            numberChange(data) {
+                this.number = data.number;
+            },
+            changePayType(type) {
+                this.payType = type;
+            },
+            async submit() {
+                let data;
+                if (!this.addressId) {
+                    this.$api.msg('请选择收货地址');
+                    return;
+                }
+                // 拼团
+                if (this.groupType) {
+                    if (!this.mgId) {
+                        this.mgId = 1;
+                    }
+
+                    let params = {
+                        mgId: this.mgId,
+                        groupType: this.groupType,
+                        type: 1,
+                        orderType: 4,
+                        goodsId: this.goodsId,
+                        addressId: this.addressId,
+                        couponId: this.couponId,
+                        memberCouponId: this.memberCouponId,
+
+                        content: this.desc
+                    };
+                    data = await Api.apiCall('post', Api.order.acceptGroup, params);
+                } else {
+                    // detail
+                    if (this.type == 1) {
+                        let params = {
+                            orderType: 1,
+                            type: 1,
+                            cartId: this.cartId,
+                            addressId: this.addressId,
+                            couponId: this.couponId,
+                            memberCouponId: this.memberCouponId,
+                            content: this.desc
+                        };
+                        if (this.groupActivityId) {
+                            params = {
+                                groupActivityId: this.groupActivityId,
+                                orderType: 3,
+                                type: 1,
+                                cartId: this.cartId,
+                                addressId: this.addressId,
+                                couponId: this.couponId,
+                                memberCouponId: this.memberCouponId,
+
+                                content: this.desc
+                            };
+                        }
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+                    // 购物车
+                    if (this.type == 2) {
+                        let params = {
+                            orderType: 1,
+                            type: 2,
+                            cartIds: this.cartIds,
+                            addressId: this.addressId,
+                            couponId: this.couponId,
+
+                            content: this.desc
+                        };
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+                    // 团购
+                    if (this.type == 5) {
+                        let params = {
+                            type: 2,
+                            cartIds: this.cartIds,
+                            addressId: this.addressId,
+                            couponId: this.couponId,
+
+                            content: this.desc
+                        };
+                        data = await Api.apiCall('post', Api.order.bookOrder, params);
+                    }
+                }
+
+                if (data && data.order) {
+                    let id = data.order.id;
+                    let url = `/pages/money/pay?id=${id}`;
+
+                    uni.navigateTo({
+                        url: url
+                    });
+                } else {
+                    this.$api.msg(data);
+                }
+            },
+            stopPrevent() {
+            }
+        }
+    };
+</script>
+
+<style lang="scss">
+    page {
+        background: $page-color-base;
+        padding-bottom: 100 upx;
+    }
+
+    .address-section {
+        padding: 30 upx 0;
+        background: #fff;
+        position: relative;
+
+        .order-content {
+            display: flex;
+            align-items: center;
+        }
+
+        .icon-shouhuodizhi {
+            flex-shrink: 0;
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 90 upx;
+            color: #888;
+            font-size: 44 upx;
+        }
+
+        .cen {
+            display: flex;
+            flex-direction: column;
+            flex: 1;
+            font-size: 28 upx;
+            color: $font-color-dark;
+        }
+
+        .name {
+            font-size: 34 upx;
+            margin-right: 24 upx;
+        }
+
+        .address {
+            margin-top: 16 upx;
+            margin-right: 20 upx;
+            color: $font-color-light;
+        }
+
+        .icon-you {
+            font-size: 32 upx;
+            color: $font-color-light;
+            margin-right: 30 upx;
+        }
+
+        .a-bg {
+            position: absolute;
+            left: 0;
+            bottom: 0;
+            display: block;
+            width: 100%;
+            height: 5 upx;
+        }
+    }
+
+    .goods-section {
+        margin-top: 16 upx;
+        background: #fff;
+        padding-bottom: 1px;
+
+        .g-header {
+            display: flex;
+            align-items: center;
+            height: 84 upx;
+            padding: 0 30 upx;
+            position: relative;
+        }
+
+        .logo {
+            display: block;
+            width: 50 upx;
+            height: 50 upx;
+            border-radius: 100px;
+        }
+
+        .name {
+            font-size: 30 upx;
+            color: $font-color-base;
+            margin-left: 24 upx;
+        }
+
+        .g-item {
+            display: flex;
+            margin: 20 upx 30 upx;
+
+            image {
+                flex-shrink: 0;
+                display: block;
+                width: 140 upx;
+                height: 140 upx;
+                border-radius: 4 upx;
+            }
+
+            .right {
+                flex: 1;
+                padding-left: 24 upx;
+                overflow: hidden;
+            }
+
+            .title {
+                font-size: 30 upx;
+                color: $font-color-dark;
+            }
+
+            .spec {
+                font-size: 26 upx;
+                color: $font-color-light;
+            }
+
+            .price-box {
+                display: flex;
+                align-items: center;
+                font-size: 32 upx;
+                color: $font-color-dark;
+                padding-top: 10 upx;
+
+                .price {
+                    margin-bottom: 4 upx;
+                }
+
+                .number {
+                    font-size: 26 upx;
+                    color: $font-color-base;
+                    margin-left: 20 upx;
+                }
+            }
+
+            .step-box {
+                position: relative;
+            }
+        }
+    }
+
+    .yt-list {
+        margin-top: 16 upx;
+        background: #fff;
+    }
+
+    .yt-list-cell {
+        display: flex;
+        align-items: center;
+        padding: 10 upx 30 upx 10 upx 40 upx;
+        line-height: 70 upx;
+        position: relative;
+
+        &.cell-hover {
+            background: #fafafa;
+        }
+
+        &.b-b:after {
+            left: 30 upx;
+        }
+
+        .cell-icon {
+            height: 32 upx;
+            width: 32 upx;
+            font-size: 22 upx;
+            color: #fff;
+            text-align: center;
+            line-height: 32 upx;
+            background: #f85e52;
+            border-radius: 4 upx;
+            margin-right: 12 upx;
+
+            &.hb {
+                background: #ffaa0e;
+            }
+
+            &.lpk {
+                background: #3ab54a;
+            }
+        }
+
+        .cell-more {
+            align-self: center;
+            font-size: 24 upx;
+            color: $font-color-light;
+            margin-left: 8 upx;
+            margin-right: -10upx;
+        }
+
+        .cell-tit {
+            flex: 1;
+            font-size: 26 upx;
+            color: $font-color-light;
+            margin-right: 10 upx;
+        }
+
+        .cell-tip {
+            font-size: 26 upx;
+            color: $font-color-dark;
+
+            &.disabled {
+                color: $font-color-light;
+            }
+
+            &.active {
+                color: $base-color;
+            }
+
+            &.red {
+                color: $base-color;
+            }
+        }
+
+        &.desc-cell {
+            .cell-tit {
+                max-width: 90 upx;
+            }
+        }
+
+        .desc {
+            flex: 1;
+            font-size: $font-base;
+            color: $font-color-dark;
+        }
+    }
+
+    /* 支付列表 */
+    .pay-list {
+        padding-left: 40 upx;
+        margin-top: 16 upx;
+        background: #fff;
+
+        .pay-item {
+            display: flex;
+            align-items: center;
+            padding-right: 20 upx;
+            line-height: 1;
+            height: 110 upx;
+            position: relative;
+        }
+
+        .icon-weixinzhifu {
+            width: 80 upx;
+            font-size: 40 upx;
+            color: #6bcc03;
+        }
+
+        .icon-alipay {
+            width: 80 upx;
+            font-size: 40 upx;
+            color: #06b4fd;
+        }
+
+        .icon-xuanzhong2 {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 60 upx;
+            height: 60 upx;
+            font-size: 40 upx;
+            color: $base-color;
+        }
+
+        .tit {
+            font-size: 32 upx;
+            color: $font-color-dark;
+            flex: 1;
+        }
+    }
+
+    .footer {
+        position: fixed;
+        left: 0;
+        bottom: 0;
+        z-index: 995;
+        display: flex;
+        align-items: center;
+        width: 100%;
+        height: 90 upx;
+        justify-content: space-between;
+        font-size: 30 upx;
+        background-color: #fff;
+        z-index: 998;
+        color: $font-color-base;
+        box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+
+        .price-content {
+            padding-left: 30 upx;
+        }
+
+        .price-tip {
+            color: $base-color;
+            margin-left: 8 upx;
+        }
+
+        .price {
+            font-size: 36 upx;
+            color: $base-color;
+        }
+
+        .submit {
+            display: flex;
+            align-items: center;
+            justify-content: center;
+            width: 280 upx;
+            height: 100%;
+            color: #fff;
+            font-size: 32 upx;
+            background-color: $base-color;
+        }
+    }
+
+    /* 优惠券面板 */
+    .mask {
+        display: flex;
+        align-items: flex-end;
+        position: fixed;
+        left: 0;
+        top: var(--window-top);
+        bottom: 0;
+        width: 100%;
+        background: rgba(0, 0, 0, 0);
+        z-index: 9995;
+        transition: 0.3s;
+
+        .mask-content {
+            width: 100%;
+            min-height: 30vh;
+            max-height: 70vh;
+            background: #f3f3f3;
+            transform: translateY(100%);
+            transition: 0.3s;
+            overflow-y: scroll;
+        }
+
+        &.none {
+            display: none;
+        }
+
+        &.show {
+            background: rgba(0, 0, 0, 0.4);
+
+            .mask-content {
+                transform: translateY(0);
+            }
+        }
+    }
+
+    /* 优惠券列表 */
+    .coupon-item {
+        display: flex;
+        flex-direction: column;
+        margin: 20 upx 24 upx;
+        background: #fff;
+
+        .con {
+            display: flex;
+            align-items: center;
+            position: relative;
+            height: 120 upx;
+            padding: 0 30 upx;
+
+            &:after {
+                position: absolute;
+                left: 0;
+                bottom: 0;
+                content: '';
+                width: 100%;
+                height: 0;
+                border-bottom: 1px dashed #f3f3f3;
+                transform: scaleY(50%);
+            }
+        }
+
+        .left {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            flex: 1;
+            overflow: hidden;
+            height: 100 upx;
+        }
+
+        .title {
+            font-size: 32 upx;
+            color: $font-color-dark;
+            margin-bottom: 10 upx;
+        }
+
+        .time {
+            font-size: 24 upx;
+            color: $font-color-light;
+        }
+
+        .right {
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            align-items: center;
+            font-size: 26 upx;
+            color: $font-color-base;
+            height: 100 upx;
+        }
+
+        .price {
+            font-size: 44 upx;
+            color: $base-color;
+
+            &:before {
+                content: '￥';
+                font-size: 34 upx;
+            }
+        }
+
+        .tips {
+            font-size: 24 upx;
+            color: $font-color-light;
+            line-height: 60 upx;
+            padding-left: 30 upx;
+        }
+
+        .circle {
+            position: absolute;
+            left: -6upx;
+            bottom: -10upx;
+            z-index: 10;
+            width: 20 upx;
+            height: 20 upx;
+            background: #f3f3f3;
+            border-radius: 100px;
+
+            &.r {
+                left: auto;
+                right: -6upx;
+            }
+        }
+    }
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/createStoreOrder.vue b/mallplusui-uniapp-app2/pages/order/createStoreOrder.vue
new file mode 100644
index 0000000..c5adb30
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/createStoreOrder.vue
@@ -0,0 +1,806 @@
+<template>
+	<view>
+		<!-- 地址 -->
+		<navigator url="../../pagesU/address/address?source=1" class="address-section">
+			<view class="order-content">
+				<text class="yticon icon-shouhuodizhi"></text>
+				<view class="cen" v-if="addressData">
+					<view class="top">
+						<text class="name">{{ addressData.name }}</text>
+						<text class="mobile">{{ addressData.phoneNumber }}</text>
+					</view>
+					<text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text>
+				</view>
+				<view class="cen" v-else>
+					<text>请设置收货地址</text>
+					<!-- <view class="top">
+                         <text class="name">{{ addressData.name }}</text>
+                         <text class="mobile">{{ addressData.phoneNumber }}</text>
+                     </view>
+                     <text class="address">{{ addressData.province }}-{{ addressData.city }}-{{ addressData.region }}-{{ addressData.detailAddress }}</text> -->
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<image
+					class="a-bg"
+					src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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"
+			></image>
+		</navigator>
+
+		<view class="goods-section" v-for="(item1, index1) in confirmOrderResultList" :key="index1">
+			<view class="g-header b-b">
+				<image class="logo" src="http://yjlive160322.oss-cn-beijing.aliyuncs.com/mall/images/20190807/QQ%E5%9B%BE%E7%89%8720190807191952.jpg"></image>
+				<text class="name"> 共{{ item1.cartPromotionItemList.length }}件商品,店铺 【{{item1.storeName }}】</text>
+				<text class="name" v-if="groupActivity">团购-{{groupActivity.name}}</text>
+			</view>
+			<!-- 商品列表 -->
+			<view class="g-item" v-for="(item, index) in item1.cartPromotionItemList" :key="index">
+				<image :src="item.productPic"></image>
+				<view class="right">
+					<text class="title clamp">{{ item.productName }}</text>
+					<text class="spec" v-if="item.productAttr">{{ item.productAttr }}</text>
+					<view class="price-box">
+						<text class="price">￥{{ item.price }}</text>
+						<text class="number">x {{ item.quantity }}</text>
+					</view>
+				</view>
+			</view>
+			<!-- 金额明细 -->
+			<view class="yt-list">
+				<view class="yt-list-cell b-b">
+					<text class="cell-tit clamp">商品金额</text>
+					<text class="cell-tip">￥{{ item1.calcAmount.totalAmount }}</text>
+				</view>
+
+				<view class="yt-list-cell b-b" v-if="item1.calcAmount.promotionAmount>0">
+					<text class="cell-tit clamp">优惠金额</text>
+					<text class="cell-tip red">-￥{{ item1.calcAmount.promotionAmount }}</text>
+				</view>
+
+				<!-- <view class="yt-list-cell b-b" v-if="memberIntegration>0">
+                                            <text class="cell-tit clamp">积分抵扣</text>
+                                            <text class="cell-tip red">-￥{{ memberIntegration }}</text>
+                                        </view>-->
+				<view class="yt-list-cell b-b">
+					<text class="cell-tit clamp">运费</text>
+					<text class="cell-tip">{{item1.calcAmount.freightAmount}}</text>
+				</view>
+				<view class="yt-list-cell desc-cell">
+					<text class="cell-tit clamp">备注</text>
+					<input class="desc" type="text" v-model="desc" placeholder="请填写备注信息" placeholder-class="placeholder" />
+				</view>
+			</view>
+		</view>
+
+
+
+
+		<!-- 底部 -->
+		<view class="footer">
+			<view class="price-content">
+				<text>实付款</text>
+				<text class="price-tip">￥</text>
+				<text class="price">{{ totalPayAmount }}</text>
+			</view>
+			<text class="submit" @click="submit">提交订单</text>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import { mapState } from 'vuex';
+	export default {
+	components: {
+    		mallplusCopyright
+    	},
+		data() {
+			return {
+				maskState: 0, //优惠券面板显示状态
+				desc: '', //备注
+				payType: 1, //1微信 2支付宝
+				type: 1,
+				groupType: '',
+				memberIntegration:0,
+				groupActivityId:'',
+				totalPayAmount: 0,
+				basicGiftsVar:'',
+				skillId:0,
+				goodsId: 0,
+				mgId: 1,
+				cartId: '',
+				cartIds: '',
+				addressId: '',
+				couponId: '',
+				memberCouponId:'',
+				coupon:{
+					amount:0,
+					coupon:{
+						amount:0
+					}
+				},
+				groupActivity:null,
+				memberReceiveAddressList: [],
+				basicGiftsList:[],
+				cartPromotionItemList: [],
+				confirmOrderResultList: [],
+				calcAmount: {
+					totalAmount: 0,
+					freightAmount: 0,
+					promotionAmount: 0,
+					payAmount: 0
+				},
+				couponList: [],
+				addressData: {
+					name: null,
+					phoneNumber: '',
+					detailAddress: '',
+					region: ''
+				}
+			};
+		},
+		 async onLoad(opt) {
+                    let option = JSON.parse(opt.dataJson);
+			let data;
+			this.type = option.type;
+			if (option.groupActivityId) { // 团购
+				let params = { groupId: option.groupActivityId };
+				data = await Api.apiCall('get', Api.order.preGroupActivityOrder, params);
+				this.groupActivityId=option.groupActivityId;
+				this.groupActivity=data.groupActivity;
+				this.type = 1;
+			}else{
+				if (option.groupType) { // 拼团
+					this.groupType = option.groupType;
+					this.goodsId = option.id;
+					this.mgId = option.mgid;
+
+					if (option.skuId) {
+						let params = { groupId: option.groupId, goodsId: option.id, skuId: option.skuId };
+						data = await Api.apiCall('post', Api.order.addGroup, params);
+					} else {
+						let params = { groupId: option.groupId, goodsId: option.id };
+						data = await Api.apiCall('post', Api.order.addGroup, params);
+					}
+				} else {
+					if (option.type == 1) { // 详情
+						this.cartId = option.id;
+						let params = { goodsId: option.goodsId,skuId: option.goodsId, type: option.type };
+						data = await Api.apiCall('get', Api.order.submitStorePreview, params);
+					} else if (option.type == 2) { // 购物车
+						let params = { cartIds: option.cartIds, type: option.type };
+						data = await Api.apiCall('get', Api.order.submitStorePreview, params);
+						this.cartIds = option.cartIds;
+					}else if (option.type == 6) { // 秒杀
+						let params = { skillId: option.skillId, type: option.type };
+						data = await Api.apiCall('get', Api.order.submitStorePreview, params);
+						this.skillId = option.skillId;
+					}
+				}
+
+			}
+			this.totalPayAmount = data.totalPayAmount;
+			/* this.memberIntegration=data.memberIntegration; */
+			this.basicGiftsList = data.basicGiftsList;
+			this.confirmOrderResultList = data.confirmOrderResultList;
+			this.calcAmount = data.calcAmount;
+			if (this.basicGiftsList) {
+				let basicGiftsVar ='';
+				let basicGiftsVar1 ='';
+				this.basicGiftsList.forEach(item => {
+					basicGiftsVar1=basicGiftsVar1+item.id+':';
+					console.log('1='+item.giftsList);
+					if (item.giftsList ) {
+						item.giftsList.forEach(item1 => {
+							basicGiftsVar1 = basicGiftsVar1 + item1.id + ',';
+						});
+					}
+					basicGiftsVar=basicGiftsVar+basicGiftsVar1.substr(0, basicGiftsVar1.length - 1)+'@';
+					basicGiftsVar1='';
+				});
+				this.basicGiftsVar=basicGiftsVar.substr(0, basicGiftsVar.length - 1);
+				console.log(this.basicGiftsVar);
+			}
+			this.addressData = data.address;
+			if (this.addressData) {
+				this.addressId = this.addressData.id;
+			}
+
+			this.couponList = data.couponHistoryDetailList;
+			this.memberReceiveAddressList = data.memberReceiveAddressListaddress;
+
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+		 getSource(){
+                          let source =Api.source;
+                         return source;
+                },
+			selectCoupon(item){
+				this.coupon=item.coupon;
+				this.couponId= item.couponId;
+				this.memberCouponId=item.id;
+				console.log(this.coupon);
+				this.toggleMask();
+			},
+			//显示优惠券面板
+			toggleMask(type) {
+				let timer = type === 'show' ? 10 : 300;
+				let state = type === 'show' ? 1 : 0;
+				this.maskState = 2;
+				setTimeout(() => {
+					this.maskState = state;
+				}, timer);
+			},
+			numberChange(data) {
+				this.number = data.number;
+			},
+			changePayType(type) {
+				this.payType = type;
+			},
+			async submit() {
+				console.log('dubmit')
+				let data;
+				if (!this.addressId) {
+					this.$api.msg('请选择收货地址');
+					return;
+				}
+				let params = {};
+
+				// 拼团
+				if (this.groupType) {
+					if (!this.mgId) {
+						this.mgId = 1;
+					}
+
+					 params = {
+						mgId: this.mgId,
+						groupType: this.groupType,
+						type: 1,
+						orderType:2,
+						goodsId: this.goodsId,
+						addressId: this.addressId,
+						couponId: this.couponId,
+						memberCouponId: this.memberCouponId,
+						content: this.desc
+					};
+					 params.source = this.getSource();
+					data = await Api.apiCall('post', Api.order.acceptGroup, params);
+				} else {
+					// detail
+					if (this.type == 1) {
+						 params = {basicGiftsVar:this.basicGiftsVar,orderType:1, type: 1, goodsId: option.goodsId,skuId: option.goodsId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
+						if (this.groupActivityId) {
+							params = {groupActivityId:this.groupActivityId,orderType:3, type: 1, goodsId: option.goodsId,skuId: option.goodsId, addressId: this.addressId, couponId: this.couponId,memberCouponId: this.memberCouponId, content: this.desc };
+						}
+						 params.source = this.getSource();
+						data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
+					}
+					// 购物车
+					if (this.type == 2) {
+						 params = {orderType:1, type: 2, cartIds: this.cartIds, addressId: this.addressId, couponId: this.couponId, content: this.desc };
+						 params.source = this.getSource();
+						 console.log(params)
+						 console.log(params.source)
+						data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
+						console.log("data=======:"+data)
+					}
+
+					// 秒杀
+					if (this.type == 6) {
+						 params = { type: 6, skillId: this.skillId, addressId: this.addressId, couponId: this.couponId, content: this.desc ,orderType:6};
+						 params.source = this.getSource();
+						data = await Api.apiCall('post', Api.order.generateStoreOrder, params);
+					}
+				}
+
+				if (data && data.order) {
+					let id = data.order.id;
+					// let url = `/pages/money/pay?id=${id}`;
+					let url = '/pages/order/payment/index?order_id=' + data.order.id + '&type=1' ;
+
+					uni.navigateTo({
+						url: url
+					});
+				} else {
+					this.$api.msg(data);
+				}
+			},
+			stopPrevent() {}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: $page-color-base;
+		padding-bottom: 100upx;
+	}
+
+	.address-section {
+		padding: 30upx 0;
+		background: #fff;
+		position: relative;
+
+		.order-content {
+			display: flex;
+			align-items: center;
+		}
+
+		.icon-shouhuodizhi {
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 90upx;
+			color: #888;
+			font-size: 44upx;
+		}
+
+		.cen {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			font-size: 28upx;
+			color: $font-color-dark;
+		}
+
+		.name {
+			font-size: 34upx;
+			margin-right: 24upx;
+		}
+
+		.address {
+			margin-top: 16upx;
+			margin-right: 20upx;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: 32upx;
+			color: $font-color-light;
+			margin-right: 30upx;
+		}
+
+		.a-bg {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			display: block;
+			width: 100%;
+			height: 5upx;
+		}
+	}
+
+	.goods-section {
+		margin-top: 16upx;
+		background: #fff;
+		padding-bottom: 1px;
+
+		.g-header {
+			display: flex;
+			align-items: center;
+			height: 84upx;
+			padding: 0 30upx;
+			position: relative;
+		}
+
+		.logo {
+			display: block;
+			width: 50upx;
+			height: 50upx;
+			border-radius: 100px;
+		}
+
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+
+		.g-item {
+			display: flex;
+			margin: 20upx 30upx;
+
+			image {
+				flex-shrink: 0;
+				display: block;
+				width: 140upx;
+				height: 140upx;
+				border-radius: 4upx;
+			}
+
+			.right {
+				flex: 1;
+				padding-left: 24upx;
+				overflow: hidden;
+			}
+
+			.title {
+				font-size: 30upx;
+				color: $font-color-dark;
+			}
+
+			.spec {
+				font-size: 26upx;
+				color: $font-color-light;
+			}
+
+			.price-box {
+				display: flex;
+				align-items: center;
+				font-size: 32upx;
+				color: $font-color-dark;
+				padding-top: 10upx;
+
+				.price {
+					margin-bottom: 4upx;
+				}
+				.number {
+					font-size: 26upx;
+					color: $font-color-base;
+					margin-left: 20upx;
+				}
+			}
+
+			.step-box {
+				position: relative;
+			}
+		}
+	}
+	.yt-list {
+		margin-top: 16upx;
+		background: #fff;
+	}
+
+	.yt-list-cell {
+		display: flex;
+		align-items: center;
+		padding: 10upx 30upx 10upx 40upx;
+		line-height: 70upx;
+		position: relative;
+
+		&.cell-hover {
+			background: #fafafa;
+		}
+
+		&.b-b:after {
+			left: 30upx;
+		}
+
+		.cell-icon {
+			height: 32upx;
+			width: 32upx;
+			font-size: 22upx;
+			color: #fff;
+			text-align: center;
+			line-height: 32upx;
+			background: #f85e52;
+			border-radius: 4upx;
+			margin-right: 12upx;
+
+			&.hb {
+				background: #ffaa0e;
+			}
+
+			&.lpk {
+				background: #3ab54a;
+			}
+		}
+
+		.cell-more {
+			align-self: center;
+			font-size: 24upx;
+			color: $font-color-light;
+			margin-left: 8upx;
+			margin-right: -10upx;
+		}
+
+		.cell-tit {
+			flex: 1;
+			font-size: 26upx;
+			color: $font-color-light;
+			margin-right: 10upx;
+		}
+
+		.cell-tip {
+			font-size: 26upx;
+			color: $font-color-dark;
+
+			&.disabled {
+				color: $font-color-light;
+			}
+
+			&.active {
+				color: $base-color;
+			}
+			&.red {
+				color: $base-color;
+			}
+		}
+
+		&.desc-cell {
+			.cell-tit {
+				max-width: 90upx;
+			}
+		}
+
+		.desc {
+			flex: 1;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+	}
+
+	/* 支付列表 */
+	.pay-list {
+		padding-left: 40upx;
+		margin-top: 16upx;
+		background: #fff;
+		.pay-item {
+			display: flex;
+			align-items: center;
+			padding-right: 20upx;
+			line-height: 1;
+			height: 110upx;
+			position: relative;
+		}
+		.icon-weixinzhifu {
+			width: 80upx;
+			font-size: 40upx;
+			color: #6bcc03;
+		}
+		.icon-alipay {
+			width: 80upx;
+			font-size: 40upx;
+			color: #06b4fd;
+		}
+		.icon-xuanzhong2 {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 60upx;
+			height: 60upx;
+			font-size: 40upx;
+			color: $base-color;
+		}
+		.tit {
+			font-size: 32upx;
+			color: $font-color-dark;
+			flex: 1;
+		}
+	}
+
+	.footer {
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 995;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 90upx;
+		justify-content: space-between;
+		font-size: 30upx;
+		background-color: #fff;
+		z-index: 998;
+		color: $font-color-base;
+		box-shadow: 0 -1px 5px rgba(0, 0, 0, 0.1);
+		.price-content {
+			padding-left: 30upx;
+		}
+		.price-tip {
+			color: $base-color;
+			margin-left: 8upx;
+		}
+		.price {
+			font-size: 36upx;
+			color: $base-color;
+		}
+		.submit {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 280upx;
+			height: 100%;
+			color: #fff;
+			font-size: 32upx;
+			background-color: $base-color;
+		}
+	}
+
+	/* 优惠券面板 */
+	.mask {
+		display: flex;
+		align-items: flex-end;
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 9995;
+		transition: 0.3s;
+
+		.mask-content {
+			width: 100%;
+			min-height: 30vh;
+			max-height: 70vh;
+			background: #f3f3f3;
+			transform: translateY(100%);
+			transition: 0.3s;
+			overflow-y: scroll;
+		}
+		&.none {
+			display: none;
+		}
+		&.show {
+			background: rgba(0, 0, 0, 0.4);
+
+			.mask-content {
+				transform: translateY(0);
+			}
+		}
+	}
+
+	/* 优惠券列表 */
+	.coupon-item {
+		display: flex;
+		flex-direction: column;
+		margin: 20upx 24upx;
+		background: #fff;
+		.con {
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 120upx;
+			padding: 0 30upx;
+			&:after {
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				content: '';
+				width: 100%;
+				height: 0;
+				border-bottom: 1px dashed #f3f3f3;
+				transform: scaleY(50%);
+			}
+		}
+		.left {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			flex: 1;
+			overflow: hidden;
+			height: 100upx;
+		}
+		.title {
+			font-size: 32upx;
+			color: $font-color-dark;
+			margin-bottom: 10upx;
+		}
+		.time {
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-size: 26upx;
+			color: $font-color-base;
+			height: 100upx;
+		}
+		.price {
+			font-size: 44upx;
+			color: $base-color;
+			&:before {
+				content: '￥';
+				font-size: 34upx;
+			}
+		}
+		.tips {
+			font-size: 24upx;
+			color: $font-color-light;
+			line-height: 60upx;
+			padding-left: 30upx;
+		}
+		.circle {
+			position: absolute;
+			left: -6upx;
+			bottom: -10upx;
+			z-index: 10;
+			width: 20upx;
+			height: 20upx;
+			background: #f3f3f3;
+			border-radius: 100px;
+			&.r {
+				left: auto;
+				right: -6upx;
+			}
+		}
+	}
+	/* 分类推荐楼层 */
+	.hot-floor {
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 20upx;
+		.floor-img-box {
+			width: 100%;
+			height: 220upx;
+			position: relative;
+			display: flex;
+			&:after {
+				padding: 10 30upx;
+				content: '';
+				position: absolute;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+		.floor-img {
+			width: 100%;
+			height: 100%;
+		}
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
+			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
+		}
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+			image {
+				width: 180upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+			text:first-child {
+				margin-bottom: 4upx;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/createStoreOrder1.vue b/mallplusui-uniapp-app2/pages/order/createStoreOrder1.vue
new file mode 100644
index 0000000..0c1c1f8
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/createStoreOrder1.vue
@@ -0,0 +1,761 @@
+<template>
+	<view>
+		<!-- 地址 -->
+		<navigator url="../../pagesU/address/address?source=1" class="address-section">
+			<view class="order-content">
+				<text class="yticon icon-shouhuodizhi"></text>
+				<view class="cen">
+					<view class="top">
+						<text class="name">{{orderInfo.address.user_name}}</text>
+						<text class="mobile">{{orderInfo.address.user_phone}}</text>
+					</view>
+					<text class="address">
+						{{ orderInfo.address.area_province_name ? orderInfo.address.area_province_name : '' }} {{ orderInfo.address.area_city_name ? orderInfo.address.area_city_name : '' }}{{ orderInfo.address.area_county_name ? orderInfo.address.area_county_name : '' }}{{ orderInfo.address.area_town_name ? orderInfo.address.area_town_name : '' }}{{ orderInfo.address.area_village_name ? orderInfo.address.area_village_name : '' }}{{ orderInfo.address.address ? orderInfo.address.address : '' }}
+						
+					</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<image class="a-bg" src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAu4AAAAFCAYAAAAaAWmiAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6Rjk3RjkzMjM2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6Rjk3RjkzMjQ2NzMxMTFFOUI4RkU4OEZGMDcxQzgzOEYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpGOTdGOTMyMTY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpGOTdGOTMyMjY3MzExMUU5QjhGRTg4RkYwNzFDODM4RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PrEOZlQAAAiuSURBVHjazJp7bFvV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"></image>
+		</navigator>
+
+		<view class="goods-section">
+			<block v-for="(item, index) in orderInfo.goods_data" :key="index">
+				<view class="g-header b-b">
+					<image class="logo" :src="domainHost + item.shop_info.shop_logo"></image>
+					<text class="name">{{item.shop_info.shop_name}}</text>
+				</view>
+				<!-- 商品列表 -->
+				<view class="g-item" v-for="(goodsItem, goodsIndex) in item.goods_list" :key="goodsIndex">
+					<image :src="domainHost + (goodsItem.sku_picture_info==null?goodsItem.goods_picture_info.pic_cover_small:goodsItem.sku_picture_info.pic_cover_small)"></image>
+					<view class="right">
+						<text class="title clamp">{{goodsItem.goods_info.goods_name}}</text>
+						<text class="spec">{{goodsItem.sku_info.sku_name==''?'标准版':goodsItem.sku_info.sku_name}}</text>
+						<view class="price-box">
+							<text class="price">￥{{goodsItem.total_price}}</text>
+							<block v-if="goodsItem.sale_area.code==1">
+								<uni-number-box
+									class="step number"
+									:min="1" 
+									:max="goodsItem.goods_info.max_buy==0?goodsItem.goods_info.stock:goodsItem.goods_info.max_buy"
+									:value="goodsItem.num"
+									:goodsId="goodsItem.goods_info.Id"
+									:skuId="goodsItem.sku_info.sku_id"
+									@eventChange="amountChange"
+								></uni-number-box>
+							</block>
+							<block v-else>
+								<text class="store_none disabled">此区域已售罄</text>
+							</block>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+
+		<!-- 优惠明细 -->
+		<view class="yt-list">
+			
+			<!--
+			<view class="yt-list-cell b-b" @click="toggleMask('show')">
+				<view class="cell-icon">
+					券
+				</view>
+				<text class="cell-tit clamp">优惠券</text>
+				<text class="cell-tip active">
+					选择优惠券
+				</text>
+				<text class="cell-more wanjia wanjia-gengduo-d"></text>
+			</view>
+			-->
+			<view class="yt-list-cell b-b">
+				<view class="cell-icon hb">
+					减
+				</view>
+				<text class="cell-tit clamp">商家促销</text>
+				<text class="cell-tip disabled">暂无优惠</text>
+			</view>
+		</view>
+		<!-- 金额明细 -->
+		<view class="yt-list">
+			<view class="yt-list-cell b-b">
+				<text class="cell-tit clamp">商品金额</text>
+				<text class="cell-tip">￥{{orderInfo.total_money}}</text>
+			</view>
+			<view class="yt-list-cell b-b">
+				<text class="cell-tit clamp" style="width: 200px;">金币抵扣</text>
+				<text class="cell-tip">-￥{{orderInfo.total_max_use_coin}}</text>
+				<!--
+				<view class="con">
+				<uni-number-box
+								class="use_coin"
+								:min="0" 
+								:max="orderInfo.total_max_use_coin"
+								:value="use_coin"
+								@eventChange="coinChange"
+							></uni-number-box>
+				</view>
+				-->
+			</view>
+			<view class="yt-list-cell b-b">
+				<text class="cell-tit clamp">运费</text>
+				<text class="cell-tip">{{orderInfo.shipping_money==0?'包邮':'￥'+orderInfo.shipping_money}}</text>
+			</view>
+			<view class="yt-list-cell desc-cell">
+				<text class="cell-tit clamp">备注</text>
+				<input class="desc" type="text" v-model="member_message" placeholder="请填写备注信息" placeholder-class="placeholder" />
+			</view>
+		</view>
+		
+		<!-- 底部 -->
+		<view class="footer">
+			<view class="price-content">
+				<text>实付款</text>
+				<text class="price-tip">￥</text>
+				<text class="price">{{orderInfo.pay_money}}</text>
+			</view>
+			<text class="submit" @click="submit">提交订单</text>
+		</view>
+		
+		<!-- 优惠券面板 -->
+		<view class="mask" :class="maskState===0 ? 'none' : maskState===1 ? 'show' : ''" @click="toggleMask">
+			<view class="mask-content" @click.stop.prevent="stopPrevent">
+				<!-- 优惠券页面，仿mt -->
+				<view class="coupon-item" v-for="(item,index) in couponList" :key="index">
+					<view class="con">
+						<view class="left">
+							<text class="title">{{item.title}}</text>
+							<text class="time">有效期至2019-06-30</text>
+						</view>
+						<view class="right">
+							<text class="price">{{item.price}}</text>
+							<text>满30可用</text>
+						</view>
+						
+						<view class="circle l"></view>
+						<view class="circle r"></view>
+					</view>
+					<text class="tips">限新用户使用</text>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import uniNumberBox from '@/components/uni-number-box.vue'
+	export default {
+		components: {
+        		mallplusCopyright,
+			uniNumberBox
+		},
+		data() {
+			return {
+				domainHost:'',
+				orderInfo:[],
+				queryInfo:[],
+				maskState: 0, //优惠券面板显示状态
+				member_message: '', //备注
+				payType: 1, //1微信 2支付宝
+				couponList: [
+					{
+						title: '新用户专享优惠券',
+						price: 5,
+					},
+					{
+						title: '庆五一发一波优惠券',
+						price: 10,
+					},
+					{
+						title: '优惠券优惠券优惠券优惠券',
+						price: 15,
+					}
+				],
+				use_coin:0,
+			}
+		},
+		onLoad(option){
+			//商品数据
+			//let data = JSON.parse(option.data);
+			this.domainHost = this.$http.Config.baseUrl
+			this.queryInfo = JSON.parse(decodeURIComponent(this.$Route.query.list))
+			this.queryInfo = JSON.stringify({goods_data:this.queryInfo})
+
+			this.order_Calculate()
+		},
+		onShow() {
+			//this.order_Calculate()
+		},
+		methods: {
+			//显示优惠券面板
+			toggleMask(type){
+				let timer = type === 'show' ? 10 : 300;
+				let	state = type === 'show' ? 1 : 0;
+				this.maskState = 2;
+				setTimeout(()=>{
+					this.maskState = state;
+				}, timer)
+			},
+			coinChange(data)
+			{
+				this.use_coin = data.number
+			},
+			amountChange(data) {
+				let tempInfo = JSON.parse(this.queryInfo)
+				let goodsList = tempInfo.goods_data
+				for(var i=0;i<goodsList.length;i++)
+				{
+					if(goodsList[i].goods_id== data.goodsId && goodsList[i].sku_id==data.skuId)
+					{
+						goodsList[i].num = data.number;
+						break;
+					}
+				}
+				tempInfo.goods_data = goodsList
+				this.queryInfo = JSON.stringify(tempInfo)
+				this.order_Calculate()
+			},
+			changePayType(type){
+				this.payType = type;
+			},
+			submit(){
+				uni.showLoading({
+					title: '请稍候'
+				});
+
+				let data = JSON.parse(this.queryInfo)
+				data.address_id = this.orderInfo.address.Id
+				data.member_message = this.member_message
+				
+				data = JSON.stringify(data)
+				
+				this.$http.orderCreate(data).then(res => {
+					uni.hideLoading();
+					if(res.data.status==1)
+					{
+						this.$Router.push({
+							name: 'pay',
+							params: res.data.content
+						})
+					}
+					else
+					{
+						uni.showToast({
+							title:res.data.message,icon:'none'
+						})
+					}
+					
+					
+				});
+			},
+			stopPrevent(){}
+			,order_Calculate()
+			{
+				let _this = this
+				let data = this.queryInfo
+				uni.showLoading({
+					title: '加载中'
+				});
+				
+				if(this.orderInfo)
+				{
+					if(this.orderInfo.address)
+					{
+						let tempInfo = JSON.parse(this.queryInfo)
+						tempInfo.address_id = this.orderInfo.address.Id
+						data = JSON.stringify(tempInfo)
+					}
+				}
+				this.$http.order_Calculate(data).then(res => {
+					uni.hideLoading();
+					if(res.data.status==1)
+					{
+						res.data.content.total_max_use_coin = parseFloat(res.data.content.total_max_use_coin)
+						this.orderInfo = res.data.content
+						if(this.orderInfo.address==null)
+						{
+							uni.showModal({
+								title:'提示',
+								content:'请先添加收货地址才可以购买商品！',
+								success(res) {
+									if (res.confirm) 
+									{
+										_this.$Router.push({name:'address'})
+									}
+									else
+									{
+										_this.$Router.back()
+									}
+								}
+							})
+						}
+						
+					}
+					else
+					{
+						uni.showToast({
+							title:res.data.message,icon:'none'
+						})
+					}
+					
+					
+				});
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: $page-color-base;
+		padding-bottom: 100upx;
+	}
+
+	.address-section {
+		padding: 30upx 0;
+		background: #fff;
+		position: relative;
+
+		.order-content {
+			display: flex;
+			align-items: center;
+		}
+
+		.icon-shouhuodizhi {
+			flex-shrink: 0;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 90upx;
+			color: #888;
+			font-size: 44upx;
+		}
+
+		.cen {
+			display: flex;
+			flex-direction: column;
+			flex: 1;
+			font-size: 28upx;
+			color: $font-color-dark;
+		}
+
+		.name {
+			font-size: 34upx;
+			margin-right: 24upx;
+		}
+
+		.address {
+			margin-top: 16upx;
+			margin-right: 20upx;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: 32upx;
+			color: $font-color-light;
+			margin-right: 30upx;
+		}
+
+		.a-bg {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			display: block;
+			width: 100%;
+			height: 5upx;
+		}
+	}
+
+	.goods-section {
+		margin-top: 16upx;
+		background: #fff;
+		padding-bottom: 1px;
+
+		.g-header {
+			display: flex;
+			align-items: center;
+			height: 84upx;
+			padding: 0 30upx;
+			position: relative;
+		}
+
+		.logo {
+			display: block;
+			width: 50upx;
+			height: 50upx;
+			border-radius: 100px;
+		}
+
+		.name {
+			font-size: 30upx;
+			color: $font-color-base;
+			margin-left: 24upx;
+		}
+
+		.g-item {
+			display: flex;
+			margin: 20upx 30upx;
+
+			image {
+				flex-shrink: 0;
+				display: block;
+				width: 140upx;
+				height: 140upx;
+				border-radius: 4upx;
+			}
+
+			.right {
+				flex: 1;
+				padding-left: 24upx;
+				overflow: hidden;
+			}
+
+			.title {
+				font-size: 30upx;
+				color: $font-color-dark;
+			}
+
+			.spec {
+				font-size: 26upx;
+				color: $font-color-light;
+			}
+
+			.price-box {
+				display: flex;
+				align-items: center;
+				font-size: 32upx;
+				color: $font-color-dark;
+				padding-top: 10upx;
+
+				.price {
+					margin-bottom: 4upx;
+					width: 100upx;
+				}
+				.number{
+					/*  #ifdef  APP-PLUS  */
+					margin-top: 40upx;
+					/*  #endif  */
+					margin-left: 160upx;
+					position: relative;
+				}
+			}
+
+			.step-box {
+				position: relative;
+			}
+		}
+	}
+	.yt-list {
+		margin-top: 16upx;
+		background: #fff;
+	}
+
+	.yt-list-cell {
+		display: flex;
+		align-items: center;
+		padding: 10upx 30upx 10upx 40upx;
+		line-height: 70upx;
+		position: relative;
+
+		&.cell-hover {
+			background: #fafafa;
+		}
+
+		&.b-b:after {
+			left: 30upx;
+		}
+
+		.cell-icon {
+			height: 32upx;
+			width: 32upx;
+			font-size: 22upx;
+			color: #fff;
+			text-align: center;
+			line-height: 32upx;
+			background: #f85e52;
+			border-radius: 4upx;
+			margin-right: 12upx;
+
+			&.hb {
+				background: #ffaa0e;
+			}
+
+			&.lpk {
+				background: #3ab54a;
+			}
+
+		}
+
+		.cell-more {
+			align-self: center;
+			font-size: 24upx;
+			color: $font-color-light;
+			margin-left: 8upx;
+			margin-right: -10upx;
+		}
+
+		.cell-tit {
+			flex: 1;
+			font-size: 26upx;
+			color: $font-color-light;
+			margin-right: 10upx;
+		}
+
+		.cell-tip {
+			font-size: 26upx;
+			color: $font-color-dark;
+
+			&.disabled {
+				color: $font-color-light;
+			}
+
+			&.active {
+				color: $base-color;
+			}
+			&.red{
+				color: $base-color;
+			}
+		}
+
+		&.desc-cell {
+			.cell-tit {
+				max-width: 90upx;
+			}
+		}
+
+		.desc {
+			flex: 1;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+	}
+	
+	/* 支付列表 */
+	.pay-list{
+		padding-left: 40upx;
+		margin-top: 16upx;
+		background: #fff;
+		.pay-item{
+			display: flex;
+			align-items: center;
+			padding-right: 20upx;
+			line-height: 1;
+			height: 110upx;	
+			position: relative;
+		}
+		.icon-weixinzhifu{
+			width: 80upx;
+			font-size: 40upx;
+			color: #6BCC03;
+		}
+		.icon-alipay{
+			width: 80upx;
+			font-size: 40upx;
+			color: #06B4FD;
+		}
+		.icon-xuanzhong2{
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 60upx;
+			height: 60upx;
+			font-size: 40upx;
+			color: $base-color;
+		}
+		.tit{
+			font-size: 32upx;
+			color: $font-color-dark;
+			flex: 1;
+		}
+	}
+	
+	.footer{
+		position: fixed;
+		left: 0;
+		bottom: 0;
+		z-index: 995;
+		display: flex;
+		align-items: center;
+		width: 100%;
+		height: 90upx;
+		justify-content: space-between;
+		font-size: 30upx;
+		background-color: #fff;
+		z-index: 998;
+		color: $font-color-base;
+		box-shadow: 0 -1px 5px rgba(0,0,0,.1);
+		.price-content{
+			padding-left: 30upx;
+		}
+		.price-tip{
+			color: $base-color;
+			margin-left: 8upx;
+		}
+		.price{
+			font-size: 36upx;
+			color: $base-color;
+		}
+		.submit{
+			display:flex;
+			align-items:center;
+			justify-content: center;
+			width: 280upx;
+			height: 100%;
+			color: #fff;
+			font-size: 32upx;
+			background-color: $base-color;
+		}
+	}
+	
+	/* 优惠券面板 */
+	.mask{
+		display: flex;
+		align-items: flex-end;
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0,0,0,0);
+		z-index: 9995;
+		transition: .3s;
+		
+		.mask-content{
+			width: 100%;
+			min-height: 30vh;
+			max-height: 70vh;
+			background: #f3f3f3;
+			transform: translateY(100%);
+			transition: .3s;
+			overflow-y:scroll;
+		}
+		&.none{
+			display: none;
+		}
+		&.show{
+			background: rgba(0,0,0,.4);
+			
+			.mask-content{
+				transform: translateY(0);
+			}
+		}
+	}
+
+	/* 优惠券列表 */
+	.coupon-item{
+		display: flex;
+		flex-direction: column;
+		margin: 20upx 24upx;
+		background: #fff;
+		.con{
+			display: flex;
+			align-items: center;
+			position: relative;
+			height: 120upx;
+			padding: 0 30upx;
+			&:after{
+				position: absolute;
+				left: 0;
+				bottom: 0;
+				content: '';
+				width: 100%;
+				height: 0;
+				border-bottom: 1px dashed #f3f3f3;
+				transform: scaleY(50%);
+			}
+		}
+		.left{
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			flex: 1;
+			overflow: hidden;
+			height: 100upx;
+		}
+		.title{
+			font-size: 32upx;
+			color: $font-color-dark;
+			margin-bottom: 10upx;
+		}
+		.time{
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+		.right{
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			font-size: 26upx;
+			color: $font-color-base;
+			height: 100upx;
+		}
+		.price{
+			font-size: 44upx;
+			color: $base-color;
+			&:before{
+				content: '￥';
+				font-size: 34upx;
+			}
+		}
+		.tips{
+			font-size: 24upx;
+			color: $font-color-light;
+			line-height: 60upx;
+			padding-left: 30upx;
+		}
+		.circle{
+			position: absolute;
+			left: -6upx;
+			bottom: -10upx;
+			z-index: 10;
+			width: 20upx;
+			height: 20upx;
+			background: #f3f3f3;
+			border-radius: 100px;
+			&.r{
+				left: auto;
+				right: -6upx;
+			}
+		}
+	}
+	
+	.con{
+		flex: 1;
+	}
+	.use_coin{
+		position:relative;
+		
+		
+		
+		/*  #ifndef  APP-PLUS  */
+		left: 100upx;
+		/*  #endif  */
+		
+		/*  #ifdef  APP-PLUS  */
+		top: 30upx;
+		left: 80upx;
+		/*  #endif  */
+	}
+	
+	.store_none{
+		font-size: 26upx;
+		color: $font-color-dark;
+		
+		&.disabled {
+			color: $font-color-light;
+		}
+		
+		&.active {
+			color: $base-color;
+		}
+		&.red{
+			color: $base-color;
+		}
+		
+		position:relative;
+		left: 250upx;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/evaluate.vue b/mallplusui-uniapp-app2/pages/order/evaluate.vue
new file mode 100644
index 0000000..f352358
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/evaluate.vue
@@ -0,0 +1,291 @@
+<template>
+	<view class="content">
+		<view class="content-top">
+			<view class="img-list">
+				<view class="img-list-item" v-for="item in info.orderItemList" :key="item.id">
+					<view class="img-list-item-gray">
+						<image class="img-list-item-l small-img" :src="item.productPic" mode="aspectFill"></image>
+						<view class="img-list-item-r small-right" @click="goodsDetail(item.productId)">
+							<view class="little-right-t">
+								<view class="goods-name list-goods-name">{{ item.productName }}</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="evaluate-num">
+						<view class="evaluate-num-t">商品评分</view>
+						<view class="evaluate-num-b">
+							<uni-rate value="2"></uni-rate>
+							<uniRate size="18" :id="item.productId" :value="score[item.productId]" @change="changeScore"></uniRate>
+						</view>
+					</view>
+
+					<view class="evaluate-content">
+						<view class="evaluate-c-t"><textarea v-model="textarea[item.productId]" placeholder="宝贝满足你的期待吗? 说说你的使用心得" /></view>
+						<view class="evaluate-c-b">
+							<view class="goods-img-item" v-if="images[item.productId].length" v-for="(img, key) in images[item.productId]" :key="key">
+								<image class="del" mode="" @click="removeImg(item.productId, key)"></image>
+								<image class="" :src="img.url" mode="" @click="clickImg(img.url)"></image>
+							</view>
+							<view class="upload-img" v-show="isupload[item.productId]">
+								<image class="icon" mode="" @click="uploadImg(item.productId)"></image>
+								<view class="">上传照片</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="button-bottom">
+			<button class="btn btn-square btn-b" hover-class="btn-hover" @click="toEvaluate" :disabled="submitStatus" :loading="submitStatus">提交评论</button>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+import uniRate from '@/components/uni-rate/uni-rate.vue';
+import { goods } from '@/config/mixins.js';
+export default {
+	mixins: [goods],
+	components: {
+		mallplusCopyright,
+		uniRate
+	},
+	data() {
+		return {
+			orderId: 0,
+			info: {}, // 订单详情
+			images: [],
+			score: [], // 商品评价
+			textarea: [], // 商品评价信息
+			isupload: [], // 启/禁用 图片上传按钮
+			rate: 5,
+			submitStatus: false
+		};
+	},
+	onLoad(options) {
+		this.orderId = options.order_id;
+		this.orderId
+			? this.orderInfo()
+			: this.$common.errorToShow('获取失败', () => {
+					uni.navigateBack({
+						delta: 1
+					});
+			  });
+	},
+	computed: {
+		// 获取vuex中状态
+		maxUploadImg() {
+			return 1;
+		}
+	},
+	methods: {
+		// 获取订单详情
+		async orderInfo() {
+			let params = { id: this.orderId };
+			this.orderInfo = await Api.apiCall('get', Api.order.orderDetail, params);
+			let images = [];
+			let textarea = [];
+			let upload = [];
+			let score = [];
+
+			this.orderInfo.orderItemList.forEach(item => {
+				if (item.type == 1) {
+					images[item.productId] = [];
+					textarea[item.productId] = '';
+					upload[item.productId] = true;
+					score[item.productId] = 5;
+				}
+			});
+
+			this.info = this.orderInfo;
+
+			this.images = images;
+			this.textarea = textarea;
+			this.score = score;
+			this.isupload = upload;
+		},
+		// 上传图片
+		uploadImg(key) {
+			this.$otherApi.uploadFiles(res => {
+				if (res.code == 200) {
+					let img = {
+						url: res.data,
+						id: res.data
+					};
+					this.images[key].push(img);
+					this.$common.successToShow(res.msg);
+				} else {
+					this.$common.errorToShow(res.msg);
+				}
+			});
+		},
+
+		// 删除图片
+		removeImg(id, key) {
+			this.images[id].splice(key, 1);
+		},
+		// 图片点击放大
+		clickImg(img) {
+			// 预览图片
+			uni.previewImage({
+				urls: img.split()
+			});
+		},
+		// 改变评分
+		changeScore(e) {
+			this.score[e.id] = e.value;
+		},
+		// 提交评价
+		async toEvaluate() {
+			this.submitStatus = true;
+
+			var myArray = new Array();
+			this.images.forEach((item, key) => {
+				let itemmm = {
+					goodsId: key,
+					images: item.url,
+					score: this.score[key],
+					textarea: this.textarea[key]
+				};
+				myArray.push(itemmm);
+			});
+			let params = {
+				orderId: this.orderId,
+				items: JSON.stringify(myArray)
+			};
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				uni.hideLoading();
+				uni.showToast({
+				    title: '评价成功'
+				});
+			}, 600);
+
+			let data = await Api.apiCall('post', Api.order.orderevaluate, params);
+			console.log(data);
+			if (data) {
+				// 更改订单列表页的订单状态
+				let pages = getCurrentPages(); // 当前页
+				let beforePage = pages[pages.length - 2]; // 上个页面
+				if (beforePage !== undefined && beforePage.route === 'pages/order/order') {
+					// #ifdef MP-WEIXIN
+					beforePage.$vm.isReload = true;
+					// #endif
+
+					// #ifdef H5
+					beforePage.isReload = true;
+					// #endif
+
+					// #ifdef MP-ALIPAY
+					beforePage.rootVM.isReload = true;
+					// #endif
+				}
+				this.submitStatus = false;
+				uni.navigateBack({
+					delta: 1
+				});
+			}
+			uni.hideLoading();
+		}
+	},
+	watch: {
+		images: {
+			handler() {
+				this.images.forEach((item, key) => {
+					this.isupload[key] = item.length > this.maxUploadImg ? false : true;
+				});
+			},
+			deep: true
+		}
+	}
+};
+</script>
+
+<style>
+.img-list-item {
+	padding: 30upx 20upx;
+}
+.img-list-item-gray {
+	background-color: #f7f7f7;
+	overflow: hidden;
+	padding: 18upx 20upx;
+}
+.small-right {
+	width: 520upx;
+}
+.evaluate-content {
+	background-color: #fff;
+	padding: 20upx 0upx;
+}
+.evaluate-c-t {
+	width: 100%;
+	height: 240upx;
+}
+.evaluate-c-t textarea {
+	width: 100%;
+	height: 100%;
+	font-size: 26upx;
+	padding: 10upx;
+}
+.evaluate-c-b {
+	overflow: hidden;
+}
+.upload-img {
+	width: 146upx;
+	height: 146upx;
+	margin: 14upx;
+	text-align: center;
+	color: #999999;
+	font-size: 22upx;
+	border: 2upx solid #e1e1e1;
+	/* #ifdef MP-ALIPAY */
+	border-top: 8upx solid #e1e1e1;
+	/* #endif */
+	border-radius: 4upx;
+	display: inline-block;
+	float: left;
+	padding: 24upx 0;
+}
+.goods-img-item {
+	width: 174upx;
+	height: 174upx;
+	padding: 14upx;
+	float: left;
+	position: relative;
+}
+.goods-img-item:nth-child(4n) {
+	margin-right: 0;
+}
+.goods-img-item image {
+	width: 100%;
+	height: 100%;
+}
+.del {
+	width: 30upx !important;
+	height: 30upx !important;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 999;
+}
+.evaluate-num {
+	padding: 20upx 26upx;
+	background-color: #fff;
+	margin-top: 20upx;
+}
+.evaluate-num-t {
+	color: #333;
+	font-size: 28upx;
+	margin-bottom: 20upx;
+}
+.button-bottom .btn {
+	width: 100%;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/logistics.vue b/mallplusui-uniapp-app2/pages/order/logistics.vue
new file mode 100644
index 0000000..adb498e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/logistics.vue
@@ -0,0 +1,230 @@
+<template>
+  <div class="div-bg bg-white" >
+    <div style="height: 0.5rem;width: 100%;background-color:#f7f7f7"></div>
+    <!--物流跟踪-->
+    <div style="padding-bottom: 0.5rem;">
+      <div class="bg-white" style="width: 92%; margin-left: 4%;margin: auto;padding-left: 15px;padding-right: 15px;">
+        <div style="font-size: 1rem;color: #111111;">物流跟踪<!--物流跟踪--></div>
+        <div>
+          <div class="track-rcol">
+            <div class="track-list">
+              <ul>
+                <div v-for="(item,index) in logisticsList" :key="index">
+                  <li class="first" v-if="index===0">
+                    <div></div>
+                    <i class="node-icon"></i>
+                    <span class="txt">{{item.AcceptStation}}</span>
+                    <span class="time">{{item.AcceptTime}}</span>
+                  </li>
+                  <li v-if="index > 0 && index !== logisticsList.length-1">
+                    <i class="node-icon"></i>
+                    <span class="txt">{{item.AcceptStation}}</span>
+                    <span class="time">{{item.AcceptTime}}</span>
+                  </li>
+                  <li v-if="index === logisticsList.length-1" class="finall">
+                    <i class="div-spilander"></i>
+                    <i class="node-icon"></i>
+                    <span class="txt">{{item.AcceptStation}}</span>
+                    <span class="time">{{item.AcceptTime}}</span>
+                  </li>
+                </div>
+              </ul>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+<script>
+import Api from '@/common/api';
+	
+export default {
+  name: 'Logic',
+  data () {
+    return {
+      logisticsList: []
+    }
+  },
+  async onLoad(options) {
+  	let params = { orderId: options.order_id };
+  	let returnLogisticby = await Api.apiCall('get', Api.order.logisticbyapi, params);
+	this.logisticsList = returnLogisticby.Traces;
+  },
+  methods: {
+  },
+  /**
+   * 加载时执行
+   */
+  mounted: function () {
+  }
+}
+</script>
+<style scoped>
+  .message-text{
+    font-family: MicrosoftYaHei;
+    font-size: 1rem;
+    font-weight: normal;
+    font-stretch: normal;
+    line-height: 3rem;
+    letter-spacing: 0rem;
+    color: #333333;
+    width: 50%;
+  }
+  .fontblack{
+    color:#999999
+  }
+  .img2{
+    width: .81rem;
+    height: .8rem;
+    float: right;
+  }
+  .addressshow2{
+    height: auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    width: 75%;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-all;
+    font-size: 1rem;
+  }
+  .addressshow1{
+    height: auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    width: 75%;
+    -webkit-line-clamp: 1;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-all;
+    font-size: 1rem;
+  }
+  .orderTitle{
+    font-size: 1rem;
+    color: #333333;
+    height: auto;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-line-clamp: 2;
+    -webkit-box-orient: vertical;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-all;
+    height: 2.5rem;
+  }
+  .orderDetail{
+    font-size: 0.8rem;
+    color: #666666;
+    text-align:left;
+  }
+  .border-ceter{
+    width: 92%;
+    padding-left: 15px;
+    padding-right: 15px;
+  }
+  .pay-button{
+    width: 88%;
+    height: 2.6rem;
+    position:relative;
+    background-color: red;
+    color: white;
+
+    margin-left: 6%;
+  }
+  ul li{
+    list-style:none;
+    font-size: 0.7rem;
+  }
+  ul {
+    padding-left: 1.5rem
+  }
+  .track-rcol{}
+  .track-list{
+    position:relative;
+  }
+  .track-list li{
+    position:relative;
+    padding:0px 0 1.5rem 25px;
+    line-height:1rem;
+    border-left:1px solid #d9d9d9;
+    color: #999;
+  }
+  .track-list li.first{
+    color:red;
+    padding-top:0;
+    width: 100%;
+    text-align: left;
+    border-left:1px solid #d9d9d9;
+  }
+  .track-list li .node-icon{
+    position: absolute;
+    left: -5.5px;
+    border-radius: 0.25rem;
+    width: 0.5rem;
+    height: 0.5rem;
+    top:4px;
+    background-color: #999999;
+  }
+  .track-list li.first .node-icon{
+    background-position:0-72px;
+    background-color: red;
+    width: 1rem;
+    z-index: 2;
+    height: 1rem;
+    position: absolute;
+    left: -9px;
+    top: 0;
+    border-radius: 0.5rem;
+  }
+  .track-list li .time{
+    margin-right:20px;
+    position:relative;
+    top:4px;
+    display:inline-block;
+    vertical-align:middle;
+    background-color: white;
+    color: #999;
+    width: 100%;
+    text-align: left;
+  }
+  .track-list li .txt{
+    position:relative;
+    display:inline-block;
+    vertical-align:top;
+    color: #999;
+  }
+  .track-list li.first .time{
+    text-align: left;
+    width: 94%;
+    color:red;
+  }
+  .track-list li.first .txt{
+    color: red;
+    text-align: left;
+    width: 94%;
+  }
+  .track-list li.finall{
+    position:relative;
+    padding:0px 0 1.5rem 25px;
+    line-height:18px;
+    border-color: white;
+    border-left:1px solid #ffffff;
+    color: #999;
+  }
+  .track-list li.finall .div-spilander{
+    width: 1px;
+    position: absolute;
+    position: absolute;
+    left: -1.5px;
+    height: 0.5rem;
+    background-color: #d9d9d9;
+  }
+
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/pages/order/order.vue b/mallplusui-uniapp-app2/pages/order/order.vue
new file mode 100644
index 0000000..99ff1e8
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/order.vue
@@ -0,0 +1,671 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+						<view class="i-top b-b">
+							<text class="time" @click="navToDetailPage(item)">{{ item.createTime }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}--</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.stateTip }}</text>
+							<!-- <text v-if="item.status === 12" class="del-btn yticon icon-iconfontshanchu1" @click="deleteOrder(index)"></text> -->
+						</view>
+
+						<scroll-view v-if="item.orderItemList.length > 1" class="goods-box" scroll-y>
+							<view v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex" class="goods-item">
+								<img class="goods-img" :src="goodsItem.productPic" @click="navToDetailPage(item)" mode="aspectFill" />
+							</view>
+						</scroll-view>
+						<view v-if="item.orderItemList.length === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill" />
+							<view class="right" @click="navToDetailPage(item)">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }}</text><br/>
+								<text class="title clamp" v-if="item.status === 5">{{ item.deliveryCompany }}:{{ item.deliverySn }}</text>
+								<text class="title clamp" v-if="item.status === 3">{{ item.deliveryCompany }}:{{ item.deliverySn }}</text>
+							</view>
+						</view>
+
+						<view class="price-box">
+							共
+							<text class="num">{{ item.orderItemList.length }}</text>
+							件商品 实付款
+							<text class="price">{{ item.payAmount }}</text>
+						</view>
+						<view class="action-box b-t">
+							<text class="state" :style="{ color: item.stateTipColor }" v-if="item.orderType == 6">秒杀订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 2">拼团订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 3">团购订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 4">砍价订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType == 5">积分订单</text>
+							<button v-if="item.status == 12" class="action-btn" @click="cancelOrder(item)">取消订单</button>
+							<button v-if="item.status == 12" class="action-btn recom" @click="payOrder(item)">立即支付</button>
+							<button v-if="item.status > 2 && item.status < 10" class="action-btn recom" @click="lookLogistics(item.id)">物流追踪</button>
+							<button v-if="item.status < 5" class="action-btn recom" @click="applyRefund(item.id)">申请售后</button>
+							<button v-if="item.status == 3" class="action-btn recom" @click="confimDelivery(item)">确认收货</button>
+							<button class="action-btn recom" hover-class="btn-hover" v-if="item.status === 4" @click="toEvaluate(item.id)">立即评价</button>
+						</view>
+					</view>
+					<uni-load-more :status="loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		mallplusCopyright,
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			pageNum: 1,
+			orderList: [],
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			loadingType: 'loading', //加载更多状态
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'loading',
+					orderList: []
+				},
+				{
+					status: 12,
+					text: '待付款',
+					loadingType: 'loading',
+					orderList: []
+				},
+				{
+					status: 2,
+					text: '待发货',
+					loadingType: 'loading',
+					orderList: []
+				},
+				{
+					status: 3,
+					text: '已发货',
+					loadingType: 'loading',
+					orderList: []
+				},
+				{
+					status: 5,
+					text: '已完成',
+					loadingType: 'loading',
+					orderList: []
+				}
+			]
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		this.tabCurrentIndex = +options.status;
+
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum+1;
+		this.loadData('refresh');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/order/orderDetail?id=${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(type = 'add', loading) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			console.log(navItem);
+			let status = navItem.status;
+			let url;
+
+			let params = { pageNum: this.pageNum, status: status };
+			let data = await Api.apiCall('get', Api.order.orderList, params);
+			console.log("data:------"+JSON.stringify(data))
+			let goodsList = data.records;
+			let goodsListJson = JSON.stringify(goodsList)
+			console.log("goodsList:"+goodsListJson)
+			let orderList = goodsList.filter(item => {
+				//添加不同状态下订单的表现形式
+				item = Object.assign(item, this.orderStateExp(item.status));
+				item.createTime = this.dateFormat(item.createTime);
+				//演示数据所以自己进行状态筛选
+				if (status === 0) {
+					//0为全部订单
+					return item;
+				}
+				return item.status === status;
+			});
+
+			if (type === 'refresh') {
+				this.orderList = [];
+			}
+			this.orderList = this.orderList.concat(orderList);
+			console.log("this.orderList.length======:"+this.orderList.length)
+			console.log("data.total======:"+data.total)
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.orderList.length >= data.total ? 'nomore' : 'loading';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+
+			navItem.orderList = [];
+			console.log(JSON.stringify(orderList))
+			orderList.forEach(item => {
+				console.log("item-----:"+item)
+				navItem.orderList.push(item);
+			});
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			//this.pageNum =  1;
+			this.loadData('refresh');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.pageNum = 1;
+			this.loadData('refresh');
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		async deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+				uni.showToast({
+				    title: '删除成功'
+				});
+			}, 600);
+		},
+		async payOrder(item) {
+			let url = '/pages/order/payment/index?order_id=' + item.id + '&type=1';
+			this.$common.navigateTo(url);
+		},
+		//取消订单
+		async cancelOrder(item) {
+			let params = { orderId: item.id };
+			let data = await Api.apiCall('post', Api.order.closeOrder, params);
+			console.log(data)
+			if (data) {
+				this.$api.msg(data);
+				this.pageNum = 1;
+				this.loadData('refresh');
+				this.tabCurrentIndex = 4;
+			}
+		},
+		//订单确认收货
+		async confimDelivery(item) {
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.confimDelivery, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data);
+				this.pageNum = 1;
+				this.loadData('refresh');
+				this.tabCurrentIndex = 4;
+			}
+		},
+		lookLogistics(orderId) {
+			this.$common.navigateTo('/pages/order/logistics?order_id=' + orderId);
+		},
+
+		// 申请售后
+		applyRefund(orderId) {
+			this.$common.navigateTo('../../pagesA/after_sale/index?order_id=' + orderId);
+		},
+
+		//订单申请退款
+		async applyRefund1(item) {
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.applyRefund, params);
+			if (data) {
+				console.log(data);
+				this.$api.msg(data);
+			}
+			this.pageNum = 1;
+			this.loadData('refresh');
+			this.tabCurrentIndex = 5;
+		},
+		// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo('/pages/order/evaluate?order_id=' + orderId);
+		},
+
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+				stateTipColor = '#fa436a';
+			if (value === 12) {
+				stateTipColor = '#909399';
+				stateTip = '待付款';
+			}
+			if (value === 1) {
+				stateTipColor = '#909399';
+				stateTip = '支付成功，没有回掉';
+			}
+			if (value === 2) {
+				stateTip = '待发货';
+			} else if (value === 3) {
+				stateTip = '待收货';
+			} else if (value === 4) {
+				stateTip = '待评价';
+			} else if (value === 5) {
+				stateTip = '已完成';
+			} else if (value === 6) {
+				stateTipColor = '#909399';
+				stateTip = '维权中';
+			} else if (value === 7) {
+				stateTip = ' 维权已完成';
+			} else if (value === 8) {
+				stateTip = '待分享';
+			} else if (value === 13) {
+				stateTip = '申请退款';
+			} else if (value === 14) {
+				stateTip = '已退款';
+			} else if (value === 15) {
+				stateTip = '已关闭';
+			} else if (value === 16) {
+				stateTip = '无效订单';
+			} else if (value === 18) {
+				stateTip = '拼团下单';
+			} else {
+				stateTip = '待付款';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/orderDetail.vue b/mallplusui-uniapp-app2/pages/order/orderDetail.vue
new file mode 100644
index 0000000..59c9486
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/orderDetail.vue
@@ -0,0 +1,590 @@
+<template>
+	<view class="content">
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<!-- 订单列表 -->
+					<view class="order-item">
+						<view class="i-top b-b">
+							<text class="time">{{ orderInfo.createTime }}</text>
+							<text class="state" :style="{ color: orderInfo.stateTipColor }" @click="navToDetailPage(item)">{{ orderInfo.id }}--</text>
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">{{ orderInfo.stateTip }}</text>
+							<text v-if="orderInfo.status === 9" class="del-btn yticon icon-iconfontshanchu1" @click="deleteOrder(index)"></text>
+						</view>
+						<view class="i-top b-b">
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单商品</text>
+						</view>
+
+						<view v-if="goodsItem.type === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in orderInfo.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }} </text>
+							</view>
+						</view>
+						<view class="i-top b-b">
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单赠品</text>
+						</view>
+						<view v-if="goodsItem.type === 2" class="goods-box-single" v-for="(goodsItem, goodsIndex) in orderInfo.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }} </text>
+							</view>
+						</view>
+						<view class="price-box">
+							共
+							<text class="num">{{ orderInfo.orderItemList.length }}</text>
+							件商品, 会员折扣
+							<text class="price">{{ orderInfo.vipAmount }}</text>
+							 优惠券抵扣
+                            							<text class="price">{{ orderInfo.couponAmount }}</text>
+						</view>
+						<view class="price-box">
+                            							 积分抵扣
+                                                        							<text class="price">{{ orderInfo.integrationAmount }}</text>
+							 ,运费
+							<text class="price">{{ orderInfo.freightAmount }}</text>
+							<view class="yt-list-cell b-b" v-if="groupActivity">
+								<text class="cell-tit clamp">活动金额</text>
+								<text class="cell-tip">￥{{ groupActivity.price }}</text>
+							</view>
+							 ,实付款
+							<text class="price">{{ orderInfo.payAmount }}</text>
+						</view>
+						<view class="action-box b-t">
+							<button v-if="orderInfo.status == 12" class="action-btn" @click="cancelOrder(orderInfo)">取消订单</button>
+							<button v-if="orderInfo.status == 12" class="action-btn recom" @click="payOrder(orderInfo)">立即支付</button>
+							<button v-if="orderInfo.status <7" class="action-btn recom" @click="applyRefund(orderInfo.id)">申请售后</button>
+							<button v-if="orderInfo.status == 3" class="action-btn recom" @click="confimDelivery(orderInfo)">确认收货</button>
+							<button class='action-btn recom'
+									hover-class="btn-hover"
+									v-if="orderInfo.status === 4"
+									@click="toEvaluate(orderInfo.id)"
+							>立即评价</button>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import Json from '@/Json';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			orderInfo: [],
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 12,
+					text: '待付款',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 2,
+					text: '待发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 3,
+					text: '已发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 4,
+					text: '已完成',
+					loadingType: 'more',
+					orderList: []
+				}
+			]
+		};
+	},
+
+	async onLoad(options) {
+		let params = { id: options.id };
+		this.orderInfo = await Api.apiCall('get', Api.order.orderDetail, params);
+		this.orderInfo = Object.assign(this.orderInfo, this.orderStateExp(this.orderInfo.status));
+		this.orderInfo.createTime = this.dateFormat(this.orderInfo.createTime);
+	},
+
+	methods: {
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		async deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+			}, 600);
+		},
+		async payOrder(item) {
+			 let url = '/pages/order/payment/index?order_id=' + item.id + '&type=1' ;
+            			this.$common.navigateTo(
+            					url
+            			)
+		},
+		//取消订单
+		async cancelOrder(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { orderId: item.id };
+			let data = await Api.apiCall('post', Api.order.closeOrder, params);
+
+			if (data) {
+				this.$api.msg(data.data);
+			}
+			uni.hideLoading();
+		},
+		//订单确认收货
+		async confimDelivery(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.confimDelivery, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+			uni.hideLoading();
+		},
+			// 申请售后
+                		applyRefund(orderId) {
+                			this.$common.navigateTo(
+                					'../../pagesA/after_sale/index?order_id=' + orderId
+                			)
+                		},
+
+		//订单申请退款
+		async applyRefund1(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.applyRefund, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data.data);
+			}
+			uni.hideLoading();
+		},
+// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo(
+					'/pages/order/evaluate?order_id=' + orderId
+			)
+		},
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 12) {
+				stateTipColor = '#909399';
+				return '待付款';
+			}if (value === 1) {
+				stateTipColor = '#909399';
+				return '支付成功，没有回掉';
+			}if (value === 2) {
+				stateTip = '待发货';
+			} else if (value === 3) {
+				stateTip = '待收货';
+			} else if (value === 4) {
+				stateTip = '待评价';
+			} else if (value === 5) {
+				stateTip = '已完成';
+			} else if (value === 6) {
+				stateTipColor = '#909399';
+				stateTip = '维权中';
+			} else if (value === 7) {
+				stateTip = ' 维权已完成';
+			} else if (value === 8) {
+				stateTip = '待分享';
+			} else if (value === 13) {
+				stateTip = '申请退款';
+			} else if (value === 14) {
+				stateTip = '已退款';
+			}  else if (value === 15) {
+				stateTip = '已关闭';
+			} else if (value === 16) {
+				stateTip = '无效订单';
+			} else {
+				stateTip = '待付款';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/payment/auth.vue b/mallplusui-uniapp-app2/pages/order/payment/auth.vue
new file mode 100644
index 0000000..441a558
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/payment/auth.vue
@@ -0,0 +1,159 @@
+<template>
+  <view class="content">
+    <view class="content-c">
+
+      <view class="load-text color-9">信息加载中.....</view>
+    </view>
+  </view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      type: '',
+      openid: '',
+      orderId: '',
+      state: ''
+    }
+  },
+  onLoad(options) {
+    this.orderId = options.order_id
+    this.money = Number(options.money)
+    this.type = Number(options.type)
+    this.uid = Number(options.uid)
+    this.state = this.$common.getQueryString('state')
+    this.getCode()
+  },
+  methods: {
+    getCode() {
+      var code = this.$common.getQueryString('code')
+      code && this.getOpenId(code)
+    },
+    async getOpenId(code) {
+      console.log(code)
+      let params = {
+        code: code,
+        scope: 2,
+        state: this.state
+      }
+      //模拟接口
+      let res = await Api.apiCall('get',Api.order.authCodeToOpenid,params);
+      console.log(res);
+      if (res) {
+            this.login(data);
+            console.log(data);
+            this.$db.set('userInfos', data.userInfo);
+            this.$db.set('token', data.tokenHead+data.token);
+            uni.switchTab({
+              url: '/pages/index/index'
+            });
+
+          //this.openid = res.data
+        //  this.toPayHandler('wechatpay')
+        } else {
+          this.$common.errorToShow(res)
+        }
+
+    },
+    checkWXJSBridge(data) {
+      let that = this
+      let interval = setInterval(() => {
+        if (typeof window.WeixinJSBridge != 'undefined') {
+          clearTimeout(interval)
+          that.onBridgeReady(data)
+        }
+      }, 200)
+    },
+    onBridgeReady(data) {
+      var _this = this
+      window.WeixinJSBridge.invoke(
+        'getBrandWCPayRequest',
+        {
+          appId: data.appid, // 公众号名称，由商户传入
+          timeStamp: data.timeStamp, // 时间戳，自1970年以来的秒数
+          nonceStr: data.nonceStr, // 随机串
+          package: data.package,
+          signType: data.signType, // 微信签名方式：
+          paySign: data.paySign // 微信签名
+        },
+        function(res) {
+          if (res.err_msg === 'get_brand_wcpay_request:ok') {
+            _this.$common.successToShow('支付成功')
+          } else if (res.err_msg === 'get_brand_wcpay_request:cancel') {
+            _this.$common.errorToShow('取消支付')
+          } else {
+            _this.$common.errorToShow('支付失败')
+          }
+          setTimeout(() => {
+            _this.$common.redirectTo(
+              '/pages/order/payment/result?id=' + data.id
+            )
+          },1000)
+        }
+      )
+    },
+    toPayHandler(code) {
+      let data = {
+        payment_code: code,
+        payment_type: this.type
+      }
+	  data['ids'] = (this.type == 1 || this.type == 5 || this.type == 6) ? this.orderId : this.uid
+      //data['ids'] = this.type == 1 ? this.orderId : this.uid
+
+      if (this.type == 1 && this.orderId) {
+        // 微信jsapi支付
+        if (this.openid) {
+          data['params'] = {
+            trade_type: 'JSAPI_OFFICIAL',
+            openid: this.openid
+          }
+        }
+      } else if (this.type == 2 && this.money) {
+        if (this.openid) {
+          data['params'] = {
+            trade_type: 'JSAPI_OFFICIAL',
+            money: this.money,
+            openid: this.openid
+          }
+        }
+      }else if ((this.type == 5 || this.type == 6) && this.recharge) {
+		data['params'] = {
+			trade_type: 'JSAPI_OFFICIAL',
+			openid: this.openid,
+			formid: this.orderId
+		}
+	  }
+      this.$api.pay(data, res => {
+        if (res.code == 200) {
+          const data = res.data
+          this.checkWXJSBridge(data)
+        } else {
+          this.$common.errorToShow(res.msg)
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style>
+.content {
+  position: relative;
+  height: 80vh;
+}
+.content-c {
+  position: absolute;
+  top: 50%;
+  left: 50%;
+  transform: translate(-50%, -50%);
+  text-align: center;
+}
+.load-img {
+  width: 100upx;
+  height: 100upx;
+}
+.load-text {
+  font-size: 26upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/payment/index.vue b/mallplusui-uniapp-app2/pages/order/payment/index.vue
new file mode 100644
index 0000000..d152b9a
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/payment/index.vue
@@ -0,0 +1,231 @@
+<template>
+	<view class="app">
+
+		<view class="price-box">
+			<text>支付金额</text>
+			<text class="price">{{orderInfo.payAmount}}</text>
+		</view>
+
+		<!-- #ifdef H5 -->
+		<payments-by-h5
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-h5>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-WEIXIN -->
+		<payments-by-wx
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-wx>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-ALIPAY -->
+		<payments-by-ali
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-ali>
+		<!-- #endif -->
+
+		<!-- #ifdef APP-PLUS||APP-PLUS-NVUE -->
+		<payments-by-app
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-app>
+		<!-- #endif -->
+	</view>
+</template>
+
+
+
+<script>
+    // #ifdef H5
+    import paymentsByH5 from '@/components/payments/paymentsByH5.vue'
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    import paymentsByWx from '@/components/payments/paymentsByWx.vue'
+    // #endif
+
+    // #ifdef MP-ALIPAY
+    import paymentsByAli from '@/components/payments/paymentsByAli.vue'
+    // #endif
+
+    // #ifdef APP-PLUS||APP-PLUS-NVUE
+    import paymentsByApp from '@/components/payments/paymentsByApp.vue'
+    // #endif
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+    export default {
+
+        data () {
+            return {
+                orderId: 0,
+                recharge: 0,
+                type: 1,	// 订单类型 1商品订单 2充值订单
+                orderInfo: {}, // 订单详情
+                userInfo: {},	// 用户信息
+				form_id:0
+            }
+        },
+
+        components: {
+            // #ifdef H5
+            paymentsByH5,
+            // #endif
+            // #ifdef MP-WEIXIN
+            paymentsByWx,
+            // #endif
+            // #ifdef MP-ALIPAY
+            paymentsByAli,
+            // #endif
+            // #ifdef APP-PLUS||APP-PLUS-NVUE
+            paymentsByApp,
+            // #endif
+        },
+
+        onLoad (options) {
+            this.orderId = options.order_id
+            this.recharge = Number(options.recharge)
+            this.type = Number(options.type)
+			this.form_id =  Number(options.form_id)
+
+            if (this.orderId && this.type == 1) {
+                // 商品订单
+                this.getOrderInfo()
+            } else if (this.recharge && this.type == 2) {
+                // 充值订单 获取用户id
+                this.getUserInfo()
+            } else if (this.form_id && (this.type == 5 || this.type == 6)) {
+				// 表单订单 id传到订单上
+				this.orderId = ''+this.form_id;
+			} else {
+                this.$common.errorToShow('订单支付参数错误', () => {
+                    uni.navigateBack({
+                        delta: 1
+                    })
+                })
+            }
+        },
+        methods: {
+            // 获取订单详情
+			async getOrderInfo () {
+
+				let params = {'id':this.orderId};
+				this.orderInfo = await Api.apiCall('get',Api.order.orderDetail,params);
+				if(this.orderInfo.pay_status == 2){
+					this.$common.redirectTo(
+							'/pages/order/payment/result?order_id=' + this.orderInfo.id
+					)
+				}
+            },
+            // 获取用户信息
+            getUserInfo () {
+                this.$api.userInfo({}, res => {
+                    if (res.code == 200) {
+                        this.userInfo = res.data
+
+                    } else {
+                        this.$common.errorToShow(res.msg)
+                    }
+                })
+            },
+            // 跳转我的余额页面
+            toRecharge () {
+                this.$common.navigateTo('/pages/member/balance/index')
+            }
+        }
+    }
+</script>
+<style lang='scss'>
+	.app {
+		width: 100%;
+	}
+
+	.price-box {
+		background-color: #fff;
+		height: 265upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 28upx;
+		color: #909399;
+
+		.price{
+			font-size: 50upx;
+			color: #303133;
+			margin-top: 12upx;
+			&:before{
+				content: '￥';
+				font-size: 40upx;
+			}
+		}
+	}
+
+	.pay-type-list {
+		margin-top: 20upx;
+		background-color: #fff;
+		padding-left: 60upx;
+
+		.type-item{
+			height: 120upx;
+			padding: 20upx 0;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding-right: 60upx;
+			font-size: 30upx;
+			position:relative;
+		}
+
+		.icon{
+			width: 100upx;
+			font-size: 52upx;
+		}
+		.icon-erjiye-yucunkuan {
+			color: #fe8e2e;
+		}
+		.icon-weixinzhifu {
+			color: #36cb59;
+		}
+		.icon-alipay {
+			color: #01aaef;
+		}
+		.tit{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			margin-bottom: 4upx;
+		}
+		.con{
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+	.mix-btn {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 630upx;
+		height: 80upx;
+		margin: 80upx auto 30upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/payment/index1.vue b/mallplusui-uniapp-app2/pages/order/payment/index1.vue
new file mode 100644
index 0000000..4a7b0a0
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/payment/index1.vue
@@ -0,0 +1,210 @@
+<template>
+	<view class="content">
+		<view class='cell-group margin-cell-group'>
+			<view class='cell-item'>
+				<view class='cell-item-hd'>
+					<view class='cell-hd-title'>订单类型</view>
+				</view>
+				<view class='cell-item-ft'>
+					<text class="cell-ft-p" v-if="type == 1" @click="orderDetail(orderId)">商品订单</text>
+					<text class="cell-ft-p" v-if="type == 2" @click="toRecharge()">充值订单</text>
+					<text class="cell-ft-p" v-if="type == 5" >快捷下单</text>
+					<text class="cell-ft-p" v-if="type == 6" >付款码</text>
+				</view>
+			</view>
+			<view v-if="type == 1">
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>订单编号</view>
+					</view>
+					<view class='cell-item-ft'>
+						<text class="cell-ft-p" @click="orderDetail(orderId)">{{ orderId }}</text>
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>订单金额</view>
+					</view>
+					<view class='cell-item-ft'>
+						<text class="cell-ft-p red-price">￥{{ orderInfo.payAmount }}</text>
+					</view>
+				</view>
+			</view>
+			<view v-else-if="type == 2">
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>充值金额</view>
+					</view>
+					<view class='cell-item-ft'>
+						<text class="cell-ft-p red-price">￥ {{ recharge }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- #ifdef H5 -->
+		<payments-by-h5
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-h5>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-WEIXIN -->
+		<payments-by-wx
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-wx>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-ALIPAY -->
+		<payments-by-ali
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-ali>
+		<!-- #endif -->
+
+		<!-- #ifdef APP-PLUS||APP-PLUS-NVUE -->
+		<payments-by-app
+				:orderId="orderId"
+				:recharge="recharge"
+				:type="type"
+				:uid="userInfo.id"
+		></payments-by-app>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+    // #ifdef H5
+    import paymentsByH5 from '@/components/payments/paymentsByH5.vue'
+    // #endif
+
+    // #ifdef MP-WEIXIN
+    import paymentsByWx from '@/components/payments/paymentsByWx.vue'
+    // #endif
+
+    // #ifdef MP-ALIPAY
+    import paymentsByAli from '@/components/payments/paymentsByAli.vue'
+    // #endif
+
+    // #ifdef APP-PLUS||APP-PLUS-NVUE
+    import paymentsByApp from '@/components/payments/paymentsByApp.vue'
+    // #endif
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+    export default {
+
+        data () {
+            return {
+                orderId: 0,
+                recharge: 0,
+                type: 1,	// 订单类型 1商品订单 2充值订单
+                orderInfo: {}, // 订单详情
+                userInfo: {},	// 用户信息
+				form_id:0
+            }
+        },
+
+        components: {
+            // #ifdef H5
+            paymentsByH5,
+            // #endif
+            // #ifdef MP-WEIXIN
+            paymentsByWx,
+            // #endif
+            // #ifdef MP-ALIPAY
+            paymentsByAli,
+            // #endif
+            // #ifdef APP-PLUS||APP-PLUS-NVUE
+            paymentsByApp,
+            // #endif
+        },
+
+        onLoad (options) {
+            this.orderId = options.order_id
+            this.recharge = Number(options.recharge)
+            this.type = Number(options.type)
+			this.form_id =  Number(options.form_id)
+
+            if (this.orderId && this.type == 1) {
+                // 商品订单
+                this.getOrderInfo()
+            } else if (this.recharge && this.type == 2) {
+                // 充值订单 获取用户id
+                this.getUserInfo()
+            } else if (this.form_id && (this.type == 5 || this.type == 6)) {
+				// 表单订单 id传到订单上
+				this.orderId = ''+this.form_id;
+			} else {
+                this.$common.errorToShow('订单支付参数错误', () => {
+                    uni.navigateBack({
+                        delta: 1
+                    })
+                })
+            }
+        },
+        methods: {
+            // 获取订单详情
+			async getOrderInfo () {
+
+				let params = {'id':this.orderId};
+				this.orderInfo = await Api.apiCall('get',Api.order.orderDetail,params);
+				if(this.orderInfo.pay_status == 2){
+					this.$common.redirectTo(
+							'/pages/order/payment/result?order_id=' + this.orderInfo.id
+					)
+				}
+            },
+            // 获取用户信息
+            getUserInfo () {
+                this.$api.userInfo({}, res => {
+                    if (res.code == 200) {
+                        this.userInfo = res.data
+
+                    } else {
+                        this.$common.errorToShow(res.msg)
+                    }
+                })
+            },
+            // 跳转我的余额页面
+            toRecharge () {
+                this.$common.navigateTo('/pages/member/balance/index')
+            }
+        }
+    }
+</script>
+
+<style>
+	.margin-cell-group{
+		margin-bottom: 20upx;
+	}
+	.cell-hd-title{
+		color: #999;
+	}
+	.payment-method .cell-item-hd{
+		min-width: 70upx;
+	}
+	.payment-method .cell-hd-icon{
+		width: 70upx;
+		height: 70upx;
+	}
+	.payment-method .cell-item-bd{
+		border-left: 2upx solid #F0F0F0;
+		padding-left: 30upx;
+	}
+	.payment-method .cell-bd-text{
+		font-size: 28upx;
+		color: #666;
+	}
+	.payment-method .address{
+		font-size: 24upx;
+		color: #999;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/order/payment/result.vue b/mallplusui-uniapp-app2/pages/order/payment/result.vue
new file mode 100644
index 0000000..de47d65
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/order/payment/result.vue
@@ -0,0 +1,75 @@
+<template>
+	<view class="content">
+		<text class="success-icon yticon icon-xuanzhong2"></text>
+		<text class="tit">支付成功</text>
+		<view class="result-mid red-price">
+			{{ paymentInfo.payAmount }}
+		</view>
+		<view class="btn-group">
+			<navigator url="/pages/order/order?status=0" open-type="redirect" class="mix-btn">查看订单</navigator>
+			<navigator url="/pages/index/index" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	export default {
+		data() {
+			return {
+				paymentId: 0,
+				paymentInfo: {}, // 支付单详情
+				orderId: 0,
+				status: false
+			}
+		},
+		onLoad(options) {
+			if (options.order) {
+				let order  = JSON.parse(options.order)
+				this.orderId = order.id
+				this.paymentInfo = order
+			}
+
+		},
+		methods: {}
+	};
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	.success-icon {
+		font-size: 160upx;
+		color: #fa436a;
+		margin-top: 100upx;
+	}
+	.tit {
+		font-size: 38upx;
+		color: #303133;
+	}
+	.btn-group {
+		padding-top: 100upx;
+	}
+	.mix-btn {
+		margin-top: 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 600upx;
+		height: 80upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		&.hollow {
+			background: #fff;
+			color: #303133;
+			border: 1px solid #ccc;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/public/index.vue b/mallplusui-uniapp-app2/pages/public/index.vue
new file mode 100644
index 0000000..dd484bd
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/public/index.vue
@@ -0,0 +1,373 @@
+<template>
+  <view class="content">
+    <view class="login-t">
+      <image class="login-logo" :src="logoImage" mode="aspectFill"></image>
+    </view>
+    <view class="login-m">
+      <view class="login-item">
+        <input type="number" v-model="mobile" :maxlength="maxMobile" placeholder="请输入手机号码" focus placeholder-class="login-item-i-p" />
+      </view>
+      <view class="login-item flc">
+        <input class="login-item-input" placeholder-class="login-item-i-p" type="text" v-model="code" placeholder="请输入验证码" />
+        <view :class="sendCodeBtn" @click="sendCode" v-if="verification">发送验证码</view>
+        <view class="btn btn-g" v-if="!verification">{{ timer }} 秒后重新获取</view>
+      </view>
+
+    </view>
+    <view class="login-b">
+      <!-- #ifdef H5|APP-PLUS|APP-PLUS-NVUE -->
+      <view v-if="user_wx_id">
+        <button :class="regButtonClass" @click="toBind()" hover-class="btn-hover">登录</button>
+      </view>
+      <view v-else>
+        <button :class="regButtonClass" @click="login()" hover-class="btn-hover">登录</button>
+        <view class="login-other flc">
+          <view class="fz12 item" @click="selectLoginType">
+            密码登录
+          </view>
+          <view class="fz12 item" @click="toReg">
+            注册
+          </view>
+        </view>
+      </view>
+      <!-- #endif -->
+      <!-- #ifdef MP -->
+      <button :class="regButtonClass" @click="showTopTips()" hover-class="btn-hover">登录</button>
+      <!-- #endif -->
+
+    </view>
+<!-- <mallplusCopyright></mallplusCopyright> -->
+  </view>
+</template>
+
+<script>
+import { mapMutations, mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import store from '@/store/index';
+import { goBack, jumpBackPage } from '@/config/mixins.js'
+export default {
+components: {
+		mallplusCopyright
+	},
+  mixins: [goBack,jumpBackPage],
+  data() {
+    return {
+      maxMobile: 11,
+      mobile: '', // 用户手机号
+      code: '', // 短信验证码
+      user_wx_id: '', //授权id
+      verification: true, // 通过v-show控制显示获取还是倒计时
+      timer: 60, // 定义初始时间为60s
+      btnb: 'btn btn-square btn-c btn-all', //按钮背景
+      type: '', // 有值是第三方登录账号绑定
+      isWeixinBrowser: this.$common.isWeiXinBrowser()
+    }
+  },
+  onLoad(option) {
+    if (option.user_wx_id) {
+      this.user_wx_id = option.user_wx_id
+      uni.setNavigationBarTitle({
+        title: '绑定手机号'
+      })
+    }
+
+
+    // H5第三方授权登录绑定
+    // if (option.type && option.type === 'bind') {
+    // 	this.type = option.type
+    // 	uni.setNavigationBarTitle({
+    // 		title: '绑定手机号'
+    // 	})
+    // }
+  },
+  computed: {
+    // 验证手机号
+    rightMobile() {
+      let res = {}
+      if (!this.mobile) {
+        res.status = false
+        res.msg = '请输入手机号'
+      } else if (!/^1[3456789]{1}\d{9}$/gi.test(this.mobile)) {
+        res.status = false
+        res.msg = '手机号格式不正确'
+      } else {
+        res.status = true
+      }
+      return res
+    },
+    // 动态计算发送验证码按钮样式
+    sendCodeBtn() {
+      let btn = 'btn btn-g'
+      if (this.mobile.length === this.maxMobile && this.rightMobile.status) {
+        return btn + ' btn-b'
+      } else {
+        return btn
+      }
+    },
+    // 动态更改登录按钮bg
+    regButtonClass() {
+      return this.mobile && this.mobile.length === this.maxMobile && this.code
+        ? this.btnb + ' btn-b'
+        : this.btnb
+    },
+    logoImage() {
+      return '/static/missing-face.png'
+    }
+  },
+  onShow() {
+    let _this = this
+    let userToken = _this.$db.get('userToken')
+    if (userToken) {
+      uni.switchTab({
+        url: '/pages/member/index/index'
+      })
+      return true
+    }
+    _this.timer = parseInt(_this.$db.get('timer'))
+    if (_this.timer != null && _this.timer > 0) {
+      _this.countDown()
+      _this.verification = false
+    }
+  },
+  methods: {
+    // 发送短信验证码
+    sendCode() {
+      if (!this.rightMobile.status) {
+        this.$common.errorToShow(this.rightMobile.msg)
+      } else {
+        this.$common.loadToShow('发送中...')
+        setTimeout(() => {
+          this.$common.loadToHide()
+          this.$api.sms({ mobile: this.mobile, code: 'login' }, res => {
+            if (res.status) {
+              this.timer = 60
+              this.verification = false
+              this.$common.successToShow(res.msg)
+              this.countDown() // 执行验证码计时
+              // this.btnb = 'btn btn-square btn-all btn-b';
+            } else {
+              this.$common.errorToShow(res.msg)
+            }
+          })
+        }, 1000)
+      }
+    },
+    // 去注册
+    toReg() {
+      this.$common.navigateTo('/pages/login/register/index')
+    },
+    // 验证码倒计时
+    countDown() {
+      let auth_timer = setInterval(() => {
+        // 定时器设置每秒递减
+        this.timer-- // 递减时间
+        uni.setStorage({
+          key: 'timer',
+          data: this.timer,
+          success: function() {}
+        })
+        if (this.timer <= 0) {
+          this.verification = true // 60s时间结束还原v-show状态并清除定时器
+          clearInterval(auth_timer)
+        }
+      }, 1000)
+    },
+    // 登录
+    login() {
+      var _this = this
+      if (!_this.rightMobile.status) {
+        _this.$common.errorToShow(_this.rightMobile.msg)
+      } else {
+        // 短信验证码登录
+        if (!_this.code) {
+          _this.$common.errorToShow('请输入短信验证码!')
+        } else {
+          let data = {
+            mobile: _this.mobile,
+            code: _this.code
+          }
+
+          let invicode = _this.$db.get('invitecode')
+          if (invicode) {
+            data.invitecode = invicode
+          }
+
+          _this.$api.smsLogin(data, res => {
+            if (res.status) {
+              this.$db.set('userToken', res.data)
+              _this.redirectHandler()
+            } else {
+              _this.$common.errorToShow(res.msg)
+            }
+          })
+        }
+      }
+    },
+    // 重定向跳转 或者返回上一个页面
+    redirectHandler() {
+      this.$common.successToShow('登录成功!', () => {
+        this.$db.set('timer', 0)
+        this.$db.del('invitecode')
+        this.handleBack()
+      })
+    },
+    // 跳转到普通登录
+    toLogin() {
+      uni.navigateTo({
+        url: '../../login/login/index'
+      })
+    },
+    //提交按钮
+    showTopTips: function() {
+      let _this = this
+      if (_this.mobile == '') {
+        _this.$common.errorToShow('请输入手机号码')
+        return false
+      }
+      if (this.code == '') {
+        _this.$common.errorToShow('请输入验证码')
+        return false
+      }
+      if (_this.user_wx_id == 0) {
+        _this.$common.errorToShow('登录失败，请稍后再试', function() {
+          uni.navigateBack({
+            delta: 1
+          })
+        })
+        return false
+      }
+      var platform = 2
+      //1就是h5登陆（h5端和微信公众号端），2就是微信小程序登陆，3是支付宝小程序，4是app，5是pc
+      // #ifdef MP-ALIPAY
+      platform = 3
+      // #endif
+      // #ifdef APP-PLUS||APP-PLUS-NVUE
+      platform = 4
+      // #endif
+      var data = {
+        mobile: _this.mobile,
+        code: _this.code,
+        platform: platform, //平台id，标识是小程序登陆的
+        user_wx_id: _this.user_wx_id //微信小程序接口存不了session，所以要绑定的id只能传到前台
+      }
+      //有推荐码的话，带上
+      var invitecode = _this.$db.get('invitecode')
+      if (invitecode) {
+        data.invitecode = invitecode
+      }
+      _this.$api.smsLogin(data, function(res) {
+        if (res.status) {
+          _this.$db.set('userToken', res.data)
+          _this.redirectHandler()
+        } else {
+          //报错了
+          _this.$common.errorToShow(res.msg)
+        }
+      })
+    },
+    // 公众号第三方登录账号绑定
+    toBind() {
+      if (this.mobile == '') {
+        this.$common.errorToShow('请输入手机号码')
+        return false
+      }
+      if (this.code == '') {
+        this.$common.errorToShow('请输入验证码')
+        return false
+      }
+
+      let data = {
+        mobile: this.mobile,
+        code: this.code,
+        user_wx_id:this.user_wx_id
+      }
+
+      // 获取邀请码
+      let invicode = this.$db.get('invitecode')
+      if (invicode) {
+        data.invitecode = invicode
+      }
+
+      this.$api.smsLogin(data, res => {
+        if (res.status) {
+          this.$db.set('userToken', res.data)
+          this.redirectHandler()
+        } else {
+          this.$common.errorToShow(res.msg)
+        }
+      })
+    },
+    // 切换登录方式
+    selectLoginType() {
+      this.$common.redirectTo('./index1')
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.content {
+  /*  #ifdef  H5  */
+  height: calc(100vh - 90upx);
+  /*  #endif  */
+  /*  #ifndef  H5  */
+  height: 100vh;
+  /*  #endif  */
+  background-color: #fff;
+
+  padding: 0upx 100upx;
+}
+.login-t {
+  text-align: center;
+  padding: 50upx 0;
+}
+.login-logo {
+  width: 180upx;
+  height: 180upx;
+  border-radius: 20upx;
+  background-color: #f8f8f8;
+  /* margin: 0 auto; */
+}
+.login-m {
+  margin-bottom: 100upx;
+}
+.login-item {
+  border-bottom: 2upx solid #d0d0d0;
+  overflow: hidden;
+  padding: 10upx;
+  color: #333;
+  margin-bottom: 30upx;
+}
+.login-item-input {
+  display: inline-block;
+  flex: 1;
+  box-sizing: border-box;
+}
+.login-item .btn {
+  border: none;
+  width: 40%;
+  text-align: right;
+  padding: 0;
+  &.btn-b {
+    background: none;
+    color: #333 !important;
+  }
+}
+.login-b .btn {
+  color: #999;
+}
+.btn-b {
+  color: #fff !important;
+}
+.login-other {
+  margin-bottom: 40upx;
+  .item {
+    padding: 20upx 0;
+  }
+}
+.btn-square {
+  height: 80upx;
+  line-height: 80upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/public/login.vue b/mallplusui-uniapp-app2/pages/public/login.vue
new file mode 100644
index 0000000..3d3fbc6
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/public/login.vue
@@ -0,0 +1,817 @@
+<template>
+	<view class="container">
+		<view class="left-bottom-sign"></view>
+		<!-- <view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view> -->
+		<view class="right-top-sign"></view>
+		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
+		<!-- <view class="left-top-sign">{{ sysInfo.name }}LOGIN</view> -->
+		<view class="welcome">欢迎回来！汇融云链</view>
+	
+	<view class="wrapper">
+		<!-- #ifdef H5 -->
+		<view class="input-content">
+			<view class="select_lay">
+			
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
+			
+			</view>
+			
+			<view class="input-item">
+				<text class="tit">手机号码</text>
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
+			</view>
+			<view class="input-item" v-if="show">
+				<text class="tit">密码</text>
+				<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+			</view>
+			<view class="input-item" v-if="!show">
+				<text class="tit">验证码</text>
+				<view class="input-item-right">
+					<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
+						style="width: 70%;" />
+					<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
+					<view class="authTime" v-else>{{ auth_time }}秒</view>
+				</view>
+			</view>
+		</view>
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+		<view class="login_bot">
+			<view class="forget-section" @click="toForget">忘记密码?</view>
+	
+			<view class="register-section">
+				还没有账号?
+				<text @click="toRegist">马上注册</text>
+			</view>
+		</view>
+		<br />
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<button class="confirm-btn" open-type="getUserInfo" @getuserinfo="wxGetUserInfo" withCredentials="true"
+			v-if="isGetPhone == false">微信登录</button>
+		<button class="confirm-btn" open-type="getPhoneNumber" @getphonenumber="getPhoneNumber"
+			v-if="isGetPhone == true">获取手机号</button>
+		<!-- #endif -->
+	
+		<!-- #ifdef APP-PLUS -->
+		<view class="input-content">
+			<view class="select_lay">
+			
+				<text :class="{'select_lay_text1':selectKey===0}" @click="selectType(0)">免密登录</text>
+				<text class="select_lay_text" :class="{'select_lay_text1':selectKey===1}" @click="selectType(1)">账号登录</text>
+			
+			</view>
+			
+			<view class="input-item">
+				<text class="tit">手机号码</text>
+				<input type="number" v-model="phone" maxlength="11" placeholder="请输入手机号码" />
+			</view>
+			<view class="input-item" v-if="show">
+				<text class="tit">密码</text>
+				<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+			</view>
+			<view class="input-item" v-if="!show">
+				<text class="tit">验证码</text>
+				<view class="input-item-right">
+					<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin"
+						style="width: 70%;" />
+					<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
+					<view class="authTime" v-else>{{ auth_time }}秒</view>
+				</view>
+			</view>
+		</view>
+		<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+	
+		<!-- <button v-if="isWeiXin == 1" class="confirm-btn" @click="wechatH5Login" :disabled="logining">微信授权登录</button>  -->
+		<view class="login_bot">
+			<view class="forget-section" @click="toForget">忘记密码?</view>
+	
+			<view class="register-section">
+				还没有账号?
+				<text @click="toRegist">马上注册</text>
+			</view>
+		</view>
+		<br />
+	
+		<!-- #endif -->
+	</view>
+
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapMutations,
+		mapState
+	} from 'vuex';
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import store from '@/store/index';
+	export default {
+		components: {
+			mallplusCopyright
+		},
+		data() {
+			return {
+				show: false,
+				selectKey:0,
+				code: '',
+				coding: false,
+				auth_time: 60,
+				phone: '',
+				password: '',
+				isWeiXin: 0,
+				sysInfo: '',
+				logining: false,
+				isGetPhone: false,
+				info: ''
+			};
+		},
+		onLoad() {
+			let isWeiXin = this.$common.isWeiXinBrowser();
+			if (isWeiXin) {
+				this.isWeiXin = 1;
+			}
+			this.sysInfo = this.$db.get('sysInfo');
+		},
+		computed: {
+			...mapState(['hasLogin', 'userInfo'])
+		},
+		methods: {
+			...mapMutations(['login']),
+			selectType(index){
+				this.selectKey=index
+				this.show = !this.show
+				
+			},
+			inputChange(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			toForget() {
+				uni.navigateTo({
+					url: '../../pagesU/user/forget'
+				});
+			},
+			// 获取验证码
+			async getCode() {
+				var myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+				if (!myreg.test(this.phone)) {
+					uni.showToast({
+						icon: 'none',
+						title: '请输入正确的手机号码'
+					});
+					return false;
+				}
+				//设置倒计时秒
+				this.auth_time = 60;
+				this.coding = true;
+				var auth_timetimer = setInterval(() => {
+					this.auth_time--;
+					if (this.auth_time < 0) {
+						this.coding = false;
+						clearInterval(auth_timetimer);
+					}
+				}, 1000);
+				//获取验证码
+				let params = {
+					phone: this.phone
+				};
+				let data = await Api.apiCall('post', Api.index.sendCodes, params);
+				if (data) {
+
+				}
+			},
+			toLoginCode() {
+				uni.navigateTo({
+					url: '/pages/public/loginCode'
+				});
+			},
+			navBack() {
+				uni.switchTab({
+					url: '/pages/index/index'
+				});
+			},
+			toRegist() {
+				uni.navigateTo({
+					url: '/pages/public/reg'
+				});
+			},
+			wechatH5Login() {
+				const that = this;
+				let href = window.location.origin;
+				let page = that.$api.prePage();
+				let prePath = '/pages/index/index';
+				if (page) {
+					prePath = page.__page__.path;
+				}
+
+				window.location =
+					'https://open.weixin.qq.com/connect/oauth2/authorize?' +
+					'appid=' +
+					Api.h5Appid +
+					'&redirect_uri=' +
+					escape(href) +
+					'&response_type=code&scope=snsapi_userinfo&state=mallplus#wechat_redirect';
+			},
+			wxGetUserInfo: function(res) {
+				if (!res.detail.iv) {
+					uni.showToast({
+						title: '您取消了授权,登录失败',
+						icon: 'none'
+					});
+					return false;
+				}
+				// this.login(res.detail.rawData);
+				const that = this;
+				let datas = '';
+				let errmsg = '';
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+
+						var params = {
+							code: loginRes.code,
+							userInfo: res.detail.rawData,
+							cloudID: res.detail.cloudID,
+							encrypted_data: res.detail.encryptedData,
+							iv: res.detail.iv,
+							source: 2,
+							signature: res.detail.signature
+						};
+						that.loginByWeixinNoPhone(params);
+					}
+				});
+			},
+			loginByWeixinNoPhone(datas) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.appletLogin_by_weixin,
+					method: 'post',
+					data: datas,
+					success: function(res) {
+						uni.showToast({
+							title: '登录成功'
+						});
+						that.login(res.data.data);
+						that.$db.set('token', res.data.data.tokenHead + res.data.data.token);
+						that.$db.set('userInfos', res.data.data.userInfo);
+
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}, 1000);
+					}
+				});
+			},
+			/**
+			 * 微信登录
+			 */
+			wxGetUserInfo1: function(res) {
+				let ress = res;
+				console.log('-----getUserInfo-----', ress);
+				if (!ress.detail.iv) {
+					uni.showToast({
+						title: '您取消了授权,登录失败',
+						icon: 'none'
+					});
+					return false;
+				}
+
+				const that = this;
+				let datas = '';
+				uni.login({
+					provider: 'weixin',
+					success: function(loginRes) {
+						console.log('=====login=====', loginRes);
+						var params = {
+							code: loginRes.code,
+							userInfo: ress.detail.rawData,
+							cloudID: ress.detail.cloudID,
+							encrypted_data: ress.detail.encryptedData,
+							iv: ress.detail.iv,
+							source: 2,
+							signature: ress.detail.signature
+						};
+						that.getAppletOpenId(params);
+					}
+				});
+			},
+			/**
+			 * 获取openid
+			 */
+			getAppletOpenId(params) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.getAppletOpenId,
+					data: params,
+					method: 'post',
+					success: function(info) {
+						// openid seession_key 存入缓存
+						that.$db.set('openId', info.data.data.openid);
+						that.$db.set('session_key', info.data.data.session_key);
+
+						that.info = {
+							openid: info.data.data.openid,
+							code: params.code,
+							userInfo: params.userInfo,
+							cloudID: params.cloudID,
+							encrypted_data: params.encryptedData,
+							iv: params.iv,
+							source: 2,
+							signature: params.signature
+						};
+						that.loginByWeixin(that.info);
+					},
+					fail: function(e) {
+						console.log(e);
+					}
+				});
+			},
+			loginByWeixin(datas) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.appletLogin_by_weixin,
+					method: 'post',
+					data: datas,
+					success: function(res) {
+						console.log('--loginByWeixin--', res);
+						if (res.data.code == 500) {
+							if (res.data.data == '登录失败 请先绑定手机号') {
+								uni.showToast({
+									title: res.data.data,
+									icon: 'none'
+								});
+								that.isGetPhone = true;
+							}
+						} else {
+							uni.showToast({
+								title: '登录成功'
+							});
+							that.login(res.data.data);
+							that.$db.set('token', res.data.data.tokenHead + res.data.data.token);
+							that.$db.set('userInfos', res.data.data.userInfo);
+
+							setTimeout(function() {
+								uni.switchTab({
+									url: '/pages/index/index'
+								});
+							}, 1000);
+						}
+					}
+				});
+			},
+			/**
+			 * 微信获取手机号
+			 */
+			getPhoneNumber(params) {
+				var that = this;
+				wx.request({
+					url: Api.BASEURI + Api.index.getWxPhone,
+					method: 'post',
+					header: {
+						'content-type': 'application/x-www-form-urlencoded'
+					},
+					data: {
+						openid: uni.getStorageSync('openId'),
+						keyStr: uni.getStorageSync('session_key'),
+						ivStr: params.detail.iv,
+						encDataStr: params.detail.encryptedData
+					},
+					success: function(res) {
+						console.log('--getPhoneNumber--', res);
+						if (res.data.code == 200) {
+							uni.setStorageSync('phone', res.data.data);
+							that.info['phone'] = res.data.data;
+							that.loginByWeixin(that.info);
+						}
+					}
+				});
+			},
+
+			appLogin() {
+				uni.getProvider({
+					service: 'oauth',
+					success: function(res) {
+						console.log(res.provider);
+						//支持微信、qq和微博等
+						if (~res.provider.indexOf('weixin')) {
+							uni.login({
+								provider: 'weixin',
+								success: function(loginRes) {
+									console.log('-------获取openid(unionid)-----');
+									console.log(JSON.stringify(loginRes));
+									// 获取用户信息
+									uni.getUserInfo({
+										provider: 'weixin',
+										success: function(info) {
+											console.log('-------获取微信用户所有-----');
+											console.log(JSON.stringify(info.userInfo));
+											let logparams1 = {
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams1);
+											// 与服务器交互将数据提交到服务端数据库
+											uni.request({
+												url: Api.BASEURI + Api.index
+													.appLogin,
+												method: 'POST',
+												header: {
+													'content-type': 'application/x-www-form-urlencoded'
+												},
+												data: {
+													sex: info.userInfo.gender,
+													city: info.userInfo
+														.country + '-' + info
+														.userInfo.province +
+														'-' + info.userInfo
+														.city,
+													source: 1,
+													openid: info.userInfo
+														.openId,
+													unionid: info.userInfo
+														.openId,
+													nickname: info.userInfo
+														.nickName,
+													headimgurl: info.userInfo
+														.avatarUrl
+												},
+												success: res => {
+													console.log(JSON
+														.stringify(res)
+													);
+
+													// 登录成功 记录会员信息到本地
+													if (res) {
+														uni.setStorageSync(
+															'userInfo',
+															res.data
+															.userInfo);
+														uni.setStorageSync(
+															'token',
+															res.data
+															.tokenHead +
+															res.data
+															.token);
+														uni.switchTab({
+															url: '/pages/index/index'
+														});
+													} else {
+														uni.showToast({
+															title: res
+																.data
+														});
+													}
+												},
+												fail: e => {
+													console.log(JSON
+														.stringify(e));
+												}
+											});
+											let logparams = {
+												logs: JSON.stringify(info.userInfo)
+											};
+											Api.apiCall('get', Api.index.logs,
+												logparams);
+										}
+									});
+								}
+							});
+						}
+					}
+				});
+			},
+			async toLogin() {
+				var that = this;
+				let phoneReg = /^1[1-9][0-9]\d{8}$/;
+				
+				if(that.selectKey==0){
+					// 免密登录
+					uni.showToast({
+						icon: 'none',
+						title: '暂不支持此登录方式'
+					});
+					return;
+				}else{
+					// 账号登录
+					
+					try {
+						if (this.phone == '') {
+							throw '请填写手机号';
+						}
+						if (!phoneReg.test(this.phone)) {
+							throw '手机号格式有误';
+						}
+						if (this.password == '') {
+							throw '请填写密码';
+						}
+					} catch (err) {
+						this.$api.msg(err);
+						return;
+					}
+					console.log("1111111111");
+					this.logining = false;
+					let params = {
+						phone: this.phone,
+						password: this.password
+					};
+					let data = await Api.apiCall('post', Api.index.login, params);
+					//this.logining = false;
+					console.log("1111111111");
+					if (data) {
+						console.log(data);
+						that.login(data);
+						uni.setStorageSync('userInfos', data.userInfo);
+						uni.setStorageSync('token', data.tokenHead + data.token);
+						// uni.setStorageSync('adminToken', data.tokenHead + data.token);
+						console.log(uni.getStorageSync('token'));
+						uni.switchTab({
+							url: '/pages/index/user'
+						});
+					}
+				}
+			
+			},
+			getuserinfoh5appwx() {
+				var that = this;
+				uni.login({
+					success: res => {
+						// res 对象格式
+
+						uni.getUserInfo({
+							success: info => {
+								// 与服务器交互将数据提交到服务端数据库
+								uni.request({
+									url: Api.BASEURI + Api.index.appLogin,
+									method: 'POST',
+									header: {
+										'content-type': 'application/x-www-form-urlencoded'
+									},
+									data: {
+										sex: info.userInfo.gender,
+										city: info.userInfo.country + '-' + info.userInfo
+											.province + '-' + info.userInfo.city,
+
+										source: 1,
+										unionid: info.userInfo.openId,
+										openid: info.userInfo.openId,
+										nickname: info.userInfo.nickName,
+										headimgurl: info.userInfo.avatarUrl
+									},
+									success: res => {
+										console.log(JSON.stringify(res.data.data));
+										// 登录成功 记录会员信息到本地
+										if (res) {
+											console.log(res);
+											that.login(res.data.data);
+											uni.setStorageSync('userInfos', res.data
+												.data.userInfo);
+											uni.setStorageSync('token', res.data.data
+												.tokenHead + res.data.data.token);
+
+											uni.switchTab({
+												url: '/pages/index/index'
+											});
+										} else {
+											uni.showToast({
+												title: res.data
+											});
+										}
+									},
+									fail: e => {
+										console.log(JSON.stringify(e));
+									}
+								});
+							},
+							fail: () => {
+								uni.showToast({
+									title: '微信登录授权失败'
+								});
+							}
+						});
+					},
+					fail: () => {
+						uni.showToast({
+							title: '微信登录授权失败'
+						});
+						uni.hideLoading();
+					}
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.container {
+		padding-top: 115px;
+		position: relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: #fff;
+	}
+
+	.wrapper {
+		position: relative;
+		z-index: 90;
+		background: #fff;
+		padding-bottom: 40upx;
+	}
+
+	.back-btn {
+		position: absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: $font-color-dark;
+	}
+
+	.left-top-sign {
+		font-size: 120upx;
+		color: $page-color-base;
+		position: relative;
+		left: -16upx;
+	}
+
+	.right-top-sign {
+		position: absolute;
+		top: 80upx;
+		right: -30upx;
+		z-index: 95;
+
+		&:before,
+		&:after {
+			display: block;
+			content: '';
+			width: 400upx;
+			height: 80upx;
+			background: #b4f3e2;
+		}
+
+		&:before {
+			transform: rotate(50deg);
+			border-radius: 0 50px 0 0;
+		}
+
+		&:after {
+			position: absolute;
+			right: -198upx;
+			top: 0;
+			transform: rotate(-50deg);
+			border-radius: 50px 0 0 0;
+			/* background: pink; */
+		}
+	}
+
+	.left-bottom-sign {
+		position: absolute;
+		left: -270upx;
+		bottom: -320upx;
+		border: 100upx solid #d0d1fd;
+		border-radius: 50%;
+		padding: 180upx;
+	}
+
+	.welcome {
+		margin-top: 150px;
+		position: relative;
+		left: 50upx;
+		top: -90upx;
+		font-size: 46upx;
+		color: #555;
+		text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+	}
+
+	.select_lay {
+		display: flex;
+		margin-top: -65upx;
+		margin-bottom: 15upx;
+		align-items: center;
+
+		.select_lay_text {
+			margin-left: 30upx;
+		}
+
+		.select_lay_text1 {
+			font-size: 30upx;
+			color: #4395FF;
+		}
+
+		.select_lay_text2 {
+			font-size: 28upx;
+			color: #000;
+		}
+	}
+
+	.input-content {
+		padding: 0 60upx;
+	}
+
+	.input-item {
+		display: flex;
+		flex-direction: column;
+		align-items: flex-start;
+		justify-content: center;
+		padding: 0 30upx;
+		background: $page-color-light;
+		height: 120upx;
+		border-radius: 4px;
+		margin-bottom: 50upx;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+
+		.tit {
+			height: 50upx;
+			line-height: 56upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+		}
+
+		input {
+			height: 60upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			width: 100%;
+		}
+
+		.input-item-right {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			width: 100%;
+			justify-content: space-between;
+		}
+
+		.codeText {
+			font-size: 28upx;
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fa436a;
+		}
+
+		.authTime {
+			font-size: 28upx;
+			width: 25%;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			color: #fa436a;
+		}
+	}
+
+	.confirm-btn {
+		width: 630upx;
+		height: 76upx;
+		line-height: 76upx;
+		border-radius: 50px;
+		margin-top: 70upx;
+		background: $uni-color-primary;
+		color: #fff;
+		font-size: $font-lg;
+
+		&:after {
+			border-radius: 100px;
+		}
+	}
+
+	.login_bot {
+		display: flex;
+		margin-top: 15upx;
+		margin-left: 70upx;
+		margin-right: 70upx;
+		flex-direction: row;
+		justify-content: space-between;
+	}
+
+	.forget-section {
+		font-size: $font-sm + 2upx;
+		color: $font-color-spec;
+		text-align: center;
+	}
+
+	.register-section {
+		bottom: 50upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+		text-align: center;
+
+		text {
+			color: $font-color-spec;
+			margin-left: 10upx;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/public/loginCode.vue b/mallplusui-uniapp-app2/pages/public/loginCode.vue
new file mode 100644
index 0000000..05562a8
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/public/loginCode.vue
@@ -0,0 +1,371 @@
+<template>
+	<view class="container">
+		<view class="left-bottom-sign"></view>
+		<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view>
+		<view class="right-top-sign"></view>
+		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
+		<view class="wrapper">
+			<view class="left-top-sign">LOGIN</view>
+			<view class="welcome">欢迎回来！</view>
+			<view class="input-content">
+				<view class="input-item">
+					<text class="tit">手机号码</text>
+					<input type="number" v-model="phone" placeholder="请输入手机号码" />
+				</view>
+				<view class="input-item">
+					<text class="tit">验证码</text>
+					<view class="input-item-right">
+						<input type="number" maxlength="6" placeholder="请输入验证码" v-model="code" @confirm="toLogin" style="width: 70%;" />
+						<view class="codeText" v-if="coding == false" @click="getCode()">获取验证码</view>
+						<view class="authTime" v-else>{{ auth_time }}秒</view>
+					</view>
+				</view>
+			</view>
+			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+			<view class="forget-section" @click="toLoginPwd">密码登录</view>
+		</view>
+		<view class="register-section">
+			还没有账号?
+			<text @click="toRegist">马上注册</text>
+		</view>
+<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import { mapMutations, mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import store from '@/store/index';
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			phone: '',
+			code: '',
+				logining: false,
+			coding: false,
+			auth_time: 60
+		};
+	},
+	onLoad() {
+		let isWeiXin = this.$common.isWeiXinBrowser();
+		if (isWeiXin) {
+			this.isWeiXin = 1;
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login']),
+		inputChange(e) {
+			const key = e.currentTarget.dataset.key;
+			this[key] = e.detail.value;
+		},
+		toLoginPwd() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			});
+		},
+		navBack() {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		},
+		toRegist() {
+			uni.navigateTo({
+				url: '/pages/public/reg'
+			});
+		},
+async toLogin() {
+			var that = this;
+			let phoneReg = /^1[1-9][0-9]\d{8}$/;
+			try {
+				if (this.phone == '') {
+					throw '请填写手机号';
+				}
+				if (!phoneReg.test(this.phone)) {
+					throw '手机号格式有误';
+				}
+				if (this.code == '') {
+					throw '请填写密码';
+				}
+			} catch (err) {
+				this.$api.msg(err);
+				return;
+			}
+			this.logining = false;
+			let params = { phone: this.phone, authCode: this.code };
+			let data = await Api.apiCall('post', Api.index.loginByCode, params);
+			//this.logining = false;
+			if (data) {
+				console.log(data);
+				that.login(data)
+				uni.setStorageSync('userInfos', data.userInfo);
+				uni.setStorageSync('token', data.tokenHead + data.token);
+				console.log(uni.getStorageSync('token'))
+				uni.switchTab({
+					url: '/pages/index/user'
+				});
+			}
+		},
+		// 获取验证码
+		async getCode() {
+			var myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+			if (!myreg.test(this.phone)) {
+				uni.showToast({
+					icon: 'none',
+					title: '请输入正确的手机号码'
+				});
+				return false;
+			}
+			//设置倒计时秒
+			this.auth_time = 60;
+			this.coding = true;
+			var auth_timetimer = setInterval(() => {
+				this.auth_time--;
+				if (this.auth_time < 0) {
+					this.coding = false;
+					clearInterval(auth_timetimer);
+				}
+			}, 1000);
+			//获取验证码
+			let params = { phone: this.phone};
+			let data = await Api.apiCall('post', Api.index.sendCodes, params);
+			if (data) {
+				
+			}
+		},
+
+		/**
+		 * 获取openid
+		 */
+		getAppletOpenId(params) {
+			var that = this;
+			wx.request({
+				url: Api.BASEURI + Api.index.getAppletOpenId,
+				data: params,
+				method: 'post',
+				success: function(info) {
+					// openid seession_key 存入缓存
+					that.$db.set('openId', info.data.data.openid);
+					that.$db.set('session_key', info.data.data.session_key);
+
+					that.info = {
+						openid: info.data.data.openid,
+						code: params.code,
+						userInfo: params.userInfo,
+						cloudID: params.cloudID,
+						encrypted_data: params.encryptedData,
+						iv: params.iv,
+						source: 2,
+						signature: params.signature
+					};
+					that.loginByWeixin(that.info);
+				},
+				fail: function(e) {
+					console.log(e);
+				}
+			});
+		},
+		loginByWeixin(datas) {
+			var that = this;
+			wx.request({
+				url: Api.BASEURI + Api.index.appletLogin_by_weixin,
+				method: 'post',
+				data: datas,
+				success: function(res) {
+					console.log('--loginByWeixin--', res);
+					if (res.data.code == 500) {
+						if (res.data.data == '手机号为空，请先绑定手机号') {
+							uni.showToast({
+								title: res.data.data,
+								icon: 'none'
+							});
+							that.isGetPhone = true;
+						}
+					} else {
+						uni.showToast({
+							title: '登录成功'
+						});
+						that.login(res.data.data);
+						that.$db.set('token', res.data.data.tokenHead + res.data.data.token);
+						that.$db.set('userInfos', res.data.data.userInfo);
+
+						setTimeout(function() {
+							uni.switchTab({
+								url: '/pages/index/index'
+							});
+						}, 1000);
+					}
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #fff;
+}
+.container {
+	padding-top: 115px;
+	position: relative;
+	width: 100vw;
+	height: 100vh;
+	overflow: hidden;
+	background: #fff;
+}
+.wrapper {
+	position: relative;
+	z-index: 90;
+	background: #fff;
+	padding-bottom: 40upx;
+}
+.input-item-right {
+	display: flex;
+	flex-direction: row;
+	align-items: center;
+	width: 100%;
+	justify-content: space-between;
+}
+.codeText {
+	font-size: 28upx;
+	width: 25%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #fa436a;
+}
+.authTime {
+	font-size: 28upx;
+	width: 25%;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	color: #fa436a;
+}
+.back-btn {
+	position: absolute;
+	left: 40upx;
+	z-index: 9999;
+	padding-top: var(--status-bar-height);
+	top: 40upx;
+	font-size: 40upx;
+	color: $font-color-dark;
+}
+.left-top-sign {
+	font-size: 120upx;
+	color: $page-color-base;
+	position: relative;
+	left: -16upx;
+}
+.right-top-sign {
+	position: absolute;
+	top: 80upx;
+	right: -30upx;
+	z-index: 95;
+	&:before,
+	&:after {
+		display: block;
+		content: '';
+		width: 400upx;
+		height: 80upx;
+		background: #b4f3e2;
+	}
+	&:before {
+		transform: rotate(50deg);
+		border-radius: 0 50px 0 0;
+	}
+	&:after {
+		position: absolute;
+		right: -198upx;
+		top: 0;
+		transform: rotate(-50deg);
+		border-radius: 50px 0 0 0;
+		/* background: pink; */
+	}
+}
+.left-bottom-sign {
+	position: absolute;
+	left: -270upx;
+	bottom: -320upx;
+	border: 100upx solid #d0d1fd;
+	border-radius: 50%;
+	padding: 180upx;
+}
+.welcome {
+	position: relative;
+	left: 50upx;
+	top: -90upx;
+	font-size: 46upx;
+	color: #555;
+	text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+}
+.input-content {
+	padding: 0 60upx;
+}
+.input-item {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	justify-content: center;
+	padding: 0 30upx;
+	background: $page-color-light;
+	height: 120upx;
+	border-radius: 4px;
+	margin-bottom: 50upx;
+	&:last-child {
+		margin-bottom: 0;
+	}
+	.tit {
+		height: 50upx;
+		line-height: 56upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+	}
+	input {
+		height: 60upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		width: 100%;
+	}
+}
+
+.confirm-btn {
+	width: 630upx;
+	height: 76upx;
+	line-height: 76upx;
+	border-radius: 50px;
+	margin-top: 70upx;
+	background: $uni-color-primary;
+	color: #fff;
+	font-size: $font-lg;
+	&:after {
+		border-radius: 100px;
+	}
+}
+.forget-section {
+	font-size: $font-sm + 2upx;
+	color: $font-color-spec;
+	text-align: center;
+	margin-top: 40upx;
+}
+.register-section {
+	position: absolute;
+	left: 0;
+	bottom: 50upx;
+	width: 100%;
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	text-align: center;
+	text {
+		color: $font-color-spec;
+		margin-left: 10upx;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/public/reg.vue b/mallplusui-uniapp-app2/pages/public/reg.vue
new file mode 100644
index 0000000..7eaf664
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/public/reg.vue
@@ -0,0 +1,256 @@
+<template>
+	<view class="container">
+		<view class="left-bottom-sign"></view>
+		<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view>
+		<view class="right-top-sign"></view>
+		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
+		<view class="wrapper">
+			<view class="left-top-sign">注册</view>
+			<view class="welcome">欢迎回来！</view>
+			<view class="input-content">
+				<view class="input-item">
+					<text class="tit">手机号码</text>
+					<input type="number" v-model="phone" placeholder="请输入手机号码" />
+				</view>
+				<view class="input-item">
+					<text class="tit">密码</text>
+					<input type="password" placeholder="请输入密码" v-model="password" @confirm="reg" />
+				</view>
+				<view class="input-item">
+					<text class="tit">确认密码</text>
+					<input type="password" placeholder="请输入确认密码" v-model="confimpassword" @confirm="reg" />
+				</view>
+				<view class="input-item">
+                					<text class="tit">邀请码</text>
+                					<input type="number" v-model="invitecode" placeholder="请输入邀请码" />
+               </view>
+			</view>
+			<button class="confirm-btn" @click="reg" :disabled="logining">注册</button>
+
+			<view class="forget-section" @click="toForget">忘记密码?</view>
+		</view>
+		<view class="register-section">
+			已经有账号?
+			<text @click="toRegist">马上登录</text>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+
+</template>
+
+<script>
+import { mapMutations } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+		invitecode:'',
+			phone: '',
+			password: '',
+			confimpassword: '',
+			logining: false
+		};
+	},
+	onLoad() {},
+	methods: {
+
+		inputChange(e) {
+			const key = e.currentTarget.dataset.key;
+			this[key] = e.detail.value;
+		},
+		navBack() {
+			uni.switchTab({
+				url: '/pages/index/index'
+			});
+		},
+		toForget(){
+        				uni.navigateTo({
+        						url: '../../pagesU/user/forget'
+        				})
+        			},
+		toRegist() {
+			uni.navigateTo({
+				url: '/pages/public/login'
+			});
+		},
+		async reg() {
+			let phoneReg = /^1[1-9][0-9]\d{8}$/;
+			try {
+				if (this.phone == '') {
+					throw '请填写手机号';
+				}
+				if (!phoneReg.test(this.phone)) {
+					throw '手机号格式有误';
+				}
+				if (this.password == '') {
+					throw '请填写密码';
+				}
+			} catch (err) {
+				this.$api.msg(err);
+				return;
+			}
+
+			let params ;
+			//有推荐码的话，带上
+			var invitecode = this.$db.get('invitecode')
+			if (invitecode) {
+				data.invitecode = invitecode
+				params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:invitecode};
+			}else {
+				params = { phone: this.phone, password: this.password, confimpassword: this.confimpassword ,source:3,invitecode:this.invitecode};
+			}
+			let data = await Api.apiCall('post', Api.index.simpleReg, params);
+
+
+			uni.navigateTo({
+				url: '/pages/public/login'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #fff;
+}
+.container {
+	padding-top: 115px;
+	position: relative;
+	width: 100vw;
+	height: 120vh;
+	overflow: hidden;
+	background: #fff;
+}
+.wrapper {
+	position: relative;
+	z-index: 90;
+	background: #fff;
+	padding-bottom: 30upx;
+}
+.back-btn {
+	position: absolute;
+	left: 40upx;
+	z-index: 9999;
+	padding-top: var(--status-bar-height);
+	top: 40upx;
+	font-size: 40upx;
+	color: $font-color-dark;
+}
+.left-top-sign {
+	font-size: 120upx;
+	color: $page-color-base;
+	position: relative;
+	left: -16upx;
+}
+.right-top-sign {
+	position: absolute;
+	top: 80upx;
+	right: -30upx;
+	z-index: 95;
+	&:before,
+	&:after {
+		display: block;
+		content: '';
+		width: 400upx;
+		height: 80upx;
+		background: #b4f3e2;
+	}
+	&:before {
+		transform: rotate(50deg);
+		border-radius: 0 50px 0 0;
+	}
+	&:after {
+		position: absolute;
+		right: -198upx;
+		top: 0;
+		transform: rotate(-50deg);
+		border-radius: 50px 0 0 0;
+		/* background: pink; */
+	}
+}
+.left-bottom-sign {
+	position: absolute;
+	left: -270upx;
+	bottom: -320upx;
+	border: 100upx solid #d0d1fd;
+	border-radius: 50%;
+	padding: 180upx;
+}
+.welcome {
+	position: relative;
+	left: 50upx;
+	top: -90upx;
+	font-size: 46upx;
+	color: #555;
+	text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+}
+.input-content {
+	padding: 0 60upx;
+}
+.input-item {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	justify-content: center;
+	padding: 0 30upx;
+	background: $page-color-light;
+	height: 120upx;
+	border-radius: 4px;
+	margin-bottom: 50upx;
+	&:last-child {
+		margin-bottom: 0;
+	}
+	.tit {
+		height: 50upx;
+		line-height: 56upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+	}
+	input {
+		height: 60upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		width: 100%;
+	}
+}
+
+.confirm-btn {
+	width: 630upx;
+	height: 76upx;
+	line-height: 76upx;
+	border-radius: 50px;
+	margin-top: 70upx;
+	background: $uni-color-primary;
+	color: #fff;
+	font-size: $font-lg;
+	&:after {
+		border-radius: 100px;
+	}
+}
+.forget-section {
+	font-size: $font-sm + 2upx;
+	color: $font-color-spec;
+	text-align: center;
+	margin-top: 40upx;
+}
+.register-section {
+	position: absolute;
+	left: 0;
+	bottom: 40upx;
+	width: 100%;
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	text-align: center;
+	text {
+		color: $font-color-spec;
+		margin-left: 10upx;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/search/search.vue b/mallplusui-uniapp-app2/pages/search/search.vue
new file mode 100644
index 0000000..1f6ef8b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/search/search.vue
@@ -0,0 +1,378 @@
+<template>
+	<view class="content">
+		<view class="search-box">
+			<!-- mSearch组件 如果使用原样式，删除组件元素 -->
+			<mSearch
+				class="mSearch-input-box"
+				:mode="2"
+				button="inside"
+				:placeholder="defaultKeyword"
+				@search="doSearch(false)"
+				@input="inputChange"
+				@confirm="doSearch(false)"
+				v-model="keyword"
+			></mSearch>
+			<!-- 原样式 如果使用原样式，恢复下方注销代码 -->
+			<!-- 原样式 end
+			<view class="input-box">
+				<input type="text" :placeholder="defaultKeyword" @input="inputChange" v-model="keyword" @confirm="doSearch(false)"
+				 placeholder-class="placeholder-class" confirm-type="search">
+			</view>
+			<view class="search-btn" @tap="doSearch(false)">搜索</view>
+
+			原样式 end -->
+		</view>
+		<view class="search-keyword" @touchstart="blur">
+			<scroll-view class="keyword-list-box" v-show="isShowKeywordList" scroll-y>
+				<view class="keyword-entry" hover-class="keyword-entry-tap" v-for="row in keywordList" :key="row.keyword">
+					<view class="keyword-text" @tap="doSearch(row.keyword)"><rich-text :nodes="row.htmlStr"></rich-text></view>
+					<view class="keyword-img" @tap="setkeyword(row)"><image src="/static/search/back.png"></image></view>
+				</view>
+			</scroll-view>
+			<scroll-view class="keyword-box" v-show="!isShowKeywordList" scroll-y>
+				<view class="keyword-block" v-if="oldKeywordList.length > 0">
+					<view class="keyword-list-header">
+						<view>历史搜索</view>
+						<view><image @tap="oldDelete" src="/static/search/delete.png"></image></view>
+					</view>
+					<view class="keyword">
+						<view v-for="(keyword, index) in oldKeywordList" @tap="doSearch(keyword)" :key="index">{{ keyword }}</view>
+					</view>
+				</view>
+				<view class="keyword-block">
+					<view class="keyword-list-header">
+						<view>热门搜索</view>
+						<view><image @tap="hotToggle" :src="'/static/search/attention' + forbid + '.png'"></image></view>
+					</view>
+					<view class="keyword" v-if="forbid == ''">
+						<view v-for="(keyword, index) in hotKeywordList" @tap="doSearch(keyword)" :key="index">{{ keyword }}</view>
+					</view>
+					<view class="hide-hot-tis" v-else><view>当前搜热门搜索已隐藏</view></view>
+				</view>
+				<view class="keyword-block" v-if="goodsList.length>0">
+					<view class="keyword-list-header">
+						<view>搜索结果</view>
+					</view>
+					<view class="keyword" >
+						<view v-for="(item, index) in goodsList"  :key="index" @click="navToDetailPage(item)">{{ item.name }}</view>
+					</view>
+
+				</view>
+
+			</scroll-view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+//引用mSearch组件，如不需要删除即可
+import mSearch from '@/components/mehaotian-search-revision/mehaotian-search-revision.vue';
+export default {
+	data() {
+		return {
+			defaultKeyword: '',
+			keyword: '',
+			oldKeywordList: [],
+			hotKeywordList: [],
+			goodsList:[],
+			keywordList: [],
+			forbid: '',
+			isShowKeywordList: false
+		};
+	},
+	onLoad() {
+		this.init();
+	},
+	components: {
+		//引用mSearch组件，如不需要删除即可
+		mSearch
+	},
+	methods: {
+		init() {
+			this.loadDefaultKeyword();
+			this.loadOldKeyword();
+			this.loadHotKeyword();
+		},
+		blur() {
+			uni.hideKeyboard();
+		},
+		//加载默认搜索关键字
+		loadDefaultKeyword() {
+			//定义默认搜索关键字，可以自己实现ajax请求数据再赋值,用户未输入时，以水印方式显示在输入框，直接不输入内容搜索会搜索默认关键字
+			this.defaultKeyword = '默认关键字';
+		},
+		//加载历史搜索,自动读取本地Storage
+		loadOldKeyword() {
+			uni.getStorage({
+				key: 'OldKeys',
+				success: res => {
+					var OldKeys = JSON.parse(res.data);
+					this.oldKeywordList = OldKeys;
+				}
+			});
+		},
+		//加载热门搜索
+		loadHotKeyword() {
+			//定义热门搜索关键字，可以自己实现ajax请求数据再赋值
+			this.hotKeywordList = ['手机', '商场', '包', '服装', '抱枕', '永生花', '鼠标垫', 'USB', 'USB3.0'];
+		},
+		//监听输入
+		inputChange(event) {
+			//兼容引入组件时传入参数情况
+			var keyword = event.detail ? event.detail.value : event;
+			if (!keyword) {
+				this.keywordList = [];
+				this.isShowKeywordList = false;
+				return;
+			}
+			this.isShowKeywordList = true;
+			//以下示例截取淘宝的关键字，请替换成你的接口
+			uni.request({
+				url: 'https://suggest.taobao.com/sug?code=utf-8&q=' + keyword, //仅为示例
+				success: res => {
+					this.keywordList = this.drawCorrelativeKeyword(res.data.result, keyword);
+				}
+			});
+		},
+		//高亮关键字
+		drawCorrelativeKeyword(keywords, keyword) {
+			var len = keywords.length,
+				keywordArr = [];
+			for (var i = 0; i < len; i++) {
+				var row = keywords[i];
+				//定义高亮#9f9f9f
+				var html = row[0].replace(keyword, "<span style='color: #9f9f9f;'>" + keyword + '</span>');
+				html = '<div>' + html + '</div>';
+				var tmpObj = {
+					keyword: row[0],
+					htmlStr: html
+				};
+				keywordArr.push(tmpObj);
+			}
+			return keywordArr;
+		},
+		//顶置关键字
+		setkeyword(data) {
+			this.keyword = data.keyword;
+		},
+		//清除历史搜索
+		oldDelete() {
+			uni.showModal({
+				content: '确定清除历史搜索记录？',
+				success: res => {
+					if (res.confirm) {
+						console.log('用户点击确定');
+						this.oldKeywordList = [];
+						uni.removeStorage({
+							key: 'OldKeys'
+						});
+					} else if (res.cancel) {
+						console.log('用户点击取消');
+					}
+				}
+			});
+		},
+		//热门搜索开关
+		hotToggle() {
+			this.forbid = this.forbid ? '' : '_forbid';
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		//执行搜索
+		async	doSearch(key) {
+			key = key ? key : this.keyword ? this.keyword : this.defaultKeyword;
+			this.keyword = key;
+			this.saveKeyword(key); //保存为历史
+
+			//以下是示例跳转淘宝搜索，可自己实现搜索逻辑
+			//#ifdef APP-PLUS
+			plus.runtime.openURL(encodeURI('taobao://s.taobao.com/search?q=' + key));
+			//#endif
+
+			let params = { keyword: key };
+			let list =await  Api.apiCall('get', Api.goods.goodsList, params);
+			console.log(list.records);
+			let goodsList = list.records;
+			this.goodsList=goodsList;
+
+		},
+		//保存关键字到历史记录
+		saveKeyword(keyword) {
+			uni.getStorage({
+				key: 'OldKeys',
+				success: res => {
+					console.log(res.data);
+					var OldKeys = JSON.parse(res.data);
+					var findIndex = OldKeys.indexOf(keyword);
+					if (findIndex == -1) {
+						OldKeys.unshift(keyword);
+					} else {
+						OldKeys.splice(findIndex, 1);
+						OldKeys.unshift(keyword);
+					}
+					//最多10个纪录
+					OldKeys.length > 10 && OldKeys.pop();
+					uni.setStorage({
+						key: 'OldKeys',
+						data: JSON.stringify(OldKeys)
+					});
+					this.oldKeywordList = OldKeys; //更新历史搜索
+				},
+				fail: e => {
+					var OldKeys = [keyword];
+					uni.setStorage({
+						key: 'OldKeys',
+						data: JSON.stringify(OldKeys)
+					});
+					this.oldKeywordList = OldKeys; //更新历史搜索
+				}
+			});
+		}
+	}
+};
+</script>
+<style>
+view {
+	display: block;
+}
+.search-box {
+	width: 100%;
+	background-color: rgb(242, 242, 242);
+	padding: 15upx 2.5%;
+	display: flex;
+	justify-content: space-between;
+}
+.search-box .mSearch-input-box {
+	width: 100%;
+}
+.search-box .input-box {
+	width: 85%;
+	flex-shrink: 1;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+}
+.search-box .search-btn {
+	width: 15%;
+	margin: 0 0 0 2%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	flex-shrink: 0;
+	font-size: 28upx;
+	color: #fff;
+	background: linear-gradient(to right, #ff9801, #ff570a);
+	border-radius: 60upx;
+}
+.search-box .input-box > input {
+	width: 100%;
+	height: 60upx;
+	font-size: 32upx;
+	border: 0;
+	border-radius: 60upx;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	padding: 0 3%;
+	margin: 0;
+	background-color: #ffffff;
+}
+.placeholder-class {
+	color: #9e9e9e;
+}
+.search-keyword {
+	width: 100%;
+	background-color: rgb(242, 242, 242);
+}
+.keyword-list-box {
+	height: calc(100vh - 110upx);
+	padding-top: 10upx;
+	border-radius: 20upx 20upx 0 0;
+	background-color: #fff;
+}
+.keyword-entry-tap {
+	background-color: #eee;
+}
+.keyword-entry {
+	width: 94%;
+	height: 80upx;
+	margin: 0 3%;
+	font-size: 30upx;
+	color: #333;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	border-bottom: solid 1upx #e7e7e7;
+}
+.keyword-entry image {
+	width: 60upx;
+	height: 60upx;
+}
+.keyword-entry .keyword-text,
+.keyword-entry .keyword-img {
+	height: 80upx;
+	display: flex;
+	align-items: center;
+}
+.keyword-entry .keyword-text {
+	width: 90%;
+}
+.keyword-entry .keyword-img {
+	width: 10%;
+	justify-content: center;
+}
+.keyword-box {
+	height: calc(100vh - 110upx);
+	border-radius: 20upx 20upx 0 0;
+	background-color: #fff;
+}
+.keyword-box .keyword-block {
+	padding: 10upx 0;
+}
+.keyword-box .keyword-block .keyword-list-header {
+	width: 100%;
+	padding: 10upx 3%;
+	font-size: 27upx;
+	color: #333;
+	display: flex;
+	justify-content: space-between;
+}
+.keyword-box .keyword-block .keyword-list-header image {
+	width: 40upx;
+	height: 40upx;
+}
+.keyword-box .keyword-block .keyword {
+	width: 100%;
+	padding: 3px 3%;
+	display: flex;
+	flex-flow: wrap;
+	justify-content: flex-start;
+}
+.keyword-box .keyword-block .hide-hot-tis {
+	display: flex;
+	justify-content: center;
+	font-size: 28upx;
+	color: #6b6b6b;
+}
+.keyword-box .keyword-block .keyword > view {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border-radius: 60upx;
+	padding: 0 30upx;
+	margin: 10upx 20upx 10upx 0;
+	height: 60upx;
+	font-size: 28upx;
+	background-color: rgb(242, 242, 242);
+	color: #6b6b6b;
+}
+
+</style>
diff --git a/mallplusui-uniapp-app2/pages/set/certification.vue b/mallplusui-uniapp-app2/pages/set/certification.vue
new file mode 100644
index 0000000..1a6450c
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/set/certification.vue
@@ -0,0 +1,707 @@
+<template>
+	<view class="content">
+		<!-- <view class="mask" v-if="CertificateStatus!='2'">
+			<cmd-result-page src="https://gw.alipayobjects.com/zos/rmsportal/HWuSTipkjJRfTWekgTUG.svg" text="等待审核" subtext="已提交申请"></cmd-result-page>
+		</view> -->
+		<view class="box-cont" >
+			<view class="name"><input type="text" placeholder="请输入姓名" @blur="blurname" /></view>
+					<view class="name"><input type="text" placeholder="请输入身份证号码" maxlength="18" @blur="blurnumber" /></view>
+					<view style="padding-left: 50upx;" v-show="numberError"><text style="color:#DD524D;">身份证号码有误</text></view>
+					<view style="padding-left:10upx;">
+						<text style="color:#DD524D;">{{ time }}</text>
+					</view>
+					<view class="idbox">
+						<view class="idboxTitle">身份证照片(正面)</view>
+						<view class="idboxConten">
+							<view class="idboxConten_left" @click="uploadIdentityImg('front')">
+								<image src="http://mp.emshop.eonfox.com/zrhzstatic/muying/camera.png"></image>
+								<view class="idboxConten_left_text">选择身份证照片</view>
+							</view>
+							<view class="idboxConten_right">
+								<image v-if="JSONS.front_image_id" :src="qiniuaddress + JSONS.front_image_id" mode="aspectFill" />
+								<image v-else src="http://mp.emshop.eonfox.com/zrhzstatic/muying/idcard1.png"></image>
+							</view>
+						</view>
+						<!-- <view class="idboxFront" @click="uploadIdentityImg('front')">
+							<image  v-if="JSONS.front_image_id" :src="qiniuaddress+JSONS.front_image_id" mode="aspectFill"/>
+							<view v-else>
+								<view style="font-size:140upx;">+</view>
+								<view>正面照片</view>
+								<view>(文字清晰，四角周全)</view>
+							</view>
+						</view> -->
+						<view class="idboxTitle">身份证照片(背面)</view>
+						<view class="idboxConten">
+							<view class="idboxConten_left" @click="uploadIdentityImg('back')">
+								<image src="http://mp.emshop.eonfox.com/zrhzstatic/muying/camera.png"></image>
+								<view class="idboxConten_left_text">选择身份证照片</view>
+							</view>
+							<view class="idboxConten_right">
+								<image v-if="JSONS.back_image_id" :src="qiniuaddress + JSONS.back_image_id" mode="aspectFill" />
+								<image v-else src="http://mp.emshop.eonfox.com/zrhzstatic/muying/idcard2.png"></image>
+							</view>
+						</view>
+						<!-- <view class="idboxBack" @click="uploadIdentityImg('back')">
+							<image v-if="JSONS.back_image_id" :src="qiniuaddress+JSONS.back_image_id" mode="aspectFill"  />
+							<view v-else>
+								<view style="font-size:140upx;">+</view>
+								<view>背面照片</view>
+								<view>(文字清晰，四角周全)</view>
+							</view>
+						</view> -->
+					</view>
+					<view class="area">
+						<view class="areaBox" @click="showMulLinkageTwoPicker">
+							<view class="areaBox_left">
+								{{ Address }}
+							</view>
+							<view class="areaBox_right"><image src="http://mp.emshop.eonfox.com/zrhzstatic/muying/back.png"></image></view>
+						</view>
+						<view class="detailAreaBox">
+							<textarea type="text" placeholder="详细地址：如道路、门牌号、小区、楼栋号、单元室等" class="homeRight" v-model="addresst" v-show="inputDisplay"></textarea>
+						</view>
+					</view>
+			<mpvue-picker  ref="mpvuePicker" @onConfirm="onConfirm" @onCancel="onCancel"></mpvue-picker>
+
+			<button type="primary" class="primary" @click="next">确认提交</button>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+	import cmdResultPage from "@/components/cmd-result-page/cmd-result-page.vue"
+import mpvuePicker from '@/components/mpvue-picker/mpvuePicker.vue';
+
+import city from '../../common/city.data.js';
+import eonfox from '@/components/eonfox/eonfox.js';
+import fns from '@/components/eonfox/fns.js';
+var ef = new eonfox();
+export default {
+	data() {
+		return {
+			img_index: 'headImgOne',
+			img_type: 'front',
+			province: [],
+			province_index: 0,
+			province_data: '',
+			citys: [],
+			citys_index: 0,
+			city_data: '',
+			username: '',
+			cardNumber: '',
+			address: '',
+			addresss: '',
+			addressc: '',
+			addresst: '',
+			headImgOne: '',
+			headImgTwo: '',
+			Front_image_id: '',
+			Back_image_id: '',
+			display: true,
+			displayx: true,
+			numberError: false,
+			time: '',
+			CertificateStatus: 0,
+			JSONS: {},
+			qiniuaddress: '',
+			phoneShow: true,
+			phoneShowTwo: false,
+			Address: '选择地址',
+			Sprovince: '',
+			Scity: '',
+			Sdistrict: '',
+			inputDisplay: true
+		};
+	},
+	onLoad() {
+		for (var i in city) {
+			this.province.push(city[i].label);
+		} //省数组赋值
+		var cityChildren = city[this.province_index].children; //获取该省城市
+		console.log(cityChildren);
+		for (var i in cityChildren) {
+			this.citys.push(cityChildren[i].label);
+		} //城市数组赋值
+	},
+	onShow() {
+		var that = this;
+		ef.submit({
+			request: {
+				s: ['APPLICATIONCONFIG'],
+				Authentication: ['USERIDENTITYSELFSTATE'],
+				Editstate: ['USERIDENTITYSELFEDITGET'],
+				config: ['APPLICATIONCONFIG']
+			},
+			callback: function(data) {
+				console.log(data);
+				var dataList = fns.checkError(data, ['s', 'Authentication'], function(erron, error) {
+					uni.showToast({
+						title: error,
+						icon: 'none'
+					});
+				});
+				//判断当前是否为编辑状态
+				const editstate = data.data.Editstate.data;
+				if (editstate) {
+					that.JSONS = editstate;
+					console.log('JSONS', that.JSONS);
+				}
+				//七牛云地址
+				if (data.data.config && data.data.config.data.qiniu_domain) {
+					that.qiniuaddress = data.data.config.data.qiniu_domain;
+				}
+				console.log(dataList.Authentication,'审核状')
+				if (dataList.Authentication == 1) {
+					that.CertificateStatus = 1;
+					console.log('审核状态', that.CertificateStatus);
+				}
+				if (that.CertificateStatus == 1) {
+					console.log('时间', data);
+					var times = data.data.s.data.user_identity.expire_time / 3600;
+					that.time = '认证失效时间还有' + times / 24 + '天' + (times % 24) + '小时';
+					console.log('时间', that.time);
+				}
+				//通过审核后
+			},
+			error: function(err) {
+				console.log('出错啦', err);
+			}
+		});
+	},
+	components: {
+		mpvuePicker,
+
+		cmdResultPage
+	},
+	methods: {
+		//选择地址
+		onConfirm(e) {
+			this.inputDisplay = true;
+			console.log(e);
+			this.Address = e.label;
+			var arr = this.Address.split('-');
+			console.log('arr', arr);
+			this.Sprovince = arr[0];
+			this.Scity = arr[1];
+			this.Sdistrict = arr[2];
+			console.log(this.Sprovince, this.Scity, this.Sdistrict);
+		},
+		onCancel() {
+			this.inputDisplay = true;
+		},
+
+		error(e) {
+			fns.err(e.detail);
+		},
+		photo(type) {
+			var _this = this;
+			wx.getSetting({
+				success(res) {
+					console.log('auth', res.authSetting);
+					if (!res.authSetting['scope.camera']) {
+						wx.authorize({
+							scope: 'scope.camera',
+							success() {
+								console.log('已同意授权');
+								// 用户已经同意
+								console.log('已同意授权', type);
+								_this.takePhoto(type);
+							}
+						});
+					} else {
+						console.log('已授权');
+						console.log('已同意授权', type);
+						_this.takePhoto(type);
+					}
+				}
+			});
+		},
+		takePhoto(type) {
+			console.log('........', type);
+			var _this = this;
+			console.log('+++++++++相机分割线+++++++++++++++++++++++++');
+			const ctx = uni.createCameraContext();
+			console.log('ctx', ctx);
+			ctx.takePhoto({
+				quality: 'high',
+				success: res => {
+					console.log('takephoto-re', res.tempImagePath);
+					var img = res.tempImagePath;
+					ef.left_token(function(left_token) {
+						//encodeURIComponent  encodeURI
+						// var uploadUrl=ef.api_server_url+"?"+encodeURI('data=[["USERIDENTITYSELFUPLOAD",[{"type":"'+_this.img_type+'"}]]]')+"&token="+left_token;
+						const uploadUrl = ef.api_server_url + '?' + encodeURI(`data=[["USERIDENTITYSELFUPLOAD",[{"type":"${type}"}]]]`) + '&token=' + left_token;
+						uni.uploadFile({
+							url: uploadUrl,
+							filePath: img,
+							fileType: 'image',
+							name: 'file',
+							success: res => {
+								console.log('上传完成:', res);
+								res = JSON.parse(res.data);
+								console.log(res);
+								res = res.data[0];
+
+								// 是否成功
+								if (res.errno == 0) {
+									// 判断图片类型
+									if (type == 'front') {
+										_this.JSONS.front_image_id = res.data;
+									} else {
+										_this.JSONS.back_image_id = res.data;
+									}
+									uni.showToast({
+										title: '上传成功',
+										success() {
+											_this.phoneShow = !_this.phoneShow;
+											_this.phoneShowTwo = !_this.phoneShowTwo;
+										}
+									});
+									console.log('JSONS.front_image_id',_this.JSONS.front_image_id)
+								} else {
+									uni.showToast({
+										title: res.error,
+										icon: 'none'
+									});
+								}
+							},
+							fail: err => {
+								console.log('uploadImage fail', err);
+								uni.showModal({
+									content: err.errMsg,
+									showCancel: false
+								});
+							}
+						});
+					});
+				},
+				fail() {
+					fns.err('打开相机失败');
+				},
+				complete() {
+					console.log('打开相机');
+				}
+			});
+			console.log('+++++++++相机分割线+++++++++++++++++++++++++');
+		},
+		provinceChange: function(e) {
+			console.log('省index:', e.target.value);
+			this.province_index = e.target.value; //以选择序号省显示改变
+			this.province_data = city[e.target.value].label; //省赋值
+			console.log('province:', city[e.target.value].label);
+			this.citys = []; //先清空城市
+			this.citys_index = 0;
+			var cityChildren = city[e.target.value].children;
+			for (var i in cityChildren) {
+				this.citys.push(cityChildren[i].label);
+			} //城市数组更换
+		},
+		cityChange: function(e) {
+			this.citys_index = e.target.value;
+			this.city_data = city[this.province_index].children[this.citys_index].label;
+			console.log('市：', e.target.value);
+			console.log('市：', this.city_data);
+		},
+		next() {
+			var that = this;
+			// that.address=that.addresss+that.addressc+that.addresst;
+			console.log('姓名', that.username);
+			console.log('姓名', that.cardNumber);
+			console.log('姓名', that.address);
+			ef.submit({
+				request: {
+					s: [
+						'USERIDENTITYSELFADD',
+						[
+							{
+								real_name: that.username,
+								card_number: that.cardNumber,
+								card_address: that.addresst,
+								province: that.Sprovince,
+								city: that.Scity,
+								district: that.Sdistrict
+							}
+						]
+					],
+					y: ['USERSELF']
+				},
+				callback: function(data) {
+					console.log(data);
+					var fns_ = fns.checkError(data, ['s'], function(erron, error) {
+						fns.err('认证', error);
+						return;
+					});
+					if (data.data.s.errno == 0) {
+						uni.showToast({
+							title: '已提交，等待审核',
+							success() {
+								setTimeout(function() {
+									uni.navigateBack({
+										delta: 1
+									});
+								}, 2000);
+							}
+						});
+					}
+				},
+				error: function(err) {
+					fns.err('', err, 1);
+				}
+			});
+		},
+		blurname: function(event) {
+			this.username = event.target.value;
+		},
+		blurnumber: function(event) {
+			var that = this;
+			that.cardNumber = event.target.value;
+			console.log('身份证号码');
+			if (!/[0-9]{18}/.test(that.cardNumber)) {
+				that.numberError = true;
+			} else {
+				that.numberError = false;
+			}
+		},
+		bluraddresss: function(event) {
+			this.addresss = event.target.value;
+		},
+		bluraddresc: function(event) {
+			this.addressc = event.target.value;
+		},
+		bluraddress: function(event) {
+			this.addresst = event.target.value;
+		},
+		// 上传身份证
+		uploadIdentityImg(type) {
+			const _this = this;
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				success: res => {
+					wx.showLoading({
+						title: '上传中'
+					});
+					console.log('chooseImage success, temp path is', res.tempFilePaths[0]);
+					const file = res.tempFilePaths[0];
+					ef.left_token(function(left_token) {
+						//encodeURIComponent  encodeURI
+						const uploadUrl = ef.api_server_url + '?' + encodeURI(`data=[["USERIDENTITYSELFUPLOAD",[{"type":"${type}"}]]]`) + '&token=' + left_token;
+						uni.uploadFile({
+							url: uploadUrl,
+							filePath: file,
+							fileType: 'image',
+							name: 'file',
+							success: res => {
+								console.log('上传完成1:', res);
+								res = JSON.parse(res.data);
+								console.log(res);
+								res = res.data[0];
+								// 是否成功
+								if (res.errno == 0) {
+									// 判断图片类型
+									if (type === 'front') {
+										_this.JSONS.front_image_id = res.data;
+									} else {
+										_this.JSONS.back_image_id = res.data;
+									}
+									uni.showToast({
+										title: '上传成功'
+									});
+								} else {
+									uni.showToast({
+										title: res.error,
+										icon: 'none'
+									});
+								}
+							},
+							fail: err => {
+								console.log('uploadImage fail', err);
+								uni.showModal({
+									content: err.errMsg,
+									showCancel: false
+								});
+							}
+						});
+					});
+				},
+				fail: err => {
+					console.log('chooseImage fail', err);
+					uni.showToast({
+						title: '你取消了图片上传',
+						icon: 'none',
+						duration: 2000,
+						success() {
+							_this.display = !_this.display;
+						}
+					});
+				}
+			});
+		},
+		ModifyThePicture() {
+			var _this = this;
+			_this.display = !_this.display;
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				// sourceType: ['album'],
+				success: res => {
+					console.log('chooseImage success, temp path is', res.tempFilePaths[0]);
+					var imageSrc = res.tempFilePaths[0];
+					ef.left_token(function(left_token) {
+						//encodeURIComponent  encodeURI
+						var uploadUrl = ef.api_server_url + '?' + encodeURI('data=[["USERIDENTITYSELFUPLOAD",[{"type":"front"}]]]') + '&token=' + left_token;
+						uni.uploadFile({
+							url: uploadUrl,
+							filePath: imageSrc,
+							fileType: 'image',
+							name: 'file',
+							success: res => {
+								console.log('上传完成:', res);
+
+								var dataList = fns.checkError(JSONS.parse(res.data), ['0'], function(erron, error) {
+									console.log('上传错误', res.data);
+									uni.showToast({
+										title: error,
+										icon: 'none'
+									});
+								});
+								console.log('dataList:', dataList[0]);
+								_this.Front_image_id = dataList[0];
+								if (dataList[0]) {
+									uni.showToast({
+										title: '上传成功',
+										icon: 'none',
+										duration: 1000,
+										success() {
+											_this.headImgOne = imageSrc;
+										}
+									});
+								}
+							},
+							fail: err => {
+								console.log('uploadImage fail', err);
+								uni.showModal({
+									content: err.errMsg,
+									showCancel: false
+								});
+							}
+						});
+					});
+				},
+				fail: err => {
+					console.log('chooseImage fail', err);
+					uni.showToast({
+						title: '你取消了图片上传',
+						icon: 'none',
+						duration: 2000,
+						success() {
+							_this.display = !_this.display;
+						}
+					});
+				}
+			});
+		},
+		ModifyThePictureTwo() {
+			var _this = this;
+			_this.displayx = !_this.displayx;
+			uni.chooseImage({
+				count: 1,
+				sizeType: ['compressed'],
+				sourceType: ['album'],
+				success: res => {
+					console.log('chooseImage success, temp path is', res.tempFilePaths[0]);
+					var imageSrc = res.tempFilePaths[0];
+					ef.left_token(function(left_token) {
+						//encodeURIComponent  encodeURI
+						var uploadUrl = ef.api_server_url + '?' + encodeURI('data=[["USERIDENTITYSELFUPLOAD",[{"type":"back"}]]]') + '&token=' + left_token;
+						uni.uploadFile({
+							url: uploadUrl,
+							filePath: imageSrc,
+							fileType: 'image',
+							name: 'file',
+							success: res => {
+								console.log('上传完成:', res);
+
+								var dataList = fns.checkError(JSONS.parse(res.data), ['0'], function(erron, error) {
+									console.log('上传错误', res.data);
+									uni.showToast({
+										title: error,
+										icon: 'none'
+									});
+								});
+								console.log('dataList:', dataList[0]);
+								_this.Back_image_id = dataList[0];
+								if (dataList[0]) {
+									uni.showToast({
+										title: '上传成功',
+										icon: 'none',
+										duration: 1000,
+										success() {
+											_this.headImgTwo = imageSrc;
+										}
+									});
+								}
+							},
+							fail: err => {
+								console.log('uploadImage fail', err);
+								uni.showModal({
+									content: err.errMsg,
+									showCancel: false
+								});
+							}
+						});
+					});
+				},
+				fail: err => {
+					console.log('chooseImage fail', err);
+					uni.showToast({
+						title: '你取消了图片上传', //JSONS.stringify(err)
+						icon: 'none',
+						duration: 2000,
+						success() {
+							_this.displayx = !_this.displayx;
+						}
+					});
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style>
+page{
+	background-color: #F5F5F5;
+}
+.homeRight{
+	width: 100%;
+	height:100%;
+}
+.content{
+	font-size: 28upx
+}
+.name{
+	display: flex;
+	width: 690upx;
+	margin-left :30upx;
+	border-radius: 10upx;
+	height: 80upx;
+	justify-content :center;
+	align-items :center  ;
+	flex-direction: row;
+	padding-left :10upx;
+	background-color :#FFFFFF;
+	margin-top :20upx;
+}
+.primary{
+	width :690upx;
+	margin: 40px auto;
+	color: #fff;
+	background:linear-gradient(to right, #F29B87,#F8C6B5);
+	z-index: 999;
+}
+
+.name input{
+	width: 100%;
+	height:40upx;
+	line-height: 40upx;
+	float:left;
+	font-size: 28upx;
+}
+ textarea{
+	font-size: 28upx;
+}
+
+
+
+.idbox{
+	width: 690upx;
+	margin-left: 30upx;
+}
+.idboxTitle{
+	width: 100%;
+	height: 80upx;
+	line-height: 80upx;
+	font-size: 30upx;
+	color: #333333;
+}
+.idboxConten{
+	width: 100%;
+	/* height: 230upx; */
+	background-color: #FFFFFF;
+	border-radius: 10upx;
+	padding: 30upx 0;
+	display: flex;
+}
+.idboxConten_left{
+	width: 200upx;
+	height: 200upx;
+	background-color: #F1F1F1;
+	margin-left: 30upx;
+}
+.idboxConten_left image{
+	width: 120upx;
+	height: 100upx;
+	margin-left: 40upx;
+	margin-top: 20upx;
+}
+.idboxConten_left_text{
+	width: 100%;
+	height: 40upx;
+	margin-top: 20upx;
+	text-align: center;
+	color: #333333;
+}
+.idboxConten_right{
+	width: 320upx;
+	height: 200upx;
+	margin-left: 90upx;
+}
+.idboxConten_right image{
+	width: 100%;
+	height: 100%;
+}
+.area{
+	width: 690upx;
+	margin-left: 30rpx;
+	background-color: #FFFFFF;
+	border-radius: 10upx;
+	margin-top: 30upx;
+	padding-left: 3%;
+}
+.areaBox{
+	width: 100%;
+	height: 80upx;
+	line-height: 80upx;
+	border-bottom: #E4E4E4 solid 1upx;
+	display: flex;
+}
+.areaBox_left{
+	width: 94%;
+	color: #333333;
+}
+.areaBox_right{
+	width: 6%;
+}
+.areaBox_right image{
+	width: 20upx;
+	height: 25upx;
+}
+.detailAreaBox{
+	width: 100%;
+	height: 110upx;
+	color: #333333;
+	padding-top: 10upx;
+}
+.mask{
+	top: 0;
+	left: 0;
+	background: #F5F5F5;
+	width: 100%;
+	height: 100vh;
+	position: absolute;
+	z-index: 1000;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pages/set/set.vue b/mallplusui-uniapp-app2/pages/set/set.vue
new file mode 100644
index 0000000..9ff541e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pages/set/set.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="container">
+		<view class="list-cell b-b m-t" @click="navTo('../../pagesU/user/profile')" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">个人资料</text>
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+		<view class="list-cell b-b" @click="navTo('../../pagesU/address/address')" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">收货地址</text>
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+		<view class="list-cell" @click="navTo('/pages/set/certification')" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">实名认证</text>
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+
+		<view class="list-cell m-t">
+			<text class="cell-tit">消息推送</text>
+			<switch checked color="#fa436a" @change="switchChange" />
+		</view>
+		<view class="list-cell m-t b-b" @click="navTo('清除缓存')" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">清除缓存</text>
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+		<view class="list-cell b-b" @click="navTo('关于Dcloud')" hover-class="cell-hover" :hover-stay-time="50">
+			<text class="cell-tit">关于{{ sysInfo.name }}</text>
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+		<view class="list-cell" @click="updateApp()">
+			<text class="cell-tit">检查更新</text>
+			<!-- <text class="cell-tip">当前版本 {{sysInfo.version}}</text> -->
+			<text class="cell-more yticon icon-you"></text>
+		</view>
+		<view class="list-cell log-out-btn" @click="toLogout"><text class="cell-tit">退出登录</text></view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import { mapMutations } from 'vuex';
+import APPUpdate from '../../plugins/APPUpdate/index.js'
+
+export default {
+	components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			sysInfo: '',
+			userInfo:{}
+		};
+	},
+	onLoad() {
+		this.sysInfo = this.$db.get('sysInfo');
+	},
+	methods: {
+		...mapMutations(['logout']),
+
+		navTo(url) {
+			uni.navigateTo({
+				url: url
+			});
+			this.$api.msg(`跳转到${url}`);
+		},
+		//退出登录
+		toLogout() {
+			uni.showModal({
+				content: '确定要退出登录么',
+				success: e => {
+					if (e.confirm) {
+						this.logout();
+						this.$db.del('userInfos');
+						this.$db.del('token');
+						Api.apiCall('post', Api.index.logout, {});
+						setTimeout(() => {
+							uni.navigateBack();
+						}, 200);
+					}
+				}
+			});
+		},
+		//switch
+		switchChange(e) {
+			let statusTip = e.detail.value ? '打开' : '关闭';
+			this.$api.msg(`${statusTip}消息推送`);
+		},
+		updateApp() {
+			// true 没有新版本的时候有提示，默认：false
+			APPUpdate(true);
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+.list-cell {
+	display: flex;
+	align-items: baseline;
+	padding: 20upx;
+	line-height: 60upx;
+	position: relative;
+	background: #fff;
+	justify-content: center;
+	&.log-out-btn {
+		margin-top: 40upx;
+		border-radius: 50upx;
+		width: 95%;
+		margin-left: 2.5%;
+		background: $uni-color-primary;
+		.cell-tit {
+			color: #ffffff;
+			text-align: center;
+			margin-right: 0;
+		}
+	}
+	&.cell-hover {
+		background: #fafafa;
+	}
+	&.b-b:after {
+		left: 30upx;
+	}
+	&.m-t {
+		margin-top: 16upx;
+	}
+	.cell-more {
+		align-self: baseline;
+		font-size: $font-lg;
+		color: $font-color-light;
+		margin-left: 10upx;
+	}
+	.cell-tit {
+		flex: 1;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		margin-right: 10upx;
+	}
+	.cell-tip {
+		font-size: $font-base;
+		color: $font-color-light;
+	}
+	switch {
+		transform: translateX(16upx) scale(0.84);
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/after_sale/detail.vue b/mallplusui-uniapp-app2/pagesA/after_sale/detail.vue
new file mode 100644
index 0000000..87cd0ec
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/after_sale/detail.vue
@@ -0,0 +1,388 @@
+<template>
+	<view class="content">
+		<view class="content-top">
+			<!-- <view class="back-img">
+				<view class="back-img-c">
+					<view class="back-img-t">退款单状态</view>
+					<view class="back-img-b">{{status_name}} {{refund_name}} {{reship_name}}...</view>
+				</view>
+			</view> -->
+			<view class='cell-group margin-cell-group'>
+				<view class='cell-item add-title-item'>
+					<view class='cell-item-bd'>
+						<view class="cell-bd-view black-text">
+							<text class="cell-bd-text color-3">退款单状态</text>
+						</view>
+						<view class="cell-bd-view">
+							<text class="cell-bd-text color-9">{{status_name}} {{refund_name}} {{reship_name}}...</text>
+						</view>
+						<view class="cell-bd-view">
+							<!-- <text class="cell-bd-text">下单时间：{{ orderInfo.ctime }}</text> -->
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group'>
+				<view class='cell-item'>
+					<view class='cell-item-hd'><view class='cell-hd-title'>售后类型</view></view>
+					<view class='cell-item-ft'><view class="cell-ft-p">{{type_name}}</view></view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'><view class='cell-hd-title'>退款金额</view></view>
+					<view class='cell-item-ft'><view class="cell-ft-p red-price">{{refund}}元</view></view>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group' v-if="images.length > 0">
+				<view class='cell-item right-img'><view class='cell-item-hd'><view class='cell-hd-title'>图片凭证</view></view></view>
+				<view class="">
+					<view class="evaluate-c-b">
+						<view class="goods-img-item" v-for="(item, key) in images" :key="key">
+							<image :src="item.url" mode="aspectFit" @click="clickImg(item.url)"></image>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group'>
+				<view class='cell-item right-img'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>问题描述</view>
+					</view>
+				</view>
+				<view class="cell-textarea">
+					<text v-if="reason">{{reason}}</text>
+					<text v-else>暂无描述</text>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group' v-show="status == 2 && reship_status == 1">
+				<view class='cell-item right-img'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>退货邮寄信息</view>
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>收件人</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" disabled="false" :value="reship_info.reship_name" />
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>联系方式</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" disabled="false" :value="reship_info.reship_mobile" />
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>邮寄地址</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" disabled="false" :value="reship_info.reship_area + reship_info.reship_address" />
+					</view>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group' v-show="status == 2 && reship_status == 1">
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>快递公司</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" v-model="logi_code" placeholder="请填写快递公司名称"/>
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>物流单号</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" v-model="logi_no" placeholder="请填写物流单号" />
+					</view>
+				</view>
+			</view>
+			<view class='cell-group margin-cell-group' v-show="status == 2 && reship_status > 1">
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>快递公司</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" disabled="false" :value="logi_code"/>
+					</view>
+				</view>
+				<view class='cell-item'>
+					<view class='cell-item-hd'>
+						<view class='cell-hd-title'>物流单号</view>
+					</view>
+					<view class='cell-item-bd'>
+						<input class='cell-bd-input' type="text" disabled="false" :value="logi_no"/>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="button-bottom" v-show="status == 2 && reship_status == 1">
+			<button class="btn btn-b" @click="submitBtn" :disabled='submitStatus' :loading='submitStatus'>提交</button>
+		</view>
+		<view class="button-bottom" v-show="(order_status == 1 && status == 3) || (order_status == 1 && status == 2 && refund_status != 1 && refund_status != 0) || (order_status == 1 && status == 2 && reship_status == 3)">
+			<button class="btn btn-b" @click="repeat">再次申请售后</button>
+		</view>
+	</view>
+</template>
+
+<script>
+export default {
+    data() {
+        return {
+			delivers: ["请选择物流公司","顺丰", "中通", "圆通","韵达"],
+			deliverIndex: 0,
+			type_name:'',     //售后类型显示
+			refund:0,         //退款金额
+			images:[],        //图片
+			reason: '暂无',       //问题描述
+			ttype:1,          //售后类型
+			status:1,         //售后单状态
+			status_name: '审核中',   //售后单状态文字描述
+			reship_status:0,        //退货单状态
+			reship_name:'',
+			refund_status:0,        //退款单状态
+			refund_name:'',
+			reship_info:[],         //退货单明细,如果售后单未审核呢，那么显示的是售后单明细，如果售后单审核通过了，显示退款单明细
+			items:[],             //退货明细
+			mark:"暂无",            //拒绝原因
+			logi_no:'',            //回填物流信息
+			logi_code:'',          //物流公司
+			reship_id:'',
+			mode: 'aspectFill',
+			order_id: '', //订单号
+			order_status: '', //订单状态
+			submitStatus: false
+        }
+    },
+	methods: {
+		//提交按钮
+		submitBtn() {
+			this.submitStatus = true;
+			if (this.logino == '') {
+				this.$common.errorToShow('请输入退货快递信息');
+				this.submitStatus = false;
+				return false;
+			}
+			let data = {
+				logi_no: this.logi_no,
+				logi_code:this.logi_code,
+				reship_id: this.reship_id,
+			};
+			this.$api.sendShip(data, res => {
+				if (res.status) {
+					this.$common.successToShow('提交成功', ress => {
+						this.submitStatus = false;
+						uni.navigateBack({
+							delta: 1
+						});
+					});
+				} else {
+					this.$common.errorToShow(res.msg);
+					this.submitStatus = false;
+				}
+			});
+		},
+		repeat() {
+			this.$common.navigateTo('../after_sale/index?order_id='+this.order_id);
+		},
+		// 图片点击放大
+		clickImg (img) {
+			// 预览图片
+			uni.previewImage({
+				urls: img.split()
+			});
+		}
+	},
+	//页面加载
+	onLoad(options) {
+		let data = {
+			aftersales_id: options.aftersales_id
+		}
+		this.$api.afterSalesInfo(data, res => {
+			if(res.status){
+				let info = res.data.info;
+				if (info.type == 1){
+					this.ttype = 1;
+					this.type_name = '仅退款';
+				}else{
+					this.ttype = 2;
+					this.type_name = '退款退货';
+				}
+				this.refund = info.refund;
+				this.images = info.images;
+				this.reason = info.reason;
+				this.reship_info = res.data.reship;
+				this.order_id = info.order_id;
+				this.order_status = info.order_status;
+				if(info.mark){
+					this.mark = info.mark;
+				}
+				if(info.status == 1){
+					this.status = 1;
+					this.status_name = '审核中';
+				}else if(info.status == 2){
+					this.status = 2;
+					this.status_name = '申请通过';
+					//退款单状态
+					if (info.bill_refund) {
+						if (info.bill_refund.status == 1) {
+							this.refund_status = 1;
+							this.refund_name = '退款中';
+						} else if (info.bill_refund.status == 2) {
+							this.refund_status = 2;
+							this.refund_name = '退款成功';
+						}
+					}
+		
+					//退货单状态
+					if(info.bill_reship){
+						this.reship_id = info.bill_reship.reship_id
+						if(info.bill_reship.status == 1) {
+							this.reship_status = 1;
+							this.reship_name = '待发退货';
+						} else if (info.bill_reship.status == 2) {
+							this.reship_status = 2;
+							this.reship_name = '待收退货';
+							this.logi_no = info.bill_reship.logi_no;
+							this.logi_code = info.bill_reship.logi_code;
+						} else {
+							this.reship_status = 3;
+							this.reship_name = '已收退货';
+							this.logi_no = info.bill_reship.logi_no;
+							this.logi_code = info.bill_reship.logi_code;
+						}
+					}
+				}else{
+					this.status = 3;
+					this.status_name = '申请驳回';
+				}
+				//售后单明细,如果有退货单明细，就用退货单明细，否则就用售后单明细
+				// if(info.bill_reship.items){
+				//   page.data.items = info.bill_reship.items;
+				// }else{
+				//   page.data.items = info.items;
+				// }
+			} else {
+				this.$common.errorToShow(res.msg);
+			}
+		});
+	}
+}
+</script>
+
+<style>
+.back-img{
+	width: 100%;
+	height: 200upx;
+	position: relative;
+	background-color: #FF7159;
+}
+.back-img image{
+	width: 100%;
+	height: 100%;
+	position: absolute;
+}
+.back-img-c{
+	width: 100%;
+	height: 100%;
+	color: #fff;
+	position: relative;
+	z-index: 99;
+	padding: 50upx;
+}
+.back-img-t{
+	font-size: 32upx;
+}
+.back-img-b{
+	font-size: 24upx;
+}
+.list-goods-name{
+	width: 100% !important;
+}
+.invoice-type .uni-list-cell{
+	display: inline-block;
+	font-size: 26upx;
+	color: #333;
+	position: relative;
+	margin-left: 50upx;
+}
+.invoice-type .uni-list-cell>view{
+	display: inline-block;
+}
+.invoice-type-icon{
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+}
+.invoice-type-c{
+	margin-left: 50upx;
+	line-height: 2;
+}
+.cell-item-ft .cell-bd-input{
+	text-align: right;
+	width: 500upx;
+	font-size: 28upx;
+}
+.cell-item-bd .cell-bd-input{
+	width: 100%;
+	overflow: hidden;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+}
+.right-img{
+	border-bottom: 0;
+}
+.cell-textarea{
+	padding: 0 26upx 20upx;
+	font-size: 26upx;
+	color: #333;
+	word-wrap: break-word;
+}
+.evaluate-c-b{
+	overflow: hidden;
+	padding: 0 20upx;
+}
+.upload-img{
+	width: 146upx;
+	height: 146upx;
+	margin: 14upx;
+	text-align: center;
+	color: #999999;
+	font-size: 22upx;
+	border: 2upx solid #E1E1E1;
+	border-radius: 4upx;
+	display: inline-block;
+	float: left;
+	padding: 24upx 0;
+}
+.goods-img-item{
+	width: 174upx;
+	height: 174upx;
+	padding: 14upx;
+	float: left;
+	position: relative;
+}
+.goods-img-item:nth-child(4n){
+	margin-right: 0;
+}
+.goods-img-item image{
+	width: 100%;
+	height: 100%;
+}
+.del{
+	width: 30upx !important;
+	height: 30upx !important;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 999;
+}
+.black-text .cell-bd-text{
+	font-size: 28upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/after_sale/index.vue b/mallplusui-uniapp-app2/pagesA/after_sale/index.vue
new file mode 100644
index 0000000..22e31df
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/after_sale/index.vue
@@ -0,0 +1,382 @@
+<template>
+	<view class="content">
+		<form @submit="submit" report-submit="true">
+			<view class="content-top">
+				<view class="img-list cart-list">
+					<checkbox-group class="cart-checkbox" @change="checkboxChange">
+						<view class="cart-checkbox-item" v-for="(item, key) in orderInfo.orderItemList" :key="key">
+							<label class="uni-list-cell uni-list-cell-pd">
+								<view class="cart-checkbox-c"><checkbox v-if="item.status != 30" :value="item.id" :checked="item.checked" color="#FF7159" /></view>
+								<view class="img-list-item">
+									<image class="img-list-item-l little-img have-none" :src="item.productPic" mode="aspectFill"></image>
+									<view class="img-list-item-r little-right">
+										<view class="little-right-t">
+											<view class="goods-name list-goods-name">{{ item.productName }}</view>
+											<view v-if="item.status == 30" class="list-goods-name red-price">已申请</view>
+										</view>
+										<view class="goods-item-c">
+											<view class="goods-buy">
+												<!-- 商品规格 -->
+												<view class="goods-salesvolume">{{ item.productPrice }} x{{ item.productQuantity }}</view>
+											</view>
+										</view>
+									</view>
+								</view>
+							</label>
+						</view>
+					</checkbox-group>
+				</view>
+				<view class="cell-group margin-cell-group">
+					<view class="cell-item">
+						<view class="cell-item-hd"><view class="cell-hd-title">服务类型</view></view>
+						<view class="cell-item-ft">
+							<view class="uni-form-item uni-column invoice-type">
+								<!-- <radio-group class="uni-list" @change="radioChange">
+									<label class="uni-list-cell uni-list-cell-pd" v-for="(item,index) in type_list" :key="index">
+										<view>
+											<radio :id="item.name" :value="item.name" :checked="item.checked"></radio>
+										</view>
+										<view>
+											<label class="label-2-text" :for="item.name">
+												<text>{{item.value}}</text>
+											</label>
+										</view>
+									</label>
+								</radio-group> -->
+								<!-- #ifndef MP-ALIPAY -->
+								<radio-group class="uni-list" @change="radioChange">
+									<label class="uni-list-cell uni-list-cell-pd" v-for="(item, index) in type_list" :key="index">
+										<view class="invoice-type-icon">
+											<radio class="a-radio" :id="item.name" :value="item.value" :checked="item.checked" :disabled="item.disabled"></radio>
+										</view>
+										<view class="invoice-type-c">
+											<label class="label-2-text" :for="item.name">
+												<text>{{ item.name }}</text>
+											</label>
+										</view>
+									</label>
+								</radio-group>
+								<!-- #endif -->
+								<!-- #ifdef MP-ALIPAY -->
+								<jhlable></jhlable>
+								<!-- #endif -->
+							</view>
+						</view>
+					</view>
+					<view class="cell-item">
+						<view class="cell-item-hd"><view class="cell-hd-title">退款金额</view></view>
+						<view class="cell-item-ft"><input class="cell-bd-input red-price" v-model="refund" :disabled="refund_input_noedit" /></view>
+					</view>
+				</view>
+				<view class="cell-group margin-cell-group">
+					<view class="cell-item right-img">
+						<view class="cell-item-hd"><view class="cell-hd-title">上传凭证</view></view>
+					</view>
+					<view class="">
+						<view class="evaluate-c-b">
+							<view class="goods-img-item" v-for="(item, key) in images" :key="key">
+								<image class="del" src="/static/image/del.png" mode="" @click="delImage(item)"></image>
+								<image class="" :src="item" mode="" @click="clickImg(item)"></image>
+							</view>
+							<view class="upload-img" v-show="isImage" @click="upImage">
+								<image class="icon" src="/static/image/camera.png" mode=""></image>
+								<view class="">上传照片</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="cell-group margin-cell-group">
+					<view class="cell-item right-img">
+						<view class="cell-item-hd"><view class="cell-hd-title">问题描述</view></view>
+					</view>
+					<view class="cell-textarea "><textarea v-model="reason" placeholder="请您在此描述问题(最多200字)" maxlength="200" /></view>
+				</view>
+			</view>
+			<view class="button-bottom"><button class="btn btn-b btn-square" formType="submit">提交</button></view>
+		</form>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import jhlable from '@/components/jihai-lable.vue';
+export default {
+	data() {
+		return {
+			type_list: [
+				{ value: '0', name: '换货', checked: true, disabled: false },
+				// { value: '1', name: '仅退款', checked: true, disabled: false },
+				// { value: '2', name: '退货', checked: false, disabled:false },
+				{ value: '3', name: '退货退款', checked: false, disabled: false }
+			],
+			orderInfo: [],
+			order_id: '',
+			items: [], //退货明细
+			item_ids: [], //选择的退货
+			aftersale_type: 1, //售后类型1退款，2退款退货
+			refund: 0, //退款金额，等于已支付的金额减去已退款的金额
+			refund_show: 0,
+			images: [], //图片
+			reason: '', //原因
+			image_max: 5, //用于前台判断上传图片按钮是否显示
+			refund_input_noedit: false,
+			mode: 'aspectFill',
+			submitStatus: false,
+			receiverId:''
+		};
+	},
+	components: { jhlable },
+	computed: {
+		isImage() {
+			let num = this.image_max - this.images.length;
+			if (num > 0) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+	},
+	methods: {
+		// 单选框点击切换
+		radioChange: function(evt) {
+			this.type_list.forEach(item => {
+				if (item.value === evt.target.value) {
+					item.checked = true;
+					this.aftersale_type = evt.target.value;
+				} else {
+					item.checked = false;
+				}
+			});
+			if (this.type_list[0].checked) {
+				this.refund_input_noedit = true;
+			} else {
+				this.refund_input_noedit = false;
+			}
+		},
+
+		//订单商品信息
+		async getOrderInfo() {
+			debugger;
+			let params = { id: this.order_id };
+			this.orderInfo = await Api.apiCall('get', Api.order.orderDetail, params);
+			this.refund_show = this.orderInfo.payAmount;
+			this.receiverId = this.orderInfo.receiverId;
+			console.log(this.receiverId)
+		},
+
+		//退货商品选择
+		checkboxChange(e) {
+			let nums = 0;
+			this.item_ids = [];
+			for (var i = 0; i < e.detail.value.length; i++) {
+				let k = e.detail.value[i];
+				for (var j = 0; j < this.orderInfo.orderItemList.length; j++) {
+					if (this.orderInfo.orderItemList[j].id == k) {
+						this.item_ids = this.item_ids.concat(k);
+					}
+				}
+			}
+		},
+
+		//提交
+		async submit(e) {
+			this.submitStatus = true;
+			/* let images = [];
+			for(var i = 0; i<this.images.length; i++) {
+				images = images.concat(this.images[i].image_id);
+			} */
+
+			//判断退款金额
+			let reg = /^[0-9]+(.[0-9]{1,2})?$/;
+			if (!reg.test(this.refund)) {
+				this.$common.errorToShow('请输入正确金额');
+				this.submitStatus = false;
+				return false;
+			} else {
+				if (this.refund < 0) {
+					this.$common.errorToShow('退款金额不能小于0');
+					return false;
+				}
+				if (this.refund > this.refund_show) {
+					this.$common.errorToShow('退款金额过大');
+					this.submitStatus = false;
+					return false;
+				}
+			}
+
+			if (!this.item_ids || this.item_ids.length == 0) {
+				this.$common.errorToShow('请选择需要售后的商品');
+				return false;
+			}
+			//组装数据，提交数据
+			let data = {
+				orderId: this.order_id,
+				type: this.aftersale_type,
+				items: this.item_ids,
+				images: this.images,
+				returnAmount: this.refund,
+				desc: this.reason,
+				companyAddressId:this.receiverId
+			};
+
+			// #ifdef MP-WEIXIN
+			data['formId'] = e.detail.formId;
+			// #endif
+
+			let res = await Api.apiCall('post', Api.order.saveOmsOrderReturnApply, data);
+			if (res.code == 200) {
+				// this.$common.successToShow('提交成功', ress => {
+				// 	this.submitStatus = false;
+				// 	uni.navigateBack({
+				// 		delta: 1
+				// 	});
+				// });
+				uni.showToast({
+					title: "提交成功",
+					icon: "none"
+				});
+			} else {
+				this.$common.errorToShow(res.msg);
+				this.submitStatus = false;
+				uni.navigateBack({ delta: 1 });
+			}
+		},
+
+		//上传图片
+		upImage() {
+			let num = this.image_max - this.images.length;
+			if (num > 0) {
+				this.$otherApi.uploadFiles(res => {
+					//this.$otherApi.uploadImage(num, res => {
+					if (res.code == 200) {
+						this.images = this.images.concat(res.data);
+						this.$common.successToShow(res.msg);
+					} else {
+						this.$common.errorToShow(res.msg);
+					}
+				});
+			}
+		},
+
+		//删除图片
+		delImage(e) {
+			let newImages = [];
+			for (var i = 0; i < this.images.length; i++) {
+				if (this.images[i].image_id != e.image_id) {
+					newImages.push(this.images[i]);
+				}
+			}
+			this.images = newImages;
+		},
+		// 图片点击放大
+		clickImg(img) {
+			// 预览图片
+			uni.previewImage({
+				urls: img.split()
+			});
+		}
+	},
+	onLoad(e) {
+		this.order_id = e.order_id;
+		this.getOrderInfo();
+	}
+};
+</script>
+
+<style lang="scss">
+@import '../../static/css/style.css';
+
+.list-goods-name {
+	width: 100% !important;
+}
+.cart-checkbox-item {
+	position: relative;
+}
+.invoice-type .uni-list-cell {
+	display: inline-block;
+	font-size: 26upx;
+	color: #333;
+	position: relative;
+	margin-left: 50upx;
+}
+.invoice-type .uni-list-cell > view {
+	display: inline-block;
+}
+.invoice-type-icon {
+	position: absolute;
+	top: 50%;
+	transform: translateY(-50%);
+}
+.invoice-type-c {
+	margin-left: 50upx;
+	line-height: 2;
+}
+.cell-item-ft .cell-bd-input {
+	text-align: right;
+	width: 500upx;
+	font-size: 28upx;
+}
+.right-img {
+	border-bottom: 0;
+}
+.cell-textarea {
+	padding: 0 26upx 20upx;
+}
+.cell-textarea textarea {
+	width: 100%;
+	height: 200upx;
+	font-size: 26upx;
+	color: #333;
+}
+.evaluate-c-b {
+	overflow: hidden;
+	padding: 0 20upx;
+}
+.upload-img {
+	width: 146upx;
+	height: 146upx;
+	margin: 14upx;
+	text-align: center;
+	color: #999999;
+	font-size: 22upx;
+	border: 2upx solid #e1e1e1;
+	border-radius: 4upx;
+	display: inline-block;
+	float: left;
+	padding: 24upx 0;
+}
+.goods-img-item {
+	width: 174upx;
+	height: 174upx;
+	padding: 14upx;
+	float: left;
+	position: relative;
+}
+.goods-img-item:nth-child(4n) {
+	margin-right: 0;
+}
+.goods-img-item image {
+	width: 100%;
+	height: 100%;
+}
+.del {
+	width: 30upx !important;
+	height: 30upx !important;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 999;
+}
+
+.cell-group {
+	background-color: #fff;
+}
+.margin-cell-group {
+	margin: 20upx 0;
+}
+
+/* #ifdef MP-ALIPAY */
+
+/* #endif */
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/after_sale/list.vue b/mallplusui-uniapp-app2/pagesA/after_sale/list.vue
new file mode 100644
index 0000000..5e6dfa5
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/after_sale/list.vue
@@ -0,0 +1,642 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item" >
+						<view class="i-top b-b">
+							<text class="time" @click="navToDetailPage(item)">{{ item.createTime }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}--</text>
+							<text class='state' v-if="item.status == 0">待审核</text>
+							<text class='state' v-else-if="item.status == 1">退货中</text>
+							<text class='state' v-else-if="item.status == 2">已完成</text>
+							<text class='state' v-else-if="item.status == 3">审核拒绝</text>
+						</view>
+
+						<scroll-view v-if="item.orderItemList.length > 1" class="goods-box" scroll-y >
+							<view v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex" class="goods-item">
+								<img class="goods-img" :src="goodsItem.productPic" @click="navToDetailPage(item)" mode="aspectFill"></img>
+							</view>
+						</scroll-view>
+						<view v-if="item.orderItemList.length === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right" @click="navToDetailPage(item)">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }}</text>
+							</view>
+						</view>
+
+						<view class="price-box">
+							共
+							<text class="num">{{ item.orderItemList.length }}</text>
+							
+						</view>
+						
+					</view>
+<uni-load-more :status="loadingType"></uni-load-more>
+				</scroll-view>
+
+			</swiper-item>
+		</swiper>
+
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			pageNum: 1,
+			orderList:[],
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			loadingType: 'loading', //加载更多状态
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'loading',
+					orderList: []
+				},
+				
+
+			]
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		this.tabCurrentIndex = 0;
+
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+    computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `detail?aftersales_id='+${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(type = 'add', loading) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let status = navItem.status;
+
+
+			let url;
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+
+				let params = { pageNum: this.pageNum };
+				let data = await Api.apiCall('get', Api.order.aftersaleslist, params);
+				let goodsList = data.records;
+				let orderList = goodsList.filter(item => {
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.orderStateExp(item.status));
+					item.createTime = this.dateFormat(item.createTime);
+					//演示数据所以自己进行状态筛选
+					if (status === 0) {
+						//0为全部订单
+						return item;
+					}
+					return item.status === status;
+				});
+
+				if (type === 'refresh') {
+					this.orderList = [];
+				}
+
+				this.orderList = this.orderList.concat(orderList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.orderList.length >= data.total ? 'nomore' : 'loading';
+
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+				this.pageNum = this.pageNum + 1;
+				navItem.orderList=[];
+                				orderList.forEach(item => {
+                					navItem.orderList.push(item);
+                				});
+			}
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			//this.pageNum =  1;
+			this.loadData('refresh');
+		},
+		//顶部tab点击
+		tabClick(index) {
+		    this.pageNum =  1;
+			this.loadData('refresh');
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		async deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+			}, 600);
+		},
+		async payOrder(item) {
+		 let url = '/pages/order/payment/index?order_id=' + item.id + '&type=1' ;
+			this.$common.navigateTo(
+					url
+			)
+
+		},
+		//取消订单
+		async cancelOrder(item) {
+			let params = { orderId: item.id };
+			let data = await Api.apiCall('post', Api.order.closeOrder, params);
+
+			if (data) {
+				this.$api.msg(data);
+				this.pageNum =  1;
+				this.loadData('refresh');
+				this.tabCurrentIndex = 4;
+			}
+
+		},
+		//订单确认收货
+		async confimDelivery(item) {
+
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.confimDelivery, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data);
+				this.pageNum =  1;
+				this.loadData('refresh');
+				this.tabCurrentIndex = 4;
+			}
+
+		},
+		// 申请售后
+        		applyRefund(orderId) {
+        			this.$common.navigateTo(
+        					'../../pagesA/after_sale/index?order_id=' + orderId
+        			)
+        		},
+
+		//订单申请退款
+		async applyRefund1(item) {
+
+			let params = { id: item.id };
+			let data = await Api.apiCall('post', Api.order.applyRefund, params);
+			if (data) {
+				console.log(data);
+				this.$api.msg(data);
+			}
+			this.pageNum =  1;
+			this.loadData('refresh');
+			this.tabCurrentIndex = 5;
+		},
+		// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo(
+					'/pages/order/evaluate?order_id=' + orderId
+			)
+		},
+
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 12) {
+				stateTipColor = '#909399';
+				stateTip = '待付款';
+			}if (value === 1) {
+				stateTipColor = '#909399';
+				stateTip = '支付成功，没有回掉';
+			}if (value === 2) {
+				stateTip = '待发货';
+			} else if (value === 3) {
+				stateTip = '待收货';
+			} else if (value === 4) {
+				stateTip = '待评价';
+			} else if (value === 5) {
+				stateTip = '已完成';
+			} else if (value === 6) {
+				stateTipColor = '#909399';
+				stateTip = '维权中';
+			} else if (value === 7) {
+				stateTip = ' 维权已完成';
+			} else if (value === 8) {
+				stateTip = '待分享';
+			} else if (value === 13) {
+				stateTip = '申请退款';
+			} else if (value === 14) {
+				stateTip = '已退款';
+			}  else if (value === 15) {
+				stateTip = '已关闭';
+			} else if (value === 16) {
+				stateTip = '无效订单';
+			} else {
+				stateTip = '待付款';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/applyCommunity.vue b/mallplusui-uniapp-app2/pagesA/build/applyCommunity.vue
new file mode 100644
index 0000000..7eca917
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/applyCommunity.vue
@@ -0,0 +1,395 @@
+<template>
+	<view class="content">
+		<view class="list-wraper logo-wraper" @click="uplodingImg(1)">
+			<view class="tit">
+				<text>点击上传商家logo</text>
+			</view>
+			<view class="input-logo" >
+				<image v-if="!logImg" src="http://mp.emshop.eonfox.com/zrhzstatic/muying/shop.png" mode=""></image>
+				<image v-else :src="logImg" mode=""></image>
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家名称：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.name"  placeholder="请输入商家名称" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家QQ：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.contactQq"  placeholder="请输入商家QQ" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家手机号：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="number" maxlength="11" v-model="infor.supportPhone" value="" placeholder="请输入手机号" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家类别：</text>
+			</view>
+			<view class="input-all">
+				<radio-group>
+					 <label class="radio" v-for="(item,index) in shopsType" :key='index'><radio  value="r1"  class="radio" @click="gain(item.type_id)"/>{{item.name}}</label>
+				</radio-group>
+			</view>
+		</view>
+		<view class="list-wraper"  @click="showMulLinkageThreePicker">
+			<view class="tips_left">
+				<text>{{pickerText}}</text>
+			</view>
+			<view class="tips_right">
+				<image src="../../static/right-arrow.png" ></image>
+			</view>
+		</view>
+
+		<view class="tips"  @click="goPage">
+			<view class="tips_left">
+				<text>{{addressName}}</text>
+			</view>
+			<view class="tips_right">
+				<image src="../../static/right-arrow.png" ></image>
+			</view>
+		</view>
+		<view class="h-20upx"></view>
+
+		<view class="list-wraper ind-wraper">
+			<view class="tit">
+				<text>商家介绍：</text>
+			</view>
+			<view class="input-lg">
+				<textarea class="lg-text" value=""  v-model="infor.description" placeholder="请输入..." />
+			</view>
+		</view>
+
+		<view class="list-wraper logo-wraper"  @click="uplodingImg(2)">
+			<view class="tit">
+				<text>点击上传营业执照：</text>
+			</view>
+			<view class="input-Image">
+				<image v-if="!BusinessImg"  src="http://mp.emshop.eonfox.com/zrhzstatic/muying/yingyezhizhao.png" mode=""></image>
+				<image v-else :src="BusinessImg" mode=""></image>
+			</view>
+		</view>
+
+		<view class="btn-box">
+			<button class="btn" @click="commit()">提交申请</button>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	// #ifdef H5
+	let jweixin = require('jweixin-module');
+	// #endif
+
+	export default {
+		data() {
+			return {
+				cityPickerValueDefault: [0, 0, 1],
+				themeColor: '#007AFF',
+				pickerText: '选择省/市/区',
+				addressName:'请选择商家地址',
+				logImg:'',
+				infor:{},
+				BusinessImg:''  ,// 营业执照
+				BusinessImgId:'',
+				logImgID:'',
+				shopsType:[
+						{
+					id: 1,
+					name: "服装",
+				     },
+					{
+						id: 2,
+						name: "化妆品",
+					},
+					{
+						id: 3,
+						name: "家装",
+					},
+					{
+						id: 4,
+						name: "水果",
+					},
+				]
+			}
+		},
+
+		onLoad(){
+
+		},
+		methods: {
+			goPage(){
+				var _this = this
+				uni.chooseLocation({
+				    success: function (res) {
+						console.log('res',res)
+				        console.log('位置名称：' + res.name);
+						_this.addressName=res.address +res.name
+						_this.infor.addressDetail = res.address +res.name
+						_this.infor.addressLat=res.latitude
+						_this.infor.addressLng=res.longitude
+				        console.log('经度：' + res.longitude);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+				    }
+				});
+			},
+			gain(id){
+				this.infor.type_id=id
+				console.log('类别id',this.infor.type_id)
+			},
+			// 上传图片
+			uplodingImg (name) {
+				this.$otherApi.uploadFiles(res => {
+					if (res.code == 200) {
+						console.log(res.data)
+						if(name==1){
+							this.logImg = res.data
+							this.infor.logo=res.data
+						}else{
+							this.BusinessImg = res.data
+							this.infor.supportName=res.data
+						}
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+			uplodingImg1(name){
+				var _this=this
+				console.log(name)
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					sourceType: ['album'],
+					success: (res) => {
+						console.log('chooseImage success, temp path is', res.tempFilePaths[0])
+						var imageSrc = res.tempFilePaths[0]
+						ef.left_token(function(left_token){
+							//encodeURIComponent  encodeURI
+							var uploadUrl=ef.api_server_url+"?"+encodeURI('data=[["APPLICATIONIMAGEUPLOADQINIU"]]')+"&token="+left_token;
+							uni.uploadFile({
+								url: uploadUrl,
+								filePath: imageSrc,
+								fileType: 'image',
+								name: 'file',
+								success: (res) => {
+									console.log('上传成功:',res.data)
+									var imageJson=JSON.parse(res.data)
+									console.log(imageJson)
+									uni.showToast({
+										title: '上传成功',
+										icon: 'success',
+										duration: 1000,
+										success() {
+											if(name==1){
+												_this.logImg = imageSrc
+												_this.infor.logo_image_id=imageJson.data[0].data.image_id
+											}else{
+												_this.BusinessImg = imageSrc
+												_this.infor.license_image_id=imageJson.data[0].data.image_id
+											}
+										}
+									})
+								},
+								fail: (err) => {
+									console.log('uploadImage fail', err);
+									uni.showModal({
+										content: err.errMsg,
+										showCancel: false
+									});
+								}
+							});
+						});
+					},
+					fail: (err) => {
+						console.log('chooseImage fail', err)
+
+					}
+				})
+			},
+			async commit(){
+				var _this=this
+				let form = Object.assign({},_this.infor)
+				let data = await Api.apiCall('post', Api.member.applyStore, form);
+				console.log(data)
+				if (data) {
+					this.$api.msg(`商户入驻成功`);
+					setTimeout(() => {
+						let url = '../../pagesC/store/storeResult?id='+data.id;
+						uni.navigateTo({
+							url
+						});
+					}, 800);
+				} else {
+					this.$api.msg(`商户入驻失败`);
+				}
+			},
+			onConfirm(e) {
+				console.log(e);
+				var label=e.label;
+				this.pickerText = label;
+				var labelArr=label.split('-');
+				this.infor.addressProvince=labelArr[0];
+				this.infor.addressCity=labelArr[1];
+				this.infor.addressArea=labelArr[2];
+				},
+
+			openLocation(){
+				// #ifdef H5
+				jweixin.getLocation({
+					type: 'wgs84',
+					success: res => {
+						const latitude = res.latitude;
+						const longitude = res.longitude;
+						jweixin.openLocation({
+							latitude: latitude, // 纬度，浮点数，范围为90 ~ -90
+							longitude: longitude, // 经度，浮点数，范围为180 ~ -180。
+							name: '位置名', // 位置名
+
+							scale: 16, // 地图缩放级别,整形值,范围从1~28。默认为最大
+							infoUrl:"http://www.baidu.com"
+						})
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background: #F5F5F5;
+		width: 100%;
+		height: 100%;
+	}
+	.h-20upx{
+		height: 20upx;
+		display: flex;
+	}
+	.tips{
+		display: flex;
+		/* width: calc(100% - 60upx); */
+		padding: 20upx;
+		background-color: #FFFFFF;
+	}
+	.tips_left{
+		width: 94%;
+		font-size: 28upx;
+		color: #de7d67;
+	}
+	.tips_right{
+		width: 5%;
+	}
+	.tips_right image{
+		width:40upx;
+	    height: 40upx;
+	}
+	.btn{
+		background-color: rgba( 242 155 135);
+		color: #FFFFFF;
+	}
+	.input-logo{
+		width: 120upx;
+		height: 120upx;
+		line-height: 120upx;
+		text-align: center;
+		font-size: 27upx;
+		color: #444444;
+	}
+	.input-logo image{
+		width: 120upx;
+		height: 120upx;
+	}
+	.input-Image{
+		width: 420upx;
+		height: 320upx;
+		line-height: 320upx;
+		text-align: center;
+		font-size: 27upx;
+		border: 1upx #CCCCCC solid;
+		color: #444444;
+	}
+	.input-Image image{
+		width: 420upx;
+		height: 320upx;
+	}
+	.radio{
+		font-size: 28upx;
+		transform:scale(0.7)
+	}
+</style>
+<style scoped lang="stylus" ref="stylesheet/stylus">
+	.content
+		width 100%
+		display flex
+		flex-direction column
+		color #333333
+		.list-wraper
+			position relative
+			display flex
+			align-items center
+			// width calc(100% - 60upx)
+			padding 20upx
+			background #FFFFFF
+			.tit
+				flex 1.5
+				text
+					font-size 28upx
+
+			.input-all
+				flex 4
+				.inpt
+					// background red
+					padding-top 6upx
+					font-size 28upx
+
+		.logo-wraper
+			.input-all
+				text-align right
+				image
+					width 100upx
+					height 100upx
+
+		.list-wraper::after
+			position absolute
+			content ""
+			width calc(100% - 60upx)
+			height 2upx
+			left 30upx
+			bottom 0
+			background #CCCCCC
+		.ind-wraper
+			flex-direction column
+			justify-content left
+			.tit
+				width 100%
+			.input-lg
+				width 100%
+				padding 20upx 10upx
+				// background red
+				.lg-text
+					font-size 24upx
+					color #777777
+		.btn-box
+			width 690upx;
+			padding 40upx 30upx
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/bindCommunity.vue b/mallplusui-uniapp-app2/pagesA/build/bindCommunity.vue
new file mode 100644
index 0000000..bc3b607
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/bindCommunity.vue
@@ -0,0 +1,397 @@
+<template>
+	<view class="content">
+		<view class="list-wraper logo-wraper" @click="uplodingImg(1)">
+			<view class="tit">
+				<text>点击上传商家logo</text>
+			</view>
+			<view class="input-logo" >
+				<image v-if="!logImg" src="http://mp.emshop.eonfox.com/zrhzstatic/muying/shop.png" mode=""></image>
+				<image v-else :src="logImg" mode=""></image>
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家名称：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.name"  placeholder="请输入商家名称" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家QQ：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.contactQq"  placeholder="请输入商家QQ" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家手机号：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="number" maxlength="11" v-model="infor.supportPhone" value="" placeholder="请输入手机号" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家类别：</text>
+			</view>
+			<view class="input-all">
+				<radio-group>
+					 <label class="radio" v-for="(item,index) in shopsType" :key='index'><radio  value="r1"  class="radio" @click="gain(item.type_id)"/>{{item.name}}</label>
+				</radio-group>
+			</view>
+		</view>
+		<view class="list-wraper"  @click="showMulLinkageThreePicker">
+			<view class="tips_left">
+				<text>{{pickerText}}</text>
+			</view>
+			<view class="tips_right">
+				<image src="../../static/right-arrow.png" ></image>
+			</view>
+		</view>
+
+		<view class="tips"  @click="goPage">
+			<view class="tips_left">
+				<text>{{addressName}}</text>
+			</view>
+			<view class="tips_right">
+				<image src="../../static/right-arrow.png" ></image>
+			</view>
+		</view>
+		<view class="h-20upx"></view>
+
+		<view class="list-wraper ind-wraper">
+			<view class="tit">
+				<text>商家介绍：</text>
+			</view>
+			<view class="input-lg">
+				<textarea class="lg-text" value=""  v-model="infor.description" placeholder="请输入..." />
+			</view>
+		</view>
+
+		<view class="list-wraper logo-wraper"  @click="uplodingImg(2)">
+			<view class="tit">
+				<text>点击上传营业执照：</text>
+			</view>
+			<view class="input-Image">
+				<image v-if="!BusinessImg"  src="http://mp.emshop.eonfox.com/zrhzstatic/muying/yingyezhizhao.png" mode=""></image>
+				<image v-else :src="BusinessImg" mode=""></image>
+			</view>
+		</view>
+
+		<view class="btn-box">
+			<button class="btn" @click="commit()">提交申请</button>
+		</view>
+	</view>
+</template>
+
+<script>
+
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	// #ifdef H5
+	let jweixin = require('jweixin-module');
+	// #endif
+
+	export default {
+		data() {
+			return {
+				cityPickerValueDefault: [0, 0, 1],
+				themeColor: '#007AFF',
+				pickerText: '选择省/市/区',
+				addressName:'请选择商家地址',
+				logImg:'',
+				infor:{},
+				BusinessImg:''  ,// 营业执照
+				BusinessImgId:'',
+				logImgID:'',
+				shopsType:[
+						{
+					id: 1,
+					name: "服装",
+				     },
+					{
+						id: 2,
+						name: "化妆品",
+					},
+					{
+						id: 3,
+						name: "家装",
+					},
+					{
+						id: 4,
+						name: "水果",
+					},
+				]
+			}
+		},
+
+		onLoad(){
+
+		},
+		methods: {
+			goPage(){
+				var _this = this
+				uni.chooseLocation({
+				    success: function (res) {
+						console.log('res',res)
+				        console.log('位置名称：' + res.name);
+						_this.addressName=res.address +res.name
+						_this.infor.addressDetail = res.address +res.name
+						_this.infor.addressLat=res.latitude
+						_this.infor.addressLng=res.longitude
+				        console.log('经度：' + res.longitude);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+				    }
+				});
+			},
+			gain(id){
+				this.infor.type_id=id
+				console.log('类别id',this.infor.type_id)
+			},
+			// 上传图片
+			uplodingImg (name) {
+				this.$otherApi.uploadFiles(res => {
+					if (res.code == 200) {
+						console.log(res.data)
+						if(name==1){
+							this.logImg = res.data
+							this.infor.logo=res.data
+						}else{
+							this.BusinessImg = res.data
+							this.infor.supportName=res.data
+						}
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+			uplodingImg1(name){
+				var _this=this
+				console.log(name)
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['compressed'],
+					sourceType: ['album'],
+					success: (res) => {
+						console.log('chooseImage success, temp path is', res.tempFilePaths[0])
+						var imageSrc = res.tempFilePaths[0]
+						ef.left_token(function(left_token){
+							//encodeURIComponent  encodeURI
+							var uploadUrl=ef.api_server_url+"?"+encodeURI('data=[["APPLICATIONIMAGEUPLOADQINIU"]]')+"&token="+left_token;
+							uni.uploadFile({
+								url: uploadUrl,
+								filePath: imageSrc,
+								fileType: 'image',
+								name: 'file',
+								success: (res) => {
+									console.log('上传成功:',res.data)
+									var imageJson=JSON.parse(res.data)
+									console.log(imageJson)
+									uni.showToast({
+										title: '上传成功',
+										icon: 'success',
+										duration: 1000,
+										success() {
+											if(name==1){
+												_this.logImg = imageSrc
+												_this.infor.logo_image_id=imageJson.data[0].data.image_id
+											}else{
+												_this.BusinessImg = imageSrc
+												_this.infor.license_image_id=imageJson.data[0].data.image_id
+											}
+										}
+									})
+								},
+								fail: (err) => {
+									console.log('uploadImage fail', err);
+									uni.showModal({
+										content: err.errMsg,
+										showCancel: false
+									});
+								}
+							});
+						});
+					},
+					fail: (err) => {
+						console.log('chooseImage fail', err)
+
+					}
+				})
+			},
+			async commit(){
+				var _this=this
+				let form = Object.assign({},_this.infor)
+				let data = await Api.apiCall('post', Api.member.applyStore, form);
+				console.log(data)
+				if (data) {
+					this.$api.msg(`商户入驻成功`);
+					setTimeout(() => {
+						let url = '../../pagesC/store/storeResult?id='+data.id;
+						uni.navigateTo({
+							url
+						});
+					}, 800);
+				} else {
+					this.$api.msg(`商户入驻失败`);
+				}
+			},
+			onConfirm(e) {
+				console.log(e);
+				var label=e.label;
+				this.pickerText = label;
+				var labelArr=label.split('-');
+				this.infor.addressProvince=labelArr[0];
+				this.infor.addressCity=labelArr[1];
+				this.infor.addressArea=labelArr[2];
+				},
+			showMulLinkageThreePicker() {
+			    this.$refs.mpvueCityPicker.show()
+			},
+			openLocation(){
+				// #ifdef H5
+				jweixin.getLocation({
+					type: 'wgs84',
+					success: res => {
+						const latitude = res.latitude;
+						const longitude = res.longitude;
+						jweixin.openLocation({
+							latitude: latitude, // 纬度，浮点数，范围为90 ~ -90
+							longitude: longitude, // 经度，浮点数，范围为180 ~ -180。
+							name: '位置名', // 位置名
+
+							scale: 16, // 地图缩放级别,整形值,范围从1~28。默认为最大
+							infoUrl:"http://www.baidu.com"
+						})
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background: #F5F5F5;
+		width: 100%;
+		height: 100%;
+	}
+	.h-20upx{
+		height: 20upx;
+		display: flex;
+	}
+	.tips{
+		display: flex;
+		/* width: calc(100% - 60upx); */
+		padding: 20upx;
+		background-color: #FFFFFF;
+	}
+	.tips_left{
+		width: 94%;
+		font-size: 28upx;
+		color: #de7d67;
+	}
+	.tips_right{
+		width: 5%;
+	}
+	.tips_right image{
+		width:40upx;
+	    height: 40upx;
+	}
+	.btn{
+		background-color: rgba( 242 155 135);
+		color: #FFFFFF;
+	}
+	.input-logo{
+		width: 120upx;
+		height: 120upx;
+		line-height: 120upx;
+		text-align: center;
+		font-size: 27upx;
+		color: #444444;
+	}
+	.input-logo image{
+		width: 120upx;
+		height: 120upx;
+	}
+	.input-Image{
+		width: 420upx;
+		height: 320upx;
+		line-height: 320upx;
+		text-align: center;
+		font-size: 27upx;
+		border: 1upx #CCCCCC solid;
+		color: #444444;
+	}
+	.input-Image image{
+		width: 420upx;
+		height: 320upx;
+	}
+	.radio{
+		font-size: 28upx;
+		transform:scale(0.7)
+	}
+</style>
+<style scoped lang="stylus" ref="stylesheet/stylus">
+	.content
+		width 100%
+		display flex
+		flex-direction column
+		color #333333
+		.list-wraper
+			position relative
+			display flex
+			align-items center
+			// width calc(100% - 60upx)
+			padding 20upx
+			background #FFFFFF
+			.tit
+				flex 1.5
+				text
+					font-size 28upx
+
+			.input-all
+				flex 4
+				.inpt
+					// background red
+					padding-top 6upx
+					font-size 28upx
+
+		.logo-wraper
+			.input-all
+				text-align right
+				image
+					width 100upx
+					height 100upx
+
+		.list-wraper::after
+			position absolute
+			content ""
+			width calc(100% - 60upx)
+			height 2upx
+			left 30upx
+			bottom 0
+			background #CCCCCC
+		.ind-wraper
+			flex-direction column
+			justify-content left
+			.tit
+				width 100%
+			.input-lg
+				width 100%
+				padding 20upx 10upx
+				// background red
+				.lg-text
+					font-size 24upx
+					color #777777
+		.btn-box
+			width 690upx;
+			padding 40upx 30upx
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/community.vue b/mallplusui-uniapp-app2/pagesA/build/community.vue
new file mode 100644
index 0000000..9d3d019
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/community.vue
@@ -0,0 +1,1088 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true"
+				placeholder="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+		<!-- #ifdef MP -->
+		<view class="carousel-section" style="margin-top: 80upx;">
+			<!-- #endif -->
+			<!-- #ifndef MP -->
+			<view class="carousel-section">
+				<!-- #endif -->
+				<!-- 标题栏和状态栏占位符 -->
+				<view class="titleNview-placing"></view>
+				<!-- 背景色区域 -->
+				<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+				<swiper class="carousel" circular @change="swiperChange">
+					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+						@click="navToDetailPageL(item.url)">
+						<image :src="item.pic" />
+					</swiper-item>
+				</swiper>
+				<!-- 自定义swiper指示器 -->
+				<view class="swiper-dots">
+					<text class="num">{{ swiperCurrent + 1 }}</text>
+					<text class="sign">/</text>
+					<text class="num">{{ swiperLength }}</text>
+				</view>
+			</view>
+			<!-- 分类 -->
+			<view class="cate-section">
+				<view class="cate-item" @click="navToTabPage('../../pagesA/build/notice')">
+					<image src="/static/temp/c3.png"></image>
+					<text>社区公告</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('../../pagesA/product/groupList')">
+					<image src="/static/temp/fasfausers.png"></image>
+					<text>社区团购</text>
+				</view>
+				<view class="cate-item" @click="navToTabPage('/pages/category/areaGoods')">
+					<image src="/static/temp/fasfa-truck.png"></image>
+					<text>社区特供</text>
+				</view>
+				<!-- <view class="cate-item" @click="navToTabPage('../../pagesA/product/paiMaiList')"> -->
+				<view class="cate-item" @click="navToTabPage('/pages/index/lease')">
+					<image src="/static/temp/c8.png"></image>
+					<text>农机租赁</text>
+				</view>
+			</view>
+
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/build/communityList?geohash='+geohash)">
+				<image src="/static/temp/nav1.png"></image>
+				<view class="tit-box">
+					<text class="tit">周边社区</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+			<!-- <view class="cate-section">
+				<view class="cate-item" @click="navToTabPageStore(item1.id)" v-for="(item1, index) in communityList"
+					:key="index">
+					<image :src="item1.pic"></image>
+					<text>{{ item1.name }}</text>
+				</view>
+			</view> -->
+
+			<!-- 新品上市 -->
+			<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/groupList')">
+				<image src="/static/temp/fasfausers.png"></image>
+				<view class="tit-box">
+					<text class="tit">社区团购</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="f-header m-t" @click="navToTabPage('/pages/category/areaGoods')">
+				<image src="/static/temp/fasfa-truck.png"></image>
+				<view class="tit-box">
+					<text class="tit">社区特供</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<!-- 	<view class="goods-list-vertical">
+				<view v-for="(item, index) in newProductList" :key="index" class="goods-item-vertical"
+					@click="navToDetailPage(item)">
+					<view class="image-wrapper-vertical">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<view class="goods-list-right">
+						<view class="goods-right-top">
+							<text class="">{{ item.name }}</text>
+						</view>
+						<view class="goods-right-bottom">
+							<text class="price">楼房:{{ item.floorNum }}</text>
+							<text class="sale">电梯:{{ item.layerCount }}</text>
+						</view>
+					</view>
+				</view>
+			</view> -->
+		</view>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import {
+		mapState
+	} from 'vuex';
+	import navBar from '@/components/zhouWei-navBar';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			coupon,
+
+			uniLoadMore,
+			navBar
+		},
+		data() {
+			return {
+				keyword: '',
+				pageNum: 1,
+				loadingType: 'more', //加载更多状态
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				communityId: 0,
+				swiperLength: 0,
+				carouselList: [],
+				hotProductList: [],
+				brandList: [], // 推荐品牌
+				homeFlashPromotion: [], // 当前秒杀场次
+				subjectList: [], //推荐专题
+				floorList: [],
+				geohash: '',
+				communityList: [],
+				communityList1: [],
+				groupHotGoodsList: [],
+				couponList: [],
+				newProductList: []
+			};
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+
+			this.getNewProductList();
+		},
+		onPullDownRefresh() {
+			this.pageNum = this.pageNum + 1;
+			this.getNewProductList('refresh');
+
+			this.loadData();
+			setTimeout(function() {
+				uni.stopPullDownRefresh();
+			}, 2000);
+		},
+
+		onShareAppMessage() {},
+		async onLoad(ops) {
+			console.log(ops)
+			if (ops.communityId && ops.communityId != undefined) {
+				this.communityId = ops.communityId;
+			} else {
+				this.communityId = 0;
+			}
+
+			uni.setNavigationBarTitle({
+				title: ops.name
+			});
+			this.getNewProductList('refresh');
+			this.loadData();
+			//this.nearCommunity();
+		},
+
+		methods: {
+			/**
+			 *
+			 * 加载首页数据
+			 */
+			async loadData() {
+				let params = {
+					communityId: this.communityId
+				};
+				let data = await Api.apiCall('get', Api.build.home, params);
+				if (data) {
+					this.carouselList = data.advertiseList || [];
+					this.swiperLength = this.carouselList.length;
+					this.titleNViewBackground = 'rgb(203, 87, 60)';
+					this.communityList = data.communityList || [];
+					this.community = data.community || [];
+					console.log(this.community)
+					console.log(this.community.latitude)
+					if (this.community.latitude) {
+						this.geohash = this.community.latitude + ',' + this.community.longitude;
+					}
+				}
+				//this.loadData2();
+			},
+
+			/**
+			 * 获取轮播图
+			 */
+			async nearCommunity() {
+				if (this.community.latitude) {
+					let params = params = {
+						geohash: this.community.latitude + ',' + this.community.longitude,
+						pageSize: 10,
+						distance: 40
+					};
+					let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
+					if (data) {
+						this.communityList = data || [];
+					}
+				}
+			},
+			/**
+			 * 获取轮播图
+			 */
+			async getBanner() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.bannerList, params);
+				if (data) {
+					this.carouselList = data || [];
+				}
+			},
+
+			/**
+			 * 获取新品上市信息
+			 */
+			async getNewProductList(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params = {
+					pageNum: this.pageNum,
+					communityId: this.communityId
+				};
+				let list = await Api.apiCall('get', Api.build.floorList, params);
+
+				let goodsList = list.records;
+
+				if (type === 'refresh') {
+					this.newProductList = [];
+				}
+
+				this.newProductList = this.newProductList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+
+			/**
+			 * 获取团购信息
+			 */
+			async getHotGoodsList() {
+				let params = {};
+				let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+				this.groupHotGoodsList = groupHotGoodsList;
+			},
+
+			/**
+			 * 获取秒杀列表信息
+			 */
+			async getFlashPromotion() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+				if (data) {
+					let homeFlashPromotion = data;
+					if (homeFlashPromotion.length > 0) {
+						this.homeFlashPromotion = homeFlashPromotion[0];
+					}
+				}
+			},
+
+			/**
+			 * 获取分类精选列表信息
+			 */
+			async getCatList() {
+				let params = {};
+				let data = await Api.apiCall('get', Api.goods.newProductList, params);
+				if (data) {
+					let cat_list = data;
+					this.cat_list = cat_list || [];
+				}
+			},
+
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPageStore(item) {
+				let id = item;
+				uni.navigateTo({
+					url: `../../pagesA/build/community?communityId=${id}`
+				});
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+
+			search() {
+				uni.navigateTo({
+					url: '/pages/search/search'
+				});
+			}
+		},
+
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.MP-search {
+		background: #ffffff;
+		height: 80upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		position: fixed;
+		width: 100%;
+		z-index: 999;
+	}
+
+	.MP-search-input {
+		font-size: 28upx;
+		background: #f5f5f5;
+		height: 60upx;
+		width: 90%;
+		border-radius: 50upx;
+		text-align: center;
+	}
+
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 60upx;
+			line-height: 60upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
+	}
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
+		}
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
+			}
+		}
+	}
+
+	page {
+		background: #f5f5f5;
+	}
+
+	.m-t {
+		margin-top: 20upx;
+	}
+
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
+	}
+
+	.carousel {
+		width: 100%;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
+	}
+
+	.swiper-dots {
+		display: flex;
+		position: absolute;
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
+	}
+
+	/* 分类 */
+	.cate-section {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
+	}
+
+	.ad-1 {
+		width: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 0upx 20upx 20upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				// margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+	}
+
+	.f-header {
+		display: flex;
+		align-items: center;
+		height: 140upx;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
+		}
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: $font-lg + 2upx;
+			color: $font-color-light;
+		}
+	}
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 20upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 20upx;
+			display: flex;
+		}
+
+		image {
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
+		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+
+			// margin-right: 24upx;
+			.t-box {
+				padding-top: 20upx;
+			}
+		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
+		}
+
+		.price {
+			color: $uni-color-primary;
+		}
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
+		}
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
+		}
+	}
+
+	/* 分类推荐楼层 */
+	.hot-floor {
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
+			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 180upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
+		}
+	}
+
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+
+		&:after {
+			border-radius: 100px;
+		}
+
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+	/* 猜你喜欢 */
+	.guess-section {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+		}
+
+		.coupon_box {
+			width: 100%;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
+		}
+
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
+		}
+	}
+
+	.getPosition {
+		height: 100upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		font-size: 32upx;
+		background-color: #fff;
+	}
+
+	.goods-list-vertical {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		.goods-item-vertical {
+			display: flex;
+			flex-direction: row;
+			height: 280upx;
+			align-items: center;
+			justify-content: center;
+			border-bottom: 1upx solid #eeeeee;
+
+			.image-wrapper-vertical {
+				width: 240upx;
+				height: 240upx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 10upx;
+
+				image {
+					width: 240upx;
+					height: 240upx;
+				}
+			}
+
+			.goods-list-right {
+				width: 470upx;
+
+				.goods-right-top {
+					height: 200upx;
+
+					text {
+						font-size: 32upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 2;
+						-webkit-box-orient: vertical;
+					}
+				}
+
+				.goods-right-bottom {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						font-size: $font-lg;
+						color: $uni-color-primary;
+						line-height: 1;
+
+						&:before {
+							content: '';
+							font-size: 26upx;
+						}
+					}
+
+					.sale {
+						color: $font-color-light;
+						font-size: 28upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/communityList.vue b/mallplusui-uniapp-app2/pagesA/build/communityList.vue
new file mode 100644
index 0000000..0b65e86
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/communityList.vue
@@ -0,0 +1,514 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<!-- <view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>楼房</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view> -->
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<!-- 列表显示 -->
+		<view class="goods-list-vertical">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical"
+				@click="navToDetailPage(item)">
+				<view class="image-wrapper-vertical">
+					<image :src="item.pic" mode="aspectFill"></image>
+				</view>
+				<view class="goods-list-right">
+					<view class="goods-right-top">
+						<text class="text1">{{ item.name }}</text>
+						<text class="text2">地址:{{ item.details}}</text>
+						<text class="text2">电话:{{ item.phone}}</text>
+					</view>
+					<!-- <view class="goods-right-bottom">
+						<text class="price">均价:{{ item.price }}</text>
+						<text class="sale" v-if="geohash">距离: {{item.distance.toFixed(4)}}</text>
+					</view> -->
+				</view>
+			</view>
+		</view>
+
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	export default {
+		components: {
+			uniLoadMore
+		},
+		data() {
+			return {
+				cateMaskState: 0, //分类面板展开状态
+				headerPosition: 'fixed',
+				headerTop: '0px',
+				keyword: '',
+				loadingType: 'more', //加载更多状态
+				filterIndex: 0,
+				cateId: 0, //已选三级分类id
+				pageNum: 1,
+				cid: null,
+				geohash: '',
+				priceOrder: 0, //1 价格从低到高 2价格从高到低
+				cateList: [],
+				goodsList: []
+			};
+		},
+
+		onLoad(options) {
+			// #ifdef H5
+			this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+			// #endif
+			this.keyword = options.keyword;
+			this.cateId = options.sid;
+			//this.loadCateList(options.fid, options.sid);
+			if (options.geohash) {
+				this.geohash = options.geohash;
+				this.nearCommunity(options.geohash);
+			} else {
+				console.log(options.geohash)
+				this.loadData();
+			}
+
+		},
+
+		onPageScroll(e) {
+			//兼容iOS端下拉时顶部漂移
+			if (e.scrollTop >= 0) {
+				this.headerPosition = 'fixed';
+			} else {
+				this.headerPosition = 'absolute';
+			}
+		},
+		//下拉刷新
+		onPullDownRefresh() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData('refresh');
+		},
+		//加载更多
+		onReachBottom() {
+			this.pageNum = this.pageNum + 1;
+			this.loadData();
+		},
+		methods: {
+			async nearCommunity(geohash) {
+				let params = params = {
+					geohash: geohash,
+					pageSize: 10,
+					distance: 240
+				};
+				let data = await Api.apiCall('get', Api.build.nearCommunityList, params);
+				if (data) {
+					this.goodsList = data || [];
+				}
+			},
+			//加载商品 ，带下拉刷新和上滑加载
+			async loadData(type = 'add', loading) {
+				//没有更多直接返回
+				if (type === 'add') {
+					if (this.loadingType === 'nomore') {
+						return;
+					}
+					this.loadingType = 'loading';
+				} else {
+					this.loadingType = 'more';
+				}
+				let params;
+
+				if (this.keyword) {
+					params = {
+						pageNum: this.pageNum,
+						keyword: this.keyword
+					};
+				} else {
+					params = {
+						pageNum: this.pageNum
+					};
+				}
+
+				let list = await Api.apiCall('get', Api.build.communityList, params);
+				let goodsList = list.records;
+				// let goodsList = await this.$api.json('goodsList');
+				if (type === 'refresh') {
+					this.goodsList = [];
+				}
+				//筛选，测试数据直接前端筛选了
+				if (this.filterIndex === 1) {
+					goodsList.sort((a, b) => b.sales - a.sales);
+				}
+				if (this.filterIndex === 2) {
+					goodsList.sort((a, b) => {
+						if (this.priceOrder == 1) {
+							return a.counts - b.counts;
+						}
+						return b.counts - a.counts;
+					});
+				}
+
+				this.goodsList = this.goodsList.concat(goodsList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+			},
+			//筛选点击
+			tabClick(index) {
+				this.pageNum = 1;
+				if (this.filterIndex === index && index !== 2) {
+					return;
+				}
+				this.filterIndex = index;
+				if (index === 2) {
+					this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+				} else {
+					this.priceOrder = 0;
+				}
+				uni.pageScrollTo({
+					duration: 300,
+					scrollTop: 0
+				});
+				this.loadData('refresh', 1);
+
+			},
+			//显示分类面板
+			toggleCateMask(type) {
+				console.log("type", type);
+				let timer = type === 'show' ? 10 : 300;
+				let state = type === 'show' ? 1 : 0;
+				this.cateMaskState = 2;
+				setTimeout(() => {
+					this.cateMaskState = state;
+				}, timer);
+			},
+			//分类点击
+			changeCate(item) {
+				console.log(item.id);
+				this.pageNum = 1;
+				this.cateId = item.id;
+				this.toggleCateMask();
+				uni.pageScrollTo({
+					duration: 300,
+					scrollTop: 0
+				});
+				this.loadData('refresh', 1);
+
+			},
+			//详情
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				let name = item.name;
+				uni.navigateTo({
+					url: `../../pagesA/build/community?communityId=${id}&name=${name}`
+				});
+			},
+			stopPrevent() {}
+		}
+	};
+</script>
+
+<style lang="scss">
+	page,
+	.content {
+		background: $page-color-base;
+	}
+
+	.content {
+		padding-top: 96upx;
+	}
+
+	.navbar {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		display: flex;
+		width: 100%;
+		height: 70upx;
+		background: #fff;
+		box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+		z-index: 10;
+		padding-left: 20px;
+
+		.nav-item {
+			flex: 1;
+			display: flex;
+			align-items: center;
+			height: 100%;
+			font-size: 30upx;
+			color: $font-color-dark;
+			position: relative;
+
+			&.current {
+				color: $base-color;
+				&:after {
+					content: '';
+					position: absolute;
+					left: 9%;
+					bottom: 0;
+					transform: translateX(-50%);
+					width: 120upx;
+					height: 0;
+					border-bottom: 4upx solid $base-color;
+				}
+			}
+		}
+
+		.p-box {
+			display: flex;
+			flex-direction: column;
+
+			.yticon {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 30upx;
+				height: 14upx;
+				line-height: 1;
+				margin-left: 4upx;
+				font-size: 26upx;
+				color: #888;
+
+				&.active {
+					color: $base-color;
+				}
+			}
+
+			.xia {
+				transform: scaleY(-1);
+			}
+		}
+
+		.cate-item {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			height: 100%;
+			width: 80upx;
+			position: relative;
+			font-size: 44upx;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 50%;
+				transform: translateY(-50%);
+				border-left: 1px solid #ddd;
+				width: 0;
+				height: 36upx;
+			}
+		}
+	}
+
+	/* 分类 */
+	.cate-mask {
+		position: fixed;
+		left: 0;
+		top: var(--window-top);
+		bottom: 0;
+		width: 100%;
+		background: rgba(0, 0, 0, 0);
+		z-index: 95;
+		transition: 0.3s;
+
+		.cate-content {
+			width: 630upx;
+			height: 100%;
+			background: #fff;
+			float: right;
+			transform: translateX(100%);
+			transition: 0.3s;
+		}
+
+		&.none {
+			display: none;
+		}
+
+		&.show {
+			background: rgba(0, 0, 0, 0.4);
+
+			.cate-content {
+				transform: translateX(0);
+			}
+		}
+	}
+
+	.cate-list {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+
+		.cate-item {
+			display: flex;
+			align-items: center;
+			height: 90upx;
+			padding-left: 30upx;
+			font-size: 28upx;
+			color: #555;
+			position: relative;
+		}
+
+		.two {
+			height: 64upx;
+			color: #303133;
+			font-size: 30upx;
+			background: #f8f8f8;
+		}
+
+		.active {
+			color: $base-color;
+		}
+	}
+
+	/* 商品列表 */
+	.goods-list {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 20upx 20upx 0 20upx;
+		background: #fff;
+
+		.goods-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price-box {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-right: 10upx;
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+
+			&:before {
+				content: '';
+				font-size: 26upx;
+			}
+		}
+	}
+
+	.goods-list-vertical {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0upx 20upx;
+		background: #fff;
+
+		.goods-item-vertical {
+			display: flex;
+			flex-direction: row;
+			height: 200upx;
+
+			.image-wrapper-vertical {
+				width: 200upx;
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				margin-right: 10upx;
+
+				image {
+					width: 150upx;
+					height: 150upx;
+				}
+			}
+
+			.goods-list-right {
+				display: flex;
+				flex-direction: column;
+				width: 470upx;
+
+				.goods-right-top {
+					.text1 {
+						margin-top: 10px;
+						font-size: 32upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+					.text2{
+						margin-top: 10px;
+						color: #555;
+						font-size: 30upx;
+						text-overflow: -o-ellipsis-lastline;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						display: -webkit-box;
+						-webkit-line-clamp: 1;
+						-webkit-box-orient: vertical;
+					}
+				}
+
+				.goods-right-bottom {
+					display: flex;
+					align-items: center;
+					justify-content: space-between;
+
+					.price {
+						font-size: $font-lg;
+						color: $uni-color-primary;
+						line-height: 1;
+
+						&:before {
+							content: '';
+							font-size: 26upx;
+						}
+					}
+
+					.sale {
+						color: $font-color-light;
+						font-size: 28upx;
+					}
+				}
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/floorList.vue b/mallplusui-uniapp-app2/pagesA/build/floorList.vue
new file mode 100644
index 0000000..d4e227a
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/floorList.vue
@@ -0,0 +1,381 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text >楼层{{ item.layerCount }}</text>
+					<text></text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			communityId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.communityId = options.communityId;
+		//this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.communityId) {
+				params = { pageNum: this.pageNum, communityId: this.communityId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, communityId: this.communityId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.build.floorList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			console.log(item.id);
+			this.pageNum = 1;
+			this.communityId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupActivityDetail?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0 20upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/groupList.vue b/mallplusui-uniapp-app2/pagesA/build/groupList.vue
new file mode 100644
index 0000000..4eee316
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/groupList.vue
@@ -0,0 +1,404 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 {{ item.sale }}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeList, params);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.build.groupList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			let groupId = item.groupId;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/groupProduct.vue b/mallplusui-uniapp-app2/pagesA/build/groupProduct.vue
new file mode 100644
index 0000000..f18a28d
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/groupProduct.vue
@@ -0,0 +1,997 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ goods.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price">{{ goods.price }}</text>
+				<text class="m-price">¥{{ goods.originalPrice }}</text>
+			</view>
+			<view class="bot-row">
+				<text>销量: {{ goods.sale }}</text>
+				<text>库存: {{ goods.stock }}</text>
+				<text>浏览量: {{ goods.hit }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b" v-if="skuList && skuList.length > 0" @click="toggleSpec">
+				<text class="tit">购买类型</text>
+				<view class="con">
+					<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+
+			<view class="eva-section">
+				<view class="e-header" v-for="(item, index) in groupMemberList" :key="index">
+					<img v-for="(item1, index1) in item.list" :key="index1" :src="item1.pic" class="logo" alt="" />
+					<div class="time"  v-if="item.list.length>0">倒计时：{{ item.djs }}</div>
+					<button type="primary" v-if="item.list.length>0 && item.status==1" class=" action-btn no-border add-cart-btn" @click="acceptGroup(item)">参与拼团</button>
+					<div class="time"  v-if="item.list.length>0 && item.status==2">已成团</div>
+				</view>
+			</view>
+			<view class="c-row b-b" v-if="serviceList && serviceList.length > 0">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text v-for="(item1, index1) in serviceList" :key="index1">{{ item1 }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 评价 -->
+		<view class="eva-section">
+			<view class="e-header">
+				<text class="tit">评价</text>
+				<text>({{ consultCount.all }})</text>
+				<text class="tit">好评</text>
+				<text>({{ consultCount.goods }})</text>
+
+				<text class="tit">一般</text>
+				<text>({{ consultCount.general }})</text>
+
+				<text class="tit">差评</text>
+				<text>({{ consultCount.bad }})</text>
+				<text class="tip" v-if="consultCount.persent != 200">好评率 {{ consultCount.persent }}%</text>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="eva-box" v-for="(item, index) in consultList" :key="item.id">
+				<image :src="item.pic" class="portrait" mode="aspectFill"></image>
+				<view class="right">
+					<text class="name">{{ item.memberName }}</text>
+					<text class="con">{{ item.consultContent }}</text>
+					<view class="bot">
+						<text class="attr">购买类型：{{ item.attr }}</text>
+						<text class="time">{{ item.consultAddtime | formatCreateTime}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(goods)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group"><button type="primary" class=" action-btn no-border add-cart-btn" @click="addGroup(goods)">发起拼单</button></view>
+		</view>
+
+		<!-- 规格-模态层弹窗 -->
+		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer attr-content" @click.stop="stopPrevent">
+				<view class="a-t">
+					<image :src="sku.pic"></image>
+					<view class="right">
+						<text class="price">¥{{ sku.price }}</text>
+						<text class="stock">库存：{{ sku.stock }}件</text>
+						<view class="selected">
+							已选：
+							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view v-for="(item, index) in specList" :key="index" class="attr-list">
+					<text>{{ item.name }}</text>
+					<view class="item-list">
+						<text
+							v-for="(childItem, childIndex) in specChildList"
+							v-if="childItem.pid === item.id"
+							:key="childIndex"
+							class="tit"
+							:class="{ selected: childItem.selected }"
+							@click="selectSpec(childIndex, childItem.pid)"
+						>
+							{{ childItem.name }}
+						</text>
+					</view>
+				</view>
+				<button class="btn" @click="toggleSpec">完成</button>
+			</view>
+		</view>
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			serviceList:[],
+			goods: [],
+			group: [],
+			favorite: true,
+			shareList: [],
+			groupMemberList: [],
+			consultList: [],
+			consultCount: {
+				all: 0,
+				bad: 0,
+				general: 0,
+				goods: 0
+			},
+			imgList: [
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+				}
+			],
+			ssss: [
+				{ title: '小心愿，大梦想', pic: '../../static/vip-card-bg.png', count: '34', time: '1625293470350' },
+				{ title: '杭州国际时', pic: '../../static/vip-card-bg.png', count: '36', time: '1725293470350' },
+				{ title: '怪兽bobo全', pic: '../../static/vip-card-bg.png', count: '74', time: '154429253270350' },
+				{ title: '汉风唐韵 、别', pic: '../../static/vip-card-bg.png', count: '266', time: '15255753270350' },
+				{ title: '听说同台“PK”？', pic: '../../static/vip-card-bg.png', count: '97', time: '15252553270450' }
+			],
+			desc: `
+
+				`,
+			skuList: [],
+			specList: [],
+			specChildList: [],
+			active: 'tab-container1',
+			pinkFont: true,
+			// 上拉刷新、下拉加载
+			allLoaded: false, //如果为true,禁止上拉刷新
+			autoFill: false, //取消自动填充，
+			list: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id, groupId: ops.groupId };
+			let data = await Api.apiCall('get', Api.goods.groupGoodsDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				let goods = detailData.goods;
+				this.goods = goods;
+				this.group = data.group;
+				this.favorite = data.favorite;
+
+				/*setInterval(() => {
+					data.memberGroupList.map((obj, index) => {
+						this.$set(obj, 'djs', this.InitTime(obj.endTime));
+					});
+
+
+				}, 500);*/
+				this.groupMemberList = data.memberGroupList;
+
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = goods.albumPics;
+				this.desc = goods.detailHtml;
+				this.small = subImages.split(',');
+				var sers = goods.serviceIds;
+				if (sers && sers.indexOf("1") != -1){
+					this.serviceList.push('无忧退货');
+				}
+				if (sers && sers.indexOf("2") != -1){
+					this.serviceList.push('快速退款');
+				}
+				if (sers && sers.indexOf("3") != -1){
+					this.serviceList.push('正品保证');
+				}
+				//await this.$api.json('detailData');
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+				this.detailData = detailData;
+				this.shareList = shareList;
+				this.specList = detailData.productAttributeValueList;
+				this.skuList = detailData.skuStockList;
+				if (this.specList) {
+					this.specList.forEach(item => {
+						let valuesA = item.value.split(',');
+
+						if (valuesA) {
+							for (let cItem of valuesA) {
+								let att = {};
+								att.pid = item.id;
+								att.name = cItem;
+								this.specChildList.push(att);
+							}
+						}
+					});
+				}
+
+				uni.setNavigationBarTitle({
+					title: goods.name
+				});
+			}
+			if (this.hasLogin) {
+				let params = { goodsId: ops.id };
+				await Api.apiCall('post', Api.goods.addView, params);
+			}
+			let params1 = { goodsId: ops.id };
+			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+			this.consultList = consoltL.list;
+			this.consultCount = consoltL.count;
+		}
+
+		if (this.specList) {
+			//规格 默认选中第一条
+			var specs = '';
+			this.specList.forEach(item => {
+				for (let cItem of this.specChildList) {
+					if (cItem.pid === item.id) {
+						this.$set(cItem, 'selected', true);
+						this.specSelected.push(cItem);
+						specs = cItem.name + ',' + specs;
+						break; //forEach不能使用break
+					}
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		}
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		toTimeStamp(strtime) {
+			var strtime = index;
+			var date = new Date(strtime);
+			var time = Date.parse(date) / 1000;
+			return time;
+		},
+		InitTime(endtime) {
+			var dd,
+				hh,
+				mm,
+				ss = null;
+			var time = parseInt(endtime) - new Date().getTime();
+
+			if (time <= 0) {
+				return '结束';
+			} else {
+				dd = Math.floor(time / 60 / 60 / 24);
+				hh = Math.floor((time / 60 / 60) % 24);
+				mm = Math.floor((time / 60) % 60);
+				ss = Math.floor(time % 60);
+				var str = dd + '天' + hh + '小时' + mm + '分' + ss + '秒';
+				return str;
+			}
+		},
+
+		//规格弹窗开关
+		toggleSpec() {
+			if (this.specClass === 'show') {
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 250);
+			} else if (this.specClass === 'none') {
+				this.specClass = 'show';
+			}
+		},
+		//选择规格
+		selectSpec(index, pid) {
+			let list = this.specChildList;
+			list.forEach(item => {
+				if (item.pid === pid) {
+					this.$set(item, 'selected', false);
+				}
+			});
+
+			this.$set(list[index], 'selected', true);
+			//存储已选择
+			/**
+			 * 修复选择规格存储错误
+			 * 将这几行代码替换即可
+			 * 选择的规格存放在specSelected中
+			 */
+			var specs = '';
+			this.specSelected = [];
+			list.forEach(item => {
+				if (item.selected === true) {
+					this.specSelected.push(item);
+					specs = item.name + ',' + specs;
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		async addGroup(item) {
+			// 发起拼团
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			}
+			let data;
+			let id = item.id;
+			if (this.sku && this.sku.id) {
+			if(this.sku.stock<1){
+            			   uni.showToast({title:"库存不够！"});
+            			   return;
+            			}
+				uni.navigateTo({
+					url: `/pages/order/createOrder?groupId=${this.group.id}&&id=${item.id}&&groupType=1&&type=1&&skuId=${this.sku.id}`
+				});
+			} else {
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+				uni.navigateTo({
+					url: `/pages/order/createOrder?groupId=${this.group.id}&&id=${item.id}&&groupType=1&&type=1`
+				});
+			}
+		},
+
+		async acceptGroup(item) {
+			console.log(item)
+			console.log(this.goods)
+			// 参与拼团
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			}
+			if (this.sku && this.sku.id) {
+			if(this.sku.stock<1){
+            			   uni.showToast({title:"库存不够！"});
+            			   return;
+            			}
+				uni.navigateTo({
+					url: `/pages/order/createOrder?groupId=${item.groupId}&&mgid=${item.id}&&id=${this.goods.id}&&groupType=2&&type=1&&skuId=${this.sku.id}'
+					}`
+				});
+			} else {
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+				uni.navigateTo({
+					url: `/pages/order/createOrder?groupId=${item.groupId}&&mgid=${item.id}&&id=${this.goods.id}&&groupType=2&&type=1`
+				});
+			}
+		},
+
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+	.logo {
+		display: block;
+		width: 50upx;
+		height: 50upx;
+		border-radius: 100px;
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/notice.vue b/mallplusui-uniapp-app2/pagesA/build/notice.vue
new file mode 100644
index 0000000..3acc954
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/notice.vue
@@ -0,0 +1,199 @@
+<template>
+	<view>
+		<view class="notice-item" v-for="(item, index) in goodsList" :key="index">
+			<text class="time">{{ item.createTime }}</text>
+			<view class="content" @click="navToDetailPage(item)">
+				<text class="title">{{ item.title }}</text>
+				<view class="img-wrapper"><image :src="item.pic" mode="aspectFill" class="pic"></image></view>
+				<text class="introduce">{{ item.content }}</text>
+				<view class="bot b-t" @click="navToDetailPage(item)">
+					<text>查看详情</text>
+					<text class="more-icon yticon icon-you"></text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	data() {
+		return {
+			pageNum: 1,
+
+			goodsList: [
+				{
+					id:"25",
+					createTime :"2020-02-02",
+					title:"测试标签",
+					pic:"https://pic3.zhimg.com/v2-c6ae9c3aff36b9b221258f6a90577902_r.jpg",
+					content:"爱上科技大厦送i的阿松i到速度奥昂是大宋i的"
+				}
+			]
+		};
+	},
+	onLoad() {
+		// this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.build.getBuildNoticeByPage, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesU/notice/subjectDetail?id=${id}`
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+	padding-bottom: 30upx;
+}
+
+.notice-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.time {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 80upx;
+	padding-top: 10upx;
+	font-size: 26upx;
+	color: #7d7d7d;
+}
+
+.content {
+	width: 710upx;
+	padding: 0 24upx;
+	background-color: #fff;
+	border-radius: 4upx;
+}
+
+.title {
+	display: flex;
+	align-items: center;
+	height: 90upx;
+	font-size: 32upx;
+	color: #303133;
+}
+
+.img-wrapper {
+	width: 100%;
+	height: 260upx;
+	position: relative;
+}
+
+.pic {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+}
+
+.cover {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	font-size: 36upx;
+	color: #fff;
+}
+
+.introduce {
+	display: inline-block;
+	padding: 16upx 0;
+	font-size: 28upx;
+	color: #606266;
+	line-height: 38upx;
+}
+
+.bot {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 80upx;
+	font-size: 24upx;
+	color: #707070;
+	position: relative;
+}
+
+.more-icon {
+	font-size: 32upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/build/repairOrder/repairOrder.vue b/mallplusui-uniapp-app2/pagesA/build/repairOrder/repairOrder.vue
new file mode 100644
index 0000000..a2c7163
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/build/repairOrder/repairOrder.vue
@@ -0,0 +1,389 @@
+<template>
+	<view>
+		<scroll-view scroll-x class="bg-white nav" scroll-with-animation :scroll-left="scrollLeft">
+			<view class="flex text-center">
+				<view class="cu-item flex-sub" :class="state=='10002'?'text-green cur':''" @tap="_tabSelect('10002')">
+					发起报修
+				</view>
+				<view class="cu-item flex-sub" :class="state=='10001'?'text-green cur':''" @tap="_tabSelect('10001')">
+					报修历史
+				</view>
+				
+			</view>
+		</scroll-view>
+		
+		<view class="margin-top" v-if="state=='10001'">
+			<view class="cu-list menu-avatar">
+				<view class="cu-item arrow" v-for="(item,index) in myOrders" :key="index" @tap="_toAuditComplaintOrder(item)">
+					<view class="cu-avatar round lg" :style="'background-image:url('+orderImg+');'">
+					</view>
+					<view class="content">
+						<view class="text-grey">{{item.complaintId}}</view>
+						<view class="text-gray text-sm flex">
+							<view class="text-cut">
+								{{item.complaintName}}
+							</view> </view>
+					</view>
+					<view class="action">
+						<view class="text-grey text-xs">{{item.createTime}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="margin-top" v-if="state=='10002'">
+			<view class="padding ">
+				<text>房屋信息</text>
+			</view>
+			<view class="cu-list menu ">
+				<view class="cu-item arrow" @tap="_selectFloor()">
+					<view class="content">
+						<text class="text-grey">楼栋</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{floorNum != ''?floorNum+'号楼':'请选择'}}</text>
+					</view>
+				</view>
+				<view class="cu-item arrow" @tap="_selectUnit()">
+					<view class="content">
+						<text class="text-grey">单元</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{unitNum != ''?unitNum+'单元':'请选择'}}</text>
+					</view>
+				</view>
+				<view class="cu-item arrow" @tap="_selectRoom()">
+					<view class="content">
+						<text class="text-grey">房屋</text>
+					</view>
+					<view class="action">
+						<text class="text-grey text-sm">{{roomNum != ''?roomNum+'室':'请选择'}}</text>
+					</view>
+				</view>
+			</view>
+		
+			<view class="padding margin-top">
+				<text>报修信息</text>
+			</view>
+		
+			<form>
+				<view class="cu-form-group">
+					<view class="title">报修类型</view>
+					<picker @change="_changeResult" :value="typeCdIndex" :range="typeCds">
+						<view class="picker">
+							{{typeCdIndex>-1?typeCds[typeCdIndex]:'请选择'}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">报修人</view>
+					<input placeholder="请输入投诉人" v-model="repairName" name="input"></input>
+				</view>
+				<view class="cu-form-group">
+					<view class="title">手机号码</view>
+					<input placeholder="输入手机号码" v-model="tel" name="input"></input>
+					<view class="cu-capsule radius">
+						<view class='cu-tag bg-blue '>
+							+86
+						</view>
+						<view class="cu-tag line-blue">
+							中国大陆
+						</view>
+					</view>
+				</view>
+				<view class="cu-form-group arrow">
+					<view class="title">预约日期</view>
+					<picker mode="date" :value="bindDate" start="2015-09-01" end="2020-09-01" @change="dateChange">
+						<view class="picker">
+							{{bindDate}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group arrow">
+					<view class="title">预约时间</view>
+					<picker mode="time" :value="bindTime" start="09:01" end="21:01" @change="timeChange">
+						<view class="picker">
+							{{bindTime}}
+						</view>
+					</picker>
+				</view>
+				<view class="cu-form-group">
+					<textarea maxlength="-1" v-model="context" placeholder="请输入投诉内容"></textarea>
+				</view>
+				<view class="cu-bar bg-white margin-top">
+					<view class="action">
+						图片上传
+					</view>
+					<view class="action">
+						{{imgList.length}}/4
+					</view>
+				</view>
+				<view class="cu-form-group">
+					<view class="grid col-4 grid-square flex-sub">
+						<view class="bg-img" v-for="(item,index) in imgList" :key="index" @tap="ViewImage" :data-url="imgList[index]">
+							<image :src="imgList[index]" mode="aspectFill"></image>
+							<view class="cu-tag bg-red" @tap.stop="_delImg" :data-index="index">
+								<text class='cuIcon-close'></text>
+							</view>
+						</view>
+						<view class="solids" @tap="_chooseImage" v-if="imgList.length<4">
+							<text class='cuIcon-cameraadd'></text>
+						</view>
+					</view>
+				</view>
+			</form>
+		
+			<view class="padding flex flex-direction">
+				<button class="cu-btn bg-green margin-tb-sm lg" @tap="_submitRepair()">提交</button>
+			</view>
+		
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				state:'10002',
+				orderImg:this.java110Constant.url.baseUrl + 'img/order.png',
+				myOrders:[],
+				imgList: [],
+				photos:[],
+				floorId: '',
+				floorNum: '',
+				unitId: '',
+				unitNum: '',
+				roomId: '',
+				roomNum: '',
+				typeCd: '',
+				typeCds: ['卧室报修', '管道报修','客厅报修'],
+				typeCdIndex: -1,
+				context:'',
+				repairName:'',
+				tel:'',
+				minDate: new Date().getTime(),
+				bindDate: '请选择',
+				bindTime: '请选择',
+			}
+		},
+		onShow() {
+			//this._loadMyOrders();
+			
+			
+		},
+		methods: {
+			_tabSelect: function(_state) {
+				this.state = _state;
+				if(_state == '10002'){
+					//this._loadOrder();
+				}else{
+					this._loadMyOrders();
+				}
+			},
+			_loadMyOrders:function(){
+				let _that = this;
+				let _userInfo = this.java110Context.getUserInfo();
+				let storeId = _userInfo.storeId;
+				let _objData = {
+					page: 1,
+					row: 15,
+					storeId: storeId,
+					userId: _userInfo.userId,
+					communityId:_that.java110Context.getCurrentCommunity().communityId
+				};
+				this.java110Context.request({
+					url: _that.java110Constant.url.listComplaints,
+					header: _that.java110Context.getHeaders(),
+					method: "GET",
+					data: _objData, //动态数据
+					success: function(res) {
+						console.log("请求返回信息：", res);
+						if (res.statusCode != 200) {
+							uni.showToast({
+								icon:'none',
+								title:res.data
+							});
+							return;
+						}
+						let _data = res.data;
+						_that.myOrders = _data.complaints;
+						
+						_data.complaints.forEach(function(item){
+							let dateStr = item.createTime;
+							console.log(dateStr);
+							let _date=new Date(dateStr);
+							item.createTime = (_date.getMonth()+1) +'-'+_date.getDate();
+						});
+					},
+					fail: function(e) {
+						wx.showToast({
+							title: "服务器异常了",
+							icon: 'none',
+							duration: 2000
+						});
+					}
+				});
+			},
+			ChooseImage: function(e) {
+				let that = this;
+				wx.chooseImage({
+					count: 4, //默认9
+					sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+					sourceType: ['album'], //从相册选择
+					success: (res) => {
+						console.log(res);
+						if (that.$data.photoList.length) {
+							that.$data.photoList.push(res.tempFilePaths[0]);
+						} else {
+							that.$data.photoList = res.tempFilePaths;
+						}
+					}
+				});
+			},
+			removePhoto: function(e) {
+				console.log(e);
+				let imageArr = this.$data.photoList;
+				imageArr.splice(e, 1);
+			},
+			_selectFloor: function() {
+				uni.navigateTo({
+					url: '/pages/floorList/floorList?communityId=' + this.java110Context.getCurrentCommunity().communityId
+				});
+			},
+			_selectUnit: function() {
+				if (this.floorId == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选择楼栋'
+					});
+					return;
+				}
+			
+				uni.navigateTo({
+					url: '/pages/unitList/unitList?communityId=' + this.java110Context.getCurrentCommunity().communityId +
+						"&floorId=" + this.floorId + "&floorNum=" + this.floorNum
+				});
+			},
+			_selectRoom: function() {
+				if (this.floorId == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选择楼栋'
+					});
+					return;
+				}
+			
+				if (this.unitId == '') {
+					uni.showToast({
+						icon: 'none',
+						title: '请先选择单元'
+					});
+					return;
+				}
+			
+				uni.navigateTo({
+					url: '/pages/roomList/roomList?communityId=' + this.java110Context.getCurrentCommunity().communityId +
+						"&floorId=" + this.floorId + "&floorNum=" + this.floorNum + "&unitId=" + this.unitId + "&unitNum=" + this.unitNum
+				});
+			},
+			_changeResult: function(e) {
+				this.typeCdIndex = e.detail.value;
+				console.log(e, this.typeCdIndex);
+			},
+			repairChange: function(e) {
+				this.typeName = this.columns[e.detail.value];
+				this.typeId = this.repairIdAttr[e.detail.value];
+			},
+			dateChange:function(e){
+				this.bindDate = e.detail.value;
+			},
+			timeChange:function(e){
+				this.bindTime = e.detail.value;
+			},
+			_submitRepair: function(e) {
+				let _that = this;
+			let _userInfo = this.java110Context.getUserInfo();
+			let storeId = _userInfo.storeId;
+			
+				let obj = {
+					"repairName": this.repairName,
+					"repairType": this.typeCd,
+					"appointmentTime": this.bindDate + " " + this.bindTime + ":00",
+					"tel": this.tel,
+					"roomId": this.roomId,
+					"photos": [],
+					"context": this.context,
+					"userId": _userInfo.userId,
+					"communityId": this.communityId,
+					"bindDate": this.bindDate,
+					"bindTime": this.bindTime
+				}
+			
+				let _photos = this.photos;
+				_photos.forEach(function(_item) {
+					obj.photos.push({
+						"photo": _item
+					});
+				});
+			
+				let msg = "";
+				if (obj.roomId == "") {
+					msg = "请选择房屋";
+				} else if (obj.repairType == "") {
+					msg = "请选择报修类型";
+				} else if (obj.repairName == "") {
+					msg = "请填写报修人";
+				} else if (obj.tel == "") {
+					msg = "请填写手机号";
+				} else if (obj.bindDate == "") {
+					msg = "请选择预约日期";
+				} else if (obj.bindTime == "") {
+					msg = "请选择预约时间";
+				} else if (obj.context == "") {
+					msg = "请填写投诉内容";
+				}
+				console.log(obj.roomId);
+			
+				if (msg != "") {
+					wx.showToast({
+						title: msg,
+						icon: 'none',
+						duration: 2000
+					});
+				} else {
+					context.request({
+						url: constant.url.saveOwnerRepair, //  http://hc.demo.winqi.cn:8012/appApi/ownerRepair.saveOwnerRepair 
+						header: context.getHeaders(),
+						method: "POST",
+						data: obj, //动态数据
+						success: function(res) {
+							if (res.statusCode == 200) {
+								_that._tabSelect('10001');
+								return;
+							}
+							wx.showToast({
+								title: "服务器异常了",
+								icon: 'none',
+								duration: 2000
+							})
+						},
+						fail: function(e) {
+							wx.showToast({
+								title: "服务器异常了",
+								icon: 'none',
+								duration: 2000
+							})
+						}
+					});
+			
+				}
+			}
+			
+		}
+	}
+</script>
+
+<style>
+
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/categoryAttr.vue b/mallplusui-uniapp-app2/pagesA/product/categoryAttr.vue
new file mode 100644
index 0000000..a1cd8bd
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/categoryAttr.vue
@@ -0,0 +1,352 @@
+<template>
+	<view class="content" style="display: flex;flex-direction: column;">
+
+		<!-- #ifdef MP-WEIXIN -->
+        <nav-bar>分类</nav-bar>
+		<view class="search" @click="search()">
+			<input class="search_input" type="text" disabled="true" placeholder="输入关键字搜索" />
+		</view>
+		<!-- #endif -->
+
+		<!-- #ifdef MP-WEIXIN -->
+		<view class="category-wrapper" :style="{'height':scroll_height+'px'}">
+		<!-- #endif -->
+		<!-- #ifdef APP-PLUS || APP-PLUS-NVUE || H5 -->
+		<view class="category-wrapper">
+		<!-- #endif -->
+			<!-- 左边导航 -->
+			<scroll-view scroll-y="true" class="left-wrapper" scroll-with-animation="true" :scroll-top="left_scroll">
+				<view class="left-content column">
+					<view class="title-content" :class="select_index === index ? 'onSelected' : ''" v-for="(title, index) in catrgoryList" :key="title.id" @tap="choose(index)">
+						{{ title.name || '分类' + (index + 1) }}
+					</view>
+				</view>
+			</scroll-view>
+			<!-- 右边内容 -->
+			<scroll-view scroll-y="true" class="right-wrapper" scroll-with-animation="true" :scroll-top="right_scroll" @scroll="myscroll">
+				<view class="right-content">
+					<!-- 产品区 -->
+					<view class="product-wrapper column with-100">
+						<view class="category-item column" :id="'list' + c_index" v-for="(c_item, c_index) in catrgoryList" :key="c_item.id">
+							<!-- 广告图 -->
+							<view class="banner-item"><image class="banner" :src="c_item.pic == '' || c_item.pic == null ? '' : c_item.pic"></image></view>
+							<view class="category-content">
+								<view class="product-item" v-for="(p_item, p_index) in c_item.goodsList" :key="p_item.id" @click="toCategory(p_item)">
+									<image class="product-img" :src="p_item.pic == '' || p_item.pic == null ? '' : p_item.pic"></image>
+									<text class="product-title">{{ p_item.name |formatLongText }}</text>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+	</view>
+	</view>
+</template>
+
+<script>
+import Api from '@/common/api';
+import navBar from "@/components/zhouWei-navBar";
+export default {
+	components:{
+		navBar
+	},
+	data() {
+		return {
+			select_index: 0,
+			windows_height: 0, //屏幕高度
+			right_height: [], //右侧每个内容的高度集合
+			right_scroll: 0, //右侧的滑动值
+			left_height: 0, //左侧总高度
+			left_scroll: 0, //左侧滑动值
+			last: 0,
+
+			scroll_height: '',
+			statusBarHeight: '',
+
+			catrgoryList: [
+
+			]
+		};
+	},
+	onLoad() {
+		this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight;
+		this.scroll_height = uni.getSystemInfoSync().windowHeight - (this.statusBarHeight + 44 + 40);
+		console.log('------',this.scroll_height)
+		this.windows_height = uni.getSystemInfoSync().windowHeight;
+		this.getData();
+	},
+	filters: {
+                        		  formatCreateTime(time) {
+                                         let date = new Date(time);
+                                         return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+                                       },
+                                      formatNull(value) {
+                                        if(value===undefined||value===null||value===''){
+                                          return '暂无';
+                                        }else{
+                                          return value;
+                                        }
+                                      },
+                                      formatLongText(value) {
+                                        if(value===undefined||value===null||value===''){
+                                          return '暂无';
+                                        }else if(value.length>4){
+                                          return value.substr(0, 4) + '...';
+                                        }else{
+                                          return value;
+                                        }
+                                      },
+                                      formatPayType(value) {
+                                        if (value === 2) {
+                                          return '支付宝';
+                                        } else if (value === 1) {
+                                          return '微信小程序';
+                                        } else  if (value === 3){
+                                          return '余额支付';
+                                        } else  if (value === 5){
+                                                   return '积分兑换';
+                                                 }
+                                      },
+                                      },
+	methods: {
+		search() {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+		async getData() {
+			let params = {};
+			this.catrgoryList = await Api.apiCall('get', Api.goods.categoryAndGoodsList, params);
+			this.$nextTick(function() {
+				this.getHeightList();
+			});
+			console.log('-----', this.catrgoryList);
+		},
+		toCategory(item) {
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${item.id}`
+			});
+
+		},
+		getHeightList() {
+			let _this = this;
+			let selectorQuery = uni.createSelectorQuery();
+			selectorQuery.select('.left-content').boundingClientRect(function(rects) {
+				_this.left_height = rects.height;
+			});
+			selectorQuery
+				.selectAll('.category-item')
+				.boundingClientRect(function(rects) {
+					_this.right_height = rects.map(item => item.top);
+					console.log(_this.right_height);
+				})
+				.exec();
+		},
+		choose(index) {
+			console.log('--choose--', index);
+			console.log('--choose--', this.select_index);
+			if (this.select_index === index) {
+				return;
+			}
+			this.select_index = index;
+			// 加入防抖
+			if (this.timeout) {
+				clearTimeout(this.timeout); //清除计时器
+			}
+			this.timeout = setTimeout(() => {
+				this.right_scroll = this.right_height[index] - 180;
+			}, 300);
+			console.log('--this.right_scroll--', this.right_scroll);
+		},
+		myscroll(e) {
+			//引入节流
+			let right_content_height = e.detail.scrollHeight - this.windows_height;
+			if (right_content_height == e.detail.scrollTop) {
+			console.log('--this.myscroll--', this.right_scroll);
+				return;
+			}
+			let scroll_top = e.detail.scrollTop + 110; //110是banner图的高度
+			//判断当前的scrollTop在哪个区间内;
+			let now = +new Date();
+			if (now - this.last > 140) {
+				this.last = now;
+				let active_index = this.right_height.findIndex((value, index, arr) => value <= scroll_top && scroll_top < arr[index + 1]);
+				this.select_index = active_index;
+				if (this.left_height - this.windows_height) {
+					//如果有超出部分
+					let diff = this.left_height - this.windows_height;
+					this.left_scroll = Math.round((active_index * diff) / (this.catrgoryList.length - 1));
+				}
+			}
+		}
+	}
+};
+</script>
+
+<style lang="less">
+page,
+.content {
+	height: 100%;
+	background-color: #f8f8f8;
+}
+
+.content {
+	display: flex;
+}
+.statusBar {
+	width: 100%;
+	position: fixed;
+	top: 0;
+	z-index: 99;
+	background: #ffffff;
+}
+.getPosition {
+	height: 90upx;
+	position: fixed;
+	z-index: 99;
+	width: 100%;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 32upx;
+	background-color: #fff;
+}
+.search {
+	background: #ffffff;
+	height: 80upx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	border-bottom: 1upx solid #eeeeee;
+}
+.search_input {
+	font-size: 28upx;
+	background: #f5f5f5;
+	height: 60upx;
+	width: 90%;
+	border-radius: 50upx;
+	text-align: center;
+}
+.banner-item {
+	width: 94%;
+	height: 180upx;
+	border-radius: 20upx;
+	margin-left: 3%;
+}
+.banner {
+	width: 100%;
+	height: 180upx;
+	border-radius: 20upx;
+	overflow: hidden;
+	box-shadow: 0upx 5upx 20upx rgba(0, 0, 0, 0.3);
+}
+.category-wrapper {
+	width: 100%;
+	display: flex;
+	flex-direction: row;
+	// position: absolute;
+	// top: 100upx;
+	// bottom: 0;
+	.left-wrapper {
+		width: 25%;
+		flex: 0 0 200rpx;
+		background-color: #ffffff;
+		.left-content {
+			.title-content {
+				width: 100%;
+				height: 100rpx;
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				font-size: 30upx;
+				border-bottom: 1px solid #eeeeee;
+				cursor: pointer;
+				&:last-child {
+					// border-bottom: 0;
+				}
+				&.onSelected {
+					background-color: #fff;
+					position: relative;
+					// color: #4aa849;
+					color: #f44142;
+
+					&::before {
+						content: '';
+						position: absolute;
+						left: 0;
+						top: 0;
+						width: 5upx;
+						height: 100%;
+						background: #f44142;
+						// background: linear-gradient(124deg, #feb436 0%, #fb7c22 100%);
+					}
+				}
+			}
+		}
+	}
+	.right-wrapper {
+		flex: 1;
+		width: 75%;
+		background-color: #ffffff;
+		.right-content {
+			width: 100%;
+			padding-top: 20rpx;
+			border-left: 1rpx solid #efefef;
+			box-sizing: border-box;
+			.banner-wrapper {
+				padding: 0 20rpx;
+				.swiper-content {
+					width: 100%;
+					height: 180rpx;
+					margin-bottom: 30rpx;
+					.swiper-item {
+						.swiper-img {
+							width: 100%;
+							height: 180rpx;
+						}
+					}
+				}
+			}
+			.product-wrapper {
+				.category-item {
+					.category-title {
+						height: 60rpx;
+						font-size: 26rpx;
+						line-height: 60rpx;
+						font-weight: 500;
+						background-color: #f6f6f6;
+						padding-left: 20rpx;
+						color: #000;
+					}
+					.category-content {
+						display: flex;
+						flex-direction: row;
+						flex-flow: wrap;
+						padding: 40rpx 20rpx 0;
+						margin-bottom: 20rpx;
+						.product-item {
+							width: 33%;
+							display: flex;
+							flex-direction: column;
+							justify-content: center;
+							align-items: center;
+							margin-bottom: 20rpx;
+							.product-img {
+								width: 120rpx;
+								height: 120rpx;
+								border-radius: 50%;
+								margin-bottom: 10rpx;
+							}
+							.product-title {
+								font-size: 28rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/discountList.vue b/mallplusui-uniapp-app2/pagesA/product/discountList.vue
new file mode 100644
index 0000000..b552d5a
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/discountList.vue
@@ -0,0 +1,408 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPageL(item.url)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 {{ item.clickCount }}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeList, params);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum ,keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.index.bannerList, params);
+			let goodsList = list;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.clickCount - a.clickCount);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.clickCount - b.clickCount;
+					}
+					return b.clickCount - a.clickCount;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情页
+                		navToDetailPageL(url) {
+                			window.location.href =url;
+                		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			let groupId = item.groupId;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/giftList.vue b/mallplusui-uniapp-app2/pagesA/product/giftList.vue
new file mode 100644
index 0000000..2c616d3
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/giftList.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.icon" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.title }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 6</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+	mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeGiftList, params);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.goods.giftList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			console.log(item.id);
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/giftProduct?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/giftProduct.vue b/mallplusui-uniapp-app2/pagesA/product/giftProduct.vue
new file mode 100644
index 0000000..2ce992f
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/giftProduct.vue
@@ -0,0 +1,706 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<view class="image-wrapper"><image :src="detailData.icon" class="loaded" mode="aspectFill"></image></view>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ detailData.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price">{{ detailData.price }}</text>
+			</view>
+			<view class="bot-row">
+				<text>销量: 6</text>
+				<text>库存: {{ detailData.stock }}</text>
+				<text>浏览量: {{ detailData.hit }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text>7天无理由退换货 ·</text>
+					<text>假一赔十 ·</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc |formatRichText"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(detailData)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group"><button type="primary" class=" action-btn no-border add-cart-btn" @click="jifenPay(detailData)">积分兑换</button></view>
+		</view>
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			favorite: true,
+			shareList: [],
+
+			desc: `
+					<div style="width:100%">
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i4/479184430/O1CN01nCpuLc1iaz4bcSN17_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd2.alicdn.com/imgextra/i2/479184430/O1CN01gwbN931iaz4TzqzmG_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i3/479184430/O1CN018wVjQh1iaz4aupv1A_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd4.alicdn.com/imgextra/i4/479184430/O1CN01tWg4Us1iaz4auqelt_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd1.alicdn.com/imgextra/i1/479184430/O1CN01Tnm1rU1iaz4aVKcwP_!!479184430.jpg_400x400.jpg" />
+					</div>
+				`,
+			skuList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.goods.giftDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				this.favorite = data.favorite;
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = detailData.albumPics;
+				this.desc = detailData.content;
+
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+				this.detailData = detailData;
+
+				this.shareList = shareList;
+
+				uni.setNavigationBarTitle({
+					title: detailData.name
+				});
+			}
+		}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	filters: {
+	 /**
+				 * 处理富文本里的图片宽度自适应
+				 * 1.去掉img标签里的style、width、height属性
+				 * 2.img标签添加style属性：max-width:100%;height:auto
+				 * 3.修改所有style里的width属性为max-width:100%
+				 * 4.去掉<br/>标签
+				 * @param html
+				 * @returns {void|string|*}
+				 */
+				formatRichText (html) { //控制小程序中图片大小
+	        if (html) {
+	            let newContent= html.replace(/<img[^>]*>/gi,function(match,capture){
+	                match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+	                match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+	                match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+	                return match;
+	            });
+	            newContent = newContent.replace(/style="[^"]+"/gi,function(match,capture){
+	                match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+	                return match;
+	            });
+	            newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+	            newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+	            return newContent;
+	        } else {
+	            return '暂无商品详情'
+	        }
+				},
+	              formatCreateTime(time) {
+	                let date = new Date(time);
+	                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+	              },
+	            },
+	methods: {
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 4, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+
+		async jifenPay(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			let params = { goodsId: id };
+			data = await Api.apiCall('post', Api.order.jifenPay, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/groupActivityDetail.vue b/mallplusui-uniapp-app2/pagesA/product/groupActivityDetail.vue
new file mode 100644
index 0000000..7af0f83
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/groupActivityDetail.vue
@@ -0,0 +1,1219 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ goods.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">{{ (goods.price * goods.memberRate) / 10 }}</text>
+				<text class="price" v-else-if="!goods.vipPrice">{{ goods.price }}</text>
+				<text class="m-price" v-if="!goods.vipPrice">¥{{ goods.originalPrice }}</text>
+				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
+				<text class="price" v-if="goods.isFenxiao == 1 && goods.fenxiaoPrice > 0">佣金 ¥{{ goods.fenxiaoPrice }}</text>
+				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
+			</view>
+			<view class="bot-row">
+				<text>销量: {{ goods.sale }}</text>
+				<text>库存: {{ goods.stock }}</text>
+				<text>浏览量: {{ goods.hit }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+		<view class="eva-section">
+        				<view class="e-header" v-for="(item, index) in groupActivity.productList" :key="index">
+        					<img  :src="item.pic" class="logo" alt="" />
+        					<text class="title clamp">{{ item.name }}</text>
+                            <text class="price">￥{{ item.price }}</text>
+
+
+        				</view>
+        				<text class="title clamp">{{ groupActivity.name }}</text>
+                                                    <text class="price">原售价:￥{{ groupActivity.originprice }}</text>
+                                                    <text class="price">套装价:￥{{ groupActivity.price }}</text>
+                                                    <text class="price">节省价:￥{{ groupActivity.originprice - groupActivity.price }}</text>
+                                                    <text class="price">运费价:￥{{ groupActivity.transfee }}</text>
+                                                    <button type="primary" class=" action-btn no-border add-cart-btn" @click="buyGroup(groupActivity)">购买套装</button>
+        			</view>
+
+
+		<view class="c-list">
+			<view class="c-row b-b" v-if="skuList && skuList.length > 0" @click="toggleSpec">
+				<text class="tit">购买类型</text>
+				<view class="con">
+					<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+
+			<view class="c-row b-b" v-if="serviceList && serviceList.length > 0">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text v-for="(item1, index1) in serviceList" :key="index1">{{ item1 }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 评价 -->
+		<view class="eva-section">
+			<view class="e-header">
+				<text class="tit">评价</text>
+				<text>({{ consultCount.all }})</text>
+				<text class="tit">好评</text>
+				<text>({{ consultCount.goods }})</text>
+
+				<text class="tit">一般</text>
+				<text>({{ consultCount.general }})</text>
+
+				<text class="tit">差评</text>
+				<text>({{ consultCount.bad }})</text>
+				<text class="tip" v-if="consultCount.persent != 200">好评率 {{ consultCount.persent }}%</text>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="eva-box" v-for="(item, index) in consultList" :key="item.id">
+				<image :src="item.pic" class="portrait" mode="aspectFill"></image>
+				<view class="right">
+					<text class="name">{{ item.memberName }}</text>
+					<text class="con">{{ item.consultContent }}</text>
+					<view class="bot">
+						<text class="attr">购买类型：{{ item.attr }}</text>
+						<text class="time">{{ item.consultAddtime | formatCreateTime}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc |formatRichText"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+			<navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-gouwuche"></text>
+				<text>购物车</text>
+			</navigator>
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(goods)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group">
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(goods)">立即购买</button>
+				<button type="primary" class=" action-btn no-border add-cart-btn" @click="addCart(goods)">加入购物车</button>
+			</view>
+		</view>
+
+<view class="mask" :class="maskState===0 ? 'none' : maskState===1 ? 'show' : ''" @click="toggleMask">
+			<view class="mask-content" @click.stop.prevent="stopPrevent">
+				<view @click="obtainCoupon(item)" class="coupon-item" v-for="(item,index) in couponList" :key="index">
+					<view class="con">
+						<view class="left">
+							<text class="title">{{item.name}}</text>
+							<text  class="time">在{{item.endTime}}前有效。 可领{{item.perLimit}}张</text>
+
+						</view>
+						<view class="right">
+							<text class="price">{{item.amount}}</text>
+							<text>满{{item.minPoint }}可减{{item.amount }}</text>
+						</view>
+						<view class="circle l"></view>
+						<view class="circle r"></view>
+					</view>
+					<text class="tips">{{item.categoryTitle?'限' + item.categoryTitle + '可用': '全品类可用'}}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 规格-模态层弹窗 -->
+		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer attr-content" @click.stop="stopPrevent">
+				<view class="a-t">
+					<image :src="sku.pic"></image>
+					<view class="right">
+						<text class="price">¥{{ sku.price }}</text>
+						<text class="stock">库存：{{ sku.stock }}件</text>
+						<view class="selected">
+							已选：
+							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view v-for="(item, index) in specList" :key="index" class="attr-list">
+					<text>{{ item.name }}</text>
+					<view class="item-list">
+						<text
+							v-for="(childItem, childIndex) in specChildList"
+							v-if="childItem.pid === item.id"
+							:key="childIndex"
+							class="tit"
+							:class="{ selected: childItem.selected }"
+							@click="selectSpec(childIndex, childItem.pid)"
+						>
+							{{ childItem.name }}
+						</text>
+					</view>
+				</view>
+				<button class="btn" @click="toggleSpec">完成</button>
+			</view>
+		</view>
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+	import { formatDate } from '@/common/date';
+
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+		maskState: 0, //优惠券面板显示状态
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			goods: [],
+			groupActivity:[],
+			favorite: true,
+			shareList: [],
+			consultList: [],
+			serviceList:[],
+			couponList:[],
+			consultCount: {
+				all: 0,
+				bad: 0,
+				general: 0,
+				goods: 0
+			},
+			imgList: [
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+				}
+			],
+			desc: `
+
+				`,
+			skuList: [],
+			specList: [],
+			specChildList: []
+		};
+	},
+	async onLoad(ops) {
+		console.log(ops)
+		let id = ops.id;
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.index.groupActivityDetail, params);
+			this.logining = false;
+console.log(data)
+			if (data) {
+				let detailData = data.goods;
+				let goods = detailData.goods;
+				this.goods = goods;
+				this.favorite = data.favorite;
+				this.groupActivity =data.groupActivity;
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = goods.albumPics;
+				this.desc = goods.detailHtml;
+				this.small = subImages.split(',');
+				//await this.$api.json('detailData');
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+				var sers = goods.serviceIds;
+				if (sers && sers.indexOf("1") != -1){
+					this.serviceList.push('无忧退货');
+				}
+				if (sers && sers.indexOf("2") != -1){
+					this.serviceList.push('快速退款');
+				}
+				if (sers && sers.indexOf("3") != -1){
+					this.serviceList.push('正品保证');
+				}
+				this.shareList = shareList;
+				this.specList = detailData.productAttributeValueList;
+				this.skuList = detailData.skuStockList;
+				if (this.specList) {
+					this.specList.forEach(item => {
+						let valuesA = item.value.split(',');
+						if (valuesA) {
+							for (let cItem of valuesA) {
+								let att = {};
+								att.pid = item.id;
+								att.name = cItem;
+								this.specChildList.push(att);
+							}
+						}
+					});
+				}
+
+				uni.setNavigationBarTitle({
+					title: goods.name
+				});
+			}else{
+			  this.$common.errorToShow('商品套餐不存在');
+			}
+			if (this.hasLogin) {
+				let params = { goodsId: ops.id ,pic:this.goods.pic};
+				await Api.apiCall('post', Api.goods.addView, params);
+			}
+			let params1 = { goodsId: ops.id };
+			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+			this.consultList = consoltL.list;
+			this.consultCount = consoltL.count;
+
+			let params3 = { };
+            let couponList1 = await Api.apiCall('get', Api.index.couponList, params3);
+            this.couponList = couponList1;
+            console.log(this.couponList);
+		}
+
+		//规格 默认选中第一条
+		if (this.specList) {
+			var specs = '';
+			this.specList.forEach(item => {
+				for (let cItem of this.specChildList) {
+					if (cItem.pid === item.id) {
+						this.$set(cItem, 'selected', true);
+						this.specSelected.push(cItem);
+						specs = cItem.name + ',' + specs;
+						break; //forEach不能使用break
+					}
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		}
+
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	filters: {
+	 /**
+				 * 处理富文本里的图片宽度自适应
+				 * 1.去掉img标签里的style、width、height属性
+				 * 2.img标签添加style属性：max-width:100%;height:auto
+				 * 3.修改所有style里的width属性为max-width:100%
+				 * 4.去掉<br/>标签
+				 * @param html
+				 * @returns {void|string|*}
+				 */
+				formatRichText (html) { //控制小程序中图片大小
+	        if (html) {
+	            let newContent= html.replace(/<img[^>]*>/gi,function(match,capture){
+	                match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+	                match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+	                match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+	                return match;
+	            });
+	            newContent = newContent.replace(/style="[^"]+"/gi,function(match,capture){
+	                match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+	                return match;
+	            });
+	            newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+	            newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+	            return newContent;
+	        } else {
+	            return '暂无商品详情'
+	        }
+				},
+	              formatCreateTime(time) {
+	                let date = new Date(time);
+	                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+	              },
+	            },
+	methods: {
+	toggleMask(type) {
+    				let timer = type === 'show' ? 10 : 300;
+    				let state = type === 'show' ? 1 : 0;
+    				this.maskState = 2;
+    				setTimeout(() => {
+    					this.maskState = state;
+    				}, timer)
+    			},
+    			//领取优惠券
+    		async	obtainCoupon(index) {
+    			if (!this.hasLogin) {
+    			this.$api.msg('请先登录');
+    			}
+    			             uni.showLoading({
+                        				title: '请稍后'
+                        			});
+
+                        			let params = { couponId: index.id };
+                        			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+                                        console.log(data);
+                        			if (data) {
+                        				this.$api.msg(data);
+                        				this.toggleMask()
+                        			}
+                        			uni.hideLoading();
+
+
+    			},
+		//规格弹窗开关
+		toggleSpec() {
+			if (this.specClass === 'show') {
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 250);
+			} else if (this.specClass === 'none') {
+				this.specClass = 'show';
+			}
+		},
+		//选择规格
+		selectSpec(index, pid) {
+			let list = this.specChildList;
+			list.forEach(item => {
+				if (item.pid === pid) {
+					this.$set(item, 'selected', false);
+				}
+			});
+
+			this.$set(list[index], 'selected', true);
+			//存储已选择
+			/**
+			 * 修复选择规格存储错误
+			 * 将这几行代码替换即可
+			 * 选择的规格存放在specSelected中
+			 */
+			var specs = '';
+			this.specSelected = [];
+			list.forEach(item => {
+				if (item.selected === true) {
+					this.specSelected.push(item);
+					specs = item.name + ',' + specs;
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+
+		async buyGroup(item) {
+        			if (!this.hasLogin) {
+        				let url = '/pages/public/login';
+        				uni.navigateTo({
+        					url
+        				});
+        			}
+
+let dataJson ={};
+                            			dataJson.groupActivityId=item.id;
+                            			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                				uni.navigateTo({
+                					url: url
+                				});
+
+
+        		},
+		async buy(item) {
+        			if (!this.hasLogin) {
+        				let url = '/pages/public/login';
+        				uni.navigateTo({
+        					url
+        				});
+        			}
+        			let userInfo = uni.getStorageSync('userInfo')
+        			if(userInfo && userInfo.storeId && userInfo.storeId==this.goods.storeId){
+        				uni.showToast({title:"不能购买自己店铺的商品！"});
+        				return;
+        			}
+        			let data;
+        			let id = item.id;
+        			console.log(id);
+        			if (this.sku && this.sku.id) {
+        			if(this.sku.stock<1){
+                    			   uni.showToast({title:"库存不够！"});
+                    			   return;
+                    			}
+        				let params = { goodsId: id, skuId: this.sku.id };
+        				// data = await Api.apiCall('post', Api.order.addCart, params);
+        				let dataJson ={};
+
+                                    			dataJson.goodsId=this.goods.id;
+
+                                    			dataJson.type=1;
+                                    			dataJson.skuId=this.sku.id;
+                                    			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                        				uni.navigateTo({
+                        					url: url
+                        				});
+
+        			} else {
+        			if(this.goods.stock<1){
+                                			   uni.showToast({title:"库存不够！"});
+                                			   return;
+                                			}
+        				let params = { goodsId: id };
+        			//	data = await Api.apiCall('post', Api.order.addCart, params);
+        let dataJson ={};
+
+                                    			dataJson.goodsId=this.goods.id;
+
+                                    			dataJson.type=1;
+
+                                    			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                        				uni.navigateTo({
+                        					url: url
+                        				});
+        			}
+        		},
+		async addCart(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			if (this.sku && this.sku.id) {
+			if(this.sku.stock<1){
+            			   uni.showToast({title:"库存不够！"});
+            			   return;
+            			}
+				let params = { goodsId: id, skuId: this.sku.id };
+				data = await Api.apiCall('post', Api.order.addCart, params);
+			} else {
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+				let params = { goodsId: id };
+				data = await Api.apiCall('post', Api.order.addCart, params);
+			}
+
+			if (data) {
+				this.$api.msg('添加购物车成功!');
+			} else {
+				this.$api.msg('加入购物车错误');
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+	.logo {
+		display: block;
+		width: 50upx;
+		height: 50upx;
+		border-radius: 100px;
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+
+/* 优惠券面板 */
+.mask {
+	display: flex;
+	align-items: flex-end;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 9995;
+	transition: 0.3s;
+
+	.mask-content {
+		width: 100%;
+		min-height: 30vh;
+		max-height: 70vh;
+		background: #f3f3f3;
+		transform: translateY(100%);
+		transition: 0.3s;
+		overflow-y: scroll;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.mask-content {
+			transform: translateY(0);
+		}
+	}
+}
+
+/* 优惠券列表 */
+.coupon-item {
+	display: flex;
+	flex-direction: column;
+	margin: 20upx 24upx;
+	background: #fff;
+	.con {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 120upx;
+		padding: 0 30upx;
+		&:after {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			content: '';
+			width: 100%;
+			height: 0;
+			border-bottom: 1px dashed #f3f3f3;
+			transform: scaleY(50%);
+		}
+	}
+	.left {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		flex: 1;
+		overflow: hidden;
+		height: 100upx;
+	}
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		margin-bottom: 10upx;
+	}
+	.time {
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 26upx;
+		color: $font-color-base;
+		height: 100upx;
+	}
+	.price {
+		font-size: 44upx;
+		color: $base-color;
+		&:before {
+			content: '￥';
+			font-size: 34upx;
+		}
+	}
+	.tips {
+		font-size: 24upx;
+		color: $font-color-light;
+		line-height: 60upx;
+		padding-left: 30upx;
+	}
+	.circle {
+		position: absolute;
+		left: -6upx;
+		bottom: -10upx;
+		z-index: 10;
+		width: 20upx;
+		height: 20upx;
+		background: #f3f3f3;
+		border-radius: 100px;
+		&.r {
+			left: auto;
+			right: -6upx;
+		}
+	}
+
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/groupActivityList.vue b/mallplusui-uniapp-app2/pagesA/product/groupActivityList.vue
new file mode 100644
index 0000000..24e9680
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/groupActivityList.vue
@@ -0,0 +1,381 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.price }}</text>
+					<text>运费 {{item.transfee}}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+        <!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+	mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		//this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.index.groupActivityList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			console.log(item.id);
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupActivityDetail?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0 20upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/groupList.vue b/mallplusui-uniapp-app2/pagesA/product/groupList.vue
new file mode 100644
index 0000000..e71e738
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/groupList.vue
@@ -0,0 +1,407 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.goods.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.goods.name }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.groupPrice }}</text>
+					<text>原价 {{ item.goods.price }}</text>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+	mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeList, params);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+			let goodsList = list;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.goodsId;
+			let groupId = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/groupProduct.vue b/mallplusui-uniapp-app2/pagesA/product/groupProduct.vue
new file mode 100644
index 0000000..689f520
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/groupProduct.vue
@@ -0,0 +1,1097 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ goods.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price">{{ group.groupPrice }}</text>
+				<text class="m-price">¥{{ goods.price }}</text>
+			</view>
+			<view class="bot-row">
+				<text>销量: {{ goods.sale }}</text>
+				<text>库存: {{ goods.stock }}</text>
+				<view class='commodity-time' v-if="group.pintuan_start_status == 1">
+                						<text>距结束仅剩</text>
+                						<view class='commodity-day'>
+                							<uni-countdown textColor="#fce250" :day="lasttime.day" :hour="lasttime.hour" :minute="lasttime.minute" :second="lasttime.second"></uni-countdown>
+                						</view>
+                					</view>
+
+                					<view class='commodity-time' v-if="group.pintuan_start_status == 2">
+                						<text>即将开团</text>
+                						<view class='commodity-day'>
+                							<uni-countdown textColor="#fce250" :day="group.lasttime.day" :hour="group.lasttime.hour"
+                							 :minute="group.lasttime.minute" :second="group.lasttime.second"></uni-countdown>
+                						</view>
+                					</view>
+                					<view class='commodity-time-img'></view>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b" v-if="skuList && skuList.length > 0" @click="toggleSpec">
+				<text class="tit">购买类型</text>
+				<view class="con">
+					<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+
+
+			<view class="eva-section">
+				<view class="e-header" v-for="(item, index) in groupMemberList" :key="index">
+					<img v-for="(item1, index1) in item.list" :key="index1" :src="item1.pic" class="logo" alt="" />
+					<button type="primary" v-if="item.list.length>0 && item.status==1"
+					class=" action-btn no-border add-cart-btn" @click="acceptGroup(item)">参与拼团</button>
+					<div class="time"  v-if="item.list.length>0 && item.status==2">已成团</div>
+				</view>
+			</view>
+			<view class="c-row b-b" v-if="serviceList && serviceList.length > 0">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text v-for="(item1, index1) in serviceList" :key="index1">{{ item1 }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 评价 -->
+		<view class="eva-section">
+			<view class="e-header">
+				<text class="tit">评价</text>
+				<text>({{ consultCount.all }})</text>
+				<text class="tit">好评</text>
+				<text>({{ consultCount.goods }})</text>
+
+				<text class="tit">一般</text>
+				<text>({{ consultCount.general }})</text>
+
+				<text class="tit">差评</text>
+				<text>({{ consultCount.bad }})</text>
+				<text class="tip" v-if="consultCount.persent != 200">好评率 {{ consultCount.persent }}%</text>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="eva-box" v-for="(item, index) in consultList" :key="item.id">
+				<image :src="item.pic" class="portrait" mode="aspectFill"></image>
+				<view class="right">
+					<text class="name">{{ item.memberName }}</text>
+					<text class="con">{{ item.consultContent }}</text>
+					<view class="bot">
+						<text class="attr">购买类型：{{ item.attr }}</text>
+						<text class="time">{{ item.consultAddtime | formatCreateTime}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc |formatRichText"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(goods)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group"><button type="primary" class=" action-btn no-border add-cart-btn" @click="addGroup(goods)">发起拼单</button></view>
+		</view>
+
+		<!-- 规格-模态层弹窗 -->
+		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer attr-content" @click.stop="stopPrevent">
+				<view class="a-t">
+					<image :src="sku.pic"></image>
+					<view class="right">
+						<text class="price">¥{{ sku.price }}</text>
+						<text class="stock">库存：{{ sku.stock }}件</text>
+						<view class="selected">
+							已选：
+							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view v-for="(item, index) in specList" :key="index" class="attr-list">
+					<text>{{ item.name }}</text>
+					<view class="item-list">
+						<text
+							v-for="(childItem, childIndex) in specChildList"
+							v-if="childItem.pid === item.id"
+							:key="childIndex"
+							class="tit"
+							:class="{ selected: childItem.selected }"
+							@click="selectSpec(childIndex, childItem.pid)"
+						>
+							{{ childItem.name }}
+						</text>
+					</view>
+				</view>
+				<button class="btn" @click="toggleSpec">完成</button>
+			</view>
+		</view>
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
+	import { formatDate } from '@/common/date';
+
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share,uniCountdown
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			serviceList:[],
+			goods: [],
+			group:{},
+			favorite: true,
+			shareList: [],
+			groupMemberList: [],
+			consultList: [],
+			lasttime: {
+            					day: 0,
+            					hour: false,
+            					minute: 0,
+            					second: 0
+            				}, //购买倒计时
+			consultCount: {
+				all: 0,
+				bad: 0,
+				general: 0,
+				goods: 0
+			},
+			imgList: [
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+				}
+			],
+			ssss: [
+				{ title: '小心愿，大梦想', pic: '../../static/vip-card-bg.png', count: '34', time: '1625293470350' },
+				{ title: '杭州国际时', pic: '../../static/vip-card-bg.png', count: '36', time: '1725293470350' },
+				{ title: '怪兽bobo全', pic: '../../static/vip-card-bg.png', count: '74', time: '154429253270350' },
+				{ title: '汉风唐韵 、别', pic: '../../static/vip-card-bg.png', count: '266', time: '15255753270350' },
+				{ title: '听说同台“PK”？', pic: '../../static/vip-card-bg.png', count: '97', time: '15252553270450' }
+			],
+			desc: `
+
+				`,
+			skuList: [],
+			specList: [],
+			specChildList: [],
+			active: 'tab-container1',
+			pinkFont: true,
+			// 上拉刷新、下拉加载
+			allLoaded: false, //如果为true,禁止上拉刷新
+			autoFill: false, //取消自动填充，
+			list: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id, groupId: ops.groupId };
+			let data = await Api.apiCall('get', Api.goods.groupGoodsDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				let goods = detailData.goods;
+				this.goods = goods;
+				this.group = data.group;
+				this.favorite = data.favorite;
+                let timestamp = Date.parse(new Date()) / 1000;
+                                                let timestamp1 = Date.parse(this.group.endTime) / 1000;
+                    							let lasttime1 = timestamp1 - timestamp;
+                    							console.log(lasttime1)
+                    							this.lasttime = this.$common.timeToDateObj(lasttime1);
+                    							console.log(this.lasttime)
+				/*setInterval(() => {
+					data.memberGroupList.map((obj, index) => {
+						this.$set(obj, 'djs', this.InitTime(obj.endTime));
+					});
+
+
+				}, 500);*/
+				this.groupMemberList = data.memberGroupList;
+
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = goods.albumPics;
+				this.desc = goods.detailHtml;
+				this.small = subImages.split(',');
+				var sers = goods.serviceIds;
+				if (sers && sers.indexOf("1") != -1){
+					this.serviceList.push('无忧退货');
+				}
+				if (sers && sers.indexOf("2") != -1){
+					this.serviceList.push('快速退款');
+				}
+				if (sers && sers.indexOf("3") != -1){
+					this.serviceList.push('正品保证');
+				}
+				//await this.$api.json('detailData');
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+				this.detailData = detailData;
+				this.shareList = shareList;
+				this.specList = detailData.productAttributeValueList;
+				this.skuList = detailData.skuStockList;
+				if (this.specList) {
+					this.specList.forEach(item => {
+						let valuesA = item.value.split(',');
+
+						if (valuesA) {
+							for (let cItem of valuesA) {
+								let att = {};
+								att.pid = item.id;
+								att.name = cItem;
+								this.specChildList.push(att);
+							}
+						}
+					});
+				}
+
+				uni.setNavigationBarTitle({
+					title: goods.name
+				});
+			}
+			if (this.hasLogin) {
+				let params = { goodsId: ops.id ,pic:this.goods.pic};
+				await Api.apiCall('post', Api.goods.addView, params);
+			}
+
+			let params1 = { goodsId: ops.id };
+			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+			this.consultList = consoltL.list;
+			this.consultCount = consoltL.count;
+		}
+
+		if (this.specList) {
+			//规格 默认选中第一条
+			var specs = '';
+			this.specList.forEach(item => {
+				for (let cItem of this.specChildList) {
+					if (cItem.pid === item.id) {
+						this.$set(cItem, 'selected', true);
+						this.specSelected.push(cItem);
+						specs = cItem.name + ',' + specs;
+						break; //forEach不能使用break
+					}
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	filters: {
+	 /**
+				 * 处理富文本里的图片宽度自适应
+				 * 1.去掉img标签里的style、width、height属性
+				 * 2.img标签添加style属性：max-width:100%;height:auto
+				 * 3.修改所有style里的width属性为max-width:100%
+				 * 4.去掉<br/>标签
+				 * @param html
+				 * @returns {void|string|*}
+				 */
+				formatRichText (html) { //控制小程序中图片大小
+	        if (html) {
+	            let newContent= html.replace(/<img[^>]*>/gi,function(match,capture){
+	                match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+	                match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+	                match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+	                return match;
+	            });
+	            newContent = newContent.replace(/style="[^"]+"/gi,function(match,capture){
+	                match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+	                return match;
+	            });
+	            newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+	            newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+	            return newContent;
+	        } else {
+	            return '暂无商品详情'
+	        }
+				},
+	              formatCreateTime(time) {
+	                let date = new Date(time);
+	                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+	              },
+	            },
+	methods: {
+		toTimeStamp(strtime) {
+			var strtime = index;
+			var date = new Date(strtime);
+			var time = Date.parse(date) / 1000;
+			return time;
+		},
+		InitTime(endtime) {
+			var dd,
+				hh,
+				mm,
+				ss = null;
+			var time = parseInt(endtime) - new Date().getTime();
+
+			if (time <= 0) {
+				return '结束';
+			} else {
+				dd = Math.floor(time / 60 / 60 / 24);
+				hh = Math.floor((time / 60 / 60) % 24);
+				mm = Math.floor((time / 60) % 60);
+				ss = Math.floor(time % 60);
+				var str = dd + '天' + hh + '小时' + mm + '分' + ss + '秒';
+				return str;
+			}
+		},
+
+		//规格弹窗开关
+		toggleSpec() {
+			if (this.specClass === 'show') {
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 250);
+			} else if (this.specClass === 'none') {
+				this.specClass = 'show';
+			}
+		},
+		//选择规格
+		selectSpec(index, pid) {
+			let list = this.specChildList;
+			list.forEach(item => {
+				if (item.pid === pid) {
+					this.$set(item, 'selected', false);
+				}
+			});
+
+			this.$set(list[index], 'selected', true);
+			//存储已选择
+			/**
+			 * 修复选择规格存储错误
+			 * 将这几行代码替换即可
+			 * 选择的规格存放在specSelected中
+			 */
+			var specs = '';
+			this.specSelected = [];
+			list.forEach(item => {
+				if (item.selected === true) {
+					this.specSelected.push(item);
+					specs = item.name + ',' + specs;
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				if (!this.sku.price) {
+					this.sku.price = this.goods.price;
+				}
+			});
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		async addGroup(item) {
+			// 发起拼团
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			}
+			let data;
+			let id = item.id;
+			if (this.sku && this.sku.id) {
+			console.log('3')
+			if(this.sku.stock<1){
+            			   uni.showToast({title:"库存不够！"});
+            			   return;
+            			}
+            		 let dataJson ={};
+                                                        			dataJson.groupId=this.group.id;
+
+                                                        			dataJson.id=item.id;
+                                                        			dataJson.groupType=1;
+                                                        			dataJson.type=1;
+                                                        			dataJson.skuId=this.sku.id;
+                                                        			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                                            				uni.navigateTo({
+                                            					url: url
+                                            				});
+			} else {
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+                        let dataJson ={};
+                                    			dataJson.groupId=this.group.id;
+
+                                    			dataJson.id=item.id;
+                                    			dataJson.groupType=1;
+                                    			dataJson.type=1;
+
+                                    			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                        				uni.navigateTo({
+                        					url: url
+                        				});
+
+			}
+		},
+
+		async acceptGroup(item) {
+
+			// 参与拼团
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			}
+			if (this.sku && this.sku.id) {
+			console.log('2')
+			if(this.sku.stock<1){
+            			   uni.showToast({title:"库存不够！"});
+            			   return;
+            			}
+            			let dataJson ={};
+            			dataJson.groupId=item.groupId;
+            			dataJson.mgid=item.id;
+            			dataJson.id=this.goods.id;
+            			dataJson.groupType=2;
+            			dataJson.type=1;
+            			dataJson.skuId=this.sku.id;
+            			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+				uni.navigateTo({
+					url: url
+				});
+			} else {
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+                        		let dataJson ={};
+                                            			dataJson.groupId=item.groupId;
+                                            			dataJson.mgid=item.id;
+                                            			dataJson.id=this.goods.id;
+                                            			dataJson.groupType=2;
+                                            			dataJson.type=1;
+
+                                            			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+				uni.navigateTo({
+					url: url
+				});
+			}
+		},
+
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+	.logo {
+		display: block;
+		width: 50upx;
+		height: 50upx;
+		border-radius: 100px;
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/list.vue b/mallplusui-uniapp-app2/pagesA/product/list.vue
new file mode 100644
index 0000000..6909105
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/list.vue
@@ -0,0 +1,528 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<!-- <text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text> -->
+			<text class="cate-item yticon icon-fenlei1" v-if="current == 0" @click="toShowMode('false')"></text>
+			<text class="cate-item cgicon icon-vertical" v-else-if="current == 1" @click="toShowMode('true')"></text>
+		</view>
+		<!-- 表格图片显示 -->
+		<view class="goods-list" v-show="current === 0">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box" v-if="item.isFenxiao == 1">
+					<text class="price">{{ item.price }}</text>
+					<text>佣金 ¥{{ item.fenxiaoPrice }}</text>
+				</view>
+				<view class="price-box" v-if="item.isVip == 1">
+					<text class="price">会员价{{ item.vipPrice }}</text>
+					<text>商品价 ¥{{ item.price }}</text>
+				</view>
+				<view class="price-box" v-else-if="item.isFenxiao == 0 && item.isVip == 0">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 {{ item.sale }}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 列表显示 -->
+		<view class="goods-list-vertical" v-show="current === 1">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)">
+				<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+				<view class="goods-list-right">
+					<view class="goods-right-top">
+						<text class="">{{ item.name }}</text>
+					</view>
+					<view class="goods-right-bottom">
+						<text class="price">{{ item.price }}</text>
+						<text class="sale">已售 {{ item.sale }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			productAttributeCategoryId: 0,
+			pageNum: 1,
+			isFenxiao: 0,
+			isVip: 0,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: [],
+
+			current: 0 // 1为列表模式
+		};
+	},
+
+	onLoad(options) {
+		console.log(options);
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.isVip = options.isVip;
+		this.isFenxiao = options.isFenxiao;
+		console.log(options);
+		this.productAttributeCategoryId = options.productAttributeCategoryId;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		toShowMode(mode) {
+			if (this.current == 0) {
+				this.current = 1;
+			} else {
+				this.current = 0;
+			}
+		},
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeList, params);
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params = { pageNum: this.pageNum, productCategoryId: this.cateId, type: 1, productAttributeCategoryId: this.productAttributeCategoryId };;
+			if (this.cateId) {
+			  params.productCategoryId = this.cateId;
+
+			}
+			if (this.productAttributeCategoryId) {
+            		        params.productAttributeCategoryId = this.productAttributeCategoryId;
+            			}
+			if (this.keyword) {
+		        params.keyword = this.keyword;
+			}
+			if (this.isVip) {
+				params.isVip = 1;
+			}
+			if (this.isFenxiao) {
+				params.isFenxiao = 1;
+			}
+			let list = await Api.apiCall('get', Api.goods.goodsList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+@font-face {
+	font-family: 'cgicon';
+	font-weight: normal;
+	font-style: normal;
+	src: url('https://at.alicdn.com/t/font_1475801_65jj7c5ss9k.ttf') format('truetype');
+}
+
+.cgicon {
+	font-family: 'cgicon' !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-vertical:before {
+	content: '\e61b';
+}
+
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+.goods-list-vertical {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0upx 20upx;
+	background: #fff;
+	.goods-item-vertical {
+		display: flex;
+		flex-direction: row;
+		height: 280upx;
+		align-items: center;
+		justify-content: center;
+		border-bottom: 1upx solid #eeeeee;
+		.image-wrapper-vertical {
+			width: 240upx;
+			height: 240upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-right: 10upx;
+			image {
+				width: 240upx;
+				height: 240upx;
+			}
+		}
+		.goods-list-right {
+			width: 470upx;
+			.goods-right-top {
+				height: 200upx;
+				text {
+					font-size: 32upx;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+			.goods-right-bottom {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.price {
+					font-size: $font-lg;
+					color: $uni-color-primary;
+					line-height: 1;
+					&:before {
+						content: '￥';
+						font-size: 26upx;
+					}
+				}
+				.sale {
+					color: $font-color-light;
+					font-size: 28upx;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/paiMaiDetail.vue b/mallplusui-uniapp-app2/pagesA/product/paiMaiDetail.vue
new file mode 100644
index 0000000..e291d60
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/paiMaiDetail.vue
@@ -0,0 +1,726 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+            				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+            					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+            				</swiper-item>
+            			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ detailData.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price">{{ detailData.price }}</text>
+			</view>
+			<view class="bot-row">
+				<text>出价次数: {{buyCount}}</text>
+
+				<text>浏览量: {{ detailData.hit }}</text>
+			</view>
+		</view>
+            <view class="share-section" >
+								<view class="share-btn" v-if="(detailData.type == 2) && detailData.timeSecound">剩余：
+								<uni-countdown  :day="detailData.timeSecound.days" :hour="detailData.timeSecound.hour" :minute="detailData.timeSecound.mins" :second="detailData.timeSecound.sc">
+								</uni-countdown></view>
+								<view class="goods-salesvolume red-price" v-if="detailData.type == 3">已结束</view>
+								<view class="goods-salesvolume red-price" v-if="detailData.type == 1">即将开团</view>
+
+
+			</view>
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text>7天无理由退换货 ·</text>
+					<text>假一赔十 ·</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc |formatRichText"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(detailData)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group"><button type="primary" class=" action-btn no-border add-cart-btn" @click="jifenPay(detailData)">出价竞拍</button></view>
+		</view>
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+import uniCountdown from "@/components/uni-countdown/uni-countdown.vue"
+export default {
+	components: {
+		share,uniCountdown
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			paimaiLogList:[],
+			buyCount : 0,
+			favorite: true,
+			shareList: [],
+
+			desc: `
+					<div style="width:100%">
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i4/479184430/O1CN01nCpuLc1iaz4bcSN17_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd2.alicdn.com/imgextra/i2/479184430/O1CN01gwbN931iaz4TzqzmG_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i3/479184430/O1CN018wVjQh1iaz4aupv1A_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd4.alicdn.com/imgextra/i4/479184430/O1CN01tWg4Us1iaz4auqelt_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd1.alicdn.com/imgextra/i1/479184430/O1CN01Tnm1rU1iaz4aVKcwP_!!479184430.jpg_400x400.jpg" />
+					</div>
+				`,
+			skuList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.goods.paiMaiDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				this.favorite = data.favorite;
+				this.paimaiLogList = detailData.paimaiLogList;
+				if(this.paimaiLogList){
+				this.buyCount=this.paimaiLogList.length;
+				}
+
+				var subImages = detailData.albumPics;
+                this.small = subImages.split(',');
+				this.desc = detailData.content;
+
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+				this.detailData = detailData;
+
+				this.shareList = shareList;
+
+				uni.setNavigationBarTitle({
+					title: detailData.name
+				});
+			}
+		}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	filters: {
+	 /**
+				 * 处理富文本里的图片宽度自适应
+				 * 1.去掉img标签里的style、width、height属性
+				 * 2.img标签添加style属性：max-width:100%;height:auto
+				 * 3.修改所有style里的width属性为max-width:100%
+				 * 4.去掉<br/>标签
+				 * @param html
+				 * @returns {void|string|*}
+				 */
+				formatRichText (html) { //控制小程序中图片大小
+	        if (html) {
+	            let newContent= html.replace(/<img[^>]*>/gi,function(match,capture){
+	                match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+	                match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+	                match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+	                return match;
+	            });
+	            newContent = newContent.replace(/style="[^"]+"/gi,function(match,capture){
+	                match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+	                return match;
+	            });
+	            newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+	            newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+	            return newContent;
+	        } else {
+	            return '暂无商品详情'
+	        }
+				},
+	              formatCreateTime(time) {
+	                let date = new Date(time);
+	                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+	              },
+	            },
+	methods: {
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 4, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+
+		async jifenPay(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			let params = { goodsId: id, price: 1 };
+			data = await Api.apiCall('post', Api.goods.updatePaiMai, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/paiMaiList.vue b/mallplusui-uniapp-app2/pagesA/product/paiMaiList.vue
new file mode 100644
index 0000000..d9afddf
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/paiMaiList.vue
@@ -0,0 +1,406 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 {{ item.sale }}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+	mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		// this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		 loadCateList(fid, sid) {
+			let params = {};
+			let list =  Api.apiCall('get', Api.goods.typeList, params);
+			console.log(list);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId ,type:2};
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword ,type:2};
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword ,type:2};
+			} else {
+				params = { pageNum: this.pageNum ,type:2};
+			}
+
+			let list = await Api.apiCall('get', Api.goods.goodsList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/paiMaiDetail?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/product.vue b/mallplusui-uniapp-app2/pagesA/product/product.vue
new file mode 100644
index 0000000..5e46963
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/product.vue
@@ -0,0 +1,1283 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ goods.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price" v-if="goods.vipPrice && goods.vipPrice > 0">{{ (goods.price * goods.memberRate) / 10 }}</text>
+				<text class="price" v-else-if="!goods.vipPrice">{{ goods.price }}</text>
+				<text class="m-price" v-if="!goods.vipPrice">¥{{ goods.originalPrice }}</text>
+				<text class="m-price" v-else-if="goods.vipPrice && goods.vipPrice > 0">¥{{ goods.price }}</text>
+				<text class="price" v-if="goods.isFenxiao == 1 && goods.fenxiaoPrice > 0">佣金 ¥{{ goods.fenxiaoPrice }}</text>
+				<text class="coupon-tip" v-if="goods.memberRate && goods.memberRate != 10">会员折扣{{ goods.memberRate }}折</text>
+			</view>
+			<view class="bot-row">
+				<text>销量: {{ goods.sale }}</text>
+				<text>库存: {{ goods.stock }}</text>
+				<text>浏览量: {{ goods.hit }}</text>
+			</view>
+		</view>
+		<view class="share-section" @click="navToTabPageStore(goods.storeId)">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				铺
+			</view>
+			<text class="tit"></text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				进入店铺
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<!--分享-->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b" v-if="skuList && skuList.length > 0" @click="toggleSpec">
+				<text class="tit">规格</text>
+				<view class="con">
+					<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+				</view>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="c-row b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
+				<text class="tit">优惠券</text>
+				<text class="con t-r red">领取优惠券</text>
+				<text class="yticon icon-you"></text>
+			</view>
+
+			<view class="c-row b-b" v-if="serviceList && serviceList.length > 0">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text v-for="(item1, index1) in serviceList" :key="index1">{{ item1 }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 评价 -->
+		<view class="eva-section">
+			<view class="e-header">
+				<text class="tit">评价</text>
+				<text>({{ consultCount.all }})</text>
+				<text class="tit">好评</text>
+				<text>({{ consultCount.goods }})</text>
+
+				<text class="tit">一般</text>
+				<text>({{ consultCount.general }})</text>
+
+				<text class="tit">差评</text>
+				<text>({{ consultCount.bad }})</text>
+				<text class="tip" v-if="consultCount.persent != 200">好评率 {{ consultCount.persent }}%</text>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="eva-box" v-for="(item, index) in consultList" :key="item.id">
+				<image :src="item.pic" class="portrait" mode="aspectFill"></image>
+				<view class="right">
+					<text class="name">{{ item.memberName }}</text>
+					<text class="con">{{ item.consultContent }}</text>
+					<view class="bot">
+						<text class="attr">购买类型：{{ item.attr }}</text>
+						<text class="time">{{ item.consultAddtime }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc | formatRichText"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+			<navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-gouwuche"></text>
+				<text>购物车</text>
+			</navigator>
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(goods)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group">
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(goods)">立即购买</button>
+				<button type="primary" class=" action-btn no-border add-cart-btn" @click="addCart(goods)">加入购物车</button>
+			</view>
+		</view>
+
+		<view class="mask" :class="maskState === 0 ? 'none' : maskState === 1 ? 'show' : ''" @click="toggleMask">
+			<view class="mask-content" @click.stop.prevent="stopPrevent">
+				<view @click="obtainCoupon(item)" class="coupon-item" v-for="(item, index) in couponList" :key="index">
+					<view class="con">
+						<view class="left">
+							<text class="title">{{ item.name }}</text>
+							<text class="time">在{{ item.endTime }}前有效。 可领{{ item.perLimit }}张</text>
+						</view>
+						<view class="right">
+							<text class="price">{{ item.amount }}</text>
+							<text>满{{ item.minPoint }}可减{{ item.amount }}</text>
+						</view>
+						<view class="circle l"></view>
+						<view class="circle r"></view>
+					</view>
+					<text class="tips">{{ item.categoryTitle ? '限' + item.categoryTitle + '可用' : '全品类可用' }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 规格-模态层弹窗 -->
+		<view class="popup spec" :class="specClass" @touchmove.stop.prevent="stopPrevent" @click="toggleSpec">
+			<!-- 遮罩层 -->
+			<view class="mask"></view>
+			<view class="layer attr-content" @click.stop="stopPrevent">
+				<view class="a-t">
+					<image :src="sku.pic"></image>
+					<view class="right">
+						<text class="price">¥{{ (sku.price * goods.memberRate) / 10 }} 原价 ¥{{ sku.price }}</text>
+						<text class="stock">库存：{{ sku.stock }}件</text>
+						<view class="selected">
+							已选：
+							<text class="selected-text" v-for="(sItem, sIndex) in specSelected" :key="sIndex">{{ sItem.name }}</text>
+						</view>
+					</view>
+				</view>
+				<view v-for="(item, index) in specList" :key="index" class="attr-list">
+					<text>{{ item.name }}</text>
+					<view class="item-list">
+						<text
+							v-for="(childItem, childIndex) in specChildList"
+							v-if="childItem.pid === item.id"
+							:key="childIndex"
+							class="tit"
+							:class="{ selected: childItem.selected }"
+							@click="selectSpec(childIndex, childItem.pid)"
+						>
+							{{ childItem.name }}
+						</text>
+					</view>
+				</view>
+				<button class="btn" @click="toggleSpec">完成</button>
+			</view>
+		</view>
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+import { formatDate } from '@/common/date';
+
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+			maskState: 0, //优惠券面板显示状态
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			serviceList: [],
+			goods: [],
+			favorite: true,
+			shareList: [],
+			consultList: [],
+			couponList: [],
+			basicMarkingList: [],
+			basicGiftsList: [],
+			consultCount: {
+				all: 0,
+				bad: 0,
+				general: 0,
+				goods: 0
+			},
+			imgList: [
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+				}
+			],
+			desc: '',
+			skuList: [],
+			specList: [],
+			specChildList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.goods.goodsDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				let goods = detailData.goods;
+				this.goods = goods;
+				this.favorite = data.favorite;
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = goods.albumPics;
+				this.desc = goods.detailHtml;
+				this.small = subImages.split(',');
+				//await this.$api.json('detailData');
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+
+				var sers = goods.serviceIds;
+				if (sers && sers.indexOf('1') != -1) {
+					this.serviceList.push('无忧退货');
+				}
+				if (sers && sers.indexOf('2') != -1) {
+					this.serviceList.push('快速退款');
+				}
+				if (sers && sers.indexOf('3') != -1) {
+					this.serviceList.push('正品保证');
+				}
+				this.shareList = shareList;
+				this.specList = detailData.productAttributeValueList;
+				this.skuList = detailData.skuStockList;
+				if (this.specList) {
+					this.specList.forEach(item => {
+						let valuesA = item.value.split(',');
+						if (valuesA) {
+							for (let cItem of valuesA) {
+								let att = {};
+								att.pid = item.id;
+								att.name = cItem;
+								this.specChildList.push(att);
+							}
+						}
+					});
+				}
+
+				uni.setNavigationBarTitle({
+					title: goods.name
+				});
+			}
+			if (this.hasLogin) {
+				let params = { goodsId: ops.id, pic: this.goods.pic };
+				await Api.apiCall('post', Api.goods.addView, params);
+			}
+			let params1 = { goodsId: ops.id };
+			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+			this.consultList = consoltL.list;
+			this.consultCount = consoltL.count;
+
+			let params3 = {};
+			let couponList1 = await Api.apiCall('get', Api.index.couponList, params3);
+			this.couponList = couponList1;
+		}
+
+		//规格 默认选中第一条
+		if (this.specList) {
+			var specs = '';
+			this.specList.forEach(item => {
+				for (let cItem of this.specChildList) {
+					if (cItem.pid === item.id) {
+						this.$set(cItem, 'selected', true);
+						this.specSelected.push(cItem);
+						specs = cItem.name + ',' + specs;
+						break; //forEach不能使用break
+					}
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+				if (!this.sku.pic) {
+					this.sku.pic = this.goods.pic;
+				}
+				if (!this.sku.stock) {
+					this.sku.stock = 0;
+				}
+				this.goods.price = this.sku.price;
+			});
+		}
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	filters: {
+		/**
+		 * 处理富文本里的图片宽度自适应
+		 * 1.去掉img标签里的style、width、height属性
+		 * 2.img标签添加style属性：max-width:100%;height:auto
+		 * 3.修改所有style里的width属性为max-width:100%
+		 * 4.去掉<br/>标签
+		 * @param html
+		 * @returns {void|string|*}
+		 */
+		formatRichText(html) {
+			//控制小程序中图片大小
+			if (html) {
+				let newContent = html.replace(/<img[^>]*>/gi, function(match, capture) {
+					match = match.replace(/style="[^"]+"/gi, '').replace(/style='[^']+'/gi, '');
+					match = match.replace(/width="[^"]+"/gi, '').replace(/width='[^']+'/gi, '');
+					match = match.replace(/height="[^"]+"/gi, '').replace(/height='[^']+'/gi, '');
+					return match;
+				});
+				newContent = newContent.replace(/style="[^"]+"/gi, function(match, capture) {
+					match = match.replace(/width:[^;]+;/gi, 'max-width:100%;').replace(/width:[^;]+;/gi, 'max-width:100%;');
+					return match;
+				});
+				newContent = newContent.replace(/<br[^>]*\/>/gi, '');
+				newContent = newContent.replace(/\<img/gi, '<img style="max-width:100%;height:auto;display:inline-block;margin:10rpx auto;"');
+				return newContent;
+			} else {
+				return '暂无商品详情';
+			}
+		},
+		formatCreateTime(time) {
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	},
+	methods: {
+		navToTabPageStore(item) {
+			let id = item;
+			uni.navigateTo({
+				url: `../../pagesC/store/store?id=${id}`
+			});
+		},
+		toggleMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.maskState = 2;
+			setTimeout(() => {
+				this.maskState = state;
+			}, timer);
+		},
+		//领取优惠券
+		async obtainCoupon(index) {
+			if (!this.hasLogin) {
+				this.$api.msg('请先登录');
+			}
+			uni.showLoading({
+				title: '请稍后'
+			});
+
+			let params = { couponId: index.id };
+			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data);
+				this.toggleMask();
+			}
+			uni.hideLoading();
+		},
+		//规格弹窗开关
+		toggleSpec() {
+			if (this.specClass === 'show') {
+				this.specClass = 'hide';
+				setTimeout(() => {
+					this.specClass = 'none';
+				}, 250);
+			} else if (this.specClass === 'none') {
+				this.specClass = 'show';
+			}
+		},
+		//选择规格
+		selectSpec(index, pid) {
+			let list = this.specChildList;
+			list.forEach(item => {
+				if (item.pid === pid) {
+					this.$set(item, 'selected', false);
+				}
+			});
+
+			this.$set(list[index], 'selected', true);
+			//存储已选择
+			/**
+			 * 修复选择规格存储错误
+			 * 将这几行代码替换即可
+			 * 选择的规格存放在specSelected中
+			 */
+			var specs = '';
+			this.specSelected = [];
+			list.forEach(item => {
+				if (item.selected === true) {
+					this.specSelected.push(item);
+					specs = item.name + ',' + specs;
+				}
+			});
+			let valuesA = specs.substr(0, specs.length - 1).split(',');
+			this.sku = null;
+			this.skuList.forEach(item => {
+				if (valuesA.length == 1 && item.sp1 == valuesA[0]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 2 && item.sp2 == valuesA[0] && item.sp1 == valuesA[1]) {
+					this.sku = item;
+				}
+				if (valuesA.length == 3 && item.sp3 == valuesA[0] && item.sp2 == valuesA[1] && item.sp1 == valuesA[2]) {
+					this.sku = item;
+				}
+			});
+			if (!this.sku) {
+				uni.showToast({ title: '商品不存在！' });
+			}
+			if (!this.sku.pic) {
+				this.sku.pic = this.goods.pic;
+			}
+			if (!this.sku.stock) {
+				this.sku.stock = 0;
+			}
+
+			this.goods.price = this.sku.price;
+
+			console.log(this.sku);
+		},
+		//分享
+		share() {
+			var title = this.goods.name;
+			var imgUrl = this.small[0];
+			var href = 'http://www.yyundong.com:8088/h5/index.html#/pagesA/product/product?id=' + this.goods.id;
+			//var href = 'http://192.168.0.107:8084/#/pagesA/product/product?id=' + this.goods.id;
+			this.$refs.share.toggleMask(title, imgUrl, href);
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		async buy(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return;
+			}
+			let userInfo = uni.getStorageSync('userInfo');
+			if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
+				uni.showToast({ title: '不能购买自己店铺的商品！' });
+				return;
+			}
+			let data;
+			let id = item.id;
+			console.log(id);
+			if (this.sku && this.sku.id) {
+				console.log(this.sku);
+				console.log(this.sku.stock);
+				if (this.sku.stock < 1) {
+					uni.showToast({ title: '库存不够！' });
+					return;
+				}
+				let params = { goodsId: id, skuId: this.sku.id };
+				// data = await Api.apiCall('post', Api.order.addCart, params);
+				let dataJson = {};
+
+				dataJson.goodsId = this.goods.id;
+
+				dataJson.type = 1;
+				dataJson.skuId = this.sku.id;
+				let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
+
+				uni.navigateTo({
+					url: url
+				});
+			} else {
+				if (this.goods.stock < 1) {
+					uni.showToast({ title: '库存不够！' });
+					return;
+				}
+				let params = { goodsId: id };
+				//	data = await Api.apiCall('post', Api.order.addCart, params);
+				let dataJson = {};
+
+				dataJson.goodsId = this.goods.id;
+
+				dataJson.type = 1;
+
+				let url = '/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson);
+
+				uni.navigateTo({
+					url: url
+				});
+			}
+		},
+		async addCart(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+			let userInfo = uni.getStorageSync('userInfo');
+			console.log(userInfo);
+			console.log(this.goods.storeId);
+			if (userInfo && userInfo.storeId && userInfo.storeId == this.goods.storeId) {
+				uni.showToast({ title: '不能购买自己店铺的商品！' });
+				return;
+			}
+			let id = item.id;
+			let data;
+
+			if (this.sku && this.sku.id) {
+				if (this.sku.stock < 1) {
+					uni.showToast({ title: '库存不够！' });
+					return;
+				}
+				let params = { goodsId: id, skuId: this.sku.id };
+				data = await Api.apiCall('post', Api.order.addCart, params);
+			} else {
+				if (this.goods.stock < 1) {
+					uni.showToast({ title: '库存不够！' });
+					return;
+				}
+				let params = { goodsId: id };
+				data = await Api.apiCall('post', Api.order.addCart, params);
+			}
+			console.log("data=========:"+data)
+			if (data) {
+				this.$api.msg('添加购物车成功!');
+			} else {
+				this.$api.msg('加入购物车错误');
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	width: 100%;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+
+/* 优惠券面板 */
+.mask {
+	display: flex;
+	align-items: flex-end;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 9995;
+	transition: 0.3s;
+
+	.mask-content {
+		width: 100%;
+		min-height: 30vh;
+		max-height: 70vh;
+		background: #f3f3f3;
+		transform: translateY(100%);
+		transition: 0.3s;
+		overflow-y: scroll;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.mask-content {
+			transform: translateY(0);
+		}
+	}
+}
+
+/* 优惠券列表 */
+.coupon-item {
+	display: flex;
+	flex-direction: column;
+	margin: 20upx 24upx;
+	background: #fff;
+	.con {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 120upx;
+		padding: 0 30upx;
+		&:after {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			content: '';
+			width: 100%;
+			height: 0;
+			border-bottom: 1px dashed #f3f3f3;
+			transform: scaleY(50%);
+		}
+	}
+	.left {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		flex: 1;
+		overflow: hidden;
+		height: 100upx;
+	}
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		margin-bottom: 10upx;
+	}
+	.time {
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 26upx;
+		color: $font-color-base;
+		height: 100upx;
+	}
+	.price {
+		font-size: 44upx;
+		color: $base-color;
+		&:before {
+			content: '￥';
+			font-size: 34upx;
+		}
+	}
+	.tips {
+		font-size: 24upx;
+		color: $font-color-light;
+		line-height: 60upx;
+		padding-left: 30upx;
+	}
+	.circle {
+		position: absolute;
+		left: -6upx;
+		bottom: -10upx;
+		z-index: 10;
+		width: 20upx;
+		height: 20upx;
+		background: #f3f3f3;
+		border-radius: 100px;
+		&.r {
+			left: auto;
+			right: -6upx;
+		}
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 220upx;
+		position: relative;
+		display: flex;
+		&:after {
+			padding: 10 30upx;
+			content: '';
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.name {
+		font-size: 30upx;
+		color: $font-color-base;
+		margin-left: 24upx;
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 100upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/secskillDetail.vue b/mallplusui-uniapp-app2/pagesA/product/secskillDetail.vue
new file mode 100644
index 0000000..29d7d7c
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/secskillDetail.vue
@@ -0,0 +1,1030 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in small" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ goods.name }}</text>
+			<view class="price-box">
+				<text class="price-tip">¥</text>
+				<text class="price">{{ skillDetail.flashPromotionPrice }}</text>
+				<text class="m-price">¥{{ goods.price }}</text>
+
+			</view>
+			<view class="bot-row">
+				<text>销量: {{ goods.sale }}</text>
+				<text>库存: {{ skillDetail.flashPromotionCount }}</text>
+				<text>浏览量: {{ goods.hit }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+
+			<view class="c-row b-b" v-if="couponList.length > 0" @click="toggleMask('show')">
+				<text class="tit">优惠券</text>
+				<text class="con t-r red">领取优惠券</text>
+				<text class="yticon icon-you"></text>
+			</view>
+
+
+			<view class="c-row b-b">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text>7天无理由退换货 ·</text>
+					<text>假一赔十 ·</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 评价 -->
+		<view class="eva-section">
+			<view class="e-header">
+				<text class="tit">评价</text>
+				<text>({{ consultCount.all }})</text>
+				<text class="tit">好评</text>
+				<text>({{ consultCount.goods }})</text>
+
+				<text class="tit">一般</text>
+				<text>({{ consultCount.general }})</text>
+
+				<text class="tit">差评</text>
+				<text>({{ consultCount.bad }})</text>
+				<text class="tip" v-if="consultCount.persent != 200">好评率 {{ consultCount.persent }}%</text>
+				<text class="yticon icon-you"></text>
+			</view>
+			<view class="eva-box" v-for="(item, index) in consultList" :key="item.id">
+				<image :src="item.pic" class="portrait" mode="aspectFill"></image>
+				<view class="right">
+					<text class="name">{{ item.memberName }}</text>
+					<text class="con">{{ item.consultContent }}</text>
+					<view class="bot">
+						<text class="attr">购买类型：{{ item.attr }}</text>
+						<text class="time">{{ item.consultAddtime | formatCreateTime}}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+			<navigator url="/pages/cart/cart" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-gouwuche"></text>
+				<text>购物车</text>
+			</navigator>
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(goods)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+
+			<view class="action-btn-group">
+				<button type="primary" class=" action-btn no-border buy-now-btn" @click="buy(goods)">立即购买</button>
+
+			</view>
+		</view>
+
+<view class="mask" :class="maskState===0 ? 'none' : maskState===1 ? 'show' : ''" @click="toggleMask">
+			<view class="mask-content" @click.stop.prevent="stopPrevent">
+				<view @click="obtainCoupon(item)" class="coupon-item" v-for="(item,index) in couponList" :key="index">
+					<view class="con">
+						<view class="left">
+							<text class="title">{{item.name}}</text>
+							<text  class="time">在{{item.endTime | formatCreateTime}}前有效。 可领{{item.perLimit}}张</text>
+
+						</view>
+						<view class="right">
+							<text class="price">{{item.amount}}</text>
+							<text>满{{item.minPoint }}可减{{item.amount }}</text>
+						</view>
+						<view class="circle l"></view>
+						<view class="circle r"></view>
+					</view>
+					<text class="tips">{{item.categoryTitle?'限' + item.categoryTitle + '可用': '全品类可用'}}</text>
+				</view>
+			</view>
+		</view>
+
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+		maskState: 0, //优惠券面板显示状态
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			skillDetail:[],
+			goods: [],
+			favorite: true,
+			shareList: [],
+			consultList: [],
+			couponList:[],
+			basicMarkingList:[],
+			basicGiftsList:[],
+			consultCount: {
+				all: 0,
+				bad: 0,
+				general: 0,
+				goods: 0
+			},
+			imgList: [
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/0/O1CN01IiyFQI1UGShoFKt1O_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd3.alicdn.com/imgextra/i3/TB1RPFPPFXXXXcNXpXXXXXXXXXX_!!0-item_pic.jpg_400x400.jpg'
+				},
+				{
+					src: 'https://gd2.alicdn.com/imgextra/i2/38832490/O1CN01IYq7gu1UGShvbEFnd_!!38832490.jpg_400x400.jpg'
+				}
+			],
+			desc: `
+
+				`,
+			skuList: [],
+			specList: [],
+			specChildList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.goods.secskillDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data.goods;
+				let goods = detailData.goods;
+				this.goods = goods;
+				this.favorite = data.favorite;
+				this.skillDetail = data.skillDetail;
+				this.typeGoodsList = detailData.typeGoodsList;
+				var subImages = goods.albumPics;
+				this.desc = goods.detailHtml;
+				this.small = subImages.split(',');
+				//await this.$api.json('detailData');
+				let shareList = await this.$api.json('shareList');
+				this.loaded = true;
+
+				this.shareList = shareList;
+
+
+				uni.setNavigationBarTitle({
+					title: goods.name
+				});
+			}
+			if (this.hasLogin) {
+				let params = { goodsId: ops.id };
+				await Api.apiCall('post', Api.goods.addView, params);
+			}
+			let params1 = { goodsId: ops.id };
+			let consoltL = await Api.apiCall('get', Api.goods.consultList, params1);
+			this.consultList = consoltL.list;
+			this.consultCount = consoltL.count;
+
+			let params3 = { };
+            let couponList1 = await Api.apiCall('get', Api.index.couponList, params3);
+            this.couponList = couponList1;
+
+
+		}
+
+
+
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+	toggleMask(type) {
+    				let timer = type === 'show' ? 10 : 300;
+    				let state = type === 'show' ? 1 : 0;
+    				this.maskState = 2;
+    				setTimeout(() => {
+    					this.maskState = state;
+    				}, timer)
+    			},
+    			//领取优惠券
+    		async	obtainCoupon(index) {
+    			if (!this.hasLogin) {
+    			this.$api.msg('请先登录');
+    			}
+    			             uni.showLoading({
+                        				title: '请稍后'
+                        			});
+
+                        			let params = { couponId: index.id };
+                        			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+                                        console.log(data);
+                        			if (data) {
+                        				this.$api.msg(data);
+                        				this.toggleMask()
+                        			}
+                        			uni.hideLoading();
+
+
+    			},
+
+
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		async buy(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			}
+
+			if(this.goods.stock<1 && this.skillDetail.flashPromotionCount<1){
+                        			   uni.showToast({title:"库存不够！"});
+                        			   return;
+                        			}
+
+ let dataJson ={};
+
+                                                        			dataJson.type=6;
+                                                        			dataJson.skillId=this.skillDetail.id;
+                                                        			let url='/pages/order/createOrder?dataJson=' + JSON.stringify(dataJson)
+
+                                            				uni.navigateTo({
+                                            					url: url
+                                            				});
+
+
+		},
+		async addCart(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			if(this.goods.stock<1){
+                        			   uni.showToast({title:"库存不足",icon: "none"});
+                        			   return;
+                        			}
+				let params = { goodsId: id,orderType:5 };
+				data = await Api.apiCall('post', Api.order.addCart, params);
+
+
+			if (data) {
+				this.$api.msg('添加购物车成功!');
+			} else {
+				this.$api.msg('加入购物车错误');
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+
+/* 优惠券面板 */
+.mask {
+	display: flex;
+	align-items: flex-end;
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 9995;
+	transition: 0.3s;
+
+	.mask-content {
+		width: 100%;
+		min-height: 30vh;
+		max-height: 70vh;
+		background: #f3f3f3;
+		transform: translateY(100%);
+		transition: 0.3s;
+		overflow-y: scroll;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.mask-content {
+			transform: translateY(0);
+		}
+	}
+}
+
+/* 优惠券列表 */
+.coupon-item {
+	display: flex;
+	flex-direction: column;
+	margin: 20upx 24upx;
+	background: #fff;
+	.con {
+		display: flex;
+		align-items: center;
+		position: relative;
+		height: 120upx;
+		padding: 0 30upx;
+		&:after {
+			position: absolute;
+			left: 0;
+			bottom: 0;
+			content: '';
+			width: 100%;
+			height: 0;
+			border-bottom: 1px dashed #f3f3f3;
+			transform: scaleY(50%);
+		}
+	}
+	.left {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		flex: 1;
+		overflow: hidden;
+		height: 100upx;
+	}
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		margin-bottom: 10upx;
+	}
+	.time {
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.right {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		font-size: 26upx;
+		color: $font-color-base;
+		height: 100upx;
+	}
+	.price {
+		font-size: 44upx;
+		color: $base-color;
+		&:before {
+			content: '￥';
+			font-size: 34upx;
+		}
+	}
+	.tips {
+		font-size: 24upx;
+		color: $font-color-light;
+		line-height: 60upx;
+		padding-left: 30upx;
+	}
+	.circle {
+		position: absolute;
+		left: -6upx;
+		bottom: -10upx;
+		z-index: 10;
+		width: 20upx;
+		height: 20upx;
+		background: #f3f3f3;
+		border-radius: 100px;
+		&.r {
+			left: auto;
+			right: -6upx;
+		}
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 220upx;
+		position: relative;
+		display: flex;
+		&:after {
+			padding: 10 30upx;
+			content: '';
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.name {
+		font-size: 30upx;
+		color: $font-color-base;
+		margin-left: 24upx;
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 100upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesA/product/tag.vue b/mallplusui-uniapp-app2/pagesA/product/tag.vue
new file mode 100644
index 0000000..7b1a853
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/tag.vue
@@ -0,0 +1,205 @@
+<template>
+	<view>
+
+		<uni-section title="商品标签" type="line"></uni-section>
+		<view class="example-body">
+			<view class="tag-view" v-for="(item, index) in goodsTagList" :key="index" @click="navToList(item.id)">
+				<uni-tag :text="item.name" type="success"  />
+			</view>
+
+		</view>
+
+		<uni-section title="会员标签" type="line"></uni-section>
+		<view class="example-body" >
+			<view class="tag-view" v-for="(item, index) in memberTagList" :key="index" @click="navToList(item.id)">
+				<uni-tag :circle="true" :text="item.name" type="warning" />
+			</view>
+		</view>
+
+		<uni-section title="内容标签" type="line"></uni-section>
+		<view class="example-body">
+			<view class="tag-view" v-for="(item, index) in cmsTagList" :key="index" @click="navToList(item.id)">
+				<uni-tag :circle="true" :inverted="inverted" :text="item.name" type="primary" @click="setInverted" />
+			</view>
+		</view>
+
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import uniTag from '@/components/uni-tag/uni-tag.vue';
+	import uniSection from '@/components/uni-section/uni-section.vue'
+	export default {
+		components: {
+			uniTag,
+			uniSection
+		},
+		data() {
+			return {
+				type: 'default',
+				goodsTagList:[],
+				memberTagList:[],
+				cmsTagList:[],
+				inverted: false
+			};
+		},
+		onLoad(options) {
+        		this.loadGoodsData();
+        		this.loadMemberData();
+        		this.loadCmsData();
+        	},
+		methods: {
+		    async loadGoodsData() {
+        			let params = {type:2,status:1};
+        			let list = await Api.apiCall('get', Api.member.memberTagList, params);
+        			this.goodsTagList = list.records;
+        		},
+        		async loadMemberData() {
+                        		let params = {type:1,status:1};
+                        			let list = await Api.apiCall('get', Api.member.memberTagList, params);
+                        			this.memberTagList = list.records;
+                        		},
+                        		async loadCmsData() {
+                                        		let params = {type:3,status:1};
+                                        			let list = await Api.apiCall('get', Api.member.memberTagList, params);
+                                        			this.cmsTagList = list.records;
+                                        		},
+			setType() {
+				let types = ['default', 'primary', 'success', 'warning', 'error'];
+				let index = types.indexOf(this.type);
+				types.splice(index, 1);
+				let randomIndex = Math.floor(Math.random() * 4);
+				this.type = types[randomIndex];
+			},
+			setInverted() {
+				this.inverted = !this.inverted;
+			},
+			navToList(tagId) {
+            			uni.navigateTo({
+            				url: `../../pagesA/product/tagGoodslist?tagId=${tagId}`
+            			});
+            		}
+		}
+	};
+</script>
+
+<style>
+	/* 头条小程序组件内不能引入字体 */
+	/* #ifdef MP-TOUTIAO */
+	@font-face {
+		font-family: uniicons;
+		font-weight: normal;
+		font-style: normal;
+
+	}
+
+	/* #endif */
+
+	/* #ifndef APP-NVUE */
+	page {
+		display: flex;
+		flex-direction: column;
+		box-sizing: border-box;
+		background-color: #efeff4;
+		min-height: 100%;
+		height: auto;
+	}
+
+	view {
+		font-size: 14px;
+		line-height: inherit;
+	}
+
+	.example {
+		padding: 0 15px 15px;
+	}
+
+	.example-info {
+		padding: 15px;
+		color: #3b4144;
+		background: #ffffff;
+	}
+
+	.example-body {
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: center;
+		padding: 0;
+		font-size: 14px;
+		background-color: #ffffff;
+	}
+
+	/* #endif */
+	.example {
+		padding: 0 15px;
+	}
+
+	.example-info {
+		/* #ifndef APP-NVUE */
+		display: block;
+		/* #endif */
+		padding: 15px;
+		color: #3b4144;
+		background-color: #ffffff;
+		font-size: 14px;
+		line-height: 20px;
+	}
+
+	.example-info-text {
+		font-size: 14px;
+		line-height: 20px;
+		color: #3b4144;
+	}
+
+
+	.example-body {
+		flex-direction: column;
+		padding: 15px;
+		background-color: #ffffff;
+	}
+
+	.word-btn-white {
+		font-size: 18px;
+		color: #FFFFFF;
+	}
+
+	.word-btn {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		border-radius: 6px;
+		height: 48px;
+		margin: 15px;
+		background-color: #007AFF;
+	}
+
+	.word-btn--hover {
+		background-color: #4ca2ff;
+	}
+
+
+	.example-body {
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: flex-start;
+		flex-wrap: wrap;
+		padding: 20rpx;
+	}
+
+	.tag-view {
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		margin: 10rpx 15rpx;
+		justify-content: center;
+	}
+</style>
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/pagesA/product/tagGoodslist.vue b/mallplusui-uniapp-app2/pagesA/product/tagGoodslist.vue
new file mode 100644
index 0000000..1ef8f7e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesA/product/tagGoodslist.vue
@@ -0,0 +1,483 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+			<view class="nav-item" :class="{ current: filterIndex === 1 }" @click="tabClick(1)">销量优先</view>
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+            <!-- <text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text> -->
+			<text class="cate-item yticon icon-fenlei1" v-if="current == 0" @click="toShowMode('false')"></text>
+			<text class="cate-item cgicon icon-vertical" v-else-if="current == 1" @click="toShowMode('true')"></text>
+		</view>
+		<!-- 表格图片显示 -->
+		<view class="goods-list" v-show="current === 0">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box" v-if="item.isFenxiao == 1">
+					<text class="price">{{ item.price }}</text>
+					<text>佣金 ¥{{ item.fenxiaoPrice }}</text>
+				</view>
+				<view class="price-box" v-if="item.isVip == 1">
+					<text class="price">会员价{{ item.vipPrice }}</text>
+					<text>商品价 ¥{{ item.price }}</text>
+				</view>
+				<view class="price-box" v-else-if="item.isFenxiao == 0 && item.isVip == 0">
+					<text class="price">{{ item.price }}</text>
+					<text>已售 {{ item.sale }}</text>
+				</view>
+			</view>
+		</view>
+		<!-- 列表显示 -->
+		<view class="goods-list-vertical" v-show="current === 1">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item-vertical" @click="navToDetailPage(item)">
+				<view class="image-wrapper-vertical"><image :src="item.pic" mode="aspectFill"></image></view>
+				<view class="goods-list-right">
+					<view class="goods-right-top">
+						<text class="">{{ item.name }}</text>
+					</view>
+					<view class="goods-right-bottom">
+						<text class="price">{{ item.price }}</text>
+						<text class="sale">已售 {{ item.sale }}</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+    <view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			productAttributeCategoryId: 0,
+			pageNum: 1,
+			isFenxiao: 0,
+			isVip: 0,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: [],
+
+			current: 0 // 1为列表模式
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.cateId = options.tagId;
+	//	this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		toShowMode(mode) {
+			if (this.current == 0) {
+				this.current = 1;
+			} else {
+				this.current = 0;
+			}
+		},
+//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeList, params);
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			let params = { tags: this.cateId };
+
+			let list = await Api.apiCall('get', Api.goods.tagGoodsList, params);
+			let goodsList = list;
+
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = goodsList;
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+@font-face {
+	font-family: 'cgicon';
+	font-weight: normal;
+	font-style: normal;
+	src: url('https://at.alicdn.com/t/font_1475801_65jj7c5ss9k.ttf') format('truetype');
+}
+
+.cgicon {
+	font-family: 'cgicon' !important;
+	font-size: 16px;
+	font-style: normal;
+	-webkit-font-smoothing: antialiased;
+	-moz-osx-font-smoothing: grayscale;
+}
+
+.icon-vertical:before {
+	content: '\e61b';
+}
+
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+.goods-list-vertical {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0upx 20upx;
+	background: #fff;
+	.goods-item-vertical {
+		display: flex;
+		flex-direction: row;
+		height: 280upx;
+		align-items: center;
+		justify-content: center;
+		border-bottom: 1upx solid #eeeeee;
+		.image-wrapper-vertical {
+			width: 240upx;
+			height: 240upx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			margin-right: 10upx;
+			image {
+				width: 240upx;
+				height: 240upx;
+			}
+		}
+		.goods-list-right {
+			width: 470upx;
+			.goods-right-top {
+				height: 200upx;
+				text {
+					font-size: 32upx;
+					text-overflow: -o-ellipsis-lastline;
+					overflow: hidden;
+					text-overflow: ellipsis;
+					display: -webkit-box;
+					-webkit-line-clamp: 2;
+					-webkit-box-orient: vertical;
+				}
+			}
+			.goods-right-bottom {
+				display: flex;
+				align-items: center;
+				justify-content: space-between;
+				.price {
+					font-size: $font-lg;
+					color: $uni-color-primary;
+					line-height: 1;
+					&:before {
+						content: '￥';
+						font-size: 26upx;
+					}
+				}
+				.sale {
+					color: $font-color-light;
+					font-size: 28upx;
+				}
+			}
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/caldar.vue b/mallplusui-uniapp-app2/pagesC/seller/caldar.vue
new file mode 100644
index 0000000..beb9ffe
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/caldar.vue
@@ -0,0 +1,114 @@
+<template>
+	<view class="content">
+		<reserve-date
+			@changeDay='changeDay'
+			@changeMonth='changeMonth'
+			:startDate='startDate'
+			:price='price'
+			:isNowDate='isNowDate'
+			:disableBefore='disableBefore'
+			:endDate='endDate'
+			:singleElection='singleElection'
+			:date='date'
+		/>
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import reserveDate from '@/components/reserve-date/reserve-date.vue'
+	import { formatDate } from '@/common/date';
+
+	export default {
+		data() {
+			return {
+				date: '2019-08-07',
+				price: {
+					type: true,
+					data: []
+				},
+				isNowDate: true,
+				disableBefore: false ,
+				endDate: '',
+				startDate: '',
+				singleElection: false
+			}
+		},
+		onLoad(options) {
+			this.date = this.dateFormat(new Date())
+		},
+		async onShow() {
+			this.date = this.dateFormat(new Date())
+		},
+		mounted() {
+			this.date = this.dateFormat(new Date())
+			console.log(this.date);
+			this.changeMonth(['', '', 31])
+		},
+		methods: {
+			// 日期改变
+			changeDay(date) {
+				console.log(date)
+			},
+			// 月改变
+			async changeMonth(data) {
+				console.log(data)
+				if (!this.price.type) return false
+				uni.showLoading({
+					title: '加载中',
+					mask: true
+				})
+				let params = {date:data.join('-')};
+				let orderResp = await Api.apiAdminCall('get', Api.admin.orderDayStatic, params,true);
+				console.log(orderResp)
+				let price = []
+				price.push(orderResp.a1);
+				price.push(orderResp.a2);
+				price.push(orderResp.a3);
+				price.push(orderResp.a4);
+				price.push(orderResp.a5);
+				price.push(orderResp.a6);
+				price.push(orderResp.a7);
+				price.push(orderResp.a8);
+				price.push(orderResp.a9);
+				price.push(orderResp.a10);
+				price.push(orderResp.a11);
+				price.push(orderResp.a12);
+				price.push(orderResp.a13);
+				price.push(orderResp.a14);
+				price.push(orderResp.a15);
+				price.push(orderResp.a16);
+				price.push(orderResp.a17);
+				price.push(orderResp.a18);
+				price.push(orderResp.a19);
+				price.push(orderResp.a20);
+				price.push(orderResp.a21);
+				price.push(orderResp.a22);
+				price.push(orderResp.a23);
+				price.push(orderResp.a24);
+				price.push(orderResp.a25);
+				price.push(orderResp.a26);
+				price.push(orderResp.a27);
+				price.push(orderResp.a28);
+				price.push(orderResp.a29);
+				price.push(orderResp.a30);
+				price.push(orderResp.a31);
+
+				this.price.data = price
+
+			},
+			dateFormat(time) {
+				console.log(time);
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd');
+			}
+		},
+		components: {
+			reserveDate
+		}
+	}
+</script>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/dayStatisc.vue b/mallplusui-uniapp-app2/pagesC/seller/dayStatisc.vue
new file mode 100644
index 0000000..0f83336
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/dayStatisc.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="content">
+		<view class="scroll-top" >
+			<time-filter @chooseTime='chooseTime' :type="type"></time-filter>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+                <view class="left">订单数量</view>
+				<view class="right">{{homedata.orderCount}}个</view>
+			</view>
+			<view class="tjBody flexRow">
+                <circle-percent titleOne="当日订单" :titleTwo="homedata.nowOrderCount" bg="#fbad4c"  :percent="(homedata.nowOrderCount*100/homedata.orderCount) | numFilter"></circle-percent>
+				<circle-percent titleOne="当日总额" :titleTwo="homedata.nowOrderPay" bg="#87d7a5"  :percent="(homedata.nowOrderCount*100/homedata.orderCount) | numFilter"></circle-percent>
+			</view>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+				<view class="left">会员统计</view>
+				<view class="right">{{homedata.memberCount}}人</view>
+			</view>
+			<view class="tjBody flexRow">
+				<circle-percent titleOne="当日新增会员" :titleTwo="homedata.mallCount+homedata.femallount" bg="#87d7a5"  :percent="((homedata.mallCount+homedata.femallount)/homedata.memberCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="男会员" :titleTwo="homedata.mallCount" bg="#00adc7"  :percent="(homedata.mallCount/homedata.memberCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="女会员" :titleTwo="homedata.femallount" bg="#FF6A6A"  :percent="(homedata.femallount/homedata.memberCount)| numFilter"></circle-percent>
+
+			</view>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+				<view class="left">商品统计</view>
+				<view class="right">{{homedata.goodsCount}}个</view>
+			</view>
+			<view class="tjBody flexRow">
+				<circle-percent titleOne="新增商品" :titleTwo="homedata.onCount+homedata.offCount" bg="#87d7a5"  :percent="((homedata.onCount+homedata.offCount)/homedata.goodsCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="下架商品" :titleTwo="homedata.offCount" bg="#00adc7"  :percent="(homedata.offCount/homedata.goodsCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="缺库存商品" :titleTwo="homedata.noStock" bg="#FF6A6A"  :percent="(homedata.noStock/homedata.goodsCount)| numFilter"></circle-percent>
+
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+    import timeFilter from '@/components/time-filter/time-filter'
+    import circlePercent from '@/components/circle-percent/circle-percent'
+	import { formatDate } from '@/common/date';
+	export default {
+		data() {
+			return {
+				date: '2019-08-07',
+				homedata:null,
+				singleElection: false,
+				type: 'day'
+			}
+		},
+        components: {
+          timeFilter,
+          circlePercent
+        },
+		onLoad() {
+		},
+		async onShow() {
+			this.date = this.dateFormat(new Date());
+			 let params = {date:this.date,type:1};
+			 let resp = await Api.apiAdminCall('get', Api.admin.dayStatic, params,true);
+			 console.log(resp)
+			 this.homedata = resp;
+		},
+        computed: {
+        },
+		methods: {
+			async	chooseTime(item, index) {
+
+					//console.log(this.addDate(item.value))
+					let params = {date:this.addDate(item.value),type:1};
+					let resp = await Api.apiAdminCall('get', Api.admin.dayStatic, params,true);
+					console.log(resp)
+					this.homedata = resp;
+			},
+			addDate(days) {
+				var d = new Date();
+				d.setDate(d.getDate() + days);
+				var m = d.getMonth() + 1;
+				if(m < 10){
+					m='0'+m
+				}
+				var day = d.getDate()
+				if(day < 10){
+					day='0'+day
+				}
+				return d.getFullYear() + '-' + m + '-' + day;
+			},
+			getMonth(month) {
+				var time = new Date();
+				time.setMonth(time.getMonth() + month);//设置month月后的时间
+				var y = time.getFullYear();
+				var m = time.getMonth() + 1;//获取当前月份
+				var d = time.getDate();
+				if(m<10){
+					m = "0"+m
+				}
+				return y + "-" + m ;
+			},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd');
+		}
+
+		}
+		,filters: {
+			numFilter (value) {
+				let realVal = ''
+				if (value) {
+					// 截取当前数据到小数点后两位
+					realVal = parseFloat(value).toFixed(2)
+				} else {
+					realVal = '0'
+				}
+				return realVal
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		background-color: $uni-bg-color;
+	}
+
+	.part{
+		background: $uni-bg-color;
+		font-size: $uni-font-size-lg;
+		color: $uni-text-color;
+		margin-bottom: 20upx;
+	}
+
+	.padding {
+		padding: 30upx 40upx;
+	}
+
+	.flexRow{
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+    .tj{
+		margin-bottom: 0;
+		padding-bottom: 0;
+		.tjTitle{
+			display: flex;
+			flex-direction: row;
+			border-bottom: 1upx solid #ebedf0;
+			padding: 40upx 0;
+            .left{
+				flex: 1;
+				text-align: left;
+				font-size: $uni-font-size-base;
+				font-weight: bold;
+			}
+			.right{
+				flex: 1;
+				text-align: right;
+				color: $uni-text-color-grey;
+			}
+		}
+		.tjBody{
+			justify-content: flex-start;
+			border-bottom: 1upx solid #f5f5f5;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/evaluate.vue b/mallplusui-uniapp-app2/pagesC/seller/evaluate.vue
new file mode 100644
index 0000000..a2fa628
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/evaluate.vue
@@ -0,0 +1,302 @@
+<template>
+	<view class="content">
+		<view class="content-top">
+			<view class='img-list'>
+				<view class='img-list-item'
+				v-for="item in info.orderItemList"
+				:key="item.id"
+				>
+					<view class="img-list-item-gray">
+						<image class='img-list-item-l small-img' :src='item.productPic' mode='aspectFill'></image>
+						<view class='img-list-item-r small-right'
+						@click="goodsDetail(item.productId)"
+						>
+							<view class='little-right-t'>
+								<view class='goods-name list-goods-name'>{{ item.productName }}</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="evaluate-num">
+						<view class="evaluate-num-t">商品评分</view>
+						<view class="evaluate-num-b">
+							<uni-rate
+							size="18"
+							:id="item.id"
+							:value="score[item.id]"
+							@change="changeScore"
+							></uni-rate>
+						</view>
+					</view>
+
+					<view class="evaluate-content">
+						<view class="evaluate-c-t">
+							<textarea v-model="textarea[item.id]" placeholder="宝贝满足你的期待吗? 说说你的使用心得" />
+						</view>
+						<view class="evaluate-c-b">
+							<view class="goods-img-item"
+							v-if="images[item.id].length"
+							v-for="(img, key) in images[item.id]"
+							:key="key"
+							>
+								<image class="del" src="../../static/image/del.png" mode="" @click="removeImg(item.id, key)"></image>
+								<image class="" :src="img.url" mode="" @click="clickImg(img.url)"></image>
+							</view>
+							<view class="upload-img" v-show="isupload[item.id]">
+								<image class="icon" src="../../static/image/camera.png" mode="" @click="uploadImg(item.id)"></image>
+								<view class="">上传照片</view>
+							</view>
+						</view>
+					</view>
+
+				</view>
+			</view>
+
+		</view>
+
+		<view class="button-bottom">
+			<button class="btn btn-square btn-b" hover-class="btn-hover" @click="toEvaluate" :disabled='submitStatus' :loading='submitStatus'>提交评论</button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+import uniRate from "@/components/uni-rate/uni-rate.vue"
+import { goods } from '@/config/mixins.js'
+export default {
+	mixins: [goods],
+    components: {uniRate},
+	data () {
+		return {
+			orderId: 0,
+			info: {}, // 订单详情
+			images: [],
+            score: [], // 商品评价
+            textarea: [], // 商品评价信息
+            isupload: [], // 启/禁用 图片上传按钮
+			rate: 5,
+			submitStatus: false
+		}
+	},
+	onLoad (options) {
+		this.orderId = options.order_id
+		this.orderId
+		? this.orderInfo()
+		: this.$common.errorToShow('获取失败', () => {
+			uni.navigateBack({
+				delta: 1
+			})
+		})
+	},
+	computed: {
+		// 获取vuex中状态
+		maxUploadImg () {
+			return 1
+		}
+	},
+	methods: {
+		// 获取订单详情
+		async orderInfo () {
+			let params = { id: this.orderId };
+			this.orderInfo = await Api.apiAdminCall('get', Api.admin.orderDetail, params);
+			let images = []
+			let textarea = []
+			let upload = []
+			let score = []
+
+			this.orderInfo.orderItemList.forEach (item => {
+				if (item.type==1){
+					images[item.id] = []
+					textarea[item.id] = ''
+					upload[item.id] = true
+					score[item.id] = 5
+				}
+
+			})
+
+			this.info = this.orderInfo
+
+			this.images = images
+			this.textarea = textarea
+			this.score = score
+			this.isupload = upload
+		},
+		// 上传图片
+		uploadImg (key) {
+			this.$otherApi.uploadFiles(res => {
+				if (res.code == 200) {
+					let img = {
+                        url: res.data,
+                        id: res.data
+                    }
+                    this.images[key].push(img)
+					this.$common.successToShow(res.msg)
+				} else {
+					this.$common.errorToShow(res.msg)
+				}
+			})
+		},
+
+		// 删除图片
+		removeImg (id, key) {
+			this.images[id].splice(key, 1)
+		},
+		// 图片点击放大
+		clickImg (img) {
+			// 预览图片
+			uni.previewImage({
+				urls: img.split()
+			});
+		},
+		// 改变评分
+		changeScore (e) {
+			this.score[e.id] = e.value
+		},
+		// 提交评价
+		async toEvaluate () {
+			this.submitStatus = true;
+			let items = {}
+            var myArray=new Array()
+			this.images.forEach((item, key) => {
+				let itemmm = {
+				    goodsId:key,
+					images: item.url,
+                    score: this.score[key],
+                    textarea: this.textarea[key]
+				}
+				myArray.push(itemmm);
+			})
+			let params = {
+				orderId: this.orderId,
+				items: JSON.stringify(myArray)
+			}
+				uni.showLoading({
+					title: '请稍后'
+				});
+
+				let data = await Api.apiAdminCall('post', Api.admin.orderevaluate, params);
+				console.log(data);
+				if (data) {
+					// 更改订单列表页的订单状态
+					let pages = getCurrentPages(); // 当前页
+					let beforePage = pages[pages.length - 2]; // 上个页面
+
+					if (beforePage !== undefined && beforePage.route === 'pages/order/order') {
+						// #ifdef MP-WEIXIN
+						beforePage.$vm.isReload = true
+						// #endif
+
+						// #ifdef H5
+						beforePage.isReload = true
+						// #endif
+
+						// #ifdef MP-ALIPAY
+						beforePage.rootVM.isReload = true
+						// #endif
+					}
+					this.submitStatus = false;
+					uni.navigateBack({
+						delta: 1
+					})
+				}
+				uni.hideLoading();
+		}
+	},
+	watch: {
+		images: {
+			handler () {
+				this.images.forEach((item, key) => {
+					this.isupload[key] = item.length > this.maxUploadImg ? false : true
+				})
+			},
+			deep: true
+		}
+	}
+}
+</script>
+
+<style>
+.img-list-item{
+	padding: 30upx 20upx;
+}
+.img-list-item-gray{
+	background-color: #F7F7F7;
+	overflow: hidden;
+	padding: 18upx 20upx;
+}
+.small-right{
+	width: 520upx;
+}
+.evaluate-content{
+	background-color: #fff;
+	padding: 20upx 0upx;
+}
+.evaluate-c-t{
+	width: 100%;
+	height: 240upx;
+}
+.evaluate-c-t textarea{
+	width: 100%;
+	height: 100%;
+	font-size: 26upx;
+	padding: 10upx;
+}
+.evaluate-c-b{
+	overflow: hidden;
+}
+.upload-img{
+	width: 146upx;
+	height: 146upx;
+	margin: 14upx;
+	text-align: center;
+	color: #999999;
+	font-size: 22upx;
+	border: 2upx solid #E1E1E1;
+	/* #ifdef MP-ALIPAY */
+	border-top: 8upx solid #E1E1E1;
+	/* #endif */
+	border-radius: 4upx;
+	display: inline-block;
+	float: left;
+	padding: 24upx 0;
+}
+.goods-img-item{
+	width: 174upx;
+	height: 174upx;
+	padding: 14upx;
+	float: left;
+	position: relative;
+}
+.goods-img-item:nth-child(4n){
+	margin-right: 0;
+}
+.goods-img-item image{
+	width: 100%;
+	height: 100%;
+}
+.del{
+	width: 30upx !important;
+	height: 30upx !important;
+	position: absolute;
+	right: 0;
+	top: 0;
+	z-index: 999;
+}
+.evaluate-num{
+	padding: 20upx 26upx;
+	background-color: #fff;
+	margin-top: 20upx;
+}
+.evaluate-num-t{
+	color: #333;
+	font-size: 28upx;
+	margin-bottom: 20upx;
+}
+.button-bottom .btn{
+	width: 100%;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/goods.vue b/mallplusui-uniapp-app2/pagesC/seller/goods.vue
new file mode 100644
index 0000000..a1cf6ac
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/goods.vue
@@ -0,0 +1,649 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" >
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item" >
+						<view class="i-top b-b">
+							<text class="time" @click="navToDetailPage(item)">{{ item.createTime  }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}</text>
+							<text v-if="status == 3" class="del-btn yticon icon-iconfontshanchu1" @click="cancelOrder(index)">删除</text>
+						</view>
+						<view  class="goods-box-single"  >
+							<img class="goods-img" :src="item.pic" mode="aspectFill"></img>
+							<view class="right" @click="navToDetailPage(item)">
+								<text class="title clamp">{{ item.name }}</text>
+								<text class="attr-box"> </text>
+								<text class="price">{{ item.price }}</text>
+							</view>
+						</view>
+
+						<view class="action-box b-t">
+						<button v-if="item.isFenxiao == 1" class="action-btn" @click="updateFenxiaoStatus(item)">解除分销</button>
+                           <button v-if="item.isFenxiao == 0" class="action-btn recom" @click="updateFenxiaoStatus(item)">设为分销</button>
+
+                           <button v-if="item.isVip == 1" class="action-btn" @click="updateVipStatus(item)">解除会员商品</button>
+                          <button v-if="item.isVip == 0" class="action-btn recom" @click="updateVipStatus(item)">设为会员商品</button>
+						<button v-if="item.recommandStatus == 1" class="action-btn" @click="updateReComStatus(item)">不推荐</button>
+                        <button v-if="item.recommandStatus == 0" class="action-btn recom" @click="updateReComStatus(item)">设为推荐</button>
+
+							<button v-if="item.publishStatus == 1" class="action-btn" @click="updatePublishStatus(item)">下架</button>
+							<button v-if="item.publishStatus == 0" class="action-btn recom" @click="updatePublishStatus(item)">上架</button>
+						</view>
+					</view>
+					<uni-load-more :status="loadingType"></uni-load-more>
+				</scroll-view>
+
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			pageNum: 1,
+			orderList:[],
+			status:0,
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			loadingType: 'more', //加载更多状态
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 1,
+					text: '出售中',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+                					status: 2,
+                					text: '已售完',
+                					loadingType: 'more',
+                					orderList: []
+                				},
+				{
+					status: 3,
+					text: '仓库中',
+					loadingType: 'more',
+					orderList: []
+				},
+
+
+                				{
+                					status: 4,
+                					text: '已删除',
+                					loadingType: 'more',
+                					orderList: []
+                				}
+			]
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		this.tabCurrentIndex = +options.status;
+		this.pageNum=1;
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		console.log('1='+this.pageNum)
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum =  1;
+		console.log('2='+this.pageNum)
+		this.loadData();
+	},
+    computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/product/product?id=${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(type = 'add', loading) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let status = navItem.status;
+			this.status=status;
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+
+				let params = { pageNum: this.pageNum, status: status };
+				let data = await Api.apiAdminCall('get', Api.admin.goodsList, params);
+				let orderList1 = data.records;
+				let orderList = orderList1.filter(item => {
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.orderStateExp(status));
+					item.createTime = this.dateFormat(item.createTime);
+					//演示数据所以自己进行状态筛选
+					if (status === 0) {
+						//0为全部订单
+						return item;
+					}
+					return item;
+				});
+
+				if (type === 'refresh') {
+					this.orderList = [];
+				}
+
+				this.orderList = this.orderList.concat(orderList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.orderList.length > data.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+				this.pageNum = this.pageNum + 1;
+				orderList.forEach(item => {
+					navItem.orderList.push(item);
+				});
+			}
+		},
+
+		//swiper 切换
+		changeTab(e) {
+		    console.log(e.target.current)
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('refresh');
+		},
+		//顶部tab点击
+		tabClick(index) {
+		console.log(index)
+			this.tabCurrentIndex = index;
+		},
+
+		        // 推荐
+        		async updateReComStatus(item) {
+        			let publishStatus =0;
+        			if (item.recommandStatus==1){
+        				publishStatus=0;
+        			}else {
+        				publishStatus=1;
+        			}
+        			let params = { id: item.id,status:publishStatus,type:1 };
+        			let data = await Api.apiAdminCall('post', Api.admin.updateReComStatus, params);
+
+        			if (data) {
+        				this.$api.msg('设置成功');
+        			}
+        		},
+        		// 推荐
+                        		async updateReComStatus(item) {
+                        			let publishStatus =0;
+                        			if (item.recommandStatus==1){
+                        				publishStatus=0;
+                        			}else {
+                        				publishStatus=1;
+                        			}
+                        			let params = { id: item.id,status:publishStatus,type:1 };
+                        			let data = await Api.apiAdminCall('post', Api.admin.updateReComStatus, params);
+
+                        			if (data) {
+                        				this.$api.msg('设置成功');
+                        			}
+                        		},
+                        		// 推荐
+                                        		async updateFenxiaoStatus(item) {
+                                        			let publishStatus =0;
+                                        			if (item.isFenxiao==1){
+                                        				publishStatus=0;
+                                        			}else {
+                                        				publishStatus=1;
+                                        			}
+                                        			let params = { id: item.id,status:publishStatus,type:5 };
+                                        			let data = await Api.apiAdminCall('post', Api.admin.updateReComStatus, params);
+
+                                        			if (data) {
+                                        				this.$api.msg('设置成功');
+                                        			}
+                                        		},
+                                        		// 推荐
+                                                        		async updateVipStatus(item) {
+                                                        			let publishStatus =0;
+                                                        			if (item.isVip==1){
+                                                        				publishStatus=0;
+                                                        			}else {
+                                                        				publishStatus=1;
+                                                        			}
+                                                        			let params = { id: item.id,status:publishStatus,type:6 };
+                                                        			let data = await Api.apiAdminCall('post', Api.admin.updateReComStatus, params);
+
+                                                        			if (data) {
+                                                        				this.$api.msg('设置成功');
+                                                        			}
+                                                        		},
+
+		// 上下架
+		async updatePublishStatus(item) {
+			let publishStatus =0;
+			if (item.publishStatus==1){
+				publishStatus=0;
+			}else {
+				publishStatus=1;
+			}
+			let params = { id: item.id,status:publishStatus ,type:1};
+			let data = await Api.apiAdminCall('post', Api.admin.updateReComStatus, params);
+			if (data) {
+				this.$api.msg(data);
+					this.pageNum=1;
+				if (item.publishStatus==1){
+					this.tabCurrentIndex = 3;
+				}else {
+					this.tabCurrentIndex = 1;
+				}
+			}
+		},
+
+
+
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 1) {
+				stateTipColor = '#909399';
+				stateTip = '出售中';
+			}if (value === 2) {
+				stateTip = '已下架';
+			} else if (value === 3) {
+				stateTip = '已售尽';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/index.vue b/mallplusui-uniapp-app2/pagesC/seller/index.vue
new file mode 100644
index 0000000..19cb01b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/index.vue
@@ -0,0 +1,947 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<view class="mp-search-box" @click="search()"><input class="ser-input" type="text" value="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+		<view class="carousel-section">
+			<!-- 标题栏和状态栏占位符 -->
+			<view class="titleNview-placing"></view>
+			<!-- 背景色区域 -->
+			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+			<swiper class="carousel" circular @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item"
+					@click="navToDetailPageL(item.url)">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper>
+			<!-- 自定义swiper指示器 -->
+			<view class="swiper-dots">
+				<text class="num">{{ swiperCurrent + 1 }}</text>
+				<text class="sign">/</text>
+				<text class="num">{{ swiperLength }}</text>
+			</view>
+		</view>
+		<!-- 分类 -->
+		<view class="cate-section">
+			<view class="cate-item" @click="navToTabPage('../../pagesC/seller/store')">
+				<image src="/static/temp/c3.png"></image>
+				<text>店铺</text>
+			</view>
+			<view class="cate-item" @click="navToTabPage('../../pagesC/seller/goods?status=0')">
+				<image src="/static/temp/c5.png"></image>
+				<text>商品</text>
+			</view>
+			<view class="cate-item" @click="navToTabPage('../../pagesC/seller/order?status=0')">
+				<image src="/static/temp/c6.png"></image>
+				<text>订单</text>
+			</view>
+			<view class="cate-item" @click="navToTabPage('../../pagesC/seller/member')">
+				<image src="/static/temp/c7.png"></image>
+				<text>会员</text>
+			</view>
+			<view class="cate-item" @click="navToTabPage('../../pagesC/seller/monthStatisc')">
+				<image src="/static/temp/c8.png"></image>
+				<text>营销</text>
+			</view>
+		</view>
+
+		<view>
+			<uni-grid :column="4" :hor="35" :ver="-45">
+				<uni-grid-item marker="badge" :text="orderData.nowOrderCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/stack')">今日订单</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderData.nowOrderCount+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">今日总额</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderData.yesOrderCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">昨日订单</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderData.yesOrderPay+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=0')">昨日总额</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderStatusCount.status0+''" type="error">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=12')">待付款</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderStatusCount.status1+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=2')">待发货</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderStatusCount.status5+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=13')">申请退款</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="orderStatusCount.status14+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/order?status=15')">已关闭</text>
+				</uni-grid-item>
+			</uni-grid>
+
+		</view>
+		<view class="ad-1">
+			<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
+				mode="scaleToFill"></image>
+		</view>
+
+		<view>
+			<uni-grid :column="3" :hor="35" :ver="-45">
+				<uni-grid-item marker="badge" :text="userData.nowCount+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.yesUserCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">昨日新增会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.qiUserCount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">当月新增会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.mallCount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">男会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.femallount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">女会员</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="userData.allCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">所有会员</text>
+				</uni-grid-item>
+
+			</uni-grid>
+		</view>
+		<view class="ad-1">
+			<image src="/static/temp/ad1.jpg" @click="navToDetailPageL('https://s.click.taobao.com/0T59c1w')"
+				mode="scaleToFill"></image>
+		</view>
+
+		<view>
+			<uni-grid :column="3" :hor="35" :ver="-45">
+				<uni-grid-item marker="badge" :text="goodsData.onCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=1')">在售商品</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.offCount+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=3')">仓库中</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.noStock+''" type="warning">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=2')">已售馨</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.nowCount+''" type="primary">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/dayStatisc')">今日新增商品</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.yesCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=0')">昨日新增商品</text>
+				</uni-grid-item>
+				<uni-grid-item marker="badge" :text="goodsData.allCount+''" type="success">
+					<text class="text" @click="navToTabPage('../../pagesC/seller/goods?status=0')">所有商品</text>
+				</uni-grid-item>
+
+			</uni-grid>
+		</view>
+		<!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import Api from '@/common/api';
+	import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+	import {
+		formatDate
+	} from '@/common/date';
+	import uniGrid from "@/components/uni-grid/uni-grid.vue"
+	import uniGridItem from "@/components/uni-grid-item/uni-grid-item.vue"
+	export default {
+		components: {
+			mallplusCopyright,
+			coupon,
+			uniGrid,
+			uniGridItem
+		},
+		data() {
+			return {
+				keyword: '',
+				titleNViewBackground: '',
+				swiperCurrent: 0,
+				swiperLength: 0,
+				carouselList: [],
+				orderData: '',
+				goodsData: '',
+				userData: '',
+				orderStatusCount: ''
+			};
+		},
+		onShow: function() {
+			this.loadData();
+		},
+		onLoad(ops) {
+			this.loadData();
+		},
+
+		methods: {
+			/**
+			 * 请求静态数据只是为了代码不那么乱
+			 * 分次请求未作整合
+			 */
+			async loadData() {
+
+				let adminToken = uni.getStorageSync('adminToken') || '';
+				console.log('adminToken:' + adminToken)
+				if (!adminToken) {
+					uni.navigateTo({
+						url: '../../pagesC/seller/login'
+					});
+					return
+				}
+				let params = {};
+				let orderResp = await Api.apiAdminCall('get', Api.admin.orderStatic, params, true);
+				this.orderData = orderResp;
+				this.orderStatusCount = orderResp.orderStatusCount
+
+				let goodsResp = await Api.apiAdminCall('get', Api.admin.goodsStatic, params);
+				this.goodsData = goodsResp;
+
+				let userResp = await Api.apiAdminCall('get', Api.admin.userStatic, params);
+				this.userData = userResp;
+
+				let data = await Api.apiAdminCall('get', Api.admin.bannerList, params);
+				this.carouselList = data.records || [];
+				this.swiperLength = this.carouselList.length;
+				this.titleNViewBackground = 'rgb(203, 87, 60)';
+
+
+
+			},
+			dateFormat(time) {
+				if (time == null || time === '') {
+					return 'N/A';
+				}
+				let date = new Date(time);
+				return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+			},
+			//轮播图切换修改背景色
+			swiperChange(e) {
+				const index = e.detail.current;
+				this.swiperCurrent = index;
+				this.titleNViewBackground = this.carouselList[index].background;
+			},
+			navToTabPage(url) {
+				uni.navigateTo({
+					url: url
+				});
+			},
+			//详情页
+			navToDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `/pages/product/product?id=${id}`
+				});
+			},
+			//详情页
+			navToDetailPageL(url) {
+				window.location.href = url;
+			},
+			//详情页
+			navToCouponDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+				uni.navigateTo({
+					url: `/pages/product/product?id=${id}`
+				});
+			},
+			async acceptCoupon(item) {
+				uni.showLoading({
+					title: '请稍后'
+				});
+
+				let params = {
+					couponId: item.id
+				};
+				let data = await Api.apiAdminCall('post', Api.admin.acceptCoupon, params);
+				console.log(data);
+				if (data) {
+					this.$api.msg(data);
+				}
+				uni.hideLoading();
+
+			},
+			navToSkillDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.id;
+
+				uni.navigateTo({
+					url: `/pages/product/secskillDetail?id=${id}`
+				});
+			},
+
+
+			navToGroupDetailPage(item) {
+				//测试数据没有写id，用title代替
+				let id = item.goodsId;
+				let groupId = item.groupId;
+				uni.navigateTo({
+					url: `/pages/product/groupProduct?id=${id}&&groupId=&{groupId}`
+				});
+			},
+			navToList() {
+				uni.navigateTo({
+					url: `/pages/product/list`
+				});
+			}
+		},
+
+		search() {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+
+		// 标题栏input搜索框点击
+		onNavigationBarSearchInputClicked: async function(e) {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+		//点击导航栏 buttons 时触发
+		onNavigationBarButtonTap(e) {
+			const index = e.index;
+			if (index === 0) {
+				this.$api.msg('点击了扫描');
+			} else if (index === 1) {
+				// #ifdef APP-PLUS
+				const pages = getCurrentPages();
+				const page = pages[pages.length - 1];
+				const currentWebview = page.$getAppWebview();
+				currentWebview.hideTitleNViewButtonRedDot({
+					index
+				});
+				// #endif
+				uni.navigateTo({
+					url: '../../pagesU/notice/notice'
+				});
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	.mp-search-box {
+		position: absolute;
+		left: 0;
+		top: 30upx;
+		z-index: 9999;
+		width: 100%;
+		padding: 0 80upx;
+
+		.ser-input {
+			flex: 1;
+			height: 56upx;
+			line-height: 56upx;
+			text-align: center;
+			font-size: 28upx;
+			color: $font-color-base;
+			border-radius: 20px;
+			background: rgba(255, 255, 255, 0.6);
+		}
+	}
+
+	page {
+		.cate-section {
+			position: relative;
+			z-index: 5;
+			border-radius: 16upx 16upx 0 0;
+			margin-top: -20upx;
+		}
+
+		.carousel-section {
+			padding: 0;
+
+			.titleNview-placing {
+				padding-top: 0;
+				height: 0;
+			}
+
+			.carousel {
+				.carousel-item {
+					padding: 0;
+				}
+			}
+
+			.swiper-dots {
+				left: 45upx;
+				bottom: 40upx;
+			}
+		}
+	}
+
+	page {
+		background: #f5f5f5;
+	}
+
+	.m-t {
+		margin-top: 16upx;
+	}
+
+	/* 头部 轮播图 */
+	.carousel-section {
+		position: relative;
+		padding-top: 10px;
+
+		.titleNview-placing {
+			height: var(--status-bar-height);
+			padding-top: 44px;
+			box-sizing: content-box;
+		}
+
+		.titleNview-background {
+			position: absolute;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 426upx;
+			transition: 0.4s;
+		}
+	}
+
+	.carousel {
+		width: 100%;
+		height: 350upx;
+
+		.carousel-item {
+			width: 100%;
+			height: 100%;
+			padding: 0 28upx;
+			overflow: hidden;
+		}
+
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 10upx;
+		}
+	}
+
+	.swiper-dots {
+		display: flex;
+		position: absolute;
+		left: 60upx;
+		bottom: 15upx;
+		width: 72upx;
+		height: 36upx;
+		background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+		background-size: 100% 100%;
+
+		.num {
+			width: 36upx;
+			height: 36upx;
+			border-radius: 50px;
+			font-size: 24upx;
+			color: #fff;
+			text-align: center;
+			line-height: 36upx;
+		}
+
+		.sign {
+			position: absolute;
+			top: 0;
+			left: 50%;
+			line-height: 36upx;
+			font-size: 12upx;
+			color: #fff;
+			transform: translateX(-50%);
+		}
+	}
+
+	/* 分类 */
+	.cate-section {
+		display: flex;
+		justify-content: space-around;
+		align-items: center;
+		flex-wrap: wrap;
+		padding: 30upx 22upx;
+		background: #fff;
+
+		.cate-item {
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+		}
+
+		/* 原图标颜色太深,不想改图了,所以加了透明度 */
+		image {
+			width: 88upx;
+			height: 88upx;
+			margin-bottom: 14upx;
+			border-radius: 50%;
+			opacity: 0.7;
+			box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+		}
+	}
+
+	.ad-1 {
+		width: 100%;
+		height: 210upx;
+		padding: 10upx 0;
+		background: #fff;
+
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+
+	/* 秒杀专区 */
+	.seckill-section {
+		padding: 4upx 30upx 24upx;
+		background: #fff;
+
+		.s-header {
+			display: flex;
+			align-items: center;
+			height: 92upx;
+			line-height: 1;
+
+			.s-img {
+				width: 140upx;
+				height: 30upx;
+			}
+
+			.tip {
+				font-size: $font-base;
+				color: $font-color-light;
+				margin: 0 20upx 0 40upx;
+			}
+
+			.timer {
+				display: inline-block;
+				width: 40upx;
+				height: 36upx;
+				text-align: center;
+				line-height: 36upx;
+				margin-right: 14upx;
+				font-size: $font-sm + 2upx;
+				color: #fff;
+				border-radius: 2px;
+				background: rgba(0, 0, 0, 0.8);
+			}
+
+			.icon-you {
+				font-size: $font-lg;
+				color: $font-color-light;
+				flex: 1;
+				text-align: right;
+			}
+		}
+
+		.floor-list {
+			white-space: nowrap;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 150upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 150upx;
+				height: 150upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+	}
+
+	.f-header {
+		display: flex;
+		align-items: center;
+		height: 140upx;
+		padding: 6upx 30upx 8upx;
+		background: #fff;
+
+		image {
+			flex-shrink: 0;
+			width: 80upx;
+			height: 80upx;
+			margin-right: 20upx;
+		}
+
+		.tit-box {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+		}
+
+		.tit {
+			font-size: $font-lg + 2upx;
+			color: #font-color-dark;
+			line-height: 1.3;
+		}
+
+		.tit2 {
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+
+		.icon-you {
+			font-size: $font-lg + 2upx;
+			color: $font-color-light;
+		}
+	}
+
+	/* 团购楼层 */
+	.group-section {
+		background: #fff;
+
+		.g-swiper {
+			height: 650upx;
+			padding-bottom: 30upx;
+		}
+
+		.g-swiper-item {
+			width: 100%;
+			padding: 0 30upx;
+			display: flex;
+		}
+
+		image {
+			width: 100%;
+			height: 460upx;
+			border-radius: 4px;
+		}
+
+		.g-item {
+			display: flex;
+			flex-direction: column;
+			overflow: hidden;
+		}
+
+		.left {
+			flex: 1.2;
+			margin-right: 24upx;
+
+			.t-box {
+				padding-top: 20upx;
+			}
+		}
+
+		.right {
+			flex: 0.8;
+			flex-direction: column-reverse;
+
+			.t-box {
+				padding-bottom: 20upx;
+			}
+		}
+
+		.t-box {
+			height: 160upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1.6;
+		}
+
+		.price {
+			color: $uni-color-primary;
+		}
+
+		.m-price {
+			font-size: $font-sm + 2upx;
+			text-decoration: line-through;
+			color: $font-color-light;
+			margin-left: 8upx;
+		}
+
+		.pro-box {
+			display: flex;
+			align-items: center;
+			margin-top: 10upx;
+			font-size: $font-sm;
+			color: $font-base;
+			padding-right: 10upx;
+		}
+
+		.progress-box {
+			flex: 1;
+			border-radius: 10px;
+			overflow: hidden;
+			margin-right: 8upx;
+		}
+	}
+
+	/* 分类推荐楼层 */
+	.hot-floor {
+		width: 100%;
+		overflow: hidden;
+		margin-bottom: 20upx;
+
+		.floor-img-box {
+			width: 100%;
+			height: 320upx;
+			position: relative;
+
+			&:after {
+				content: '';
+				position: absolute;
+				left: 0;
+				top: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+			}
+		}
+
+		.floor-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.floor-list {
+			white-space: nowrap;
+			padding: 20upx;
+			padding-right: 50upx;
+			border-radius: 6upx;
+			margin-top: -140upx;
+			margin-left: 30upx;
+			background: #fff;
+			box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+			position: relative;
+			z-index: 1;
+		}
+
+		.scoll-wrapper {
+			display: flex;
+			align-items: flex-start;
+		}
+
+		.floor-item {
+			width: 180upx;
+			margin-right: 20upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-dark;
+			line-height: 1.8;
+
+			image {
+				width: 180upx;
+				height: 180upx;
+				border-radius: 6upx;
+			}
+
+			.price {
+				color: $uni-color-primary;
+			}
+		}
+
+		.more {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			flex-shrink: 0;
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+			background: #f3f3f3;
+			font-size: $font-base;
+			color: $font-color-light;
+
+			text:first-child {
+				margin-bottom: 4upx;
+			}
+		}
+	}
+
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+
+		&:after {
+			border-radius: 100px;
+		}
+
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+
+
+	/* 猜你喜欢 */
+	.guess-section {
+		display: flex;
+		flex-wrap: wrap;
+		padding: 0 30upx;
+		background: #fff;
+
+		.guess-item {
+			display: flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+
+			&:nth-child(2n + 1) {
+				margin-right: 4%;
+			}
+		}
+
+		.image-wrapper {
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+
+			image {
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+
+		.title {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+
+		.price {
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+		}
+
+		.coupon_box {
+			width: 100%;
+			height: auto;
+			display: table;
+			padding: 6upx 26upx 26upx 26upx;
+		}
+
+		.other_type {
+			width: 100%;
+			height: 90upx;
+			padding-top: 50upx;
+
+			.text {
+				width: 100%;
+				border-top: 1px solid #eeeeee;
+				display: block;
+				text-align: center;
+				position: relative;
+			}
+
+			.text span {
+				width: 180upx;
+				height: 40upx;
+				line-height: 40upx;
+				color: #999999;
+				display: block;
+				background: #ffffff;
+				position: absolute;
+				left: 50%;
+				top: 50%;
+				margin-left: -90upx;
+				margin-top: -20upx;
+				font-size: $font-base;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/login.vue b/mallplusui-uniapp-app2/pagesC/seller/login.vue
new file mode 100644
index 0000000..66287f7
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/login.vue
@@ -0,0 +1,239 @@
+<template>
+	<view class="container">
+		<view class="left-bottom-sign"></view>
+
+		<view class="right-top-sign"></view>
+		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
+		<view class="wrapper">
+			<view class="left-top-sign">LOGIN</view>
+			<view class="welcome">欢迎回来！</view>
+			<view class="input-content">
+				<view class="input-item">
+					<text class="tit">手机号码</text>
+					<input type="text" v-model="username" placeholder="请输入手机号码" />
+				</view>
+				<view class="input-item">
+					<text class="tit">密码</text>
+					<input type="password" placeholder="请输入密码" v-model="password" @confirm="toLogin" />
+				</view>
+			</view>
+			<button class="confirm-btn" @click="toLogin" :disabled="logining">登录</button>
+			<view class="forget-section">忘记密码?</view>
+		</view>
+		<view class="register-section">
+			还没有账号?
+			<text @click="toRegist">马上注册</text>
+		</view>
+    <!-- <mallplusCopyright></mallplusCopyright> -->
+	</view>
+</template>
+
+<script>
+import { mapMutations, mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import store from '@/store/index';
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			username: 'admin',
+			password: '123456',
+			logining: false
+		};
+	},
+	onLoad() {},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		...mapMutations(['login']),
+		inputChange(e) {
+			const key = e.currentTarget.dataset.key;
+			this[key] = e.detail.value;
+		},
+		navBack() {
+			uni.switchTab({
+				url: '/pages/index/user'
+			});
+		},
+		toRegist() {
+			uni.navigateTo({
+				url: '/pages/public/reg'
+			});
+		},
+
+
+		async toLogin() {
+
+			try {
+				if (this.username == '') {
+					throw '请填写手机号';
+				}
+
+				if (this.password == '') {
+					throw '请填写密码';
+				}
+			} catch (err) {
+				this.$api.msg(err);
+				return;
+			}
+			this.logining = true;
+			let params = { username: this.username, password: this.password };
+			let data = await Api.apiAdminCall('post', Api.admin.login, params);
+			this.logining = false;
+			if (data) {
+
+				console.log(data);
+
+				this.$db.set('adminToken', data.tokenHead+data.token);
+				uni.navigateTo({
+					url: '../../pagesC/seller/index'
+				});
+			}
+		},
+
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: #fff;
+}
+.container {
+	padding-top: 115px;
+	position: relative;
+	width: 100vw;
+	height: 100vh;
+	overflow: hidden;
+	background: #fff;
+}
+.wrapper {
+	position: relative;
+	z-index: 90;
+	background: #fff;
+	padding-bottom: 40upx;
+}
+.back-btn {
+	position: absolute;
+	left: 40upx;
+	z-index: 9999;
+	padding-top: var(--status-bar-height);
+	top: 40upx;
+	font-size: 40upx;
+	color: $font-color-dark;
+}
+.left-top-sign {
+	font-size: 120upx;
+	color: $page-color-base;
+	position: relative;
+	left: -16upx;
+}
+.right-top-sign {
+	position: absolute;
+	top: 80upx;
+	right: -30upx;
+	z-index: 95;
+	&:before,
+	&:after {
+		display: block;
+		content: '';
+		width: 400upx;
+		height: 80upx;
+		background: #b4f3e2;
+	}
+	&:before {
+		transform: rotate(50deg);
+		border-radius: 0 50px 0 0;
+	}
+	&:after {
+		position: absolute;
+		right: -198upx;
+		top: 0;
+		transform: rotate(-50deg);
+		border-radius: 50px 0 0 0;
+		/* background: pink; */
+	}
+}
+.left-bottom-sign {
+	position: absolute;
+	left: -270upx;
+	bottom: -320upx;
+	border: 100upx solid #d0d1fd;
+	border-radius: 50%;
+	padding: 180upx;
+}
+.welcome {
+	position: relative;
+	left: 50upx;
+	top: -90upx;
+	font-size: 46upx;
+	color: #555;
+	text-shadow: 1px 0px 1px rgba(0, 0, 0, 0.3);
+}
+.input-content {
+	padding: 0 60upx;
+}
+.input-item {
+	display: flex;
+	flex-direction: column;
+	align-items: flex-start;
+	justify-content: center;
+	padding: 0 30upx;
+	background: $page-color-light;
+	height: 120upx;
+	border-radius: 4px;
+	margin-bottom: 50upx;
+	&:last-child {
+		margin-bottom: 0;
+	}
+	.tit {
+		height: 50upx;
+		line-height: 56upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-base;
+	}
+	input {
+		height: 60upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		width: 100%;
+	}
+}
+
+.confirm-btn {
+	width: 630upx;
+	height: 76upx;
+	line-height: 76upx;
+	border-radius: 50px;
+	margin-top: 70upx;
+	background: $uni-color-primary;
+	color: #fff;
+	font-size: $font-lg;
+	&:after {
+		border-radius: 100px;
+	}
+}
+.forget-section {
+	font-size: $font-sm + 2upx;
+	color: $font-color-spec;
+	text-align: center;
+	margin-top: 40upx;
+}
+.register-section {
+	position: absolute;
+	left: 0;
+	bottom: 50upx;
+	width: 100%;
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	text-align: center;
+	text {
+		color: $font-color-spec;
+		margin-left: 10upx;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/member.vue b/mallplusui-uniapp-app2/pagesC/seller/member.vue
new file mode 100644
index 0000000..a00ace6
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/member.vue
@@ -0,0 +1,567 @@
+<template>
+	<view class="content">
+					<!-- 空白页 -->
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in orderList" :key="index" class="order-item" >
+						<view class="i-top b-b">
+							<text class="time" @click="navToDetailPage(item)">{{ item.createTime  }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}--</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.username }}</text>
+						</view>
+						<view  class="goods-box-single"  >
+							<img class="goods-img" :src="item.icon" mode="aspectFill"></img>
+							<view class="right" @click="navToDetailPage(item)">
+								<text class="title clamp">余额{{ item.blance }}</text>
+								<text class="attr-box"> 积分{{ item.integration }}</text>
+							</view>
+						</view>
+
+
+						<view class="action-box b-t">
+
+							<button v-if="status == 1" class="action-btn" @click="updatePublishStatus(item)">下架</button>
+							<button v-if="status == 2" class="action-btn recom" @click="updatePublishStatus(item)">上架</button>
+
+						</view>
+					</view>
+					<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			pageNum: 1,
+			orderList:[],
+			status:0,
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			loadingType: 'more', //加载更多状态
+
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+
+
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		console.log('1='+this.pageNum)
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum =  1;
+		console.log('2='+this.pageNum)
+		this.loadData();
+	},
+    computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/product/product?id=${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(type = 'add', loading) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+
+
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+
+				let params = { pageNum: this.pageNum };
+				let data = await Api.apiAdminCall('get', Api.admin.memberList, params);
+				let orderList1 = data.records;
+				let orderList = orderList1.filter(item => {
+					//添加不同状态下订单的表现形式
+
+					item.createTime = this.dateFormat(item.createTime);
+
+					return item;
+				});
+
+				if (type === 'refresh') {
+					this.orderList = [];
+				}
+
+				this.orderList = this.orderList.concat(orderList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.orderList.length > data.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+
+
+			}
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('refresh');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		// 上下架
+		async updatePublishStatus(item) {
+
+			let publishStatus =0;
+			if (item.publishStatus==1){
+				publishStatus=0;
+			}else {
+				publishStatus=1;
+			}
+			let params = { id: item.id,status:publishStatus };
+			let data = await Api.apiAdminCall('post', Api.admin.updatePublishStatus, params);
+
+			if (data) {
+				this.$api.msg(data);
+				if (item.publishStatus==1){
+					this.tabCurrentIndex = 2;
+				}else {
+					this.tabCurrentIndex = 1;
+				}
+
+			}
+		},
+
+		//取消订单
+		async cancelOrder(item) {
+			let params = { orderId: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.closeOrder, params);
+
+			if (data) {
+				this.$api.msg(data);
+				this.tabCurrentIndex = 4;
+			}
+
+		},
+//订单确认收货
+		async confimDelivery(item) {
+
+			let params = { id: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.confimDelivery, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data);
+				this.tabCurrentIndex = 4;
+			}
+
+		},
+		//订单申请退款
+		async applyRefund(item) {
+
+			let params = { id: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.applyRefund, params);
+			if (data) {
+				console.log(data);
+				this.$api.msg(data);
+			}
+			this.tabCurrentIndex = 5;
+		},
+// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo(
+					'/pages/order/evaluate?order_id=' + orderId
+			)
+		},
+
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 1) {
+				stateTipColor = '#909399';
+				stateTip = '出售中';
+			}if (value === 2) {
+				stateTip = '已下架';
+			} else if (value === 3) {
+				stateTip = '已售尽';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/monthStatisc.vue b/mallplusui-uniapp-app2/pagesC/seller/monthStatisc.vue
new file mode 100644
index 0000000..3873e3d
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/monthStatisc.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="content">
+		<view class="scroll-top" >
+			<time-filter @chooseTime='chooseTime' :type="type"></time-filter>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+				<view class="left">订单数量</view>
+				<view class="right">{{homedata.orderCount}}个</view>
+			</view>
+			<view class="tjBody flexRow">
+				<circle-percent titleOne="当月订单" :titleTwo="homedata.nowOrderCount" bg="#fbad4c"  :percent="(homedata.nowOrderCount*100/homedata.orderCount) | numFilter"></circle-percent>
+				<circle-percent titleOne="当月总额" :titleTwo="homedata.nowOrderPay" bg="#87d7a5"  :percent="(homedata.nowOrderCount*100/homedata.orderCount) | numFilter"></circle-percent>
+			</view>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+				<view class="left">会员统计</view>
+				<view class="right">{{homedata.memberCount}}人</view>
+			</view>
+			<view class="tjBody flexRow">
+				<circle-percent titleOne="当月新增会员" :titleTwo="homedata.mallCount+homedata.femallount" bg="#87d7a5"  :percent="((homedata.mallCount+homedata.femallount)/homedata.memberCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="男会员" :titleTwo="homedata.mallCount" bg="#00adc7"  :percent="(homedata.mallCount/homedata.memberCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="女会员" :titleTwo="homedata.femallount" bg="#FF6A6A"  :percent="(homedata.femallount/homedata.memberCount)| numFilter"></circle-percent>
+
+			</view>
+		</view>
+		<view class="part tj padding">
+			<view class="tjTitle">
+				<view class="left">商品统计</view>
+				<view class="right">{{homedata.goodsCount}}个</view>
+			</view>
+			<view class="tjBody flexRow">
+				<circle-percent titleOne="新增商品" :titleTwo="homedata.onCount+homedata.offCount" bg="#87d7a5"  :percent="((homedata.onCount+homedata.offCount)/homedata.goodsCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="下架商品" :titleTwo="homedata.offCount" bg="#00adc7"  :percent="(homedata.offCount/homedata.goodsCount)| numFilter"></circle-percent>
+				<circle-percent titleOne="缺库存商品" :titleTwo="homedata.noStock" bg="#FF6A6A"  :percent="(homedata.noStock/homedata.goodsCount)| numFilter"></circle-percent>
+
+			</view>
+		</view>
+	</view>
+
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+    import timeFilter from '@/components/time-filter/time-filter'
+    import circlePercent from '@/components/circle-percent/circle-percent'
+	import { formatDate } from '@/common/date';
+	export default {
+		data() {
+			return {
+				date: '2019-11-01',
+				homedata:null,
+				singleElection: false,
+				type: 'month'
+			}
+		},
+        components: {
+          timeFilter,
+          circlePercent
+        },
+		onLoad() {
+		},
+		async onShow() {
+			this.date = this.dateFormat(new Date());
+			 let params = {date:this.date,type:2};
+			 let resp = await Api.apiAdminCall('get', Api.admin.dayStatic, params,true);
+			 console.log(resp)
+			 this.homedata = resp;
+		},
+        computed: {
+        },
+		methods: {
+			async	chooseTime(item, index) {
+				let params = {date:this.getMonth(item.value),type:2};
+				let resp = await Api.apiAdminCall('get', Api.admin.dayStatic, params,true);
+				console.log(resp)
+				this.homedata = resp;
+			},
+			addDate(days) {
+				var d = new Date();
+				d.setDate(d.getDate() + days);
+				var m = d.getMonth() + 1;
+				if(m < 10){
+					m='0'+m
+				}
+				var day = d.getDate()
+				if(day < 10){
+					day='0'+day
+				}
+				return d.getFullYear() + '-' + m + '-' + day;
+			},
+			getMonth(month) {
+				var time = new Date();
+				time.setMonth(time.getMonth() + month);//设置month月后的时间
+				var y = time.getFullYear();
+				var m = time.getMonth() + 1;//获取当前月份
+				var d = time.getDate();
+				if(m<10){
+					m = "0"+m
+				}
+				return y + "-" + m + '-' + d;
+			},
+
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd');
+		}
+
+		}
+		,filters: {
+			numFilter (value) {
+				let realVal = ''
+				if (value) {
+					// 截取当前数据到小数点后两位
+					realVal = parseFloat(value).toFixed(2)
+				} else {
+					realVal = '0'
+				}
+				return realVal
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{
+		background-color: $uni-bg-color;
+	}
+
+	.part{
+		background: $uni-bg-color;
+		font-size: $uni-font-size-lg;
+		color: $uni-text-color;
+		margin-bottom: 20upx;
+	}
+
+	.padding {
+		padding: 30upx 40upx;
+	}
+
+	.flexRow{
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		justify-content: space-around;
+	}
+
+    .tj{
+		margin-bottom: 0;
+		padding-bottom: 0;
+		.tjTitle{
+			display: flex;
+			flex-direction: row;
+			border-bottom: 1upx solid #ebedf0;
+			padding: 40upx 0;
+            .left{
+				flex: 1;
+				text-align: left;
+				font-size: $uni-font-size-base;
+				font-weight: bold;
+			}
+			.right{
+				flex: 1;
+				text-align: right;
+				color: $uni-text-color-grey;
+			}
+		}
+		.tjBody{
+			justify-content: flex-start;
+			border-bottom: 1upx solid #f5f5f5;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/order.vue b/mallplusui-uniapp-app2/pagesC/seller/order.vue
new file mode 100644
index 0000000..4a4e60a
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/order.vue
@@ -0,0 +1,648 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" >
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item" >
+						<view class="i-top b-b">
+							<text class="time" @click="navToDetailPage(item)">{{ item.createTime }}</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.id }}--</text>
+							<text class="state" :style="{ color: item.stateTipColor }" @click="navToDetailPage(item)">{{ item.stateTip }}</text>
+							<text v-if="item.status === 12" class="del-btn yticon icon-iconfontshanchu1" @click="cancelOrder(index)"></text>
+						</view>
+
+						<scroll-view v-if="item.orderItemList.length > 1" class="goods-box" scroll-x>
+							<view v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex" class="goods-item">
+								<img class="goods-img" :src="goodsItem.productPic" @click="navToDetailPage(item)" mode="aspectFill"></img>
+							</view>
+						</scroll-view>
+						<view v-if="item.orderItemList.length === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in item.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right" @click="navToDetailPage(item)">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }}</text>
+							</view>
+						</view>
+
+						<view class="price-box">
+							共
+							<text class="num">{{ item.orderItemList.length }}</text>
+							件商品 实付款
+							<text class="price">{{ item.payAmount }}</text>
+						</view>
+						<view class="action-box b-t">
+							<text class="state" :style="{ color: item.stateTipColor }" v-if="item.orderType== 6">秒杀订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType== 2">拼团订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType== 3">团购订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType== 4">砍价订单</text>
+							<text class="state" :style="{ color: item.stateTipColor }" v-else-if="item.orderType== 5">积分订单</text>
+
+
+						</view>
+					</view>
+					<uni-load-more :status="loadingType"></uni-load-more>
+				</scroll-view>
+
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			pageNum: 1,
+			orderList:[],
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			loadingType: 'more', //加载更多状态
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 12,
+					text: '待付款',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 2,
+					text: '待发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 3,
+					text: '已发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 5,
+					text: '已完成',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 13,
+					text: '申请退款',
+					loadingType: 'more',
+					orderList: []
+				}
+			]
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		this.tabCurrentIndex = +options.status;
+		this.pageNum =  1;
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum =  1;
+		console.log('1='+this.pageNum)
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum =  1;
+		console.log('2='+this.pageNum)
+		this.loadData();
+	},
+    computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/index/orderDetail?id=${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(type = 'add', loading) {
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+
+			let status = navItem.status;
+
+
+
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+
+				let params = { pageNum: this.pageNum, status: status };
+				let data = await Api.apiAdminCall('get', Api.admin.orderList, params);
+				let goodsList = data.records;
+				let orderList = goodsList.filter(item => {
+					//添加不同状态下订单的表现形式
+					item = Object.assign(item, this.orderStateExp(item.status));
+					item.createTime = this.dateFormat(item.createTime);
+					//演示数据所以自己进行状态筛选
+					if (status === 0) {
+						//0为全部订单
+						return item;
+					}
+					return item.status === status;
+				});
+
+				if (type === 'refresh') {
+					this.orderList = [];
+				}
+
+				this.orderList = this.orderList.concat(orderList);
+
+				//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+				this.loadingType = this.orderList.length >= data.total ? 'nomore' : 'more';
+				if (type === 'refresh') {
+					if (loading == 1) {
+						uni.hideLoading();
+					} else {
+						uni.stopPullDownRefresh();
+					}
+				}
+				this.pageNum = this.pageNum + 1;
+				orderList.forEach(item => {
+					navItem.orderList.push(item);
+				});
+			}
+		},
+
+		//swiper 切换
+		changeTab(e) {
+		this.pageNum =  1;
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('refresh');
+		},
+		//顶部tab点击
+		tabClick(index) {
+		this.pageNum =  1;
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		async deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+			}, 600);
+		},
+		async payOrder(item) {
+			this.$common.navigateTo(
+					'/pages/money/pay?id=' + item.id
+			)
+
+		},
+		//取消订单
+		async cancelOrder(item) {
+			let params = { orderId: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.closeOrder, params);
+
+			if (data) {
+				this.$api.msg(data);
+				this.tabCurrentIndex = 4;
+			}
+
+		},
+
+		//订单申请退款
+		async applyRefund(item) {
+
+			let params = { id: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.applyRefund, params);
+			if (data) {
+				console.log(data);
+				this.$api.msg(data);
+			}
+			this.tabCurrentIndex = 5;
+		},
+// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo(
+					'/pages/order/evaluate?order_id=' + orderId
+			)
+		},
+
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 12) {
+				stateTipColor = '#909399';
+				stateTip = '待付款';
+			}if (value === 1) {
+				stateTipColor = '#909399';
+				stateTip = '支付成功，没有回掉';
+			}if (value === 2) {
+				stateTip = '待发货';
+			} else if (value === 3) {
+				stateTip = '待收货';
+			} else if (value === 4) {
+				stateTip = '待评价';
+			} else if (value === 5) {
+				stateTip = '已完成';
+			} else if (value === 6) {
+				stateTipColor = '#909399';
+				stateTip = '维权中';
+			} else if (value === 7) {
+				stateTip = ' 维权已完成';
+			} else if (value === 8) {
+				stateTip = '待分享';
+			} else if (value === 13) {
+				stateTip = '申请退款';
+			} else if (value === 14) {
+				stateTip = '已退款';
+			}  else if (value === 15) {
+				stateTip = '已关闭';
+			} else if (value === 16) {
+				stateTip = '无效订单';
+			} else {
+				stateTip = '待付款';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+
+		dateFormat(time) {
+			console.log(time)
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/orderDetail.vue b/mallplusui-uniapp-app2/pagesC/seller/orderDetail.vue
new file mode 100644
index 0000000..8b11e2d
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/orderDetail.vue
@@ -0,0 +1,582 @@
+<template>
+	<view class="content">
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content">
+				<scroll-view class="list-scroll-content" scroll-y>
+					<!-- 订单列表 -->
+					<view class="order-item">
+						<view class="i-top b-b">
+							<text class="time">{{ orderInfo.createTime }}</text>
+							<text class="state" :style="{ color: orderInfo.stateTipColor }" @click="navToDetailPage(item)">{{ orderInfo.id }}--</text>
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">{{ orderInfo.stateTip }}</text>
+							<text v-if="orderInfo.status === 9" class="del-btn yticon icon-iconfontshanchu1" @click="deleteOrder(index)"></text>
+						</view>
+						<view class="i-top b-b">
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单商品</text>
+						</view>
+
+						<view v-if="goodsItem.type === 1" class="goods-box-single" v-for="(goodsItem, goodsIndex) in orderInfo.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }}</text>
+							</view>
+						</view>
+						<view class="i-top b-b">
+							<text class="state" :style="{ color: orderInfo.stateTipColor }">订单赠品</text>
+						</view>
+						<view v-if="goodsItem.type === 2" class="goods-box-single" v-for="(goodsItem, goodsIndex) in orderInfo.orderItemList" :key="goodsIndex">
+							<img class="goods-img" :src="goodsItem.productPic" mode="aspectFill"></img>
+							<view class="right">
+								<text class="title clamp">{{ goodsItem.productName }}</text>
+								<text class="attr-box">{{ goodsItem.productAttr }} x {{ goodsItem.productQuantity }}</text>
+								<text class="price">{{ goodsItem.productPrice }}</text>
+							</view>
+						</view>
+						<view class="price-box">
+							共
+							<text class="num">{{ orderInfo.orderItemList.length }}</text>
+							件商品, 优惠金额
+							<text class="price">{{ orderInfo.promotionAmount }}</text>
+							 ,运费
+							<text class="price">{{ orderInfo.freightAmount }}</text>
+							<view class="yt-list-cell b-b" v-if="groupActivity">
+								<text class="cell-tit clamp">活动金额</text>
+								<text class="cell-tip">￥{{ groupActivity.price }}</text>
+							</view>
+							 ,实付款
+							<text class="price">{{ orderInfo.payAmount }}</text>
+						</view>
+						<view class="action-box b-t">
+							<button v-if="orderInfo.status == 12" class="action-btn" @click="cancelOrder(orderInfo)">取消订单</button>
+							<button v-if="orderInfo.status == 12" class="action-btn recom" @click="payOrder(orderInfo)">立即支付</button>
+							<button v-if="orderInfo.status <7" class="action-btn recom" @click="applyRefund(item)">申请退款</button>
+							<button v-if="orderInfo.status == 3" class="action-btn recom" @click="confimDelivery(orderInfo)">确认收货</button>
+							<button class='action-btn recom'
+									hover-class="btn-hover"
+									v-if="orderInfo.status === 4"
+									@click="toEvaluate(orderInfo.id)"
+							>立即评价</button>
+						</view>
+					</view>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import Json from '@/Json';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			orderInfo: [],
+			navList: [
+				{
+					status: 0,
+					text: '全部',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 12,
+					text: '待付款',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 2,
+					text: '待发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 3,
+					text: '已发货',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					status: 4,
+					text: '已完成',
+					loadingType: 'more',
+					orderList: []
+				}
+			]
+		};
+	},
+
+	async onLoad(options) {
+		let params = { id: options.id };
+		this.orderInfo = await Api.apiAdminCall('get', Api.admin.orderDetail, params);
+		this.orderInfo = Object.assign(this.orderInfo, this.orderStateExp(this.orderInfo.status));
+		this.orderInfo.createTime = this.dateFormat(this.orderInfo.createTime);
+	},
+
+	methods: {
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		async deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+			}, 600);
+		},
+		async payOrder(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+
+			let params = { orderId: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.weixinAppletPay, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+			uni.hideLoading();
+		},
+		//取消订单
+		async cancelOrder(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { orderId: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.closeOrder, params);
+
+			if (data) {
+				this.$api.msg(data.data);
+			}
+			uni.hideLoading();
+		},
+		//订单确认收货
+		async confimDelivery(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { id: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.confimDelivery, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+			uni.hideLoading();
+		},
+		//订单申请退款
+		async applyRefund(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			let params = { id: item.id };
+			let data = await Api.apiAdminCall('post', Api.admin.applyRefund, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data.data);
+			}
+			uni.hideLoading();
+		},
+// 去评价
+		toEvaluate(orderId) {
+			this.$common.navigateTo(
+					'/pages/order/evaluate?order_id=' + orderId
+			)
+		},
+		//订单状态文字和颜色
+		orderStateExp(value) {
+			let stateTip = '',
+					stateTipColor = '#fa436a';
+			if (value === 12) {
+				stateTipColor = '#909399';
+				return '待付款';
+			}if (value === 1) {
+				stateTipColor = '#909399';
+				return '支付成功，没有回掉';
+			}if (value === 2) {
+				stateTip = '待发货';
+			} else if (value === 3) {
+				stateTip = '待收货';
+			} else if (value === 4) {
+				stateTip = '待评价';
+			} else if (value === 5) {
+				stateTip = '已完成';
+			} else if (value === 6) {
+				stateTipColor = '#909399';
+				stateTip = '维权中';
+			} else if (value === 7) {
+				stateTip = ' 维权已完成';
+			} else if (value === 8) {
+				stateTip = '待分享';
+			} else if (value === 13) {
+				stateTip = '申请退款';
+			} else if (value === 14) {
+				stateTip = '已退款';
+			}  else if (value === 15) {
+				stateTip = '已关闭';
+			} else if (value === 16) {
+				stateTip = '无效订单';
+			} else {
+				stateTip = '待付款';
+			}
+
+			return { stateTip, stateTipColor };
+		},
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/secskill.vue b/mallplusui-uniapp-app2/pagesC/seller/secskill.vue
new file mode 100644
index 0000000..b818de5
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/secskill.vue
@@ -0,0 +1,577 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<view class="mp-search-box" @click="search()"><input class="ser-input" type="text" value="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+		<view class="carousel-section">
+			<!-- 标题栏和状态栏占位符 -->
+			<view class="titleNview-placing"></view>
+			<!-- 背景色区域 -->
+			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+			<swiper class="carousel" circular @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPage({ title: '轮播广告' })">
+					<image :src="item.pic" />
+				</swiper-item>
+			</swiper>
+			<!-- 自定义swiper指示器 -->
+			<view class="swiper-dots">
+				<text class="num">{{ swiperCurrent + 1 }}</text>
+				<text class="sign">/</text>
+				<text class="num">{{ swiperLength }}</text>
+			</view>
+		</view>
+
+		<view class="ad-1"><image src="/static/temp/ad1.jpg" mode="scaleToFill"></image></view>
+
+		<!-- 秒杀楼层 -->
+		<view class="seckill-section m-t" v-if="item1.flashSessionInfoList.length > 0" v-for="(item1, index1) in groupHotGoodsList" :key="index1">
+        <view class="s-header" >
+        <image class="s-img" src="/static/temp/secskill-img.jpg" mode="widthFix"></image>
+        <text class="tip">{{ item1.flashName }}</text>
+        </view>
+		<view v-if="item2.productList.length > 0" v-for="(item2, index2) in item1.flashSessionInfoList" :key="index1">
+			<view class="s-header" >
+				<text class="tip">{{ item2.startTime }}</text>
+				<text class="tip">～</text>
+				<text class="tip">{{ item2.endTime }}</text>
+
+			</view>
+			<scroll-view class="floor-list" scroll-x>
+				<view class="scoll-wrapper">
+					<view v-for="(item, index) in item2.productList" :key="index" class="floor-item" @click="navToDetailPage(item)">
+						<image :src="item.productImg" mode="aspectFill"></image>
+						<text class="title clamp">{{ item.productName }}</text>
+						<text class="price clamp">秒杀价 ￥{{ item.flashPromotionPrice }}</text>
+						<text class="price clamp">原价 ￥{{ item.productPrice }}</text>
+					</view>
+				</view>
+			</scroll-view>
+		  </view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	data() {
+		return {
+			keyword: '',
+			titleNViewBackground: '',
+			swiperCurrent: 0,
+			swiperLength: 0,
+			carouselList: [],
+			hotProductList: [],
+			brandList: [], // 推荐品牌
+			homeFlashPromotion: [], // 当前秒杀场次
+			subjectList: [], //推荐专题
+			cat_list: [],
+			homeFlashPromotion: [],
+			groupHotGoodsList: [],
+			newProductList: []
+		};
+	},
+
+	onLoad() {
+		this.loadData();
+	},
+	methods: {
+		/**
+		 * 请求静态数据只是为了代码不那么乱
+		 * 分次请求未作整合
+		 */
+		async loadData() {
+			this.logining = true;
+			let params = {};
+			let groupHotGoodsList = await Api.apiAdminCall('get', Api.admin.homeFlashPromotionList, params);
+			this.groupHotGoodsList = groupHotGoodsList;
+
+			let advertiseList = await Api.apiAdminCall('get', Api.admin.bannerList, params);
+			console.log(advertiseList);
+			this.carouselList = advertiseList || [];
+			this.swiperLength = this.carouselList.length;
+			this.logining = false;
+		},
+		//轮播图切换修改背景色
+		swiperChange(e) {
+			const index = e.detail.current;
+			this.swiperCurrent = index;
+			this.titleNViewBackground = this.carouselList[index].background;
+		},
+		navToTabPage(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/product/secskillDetail?id=${id}`
+			});
+		},
+		navToList() {
+			uni.navigateTo({
+				url: `/pages/product/list`
+			});
+		}
+	},
+
+	search() {
+		uni.navigateTo({
+			url: '/pages/search/search'
+		});
+	},
+
+	// 标题栏input搜索框点击
+	onNavigationBarSearchInputClicked: async function(e) {
+		uni.navigateTo({
+			url: '/pages/search/search'
+		});
+	},
+	//点击导航栏 buttons 时触发
+	onNavigationBarButtonTap(e) {
+		const index = e.index;
+		if (index === 0) {
+			this.$api.msg('点击了扫描');
+		} else if (index === 1) {
+			// #ifdef APP-PLUS
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1];
+			const currentWebview = page.$getAppWebview();
+			currentWebview.hideTitleNViewButtonRedDot({
+				index
+			});
+			// #endif
+			uni.navigateTo({
+				url: '../../pagesU/notice/notice'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 56upx;
+		line-height: 56upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 16upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 4upx 30upx 24upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 92upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 250upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 250upx;
+			height: 250upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 6upx 30upx 8upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 30upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 30upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/stack.vue b/mallplusui-uniapp-app2/pagesC/seller/stack.vue
new file mode 100644
index 0000000..beaf6b0
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/stack.vue
@@ -0,0 +1,161 @@
+<template>
+	<view class="qiun-columns">
+		<!--#ifdef H5 -->
+		<view class="qiun-bg-white qiun-title-bar qiun-common-mt" >
+			<view class="qiun-title-dot-light">页面地址</view>
+		</view>
+		<view class="qiun-bg-white qiun-padding">
+		    <text>pages/basic/column/stack</text>
+		</view>
+		<!--#endif-->
+		<view class="qiun-bg-white qiun-title-bar qiun-common-mt" >
+			<view class="qiun-title-dot-light">堆叠柱状图</view>
+		</view>
+		<view class="qiun-charts" >
+			<!--#ifdef MP-ALIPAY -->
+			<canvas canvas-id="canvasColumnStack" id="canvasColumnStack" class="charts" :width="cWidth*pixelRatio" :height="cHeight*pixelRatio" :style="{'width':cWidth+'px','height':cHeight+'px'}" @touchstart="touchColumn"></canvas>
+			<!--#endif-->
+			<!--#ifndef MP-ALIPAY -->
+			<canvas canvas-id="canvasColumnStack" id="canvasColumnStack" class="charts"  @touchstart="touchColumn"></canvas>
+			<!--#endif-->
+		</view>
+		<!--#ifdef H5 -->
+		<view class="qiun-bg-white qiun-title-bar qiun-common-mt" >
+			<view class="qiun-title-dot-light">标准数据格式</view>
+		</view>
+		<view class="qiun-bg-white qiun-padding">
+		    <textarea class="qiun-textarea" auto-height="true" maxlength="-1" v-model="textarea"/>
+		</view>
+		<view class="qiun-text-tips">Tips：修改后点击更新图表</view>
+		<button class="qiun-button" @tap="changeData()">更新图表</button>
+		<!--#endif-->
+	</view>
+</template>
+
+<script>
+	import uCharts from '@/components/u-charts/u-charts.js';
+	import  { isJSON } from '@/common/checker.js';
+	var _self;
+	var canvaColumn=null;
+	export default {
+		data() {
+			return {
+				cWidth:'',
+				cHeight:'',
+				pixelRatio:1,
+				textarea:''
+			}
+		},
+		onLoad() {
+			_self = this;
+			//#ifdef MP-ALIPAY
+			uni.getSystemInfo({
+				success: function (res) {
+					if(res.pixelRatio>1){
+						//正常这里给2就行，如果pixelRatio=3性能会降低一点
+						//_self.pixelRatio =res.pixelRatio;
+						_self.pixelRatio =2;
+					}
+				}
+			});
+			//#endif
+			this.cWidth=uni.upx2px(750);
+			this.cHeight=uni.upx2px(500);
+			this.getServerData();
+		},
+		methods: {
+			getServerData(){
+				uni.request({
+					url: 'http://www.yjlive.cn:8085/common/data.json',
+					data:{
+					},
+					success: function(res) {
+						console.log(res.data.data)
+						let ColumnStack={categories:[],series:[]};
+						//这里我后台返回的是数组，所以用等于，如果您后台返回的是单条数据，需要push进去
+						ColumnStack.categories=res.data.data.ColumnStack.categories;
+						ColumnStack.series=res.data.data.ColumnStack.series;
+						_self.textarea = JSON.stringify(res.data.data.ColumnStack);
+						_self.showColumnStack("canvasColumnStack",ColumnStack);
+					},
+					fail: () => {
+						_self.tips="网络错误，小程序端请检查合法域名";
+					},
+				});
+			},
+			showColumnStack(canvasId,chartData){
+				canvaColumn=new uCharts({
+					$this:_self,
+					canvasId: canvasId,
+					type: 'column',
+					padding:[15,15,0,15],
+					legend:{
+						show:true,
+						padding:5,
+						lineHeight:11,
+						margin:0,
+					},
+					fontSize:11,
+					background:'#FFFFFF',
+					pixelRatio:_self.pixelRatio,
+					animation: true,
+					categories: chartData.categories,
+					series: chartData.series,
+					xAxis: {
+						disableGrid:true,
+					},
+					yAxis: {
+						//disabled:true
+					},
+					dataLabel: true,
+					width: _self.cWidth*_self.pixelRatio,
+					height: _self.cHeight*_self.pixelRatio,
+					extra: {
+						column: {
+							type:'stack',
+							width: _self.cWidth*_self.pixelRatio*0.5/chartData.categories.length
+						}
+					  }
+				});
+
+			},
+			touchColumn(e){
+				canvaColumn.touchLegend(e);
+				canvaColumn.showToolTip(e, {
+					format: function (item, category) {
+						return category + ' ' + item.name + ':' + item.data
+					}
+				});
+			},
+			changeData(){
+				if(isJSON(_self.textarea)){
+					let newdata=JSON.parse(_self.textarea);
+					canvaColumn.updateData({
+						series: newdata.series,
+						categories: newdata.categories
+					});
+				}else{
+					uni.showToast({
+						title:'数据格式错误',
+						image:'../../../static/images/alert-warning.png'
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style>
+	/*样式的width和height一定要与定义的cWidth和cHeight相对应*/
+	.qiun-charts {
+		width: 750upx;
+		height: 500upx;
+		background-color: #FFFFFF;
+	}
+
+	.charts {
+		width: 750upx;
+		height: 500upx;
+		background-color: #FFFFFF;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/seller/store.vue b/mallplusui-uniapp-app2/pagesC/seller/store.vue
new file mode 100644
index 0000000..90f8b8e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/seller/store.vue
@@ -0,0 +1,722 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<view class="image-wrapper"><image :src="detailData.logo" class="loaded" mode="aspectFill"></image></view>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ detailData.name }}</text>
+
+			<view class="bot-row">
+				<text>浏览量: {{ detailData.hit }}</text>
+				<text>收藏量: {{ detailData.collect }}</text>
+				<text>商品量: {{ detailData.goodsCount }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text>7天无理由退换货 ·</text>
+					<text>假一赔十 ·</text>
+				</view>
+			</view>
+		</view>
+        <view class="c-list">
+			<view class="c-row b-b">
+				<text class="tit">地址</text>
+				<view class="bz-list con">
+					<text>{{detailData.addressProvince}} ·</text>
+					<text>{{detailData.addressCity}} ·</text>
+					<text>{{detailData.addressArea}} ·</text>
+					<text>{{detailData.addressDetail}} ·</text>
+				</view>
+			</view>
+		</view>
+		<view class="">
+			<view class="hot-floor" v-if="item1.goodsList.length > 0" v-for="(item1, index1) in cat_list" :key="index1">
+				<view class="floor-img-box"><image class="floor-img" :src="item1.pic" mode="scaleToFill"></image></view>
+				<scroll-view class="floor-list" scroll-x>
+					<view class="scoll-wrapper">
+						<view v-for="(item, index) in item1.goodsList" :key="index" class="floor-item" @click="navToDetailPage(item)">
+							<image :src="item.pic" mode="aspectFill"></image>
+							<text class="title clamp">{{ item.name }}</text>
+							<text class="price">￥{{ item.price }}</text>
+						</view>
+						<view class="more" @click="navToTabPage('/pages/product/list')">
+							<text>查看全部</text>
+							<text>More+</text>
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+
+		</view>
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			favorite: true,
+			shareList: [],
+			cat_list: [],
+
+			desc: `
+					<div style="width:100%">
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i4/479184430/O1CN01nCpuLc1iaz4bcSN17_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd2.alicdn.com/imgextra/i2/479184430/O1CN01gwbN931iaz4TzqzmG_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i3/479184430/O1CN018wVjQh1iaz4aupv1A_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd4.alicdn.com/imgextra/i4/479184430/O1CN01tWg4Us1iaz4auqelt_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd1.alicdn.com/imgextra/i1/479184430/O1CN01Tnm1rU1iaz4aVKcwP_!!479184430.jpg_400x400.jpg" />
+					</div>
+				`,
+			skuList: []
+		};
+	},
+	async onLoad(ops) {
+
+
+			let params = {};
+			let data = await Api.apiAdminCall('get', Api.admin.storeDetail, params,true);
+			if (data) {
+			console.log(data)
+				let detailData = data.store;
+				this.detailData = detailData;
+				this.cat_list = data.store.list;
+				uni.setNavigationBarTitle({
+					title: detailData.name
+				});
+			}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `/pages/product/product?id=${id}`
+			});
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+
+
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/applyBusiness.vue b/mallplusui-uniapp-app2/pagesC/store/applyBusiness.vue
new file mode 100644
index 0000000..d89ce5c
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/applyBusiness.vue
@@ -0,0 +1,333 @@
+<template>
+	<view class="content">
+		<view class="list-wraper logo-wraper" @click="uplodingImg(1)">
+			<view class="tit">
+				<text>点击上传商家logo</text>
+			</view>
+			<view class="input-logo" >
+				<image v-if="!logImg" src="http://mp.emshop.eonfox.com/zrhzstatic/muying/shop.png" mode=""></image>
+				<image v-else :src="logImg" mode=""></image>
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家名称：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.name"  placeholder="请输入商家名称" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家QQ：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="text" value="" v-model="infor.contactQq"  placeholder="请输入商家QQ" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家手机号：</text>
+			</view>
+			<view class="input-all">
+				<input class="inpt" type="number" maxlength="11" v-model="infor.supportPhone" value="" placeholder="请输入手机号" />
+			</view>
+		</view>
+		<view class="list-wraper">
+			<view class="tit">
+				<text>商家类别：</text>
+			</view>
+			<view class="input-all">
+				<radio-group>
+					 <label class="radio" v-for="(item,index) in shopsType" :key='index'><radio  value="r1"  class="radio" @click="gain(item.type_id)"/>{{item.name}}</label>
+				</radio-group>
+			</view>
+		</view>
+
+
+		<view class="tips"  @click="goPage">
+			<view class="tips_left">
+				<text>{{addressName}}</text>
+			</view>
+			<view class="tips_right">
+				<image src="../../static/right-arrow.png" ></image>
+			</view>
+		</view>
+		<view class="h-20upx"></view>
+
+		<view class="list-wraper ind-wraper">
+			<view class="tit">
+				<text>商家介绍：</text>
+			</view>
+			<view class="input-lg">
+				<textarea class="lg-text" value=""  v-model="infor.description" placeholder="请输入..." />
+			</view>
+		</view>
+
+		<view class="list-wraper logo-wraper"  @click="uplodingImg(2)">
+			<view class="tit">
+				<text>点击上传营业执照：</text>
+			</view>
+			<view class="input-Image">
+				<image v-if="!BusinessImg"  src="http://mp.emshop.eonfox.com/zrhzstatic/muying/yingyezhizhao.png" mode=""></image>
+				<image v-else :src="BusinessImg" mode=""></image>
+			</view>
+		</view>
+
+		<view class="btn-box">
+			<button class="btn" @click="commit()">提交申请</button>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	// #ifdef H5
+	let jweixin = require('jweixin-module');
+	// #endif
+
+	export default {
+	components: {
+    		mallplusCopyright
+    	},
+		data() {
+			return {
+				cityPickerValueDefault: [0, 0, 1],
+				themeColor: '#007AFF',
+				pickerText: '选择省/市/区',
+				addressName:'请选择商家地址',
+				logImg:'',
+				infor:{},
+				BusinessImg:''  ,// 营业执照
+				BusinessImgId:'',
+				logImgID:'',
+				shopsType:[
+						{
+					id: 1,
+					name: "服装",
+				     },
+					{
+						id: 2,
+						name: "化妆品",
+					},
+					{
+						id: 3,
+						name: "家装",
+					},
+					{
+						id: 4,
+						name: "水果",
+					},
+				]
+			}
+		},
+		components: {
+
+		},
+		onLoad(){
+
+		},
+		methods: {
+			goPage(){
+				var _this = this
+				uni.chooseLocation({
+				    success: function (res) {
+						console.log('res',res)
+				        console.log('位置名称：' + res.name);
+						_this.addressName=res.address +res.name
+						_this.infor.addressDetail = res.address +res.name
+						_this.infor.addressLat=res.latitude
+						_this.infor.addressLng=res.longitude
+				        console.log('经度：' + res.longitude);
+						console.log('详细地址：' + res.address);
+						console.log('纬度：' + res.latitude);
+				    }
+				});
+			},
+			gain(id){
+				this.infor.type_id=id
+				console.log('类别id',this.infor.type_id)
+			},
+			// 上传图片
+			uplodingImg (name) {
+				this.$otherApi.uploadFiles(res => {
+					if (res.code == 200) {
+						console.log(res.data)
+						if(name==1){
+							this.logImg = res.data
+							this.infor.logo=res.data
+						}else{
+							this.BusinessImg = res.data
+							this.infor.supportName=res.data
+						}
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+
+			async commit(){
+				var _this=this
+				let form = Object.assign({},_this.infor)
+				let data = await Api.apiCall('post', Api.member.applyStore, form);
+				console.log(data)
+				if (data) {
+					this.$api.msg(`商户入驻成功`);
+					setTimeout(() => {
+						let url = '../../pagesC/store/storeResult?id='+data.id;
+						uni.navigateTo({
+							url
+						});
+					}, 800);
+				} else {
+					this.$api.msg(`商户入驻失败`);
+				}
+			},
+
+			openLocation(){
+				// #ifdef H5
+				jweixin.getLocation({
+					type: 'wgs84',
+					success: res => {
+						const latitude = res.latitude;
+						const longitude = res.longitude;
+						jweixin.openLocation({
+							latitude: latitude, // 纬度，浮点数，范围为90 ~ -90
+							longitude: longitude, // 经度，浮点数，范围为180 ~ -180。
+							name: '位置名', // 位置名
+
+							scale: 16, // 地图缩放级别,整形值,范围从1~28。默认为最大
+							infoUrl:"http://www.baidu.com"
+						})
+					},
+					fail: () => {},
+					complete: () => {}
+				});
+
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	page{
+		background: #F5F5F5;
+		width: 100%;
+		height: 100%;
+	}
+	.h-20upx{
+		height: 20upx;
+		display: flex;
+	}
+	.tips{
+		display: flex;
+		/* width: calc(100% - 60upx); */
+		padding: 20upx;
+		background-color: #FFFFFF;
+	}
+	.tips_left{
+		width: 94%;
+		font-size: 28upx;
+		color: #de7d67;
+	}
+	.tips_right{
+		width: 5%;
+	}
+	.tips_right image{
+		width:40upx;
+	    height: 40upx;
+	}
+	.btn{
+		background-color: rgba( 242 155 135);
+		color: #FFFFFF;
+	}
+	.input-logo{
+		width: 120upx;
+		height: 120upx;
+		line-height: 120upx;
+		text-align: center;
+		font-size: 27upx;
+		color: #444444;
+	}
+	.input-logo image{
+		width: 120upx;
+		height: 120upx;
+	}
+	.input-Image{
+		width: 420upx;
+		height: 320upx;
+		line-height: 320upx;
+		text-align: center;
+		font-size: 27upx;
+		border: 1upx #CCCCCC solid;
+		color: #444444;
+	}
+	.input-Image image{
+		width: 420upx;
+		height: 320upx;
+	}
+	.radio{
+		font-size: 28upx;
+		transform:scale(0.7)
+	}
+</style>
+<style scoped lang="stylus" ref="stylesheet/stylus">
+	.content
+		width 100%
+		display flex
+		flex-direction column
+		color #333333
+		.list-wraper
+			position relative
+			display flex
+			align-items center
+			// width calc(100% - 60upx)
+			padding 20upx
+			background #FFFFFF
+			.tit
+				flex 1.5
+				text
+					font-size 28upx
+
+			.input-all
+				flex 4
+				.inpt
+					// background red
+					padding-top 6upx
+					font-size 28upx
+
+		.logo-wraper
+			.input-all
+				text-align right
+				image
+					width 100upx
+					height 100upx
+
+		.list-wraper::after
+			position absolute
+			content ""
+			width calc(100% - 60upx)
+			height 2upx
+			left 30upx
+			bottom 0
+			background #CCCCCC
+		.ind-wraper
+			flex-direction column
+			justify-content left
+			.tit
+				width 100%
+			.input-lg
+				width 100%
+				padding 20upx 10upx
+				// background red
+				.lg-text
+					font-size 24upx
+					color #777777
+		.btn-box
+			width 690upx;
+			padding 40upx 30upx
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/businessDetails.vue b/mallplusui-uniapp-app2/pagesC/store/businessDetails.vue
new file mode 100644
index 0000000..aef89d6
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/businessDetails.vue
@@ -0,0 +1,1036 @@
+<template>
+	<view class="content">
+		<view class="head" >
+			<view class="backstyle" >
+			</view>
+			<image :src="imgA" mode="widthFix"></image>
+		</view>
+		<!-- 商家内容标题部分 -->
+		<view class="content-title">
+			<view class="title-img"  @click="magnifyThree">
+				<image :src="imgA"  mode=""></image>
+			</view>
+			<view class="title-font">
+				<view class="fontBox">
+					{{name}}
+				</view>
+				<view class="fontInfo">
+					{{store.supportPhone}}
+				</view>
+			<!-- 	<view class="fontBox" >
+					<uni-icon v-for="(n,ind) in star" type="star-filled"  size="15" class="star-filled" color="8e8e8e" :key="ind"></uni-icon>
+				</view> -->
+				<!-- <view class="fontBox">
+					{{distance}}
+				</view> -->
+			</view>
+			<view class="title-btn">
+				<view v-if="store.favorite" @click="goCollect(store)">
+					<text  class="yticon icon-shoucang2" style="color: #ffba00 ; font-size: 35px;"  ></text>
+				</view>
+				<view v-else @click="goCollect(store)">
+					<text  class="yticon icon-shoucang2" style="color: #ffffff; font-size: 35px;" ></text><!-- 收藏1 取消收藏2 -->
+				</view>
+				<view @click="showEvaluateLayer()">
+					<text  class="yticon icon-pinglun-copy" style="color: #ffffff ; font-size: 35px;"  ></text>
+				</view>
+
+			</view>
+		</view>
+		<view class="BigBOX" v-show="dispalyImgThree" @click="clickshowThree">
+			 <image :src="imgA" mode="" ></image>
+		</view>
+		<view class="tab" >
+			<view class="tab-item" :class="selectIndex==1||selectIndex==5?'tab-item-checked':''" @click="changTab(1)">
+				商品
+			</view>
+			<view class="tab-item" :class="selectIndex==2?'tab-item-checked':''" @click="changTab(2)">
+				分类
+			</view>
+			<view class="tab-item" v-if="reviewNum<99" :class="selectIndex==3?'tab-item-checked':''" @click="changTab(3)">
+				评价({{pingjia.length}})
+			</view>
+			<view class="tab-item" v-else :class="selectIndex==3?'tab-item-checked':''" @click="changTab(3)">
+				评价(99+)
+			</view>
+			<view class="tab-item" :class="selectIndex==4?'tab-item-checked':''" @click="changTab(4)">
+				商家
+			</view>
+			<view class="tab-item" :class="selectIndex==4?'tab-item-checked':''" @click="changTab(5)">
+            				门店
+            			</view>
+		</view>
+		<view class="bbox">
+
+		</view>
+		<view v-show="selectIndex==1">
+			<view class="goods-list">
+				<view
+					v-for="(item, index) in newProductList" :key="index"
+					class="goods-item"
+					@click="navToDetailPage(item)"
+				>
+					<view class="image-wrapper">
+						<image :src="item.pic" mode="aspectFill"></image>
+					</view>
+					<text class="title clamp">{{item.name}}</text>
+					<view class="price-box">
+						<text class="price">{{item.price}}</text>
+						<text>已售 {{item.sale}}</text>
+					</view>
+				</view>
+			</view>
+			<uni-load-more :status="loadingType"></uni-load-more>
+		</view>
+		<view  v-show="selectIndex==2">
+			<view class="categroy" >
+				<view class="categroy-item" v-if="category" v-for="(item,index) in category" :key="index" @click="toCategoryList(item.id)">
+
+					<image :src="item.pic" mode="" class="categroy-item-img"  v-if="item.pic" ></image>
+                      <image  mode="" class="categroy-item-img"  v-else src="/static/missing-face.png"  ></image>
+					<text class="categroy-item-text">{{item.name}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view  v-show="selectIndex==3">
+			<!-- 商家位置 -->
+			<view class="evaluateTitle" >
+				<view class="evaluateTitle-left">
+					<view class="evaluateTitle-leftBack">
+					</view>
+					店铺评价
+				</view>
+				<view class="evaluateTitle-right" v-if="pingjia" @click="toCommentList()">
+					全部评价({{pingjia.length}})
+					<image src="../../static/right-arrow.png" style="width:22upx;height:22upx;" mode="" @click.stop=""></image>
+				</view>
+
+			</view>
+			<view class="evaluateContainer" v-if="pingjia && pingjia.length>0">
+				<view class="evaluate-item" v-if="pingjia" v-for="(item,index) in pingjia" :key="index">
+					<image class="evaluate-itemlogo" v-if="item.pic" :src="item.pic"   mode=""></image>
+					<image class="evaluate-itemlogo" v-else src="/static/missing-face.png"   mode=""></image>
+					<view class="evaluate-item-content">
+						<view class="evaluate-item-content-user">
+							<text class="title" v-if="item.name">
+								{{item.name}}
+							</text>
+							<text v-else>未设置昵称</text>
+							<text class="date">
+								{{item.createTime |formatCreateTime}}
+							</text>
+						</view>
+						<view class="evaluate-item-content-text">
+							{{item.memo}}
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<view class="evaluateContainer" v-else>
+				暂无评价
+			</view>
+
+		</view>
+		<view  v-show="selectIndex==4">
+			<!-- 商家位置 -->
+			<view class="addressBox" @click="openMap()">
+				<view class="addressBox-left">
+					<image src="../../static/position.png" style="width:34upx;height:34upx;" mode=""></image>
+					<view class="content-content">{{store.addressDetail}}</view>
+				</view>
+				<view class="addressBox-right">
+					<image src="../../static/temp/share_wechat.png" style="width:44upx;height:44upx;" mode="" @click.stop="showContactInfo()"></image>
+					<image src="../../static/iphone.png" style="width:44upx;height:44upx;" mode="" @click.stop="makePhoneCall(store.supportPhone)"></image>
+				</view>
+
+				<!-- <view class="addressFont">
+					商家电话：{{phone}}
+				</view> -->
+			</view>
+			<view class="bbox">
+
+			</view>
+			<!-- 商家风采 -->
+			<view class="imgBox">
+				<view class="imgBoxImg" v-show="dispaly" @click="magnifyTwo">
+					<image :src="imgA" mode=""></image>
+				</view>
+	 			<view class="imgBoxImg" v-show="dispalyx">
+					<image :src="store.supportName" mode=""></image>
+				</view>
+				<view class="imgBoxImg" v-for="(item,index) in sjimg" :key="index">
+					<image :src="address+item" mode=""  @click="magnify(index)"></image>
+				</view>
+			</view>
+			<view class="BigBOX" v-show="dispalyImgTwo" @click="clickshowTwo">
+				 <image :src="imgB" mode="" ></image>
+			</view>
+			<view class="BigBOX"  @click="clickshow" v-show="dispalyImg">
+				 <image :src="address+sjimg[imgIndex]" mode=""  ></image>
+			</view>
+		</view>
+		<view v-show="selectIndex==5">
+		<view class="shop-box">
+			<view v-if="!shopList" style="text-align: center; color:#5C5C5C; font-size: 30upx;">暂无商家记录</view>
+            			<view class="shop" v-for="(item, index) in shopList" @click="gobrand" :data-Businessid="item.id" :key="index">
+
+            				<image :src="item.logo" mode="" class="image" width="100%" height="100%" v-if="item.logo" ></image>
+                            <image  mode="" class="image" width="100%" height="100%" v-else src="/static/missing-face.png"  ></image>
+            				<view class="shopText">
+            					<text class="name">{{ item.storeName }}【{{item.linkman}}】</text>
+            					<view class="evaluate">
+            						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+            						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+            						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+            						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+            						<uni-icon type="star-filled" size="15" class="star-filled" color="8e8e8e"></uni-icon>
+            						 <text class="garde" style="margin-right:10upx; color:#666666; ">{{ item.collect }}</text>
+            					</view>
+            					<view class="bottomInformation">
+            						<text class="crux" style="margin-top: 30upx; color:#666666; overflow: hidden; display: inline-block; height: 40upx; text-overflow:ellipsis;">
+            							{{ item.address }}
+            						</text>
+            						<text class="distance" style=" color:#666666;">{{ item.mobile }}</text>
+            					</view>
+            				</view>
+            				</view>
+            			</view>
+
+		</view>
+		<view class="mask1" v-show="contactInfoDisplay" @click="showContactInfo()">
+
+		</view>
+		<view class="contactInfo" v-show="contactInfoDisplay">
+			<text class="contactInfo-title">识别二维码添加店家微信</text>
+			<image :src="store.contactQrcode" mode="" style="width: 318upx;height:318upx;"></image>
+			<text>{{name}}</text>
+			<text>微信号{{store.contactQq}}</text>
+			<text>客服电话：{{store.supportPhone}}</text>
+		</view>
+		<view class="mask1" v-show="evaluateLayer" @click="showEvaluateLayer()">
+
+		</view>
+		<view class="evaluateLayer" v-show="evaluateLayer">
+			<text>请输入评价内容</text>
+			<textarea v-model="evaluate" placeholder="请输入评价信息" />
+			<view class="evaluateLayerBtn">
+				<view class="cancel" @click="showEvaluateLayer()">
+					取消
+				</view>
+				<view class="confirm" @click="submitEvaluate()">
+					确定
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import { formatDate } from '@/common/date';
+	import uniIcon from "@/components/uni-icon/uni-icon.vue";
+	import eonfox from "@/components/eonfox/eonfox.js"
+	import fns from '@/components/eonfox/fns.js';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+	// #ifdef H5
+	let jweixin = require('jweixin-module');
+	// #endif
+	var ef = new eonfox();
+	export default {
+	components: {
+    		mallplusCopyright
+    	},
+		data(){
+			return {
+			store:'',
+				id:'',
+			    name:'',
+				info:'',
+				license_image_id:'',
+				logimg:'',
+				phone:'',
+				star:'',
+				imgA:'',
+				imgB:'',
+				sjimg:[],
+				address:'',
+				Latitude:'',
+				Longitude:'',
+				BusinessAddress:'',
+				dispaly:true,
+				dispalyx:true,
+				distance:'',
+				dispalyImg:false,
+				index:0,
+				imgIndex:'',
+				dispalyImgTwo:false,
+				dispalyImgThree:false,
+				contactInfoDisplay:false,//是否展示商家联系方式
+				selectIndex:1,//当前选中栏
+				shopLatitude:'',
+				shopLongitude:'',
+				loadingType: 'more', //加载更多状态
+				filterIndex: 0,
+				priceOrder: 0, //1 价格从低到高 2价格从高到低
+				goodsList: [],
+				shopList: [],
+				qiniu:'',
+				search:{},
+				sort:[],
+				page:10,
+				category:null,
+				loadingcategoryType: 'more', //分类加载更多状态
+				categoryPage:10,//分类商品分页
+				categoryType:'',//分类类型
+				newProductList:[],
+				evaluateLayer:false,//评价弹窗
+				evaluate:'',//评价内容
+				pingjia:'',//评价列表
+				reviewNum:0,//评价数量
+				params:{},
+				pageNum: 1,
+				lon:'',
+				lat:'',
+				favorite: false//收藏
+			}
+		},
+filters: {
+              formatCreateTime(time) {
+                let date = new Date(time);
+                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+              },
+            },
+		methods:{
+			toCommentList(){
+				var _this=this;
+				if(_this.id){
+					uni.navigateTo({
+						url: '/pagesA/commentList/commentList?type=merchant&id='+_this.id
+					});
+				}
+				else{
+					uni.showToast({
+						title:"店铺id异常",
+						icon:'none'
+					})
+				}
+			},
+			async submitEvaluate(){
+				var _this=this;
+				if(_this.evaluate.trim()==''){
+					uni.showToast({
+						title:"请输入评价内容",
+						icon:'none'
+					})
+					return
+				}
+				else{
+				let params = { storeId: this.id,memo:_this.evaluate };
+                	let groupHotGoodsList = await Api.apiCall('post', Api.member.addStoreComment, params);
+				if(groupHotGoodsList){
+				this.storeCommentList(this.id);
+                										_this.showEvaluateLayer();
+                										uni.showToast({
+                											title: '评价成功'
+                										});
+this.changTab(3);
+                									}
+
+				}
+			},
+			showEvaluateLayer(){
+			        this.evaluate='';
+				this.evaluateLayer=!this.evaluateLayer;
+			},
+			toCategoryList(typeid){
+				this.changTab(1);
+				this.categoryType=typeid;
+				this.params.storeClassId=this.typeid;
+				this.getNewProductList('refresh');
+			},
+			//详情
+			navToDetailPage(item){
+				// console.log(item)
+
+				let id = item.id;
+				uni.navigateTo({
+					url: `../../pagesA/product/product?id=${id}`
+				})
+			},
+			
+			//加载分类商品 ，带下拉刷新和上滑加载
+			async loadCateGoryData(type='add', loading) {
+
+			},
+			//唤起拨号
+			makePhoneCall(phone){
+				uni.makePhoneCall({phoneNumber:phone});
+			},
+			//展示商家联系方式
+			showContactInfo(){
+				this.contactInfoDisplay=!this.contactInfoDisplay;
+			},
+			//切换Tab
+			changTab(index){
+				this.selectIndex=index;
+			},
+			//收藏
+			async goCollect(item){
+				var _this=this
+				_this.favorite = !this.favorite;
+			let params = { objId: this.id, type: 3, name: item.name, meno1: item.logo, meno2: item.collect, meno3: item.hit };
+            Api.apiCall('post', Api.goods.favoriteSave, params);
+
+			},
+				openMap1() {
+                    			var _this = this;
+                    			uni.chooseLocation({
+
+                    				success: function(res) {
+                    			console.log('res', res);
+                                _this.addressData.longitude=res.longitude;
+                                _this.addressData.latitude=res.latitude;
+                                _this.addressId = 1 ;
+                    					_this.addressData.province = res.address ;
+                    					_this.addressData.name =  res.name;
+                    					console.log('经度：' + res.longitude);
+                    					console.log('详细地址：' + res.address);
+                    					console.log('纬度：' + res.latitude);
+                    					_this.storeList = {};
+                    				}
+                    			});
+
+                    		},
+			openMap(){
+				var _this=this
+				uni.openLocation({
+					latitude: parseFloat(_this.shopLatitude),
+					longitude: parseFloat(_this.shopLongitude),
+					name:_this.name,
+					address:_this.store.addressDetail,
+					success: function () {
+						console.log('success');
+					}
+				});
+
+			},
+			//点击获取图片的下标
+			magnify:function(index){
+				console.log('点击了',index);
+				this.imgIndex=index;
+				this.dispalyImg=true;
+				this.dispalyImgTwo=false;
+				this.dispalyImgThree=false;
+			},
+			//点击关闭图片
+			clickshow(){
+				this.dispalyImg=false;
+			},
+			magnifyTwo(){
+				this.dispalyImgTwo=true;
+				this.dispalyImg=false;
+				this.dispalyImgThree=false;
+			},
+			magnifyThree(){
+				this.dispalyImgThree=true;
+				this.dispalyImgTwo=false;
+				this.dispalyImg=false;
+			},
+			clickshowTwo(){
+				this.dispalyImgTwo=false;
+			},
+			clickshowThree(){
+				this.dispalyImgThree=false;
+			},
+			returnto() {
+				uni.navigateBack({
+					delta:1
+				})
+			},
+			        async getShopList(storeId) {
+            			let params = { storeId: storeId };
+            			let groupHotGoodsList = await Api.apiCall('get', Api.index.shoplist, params);
+            			this.shopList = groupHotGoodsList;
+            		},
+
+            		async storeCommentList(storeId) {
+                                                    			let params = { storeId: storeId };
+                                                    			let storeClass = await Api.apiCall('get', Api.index.storeCommentList, params);
+                                                    			this.pingjia = storeClass.records;
+                                                    		},
+            		 async storeClassList(storeId) {
+                                			let params = { storeId: storeId };
+                                			let storeClass = await Api.apiCall('get', Api.index.storeClassList, params);
+                                			this.category = storeClass.records;
+                                		},
+			/**
+                		     * 获取新品上市信息
+                		     */
+                		    async getNewProductList(type = 'add', loading){
+                		    //没有更多直接返回
+                            			if (type === 'add') {
+                            				if (this.loadingType === 'nomore') {
+                            					return;
+                            				}
+                            				this.loadingType = 'loading';
+                            			} else {
+                            				this.loadingType = 'more';
+                            			}
+                            			this.params.pageNum=this.pageNum;
+                            			this.params.storeId=this.id;
+
+                		      let list = await Api.apiCall('get', Api.goods.goodsList, this.params);
+            
+            
+                		        let goodsList = list.records;
+            
+                                			if (type === 'refresh') {
+                                				this.newProductList = [];
+                                			}
+            
+                    	this.newProductList = this.newProductList.concat(goodsList);
+            
+                                			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+                                			this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+                                			if (type === 'refresh') {
+                                				if (loading == 1) {
+                                					uni.hideLoading();
+                                				} else {
+                                					uni.stopPullDownRefresh();
+                                				}
+                                			}
+            
+                		    },
+		},
+			async onLoad(ops) {
+
+        	if(ops.id && ops.id!=undefined){
+        	this.id=ops.id;
+        	}else{
+        	this.id=0;
+        	}
+                this.getNewProductList('refresh');
+        		let params = { id:this.id };
+        		let store = await Api.apiCall('get', Api.member.storeDetail1, params);
+        		this.store=store.store;
+                this.imgA=this.store.logo;
+                this.name=this.store.name;
+
+        if(ops.lat && ops.lat!=undefined){
+        	this.shopLatitude=ops.lat;
+       	}
+        if(ops.lon && ops.lon!=undefined){
+        	this.shopLongitude=ops.lon;
+       	}
+         this.getShopList(this.id);
+        this.storeClassList(this.id);
+        this.storeCommentList(this.id);
+        	},
+
+			//加载更多
+                	onReachBottom() {
+                		this.pageNum = this.pageNum + 1;
+
+                		this.getNewProductList();
+                	},
+            	onPullDownRefresh() {
+            	this.pageNum = this.pageNum + 1;
+            	this.getNewProductList('refresh');
+
+
+            		setTimeout(function () {
+            			uni.stopPullDownRefresh();
+            		}, 2000);
+            	},
+		components:{
+			uniIcon,
+			uniLoadMore
+		},
+	}
+</script>
+<style scoped lang="stylus" ref="stylesheet/stylus">
+.content
+	width 100%
+	overflow hidden
+	.title-box
+		display flex
+		justify-content center // 水平居中
+		align-items center // 垂直居中
+		flex-direction row // 左到右
+		width 750upx
+		padding 0 20upx
+		height 100upx
+		.scan
+			width 40upx
+			height 40upx
+		.input-box
+			// margin-left 20upx
+			width 700upx
+			height 58upx
+			// border 1upx solid #d3d3d3
+			border-radius 50upx
+			.search
+				display inline-block
+				position absolute
+				top 0
+				left 0
+			.input
+				width 80%
+				display inline-block
+				font-size 28upx
+				text-align center
+				// text-align left
+				line-height 100%
+				height 100%
+		.chat
+			flex 1
+	.topTitle
+		width 100%
+		height 80upx
+		display flex
+		align-items center // 垂直居中
+		flex-direction row
+		padding 0 20upx
+		color #333
+		font-size 30upx
+		.allStore
+			vertical-align middle
+			line-height 80upx
+			color #e7313a
+		.discountStore
+			line-height 100upx
+			padding-left 20upx
+		.leftBox
+			width 300upx
+			text-align right
+	.classification
+		height 80upx
+		display flex
+		align-items center
+		justify-content center // 垂直居中
+		flex-direction row
+		font-size 28upx
+		.typeList
+			text-align center
+			line-height 80upx
+			border 1px solid #d3d3d3
+			width 50%
+			height 100%
+	.place
+		font-size 30upx
+		height 100upx
+		text-align left
+		line-height 100upx
+		border-bottom 1px solid #d3d3d3
+		padding-left 20px
+	.shop-box, width 100%
+		height auto
+	.shop
+		height 200upx
+		border-bottom 1px solid #eee
+		display flex
+		align-items center
+		justify-content flex-start
+		flex-direction row
+		.image
+			width 160upx
+			height 160upx
+			margin-left 25upx
+			border-radius 50%
+		.shopText
+			width 500upx
+			height 220upx
+			margin-left 25upx
+			padding-top 25upx
+			.name
+				color #333
+				font-weight 600
+				font-size 30upx
+				width 100%
+				height 30px
+			.evaluate
+				font-size 20upx
+				margin-top 20upx
+			.bottomInformation
+				align-items center
+				justify-content space-between
+				flex-direction row
+				width 100%
+				color #333
+				font-size 28upx
+				.crux
+					width 240upx
+					display inline-block
+				.distance
+					width calc(100% - 250upx)
+					float right
+					text-align right
+					margin-top 30upx
+			.icoimg
+				width 48upx
+				height 48upx
+</style>
+<style>
+	.content{
+		font-size:28upx;
+		width:100%;
+		height:auto;
+	}
+	.head{
+		width: 750upx;
+		height: 300upx;
+		overflow: hidden;
+		position: relative;
+	}
+	.head image{
+		width: 750upx;
+		height: 180upx;
+	}
+	.backstyle{
+		position: absolute;
+		width: 100%;
+		height: 100%;
+		background-size: cover;
+		background-color: rgba(0,0,0,0.4);
+		background-repeat: no-repeat;
+
+	}
+	.content-title{
+		width: 100%;
+		height:auto;
+		display: flex;
+		margin-top: -120upx;
+		position: relative;
+		background-color: rgba(0,0,0,0.5);
+	}
+	.content-content{
+		padding-left: 16upx;
+	}
+	.title-img{
+		float:left;
+		width: 130upx;
+		height:130upx;
+		margin-left: 30upx;
+		margin-right: 30upx;
+		margin-top: 10upx;
+	}
+	.title-img image{
+		width: 130upx;
+		height:130upx;
+		border-radius: 6upx;
+	}
+	.title-font{
+		width: 440upx;
+		height: 150upx;
+		float: left;
+		margin-top: 10upx;
+		color: #FFF;
+	}
+	.title-btn{
+		width:170upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		margin-right: 15upx;
+	}
+	.title-btn view{
+		width: 70upx;
+		height: 70upx;
+		margin-left: 15upx;
+	}
+	.fontBox{
+		width: 100%;
+		height: 50upx;
+		line-height: 50upx;
+		font-size: 36upx;
+	}
+	.fontInfo{
+		font-size: 24upx;
+	}
+	.bbox{
+		width: 100%;
+		height:20upx;
+		background-color: #e4e2e2;
+	}
+	.addressBox{
+		width: 690upx;
+		height:auto;
+		padding-top: 20upx;
+		padding-bottom: 20upx;
+		padding-left:30upx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.addressBox-left{
+		display: flex;
+	}
+	.addressBox-right{
+		display: flex;
+		width:148upx;
+		justify-content: space-between;
+	}
+	.imgBox{
+		width: 750upx;
+		padding:0 30upx;
+		height: auto;
+		display: flex;
+		flex-wrap: wrap;
+	}
+	.imgBoxImg{
+		margin-top:40upx;
+		margin-left: 5upx;
+		margin-right: 5upx;
+		width: 220upx;
+		height:220upx;
+	}
+	.imgBoxImg image{
+		width: 220upx;
+		height:220upx;
+		border-radius: 10upx;
+	}
+	.BigBOX{
+		position:fixed;
+		float: left;
+		top:0upx;
+		width:100%;
+		height:1600upx;
+		background-color: #101010;
+		z-index:5;
+	}
+	.BigBOX image{
+		float: left;
+		width: 100%;
+		height: 600upx;
+		margin-top: 200upx;
+	}
+	.tab{
+		height:90upx;
+		display: flex;
+		justify-content: space-between;
+	}
+	.tab-item{
+		width: 25%;
+		height:90upx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.tab-item-checked{
+		border-bottom:solid 4upx #F8C6B5 ;
+	}
+	.mask1 {
+		position: fixed;
+		top:0;
+		left:0;
+		z-index:4;
+		width:100%;
+		height:100vh;
+		background:rgba(0,0,0,0.4);
+	}
+	.contactInfo{
+		z-index:5;
+		position: fixed;
+		width:500upx;
+		height:570upx;
+		background-color: #fff;
+		border-radius:10upx ;
+		top:25vh;
+		left: 125upx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+		font-size: 28upx;
+	}
+
+	.contactInfo-title{
+
+		font-size: 32upx;
+		font-weight: 500;
+	}
+	.evaluateTitle{
+		display: flex;
+		width: 730upx;
+		height: 80upx;
+		align-items: center;
+		justify-content: space-between;
+	}
+	.evaluateTitle-left{
+		font-size: 32upx;
+		align-items: center;
+		display: flex;
+	}
+	.evaluateTitle-leftBack{
+		width:20upx;
+		height: 34upx;
+		background-color:#F8C6B5 ;
+		margin-right: 20upx;
+	}
+	.evaluateTitle-right{
+		display: flex;
+		font-size: 24upx;
+		align-items: center;
+	}
+	.evaluateContainer{
+		width: 710upx;
+		padding-left: 40upx;
+	}
+	.evaluate-item{
+		border-bottom: solid 2upx #BFBFBF;
+		display: flex;
+		padding: 20upx 0;
+	}
+	.evaluate-itemlogo{
+		width: 80upx;
+		height: 80upx;
+		border-radius: 40upx;
+	}
+	.evaluate-item-content{
+		width:590upx;
+		padding-left: 20upx;
+		font-size: 28upx;
+	}
+	.evaluate-item-content-user{
+		display: flex;
+		flex-direction: column;
+		height: 80upx;
+		justify-content: space-between;
+	}
+	.evaluate-item-content-user .title{
+		font-size: 28upx;
+	}
+	.evaluate-item-content-user .date{
+		font-size: 24upx;
+	}
+	.evaluate-item-content-text{
+		padding-top: 20upx;
+	}
+
+	.evaluateLayer{
+		z-index:5;
+		position: fixed;
+		width:600upx;
+		height:570upx;
+		background-color: #fff;
+		border-radius:10upx ;
+		top:25vh;
+		left: 75upx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: space-around;
+		font-size: 28upx;
+	}
+	.evaluateLayer text{
+		margin-top: 20upx;
+	}
+	.evaluateLayer textarea{
+		width: 560upx;
+		padding: 20upx;
+		border: solid 1upx #111A34;
+		border-radius: 10upx;
+	}
+	.evaluateLayerBtn{
+		width: 560upx;
+		display: flex;
+		justify-content:space-around;
+	}
+	.evaluateLayerBtn .confirm{
+		width: 200upx;
+		height: 80upx;
+		background-color: #5193ff;
+		color: #FFF;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 10upx;
+	}
+	.evaluateLayerBtn .cancel{
+		width: 200upx;
+		height: 80upx;
+		background-color: #cccccc;
+		color: #FFF;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		border-radius: 10upx;
+	}
+	.categroy{
+		width:750upx;
+		padding: 20upx 20upx;
+		display:flex;
+		flex-wrap: wrap;
+	}
+	.categroy-item{
+		width: 174.5upx;
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+		margin-top: 50upx;
+	}
+	.categroy-item-img{
+		width: 80upx;
+		height:80upx;
+	}
+	.categroy-item-text{
+		margin-top: 20upx;
+	}
+
+
+</style>
+<style lang="scss">
+	/* 商品列表 */
+	.goods-list{
+		display:flex;
+		flex-wrap:wrap;
+		padding: 30upx 30upx 0;
+		background: #fff;
+		.goods-item{
+			display:flex;
+			flex-direction: column;
+			width: 48%;
+			padding-bottom: 40upx;
+			&:nth-child(2n+1){
+				margin-right: 4%;
+			}
+		}
+		.image-wrapper{
+			width: 100%;
+			height: 330upx;
+			border-radius: 3px;
+			overflow: hidden;
+			image{
+				width: 100%;
+				height: 100%;
+				opacity: 1;
+			}
+		}
+		.title{
+			font-size: $font-lg;
+			color: $font-color-dark;
+			line-height: 80upx;
+		}
+		.price-box{
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding-right: 10upx;
+			font-size: 24upx;
+			color: $font-color-light;
+		}
+		.price{
+			font-size: $font-lg;
+			color: $uni-color-primary;
+			line-height: 1;
+			&:before{
+				content: '￥';
+				font-size: 26upx;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/index.vue b/mallplusui-uniapp-app2/pagesC/store/index.vue
new file mode 100644
index 0000000..f4bb841
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/index.vue
@@ -0,0 +1,365 @@
+<template>
+	<view class="content" style="padding-top: 0upx;">
+
+        <!-- #ifdef MP-WEIXIN -->
+        <view class="subscription-notice" v-if="suTip">
+            <view>
+                <image class="icon" src="/static/image/subscription-tip.png" mode=""></image>
+                <text>订阅消息，及时获取订单最新动态</text>
+            </view>
+            <view>
+                <text class="subscription-notice-btn red-price" @click="toSubscription()">消息订阅</text>
+                <text class="subscription-notice-btn-close" @click="toClose()">×</text>
+            </view>
+        </view>
+        <!-- #endif -->
+
+		<jshop :jdata="pageData"></jshop>
+
+		<!-- #ifdef H5 || APP-PLUS-NVUE || APP-PLUS -->
+		<view class="service" @click="showChat()"><image class="icon" src="/static/image/seller-content.png" mode=""></image></view>
+		<!-- #endif -->
+		<!-- #ifdef MP-WEIXIN -->
+		<button class="service" hover-class="none" open-type="contact" bindcontact="showChat" :session-from="kefupara">
+			<image class="icon" src="/static/image/seller-content.png" mode=""></image>
+		</button>
+		<!-- #endif -->
+		<!-- #ifdef MP-ALIPAY -->
+		<contact-button class="service icon" icon="/static/image/seller-content.png" size="80rpx*80rpx" tnt-inst-id="WKPKUZXG" scene="SCE00040186" hover-class="none" />
+		<!-- #endif -->
+		<!-- #ifdef MP-TOUTIAO -->
+		<!-- 头条客服 -->
+		<!-- #endif -->
+		<red-bag v-if="redBagShow" @click="handleGet"></red-bag>
+
+	</view>
+</template>
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import jshop from '@/components/jshop/jshop.vue';
+
+import uniCountdown from '@/components/uni-countdown/uni-countdown.vue';
+import redBag from '@/components/red-bag/index';
+import { goods } from '@/config/mixins.js';
+import { goBack } from '@/config/mixins.js';
+export default {
+	mixins: [goods],
+	components: {
+		mallplusCopyright,
+		jshop,
+		uniCountdown,
+		redBag
+	},
+	data() {
+		return {
+		topmenu:{},
+			imageUrl: '/static/image/share_image.png', //店铺分享图片
+			pageData: [],
+			pageTitle: [],
+			pageCode: 'mobile_home', //页面布局编码
+			pintuan: [], //拼团列表,
+			redBagShow: false, //红包
+			config: '', //配置信息
+			userInfo: {}, // 用户信息
+			kefupara: '', //客服传递资料
+			id:0,
+			copy: false,
+			suTipStatus: false,
+            shareUrl: '/pages/share/jump'
+		};
+	},
+	updated() {
+		this.copy = true;
+	},
+	computed: {
+		appTitle() {
+			return this.pageTitle.pageName;
+		},
+		// 获取店铺联系人手机号
+		shopMobile() {
+			return this.$store.state.config.shop_mobile || 0;
+		},
+		suTip() {
+			return this.suTipStatus;
+		}
+	},
+	onLoad(e) {
+	this.id=e.id;
+		this.initData();
+		if (this.pageTitle.pageName) {
+			uni.setNavigationBarTitle({
+				title:  this.pageTitle.pageName
+			});
+		}
+	},
+	onShow() {
+		// #ifdef MP-WEIXIN
+		this.userIsSubscription();
+		// #endif
+	},
+	methods: {
+		//领取红包
+		handleGet() {},
+		destroyed() {
+			window.removeEventListener('scroll', this.handleScroll);
+		},
+		goSearch() {
+			uni.navigateTo({
+				url: './search'
+			});
+		},
+		// 首页初始化获取数据
+	async	initData() {
+		let params={type:2,storeId:this.id};
+	let res = await Api.apiCall('get',Api.index.diyDetail,params);
+	console.log(res)
+			let items = JSON.parse(res.datas)
+
+console.log(items.currentTemplate)
+			items.currentTemplate.forEach((item)=> {
+                  if (item.id == 'topmenu') {
+                   this.topmenu = item;
+                    if (item.data[0] == undefined) {
+                      var linkurl = '';
+                    } else {
+                      var linkurl = item.data[0].linkurl;
+                      core.get('diypage/getInfo', {
+                        dataurl: linkurl
+                      }, function(ret) {
+                        //console.log(ret);
+                        item.data[0].data = ret.goods.list;
+                      });
+                    }
+
+                  }
+
+                  if (item.id == 'seckillgroup') {
+                    var data = {};
+                    data.status = item.data.status;
+                    data.endtime = item.data.endtime;
+                    data.starttime = item.data.starttime;
+                    $this.initSeckill(data);
+                  }
+                });
+                this.pageData = items.currentTemplate;
+                this.pageTitle =items.basicOption;
+                setTimeout(() => {
+                							this.showLoad = false;
+                						}, 600);
+			//获取首页配置
+
+			var _this = this;
+			if (this.$db.get('userToken')) {
+				this.$api.userInfo({}, res => {
+					if (res.status) {
+						_this.userInfo = res.data;
+						// #ifdef MP-WEIXIN
+						//微信小程序打开客服时，传递用户信息
+						var kefupara = {};
+						kefupara.nickName = res.data.nickname;
+						kefupara.tel = res.data.mobile;
+						_this.kefupara = JSON.stringify(kefupara);
+						// #endif
+					}
+				});
+			}
+
+			// #ifdef MP-WEIXIN
+			this.userIsSubscription();
+			// #endif
+            
+          //  this.getShareUrl();
+		},
+		//在线客服,只有手机号的，请自己替换为手机号
+		showChat() {
+			// #ifdef H5
+			let _this = this;
+			window._AIHECONG('ini', {
+				entId: this.config.ent_id,
+				button: false,
+				appearance: {
+					panelMobile: {
+						tone: '#FF7159',
+						sideMargin: 30,
+						ratio: 'part',
+						headHeight: 50
+					}
+				}
+			});
+			//传递客户信息
+			window._AIHECONG('customer', {
+				head: _this.userInfo.avatar,
+				名称: _this.userInfo.nickname,
+				手机: _this.userInfo.mobile
+			});
+			window._AIHECONG('showChat');
+			// #endif
+
+			// 客服页面
+			// #ifdef APP-PLUS || APP-PLUS-NVUE
+			this.$common.navigateTo('../customer_service/index');
+			// #endif
+
+			// 头条系客服
+			// #ifdef MP-TOUTIAO
+			if (this.shopMobile != 0) {
+				let _this = this;
+				tt.makePhoneCall({
+					phoneNumber: this.shopMobile.toString(),
+					success(res) {},
+					fail(res) {}
+				});
+			} else {
+				_this.$common.errorToShow('暂无设置客服电话');
+			}
+			// #endif
+		},
+		//前往订阅
+		toSubscription() {
+			this.$common.navigateTo('/pages/member/setting/subscription/index');
+		},
+		//查询用户订阅
+		userIsSubscription() {
+			let userToken = this.$db.get('userToken');
+			if (userToken && userToken != '') {
+				this.$api.subscriptionIsTip(res => {
+					if (res.status) {
+						if (res.data) {
+							this.suTipStatus = true;
+						} else {
+							this.suTipStatus = false;
+						}
+					} else {
+						this.suTipStatus = true;
+					}
+				});
+			} else {
+				this.suTipStatus = true;
+			}
+		},
+		//关闭订阅
+		toClose() {
+			let userToken = this.$db.get('userToken');
+			if (userToken && userToken != '') {
+				this.$api.subscriptionCloseTip(res => {
+					this.suTipStatus = false;
+				});
+			} else {
+				this.suTipStatus = false;
+			}
+		},
+        //获取分享URL
+        getShareUrl() {
+            let data = {
+                client: 2,
+                url: "/pages/share/jump",
+                type: 1,
+                page: 1,
+            };
+            let userToken = this.$db.get('userToken');
+            if (userToken && userToken != '') {
+            	data['token'] = userToken;
+            }
+            this.$api.share(data, res => {
+                this.shareUrl = res.data
+            });
+        }
+	},
+	onPullDownRefresh() {
+		this.initData();
+		uni.stopPullDownRefresh();
+	},
+	//分享
+	onShareAppMessage() {
+		return {
+			title: this.$store.state.config.share_title,
+			// #ifdef MP-ALIPAY
+			desc: this.$store.state.config.share_desc,
+			// #endif
+			imageUrl: this.$store.state.config.share_image,
+			path: this.shareUrl
+		};
+	},
+	// #ifdef MP-WEIXIN || APP-PLUS || APP-PLUS-NVUE
+	onPageScroll() {
+		var _this = this;
+		const query = uni.createSelectorQuery();
+		query
+			.select('.content >>> .search')
+			.boundingClientRect(function(res) {
+				if (res) {
+					if (res.top < 0) {
+						_this.$store.commit('searchFixed', true);
+					} else {
+						_this.$store.commit('searchFixed', false);
+					}
+				}
+			})
+			.exec();
+	}
+	//#endif
+};
+</script>
+
+<style>
+.cell-item {
+	border: none;
+}
+
+.cell-ft-text {
+	font-size: 22upx;
+	color: #999;
+}
+
+.service {
+	width: 80rpx;
+	height: 80rpx;
+	background-color: #fff;
+	border-radius: 50%;
+	position: fixed;
+	right: 30rpx;
+	bottom: 120rpx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	box-shadow: 0 0 10rpx #ccc;
+	padding: 0;
+	z-index: 996;
+}
+.service .icon {
+	width: 60rpx;
+	height: 60rpx;
+}
+.subscription-notice {
+	background-color: #ffffff;
+	box-shadow: 0 2rpx 18rpx #eeeeee;
+	position: relative;
+	z-index: 99;
+	height: 66rpx;
+	line-height: 66rpx;
+	padding: 0 20rpx;
+	font-size: 28rpx;
+	color: #333333;
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+}
+.subscription-notice > view {
+	display: flex;
+	align-items: center;
+}
+.subscription-notice .icon {
+	width: 32rpx;
+	height: 32rpx;
+	margin-right: 10rpx;
+}
+.subscription-notice-btn {
+	color: #4285f4;
+}
+.subscription-notice-btn-close {
+	color: #888888;
+	padding-left: 10px;
+	font-size: 30rpx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/list.vue b/mallplusui-uniapp-app2/pagesC/store/list.vue
new file mode 100644
index 0000000..5c090e7
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/list.vue
@@ -0,0 +1,279 @@
+<template>
+	<view class="content">
+		<view class="goods-list">
+			<view v-for="(item, index) in storeList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.logo" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			storeList: []
+		};
+	},
+
+	async onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		let params = {};
+		let list = await Api.apiCall('get', Api.member.storeList, params);
+		console.log(list);
+		this.storeList = list;
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+
+	methods: {
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesC/store/store?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/school.vue b/mallplusui-uniapp-app2/pagesC/store/school.vue
new file mode 100644
index 0000000..f88035f
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/school.vue
@@ -0,0 +1,742 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<view class="image-wrapper"><image :src="detailData.pic" class="loaded" mode="aspectFill"></image></view>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ detailData.name }}</text>
+
+			<view class="bot-row">
+				<text>销量: 6</text>
+				<text>库存: {{ detailData.stock }}</text>
+				<text>浏览量: {{ detailData.hit }}</text>
+			</view>
+		</view>
+
+		<!--  分享 -->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b">
+				<text class="tit">服务</text>
+				<view class="bz-list con">
+					<text>7天无理由退换货 ·</text>
+					<text>假一赔十 ·</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="">
+			<view class="hot-floor" v-if="goodsList.length > 0">
+				<view v-for="(item, index) in goodsList" :key="index" class="floor-item" @click="navToDetailPage(item)">
+					<image :src="item.pic" mode="aspectFill"></image>
+					<text class="title clamp">{{ item.name }}</text>
+					<text class="price">￥{{ item.price }}</text>
+				</view>
+			</view>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(detailData)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+		</view>
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+		share
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			favorite: true,
+			shareList: [],
+			cat_list: [],
+
+			desc: `
+					<div style="width:100%">
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i4/479184430/O1CN01nCpuLc1iaz4bcSN17_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd2.alicdn.com/imgextra/i2/479184430/O1CN01gwbN931iaz4TzqzmG_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd3.alicdn.com/imgextra/i3/479184430/O1CN018wVjQh1iaz4aupv1A_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd4.alicdn.com/imgextra/i4/479184430/O1CN01tWg4Us1iaz4auqelt_!!479184430.jpg_400x400.jpg" />
+						<img style="width:100%;display:block;" src="https://gd1.alicdn.com/imgextra/i1/479184430/O1CN01Tnm1rU1iaz4aVKcwP_!!479184430.jpg_400x400.jpg" />
+					</div>
+				`,
+			goodsList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.member.schoolDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data;
+				this.detailData = detailData;
+				this.goodsList = data.goodsList;
+				this.loaded = true;
+
+				uni.setNavigationBarTitle({
+					title: detailData.name
+				});
+			}
+		}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 6, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		async jifenPay(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			let params = { goodsId: id };
+			data = await Api.apiCall('post', Api.order.jifenPay, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/schoolList.vue b/mallplusui-uniapp-app2/pagesC/store/schoolList.vue
new file mode 100644
index 0000000..977cd64
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/schoolList.vue
@@ -0,0 +1,386 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>热度</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList(fid, sid) {
+			let params = {};
+			let list = await Api.apiCall('get', Api.goods.typeGiftList, params);
+			//let list = await this.$api.json('cateList');
+			let cateList = list.filter(item => item.pid == null);
+
+			cateList.forEach(item => {
+				let tempList = list.filter(val => val.pid == item.id);
+				item.child = tempList;
+			});
+			this.cateList = cateList;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.member.schoolList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.is985 - a.is985);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.hot - b.hot;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			console.log(item.id);
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesC/store/school?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/store.vue b/mallplusui-uniapp-app2/pagesC/store/store.vue
new file mode 100644
index 0000000..074ed4b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/store.vue
@@ -0,0 +1,1039 @@
+<template>
+	<view class="container">
+		<!-- 小程序头部兼容 -->
+		<!-- #ifdef MP -->
+		<view class="MP-search" @click="search()" style=""><input class="MP-search-input" type="text" disabled="true" placeholder="输入关键字搜索" /></view>
+		<!-- #endif -->
+
+		<!-- 头部轮播 -->
+
+		
+		<view class="carousel-section">
+			
+			<!-- 标题栏和状态栏占位符 -->
+			<view class="titleNview-placing"></view>
+			<!-- 背景色区域 -->
+			<view class="titleNview-background" :style="{ backgroundColor: titleNViewBackground }"></view>
+			<swiper class="carousel" circular @change="swiperChange">
+				<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item" @click="navToDetailPageL(item.url)"><image :src="item.pic" /></swiper-item>
+			</swiper>
+			<!-- 自定义swiper指示器 -->
+			<view class="swiper-dots">
+				<text class="num">{{ swiperCurrent + 1 }}</text>
+				<text class="sign">/</text>
+				<text class="num">{{ swiperLength }}</text>
+			</view>
+		</view>
+		<!-- 分类 -->
+		<view class="cate-section" v-if="cat_list && cat_list.length > 0">
+			<view class="cate-item" @click="navToTabPageList(item1)" v-for="(item1, index) in cat_list" :key="index">
+				<image :src="item1.pic"></image>
+				<text>{{ item1.name }}</text>
+			</view>
+		</view>
+		<view class="cate-section" v-if="cat_list1 && cat_list1.length > 0">
+			<view class="cate-item" @click="navToTabPageList(item1)" v-for="(item1, index) in cat_list1" :key="index">
+				<image :src="item1.pic"></image>
+				<text>{{ item1.name }}</text>
+			</view>
+		</view>
+		<!--分享-->
+		<view class="share-section" @click="share">
+			<view class="share-icon">
+				<text class="yticon icon-xingxing"></text>
+				返
+			</view>
+			<text class="tit">该商品分享可领49减10红包</text>
+			<text class="yticon icon-bangzhu1"></text>
+			<view class="share-btn">
+				立即分享
+				<text class="yticon icon-you"></text>
+			</view>
+		</view>
+		<!-- 推荐 -->
+		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+			<image src="/static/temp/h1.png"></image>
+			<view class="tit-box">
+				<text class="tit">店铺推荐</text>
+				<text class="tit2">Guess You Like It</text>
+			</view>
+			<text class="yticon icon-you"></text>
+		</view>
+
+		<view class="guess-section">
+			<view v-for="(item, index) in hotProductList" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<text class="price">￥{{ item.price }}</text>
+			</view>
+		</view>
+
+		<!-- 新品上市 -->
+		<view class="f-header m-t" @click="navToTabPage('../../pagesA/product/list')">
+			<image src="/static/temp/h1.png"></image>
+			<view class="tit-box">
+				<text class="tit">新品上市</text>
+				<text class="tit2">Guess You Like It</text>
+			</view>
+			<text class="yticon icon-you"></text>
+		</view>
+
+		<view class="guess-section">
+			<view v-for="(item, index) in newProductList" :key="index" class="guess-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<text class="price">￥{{ item.price }}</text>
+			</view>
+		</view>
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import coupon from '@/components/coolc-coupon/coolc-coupon';
+
+import { formatDate } from '@/common/date';
+import { mapState } from 'vuex';
+import navBar from '@/components/zhouWei-navBar';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import share from '@/components/share';
+export default {
+	components: {
+		coupon,
+		mallplusCopyright,
+		uniLoadMore,
+		navBar,
+		share
+	},
+	data() {
+		return {
+			keyword: '',
+			pageNum: 1,
+			loadingType: 'more', //加载更多状态
+			titleNViewBackground: '',
+			swiperCurrent: 0,
+			id: 0,
+			swiperLength: 0,
+			shareList: [],
+			carouselList: [],
+			hotProductList: [],
+			brandList: [], // 推荐品牌
+			homeFlashPromotion: [], // 当前秒杀场次
+			subjectList: [], //推荐专题
+			cat_list: [],
+			cat_list1: [],
+			groupHotGoodsList: [],
+			couponList: [],
+			newProductList: []
+		};
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+
+		this.getNewProductList();
+	},
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.getNewProductList('refresh');
+
+		this.loadData();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 2000);
+	},
+
+	onShareAppMessage() {},
+	async onLoad(ops) {
+		if (ops.id && ops.id != undefined) {
+			this.id = ops.id;
+		} else {
+			this.id = 0;
+		}
+		this.loadData();
+		let params = { id: this.id };
+		let store = await Api.apiCall('get', Api.member.storeDetail1, params);
+		this.getNewProductList('refresh');
+
+		uni.setNavigationBarTitle({
+			title: store.name
+		});
+		console.log(store);
+		let logo = store.logo;
+		let name = store.name;
+		console.log(logo);
+		console.log(name);
+		const shareList = [
+			{
+				type: 1,
+				icon: logo,
+				text: name
+			}
+		];
+		this.shareList = shareList;
+	},
+
+	methods: {
+		/**
+		 *
+		 * 加载首页数据
+		 */
+		async loadData() {
+			this.loadData2();
+		},
+
+		/**
+		 * 获取轮播图
+		 */
+		async getBanner() {
+			let params = {};
+			let data = await Api.apiCall('get', Api.index.bannerList, params);
+			if (data) {
+				this.carouselList = data || [];
+				this.swiperLength = this.carouselList.length;
+				this.titleNViewBackground = 'rgb(203, 87, 60)';
+			}
+		},
+
+		/**
+		 * 获取新品上市信息
+		 */
+		async getNewProductList(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params = { pageNum: this.pageNum, storeId: this.id };
+			let list = await Api.apiCall('get', Api.goods.goodsList, params);
+
+			let goodsList = list.records;
+
+			if (type === 'refresh') {
+				this.newProductList = [];
+			}
+
+			this.newProductList = this.newProductList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.newProductList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+
+		/**
+		 * 获取团购信息
+		 */
+		async getHotGoodsList() {
+			let params = {};
+			let groupHotGoodsList = await Api.apiCall('get', Api.goods.groupHotGoodsList, params);
+			this.groupHotGoodsList = groupHotGoodsList;
+		},
+
+		/**
+		 * 获取秒杀列表信息
+		 */
+		async getFlashPromotion() {
+			let params = {};
+			let data = await Api.apiCall('get', Api.index.homeFlashPromotionList, params);
+			if (data) {
+				let homeFlashPromotion = data;
+				if (homeFlashPromotion.length > 0) {
+					this.homeFlashPromotion = homeFlashPromotion[0];
+				}
+			}
+		},
+
+		/**
+		 * 获取分类精选列表信息
+		 */
+		async getCatList() {
+			let params = {};
+			let data = await Api.apiCall('get', Api.goods.newProductList, params);
+			if (data) {
+				let cat_list = data;
+				this.cat_list = cat_list || [];
+			}
+		},
+
+		/**
+		 * 请求静态数据只是为了代码不那么乱
+		 * 分次请求未作整合
+		 */
+		async loadData2() {
+			let params = { id: this.id };
+			let data = await Api.apiCall('get', Api.member.store, params);
+
+			if (data) {
+				this.carouselList = data.advertiseList || [];
+				this.swiperLength = this.carouselList.length;
+				this.titleNViewBackground = 'rgb(203, 87, 60)';
+
+				let cat_list = data.categoryList;
+				this.cat_list = cat_list || [];
+				this.cat_list1 = data.categoryList1;
+
+				let hotProductList = data.hotProductList;
+				this.hotProductList = hotProductList || [];
+			}
+		},
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		},
+		//轮播图切换修改背景色
+		swiperChange(e) {
+			const index = e.detail.current;
+			this.swiperCurrent = index;
+			this.titleNViewBackground = this.carouselList[index].background;
+		},
+		navToTabPage(url) {
+			uni.navigateTo({
+				url: url
+			});
+		},
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		navToTabPageList(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/list?productAttributeCategoryId=${id}`
+			});
+		},
+		//详情页
+		navToDetailPageL(url) {
+			window.location.href = url;
+		},
+		//详情页
+		navToCouponDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		async acceptCoupon(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+
+			let params = { couponId: item.id };
+			let data = await Api.apiCall('post', Api.index.acceptCoupon, params);
+			console.log(data);
+			if (data) {
+				this.$api.msg(data);
+			}
+			uni.hideLoading();
+		},
+		navToSkillDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+
+			uni.navigateTo({
+				url: `../../pagesA/product/secskillDetail?id=${id}`
+			});
+		},
+
+		navToGroupDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.goodsId;
+			let groupId = item.groupId;
+			uni.navigateTo({
+				url: `../../pagesA/product/groupProduct?id=${id}&&groupId=&{groupId}`
+			});
+		},
+		navToList() {
+			uni.navigateTo({
+				url: `../../pagesA/product/list`
+			});
+		},
+		search() {
+			uni.navigateTo({
+				url: '/pages/search/search'
+			});
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		}
+	},
+
+	// 标题栏input搜索框点击
+	onNavigationBarSearchInputClicked: async function(e) {
+		uni.navigateTo({
+			url: '/pages/search/search'
+		});
+	},
+	//点击导航栏 buttons 时触发
+	onNavigationBarButtonTap(e) {
+		const index = e.index;
+		if (index === 0) {
+			this.$api.msg('点击了扫描');
+		} else if (index === 1) {
+			// #ifdef APP-PLUS
+			const pages = getCurrentPages();
+			const page = pages[pages.length - 1];
+			const currentWebview = page.$getAppWebview();
+			currentWebview.hideTitleNViewButtonRedDot({
+				index
+			});
+			// #endif
+			uni.navigateTo({
+				url: '../../pagesU/notice/notice'
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+.MP-search {
+	background: #ffffff;
+	height: 80upx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: fixed;
+	width: 100%;
+	z-index: 999;
+}
+.MP-search-input {
+	font-size: 28upx;
+	background: #f5f5f5;
+	height: 60upx;
+	width: 90%;
+	border-radius: 50upx;
+	text-align: center;
+}
+.mp-search-box {
+	position: absolute;
+	left: 0;
+	top: 30upx;
+	z-index: 9999;
+	width: 100%;
+	padding: 0 80upx;
+	.ser-input {
+		flex: 1;
+		height: 60upx;
+		line-height: 60upx;
+		text-align: center;
+		font-size: 28upx;
+		color: $font-color-base;
+		border-radius: 20px;
+		background: rgba(255, 255, 255, 0.6);
+	}
+}
+page {
+	.cate-section {
+		position: relative;
+		z-index: 5;
+		border-radius: 16upx 16upx 0 0;
+		margin-top: -20upx;
+	}
+	.carousel-section {
+		padding: 0;
+		.titleNview-placing {
+			padding-top: 0;
+			height: 0;
+		}
+		.carousel {
+			.carousel-item {
+				padding: 0;
+			}
+		}
+		.swiper-dots {
+			left: 45upx;
+			bottom: 40upx;
+		}
+	}
+}
+
+page {
+	background: #f5f5f5;
+}
+.m-t {
+	margin-top: 20upx;
+}
+/* 头部 轮播图 */
+.carousel-section {
+	position: relative;
+	padding-top: 10px;
+
+	.titleNview-placing {
+		height: var(--status-bar-height);
+		padding-top: 44px;
+		box-sizing: content-box;
+	}
+
+	.titleNview-background {
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 426upx;
+		transition: 0.4s;
+	}
+}
+.carousel {
+	width: 100%;
+	height: 350upx;
+
+	.carousel-item {
+		width: 100%;
+		height: 100%;
+		padding: 0 28upx;
+		overflow: hidden;
+	}
+
+	image {
+		width: 100%;
+		height: 100%;
+		border-radius: 10upx;
+	}
+}
+.swiper-dots {
+	display: flex;
+	position: absolute;
+	left: 60upx;
+	bottom: 15upx;
+	width: 72upx;
+	height: 36upx;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABkCAYAAADDhn8LAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTMyIDc5LjE1OTI4NCwgMjAxNi8wNC8xOS0xMzoxMzo0MCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OTk4MzlBNjE0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OTk4MzlBNjA0NjU1MTFFOUExNjRFQ0I3RTQ0NEExQjMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIDIwMTcgKFdpbmRvd3MpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6Q0E3RUNERkE0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiIHN0UmVmOmRvY3VtZW50SUQ9InhtcC5kaWQ6Q0E3RUNERkI0NjExMTFFOTg5NzI4MTM2Rjg0OUQwOEUiLz4gPC9yZGY6RGVzY3JpcHRpb24+IDwvcmRmOlJERj4gPC94OnhtcG1ldGE+IDw/eHBhY2tldCBlbmQ9InIiPz4Gh5BPAAACTUlEQVR42uzcQW7jQAwFUdN306l1uWwNww5kqdsmm6/2MwtVCp8CosQtP9vg/2+/gY+DRAMBgqnjIp2PaCxCLLldpPARRIiFj1yBbMV+cHZh9PURRLQNhY8kgWyL/WDtwujjI8hoE8rKLqb5CDJaRMJHokC6yKgSCR9JAukmokIknCQJpLOIrJFwMsBJELFcKHwM9BFkLBMKFxNcBCHlQ+FhoocgpVwwnv0Xn30QBJGMC0QcaBVJiAMiec/dcwKuL4j1QMsVCXFAJE4s4NQA3K/8Y6DzO4g40P7UcmIBJxbEesCKWBDg8wWxHrAiFgT4fEGsB/CwIhYE+AeBAAdPLOcV8HRmWRDAiQVcO7GcV8CLM8uCAE4sQCDAlHcQ7x+ABQEEAggEEAggEEAggEAAgQACASAQQCCAQACBAAIBBAIIBBAIIBBAIABe4e9iAe/xd7EAJxYgEGDeO4j3EODp/cOCAE4sYMyJ5cwCHs4rCwI4sYBxJ5YzC84rCwKcXxArAuthQYDzC2JF0H49LAhwYUGsCFqvx5EF2T07dMaJBetx4cRyaqFtHJ8EIhK0i8OJBQxcECuCVutxJhCRoE0cZwMRyRcFefa/ffZBVPogePihhyCnbBhcfMFFEFM+DD4m+ghSlgmDkwlOgpAl4+BkkJMgZdk4+EgaSCcpVX7bmY9kgXQQU+1TgE0c+QJZUUz1b2T4SBbIKmJW+3iMj2SBVBWz+leVfCQLpIqYbp8b85EskIxyfIOfK5Sf+wiCRJEsllQ+oqEkQfBxmD8BBgA5hVjXyrBNUQAAAABJRU5ErkJggg==);
+	background-size: 100% 100%;
+
+	.num {
+		width: 36upx;
+		height: 36upx;
+		border-radius: 50px;
+		font-size: 24upx;
+		color: #fff;
+		text-align: center;
+		line-height: 36upx;
+	}
+
+	.sign {
+		position: absolute;
+		top: 0;
+		left: 50%;
+		line-height: 36upx;
+		font-size: 12upx;
+		color: #fff;
+		transform: translateX(-50%);
+	}
+}
+/* 分类 */
+.cate-section {
+	display: flex;
+	justify-content: space-around;
+	align-items: center;
+	flex-wrap: wrap;
+	padding: 30upx 22upx;
+	background: #fff;
+	.cate-item {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+	}
+	/* 原图标颜色太深,不想改图了,所以加了透明度 */
+	image {
+		width: 88upx;
+		height: 88upx;
+		margin-bottom: 14upx;
+		border-radius: 50%;
+		opacity: 0.7;
+		box-shadow: 4upx 4upx 20upx rgba(250, 67, 106, 0.3);
+	}
+}
+.ad-1 {
+	width: 100%;
+	height: 210upx;
+	padding: 10upx 0;
+	background: #fff;
+	image {
+		width: 100%;
+		height: 100%;
+	}
+}
+/* 秒杀专区 */
+.seckill-section {
+	padding: 0upx 20upx 20upx;
+	background: #fff;
+	.s-header {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		line-height: 1;
+		.s-img {
+			width: 140upx;
+			height: 30upx;
+		}
+		.tip {
+			font-size: $font-base;
+			color: $font-color-light;
+			// margin: 0 20upx 0 40upx;
+		}
+		.timer {
+			display: inline-block;
+			width: 40upx;
+			height: 36upx;
+			text-align: center;
+			line-height: 36upx;
+			margin-right: 14upx;
+			font-size: $font-sm + 2upx;
+			color: #fff;
+			border-radius: 2px;
+			background: rgba(0, 0, 0, 0.8);
+		}
+		.icon-you {
+			font-size: $font-lg;
+			color: $font-color-light;
+			flex: 1;
+			text-align: right;
+		}
+	}
+	.floor-list {
+		white-space: nowrap;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 150upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 150upx;
+			height: 150upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+}
+
+.f-header {
+	display: flex;
+	align-items: center;
+	height: 140upx;
+	padding: 0upx 20upx;
+	background: #fff;
+	image {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		margin-right: 20upx;
+	}
+	.tit-box {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+	}
+	.tit {
+		font-size: $font-lg + 2upx;
+		color: #font-color-dark;
+		line-height: 1.3;
+	}
+	.tit2 {
+		font-size: $font-sm;
+		color: $font-color-light;
+	}
+	.icon-you {
+		font-size: $font-lg + 2upx;
+		color: $font-color-light;
+	}
+}
+/* 团购楼层 */
+.group-section {
+	background: #fff;
+	.g-swiper {
+		height: 650upx;
+		padding-bottom: 20upx;
+	}
+	.g-swiper-item {
+		width: 100%;
+		padding: 0 20upx;
+		display: flex;
+	}
+	image {
+		width: 100%;
+		height: 460upx;
+		border-radius: 4px;
+	}
+	.g-item {
+		display: flex;
+		flex-direction: column;
+		overflow: hidden;
+	}
+	.left {
+		flex: 1.2;
+		// margin-right: 24upx;
+		.t-box {
+			padding-top: 20upx;
+		}
+	}
+	.right {
+		flex: 0.8;
+		flex-direction: column-reverse;
+		.t-box {
+			padding-bottom: 20upx;
+		}
+	}
+	.t-box {
+		height: 160upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		line-height: 1.6;
+	}
+	.price {
+		color: $uni-color-primary;
+	}
+	.m-price {
+		font-size: $font-sm + 2upx;
+		text-decoration: line-through;
+		color: $font-color-light;
+		margin-left: 8upx;
+	}
+	.pro-box {
+		display: flex;
+		align-items: center;
+		margin-top: 10upx;
+		font-size: $font-sm;
+		color: $font-base;
+		padding-right: 10upx;
+	}
+	.progress-box {
+		flex: 1;
+		border-radius: 10px;
+		overflow: hidden;
+		margin-right: 8upx;
+	}
+}
+/* 分类推荐楼层 */
+.hot-floor {
+	width: 100%;
+	overflow: hidden;
+	margin-bottom: 20upx;
+	.floor-img-box {
+		width: 100%;
+		height: 320upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 0;
+			width: 100%;
+			height: 100%;
+			background: linear-gradient(rgba(255, 255, 255, 0.06) 30%, #f8f8f8);
+		}
+	}
+	.floor-img {
+		width: 100%;
+		height: 100%;
+	}
+	.floor-list {
+		white-space: nowrap;
+		padding: 20upx;
+		padding-right: 50upx;
+		border-radius: 6upx;
+		margin-top: -140upx;
+		margin-left: 30upx;
+		background: #fff;
+		box-shadow: 1px 1px 5px rgba(0, 0, 0, 0.2);
+		position: relative;
+		z-index: 1;
+	}
+	.scoll-wrapper {
+		display: flex;
+		align-items: flex-start;
+	}
+	.floor-item {
+		width: 180upx;
+		margin-right: 20upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		line-height: 1.8;
+		image {
+			width: 180upx;
+			height: 180upx;
+			border-radius: 6upx;
+		}
+		.price {
+			color: $uni-color-primary;
+		}
+	}
+	.more {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		flex-shrink: 0;
+		width: 180upx;
+		height: 180upx;
+		border-radius: 6upx;
+		background: #f3f3f3;
+		font-size: $font-base;
+		color: $font-color-light;
+		text:first-child {
+			margin-bottom: 4upx;
+		}
+	}
+}
+/* 单条商品 */
+.goods-box-single {
+	display: flex;
+	padding: 20upx 0;
+	.goods-img {
+		display: block;
+		width: 120upx;
+		height: 120upx;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		padding: 0 30upx 0 24upx;
+		overflow: hidden;
+		.title {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			line-height: 1;
+		}
+		.attr-box {
+			font-size: $font-sm + 2upx;
+			color: $font-color-light;
+			padding: 10upx 12upx;
+		}
+		.price {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+}
+
+.price-box {
+	display: flex;
+	justify-content: flex-end;
+	align-items: baseline;
+	padding: 20upx 30upx;
+	font-size: $font-sm + 2upx;
+	color: $font-color-light;
+	.num {
+		margin: 0 8upx;
+		color: $font-color-dark;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		&:before {
+			content: '￥';
+			font-size: $font-sm;
+			margin: 0 2upx 0 8upx;
+		}
+	}
+}
+.action-box {
+	display: flex;
+	justify-content: flex-end;
+	align-items: center;
+	height: 100upx;
+	position: relative;
+	padding-right: 30upx;
+}
+.action-btn {
+	width: 160upx;
+	height: 60upx;
+	margin: 0;
+	margin-left: 24upx;
+	padding: 0;
+	text-align: center;
+	line-height: 60upx;
+	font-size: $font-sm + 2upx;
+	color: $font-color-dark;
+	background: #fff;
+	border-radius: 100px;
+	&:after {
+		border-radius: 100px;
+	}
+	&.recom {
+		background: #fff9f9;
+		color: $base-color;
+		&:after {
+			border-color: #f7bcc8;
+		}
+	}
+}
+
+/* 猜你喜欢 */
+.guess-section {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.guess-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+	}
+	.coupon_box {
+		width: 100%;
+		height: auto;
+		display: table;
+		padding: 6upx 26upx 26upx 26upx;
+	}
+
+	.other_type {
+		width: 100%;
+		height: 90upx;
+		padding-top: 50upx;
+
+		.text {
+			width: 100%;
+			border-top: 1px solid #eeeeee;
+			display: block;
+			text-align: center;
+			position: relative;
+		}
+		.text span {
+			width: 180upx;
+			height: 40upx;
+			line-height: 40upx;
+			color: #999999;
+			display: block;
+			background: #ffffff;
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			margin-left: -90upx;
+			margin-top: -20upx;
+			font-size: $font-base;
+		}
+	}
+}
+.getPosition {
+	height: 100upx;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	font-size: 32upx;
+	background-color: #fff;
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/storeList.vue b/mallplusui-uniapp-app2/pagesC/store/storeList.vue
new file mode 100644
index 0000000..0035613
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/storeList.vue
@@ -0,0 +1,382 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" :class="{ current: filterIndex === 0 }" @click="tabClick(0)">综合排序</view>
+
+			<view class="nav-item" :class="{ current: filterIndex === 2 }" @click="tabClick(2)">
+				<text>价格</text>
+				<view class="p-box">
+					<text :class="{ active: priceOrder === 1 && filterIndex === 2 }" class="yticon icon-shang"></text>
+					<text :class="{ active: priceOrder === 2 && filterIndex === 2 }" class="yticon icon-shang xia"></text>
+				</view>
+			</view>
+			<text class="cate-item yticon icon-fenlei1" @click="toggleCateMask('show')"></text>
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.logo" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.name }}</text>
+				<view class="price-box">
+					<text >浏览{{ item.hit }}</text>
+					<text>收藏 {{item.collect}}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			keyword: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+		this.keyword = options.keyword;
+		this.cateId = options.sid;
+		//this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.member.storeList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+			//筛选，测试数据直接前端筛选了
+			if (this.filterIndex === 1) {
+				goodsList.sort((a, b) => b.sales - a.sales);
+			}
+			if (this.filterIndex === 2) {
+				goodsList.sort((a, b) => {
+					if (this.priceOrder == 1) {
+						return a.price - b.price;
+					}
+					return b.price - a.price;
+				});
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+			this.pageNum = 1;
+			if (this.filterIndex === index && index !== 2) {
+				return;
+			}
+			this.filterIndex = index;
+			if (index === 2) {
+				this.priceOrder = this.priceOrder === 1 ? 2 : 1;
+			} else {
+				this.priceOrder = 0;
+			}
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			console.log(item.id);
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesC/store/store?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 20upx 20upx 0 20upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesC/store/storeResult.vue b/mallplusui-uniapp-app2/pagesC/store/storeResult.vue
new file mode 100644
index 0000000..3e04f12
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesC/store/storeResult.vue
@@ -0,0 +1,95 @@
+<template>
+	<view class="content">
+		<text class="success-icon yticon icon-xuanzhong2"></text>
+		<text class="tit">{{orderInfo.name}}</text>
+		<view class="result-mid red-price" v-if="orderInfo.status==1">
+			申请中----
+		</view>
+		<view class="result-mid red-price" v-if="orderInfo.status==2">
+        			申请拒绝----
+        </view>
+		<view class="btn-group">
+			<navigator url="/pages/order/order?status=0" open-type="redirect" class="mix-btn">用户中心</navigator>
+			<navigator url="/pages/index/user" open-type="switchTab" class="mix-btn hollow">返回首页</navigator>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	export default {
+		components: {
+                		mallplusCopyright
+                	},
+		data() {
+
+			return {
+				paymentId: 0,
+				orderInfo: {}, // 支付单详情
+				orderId: 0,
+				status: false
+			}
+		},
+		async onLoad(options) {
+			console.log(options)
+        		let params = {  };
+        		let data = await Api.apiCall('get', Api.member.storeDetail1, params);
+			console.log(data)
+			this.orderInfo = data.store;
+			if (data.member){
+				uni.setStorageSync('userInfo', data.member);
+			  }
+			} ,
+
+
+
+		methods: {
+			status(time) {
+        			if (time == null || time === '') {
+        				return 'N/A';
+        			}
+        			let date = new Date(time);
+        			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+        		}}
+	};
+</script>
+
+<style lang="scss">
+	.content {
+		display: flex;
+		flex-direction: column;
+		justify-content: center;
+		align-items: center;
+	}
+	.success-icon {
+		font-size: 160upx;
+		color: #fa436a;
+		margin-top: 100upx;
+	}
+	.tit {
+		font-size: 38upx;
+		color: #303133;
+	}
+	.btn-group {
+		padding-top: 100upx;
+	}
+	.mix-btn {
+		margin-top: 30upx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 600upx;
+		height: 80upx;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		&.hollow {
+			background: #fff;
+			color: #303133;
+			border: 1px solid #ccc;
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/address/address.vue b/mallplusui-uniapp-app2/pagesU/address/address.vue
new file mode 100644
index 0000000..d70e754
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/address/address.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="content b-t">
+		<view class="list b-b" v-for="(item, index) in addressList" :key="index">
+			<view class="wrapper" @click="checkAddress(item)">
+				<view class="u-box">
+					<text class="name">{{ item.name }}</text>
+					<text class="mobile">{{ item.phoneNumber }}</text>
+				</view>
+				<view class="address-box">
+					<text v-if="item.defaultStatus == 1" class="tag">默认</text>
+					<text class="address"> {{ item.province }}-{{ item.city }}-{{ item.region }}-{{ item.detailAddress }}</text>
+				</view>
+				
+			</view>
+			<view class="" style="display: flex;flex-direction: row;width: 100%;justify-content: flex-end;">
+				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;" @click="addAddress('edit', item)">
+					<text class="yticon icon-bianji"></text>
+					<text style="font-size: 30upx;margin-left: 10upx;">编辑</text>
+				</view>
+				<view class="" style="width: 20%;display: flex;align-items: center;justify-content: center;" @click="delAddress(item)">
+					<text class="yticon icon-iconfontshanchu1"></text>
+					<text style="font-size: 30upx;">删除</text>
+				</view>
+			</view>
+		</view>
+		<!--<text style="display:block;padding: 16upx 30upx 10upx;lihe-height: 1.6;color: #fa436a;font-size: 24upx;">
+			重要：添加和修改地址回调仅增加了一条数据做演示，实际开发中将回调改为请求后端接口刷新一下列表即可
+		</text>-->
+
+		<button class="add-btn" @click="addAddress('add')">新增地址</button>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+
+import Api from '@/common/api';
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			source: 0,
+			addressList: [],
+		};
+	},
+	async onLoad(option) {
+		this.source = option.source;
+		this.getListAddress()
+	},
+	async onShow(){
+		this.getListAddress()
+	},
+	methods: {
+		async getListAddress(){
+			let params = {};
+			this.addressList = await Api.apiCall('get', Api.goods.listAddress, params);
+		},
+		//选择地址
+		checkAddress(item) {
+			if (this.source == 1) {
+				//this.$api.prePage()获取上一页实例，在App.vue定义
+				this.$api.prePage().addressData = item;
+				this.$api.prePage().addressId = item.id;
+				uni.navigateBack();
+			}
+		},
+		addAddress(type, item) {
+			uni.navigateTo({
+				url: `../../pagesU/address/addressManage?type=${type}&data=${JSON.stringify(item)}`
+			});
+		},
+		//添加或修改成功之后回调
+		refreshList(data, type) {
+			//添加或修改后事件，这里直接在最前面添加了一条数据，实际应用中直接刷新地址列表即可
+			this.addressList.unshift(data);
+
+			console.log(data, type);
+		},
+		// 删除地址
+		async delAddress(item){
+			console.log(item)
+			// let params = {
+			// 	id: item.id
+			// }
+			let data = await Api.apiCall('post', Api.goods.deleteAddress, {id: item.id});
+			if(data){
+				uni.showToast({
+					title: '删除成功',
+				})
+			}else{
+				uni.showToast({
+					title: '删除失败',
+					icon: 'none'
+				})
+			}
+			this.getListAddress();
+			console.log("------删除-------",data)
+		},
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	padding-bottom: 120upx;
+}
+.content {
+	position: relative;
+}
+.list {
+	display: flex;
+	align-items: center;
+	flex-direction: column;
+	padding: 20upx;
+	background: #fff;
+	position: relative;
+}
+.wrapper {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	flex: 1;
+}
+.address-box {
+	display: flex;
+	align-items: center;
+	margin: 10upx 0;
+	.tag {
+		font-size: 24upx;
+		color: $base-color;
+		margin-right: 10upx;
+		background: #fffafb;
+		border: 1px solid #ffb4c7;
+		border-radius: 4upx;
+		padding: 4upx 10upx;
+		line-height: 1;
+	}
+	.address {
+		font-size: 28upx;
+		color: $font-color-light;
+	}
+}
+.u-box {
+	font-size: 32upx;
+	color: $font-color-000;
+	// margin-top: 16upx;
+	.name {
+		margin-right: 30upx;
+	}
+}
+.icon-bianji {
+	// display: flex;
+	// align-items: center;
+	// height: 80upx;
+	font-size: 36upx;
+	color: $font-color-light;
+	// padding-left: 30upx;
+}
+
+.add-btn {
+	position: fixed;
+	left: 30upx;
+	right: 30upx;
+	bottom: 16upx;
+	z-index: 95;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	width: 690upx;
+	height: 80upx;
+	font-size: 32upx;
+	color: #fff;
+	background-color: $base-color;
+	border-radius: 10upx;
+	box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/address/addressManage.vue b/mallplusui-uniapp-app2/pagesU/address/addressManage.vue
new file mode 100644
index 0000000..656781e
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/address/addressManage.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="content">
+
+		<view class="row b-b">
+			<text class="tit">联系人</text>
+			<input class="input" type="text" v-model="addressData.name" placeholder="收货人姓名" placeholder-class="placeholder" />
+		</view>
+		<view class="row b-b">
+			<text class="tit">手机号</text>
+			<input class="input" type="number" maxlength="11" v-model="addressData.phoneNumber" placeholder="收货人手机号码" placeholder-class="placeholder" />
+		</view>
+
+		<view class="row b-b">
+			<text class="tit">城市</text>
+			<input placeholder="请选择城市" disabled="true" :value="addressData.province + ' ' + addressData.city + ' ' + addressData.region" @click="lotusAddressData.visible = true" class="input">
+				<lotus-address v-on:choseVal="choseValue" :lotusAddressData="lotusAddressData"></lotus-address>
+			</input>
+			<text class="yticon icon-shouhuodizhi"></text>
+		</view>
+		<view class="row b-b">
+		<text class="tit">地图:</text>
+
+
+        				<input class="input" @click="openMap()" type="text" value="" v-model="mapAddressName" placeholder="在地图上搜索并选择地址" disabled="true" />
+        				<text class="yticon icon-shouhuodizhi"></text>
+
+        		</view>
+		<view class="row b-b">
+			<text class="tit">详细</text>
+			<input class="input" type="text" v-model="addressData.detailAddress" placeholder="街道、楼号、门牌" placeholder-class="placeholder" />
+		</view>
+
+		<view class="row default-row">
+			<text class="tit">设为默认</text>
+			<switch :checked="addressData.defaultStatus" color="#fa436a" @change="switchChange" />
+		</view>
+		<button class="add-btn" @click="confirm">提交</button>
+	</view>
+</template>
+
+<script>
+import Api from '@/common/api';
+import lotusAddress from "@/components/Winglau14-lotusAddress/Winglau14-lotusAddress.vue"
+	export default {
+		data() {
+			return {
+			mapAddressName: '',
+				addressData: {
+					name: '',
+					phoneNumber: '',
+					province: '',
+					city: '',
+					region: '',
+					detailAddress: '',
+					defaultStatus: 0,
+					def: false
+				},
+				lotusAddressData:{
+					visible:false,
+					provinceName:'',
+					cityName:'',
+					townName:'',
+				},
+			}
+		},
+		onLoad(option){
+			let title = '新增收货地址';
+			if(option.type==='edit'){
+				title = '编辑收货地址'
+				this.addressData = JSON.parse(option.data)
+			}
+			this.manageType = option.type;
+			uni.setNavigationBarTitle({
+				title
+			})
+		},
+		methods: {
+			switchChange(e){
+				this.addressData.defaultStatus = e.detail.value?1:0
+				this.addressData.def = e.detail.value
+			},
+        openMap() {
+			var _this = this;
+			uni.chooseLocation({
+
+				success: function(res) {
+					console.log('res', res);
+
+					_this.addressData.latitude = res.latitude;
+					_this.addressData.longitude = res.longitude;
+					_this.mapAddressName= res.address + res.name;
+					_this.addressData.detailAddress = res.address + res.name;
+					console.log('经度：' + res.longitude);
+					console.log('详细地址：' + res.address);
+					console.log('纬度：' + res.latitude);
+				}
+			});
+
+		},
+			choseValue(res){
+            //res数据源包括已选省市区与省市区code
+				this.lotusAddressData.visible = false;//visible为显示与关闭组件标识true显示false隐藏
+				if(res.isChose){
+					console.log(res)
+					this.lotusAddressData.provinceName = res.provice;//省
+					this.lotusAddressData.cityName = res.city;//市
+					this.lotusAddressData.townName = res.town;//区
+
+					//赋值到addressData
+					this.addressData.province = res.provice
+					this.addressData.city = res.city
+					this.addressData.region = res.town
+
+				}
+			},
+
+			//提交
+			async confirm(){
+				const that = this
+				let data = this.addressData;
+				if(!data.name){
+					this.$api.msg('请填写收货人姓名');
+					return;
+				}
+				if(!/(^1[3|4|5|7|8][0-9]{9}$)/.test(data.phoneNumber)){
+					that.$api.msg('请输入正确的手机号码');
+					return
+				}
+				if (!data.province) {
+					that.$api.msg('请选择省市区');
+					return
+				}
+				if (!data.city) {
+					that.$api.msg('请选择二级城市')
+					return
+				}
+				if (!data.region) {
+					that.$api.msg('请选择三级区或县')
+					return
+				}
+				if(!data.detailAddress){
+					that.$api.msg('请输入详细地址');
+					return
+				}
+
+				let data1 = await Api.apiCall('post', Api.goods.addressSave, that.addressData);
+				if (data1) {
+                				this.$api.msg(`保存成功`);
+                				setTimeout(() => {
+                					uni.navigateBack({
+                						delta:1
+                					})
+
+                				}, 800);
+                			} else {
+                				this.$api.msg(`保存失败`);
+                			}
+
+
+			},
+		},
+		components:{
+			"lotus-address":lotusAddress
+		},
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background: $page-color-base;
+		padding-top: 16upx;
+	}
+
+	.row{
+		display: flex;
+		align-items: center;
+		position: relative;
+		padding:0 30upx;
+		height: 110upx;
+		background: #fff;
+
+		.tit{
+			flex-shrink: 0;
+			width: 120upx;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+		.input{
+			flex: 1;
+			font-size: 30upx;
+			color: $font-color-dark;
+		}
+		.icon-shouhuodizhi{
+			font-size: 36upx;
+			color: $font-color-light;
+		}
+	}
+	.default-row{
+		margin-top: 16upx;
+		.tit{
+			flex: 1;
+		}
+		switch{
+			transform: translateX(16upx) scale(.9);
+		}
+	}
+	.add-btn{
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 690upx;
+		height: 80upx;
+		margin: 60upx auto;
+		font-size: $font-lg;
+		color: #fff;
+		background-color: $base-color;
+		border-radius: 10upx;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/address/addressManage1.vue b/mallplusui-uniapp-app2/pagesU/address/addressManage1.vue
new file mode 100644
index 0000000..77669ff
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/address/addressManage1.vue
@@ -0,0 +1,314 @@
+<template>
+	<view class="content">
+		<view class="box">
+			<view class="box_left">收货人:</view>
+			<view class="box_right"><input type="text" v-model="user.name" placeholder="为确保收货请使用真名" /></view>
+		</view>
+		<view class="box">
+			<view class="box_left">手机号:</view>
+			<view class="box_right"><input type="number" maxlength="11" v-model="user.phoneNumber" placeholder="请确保收货电话真实有效" /></view>
+		</view>
+		<view class="box">
+			<view class="box_left">地区:</view>
+			<view class="box_right">
+				<view class="citybtn" @click="showMulLinkageThreePicker">{{ pickerText }}</view>
+				<!-- <view><image src="../../static/xiala.png" mode=""></image></view> -->
+			</view>
+		</view>
+		<view class="box">
+			<view class="box_left">地址定位:</view>
+			<view class="box_right_right" @click="openMap()">
+				<input type="text" value="" v-model="mapAddressName" placeholder="在地图上搜索并选择地址" disabled="true" />
+				<!-- <text>{{ mapAddressName }}</text> -->
+				<image src="/static/location.png" mode=""></image>
+			</view>
+		</view>
+		<view class="box">
+			<view class="box_left">详细地址:</view>
+			<view class="box_right_right">
+				<input type="text" value="" v-model="user.detailAddress" placeholder="街道门牌,楼层房间号等信息" />
+				<image src="../../static/address.png" mode="" @click="gosite"></image>
+			</view>
+		</view>
+
+		<!-- <view class="box">
+			<view class="box_left">
+				身份证号
+			</view>
+			<view class="box_right">
+				<input type="text" value="" v-model="IDcard" placeholder="身份证号码" />
+			</view>
+		</view> -->
+		<view class="box">
+			<view class="box_left_two">设为默认收件地址:</view>
+			<view class="box_right_two"><switch color="#D23535" :checked="user.defaultStatus == 1" style="transform:scale(0.8)" @change="switchBtn" /></view>
+		</view>
+		<button class="btn" @click="submit">提交</button>
+		<mpvue-city-picker :themeColor="themeColor" ref="mpvueCityPicker" :pickerValueDefault="cityPickerValueDefault" @onConfirm="onConfirm"></mpvue-city-picker>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import mpvueCityPicker from '@/components/mpvue-citypicker/mpvueCityPicker.vue';
+
+import Api from '@/common/api';
+
+
+
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			cityPickerValueDefault: [0, 0, 1],
+			themeColor: '#007AFF',
+			pickerText: '选择省/市/区',
+			mode: '',
+			deepLength: 1,
+			pickerValueDefault: [0],
+			pickerValueArray: [],
+			user: {
+				name: '', // [str] [必填] [收货人]
+				phoneNumber: '',
+				province: '', //[str] [必填] [省]
+				city: '', //        [str] [必填] [市]
+				region: '', //    [str] [必填] [区]
+				detailAddress: '', //     [str] [必填] [详址]
+				defaultStatus: '0', //     [int] [可选] [默认地址。1是0否]
+				longitude: 0, //经度
+				latitude: 0 //纬度
+			},
+			IDcard: '',
+			id: '',
+			mapAddressName: ''
+		};
+	},
+	components: {
+		mpvueCityPicker
+	},
+	onLoad(option) {
+		console.log(option);
+		let title = '新增收货地址';
+		var that = this;
+		if (option.type === 'edit') {
+			title = '编辑收货地址';
+			this.user = JSON.parse(option.data);
+			console.log('user',this.user);
+			that.id = this.user.id;
+			var province = this.user.province;
+			var city = this.user.city;
+			var region = this.user.region;
+			that.pickerText = province + '-' + city + '-' + region;
+		}
+		uni.setNavigationBarTitle({
+			title
+		});
+
+	},
+	methods: {
+		// 三级联动选择
+		showMulLinkageThreePicker() {
+			this.$refs.mpvueCityPicker.show();
+		},
+		onConfirm(e) {
+			console.log(e);
+			var label = e.label;
+			this.pickerText = label;
+			var labelArr = label.split('-');
+			this.user.province = labelArr[0];
+			this.user.city = labelArr[1];
+			this.user.region = labelArr[2];
+		},
+		gosite() {
+			var that = this;
+			uni.chooseLocation({
+				success: function(res) {
+					console.log('位置名称：' + res.name);
+					console.log('详细地址：' + res.address);
+					that.user.detailAddress = res.address;
+					console.log('纬度：' + res.latitude);
+					console.log('经度：' + res.longitude);
+				}
+			});
+		},
+		openMap() {
+			var _this = this;
+			uni.chooseLocation({
+				keyword: _this.user.detailAddress,
+				success: function(res) {
+					console.log('res', res);
+
+					_this.user.latitude = res.latitude;
+					_this.user.longitude = res.longitude;
+					_this.mapAddressName = res.address + res.name;
+					console.log('经度：' + res.longitude);
+					console.log('详细地址：' + res.address);
+					console.log('纬度：' + res.latitude);
+				}
+			});
+
+		},
+		async submit() {
+			let params;
+			var info = this.user,
+				_this = this;
+			if (info.name==''||info.phoneNumber==''||info.detailAddress=='') {
+				uni.showToast({
+					title: '请将信息填写完整',
+					icon: 'none'
+				});
+				return;
+			}
+			var reg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+			if(!reg.test(info.phoneNumber)){
+				uni.showToast({
+					title: '请输入正确的手机号',
+					icon: 'none'
+				});
+				return;
+			}
+			uni.showLoading({
+				title: '请稍等...'
+			});
+			if (_this.id) {
+				params = {
+					id: _this.id,
+					defaultStatus: info.defaultStatus,
+
+					detailAddress: info.detailAddress,
+					phoneNumber: info.phoneNumber,
+					province: info.province,
+					city: info.city,
+					region: info.region,
+					longitude: info.longitude,
+					latitude: info.latitude,
+					name: info.name
+				};
+			} else {
+				params = {
+					defaultStatus: info.defaultStatus,
+					region: info.region,
+					detailAddress: info.detailAddress,
+					phoneNumber: info.phoneNumber,
+					province: info.province,
+					city: info.city,
+					longitude: info.longitude,
+					latitude: info.latitude,
+					name: info.name
+				};
+			}
+			let data = await Api.apiCall('post', Api.goods.addressSave, params);
+			if (data) {
+				this.$api.msg(`地址${_this.id ? '修改' : '添加'}成功`);
+				setTimeout(() => {
+					uni.navigateBack({
+						delta:1
+					})
+					// let url = '../../pagesU/address/address';
+					// uni.navigateTo({
+					// 	url
+					// });
+				}, 800);
+			} else {
+				this.$api.msg(`地址${_this.id ? '修改' : '添加'}失败`);
+			}
+		},
+		switchBtn: function(e) {
+			var that = this;
+			console.log('switch1 发生 change 事件，携带值为', e.target.value);
+			if (e.target.value == true) {
+				that.user.defaultStatus = 1;
+			} else {
+				that.user.defaultStatus = 0;
+			}
+			console.log(that.user.defaultStatus);
+		}
+	}
+};
+</script>
+
+<style>
+page {
+	background: $page-color-base;
+	padding-top: 16upx;
+}
+.content {
+	width: 100%;
+	font-size: 28upx;
+	/* padding-top: 40upx; */
+	color: #676769;
+}
+.box {
+	width: 100%;
+	padding: 0 20upx;
+	height: 100upx;
+	display: flex;
+	align-items: center;
+	/* margin-bottom: 20upx; */
+	border-bottom: 1upx solid #EEEEEE;
+}
+.box_left {
+	width: 20%;
+	display: flex;
+	align-items: center;
+}
+.box_left_two {
+	width: 550upx;
+}
+.box_right {
+	width: 70%;
+	display: flex;
+}
+.box_right_right {
+	width: 85%;
+	height: 80upx;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	padding-left: 3%;
+}
+.box_right_right input {
+	width: 87%;
+	height: 70upx;
+	line-height: 70upx;
+}
+.box_right_right image {
+	width: 40upx;
+	height: 40upx;
+}
+.box_right image {
+	width: 40upx;
+	height: 40upx;
+	margin-top: 20upx;
+	margin-left: 30upx;
+}
+.box_right_two {
+	width: 150upx;
+}
+
+.box_right input {
+	width: 97%;
+	height: 80upx;
+	padding-left: 3%;
+	background-color: #ffffff;
+}
+.btn {
+	width: 690upx;
+	height: 90upx;
+	line-height: 90upx;
+	background: #fa436a;
+	/* background-color: rgba(242 155 135); */
+	color: #ffffff;
+	font-size: 32upx;
+	margin-top: 120upx;
+}
+.citybtn {
+	width: 80%;
+	height: 80upx;
+	line-height: 80upx;
+	overflow: hidden;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/marking/index.vue b/mallplusui-uniapp-app2/pagesU/marking/index.vue
new file mode 100644
index 0000000..e69de29
diff --git a/mallplusui-uniapp-app2/pagesU/notice/notice.vue b/mallplusui-uniapp-app2/pagesU/notice/notice.vue
new file mode 100644
index 0000000..febfcf1
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/notice/notice.vue
@@ -0,0 +1,202 @@
+<template>
+	<view>
+		<view class="notice-item" v-for="(item, index) in goodsList" :key="index">
+			<text class="time">{{ item.createTime |formatCreateTime}}</text>
+			<view class="content" @click="navToDetailPage(item)">
+				<text class="title">{{ item.title }}</text>
+				<view class="img-wrapper"><image :src="item.pic" mode="aspectFill" class="pic"></image></view>
+				<text class="introduce">{{ item.description }}</text>
+				<view class="bot b-t" @click="navToDetailPage(item)">
+					<text>查看详情</text>
+					<text class="more-icon yticon icon-you"></text>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+	import { formatDate } from '@/common/date';
+import Api from '@/common/api';
+export default {
+components: {
+		mallplusCopyright
+	},
+	data() {
+		return {
+			pageNum: 1,
+
+			goodsList: []
+		};
+	},
+	onLoad() {
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	filters: {
+                  formatCreateTime(time) {
+                    let date = new Date(time);
+                    return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+                  },
+                },
+	methods: {
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+			if (this.cateId) {
+				params = { pageNum: this.pageNum, productCategoryId: this.cateId };
+				if (this.keyword) {
+					params = { pageNum: this.pageNum, productCategoryId: this.cateId, keyword: this.keyword };
+				}
+			}
+			if (this.keyword) {
+				params = { pageNum: this.pageNum, keyword: this.keyword };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.cms.subjectList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesU/notice/subjectDetail?id=${id}`
+			});
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+	padding-bottom: 30upx;
+}
+
+.notice-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.time {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 80upx;
+	padding-top: 10upx;
+	font-size: 26upx;
+	color: #7d7d7d;
+}
+
+.content {
+	width: 710upx;
+	padding: 0 24upx;
+	background-color: #fff;
+	border-radius: 4upx;
+}
+
+.title {
+	display: flex;
+	align-items: center;
+	height: 90upx;
+	font-size: 32upx;
+	color: #303133;
+}
+
+.img-wrapper {
+	width: 100%;
+	height: 260upx;
+	position: relative;
+}
+
+.pic {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+}
+
+.cover {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	font-size: 36upx;
+	color: #fff;
+}
+
+.introduce {
+	display: inline-block;
+	padding: 16upx 0;
+	font-size: 28upx;
+	color: #606266;
+	line-height: 38upx;
+}
+
+.bot {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 80upx;
+	font-size: 24upx;
+	color: #707070;
+	position: relative;
+}
+
+.more-icon {
+	font-size: 32upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/notice/notice1.vue b/mallplusui-uniapp-app2/pagesU/notice/notice1.vue
new file mode 100644
index 0000000..3f87e0f
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/notice/notice1.vue
@@ -0,0 +1,151 @@
+<template>
+	<view>
+		<view class="notice-item">
+			<text class="time">11:30</text>
+			<view class="content">
+				<text class="title">新品上市，全场满199减50</text>
+				<view class="img-wrapper">
+					<image
+						class="pic"
+						src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"
+					></image>
+				</view>
+				<text class="introduce">虽然做了一件好事，但很有可能因此招来他人的无端猜测，例如被质疑是否藏有其他利己动机等，乃至谴责。即便如此，还是要做好事。</text>
+				<view class="bot b-t">
+					<text>查看详情</text>
+					<text class="more-icon yticon icon-you"></text>
+				</view>
+			</view>
+		</view>
+		<view class="notice-item">
+			<text class="time">昨天 12:30</text>
+			<view class="content">
+				<text class="title">新品上市，全场满199减50</text>
+				<view class="img-wrapper">
+					<image class="pic" src="https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3761064275,227090144&fm=26&gp=0.jpg"></image>
+					<view class="cover">活动结束</view>
+				</view>
+				<view class="bot b-t">
+					<text>查看详情</text>
+					<text class="more-icon yticon icon-you"></text>
+				</view>
+			</view>
+		</view>
+		<view class="notice-item">
+			<text class="time">2019-07-26 12:30</text>
+			<view class="content">
+				<text class="title">新品上市，全场满199减50</text>
+				<view class="img-wrapper">
+					<image
+						class="pic"
+						src="https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1556465765776&di=57bb5ff70dc4f67dcdb856e5d123c9e7&imgtype=0&src=http%3A%2F%2Fimg.zcool.cn%2Fcommunity%2F01fd015aa4d95fa801206d96069229.jpg%401280w_1l_2o_100sh.jpg"
+					></image>
+					<view class="cover">活动结束</view>
+				</view>
+				<text class="introduce">新品上市全场2折起，新品上市全场2折起，新品上市全场2折起，新品上市全场2折起，新品上市全场2折起</text>
+				<view class="bot b-t">
+					<text>查看详情</text>
+					<text class="more-icon yticon icon-you"></text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+export default {
+	data() {
+		return {};
+	},
+	methods: {}
+};
+</script>
+
+<style lang="scss">
+page {
+	background-color: #f7f7f7;
+	padding-bottom: 30upx;
+}
+
+.notice-item {
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+}
+
+.time {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	height: 80upx;
+	padding-top: 10upx;
+	font-size: 26upx;
+	color: #7d7d7d;
+}
+
+.content {
+	width: 710upx;
+	padding: 0 24upx;
+	background-color: #fff;
+	border-radius: 4upx;
+}
+
+.title {
+	display: flex;
+	align-items: center;
+	height: 90upx;
+	font-size: 32upx;
+	color: #303133;
+}
+
+.img-wrapper {
+	width: 100%;
+	height: 260upx;
+	position: relative;
+}
+
+.pic {
+	display: block;
+	width: 100%;
+	height: 100%;
+	border-radius: 6upx;
+}
+
+.cover {
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	position: absolute;
+	left: 0;
+	top: 0;
+	width: 100%;
+	height: 100%;
+	background-color: rgba(0, 0, 0, 0.5);
+	font-size: 36upx;
+	color: #fff;
+}
+
+.introduce {
+	display: inline-block;
+	padding: 16upx 0;
+	font-size: 28upx;
+	color: #606266;
+	line-height: 38upx;
+}
+
+.bot {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	height: 80upx;
+	font-size: 24upx;
+	color: #707070;
+	position: relative;
+}
+
+.more-icon {
+	font-size: 32upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/notice/subjectDetail.vue b/mallplusui-uniapp-app2/pagesU/notice/subjectDetail.vue
new file mode 100644
index 0000000..c30530b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/notice/subjectDetail.vue
@@ -0,0 +1,655 @@
+<template>
+	<view class="container">
+		<view class="carousel">
+			<swiper indicator-dots circular="true" duration="400">
+				<swiper-item class="swiper-item" v-for="(item, index) in detailData.pics" :key="index">
+					<view class="image-wrapper"><image :src="item" class="loaded" mode="aspectFill"></image></view>
+				</swiper-item>
+			</swiper>
+		</view>
+
+		<view class="introduce-section">
+			<text class="title">{{ detailData.title }}</text>
+
+			<view class="bot-row">
+				<text>收藏量: {{ detailData.collectCount }}</text>
+				<text>评论量: {{ detailData.commentCount }}</text>
+				<text>浏览量: {{ detailData.readCount }}</text>
+			</view>
+		</view>
+
+		<view class="c-list">
+			<view class="c-row b-b">
+				<view class="tip">
+					<text>{{ detailData.description }}</text>
+				</view>
+			</view>
+		</view>
+
+		<view class="detail-desc">
+			<view class="d-header"><text>图文详情</text></view>
+			<rich-text :nodes="desc"></rich-text>
+		</view>
+
+		<!-- 底部操作菜单 -->
+		<view class="page-bottom">
+			<navigator url="/pages/index/index" open-type="switchTab" class="p-b-btn">
+				<text class="yticon icon-xiatubiao--copy"></text>
+				<text>首页</text>
+			</navigator>
+
+			<view class="p-b-btn" :class="{ active: favorite }" @click="toFavorite(detailData)">
+				<text class="yticon icon-shoucang"></text>
+				<text>收藏</text>
+			</view>
+		</view>
+
+		<!-- 分享 -->
+		<share ref="share" :contentHeight="580" :shareList="shareList"></share>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import share from '@/components/share';
+import { mapState } from 'vuex';
+export default {
+	components: {
+    		mallplusCopyright,
+		share
+	},
+	data() {
+		return {
+			specClass: 'none',
+			specSelected: [],
+			small: null,
+			sku: [],
+			detailData: [],
+			favorite: true,
+			shareList: [],
+
+			desc: `
+
+				`,
+			skuList: []
+		};
+	},
+	async onLoad(ops) {
+		//接收传值,id里面放的是标题，因为测试数据并没写id
+		let id = ops.id;
+
+		if (id) {
+			this.logining = true;
+			let params = { id: ops.id };
+			let data = await Api.apiCall('get', Api.cms.subjectDetail, params);
+			this.logining = false;
+
+			if (data) {
+				let detailData = data;
+				this.detailData = detailData;
+				this.desc = data.content;
+				uni.setNavigationBarTitle({
+					title: detailData.name
+				});
+			}
+		}
+
+		this.shareList = await this.$api.json('shareList');
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 1, name: item.name, meno1: item.pic };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+		//分享
+		share() {
+			this.$refs.share.toggleMask();
+		},
+		//收藏
+		toFavorite(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				this.favorite = !this.favorite;
+				let params = { objId: item.id, type: 4, name: item.name, meno1: item.pic, meno2: item.price, meno3: item.sale };
+				Api.apiCall('post', Api.goods.favoriteSave, params);
+			}
+		},
+
+		async jifenPay(item) {
+			if (!this.hasLogin) {
+				let url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+				return false;
+			}
+
+			let id = item.id;
+			let data;
+
+			let params = { goodsId: id };
+			data = await Api.apiCall('post', Api.order.jifenPay, params);
+
+			if (data) {
+				this.$api.msg(data);
+			}
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+	padding-bottom: 160upx;
+}
+.icon-you {
+	font-size: $font-base + 2upx;
+	color: #888;
+}
+.carousel {
+	height: 722upx;
+	position: relative;
+	swiper {
+		height: 100%;
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 100%;
+	}
+	.swiper-item {
+		display: flex;
+		justify-content: center;
+		align-content: center;
+		height: 750upx;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+		}
+	}
+}
+
+/* 标题简介 */
+.introduce-section {
+	background: #fff;
+	padding: 20upx 30upx;
+
+	.title {
+		font-size: 32upx;
+		color: $font-color-dark;
+		height: 50upx;
+		line-height: 50upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: baseline;
+		height: 64upx;
+		padding: 10upx 0;
+		font-size: 26upx;
+		color: $uni-color-primary;
+	}
+	.price {
+		font-size: $font-lg + 2upx;
+	}
+	.m-price {
+		margin: 0 12upx;
+		color: $font-color-light;
+		text-decoration: line-through;
+	}
+	.coupon-tip {
+		align-items: center;
+		padding: 4upx 10upx;
+		background: $uni-color-primary;
+		font-size: $font-sm;
+		color: #fff;
+		border-radius: 6upx;
+		line-height: 1;
+		transform: translateY(-4upx);
+	}
+	.bot-row {
+		display: flex;
+		align-items: center;
+		height: 50upx;
+		font-size: $font-sm;
+		color: $font-color-light;
+		text {
+			flex: 1;
+		}
+	}
+}
+/* 分享 */
+.share-section {
+	display: flex;
+	align-items: center;
+	color: $font-color-base;
+	background: linear-gradient(left, #fdf5f6, #fbebf6);
+	padding: 12upx 30upx;
+	.share-icon {
+		display: flex;
+		align-items: center;
+		width: 70upx;
+		height: 30upx;
+		line-height: 1;
+		border: 1px solid $uni-color-primary;
+		border-radius: 4upx;
+		position: relative;
+		overflow: hidden;
+		font-size: 22upx;
+		color: $uni-color-primary;
+		&:after {
+			content: '';
+			width: 50upx;
+			height: 50upx;
+			border-radius: 50%;
+			left: -20upx;
+			top: -12upx;
+			position: absolute;
+			background: $uni-color-primary;
+		}
+	}
+	.icon-xingxing {
+		position: relative;
+		z-index: 1;
+		font-size: 24upx;
+		margin-left: 2upx;
+		margin-right: 10upx;
+		color: #fff;
+		line-height: 1;
+	}
+	.tit {
+		font-size: $font-base;
+		margin-left: 10upx;
+	}
+	.icon-bangzhu1 {
+		padding: 10upx;
+		font-size: 30upx;
+		line-height: 1;
+	}
+	.share-btn {
+		flex: 1;
+		text-align: right;
+		font-size: $font-sm;
+		color: $uni-color-primary;
+	}
+	.icon-you {
+		font-size: $font-sm;
+		margin-left: 4upx;
+		color: $uni-color-primary;
+	}
+}
+
+.c-list {
+	font-size: $font-sm + 2upx;
+	color: $font-color-base;
+	background: #fff;
+	.c-row {
+		display: flex;
+		align-items: center;
+		padding: 20upx 30upx;
+		position: relative;
+	}
+	.tit {
+		width: 140upx;
+	}
+	.con {
+		flex: 1;
+		color: $font-color-dark;
+		.selected-text {
+			margin-right: 10upx;
+		}
+	}
+	.bz-list {
+		height: 40upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		text {
+			display: inline-block;
+			margin-right: 30upx;
+		}
+	}
+	.con-list {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		color: $font-color-dark;
+		line-height: 40upx;
+	}
+	.red {
+		color: $uni-color-primary;
+	}
+}
+
+/* 评价 */
+.eva-section {
+	display: flex;
+	flex-direction: column;
+	padding: 20upx 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.e-header {
+		display: flex;
+		align-items: center;
+		height: 70upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.tit {
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			margin-right: 4upx;
+		}
+		.tip {
+			flex: 1;
+			text-align: right;
+		}
+		.icon-you {
+			margin-left: 10upx;
+		}
+	}
+}
+.eva-box {
+	display: flex;
+	padding: 20upx 0;
+	.portrait {
+		flex-shrink: 0;
+		width: 80upx;
+		height: 80upx;
+		border-radius: 100px;
+	}
+	.right {
+		flex: 1;
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base;
+		color: $font-color-base;
+		padding-left: 26upx;
+		.con {
+			font-size: $font-base;
+			color: $font-color-dark;
+			padding: 20upx 0;
+		}
+		.bot {
+			display: flex;
+			justify-content: space-between;
+			font-size: $font-sm;
+			color: $font-color-light;
+		}
+	}
+}
+/*  详情 */
+.detail-desc {
+	background: #fff;
+	margin-top: 16upx;
+	.d-header {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 80upx;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		position: relative;
+
+		text {
+			padding: 0 20upx;
+			background: #fff;
+			position: relative;
+			z-index: 1;
+		}
+		&:after {
+			position: absolute;
+			left: 50%;
+			top: 50%;
+			transform: translateX(-50%);
+			width: 300upx;
+			height: 0;
+			content: '';
+			border-bottom: 1px solid #ccc;
+		}
+	}
+}
+
+/* 规格选择弹窗 */
+.attr-content {
+	padding: 10upx 30upx;
+	.a-t {
+		display: flex;
+		image {
+			width: 170upx;
+			height: 170upx;
+			flex-shrink: 0;
+			margin-top: -40upx;
+			border-radius: 8upx;
+		}
+		.right {
+			display: flex;
+			flex-direction: column;
+			padding-left: 24upx;
+			font-size: $font-sm + 2upx;
+			color: $font-color-base;
+			line-height: 42upx;
+			.price {
+				font-size: $font-lg;
+				color: $uni-color-primary;
+				margin-bottom: 10upx;
+			}
+			.selected-text {
+				margin-right: 10upx;
+			}
+		}
+	}
+	.attr-list {
+		display: flex;
+		flex-direction: column;
+		font-size: $font-base + 2upx;
+		color: $font-color-base;
+		padding-top: 30upx;
+		padding-left: 10upx;
+	}
+	.item-list {
+		padding: 20upx 0 0;
+		display: flex;
+		flex-wrap: wrap;
+		text {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			background: #eee;
+			margin-right: 20upx;
+			margin-bottom: 20upx;
+			border-radius: 100upx;
+			min-width: 60upx;
+			height: 60upx;
+			padding: 0 20upx;
+			font-size: $font-base;
+			color: $font-color-dark;
+		}
+		.selected {
+			background: #fbebee;
+			color: $uni-color-primary;
+		}
+	}
+}
+
+/*  弹出层 */
+.popup {
+	position: fixed;
+	left: 0;
+	top: 0;
+	right: 0;
+	bottom: 0;
+	z-index: 99;
+
+	&.show {
+		display: block;
+		.mask {
+			animation: showPopup 0.2s linear both;
+		}
+		.layer {
+			animation: showLayer 0.2s linear both;
+		}
+	}
+	&.hide {
+		.mask {
+			animation: hidePopup 0.2s linear both;
+		}
+		.layer {
+			animation: hideLayer 0.2s linear both;
+		}
+	}
+	&.none {
+		display: none;
+	}
+	.mask {
+		position: fixed;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		z-index: 1;
+		background-color: rgba(0, 0, 0, 0.4);
+	}
+	.layer {
+		position: fixed;
+		z-index: 99;
+		bottom: 0;
+		width: 100%;
+		min-height: 40vh;
+		border-radius: 10upx 10upx 0 0;
+		background-color: #fff;
+		.btn {
+			height: 66upx;
+			line-height: 66upx;
+			border-radius: 100upx;
+			background: $uni-color-primary;
+			font-size: $font-base + 2upx;
+			color: #fff;
+			margin: 30upx auto 20upx;
+		}
+	}
+	@keyframes showPopup {
+		0% {
+			opacity: 0;
+		}
+		100% {
+			opacity: 1;
+		}
+	}
+	@keyframes hidePopup {
+		0% {
+			opacity: 1;
+		}
+		100% {
+			opacity: 0;
+		}
+	}
+	@keyframes showLayer {
+		0% {
+			transform: translateY(120%);
+		}
+		100% {
+			transform: translateY(0%);
+		}
+	}
+	@keyframes hideLayer {
+		0% {
+			transform: translateY(0);
+		}
+		100% {
+			transform: translateY(120%);
+		}
+	}
+}
+
+/* 底部操作菜单 */
+.page-bottom {
+	position: fixed;
+	left: 30upx;
+	bottom: 30upx;
+	z-index: 95;
+	display: flex;
+	justify-content: center;
+	align-items: center;
+	width: 690upx;
+	height: 100upx;
+	background: rgba(255, 255, 255, 0.9);
+	box-shadow: 0 0 20upx 0 rgba(0, 0, 0, 0.5);
+	border-radius: 16upx;
+
+	.p-b-btn {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+		font-size: $font-sm;
+		color: $font-color-base;
+		width: 96upx;
+		height: 80upx;
+		.yticon {
+			font-size: 40upx;
+			line-height: 48upx;
+			color: $font-color-light;
+		}
+		&.active,
+		&.active .yticon {
+			color: $uni-color-primary;
+		}
+		.icon-fenxiang2 {
+			font-size: 42upx;
+			transform: translateY(-2upx);
+		}
+		.icon-shoucang {
+			font-size: 46upx;
+		}
+	}
+	.action-btn-group {
+		display: flex;
+		height: 76upx;
+		border-radius: 100px;
+		overflow: hidden;
+		box-shadow: 0 20upx 40upx -16upx #fa436a;
+		box-shadow: 1px 2px 5px rgba(219, 63, 96, 0.4);
+		background: linear-gradient(to right, #ffac30, #fa436a, #f56c6c);
+		margin-left: 20upx;
+		position: relative;
+		&:after {
+			content: '';
+			position: absolute;
+			top: 50%;
+			right: 50%;
+			transform: translateY(-50%);
+			height: 28upx;
+			width: 0;
+			border-right: 1px solid rgba(255, 255, 255, 0.5);
+		}
+		.action-btn {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 180upx;
+			height: 100%;
+			font-size: $font-base;
+			padding: 0;
+			border-radius: 0;
+			background: transparent;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/notice/subjectList.vue b/mallplusui-uniapp-app2/pagesU/notice/subjectList.vue
new file mode 100644
index 0000000..328a500
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/notice/subjectList.vue
@@ -0,0 +1,371 @@
+<template>
+	<view class="content">
+		<view class="navbar" :style="{ position: headerPosition, top: headerTop }">
+			<view class="nav-item" v-for="(item, index) in cateList" :key="index" :class="{ current: filterIndex === item.id }" @click="tabClick(item.id)">{{item.name}}</view>
+
+		</view>
+		<view class="goods-list">
+			<view v-for="(item, index) in goodsList" :key="index" class="goods-item" @click="navToDetailPage(item)">
+				<view class="image-wrapper"><image :src="item.pic" mode="aspectFill"></image></view>
+				<text class="title clamp">{{ item.title }}</text>
+				<view class="price-box">
+					<text>收藏量 {{ item.collectCount }}</text>
+					<text>浏览量 {{ item.readCount }}</text>
+				</view>
+			</view>
+		</view>
+		<uni-load-more :status="loadingType"></uni-load-more>
+
+		<view class="cate-mask" :class="cateMaskState === 0 ? 'none' : cateMaskState === 1 ? 'show' : ''" @click="toggleCateMask">
+			<view class="cate-content" @click.stop.prevent="stopPrevent" @touchmove.stop.prevent="stopPrevent">
+				<scroll-view scroll-y class="cate-list">
+					<view v-for="item in cateList" :key="item.id">
+						<view class="cate-item b-b two">{{ item.name }}</view>
+						<view v-for="tItem in item.child" :key="tItem.id" class="cate-item b-b" :class="{ active: tItem.id == cateId }" @click="changeCate(tItem)">
+							{{ tItem.name }}
+						</view>
+					</view>
+				</scroll-view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore
+	},
+	data() {
+		return {
+			cateMaskState: 0, //分类面板展开状态
+			headerPosition: 'fixed',
+			headerTop: '0px',
+			categoryId: '',
+			loadingType: 'more', //加载更多状态
+			filterIndex: 0,
+			cateId: 0, //已选三级分类id
+			pageNum: 1,
+			cid: null,
+			priceOrder: 0, //1 价格从低到高 2价格从高到低
+			cateList: [],
+			goodsList: []
+		};
+	},
+
+	onLoad(options) {
+		// #ifdef H5
+		this.headerTop = document.getElementsByTagName('uni-page-head')[0].offsetHeight + 'px';
+		// #endif
+
+		this.cateId = options.sid;
+		this.loadCateList(options.fid, options.sid);
+		this.loadData();
+	},
+	onPageScroll(e) {
+		//兼容iOS端下拉时顶部漂移
+		if (e.scrollTop >= 0) {
+			this.headerPosition = 'fixed';
+		} else {
+			this.headerPosition = 'absolute';
+		}
+	},
+	//下拉刷新
+	onPullDownRefresh() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData('refresh');
+	},
+	//加载更多
+	onReachBottom() {
+		this.pageNum = this.pageNum + 1;
+		this.loadData();
+	},
+	methods: {
+		//加载分类
+		async loadCateList() {
+			let params = {'showStatus':1};
+			let list = await Api.apiCall('get', Api.cms.subjectCategoryList, params);
+
+			this.cateList = list.records;
+		},
+		//加载商品 ，带下拉刷新和上滑加载
+		async loadData(type = 'add', loading) {
+			//没有更多直接返回
+			if (type === 'add') {
+				if (this.loadingType === 'nomore') {
+					return;
+				}
+				this.loadingType = 'loading';
+			} else {
+				this.loadingType = 'more';
+			}
+			let params;
+
+			if (this.categoryId) {
+				params = { pageNum: this.pageNum, categoryId: this.categoryId };
+			} else {
+				params = { pageNum: this.pageNum };
+			}
+
+			let list = await Api.apiCall('get', Api.cms.subjectList, params);
+			let goodsList = list.records;
+			// let goodsList = await this.$api.json('goodsList');
+			if (type === 'refresh') {
+				this.goodsList = [];
+			}
+
+
+			this.goodsList = this.goodsList.concat(goodsList);
+
+			//判断是否还有下一页，有是more  没有是nomore(测试数据判断大于20就没有了)
+			this.loadingType = this.goodsList.length > list.total ? 'nomore' : 'more';
+			if (type === 'refresh') {
+				if (loading == 1) {
+					uni.hideLoading();
+				} else {
+					uni.stopPullDownRefresh();
+				}
+			}
+		},
+		//筛选点击
+		tabClick(index) {
+		console.log('tab='+index);
+			this.pageNum = 1;
+
+			this.categoryId = index;
+
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//显示分类面板
+		toggleCateMask(type) {
+			let timer = type === 'show' ? 10 : 300;
+			let state = type === 'show' ? 1 : 0;
+			this.cateMaskState = 2;
+			setTimeout(() => {
+				this.cateMaskState = state;
+			}, timer);
+		},
+		//分类点击
+		changeCate(item) {
+			this.pageNum = 1;
+			this.cateId = item.id;
+			this.toggleCateMask();
+			uni.pageScrollTo({
+				duration: 300,
+				scrollTop: 0
+			});
+			this.loadData('refresh', 1);
+
+		},
+		//详情
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			let groupId = item.groupId;
+			uni.navigateTo({
+				url: `../../pagesU/notice/subjectDetail?id=${id}`
+			});
+		},
+		stopPrevent() {}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+}
+.content {
+	padding-top: 96upx;
+}
+
+.navbar {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	display: flex;
+	width: 100%;
+	height: 80upx;
+	background: #fff;
+	box-shadow: 0 2upx 10upx rgba(0, 0, 0, 0.06);
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 30upx;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 120upx;
+				height: 0;
+				border-bottom: 4upx solid $base-color;
+			}
+		}
+	}
+	.p-box {
+		display: flex;
+		flex-direction: column;
+		.yticon {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 30upx;
+			height: 14upx;
+			line-height: 1;
+			margin-left: 4upx;
+			font-size: 26upx;
+			color: #888;
+			&.active {
+				color: $base-color;
+			}
+		}
+		.xia {
+			transform: scaleY(-1);
+		}
+	}
+	.cate-item {
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		width: 80upx;
+		position: relative;
+		font-size: 44upx;
+		&:after {
+			content: '';
+			position: absolute;
+			left: 0;
+			top: 50%;
+			transform: translateY(-50%);
+			border-left: 1px solid #ddd;
+			width: 0;
+			height: 36upx;
+		}
+	}
+}
+
+/* 分类 */
+.cate-mask {
+	position: fixed;
+	left: 0;
+	top: var(--window-top);
+	bottom: 0;
+	width: 100%;
+	background: rgba(0, 0, 0, 0);
+	z-index: 95;
+	transition: 0.3s;
+
+	.cate-content {
+		width: 630upx;
+		height: 100%;
+		background: #fff;
+		float: right;
+		transform: translateX(100%);
+		transition: 0.3s;
+	}
+	&.none {
+		display: none;
+	}
+	&.show {
+		background: rgba(0, 0, 0, 0.4);
+
+		.cate-content {
+			transform: translateX(0);
+		}
+	}
+}
+.cate-list {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	.cate-item {
+		display: flex;
+		align-items: center;
+		height: 90upx;
+		padding-left: 30upx;
+		font-size: 28upx;
+		color: #555;
+		position: relative;
+	}
+	.two {
+		height: 64upx;
+		color: #303133;
+		font-size: 30upx;
+		background: #f8f8f8;
+	}
+	.active {
+		color: $base-color;
+	}
+}
+
+/* 商品列表 */
+.goods-list {
+	display: flex;
+	flex-wrap: wrap;
+	padding: 0 30upx;
+	background: #fff;
+	.goods-item {
+		display: flex;
+		flex-direction: column;
+		width: 48%;
+		padding-bottom: 40upx;
+		&:nth-child(2n + 1) {
+			margin-right: 4%;
+		}
+	}
+	.image-wrapper {
+		width: 100%;
+		height: 330upx;
+		border-radius: 3px;
+		overflow: hidden;
+		image {
+			width: 100%;
+			height: 100%;
+			opacity: 1;
+		}
+	}
+	.title {
+		font-size: $font-lg;
+		color: $font-color-dark;
+		line-height: 80upx;
+	}
+	.price-box {
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
+		padding-right: 10upx;
+		font-size: 24upx;
+		color: $font-color-light;
+	}
+	.price {
+		font-size: $font-lg;
+		color: $uni-color-primary;
+		line-height: 1;
+		&:before {
+			content: '￥';
+			font-size: 26upx;
+		}
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/README.md b/mallplusui-uniapp-app2/pagesU/user/README.md
new file mode 100644
index 0000000..9149c99
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/README.md
@@ -0,0 +1,100 @@
+## 使用说明：
+| 属性名		| 类型			|  说明													|
+| --------		| -----:		| :----:												|
+| date			| String		|  当前日期，格式支持YYYY-MM							|
+| list			| Array			|  已经签到的时间列表，格式支持YYYY-MM-DD、MM-DD、DD	|
+| signin_fun	|   function	|  当天签到时调用，返回签到的日期信息					|
+| repair		|    Boolean	|  是否开启补签											|
+| rule			|    Boolean	|  补签规则开关，默认false，没有补签规则				|
+| repair_fun	|    function	|  开启补签后，补签时调用，返回签到的日期信息			|
+| choose_date	|    Boolean	|  是否可以选择日期										|
+| date_change	|    function	|  当前日期改变时调用									|
+
+``` html
+<fl-signin 
+	:date="date" 
+	:list="list" 
+	@signin_fun="signin_fun" 
+	:repair="repair" 
+	:rule="rule" 
+	@repair_fun="repair_fun" 
+	:choose_date="choose_date" 
+	@date_change="date_change"
+></fl-signin>
+```
+
+```javascript
+data() {
+	return {
+		// 是否可以选择日期
+		choose_date: false,
+		// 当前日期
+		date: "2019-03",
+		// 签到成功列表
+		list: ["2019-03-10", "03-15", "20"],
+		// 是否开启补签
+		repair: false,
+		// 是否开启补签规则
+		rule: false,
+	}
+},
+methods: {
+	// 签到时触发
+	signin_fun(res) {
+		console.log(res)
+		this.list.push(res.day)
+		uni.showToast({
+			title: "签到成功",
+			icon: "none"
+		})
+	},
+	// 补签成功时触发
+	repair_fun(res) {
+		console.log(res)
+		this.list.push(res.day)
+		uni.showToast({
+			title: "补签成功",
+			icon: "none"
+		})
+	},
+	// 当月份改变时触发
+	date_change(date) {
+		console.log(date);
+		// 更新当前日期
+		this.date = date;
+		// 更新签到列表
+		this.list = ["01", "02"];
+	},
+}
+```
+
+Tips:
+  * 有啥问题和建议或者错误不足之处，还望各位大神指出，急的话+QQ：806834390。
+
+
+### 历史版本
+----
+#### V1.0.0   2019/03/22
+只有最简单的签到和补签功能。
+#### V1.1.0   2019/03/23
+经大神指点，新增签到按钮和提示，新增补签规则：只能从补签的第一个日期开始补签。
+#### V1.2.0   2019/03/24
+经大神反馈，修改后的新版本已兼容微信小程序。
+#### V1.3.0   2019/03/25
+新增补签规则开关rule。
+#### V1.4.0   2019/04/02
+修复一个重大BUG(日期的计算有问题)，感谢那位发现问题的大神Ｏ(≧∇≦)Ｏ
+#### V1.5.0   2019/04/06
+优化了部分代码，新增日期选择功能，现在可以查看上n月的签到信息了。
+#### V1.6.0   2019/04/10
+修复了一个BUG。
+#### V1.7.0   2019/04/11
+修复了一个样式上的问题，当窗口正好处于某些宽度时，星期天会因为宽度不够，被挤到下一行。感谢Tonybo通过QQ邮箱告诉我。
+#### V1.8.0   2019/04/11
+修复了一个渲染时判断不对的问题，啊——！还以为不会有问题了！！！咳咳，感谢那些告诉我问题的人。
+#### V1.9.0   2019/05/16
+我的错，虽然我已经不知道item.index是用来做什么用的了，删掉就行，不然小程序上会出现undefined，感谢安雨忻的反馈。
+#### V2.0.0   2019/05/27
+根据同事的反馈，所有事件都阻止了冒泡，防止触发其它的自定义事件。
+#### V2.1.0   2019/05/31
+修复了日期不能选择或出错的问题，顺便把代码重新看了一遍，感谢Await的反馈，也在这里向那些下载了插件的人说声“对不起”，是我没有做好。
diff --git a/mallplusui-uniapp-app2/pagesU/user/applyMember.vue b/mallplusui-uniapp-app2/pagesU/user/applyMember.vue
new file mode 100644
index 0000000..32af21d
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/applyMember.vue
@@ -0,0 +1,284 @@
+<template>
+	<view>
+		<view class="block">
+
+			<view class="content">
+				<view class="my">
+					我的账户余额：{{money}} 元
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				会员等级
+			</view>
+			<view class="content">
+				<view class="amount">
+					<view class="list">
+						<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)" :class="{'on':amount.id == inputAmount}">
+							{{amount.price}}元  {{amount.name}}
+						</view>
+					</view>
+
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				选择支付方式
+			</view>
+			<view class="content">
+				<view class="pay-list">
+					<!-- #ifdef APP-PLUS -->
+					<view class="row" @tap="paytype='alipay'">
+							<view class="left">
+								<image src="../../static/img/alipay.png"></image>
+							</view>
+							<view class="center">
+								支付宝支付
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='alipay'" color="#70b162" />
+							</view>
+					</view>
+					<!-- #endif -->
+					<view class="row" @tap="paytype='wxpay'">
+							<view class="left">
+								<image src="../../static/image/wechatpay.png"></image>
+							</view>
+							<view class="center">
+								微信支付
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='wxpay'" color="#70b162" />
+							</view>
+					</view>
+					<view class="row" @tap="paytype='blancepay'">
+                    							<view class="left">
+                    								<image src="../../static/image/balancepay.png"></image>
+                    							</view>
+                    							<view class="center">
+                    								余额支付
+                    							</view>
+                    							<view class="right">
+                    								<radio :checked="paytype=='blancepay'" color="#70b162" />
+                    							</view>
+                    					</view>
+				</view>
+			</view>
+		</view>
+		<view class="pay">
+			<view class="btn" @tap="pay">立即升级</view>
+			<!-- <view class="tis">
+				点击立即充值，即代表您同意<view class="terms">
+					《条款协议》
+				</view>
+			</view> -->
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+
+
+	export default {
+	 components: {
+            		mallplusCopyright
+            	},
+		data() {
+
+			return {
+				money:0,
+				inputAmount:'',//金额
+				amountList:[100,200,500],//预设3个可选快捷金额
+				paytype:'wxpay'//支付类型
+			};
+		},
+		onShow(){
+			this.load()
+		},
+		methods:{
+		async	load(){
+				 let params = {  };
+                  let data1 = await Api.apiCall('get', Api.member.currentMember, params);
+                	this.money = data1.blance;
+
+                	let data2 = await Api.apiCall('get', Api.member.memberLevelList, params);
+                	data2 = data2.filter(item => item.id<data1.memberLevelId);
+                     this.amountList = data2;
+			},
+			async onload() {
+			     let params = {  };
+            		let data1 = await Api.apiCall('get', Api.index.currentMember, params);
+					this.money = data1.blance;
+			},
+			select(amount){
+				this.inputAmount = amount.id;
+			},
+
+			async pay(){
+				var _this=this
+
+
+
+                    			 let params = {memberLevelId:this.inputAmount  };
+                                   	let data1 = await Api.apiCall('post', Api.member.applyMember, params);
+                                         if(data1.code==200){
+                                         this.$api.msg('升级成功');
+                                             uni.switchTab({
+                                         								url: '/pages/index/user'
+                                         							});
+                                         }
+                                            console.log(data1)
+
+
+
+
+			},
+
+
+		},
+		onLoad() {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+	.block{
+		width: 94%;
+		padding: 20upx 3%;
+		.title{
+			width: 100%;
+			font-size: 34upx;
+		}
+		.content{
+			.my{
+				width: 100%;
+				height: 120upx;
+				display: flex;
+				align-items: center;
+				font-size: 30upx;
+				border-bottom: solid 1upx #eee;
+			}
+			.amount{
+				width: 100%;
+
+				.list{
+					display: flex;
+					justify-content: space-between;
+					padding: 20upx 0;
+					.box{
+						width: 30%;
+						height: 120upx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						border-radius: 10upx;
+						box-shadow: 0upx 5upx 20upx rgba(0,0,0,0.05);
+						font-size: 36upx;
+						background-color: #f1f1f1;
+						color: 333;
+						&.on{
+							background-color: $uni-color-success;
+							color: #fff;
+						}
+					}
+				}
+				.num{
+					margin-top: 10upx;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					.text{
+						padding-right: 10upx;
+						font-size: 30upx;
+					}
+					.input{
+						width: 28.2vw;
+						border-bottom: solid 2upx #999;
+
+						justify-content: flex-end;
+						align-items: center;
+						input{
+							margin: 0 20upx;
+							height: 60upx;
+							font-size: 30upx;
+							color: $uni-color-success;
+							justify-content: flex-end;
+							align-items: center;
+						}
+					}
+				}
+			}
+			.pay-list{
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+				.row{
+					width: 100%;
+					height: 120upx;
+					display: flex;
+					align-items: center;
+					.left{
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						align-items: center;
+						image{
+							width: 80upx;
+							height: 80upx;
+						}
+					}
+					.center{
+						width: 100%;
+						font-size: 30upx;
+					}
+					.right{
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+	}
+	.pay{
+		margin-top: 20upx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		flex-wrap: wrap;
+		.btn{
+			width: 70%;
+			height: 80upx;
+			border-radius: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			background-color: $uni-color-success;
+			box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.2);
+		}
+		.btn-tixi{
+			color: $uni-color-success;
+			background: #FFFFFF;
+			border:1upx solid $uni-color-success;
+		}
+		.tis{
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 24upx;
+			display: flex;
+			justify-content: center;
+			align-items: baseline;
+			color: #999;
+			.terms{
+				color: #5a9ef7;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/balance.vue b/mallplusui-uniapp-app2/pagesU/user/balance.vue
new file mode 100644
index 0000000..f33ab31
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/balance.vue
@@ -0,0 +1,102 @@
+<template>
+	<view class="content column">
+		<view class="balance bg-green margin-bottom-20 text-while column align-item">
+			<view class="column balance-top">
+				<text class="text-size-max">￥{{totalMoney}}</text>
+				<text class="font-bold">账户余额</text>
+			</view>
+			<view class="balance-title font-bold row">
+				<view class="balance-content">
+					<text>充值</text>
+				</view>
+				<view class="balance-content">
+					<text>提现</text>
+				</view>
+				<view class="balance-content">
+					<text>说明</text>
+				</view>
+			</view>
+		</view>
+		
+		<view class="content margin-bottom-20 column">
+			<view class="balance-nav bg-white bottom-line">
+				<view class="nav-content margin-width-20 justify-between align-item">
+					<text>充值记录</text>
+					<text class="icon-you yticon"></text>
+				</view>
+			</view>
+			<view class="balance-nav bg-white bottom-line">
+				<view class="nav-content margin-width-20 justify-between align-item">
+					<text>提现记录</text>
+					<text class="icon-you yticon"></text>
+				</view>
+			</view>
+		</view>
+		<view class="content margin-bottom-20 column">
+			<view class="balance-nav bg-white bottom-line">
+				<view class="nav-content margin-width-20 justify-between align-item">
+					<text>交易流水</text>
+					<text class="icon-you yticon"></text>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	export default{
+	components: {
+    		mallplusCopyright
+    	},
+		data(){
+			return{
+				totalMoney:0.00,//总余额
+				codeMoney:0.00,//扫码余额
+				rechargeMoney:0.00,//充值余额
+				userinfo: {},
+			}
+		},
+		async onShow(){
+			 let params = {  };
+                        				let data1 = await Api.apiCall('get', Api.member.currentMember, params);
+            					this.totalMoney = data1.blance;
+		},
+		methods:{
+			
+		}
+	}
+</script>
+
+<style>
+page{background-color: #F3F3F3;}
+view {font-size: 30upx;line-height: 1.8;display: flex;}
+.row{flex-direction: row;}
+.column {flex-direction: column;}
+.text-size-max{font-size: 80upx;}
+.justify-center{justify-content: center;}
+.justify-between{justify-content: space-between;}
+.align-item{align-items: center;}
+.bg-white{background: #FFFFFF;}
+.bg-green {background: #F44142;}
+.text-size-24 {font-size: 24upx;}
+.text-size-mim {font-size: 26upx;}
+.text-grey {color: #9B9B9B;}
+.text-while{color: #FFFFFF;}
+.font-bold{font-weight: bold;}
+.bottom-line{border-bottom: #EEEEEE solid 1upx}
+.margin-bottom-20{margin-bottom: 20upx;}
+.margin-top-20{margin-top: 20upx;}
+.margin-width-20{margin:0 20upx;}
+
+.content{width: 100%;}
+.balance{width: 100%;}
+.balance-top{width: 100%;align-items: center;line-height: 1.5;margin-top: 20upx;}
+.balance-title{background: rgba(255,255,255,0.12);margin-top: 40upx;width: 100%;height: 100upx;justify-content: center;align-items: center;}
+.balance-content{width: 33%;height: 100upx;align-items: center;justify-content: center;}
+.balance-content image{width: 50upx;height: 50upx;margin-right: 10upx;}
+.balance-nav{width: 100%;height: 100upx;}
+.nav-content{width: 100%;}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/collect.vue b/mallplusui-uniapp-app2/pagesU/user/collect.vue
new file mode 100644
index 0000000..af10f4b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/collect.vue
@@ -0,0 +1,557 @@
+<template>
+	<view class="content">
+		<view class="navbar">
+			<view v-for="(item, index) in navList" :key="index" class="nav-item" :class="{ current: tabCurrentIndex === index }" @click="tabClick(index)">{{ item.text }}</view>
+		</view>
+
+		<swiper :current="tabCurrentIndex" class="swiper-box" duration="300" @change="changeTab">
+			<swiper-item class="tab-content" v-for="(tabItem, tabIndex) in navList" :key="tabIndex">
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData" >
+					<!-- 空白页 -->
+					<empty v-if="tabItem.loaded === true && tabItem.orderList.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in tabItem.orderList" :key="index" class="order-item">
+						<view class="i-top b-b">
+							<text class="time">{{ item.addTime }}</text>
+							<!--<text class="state" :style="{color: item.stateTipColor}">{{item.stateTip}}</text>-->
+							<text class="del-btn yticon icon-iconfontshanchu1" @click="deleteOrder(index)"></text>
+						</view>
+
+						<view class="goods-box-single">
+							<image class="goods-img" :src="item.meno1" @click="navToDetailPage(item)" mode="aspectFill"></image>
+							<view class="right">
+								<text class="title clamp">{{ item.name }}</text>
+								<text class="attr-box">{{ item.meno3 }}</text>
+								<text class="price">{{ item.meno2 }}</text>
+							</view>
+						</view>
+					</view>
+
+					<uni-load-more :status="tabItem.loadingType"></uni-load-more>
+				</scroll-view>
+			</swiper-item>
+		</swiper>
+
+	</view>
+</template>
+
+<script>
+import { mapState } from 'vuex';
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+    		mallplusCopyright,
+		uniLoadMore,
+		empty
+	},
+	data() {
+		return {
+			tabCurrentIndex: 0,
+			navList: [
+				{
+					type: 1,
+					text: '收藏商品',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					type: 2,
+					text: '收藏文章',
+					loadingType: 'more',
+					orderList: []
+				},
+				{
+					type: 3,
+					text: '收藏店铺',
+					loadingType: 'more',
+					orderList: []
+				}
+			]
+		};
+	},
+
+	onLoad(options) {
+		/**
+		 * 修复app端点击除全部订单外的按钮进入时不加载数据的问题
+		 * 替换onLoad下代码即可
+		 */
+		if (options && options.type) {
+			this.tabCurrentIndex = +options.type;
+		}
+		//  MP
+		this.loadData();
+	},
+	computed: {
+		...mapState(['hasLogin', 'userInfo'])
+	},
+	methods: {
+		//详情页
+		navToDetailPage(item) {
+			//测试数据没有写id，用title代替
+			let id = item.id;
+			uni.navigateTo({
+				url: `../../pagesA/product/product?id=${id}`
+			});
+		},
+		//获取订单列表
+		async loadData(source) {
+			console.log('=======================')
+			
+			//这里是将订单挂载到tab列表下
+			let index = this.tabCurrentIndex;
+			let navItem = this.navList[index];
+			let type = navItem.type;
+
+			if (source === 'tabChange' && navItem.loaded === true) {
+				//tab切换只有第一次需要加载数据
+				return;
+			}
+			if (navItem.loadingType === 'loading') {
+				//防止重复加载
+				return;
+			}
+
+			navItem.loadingType = 'loading';
+
+			if (!this.hasLogin) {
+				url = '/pages/public/login';
+				uni.navigateTo({
+					url
+				});
+			} else {
+				let params = {  };
+				let data = await Api.apiCall('get', Api.goods.listCollect, params);
+
+				let orderList = data.records.filter(item => {
+					//添加不同状态下订单的表现形式
+					if (item.type == 1) {
+						if (item.meno3 == null) {
+							item.meno3 = 0;
+						}
+						item.meno3 = '销量:' + item.meno3;
+					}
+
+					item = Object.assign(item, this.orderStateExp(item.type));
+					item.addTime = this.dateFormat(item.addTime);
+					return item.type === type;
+				});
+				orderList.forEach(item => {
+					navItem.orderList.push(item);
+				});
+				//loaded新字段用于表示数据加载完毕，如果为空可以显示空白页
+				this.$set(navItem, 'loaded', true);
+
+				//判断是否还有数据， 有改为 more， 没有改为noMore
+				navItem.loadingType = 'more';
+			}
+		},
+
+		//swiper 切换
+		changeTab(e) {
+			this.tabCurrentIndex = e.target.current;
+			this.loadData('tabChange');
+		},
+		//顶部tab点击
+		tabClick(index) {
+			this.tabCurrentIndex = index;
+		},
+		//删除订单
+		deleteOrder(index) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				this.navList[this.tabCurrentIndex].orderList.splice(index, 1);
+				uni.hideLoading();
+			}, 600);
+			let list = this.navList[this.tabCurrentIndex].orderList;
+			let row = list[index];
+			let id = row.id;
+			let params = { ids: id };
+			let data = Api.apiCall('post', Api.goods.deleteCollect, params);
+		},
+		//取消订单
+		cancelOrder(item) {
+			uni.showLoading({
+				title: '请稍后'
+			});
+			setTimeout(() => {
+				let { stateTip, stateTipColor } = this.orderStateExp(9);
+				item = Object.assign(item, {
+					type: 9,
+					stateTip,
+					stateTipColor
+				});
+
+				//取消订单后删除待付款中该项
+				let list = this.navList[1].orderList;
+				let index = list.findIndex(val => val.id === item.id);
+				index !== -1 && list.splice(index, 1);
+
+				uni.hideLoading();
+			}, 600);
+		},
+
+		//订单状态文字和颜色
+		orderStateExp(type) {
+			let stateTip = '',
+				stateTipColor = '#fa436a';
+			switch (+type) {
+				case 1:
+					stateTip = '收藏商品';
+					break;
+				case 2:
+					stateTip = '收藏文章';
+					break;
+				case 3:
+					stateTip = '收藏店铺';
+					stateTipColor = '#909399';
+					break;
+
+				//更多自定义
+			}
+			return { stateTip, stateTipColor };
+		},
+		dateFormat(time) {
+			if (time == null || time === '') {
+				return 'N/A';
+			}
+			let date = new Date(time);
+			return formatDate(date, 'yyyy-MM-dd hh:mm:ss');
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/coupon.vue b/mallplusui-uniapp-app2/pagesU/user/coupon.vue
new file mode 100644
index 0000000..12a0353
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/coupon.vue
@@ -0,0 +1,513 @@
+<template>
+	<view>
+		<view class="tabr" :style="{top:headerTop}">
+			<view :class="{on:typeClass=='valid'}" @tap="switchType('valid')">可用({{couponValidList.length}})</view><view :class="{on:typeClass=='invalid'}"  @tap="switchType('invalid')">已失效({{couponinvalidList.length}})</view>
+			<view class="border" :class="typeClass"></view>
+		</view>
+		<view class="place" ></view>
+		<view class="list">
+			<!-- 优惠券列表 -->
+			<view class="sub-list valid" :class="subState">
+				<view class="tis" v-if="couponValidList.length==0">没有数据~</view>
+				<view class="row" v-for="(row,index) in couponValidList" :key="index" >
+					<!-- 删除按钮 -->
+					<view class="menu" @tap.stop="deleteCoupon(row.id,couponValidList)">
+						<view class="icon shanchu"></view>
+					</view>
+					<!-- content -->
+					<view class="carrier" :class="[typeClass=='valid'?theIndex==index?'open':oldIndex==index?'close':'':'']" @touchstart="touchStart(index,$event)" @touchmove="touchMove(index,$event)" @touchend="touchEnd(index,$event)">
+						<view class="left">
+							<view class="title">
+								{{row.note}}
+							</view>
+							<view class="term" v-if="row.terStartime==0 && row.terEndtime==0">
+								永久有效
+								<!-- {{row.termStart}} ~ {{row.termEnd}} -->
+							</view>
+							<view class="term" v-else>
+								{{row.startTime|formatCreateTime}} ~ {{row.endTime |formatCreateTime}}
+							</view>
+							<view class="gap-top"></view>
+							<view class="gap-bottom"></view>
+						</view>
+						<view class="right">
+							<view class="ticket">
+								<view class="num">
+
+								</view>
+								<view class="unit">
+
+								</view>
+							</view>
+							<view class="criteria">
+								{{row.amount}} 元
+							</view>
+							<view class="use" @click="goUse">
+								去使用
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="sub-list invalid" :class="subState">
+				<view class="tis" v-if="couponinvalidList.length==0">没有数据~</view>
+				<view class="row" v-for="(row,index) in couponinvalidList" :key="index" >
+					<!-- 删除按钮 -->
+					<view class="menu" @tap.stop="deleteCoupon(row.id,couponinvalidList)">
+						<view class="icon shanchu"></view>
+					</view>
+					<!-- content -->
+					<view class="carrier" :class="[typeClass=='invalid'?theIndex==index?'open':oldIndex==index?'close':'':'']" @touchstart="touchStart(index,$event)" @touchmove="touchMove(index,$event)" @touchend="touchEnd(index,$event)">
+						<view class="left">
+							<view class="title">
+								{{row.note}}
+							</view>
+							<view class="term" v-if="row.terStartime==0 && row.terEndtime==0">
+								已失效
+								<!-- {{row.termStart}} ~ {{row.termEnd}} -->
+							</view>
+							<view class="term" v-else>
+								{{row.startTime |formatCreateTime}} ~ {{row.endTime |formatCreateTime}}
+							</view>
+							<view class="icon shixiao">
+
+							</view>
+							<view class="gap-top"></view>
+							<view class="gap-bottom"></view>
+						</view>
+						<view class="right invalid">
+							<view class="ticket">
+								<view class="num">
+
+								</view>
+								<view class="unit">
+
+								</view>
+							</view>
+							<view class="criteria">
+								{{row.amount}}元
+							</view>
+							<!-- <view class="use">
+								去查看
+							</view> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import eonfox from '@/components/eonfox/eonfox.js';
+	import fns from '@/components/eonfox/fns.js';
+	import { formatDate } from '@/common/date';
+
+	var ef = new eonfox();
+	export default {
+		data() {
+			return {
+				couponValidList:[
+					// {id:1,title:"日常用品立减10元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"10",criteria:"满50使用"},
+					// {id:2,title:"家用电器立减100元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"100",criteria:"满500使用"},
+					// {id:3,title:"全场立减10元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"10",criteria:"无门槛"},
+					// {id:4,title:"全场立减50元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"50",criteria:"满1000使用"}
+
+				],
+				couponinvalidList:[
+					// {id:1,title:"日常用品立减10元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"10",criteria:"满50使用"},
+					// {id:2,title:"家用电器立减100元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"100",criteria:"满500使用"},
+					// {id:3,title:"全场立减10元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"10",criteria:"无门槛"},
+					// {id:4,title:"全场立减50元",termStart:"2019-04-01",termEnd:"2019-05-30",ticket:"50",criteria:"满1000使用"}
+				],
+				headerTop:0,
+				//控制滑动效果
+				typeClass:'valid',
+				subState:'',
+				theIndex:null,
+				oldIndex:null,
+				isStop:false
+			}
+		},
+		onPageScroll(e){
+
+		},
+		//下拉刷新，需要自己在page.json文件中配置开启页面下拉刷新 "enablePullDownRefresh": true
+		onPullDownRefresh() {
+		    setTimeout(function () {
+		        uni.stopPullDownRefresh();
+		    }, 1000);
+		},
+		onLoad() {
+			this.getData()
+			//兼容H5下排序栏位置
+			// #ifdef H5
+				//定时器方式循环获取高度为止，这么写的原因是onLoad中head未必已经渲染出来。
+				let Timer = setInterval(()=>{
+					let uniHead = document.getElementsByTagName('uni-page-head');
+					if(uniHead.length>0){
+						this.headerTop = uniHead[0].offsetHeight+'px';
+						clearInterval(Timer);//清除定时器
+					}
+				},1);
+			// #endif
+		},
+		filters: {
+              formatCreateTime(time) {
+                let date = new Date(time);
+                return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+              },
+            },
+		methods: {
+			goUse(){
+				uni.switchTab({
+					url:'/pages/index/index'
+				})
+			},
+		async	getData(){
+				let params = {  };
+                				let data = await Api.apiCall('get', Api.index.listMemberCoupon, params);
+                				let viewList = data;
+                				 viewList.forEach(item => {
+                                                           if(item.useStatus==0){
+                                                           this.couponValidList.push(item);
+                                                                	}else{
+                                                                	 this.couponinvalidList.push(item);
+                                                                	}
+                                                        });
+
+
+			},
+			switchType(type){
+				// console.log(type)
+				if(this.typeClass==type){
+					return ;
+				}
+				uni.pageScrollTo({
+					scrollTop:0,
+					duration:0
+				})
+				this.typeClass = type;
+				this.subState = this.typeClass==''?'':'show'+type;
+				setTimeout(()=>{
+					this.oldIndex = null;
+					this.theIndex = null;
+					this.subState = this.typeClass=='valid'?'':this.subState;
+				},200)
+			},
+			//控制左滑删除效果-begin
+			touchStart(index,event){
+				//多点触控不触发
+				if(event.touches.length>1){
+					this.isStop = true;
+					return ;
+				}
+				this.oldIndex = this.theIndex;
+				this.theIndex = null;
+				//初始坐标
+				this.initXY = [event.touches[0].pageX,event.touches[0].pageY];
+			},
+			touchMove(index,event){
+				//多点触控不触发
+				if(event.touches.length>1){
+					this.isStop = true;
+					return ;
+				}
+				let moveX = event.touches[0].pageX - this.initXY[0];
+				let moveY = event.touches[0].pageY - this.initXY[1];
+
+				if(this.isStop||Math.abs(moveX)<5){
+					return ;
+				}
+				if (Math.abs(moveY) > Math.abs(moveX)){
+					// 竖向滑动-不触发左滑效果
+					this.isStop = true;
+					return;
+				}
+
+				if(moveX<0){
+					this.theIndex = index;
+					this.isStop = true;
+				}else if(moveX>0){
+					if(this.theIndex!=null&&this.oldIndex==this.theIndex){
+						this.oldIndex = index;
+						this.theIndex = null;
+						this.isStop = true;
+						setTimeout(()=>{
+							this.oldIndex = null;
+						},150)
+					}
+				}
+			},
+
+			touchEnd(index,$event){
+				//解除禁止触发状态
+				this.isStop = false;
+			},
+
+			//删除商品
+			deleteCoupon(id,List){
+				let len = List.length;
+				for(let i=0;i<len;i++){
+					if(id==List[i].id){
+						List.splice(i, 1);
+						break;
+					}
+				}
+				this.oldIndex = null;
+				this.theIndex = null;
+			},
+
+			discard() {
+				//丢弃
+			}
+
+
+		}
+	}
+</script>
+<style lang="scss">
+	view{
+		display: flex;
+		flex-wrap: wrap;
+
+	}
+	page{position: relative;background-color: #f5f5f5;}
+	.hidden{
+		display: none !important;
+	}
+	.place{
+		width: 100%;
+		height: 95upx;
+	}
+	.tabr{
+		background-color: #fff;
+		/* #ifdef H5 || MP-WEIXIN*/
+		width: 100% !important;
+		/* #endif */
+		width: 94%;
+		height: 95upx;
+		padding: 0 3%;
+		border-bottom: solid 1upx #dedede;
+		position: fixed;
+		top: 0;
+		z-index: 10;
+		view{
+			width: 50%;
+			height: 90upx;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+			color: #999;
+		}
+		.on{
+			color: $uni-color-success;
+		}
+		.border{
+			height: 4upx;
+			background-color: $uni-color-success;
+			transition: all .3s ease-out;
+			&.invalid{
+				transform: translate3d(100%,0,0);
+			}
+		}
+
+	}
+	.list{
+		width: 100%;
+		display: block;
+		position: relative;
+	}
+	@keyframes showValid {
+		0% {transform: translateX(-100%);}100% {transform: translateX(0);}
+	}
+	@keyframes showInvalid {
+		0% {transform: translateX(0);}100% {transform: translateX(-100%);}
+	}
+	.sub-list{
+		&.invalid{
+			position: absolute;
+			top: 0;
+			left:100%;
+			display: none;
+		}
+		&.showvalid{
+			display: flex;
+			animation: showValid 0.20s linear both;
+		}
+		&.showinvalid{
+			display: flex;
+			animation: showInvalid 0.20s linear both;
+		}
+		width: 100%;
+		padding: 20upx 0 120upx 0;
+		.tis{
+			width: 100%;
+			height: 60upx;
+			justify-content: center;
+			align-items: center;
+			font-size: 32upx;
+		}
+		.row{
+			width: 92%;
+			height: 24vw;
+			margin: 20upx auto 10upx auto;
+			border-radius: 8upx;
+			// box-shadow: 0upx 0 10upx rgba(0,0,0,0.1);
+			align-items: center;
+			position: relative;
+			overflow: hidden;
+			z-index: 4;
+			border: 0;
+			.menu{
+				.icon{
+					color: #fff;
+					font-size:50upx;
+				}
+				position: absolute;
+				width: 28%;
+				height: 100%;
+				right: 0;
+				justify-content: center;
+				align-items: center;
+				background-color: red;
+				color: #fff;
+				z-index: 2;
+			}
+			.carrier{
+				@keyframes showMenu {
+					0% {transform: translateX(0);}100% {transform: translateX(-28%);}
+				}
+				@keyframes closeMenu {
+					0% {transform: translateX(-28%);}100% {transform: translateX(0);}
+				}
+				&.open{
+					animation: showMenu 0.25s linear both;
+				}
+				&.close{
+					animation: closeMenu 0.15s linear both;
+				}
+				background-color: #fff;
+				position: absolute;
+				width: 100%;
+				padding: 0 0;
+				height: 100%;
+				z-index: 3;
+				flex-wrap: nowrap;
+				.left{
+					width: 100%;
+					.title{
+						padding-top: 3vw;
+						width: 90%;
+						margin: 0 5%;
+						font-size: 36upx;
+					}
+					.term{
+						width: 90%;
+						margin: 0 5%;
+						font-size: 26upx;
+						color: #999;
+					}
+					position: relative;
+					.gap-top,.gap-bottom{
+						position: absolute;
+						width: 20upx;
+						height: 20upx;
+						right: -10upx;
+						border-radius: 100%;
+						background-color: #f5f5f5;
+					}
+					.gap-top{
+						top: -10upx;
+					}
+					.gap-bottom{
+						bottom: -10upx;
+					}
+					.shixiao{
+						position: absolute;
+						right: 20upx;
+						font-size: 150upx;
+						z-index: 6;
+						color: rgba(153,153,153,0.2)
+					}
+				}
+				.right{
+					flex-shrink: 0;
+					width: 28%;
+					color: #fff;
+					background:linear-gradient(to right,#ec625c,#ee827f);
+					&.invalid{
+						background:linear-gradient(to right,#aaa,#999);
+						.use{
+							color: #aaa;
+						}
+					}
+					justify-content: center;
+					.ticket,.criteria{width: 100%;}
+					.ticket{
+						padding-top: 1vw;
+						justify-content: center;
+						align-items: baseline;
+						height: 6vw;
+						.num{
+							font-size: 42upx;
+							font-weight: 600;
+						}
+						.unit{
+							font-size: 24upx;
+						}
+					}
+					.criteria{
+						justify-content: center;
+
+						font-size: 28upx;
+					}
+					.use{
+						width: 50%;
+						height: 40upx;
+						justify-content: center;
+						align-items: center;
+						font-size: 24upx;
+						background-color: #fff;
+						color: #ee827f;
+						border-radius: 40upx;
+						padding: 0 10upx;
+					}
+				}
+			}
+			/*
+			<view class="carrier" :class="[theIndex==index?'open':oldIndex==index?'close':'']" @touchstart="touchStart(index,$event)" @touchmove="touchMove(index,$event)" @touchend="touchEnd(index,$event)">
+				<view class="left">
+					<view class="title">
+						10元日常用品类
+					</view>
+					<view class="term">
+						2019-04-01~2019-05-30
+					</view>
+				</view>
+				<view class="right">
+					<view class="ticket">
+						<view class="num">
+							10
+						</view>
+						<view class="unit">
+							元
+						</view>
+					</view>
+					<view class="criteria">
+						满50使用
+					</view>
+					<view class="use">
+						去使用
+					</view>
+				</view>
+			</view>
+			*
+			* */
+		}
+	}
+
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/deposit.vue b/mallplusui-uniapp-app2/pagesU/user/deposit.vue
new file mode 100644
index 0000000..1a9b5c6
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/deposit.vue
@@ -0,0 +1,869 @@
+<template>
+	<view>
+		<view class="block">
+			<view class="title">
+				<text>我的账户</text>
+				<text style="font-size: 28rpx;padding-left: 60rpx;color: #007AFF;" @click="gominxi">交易明细</text>
+			</view>
+
+			<view class="content">
+				<view class="my">
+					我的账户余额：{{money}} 元
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				充值金额
+			</view>
+			<view class="content">
+				<view class="amount">
+					<view class="list">
+						<view class="box" v-for="(amount,index) in amountList" :key="index" @tap="select(amount)" :class="{'on':amount == inputAmount}">
+							{{amount}}元
+						</view>
+					</view>
+					<view class="num">
+						<view class="text">
+							自定义充值金额
+						</view>
+						<view class="input">
+							<input type="number" v-model="inputAmount" />
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="block">
+			<view class="title">
+				选择支付方式
+			</view>
+			<view class="content">
+				<view class="pay-list">
+					<!-- #ifdef APP-PLUS -->
+					<view class="row" @tap="paytype='alipay'">
+							<view class="left">
+								<image src="../../static/img/alipay.png"></image>
+							</view>
+							<view class="center">
+								支付宝支付
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='alipay'" color="#70b162" />
+							</view>
+					</view>
+					<!-- #endif -->
+					<view class="row" @tap="paytype='wxpay'">
+							<view class="left">
+								<image src="../../static/image/wechatpay.png"></image>
+							</view>
+							<view class="center">
+								微信支付
+							</view>
+							<view class="right">
+								<radio :checked="paytype=='wxpay'" color="#70b162" />
+							</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="pay">
+			<view class="btn" @tap="pay">立即充值</view>
+			<!-- <view class="tis">
+				点击立即充值，即代表您同意<view class="terms">
+					《条款协议》
+				</view>
+			</view> -->
+		</view>
+		<view class="pay">
+			<view class="btn btn-tixi" @click="gopage">去提现</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import eonfox from '@/components/eonfox/eonfox.js';
+	import fns from '@/components/eonfox/fns.js';
+	var ef=new eonfox()
+	export default {
+		data() {
+			return {
+				money:0,
+				inputAmount:'',//金额
+				amountList:[100,200,500],//预设3个可选快捷金额
+				paytype:'wxpay'//支付类型
+			};
+		},
+		onShow(){
+			this.load()
+		},
+		methods:{
+		async	load(){
+				 let params = {  };
+                            				let data1 = await Api.apiCall('get', Api.member.currentMember, params);
+                					this.money = data1.blance;
+			},
+			async onload() {
+			     let params = {  };
+            				let data1 = await Api.apiCall('get', Api.index.currentMember, params);
+					this.money = data1.blance;
+			},
+			select(amount){
+				this.inputAmount = amount;
+			},
+			doDeposit(){
+				if(this.paytype=='alipay'){
+					console.log('支付宝')
+
+					return
+				}else{
+					console.log('微信')
+					return
+				}
+				if (parseFloat(this.inputAmount).toString() == "NaN") {
+					uni.showToast({title:'请输入正确金额',icon:'none'});
+					return ;
+				}
+				if(this.inputAmount<=0){
+					uni.showToast({title:'请输入大于100的金额',icon:'none'});
+					return ;
+				}
+				if(parseFloat(this.inputAmount).toFixed(2)!=parseFloat(this.inputAmount)){
+					uni.showToast({title:'最多只能输入两位小数哦~',icon:'none'});
+					return ;
+				}
+				//模板模拟支付，实际应用请调起微信/支付宝
+				uni.showLoading({
+					title:'支付中...'
+				});
+				setTimeout(()=>{
+					uni.hideLoading();
+					uni.showToast({
+						title:'支付成功'
+					});
+					setTimeout(()=>{
+						uni.switchTab({
+							url:'../../pages/index/user'
+						});
+					},300);
+				},700)
+			},
+			pay(){
+				var _this=this
+				if(!/^\d+(\.\d+)?$/.test(_this.inputAmount)||_this.inputAmount<=0){
+					uni.showToast({
+						title:'请输入正确金额',
+						icon:'none'
+					})
+				}else{
+					if(_this.paytype!='alipay'){
+						_this.WeChatPay()
+						// // #ifdef MP-WEIXIN
+						// _this.pay_mp_weixin()
+						// // #endif
+						// // #ifdef APP-PLUS || H5
+						// _this.pay_APP_weixin()
+						// // #endif
+					}
+					if(_this.paytype=='alipay'){
+						// #ifdef H5 || MP-WEIXIN
+						uni.showToast({
+							title: '开发中。。。',
+							icon:'none'
+						});
+						// #endif
+						// #ifdef APP-PLUS
+						_this.payAli();
+						// #endif
+					}
+
+				}
+
+			},
+			payAli(){
+				var _this=this;
+				ef.submit({
+						request: {
+							s: ['APPLICATIONORDERSELFBUYUSERMONEY', [{
+								money_fen:_this.inputAmount*100,//必须|要购买余额(人民币，分)
+								pay_method: 'alipay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+								alipay_trade_type:'APP'
+							} ]]
+						},
+						callback(data){
+							console.log('调起支付宝支付',data)
+
+							fns.checkError(data,'s',function(errno,error){
+								uni.showToast({
+									title:error,
+									icon:'none'
+								})
+
+							})
+							var ali=data.data.s.data.alipay
+							if(ali){
+								uni.requestPayment({
+										provider: 'alipay',
+										orderInfo:ali,
+										success: function (res) {
+											console.log('success:' + JSON.stringify(res));
+											_this.onload()
+											uni.showToast({
+												title:'充值成功',
+												icon:'none'
+											})
+										},
+										fail: function (err) {
+											console.log('fail:' + JSON.stringify(err));
+										}
+									});
+							}
+						},
+						error(err){
+							fns.err('提交订单失败',err,1)
+						}
+
+
+				})
+			},
+			// 微信充值
+			WeChatPay(){
+				var _this=this
+				// if (!/^\d+(\.\d+)?$/.test(_this.pay_money) || _this.pay_money <= 0) {
+				// 	uni.showToast({
+				// 		title: '请输入正确金额',
+				// 		icon: 'none'
+				// 	});
+				// }else{
+					var money_fen=_this.inputAmount*100
+					// if(_this.tabIndex!=0){
+					// 	money_fen=_this.tabIndex*100
+					// }else{
+					// 	money_fen=_this.pay_money*100
+					// }
+					// APP充值
+					// #ifdef APP-PLUS
+					ef.submit({
+						request: {
+							s: [
+								'APPLICATIONORDERSELFBUYUSERMONEY',
+								[
+									{
+										money_fen: money_fen, //必须|要购买余额(人民币，分)
+										pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+										weixin_trade_type: 'APP'
+									}
+								]
+							]
+						},
+						callback: function(data) {
+							console.log('商家', data);
+							if (
+								fns.checkError(data, 's', function(erron, error) {
+									uni.showToast({
+										title: error,
+										icon: 'none'
+									});
+									_this.pay_switch = false;
+								})
+							) {
+								//7,已支付
+								//发起支付
+								console.log('发起支付', data.data.s.data);
+								_this.requestPayment(data.data.s.data);
+								//获取成功，无错误信息时
+							}
+						},
+						error(err) {
+							fns.err('提交订单失败', err, 1);
+						}
+					});
+					// #endif
+
+					//#ifdef  MP-WEIXIN
+					  wx.login({
+					  	//微信小程序登录获取code
+					  	success(res) {
+					  		// #ifdef MP-WEIXIN
+					  		_this.code = res.code;
+					  		// #endif
+					  		// #ifdef APP-PLUS
+					  		_this.code = res.authResult.openid;
+					  		// #endif
+					  		if (_this.code) {
+					  			//获取到code生成订单
+					  			// 发起网络请求
+					  			console.log('发起网络请求');
+					  			ef.submit({
+					  				request: {
+					  					s: [
+					  						'APPLICATIONORDERSELFBUYUSERMONEY',
+					  						[
+					  							{
+					  								money_fen: money_fen, //必须|要购买余额(人民币，分)
+					  								// #ifdef MP-WEIXIN
+					  								weixin_login_code: _this.code,
+					  								pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+					  								weixin_trade_type: 'JSAPI',
+					  								// #endif
+					  								// #ifdef APP-PLUS
+					  								weixin_login_openid: _this.code,
+					  								pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+					  								weixin_trade_type: 'APP'
+					  								// #endif
+					  							}
+					  						]
+					  					]
+					  				},
+					  				callback: function(data) {
+					  					console.log('商家', data);
+					  					if (
+					  						fns.checkError(data, 's', function(erron, error) {
+					  							uni.showToast({
+					  								title: error,
+					  								icon: 'none'
+					  							});
+					  							_this.pay_switch = false;
+					  						})
+					  					) {
+					  						//7,已支付
+					  						//发起支付
+					  						console.log('发起支付', data.data.s.data);
+					  						_this.requestPayment(data.data.s.data);
+					  						//获取成功，无错误信息时
+					  					}
+					  				},
+					  				error: function(err) {
+					  					console.log('出错啦', err);
+					  					uni.showToast({
+					  						title: JSON.stringify(err),
+					  						icon: 'none'
+					  					});
+					  					_this.pay_switch = false;
+					  				}
+					  			});
+					  		} else {
+					  			_this.pay_switch = false;
+					  			console.log('登录失败！' + res.errMsg);
+					  			uni.showToast({
+					  				title: '登录失败！' + res.errMsg,
+					  				icon: 'none'
+					  			});
+					  		}
+					  	},
+					  	fail() {
+					  		_this.pay_switch = false;
+					  	}
+					  });
+					// #endif
+
+					//#ifdef H5
+					ef.submit({
+						request: {
+							s: ['SESSIONWEIXINACCESSTOKEN']
+						},
+						callback(data) {
+							var dataList = fns.checkError(data, 's', function(errno, error) {
+								uni.showToast({
+									title: '请先确认微信授权',
+									icon: 'none'
+								})
+							})
+							console.log(dataList);
+							if (dataList.s) {
+								ef.submit({
+									request: {
+										s: ['APPLICATIONORDERSELFBUYUSERMONEY',
+								[
+									{
+										money_fen: money_fen, //必须|要购买余额(人民币，分)
+										pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+										weixin_trade_type: 'MPJSAPI',
+										weixin_login_openid: dataList.s.openid
+									}
+								]
+										]
+									},
+
+									callback(data) {
+										console.log('调起微信支付', data);
+										var dataList = fns.checkError(data, 's', function(errno, error) {
+											uni.showToast({
+												title: error,
+												icon: 'none'
+											});
+										});
+										var ress = dataList.s;
+										if (ress) {
+											console.log('ress', ress);
+
+											var getBrandWCPayRequest = {
+												appId: ress.appid,
+												timeStamp: String(ress.time_stamp), // 支付签名时间戳，注意微信jssdk中的所有使用timestamp字段均为小写。但最新版的支付后台生成签名使用的timeStamp字段名需大写其中的S字符
+												nonceStr: ress.nonce_str, // 支付签名随机串，不长于 32 位
+												package: 'prepay_id=' + ress.prepay_id, // 统一支付接口返回的prepay_id参数值，提交格式如：prepay_id=\*\*\*）
+												signType: ress.sign_type, // 签名方式，默认为'SHA1'，使用新版支付需传入'MD5'
+												paySign: ress.pay_sign, // 支付签名
+											};
+
+											console.log('getBrandWCPayRequest', getBrandWCPayRequest);
+
+											function onBridgeReady() {
+												WeixinJSBridge.invoke(
+													'getBrandWCPayRequest', getBrandWCPayRequest,
+													function(res) {
+														if (res.err_msg == "get_brand_wcpay_request:ok") {
+															uni.showToast({
+																title: '支付成功',
+																success() {
+																	// setTimeout(function() {
+																	// 	uni.navigateTo({
+																	// 		url: '../../pagesB/my-order/my-order'
+																	// 	});
+																	// }, 2000)
+																}
+															})
+														}
+														if (res.err_msg == "get_brand_wcpay_request:fail") {
+															uni.showToast({
+																title: '支付失败',
+																icon: 'none'
+															})
+														}
+														if (res.err_msg == "get_brand_wcpay_request:cancel") {
+															uni.showToast({
+																title: '已取消支付',
+																icon: 'none',
+																success() {
+																	setTimeout(function() {
+																		uni.navigateBack({
+																			delta: 1
+																		});
+																	}, 1500)
+																}
+															})
+														}
+													});
+											}
+
+											if (typeof WeixinJSBridge == "undefined") {
+												if (document.addEventListener) {
+													document.addEventListener('WeixinJSBridgeReady', onBridgeReady, false);
+												} else if (document.attachEvent) {
+													document.attachEvent('WeixinJSBridgeReady', onBridgeReady);
+													document.attachEvent('onWeixinJSBridgeReady', onBridgeReady);
+												}
+											} else {
+												onBridgeReady();
+											}
+
+										} else {
+											console.log('提交订单失败', ress);
+											_this.payWeChatPMJSAPI();
+
+										}
+										console.log('提交订单', ress);
+
+									},
+									error(err) {
+										console.log('提交订单失败', err, 1);
+									}
+								});
+
+
+							} else {
+
+								console.log('location', location.href);
+
+								//当 ACCESSTOKEN 不存在
+								ef.left_token(function(left_token) {
+									var notify_url = encodeURIComponent(location.href);
+									var url = ef.api_server_url + "?" + encodeURI('data=[["SESSIONWEIXINAUTHORIZE",[{"notify_url":"' +
+										notify_url + '"}]]]') + "&token=" + left_token;
+									console.log(url);
+									location.href = url;
+								});
+
+							}
+						},
+						error(err) {
+							fns.err('err', err, 1)
+						}
+					})
+					// #endif
+
+				// }
+			},
+			//app微信支付
+			pay_APP_weixin() {
+				var _this = this;
+				ef.submit({
+					request: {
+						s: [
+							'APPLICATIONORDERSELFBUYUSERMONEY',
+							[
+								{
+									money_fen: _this.pay_money * 100, //必须|要购买余额(人民币，分)
+									pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+									weixin_trade_type: 'APP'
+								}
+							]
+						]
+					},
+					callback: function(data) {
+						console.log('商家', data);
+						if (
+							fns.checkError(data, 's', function(erron, error) {
+								uni.showToast({
+									title: error,
+									icon: 'none'
+								});
+								_this.pay_switch = false;
+							})
+						) {
+							//7,已支付
+							//发起支付
+							console.log('发起支付', data.data.s.data);
+							_this.requestPayment(data.data.s.data);
+							//获取成功，无错误信息时
+						}
+					},
+					error(err) {
+						fns.err('提交订单失败', err, 1);
+					}
+				});
+			},
+			//微信小程序支付
+			pay_mp_weixin() {
+				var _this = this;
+				wx.login({
+					//微信小程序登录获取code
+					success(res) {
+						// #ifdef MP-WEIXIN
+						_this.code = res.code;
+						// #endif
+						// #ifdef APP-PLUS
+						_this.code = res.authResult.openid;
+						// #endif
+						if (_this.code) {
+							//获取到code生成订单
+							// 发起网络请求
+							console.log('发起网络请求');
+							ef.submit({
+								request: {
+									s: [
+										'APPLICATIONORDERSELFBUYUSERMONEY',
+										[
+											{
+												money_fen: _this.pay_money * 100, //必须|要购买余额(人民币，分)
+												// #ifdef MP-WEIXIN
+												weixin_login_code: _this.code,
+												pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+												weixin_trade_type: 'JSAPI',
+												// #endif
+												// #ifdef APP-PLUS
+												weixin_login_openid: _this.code,
+												pay_method: 'weixinpay', //支付方式 weixinpay 微信支付、alipay 支付宝支付
+												weixin_trade_type: 'APP'
+												// #endif
+											}
+										]
+									]
+								},
+								callback: function(data) {
+									console.log('商家', data);
+									if (
+										fns.checkError(data, 's', function(erron, error) {
+											uni.showToast({
+												title: error,
+												icon: 'none'
+											});
+											_this.pay_switch = false;
+										})
+									) {
+										//7,已支付
+										//发起支付
+										console.log('发起支付', data.data.s.data);
+										_this.requestPayment(data.data.s.data);
+										//获取成功，无错误信息时
+									}
+								},
+								error: function(err) {
+									console.log('出错啦', err);
+									uni.showToast({
+										title: JSON.stringify(err),
+										icon: 'none'
+									});
+									_this.pay_switch = false;
+								}
+							});
+						} else {
+							_this.pay_switch = false;
+							console.log('登录失败！' + res.errMsg);
+							uni.showToast({
+								title: '登录失败！' + res.errMsg,
+								icon: 'none'
+							});
+						}
+					},
+					fail() {
+						_this.pay_switch = false;
+					}
+				});
+			},
+			requestPayment(wxArr) {
+				var _this = this;
+				_this.test = '开始了';
+				var _this = this;
+				console.log('支付参数' + JSON.stringify(wxArr));
+				console.log('调起支付');
+				_this.test = '调起支付';
+
+				// #ifdef APP-PLUS
+				var orderInfo = {
+					appid: wxArr.appid,
+					partnerid: wxArr.mch_id, //商户号
+					prepayid: wxArr.prepay_id, //预支付交易会话ID
+					package: 'Sign=WXPay', //扩展字段,暂填写固定值Sign=WXPay
+					noncestr: wxArr.nonce_str, //随机字符串
+					timestamp: wxArr.time_stamp, //时间戳
+					sign: wxArr.pay_sign //签名
+				};
+				// #endif
+
+				uni.requestPayment({
+					// #ifdef MP-WEIXIN
+					provider: 'wxpay',
+					timeStamp: String(wxArr.time_stamp),
+					nonceStr: wxArr.nonce_str,
+					package: 'prepay_id=' + wxArr.prepay_id,
+					signType: wxArr.sign_type,
+					paySign: wxArr.pay_sign,
+					orderInfo: wxArr,
+					// #endif
+					// #ifdef APP-PLUS
+					provider: 'wxpay',
+					orderInfo: JSON.stringify(orderInfo),
+					// #endif
+					success: function(res) {
+						console.log('成功success:' + JSON.stringify(res));
+						if (res.errMsg == 'requestPayment:ok') {
+							_this.pay_switch = false;
+							//支付成功是进行订单查询
+							var out_time = 0;
+							var timeTn = setInterval(function() {
+								out_time++;
+								if (out_time <= 30) {
+									_this.pay_result_query(wxArr.order_id, function() {
+										clearInterval(timeTn);
+										_this.onload();
+										uni.showToast({
+											title: '充值成功',
+											icon: 'none'
+										});
+									});
+								} else {
+									uni.showToast({
+										title: '业务超时，如已支付，请稍后再个人页面查看是否到账',
+										icon: 'none'
+									});
+								}
+							}, 1000);
+						} else {
+							uni.showToast({
+								title: '业务超时，如已支付，请稍后再个人页面查看是否到账',
+								icon: 'none'
+							});
+							_this.pay_switch = false;
+						}
+					},
+					fail: function(err) {
+						_this.pay_switch = false;
+						return false;
+					}
+				});
+			},
+			//支付结果查询（订单号）
+			pay_result_query(order_id, fun) {
+				console.log('正在查询');
+				ef.submit({
+					request: {
+						s: [
+							'APPLICATIONORDERSELFPAYSTATE',
+							[
+								{
+									order_id: order_id
+								}
+							]
+						]
+					},
+					callback: function(data) {
+						// console.log('支付查询回调成功',data.data.s.data) ;return data.data.s.data;
+						if (
+							fns.checkError(data, 's', function(errno, error) {
+								return false;
+							})
+						) {
+							fun();
+						}
+					},
+					error: function(err) {
+						return 0;
+					}
+				});
+			},
+
+			gominxi(){
+				uni.navigateTo({
+						url: '../../pagesU/user/balance'
+				})
+			},
+			gopage(){
+				uni.navigateTo({
+				url: '../../pagesU/user/myPurse'
+				})
+			},
+		},
+		onLoad() {
+
+		},
+	}
+</script>
+
+<style lang="scss">
+	.block{
+		width: 94%;
+		padding: 20upx 3%;
+		.title{
+			width: 100%;
+			font-size: 34upx;
+		}
+		.content{
+			.my{
+				width: 100%;
+				height: 120upx;
+				display: flex;
+				align-items: center;
+				font-size: 30upx;
+				border-bottom: solid 1upx #eee;
+			}
+			.amount{
+				width: 100%;
+
+				.list{
+					display: flex;
+					justify-content: space-between;
+					padding: 20upx 0;
+					.box{
+						width: 30%;
+						height: 120upx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						border-radius: 10upx;
+						box-shadow: 0upx 5upx 20upx rgba(0,0,0,0.05);
+						font-size: 36upx;
+						background-color: #f1f1f1;
+						color: 333;
+						&.on{
+							background-color: $uni-color-success;
+							color: #fff;
+						}
+					}
+				}
+				.num{
+					margin-top: 10upx;
+					display: flex;
+					justify-content: flex-end;
+					align-items: center;
+					.text{
+						padding-right: 10upx;
+						font-size: 30upx;
+					}
+					.input{
+						width: 28.2vw;
+						border-bottom: solid 2upx #999;
+
+						justify-content: flex-end;
+						align-items: center;
+						input{
+							margin: 0 20upx;
+							height: 60upx;
+							font-size: 30upx;
+							color: $uni-color-success;
+							justify-content: flex-end;
+							align-items: center;
+						}
+					}
+				}
+			}
+			.pay-list{
+				width: 100%;
+				border-bottom: solid 1upx #eee;
+				.row{
+					width: 100%;
+					height: 120upx;
+					display: flex;
+					align-items: center;
+					.left{
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						align-items: center;
+						image{
+							width: 80upx;
+							height: 80upx;
+						}
+					}
+					.center{
+						width: 100%;
+						font-size: 30upx;
+					}
+					.right{
+						width: 100upx;
+						flex-shrink: 0;
+						display: flex;
+						justify-content: flex-end;
+					}
+				}
+			}
+		}
+	}
+	.pay{
+		margin-top: 20upx;
+		width: 100%;
+		display: flex;
+		justify-content: center;
+		flex-wrap: wrap;
+		.btn{
+			width: 70%;
+			height: 80upx;
+			border-radius: 80upx;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			color: #fff;
+			background-color: $uni-color-success;
+			box-shadow: 0upx 5upx 10upx rgba(0,0,0,0.2);
+		}
+		.btn-tixi{
+			color: $uni-color-success;
+			background: #FFFFFF;
+			border:1upx solid $uni-color-success;
+		}
+		.tis{
+			margin-top: 10upx;
+			width: 100%;
+			font-size: 24upx;
+			display: flex;
+			justify-content: center;
+			align-items: baseline;
+			color: #999;
+			.terms{
+				color: #5a9ef7;
+			}
+		}
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/forget.vue b/mallplusui-uniapp-app2/pagesU/user/forget.vue
new file mode 100644
index 0000000..c9d8356
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/forget.vue
@@ -0,0 +1,488 @@
+<template>
+	<view class="container">
+		<view class="left-bottom-sign"></view>
+		<view class="back-btn yticon icon-zuojiantou-up" @click="navBack"></view>
+		<view class="right-top-sign"></view>
+		<!-- 设置白色背景防止软键盘把下部绝对定位元素顶上来盖住输入框等 -->
+		<view class="wrapper">
+			<view class="left-top-sign">LOGIN</view>
+			<view class="welcome">
+				忘记密码！
+			</view>
+			<view class="input-content">
+				<view class="input-item">
+					<text class="tit">手机号码</text>
+					<input
+						type="number"
+						:value="phone"
+						placeholder="请输入手机号码"
+						maxlength="11"
+						data-key="phone"
+						@input="onKeyInput"
+					/>
+				</view>
+				<view class="input-item">
+					<text class="tit">密码</text>
+					<input
+						type="mobile"
+						value=""
+						placeholder="8~24位不含特殊字符的数字、字母组合"
+						placeholder-class="input-empty"
+						maxlength="20"
+						password
+						data-key="password"
+						@input="inputChange"
+					/>
+				</view>
+				<view class="input-item">
+					<text class="tit">密码</text>
+					<input
+						type="mobile"
+						value=""
+						placeholder="8~24位不含特殊字符的数字、字母组合"
+						placeholder-class="input-empty"
+						maxlength="20"
+						password
+						data-key="confimpassword"
+						@input="inputChange"
+					/>
+				</view>
+				<view class="verificationBox" >
+					<view class="verificationCon">
+						<text class="verificationLeft">验证码</text>
+						<input type="text" value="" @input="onKeyverification" placeholder="请输入验证码"  placeholder-style="font-size:26upx;color:#444444" class="verificationInput" />
+					</view>
+					<button type="primary" :disabled="getverifSwitch" class="button" @click="getverification">{{getConfirms}}</button>
+				</view>
+
+
+			</view>
+			<button class="confirm-btn" @click="toRegister" :disabled="logining">重置密码</button>
+
+		</view>
+		<view class="register-section">
+			已有账号?
+			<text @click="toLogin">返回登录</text>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import {
+        mapMutations
+    } from 'vuex';
+	import eonfox from '@/components/eonfox/eonfox.js';
+	import fns from '@/components/eonfox/fns.js';
+	var ef = new eonfox();
+	export default{
+		data(){
+			return {
+				phone: '',
+				password: '',
+				confimpassword:'',//第二次输入密码
+				logining: false,
+				verifTime:0,//验证码时长
+				getConfirms: '获取验证码',
+				confirm:'',
+				getverifSwitch:false,
+				oauthid:''
+			}
+		},
+		onLoad(){
+			this.getStroges();
+		},
+		methods: {
+			...mapMutations(['login']),
+			getStroges(){
+				try {
+				    const value = uni.getStorageSync('oauth_id');
+				    if (value) {
+				        console.log(value);
+						this.oauthid = value
+				    }
+				} catch (e) {
+				    console.log(e)
+				}
+			},
+			inputChange(e){
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+			navBack(){
+				uni.switchTab({
+				    url: '/pages/index/index'
+				});
+			},
+			toLogin(){
+				uni.redirectTo({
+					url:'/pages/public/login'
+				})
+			},
+			async toRegister(){
+				var _this=this
+				var phone=this.phone,password=this.password,confimpassword=this.confimpassword;
+				if (!/^1\d{10}$/.test(phone)){
+					uni.showToast({
+						title:'手机号有误',
+						icon:'none'
+					})
+				}else if (password.length < 8 ||password.length > 24||confimpassword.length < 8 ||confimpassword.length > 24) {
+					uni.showToast({
+						title:'密码长度为8~24个字符',
+						icon:'none'
+					})
+				}
+				else if(password!=confimpassword){
+					uni.showToast({
+						title:'两次输入的密码不一致，请检查修改',
+						icon:'none'
+					})
+				}
+				else if(_this.confirm==''){
+					uni.showToast({
+						title: '验证码不能为空',
+						icon: 'none'
+					});
+				}
+				else{
+					var req={};
+					req = {
+					phone: this.phone,
+					 password:this.password,
+					 confimpassword:this.confimpassword,
+
+					 authCode: this.confirm,
+
+					  };
+
+                      let data = await Api.apiCall('post', Api.member.resetPassword, req);
+					uni.showToast({
+                    									title: '重置成功',
+                    									success() {
+                    										_this.bind()
+                    										setTimeout(function(){
+                    										uni.reLaunch({
+                    											url:'/pages/public/login'
+                    											});
+                    										},1000)
+                    									}
+                    								});
+				}
+
+			},
+			onKeyInput: function(e) {
+				const key = e.currentTarget.dataset.key;
+				this[key] = e.detail.value;
+			},
+
+			async getverification(){
+
+				let _this = this;
+				// 验证是否已进行验证码操作
+				if(this.verifTime==0){
+					if (!/^1[1234567890]\d{9}$/.test(this.phone)) {
+						uni.showToast({
+							title: '电话号码有误，请重新输入',
+							icon: 'none'
+						});
+						this.phone = '';
+						return;
+					} else {
+						_this.getverifSwitch=true
+						this.verifTime=60;
+						_this.getConfirms=this.verifTime
+						//倒计时
+						var timeInterval=setInterval(function(){
+							_this.verifTime -- ;
+							if(_this.verifTime<=0){
+								//倒计时结束清除定时器
+								clearInterval(timeInterval)
+								_this.getConfirms='重新发送'
+								_this.getverifSwitch=false
+								return;
+							}
+							_this.getConfirms=_this.verifTime
+						},1000)
+
+						let params = { phone: this.phone};
+                        			let data = await Api.apiCall('post', Api.index.sendCodes, params);
+					}
+				}else{
+					uni.showToast({
+						title: "请勿重复操作",
+						icon: 'none'
+					});
+				}
+
+			},
+			onKeyverification: function(event) {
+				this.confirm = event.target.value;
+			},
+			//绑定
+			bind(){
+				var _this=this
+				console.log('oauth');
+				uni.getStorage({
+					key:'oauth',
+					success(re) {
+						if(re.data){
+							_this.bind_()
+						}
+					}
+				})
+			},
+			bind_(){
+				console.log('bind');
+				var _this=this
+							// #ifdef MP-WEIXIN
+							wx.login({
+								success(res) {
+									wx.getUserInfo({
+										success(re) {
+											re.code=res.code;
+											console.log('re:',re);
+											ef.submit({
+												request:{s:['USERSELFBINDWEIXIN',['applet',re]]},
+												callback(data){
+													console.log(data);
+													fns.unionid()
+													return
+												},
+												error(err){
+													fns.err('err',err)
+												}
+											})
+										}
+									})
+								}
+							})
+							// #endif
+							// #ifdef APP-PLUS
+							uni.showToast({
+								title:'正在绑定',
+								icon:'loading'
+							})
+							console.log('oauto star');
+							uni.login({
+							  provider: 'weixin',
+							  success: function (loginRes) {
+								  console.log('loginres:',typeof loginRes);
+								  if (loginRes.errMsg=='login:ok') {
+											// 获取用户信息
+											uni.showToast({
+												title:'获取信息',
+												icon:'loading'
+											})
+											uni.getUserInfo({
+											  provider: 'weixin',
+											  success: function (infoRes) {
+												  uni.showToast({
+												  	title:'获取成功',
+												  	icon:'loading'
+												  })
+												  ef.submit({
+												  	request:{s:['USERSELFBINDWEIXIN',['app',infoRes.userInfo]]},
+												  	callback(data){
+												  		console.log(data);
+														console.log(JSON.stringify(data));
+														fns.unionid()
+												  	},
+												  	error(err){
+														console.log(err);
+												  	}
+												  })
+
+												},
+											  fail(err){
+												  console.log(err);
+											  }
+											});
+								  }else{
+									 console.log(err);
+								  }
+
+							  },
+							  fail(err) {
+							  	console.log(err);
+							  }
+
+							});
+							// #endif
+			}
+		},
+
+	}
+</script>
+
+<style lang='scss'>
+	page{
+		background: #fff;
+	}
+	.container{
+		padding-top: 55px;
+		position:relative;
+		width: 100vw;
+		height: 100vh;
+		overflow: hidden;
+		background: #fff;
+	}
+	.wrapper{
+		position:relative;
+		z-index: 90;
+		background: #fff;
+		padding-bottom: 40upx;
+	}
+	.back-btn{
+		position:absolute;
+		left: 40upx;
+		z-index: 9999;
+		padding-top: var(--status-bar-height);
+		top: 40upx;
+		font-size: 40upx;
+		color: $font-color-dark;
+	}
+	.left-top-sign{
+		font-size: 120upx;
+		color: $page-color-base;
+		position:relative;
+		left: -16upx;
+	}
+	.right-top-sign{
+		position:absolute;
+		top: 80upx;
+		right: -30upx;
+		z-index: 95;
+		&:before, &:after{
+			display:block;
+			content:"";
+			width: 400upx;
+			height: 80upx;
+			background: #b4f3e2;
+		}
+		&:before{
+			transform: rotate(50deg);
+			border-radius: 0 50px 0 0;
+		}
+		&:after{
+			position: absolute;
+			right: -198upx;
+			top: 0;
+			transform: rotate(-50deg);
+			border-radius: 50px 0 0 0;
+			/* background: pink; */
+		}
+	}
+	.left-bottom-sign{
+		position:absolute;
+		left: -270upx;
+		bottom: -320upx;
+		border: 100upx solid #d0d1fd;
+		border-radius: 50%;
+		padding: 180upx;
+	}
+	.welcome{
+		position:relative;
+		left: 50upx;
+		top: -90upx;
+		font-size: 46upx;
+		color: #555;
+		text-shadow: 1px 0px 1px rgba(0,0,0,.3);
+	}
+	.input-content{
+		padding: 0 60upx;
+	}
+	.input-item{
+		display:flex;
+		flex-direction: column;
+		align-items:flex-start;
+		justify-content: center;
+		padding: 0 30upx;
+		background:$page-color-light;
+		height: 120upx;
+		border-radius: 4px;
+		margin-bottom: 50upx;
+		&:last-child{
+			margin-bottom: 0;
+		}
+		.tit{
+			height: 50upx;
+			line-height: 56upx;
+			font-size: $font-sm+2upx;
+			color: $font-color-base;
+		}
+		input{
+			height: 60upx;
+			font-size: $font-base + 2upx;
+			color: $font-color-dark;
+			width: 100%;
+		}
+	}
+
+	.confirm-btn{
+		width: 630upx;
+		height: 76upx;
+		line-height: 76upx;
+		border-radius: 50px;
+		margin-top: 70upx;
+		background: $uni-color-primary;
+		color: #fff;
+		font-size: $font-lg;
+		&:after{
+			border-radius: 100px;
+		}
+	}
+	.forget-section{
+		font-size: $font-sm+2upx;
+		color: $font-color-spec;
+		text-align: center;
+		margin-top: 40upx;
+	}
+	.register-section{
+		position:absolute;
+		left: 0;
+		bottom: 50upx;
+		width: 100%;
+		font-size: $font-sm+2upx;
+		color: $font-color-base;
+		text-align: center;
+		text{
+			color: $font-color-spec;
+			margin-left: 10upx;
+		}
+	}
+
+
+</style>
+<style lang="stylus" ref="stylesheet/stylus">
+	.verificationBox
+		width 630upx
+		height 80upx
+		margin 20upx auto
+		display flex
+		align-items center
+		justify-content center// 垂直居中
+		flex-direction row
+		.verificationCon
+			height 100%
+			width 65%
+			background #f8f6fc
+			display flex
+			align-items center
+			justify-content center// 垂直居中
+			flex-direction row
+			border-radius 10upx
+			.verificationLeft
+				width 200upx
+				font-size 28upx
+				font-weight 550
+				text-align center
+			.verificationInput
+				display inline-block
+		.button
+			height 100%
+			width 35%
+			background #fa436a
+			font-size 28upx
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/integral.vue b/mallplusui-uniapp-app2/pagesU/user/integral.vue
new file mode 100644
index 0000000..562d3d0
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/integral.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="content">
+		<view class="status-contents">
+			<view class="status top-view"></view>
+		</view>
+	<!-- 	#ifdef APP-PLUS || H5 -->
+		<view class="title-box" @click="back">
+			<uni-icon class="icon" type="arrowleft" size="28" color="#fff"></uni-icon>
+			<text class="title">库存积分</text>
+		</view>
+		<!-- #endif -->
+		<view class="integral-box">
+			<view class="toUse">
+				<text class="price" v-if="!integral">0</text>
+				<text class="price" v-else="">{{integral/100}}</text>
+				<text class="text">可支配积分</text>
+			</view>
+			<view class="integral-items">
+				<view class="details-item" @click="billingDetails">
+					<text>账单明细</text>
+					<uni-icon class="icon" type="arrowright" size="24" color="#333"></uni-icon>
+				</view>
+				<view class="buy-item" @click="enterToBuy">
+					<text>购买积分</text>
+					<uni-icon class="icon" type="arrowright" size="24" color="#333"></uni-icon>
+				</view>
+				<view class="given-item" @click="presentIntegral">
+					<text>赠送积分</text>
+					<uni-icon class="icon" type="arrowright" size="24" color="#333"></uni-icon>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniIcon from "@/components/uni-icon/uni-icon.vue"
+	import eonfox from '@/components/eonfox/eonfox.js';
+	import fns from '@/components/eonfox/fns.js';
+	var ef = new eonfox();
+	export default {
+		data() {
+			return {
+				integral:'',
+				shopsId:''
+			};
+		},
+	onShow: function () {
+		this.load();
+	},	
+	
+		components:{
+			uniIcon	
+		},
+		methods: {
+			load(){
+				var that=this;
+				ef.submit({
+					request: {
+						sj: ['MERCHANTSELF'],
+						jf:['MERCHANTCREDITSELF']
+					},
+					callback: function(data){
+						console.log(data);
+						var fns_ = fns.checkError(data,"sj",function(erron, error){
+							uni.showToast({
+								title:error,
+								icon:'none'
+							});
+							
+							//没有数据，说明不是商家
+							return;
+						});
+						if( fns_.jf ){
+							that.integral = fns_.jf;
+						}
+						if(fns_.sj){
+							that.shopsId = fns_.sj[0].id;
+						}
+					},
+					 error: function(err){
+							 console.log("出错啦", err);
+					},
+				});
+				
+			},
+			
+			back() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+			enterToBuy() {
+				uni.navigateTo({
+					url: '../../pagesA/buyIntegral/buyIntegral'
+				})
+			},
+			presentIntegral() {
+				uni.navigateTo({
+					url: '../presentIntegral/presentIntegral'
+				})
+			},
+			billingDetails:function(){
+				uni.navigateTo({
+					url:'../transactionDetail/transactionDetail?method=merchant_integral&mch_id='+this.shopsId
+				});
+			}
+			
+		}
+	}
+</script>
+
+
+<style>
+	.status-contents{
+		height: var(--status-bar-height);
+		background-color: #FF5252;
+	}
+	.top-view{
+		width: 100%;
+		position: fixed;
+		top: 0;
+	}
+	.status{
+		height:var(--status-bar-height);
+	}
+</style>
+
+<style scoped lang="stylus" ref="stylesheet/stylus">
+	.content
+		width 100%
+		overflow hidden
+		.title-box
+			width 100%
+			height 60px
+			color #fff
+			font-size 18px
+			line-height 60px
+			background-color #FF5252
+			
+			.icon
+				width 40%
+		.integral-box
+			width 100%
+			// height 165px
+			.toUse
+				width 100%
+				height 140px
+				color #fff
+				background-color #FF5252
+				text
+					display block
+				.price
+					font-size 36px
+					text-align center
+					margin 0 auto
+					width 40%
+					background-color #FF5252
+				.text
+					font-size 18px
+					margin 20px auto
+					text-align center
+					width 90%
+			.integral-items
+				width 100%
+				height 170px
+				background-color #f4f3f3
+				display flex
+				justify-content center
+				align-items center
+				flex-direction column
+				.details-item, .buy-item, .given-item
+					width 100%
+					height 45px
+					background-color #fff
+					display flex
+					padding-left 15px
+					justify-content center
+					align-items center
+					border-bottom 1px solid #ccc
+					text
+						width 90%
+					.icon 
+						width 10%
+				.details-item
+					margin 15px
+				
+				
+			
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/invite.vue b/mallplusui-uniapp-app2/pagesU/user/invite.vue
new file mode 100644
index 0000000..7519a6f
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/invite.vue
@@ -0,0 +1,326 @@
+<template>
+	<view class="content">
+		<image class="invite-bg" src="/static/image/invite-bg.png" mode=""></image>
+		<view class="invite-c">
+			<view class="invite-w">
+				<view class='invite-w-t'>我的专属邀请码</view>
+				<text class='invite-w-num'>{{code}}</text>
+				<view class='invite-w-detail'>快去分享您的邀请码吧，让更多的好友加入到【{{appTitle}}】，您也可以获得丰厚的奖励！</view>
+				<view class='invite-w-bot'>
+					<view bindtap='commission' @click="toMoney">
+						<image class='invite-w-bot-ic' src='/static/image/ic-earnings.png'></image>
+						<text class='invite-w-bot-red'>￥{{money}}元</text>
+						<text class='invite-w-bot-gray'>邀请收益</text>
+					</view>
+					<view bindtap='recommendlist' @click="toList">
+						<image class='invite-w-bot-ic' src='/static/image/ic-number.png'></image>
+						<text class='invite-w-bot-red'>{{number}}人</text>
+						<text class='invite-w-bot-gray'>邀请人数</text>
+					</view>
+				</view>
+			</view>
+			<view class="invite-w" v-if="!invitecode1">
+				<text class='invite-w-t-blue'>谁推荐你的？</text>
+				<input class='invite-w-input' placeholder='请输入推荐人邀请码' v-model="invitecode"></input>
+				<view class='invite-w-btn' @click="setMyInvite">提交</view>
+			</view>
+			<view class='invite-btn'>
+				<!-- #ifdef MP-WEIXIN -->
+				<button class='share btn' open-type="share">
+					<image src='/static/image/ic-wechat.png'></image>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef H5 -->
+				<button class='share btn' @click="copyUrl()" v-show="!ifwx">
+					<image src='/static/image/ic-link.png'></image>
+				</button>
+				<!-- #endif -->
+				<button class='share btn' @click="createPoster()">
+					<image src='/static/image/ic-img.png'></image>
+				</button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import {apiBaseUrl} from '@/config/config.js'
+	// #ifdef MP-TOUTIAO
+	import {ttPlatform} from '@/config/config.js'
+	// #endif
+	export default {
+		data() {
+			return {
+				myShareCode: '', //分享Code
+				code: '',
+				money: 0,
+				number: 0,
+				appTitle:'',
+				is_superior: false,
+				invitecode: '',
+				invitecode1: '',
+				imageUrl: '/static/image/share_image.png',
+			}
+		},
+		computed: {
+
+		},
+		onShow() {
+			this.getInviteData();
+			this.getMyShareCode();
+			this.ifwxl()
+		},
+		methods: {
+			// 判断是不是微信浏览器
+			ifwxl(){
+				this.ifwx = this.$common.isWeiXinBrowser()
+			},
+			//获取数据
+			async getInviteData() {
+			let param = {}
+				let data = await Api.apiCall('get', Api.member.getInviteData, param);
+				console.log(data)
+					this.code = data.id;
+					this.money = data.buyMoney;
+					this.number = data.buyCount;
+					this.invitecode1 = data.invitecode;
+					this.appTitle='恬园商城'
+
+			},
+			//去佣金明细
+			toMoney() {
+				this.$common.navigateTo('./inviteMoney?status=5');
+			},
+			//去邀请列表
+			toList() {
+				this.$common.navigateTo('./inviteList');
+			},
+			//填写设置要求
+			setMyInvite() {
+				let data = {
+					invitecode: this.invitecode
+				}
+					Api.apiCall('post', Api.member.updateMember, data);
+					this.$common.successToShow('邀请码填写成功');
+			},
+			// 生成邀请海报
+			createPoster() {
+				let data = {
+					type: 2
+				}
+
+				let page_path = 'pages/share/jump';
+				// #ifdef H5
+				data.source = 1;
+				data.return_url = apiBaseUrl + 'wap/' + page_path;
+				// #endif
+
+				// #ifdef MP-WEIXIN
+				data.source = 2;
+				data.return_url = page_path;
+				// #endif
+
+				// #ifdef MP-ALIPAY
+				data.source = 3;
+				data.return_url = page_path;
+				// #endif
+
+				// #ifdef MP-TOUTIAO
+				data.source = 4;
+				data.return_url = page_path;
+				data.tt_platform = ttPlatform;
+				// #endif
+
+				let userToken = this.$db.get('userToken')
+
+				if (userToken) {
+					data.token = userToken
+				}
+				this.$api.createPoster(data, res => {
+					if (res.status) {
+						this.$common.navigateTo('/pages/share?poster=' + res.data)
+					} else {
+						this.$common.errorToShow(res.msg)
+					}
+				})
+			},
+			//复制URL链接
+			copyUrl() {
+				let userInfo = uni.getStorageSync('userInfo')
+
+			//todo::要复制的内容是 res.data
+            						uni.setClipboardData({
+            							data:'http://www.yjlive.cn:8082/?invitecode='+userInfo.id,
+            							success:function(data){
+            								_this.$common.successToShow('复制成功');
+            							},
+            							fail:function(err){
+            								_this.$common.errorToShow('复制分享URL失败');
+            							}
+            						})
+			},
+			getMyShareCode() {
+				let userToken = this.$db.get("userToken");
+				if (userToken && userToken != '') {
+					// 获取我的分享码
+					this.$api.shareCode({}, res => {
+						if (res.status) {
+							this.myShareCode = res.data ? res.data : '';
+						}
+					});
+				}
+			}
+		},
+		//分享
+		onShareAppMessage() {
+			let myInviteCode = this.myShareCode ? this.myShareCode : '';
+			let ins = this.$common.shareParameterDecode('type=3&invite=' + myInviteCode);
+			let path = '/pages/share/jump?scene=' + ins;
+			return {
+				title: this.$store.state.config.share_title,
+				// #ifdef MP-ALIPAY
+				desc: this.$store.state.config.share_desc,
+				// #endif
+				imageUrl: this.$store.state.config.share_image,
+				path: path
+			}
+		}
+	}
+</script>
+
+<style>
+	.invite {
+		width: 100%;
+		height: 100%;
+		background: linear-gradient(to right, #4c21d2, #4864f8);
+	}
+
+	.invite-bg {
+		position: absolute;
+		width: 750upx;
+		height: 683upx;
+		z-index: 66;
+	}
+
+	.invite-c {
+		position: relative;
+		z-index: 67;
+		width: 750upx;
+		padding: 0 30upx;
+		top: 488upx;
+		background: linear-gradient(to right, #4c21d2, #4864f8);
+	}
+
+	.invite-w {
+		background-color: #fff;
+		width: 690upx;
+		text-align: center;
+		padding: 40upx 100upx;
+		box-sizing: border-box;
+		border-radius: 30upx;
+		margin-bottom: 70upx;
+		position: relative;
+		top: -148upx;
+	}
+
+	.invite-w-t {
+		width: 70%;
+		margin: 0 auto;
+		color: #fff;
+		border-radius: 50upx;
+		font-size: 30upx;
+		box-sizing: border-box;
+		padding: 10upx;
+		display: block;
+		background: linear-gradient(to right, #5f2ef6, #b945dd);
+	}
+
+	.invite-w-num {
+		color: #5f2ef6;
+		display: block;
+		font-size: 36upx;
+		margin-top: 20upx;
+	}
+
+	.invite-w-detail {
+		color: #666;
+		font-size: 24upx;
+		line-height: 1.5;
+		margin-top: 20upx;
+	}
+
+	.invite-w-bot {
+		margin: 20upx 0 50upx;
+	}
+
+	.invite-w-bot>view {
+		width: 49%;
+		display: inline-block;
+	}
+
+	.invite-w-bot-ic {
+		width: 48upx;
+		height: 48upx;
+	}
+
+	.invite-w-bot-red {
+		font-size: 24upx;
+		color: #ca0400;
+		display: block;
+	}
+
+	.invite-w-bot-gray {
+		font-size: 24upx;
+		color: #acacac;
+		display: block;
+	}
+
+	.invite-w-t-blue {
+		color: #348dfc;
+		font-size: 30upx;
+		margin-bottom: 50upx;
+		display: block;
+	}
+
+	.invite-w-input {
+		font-size: 30upx;
+		border-bottom: 1px solid #dadada;
+		margin-bottom: 50upx;
+		color: #999;
+	}
+
+	.invite-w-btn {
+		background: linear-gradient(to right, #4a6af9, #28c4ff);
+		color: #fff;
+		width: 50%;
+		margin: 0 auto;
+		border-radius: 50upx;
+		font-size: 30upx;
+		padding: 10upx 0;
+	}
+
+	.invite-btn {
+		position: relative;
+		top: -150upx;
+		text-align: center;
+		width: 690upx;
+	}
+
+	.share {
+		background-color: none;
+		position: relative;
+		width: 98upx;
+		height: 98upx;
+		display: inline-block;
+		border-radius: 50%;
+		padding: 0;
+		margin: 0 40rpx 40rpx;
+	}
+
+	.invite-btn image {
+		width: 98upx;
+		height: 98upx;
+	}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/inviteList.vue b/mallplusui-uniapp-app2/pagesU/user/inviteList.vue
new file mode 100644
index 0000000..bde1a2b
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/inviteList.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="content">
+		<view class="collection">
+			<view class="container_of_slide" v-for="(item, index) in lists" :key="index">
+				<view class="slide_list">
+					<view class="now-message-info" hover-class="uni-list-cell-hover">
+						<view class="icon-circle">
+							<image class='goods-img' :src="item.icon" mode="aspectFill"></image>
+						</view>
+						<view class="list-right">
+							<view class="list-title">昵称: {{ item.nickname }}</view>
+							<view class="list-detail color-6">手机号: {{ item.phone }}</view>
+							<view class="list-detail">推荐时间: {{ item.createTime |formatCreateTime}}</view>
+						</view>
+					</view>
+					<view style="clear:both"></view>
+				</view>
+			</view>
+			<uni-load-more :status="loadStatus"></uni-load-more>
+		</view>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue'
+import { formatDate } from '@/common/date';
+export default {
+	components: {
+		uniLoadMore
+	},
+	data() {
+		return {
+			lists: [],
+			page: 1, //当前页
+			limit: 10, //每页显示几条
+			loadStatus: 'more'
+		};
+	},
+	onLoad () {
+		this.getShareCode();
+		this.getDataList();
+	},
+	onReachBottom () {
+		if (this.loadStatus === 'more') {
+			this.getDataList()
+		}
+	},
+	filters: {
+                  formatCreateTime(time) {
+                    let date = new Date(time);
+                    return formatDate(date, 'yyyy-MM-dd hh:mm:ss')
+                  },
+                },
+	methods: {
+	async	getDataList() {
+			let params = {  };
+                        				let data = await Api.apiCall('get', Api.member.inviteUser, params);
+                        				console.log(data)
+                        				this.lists = data;
+		},
+		//获取邀请码
+		getShareCode(){
+			let userToken = this.$db.get("userToken");
+			if (userToken && userToken != '') {
+				// 获取我的分享码
+				this.$api.shareCode({}, res => {
+					if (res.status) {
+						this.myShareCode = res.data;
+					}
+				});
+			}
+		}
+	},
+};
+</script>
+
+<style scoped>
+.collection .goods-img{
+	width: 150upx;
+	height: 150upx;
+}
+.container_of_slide {
+	width: 100%;
+	overflow: hidden;
+}
+.slide_list {
+	transition: all 100ms;
+	transition-timing-function: ease-out;
+	min-width: 100%;
+}
+.now-message-info {
+	box-sizing:border-box;
+	display: flex;
+	align-items: center;
+	font-size: 16px;
+	clear:both;
+	padding: 20upx 26upx;
+	margin-bottom: 2upx;
+	background: #FFFFFF;
+	width: 100%;
+}
+.now-message-info,
+.group-btn {
+	float: left;
+}
+.group-btn {
+	display: flex;
+	flex-direction: row;
+	height: 190upx;
+	min-width: 100upx;
+	align-items: center;
+
+}
+.group-btn .btn-div {
+	height: 190upx;
+	color: #fff;
+	text-align: center;
+	padding: 0 50upx;
+	font-size: 34upx;
+	line-height: 190upx;
+}
+.group-btn .top {
+	background-color: #FF7159;
+}
+.group-btn .removeM {
+	background-color: #999;
+}
+.icon-circle{
+	width:150upx;
+	height: 150upx;
+	float: left;
+}
+.list-right{
+	float: left;
+	margin-left: 25upx;
+	height: 150upx;
+}
+.list-right-1{
+	float: right;
+	color: #A9A9A9;
+}
+.list-title{
+	width: 490upx;
+	line-height:1.5;
+	overflow:hidden;
+	color:#333;
+	font-size: 26upx;
+	min-height: 60upx;
+}
+.list-detail{
+	width: 460upx;
+	font-size: 24upx;
+	color: #a9a9a9;
+	display:-webkit-box;
+	-webkit-box-orient:vertical;
+	-webkit-line-clamp:1;
+	overflow:hidden;
+	height: 50upx;
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/inviteMoney.vue b/mallplusui-uniapp-app2/pagesU/user/inviteMoney.vue
new file mode 100644
index 0000000..4e988ca
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/inviteMoney.vue
@@ -0,0 +1,416 @@
+<template>
+	<view class="content">
+
+
+
+
+				<scroll-view class="list-scroll-content" scroll-y @scrolltolower="loadData">
+					<!-- 空白页 -->
+					<empty v-if=" list.length === 0"></empty>
+
+					<!-- 订单列表 -->
+					<view v-for="(item, index) in list" :key="index" class="order-item" >
+						<view class="i-top b-b">
+							<text class="time">{{ item.createTime }}</text>
+							<text class="time">订单编号：{{ item.orderId }}</text>
+							<text class="state">商品编号：{{ item.goodsId }}</text>
+							<text class="state">佣金：{{ item.money }}</text>
+
+						</view>
+
+
+
+					</view>
+<uni-load-more :status="loadingType"></uni-load-more>
+				</scroll-view>
+
+
+
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import uniLoadMore from '@/components/uni-load-more/uni-load-more.vue';
+import empty from '@/components/empty';
+export default {
+	components: {
+		uniLoadMore
+	},
+    data() {
+        return {
+			objectType: ['全部', '消费', '退款', '充值', '提现', '佣金', '平台调整'],
+			index: 0,	// 默认选中的类型	索引
+			page: 1,
+			limit: 10,
+			list: [],
+			states: [0, 1, 2, 3, 4, 5, 7], // 不同类型的状态
+			loadStatus: 'more'
+        }
+    },
+	onLoad (e) {
+		if(e.status){
+			this.index = this.states.indexOf(parseInt(e.status));
+		}else{
+			this.balances()//修复多次加载问题
+		}
+	},
+	onReachBottom () {
+		if (this.loadStatus === 'more') {
+			this.balances()
+		}
+	},
+    methods: {
+		// 切换类型
+		changeState (e) {
+			if (this.index !== e.target.value) {
+				this.index = e.target.value;
+				this.page = 1
+				this.list = []
+			}
+		},
+		// 获取余额明细
+		async balances () {
+			let params = {  };
+            				let data = await Api.apiCall('get', Api.member.inviteMoney, params);
+            				console.log(data)
+            				this.list = data;
+		}
+    },
+	watch: {
+		index () {
+			this.balances();
+		}
+	}
+}
+</script>
+</script>
+
+<style lang="scss">
+page,
+.content {
+	background: $page-color-base;
+	height: 100%;
+}
+
+.swiper-box {
+	height: calc(100% - 40px);
+}
+.list-scroll-content {
+	height: 100%;
+}
+
+.navbar {
+	display: flex;
+	height: 40px;
+	padding: 0 5px;
+	background: #fff;
+	box-shadow: 0 1px 5px rgba(0, 0, 0, 0.06);
+	position: relative;
+	z-index: 10;
+	.nav-item {
+		flex: 1;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		height: 100%;
+		font-size: 15px;
+		color: $font-color-dark;
+		position: relative;
+		&.current {
+			color: $base-color;
+			&:after {
+				content: '';
+				position: absolute;
+				left: 50%;
+				bottom: 0;
+				transform: translateX(-50%);
+				width: 44px;
+				height: 0;
+				border-bottom: 2px solid $base-color;
+			}
+		}
+	}
+}
+
+.uni-swiper-item {
+	height: auto;
+}
+.order-item {
+	display: flex;
+	flex-direction: column;
+	padding-left: 30upx;
+	background: #fff;
+	margin-top: 16upx;
+	.i-top {
+		display: flex;
+		align-items: center;
+		height: 80upx;
+		padding-right: 30upx;
+		font-size: $font-base;
+		color: $font-color-dark;
+		position: relative;
+		.time {
+			flex: 1;
+		}
+		.state {
+			color: $base-color;
+		}
+		.del-btn {
+			padding: 10upx 0 10upx 36upx;
+			font-size: $font-lg;
+			color: $font-color-light;
+			position: relative;
+			&:after {
+				content: '';
+				width: 0;
+				height: 30upx;
+				border-left: 1px solid $border-color-dark;
+				position: absolute;
+				left: 20upx;
+				top: 50%;
+				transform: translateY(-50%);
+			}
+		}
+	}
+	/* 多条商品 */
+	.goods-box {
+		height: 160upx;
+		padding: 20upx 0;
+		white-space: nowrap;
+		.goods-item {
+			width: 120upx;
+			height: 120upx;
+			display: inline-block;
+			margin-right: 24upx;
+		}
+		.goods-img {
+			display: block;
+			width: 100%;
+			height: 100%;
+		}
+	}
+	/* 单条商品 */
+	.goods-box-single {
+		display: flex;
+		padding: 20upx 0;
+		.goods-img {
+			display: block;
+			width: 120upx;
+			height: 120upx;
+		}
+		.right {
+			flex: 1;
+			display: flex;
+			flex-direction: column;
+			padding: 0 30upx 0 24upx;
+			overflow: hidden;
+			.title {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				line-height: 1;
+			}
+			.attr-box {
+				font-size: $font-sm + 2upx;
+				color: $font-color-light;
+				padding: 10upx 12upx;
+			}
+			.price {
+				font-size: $font-base + 2upx;
+				color: $font-color-dark;
+				&:before {
+					content: '￥';
+					font-size: $font-sm;
+					margin: 0 2upx 0 8upx;
+				}
+			}
+		}
+	}
+
+	.price-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: baseline;
+		padding: 20upx 30upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-light;
+		.num {
+			margin: 0 8upx;
+			color: $font-color-dark;
+		}
+		.price {
+			font-size: $font-lg;
+			color: $font-color-dark;
+			&:before {
+				content: '￥';
+				font-size: $font-sm;
+				margin: 0 2upx 0 8upx;
+			}
+		}
+	}
+	.action-box {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+		height: 100upx;
+		position: relative;
+		padding-right: 30upx;
+	}
+	.action-btn {
+		width: 160upx;
+		height: 60upx;
+		margin: 0;
+		margin-left: 24upx;
+		padding: 0;
+		text-align: center;
+		line-height: 60upx;
+		font-size: $font-sm + 2upx;
+		color: $font-color-dark;
+		background: #fff;
+		border-radius: 100px;
+		&:after {
+			border-radius: 100px;
+		}
+		&.recom {
+			background: #fff9f9;
+			color: $base-color;
+			&:after {
+				border-color: #f7bcc8;
+			}
+		}
+	}
+}
+
+/* load-more */
+.uni-load-more {
+	display: flex;
+	flex-direction: row;
+	height: 80upx;
+	align-items: center;
+	justify-content: center;
+}
+
+.uni-load-more__text {
+	font-size: 28upx;
+	color: #999;
+}
+
+.uni-load-more__img {
+	height: 24px;
+	width: 24px;
+	margin-right: 10px;
+}
+
+.uni-load-more__img > view {
+	position: absolute;
+}
+
+.uni-load-more__img > view view {
+	width: 6px;
+	height: 2px;
+	border-top-left-radius: 1px;
+	border-bottom-left-radius: 1px;
+	background: #999;
+	position: absolute;
+	opacity: 0.2;
+	transform-origin: 50%;
+	animation: load 1.56s ease infinite;
+}
+
+.uni-load-more__img > view view:nth-child(1) {
+	transform: rotate(90deg);
+	top: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(2) {
+	transform: rotate(180deg);
+	top: 11px;
+	right: 0;
+}
+
+.uni-load-more__img > view view:nth-child(3) {
+	transform: rotate(270deg);
+	bottom: 2px;
+	left: 9px;
+}
+
+.uni-load-more__img > view view:nth-child(4) {
+	top: 11px;
+	left: 0;
+}
+
+.load1,
+.load2,
+.load3 {
+	height: 24px;
+	width: 24px;
+}
+
+.load2 {
+	transform: rotate(30deg);
+}
+
+.load3 {
+	transform: rotate(60deg);
+}
+
+.load1 view:nth-child(1) {
+	animation-delay: 0s;
+}
+
+.load2 view:nth-child(1) {
+	animation-delay: 0.13s;
+}
+
+.load3 view:nth-child(1) {
+	animation-delay: 0.26s;
+}
+
+.load1 view:nth-child(2) {
+	animation-delay: 0.39s;
+}
+
+.load2 view:nth-child(2) {
+	animation-delay: 0.52s;
+}
+
+.load3 view:nth-child(2) {
+	animation-delay: 0.65s;
+}
+
+.load1 view:nth-child(3) {
+	animation-delay: 0.78s;
+}
+
+.load2 view:nth-child(3) {
+	animation-delay: 0.91s;
+}
+
+.load3 view:nth-child(3) {
+	animation-delay: 1.04s;
+}
+
+.load1 view:nth-child(4) {
+	animation-delay: 1.17s;
+}
+
+.load2 view:nth-child(4) {
+	animation-delay: 1.3s;
+}
+
+.load3 view:nth-child(4) {
+	animation-delay: 1.43s;
+}
+
+@-webkit-keyframes load {
+	0% {
+		opacity: 1;
+	}
+
+	100% {
+		opacity: 0.2;
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/myPurse.vue b/mallplusui-uniapp-app2/pagesU/user/myPurse.vue
new file mode 100644
index 0000000..845db54
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/myPurse.vue
@@ -0,0 +1,580 @@
+<template>
+	<view class="conten">
+		<view class="conten-top">
+			<view class="conten-top-title">
+				<text>{{money/100}}</text>
+			</view>
+			<view class="conten-top-text">
+				<text>可提现金额</text>
+			</view>
+		</view>
+		<view class="detail" @click="goDetail">
+			<text>提现明细</text>
+			<view class="detailedRight">
+				<image src="http://rs.eonfox.cc/clzy/static/Arrow_right02.png" class="detailedRightImg"></image>
+			</view>
+		</view>
+		<view class="withdrawDeposit" v-show="!display">
+			<view class="withdrawDeposit-title">
+				<text>请输入提现金额</text>
+			</view>
+			<text class="abposin">￥</text>
+			<view class="withdrawDeposit-box">
+				<input type="digit"  v-model="moneyTx" placeholder="此处金额在100~10000间且每日提现不能超过三次"/>
+			</view>
+			<view class="withdrawDeposit-text">
+				<text>请选择提现账户</text>
+			</view>
+			
+		</view>
+		 <view class="BopBox" v-show="display">
+			<view class="informationBox">
+				<view class="infor-title">
+					<text>支付宝账号:</text>
+				</view>
+				<view class="infor-input">
+					<input type="text" value="" @input="inpID" :placeholder="ID" />
+				</view>
+			</view>
+			<view class="informationBox">
+				<view class="infor-title">
+					<text>真实姓名:</text>
+				</view>
+				<view class="infor-input">
+					<input type="text" value="" @input="inpName"  :placeholder="name"/>
+				</view>
+			</view>
+			<view class="affirmBut">
+				<button type="primary" @click="next()">确认</button>
+			</view>				
+		</view>
+		<!-- <view class="payw">
+			<image src="http://rs.eonfox.cc/clzy/static/ali_pay.png" mode=""></image>
+			<text class="txt" @click="payAli">支付宝</text>
+			<text style="float: right; padding-right:40upx;color: #598fc7;" @click="addpayAli">添加支付宝账号信息</text>
+		</view>
+		<view class="pay" @click="payWx">
+			<image src="http://rs.eonfox.cc/clzy/static/wechat.png" mode=""></image>
+			<text class="txt">微信</text>
+		</view> -->
+         <view style="float:left;" v-show="!display">
+			    <view class="payw">
+			     	<image src="http://rs.eonfox.cc/clzy/static/ali_pay.png" mode=""></image>
+			     	<text class="txt" @click="popBox">支付宝</text>  <!-- @click="payAli" -->
+					 <label class="radio"><radio value="r1" :checked="choice"  @click="xz('z')"/></label>
+			    </view>
+               <view class="pay">
+				   <image src="http://rs.eonfox.cc/clzy/static/wechat.png" mode="" ></image>
+				   <text class="txt">微信</text>
+               	<label class="radio"><radio value="r2" :checked="!choice"  @click="xz('w')" /></label>
+               </view>
+         </view>
+		 <button class="confirm-btn" @click="WithdrawBut" v-show="!display">
+		 	提现
+		 </button>
+	</view>
+</template>
+
+<script>
+import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+	import uniIcon from "@/components/uni-icon/uni-icon.vue"
+	import fns from '@/components/eonfox/fns.js';
+	import eonfox from '@/components/eonfox/eonfox.js';
+	var ef = new eonfox();
+	export default {
+		data() {
+			return {
+				money:'0.00',
+				moneyTx:'',
+				Sofar:'',
+				code:'',
+				openid:'',
+				ID:'',  //支付宝账号
+				name:'', //支付宝真实姓名
+				choice:true,
+				display:false,
+				isAuth:false
+			};
+		},
+		onShow() {
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: '#ff5252',
+				animation: {
+					duration: 400,
+					timingFunc: 'easeIn'
+				}
+			})
+			this.moneyQuery();
+			var that=this;
+
+		},
+		methods:{
+			goDetail(){
+				uni.navigateTo({
+					url: '../../pagesA/transactionDetail/transactionDetail?method=user_money_earning'
+				})
+			},
+			payAli(){
+				var _this=this
+				var money=_this.moneyTx*100
+				ef.submit({
+					request:{s:['APPLICATIONORDERSELFUSERMONEYEARNINGWITHDRAW',[{
+						money_fen:money,
+						withdraw_method:"alipay",
+// 						// #ifdef MP-WEIXIN
+// 						weixin_login_code:_this.code,
+// 						weixin_trade_type:"JSAPI",
+// 						// #endif
+// 						// #ifdef APP-PLUS
+// 						weixin_login_openid:"用户OpenID，当weixin_login_code参数不存在时需要",
+// 						weixin_trade_type:"APP"
+// 						// #endif
+                       alipay_account:_this.ID,//支付宝账号
+					   alipay_realname:_this.name,//真实姓名
+					}]]},
+					callback(data){
+						console.log(data);
+						var re=fns.checkError(data,'s',function(errno,error){
+							uni.showToast({
+								title:error,
+								icon:'none'
+							})
+						})
+					if(data.data.s.errno==0){
+						uni.showToast({
+							title:'提现成功',
+							
+						});
+						setTimeout(function(){
+							uni.navigateBack({
+								url:'../../pages/me/me'
+							})
+						},2000);
+					}
+						
+					},error(err){
+						fns.err('调用提现错误',err,1)
+					}
+				})
+			this.moneyQuery();
+			},
+			addpayAli(){
+				uni.navigateTo({
+					url: '../../pagesA/addpayAli/addpayAli'
+				})
+			},
+			payWx(){
+				var _this=this
+				var money=_this.moneyTx*100
+				console.log('提现金额',money);
+				console.log('我的账户',_this.money);
+				console.log(money<=0,money>_this.money);
+				if(money<=0||money>_this.money||!/^\d+(\.\d+)?$/.test(money)){
+					uni.showToast({
+						title:'提现金额错误',
+						icon:'none'
+					})
+				}else{
+					// #ifdef MP-WEIXIN
+					
+					_this.wxMp()
+					// #endif
+					// #ifdef APP-PLUS
+					_this.wxApp()
+					// #endif
+				}
+			},
+			wxMp(){
+				var _this=this
+				wx.login({
+					//微信小程序登录获取code
+					success(res) {
+						_this.code = res.code;
+						if (res.code) {
+							//获取到code生成订单
+							// 发起网络请求
+							console.log('发起网络请求');
+							_this.tiXian()
+						} else {
+							_this.isDisable = false;
+							console.log('登录失败！' + res.errMsg)
+							uni.showToast({
+								title: '登录失败！' + res.errMsg,
+								icon: 'none'
+							})
+						}
+					}
+				})
+			},
+			wxApp(){
+				var _this=this
+				uni.login({
+				  provider: 'weixin',
+				  success: function (loginRes) {
+					  console.log('loginres:',typeof loginRes);
+					  if (loginRes.errMsg=='login:ok') {
+								// 获取用户信息
+								uni.getUserInfo({
+								  provider: 'weixin',
+								  success: function (infoRes) {
+									 console.log('info',JSON.stringify(infoRes.userInfo));
+									 var openid=infoRes.userInfo.openId
+									 _this.tiXian(openid)
+									},
+								  fail(err){
+									 fns.err('err',err,1)
+								  }
+								});
+							
+					  }else{
+						  fns.err('err','err',1)
+					  }
+				  },
+				  fail(err) {
+				  	fns.err('err','login',1)
+				  }
+				});
+			},
+			tiXian(openid){
+				var _this=this
+				var money=_this.moneyTx*100
+				ef.submit({
+					request:{s:['APPLICATIONORDERSELFUSERMONEYEARNINGWITHDRAW',[{
+						money_fen:money,
+						comment:"赠送收益提现",
+						withdraw_method:"weixinpay",
+						// #ifdef MP-WEIXIN
+						weixin_login_code:_this.code,
+						weixin_trade_type:"JSAPI",
+						// #endif
+						// #ifdef APP-PLUS
+						weixin_login_openid:openid,
+						weixin_trade_type:"APP"
+						// #endif
+					}]]},
+					callback(data){
+						var re=fns.checkError(data,'s',function(errno,error){
+							fns.err('err',error)
+						})
+						if (data.data.s && data.data.s.data ){
+							uni.showToast({
+								title:'提现成功',
+								success() {
+									setTimeout(function(){
+										uni.redirectTo({
+											url:'../../pagesB/profit/profit'
+										})
+									},2000)
+								}
+							})
+						}
+						console.log('tixian',data);
+					},error(err){
+						fns.err('调用提现错误',err,1)
+					}
+				})
+				
+			},
+			async moneyQuery(){
+				var _this=this
+
+                				 let params = {  };
+                                            				let data1 = await Api.apiCall('get', Api.member.currentMember, params);
+                                					_this.money = data1.blance;
+
+
+			},
+			xz(fun){
+				var that=this;
+				if(fun=='z'){
+					that.choice=true;
+				}else{
+					that.choice=false;
+				}
+		
+			},
+			popBox(){
+				var that=this;
+				that.display=!that.display;
+			},
+			inpID:function(event){
+				var that=this;
+				that.ID = event.detail.value;
+			},
+			inpName:function(event){
+				var that=this;
+				that.name = event.detail.value;
+			},
+			next(){
+				var that=this;
+				that.display=!that.display;
+				ef.submit({
+						request: {
+							u:['USERSELFCONFIGALIPAY',[{account:that.ID,realname:that.name}]]
+						},
+						callback: function(data){
+							console.log("用户支付宝信息",data);
+							var ulist=fns.checkError(data,'u',function(errno,error){
+								 uni.showToast({
+								 	title:error,
+									icon:'none'
+								 })
+							})
+							if(ulist.u){
+								uni.showToast({
+									title:'保存成功',
+									icon:'none',
+									success() {
+										that.isAuth=true
+									}
+								})	
+							}
+							
+						},
+						 error: function(err){
+								 console.log("出错啦", err);
+						},
+					});
+				},
+		WithdrawBut(){
+			console.log('点击提现按钮')
+			var that=this;
+			// true支付宝
+// 			if(that.choice==true){
+// 				that.payAli();
+// 			}
+// 			// false微信
+			if(that.moneyTx<100){
+				fns.err('提现金额必须大于等于100元');
+				return
+			}
+// 			
+			if(that.choice){
+				console.log('提现支付宝',that.isAuth);
+				
+// 				if(!that.isAuth){
+// 					uni.showToast({
+// 						title:'请设置支付宝信息',
+// 						icon:'none',
+// 						success() {
+// 							that.display=!that.display;
+// 						}
+// 					});
+// 					return;
+// 					
+// 				}
+				if(that.ID==""){
+					 that.display=!that.display;
+				}
+				else{
+					uni.showModal({
+						title:'提示',
+						content:'你是否要提现'+that.moneyTx+'元到'+that.ID+'账号',
+						 success: function (res) {
+                       if (res.confirm) {
+                        that.payAli();
+                       } else if (res.cancel) {
+                        that.display=!that.display;
+                      }
+                     }
+					})
+				}
+				
+				
+			}else{
+				console.log('提现微信');
+				that.payWx();
+			}
+		}
+		//-----	
+		}
+	}
+</script>
+
+<style>
+	.conten{
+		width: 100%;
+		height: 100%;
+		
+	}
+	.conten-top{
+		width: 100%;
+		height: 250upx;
+		background-color: #FF5252;
+		padding-top: 80upx;
+		color: #ffff;
+	}
+	.conten-top-text{
+		width: 100%;
+		height: 50upx;
+		text-align: center;
+		font-size:32upx;
+		margin-top: 30upx;
+	}
+	.conten-top-text text{
+		font-size:32upx;
+		color:#FFFFFF;
+	}
+	.conten-top-title{
+		width: 100%;
+		height: 50upx;
+		text-align: center;
+		
+	}
+	.conten-top-title text{
+		font-size:56upx;
+		color:#FFFFFF;
+	}
+	.detail{
+		float: left;
+		width: 100%;
+		height: 100upx;
+		border-bottom:1px solid #dedbdb;
+		line-height: 100upx;
+		padding-left: 20upx;
+		font-size: 32upx;
+	}
+	.withdrawDeposit{
+		width: 100%;
+		height: 300upx;
+		font-size: 28upx;
+		float: left;
+	}
+	.withdrawDeposit-title{
+		width:90%;
+		color: #666666;
+		margin-left: 10%;
+		line-height: 100upx;
+		height: 100upx;
+	}
+	.withdrawDeposit-box{
+		width: 90%;
+		height: 70upx;
+		background-color: #E8E8E8;
+		margin-left: 10%;
+		margin-top:10upx;
+		line-height: 70upx;
+	}
+	.withdrawDeposit-text{
+		width: 100%;
+		height: 70upx;
+		text-align: center;
+		line-height: 70upx;
+		margin-top: 30upx;
+	}
+	.payw{
+		float: left;
+		width: 100%;
+		height: 100upx;
+		border: 1px #DEDBDB solid;
+		line-height: 100upx;
+		font-size: 28upx;
+		padding-left: 30upx;
+	}
+	.pay{
+		float: left;
+		width: 100%;
+		height: 100upx;
+		border-bottom: 1px #DEDBDB solid;
+		line-height: 100upx;
+		font-size: 28upx;
+		padding-left: 30upx;
+		margin-bottom: 80upx;
+	}
+	.abposin{
+		position:absolute;
+		width: 40upx;
+		height: 40upx;
+		margin-left: 15upx;
+		font-size: 48upx;
+		margin-top: 8upx;
+	}
+	image{
+		width: 48upx;
+		height: 48upx;
+		margin: 20upx 20upx;
+		float: left;
+	}
+	.txt{
+		width: 510upx;
+		height: 100upx;
+		line-height: 100upx;
+		float: left;
+	}
+	.radio{
+		float: right;
+		padding-right:50upx;
+	}
+	.confirm-btn{
+		width :95%;
+		height :55px;
+		color: #fff;
+        margin-left: 2.5%;
+		background-color: #F8A0A0;
+		border-radius :4px;
+	}
+	
+	/* 弹出框样式 */
+	.BopBox{
+		width:100%;
+		height: 400upx;
+		position: absolute;
+		background-color: #FFFFFF;
+	}	
+	
+	.BopBox-title {
+		width: 100%;
+		height: 60upx;
+		font-size: 32upx;
+		text-align: center;
+	}
+	.informationBox{
+		width:100%;
+		padding: 5upx;
+		height: 80upx;
+		line-height: 80upx;
+		border-bottom: #eee 1px solid;
+		font-size:28upx;
+	}
+	.infor-title{
+		float: left;
+		width: 25%;
+		height: 80upx;
+		text-align: right;
+	}
+	.infor-input{
+		padding-left: 10upx;
+		width: 70%;
+		height: 50upx;
+		float: left;
+	}
+	.infor-input input{
+		width: 100%;
+		float: left;
+		height: 80upx;
+		line-height: 80upx;
+	}
+	.affirmBut{
+		width: 95%;
+		height: 60upx;
+		margin-top: 80upx;
+		margin-left: 2.5%;
+	}
+	.detailedRight{
+		width :44px;
+		position:relative;
+		right :10px;
+		top: 5px;
+		float: right;
+		text-align :right;
+	}
+		
+		.detailedRightImg{
+		  width: 20px;
+		   height :20px;	
+		}
+			
+		
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/profile.vue b/mallplusui-uniapp-app2/pagesU/user/profile.vue
new file mode 100644
index 0000000..f5665ab
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/profile.vue
@@ -0,0 +1,190 @@
+<template>
+		<view class="container">
+			<view class="list-cell b-b m-t" @click="upImg" :hover-stay-time="50" style="display: flex;align-items: center;">
+				<text class="cell-tit">我的头像</text>
+				<view class="" style="display: flex;align-items: center;justify-content: center;height: 80upx;line-height: 80upx;">
+					<image v-if="userInfos && userInfos.icon" :src="userInfos.icon" style="border-radius: 50%;width: 100upx;height: 100upx;"></image>
+					<text class="cell-more yticon icon-you"></text>
+				</view>
+			</view>
+
+			<view class="list-cell b-b m-t" @click="inputShowModal('nickname')" hover-class="cell-hover" :hover-stay-time="50">
+				<text class="cell-tit" v-if="userInfos && userInfos.nickname">修改昵称:{{userInfos.nickname|| ''}}</text>
+				<text class="cell-more yticon icon-you"></text>
+			</view>
+			<view class="list-cell b-b" @click="genderShowModal" hover-class="cell-hover" :hover-stay-time="50">
+				<text class="cell-tit">修改性别</text>
+				<text class="cell-more yticon icon-you"></text>
+			</view>
+
+			<neil-modal :show="inputShow" @close="cancel" title="编辑" @cancel="cancel" @confirm="confirm">
+				<input v-model="inputContent" style="margin:20upx" placeholder="请输入..." />
+			</neil-modal>
+			<neil-modal :show="genderShow" @close="cancel" title="选择性别" @cancel="cancel" @confirm="confirmGender">
+				<view>
+					<radio-group style="text-align:center" @change="genderRadioChange">
+						<label v-for="(item, index) in genders" :key="item.value">
+							<radio :value="item.value" :checked="index === current" style="margin:10upx" />
+							{{ item.name }}
+						</label>
+					</radio-group>
+				</view>
+			</neil-modal>
+		</view>
+</template>
+
+<script>
+	import mallplusCopyright from '@/components/mall-copyright/mallplusCopyright.vue';
+import Api from '@/common/api';
+import neilModal from '@/components/neil-modal.vue';
+import { mapState, mapMutations } from 'vuex';
+export default {
+	components: {
+		neilModal
+	},
+	data() {
+		return {
+			inputShow: false,
+			feild: undefined,
+			inputContent: '',
+			genderShow: false,
+			gender: undefined,
+			genders: [{ name: '保密', value: 0 }, { name: '男', value: 1 }, { name: '女', value: 2 }],
+
+			userInfos: {},
+			sourceTypeIndex: 0,
+			sourceType: ['拍照', '相册', '拍照或相册'],
+			sizeTypeIndex: 0,
+			sizeType: ['压缩', '原图', '压缩或原图'],
+		};
+	},
+	async onShow() {
+		 let params = {  };
+		 let data = await Api.apiCall('get', Api.index.userSampleInfo, params);
+		 this.userInfos=data;
+		 console.log(this.userInfos);
+	},
+	async onLoad() {
+		let params = {  };
+		let data = await Api.apiCall('get', Api.index.userSampleInfo, params);
+		this.userInfos=data;
+		console.log(this.userInfos);
+	},
+	methods: {
+		upImg(){
+			this.$otherApi.uploadFiles(res => {
+				if (res.code == 200) {
+					this.userInfos.icon = res.data;
+					let obj = {
+						id:1,
+						icon: res.data
+					};
+					Api.apiCall('post', Api.member.updateMember, obj);
+					that.$api.msg('修改成功');
+				} else {
+					this.$common.errorToShow(res.msg)
+				}
+			})
+
+		},
+		cancel() {
+			this.inputShow = false;
+			this.genderShow = false;
+		},
+		inputShowModal(feild) {
+			this.feild = feild;
+			this.inputShow = true;
+			this.inputContent = '';
+		},
+		genderShowModal() {
+			this.genderShow = true;
+			this.gender = undefined;
+		},
+		confirm() {
+			const that = this;
+			if (!that.inputContent) {
+				that.$api.msg('输入不能为空');
+				return;
+			}
+			let obj = {	id:1};
+			obj[that.feild] = that.inputContent;
+			Api.apiCall('post', Api.member.updateMember, obj);
+			that.$api.msg('修改成功');
+			that.userInfos[that.feild] = that.inputContent
+
+		},
+		genderRadioChange(e) {
+			this.gender = parseInt(e.detail.value);
+		},
+		confirmGender() {
+			const that = this;
+			if (that.gender === undefined) {
+				that.$api.msg('请选择性别');
+				return;
+			}
+			let obj = {
+				id:1,
+				gender: that.gender
+			};
+			Api.apiCall('post', Api.member.updateMember, obj);
+			that.$api.msg('修改成功');
+
+		}
+	}
+};
+</script>
+
+<style lang="scss">
+page {
+	background: $page-color-base;
+}
+
+page {
+	background: $page-color-base;
+}
+.list-cell {
+	display: flex;
+	align-items: baseline;
+	padding: 20upx;
+	line-height: 60upx;
+	position: relative;
+	background: #fff;
+	justify-content: center;
+	&.log-out-btn {
+		margin-top: 40upx;
+		.cell-tit {
+			color: $uni-color-primary;
+			text-align: center;
+			margin-right: 0;
+		}
+	}
+	&.cell-hover {
+		background: #fafafa;
+	}
+	&.b-b:after {
+		left: 30upx;
+	}
+	&.m-t {
+		margin-top: 16upx;
+	}
+	.cell-more {
+		align-self: baseline;
+		font-size: $font-lg;
+		color: $font-color-light;
+		margin-left: 10upx;
+	}
+	.cell-tit {
+		flex: 1;
+		font-size: $font-base + 2upx;
+		color: $font-color-dark;
+		margin-right: 10upx;
+	}
+	.cell-tip {
+		font-size: $font-base;
+		color: $font-color-light;
+	}
+	switch {
+		transform: translateX(16upx) scale(0.84);
+	}
+}
+</style>
diff --git a/mallplusui-uniapp-app2/pagesU/user/reset_password.vue b/mallplusui-uniapp-app2/pagesU/user/reset_password.vue
new file mode 100644
index 0000000..6f8cbb8
--- /dev/null
+++ b/mallplusui-uniapp-app2/pagesU/user/reset_password.vue
@@ -0,0 +1,127 @@
+<template>
+	<view>
+		<!-- <form @submit="formSubmit"> -->
+			<view class="section">
+				<input name="account"   v-model="password" password="true"  maxlength="32"  placeholder="请新输入密码" placeholder-style="font-size:15px" class="password"/>
+				<view class="eyesBox">
+					<image src="http://rs.eonfox.cc/clzy/static/eyes.png" class="eyes"></image>
+				</view>
+			</view>
+			<view class="section">
+				<input name="password"  password="true" v-model="confirm_password"  maxlength="32"  placeholder="请确认密码" placeholder-style="font-size:26upx" class="password"/>
+				<view class="eyesBox" >
+					<image src="http://rs.eonfox.cc/clzy/static/eyes.png" mode="" class="eyes"></image>
+				</view>
+			</view>
+			<view class="remind">
+				<text class="remindText">密码长度8~24位,必须包含数字/字母/符号至少2种以上元素</text>
+			</view>
+			<view class="btn-area" >
+				<button formType="submit" @click="formSubmit()" class="buttons" >确认提交</button>
+			</view>
+		<!-- </form> -->
+	</view>
+</template>
+
+<script>
+	import eonfox from '@/components/eonfox/eonfox.js';
+	import fns from '@/components/eonfox/fns.js';
+	var ef = new eonfox();
+export default {
+	data() {
+		return {
+			phone:'',
+			code:'',
+			password:'',
+			confirm_password:'',
+		};
+	},
+	onLoad(e) {
+		this.phone=e.phone;
+		this.code=e.code;
+		console.log("电话号码",this.phone);
+		console.log("验证码",this.code);
+	},
+	methods: {
+		formSubmit:function(){
+			var _this = this;
+			ef.submit({
+				request: {
+					s: ['USERRESETPASSWORD',[{phone:_this.phone,password:_this.password,confirm_password:_this.confirm_password,phone_verify_key:"reset_password",phone_verify_code:_this.code,log_out:true}]	
+					]
+				},
+				callback: function(data) {
+					if (fns.checkError(data,'s',function(errno,error){
+						_this.getverifSwitch=false;
+						uni.showToast({
+							title:error,
+							icon:'none'
+						})
+					})) {
+						uni.showToast({
+							title:'密码修改成功',
+							icon:'success',
+							success() {
+								setTimeout(function(){
+									uni.reLaunch({
+										url:
+											'../../pagesA/login/login' 
+									})
+								},1000)
+							}
+						})
+						
+					} 
+					console.log(data)
+				},
+				error: function(err) {
+					console.log('出错啦', err);
+					uni.showToast({
+						title:JSON.stringify(err),
+						icon:'none'
+					})
+				}
+			});
+		}
+	}
+};
+</script>
+
+<style scoped lang="stylus" ref="stylesheet/stylus">
+	.section
+		width 90%
+		// height 80upx
+		margin 20upx auto
+		padding 18upx 0
+		background #F2F2F2
+		border-radius 10upx
+		position relative
+		top 5px
+		.eyesBox
+			position absolute
+			right 10upx
+			top 5upx
+			height 100%
+			width 60upx
+			.eyes
+				width 40upx
+				height 40upx
+				position absolute
+				right 10upx
+				top 25upx
+	.remind
+		width 90%
+		height 80upx
+		margin 20upx auto
+		font-size 26upx
+		color #A9A9A9
+		.remindText
+			height 80upx
+			line-height 80upx
+	.btn-area
+		width 90%
+		margin 10upx auto
+		.buttons
+			color #fff
+			background #F76968
+</style>
diff --git a/mallplusui-uniapp-app2/plugins/APPUpdate/APPUpdate.md b/mallplusui-uniapp-app2/plugins/APPUpdate/APPUpdate.md
new file mode 100644
index 0000000..b6dbc1d
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/APPUpdate/APPUpdate.md
@@ -0,0 +1,106 @@
+# APP版本更新、强制更新、漂亮的更新界面、IOS更新（跳转IOS store）、wgt更新
+
+### QQ交流群(学习干货多多) 607391225
+![QQ交流群](http://qn.kemean.cn//upload/202004/14/15868301778472k7oubi6.png)
+
+### 常见问题
+1.安卓apk下载完成后没有更新APP?
+
+答：问题是因为没有添加APP安装应用的权限，解决方法在`manifest.json`文件里面`APP模块权限配置`的`Android打包权限配置`勾选以下权限
+```
+<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>  
+<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>
+```
+若还有问题请看[安装apk无法执行的解决方案](https://ask.dcloud.net.cn/article/35703 "安装apk无法执行的解决方案")
+
+2.APP更新后版本号没变，还是之前的版本号？
+
+答：可能是更新的安装包没有升级版本号，`manifest.json`文件里面基本设置`应用版本号`和`应用版本名称`需要升高
+
+3.APP更新后没有覆盖之前的APP？
+
+答：可能是更新的安装包`包名`和APP的`包名`不一样
+
+### 第一步配置APP更新接口
+在`APPUpdate.js`里面`getServerNo`函数方法配置更新接口
+```
+let httpData = {
+	version:version
+};
+if (platform == "android") {
+	httpData.type = 1101;
+} else {
+	httpData.type = 1102;
+}
+/* 接口入参说明
+ * version: 应用当前版本号（已自动获取）
+ * type：平台（1101是安卓，1102是IOS）
+ */ 
+$http.get("api/kemean/aid/app_version", httpData).then(res => {
+	/*接口出参说明 （res数据说明）
+	* | 参数名称	     | 一定返回 	| 类型	    | 描述
+	* | -------------|--------- | --------- | ------------- |
+	* | versionCode	 | y	    | int	    | 版本号        |
+	* | versionName	 | y	    | String	| 版本名称      |
+	* | versionInfo	 | y	    | String	| 版本信息 \n 换行（例如：1.修改了bug1 \n 2.修改了bug2 \n 3.修改了bug3）      |
+	* | forceUpdate	 | y	    | boolean	| 是否强制更新  |
+	* | downloadUrl	 | y	    | String	| 版本下载链接 `IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接` |
+	*/
+});
+```
+
+### 第二步 使用方法
+``` 
+// App.vue页面
+
+// #ifdef APP-PLUS
+import APPUpdate from "@/plugins/APPUpdate";
+// #endif
+
+onLaunch: function(e) {
+	// #ifdef APP-PLUS
+	APPUpdate();
+	// #endif
+}
+```
+
+### 第三步 添加APP安装应用的权限
+在`manifest.json`文件里面`APP模块权限配置`的`Android打包权限配置`勾选以下权限
+```
+<uses-permission android:name=\"android.permission.INSTALL_PACKAGES\"/>  
+<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>
+```
+
+### 修改弹窗的主题色或弹窗图标
+在`APPUpdate.js`里面上面`$mainColor`常量中定义主题颜色，`$iconUrl`常量中定义图标地址
+
+### 检查APP是否有新版本（一般在设置页面使用）
+```
+// #ifdef APP-PLUS
+import APPUpdate, { getCurrentNo } from "@/plugins/APPUpdate";
+// #endif
+export default {
+	data() {
+		return {
+			version: "" // 版本号
+		};
+	},
+	//第一次加载
+	onLoad(e) {
+		// #ifdef APP-PLUS
+		getCurrentNo(res => {
+			// 进页面获取当前APP版本号（用于页面显示）
+			this.version = res.version;
+		});
+		// #endif
+	},
+	//方法
+	methods: {
+		// 检查APP是否有新版本
+		onAPPUpdate() {
+			// true 没有新版本的时候有提示，默认：false
+			APPUpdate(true);
+		}
+	}
+}
+```
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/plugins/APPUpdate/index.js b/mallplusui-uniapp-app2/plugins/APPUpdate/index.js
new file mode 100644
index 0000000..b66cda6
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/APPUpdate/index.js
@@ -0,0 +1,816 @@
+// #ifdef APP-PLUS 
+import $api from '@/common/api';
+import $http from '@/config/requestConfig';
+const platform = uni.getSystemInfoSync().platform;
+// 主颜色
+const $mainColor = "FF5B78";
+// 弹窗图标url
+const $iconUrl = "/static/icon/ic_ar.png";
+// 获取当前应用的版本号
+export const getCurrentNo = function(callback) {
+	// 获取本地应用资源版本号
+	plus.runtime.getProperty(plus.runtime.appid, function(inf) {
+		callback && callback({
+			versionCode: inf.version.replace(/\./g, ""),
+			version: inf.version
+		});
+	});
+}
+// 发起ajax请求获取服务端版本号
+export const getServerNo = function(version, isPrompt = false, callback) {
+	let userInfos = uni.getStorageSync('userInfos');
+	console.log(userInfos);
+	console.log(userInfos.username)
+	let userName = userInfos.username;
+	let httpData = {
+		version: version,
+		userName:userName
+	};
+	console.log(userName)
+	if (platform == "android") {
+		httpData.type = 1101;
+	} else {
+		httpData.type = 1102;
+	}
+	/* 接口入参说明
+	 * version: 应用当前版本号（已自动获取）
+	 * type：平台（1101是安卓，1102是IOS）
+	 */
+	$http.get("api/appVersion/versioninfo", httpData, {
+		isPrompt: isPrompt
+	}).then(res => {
+		/* res的数据说明
+		 * | 参数名称	     | 一定返回 	| 类型	    | 描述
+		 * | -------------|--------- | --------- | ------------- |
+		 * | versionCode	 | y	    | int	    | 版本号        |
+		 * | versionName	 | y	    | String	| 版本名称      |
+		 * | versionInfo	 | y	    | String	| 版本信息      |
+		 * | forceUpdate	 | y	    | boolean	| 是否强制更新  |
+		 * | downloadUrl	 | y	    | String	| 版本下载链接（IOS安装包更新请放跳转store应用商店链接,安卓apk和wgt文件放文件下载链接）  |
+		 */
+		console.log(res)
+		console.log(JSON.parse(res));
+		console.log(JSON.stringify(JSON.parse(res)))
+		console.log(JSON.parse(res).downloadUrl)
+		if (res && JSON.parse(res).downloadUrl && version < JSON.parse(res).versionCode) {
+			callback && callback(res);
+		} else if (isPrompt) {
+			uni.showToast({
+				title: "暂无新版本",
+				icon: "none"
+			});
+		}
+	});
+}
+// 从服务器下载应用资源包
+export const getDownload = function(res) {
+	//let data = JSON.parse(res);
+	let data = res;
+	let popupData = {
+		progress: true,
+		buttonNum: 2
+	};
+	if (data.forceUpdate) {
+		popupData.buttonNum = 0;
+	}
+	let file = data.fileName
+	let dtask;
+	let lastProgressValue = 0;
+	downloadPopup(popupData, function(res) {
+			dtask = plus.downloader.createDownload(data.downloadUrl, {
+				// filename: '_doc/update/' + file + '/' + new Date().getTime() + '/'
+				filename: '_doc/update/' + new Date().getTime() + '/' + file
+			}, function(download, status) {
+				console.log("status=====:" + status)
+				if (status == 200) {
+					res.change({
+						progressValue: 100,
+						progressTip: "正在安装文件...",
+						progress: true,
+						buttonNum: 0
+					});
+					console.log(download.filename)
+					plus.runtime.install(download.filename, {
+						force: false
+					}, function() {
+						// plus.runtime.restart();//下载后重启app
+						res.change({
+							contentText: "应用资源更新完成！",
+							buttonNum: 1,
+							progress: false
+						});
+					}, function(e) {
+						res.cancel();
+						plus.nativeUI.alert("安装文件失败[" + e.code + "]：" + e.message);
+					});
+				} else {
+					res.change({
+						contentText: "文件下载失败...",
+						buttonNum: 1,
+						progress: false
+					});
+				}
+			});
+			dtask.start();
+			dtask.addEventListener("statechanged", function(task, status) {
+				switch (task.state) {
+					case 1: // 开始
+						res.change({
+							progressValue: 0,
+							progressTip: "准备下载...",
+							progress: true
+						});
+						break;
+					case 2: // 已连接到服务器  
+						res.change({
+							progressValue: 0,
+							progressTip: "开始下载...",
+							progress: true
+						});
+						break;
+					case 3:
+						const progress = parseInt(task.downloadedSize / task.totalSize * 100);
+						if (progress - lastProgressValue >= 2) {
+							lastProgressValue = progress;
+							res.change({
+								progressValue: progress,
+								progressTip: "已下载" + progress + "%",
+								progress: true
+							});
+						}
+
+						break;
+				}
+			});
+		}, function() {
+			// 取消下载
+			dtask && dtask.abort();
+			uni.showToast({
+				title: "已取消下载",
+				icon: "none"
+			});
+		},
+		function() {
+			// 重启APP
+			plus.runtime.restart();
+		});
+}
+// 文字换行
+function drawtext(text, maxWidth) {
+	debugger
+	let textArr = text.split(" ");
+	let len = textArr.length;
+	// 上个节点
+	let previousNode = 0;
+	// 记录节点宽度
+	let nodeWidth = 0;
+	// 文本换行数组
+	let rowText = [];
+	// 如果是字母，侧保存长度
+	let letterWidth = 0;
+	// 汉字宽度
+	let chineseWidth = 14;
+	// otherFont宽度
+	let otherWidth = 7;
+	for (let i = 0; i < len; i++) {
+		if (/[\u4e00-\u9fa5]|[\uFE30-\uFFA0]/g.test(textArr[i])) {
+			if (letterWidth > 0) {
+				if (nodeWidth + chineseWidth + letterWidth * otherWidth > maxWidth) {
+					rowText.push({
+						type: "text",
+						content: text.substring(previousNode, i)
+					});
+					previousNode = i;
+					nodeWidth = chineseWidth;
+					letterWidth = 0;
+				} else {
+					nodeWidth += chineseWidth + letterWidth * otherWidth;
+					letterWidth = 0;
+				}
+			} else {
+				if (nodeWidth + chineseWidth > maxWidth) {
+					rowText.push({
+						type: "text",
+						content: text.substring(previousNode, i)
+					});
+					previousNode = i;
+					nodeWidth = chineseWidth;
+				} else {
+					nodeWidth += chineseWidth;
+				}
+			}
+		} else {
+			if (/\n/g.test(textArr[i])) {
+				rowText.push({
+					type: "break",
+					content: text.substring(previousNode, i)
+				});
+				previousNode = i + 1;
+				nodeWidth = 0;
+				letterWidth = 0;
+			} else if (textArr[i] == "\\" && textArr[i + 1] == "n") {
+				rowText.push({
+					type: "break",
+					content: text.substring(previousNode, i)
+				});
+				previousNode = i + 2;
+				nodeWidth = 0;
+				letterWidth = 0;
+			} else if (/[a-zA-Z0-9]/g.test(textArr[i])) {
+				letterWidth += 1;
+				if (nodeWidth + letterWidth * otherWidth > maxWidth) {
+					rowText.push({
+						type: "text",
+						content: text.substring(previousNode, i + 1 - letterWidth)
+					});
+					previousNode = i + 1 - letterWidth;
+					nodeWidth = letterWidth * otherWidth;
+					letterWidth = 0;
+				}
+			} else {
+				if (nodeWidth + otherWidth > maxWidth) {
+					rowText.push({
+						type: "text",
+						content: text.substring(previousNode, i)
+					});
+					previousNode = i;
+					nodeWidth = otherWidth;
+				} else {
+					nodeWidth += otherWidth;
+				}
+			}
+		}
+	}
+	if (previousNode < len) {
+		rowText.push({
+			type: "text",
+			// content: text.substring(previousNode, len)
+			content: text
+		});
+	}
+	return rowText;
+}
+// 是否更新弹窗
+function updatePopup(res, callback) {
+	console.log(res);
+	//let data = JSON.parse(res);
+	let data = res;
+	console.log(data.versionInfo)
+	// 弹窗遮罩层
+	let maskLayer = new plus.nativeObj.View("maskLayer", { //先创建遮罩层
+		top: '0px',
+		left: '0px',
+		height: '100%',
+		width: '100%',
+		backgroundColor: 'rgba(0,0,0,0.5)'
+	});
+
+	// 以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
+	const screenWidth = plus.screen.resolutionWidth;
+	const screenHeight = plus.screen.resolutionHeight;
+	//弹窗容器宽度
+	const popupViewWidth = screenWidth * 0.7;
+	// 弹窗容器的Padding
+	const viewContentPadding = 20;
+	// 弹窗容器的宽度
+	const viewContentWidth = parseInt(popupViewWidth - (viewContentPadding * 2));
+	// 描述的列表
+	const descriptionList = drawtext(data.versionInfo, viewContentWidth);
+	// 弹窗容器高度
+	let popupViewHeight = 80 + 20 + 20 + 90 + 10;
+	let popupViewContentList = [{
+			src: $iconUrl,
+			id: "logo",
+			tag: "img",
+			position: {
+				top: "0px",
+				left: (popupViewWidth - 124) / 2 + "px",
+				width: "124px",
+				height: "80px",
+			}
+		},
+		{
+			tag: 'font',
+			id: 'title',
+			text: "发现新版本" + data.versionName,
+			textStyles: {
+				size: '18px',
+				color: "#333",
+				weight: "bold",
+				whiteSpace: "normal"
+			},
+			position: {
+				top: '90px',
+				left: viewContentPadding + "px",
+				width: viewContentWidth + "px",
+				height: "30px",
+			}
+		}
+	];
+	const textHeight = 18;
+	let contentTop = 130;
+	descriptionList.forEach((item, index) => {
+		if (index > 0) {
+			popupViewHeight += textHeight;
+			contentTop += textHeight;
+		}
+		popupViewContentList.push({
+			tag: 'font',
+			id: 'content' + index + 1,
+			text: item.content,
+			textStyles: {
+				size: '14px',
+				color: "#666",
+				lineSpacing: "50%",
+				align: "left"
+			},
+			position: {
+				top: contentTop + "px",
+				left: viewContentPadding + "px",
+				width: viewContentWidth + "px",
+				height: textHeight + "px",
+			}
+		});
+		if (item.type == "break") {
+			contentTop += 10;
+			popupViewHeight += 10;
+		}
+	});
+	// 弹窗内容
+	let popupView = new plus.nativeObj.View("popupView", { //创建底部图标菜单
+		tag: "rect",
+		top: (screenHeight - popupViewHeight) / 2 + "px",
+		left: '15%',
+		height: popupViewHeight + "px",
+		width: "70%"
+	});
+	// 绘制白色背景
+	popupView.drawRect({
+		color: "#FFFFFF",
+		radius: "8px"
+	}, {
+		top: "40px",
+		height: popupViewHeight - 40 + "px",
+	});
+	// 绘制底边按钮
+	popupView.drawRect({
+		radius: "3px",
+		borderColor: "#f1f1f1",
+		borderWidth: "1px",
+	}, {
+		bottom: viewContentPadding + 'px',
+		left: viewContentPadding + "px",
+		width: (viewContentWidth - viewContentPadding) / 2 + "px",
+		height: "30px",
+	});
+	// 绘制底边按钮
+	popupView.drawRect({
+		radius: "3px",
+		color: $mainColor,
+	}, {
+		bottom: viewContentPadding + 'px',
+		left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
+		width: (viewContentWidth - viewContentPadding) / 2 + "px",
+		height: "30px",
+	});
+	popupViewContentList.push({
+		tag: 'font',
+		id: 'cancelText',
+		text: "暂不升级",
+		textStyles: {
+			size: '14px',
+			color: "#666",
+			lineSpacing: "0%",
+			whiteSpace: "normal"
+		},
+		position: {
+			bottom: viewContentPadding + 'px',
+			left: viewContentPadding + "px",
+			width: (viewContentWidth - viewContentPadding) / 2 + "px",
+			height: "30px",
+		}
+	});
+	popupViewContentList.push({
+		tag: 'font',
+		id: 'confirmText',
+		text: "立即升级",
+		textStyles: {
+			size: '14px',
+			color: "#FFF",
+			lineSpacing: "0%",
+			whiteSpace: "normal"
+		},
+		position: {
+			bottom: viewContentPadding + 'px',
+			left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
+			width: (viewContentWidth - viewContentPadding) / 2 + "px",
+			height: "30px",
+		}
+	});
+	popupView.draw(popupViewContentList);
+	popupView.addEventListener("click", function(e) {
+		let maxTop = popupViewHeight - viewContentPadding;
+		let maxLeft = popupViewWidth - viewContentPadding;
+		let buttonWidth = (viewContentWidth - viewContentPadding) / 2;
+		if (e.clientY > maxTop - 30 && e.clientY < maxTop) {
+			// 暂不升级
+			if (e.clientX > viewContentPadding && e.clientX < maxLeft - buttonWidth - viewContentPadding) {
+				maskLayer.hide();
+				popupView.hide();
+			} else if (e.clientX > maxLeft - buttonWidth && e.clientX < maxLeft) {
+				// 立即升级
+				maskLayer.hide();
+				popupView.hide();
+				callback && callback();
+			}
+		}
+	});
+	// 点击遮罩层
+	maskLayer.addEventListener("click", function() { //处理遮罩层点击
+		maskLayer.hide();
+		popupView.hide();
+	});
+	// 显示弹窗
+	maskLayer.show();
+	popupView.show();
+}
+// 文件下载的弹窗绘图
+function downloadPopupDrawing(data) {
+	// 以下为计算菜单的nview绘制布局，为固定算法，使用者无关关心
+	const screenWidth = plus.screen.resolutionWidth;
+	const screenHeight = plus.screen.resolutionHeight;
+	//弹窗容器宽度
+	const popupViewWidth = screenWidth * 0.7;
+	// 弹窗容器的Padding
+	const viewContentPadding = 20;
+	// 弹窗容器的宽度
+	const viewContentWidth = popupViewWidth - (viewContentPadding * 2);
+	// 弹窗容器高度
+	let popupViewHeight = viewContentPadding * 3 + 60;
+	let progressTip = data.progressTip || "准备下载...";
+	let contentText = data.contentText || "正在为您更新，请耐心等待";
+	let elementList = [{
+			tag: 'rect', //背景色
+			color: '#FFFFFF',
+			rectStyles: {
+				radius: "8px"
+			}
+		},
+		{
+			tag: 'font',
+			id: 'title',
+			text: "升级APP",
+			textStyles: {
+				size: '16px',
+				color: "#333",
+				weight: "bold",
+				verticalAlign: "middle",
+				whiteSpace: "normal"
+			},
+			position: {
+				top: viewContentPadding + 'px',
+				height: "30px",
+			}
+		},
+		{
+			tag: 'font',
+			id: 'content',
+			text: contentText,
+			textStyles: {
+				size: '14px',
+				color: "#333",
+				verticalAlign: "middle",
+				whiteSpace: "normal"
+			},
+			position: {
+				top: viewContentPadding * 2 + 30 + 'px',
+				height: "20px",
+			}
+		}
+	];
+	// 是否有进度条
+	if (data.progress) {
+		popupViewHeight += viewContentPadding + 40;
+		elementList = elementList.concat([{
+				tag: 'font',
+				id: 'progressValue',
+				text: progressTip,
+				textStyles: {
+					size: '14px',
+					color: $mainColor,
+					whiteSpace: "normal"
+				},
+				position: {
+					top: viewContentPadding * 4 + 20 + 'px',
+					height: "30px"
+				}
+			},
+			{
+				tag: 'rect', //绘制进度条背景
+				id: 'progressBg',
+				rectStyles: {
+					radius: "4px",
+					borderColor: "#f1f1f1",
+					borderWidth: "1px",
+				},
+				position: {
+					top: viewContentPadding * 4 + 60 + 'px',
+					left: viewContentPadding + "px",
+					width: viewContentWidth + "px",
+					height: "8px"
+				}
+			},
+		]);
+	}
+	if (data.buttonNum == 2) {
+		popupViewHeight += viewContentPadding + 30;
+		elementList = elementList.concat([{
+				tag: 'rect', //绘制底边按钮
+				rectStyles: {
+					radius: "3px",
+					borderColor: "#f1f1f1",
+					borderWidth: "1px",
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: viewContentPadding + "px",
+					width: (viewContentWidth - viewContentPadding) / 2 + "px",
+					height: "30px"
+				}
+			},
+			{
+				tag: 'rect', //绘制底边按钮
+				rectStyles: {
+					radius: "3px",
+					color: $mainColor
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
+					width: (viewContentWidth - viewContentPadding) / 2 + "px",
+					height: "30px"
+				}
+			},
+			{
+				tag: 'font',
+				id: 'cancelText',
+				text: "取消下载",
+				textStyles: {
+					size: '14px',
+					color: "#666",
+					lineSpacing: "0%",
+					whiteSpace: "normal"
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: viewContentPadding + "px",
+					width: (viewContentWidth - viewContentPadding) / 2 + "px",
+					height: "30px",
+				}
+			},
+			{
+				tag: 'font',
+				id: 'confirmText',
+				text: "后台下载",
+				textStyles: {
+					size: '14px',
+					color: "#FFF",
+					lineSpacing: "0%",
+					whiteSpace: "normal"
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: ((viewContentWidth - viewContentPadding) / 2 + viewContentPadding * 2) + "px",
+					width: (viewContentWidth - viewContentPadding) / 2 + "px",
+					height: "30px",
+				}
+			}
+		]);
+	}
+	if (data.buttonNum == 1) {
+		popupViewHeight += viewContentPadding + 40;
+		elementList = elementList.concat([{
+				tag: 'rect', //绘制底边按钮
+				rectStyles: {
+					radius: "6px",
+					color: $mainColor
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: viewContentPadding + "px",
+					width: viewContentWidth + "px",
+					height: "40px"
+				}
+			},
+			{
+				tag: 'font',
+				id: 'confirmText',
+				text: "关闭",
+				textStyles: {
+					size: '14px',
+					color: "#FFF",
+					lineSpacing: "0%",
+				},
+				position: {
+					bottom: viewContentPadding + 'px',
+					left: viewContentPadding + "px",
+					width: viewContentWidth + "px",
+					height: "40px"
+				}
+			}
+		]);
+	}
+	return {
+		popupViewHeight: popupViewHeight,
+		popupViewWidth: popupViewWidth,
+		screenHeight: screenHeight,
+		viewContentWidth: viewContentWidth,
+		viewContentPadding: viewContentPadding,
+		elementList: elementList
+	};
+}
+// 文件下载的弹窗
+function downloadPopup(data, callback, cancelCallback, rebootCallback) {
+	// 弹窗遮罩层
+	let maskLayer = new plus.nativeObj.View("maskLayer", { //先创建遮罩层
+		top: '0px',
+		left: '0px',
+		height: '100%',
+		width: '100%',
+		backgroundColor: 'rgba(0,0,0,0.5)'
+	});
+	let popupViewData = downloadPopupDrawing(data);
+	// 弹窗内容
+	let popupView = new plus.nativeObj.View("popupView", { //创建底部图标菜单
+		tag: "rect",
+		top: (popupViewData.screenHeight - popupViewData.popupViewHeight) / 2 + "px",
+		left: '15%',
+		height: popupViewData.popupViewHeight + "px",
+		width: "70%",
+	});
+	let progressValue = 0;
+	let progressTip = 0;
+	let contentText = 0;
+	let buttonNum = 2;
+	if (data.buttonNum >= 0) {
+		buttonNum = data.buttonNum;
+	}
+	popupView.draw(popupViewData.elementList);
+	popupView.addEventListener("click", function(e) {
+		let maxTop = popupViewData.popupViewHeight - popupViewData.viewContentPadding;
+		let maxLeft = popupViewData.popupViewWidth - popupViewData.viewContentPadding;
+		if (e.clientY > maxTop - 40 && e.clientY < maxTop) {
+			if (buttonNum == 1) {
+				// 单按钮
+				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft) {
+					maskLayer.hide();
+					popupView.hide();
+					rebootCallback && rebootCallback();
+				}
+			} else if (buttonNum == 2) {
+				// 双按钮
+				let buttonWidth = (popupViewData.viewContentWidth - popupViewData.viewContentPadding) / 2;
+				if (e.clientX > popupViewData.viewContentPadding && e.clientX < maxLeft - buttonWidth - popupViewData.viewContentPadding) {
+					maskLayer.hide();
+					popupView.hide();
+					cancelCallback && cancelCallback();
+				} else if (e.clientX > maxLeft - buttonWidth && e.clientX < maxLeft) {
+					maskLayer.hide();
+					popupView.hide();
+				}
+			}
+		}
+	});
+	// 显示弹窗
+	maskLayer.show();
+	popupView.show();
+	// 改变进度条
+	callback({
+		change: function(res) {
+			let progressElement = [];
+			if (res.progressValue) {
+				progressValue = res.progressValue;
+				// 绘制进度条
+				progressElement.push({
+					tag: 'rect', //绘制进度条背景
+					id: 'progressValueBg',
+					rectStyles: {
+						radius: "4px",
+						color: $mainColor
+					},
+					position: {
+						top: popupViewData.viewContentPadding * 4 + 60 + 'px',
+						left: popupViewData.viewContentPadding + "px",
+						width: popupViewData.viewContentWidth * (res.progressValue / 100) + "px",
+						height: "8px"
+					}
+				});
+			}
+			if (res.progressTip) {
+				progressTip = res.progressTip;
+				progressElement.push({
+					tag: 'font',
+					id: 'progressValue',
+					text: res.progressTip,
+					textStyles: {
+						size: '14px',
+						color: $mainColor,
+						whiteSpace: "normal"
+					},
+					position: {
+						top: popupViewData.viewContentPadding * 4 + 20 + 'px',
+						height: "30px"
+					}
+				});
+			}
+			if (res.contentText) {
+				contentText = res.contentText;
+				progressElement.push({
+					tag: 'font',
+					id: 'content',
+					text: res.contentText,
+					textStyles: {
+						size: '16px',
+						color: "#333",
+						whiteSpace: "normal"
+					},
+					position: {
+						top: popupViewData.viewContentPadding * 2 + 30 + 'px',
+						height: "30px",
+					}
+				});
+			}
+			if (res.buttonNum >= 0 && buttonNum != res.buttonNum) {
+				buttonNum = res.buttonNum;
+				popupView.reset();
+				popupViewData = downloadPopupDrawing(Object.assign({
+					progressValue: progressValue,
+					progressTip: progressTip,
+					contentText: contentText,
+				}, res));
+				let newElement = [];
+				popupViewData.elementList.map((item, index) => {
+					let have = false;
+					progressElement.forEach((childItem, childIndex) => {
+						if (item.id == childItem.id) {
+							have = true;
+						}
+					});
+					if (!have) {
+						newElement.push(item);
+					}
+				});
+				progressElement = newElement.concat(progressElement);
+				popupView.setStyle({
+					tag: "rect",
+					top: (popupViewData.screenHeight - popupViewData.popupViewHeight) / 2 + "px",
+					left: '15%',
+					height: popupViewData.popupViewHeight + "px",
+					width: "70%",
+				});
+				popupView.draw(progressElement);
+			} else {
+				popupView.draw(progressElement);
+			}
+		},
+		cancel: function() {
+			maskLayer.hide();
+			popupView.hide();
+		}
+	});
+}
+export default function(isPrompt = false) {
+	getCurrentNo(version => {
+		getServerNo(version.versionCode, isPrompt, data => {
+			let res = JSON.parse(data);
+			if (res.forceUpdate) {
+				if (/\.wgt$/i.test(res.downloadUrl)) {
+					getDownload(res);
+				} else if (/\.apk$/i.test(res.downloadUrl)) {
+					plus.runtime.openURL(res.downloadUrl);
+				} else {
+					if (platform == "android") {
+						getDownload(res);
+					} else {
+						plus.runtime.openURL(res.downloadUrl);
+					}
+				}
+			} else {
+				updatePopup(res, function() {
+					if (/\.wgt$/i.test(res.downloadUrl)) {
+						getDownload(res);
+					} else if (/\.html$/i.test(res.downloadUrl)) {
+						plus.runtime.openURL(res.downloadUrl);
+					} else {
+						if (platform == "android") {
+							getDownload(res);
+						} else {
+							plus.runtime.openURL(res.downloadUrl);
+						}
+					}
+				});
+			}
+		});
+	});
+}
+// #endif
diff --git a/mallplusui-uniapp-app2/plugins/request/fileUpload.js b/mallplusui-uniapp-app2/plugins/request/fileUpload.js
new file mode 100644
index 0000000..e1fc1c1
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/request/fileUpload.js
@@ -0,0 +1,390 @@
+import request from "./request.js";
+const qiniuUploader = require("./qiniuUploader");
+export default class fileUpload extends request {
+	constructor(props) {
+		// 调用实现父类的构造函数
+		super(props);
+	}
+	//七牛云上传图片
+	qnImgUpload(data = {}, options = {}) {
+		const _this = this;
+		return new Promise((resolve, reject) => {
+			uni.chooseImage({
+				count: data.count || 9, //默认9
+				sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: data.sourceType || ['album', 'camera'], //从相册选择
+				success: function(res) {
+					_this.qnFileUpload({
+						files: res.tempFiles,
+						...data
+					}, options).then(resolve, reject);
+				}
+			});
+		});
+	}
+	//七牛云上传文件命名
+	randomChar(l, url = "") {
+		const x = "0123456789qwertyuioplkjhgfdsazxcvbnm";
+		let tmp = "";
+		let time = new Date();
+		for (let i = 0; i < l; i++) {
+			tmp += x.charAt(Math.ceil(Math.random() * 100000000) % x.length);
+		}
+		return (
+			"file/" +
+			url +
+			time.getTime() +
+			tmp
+		);
+	}
+	//七牛云文件上传（支持多张上传）
+	qnFileUpload(data = {}, options = {}) {
+		const _this = this;
+		let requestInfo = {
+			...data,
+			...this.config,
+			...options,
+			header: {},
+			method: "FILE"
+		};
+		return new Promise((resolve, reject) => {
+			//请求前回调
+			if (_this.requestStart) {
+				let requestStart = _this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					requestInfo.load = requestStart.load;
+					requestInfo.files = requestStart.files;
+				} else {
+					//请求完成回调
+					_this.requestEnd && _this.requestEnd(requestInfo, {
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					reject({
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					return;
+				}
+			}
+			if (Array.isArray(requestInfo.files)) {
+				let len = requestInfo.files.length;
+				let imageList = new Array;
+				if(_this.getQnToken){
+					_this.getQnToken(qnRes => {
+						/*
+						 *接口返回参数：
+						 *visitPrefix:访问文件的域名
+						 *token:七牛云上传token
+						 *folderPath:上传的文件夹
+						 *region: 地区 默认为：SCN
+						 */
+						uploadFile(0);
+						function uploadFile(i) {
+							let fileData = {
+								fileIndex: i,
+								files: requestInfo.files,
+								size: requestInfo.files[i].size
+							};
+							// #ifdef H5
+							fileData.name = requestInfo.files[i].name;
+							fileData.type = requestInfo.files[i].type;
+							// #endif
+							// 交给七牛上传
+							qiniuUploader.upload(requestInfo.files[i].path, (res) => {
+								fileData.url = res.imageURL;
+								requestInfo.onEachUpdate && requestInfo.onEachUpdate({
+									url: res.imageURL,
+									...fileData
+								});
+								imageList.push(res.imageURL);
+								if (len - 1 > i) {
+									uploadFile(i + 1);
+								} else {
+									//请求完成回调
+									_this.requestEnd && _this.requestEnd(requestInfo, {
+										errMsg: "request:ok",
+										statusCode: 200,
+										data: imageList
+									});
+									resolve(imageList);
+								}
+							}, (error) => {
+								console.log('error: ' + error);
+								//请求完成回调
+								_this.requestEnd && _this.requestEnd(requestInfo, error);
+								reject(error)
+							}, {
+								region: qnRes.region || 'SCN', //地区
+								domain: qnRes.visitPrefix, // bucket 域名，下载资源时用到。
+								key: _this.randomChar(8, qnRes.folderPath),
+								uptoken: qnRes.token, // 由其他程序生成七牛 uptoken
+								uptokenURL: 'UpTokenURL.com/uptoken' // 上传地址
+							}, (res) => {
+								console.log(requestInfo);
+								requestInfo.onProgressUpdate && requestInfo.onProgressUpdate(Object.assign({}, fileData, res));
+								// console.log('上传进度', res.progress)
+								// console.log('已经上传的数据长度', res.totalBytesSent)
+								// console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend)
+							});
+						}
+					});
+				} else {
+					//请求完成回调
+					_this.requestEnd && _this.requestEnd(requestInfo, {
+						errMsg: "请添加七牛云回调方法：getQnToken",
+						statusCode: 0
+					});
+					reject({
+						errMsg: "请添加七牛云回调方法：getQnToken",
+						statusCode: 0
+					});
+					return;
+				}
+			} else {
+				//请求完成回调
+				_this.requestEnd && _this.requestEnd(requestInfo, {
+					errMsg: "files 必须是数组类型",
+					statusCode: 0
+				});
+				reject({
+					errMsg: "files 必须是数组类型",
+					statusCode: 0
+				});
+			};
+		});
+
+	}
+	//本地服务器图片上传
+	urlImgUpload(url = '', data = {}, options = {}) {
+		const _this = this;
+		return new Promise((resolve, reject) => {
+			uni.chooseImage({
+				count: data.count || 9, //默认9
+				sizeType: data.sizeType || ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+				sourceType: data.sourceType || ['album', 'camera'], //从相册选择
+				success: function(res) {
+					_this.urlFileUpload(url, {
+						...data,
+						files: res.tempFiles
+					}, options).then(resolve, reject);
+				}
+			});
+		});
+	}
+	//本地服务器文件上传方法
+	urlFileUpload(url = '', data = {}, options = {}) {
+		let requestInfo = this.getDefault({
+			...data,
+			url: url,
+			method: "FILE"
+		}, options);
+		const _this = this;
+		return new Promise((resolve, reject) => {
+			//请求前回调
+			if (_this.requestStart) {
+				let requestStart = _this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					requestInfo.data = requestStart.data;
+					requestInfo.header = requestStart.header;
+					requestInfo.isPrompt = requestStart.isPrompt;
+					requestInfo.load = requestStart.load;
+					requestInfo.isFactory = requestStart.isFactory;
+					requestInfo.files = requestStart.files;
+				} else {
+					//请求完成回调
+					_this.requestEnd && _this.requestEnd(requestInfo, {
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					reject({
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					return;
+				}
+			}
+			// 本地文件上传去掉默认Content-Type
+			if(requestInfo.header['Content-Type']){
+				delete requestInfo.header['Content-Type'];
+			}
+			if (Array.isArray(requestInfo.files)) {
+				// #ifdef APP-PLUS || H5
+				let files = [];
+				let fileData = {
+					files: requestInfo.files,
+					name: requestInfo.name || "file"
+				};
+				requestInfo.files.forEach(item => {
+					files.push({
+						uri: item.path,
+						name: requestInfo.name || "file"
+					});
+				});
+				let config = {
+					url: requestInfo.url,
+					files: files,
+					header: requestInfo.header, //加入请求头
+					success: (response) => {
+						if (typeof(response.data) == "string") {
+							response.data = JSON.parse(response.data);
+						}
+						//是否用外部的数据处理方法
+						if (requestInfo.isFactory && _this.dataFactory) {
+							//数据处理
+							_this.dataFactory({
+								...requestInfo,
+								response: response,
+								resolve: function(data) {
+									requestInfo.onEachUpdate && requestInfo.onEachUpdate({
+										data: data,
+										...fileData
+									});
+									//请求完成回调
+									_this.requestEnd && _this.requestEnd(requestInfo, {
+										errMsg: "request:ok",
+										statusCode: 200,
+										data: data
+									});
+									resolve(data);
+								},
+								reject: function(err) {
+									//请求完成回调
+									_this.requestEnd && _this.requestEnd(requestInfo, {
+										errMsg: "数据工厂返回错误",
+										statusCode: 0,
+										data: err
+									});
+									reject(err);
+								}
+							});
+						} else {
+							requestInfo.onEachUpdate && requestInfo.onEachUpdate({
+								data: response,
+								...fileData
+							});
+							//请求完成回调
+							_this.requestEnd && _this.requestEnd(requestInfo, response);
+							resolve(response);
+						}
+					},
+					fail: (err) => {
+						//请求完成回调
+						_this.requestEnd && _this.requestEnd(requestInfo, err);
+						reject(err);
+					}
+				};
+				if (requestInfo.data) {
+					config.formData = requestInfo.data;
+				}
+				const uploadTask = uni.uploadFile(config);
+				uploadTask.onProgressUpdate(res => {
+					requestInfo.onProgressUpdate && requestInfo.onProgressUpdate(Object.assign({}, fileData, res));
+				});
+				// #endif
+				// #ifdef MP
+				const len = requestInfo.files.length - 1;
+				let fileList = new Array;
+				fileUpload(0);
+
+				function fileUpload(i) {
+					let fileData = {
+						fileIndex: i,
+						files: requestInfo.files,
+						size: requestInfo.files[i].size
+					};
+					// #ifdef H5
+					fileData.name = requestInfo.files[i].name;
+					fileData.type = requestInfo.files[i].type;
+					// #endif
+					let config = {
+						url: requestInfo.url,
+						filePath: requestInfo.files[i].path,
+						header: requestInfo.header, //加入请求头
+						name: requestInfo.name || "file",
+						success: (response) => {
+							if (typeof(response.data) == "string") {
+								response.data = JSON.parse(response.data);
+							}
+							//是否用外部的数据处理方法
+							if (requestInfo.isFactory && _this.dataFactory) {
+								//数据处理
+								_this.dataFactory({
+									...requestInfo,
+									response: response,
+									resolve: function(data) {
+										requestInfo.onEachUpdate && requestInfo.onEachUpdate({
+											data: data,
+											...fileData
+										});
+										fileList.push(data);
+										if (len <= i) {
+											//请求完成回调
+											_this.requestEnd && _this.requestEnd(requestInfo, {
+												errMsg: "request:ok",
+												statusCode: 200,
+												data: fileList
+											});
+											resolve(fileList);
+										} else {
+											fileUpload(i + 1);
+										}
+									},
+									reject: function(err) {
+										//请求完成回调
+										_this.requestEnd && _this.requestEnd(requestInfo, {
+											errMsg: "数据工厂返回错误",
+											statusCode: 0,
+											data: err
+										});
+										reject(err);
+									}
+								});
+							} else {
+								requestInfo.onEachUpdate && requestInfo.onEachUpdate({
+									data: response,
+									...fileData
+								});
+								fileList.push(response);
+								if (len <= i) {
+									//请求完成回调
+									_this.requestEnd && _this.requestEnd(requestInfo, {
+										errMsg: "request:ok",
+										statusCode: 200,
+										data: fileList
+									});
+									resolve(fileList);
+								} else {
+									fileUpload(i + 1);
+								}
+							}
+						},
+						fail: (err) => {
+							//请求完成回调
+							_this.requestEnd && _this.requestEnd(requestInfo, err);
+							reject(err);
+						}
+					};
+					if (requestInfo.data) {
+						config.formData = requestInfo.data;
+					}
+					const uploadTask = uni.uploadFile(config);
+					uploadTask.onProgressUpdate(res => {
+						requestInfo.onProgressUpdate && requestInfo.onProgressUpdate(Object.assign({}, fileData, res));
+					});
+				}
+				// #endif
+			} else {
+				//请求完成回调
+				_this.requestEnd && _this.requestEnd(requestInfo, {
+					errMsg: "files 必须是数组类型",
+					statusCode: 0
+				});
+				reject({
+					errMsg: "files 必须是数组类型",
+					statusCode: 0
+				})
+			}
+		});
+	}
+}
diff --git a/mallplusui-uniapp-app2/plugins/request/index.js b/mallplusui-uniapp-app2/plugins/request/index.js
new file mode 100644
index 0000000..8884f51
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/request/index.js
@@ -0,0 +1,7 @@
+/***************纯粹的数据请求（如果使用这种可以删除掉fileUpload.js）******************/
+// import request from "./request.js";
+// export default request;
+
+/********数据请求同时继承了文件上传（包括七牛云上传）************/
+import fileUpload from "./fileUpload.js";
+export default fileUpload;
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/plugins/request/qiniuUploader.js b/mallplusui-uniapp-app2/plugins/request/qiniuUploader.js
new file mode 100644
index 0000000..138c80e
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/request/qiniuUploader.js
@@ -0,0 +1,169 @@
+// created by gpake
+(function () {
+
+  var config = {
+    qiniuRegion: '',
+    qiniuImageURLPrefix: '',
+    qiniuUploadToken: '',
+    qiniuUploadTokenURL: '',
+    qiniuUploadTokenFunction: null,
+    qiniuShouldUseQiniuFileName: false
+  }
+
+  module.exports = {
+    init: init,
+    upload: upload,
+  }
+
+  // 在整个程序生命周期中，只需要 init 一次即可
+  // 如果需要变更参数，再调用 init 即可
+  function init(options) {
+    config = {
+      qiniuRegion: '',
+      qiniuImageURLPrefix: '',
+      qiniuUploadToken: '',
+      qiniuUploadTokenURL: '',
+      qiniuUploadTokenFunction: null,
+      qiniuShouldUseQiniuFileName: false
+    };
+    updateConfigWithOptions(options);
+  }
+
+  function updateConfigWithOptions(options) {
+    if (options.region) {
+      config.qiniuRegion = options.region;
+    } else {
+      console.error('qiniu uploader need your bucket region');
+    }
+    if (options.uptoken) {
+      config.qiniuUploadToken = options.uptoken;
+    } else if (options.uptokenURL) {
+      config.qiniuUploadTokenURL = options.uptokenURL;
+    } else if (options.uptokenFunc) {
+      config.qiniuUploadTokenFunction = options.uptokenFunc;
+    }
+    if (options.domain) {
+      config.qiniuImageURLPrefix = options.domain;
+    }
+    config.qiniuShouldUseQiniuFileName = options.shouldUseQiniuFileName
+  }
+
+  function upload(filePath, success, fail, options, progress, cancelTask) {
+    if (null == filePath) {
+      console.error('qiniu uploader need filePath to upload');
+      return;
+    }
+    if (options) {
+      updateConfigWithOptions(options);
+    }
+    if (config.qiniuUploadToken) {
+      doUpload(filePath, success, fail, options, progress, cancelTask);
+    } else if (config.qiniuUploadTokenURL) {
+      getQiniuToken(function () {
+        doUpload(filePath, success, fail, options, progress, cancelTask);
+      });
+    } else if (config.qiniuUploadTokenFunction) {
+      config.qiniuUploadToken = config.qiniuUploadTokenFunction();
+      if (null == config.qiniuUploadToken && config.qiniuUploadToken.length > 0) {
+        console.error('qiniu UploadTokenFunction result is null, please check the return value');
+        return
+      }
+      doUpload(filePath, success, fail, options, progress, cancelTask);
+    } else {
+      console.error('qiniu uploader need one of [uptoken, uptokenURL, uptokenFunc]');
+      return;
+    }
+  }
+
+  function doUpload(filePath, success, fail, options, progress, cancelTask) {
+    if (null == config.qiniuUploadToken && config.qiniuUploadToken.length > 0) {
+      console.error('qiniu UploadToken is null, please check the init config or networking');
+      return
+    }
+    var url = uploadURLFromRegionCode(config.qiniuRegion);
+    var fileName = filePath.split('//')[1];
+    if (options && options.key) {
+      fileName = options.key;
+    }
+    var formData = {
+      'token': config.qiniuUploadToken
+    };
+    if (!config.qiniuShouldUseQiniuFileName) {
+      formData['key'] = fileName
+    }
+    var uploadTask = wx.uploadFile({
+      url: url,
+      filePath: filePath,
+      name: 'file',
+      formData: formData,
+      success: function (res) {
+        var dataString = res.data
+        if (res.data.hasOwnProperty('type') && res.data.type === 'Buffer') {
+          dataString = String.fromCharCode.apply(null, res.data.data)
+        }
+        try {
+          var dataObject = JSON.parse(dataString);
+          //do something
+          var imageUrl = config.qiniuImageURLPrefix + '/' + dataObject.key;
+          dataObject.imageURL = imageUrl;
+          if (success) {
+            success(dataObject);
+          }
+        } catch (e) {
+          console.log('parse JSON failed, origin String is: ' + dataString)
+          if (fail) {
+            fail(e);
+          }
+        }
+      },
+      fail: function (error) {
+        console.error(error);
+        if (fail) {
+          fail(error);
+        }
+      }
+    })
+
+    uploadTask.onProgressUpdate((res) => {
+      progress && progress(res)
+    })
+
+    cancelTask && cancelTask(() => {
+      uploadTask.abort()
+    })
+  }
+
+  function getQiniuToken(callback) {
+    wx.request({
+      url: config.qiniuUploadTokenURL,
+      success: function (res) {
+        var token = res.data.uptoken;
+        if (token && token.length > 0) {
+          config.qiniuUploadToken = token;
+          if (callback) {
+            callback();
+          }
+        } else {
+          console.error('qiniuUploader cannot get your token, please check the uptokenURL or server')
+        }
+      },
+      fail: function (error) {
+        console.error('qiniu UploadToken is null, please check the init config or networking: ' + error);
+      }
+    })
+  }
+
+  function uploadURLFromRegionCode(code) {
+    var uploadURL = null;
+    switch (code) {
+      case 'ECN': uploadURL = 'https://up.qbox.me'; break;
+      case 'NCN': uploadURL = 'https://up-z1.qbox.me'; break;
+      case 'SCN': uploadURL = 'https://up-z2.qbox.me'; break;
+      case 'NA': uploadURL = 'https://up-na0.qbox.me'; break;
+      case 'ASG': uploadURL = 'https://up-as0.qbox.me'; break;
+      default: console.error('please make the region is with one of [ECN, SCN, NCN, NA, ASG]');
+    }
+    return uploadURL;
+  }
+
+})();
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/plugins/request/request.js b/mallplusui-uniapp-app2/plugins/request/request.js
new file mode 100644
index 0000000..1b2877b
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/request/request.js
@@ -0,0 +1,225 @@
+export default class request {
+	constructor(options) {
+		//请求公共地址
+		this.baseUrl = options.baseUrl || "";
+		//公共文件上传请求地址
+		this.fileUrl = options.fileUrl || "";
+		//默认请求头
+		this.header = options.header || {};
+		//默认配置
+		this.config = {
+			isPrompt: options.isPrompt === false ? false : true,
+			load: options.load === false ? false : true,
+			isFactory: options.isFactory === false ? false : true,
+			loadMore: options.loadMore === false ? false : true
+		};
+	}
+
+	// 获取默认信息
+	getDefault(data, options = {}) {
+		//判断url是不是链接
+		let urlType = /^([hH][tT]{2}[pP]:\/\/|[hH][tT]{2}[pP][sS]:\/\/)(([A-Za-z0-9-~]+).)+([A-Za-z0-9-~/])+$/.test(data.url);
+		let config = Object.assign({}, this.config, options, data);
+		if (data.method == "FILE") {
+			config.url = urlType ? data.url : this.fileUrl + data.url;
+		} else {
+			config.url = urlType ? data.url : this.baseUrl + data.url;
+		}
+		//请求头
+		if (options.header) {
+			config.header = Object.assign({}, this.header, options.header);
+		} else if (data.header) {
+			config.header = Object.assign({}, this.header, data.header);
+		} else {
+			config.header = this.header;
+		}
+		return config;
+	}
+
+	//post请求
+	post(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "POST",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//get请求
+	get(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "GET",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//put请求
+	put(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "PUT",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//delete请求
+	delete(url = '', data = {}, options = {}) {
+		return this.request({
+			method: "DELETE",
+			data: data,
+			url: url,
+			...options
+		});
+	}
+
+	//接口请求方法
+	request(data) {
+		return new Promise((resolve, reject) => {
+			if (!data.url) {
+				console.log("request缺失数据url");
+				reject({
+					errMsg: "缺失数据url",
+					statusCode: 0
+				});
+				return;
+			}
+			let requestInfo = this.getDefault(data);
+			//请求前回调
+			if (this.requestStart) {
+				let requestStart = this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					requestInfo.data = requestStart.data;
+					requestInfo.header = requestStart.header;
+					requestInfo.isPrompt = requestStart.isPrompt;
+					requestInfo.load = requestStart.load;
+					requestInfo.isFactory = requestStart.isFactory;
+				} else {
+					//请求完成回调
+					_this.requestEnd && _this.requestEnd(requestInfo, {
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					reject({
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					return;
+				}
+			}
+			let requestData = {
+				url: requestInfo.url,
+				header: requestInfo.header, //加入请求头
+				success: (res) => {
+					//请求完成回调
+					this.requestEnd && this.requestEnd(requestInfo, res);
+					//是否用外部的数据处理方法
+					if (requestInfo.isFactory && this.dataFactory) {
+						//数据处理
+						this.dataFactory({
+							...requestInfo,
+							response: res,
+							resolve: resolve,
+							reject: reject
+						});
+					} else {
+						resolve(res);
+					}
+				},
+				fail: (err) => {
+					console.log("err");
+					//请求完成回调
+					this.requestEnd && this.requestEnd(requestInfo, err);
+					reject(err);
+				}
+			};
+			//请求类型
+			if (requestInfo.method) {
+				requestData.method = requestInfo.method;
+			}
+			if (requestInfo.data) {
+				requestData.data = requestInfo.data;
+			}
+			// #ifdef MP-WEIXIN || MP-ALIPAY
+			if (requestInfo.timeout) {
+				requestData.timeout = requestInfo.timeout;
+			}
+			// #endif
+			if (requestInfo.dataType) {
+				requestData.dataType = requestInfo.dataType;
+			}
+			// #ifndef APP-PLUS || MP-ALIPAY
+			if (requestInfo.responseType) {
+				requestData.responseType = requestInfo.responseType;
+			}
+			// #endif
+			// #ifdef H5
+			if (requestInfo.withCredentials) {
+				requestData.withCredentials = requestInfo.withCredentials;
+			}
+			// #endif
+			uni.request(requestData);
+		});
+	}
+	//jsonp请求(只限于H5使用)
+	jsonp(url = '', data = {}, options = {}) {
+		let requestInfo = this.getDefault({
+			method: "JSONP",
+			data: data,
+			url: url,
+		}, options);
+		let dataStr = '';
+		Object.keys(data).forEach(key => {
+			dataStr += key + '=' + data[key] + '&';
+		});
+		//匹配最后一个&并去除
+		if (dataStr !== '') {
+			dataStr = dataStr.substr(0, dataStr.lastIndexOf('&'));
+		}
+		requestInfo.url = requestInfo.url + '?' + dataStr;
+		const _this = this;
+		return new Promise((resolve, reject) => {
+			let callbackName = "callback" + Math.ceil(Math.random() * 1000000);
+			if (_this.requestStart) {
+				requestInfo.data = data;
+				let requestStart = _this.requestStart(requestInfo);
+				if (typeof requestStart == "object") {
+					requestInfo.data = requestStart.data;
+					requestInfo.header = requestStart.header;
+					requestInfo.isPrompt = requestStart.isPrompt;
+					requestInfo.load = requestStart.load;
+					requestInfo.isFactory = requestStart.isFactory;
+				} else {
+					//请求完成回调
+					_this.requestEnd && _this.requestEnd(requestInfo, {
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					reject({
+						errMsg: "请求开始拦截器未通过",
+						statusCode: 0
+					});
+					return;
+				}
+			}
+			// #ifdef H5
+			window[callbackName] = function(data) {
+				resolve(data);
+			}
+			let script = document.createElement("script");
+			script.src = requestInfo.url + "&callback=" + callbackName;
+			document.head.appendChild(script);
+			// 及时删除，防止加载过多的JS
+			document.head.removeChild(script);
+			// #endif
+			//请求完成回调
+			_this.requestEnd && _this.requestEnd(requestInfo, {
+				errMsg: "request:ok",
+				statusCode: 200
+			});
+		});
+	}
+}
diff --git a/mallplusui-uniapp-app2/plugins/request/request.md b/mallplusui-uniapp-app2/plugins/request/request.md
new file mode 100644
index 0000000..2d59e5b
--- /dev/null
+++ b/mallplusui-uniapp-app2/plugins/request/request.md
@@ -0,0 +1,229 @@
+# request请求、配置简单、批量上传图片、超强适应性（很方便的支持多域名请求）
+1. 配置简单、源码清晰注释多、适用于一项目多域名请求、第三方请求、七牛云图片上传、本地服务器图片上传等等
+2. 支持请求`get`、`post`、`put`、`delete`
+3. 自动显示请求加载动画（可单个接口关闭）
+4. 全局`api`数据处理函数，只回调请求正确的数据（可单个接口关闭）
+5. 未登录或登录失效自动拦截并调用登录方法（可单个接口关闭）
+6. 全局自动提示接口抛出的错误信息（可单个接口关闭）
+7. 支持 Promise
+8. 支持拦截器
+9. 支持七牛云文件（图片）批量上传
+10. 支持本地服务器文件（图片）批量上传
+11. 支持上传文件拦截过滤
+12. 支持上传文件进度监听
+13. 支持上传文件单张成功回调
+
+### QQ交流群(学习干货多多) 607391225
+![QQ交流群](http://qn.kemean.cn//upload/202004/14/15868301778472k7oubi6.png)
+
+### 常见问题
+1.接口请求成功了，没有返回数据或者数据是走的catch回调
+
+答：`requestConfig.js` 请求配置文件里面，有一个`$http.dataFactory`方法，里面写的只是参考示例，`此方法需要开发者根据各自的接口返回类型修改`
+
+2.官方的方法有数据，本插件方法请求报错跨域问题
+
+答：`requestConfig.js` 请求配置文件里面，`header`请求头设置的`content-type`请求类型需求和后台保持一致
+
+3.登录后用户`token`怎么设置？
+
+答：`requestConfig.js` 请求配置文件里面，`$http.requestStart`请求开始拦截器里面设置
+
+4.怎么判断上传的文件（图片）太大？怎么过滤掉太大的文件（图片）？
+
+答：`requestConfig.js` 请求配置文件里面，`$http.requestStart`请求开始拦截器里面设置
+
+### 本次更新注意事项
+1. 所有的headers都改成了header（和官方统一）
+2. 七牛云的获取token等信息提取到了`requestConfig.js`文件，参考如下
+
+```
+// 添加获取七牛云token的方法
+$http.getQnToken = function(callback){
+	//该地址需要开发者自行配置（每个后台的接口风格都不一样）
+	$http.get("api/kemean/aid/qn_upload").then(data => {
+		/*
+		 *接口返回参数：
+		 *visitPrefix:访问文件的域名
+		 *token:七牛云上传token
+		 *folderPath:上传的文件夹
+		 */
+		callback({
+			visitPrefix: data.visitPrefix,
+			token: data.token,
+			folderPath: data.folderPath
+		});
+	});
+}
+```
+
+### 文件说明
+1. `request => request.js` 请求方法的源码文件
+2. `request => fileUpload.js` 七牛云上传和服务器上传的源码文件
+3. `request => index.js` 输出方法的文件
+4. `request => qiniuUploader.js` 七牛云官方上传文件
+5. `requestConfig.js` 请求配置文件（具体看代码）
+
+### 在main.js引入并挂在Vue上
+```
+import $http from '@/zhouWei-request/requestConfig';
+Vue.prototype.$http = $http;
+```
+
+### 通用请求方法（此方法不支持文件上传和JSONP）
+```
+this.$http.request({
+	url: 'aid/region',
+	method: "GET", // POST、GET、PUT、DELETE，具体说明查看官方文档
+	data: {pid:0},
+	timeout: 30000,  // 默认 30000 说明：超时时间，单位 ms，具体说明查看官方文档
+	dataType: "json",  // 默认 json 说明：如果设为 json，会尝试对返回的数据做一次 JSON.parse，具体说明查看官方文档
+	responseType: "text",  // 默认 text 说明：设置响应的数据类型。合法值：text、arraybuffer，具体说明查看官方文档
+	withCredentials: false,  // 默认 false 说明：跨域请求时是否携带凭证（cookies），具体说明查看官方文档
+	isPrompt: true,//（默认 true 说明：本接口抛出的错误是否提示）
+	load: true,//（默认 true 说明：本接口是否提示加载动画）
+	header: { //默认 无 说明：请求头
+		'Content-Type': 'application/json'
+	},
+	isFactory: true, //（默认 true 说明：本接口是否调用公共的数据处理方法，设置false后isPrompt参数将失去作用）
+}).then(function (response) {
+	//这里只会在接口是成功状态返回
+}).catch(function (error) {
+	//这里只会在接口是失败状态返回，不需要去处理错误提示
+	console.log(error);
+});
+```
+
+### get请求 正常写法 
+```
+this.$http.get('aid/region',{pid:0}).
+then(function (response) {
+	//这里只会在接口是成功状态返回
+}).catch(function (error) {
+	//这里只会在接口是失败状态返回，不需要去处理错误提示
+	console.log(error);
+});
+```
+
+### post请求 async写法 
+```
+async request(){
+	let data = await this.$http.post('aid/region',{pid:0});
+	console.log(data);
+}
+```
+
+### 其他功能配置项
+```
+let data = await this.$http.post(
+	'http://www.aaa.com/aid/region', //可以直接放链接(将不启用全局定义域名)
+	{
+		pid:0
+	}, 
+	{
+		isPrompt: true,//（默认 true 说明：本接口抛出的错误是否提示）
+		load: true,//（默认 true 说明：本接口是否提示加载动画）
+		header: { //默认 无 说明：请求头
+			'Content-Type': 'application/json'
+		},
+		isFactory: true //（默认 true 说明：本接口是否调用公共的数据处理方法，设置false后isPrompt参数将失去作用）
+	}
+);
+```
+
+### 本地服务器图片上传（支持多张上传）
+```
+this.$http.urlImgUpload('flie/upload',{
+	name:"后台接受文件key名称", //默认 file
+	count:"最大选择数",//默认 9
+	sizeType:"选择压缩图原图，默认两个都选",//默认 ['original', 'compressed']
+	sourceType:"选择相机拍照或相册上传 默认两个都选",//默认 ['album','camera']
+	data:"而外参数" //可不填,
+	onEachUpdate: res => {
+		console.log("单张上传成功返回：",res);
+	},
+	onProgressUpdate: res => {
+		console.log("上传进度返回：",res);
+	}
+},{
+	isPrompt: true,//（默认 true 说明：本接口抛出的错误是否提示）
+	load: true,//（默认 true 说明：本接口是否提示加载动画）
+	header: { //默认 无 说明：请求头
+		'Content-Type': 'application/json'
+	},
+	isFactory: true, //（默认 true 说明：本接口是否调用公共的数据处理方法，设置false后isPrompt参数奖失去作用）
+	maxSize: 300000 //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
+}).then(res => {
+	console.log("全部上传完返回结果：",res);
+});
+```
+### 本地服务器文件上传（支持多张上传）
+```
+this.$http.urlFileUpload("flie/upload",{
+		files:[], // 必填 临时文件路径
+		data:"向服务器传递的参数", //可不填
+		name:"后台接受文件key名称", //默认 file
+		onEachUpdate: res => {
+			console.log("单张上传成功返回：",res);
+		},
+		onProgressUpdate: res => {
+			console.log("上传进度返回：",res);
+		}
+	},
+	{
+		isPrompt: true,//（默认 true 说明：本接口抛出的错误是否提示）
+		load: true,//（默认 true 说明：本接口是否提示加载动画）
+		header: { //默认 无 说明：请求头
+			'Content-Type': 'application/json'
+		},
+		isFactory: true, //（默认 true 说明：本接口是否调用公共的数据处理方法，设置false后isPrompt参数奖失去作用）
+		maxSize: 300000 //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
+	}).then(res => {
+		console.log("全部上传完返回结果：",res);
+	});
+```
+
+### 七牛云图片上传（支持多张上传）
+```
+this.$http.qnImgUpload({
+		count:"最大选择数", // 默认 9
+		sizeType:"选择压缩图原图，默认两个都选", // 默认 ['original', 'compressed']
+		sourceType:"选择相机拍照或相册上传 默认两个都选", // 默认 ['album','camera']
+		onEachUpdate: res => {
+			console.log("单张上传成功返回：",res);
+		},
+		onProgressUpdate: res => {
+			console.log("上传进度返回：",res);
+		}
+	},
+	{
+		load: true, //（默认 true 说明：本接口是否提示加载动画）
+		maxSize: 300000 //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
+	}).then(res => {
+		console.log("全部上传完返回结果：",res);
+	});
+```
+
+### 七牛云文件上传（支持多张上传）
+```
+this.$http.qnFileUpload(
+	{
+		files:[], // 必填 临时文件路径
+		onEachUpdate: res => {
+			console.log("单张上传成功返回：",res);
+		},
+		onProgressUpdate: res => {
+			console.log("上传进度返回：",res);
+		}
+	},
+	{
+		load: true, //（默认 true 说明：本接口是否提示加载动画）
+		maxSize: 300000 //（默认 无 说明：上传的文件最大字节数限制，默认不限制）
+	}).then(res => {
+		console.log("全部上传完返回结果：",res);
+	});
+```
+### jsonp 跨域请求（只支持H5）
+```
+let data = await this.$http.jsonp('http://www.aaa.com/aid/region',{pid:0});
+```
diff --git a/mallplusui-uniapp-app2/root.txt b/mallplusui-uniapp-app2/root.txt
new file mode 100644
index 0000000..e69de29
diff --git a/mallplusui-uniapp-app2/static/address.png b/mallplusui-uniapp-app2/static/address.png
new file mode 100644
index 0000000..a2bb507
Binary files /dev/null and b/mallplusui-uniapp-app2/static/address.png differ
diff --git a/mallplusui-uniapp-app2/static/arc.png b/mallplusui-uniapp-app2/static/arc.png
new file mode 100644
index 0000000..c7ef6df
Binary files /dev/null and b/mallplusui-uniapp-app2/static/arc.png differ
diff --git a/mallplusui-uniapp-app2/static/css/style.css b/mallplusui-uniapp-app2/static/css/style.css
new file mode 100644
index 0000000..682cb43
--- /dev/null
+++ b/mallplusui-uniapp-app2/static/css/style.css
@@ -0,0 +1,777 @@
+body{
+  background-color: #f8f8f8;
+  font-size: 28upx;
+}
+view{
+  box-sizing: border-box;
+}
+/* #ifdef MP-ALIPAY */
+image{
+	background-size: 100% 100%;
+}
+button{
+	height: auto;
+	border: none;
+	line-height: 2.55555556;
+	padding: 0 28upx;
+}
+input{
+	background: none;
+	padding: 0;
+}
+shared-checkbox{
+	border-radius: 50%;
+}
+shared-checkbox{
+    border-radius: 50%;
+    height: 36rpx;
+    width: 36rpx;
+    margin-top: -4rpx;
+    border: 1rpx solid #d1d1d1;
+	color: #FF7159;
+}
+shared-checkbox:checked {
+  /* width: 36rpx;
+  height: 36rpx;
+  line-height: 36rpx;
+  border-radius: 50%;
+  text-align: center;
+  font-size: 28rpx;
+  color: #fff;
+  background: transparent;
+  transform: translate(-50%, -50%) scale(1);
+  -webkit-transform: translate(-50%, -50%) scale(1);
+  background-color: #FF7159;
+  border: 1rpx solid #FF7159; */
+  background-color: #000;
+  color: #000;
+}
+._radio{
+   border-radius: 50%;/* 圆角 */
+   width: 36rpx;
+   height: 36rpx;
+   margin-top: -4rpx;
+   border: 1rpx solid #d1d1d1;
+}
+/* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */
+._radio:checked{
+   border: 1rpx solid #FF7159;
+   background: #FF7159;
+}
+/* 选中后的 对勾样式 （白色对勾 可根据UI需求自己修改） */
+._radio:checked::before{
+   border-radius: 50%;/* 圆角 */
+   width: 36rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   height: 36rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   line-height: 36rpx;
+   text-align: center;
+   font-size:28rpx; /* 对勾大小 30rpx */
+   color:#fff; /* 对勾颜色 白色 */
+   background: transparent;
+   transform:translate(-50%, -50%) scale(1);
+   -webkit-transform:translate(-50%, -50%) scale(1);
+}
+/* #endif */
+uni-toast .uni-toast{
+	/* width: 6em; */
+	font-size: 24upx;
+	border-radius: 10px;
+	background: rgba(17,17,17,.5);
+}
+uni-input div, uni-input div div,uni-input, uni-input input{
+	/* min-height: 1rem !important; */
+}
+uni-input{
+	/* height: 1rem; */
+}
+uni-input div div.input-placeholder{
+	/* padding: 8upx 0; */
+}
+.content-top{
+	margin-bottom: 116upx;
+}
+.have-none{
+  background-color: #f3f3f3;
+}
+.color-o{
+	color: #FF7159 !important;
+}
+.color-f{
+	color: #fff !important;
+}
+.color-d{
+	color: #ddd !important;
+}
+.color-3{
+	color: #333 !important;
+}
+.color-6{
+	color: #666 !important;
+}
+.color-9{
+	color: #999 !important;
+}
+.fsz24{
+	font-size: 24upx !important;
+}
+.fsz26{
+	font-size: 26upx !important;
+}
+.fsz28{
+	font-size: 28upx !important;
+}
+.fsz30{
+	font-size: 30upx !important;
+}
+.fsz32{
+	font-size: 32upx !important;
+}
+.fsz34{
+	font-size: 34upx !important;
+}
+.fsz36{
+	font-size: 36upx !important;
+}
+.fsz38{
+	font-size: 38upx !important;
+}
+.fsz50{
+	font-size: 50upx !important;
+}
+.search{
+  width: 100%;
+  height: 104upx;
+  padding: 16upx 26upx;
+  background-color: rgba(255,255,255,1);
+	z-index: 999;
+	transition: all .5s;
+}
+.search-c{
+  width: 100%;
+  height: 100%;
+  position: relative;
+}
+.search-input{
+  background-color: #E9E9E9;
+  width: 100%;
+  height: 100%;
+  box-sizing: border-box;
+  line-height: 52upx;
+  padding: 10upx 90upx 10upx 40upx;
+  border-radius: 50upx;
+  font-size: 24upx;
+	transition: all .5s;  
+}
+.search-input-p{
+  color: #999;
+  width: 100%;
+  height: 100%;
+}
+.search-input-p-c{
+	position: relative;
+	top: 50%;
+	transform: translateY(-50%);
+}
+.search-icon{
+  position: absolute;
+  top: 50%;
+  right: 30upx;
+  transform: translateY(-50%);
+	z-index: 99;
+}
+.swiper-c{
+  height: 100%;
+}
+.swiper-c image{
+  height: 100%;
+  width: 100%;
+}
+.btn{
+  display: inline-block;
+  box-sizing: border-box;
+  border-radius: 0;
+  font-size: 28upx;
+	transform: scale(1);
+	transition: all .5s;
+}
+/*按钮按下缩小变色*/
+.btn-hover{
+	transform: scale(.90);
+	transition: all .5s;
+	opacity: .8;
+}
+/*按钮按下只变色*/
+.btn-hover2{
+/* 	transform: scale(.95); */
+	transition: all .1s;
+	opacity: .6;
+}
+.btn::after{
+  border: none;
+}
+.btn-circle{
+  padding: 0upx 20upx;
+  height: 60upx;
+  line-height: 60upx;
+  min-width: 140upx;
+/*  border-radius: 6upx; */
+  font-size: 22upx;
+}
+.btn-square{
+  padding: 0upx 40upx;
+  height: 90upx;
+  line-height: 90upx;
+  min-width: 150upx;
+  border: none !important;
+}
+.btn-fillet{
+	border-radius: 50upx;
+}
+.btn-c{
+	background-color: #f7f7f7;
+}
+.btn-w{
+  border: 2upx solid #333;
+  color: #333;
+	background-color: #fff;
+}
+.btn-g{
+  border: 2upx solid #E0E0E0;
+  color: #999;
+	background-color: #fff;
+}
+.btn-b{
+  border: 2upx solid #333;
+  background-color: #333;
+  color: #fff;
+}
+.btn-o{
+  border: 2upx solid #FF7159;
+  background-color: #FF7159;
+  color: #fff;
+}
+.btn-half{
+	width: 50%;
+}
+.btn-all{
+	width: 100%;
+}
+.img-grids{
+  overflow: hidden;
+	/* padding-bottom: 26upx; */
+}
+.img-grids .goods-name{
+	height: 72upx;
+}
+.column3.img-grids .goods-name{
+	height: 68upx;
+}
+.img-grids-item{
+  width: 336upx;
+  margin: 26upx;
+  display: inline-block;
+  background-color: #fff;
+  float: left;
+  min-height: 130upx;
+  /* #ifdef MP-ALIPAY */
+  width: 330rpx;
+  margin: 25rpx;
+  min-height: 130rpx;
+  /* #endif */
+}
+.img-grids-item:nth-child(2n-1){
+  margin-right: 0;
+}
+.img-grids-item-t{
+  width: 336upx;
+  height: 336upx;
+   /* #ifdef MP-ALIPAY */
+  width: 330rpx;
+  height: 330rpx;
+  /* #endif */
+}
+.img-grids-item-b{
+  padding: 0 10upx 10upx;
+}
+.goods-name{
+  display: -webkit-box;
+  -webkit-box-orient: vertical;
+  -webkit-line-clamp: 2;
+  overflow: hidden;
+  color: #333;  
+  width: 100%; 
+  /* height: 72upx; */
+  /* #ifdef MP-ALIPAY */
+  min-height: 20px;
+  /* #endif */
+}
+.grids-goods-name{
+  font-size: 26upx;
+}
+.goods-item-c{
+  overflow: hidden;
+  margin-top: 10upx;
+}
+.goods-price{
+  min-width: 120upx;
+  min-height: 40upx;
+  color: #333;
+  font-size: 28upx;
+  display: inline-block;
+  float: left;
+}
+.red-price{
+  color: #FF7159 !important;
+}
+.img-list{
+
+}
+.img-list .goods-name{
+	min-height: 74upx;
+}
+.img-list-item{
+  padding: 30upx 26upx;
+  background-color: #fff;
+  margin-bottom: 2upx;
+  overflow: hidden;
+}
+.img-list-item-l{
+  width: 250upx;
+  height: 250upx;
+  display: inline-block;
+  float: left;
+}
+.img-list-item-r{
+  width: 410upx;
+  min-height: 250upx;
+  display: inline-block;
+  margin-left: 26upx;
+  float: left;
+  padding: 10upx 0;
+  position: relative;
+}
+.list-goods-name{
+  font-size: 28upx;
+}
+.img-list-item .goods-item-c{
+  /* position: absolute; */
+  /* bottom: 0; */
+  width: 100%;
+	margin-top: 0;
+}
+.img-list-item .goods-price{
+  min-width: 150upx;
+  min-height: 50upx;
+  font-size: 38upx;
+  float: none;
+}
+.goods-buy{
+  overflow: hidden;
+}
+.goods-salesvolume{
+  min-width: 100upx;
+  height: 30upx;
+  font-size: 20upx;
+  color: #999;
+  display: inline-block;
+}
+.goods-cart{
+  width: 40upx;
+  height: 40upx;
+  float: right;
+}
+.medium-img{
+	width: 196upx;
+	height: 196upx;
+}
+.little-img{
+  width: 140upx;
+  height: 140upx;
+}
+.small-img{
+  width: 120upx;
+  height: 120upx;
+}
+.medium-right{
+	width: 340upx;
+	min-height: 140upx;
+}
+.little-right{
+  width: 520upx;
+  min-height: 140upx;
+  padding: 0;
+}
+.small-right{
+  width: 540upx;
+  height: 120upx;
+  padding: 0;
+	min-height: 60upx;
+}
+.little-right-t{
+  overflow: hidden;
+}
+.little-right .list-goods-name{
+  float: left;
+  width: 360upx;
+	margin-bottom: 6upx;
+}
+.small-right .list-goods-name{
+  width: 100%;
+}
+.little-right .goods-price{
+  float: right;
+  font-size: 28upx;
+  text-align: right;
+  min-width: 120upx;
+	max-width: 150upx;
+	overflow: hidden;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+  min-height: 40upx;
+}
+.goods-num{
+  float: right;
+  color: #999;
+  font-size: 24upx;
+  height: 30upx;
+  min-width: 50upx;
+}
+.goods-numbox{
+	float: right;
+}
+.little-right .goods-salesvolume{
+  font-size: 24upx;
+  /* float: left; */
+}
+.cell-group{
+  background-color: #fff;
+}
+.cell-item{
+  padding: 20upx 26upx 20upx 0;
+  width: 724upx;
+  margin-left: 26upx;
+  border-bottom: 2upx solid #f3f3f3;
+  position: relative;
+  overflow: hidden;
+  background-color: #fff;
+	color: #333;
+  display: table;
+	min-height: 90upx;
+}
+.cell-item:last-child{
+  border: none;
+}
+.cell-item-hd{
+  display: table-cell;
+  vertical-align: middle;
+  min-width: 160upx;
+  max-width: 180upx;
+  font-size: 28upx;
+	position: relative;
+}
+.cell-hd-icon{
+  width: 40upx;
+  height: 40upx;
+  display: inline-block;
+  float: left;
+	margin-right: 8upx;
+}
+.cell-hd-title{
+  float: left;
+  display: inline-block;
+  position: relative;
+  /* #ifdef MP-ALIPAY */
+  top: 4upx;
+  /* #endif */
+}
+.cell-item-bd{
+  display: table-cell;
+  vertical-align: middle;
+  margin-left: 20upx;
+  min-height: 30upx;
+  overflow: hidden;
+  min-width: 440upx;
+  max-width: 480upx;
+	padding-right: 50upx;
+}
+.cell-bd-view {
+	position: relative;
+	overflow: hidden;
+}
+.cell-bd-text{
+  float: left;
+  position: relative;
+  font-size: 24upx;
+}
+.cell-bd-text-right{
+	float: right;
+}
+.cell-bd-input{
+  display: inline-block;
+  float: left;
+	font-size: 26upx;
+}
+.cell-item-ft{
+  display: inline-block;
+  position: absolute;
+  top: 50%;
+  right: 26upx;
+  transform: translateY(-50%);
+  overflow: hidden;
+}
+.right-img .cell-item-ft{
+	right: 8upx;
+	height: 50upx;
+}
+.cell-ft-view{
+	position: relative;
+	overflow: hidden;
+	color: #666;
+	font-size: 28upx;
+	text-align: right;
+}
+.cell-ft-p{
+	font-size: 24upx;
+	color: #666;
+}
+.cell-ft-text{
+  font-size: 28upx;
+  float: right;
+  position: relative;
+  /* top: 8upx; */
+  line-height: 50upx;
+}
+.cell-ft-next{
+  float: right;  
+}
+.margin-cell-group{
+	margin: 20upx 0;
+}
+.bottom-cell-group{
+	margin-bottom: 20upx;
+}
+.min-cell-group{
+	margin-bottom: 1px;
+	padding: 20upx 0;
+}
+.min-cell-group .cell-item{
+	border-bottom: none;
+	min-height: 50upx;
+	padding: 0 26upx 0 0;
+}
+.icon{
+  width: 50upx;
+  height: 50upx;
+  /* #ifdef MP-ALIPAY */
+  background-size: 100% 100%;
+  /* #endif */
+}
+.swiper-grids .swiper-list{
+  white-space:nowrap;
+  width:100%;
+  min-height: 200upx;
+}
+.swiper-grids .img-grids-item{
+  float: none;
+  margin-right: 0;
+  width: 255upx;
+  margin-top: 0;
+}
+.swiper-grids .img-grids-item:last-child{
+  margin-right: 26upx;
+}
+.swiper-grids .img-grids-item-t{
+  width: 255upx;
+  height: 255upx;
+}
+.swiper-grids .goods-name{
+  white-space: normal;
+}
+.member-grid{
+  padding: 20upx 26upx;
+  /* overflow: hidden; */
+  width: 100%;
+  display: flex;
+}
+.member-item{
+  /* width: 20%; */
+  flex: 1;
+  /* float: left; */
+  /* display: inline-block; */
+  text-align: center;
+  position: relative;
+}
+/*会员中心图标按下事件*/
+.member-item:active{
+	transform: scale(.90);
+	transition: all .5s;
+	opacity: .8;
+}
+.member-item-icon{
+  width: 50upx;
+  height: 50upx;
+  display: block;
+  margin: 0 auto;
+}
+.member-item-text{
+  font-size: 24upx;
+  color: #666;
+  display: block;
+}
+.cart-list{
+	
+}
+.cart-checkbox{
+	position: relative;
+	height: 100%;
+}
+.cart-checkbox-c{
+	display: inline-block;
+	position: absolute;
+	top: 50%;
+	left: 26upx;
+	transform: translateY(-50%);
+	z-index: 99;
+}
+.cart-list .img-list-item{
+	padding-left: 90upx;
+}
+.cart-list .little-right{
+	width: 468upx;
+}
+.cart-list .little-right .list-goods-name{
+	width: 300upx;
+}
+.uni-checkbox-input{
+	border-radius: 50% !important;
+	color: #fff !important;
+}
+uni-radio .uni-radio-input,uni-checkbox .uni-checkbox-input{
+	width: 36upx;
+	height: 36upx;
+}
+uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked,.uni-radio-input.uni-radio-input-checked{
+	background-color: #FF7159 !important;
+	border-color: #FF7159 !important;
+	width: 36upx;
+	height: 36upx;
+}
+uni-checkbox.checkboxNo .uni-checkbox-input{
+	background-color: #e1e1e1 !important;
+	border-color: #e1e1e1 !important;
+}
+uni-radio.radioNo .uni-radio-input{
+	background-color: #e1e1e1 !important;
+	border-color: #e1e1e1 !important;
+}
+uni-checkbox .uni-checkbox-input.uni-checkbox-input-checked:before{
+	font-size: 36rpx;
+}
+.login-item-i-p{
+	color: #999;
+}
+.two-line{
+	display: -webkit-box;
+	-webkit-box-orient: vertical;
+	-webkit-line-clamp: 2;
+	overflow: hidden;
+}
+.badge{
+	display: inline-block;
+	position: absolute;
+	min-width:13px;
+	height:13px;
+	line-height:13px;
+	background-color:#FF7159;
+	color:#fff;
+	font-size:12px;
+	border-radius:50upx;
+	padding:0 3px;
+	z-index: 99;
+}
+.button-bottom{
+	background-color: #fff;
+	position: fixed;
+	bottom: 0;
+	height: 90upx;
+	width: 100%;
+	display: flex;
+	z-index: 66;
+	box-shadow: 0 0 10px #ccc;
+}
+.button-bottom .btn{
+	flex: 1;
+}
+.romotion-tip{
+	/* display: inline-block; */
+	overflow: hidden;
+}
+.romotion-tip-item{
+	display: inline-block;
+	float: left;
+	margin-right: 10upx;
+	margin-bottom: 4upx;
+	background-color: #FF7159;
+	color: #fff;
+	height: 34upx;
+	font-size: 24upx;
+	line-height: 34upx;
+	padding: 0 10upx;
+}
+.bg-gray{
+	background-color: #D0D0D0;
+}
+
+
+
+/*  #ifdef MP */
+checkbox .wx-checkbox-input{
+    border-radius: 50%;
+    height: 36rpx;
+    width: 36rpx;
+    margin-top: -4rpx;
+    border: 1rpx solid #d1d1d1;
+	
+}
+checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
+  width: 36rpx;
+  height: 36rpx;
+  line-height: 36rpx;
+  border-radius: 50%;
+  text-align: center;
+  font-size: 28rpx;
+  color: #fff;
+  background: transparent;
+  transform: translate(-50%, -50%) scale(1);
+  -webkit-transform: translate(-50%, -50%) scale(1);
+  background-color: #FF7159;
+  border: 1rpx solid #FF7159;
+}
+radio .wx-radio-input{
+   border-radius: 50%;/* 圆角 */
+   width: 36rpx;
+   height: 36rpx;
+   margin-top: -4rpx;
+   border: 1rpx solid #d1d1d1;
+}
+/* 选中后的 背景样式 （红色背景 无边框 可根据UI需求自己修改） */
+radio .wx-radio-input.wx-radio-input-checked{
+   border: 1rpx solid #FF7159;
+   background: #FF7159;
+}
+/* 选中后的 对勾样式 （白色对勾 可根据UI需求自己修改） */
+radio .wx-radio-input.wx-radio-input-checked::before{
+   border-radius: 50%;/* 圆角 */
+   width: 36rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   height: 36rpx; /* 选中后对勾大小，不要超过背景的尺寸 */
+   line-height: 36rpx;
+   text-align: center;
+   font-size:28rpx; /* 对勾大小 30rpx */
+   color:#fff; /* 对勾颜色 白色 */
+   background: transparent;
+   transform:translate(-50%, -50%) scale(1);
+   -webkit-transform:translate(-50%, -50%) scale(1);
+}
+
+/*  #endif  */
+
diff --git a/mallplusui-uniapp-app2/static/emptyCart.jpg b/mallplusui-uniapp-app2/static/emptyCart.jpg
new file mode 100644
index 0000000..be15652
Binary files /dev/null and b/mallplusui-uniapp-app2/static/emptyCart.jpg differ
diff --git a/mallplusui-uniapp-app2/static/errorImage.jpg b/mallplusui-uniapp-app2/static/errorImage.jpg
new file mode 100644
index 0000000..7a76067
Binary files /dev/null and b/mallplusui-uniapp-app2/static/errorImage.jpg differ
diff --git a/mallplusui-uniapp-app2/static/fujin.png b/mallplusui-uniapp-app2/static/fujin.png
new file mode 100644
index 0000000..efcd97c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/fujin.png differ
diff --git a/mallplusui-uniapp-app2/static/fujin_.png b/mallplusui-uniapp-app2/static/fujin_.png
new file mode 100644
index 0000000..ad31a46
Binary files /dev/null and b/mallplusui-uniapp-app2/static/fujin_.png differ
diff --git a/mallplusui-uniapp-app2/static/icon/ic_ar.png b/mallplusui-uniapp-app2/static/icon/ic_ar.png
new file mode 100644
index 0000000..33d6c48
Binary files /dev/null and b/mallplusui-uniapp-app2/static/icon/ic_ar.png differ
diff --git a/mallplusui-uniapp-app2/static/image/alipay.png b/mallplusui-uniapp-app2/static/image/alipay.png
new file mode 100644
index 0000000..8f7cf9f
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/alipay.png differ
diff --git a/mallplusui-uniapp-app2/static/image/balancepay.png b/mallplusui-uniapp-app2/static/image/balancepay.png
new file mode 100644
index 0000000..7dc59b6
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/balancepay.png differ
diff --git a/mallplusui-uniapp-app2/static/image/camera.png b/mallplusui-uniapp-app2/static/image/camera.png
new file mode 100644
index 0000000..db29758
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/camera.png differ
diff --git a/mallplusui-uniapp-app2/static/image/del.png b/mallplusui-uniapp-app2/static/image/del.png
new file mode 100644
index 0000000..382f39c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/del.png differ
diff --git a/mallplusui-uniapp-app2/static/image/ic-img.png b/mallplusui-uniapp-app2/static/image/ic-img.png
new file mode 100644
index 0000000..bb94276
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/ic-img.png differ
diff --git a/mallplusui-uniapp-app2/static/image/ic-link.png b/mallplusui-uniapp-app2/static/image/ic-link.png
new file mode 100644
index 0000000..b85d101
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/ic-link.png differ
diff --git a/mallplusui-uniapp-app2/static/image/invite-bg.png b/mallplusui-uniapp-app2/static/image/invite-bg.png
new file mode 100644
index 0000000..618e8bd
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/invite-bg.png differ
diff --git a/mallplusui-uniapp-app2/static/image/payment_balance.png b/mallplusui-uniapp-app2/static/image/payment_balance.png
new file mode 100644
index 0000000..c979e70
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/payment_balance.png differ
diff --git a/mallplusui-uniapp-app2/static/image/qq.png b/mallplusui-uniapp-app2/static/image/qq.png
new file mode 100644
index 0000000..fb4d8b3
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/qq.png differ
diff --git a/mallplusui-uniapp-app2/static/image/wechatpay.png b/mallplusui-uniapp-app2/static/image/wechatpay.png
new file mode 100644
index 0000000..ed8ca52
Binary files /dev/null and b/mallplusui-uniapp-app2/static/image/wechatpay.png differ
diff --git a/mallplusui-uniapp-app2/static/img/alipay.png b/mallplusui-uniapp-app2/static/img/alipay.png
new file mode 100644
index 0000000..bdfc354
Binary files /dev/null and b/mallplusui-uniapp-app2/static/img/alipay.png differ
diff --git a/mallplusui-uniapp-app2/static/iphone.png b/mallplusui-uniapp-app2/static/iphone.png
new file mode 100644
index 0000000..d746b74
Binary files /dev/null and b/mallplusui-uniapp-app2/static/iphone.png differ
diff --git a/mallplusui-uniapp-app2/static/location.png b/mallplusui-uniapp-app2/static/location.png
new file mode 100644
index 0000000..eeab8df
Binary files /dev/null and b/mallplusui-uniapp-app2/static/location.png differ
diff --git a/mallplusui-uniapp-app2/static/logo.png b/mallplusui-uniapp-app2/static/logo.png
new file mode 100644
index 0000000..5c572a4
Binary files /dev/null and b/mallplusui-uniapp-app2/static/logo.png differ
diff --git a/mallplusui-uniapp-app2/static/missing-face.png b/mallplusui-uniapp-app2/static/missing-face.png
new file mode 100644
index 0000000..c9be652
Binary files /dev/null and b/mallplusui-uniapp-app2/static/missing-face.png differ
diff --git a/mallplusui-uniapp-app2/static/position.png b/mallplusui-uniapp-app2/static/position.png
new file mode 100644
index 0000000..e160a4f
Binary files /dev/null and b/mallplusui-uniapp-app2/static/position.png differ
diff --git a/mallplusui-uniapp-app2/static/right-arrow.png b/mallplusui-uniapp-app2/static/right-arrow.png
new file mode 100644
index 0000000..aaabefa
Binary files /dev/null and b/mallplusui-uniapp-app2/static/right-arrow.png differ
diff --git a/mallplusui-uniapp-app2/static/search.png b/mallplusui-uniapp-app2/static/search.png
new file mode 100644
index 0000000..1d8e05a
Binary files /dev/null and b/mallplusui-uniapp-app2/static/search.png differ
diff --git a/mallplusui-uniapp-app2/static/search/attention.png b/mallplusui-uniapp-app2/static/search/attention.png
new file mode 100644
index 0000000..ca115dd
Binary files /dev/null and b/mallplusui-uniapp-app2/static/search/attention.png differ
diff --git a/mallplusui-uniapp-app2/static/search/attention_forbid.png b/mallplusui-uniapp-app2/static/search/attention_forbid.png
new file mode 100644
index 0000000..ba967da
Binary files /dev/null and b/mallplusui-uniapp-app2/static/search/attention_forbid.png differ
diff --git a/mallplusui-uniapp-app2/static/search/back.png b/mallplusui-uniapp-app2/static/search/back.png
new file mode 100644
index 0000000..47cdd81
Binary files /dev/null and b/mallplusui-uniapp-app2/static/search/back.png differ
diff --git a/mallplusui-uniapp-app2/static/search/delete.png b/mallplusui-uniapp-app2/static/search/delete.png
new file mode 100644
index 0000000..c812557
Binary files /dev/null and b/mallplusui-uniapp-app2/static/search/delete.png differ
diff --git a/mallplusui-uniapp-app2/static/select.png b/mallplusui-uniapp-app2/static/select.png
new file mode 100644
index 0000000..fff0c32
Binary files /dev/null and b/mallplusui-uniapp-app2/static/select.png differ
diff --git a/mallplusui-uniapp-app2/static/selected.png b/mallplusui-uniapp-app2/static/selected.png
new file mode 100644
index 0000000..1719f1b
Binary files /dev/null and b/mallplusui-uniapp-app2/static/selected.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-cart-current.png b/mallplusui-uniapp-app2/static/tab-cart-current.png
new file mode 100644
index 0000000..c55bc46
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-cart-current.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-cart.png b/mallplusui-uniapp-app2/static/tab-cart.png
new file mode 100644
index 0000000..6089c09
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-cart.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-cate-current.png b/mallplusui-uniapp-app2/static/tab-cate-current.png
new file mode 100644
index 0000000..c60ede5
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-cate-current.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-cate.png b/mallplusui-uniapp-app2/static/tab-cate.png
new file mode 100644
index 0000000..4913d50
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-cate.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-home-current.png b/mallplusui-uniapp-app2/static/tab-home-current.png
new file mode 100644
index 0000000..4b9c7a6
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-home-current.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-home.png b/mallplusui-uniapp-app2/static/tab-home.png
new file mode 100644
index 0000000..69964d3
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-home.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-my-current.png b/mallplusui-uniapp-app2/static/tab-my-current.png
new file mode 100644
index 0000000..2dd0974
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-my-current.png differ
diff --git a/mallplusui-uniapp-app2/static/tab-my.png b/mallplusui-uniapp-app2/static/tab-my.png
new file mode 100644
index 0000000..e6b4494
Binary files /dev/null and b/mallplusui-uniapp-app2/static/tab-my.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/ad1.jpg b/mallplusui-uniapp-app2/static/temp/ad1.jpg
new file mode 100644
index 0000000..d03fa35
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/ad1.jpg differ
diff --git a/mallplusui-uniapp-app2/static/temp/antFill-gift.png b/mallplusui-uniapp-app2/static/temp/antFill-gift.png
new file mode 100644
index 0000000..dc0fde0
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/antFill-gift.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/antFill-home.png b/mallplusui-uniapp-app2/static/temp/antFill-home.png
new file mode 100644
index 0000000..269907c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/antFill-home.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c1.png b/mallplusui-uniapp-app2/static/temp/c1.png
new file mode 100644
index 0000000..0ca677f
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c1.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c3.png b/mallplusui-uniapp-app2/static/temp/c3.png
new file mode 100644
index 0000000..c72f8a3
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c3.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c4.png b/mallplusui-uniapp-app2/static/temp/c4.png
new file mode 100644
index 0000000..e72766c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c4.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c5.png b/mallplusui-uniapp-app2/static/temp/c5.png
new file mode 100644
index 0000000..5ea4377
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c5.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c6.png b/mallplusui-uniapp-app2/static/temp/c6.png
new file mode 100644
index 0000000..23d6bc9
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c6.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c7.png b/mallplusui-uniapp-app2/static/temp/c7.png
new file mode 100644
index 0000000..1179641
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c7.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/c8.png b/mallplusui-uniapp-app2/static/temp/c8.png
new file mode 100644
index 0000000..43b3839
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/c8.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fabfa-dropbox.png b/mallplusui-uniapp-app2/static/temp/fabfa-dropbox.png
new file mode 100644
index 0000000..18ad1b2
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fabfa-dropbox.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-archive.png b/mallplusui-uniapp-app2/static/temp/fasfa-archive.png
new file mode 100644
index 0000000..12fb8ce
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-archive.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-history.png b/mallplusui-uniapp-app2/static/temp/fasfa-history.png
new file mode 100644
index 0000000..c59c677
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-history.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-shopping.png b/mallplusui-uniapp-app2/static/temp/fasfa-shopping.png
new file mode 100644
index 0000000..f852f39
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-shopping.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-sitemap.png b/mallplusui-uniapp-app2/static/temp/fasfa-sitemap.png
new file mode 100644
index 0000000..966a4ed
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-sitemap.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-street.png b/mallplusui-uniapp-app2/static/temp/fasfa-street.png
new file mode 100644
index 0000000..f1f701c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-street.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfa-truck.png b/mallplusui-uniapp-app2/static/temp/fasfa-truck.png
new file mode 100644
index 0000000..82aea48
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfa-truck.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/fasfausers.png b/mallplusui-uniapp-app2/static/temp/fasfausers.png
new file mode 100644
index 0000000..d04126c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/fasfausers.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/h1.png b/mallplusui-uniapp-app2/static/temp/h1.png
new file mode 100644
index 0000000..caa6d19
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/h1.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/nav1.png b/mallplusui-uniapp-app2/static/temp/nav1.png
new file mode 100644
index 0000000..2d9c95e
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/nav1.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/secskill-img.jpg b/mallplusui-uniapp-app2/static/temp/secskill-img.jpg
new file mode 100644
index 0000000..ea21ae9
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/secskill-img.jpg differ
diff --git a/mallplusui-uniapp-app2/static/temp/share_moment.png b/mallplusui-uniapp-app2/static/temp/share_moment.png
new file mode 100644
index 0000000..6fbb733
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/share_moment.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/share_qq.png b/mallplusui-uniapp-app2/static/temp/share_qq.png
new file mode 100644
index 0000000..5cedd48
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/share_qq.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/share_qqzone.png b/mallplusui-uniapp-app2/static/temp/share_qqzone.png
new file mode 100644
index 0000000..ec4115d
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/share_qqzone.png differ
diff --git a/mallplusui-uniapp-app2/static/temp/share_wechat.png b/mallplusui-uniapp-app2/static/temp/share_wechat.png
new file mode 100644
index 0000000..f88a7a7
Binary files /dev/null and b/mallplusui-uniapp-app2/static/temp/share_wechat.png differ
diff --git a/mallplusui-uniapp-app2/static/user-bg.jpg b/mallplusui-uniapp-app2/static/user-bg.jpg
new file mode 100644
index 0000000..af8c49c
Binary files /dev/null and b/mallplusui-uniapp-app2/static/user-bg.jpg differ
diff --git a/mallplusui-uniapp-app2/static/vip-card-bg.png b/mallplusui-uniapp-app2/static/vip-card-bg.png
new file mode 100644
index 0000000..6840371
Binary files /dev/null and b/mallplusui-uniapp-app2/static/vip-card-bg.png differ
diff --git a/mallplusui-uniapp-app2/static/youhuiquan.png b/mallplusui-uniapp-app2/static/youhuiquan.png
new file mode 100644
index 0000000..0a9c80b
Binary files /dev/null and b/mallplusui-uniapp-app2/static/youhuiquan.png differ
diff --git a/mallplusui-uniapp-app2/static/yticon.ttf b/mallplusui-uniapp-app2/static/yticon.ttf
new file mode 100644
index 0000000..966501e
Binary files /dev/null and b/mallplusui-uniapp-app2/static/yticon.ttf differ
diff --git a/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_black.png b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_black.png
new file mode 100644
index 0000000..d096753
Binary files /dev/null and b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_black.png differ
diff --git a/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_white.png b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_white.png
new file mode 100644
index 0000000..beedbed
Binary files /dev/null and b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_back_white.png differ
diff --git a/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_black.png b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_black.png
new file mode 100644
index 0000000..cfc4853
Binary files /dev/null and b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_black.png differ
diff --git a/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_white.png b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_white.png
new file mode 100644
index 0000000..6986a30
Binary files /dev/null and b/mallplusui-uniapp-app2/static/zhouWei-navBar/icon_home_white.png differ
diff --git a/mallplusui-uniapp-app2/store/index.js b/mallplusui-uniapp-app2/store/index.js
new file mode 100644
index 0000000..09ce84e
--- /dev/null
+++ b/mallplusui-uniapp-app2/store/index.js
@@ -0,0 +1,38 @@
+import Vue from 'vue'
+import Vuex from 'vuex'
+
+Vue.use(Vuex)
+
+const store = new Vuex.Store({
+	state: {
+		hasLogin: false,
+		userInfo:''
+	},
+	mutations: {
+		login(state, provider) {
+		console.log(provider);
+			if (provider && provider!=undefined){
+                state.hasLogin = true;
+				uni.setStorage({//缓存用户登陆状态
+					key: 'userInfo',
+					data: provider.userInfo
+				})
+				state.userInfo = provider;
+			}
+
+
+		},
+		logout(state) {
+			state.hasLogin = false;
+			state.userInfo = '';
+			uni.removeStorage({
+                key: 'userInfo'
+            })
+		}
+	},
+	actions: {
+
+	}
+})
+
+export default store
diff --git a/mallplusui-uniapp-app2/test.json b/mallplusui-uniapp-app2/test.json
new file mode 100644
index 0000000..bb96e45
--- /dev/null
+++ b/mallplusui-uniapp-app2/test.json
@@ -0,0 +1 @@
+1.小程序订单列表下拉问题
\ No newline at end of file
diff --git a/mallplusui-uniapp-app2/uni.scss b/mallplusui-uniapp-app2/uni.scss
new file mode 100644
index 0000000..89632af
--- /dev/null
+++ b/mallplusui-uniapp-app2/uni.scss
@@ -0,0 +1,112 @@
+
+/* 页面左右间距 */
+$page-row-spacing: 30upx;
+$page-color-base: #f8f8f8;
+$page-color-light: #f8f6fc;
+$base-color: #fa436a;
+
+/* 文字尺寸 */
+$font-sm: 24upx;
+$font-base: 28upx;
+$font-lg: 32upx;
+/*文字颜色*/
+$font-color-dark: #303133;
+$font-color-base: #606266;
+$font-color-light: #909399;
+$font-color-disabled: #C0C4CC;
+$font-color-spec: #4399fc;
+$font-color-gray:#999999;
+$font-color-red:#dd0037;
+$font-color-ccc:#cccccc;
+$font-color-999:#999999;
+$font-color-666:#666666;
+$font-color-333:#333333;
+$font-color-000:#000000;
+/* 边框颜色 */
+$border-color-dark: #DCDFE6;
+$border-color-base: #E4E7ED;
+$border-color-light: #EBEEF5;
+/* 背景颜色 */
+$image-bg-color:#eeeeee;
+$bgcolor_white:#ffffff;
+$all_bgcolor:#f4f4f4;
+$vui_bgcolor:#8c0027;
+/* 图片加载中颜色 */
+$image-bg-color: #eee;
+/* 行为相关颜色 */
+$uni-color-primary:#fa436a;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+//自定义变量
+$theme-color: #28b8a1;
+$bg-grey: #f4f4f4;
+$bd-color: #f0f0f0;
+$color-light: #5e5e5e;
+$g2: #eeeeee;
+$g5: #9e9e9e;
+$fz12: 24upx;
+$fz16: 32upx;
+$fz18: 36upx;
+$fz20: 40upx;
+
+/* 文字基本颜色 */
+$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;
+
+
+
+
+