xxxxxxx

watero-wechat-web/src/main/webapp/WEB-INF/views/wechat/index.html

@@ -22,7 +22,7 @@
 		.header h6{text-indent: 12px;color: #999;letter-spacing:2px;}
 		.go-index{width: 30%;margin-right:1%;float: none;}
 		.go-index img{width: 80%;padding-top: 5px;margin-left: 12px;max-width: 100px;}
-		.swiper-container-horizontal>.swiper-pagination-bullets{bottom: -15px;}
+		.swiper-container-horizontal>.swiper-pagination-bullets{bottom: 0;}
 		.swiper-pagination-bullet-active{background: #db3f53;}
 		.index-title{padding: 7px 12px 7px 12px;display: block;position: relative;}
 		.index-title strong{font-size: 17px;}
@@ -77,7 +77,7 @@
 	<!--商城首页begin-->
 	<div class="mui-content-padded">
 	<!--banner 开始-->
-	<div class="swiper-container">
+	<div class="swiper-container" style="padding:10px 0 20px 0;">
 		<div class="swiper-wrapper">
 			<div class="swiper-slide"><img width="100%" src="//s.iamberry.com/watero/images/banner-20190102.png" /></div>
 			<div class="swiper-slide"><img width="100%" src="//s.iamberry.com/watero/images/banner-20190101.png" /></div>
@@ -88,7 +88,7 @@
 	<!--banner 结束-->
 	</div>
 
-	<div class="index-title go_web_shop" style="margin-top: 20px;">
+	<div class="index-title go_web_shop">
 		<strong>Watero水机</strong><span class="mui-pull-right"><font>更多</font><span class="mui-icon mui-icon-arrowright"></span></span>
 	</div>
 	<!--list开始-->
@@ -166,7 +166,7 @@
                         autoplay: {
                             delay: 5000,//5秒切换一次
                         },
-                        effect: 'flip',
+                        effect: 'slide',
                         loop: true,
                         grabCursor: true,
                         pagination: {
@@ -188,6 +188,7 @@
                         "shareAppSuccess": "分享成功!",
                         "shareAppCancel": "已取消分享"
                     };
+                    getConfig();
                     document.querySelector('.loading-bg').style.display = 'none'
                 } else {
                     mui.alert(dt.message, ' ', '朕知道了', function() {

watero-wechat-web/src/main/webapp/common/shop/js/city.data-3.js

@@ -2,7 +2,7 @@ var cityData3 = [{
 	value: '110000',
 	text: '北京市',
 	children: [{
-		value: "110101",
+		value: "110100",
 		text: "北京市",
 		children: [{
 			value: "110101",
@@ -2746,7 +2746,7 @@ var cityData3 = [{
 	value: '310000',
 	text: '上海市',
 	children: [{
-		value: '310000',
+		value: '310100',
 		text: '上海市',
 		children: [{
 			value: "310101",
@@ -5651,31 +5651,6 @@ var cityData3 = [{
 		value: "411000",
 		text: "许昌市",
 		children: [{
-			value: "410902",
-			text: "华龙区"
-		}, {
-			value: "410922",
-			text: "清丰县"
-		}, {
-			value: "410923",
-			text: "南乐县"
-		}, {
-			value: "410926",
-			text: "范县"
-		}, {
-			value: "410927",
-			text: "台前县"
-		}, {
-			value: "410928",
-			text: "濮阳县"
-		}, {
-			value: "410929",
-			text: "其它区"
-		}]
-	}, {
-		value: "411100",
-		text: "漯河市",
-		children: [{
 			value: "411002",
 			text: "魏都区"
 		}, {
@@ -5698,8 +5673,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411200",
-		text: "三门峡市",
+		value: "411100",
+		text: "漯河市",
 		children: [{
 			value: "411102",
 			text: "源汇区"
@@ -5720,8 +5695,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411300",
-		text: "南阳市",
+		value: "411200",
+		text: "三门峡市",
 		children: [{
 			value: "411202",
 			text: "湖滨区"
@@ -5745,8 +5720,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411400",
-		text: "商丘市",
+		value: "411300",
+		text: "南阳市",
 		children: [{
 			value: "411302",
 			text: "宛城区"
@@ -5791,8 +5766,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411500",
-		text: "信阳市",
+		value: "411400",
+		text: "商丘市",
 		children: [{
 			value: "411402",
 			text: "梁园区"
@@ -5825,8 +5800,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411600",
-		text: "周口市",
+		value: "411500",
+		text: "信阳市",
 		children: [{
 			value: "411502",
 			text: "浉河区"
@@ -5862,8 +5837,8 @@ var cityData3 = [{
 			text: "其它区"
 		}]
 	}, {
-		value: "411700",
-		text: "驻马店市",
+		value: "411600",
+		text: "周口市",
 		children: [{
 			value: "411602",
 			text: "川汇区"
@@ -5898,6 +5873,40 @@ var cityData3 = [{
 			value: "411682",
 			text: "其它区"
 		}]
+	},{
+		value: "411700",
+		text: "驻马店市",
+		children: [{
+			value: "411702",
+			text: "驿城区"
+		}, {
+			value: "411721",
+			text: "西平县"
+		}, {
+			value: "411722",
+			text: "上蔡县"
+		}, {
+			value: "411723",
+			text: "平舆县"
+		}, {
+			value: "411724",
+			text: "正阳县"
+		}, {
+			value: "411725",
+			text: "确山县"
+		}, {
+			value: "411726",
+			text: "泌阳县"
+		}, {
+			value: "411727",
+			text: "汝南县"
+		}, {
+			value: "411628",
+			text: "遂平县"
+		}, {
+			value: "411729",
+			text: "新蔡县"
+		}]
 	}]
 }, {
 	value: '420000',
@@ -10191,16 +10200,7 @@ var cityData3 = [{
 	}, {
 		value: "620200",
 		text: "嘉峪关市",
-		children: [{
-			value: "620302",
-			text: "金川区"
-		}, {
-			value: "620321",
-			text: "永昌县"
-		}, {
-			value: "620322",
-			text: "其它区"
-		}]
+		children: []
 	}, {
 		value: "620300",
 		text: "金昌市",
@@ -11538,4 +11538,11 @@ var cityData3 = [{
 		value: "820200",
 		text: "离岛"
 	}]
+}, {
+	value: '990000',
+	text: '海外',
+	children: [{
+		value: "990100",
+		text: "海外"
+	}]
 }]

watero-wechat-web/src/main/webapp/common/shop/js/city.data.js

@@ -1595,4 +1595,11 @@ var cityData = [{
 		value: "820200",
 		text: "离岛"
 	}]
+}, {
+	value: '990000',
+	text: '海外',
+	children: [{
+		value: "990100",
+		text: "海外"
+	}]
 }]

watero-wechat-web/src/main/webapp/common/shop/js/mui.poppicker.js

@@ -112,9 +112,11 @@
 		getSelectedItems: function() {
 			var self = this;
 			var items = [];
-			for (var i in self.pickers) {
-				var picker = self.pickers[i];
-				items.push(picker.getSelectedItem() || {});
+			for (var i in self.pickers) {    
+				if(self.pickers.hasOwnProperty(i)) { // 修复for in会访问继承属性造成items报错情况
+					var picker = self.pickers[i];
+					items.push(picker.getSelectedItem() || {});
+				}
 			}
 			return items;
 		},