首页 发现 帮助
登录
qmx
/
jy
14
0
派生 0
文件 工单管理 2 合并请求 0 Wiki
浏览代码

区域

xuzhiheng 5 年之前
父节点
9cba56fd01
当前提交
c78ce78c2a
共有 4 个文件被更改，包括 234 次插入 和 46 次删除
合并视图 显示文件统计
  1. 14 8
      src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js
  2. 101 14
      src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html
  3. 14 8
      src/web/staticres/wx_dataExport/js/mapJSON.js
  4. 105 16
      src/web/templates/weixin/dataExport/dataExport_area.html

+ 14 - 8
src/jfw/modules/app/src/web/staticres/jyapp/dataExport/js/mapJSON.js
查看文件 

@@ -1555,6 +1555,12 @@ var chinaMapJSON = [{
 
     "ProID": 20,
 
     "ProID": 20,
 
     "CitySort": 272,
 
     "CitySort": 272,
 
     "area": ['其他']
 
     "area": ['其他']
 
+  },{
 
+    "CityID": 272,
 
+    "name": "三沙市",
 
+    "ProID": 20,
 
+    "CitySort": 272,
 
+    "area": ['其他']
 
   }]
 
   }]
 
 }, {
 
 }, {
 
   "ProID": 21,
 
   "ProID": 21,
 
@@ -1875,7 +1881,7 @@ var chinaMapJSON = [{
 
     "area": ['其他']
 
     "area": ['其他']
 
   }, {
 
   }, {
 
     "CityID": 344,
 
     "CityID": 344,
 
-    "name": "吐鲁番地区",
 
+    "name": "吐鲁番市",
 
     "ProID": 24,
 
     "ProID": 24,
 
     "CitySort": 344,
 
     "CitySort": 344,
 
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
 
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
 
@@ -1935,7 +1941,7 @@ var chinaMapJSON = [{
 
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
 
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
 
   }, {
 
   }, {
 
     "CityID": 291,
 
     "CityID": 291,
 
-    "name": "海东地区",
 
+    "name": "海东市",
 
     "ProID": 25,
 
     "ProID": 25,
 
     "CitySort": 291,
 
     "CitySort": 291,
 
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
 
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
 
@@ -2187,13 +2193,13 @@ var chinaMapJSON = [{
 
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
 
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
 
   }, {
 
   }, {
 
     "CityID": 251,
 
     "CityID": 251,
 
-    "name": "铜仁地区",
 
+    "name": "铜仁市",
 
     "ProID": 29,
 
     "ProID": 29,
 
     "CitySort": 251,
 
     "CitySort": 251,
 
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
 
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
 
   }, {
 
   }, {
 
     "CityID": 252,
 
     "CityID": 252,
 
-    "name": "毕节地区",
 
+    "name": "毕节市",
 
     "ProID": 29,
 
     "ProID": 29,
 
     "CitySort": 252,
 
     "CitySort": 252,
 
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]
 
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]
 
@@ -2325,25 +2331,25 @@ var chinaMapJSON = [{
 
     "area": ["城关区", "林周县", "当雄县", "尼木县", "曲水县", "堆龙德庆县", "达孜县", "墨竹工卡县"]
 
     "area": ["城关区", "林周县", "当雄县", "尼木县", "曲水县", "堆龙德庆县", "达孜县", "墨竹工卡县"]
 
   }, {
 
   }, {
 
     "CityID": 322,
 
     "CityID": 322,
 
-    "name": "日喀则地区",
 
+    "name": "日喀则市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 322,
 
     "CitySort": 322,
 
     "area": ["日喀则市", "南木林县", "江孜县", "定日县", "萨迦县", "拉孜县", "昂仁县", "谢通门县", "白朗县", "仁布县", "康马县", "定结县", "仲巴县", "亚东县", "吉隆县", "聂拉木县", "萨嘎县", "岗巴县"]
 
     "area": ["日喀则市", "南木林县", "江孜县", "定日县", "萨迦县", "拉孜县", "昂仁县", "谢通门县", "白朗县", "仁布县", "康马县", "定结县", "仲巴县", "亚东县", "吉隆县", "聂拉木县", "萨嘎县", "岗巴县"]
 
   }, {
 
   }, {
 
     "CityID": 323,
 
     "CityID": 323,
 
-    "name": "山南地区",
 
+    "name": "山南市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 323,
 
     "CitySort": 323,
 
     "area": ["乃东县", "扎囊县", "贡嘎县", "桑日县", "琼结县", "曲松县", "措美县", "洛扎县", "加查县", "隆子县", "错那县", "浪卡子县"]
 
     "area": ["乃东县", "扎囊县", "贡嘎县", "桑日县", "琼结县", "曲松县", "措美县", "洛扎县", "加查县", "隆子县", "错那县", "浪卡子县"]
 
   }, {
 
   }, {
 
     "CityID": 324,
 
     "CityID": 324,
 
-    "name": "林芝地区",
 
+    "name": "林芝市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 324,
 
     "CitySort": 324,
 
     "area": ["林芝县", "工布江达县", "米林县", "墨脱县", "波密县", "察隅县", "朗县"]
 
     "area": ["林芝县", "工布江达县", "米林县", "墨脱县", "波密县", "察隅县", "朗县"]
 
   }, {
 
   }, {
 
     "CityID": 325,
 
     "CityID": 325,
 
-    "name": "昌都地区",
 
+    "name": "昌都市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 325,
 
     "CitySort": 325,
 
     "area": ["昌都县", "江达县", "贡觉县", "类乌齐县", "丁青县", "察雅县", "八宿县", "左贡县", "芒康县", "洛隆县", "边坝县"]
 
     "area": ["昌都县", "江达县", "贡觉县", "类乌齐县", "丁青县", "察雅县", "八宿县", "左贡县", "芒康县", "洛隆县", "边坝县"]

+ 101 - 14
src/jfw/modules/app/src/web/templates/dataExport/dataExport_area.html
查看文件 

@@ -50,6 +50,46 @@
 
 				top: 18px;
 
 				top: 18px;
 
 				color: #444444;
 
 				color: #444444;
 
 			}
 
 			}
 
+			#choose_area .result {
 
+				position: relative;
 
+				padding: .2rem .3rem;
 
+				font-size: .26rem;
 
+				text-align: justify;
 
+			}
 
+			#choose_area .result .result_text {
 
+				position: relative;
 
+				min-height: 0.38rem;
 
+			}
 
+			#choose_area .result .line_two {
 
+				text-overflow: ellipsis;
 
+				overflow: hidden;
 
+				text-overflow: ellipsis;
 
+				display: -webkit-box;
 
+				-webkit-line-clamp: 2;
 
+				line-clamp: 2;
 
+				-webkit-box-orient: vertical;
 
+			}
 
+			#choose_area .result .detail, #choose_area .result .packup {
 
+				display: inline-block;
 
+				width: 1.5rem;
 
+				padding-right: 0.1rem;
 
+				text-align: right;
 
+				color: #2cb7ca;
 
+				font-size: .26rem;
 
+				z-index: 999;
 
+			}
 
+			#choose_area .result .detail {
 
+				position: absolute;
 
+				right: 0;
 
+				bottom: 0;
 
+				background: linear-gradient(90deg, rgba(245, 244, 249, 0) 0%, rgba(245, 244, 249, 0.96) 36%, #f5f4f9 100%);
 
+			}
 
+			#choose_area .result .packup {
 
+				position: absolute;
 
+				right: 0.3rem;
 
+				bottom: 0;
 
+				margin-top: .1rem;
 
+			}
 
 		</style>
 
 		</style>
 
 	<body>
 
 	<body>
 
 		<div class="app-layout-header">
 
 		<div class="app-layout-header">
 
@@ -58,8 +98,10 @@
 
 		</div>
 
 		</div>
 
 		<div id="choose_area" style="padding-top:65px">
 
 		<div id="choose_area" style="padding-top:65px">
 
 				<div class="result">
 
 				<div class="result">
 
-					已选择：
 
-					<span class="result_name"></span>
 
+					<p class="result_text line_two"> 已选择：<span class="result_name"></span>
 
+						<a href="javascript:;" class="detail">详情</a>
 
+					</p>
 
+					<a href="javascript:;" class="packup" style="display: none;">收起</a>
 
 				</div>
 
 				</div>
 
 				<div class="form">
 
 				<div class="form">
 
 
 
@@ -456,14 +498,54 @@
 
 			});
 
 			});
 
 			function createMoreCity(arr){
 
 			function createMoreCity(arr){
 
 				var tempHtml = arr.map(function(v) {
 
 				var tempHtml = arr.map(function(v) {
 
-					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 
+					return '<button class="city">' + v.name + '</button>'
 
 				}).join('');
 
 				}).join('');
 
 				return tempHtml
 
 				return tempHtml
 
 			}
 
 			}
 
 			//
 
 			//
 
+			// 判断选中结果是展开还是收起
 
+			function isOpen(){
 
+				let pHeight = $('.result_text').height();
 
+				let minHeight = $('.result_text').css('min-height');
 
+				let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
 
+				// console.log("高度："+ pHeight,"最小高度"+ minHeight,"行数：" + rows);
 
+				if(rows === 1){
 
+					$('.packup').hide();
 
+					$('.detail').hide()
 
+				}else if(rows === 2){
 
+					// $('.result_text').addClass('line_two')
 
+					// console.log($('.result_name').html().trim().length);
 
+					let length = $('.result_name').html().trim().length;
 
+					if(length >= 50){
 
+						$('.detail').show();
 
+						$('.packup').hide()
 
+					}else{
 
+						$('.detail').hide();
 
+						$('.packup').hide()
 
+					}
 
+
 
+				} else{
 
+					$('.packup').show();
 
+					$('.detail').hide()
 
+				}
 
+			}
 
+			// 展开收起事件
 
+			$('.detail').click(function () {
 
+				$('.result_text').removeClass('line_two');
 
+				$(".result").css("padding-bottom","0.3rem");
 
+				$(this).hide();
 
+				$('.packup').show()
 
+			});
 
+			$('.packup').click(function () {
 
+				$(".result").css("padding-bottom","0.2rem");
 
+				$('.result_text').addClass('line_two');
 
+				$(this).hide();
 
+				$('.detail').show()
 
+			});
 
+			//
 
 			/* 选中结果 */
 
 			/* 选中结果 */
 
 			function getResult() {
 
 			function getResult() {
 
-				$('.result_name').empty()
 
+				$('.result_name').empty();
 
 				var data = []; //定义一个总数组
 
 				var data = []; //定义一个总数组
 
 				var cityArr =[]; //定义一个选中城市数组
 
 				var cityArr =[]; //定义一个选中城市数组
 
 				var val = $('.other').parents('.province').text().trim();
 
 				var val = $('.other').parents('.province').text().trim();
 
@@ -491,8 +573,8 @@
 
 						// console.log($(this).parent('.tab_content').find('.city.active').text().trim())
 
 						// console.log($(this).parent('.tab_content').find('.city.active').text().trim())
 
 
 
 						let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
 
 						let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
 
-						let city = $(this).html()
 
-						arr.push({name:city,parent:province})
 
+						let city = $(this).html();
 
+						arr.push({name:city,parent:province});
 
 						// console.log(arr)
 
 						// console.log(arr)
 
 						for(let i =0;i<arr.length;i++){
 
 						for(let i =0;i<arr.length;i++){
 
 							// console.log(arr[i])
 
 							// console.log(arr[i])
 
@@ -528,29 +610,34 @@
 
 				for (var i = 0; i < result.length; i++) {
 
 				for (var i = 0; i < result.length; i++) {
 
 					let children = result[i].children;
 
 					let children = result[i].children;
 
 					if( children.length >0){
 
 					if( children.length >0){
 
-						html += `<span> ${result[i].name} (</span>`;
 
+						// 判断每个省份下选中的城市长度，当大于等于4的时候 弹出"选择全省更划算的弹窗"
 
+						if (children.length >= 4) {
 
+							$('.tips_btn .tips_d_text').show()
 
+						}
 
+						html += `${result[i].name}(`;
 
 						for(var j = 0;j < children.length;j++){
 
 						for(var j = 0;j < children.length;j++){
 
 							if (j != children.length - 1) {
 
 							if (j != children.length - 1) {
 
-								html += `<span> ${children[j].name}、</span>`
 
+								html += `${children[j].name}、`
 
 							} else {
 
 							} else {
 
-								html += `<span> ${children[j].name} </span>`
 
+								html += `${children[j].name}`
 
 							}
 
 							}
 
 						}
 
 						}
 
 						if(i !=result.length -1){
 
 						if(i !=result.length -1){
 
-							html += `<span>)</span>、`
 
+							html += `)、`
 
 						}else{
 
 						}else{
 
-							html += `<span>)</span>`
 
+							html += `)`
 
 						}
 
 						}
 
 
 
 					}else{
 
 					}else{
 
 						if(i !=result.length -1){
 
 						if(i !=result.length -1){
 
-							html += `<span>${result[i].name}、</span>`
 
+							html += `${result[i].name}、`
 
 						}else{
 
 						}else{
 
-							html += `<span>${result[i].name}</span>`
 
+							html += `${result[i].name}`
 
 						}
 
 						}
 
 					}
 
 					}
 
 				}
 
 				}
 
-				$('.result_name').append(html)
 
+				$('.result_name').append(html);
 
+				isOpen()
 
 			}
 
 			}
 
 
 
 			//
 
 			//

+ 14 - 8
src/web/staticres/wx_dataExport/js/mapJSON.js
查看文件 

@@ -1555,6 +1555,12 @@ var chinaMapJSON = [{
 
     "ProID": 20,
 
     "ProID": 20,
 
     "CitySort": 272,
 
     "CitySort": 272,
 
     "area": ['其他']
 
     "area": ['其他']
 
+  },{
 
+    "CityID": 272,
 
+    "name": "三沙市",
 
+    "ProID": 20,
 
+    "CitySort": 272,
 
+    "area": ['其他']
 
   }]
 
   }]
 
 }, {
 
 }, {
 
   "ProID": 21,
 
   "ProID": 21,
 
@@ -1875,7 +1881,7 @@ var chinaMapJSON = [{
 
     "area": ['其他']
 
     "area": ['其他']
 
   }, {
 
   }, {
 
     "CityID": 344,
 
     "CityID": 344,
 
-    "name": "吐鲁番地区",
 
+    "name": "吐鲁番市",
 
     "ProID": 24,
 
     "ProID": 24,
 
     "CitySort": 344,
 
     "CitySort": 344,
 
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
 
     "area": ["吐鲁番市", "鄯善县", "托克逊县"]
 
@@ -1935,7 +1941,7 @@ var chinaMapJSON = [{
 
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
 
     "area": ["城东区", "城中区", "城西区", "城北区", "大通回族土族自治县", "湟中县", "湟源县"]
 
   }, {
 
   }, {
 
     "CityID": 291,
 
     "CityID": 291,
 
-    "name": "海东地区",
 
+    "name": "海东市",
 
     "ProID": 25,
 
     "ProID": 25,
 
     "CitySort": 291,
 
     "CitySort": 291,
 
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
 
     "area": ["平安县", "民和回族土族自治县", "乐都县", "互助土族自治县", "化隆回族自治县", "循化撒拉族自治县"]
 
@@ -2187,13 +2193,13 @@ var chinaMapJSON = [{
 
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
 
     "area": ["凯里市", "黄平县", "施秉县", "三穗县", "镇远县", "岑巩县", "天柱县", "锦屏县", "剑河县", "台江县", "黎平县", "榕江县", "从江县", "雷山县", "麻江县", "丹寨县"]
 
   }, {
 
   }, {
 
     "CityID": 251,
 
     "CityID": 251,
 
-    "name": "铜仁地区",
 
+    "name": "铜仁市",
 
     "ProID": 29,
 
     "ProID": 29,
 
     "CitySort": 251,
 
     "CitySort": 251,
 
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
 
     "area": ["铜仁市", "江口县", "玉屏侗族自治县", "石阡县", "思南县", "印江土家族苗族自治县", "德江县", "沿河土家族自治县", "松桃苗族自治县", "万山特区"]
 
   }, {
 
   }, {
 
     "CityID": 252,
 
     "CityID": 252,
 
-    "name": "毕节地区",
 
+    "name": "毕节市",
 
     "ProID": 29,
 
     "ProID": 29,
 
     "CitySort": 252,
 
     "CitySort": 252,
 
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]
 
     "area": ["毕节市", "大方县", "黔西县", "金沙县", "织金县", "纳雍县", "威宁彝族回族苗族自治县", "赫章县"]
 
@@ -2325,25 +2331,25 @@ var chinaMapJSON = [{
 
     "area": ["城关区", "林周县", "当雄县", "尼木县", "曲水县", "堆龙德庆县", "达孜县", "墨竹工卡县"]
 
     "area": ["城关区", "林周县", "当雄县", "尼木县", "曲水县", "堆龙德庆县", "达孜县", "墨竹工卡县"]
 
   }, {
 
   }, {
 
     "CityID": 322,
 
     "CityID": 322,
 
-    "name": "日喀则地区",
 
+    "name": "日喀则市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 322,
 
     "CitySort": 322,
 
     "area": ["日喀则市", "南木林县", "江孜县", "定日县", "萨迦县", "拉孜县", "昂仁县", "谢通门县", "白朗县", "仁布县", "康马县", "定结县", "仲巴县", "亚东县", "吉隆县", "聂拉木县", "萨嘎县", "岗巴县"]
 
     "area": ["日喀则市", "南木林县", "江孜县", "定日县", "萨迦县", "拉孜县", "昂仁县", "谢通门县", "白朗县", "仁布县", "康马县", "定结县", "仲巴县", "亚东县", "吉隆县", "聂拉木县", "萨嘎县", "岗巴县"]
 
   }, {
 
   }, {
 
     "CityID": 323,
 
     "CityID": 323,
 
-    "name": "山南地区",
 
+    "name": "山南市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 323,
 
     "CitySort": 323,
 
     "area": ["乃东县", "扎囊县", "贡嘎县", "桑日县", "琼结县", "曲松县", "措美县", "洛扎县", "加查县", "隆子县", "错那县", "浪卡子县"]
 
     "area": ["乃东县", "扎囊县", "贡嘎县", "桑日县", "琼结县", "曲松县", "措美县", "洛扎县", "加查县", "隆子县", "错那县", "浪卡子县"]
 
   }, {
 
   }, {
 
     "CityID": 324,
 
     "CityID": 324,
 
-    "name": "林芝地区",
 
+    "name": "林芝市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 324,
 
     "CitySort": 324,
 
     "area": ["林芝县", "工布江达县", "米林县", "墨脱县", "波密县", "察隅县", "朗县"]
 
     "area": ["林芝县", "工布江达县", "米林县", "墨脱县", "波密县", "察隅县", "朗县"]
 
   }, {
 
   }, {
 
     "CityID": 325,
 
     "CityID": 325,
 
-    "name": "昌都地区",
 
+    "name": "昌都市",
 
     "ProID": 31,
 
     "ProID": 31,
 
     "CitySort": 325,
 
     "CitySort": 325,
 
     "area": ["昌都县", "江达县", "贡觉县", "类乌齐县", "丁青县", "察雅县", "八宿县", "左贡县", "芒康县", "洛隆县", "边坝县"]
 
     "area": ["昌都县", "江达县", "贡觉县", "类乌齐县", "丁青县", "察雅县", "八宿县", "左贡县", "芒康县", "洛隆县", "边坝县"]

+ 105 - 16
src/web/templates/weixin/dataExport/dataExport_area.html
查看文件 

@@ -15,11 +15,55 @@
 
 		{{include "/common/weixin.html"}}
 
 		{{include "/common/weixin.html"}}
 
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 
 		<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
 
 	</head>
 
 	</head>
 
+	<style>
 
+		#choose_area .result {
 
+			position: relative;
 
+			padding: .2rem .3rem;
 
+			font-size: .26rem;
 
+			text-align: justify;
 
+		}
 
+		#choose_area .result .result_text {
 
+			position: relative;
 
+			min-height: 0.38rem;
 
+		}
 
+		#choose_area .result .line_two {
 
+			text-overflow: ellipsis;
 
+			overflow: hidden;
 
+			text-overflow: ellipsis;
 
+			display: -webkit-box;
 
+			-webkit-line-clamp: 2;
 
+			line-clamp: 2;
 
+			-webkit-box-orient: vertical;
 
+		}
 
+		#choose_area .result .detail, #choose_area .result .packup {
 
+			display: inline-block;
 
+			width: 1.5rem;
 
+			padding-right: 0.1rem;
 
+			text-align: right;
 
+			color: #2cb7ca;
 
+			font-size: .26rem;
 
+			z-index: 999;
 
+		}
 
+		#choose_area .result .detail {
 
+			position: absolute;
 
+			right: 0;
 
+			bottom: 0;
 
+			background: linear-gradient(90deg, rgba(245, 244, 249, 0) 0%, rgba(245, 244, 249, 0.96) 36%, #f5f4f9 100%);
 
+		}
 
+		#choose_area .result .packup {
 
+			position: absolute;
 
+			right: 0.3rem;
 
+			bottom: 0;
 
+			margin-top: .1rem;
 
+		}
 
+	</style>
 
 	<body>
 
 	<body>
 
 	<div id="choose_area">
 
 	<div id="choose_area">
 
 		<div class="result">
 
 		<div class="result">
 
-			已选择：
 
-			<span class="result_name"></span>
 
+			<p class="result_text line_two"> 已选择：<span class="result_name"></span>
 
+				<a href="javascript:;" class="detail">详情</a>
 
+			</p>
 
+			<a href="javascript:;" class="packup" style="display: none;">收起</a>
 
 		</div>
 
 		</div>
 
 		<div class="form">
 
 		<div class="form">
 
 			<div class="select-area-box">
 
 			<div class="select-area-box">
 
@@ -371,9 +415,9 @@
 
 			<button class="reset-btn">重置</button>
 
 			<button class="reset-btn">重置</button>
 
 			<button class="save-btn">确认</button>
 
 			<button class="save-btn">确认</button>
 
 		</div>
 
 		</div>
 
-
 
 	</div>
 
 	</div>
 
-		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 
+
 
+	<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/jquery-2.1.4.js?v={{Msg "seo" "version"}}"></script>
 
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}3"></script>
 
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/mapJSON.js?v={{Msg "seo" "version"}}3"></script>
 
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 
 		<script src="{{Msg "seo" "cdn"}}/wx_dataExport/js/fastclick.js?v={{Msg "seo" "version"}}"></script>
 
 		<script>
 
 		<script>
 
@@ -416,14 +460,54 @@
 
 			});
 
 			});
 
 			function createMoreCity(arr){
 
 			function createMoreCity(arr){
 
 				var tempHtml = arr.map(function(v) {
 
 				var tempHtml = arr.map(function(v) {
 
-					return '<button class="city">' + v.name.replace(/地区$/g, '市') + '</button>'
 
+					return '<button class="city">' + v.name + '</button>'
 
 				}).join('');
 
 				}).join('');
 
 				return tempHtml
 
 				return tempHtml
 
 			}
 
 			}
 
 			//
 
 			//
 
+			// 判断选中结果是展开还是收起
 
+			function isOpen(){
 
+				let pHeight = $('.result_text').height();
 
+				let minHeight = $('.result_text').css('min-height');
 
+				let rows = Math.round(Math.round(pHeight)/ parseFloat(minHeight));
 
+				// console.log("高度："+ pHeight,"最小高度"+ minHeight,"行数：" + rows);
 
+				if(rows === 1){
 
+					$('.packup').hide();
 
+					$('.detail').hide()
 
+				}else if(rows === 2){
 
+					// $('.result_text').addClass('line_two')
 
+					// console.log($('.result_name').html().trim().length);
 
+					let length = $('.result_name').html().trim().length;
 
+					if(length >= 50){
 
+						$('.detail').show();
 
+						$('.packup').hide()
 
+					}else{
 
+						$('.detail').hide();
 
+						$('.packup').hide()
 
+					}
 
+
 
+				} else{
 
+					$('.packup').show();
 
+					$('.detail').hide()
 
+				}
 
+			}
 
+			// 展开收起事件
 
+			$('.detail').click(function () {
 
+				$('.result_text').removeClass('line_two');
 
+				$(".result").css("padding-bottom","0.3rem");
 
+				$(this).hide();
 
+				$('.packup').show()
 
+			});
 
+			$('.packup').click(function () {
 
+				$(".result").css("padding-bottom","0.2rem");
 
+				$('.result_text').addClass('line_two');
 
+				$(this).hide();
 
+				$('.detail').show()
 
+			});
 
+			//
 
 			/* 选中结果 */
 
 			/* 选中结果 */
 
 			function getResult() {
 
 			function getResult() {
 
-				$('.result_name').empty()
 
+				$('.result_name').empty();
 
 				var data = []; //定义一个总数组
 
 				var data = []; //定义一个总数组
 
 				var cityArr =[]; //定义一个选中城市数组
 
 				var cityArr =[]; //定义一个选中城市数组
 
 				var val = $('.other').parents('.province').text().trim();
 
 				var val = $('.other').parents('.province').text().trim();
 
@@ -451,8 +535,8 @@
 
 						// console.log($(this).parent('.tab_content').find('.city.active').text().trim())
 
 						// console.log($(this).parent('.tab_content').find('.city.active').text().trim())
 
 
 
 						let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
 
 						let province = $(this).parent('.tab_content').siblings('.tab:not(.whole)').children('.province').text().trim();
 
-						let city = $(this).html()
 
-						arr.push({name:city,parent:province})
 
+						let city = $(this).html();
 
+						arr.push({name:city,parent:province});
 
 						// console.log(arr)
 
 						// console.log(arr)
 
 						for(let i =0;i<arr.length;i++){
 
 						for(let i =0;i<arr.length;i++){
 
 							// console.log(arr[i])
 
 							// console.log(arr[i])
 
@@ -488,29 +572,34 @@
 
 				for (var i = 0; i < result.length; i++) {
 
 				for (var i = 0; i < result.length; i++) {
 
 					let children = result[i].children;
 
 					let children = result[i].children;
 
 					if( children.length >0){
 
 					if( children.length >0){
 
-						html += `<span> ${result[i].name} (</span>`;
 
+						// 判断每个省份下选中的城市长度，当大于等于4的时候 弹出"选择全省更划算的弹窗"
 
+						if (children.length >= 4) {
 
+							$('.tips_btn .tips_d_text').show()
 
+						}
 
+						html += `${result[i].name}(`;
 
 						for(var j = 0;j < children.length;j++){
 
 						for(var j = 0;j < children.length;j++){
 
 							if (j != children.length - 1) {
 
 							if (j != children.length - 1) {
 
-								html += `<span> ${children[j].name}、</span>`
 
+								html += `${children[j].name}、`
 
 							} else {
 
 							} else {
 
-								html += `<span> ${children[j].name} </span>`
 
+								html += `${children[j].name}`
 
 							}
 
 							}
 
 						}
 
 						}
 
 						if(i !=result.length -1){
 
 						if(i !=result.length -1){
 
-							html += `<span>)</span>、`
 
+							html += `)、`
 
 						}else{
 
 						}else{
 
-							html += `<span>)</span>`
 
+							html += `)`
 
 						}
 
 						}
 
 
 
 					}else{
 
 					}else{
 
 						if(i !=result.length -1){
 
 						if(i !=result.length -1){
 
-							html += `<span>${result[i].name}、</span>`
 
+							html += `${result[i].name}、`
 
 						}else{
 
 						}else{
 
-							html += `<span>${result[i].name}</span>`
 
+							html += `${result[i].name}`
 
 						}
 
 						}
 
 					}
 
 					}
 
 				}
 
 				}
 
-				$('.result_name').append(html)
 
+				$('.result_name').append(html);
 
+				isOpen()
 
 			}
 
 			}
 
 			//
 
 			//
 
 			 $(function(){
 
 			 $(function(){